diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 60b21a86163..30cb9833a6a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -45,3 +45,5 @@ updates:
     directory: "/"
     schedule:
       interval: weekly
+    exclude-paths:
+      - "misc/bazel/registry/**"
diff --git a/.github/workflows/compile-queries.yml b/.github/workflows/compile-queries.yml
deleted file mode 100644
index c8f6301bb53..00000000000
--- a/.github/workflows/compile-queries.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-name: "Compile all queries using the latest stable CodeQL CLI"
-
-on:
-  push:
-    branches:  # makes sure the cache gets populated - running on the branches people tend to merge into.
-      - main
-      - "rc/*"
-      - "codeql-cli-*"
-  pull_request:
-    paths:
-      - '**.ql'
-      - '**.qll'
-      - '**/qlpack.yml'
-      - '**.dbscheme'
-
-permissions:
-  contents: read
-
-jobs:
-  detect-changes:
-    if: github.repository_owner == 'github'
-    runs-on: ubuntu-latest
-    outputs:
-      languages: ${{ steps.detect.outputs.languages }}
-    steps:
-      - uses: actions/checkout@v5
-      - name: Detect changed languages
-        id: detect
-        run: |
-          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            # For PRs, detect which languages have changes
-            changed_files=$(gh pr view ${{ github.event.pull_request.number }} --json files --jq '.files.[].path')
-            languages=()
-            for lang in actions cpp csharp go java javascript python ql ruby rust swift; do
-              if echo "$changed_files" | grep -qE "^($lang/|shared/)" ; then
-                languages+=("$lang")
-              fi
-            done
-            echo "languages=$(jq -c -n '$ARGS.positional' --args "${languages[@]}")" >> $GITHUB_OUTPUT
-          else
-            # For pushes to main/rc branches, run all languages
-            echo 'languages=["actions","cpp","csharp","go","java","javascript","python","ql","ruby","rust","swift"]' >> $GITHUB_OUTPUT
-          fi
-        env:
-          GH_TOKEN: ${{ github.token }}
-
-  compile-queries:
-    needs: detect-changes
-    if: github.repository_owner == 'github' && needs.detect-changes.outputs.languages != '[]'
-    runs-on: ubuntu-latest-xl
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ${{ fromJson(needs.detect-changes.outputs.languages) }}
-
-    steps:
-      - uses: actions/checkout@v5
-      - name: Setup CodeQL
-        uses: ./.github/actions/fetch-codeql
-        with:
-          channel: 'release'
-      - name: Cache compilation cache
-        id: query-cache
-        uses: ./.github/actions/cache-query-compilation
-        with: 
-          key: ${{ matrix.language }}-queries
-      - name: check formatting
-        run: find shared ${{ matrix.language }}/ql -type f \( -name "*.qll" -o -name "*.ql" \) -print0 | xargs -0 -n 3000 -P 10 codeql query format -q --check-only
-      - name: compile queries - check-only
-        # run with --check-only if running in a PR (github.sha != main)
-        if : ${{ github.event_name == 'pull_request' }}
-        shell: bash
-        run: codeql query compile -q -j0 ${{ matrix.language }}/ql/{src,examples} --keep-going --warnings=error --check-only --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500 --ram=56000
-      - name: compile queries - full
-        # do full compile if running on main - this populates the cache
-        if : ${{ github.event_name != 'pull_request' }}
-        shell: bash
-        run: codeql query compile -q -j0 ${{ matrix.language }}/ql/{src,examples} --keep-going --warnings=error --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500 --ram=56000
diff --git a/.github/workflows/ruby-build.yml b/.github/workflows/ruby-build.yml
deleted file mode 100644
index 39aadef0913..00000000000
--- a/.github/workflows/ruby-build.yml
+++ /dev/null
@@ -1,236 +0,0 @@
-name: "Ruby: Build"
-
-on:
-  push:
-    paths:
-      - "ruby/**"
-      - .github/workflows/ruby-build.yml
-      - .github/actions/fetch-codeql/action.yml
-      - codeql-workspace.yml
-      - "shared/tree-sitter-extractor/**"
-    branches:
-      - main
-      - "rc/*"
-  pull_request:
-    paths:
-      - "ruby/**"
-      - .github/workflows/ruby-build.yml
-      - .github/actions/fetch-codeql/action.yml
-      - codeql-workspace.yml
-      - "shared/tree-sitter-extractor/**"
-    branches:
-      - main
-      - "rc/*"
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: "Version tag to create"
-        required: false
-
-env:
-  CARGO_TERM_COLOR: always
-
-defaults:
-  run:
-    working-directory: ruby
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@v5
-      - name: Install GNU tar
-        if: runner.os == 'macOS'
-        run: |
-          brew install gnu-tar
-          echo "/usr/local/opt/gnu-tar/libexec/gnubin" >> $GITHUB_PATH
-      - name: Prepare Windows
-        if: runner.os == 'Windows'
-        shell: powershell
-        run: |
-          git config --global core.longpaths true
-      - uses: ./.github/actions/os-version
-        id: os_version
-      - name: Cache entire extractor
-        uses: actions/cache@v3
-        id: cache-extractor
-        with:
-          path: |
-            target/release/codeql-extractor-ruby
-            target/release/codeql-extractor-ruby.exe
-            ruby/extractor/ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
-          key: ${{ runner.os }}-${{ steps.os_version.outputs.version }}-ruby-extractor-${{ hashFiles('ruby/extractor/rust-toolchain.toml', 'ruby/extractor/Cargo.lock') }}-${{ hashFiles('shared/tree-sitter-extractor') }}-${{ hashFiles('ruby/extractor/**/*.rs') }}
-      - uses: actions/cache@v3
-        if: steps.cache-extractor.outputs.cache-hit != 'true'
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-${{ steps.os_version.outputs.version }}-ruby-rust-cargo-${{ hashFiles('ruby/extractor/rust-toolchain.toml', 'ruby/extractor/**/Cargo.lock') }}
-      - name: Check formatting
-        if: steps.cache-extractor.outputs.cache-hit != 'true'
-        run: cd extractor && cargo fmt -- --check
-      - name: Build
-        if: steps.cache-extractor.outputs.cache-hit != 'true'
-        run: cd extractor && cargo build --verbose
-      - name: Run tests
-        if: steps.cache-extractor.outputs.cache-hit != 'true'
-        run: cd extractor && cargo test --verbose
-      - name: Release build
-        if: steps.cache-extractor.outputs.cache-hit != 'true'
-        run: cd extractor && cargo build --release
-      - name: Generate dbscheme
-        if: ${{ matrix.os == 'ubuntu-latest' && steps.cache-extractor.outputs.cache-hit != 'true'}}
-        run: ../target/release/codeql-extractor-ruby generate --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
-      - uses: actions/upload-artifact@v4
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        with:
-          name: ruby.dbscheme
-          path: ruby/ql/lib/ruby.dbscheme
-      - uses: actions/upload-artifact@v4
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        with:
-          name: TreeSitter.qll
-          path: ruby/ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
-      - uses: actions/upload-artifact@v4
-        with:
-          name: extractor-${{ matrix.os }}
-          path: |
-            target/release/codeql-extractor-ruby
-            target/release/codeql-extractor-ruby.exe
-          retention-days: 1
-  compile-queries:
-    if: github.repository_owner == 'github'
-    runs-on: ubuntu-latest-xl
-    steps:
-      - uses: actions/checkout@v5
-      - name: Fetch CodeQL
-        uses: ./.github/actions/fetch-codeql
-      - name: Cache compilation cache
-        id: query-cache
-        uses: ./.github/actions/cache-query-compilation
-        with:
-          key: ruby-build
-      - name: Build Query Pack
-        run: |
-          PACKS=${{ runner.temp }}/query-packs
-          rm -rf $PACKS
-          codeql pack create ../misc/suite-helpers --output "$PACKS"
-          codeql pack create ../shared/regex --output "$PACKS"
-          codeql pack create ../shared/ssa --output "$PACKS"
-          codeql pack create ../shared/tutorial --output "$PACKS"
-          codeql pack create ql/lib --output "$PACKS"
-          codeql pack create -j0 ql/src --output "$PACKS" --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
-          PACK_FOLDER=$(readlink -f "$PACKS"/codeql/ruby-queries/*)
-          codeql generate query-help --format=sarifv2.1.0 --output="${PACK_FOLDER}/rules.sarif" ql/src
-          (cd ql/src; find queries \( -name '*.qhelp' -o -name '*.rb' -o -name '*.erb' \) -exec bash -c 'mkdir -p "'"${PACK_FOLDER}"'/$(dirname "{}")"' \; -exec cp "{}" "${PACK_FOLDER}/{}" \;)
-      - uses: actions/upload-artifact@v4
-        with:
-          name: codeql-ruby-queries
-          path: |
-            ${{ runner.temp }}/query-packs/*
-          retention-days: 1
-          include-hidden-files: true
-
-  package:
-    runs-on: ubuntu-latest
-    needs: [build, compile-queries]
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions/download-artifact@v4
-        with:
-          name: ruby.dbscheme
-          path: ruby/ruby
-      - uses: actions/download-artifact@v4
-        with:
-          name: extractor-ubuntu-latest
-          path: ruby/linux64
-      - uses: actions/download-artifact@v4
-        with:
-          name: extractor-windows-latest
-          path: ruby/win64
-      - uses: actions/download-artifact@v4
-        with:
-          name: extractor-macos-latest
-          path: ruby/osx64
-      - run: |
-          mkdir -p ruby
-          cp -r codeql-extractor.yml tools ql/lib/ruby.dbscheme.stats ruby/
-          mkdir -p ruby/tools/{linux64,osx64,win64}
-          cp linux64/codeql-extractor-ruby ruby/tools/linux64/extractor
-          cp osx64/codeql-extractor-ruby ruby/tools/osx64/extractor
-          cp win64/codeql-extractor-ruby.exe ruby/tools/win64/extractor.exe
-          chmod +x ruby/tools/{linux64,osx64}/extractor
-          zip -rq codeql-ruby.zip ruby
-      - uses: actions/upload-artifact@v4
-        with:
-          name: codeql-ruby-pack
-          path: ruby/codeql-ruby.zip
-          retention-days: 1
-          include-hidden-files: true
-      - uses: actions/download-artifact@v4
-        with:
-          name: codeql-ruby-queries
-          path: ruby/qlpacks
-      - run: |
-          echo '{
-            "provide": [
-            "ruby/codeql-extractor.yml",
-            "qlpacks/*/*/*/qlpack.yml"
-            ]
-          }' > .codeqlmanifest.json
-          zip -rq codeql-ruby-bundle.zip .codeqlmanifest.json ruby qlpacks
-      - uses: actions/upload-artifact@v4
-        with:
-          name: codeql-ruby-bundle
-          path: ruby/codeql-ruby-bundle.zip
-          retention-days: 1
-          include-hidden-files: true
-
-  test:
-    defaults:
-      run:
-        working-directory: ${{ github.workspace }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-
-    runs-on: ${{ matrix.os }}
-    needs: [package]
-    steps:
-      - uses: actions/checkout@v5
-      - name: Fetch CodeQL
-        uses: ./.github/actions/fetch-codeql
-
-      - name: Download Ruby bundle
-        uses: actions/download-artifact@v4
-        with:
-          name: codeql-ruby-bundle
-          path: ${{ runner.temp }}
-      - name: Unzip Ruby bundle
-        shell: bash
-        run: unzip -q -d "${{ runner.temp }}/ruby-bundle" "${{ runner.temp }}/codeql-ruby-bundle.zip"
-
-      - name: Run QL test
-        shell: bash
-        run: |
-          codeql test run --search-path "${{ runner.temp }}/ruby-bundle" --additional-packs "${{ runner.temp }}/ruby-bundle" ruby/ql/test/library-tests/ast/constants/
-      - name: Create database
-        shell: bash
-        run: |
-          codeql database create --search-path "${{ runner.temp }}/ruby-bundle" --language ruby --source-root ruby/ql/test/library-tests/ast/constants/ ../database
-      - name: Analyze database
-        shell: bash
-        run: |
-          codeql database analyze --search-path "${{ runner.temp }}/ruby-bundle" --format=sarifv2.1.0 --output=out.sarif ../database ruby-code-scanning.qls
diff --git a/.github/workflows/ruby-dataset-measure.yml b/.github/workflows/ruby-dataset-measure.yml
deleted file mode 100644
index a88b23bf3a1..00000000000
--- a/.github/workflows/ruby-dataset-measure.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-name: "Ruby: Collect database stats"
-
-on:
-  push:
-    branches:
-      - main
-      - "rc/*"
-    paths:
-      - ruby/ql/lib/ruby.dbscheme
-      - .github/workflows/ruby-dataset-measure.yml
-  pull_request:
-    branches:
-      - main
-      - "rc/*"
-    paths:
-      - ruby/ql/lib/ruby.dbscheme
-      - .github/workflows/ruby-dataset-measure.yml
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  measure:
-    env:
-      CODEQL_THREADS: 4 # TODO: remove this once it's set by the CLI
-    strategy:
-      fail-fast: false
-      matrix:
-        repo: [rails/rails, discourse/discourse, spree/spree, ruby/ruby]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-
-      - uses: ./.github/actions/fetch-codeql
-
-      - uses: ./ruby/actions/create-extractor-pack
-
-      - name: Checkout ${{ matrix.repo }}
-        uses: actions/checkout@v5
-        with:
-          repository: ${{ matrix.repo }}
-          path: ${{ github.workspace }}/repo
-      - name: Create database
-        run: |
-          codeql database create \
-            --search-path "${{ github.workspace }}" \
-            --threads 4 \
-            --language ruby --source-root "${{ github.workspace }}/repo" \
-            "${{ runner.temp }}/database"
-      - name: Measure database
-        run: |
-          mkdir -p "stats/${{ matrix.repo }}"
-          codeql dataset measure --threads 4 --output "stats/${{ matrix.repo }}/stats.xml" "${{ runner.temp }}/database/db-ruby"
-      - uses: actions/upload-artifact@v4
-        with:
-          name: measurements-${{ hashFiles('stats/**') }}
-          path: stats
-          retention-days: 1
-
-  merge:
-    runs-on: ubuntu-latest
-    needs: measure
-    steps:
-      - uses: actions/checkout@v5
-      - uses: actions/download-artifact@v4
-        with:
-          path: stats
-      - run: |
-          python -m pip install --user lxml
-          find stats -name 'stats.xml' | sort | xargs python ruby/scripts/merge_stats.py --output ruby/ql/lib/ruby.dbscheme.stats --normalise ruby_tokeninfo
-      - uses: actions/upload-artifact@v4
-        with:
-          name: ruby.dbscheme.stats
-          path: ruby/ql/lib/ruby.dbscheme.stats
diff --git a/.github/workflows/ruby-qltest-rtjo.yml b/.github/workflows/ruby-qltest-rtjo.yml
deleted file mode 100644
index 1d57c465538..00000000000
--- a/.github/workflows/ruby-qltest-rtjo.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: "Ruby: Run RTJO Language Tests"
-
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - labeled
-
-env:
-  CARGO_TERM_COLOR: always
-
-defaults:
-  run:
-    working-directory: ruby
-
-permissions:
-  contents: read
-
-jobs:
-  qltest-rtjo:
-    if: "github.repository_owner == 'github' && github.event.label.name == 'Run: RTJO Language Tests'"
-    runs-on: ubuntu-latest-xl
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v5
-      - uses: ./.github/actions/fetch-codeql
-      - uses: ./ruby/actions/create-extractor-pack
-      - name: Cache compilation cache
-        id: query-cache
-        uses: ./.github/actions/cache-query-compilation
-        with:
-          key: ruby-qltest
-      - name: Run QL tests
-        run: |
-          codeql test run --dynamic-join-order-mode=all --threads=0 --ram 50000 --search-path "${{ github.workspace }}" --check-databases --check-diff-informed --check-undefined-labels --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --consistency-queries ql/consistency-queries ql/test --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
diff --git a/.github/workflows/ruby-qltest.yml b/.github/workflows/ruby-qltest.yml
deleted file mode 100644
index e178a5dfb6e..00000000000
--- a/.github/workflows/ruby-qltest.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-name: "Ruby: Run QL Tests"
-
-on:
-  push:
-    paths:
-      - "ruby/**"
-      - "shared/**"
-      - .github/workflows/ruby-build.yml
-      - .github/actions/fetch-codeql/action.yml
-      - codeql-workspace.yml
-    branches:
-      - main
-      - "rc/*"
-  pull_request:
-    paths:
-      - "ruby/**"
-      - "shared/**"
-      - .github/workflows/ruby-qltest.yml
-      - .github/actions/fetch-codeql/action.yml
-      - codeql-workspace.yml
-    branches:
-      - main
-      - "rc/*"
-
-env:
-  CARGO_TERM_COLOR: always
-
-defaults:
-  run:
-    working-directory: ruby
-
-permissions:
-  contents: read
-
-jobs:
-  qlupgrade:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - uses: ./.github/actions/fetch-codeql
-      - name: Check DB upgrade scripts
-        run: |
-          echo >empty.trap
-          codeql dataset import -S ql/lib/upgrades/initial/ruby.dbscheme testdb empty.trap
-          codeql dataset upgrade testdb --additional-packs ql/lib
-          diff -q testdb/ruby.dbscheme ql/lib/ruby.dbscheme
-      - name: Check DB downgrade scripts
-        run: |
-          echo >empty.trap
-          rm -rf testdb; codeql dataset import -S ql/lib/ruby.dbscheme testdb empty.trap
-          codeql resolve upgrades --format=lines --allow-downgrades --additional-packs downgrades \
-           --dbscheme=ql/lib/ruby.dbscheme --target-dbscheme=downgrades/initial/ruby.dbscheme |
-           xargs codeql execute upgrades testdb
-          diff -q testdb/ruby.dbscheme downgrades/initial/ruby.dbscheme
-  qltest:
-    if: github.repository_owner == 'github'
-    runs-on: ubuntu-latest-xl
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v5
-      - uses: ./.github/actions/fetch-codeql
-      - uses: ./ruby/actions/create-extractor-pack
-      - name: Cache compilation cache
-        id: query-cache
-        uses: ./.github/actions/cache-query-compilation
-        with:
-          key: ruby-qltest
-      - name: Run QL tests
-        run: |
-          codeql test run --threads=0 --ram 50000 --search-path "${{ github.workspace }}" --check-databases --check-diff-informed --check-undefined-labels --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --consistency-queries ql/consistency-queries ql/test --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
diff --git a/MODULE.bazel b/MODULE.bazel
index 2b37719584c..d1aad277ed4 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -15,23 +15,23 @@ local_path_override(
 # see https://registry.bazel.build/ for a list of available packages
 
 bazel_dep(name = "platforms", version = "1.0.0")
-bazel_dep(name = "rules_cc", version = "0.2.16")
-bazel_dep(name = "rules_go", version = "0.59.0")
-bazel_dep(name = "rules_java", version = "9.0.3")
-bazel_dep(name = "rules_pkg", version = "1.0.1")
+bazel_dep(name = "rules_cc", version = "0.2.17")
+bazel_dep(name = "rules_go", version = "0.60.0")
+bazel_dep(name = "rules_java", version = "9.6.1")
+bazel_dep(name = "rules_pkg", version = "1.2.0")
 bazel_dep(name = "rules_nodejs", version = "6.7.3")
-bazel_dep(name = "rules_python", version = "0.40.0")
-bazel_dep(name = "rules_shell", version = "0.5.0")
-bazel_dep(name = "bazel_skylib", version = "1.8.1")
-bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "absl")
+bazel_dep(name = "rules_python", version = "1.9.0")
+bazel_dep(name = "rules_shell", version = "0.7.1")
+bazel_dep(name = "bazel_skylib", version = "1.9.0")
+bazel_dep(name = "abseil-cpp", version = "20260107.1", repo_name = "absl")
 bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")
 bazel_dep(name = "fmt", version = "12.1.0-codeql.1")
 bazel_dep(name = "rules_kotlin", version = "2.2.2-codeql.1")
 bazel_dep(name = "gazelle", version = "0.47.0")
 bazel_dep(name = "rules_dotnet", version = "0.21.5-codeql.1")
-bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
-bazel_dep(name = "rules_rust", version = "0.68.1.codeql.1")
-bazel_dep(name = "zstd", version = "1.5.5.bcr.1")
+bazel_dep(name = "googletest", version = "1.17.0.bcr.2")
+bazel_dep(name = "rules_rust", version = "0.69.0")
+bazel_dep(name = "zstd", version = "1.5.7.bcr.1")
 
 bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
 
diff --git a/actions/ql/lib/CHANGELOG.md b/actions/ql/lib/CHANGELOG.md
index 1b41f2f2f5e..e482a61b06a 100644
--- a/actions/ql/lib/CHANGELOG.md
+++ b/actions/ql/lib/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.4.30
+
+No user-facing changes.
+
+## 0.4.29
+
+No user-facing changes.
+
 ## 0.4.28
 
 No user-facing changes.
diff --git a/actions/ql/lib/change-notes/released/0.4.29.md b/actions/ql/lib/change-notes/released/0.4.29.md
new file mode 100644
index 00000000000..4085afb00b3
--- /dev/null
+++ b/actions/ql/lib/change-notes/released/0.4.29.md
@@ -0,0 +1,3 @@
+## 0.4.29
+
+No user-facing changes.
diff --git a/actions/ql/lib/change-notes/released/0.4.30.md b/actions/ql/lib/change-notes/released/0.4.30.md
new file mode 100644
index 00000000000..db4b03e0b97
--- /dev/null
+++ b/actions/ql/lib/change-notes/released/0.4.30.md
@@ -0,0 +1,3 @@
+## 0.4.30
+
+No user-facing changes.
diff --git a/actions/ql/lib/codeql-pack.release.yml b/actions/ql/lib/codeql-pack.release.yml
index ff6beb81526..008b5d85453 100644
--- a/actions/ql/lib/codeql-pack.release.yml
+++ b/actions/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.4.28
+lastReleaseVersion: 0.4.30
diff --git a/actions/ql/lib/qlpack.yml b/actions/ql/lib/qlpack.yml
index a9d5b7e61f6..a6806dc906f 100644
--- a/actions/ql/lib/qlpack.yml
+++ b/actions/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/actions-all
-version: 0.4.29-dev
+version: 0.4.31-dev
 library: true
 warnOnImplicitThis: true
 dependencies:
diff --git a/actions/ql/src/CHANGELOG.md b/actions/ql/src/CHANGELOG.md
index c92b28841fa..3b0f1c68853 100644
--- a/actions/ql/src/CHANGELOG.md
+++ b/actions/ql/src/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.6.22
+
+No user-facing changes.
+
+## 0.6.21
+
+No user-facing changes.
+
 ## 0.6.20
 
 No user-facing changes.
diff --git a/actions/ql/src/change-notes/released/0.6.21.md b/actions/ql/src/change-notes/released/0.6.21.md
new file mode 100644
index 00000000000..092e114d959
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.6.21.md
@@ -0,0 +1,3 @@
+## 0.6.21
+
+No user-facing changes.
diff --git a/actions/ql/src/change-notes/released/0.6.22.md b/actions/ql/src/change-notes/released/0.6.22.md
new file mode 100644
index 00000000000..e94a6b1f5a2
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.6.22.md
@@ -0,0 +1,3 @@
+## 0.6.22
+
+No user-facing changes.
diff --git a/actions/ql/src/codeql-pack.release.yml b/actions/ql/src/codeql-pack.release.yml
index e30c5c64b1b..d34186b2833 100644
--- a/actions/ql/src/codeql-pack.release.yml
+++ b/actions/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.6.20
+lastReleaseVersion: 0.6.22
diff --git a/actions/ql/src/qlpack.yml b/actions/ql/src/qlpack.yml
index f4e731dc26d..0c097847479 100644
--- a/actions/ql/src/qlpack.yml
+++ b/actions/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/actions-queries
-version: 0.6.21-dev
+version: 0.6.23-dev
 library: false
 warnOnImplicitThis: true
 groups: [actions, queries]
diff --git a/config/add-overlay-annotations.py b/config/add-overlay-annotations.py
index 0a30eee5799..4fbd9a2b7fc 100644
--- a/config/add-overlay-annotations.py
+++ b/config/add-overlay-annotations.py
@@ -199,6 +199,7 @@ def annotate_as_appropriate(filename, lines):
     # as overlay[local?].  It is not clear that these heuristics are exactly what we want,
     # but they seem to work well enough for now (as determined by speed and accuracy numbers).
     if (filename.endswith("Test.qll") or
+        re.search(r"go/ql/lib/semmle/go/security/[^/]+[.]qll$", filename.replace(os.sep, "/")) or
         ((filename.endswith("Query.qll") or filename.endswith("Config.qll")) and
          any("implements DataFlow::ConfigSig" in line for line in lines))):
         return None
diff --git a/config/identical-files.json b/config/identical-files.json
index bdaf567ae17..8a5c00a49f8 100644
--- a/config/identical-files.json
+++ b/config/identical-files.json
@@ -172,10 +172,6 @@
     "cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/reachability/PrintDominance.qll",
     "cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/internal/reachability/PrintDominance.qll"
   ],
-  "C# ControlFlowReachability": [
-    "csharp/ql/lib/semmle/code/csharp/dataflow/internal/ControlFlowReachability.qll",
-    "csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/ControlFlowReachability.qll"
-  ],
   "C++ ExternalAPIs": [
     "cpp/ql/src/Security/CWE/CWE-020/ExternalAPIs.qll",
     "cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIs.qll"
diff --git a/cpp/downgrades/770002bb02322e04fa25345838ce6e82af285a0b/in_trap.ql b/cpp/downgrades/770002bb02322e04fa25345838ce6e82af285a0b/in_trap.ql
new file mode 100644
index 00000000000..5ea4f67776b
--- /dev/null
+++ b/cpp/downgrades/770002bb02322e04fa25345838ce6e82af285a0b/in_trap.ql
@@ -0,0 +1,21 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class Trap extends @trap {
+  string toString() { none() }
+}
+
+class Tag extends @tag {
+  string toString() { none() }
+}
+
+from Element e, Trap trap
+where
+  in_trap_or_tag(e, trap)
+  or
+  exists(Tag tag |
+    in_trap_or_tag(e, tag) and
+    trap_uses_tag(trap, tag)
+  )
+select e, trap
diff --git a/cpp/downgrades/770002bb02322e04fa25345838ce6e82af285a0b/old.dbscheme b/cpp/downgrades/770002bb02322e04fa25345838ce6e82af285a0b/old.dbscheme
new file mode 100644
index 00000000000..770002bb023
--- /dev/null
+++ b/cpp/downgrades/770002bb02322e04fa25345838ce6e82af285a0b/old.dbscheme
@@ -0,0 +1,2545 @@
+
+/*- 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
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_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
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag 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
+// ... 41 _Decimal64
+// ... 42 _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
+                       | @decltype;
+
+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
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@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
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+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
+);
+
+param_ref_to_this(
+    int expr: @param_ref 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
+| 17 = @ppd_embed
+| 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
+);
+
+embeds(
+    unique int id: @ppd_embed 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
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string 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/770002bb02322e04fa25345838ce6e82af285a0b/semmlecode.dbscheme b/cpp/downgrades/770002bb02322e04fa25345838ce6e82af285a0b/semmlecode.dbscheme
new file mode 100644
index 00000000000..7e7c2f55670
--- /dev/null
+++ b/cpp/downgrades/770002bb02322e04fa25345838ce6e82af285a0b/semmlecode.dbscheme
@@ -0,0 +1,2517 @@
+
+/*- 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
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_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
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    string source_file: string ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file `trap_file`.
+ */
+in_trap(
+    int element: @element ref,
+    int trap_file: @trap 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
+// ... 41 _Decimal64
+// ... 42 _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
+                       | @decltype;
+
+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
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@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
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+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
+);
+
+param_ref_to_this(
+    int expr: @param_ref 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
+| 17 = @ppd_embed
+| 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
+);
+
+embeds(
+    unique int id: @ppd_embed 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
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string 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/770002bb02322e04fa25345838ce6e82af285a0b/source_file_uses_trap.ql b/cpp/downgrades/770002bb02322e04fa25345838ce6e82af285a0b/source_file_uses_trap.ql
new file mode 100644
index 00000000000..7e91f4e0b86
--- /dev/null
+++ b/cpp/downgrades/770002bb02322e04fa25345838ce6e82af285a0b/source_file_uses_trap.ql
@@ -0,0 +1,13 @@
+class SourceFile extends @source_file {
+  string toString() { none() }
+}
+
+class Trap extends @trap {
+  string toString() { none() }
+}
+
+from SourceFile source_file, string name, Trap trap
+where
+  source_file_uses_trap(source_file, trap) and
+  source_file_name(source_file, name)
+select name, trap
diff --git a/cpp/downgrades/770002bb02322e04fa25345838ce6e82af285a0b/upgrade.properties b/cpp/downgrades/770002bb02322e04fa25345838ce6e82af285a0b/upgrade.properties
new file mode 100644
index 00000000000..8b75a52f182
--- /dev/null
+++ b/cpp/downgrades/770002bb02322e04fa25345838ce6e82af285a0b/upgrade.properties
@@ -0,0 +1,8 @@
+description: Add source_file_name
+compatibility: backwards
+source_file_uses_trap.rel: run source_file_uses_trap.ql
+source_file_name.rel: delete
+tag_name.rel: delete
+trap_uses_tag.rel: delete
+in_trap.rel: run in_trap.ql
+in_trap_or_tag.rel: delete
diff --git a/cpp/ql/integration-tests/query-suite/cpp-code-scanning.qls.expected b/cpp/ql/integration-tests/query-suite/cpp-code-scanning.qls.expected
index 33c02079fff..57d240fd795 100644
--- a/cpp/ql/integration-tests/query-suite/cpp-code-scanning.qls.expected
+++ b/cpp/ql/integration-tests/query-suite/cpp-code-scanning.qls.expected
@@ -52,5 +52,6 @@ ql/cpp/ql/src/Summary/LinesOfUserCode.ql
 ql/cpp/ql/src/Telemetry/CompilerErrors.ql
 ql/cpp/ql/src/Telemetry/DatabaseQuality.ql
 ql/cpp/ql/src/Telemetry/ExtractionMetrics.ql
+ql/cpp/ql/src/Telemetry/ExtractorInformation.ql
 ql/cpp/ql/src/Telemetry/MissingIncludes.ql
 ql/cpp/ql/src/Telemetry/SucceededIncludes.ql
diff --git a/cpp/ql/integration-tests/query-suite/cpp-security-and-quality.qls.expected b/cpp/ql/integration-tests/query-suite/cpp-security-and-quality.qls.expected
index 9ef67d525cd..cb4e5f7b305 100644
--- a/cpp/ql/integration-tests/query-suite/cpp-security-and-quality.qls.expected
+++ b/cpp/ql/integration-tests/query-suite/cpp-security-and-quality.qls.expected
@@ -160,6 +160,7 @@ ql/cpp/ql/src/Summary/LinesOfUserCode.ql
 ql/cpp/ql/src/Telemetry/CompilerErrors.ql
 ql/cpp/ql/src/Telemetry/DatabaseQuality.ql
 ql/cpp/ql/src/Telemetry/ExtractionMetrics.ql
+ql/cpp/ql/src/Telemetry/ExtractorInformation.ql
 ql/cpp/ql/src/Telemetry/MissingIncludes.ql
 ql/cpp/ql/src/Telemetry/SucceededIncludes.ql
 ql/cpp/ql/src/jsf/4.06 Pre-Processing Directives/AV Rule 32.ql
diff --git a/cpp/ql/integration-tests/query-suite/cpp-security-extended.qls.expected b/cpp/ql/integration-tests/query-suite/cpp-security-extended.qls.expected
index f014b6d5dc5..7c5e3d98c5c 100644
--- a/cpp/ql/integration-tests/query-suite/cpp-security-extended.qls.expected
+++ b/cpp/ql/integration-tests/query-suite/cpp-security-extended.qls.expected
@@ -93,5 +93,6 @@ ql/cpp/ql/src/Summary/LinesOfUserCode.ql
 ql/cpp/ql/src/Telemetry/CompilerErrors.ql
 ql/cpp/ql/src/Telemetry/DatabaseQuality.ql
 ql/cpp/ql/src/Telemetry/ExtractionMetrics.ql
+ql/cpp/ql/src/Telemetry/ExtractorInformation.ql
 ql/cpp/ql/src/Telemetry/MissingIncludes.ql
 ql/cpp/ql/src/Telemetry/SucceededIncludes.ql
diff --git a/cpp/ql/lib/CHANGELOG.md b/cpp/ql/lib/CHANGELOG.md
index 91f4b009b2b..de37c16751a 100644
--- a/cpp/ql/lib/CHANGELOG.md
+++ b/cpp/ql/lib/CHANGELOG.md
@@ -1,3 +1,24 @@
+## 8.0.1
+
+### Minor Analysis Improvements
+
+* Inline expectations test comments, which are of the form `// $ tag` or `// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the `$` symbol.
+
+## 8.0.0
+
+### Breaking Changes
+
+* CodeQL version 2.24.2 accidentally introduced a syntactical breaking change to `BarrierGuard<...>::getAnIndirectBarrierNode` and `InstructionBarrierGuard<...>::getAnIndirectBarrierNode`. These breaking changes have now been reverted so that the original code compiles again.
+* `MustFlow`, the inter-procedural must-flow data flow analysis library, has been re-worked to use parameterized modules. Like in the case of data flow and taint tracking, instead of extending the `MustFlowConfiguration` class, the user should now implement a module with the `MustFlow::ConfigSig` signature, and instantiate the `MustFlow::Global` parameterized module with the implemented module.
+
+### Minor Analysis Improvements
+
+* Refactored the "Year field changed using an arithmetic operation without checking for leap year" query (`cpp/leap-year/unchecked-after-arithmetic-year-modification`) to address large numbers of false positive results.
+
+### Bug Fixes
+
+* The `allowInterproceduralFlow` predicate of must-flow data flow configurations now correctly handles direct recursion.
+
 ## 7.1.1
 
 ### Minor Analysis Improvements
diff --git a/cpp/ql/lib/change-notes/2026-02-06-UncheckedLeapYearAfterModification_Refactor.md b/cpp/ql/lib/change-notes/2026-02-06-UncheckedLeapYearAfterModification_Refactor.md
deleted file mode 100644
index 4a2cf3ef189..00000000000
--- a/cpp/ql/lib/change-notes/2026-02-06-UncheckedLeapYearAfterModification_Refactor.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Refactored the "Year field changed using an arithmetic operation without checking for leap year" query (`cpp/leap-year/unchecked-after-arithmetic-year-modification`) to address large numbers of false positive results.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/2026-02-14-must-flow-fix.md b/cpp/ql/lib/change-notes/2026-02-14-must-flow-fix.md
deleted file mode 100644
index fc838f51c06..00000000000
--- a/cpp/ql/lib/change-notes/2026-02-14-must-flow-fix.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: fix
----
-* The `allowInterproceduralFlow` predicate of must-flow data flow configurations now correctly handles direct recursion.
diff --git a/cpp/ql/lib/change-notes/2026-02-14-must-flow.md b/cpp/ql/lib/change-notes/2026-02-14-must-flow.md
deleted file mode 100644
index 3d1afaa6344..00000000000
--- a/cpp/ql/lib/change-notes/2026-02-14-must-flow.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: breaking
----
-* `MustFlow`, the inter-procedural must-flow data flow analysis library, has been re-worked to use parameterized modules. Like in the case of data flow and taint tracking, instead of extending the `MustFlowConfiguration` class, the user should now implement a module with the `MustFlow::ConfigSig` signature, and instantiate the `MustFlow::Global` parameterized module with the implemented module.
diff --git a/cpp/ql/lib/change-notes/2026-03-20-add-indirect-uninitialized-node.md b/cpp/ql/lib/change-notes/2026-03-20-add-indirect-uninitialized-node.md
new file mode 100644
index 00000000000..07235e047d4
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2026-03-20-add-indirect-uninitialized-node.md
@@ -0,0 +1,4 @@
+---
+category: feature
+---
+* Added a class `IndirectUninitializedNode` to represent the indirection of an uninitialized local variable as a dataflow node.
diff --git a/cpp/ql/lib/change-notes/2026-03-23-indirect-parameter-nodes-and-indirect-instructions.md b/cpp/ql/lib/change-notes/2026-03-23-indirect-parameter-nodes-and-indirect-instructions.md
new file mode 100644
index 00000000000..c3bd4028ee9
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2026-03-23-indirect-parameter-nodes-and-indirect-instructions.md
@@ -0,0 +1,5 @@
+---
+category: feature
+---
+* Added a class `DataFlow::IndirectParameterNode` to represent the indirection of a parameter as a dataflow node.
+* Added a predicate `Node::asIndirectInstruction` which returns the `Instruction` that defines the indirect dataflow node, if any.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/released/8.0.0.md b/cpp/ql/lib/change-notes/released/8.0.0.md
new file mode 100644
index 00000000000..36d58d9bd99
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/8.0.0.md
@@ -0,0 +1,14 @@
+## 8.0.0
+
+### Breaking Changes
+
+* CodeQL version 2.24.2 accidentally introduced a syntactical breaking change to `BarrierGuard<...>::getAnIndirectBarrierNode` and `InstructionBarrierGuard<...>::getAnIndirectBarrierNode`. These breaking changes have now been reverted so that the original code compiles again.
+* `MustFlow`, the inter-procedural must-flow data flow analysis library, has been re-worked to use parameterized modules. Like in the case of data flow and taint tracking, instead of extending the `MustFlowConfiguration` class, the user should now implement a module with the `MustFlow::ConfigSig` signature, and instantiate the `MustFlow::Global` parameterized module with the implemented module.
+
+### Minor Analysis Improvements
+
+* Refactored the "Year field changed using an arithmetic operation without checking for leap year" query (`cpp/leap-year/unchecked-after-arithmetic-year-modification`) to address large numbers of false positive results.
+
+### Bug Fixes
+
+* The `allowInterproceduralFlow` predicate of must-flow data flow configurations now correctly handles direct recursion.
diff --git a/cpp/ql/lib/change-notes/released/8.0.1.md b/cpp/ql/lib/change-notes/released/8.0.1.md
new file mode 100644
index 00000000000..46866df058a
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/8.0.1.md
@@ -0,0 +1,5 @@
+## 8.0.1
+
+### Minor Analysis Improvements
+
+* Inline expectations test comments, which are of the form `// $ tag` or `// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the `$` symbol.
diff --git a/cpp/ql/lib/codeql-pack.release.yml b/cpp/ql/lib/codeql-pack.release.yml
index 8e970df6cae..145ae8f5b47 100644
--- a/cpp/ql/lib/codeql-pack.release.yml
+++ b/cpp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 7.1.1
+lastReleaseVersion: 8.0.1
diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
index 31ce003aadc..beb1e9234e8 100644
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 7.1.2-dev
+version: 8.0.2-dev
 groups: cpp
 dbscheme: semmlecode.cpp.dbscheme
 extractor: cpp
diff --git a/cpp/ql/lib/semmle/code/cpp/Function.qll b/cpp/ql/lib/semmle/code/cpp/Function.qll
index 10b156e3fb6..8d93ac0f2a3 100644
--- a/cpp/ql/lib/semmle/code/cpp/Function.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Function.qll
@@ -524,6 +524,12 @@ class Function extends Declaration, ControlFlowNode, AccessHolder, @function {
       not exists(NewOrNewArrayExpr new | e = new.getAllocatorCall().getArgument(0))
     )
   }
+
+  /**
+   * Holds if this function has an ambiguous return type, meaning that zero or multiple return
+   * types for this function are present in the database (this can occur in `build-mode: none`).
+   */
+  predicate hasAmbiguousReturnType() { count(this.getType()) != 1 }
 }
 
 pragma[noinline]
diff --git a/cpp/ql/lib/semmle/code/cpp/commons/Printf.qll b/cpp/ql/lib/semmle/code/cpp/commons/Printf.qll
index 023ce09c5c1..d189dd36f87 100644
--- a/cpp/ql/lib/semmle/code/cpp/commons/Printf.qll
+++ b/cpp/ql/lib/semmle/code/cpp/commons/Printf.qll
@@ -163,12 +163,23 @@ predicate primitiveVariadicFormatter(
   )
 }
 
+/**
+ * Gets a function call whose target is a variadic formatter with the given
+ * `type`, `format` parameter index and `output` parameter index.
+ *
+ * Join-order helper for `callsVariadicFormatter`.
+ */
+pragma[nomagic]
+private predicate callsVariadicFormatterCall(FunctionCall fc, string type, int format, int output) {
+  variadicFormatter(fc.getTarget(), type, format, output)
+}
+
 private predicate callsVariadicFormatter(
   Function f, string type, int formatParamIndex, int outputParamIndex
 ) {
   // calls a variadic formatter with `formatParamIndex`, `outputParamIndex` linked
   exists(FunctionCall fc, int format, int output |
-    variadicFormatter(pragma[only_bind_into](fc.getTarget()), type, format, output) and
+    callsVariadicFormatterCall(fc, type, format, output) and
     fc.getEnclosingFunction() = f and
     fc.getArgument(format) = f.getParameter(formatParamIndex).getAnAccess() and
     fc.getArgument(output) = f.getParameter(outputParamIndex).getAnAccess()
@@ -176,7 +187,7 @@ private predicate callsVariadicFormatter(
   or
   // calls a variadic formatter with only `formatParamIndex` linked
   exists(FunctionCall fc, string calledType, int format, int output |
-    variadicFormatter(pragma[only_bind_into](fc.getTarget()), calledType, format, output) and
+    callsVariadicFormatterCall(fc, calledType, format, output) and
     fc.getEnclosingFunction() = f and
     fc.getArgument(format) = f.getParameter(formatParamIndex).getAnAccess() and
     not fc.getArgument(output) = f.getParameter(_).getAnAccess() and
diff --git a/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll b/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll
index 211be2aa432..dad011d9391 100644
--- a/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll
+++ b/cpp/ql/lib/semmle/code/cpp/controlflow/IRGuards.qll
@@ -1663,7 +1663,7 @@ private module Cached {
   private predicate compares_ge(
     ValueNumber test, Operand left, Operand right, int k, boolean isGe, GuardValue value
   ) {
-    exists(int onemk | k = 1 - onemk | compares_lt(test, right, left, onemk, isGe, value))
+    compares_lt(test, right, left, 1 - k, isGe, value)
   }
 
   /** Rearrange various simple comparisons into `left < right + k` form. */
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll
index cf8f01e6944..7cf3b937ac5 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll
@@ -353,12 +353,26 @@ module CsvValidation {
     )
   }
 
+  private string getIncorrectConstructorSummaryOutput() {
+    exists(string namespace, string type, string name, string output |
+      type = name or
+      type = name + "<" + any(string s)
+    |
+      summaryModel(namespace, type, _, name, _, _, _, output, _, _, _) and
+      output.matches("ReturnValue%") and
+      result =
+        "Constructor model for " + namespace + "." + type +
+          " should use `Argument[this]` in the output, not `ReturnValue`."
+    )
+  }
+
   /** Holds if some row in a CSV-based flow model appears to contain typos. */
   query predicate invalidModelRow(string msg) {
     msg =
       [
         getInvalidModelSignature(), getInvalidModelInput(), getInvalidModelOutput(),
-        getInvalidModelSubtype(), getInvalidModelColumnCount(), KindVal::getInvalidModelKind()
+        getInvalidModelSubtype(), getInvalidModelColumnCount(), KindVal::getInvalidModelKind(),
+        getIncorrectConstructorSummaryOutput()
       ]
   }
 }
@@ -555,6 +569,7 @@ private Locatable getSupportedFunctionTemplateArgument(Function templateFunction
  * Normalize the `n`'th parameter of `f` by replacing template names
  * with `func:N` (where `N` is the index of the template).
  */
+pragma[nomagic]
 private string getTypeNameWithoutFunctionTemplates(Function f, int n, int remaining) {
   exists(Function templateFunction |
     templateFunction = getFullyTemplatedFunction(f) and
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowSummaryImpl.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowSummaryImpl.qll
index af3e25ba734..cce1b80e7fc 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowSummaryImpl.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/FlowSummaryImpl.qll
@@ -201,7 +201,7 @@ module SourceSinkInterpretationInput implements
     string toString() {
       result = this.asElement().toString()
       or
-      result = this.asNode().toString()
+      result = this.asNode().toStringImpl()
       or
       result = this.asCall().toString()
     }
diff --git a/cpp/ql/lib/semmle/code/cpp/internal/Overlay.qll b/cpp/ql/lib/semmle/code/cpp/internal/Overlay.qll
index 3dea144bbf6..e93bf578921 100644
--- a/cpp/ql/lib/semmle/code/cpp/internal/Overlay.qll
+++ b/cpp/ql/lib/semmle/code/cpp/internal/Overlay.qll
@@ -6,117 +6,67 @@ private import OverlayXml
 
 /**
  * Holds always for the overlay variant and never for the base variant.
- * This local predicate is used to define local predicates that behave
- * differently for the base and overlay variant.
  */
 overlay[local]
 predicate isOverlay() { databaseMetadata("isOverlay", "true") }
 
-overlay[local]
-private string getLocationFilePath(@location_default loc) {
-  exists(@file file | locations_default(loc, file, _, _, _, _) | files(file, result))
-}
-
 /**
- * Gets the file path for an element with a single location.
+ * Holds if the TRAP file or tag `t` is reachable from source file `sourceFile`
+ * in the base (isOverlayVariant=false) or overlay (isOverlayVariant=true) variant.
  */
 overlay[local]
-private string getSingleLocationFilePath(@element e) {
-  exists(@location_default loc |
-    var_decls(e, _, _, _, loc)
-    or
-    fun_decls(e, _, _, _, loc)
-    or
-    type_decls(e, _, loc)
-    or
-    namespace_decls(e, _, loc, _)
-    or
-    macroinvocations(e, _, loc, _)
-    or
-    preprocdirects(e, _, loc)
-    or
-    diagnostics(e, _, _, _, _, loc)
-    or
-    usings(e, _, loc, _)
-    or
-    static_asserts(e, _, _, loc, _)
-    or
-    derivations(e, _, _, _, loc)
-    or
-    frienddecls(e, _, _, loc)
-    or
-    comments(e, _, loc)
-    or
-    exprs(e, _, loc)
-    or
-    stmts(e, _, loc)
-    or
-    initialisers(e, _, _, loc)
-    or
-    attributes(e, _, _, _, loc)
-    or
-    attribute_args(e, _, _, _, loc)
-    or
-    namequalifiers(e, _, _, loc)
-    or
-    enumconstants(e, _, _, _, _, loc)
-    or
-    type_mentions(e, _, loc, _)
-    or
-    lambda_capture(e, _, _, _, _, _, loc)
-    or
-    concept_templates(e, _, loc)
-  |
-    result = getLocationFilePath(loc)
+private predicate locallyReachableTrapOrTag(
+  boolean isOverlayVariant, string sourceFile, @trap_or_tag t
+) {
+  exists(@source_file sf, @trap trap |
+    (if isOverlay() then isOverlayVariant = true else isOverlayVariant = false) and
+    source_file_uses_trap(sf, trap) and
+    source_file_name(sf, sourceFile) and
+    (t = trap or trap_uses_tag(trap, t))
   )
 }
 
 /**
- * Gets the file path for an element with potentially multiple locations.
+ * Holds if element `e` is in TRAP file or tag `t`
+ * in the base (isOverlayVariant=false) or overlay (isOverlayVariant=true) variant.
  */
 overlay[local]
-private string getMultiLocationFilePath(@element e) {
-  exists(@location_default loc |
-    var_decls(_, e, _, _, loc)
-    or
-    fun_decls(_, e, _, _, loc)
-    or
-    type_decls(_, e, loc)
-    or
-    namespace_decls(_, e, loc, _)
-  |
-    result = getLocationFilePath(loc)
-  )
-}
-
-/**
- * A local helper predicate that holds in the base variant and never in the
- * overlay variant.
- */
-overlay[local]
-private predicate isBase() { not isOverlay() }
-
-/**
- * Holds if `path` was extracted in the overlay database.
- */
-overlay[local]
-private predicate overlayHasFile(string path) {
-  isOverlay() and
-  files(_, path) and
-  path != ""
+private predicate locallyInTrapOrTag(boolean isOverlayVariant, @element e, @trap_or_tag t) {
+  (if isOverlay() then isOverlayVariant = true else isOverlayVariant = false) and
+  in_trap_or_tag(e, t)
 }
 
 /**
  * Discards an element from the base variant if:
- * - It has a single location in a file extracted in the overlay, or
- * - All of its locations are in files extracted in the overlay.
+ * - We have knowledge about what TRAP file or tag it is in (in the base).
+ * - It is not in any overlay TRAP file or tag that is reachable from an overlay source file.
+ * - For every base TRAP file or tag that contains it and is reachable from a base source file,
+ *   either the source file has changed, or the overlay has redefined the TRAP file or tag,
+ *   or the overlay runner has re-extracted the same source file.
  */
 overlay[discard_entity]
 private predicate discardElement(@element e) {
-  isBase() and
-  (
-    overlayHasFile(getSingleLocationFilePath(e))
-    or
-    forex(string path | path = getMultiLocationFilePath(e) | overlayHasFile(path))
+  // If we don't have any knowledge about what TRAP file something
+  // is in, then we don't want to discard it, so we only consider
+  // entities that are known to be in a base TRAP file or tag.
+  locallyInTrapOrTag(false, e, _) and
+  // Anything that is reachable from an overlay source file should
+  // not be discarded.
+  not exists(@trap_or_tag t | locallyInTrapOrTag(true, e, t) |
+    locallyReachableTrapOrTag(true, _, t)
+  ) and
+  // Finally, we have to make sure the base variant does not retain it.
+  // If it is reachable from a base source file, then that is
+  // sufficient unless either the base source file has changed (in
+  // particular, been deleted), or the overlay has redefined the TRAP
+  // file or tag it is in, or the overlay runner has re-extracted the same
+  // source file (e.g. because a header it includes has changed).
+  forall(@trap_or_tag t, string sourceFile |
+    locallyInTrapOrTag(false, e, t) and
+    locallyReachableTrapOrTag(false, sourceFile, t)
+  |
+    overlayChangedFiles(sourceFile) or
+    locallyReachableTrapOrTag(true, _, t) or
+    locallyReachableTrapOrTag(true, sourceFile, _)
   )
 }
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 0d63558c956..bce93655276 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
@@ -238,7 +238,12 @@ private module TrackVirtualDispatch<methodDispatchSig/1 virtualDispatch0> {
 
   private import TypeTracking<Location, TtInput>::TypeTrack<qualifierSource/1>::Graph<qualifierOfVirtualCall/1>
 
-  private predicate edgePlus(PathNode n1, PathNode n2) = fastTC(edges/2)(n1, n2)
+  private predicate isSource(PathNode n) { n.isSource() }
+
+  private predicate isSink(PathNode n) { n.isSink() }
+
+  private predicate edgePlus(PathNode n1, PathNode n2) =
+    doublyBoundedFastTC(edges/2, isSource/1, isSink/1)(n1, n2)
 
   /**
    * Gets the most specific implementation of `mf` that may be called when the
@@ -255,6 +260,15 @@ private module TrackVirtualDispatch<methodDispatchSig/1 virtualDispatch0> {
     )
   }
 
+  pragma[nomagic]
+  private MemberFunction mostSpecificForSource(PathNode p1, MemberFunction mf) {
+    p1.isSource() and
+    exists(Class derived |
+      qualifierSourceImpl(p1.getNode(), derived) and
+      result = mostSpecific(mf, derived)
+    )
+  }
+
   /**
    * Gets a possible pair of end-points `(p1, p2)` where:
    * - `p1` is a derived-to-base conversion that converts from some
@@ -264,16 +278,16 @@ private module TrackVirtualDispatch<methodDispatchSig/1 virtualDispatch0> {
    * - `callable` is the most specific implementation that may be called when
    * the qualifier has type `derived`.
    */
+  bindingset[p1, p2]
+  pragma[inline_late]
   private predicate pairCand(
     PathNode p1, PathNode p2, DataFlowPrivate::DataFlowCallable callable,
     DataFlowPrivate::DataFlowCall call
   ) {
-    exists(Class derived, MemberFunction mf |
-      qualifierSourceImpl(p1.getNode(), derived) and
+    p2.isSink() and
+    exists(MemberFunction mf |
       qualifierOfVirtualCallImpl(p2.getNode(), call.asCallInstruction(), mf) and
-      p1.isSource() and
-      p2.isSink() and
-      callable.asSourceCallable() = mostSpecific(mf, derived)
+      callable.asSourceCallable() = mostSpecificForSource(p1, mf)
     )
   }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowNodes.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowNodes.qll
new file mode 100644
index 00000000000..1895726ecb4
--- /dev/null
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowNodes.qll
@@ -0,0 +1,1865 @@
+private import cpp
+private import semmle.code.cpp.ir.ValueNumbering
+private import semmle.code.cpp.ir.IR
+private import semmle.code.cpp.models.interfaces.DataFlow
+private import semmle.code.cpp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
+private import DataFlowPrivate
+private import DataFlowUtil
+private import ModelUtil
+private import SsaImpl as SsaImpl
+private import DataFlowImplCommon as DataFlowImplCommon
+private import codeql.util.Unit
+private import Node0ToString
+
+/**
+ * A canonical representation of a field.
+ *
+ * For performance reasons we want a unique `Content` that represents
+ * a given field across any template instantiation of a class.
+ *
+ * This is possible in _almost_ all cases, but there are cases where it is
+ * not possible to map between a field in the uninstantiated template to a
+ * field in the instantiated template. This happens in the case of local class
+ * definitions (because the local class is not the template that constructs
+ * the instantiation - it is the enclosing function). So this abstract class
+ * has two implementations: a non-local case (where we can represent a
+ * canonical field as the field declaration from an uninstantiated class
+ * template or a non-templated class), and a local case (where we simply use
+ * the field from the instantiated class).
+ */
+abstract class CanonicalField extends Field {
+  /** Gets a field represented by this canonical field. */
+  abstract Field getAField();
+
+  /**
+   * Gets a class that declares a field represented by this canonical field.
+   */
+  abstract Class getADeclaringType();
+
+  /**
+   * Gets a type that this canonical field may have. Note that this may
+   * not be a unique type. For example, consider this case:
+   * ```
+   * template<typename T>
+   * struct S { T x; };
+   *
+   * S<int> s1;
+   * S<char> s2;
+   * ```
+   * In this case the canonical field corresponding to `S::x` has two types:
+   * `int` and `char`.
+   */
+  Type getAType() { result = this.getAField().getType() }
+
+  Type getAnUnspecifiedType() { result = this.getAType().getUnspecifiedType() }
+}
+
+private class NonLocalCanonicalField extends CanonicalField {
+  Class declaringType;
+
+  NonLocalCanonicalField() {
+    declaringType = this.getDeclaringType() and
+    not declaringType.isFromTemplateInstantiation(_) and
+    not declaringType.isLocal() // handled in LocalCanonicalField
+  }
+
+  override Field getAField() {
+    exists(Class c | result.getDeclaringType() = c |
+      // Either the declaring class of the field is a template instantiation
+      // that has been constructed from this canonical declaration
+      c.isConstructedFrom(declaringType) and
+      pragma[only_bind_out](result.getName()) = pragma[only_bind_out](this.getName())
+      or
+      // or this canonical declaration is not a template.
+      not c.isConstructedFrom(_) and
+      result = this
+    )
+  }
+
+  override Class getADeclaringType() {
+    result = this.getDeclaringType()
+    or
+    result.isConstructedFrom(this.getDeclaringType())
+  }
+}
+
+private class LocalCanonicalField extends CanonicalField {
+  Class declaringType;
+
+  LocalCanonicalField() {
+    declaringType = this.getDeclaringType() and
+    declaringType.isLocal()
+  }
+
+  override Field getAField() { result = this }
+
+  override Class getADeclaringType() { result = declaringType }
+}
+
+/**
+ * A canonical representation of a `Union`. See `CanonicalField` for the explanation for
+ * why we need a canonical representation.
+ */
+abstract class CanonicalUnion extends Union {
+  /** Gets a union represented by this canonical union. */
+  abstract Union getAUnion();
+
+  /** Gets a canonical field of this canonical union. */
+  CanonicalField getACanonicalField() { result.getDeclaringType() = this }
+}
+
+private class NonLocalCanonicalUnion extends CanonicalUnion {
+  NonLocalCanonicalUnion() { not this.isFromTemplateInstantiation(_) and not this.isLocal() }
+
+  override Union getAUnion() {
+    result = this
+    or
+    result.isConstructedFrom(this)
+  }
+}
+
+private class LocalCanonicalUnion extends CanonicalUnion {
+  LocalCanonicalUnion() { this.isLocal() }
+
+  override Union getAUnion() { result = this }
+}
+
+bindingset[f]
+pragma[inline_late]
+int getFieldSize(CanonicalField f) { result = max(f.getAType().getSize()) }
+
+/**
+ * Gets a field in the union `u` whose size
+ * is `bytes` number of bytes.
+ */
+private CanonicalField getAFieldWithSize(CanonicalUnion u, int bytes) {
+  result = u.getACanonicalField() and
+  bytes = getFieldSize(result)
+}
+
+cached
+private module Cached {
+  cached
+  newtype TContent =
+    TNonUnionContent(CanonicalField f, int indirectionIndex) {
+      // the indirection index for field content starts at 1 (because `TNonUnionContent` is thought of as
+      // the address of the field, `FieldAddress` in the IR).
+      indirectionIndex = [1 .. max(SsaImpl::getMaxIndirectionsForType(f.getAnUnspecifiedType()))] and
+      // Reads and writes of union fields are tracked using `UnionContent`.
+      not f.getDeclaringType() instanceof Union
+    } or
+    TUnionContent(CanonicalUnion u, int bytes, int indirectionIndex) {
+      exists(CanonicalField f |
+        f = u.getACanonicalField() and
+        bytes = getFieldSize(f) and
+        // We key `UnionContent` by the union instead of its fields since a write to one
+        // field can be read by any read of the union's fields. Again, the indirection index
+        // is 1-based (because 0 is considered the address).
+        indirectionIndex =
+          [1 .. max(SsaImpl::getMaxIndirectionsForType(getAFieldWithSize(u, bytes)
+                      .getAnUnspecifiedType())
+            )]
+      )
+    } or
+    TElementContent(int indirectionIndex) {
+      indirectionIndex = [1 .. getMaxElementContentIndirectionIndex()]
+    }
+
+  /**
+   * The IR dataflow graph consists of the following nodes:
+   * - `Node0`, which injects most instructions and operands directly into the
+   *    dataflow graph.
+   * - `VariableNode`, which is used to model flow through global variables.
+   * - `PostUpdateNodeImpl`, which is used to model the state of an object after
+   *    an update after a number of loads.
+   * - `SsaSynthNode`, which represents synthesized nodes as computed by the shared SSA
+   *    library.
+   * - `RawIndirectOperand`, which represents the value of `operand` after
+   *    loading the address a number of times.
+   * - `RawIndirectInstruction`, which represents the value of `instr` after
+   *    loading the address a number of times.
+   */
+  cached
+  newtype TIRDataFlowNode =
+    TNode0(Node0Impl node) { DataFlowImplCommon::forceCachingInSameStage() } or
+    TGlobalLikeVariableNode(GlobalLikeVariable var, int indirectionIndex) {
+      indirectionIndex =
+        [getMinIndirectionsForType(var.getUnspecifiedType()) .. SsaImpl::getMaxIndirectionsForType(var.getUnspecifiedType())]
+    } or
+    TPostUpdateNodeImpl(Operand operand, int indirectionIndex) {
+      isPostUpdateNodeImpl(operand, indirectionIndex)
+    } or
+    TSsaSynthNode(SsaImpl::SynthNode n) or
+    TSsaIteratorNode(IteratorFlow::IteratorFlowNode n) or
+    TRawIndirectOperand0(Node0Impl node, int indirectionIndex) {
+      SsaImpl::hasRawIndirectOperand(node.asOperand(), indirectionIndex)
+    } or
+    TRawIndirectInstruction0(Node0Impl node, int indirectionIndex) {
+      not exists(node.asOperand()) and
+      SsaImpl::hasRawIndirectInstruction(node.asInstruction(), indirectionIndex)
+    } or
+    TFinalParameterNode(Parameter p, int indirectionIndex) {
+      exists(SsaImpl::FinalParameterUse use |
+        use.getParameter() = p and
+        use.getIndirectionIndex() = indirectionIndex
+      )
+    } or
+    TFinalGlobalValue(SsaImpl::GlobalUse globalUse) or
+    TInitialGlobalValue(SsaImpl::GlobalDef globalUse) or
+    TBodyLessParameterNodeImpl(Parameter p, int indirectionIndex) {
+      // Rule out parameters of catch blocks.
+      not exists(p.getCatchBlock()) and
+      // We subtract one because `getMaxIndirectionsForType` returns the maximum
+      // indirection for a glvalue of a given type, and this doesn't apply to
+      // parameters.
+      indirectionIndex = [0 .. SsaImpl::getMaxIndirectionsForType(p.getUnspecifiedType()) - 1] and
+      not any(InitializeParameterInstruction init).getParameter() = p
+    } or
+    TFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn)
+}
+
+import Cached
+
+/**
+ * An operand that is defined by a `FieldAddressInstruction`.
+ */
+class FieldAddress extends Operand {
+  FieldAddressInstruction fai;
+
+  FieldAddress() { fai = this.getDef() and not SsaImpl::ignoreOperand(this) }
+
+  /** Gets the field associated with this instruction. */
+  Field getField() { result = fai.getField() }
+
+  /** Gets the instruction whose result provides the address of the object containing the field. */
+  Instruction getObjectAddress() { result = fai.getObjectAddress() }
+
+  /** Gets the operand that provides the address of the object containing the field. */
+  Operand getObjectAddressOperand() { result = fai.getObjectAddressOperand() }
+}
+
+/**
+ * Holds if `opFrom` is an operand whose value flows to the result of `instrTo`.
+ *
+ * `isPointerArith` is `true` if `instrTo` is a `PointerArithmeticInstruction` and `opFrom`
+ * is the left operand.
+ *
+ * `additional` is `true` if the conversion is supplied by an implementation of the
+ * `Indirection` class. It is sometimes useful to exclude such conversions.
+ */
+predicate conversionFlow(
+  Operand opFrom, Instruction instrTo, boolean isPointerArith, boolean additional
+) {
+  isPointerArith = false and
+  (
+    additional = false and
+    (
+      instrTo.(CopyValueInstruction).getSourceValueOperand() = opFrom
+      or
+      instrTo.(ConvertInstruction).getUnaryOperand() = opFrom
+      or
+      instrTo.(CheckedConvertOrNullInstruction).getUnaryOperand() = opFrom
+      or
+      instrTo.(InheritanceConversionInstruction).getUnaryOperand() = opFrom
+      or
+      exists(BuiltInInstruction builtIn |
+        builtIn = instrTo and
+        // __builtin_bit_cast
+        builtIn.getBuiltInOperation() instanceof BuiltInBitCast and
+        opFrom = builtIn.getAnOperand()
+      )
+    )
+    or
+    additional = true and
+    SsaImpl::isAdditionalConversionFlow(opFrom, instrTo)
+  )
+  or
+  isPointerArith = true and
+  additional = false and
+  instrTo.(PointerArithmeticInstruction).getLeftOperand() = opFrom
+}
+
+module Public {
+  import ExprNodes
+
+  /**
+   * A node in a data flow graph.
+   *
+   * A node can be either an expression, a parameter, or an uninitialized local
+   * variable. Such nodes are created with `DataFlow::exprNode`,
+   * `DataFlow::parameterNode`, and `DataFlow::uninitializedNode` respectively.
+   */
+  class Node extends TIRDataFlowNode {
+    /**
+     * INTERNAL: Do not use.
+     */
+    DataFlowCallable getEnclosingCallable() { none() } // overridden in subclasses
+
+    /** Gets the function to which this node belongs, if any. */
+    Declaration getFunction() { none() } // overridden in subclasses
+
+    /** Holds if this node represents a glvalue. */
+    predicate isGLValue() { none() }
+
+    /**
+     * Gets the type of this node.
+     *
+     * If `isGLValue()` holds, then the type of this node
+     * should be thought of as "pointer to `getType()`".
+     */
+    Type getType() { none() } // overridden in subclasses
+
+    /** Gets the instruction corresponding to this node, if any. */
+    Instruction asInstruction() { result = this.(InstructionNode).getInstruction() }
+
+    /** Gets the operands corresponding to this node, if any. */
+    Operand asOperand() { result = this.(OperandNode).getOperand() }
+
+    /**
+     * Gets the operand that is indirectly tracked by this node behind `index`
+     * number of indirections.
+     */
+    Operand asIndirectOperand(int index) { hasOperandAndIndex(this, result, index) }
+
+    /**
+     * Gets the instruction that is indirectly tracked by this node behind
+     * `index` number of indirections.
+     */
+    Instruction asIndirectInstruction(int index) { hasInstructionAndIndex(this, result, index) }
+
+    /**
+     * Holds if this node is at index `i` in basic block `block`.
+     *
+     * Note: Phi nodes are considered to be at index `-1`.
+     */
+    final predicate hasIndexInBlock(IRBlock block, int i) {
+      this.asInstruction() = block.getInstruction(i)
+      or
+      this.asOperand().getUse() = block.getInstruction(i)
+      or
+      exists(SsaImpl::SynthNode ssaNode |
+        this.(SsaSynthNode).getSynthNode() = ssaNode and
+        ssaNode.getBasicBlock() = block and
+        ssaNode.getIndex() = i
+      )
+      or
+      this.(RawIndirectOperand).getOperand().getUse() = block.getInstruction(i)
+      or
+      this.(RawIndirectInstruction).getInstruction() = block.getInstruction(i)
+      or
+      this.(PostUpdateNode).getPreUpdateNode().hasIndexInBlock(block, i)
+    }
+
+    /** Gets the basic block of this node, if any. */
+    final IRBlock getBasicBlock() { this.hasIndexInBlock(result, _) }
+
+    /**
+     * Gets the non-conversion expression corresponding to this node, if any.
+     * This predicate only has a result on nodes that represent the value of
+     * evaluating the expression. For data flowing _out of_ an expression, like
+     * when an argument is passed by reference, use `asDefiningArgument` instead
+     * of `asExpr`.
+     *
+     * If this node strictly (in the sense of `asConvertedExpr`) corresponds to
+     * a `Conversion`, then the result is the underlying non-`Conversion` base
+     * expression.
+     */
+    Expr asExpr() { result = this.asExpr(_) }
+
+    /**
+     * INTERNAL: Do not use.
+     */
+    Expr asExpr(int n) { result = this.(ExprNode).getExpr(n) }
+
+    /**
+     * INTERNAL: Do not use.
+     */
+    Expr asIndirectExpr(int n, int index) { result = this.(IndirectExprNode).getExpr(n, index) }
+
+    /**
+     * Gets the non-conversion expression that's indirectly tracked by this node
+     * under `index` number of indirections.
+     */
+    Expr asIndirectExpr(int index) { result = this.asIndirectExpr(_, index) }
+
+    /**
+     * Gets the non-conversion expression that's indirectly tracked by this node
+     * behind a number of indirections.
+     */
+    Expr asIndirectExpr() { result = this.asIndirectExpr(_) }
+
+    /**
+     * Gets the expression corresponding to this node, if any. The returned
+     * expression may be a `Conversion`.
+     */
+    Expr asConvertedExpr() { result = this.asConvertedExpr(_) }
+
+    /**
+     * Gets the expression corresponding to this node, if any. The returned
+     * expression may be a `Conversion`.
+     */
+    Expr asConvertedExpr(int n) { result = this.(ExprNode).getConvertedExpr(n) }
+
+    private Expr asIndirectConvertedExpr(int n, int index) {
+      result = this.(IndirectExprNode).getConvertedExpr(n, index)
+    }
+
+    /**
+     * Gets the expression that's indirectly tracked by this node
+     * behind `index` number of indirections.
+     */
+    Expr asIndirectConvertedExpr(int index) { result = this.asIndirectConvertedExpr(_, index) }
+
+    /**
+     * Gets the expression that's indirectly tracked by this node behind a
+     * number of indirections.
+     */
+    Expr asIndirectConvertedExpr() { result = this.asIndirectConvertedExpr(_) }
+
+    /**
+     * Gets the argument that defines this `DefinitionByReferenceNode`, if any.
+     * This predicate should be used instead of `asExpr` when referring to the
+     * value of a reference argument _after_ the call has returned. For example,
+     * in `f(&x)`, this predicate will have `&x` as its result for the `Node`
+     * that represents the new value of `x`.
+     */
+    Expr asDefiningArgument() { result = this.asDefiningArgument(_) }
+
+    /**
+     * Gets the definition associated with this node, if any.
+     *
+     * For example, consider the following example
+     * ```cpp
+     * int x = 42;     // 1
+     * x = 34;         // 2
+     * ++x;            // 3
+     * x++;            // 4
+     * x += 1;         // 5
+     * int y = x += 2; // 6
+     * ```
+     * - For (1) the result is `42`.
+     * - For (2) the result is `x = 34`.
+     * - For (3) the result is `++x`.
+     * - For (4) the result is `x++`.
+     * - For (5) the result is `x += 1`.
+     * - For (6) there are two results:
+     *   - For the definition generated by `x += 2` the result is `x += 2`
+     *   - For the definition generated by `int y = ...` the result is
+     *     also `x += 2`.
+     *
+     * For assignments, `node.asDefinition()` and `node.asExpr()` will both exist
+     * for the same dataflow node. However, for expression such as `x++` that
+     * both write to `x` and read the current value of `x`, `node.asDefinition()`
+     * will give the node corresponding to the value after the increment, and
+     * `node.asExpr()` will give the node corresponding to the value before the
+     * increment. For an example of this, consider the following:
+     *
+     * ```cpp
+     * sink(x++);
+     * ```
+     * in the above program, there will not be flow from a node `n` such that
+     * `n.asDefinition() instanceof IncrementOperation` to the argument of `sink`
+     * since the value passed to `sink` is the value before to the increment.
+     * However, there will be dataflow from a node `n` such that
+     * `n.asExpr() instanceof IncrementOperation` since the result of evaluating
+     * the expression `x++` is passed to `sink`.
+     */
+    Expr asDefinition() { result = this.asDefinition(_) }
+
+    private predicate isCertainStore() {
+      exists(SsaImpl::Definition def |
+        SsaImpl::defToNode(this, def, _) and
+        def.isCertain()
+      )
+    }
+
+    /**
+     * Gets the definition associated with this node, if any.
+     *
+     * For example, consider the following example
+     * ```cpp
+     * int x = 42;     // 1
+     * x = 34;         // 2
+     * ++x;            // 3
+     * x++;            // 4
+     * x += 1;         // 5
+     * int y = x += 2; // 6
+     * ```
+     * - For (1) the result is `42`.
+     * - For (2) the result is `x = 34`.
+     * - For (3) the result is `++x`.
+     * - For (4) the result is `x++`.
+     * - For (5) the result is `x += 1`.
+     * - For (6) there are two results:
+     *   - For the definition generated by `x += 2` the result is `x += 2`
+     *   - For the definition generated by `int y = ...` the result is
+     *     also `x += 2`.
+     *
+     * For assignments, `node.asDefinition(_)` and `node.asExpr()` will both exist
+     * for the same dataflow node. However, for expression such as `x++` that
+     * both write to `x` and read the current value of `x`, `node.asDefinition(_)`
+     * will give the node corresponding to the value after the increment, and
+     * `node.asExpr()` will give the node corresponding to the value before the
+     * increment. For an example of this, consider the following:
+     *
+     * ```cpp
+     * sink(x++);
+     * ```
+     * in the above program, there will not be flow from a node `n` such that
+     * `n.asDefinition(_) instanceof IncrementOperation` to the argument of `sink`
+     * since the value passed to `sink` is the value before to the increment.
+     * However, there will be dataflow from a node `n` such that
+     * `n.asExpr() instanceof IncrementOperation` since the result of evaluating
+     * the expression `x++` is passed to `sink`.
+     *
+     * If `uncertain = false` then the definition is guaranteed to overwrite
+     * the entire buffer pointed to by the destination address of the definition.
+     * Otherwise, `uncertain = true`.
+     *
+     * For example, the write `int x; x = 42;` is guaranteed to overwrite all the
+     * bytes allocated to `x`, while the assignment `int p[10]; p[3] = 42;` has
+     * `uncertain = true` since the write will not overwrite the entire buffer
+     * pointed to by `p`.
+     */
+    Expr asDefinition(boolean uncertain) {
+      exists(StoreInstruction store |
+        store = this.asInstruction() and
+        result = asDefinitionImpl(store) and
+        if this.isCertainStore() then uncertain = false else uncertain = true
+      )
+    }
+
+    /**
+     * Gets the definition associated with this node, if this node is a certain definition.
+     *
+     * See `Node.asDefinition/1` for a description of certain and uncertain definitions.
+     */
+    Expr asCertainDefinition() { result = this.asDefinition(false) }
+
+    /**
+     * Gets the definition associated with this node, if this node is an uncertain definition.
+     *
+     * See `Node.asDefinition/1` for a description of certain and uncertain definitions.
+     */
+    Expr asUncertainDefinition() { result = this.asDefinition(true) }
+
+    /**
+     * Gets the indirect definition at a given indirection corresponding to this
+     * node, if any.
+     *
+     * See the comments on `Node.asDefinition` for examples.
+     */
+    Expr asIndirectDefinition(int indirectionIndex) {
+      exists(StoreInstruction store |
+        this.(IndirectInstruction).hasInstructionAndIndirectionIndex(store, indirectionIndex) and
+        result = asDefinitionImpl(store)
+      )
+    }
+
+    /**
+     * Gets the indirect definition at some indirection corresponding to this
+     * node, if any.
+     */
+    Expr asIndirectDefinition() { result = this.asIndirectDefinition(_) }
+
+    /**
+     * Gets the argument that defines this `DefinitionByReferenceNode`, if any.
+     *
+     * Unlike `Node::asDefiningArgument/0`, this predicate gets the node representing
+     * the value of the `index`'th indirection after leaving a function. For example,
+     * in:
+     * ```cpp
+     * void f(int**);
+     * ...
+     * int** x = ...;
+     * f(x);
+     * ```
+     * The node `n` such that `n.asDefiningArgument(1)` is the argument `x` will
+     * contain the value of `*x` after `f` has returned, and the node `n` such that
+     * `n.asDefiningArgument(2)` is the argument `x` will contain the value of `**x`
+     * after the `f` has returned.
+     */
+    Expr asDefiningArgument(int index) {
+      this.(DefinitionByReferenceNode).getIndirectionIndex() = index and
+      result = this.(DefinitionByReferenceNode).getArgument()
+    }
+
+    /**
+     * Gets the the argument going into a function for a node that represents
+     * the indirect value of the argument after `index` loads. For example, in:
+     * ```cpp
+     * void f(int**);
+     * ...
+     * int** x = ...;
+     * f(x);
+     * ```
+     * The node `n` such that `n.asIndirectArgument(1)` represents the value of
+     * `*x` going into `f`, and the node `n` such that `n.asIndirectArgument(2)`
+     * represents the value of `**x` going into `f`.
+     */
+    Expr asIndirectArgument(int index) {
+      this.(SideEffectOperandNode).hasAddressOperandAndIndirectionIndex(_, index) and
+      result = this.(SideEffectOperandNode).getArgument()
+    }
+
+    /**
+     * Gets the the argument going into a function for a node that represents
+     * the indirect value of the argument after any non-zero number of loads.
+     */
+    Expr asIndirectArgument() { result = this.asIndirectArgument(_) }
+
+    /** Gets the positional parameter corresponding to this node, if any. */
+    Parameter asParameter() {
+      exists(int indirectionIndex | result = this.asParameter(indirectionIndex) |
+        if result.getUnspecifiedType() instanceof ReferenceType
+        then indirectionIndex = 1
+        else indirectionIndex = 0
+      )
+    }
+
+    /**
+     * Gets the uninitialized local variable corresponding to this node, if
+     * any.
+     */
+    LocalVariable asUninitialized() { result = this.(UninitializedNode).getLocalVariable() }
+
+    /**
+     * Gets the uninitialized local variable corresponding to this node behind
+     * `index` number of indirections, if any.
+     */
+    LocalVariable asIndirectUninitialized(int index) {
+      exists(IndirectUninitializedNode indirectUninitializedNode |
+        this = indirectUninitializedNode and
+        indirectUninitializedNode.getIndirectionIndex() = index
+      |
+        result = indirectUninitializedNode.getLocalVariable()
+      )
+    }
+
+    /**
+     * Gets the uninitialized local variable corresponding to this node behind
+     * a number indirections, if any.
+     */
+    LocalVariable asIndirectUninitialized() { result = this.asIndirectUninitialized(_) }
+
+    /**
+     * Gets the positional parameter corresponding to the node that represents
+     * the value of the parameter after `index` number of loads, if any. For
+     * example, in:
+     * ```cpp
+     * void f(int** x) { ... }
+     * ```
+     * - The node `n` such that `n.asParameter(0)` is the parameter `x` represents
+     * the value of `x`.
+     * - The node `n` such that `n.asParameter(1)` is the parameter `x` represents
+     * the value of `*x`.
+     * - The node `n` such that `n.asParameter(2)` is the parameter `x` represents
+     * the value of `**x`.
+     */
+    Parameter asParameter(int index) {
+      index = 0 and
+      result = this.(ExplicitParameterNode).getParameter()
+      or
+      this.(IndirectParameterNode).getIndirectionIndex() = index and
+      result = this.(IndirectParameterNode).getParameter()
+    }
+
+    /**
+     * Holds if this node represents the `indirectionIndex`'th indirection of
+     * the value of an output parameter `p` just before reaching the end of a function.
+     */
+    predicate isFinalValueOfParameter(Parameter p, int indirectionIndex) {
+      exists(FinalParameterNode n | n = this |
+        p = n.getParameter() and
+        indirectionIndex = n.getIndirectionIndex()
+      )
+    }
+
+    /**
+     * Holds if this node represents the value of an output parameter `p`
+     * just before reaching the end of a function.
+     */
+    predicate isFinalValueOfParameter(Parameter p) { this.isFinalValueOfParameter(p, _) }
+
+    /**
+     * Gets the variable corresponding to this node, if any. This can be used for
+     * modeling flow in and out of global variables.
+     */
+    Variable asVariable() {
+      this = TGlobalLikeVariableNode(result, getMinIndirectionsForType(result.getUnspecifiedType()))
+    }
+
+    /**
+     * Gets the `indirectionIndex`'th indirection of this node's underlying variable, if any.
+     *
+     * This can be used for modeling flow in and out of global variables.
+     */
+    Variable asIndirectVariable(int indirectionIndex) {
+      indirectionIndex > getMinIndirectionsForType(result.getUnspecifiedType()) and
+      this = TGlobalLikeVariableNode(result, indirectionIndex)
+    }
+
+    /** Gets an indirection of this node's underlying variable, if any. */
+    Variable asIndirectVariable() { result = this.asIndirectVariable(_) }
+
+    /**
+     * Gets the expression that is partially defined by this node, if any.
+     *
+     * Partial definitions are created for field stores (`x.y = taint();` is a partial
+     * definition of `x`), and for calls that may change the value of an object (so
+     * `x.set(taint())` is a partial definition of `x`, and `transfer(&x, taint())` is
+     * a partial definition of `&x`).
+     */
+    Expr asPartialDefinition() {
+      exists(PartialDefinitionNode pdn | this = pdn |
+        pdn.getIndirectionIndex() > 0 and
+        result = pdn.getDefinedExpr()
+      )
+    }
+
+    /**
+     * Gets an upper bound on the type of this node.
+     */
+    Type getTypeBound() { result = this.getType() }
+
+    /** Gets the location of this element. */
+    final Location getLocation() { result = getLocationCached(this) }
+
+    /** INTERNAL: Do not use. */
+    Location getLocationImpl() {
+      none() // overridden by subclasses
+    }
+
+    /** Gets a textual representation of this element. */
+    final string toString() { result = toStringCached(this) }
+
+    /** INTERNAL: Do not use. */
+    string toStringImpl() {
+      none() // overridden by subclasses
+    }
+  }
+
+  /**
+   * An instruction, viewed as a node in a data flow graph.
+   */
+  class InstructionNode extends Node0 {
+    override InstructionNode0 node;
+    Instruction instr;
+
+    InstructionNode() { instr = node.getInstruction() }
+
+    /** Gets the instruction corresponding to this node. */
+    Instruction getInstruction() { result = instr }
+  }
+
+  /**
+   * An operand, viewed as a node in a data flow graph.
+   */
+  class OperandNode extends Node, Node0 {
+    override OperandNode0 node;
+    Operand op;
+
+    OperandNode() { op = node.getOperand() }
+
+    /** Gets the operand corresponding to this node. */
+    Operand getOperand() { result = op }
+  }
+
+  /**
+   * A node associated with an object after an operation that might have
+   * changed its state.
+   *
+   * This can be either the argument to a callable after the callable returns
+   * (which might have mutated the argument), or the qualifier of a field after
+   * an update to the field.
+   *
+   * Nodes corresponding to AST elements, for example `ExprNode`, usually refer
+   * to the value before the update with the exception of `ClassInstanceExpr`,
+   * which represents the value after the constructor has run.
+   */
+  abstract class PostUpdateNode extends Node {
+    /**
+     * Gets the node before the state update.
+     */
+    abstract Node getPreUpdateNode();
+
+    final override Type getType() { result = this.getPreUpdateNode().getType() }
+  }
+
+  abstract private class AbstractUninitializedNode extends Node {
+    LocalVariable v;
+    int indirectionIndex;
+
+    AbstractUninitializedNode() {
+      exists(SsaImpl::Definition def, SsaImpl::SourceVariable sv |
+        def.getIndirectionIndex() = indirectionIndex and
+        def.getValue().asInstruction() instanceof UninitializedInstruction and
+        SsaImpl::defToNode(this, def, sv) and
+        v = sv.getBaseVariable().(SsaImpl::BaseIRVariable).getIRVariable().getAst()
+      )
+    }
+
+    /** Gets the uninitialized local variable corresponding to this node. */
+    LocalVariable getLocalVariable() { result = v }
+  }
+
+  /**
+   * The value of an uninitialized local variable, viewed as a node in a data
+   * flow graph.
+   */
+  class UninitializedNode extends AbstractUninitializedNode {
+    UninitializedNode() { indirectionIndex = 0 }
+  }
+
+  /**
+   * The value of an uninitialized local variable behind one or more levels of
+   * indirection, viewed as a node in a data flow graph.
+   */
+  class IndirectUninitializedNode extends AbstractUninitializedNode {
+    IndirectUninitializedNode() { indirectionIndex > 0 }
+
+    /** Gets the indirection index of this node. */
+    int getIndirectionIndex() { result = indirectionIndex }
+  }
+
+  /**
+   * The value of a parameter at function entry, viewed as a node in a data
+   * flow graph. This includes both explicit parameters such as `x` in `f(x)`
+   * and implicit parameters such as `this` in `x.f()`.
+   *
+   * To match a specific kind of parameter, consider using one of the subclasses
+   * `ExplicitParameterNode`, `ThisParameterNode`, or
+   * `ParameterIndirectionNode`.
+   */
+  final class ParameterNode = AbstractParameterNode;
+
+  /** An explicit positional parameter, including `this`, but not `...`. */
+  final class DirectParameterNode = AbstractDirectParameterNode;
+
+  /**
+   * A node representing an indirection of a positional parameter,
+   * including `*this`, but not `*...`.
+   */
+  final class IndirectParameterNode = AbstractIndirectParameterNode;
+
+  final class ExplicitParameterNode = AbstractExplicitParameterNode;
+
+  /** An implicit `this` parameter. */
+  class ThisParameterInstructionNode extends AbstractExplicitParameterNode,
+    InstructionDirectParameterNode
+  {
+    ThisParameterInstructionNode() { instr.getIRVariable() instanceof IRThisVariable }
+
+    override predicate isSourceParameterOf(Function f, ParameterPosition pos) {
+      pos.(DirectPosition).getArgumentIndex() = -1 and
+      instr.getEnclosingFunction() = f
+    }
+
+    override string toStringImpl() { result = "this" }
+  }
+
+  /**
+   * A node that represents the value of a variable after a function call that
+   * may have changed the variable because it's passed by reference.
+   *
+   * A typical example would be a call `f(&x)`. Firstly, there will be flow into
+   * `x` from previous definitions of `x`. Secondly, there will be a
+   * `DefinitionByReferenceNode` to represent the value of `x` after the call has
+   * returned. This node will have its `getArgument()` equal to `&x` and its
+   * `getVariableAccess()` equal to `x`.
+   */
+  class DefinitionByReferenceNode extends IndirectArgumentOutNode {
+    DefinitionByReferenceNode() { this.getIndirectionIndex() > 0 }
+
+    /** Gets the unconverted argument corresponding to this node. */
+    Expr getArgument() {
+      result = this.getAddressOperand().getDef().getUnconvertedResultExpression()
+    }
+
+    /** Gets the parameter through which this value is assigned. */
+    Parameter getParameter() {
+      result = this.getCallInstruction().getStaticCallTarget().getParameter(this.getArgumentIndex())
+    }
+  }
+
+  /**
+   * A `Node` corresponding to a global (or `static` local) variable in the
+   * program, as opposed to the value of that variable at some particular point.
+   * This is used to model flow through global variables (and `static` local
+   * variables).
+   *
+   * There is no `VariableNode` for non-`static` local variables.
+   */
+  class VariableNode extends Node, TGlobalLikeVariableNode {
+    Variable v;
+    int indirectionIndex;
+
+    VariableNode() { this = TGlobalLikeVariableNode(v, indirectionIndex) }
+
+    /** Gets the variable corresponding to this node. */
+    Variable getVariable() { result = v }
+
+    /** Gets the indirection index of this node. */
+    int getIndirectionIndex() { result = indirectionIndex }
+
+    override Declaration getFunction() { none() }
+
+    override DataFlowCallable getEnclosingCallable() {
+      // When flow crosses from one _enclosing callable_ to another, the
+      // interprocedural data-flow library discards call contexts and inserts a
+      // node in the big-step relation used for human-readable path explanations.
+      // Therefore we want a distinct enclosing callable for each `VariableNode`,
+      // and that can be the `Variable` itself.
+      result.asSourceCallable() = v
+    }
+
+    override Type getType() { result = getTypeImpl(v.getUnderlyingType(), indirectionIndex - 1) }
+
+    final override Location getLocationImpl() {
+      // Certain variables (such as parameters) can have multiple locations.
+      // When there's a unique location we use that one, but if multiple locations
+      // exist we default to an unknown location.
+      result = unique( | | v.getLocation())
+      or
+      not exists(unique( | | v.getLocation())) and
+      result instanceof UnknownLocation
+    }
+
+    override string toStringImpl() { result = stars(this) + v.toString() }
+  }
+
+  /**
+   * Gets the node corresponding to `instr`.
+   */
+  InstructionNode instructionNode(Instruction instr) { result.getInstruction() = instr }
+
+  /**
+   * Gets the node corresponding to `operand`.
+   */
+  OperandNode operandNode(Operand operand) { result.getOperand() = operand }
+
+  /**
+   * Gets the `Node` corresponding to the value of evaluating `e` or any of its
+   * conversions. There is no result if `e` is a `Conversion`. For data flowing
+   * _out of_ an expression, like when an argument is passed by reference, use
+   * `definitionByReferenceNodeFromArgument` instead.
+   */
+  ExprNode exprNode(Expr e) { result.getExpr(_) = e }
+
+  /**
+   * Gets the `Node` corresponding to the value of evaluating `e`. Here, `e` may
+   * be a `Conversion`. For data flowing _out of_ an expression, like when an
+   * argument is passed by reference, use
+   * `definitionByReferenceNodeFromArgument` instead.
+   */
+  ExprNode convertedExprNode(Expr e) { result.getConvertedExpr(_) = e }
+
+  /**
+   * Gets the `Node` corresponding to the value of `p` at function entry.
+   */
+  ExplicitParameterNode parameterNode(Parameter p) { result.getParameter() = p }
+
+  /**
+   * Gets the `Node` corresponding to a definition by reference of the variable
+   * that is passed as unconverted `argument` of a call.
+   */
+  DefinitionByReferenceNode definitionByReferenceNodeFromArgument(Expr argument) {
+    result.getArgument() = argument
+  }
+
+  /** Gets the `VariableNode` corresponding to the variable `v`. */
+  VariableNode variableNode(Variable v) {
+    result.getVariable() = v and result.getIndirectionIndex() = 1
+  }
+
+  /**
+   * Gets the `Node` corresponding to the value of an uninitialized local
+   * variable `v`.
+   */
+  Node uninitializedNode(LocalVariable v) { result.asUninitialized() = v }
+
+  /**
+   * Holds if `indirectOperand` is the dataflow node that represents the
+   * indirection of `operand` with indirection index `indirectionIndex`.
+   */
+  predicate hasOperandAndIndex(
+    IndirectOperand indirectOperand, Operand operand, int indirectionIndex
+  ) {
+    indirectOperand.hasOperandAndIndirectionIndex(operand, indirectionIndex)
+  }
+
+  /**
+   * Holds if `indirectInstr` is the dataflow node that represents the
+   * indirection of `instr` with indirection index `indirectionIndex`.
+   */
+  predicate hasInstructionAndIndex(
+    IndirectInstruction indirectInstr, Instruction instr, int indirectionIndex
+  ) {
+    indirectInstr.hasInstructionAndIndirectionIndex(instr, indirectionIndex)
+  }
+}
+
+private import Public
+
+/**
+ * A class that lifts pre-SSA dataflow nodes to regular dataflow nodes.
+ */
+private class Node0 extends Node, TNode0 {
+  Node0Impl node;
+
+  Node0() { this = TNode0(node) }
+
+  override DataFlowCallable getEnclosingCallable() {
+    result.asSourceCallable() = node.getEnclosingCallable()
+  }
+
+  override Declaration getFunction() { result = node.getFunction() }
+
+  override Location getLocationImpl() { result = node.getLocation() }
+
+  override string toStringImpl() { result = node.toStringImpl() }
+
+  override Type getType() { result = node.getType() }
+
+  override predicate isGLValue() { node.isGLValue() }
+}
+
+class PostUpdateNodeImpl extends PartialDefinitionNode, TPostUpdateNodeImpl {
+  int indirectionIndex;
+  Operand operand;
+
+  PostUpdateNodeImpl() { this = TPostUpdateNodeImpl(operand, indirectionIndex) }
+
+  override Declaration getFunction() { result = operand.getUse().getEnclosingFunction() }
+
+  override DataFlowCallable getEnclosingCallable() {
+    result = this.getPreUpdateNode().getEnclosingCallable()
+  }
+
+  /** Gets the operand associated with this node. */
+  Operand getOperand() { result = operand }
+
+  /** Gets the indirection index associated with this node. */
+  override int getIndirectionIndex() { result = indirectionIndex }
+
+  override Location getLocationImpl() { result = operand.getLocation() }
+
+  final override Node getPreUpdateNode() {
+    indirectionIndex > 0 and
+    hasOperandAndIndex(result, operand, indirectionIndex)
+    or
+    indirectionIndex = 0 and
+    result.asOperand() = operand
+  }
+
+  final override Expr getDefinedExpr() {
+    result = operand.getDef().getUnconvertedResultExpression()
+  }
+}
+
+/**
+ * The node representing the value of a field after it has been updated.
+ */
+class PostFieldUpdateNode extends PostUpdateNodeImpl {
+  FieldAddress fieldAddress;
+
+  PostFieldUpdateNode() { operand = fieldAddress.getObjectAddressOperand() }
+
+  FieldAddress getFieldAddress() { result = fieldAddress }
+
+  Field getUpdatedField() { result = this.getFieldAddress().getField() }
+
+  override string toStringImpl() {
+    result = this.getPreUpdateNode().toStringImpl() + " [post update]"
+  }
+}
+
+/**
+ * The base class for nodes that perform "partial definitions".
+ *
+ * In contrast to a normal "definition", which provides a new value for
+ * something, a partial definition is an expression that may affect a
+ * value, but does not necessarily replace it entirely. For example:
+ * ```
+ * x.y = 1; // a partial definition of the object `x`.
+ * x.y.z = 1; // a partial definition of the object `x.y` and `x`.
+ * x.setY(1); // a partial definition of the object `x`.
+ * setY(&x); // a partial definition of the object `x`.
+ * ```
+ */
+abstract private class PartialDefinitionNode extends PostUpdateNode {
+  /** Gets the indirection index of this node. */
+  abstract int getIndirectionIndex();
+
+  /** Gets the expression that is partially defined by this node. */
+  abstract Expr getDefinedExpr();
+}
+
+/**
+ * A node representing the indirection of a value after it
+ * has been returned from a function.
+ */
+class IndirectArgumentOutNode extends PostUpdateNodeImpl {
+  override ArgumentOperand operand;
+
+  /**
+   * Gets the index of the argument that is associated with this post-
+   * update node.
+   */
+  int getArgumentIndex() {
+    exists(CallInstruction call | call.getArgumentOperand(result) = operand)
+  }
+
+  /**
+   * Gets the `Operand` that represents the address of the value that is being
+   * updated.
+   */
+  Operand getAddressOperand() { result = operand }
+
+  /**
+   * Gets the `CallInstruction` that represents the call that updated the
+   * argument.
+   */
+  CallInstruction getCallInstruction() { result.getAnArgumentOperand() = operand }
+
+  /**
+   * Gets the `Function` that the call targets, if this is statically known.
+   */
+  Function getStaticCallTarget() { result = this.getCallInstruction().getStaticCallTarget() }
+
+  override string toStringImpl() {
+    exists(string prefix | if indirectionIndex > 0 then prefix = "" else prefix = "pointer to " |
+      // This string should be unique enough to be helpful but common enough to
+      // avoid storing too many different strings.
+      result = prefix + this.getStaticCallTarget().getName() + " output argument"
+      or
+      not exists(this.getStaticCallTarget()) and
+      result = prefix + "output argument"
+    )
+  }
+}
+
+/**
+ * Holds if `node` is an indirect operand with columns `(operand, indirectionIndex)`, and
+ * `operand` represents a use of the fully converted value of `call`.
+ */
+private predicate hasOperand(Node node, CallInstruction call, int indirectionIndex, Operand operand) {
+  operandForFullyConvertedCall(operand, call) and
+  hasOperandAndIndex(node, operand, indirectionIndex)
+}
+
+/**
+ * Holds if `node` is an indirect instruction with columns `(instr, indirectionIndex)`, and
+ * `instr` represents a use of the fully converted value of `call`.
+ *
+ * Note that `hasOperand(node, _, _, _)` implies `not hasInstruction(node, _, _, _)`.
+ */
+private predicate hasInstruction(
+  Node node, CallInstruction call, int indirectionIndex, Instruction instr
+) {
+  instructionForFullyConvertedCall(instr, call) and
+  hasInstructionAndIndex(node, instr, indirectionIndex)
+}
+
+/**
+ * A node representing the indirect value of a function call (i.e., a value hidden
+ * behind a number of indirections).
+ */
+class IndirectReturnOutNode extends Node {
+  CallInstruction call;
+  int indirectionIndex;
+
+  IndirectReturnOutNode() {
+    // Annoyingly, we need to pick the fully converted value as the output of the function to
+    // make flow through in the shared dataflow library work correctly.
+    hasOperand(this, call, indirectionIndex, _)
+    or
+    hasInstruction(this, call, indirectionIndex, _)
+  }
+
+  CallInstruction getCallInstruction() { result = call }
+
+  int getIndirectionIndex() { result = indirectionIndex }
+
+  /** Gets the operand associated with this node, if any. */
+  Operand getOperand() { hasOperand(this, call, indirectionIndex, result) }
+
+  /** Gets the instruction associated with this node, if any. */
+  Instruction getInstruction() { hasInstruction(this, call, indirectionIndex, result) }
+}
+
+/**
+ * An `IndirectReturnOutNode` which is used as a destination of a store operation.
+ * When it's used for a store operation it's useful to have this be a `PostUpdateNode` for
+ * the shared dataflow library's flow-through mechanism to detect flow in cases such as:
+ * ```cpp
+ * struct MyInt {
+ *   int i;
+ *   int& getRef() { return i; }
+ * };
+ * ...
+ * MyInt mi;
+ * mi.getRef() = source(); // this is detected as a store to `i` via flow-through.
+ * sink(mi.i);
+ * ```
+ */
+private class PostIndirectReturnOutNode extends IndirectReturnOutNode, PostUpdateNode {
+  PostIndirectReturnOutNode() {
+    any(StoreInstruction store).getDestinationAddressOperand() = this.getOperand()
+  }
+
+  override Node getPreUpdateNode() { result = this }
+}
+
+/**
+ * A node that represents the indirect value of an operand in the IR
+ * after `index` number of loads.
+ */
+private class RawIndirectOperand0 extends Node, TRawIndirectOperand0 {
+  Node0Impl node;
+  int indirectionIndex;
+
+  RawIndirectOperand0() { this = TRawIndirectOperand0(node, indirectionIndex) }
+
+  /** Gets the underlying instruction. */
+  Operand getOperand() { result = node.asOperand() }
+
+  /** Gets the underlying indirection index. */
+  int getIndirectionIndex() { result = indirectionIndex }
+
+  override Declaration getFunction() { result = node.getFunction() }
+
+  override DataFlowCallable getEnclosingCallable() {
+    result.asSourceCallable() = node.getEnclosingCallable()
+  }
+
+  override predicate isGLValue() { this.getOperand().isGLValue() }
+
+  override Type getType() {
+    exists(int sub, Type type, boolean isGLValue |
+      type = getOperandType(this.getOperand(), isGLValue) and
+      if isGLValue = true then sub = 1 else sub = 0
+    |
+      result = getTypeImpl(type.getUnderlyingType(), indirectionIndex - sub)
+    )
+  }
+
+  final override Location getLocationImpl() {
+    if exists(this.getOperand().getLocation())
+    then result = this.getOperand().getLocation()
+    else result instanceof UnknownLocation
+  }
+
+  override string toStringImpl() { result = stars(this) + operandToString(this.getOperand()) }
+}
+
+/**
+ * A node that represents the indirect value of an instruction in the IR
+ * after `index` number of loads.
+ */
+private class RawIndirectInstruction0 extends Node, TRawIndirectInstruction0 {
+  Node0Impl node;
+  int indirectionIndex;
+
+  RawIndirectInstruction0() { this = TRawIndirectInstruction0(node, indirectionIndex) }
+
+  /** Gets the underlying instruction. */
+  Instruction getInstruction() { result = node.asInstruction() }
+
+  /** Gets the underlying indirection index. */
+  int getIndirectionIndex() { result = indirectionIndex }
+
+  override Declaration getFunction() { result = node.getFunction() }
+
+  override DataFlowCallable getEnclosingCallable() {
+    result.asSourceCallable() = node.getEnclosingCallable()
+  }
+
+  override predicate isGLValue() { this.getInstruction().isGLValue() }
+
+  override Type getType() {
+    exists(int sub, Type type, boolean isGLValue |
+      type = getInstructionType(this.getInstruction(), isGLValue) and
+      if isGLValue = true then sub = 1 else sub = 0
+    |
+      result = getTypeImpl(type.getUnderlyingType(), indirectionIndex - sub)
+    )
+  }
+
+  final override Location getLocationImpl() {
+    if exists(this.getInstruction().getLocation())
+    then result = this.getInstruction().getLocation()
+    else result instanceof UnknownLocation
+  }
+
+  override string toStringImpl() {
+    result = stars(this) + instructionToString(this.getInstruction())
+  }
+}
+
+/**
+ * A node that represents the indirect value of an operand in the IR
+ * after a number of loads.
+ */
+class RawIndirectOperand extends Node {
+  int indirectionIndex;
+  Operand operand;
+
+  RawIndirectOperand() {
+    exists(Node0Impl node | operand = node.asOperand() |
+      this = TRawIndirectOperand0(node, indirectionIndex)
+      or
+      this = TRawIndirectInstruction0(node, indirectionIndex)
+    )
+  }
+
+  /** Gets the operand associated with this node. */
+  Operand getOperand() { result = operand }
+
+  /** Gets the underlying indirection index. */
+  int getIndirectionIndex() { result = indirectionIndex }
+}
+
+/**
+ * A node that represents the indirect value of an instruction in the IR
+ * after a number of loads.
+ */
+class RawIndirectInstruction extends Node {
+  int indirectionIndex;
+  Instruction instr;
+
+  RawIndirectInstruction() {
+    exists(Node0Impl node | instr = node.asInstruction() |
+      this = TRawIndirectOperand0(node, indirectionIndex)
+      or
+      this = TRawIndirectInstruction0(node, indirectionIndex)
+    )
+  }
+
+  /** Gets the instruction associated with this node. */
+  Instruction getInstruction() { result = instr }
+
+  /** Gets the underlying indirection index. */
+  int getIndirectionIndex() { result = indirectionIndex }
+}
+
+/**
+ * A synthesized SSA node produced by the shared SSA library, viewed as a node
+ * in a data flow graph.
+ */
+class SsaSynthNode extends Node, TSsaSynthNode {
+  SsaImpl::SynthNode node;
+
+  SsaSynthNode() { this = TSsaSynthNode(node) }
+
+  /** Gets the synthesized SSA node associated with this node. */
+  SsaImpl::SynthNode getSynthNode() { result = node }
+
+  override DataFlowCallable getEnclosingCallable() {
+    result.asSourceCallable() = this.getFunction()
+  }
+
+  override Declaration getFunction() { result = node.getBasicBlock().getEnclosingFunction() }
+
+  override Type getType() { result = node.getSourceVariable().getType() }
+
+  override predicate isGLValue() { node.getSourceVariable().isGLValue() }
+
+  final override Location getLocationImpl() { result = node.getLocation() }
+
+  override string toStringImpl() { result = node.toString() }
+}
+
+/**
+ * Dataflow nodes necessary for iterator flow
+ */
+class SsaIteratorNode extends Node, TSsaIteratorNode {
+  IteratorFlow::IteratorFlowNode node;
+
+  SsaIteratorNode() { this = TSsaIteratorNode(node) }
+
+  /** Gets the phi node associated with this node. */
+  IteratorFlow::IteratorFlowNode getIteratorFlowNode() { result = node }
+
+  override DataFlowCallable getEnclosingCallable() {
+    result.asSourceCallable() = this.getFunction()
+  }
+
+  override Declaration getFunction() { result = node.getFunction() }
+
+  override Type getType() { result = node.getType() }
+
+  final override Location getLocationImpl() { result = node.getLocation() }
+
+  override string toStringImpl() { result = node.toString() }
+}
+
+/**
+ * A node representing a value after leaving a function.
+ */
+class SideEffectOperandNode extends Node instanceof IndirectOperand {
+  CallInstruction call;
+  int argumentIndex;
+  ArgumentOperand arg;
+
+  SideEffectOperandNode() {
+    arg = call.getArgumentOperand(argumentIndex) and
+    IndirectOperand.super.hasOperandAndIndirectionIndex(arg, _)
+  }
+
+  CallInstruction getCallInstruction() { result = call }
+
+  /** Gets the underlying operand and the underlying indirection index. */
+  predicate hasAddressOperandAndIndirectionIndex(Operand operand, int indirectionIndex) {
+    IndirectOperand.super.hasOperandAndIndirectionIndex(operand, indirectionIndex)
+  }
+
+  int getArgumentIndex() { result = argumentIndex }
+
+  override DataFlowCallable getEnclosingCallable() {
+    result.asSourceCallable() = this.getFunction()
+  }
+
+  override Declaration getFunction() { result = call.getEnclosingFunction() }
+
+  Expr getArgument() { result = call.getArgument(argumentIndex).getUnconvertedResultExpression() }
+}
+
+/**
+ * A node representing the value of a global variable just before returning
+ * from a function body.
+ */
+class FinalGlobalValue extends Node, TFinalGlobalValue {
+  SsaImpl::GlobalUse globalUse;
+
+  FinalGlobalValue() { this = TFinalGlobalValue(globalUse) }
+
+  /** Gets the underlying SSA use. */
+  SsaImpl::GlobalUse getGlobalUse() { result = globalUse }
+
+  override DataFlowCallable getEnclosingCallable() {
+    result.asSourceCallable() = this.getFunction()
+  }
+
+  override Declaration getFunction() { result = globalUse.getIRFunction().getFunction() }
+
+  override Type getType() {
+    exists(int indirectionIndex |
+      indirectionIndex = globalUse.getIndirectionIndex() and
+      result = getTypeImpl(globalUse.getUnderlyingType(), indirectionIndex)
+    )
+  }
+
+  final override Location getLocationImpl() { result = globalUse.getLocation() }
+
+  override string toStringImpl() { result = globalUse.toString() }
+}
+
+/**
+ * A node representing the value of a global variable just after entering
+ * a function body.
+ */
+class InitialGlobalValue extends Node, TInitialGlobalValue {
+  SsaImpl::GlobalDef globalDef;
+
+  InitialGlobalValue() { this = TInitialGlobalValue(globalDef) }
+
+  /** Gets the underlying SSA definition. */
+  SsaImpl::GlobalDef getGlobalDef() { result = globalDef }
+
+  override DataFlowCallable getEnclosingCallable() {
+    result.asSourceCallable() = this.getFunction()
+  }
+
+  override Declaration getFunction() { result = globalDef.getFunction() }
+
+  final override predicate isGLValue() { globalDef.getIndirectionIndex() = 0 }
+
+  override Type getType() { result = globalDef.getUnderlyingType() }
+
+  final override Location getLocationImpl() { result = globalDef.getLocation() }
+
+  override string toStringImpl() { result = globalDef.toString() }
+}
+
+/**
+ * A node representing a parameter for a function with no body.
+ */
+class BodyLessParameterNodeImpl extends Node, TBodyLessParameterNodeImpl {
+  Parameter p;
+  int indirectionIndex;
+
+  BodyLessParameterNodeImpl() { this = TBodyLessParameterNodeImpl(p, indirectionIndex) }
+
+  override DataFlowCallable getEnclosingCallable() {
+    result.asSourceCallable() = this.getFunction()
+  }
+
+  override Declaration getFunction() { result = p.getFunction() }
+
+  /** Gets the indirection index of this node. */
+  int getIndirectionIndex() { result = indirectionIndex }
+
+  override Type getType() {
+    result = getTypeImpl(p.getUnderlyingType(), this.getIndirectionIndex())
+  }
+
+  final override Location getLocationImpl() {
+    result = unique( | | p.getLocation())
+    or
+    count(p.getLocation()) != 1 and
+    result instanceof UnknownLocation
+  }
+
+  final override string toStringImpl() {
+    exists(string prefix | prefix = stars(this) | result = prefix + p.toString())
+  }
+}
+
+/**
+ * A data-flow node used to model flow summaries. That is, a dataflow node
+ * that is synthesized to represent a parameter, return value, or other part
+ * of a models-as-data modeled function.
+ */
+class FlowSummaryNode extends Node, TFlowSummaryNode {
+  /**
+   * Gets the models-as-data `SummaryNode` associated with this dataflow
+   * `FlowSummaryNode`.
+   */
+  FlowSummaryImpl::Private::SummaryNode getSummaryNode() { this = TFlowSummaryNode(result) }
+
+  /**
+   * Gets the summarized callable that this node belongs to.
+   */
+  FlowSummaryImpl::Public::SummarizedCallable getSummarizedCallable() {
+    result = this.getSummaryNode().getSummarizedCallable()
+  }
+
+  /**
+   * Gets the enclosing callable. For a `FlowSummaryNode` this is always the
+   * summarized function this node is part of.
+   */
+  override DataFlowCallable getEnclosingCallable() {
+    result.asSummarizedCallable() = this.getSummarizedCallable()
+  }
+
+  override Location getLocationImpl() { result = this.getSummarizedCallable().getLocation() }
+
+  override string toStringImpl() { result = this.getSummaryNode().toString() }
+}
+
+/**
+ * A node representing the indirection of a value that is
+ * about to be returned from a function.
+ */
+class IndirectReturnNode extends Node {
+  IndirectReturnNode() {
+    this instanceof FinalParameterNode
+    or
+    this.(IndirectOperand)
+        .hasOperandAndIndirectionIndex(any(ReturnValueInstruction ret).getReturnAddressOperand(), _)
+  }
+
+  override SourceCallable getEnclosingCallable() { result.asSourceCallable() = this.getFunction() }
+
+  /**
+   * Holds if this node represents the value that is returned to the caller
+   * through a `return` statement.
+   */
+  predicate isNormalReturn() { this instanceof IndirectOperand }
+
+  /**
+   * Holds if this node represents the value that is returned to the caller
+   * by writing to the `argumentIndex`'th argument of the call.
+   */
+  predicate isParameterReturn(int argumentIndex) {
+    this.(FinalParameterNode).getArgumentIndex() = argumentIndex
+  }
+
+  /** Gets the indirection index of this indirect return node. */
+  int getIndirectionIndex() {
+    result = this.(FinalParameterNode).getIndirectionIndex()
+    or
+    this.(IndirectOperand).hasOperandAndIndirectionIndex(_, result)
+  }
+}
+
+/**
+ * A node representing the value of an output parameter
+ * just before reaching the end of a function.
+ */
+class FinalParameterNode extends Node, TFinalParameterNode {
+  Parameter p;
+  int indirectionIndex;
+
+  FinalParameterNode() { this = TFinalParameterNode(p, indirectionIndex) }
+
+  /** Gets the parameter associated with this final use. */
+  Parameter getParameter() { result = p }
+
+  /** Gets the underlying indirection index. */
+  int getIndirectionIndex() { result = indirectionIndex }
+
+  /** Gets the argument index associated with this final use. */
+  final int getArgumentIndex() { result = p.getIndex() }
+
+  override Declaration getFunction() { result = p.getFunction() }
+
+  override DataFlowCallable getEnclosingCallable() {
+    result.asSourceCallable() = this.getFunction()
+  }
+
+  override Type getType() { result = getTypeImpl(p.getUnderlyingType(), indirectionIndex) }
+
+  final override Location getLocationImpl() {
+    // Parameters can have multiple locations. When there's a unique location we use
+    // that one, but if multiple locations exist we default to an unknown location.
+    result = unique( | | p.getLocation())
+    or
+    not exists(unique( | | p.getLocation())) and
+    result instanceof UnknownLocation
+  }
+
+  override string toStringImpl() { result = stars(this) + p.toString() }
+}
+
+abstract private class AbstractParameterNode extends Node {
+  /**
+   * Holds if this node is the parameter of `f` at the specified position. The
+   * implicit `this` parameter is considered to have position `-1`, and
+   * pointer-indirection parameters are at further negative positions.
+   */
+  predicate isSourceParameterOf(Function f, ParameterPosition pos) { none() }
+
+  /**
+   * Holds if this node is the parameter of `sc` at the specified position. The
+   * implicit `this` parameter is considered to have position `-1`, and
+   * pointer-indirection parameters are at further negative positions.
+   */
+  predicate isSummaryParameterOf(
+    FlowSummaryImpl::Public::SummarizedCallable sc, ParameterPosition pos
+  ) {
+    none()
+  }
+
+  /**
+   * Holds if this node is the parameter of `c` at the specified position. The
+   * implicit `this` parameter is considered to have position `-1`, and
+   * pointer-indirection parameters are at further negative positions.
+   */
+  final predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) {
+    this.isSummaryParameterOf(c.asSummarizedCallable(), pos)
+    or
+    this.isSourceParameterOf(c.asSourceCallable(), pos)
+  }
+
+  /** Gets the `Parameter` associated with this node, if it exists. */
+  Parameter getParameter() { none() } // overridden by subclasses
+}
+
+abstract private class AbstractIndirectParameterNode extends AbstractParameterNode {
+  /** Gets the indirection index of this parameter node. */
+  abstract int getIndirectionIndex();
+}
+
+pragma[noinline]
+private predicate indirectParameterNodeHasArgumentIndexAndIndex(
+  IndirectInstructionParameterNode node, int argumentIndex, int indirectionIndex
+) {
+  node.hasInstructionAndIndirectionIndex(_, indirectionIndex) and
+  node.getArgumentIndex() = argumentIndex
+}
+
+pragma[noinline]
+private predicate indirectPositionHasArgumentIndexAndIndex(
+  IndirectionPosition pos, int argumentIndex, int indirectionIndex
+) {
+  pos.getArgumentIndex() = argumentIndex and
+  pos.getIndirectionIndex() = indirectionIndex
+}
+
+private class IndirectInstructionParameterNode extends AbstractIndirectParameterNode instanceof IndirectInstruction
+{
+  InitializeParameterInstruction init;
+
+  IndirectInstructionParameterNode() {
+    IndirectInstruction.super.hasInstructionAndIndirectionIndex(init, _)
+  }
+
+  int getArgumentIndex() { init.hasIndex(result) }
+
+  override string toStringImpl() {
+    exists(string prefix | prefix = stars(this) |
+      result = prefix + this.getParameter().toString()
+      or
+      not exists(this.getParameter()) and
+      result = prefix + "this"
+    )
+  }
+
+  /** Gets the parameter whose indirection is initialized. */
+  override Parameter getParameter() { result = init.getParameter() }
+
+  override DataFlowCallable getEnclosingCallable() {
+    result.asSourceCallable() = this.getFunction()
+  }
+
+  override Declaration getFunction() { result = init.getEnclosingFunction() }
+
+  override predicate isSourceParameterOf(Function f, ParameterPosition pos) {
+    this.getFunction() = f and
+    exists(int argumentIndex, int indirectionIndex |
+      indirectPositionHasArgumentIndexAndIndex(pos, argumentIndex, indirectionIndex) and
+      indirectParameterNodeHasArgumentIndexAndIndex(this, argumentIndex, indirectionIndex)
+    )
+  }
+
+  /** Gets the underlying operand and the underlying indirection index. */
+  predicate hasInstructionAndIndirectionIndex(Instruction instr, int index) {
+    IndirectInstruction.super.hasInstructionAndIndirectionIndex(instr, index)
+  }
+
+  final override int getIndirectionIndex() { this.hasInstructionAndIndirectionIndex(init, result) }
+}
+
+abstract private class AbstractDirectParameterNode extends AbstractParameterNode { }
+
+/**
+ * A non-indirect parameter node that is represented as an `Instruction`.
+ */
+abstract class InstructionDirectParameterNode extends InstructionNode, AbstractDirectParameterNode {
+  final override InitializeParameterInstruction instr;
+
+  /**
+   * Gets the `IRVariable` that this parameter references.
+   */
+  final IRVariable getIRVariable() { result = instr.getIRVariable() }
+}
+
+abstract private class AbstractExplicitParameterNode extends AbstractDirectParameterNode { }
+
+/** An explicit positional parameter, not including `this` or `...`. */
+private class ExplicitParameterInstructionNode extends AbstractExplicitParameterNode,
+  InstructionDirectParameterNode
+{
+  ExplicitParameterInstructionNode() { exists(instr.getParameter()) }
+
+  override predicate isSourceParameterOf(Function f, ParameterPosition pos) {
+    f.getParameter(pos.(DirectPosition).getArgumentIndex()) = instr.getParameter()
+  }
+
+  override string toStringImpl() { result = instr.getParameter().toString() }
+
+  override Parameter getParameter() { result = instr.getParameter() }
+}
+
+/**
+ * A parameter node that is part of a summary.
+ */
+class SummaryParameterNode extends AbstractParameterNode, FlowSummaryNode {
+  SummaryParameterNode() {
+    FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), _)
+  }
+
+  private ParameterPosition getPosition() {
+    FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), result)
+  }
+
+  override predicate isSummaryParameterOf(
+    FlowSummaryImpl::Public::SummarizedCallable c, ParameterPosition p
+  ) {
+    c = this.getSummarizedCallable() and
+    p = this.getPosition()
+  }
+}
+
+private class DirectBodyLessParameterNode extends AbstractExplicitParameterNode,
+  BodyLessParameterNodeImpl
+{
+  DirectBodyLessParameterNode() { indirectionIndex = 0 }
+
+  override predicate isSourceParameterOf(Function f, ParameterPosition pos) {
+    this.getFunction() = f and
+    f.getParameter(pos.(DirectPosition).getArgumentIndex()) = p
+  }
+
+  override Parameter getParameter() { result = p }
+}
+
+private class IndirectBodyLessParameterNode extends AbstractIndirectParameterNode,
+  BodyLessParameterNodeImpl
+{
+  IndirectBodyLessParameterNode() { not this instanceof DirectBodyLessParameterNode }
+
+  override predicate isSourceParameterOf(Function f, ParameterPosition pos) {
+    exists(int argumentPosition |
+      this.getFunction() = f and
+      f.getParameter(argumentPosition) = p and
+      indirectPositionHasArgumentIndexAndIndex(pos, argumentPosition, indirectionIndex)
+    )
+  }
+
+  override int getIndirectionIndex() {
+    result = BodyLessParameterNodeImpl.super.getIndirectionIndex()
+  }
+
+  override Parameter getParameter() { result = p }
+}
+
+/**
+ * A `PostUpdateNode` that is part of a flow summary. These are synthesized,
+ * for example, when a models-as-data summary models a write to a field since
+ * the write needs to target a `PostUpdateNode`.
+ */
+class SummaryPostUpdateNode extends FlowSummaryNode, PostUpdateNode {
+  SummaryPostUpdateNode() {
+    FlowSummaryImpl::Private::summaryPostUpdateNode(this.getSummaryNode(), _)
+  }
+
+  override Node getPreUpdateNode() {
+    FlowSummaryImpl::Private::summaryPostUpdateNode(this.getSummaryNode(),
+      result.(FlowSummaryNode).getSummaryNode())
+  }
+}
+
+/**
+ * Returns `t`, but stripped of the outermost pointer, reference, etc.
+ *
+ * For example, `stripPointers(int*&)` is `int*` and `stripPointers(int*)` is `int`.
+ */
+private Type stripPointer(Type t) {
+  result = any(SsaImpl::Indirection ind | ind.getType() = t).getBaseType()
+  or
+  result = t.(PointerToMemberType).getBaseType()
+  or
+  result = t.(FunctionPointerIshType).getBaseType()
+}
+
+/**
+ * Returns `t`, but stripped of the outer-most `indirectionIndex` number of indirections.
+ */
+private Type getTypeImpl0(Type t, int indirectionIndex) {
+  indirectionIndex = 0 and
+  result = t
+  or
+  indirectionIndex > 0 and
+  exists(Type stripped |
+    stripped = stripPointer(t.stripTopLevelSpecifiers()) and
+    stripped.getUnspecifiedType() != t.getUnspecifiedType() and
+    result = getTypeImpl0(stripped, indirectionIndex - 1)
+  )
+}
+
+/**
+ * Returns `t`, but stripped of the outer-most `indirectionIndex` number of indirections.
+ *
+ * If `indirectionIndex` cannot be stripped off `t`, an `UnknownType` is returned.
+ */
+bindingset[t, indirectionIndex]
+pragma[inline_late]
+Type getTypeImpl(Type t, int indirectionIndex) {
+  result = getTypeImpl0(t, indirectionIndex)
+  or
+  not exists(getTypeImpl0(t, indirectionIndex)) and
+  result instanceof UnknownType
+}
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 88d7dd9faf1..6dd953b16ab 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
@@ -1,5 +1,6 @@
 private import cpp as Cpp
 private import DataFlowUtil
+private import DataFlowNodes
 private import semmle.code.cpp.ir.IR
 private import DataFlowDispatch
 private import semmle.code.cpp.ir.internal.IRCppLanguage
@@ -16,28 +17,42 @@ private import semmle.code.cpp.dataflow.ExternalFlow as External
 cached
 private module Cached {
   cached
-  module Nodes0 {
-    cached
-    newtype TIRDataFlowNode0 =
-      TInstructionNode0(Instruction i) {
-        not Ssa::ignoreInstruction(i) and
-        not exists(Operand op |
-          not Ssa::ignoreOperand(op) and i = Ssa::getIRRepresentationOfOperand(op)
-        ) and
-        // We exclude `void`-typed instructions because they cannot contain data.
-        // However, if the instruction is a glvalue, and their type is `void`, then the result
-        // type of the instruction is really `void*`, and thus we still want to have a dataflow
-        // node for it.
-        (not i.getResultType() instanceof VoidType or i.isGLValue())
-      } or
-      TMultipleUseOperandNode0(Operand op) {
-        not Ssa::ignoreOperand(op) and not exists(Ssa::getIRRepresentationOfOperand(op))
-      } or
-      TSingleUseOperandNode0(Operand op) {
-        not Ssa::ignoreOperand(op) and exists(Ssa::getIRRepresentationOfOperand(op))
-      }
+  newtype TIRDataFlowNode0 =
+    TInstructionNode0(Instruction i) {
+      not Ssa::ignoreInstruction(i) and
+      not exists(Operand op |
+        not Ssa::ignoreOperand(op) and i = Ssa::getIRRepresentationOfOperand(op)
+      ) and
+      // We exclude `void`-typed instructions because they cannot contain data.
+      // However, if the instruction is a glvalue, and their type is `void`, then the result
+      // type of the instruction is really `void*`, and thus we still want to have a dataflow
+      // node for it.
+      (not i.getResultType() instanceof VoidType or i.isGLValue())
+    } or
+    TMultipleUseOperandNode0(Operand op) {
+      not Ssa::ignoreOperand(op) and not exists(Ssa::getIRRepresentationOfOperand(op))
+    } or
+    TSingleUseOperandNode0(Operand op) {
+      not Ssa::ignoreOperand(op) and exists(Ssa::getIRRepresentationOfOperand(op))
+    }
+
+  cached
+  string toStringCached(Node n) {
+    result = toExprString(n)
+    or
+    not exists(toExprString(n)) and
+    result = n.toStringImpl()
   }
 
+  cached
+  Location getLocationCached(Node n) { result = n.getLocationImpl() }
+
+  cached
+  newtype TContentApprox =
+    TFieldApproxContent(string s) { fieldHasApproxName(_, s) } or
+    TUnionApproxContent(string s) { unionHasApproxName(_, s) } or
+    TElementApproxContent()
+
   /**
    * Gets an additional term that is added to the `join` and `branch` computations to reflect
    * an additional forward or backwards branching factor that is not taken into account
@@ -59,38 +74,174 @@ private module Cached {
       result = countNumberOfBranchesUsingParameter(switch, p)
     )
   }
-}
 
-import Cached
-private import Nodes0
+  cached
+  newtype TDataFlowCallable =
+    TSourceCallable(Cpp::Declaration decl) or
+    TSummarizedCallable(FlowSummaryImpl::Public::SummarizedCallable c)
 
-/**
- * A module for calculating the number of stars (i.e., `*`s) needed for various
- * dataflow node `toString` predicates.
- */
-module NodeStars {
-  private int getNumberOfIndirections(Node n) {
-    result = n.(RawIndirectOperand).getIndirectionIndex()
+  cached
+  newtype TDataFlowCall =
+    TNormalCall(CallInstruction call) or
+    TSummaryCall(
+      FlowSummaryImpl::Public::SummarizedCallable c, FlowSummaryImpl::Private::SummaryNode receiver
+    ) {
+      FlowSummaryImpl::Private::summaryCallbackRange(c, receiver)
+    }
+
+  /**
+   * Holds if data can flow from `node1` to `node2` in a way that loses the
+   * calling context. For example, this would happen with flow through a
+   * global or static variable.
+   */
+  cached
+  predicate jumpStep(Node n1, Node n2) {
+    exists(GlobalLikeVariable v |
+      exists(Ssa::GlobalUse globalUse |
+        v = globalUse.getVariable() and
+        n1.(FinalGlobalValue).getGlobalUse() = globalUse
+      |
+        globalUse.getIndirection() = getMinIndirectionForGlobalUse(globalUse) and
+        v = n2.asVariable()
+        or
+        v = n2.asIndirectVariable(globalUse.getIndirection())
+      )
+      or
+      exists(Ssa::GlobalDef globalDef |
+        v = globalDef.getVariable() and
+        n2.(InitialGlobalValue).getGlobalDef() = globalDef
+      |
+        globalDef.getIndirection() = getMinIndirectionForGlobalDef(globalDef) and
+        v = n1.asVariable()
+        or
+        v = n1.asIndirectVariable(globalDef.getIndirection())
+      )
+    )
     or
-    result = n.(RawIndirectInstruction).getIndirectionIndex()
-    or
-    result = n.(VariableNode).getIndirectionIndex()
-    or
-    result = n.(PostUpdateNodeImpl).getIndirectionIndex()
-    or
-    result = n.(FinalParameterNode).getIndirectionIndex()
-    or
-    result = n.(BodyLessParameterNodeImpl).getIndirectionIndex()
+    // models-as-data summarized flow
+    FlowSummaryImpl::Private::Steps::summaryJumpStep(n1.(FlowSummaryNode).getSummaryNode(),
+      n2.(FlowSummaryNode).getSummaryNode())
   }
 
   /**
-   * Gets the number of stars (i.e., `*`s) needed to produce the `toString`
-   * output for `n`.
+   * Holds if data can flow from `node1` to `node2` via an assignment to `f`.
+   * Thus, `node2` references an object with a field `f` that contains the
+   * value of `node1`.
+   *
+   * The boolean `certain` is true if the destination address does not involve
+   * any pointer arithmetic, and false otherwise.
    */
-  string stars(Node n) { result = repeatStars(getNumberOfIndirections(n)) }
+  cached
+  predicate storeStepImpl(Node node1, Content c, Node node2, boolean certain) {
+    exists(
+      PostFieldUpdateNode postFieldUpdate, int indirectionIndex1, int numberOfLoads,
+      StoreInstruction store, FieldContent fc
+    |
+      postFieldUpdate = node2 and
+      fc = c and
+      nodeHasInstruction(node1, pragma[only_bind_into](store),
+        pragma[only_bind_into](indirectionIndex1)) and
+      postFieldUpdate.getIndirectionIndex() = 1 and
+      numberOfLoadsFromOperand(postFieldUpdate.getFieldAddress(),
+        store.getDestinationAddressOperand(), numberOfLoads, certain) and
+      fc.getAField() = postFieldUpdate.getUpdatedField() and
+      getIndirectionIndexLate(fc) = 1 + indirectionIndex1 + numberOfLoads
+    )
+    or
+    // models-as-data summarized flow
+    FlowSummaryImpl::Private::Steps::summaryStoreStep(node1.(FlowSummaryNode).getSummaryNode(), c,
+      node2.(FlowSummaryNode).getSummaryNode()) and
+    certain = true
+  }
+
+  /**
+   * Holds if data can flow from `node1` to `node2` via an assignment to `f`.
+   * Thus, `node2` references an object with a field `f` that contains the
+   * value of `node1`.
+   */
+  cached
+  predicate storeStep(Node node1, ContentSet c, Node node2) { storeStepImpl(node1, c, node2, _) }
+
+  /**
+   * Holds if data can flow from `node1` to `node2` via a read of `f`.
+   * Thus, `node1` references an object with a field `f` whose value ends up in
+   * `node2`.
+   */
+  cached
+  predicate readStep(Node node1, ContentSet c, Node node2) {
+    exists(
+      FieldAddress fa1, Operand operand, int numberOfLoads, int indirectionIndex2, FieldContent fc
+    |
+      fc = c and
+      nodeHasOperand(node2, operand, indirectionIndex2) and
+      // The `1` here matches the `node2.getIndirectionIndex() = 1` conjunct
+      // in `storeStep`.
+      nodeHasOperand(node1, fa1.getObjectAddressOperand(), 1) and
+      numberOfLoadsFromOperand(fa1, operand, numberOfLoads, _) and
+      fc.getAField() = fa1.getField() and
+      getIndirectionIndexLate(fc) = indirectionIndex2 + numberOfLoads
+    )
+    or
+    // models-as-data summarized flow
+    FlowSummaryImpl::Private::Steps::summaryReadStep(node1.(FlowSummaryNode).getSummaryNode(), c,
+      node2.(FlowSummaryNode).getSummaryNode())
+  }
+
+  /**
+   * Holds if values stored inside content `c` are cleared at node `n`.
+   */
+  cached
+  predicate clearsContent(Node n, ContentSet c) {
+    n =
+      any(PostUpdateNode pun, Content d |
+        d.impliesClearOf(c) and storeStepImpl(_, d, pun, true)
+      |
+        pun
+      ).getPreUpdateNode() and
+    (
+      not exists(Operand op, Cpp::Operation p |
+        n.(IndirectOperand).hasOperandAndIndirectionIndex(op, _) and
+        (
+          p instanceof Cpp::AssignPointerAddExpr or
+          p instanceof Cpp::AssignPointerSubExpr or
+          p instanceof Cpp::CrementOperation
+        )
+      |
+        p.getAnOperand() = op.getUse().getAst()
+      )
+      or
+      forex(PostUpdateNode pun, Content d |
+        pragma[only_bind_into](d).impliesClearOf(pragma[only_bind_into](c)) and
+        storeStepImpl(_, d, pun, true) and
+        pun.getPreUpdateNode() = n
+      |
+        c.(Content).getIndirectionIndex() = d.getIndirectionIndex()
+      )
+    )
+  }
 }
 
-import NodeStars
+import Cached
+
+private int getNumberOfIndirections(Node n) {
+  result = n.(RawIndirectOperand).getIndirectionIndex()
+  or
+  result = n.(RawIndirectInstruction).getIndirectionIndex()
+  or
+  result = n.(VariableNode).getIndirectionIndex()
+  or
+  result = n.(PostUpdateNodeImpl).getIndirectionIndex()
+  or
+  result = n.(FinalParameterNode).getIndirectionIndex()
+  or
+  result = n.(BodyLessParameterNodeImpl).getIndirectionIndex()
+}
+
+/**
+ * Gets the number of stars (i.e., `*`s) needed to produce the `toString`
+ * output for `n`.
+ */
+string stars(Node n) { result = repeatStars(getNumberOfIndirections(n)) }
 
 /**
  * A cut-down `DataFlow::Node` class that does not depend on the output of SSA.
@@ -828,85 +979,10 @@ private int getMinIndirectionForGlobalDef(Ssa::GlobalDef def) {
   result = getMinIndirectionsForType(def.getUnspecifiedType())
 }
 
-/**
- * Holds if data can flow from `node1` to `node2` in a way that loses the
- * calling context. For example, this would happen with flow through a
- * global or static variable.
- */
-predicate jumpStep(Node n1, Node n2) {
-  exists(GlobalLikeVariable v |
-    exists(Ssa::GlobalUse globalUse |
-      v = globalUse.getVariable() and
-      n1.(FinalGlobalValue).getGlobalUse() = globalUse
-    |
-      globalUse.getIndirection() = getMinIndirectionForGlobalUse(globalUse) and
-      v = n2.asVariable()
-      or
-      v = n2.asIndirectVariable(globalUse.getIndirection())
-    )
-    or
-    exists(Ssa::GlobalDef globalDef |
-      v = globalDef.getVariable() and
-      n2.(InitialGlobalValue).getGlobalDef() = globalDef
-    |
-      globalDef.getIndirection() = getMinIndirectionForGlobalDef(globalDef) and
-      v = n1.asVariable()
-      or
-      v = n1.asIndirectVariable(globalDef.getIndirection())
-    )
-  )
-  or
-  // models-as-data summarized flow
-  FlowSummaryImpl::Private::Steps::summaryJumpStep(n1.(FlowSummaryNode).getSummaryNode(),
-    n2.(FlowSummaryNode).getSummaryNode())
-}
-
 bindingset[c]
 pragma[inline_late]
 private int getIndirectionIndexLate(Content c) { result = c.getIndirectionIndex() }
 
-/**
- * Holds if data can flow from `node1` to `node2` via an assignment to `f`.
- * Thus, `node2` references an object with a field `f` that contains the
- * value of `node1`.
- *
- * The boolean `certain` is true if the destination address does not involve
- * any pointer arithmetic, and false otherwise. This has to do with whether a
- * store step can be used to clear a field (see `clearsContent`).
- */
-predicate storeStepImpl(Node node1, Content c, Node node2, boolean certain) {
-  exists(
-    PostFieldUpdateNode postFieldUpdate, int indirectionIndex1, int numberOfLoads,
-    StoreInstruction store, FieldContent fc
-  |
-    postFieldUpdate = node2 and
-    fc = c and
-    nodeHasInstruction(node1, pragma[only_bind_into](store),
-      pragma[only_bind_into](indirectionIndex1)) and
-    postFieldUpdate.getIndirectionIndex() = 1 and
-    numberOfLoadsFromOperand(postFieldUpdate.getFieldAddress(),
-      store.getDestinationAddressOperand(), numberOfLoads, certain) and
-    fc.getAField() = postFieldUpdate.getUpdatedField() and
-    getIndirectionIndexLate(fc) = 1 + indirectionIndex1 + numberOfLoads
-  )
-  or
-  // models-as-data summarized flow
-  FlowSummaryImpl::Private::Steps::summaryStoreStep(node1.(FlowSummaryNode).getSummaryNode(), c,
-    node2.(FlowSummaryNode).getSummaryNode()) and
-  certain = true
-}
-
-/**
- * Holds if data can flow from `node1` to `node2` via an assignment to `f`.
- * Thus, `node2` references an object with a field `f` that contains the
- * value of `node1`.
- */
-predicate storeStep(Node node1, ContentSet c, Node node2) { storeStepImpl(node1, c, node2, _) }
-
-/**
- * Holds if `operandFrom` flows to `operandTo` using a sequence of conversion-like
- * operations and exactly `n` `LoadInstruction` operations.
- */
 private predicate numberOfLoadsFromOperandRec(
   Operand operandFrom, Operand operandTo, int ind, boolean certain
 ) {
@@ -957,63 +1033,6 @@ predicate nodeHasInstruction(Node node, Instruction instr, int indirectionIndex)
   hasInstructionAndIndex(node, instr, indirectionIndex)
 }
 
-/**
- * Holds if data can flow from `node1` to `node2` via a read of `f`.
- * Thus, `node1` references an object with a field `f` whose value ends up in
- * `node2`.
- */
-predicate readStep(Node node1, ContentSet c, Node node2) {
-  exists(
-    FieldAddress fa1, Operand operand, int numberOfLoads, int indirectionIndex2, FieldContent fc
-  |
-    fc = c and
-    nodeHasOperand(node2, operand, indirectionIndex2) and
-    // The `1` here matches the `node2.getIndirectionIndex() = 1` conjunct
-    // in `storeStep`.
-    nodeHasOperand(node1, fa1.getObjectAddressOperand(), 1) and
-    numberOfLoadsFromOperand(fa1, operand, numberOfLoads, _) and
-    fc.getAField() = fa1.getField() and
-    getIndirectionIndexLate(fc) = indirectionIndex2 + numberOfLoads
-  )
-  or
-  // models-as-data summarized flow
-  FlowSummaryImpl::Private::Steps::summaryReadStep(node1.(FlowSummaryNode).getSummaryNode(), c,
-    node2.(FlowSummaryNode).getSummaryNode())
-}
-
-/**
- * Holds if values stored inside content `c` are cleared at node `n`.
- */
-predicate clearsContent(Node n, ContentSet c) {
-  n =
-    any(PostUpdateNode pun, Content d | d.impliesClearOf(c) and storeStepImpl(_, d, pun, true) | pun)
-        .getPreUpdateNode() and
-  (
-    // The crement operations and pointer addition and subtraction self-assign. We do not
-    // want to clear the contents if it is indirectly pointed at by any of these operations,
-    // as part of the contents might still be accessible afterwards. If there is no such
-    // indirection clearing the contents is safe.
-    not exists(Operand op, Cpp::Operation p |
-      n.(IndirectOperand).hasOperandAndIndirectionIndex(op, _) and
-      (
-        p instanceof Cpp::AssignPointerAddExpr or
-        p instanceof Cpp::AssignPointerSubExpr or
-        p instanceof Cpp::CrementOperation
-      )
-    |
-      p.getAnOperand() = op.getUse().getAst()
-    )
-    or
-    forex(PostUpdateNode pun, Content d |
-      pragma[only_bind_into](d).impliesClearOf(pragma[only_bind_into](c)) and
-      storeStepImpl(_, d, pun, true) and
-      pun.getPreUpdateNode() = n
-    |
-      c.(Content).getIndirectionIndex() = d.getIndirectionIndex()
-    )
-  )
-}
-
 /**
  * Holds if the value that is being tracked is expected to be stored inside content `c`
  * at node `n`.
@@ -1046,11 +1065,6 @@ class CastNode extends Node {
   CastNode() { none() } // stub implementation
 }
 
-cached
-private newtype TDataFlowCallable =
-  TSourceCallable(Cpp::Declaration decl) or
-  TSummarizedCallable(FlowSummaryImpl::Public::SummarizedCallable c)
-
 /**
  * A callable, which may be:
  *  - a function (that may contain code)
@@ -1134,15 +1148,6 @@ class DataFlowType extends TypeFinal {
   string toString() { result = "" }
 }
 
-cached
-private newtype TDataFlowCall =
-  TNormalCall(CallInstruction call) or
-  TSummaryCall(
-    FlowSummaryImpl::Public::SummarizedCallable c, FlowSummaryImpl::Private::SummaryNode receiver
-  ) {
-    FlowSummaryImpl::Private::summaryCallbackRange(c, receiver)
-  }
-
 private predicate summarizedCallableIsManual(SummarizedCallable sc) {
   sc.asSummarizedCallable().hasManualModel()
 }
@@ -1523,12 +1528,6 @@ private predicate fieldHasApproxName(Field f, string s) {
 
 private predicate unionHasApproxName(Cpp::Union u, string s) { s = u.getName().charAt(0) }
 
-cached
-private newtype TContentApprox =
-  TFieldApproxContent(string s) { fieldHasApproxName(_, s) } or
-  TUnionApproxContent(string s) { unionHasApproxName(_, s) } or
-  TElementApproxContent()
-
 /** An approximated `Content`. */
 class ContentApprox extends TContentApprox {
   string toString() { none() } // overridden in subclasses
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 9bc3a80e3e0..d42d959f56e 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
@@ -3,14 +3,12 @@
  */
 
 private import cpp
-// The `ValueNumbering` library has to be imported right after `cpp` to ensure
-// that the cached IR gets the same checksum here as it does in queries that use
-// `ValueNumbering` without `DataFlow`.
 private import semmle.code.cpp.ir.ValueNumbering
 private import semmle.code.cpp.ir.IR
 private import semmle.code.cpp.controlflow.IRGuards
 private import semmle.code.cpp.models.interfaces.DataFlow
 private import semmle.code.cpp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
+private import TaintTrackingUtil as TaintTrackingUtil
 private import DataFlowPrivate
 private import ModelUtil
 private import SsaImpl as SsaImpl
@@ -18,1702 +16,8 @@ private import DataFlowImplCommon as DataFlowImplCommon
 private import codeql.util.Unit
 private import Node0ToString
 private import DataFlowDispatch as DataFlowDispatch
-import ExprNodes
-
-/**
- * The IR dataflow graph consists of the following nodes:
- * - `Node0`, which injects most instructions and operands directly into the
- *    dataflow graph.
- * - `VariableNode`, which is used to model flow through global variables.
- * - `PostUpdateNodeImpl`, which is used to model the state of an object after
- *    an update after a number of loads.
- * - `SsaSynthNode`, which represents synthesized nodes as computed by the shared SSA
- *    library.
- * - `RawIndirectOperand`, which represents the value of `operand` after
- *    loading the address a number of times.
- * - `RawIndirectInstruction`, which represents the value of `instr` after
- *    loading the address a number of times.
- */
-cached
-private newtype TIRDataFlowNode =
-  TNode0(Node0Impl node) { DataFlowImplCommon::forceCachingInSameStage() } or
-  TGlobalLikeVariableNode(GlobalLikeVariable var, int indirectionIndex) {
-    indirectionIndex =
-      [getMinIndirectionsForType(var.getUnspecifiedType()) .. SsaImpl::getMaxIndirectionsForType(var.getUnspecifiedType())]
-  } or
-  TPostUpdateNodeImpl(Operand operand, int indirectionIndex) {
-    isPostUpdateNodeImpl(operand, indirectionIndex)
-  } or
-  TSsaSynthNode(SsaImpl::SynthNode n) or
-  TSsaIteratorNode(IteratorFlow::IteratorFlowNode n) or
-  TRawIndirectOperand0(Node0Impl node, int indirectionIndex) {
-    SsaImpl::hasRawIndirectOperand(node.asOperand(), indirectionIndex)
-  } or
-  TRawIndirectInstruction0(Node0Impl node, int indirectionIndex) {
-    not exists(node.asOperand()) and
-    SsaImpl::hasRawIndirectInstruction(node.asInstruction(), indirectionIndex)
-  } or
-  TFinalParameterNode(Parameter p, int indirectionIndex) {
-    exists(SsaImpl::FinalParameterUse use |
-      use.getParameter() = p and
-      use.getIndirectionIndex() = indirectionIndex
-    )
-  } or
-  TFinalGlobalValue(SsaImpl::GlobalUse globalUse) or
-  TInitialGlobalValue(SsaImpl::GlobalDef globalUse) or
-  TBodyLessParameterNodeImpl(Parameter p, int indirectionIndex) {
-    // Rule out parameters of catch blocks.
-    not exists(p.getCatchBlock()) and
-    // We subtract one because `getMaxIndirectionsForType` returns the maximum
-    // indirection for a glvalue of a given type, and this doesn't apply to
-    // parameters.
-    indirectionIndex = [0 .. SsaImpl::getMaxIndirectionsForType(p.getUnspecifiedType()) - 1] and
-    not any(InitializeParameterInstruction init).getParameter() = p
-  } or
-  TFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn)
-
-/**
- * An operand that is defined by a `FieldAddressInstruction`.
- */
-class FieldAddress extends Operand {
-  FieldAddressInstruction fai;
-
-  FieldAddress() { fai = this.getDef() and not SsaImpl::ignoreOperand(this) }
-
-  /** Gets the field associated with this instruction. */
-  Field getField() { result = fai.getField() }
-
-  /** Gets the instruction whose result provides the address of the object containing the field. */
-  Instruction getObjectAddress() { result = fai.getObjectAddress() }
-
-  /** Gets the operand that provides the address of the object containing the field. */
-  Operand getObjectAddressOperand() { result = fai.getObjectAddressOperand() }
-}
-
-/**
- * Holds if `opFrom` is an operand whose value flows to the result of `instrTo`.
- *
- * `isPointerArith` is `true` if `instrTo` is a `PointerArithmeticInstruction` and `opFrom`
- * is the left operand.
- *
- * `additional` is `true` if the conversion is supplied by an implementation of the
- * `Indirection` class. It is sometimes useful to exclude such conversions.
- */
-predicate conversionFlow(
-  Operand opFrom, Instruction instrTo, boolean isPointerArith, boolean additional
-) {
-  isPointerArith = false and
-  (
-    additional = false and
-    (
-      instrTo.(CopyValueInstruction).getSourceValueOperand() = opFrom
-      or
-      instrTo.(ConvertInstruction).getUnaryOperand() = opFrom
-      or
-      instrTo.(CheckedConvertOrNullInstruction).getUnaryOperand() = opFrom
-      or
-      instrTo.(InheritanceConversionInstruction).getUnaryOperand() = opFrom
-      or
-      exists(BuiltInInstruction builtIn |
-        builtIn = instrTo and
-        // __builtin_bit_cast
-        builtIn.getBuiltInOperation() instanceof BuiltInBitCast and
-        opFrom = builtIn.getAnOperand()
-      )
-    )
-    or
-    additional = true and
-    SsaImpl::isAdditionalConversionFlow(opFrom, instrTo)
-  )
-  or
-  isPointerArith = true and
-  additional = false and
-  instrTo.(PointerArithmeticInstruction).getLeftOperand() = opFrom
-}
-
-/**
- * A node in a data flow graph.
- *
- * A node can be either an expression, a parameter, or an uninitialized local
- * variable. Such nodes are created with `DataFlow::exprNode`,
- * `DataFlow::parameterNode`, and `DataFlow::uninitializedNode` respectively.
- */
-class Node extends TIRDataFlowNode {
-  /**
-   * INTERNAL: Do not use.
-   */
-  DataFlowCallable getEnclosingCallable() { none() } // overridden in subclasses
-
-  /** Gets the function to which this node belongs, if any. */
-  Declaration getFunction() { none() } // overridden in subclasses
-
-  /** Holds if this node represents a glvalue. */
-  predicate isGLValue() { none() }
-
-  /**
-   * Gets the type of this node.
-   *
-   * If `isGLValue()` holds, then the type of this node
-   * should be thought of as "pointer to `getType()`".
-   */
-  Type getType() { none() } // overridden in subclasses
-
-  /** Gets the instruction corresponding to this node, if any. */
-  Instruction asInstruction() { result = this.(InstructionNode).getInstruction() }
-
-  /** Gets the operands corresponding to this node, if any. */
-  Operand asOperand() { result = this.(OperandNode).getOperand() }
-
-  /**
-   * Gets the operand that is indirectly tracked by this node behind `index`
-   * number of indirections.
-   */
-  Operand asIndirectOperand(int index) { hasOperandAndIndex(this, result, index) }
-
-  /**
-   * Holds if this node is at index `i` in basic block `block`.
-   *
-   * Note: Phi nodes are considered to be at index `-1`.
-   */
-  final predicate hasIndexInBlock(IRBlock block, int i) {
-    this.asInstruction() = block.getInstruction(i)
-    or
-    this.asOperand().getUse() = block.getInstruction(i)
-    or
-    exists(SsaImpl::SynthNode ssaNode |
-      this.(SsaSynthNode).getSynthNode() = ssaNode and
-      ssaNode.getBasicBlock() = block and
-      ssaNode.getIndex() = i
-    )
-    or
-    this.(RawIndirectOperand).getOperand().getUse() = block.getInstruction(i)
-    or
-    this.(RawIndirectInstruction).getInstruction() = block.getInstruction(i)
-    or
-    this.(PostUpdateNode).getPreUpdateNode().hasIndexInBlock(block, i)
-  }
-
-  /** Gets the basic block of this node, if any. */
-  final IRBlock getBasicBlock() { this.hasIndexInBlock(result, _) }
-
-  /**
-   * Gets the non-conversion expression corresponding to this node, if any.
-   * This predicate only has a result on nodes that represent the value of
-   * evaluating the expression. For data flowing _out of_ an expression, like
-   * when an argument is passed by reference, use `asDefiningArgument` instead
-   * of `asExpr`.
-   *
-   * If this node strictly (in the sense of `asConvertedExpr`) corresponds to
-   * a `Conversion`, then the result is the underlying non-`Conversion` base
-   * expression.
-   */
-  Expr asExpr() { result = this.asExpr(_) }
-
-  /**
-   * INTERNAL: Do not use.
-   */
-  Expr asExpr(int n) { result = this.(ExprNode).getExpr(n) }
-
-  /**
-   * INTERNAL: Do not use.
-   */
-  Expr asIndirectExpr(int n, int index) { result = this.(IndirectExprNode).getExpr(n, index) }
-
-  /**
-   * Gets the non-conversion expression that's indirectly tracked by this node
-   * under `index` number of indirections.
-   */
-  Expr asIndirectExpr(int index) { result = this.asIndirectExpr(_, index) }
-
-  /**
-   * Gets the non-conversion expression that's indirectly tracked by this node
-   * behind a number of indirections.
-   */
-  Expr asIndirectExpr() { result = this.asIndirectExpr(_) }
-
-  /**
-   * Gets the expression corresponding to this node, if any. The returned
-   * expression may be a `Conversion`.
-   */
-  Expr asConvertedExpr() { result = this.asConvertedExpr(_) }
-
-  /**
-   * Gets the expression corresponding to this node, if any. The returned
-   * expression may be a `Conversion`.
-   */
-  Expr asConvertedExpr(int n) { result = this.(ExprNode).getConvertedExpr(n) }
-
-  /**
-   * INTERNAL: Do not use.
-   */
-  Expr asIndirectConvertedExpr(int n, int index) {
-    result = this.(IndirectExprNode).getConvertedExpr(n, index)
-  }
-
-  /**
-   * Gets the expression that's indirectly tracked by this node
-   * behind `index` number of indirections.
-   */
-  Expr asIndirectConvertedExpr(int index) { result = this.asIndirectConvertedExpr(_, index) }
-
-  /**
-   * Gets the expression that's indirectly tracked by this node behind a
-   * number of indirections.
-   */
-  Expr asIndirectConvertedExpr() { result = this.asIndirectConvertedExpr(_) }
-
-  /**
-   * Gets the argument that defines this `DefinitionByReferenceNode`, if any.
-   * This predicate should be used instead of `asExpr` when referring to the
-   * value of a reference argument _after_ the call has returned. For example,
-   * in `f(&x)`, this predicate will have `&x` as its result for the `Node`
-   * that represents the new value of `x`.
-   */
-  Expr asDefiningArgument() { result = this.asDefiningArgument(_) }
-
-  /**
-   * Gets the definition associated with this node, if any.
-   *
-   * For example, consider the following example
-   * ```cpp
-   * int x = 42;     // 1
-   * x = 34;         // 2
-   * ++x;            // 3
-   * x++;            // 4
-   * x += 1;         // 5
-   * int y = x += 2; // 6
-   * ```
-   * - For (1) the result is `42`.
-   * - For (2) the result is `x = 34`.
-   * - For (3) the result is `++x`.
-   * - For (4) the result is `x++`.
-   * - For (5) the result is `x += 1`.
-   * - For (6) there are two results:
-   *   - For the definition generated by `x += 2` the result is `x += 2`
-   *   - For the definition generated by `int y = ...` the result is
-   *     also `x += 2`.
-   *
-   * For assignments, `node.asDefinition()` and `node.asExpr()` will both exist
-   * for the same dataflow node. However, for expression such as `x++` that
-   * both write to `x` and read the current value of `x`, `node.asDefinition()`
-   * will give the node corresponding to the value after the increment, and
-   * `node.asExpr()` will give the node corresponding to the value before the
-   * increment. For an example of this, consider the following:
-   *
-   * ```cpp
-   * sink(x++);
-   * ```
-   * in the above program, there will not be flow from a node `n` such that
-   * `n.asDefinition() instanceof IncrementOperation` to the argument of `sink`
-   * since the value passed to `sink` is the value before to the increment.
-   * However, there will be dataflow from a node `n` such that
-   * `n.asExpr() instanceof IncrementOperation` since the result of evaluating
-   * the expression `x++` is passed to `sink`.
-   */
-  Expr asDefinition() { result = this.asDefinition(_) }
-
-  private predicate isCertainStore() {
-    exists(SsaImpl::Definition def |
-      SsaImpl::defToNode(this, def, _) and
-      def.isCertain()
-    )
-  }
-
-  /**
-   * Gets the definition associated with this node, if any.
-   *
-   * For example, consider the following example
-   * ```cpp
-   * int x = 42;     // 1
-   * x = 34;         // 2
-   * ++x;            // 3
-   * x++;            // 4
-   * x += 1;         // 5
-   * int y = x += 2; // 6
-   * ```
-   * - For (1) the result is `42`.
-   * - For (2) the result is `x = 34`.
-   * - For (3) the result is `++x`.
-   * - For (4) the result is `x++`.
-   * - For (5) the result is `x += 1`.
-   * - For (6) there are two results:
-   *   - For the definition generated by `x += 2` the result is `x += 2`
-   *   - For the definition generated by `int y = ...` the result is
-   *     also `x += 2`.
-   *
-   * For assignments, `node.asDefinition(_)` and `node.asExpr()` will both exist
-   * for the same dataflow node. However, for expression such as `x++` that
-   * both write to `x` and read the current value of `x`, `node.asDefinition(_)`
-   * will give the node corresponding to the value after the increment, and
-   * `node.asExpr()` will give the node corresponding to the value before the
-   * increment. For an example of this, consider the following:
-   *
-   * ```cpp
-   * sink(x++);
-   * ```
-   * in the above program, there will not be flow from a node `n` such that
-   * `n.asDefinition(_) instanceof IncrementOperation` to the argument of `sink`
-   * since the value passed to `sink` is the value before to the increment.
-   * However, there will be dataflow from a node `n` such that
-   * `n.asExpr() instanceof IncrementOperation` since the result of evaluating
-   * the expression `x++` is passed to `sink`.
-   *
-   * If `uncertain = false` then the definition is guaranteed to overwrite
-   * the entire buffer pointed to by the destination address of the definition.
-   * Otherwise, `uncertain = true`.
-   *
-   * For example, the write `int x; x = 42;` is guaranteed to overwrite all the
-   * bytes allocated to `x`, while the assignment `int p[10]; p[3] = 42;` has
-   * `uncertain = true` since the write will not overwrite the entire buffer
-   * pointed to by `p`.
-   */
-  Expr asDefinition(boolean uncertain) {
-    exists(StoreInstruction store |
-      store = this.asInstruction() and
-      result = asDefinitionImpl(store) and
-      if this.isCertainStore() then uncertain = false else uncertain = true
-    )
-  }
-
-  /**
-   * Gets the definition associated with this node, if this node is a certain definition.
-   *
-   * See `Node.asDefinition/1` for a description of certain and uncertain definitions.
-   */
-  Expr asCertainDefinition() { result = this.asDefinition(false) }
-
-  /**
-   * Gets the definition associated with this node, if this node is an uncertain definition.
-   *
-   * See `Node.asDefinition/1` for a description of certain and uncertain definitions.
-   */
-  Expr asUncertainDefinition() { result = this.asDefinition(true) }
-
-  /**
-   * Gets the indirect definition at a given indirection corresponding to this
-   * node, if any.
-   *
-   * See the comments on `Node.asDefinition` for examples.
-   */
-  Expr asIndirectDefinition(int indirectionIndex) {
-    exists(StoreInstruction store |
-      this.(IndirectInstruction).hasInstructionAndIndirectionIndex(store, indirectionIndex) and
-      result = asDefinitionImpl(store)
-    )
-  }
-
-  /**
-   * Gets the indirect definition at some indirection corresponding to this
-   * node, if any.
-   */
-  Expr asIndirectDefinition() { result = this.asIndirectDefinition(_) }
-
-  /**
-   * Gets the argument that defines this `DefinitionByReferenceNode`, if any.
-   *
-   * Unlike `Node::asDefiningArgument/0`, this predicate gets the node representing
-   * the value of the `index`'th indirection after leaving a function. For example,
-   * in:
-   * ```cpp
-   * void f(int**);
-   * ...
-   * int** x = ...;
-   * f(x);
-   * ```
-   * The node `n` such that `n.asDefiningArgument(1)` is the argument `x` will
-   * contain the value of `*x` after `f` has returned, and the node `n` such that
-   * `n.asDefiningArgument(2)` is the argument `x` will contain the value of `**x`
-   * after the `f` has returned.
-   */
-  Expr asDefiningArgument(int index) {
-    this.(DefinitionByReferenceNode).getIndirectionIndex() = index and
-    result = this.(DefinitionByReferenceNode).getArgument()
-  }
-
-  /**
-   * Gets the the argument going into a function for a node that represents
-   * the indirect value of the argument after `index` loads. For example, in:
-   * ```cpp
-   * void f(int**);
-   * ...
-   * int** x = ...;
-   * f(x);
-   * ```
-   * The node `n` such that `n.asIndirectArgument(1)` represents the value of
-   * `*x` going into `f`, and the node `n` such that `n.asIndirectArgument(2)`
-   * represents the value of `**x` going into `f`.
-   */
-  Expr asIndirectArgument(int index) {
-    this.(SideEffectOperandNode).hasAddressOperandAndIndirectionIndex(_, index) and
-    result = this.(SideEffectOperandNode).getArgument()
-  }
-
-  /**
-   * Gets the the argument going into a function for a node that represents
-   * the indirect value of the argument after any non-zero number of loads.
-   */
-  Expr asIndirectArgument() { result = this.asIndirectArgument(_) }
-
-  /** Gets the positional parameter corresponding to this node, if any. */
-  Parameter asParameter() {
-    exists(int indirectionIndex | result = this.asParameter(indirectionIndex) |
-      if result.getUnspecifiedType() instanceof ReferenceType
-      then indirectionIndex = 1
-      else indirectionIndex = 0
-    )
-  }
-
-  /**
-   * Gets the uninitialized local variable corresponding to this node, if
-   * any.
-   */
-  LocalVariable asUninitialized() { result = this.(UninitializedNode).getLocalVariable() }
-
-  /**
-   * Gets the positional parameter corresponding to the node that represents
-   * the value of the parameter after `index` number of loads, if any. For
-   * example, in:
-   * ```cpp
-   * void f(int** x) { ... }
-   * ```
-   * - The node `n` such that `n.asParameter(0)` is the parameter `x` represents
-   * the value of `x`.
-   * - The node `n` such that `n.asParameter(1)` is the parameter `x` represents
-   * the value of `*x`.
-   * - The node `n` such that `n.asParameter(2)` is the parameter `x` represents
-   * the value of `**x`.
-   */
-  Parameter asParameter(int index) {
-    index = 0 and
-    result = this.(ExplicitParameterNode).getParameter()
-    or
-    this.(IndirectParameterNode).getIndirectionIndex() = index and
-    result = this.(IndirectParameterNode).getParameter()
-  }
-
-  /**
-   * Holds if this node represents the `indirectionIndex`'th indirection of
-   * the value of an output parameter `p` just before reaching the end of a function.
-   */
-  predicate isFinalValueOfParameter(Parameter p, int indirectionIndex) {
-    exists(FinalParameterNode n | n = this |
-      p = n.getParameter() and
-      indirectionIndex = n.getIndirectionIndex()
-    )
-  }
-
-  /**
-   * Holds if this node represents the value of an output parameter `p`
-   * just before reaching the end of a function.
-   */
-  predicate isFinalValueOfParameter(Parameter p) { this.isFinalValueOfParameter(p, _) }
-
-  /**
-   * Gets the variable corresponding to this node, if any. This can be used for
-   * modeling flow in and out of global variables.
-   */
-  Variable asVariable() {
-    this = TGlobalLikeVariableNode(result, getMinIndirectionsForType(result.getUnspecifiedType()))
-  }
-
-  /**
-   * Gets the `indirectionIndex`'th indirection of this node's underlying variable, if any.
-   *
-   * This can be used for modeling flow in and out of global variables.
-   */
-  Variable asIndirectVariable(int indirectionIndex) {
-    indirectionIndex > getMinIndirectionsForType(result.getUnspecifiedType()) and
-    this = TGlobalLikeVariableNode(result, indirectionIndex)
-  }
-
-  /** Gets an indirection of this node's underlying variable, if any. */
-  Variable asIndirectVariable() { result = this.asIndirectVariable(_) }
-
-  /**
-   * Gets the expression that is partially defined by this node, if any.
-   *
-   * Partial definitions are created for field stores (`x.y = taint();` is a partial
-   * definition of `x`), and for calls that may change the value of an object (so
-   * `x.set(taint())` is a partial definition of `x`, and `transfer(&x, taint())` is
-   * a partial definition of `&x`).
-   */
-  Expr asPartialDefinition() {
-    exists(PartialDefinitionNode pdn | this = pdn |
-      pdn.getIndirectionIndex() > 0 and
-      result = pdn.getDefinedExpr()
-    )
-  }
-
-  /**
-   * Gets an upper bound on the type of this node.
-   */
-  Type getTypeBound() { result = this.getType() }
-
-  /** Gets the location of this element. */
-  cached
-  final Location getLocation() { result = this.getLocationImpl() }
-
-  /** INTERNAL: Do not use. */
-  Location getLocationImpl() {
-    none() // overridden by subclasses
-  }
-
-  /** Gets a textual representation of this element. */
-  cached
-  final string toString() {
-    result = toExprString(this)
-    or
-    not exists(toExprString(this)) and
-    result = this.toStringImpl()
-  }
-
-  /** INTERNAL: Do not use. */
-  string toStringImpl() {
-    none() // overridden by subclasses
-  }
-}
-
-/**
- * A class that lifts pre-SSA dataflow nodes to regular dataflow nodes.
- */
-private class Node0 extends Node, TNode0 {
-  Node0Impl node;
-
-  Node0() { this = TNode0(node) }
-
-  override DataFlowCallable getEnclosingCallable() {
-    result.asSourceCallable() = node.getEnclosingCallable()
-  }
-
-  override Declaration getFunction() { result = node.getFunction() }
-
-  override Location getLocationImpl() { result = node.getLocation() }
-
-  override string toStringImpl() { result = node.toString() }
-
-  override Type getType() { result = node.getType() }
-
-  override predicate isGLValue() { node.isGLValue() }
-}
-
-/**
- * An instruction, viewed as a node in a data flow graph.
- */
-class InstructionNode extends Node0 {
-  override InstructionNode0 node;
-  Instruction instr;
-
-  InstructionNode() { instr = node.getInstruction() }
-
-  /** Gets the instruction corresponding to this node. */
-  Instruction getInstruction() { result = instr }
-}
-
-/**
- * An operand, viewed as a node in a data flow graph.
- */
-class OperandNode extends Node, Node0 {
-  override OperandNode0 node;
-  Operand op;
-
-  OperandNode() { op = node.getOperand() }
-
-  /** Gets the operand corresponding to this node. */
-  Operand getOperand() { result = op }
-}
-
-/**
- * INTERNAL: Do not use.
- *
- * Returns `t`, but stripped of the outermost pointer, reference, etc.
- *
- * For example, `stripPointers(int*&)` is `int*` and `stripPointers(int*)` is `int`.
- */
-Type stripPointer(Type t) {
-  result = any(SsaImpl::Indirection ind | ind.getType() = t).getBaseType()
-  or
-  result = t.(PointerToMemberType).getBaseType()
-  or
-  result = t.(FunctionPointerIshType).getBaseType()
-}
-
-/**
- * INTERNAL: Do not use.
- */
-class PostUpdateNodeImpl extends PartialDefinitionNode, TPostUpdateNodeImpl {
-  int indirectionIndex;
-  Operand operand;
-
-  PostUpdateNodeImpl() { this = TPostUpdateNodeImpl(operand, indirectionIndex) }
-
-  override Declaration getFunction() { result = operand.getUse().getEnclosingFunction() }
-
-  override DataFlowCallable getEnclosingCallable() {
-    result = this.getPreUpdateNode().getEnclosingCallable()
-  }
-
-  /** Gets the operand associated with this node. */
-  Operand getOperand() { result = operand }
-
-  /** Gets the indirection index associated with this node. */
-  override int getIndirectionIndex() { result = indirectionIndex }
-
-  override Location getLocationImpl() { result = operand.getLocation() }
-
-  final override Node getPreUpdateNode() {
-    indirectionIndex > 0 and
-    hasOperandAndIndex(result, operand, indirectionIndex)
-    or
-    indirectionIndex = 0 and
-    result.asOperand() = operand
-  }
-
-  final override Expr getDefinedExpr() {
-    result = operand.getDef().getUnconvertedResultExpression()
-  }
-}
-
-/**
- * INTERNAL: do not use.
- *
- * The node representing the value of a field after it has been updated.
- */
-class PostFieldUpdateNode extends PostUpdateNodeImpl {
-  FieldAddress fieldAddress;
-
-  PostFieldUpdateNode() { operand = fieldAddress.getObjectAddressOperand() }
-
-  FieldAddress getFieldAddress() { result = fieldAddress }
-
-  Field getUpdatedField() { result = this.getFieldAddress().getField() }
-
-  override string toStringImpl() { result = this.getPreUpdateNode() + " [post update]" }
-}
-
-/**
- * INTERNAL: do not use.
- *
- * A synthesized SSA node produced by the shared SSA library, viewed as a node
- * in a data flow graph.
- */
-class SsaSynthNode extends Node, TSsaSynthNode {
-  SsaImpl::SynthNode node;
-
-  SsaSynthNode() { this = TSsaSynthNode(node) }
-
-  /** Gets the synthesized SSA node associated with this node. */
-  SsaImpl::SynthNode getSynthNode() { result = node }
-
-  override DataFlowCallable getEnclosingCallable() {
-    result.asSourceCallable() = this.getFunction()
-  }
-
-  override Declaration getFunction() { result = node.getBasicBlock().getEnclosingFunction() }
-
-  override Type getType() { result = node.getSourceVariable().getType() }
-
-  override predicate isGLValue() { node.getSourceVariable().isGLValue() }
-
-  final override Location getLocationImpl() { result = node.getLocation() }
-
-  override string toStringImpl() { result = node.toString() }
-}
-
-/**
- * INTERNAL: do not use.
- *
- * Dataflow nodes necessary for iterator flow
- */
-class SsaIteratorNode extends Node, TSsaIteratorNode {
-  IteratorFlow::IteratorFlowNode node;
-
-  SsaIteratorNode() { this = TSsaIteratorNode(node) }
-
-  /** Gets the phi node associated with this node. */
-  IteratorFlow::IteratorFlowNode getIteratorFlowNode() { result = node }
-
-  override DataFlowCallable getEnclosingCallable() {
-    result.asSourceCallable() = this.getFunction()
-  }
-
-  override Declaration getFunction() { result = node.getFunction() }
-
-  override Type getType() { result = node.getType() }
-
-  final override Location getLocationImpl() { result = node.getLocation() }
-
-  override string toStringImpl() { result = node.toString() }
-}
-
-/**
- * INTERNAL: do not use.
- *
- * A node representing a value after leaving a function.
- */
-class SideEffectOperandNode extends Node instanceof IndirectOperand {
-  CallInstruction call;
-  int argumentIndex;
-  ArgumentOperand arg;
-
-  SideEffectOperandNode() {
-    arg = call.getArgumentOperand(argumentIndex) and
-    IndirectOperand.super.hasOperandAndIndirectionIndex(arg, _)
-  }
-
-  CallInstruction getCallInstruction() { result = call }
-
-  /** Gets the underlying operand and the underlying indirection index. */
-  predicate hasAddressOperandAndIndirectionIndex(Operand operand, int indirectionIndex) {
-    IndirectOperand.super.hasOperandAndIndirectionIndex(operand, indirectionIndex)
-  }
-
-  int getArgumentIndex() { result = argumentIndex }
-
-  override DataFlowCallable getEnclosingCallable() {
-    result.asSourceCallable() = this.getFunction()
-  }
-
-  override Declaration getFunction() { result = call.getEnclosingFunction() }
-
-  Expr getArgument() { result = call.getArgument(argumentIndex).getUnconvertedResultExpression() }
-}
-
-/**
- * INTERNAL: do not use.
- *
- * A node representing the value of a global variable just before returning
- * from a function body.
- */
-class FinalGlobalValue extends Node, TFinalGlobalValue {
-  SsaImpl::GlobalUse globalUse;
-
-  FinalGlobalValue() { this = TFinalGlobalValue(globalUse) }
-
-  /** Gets the underlying SSA use. */
-  SsaImpl::GlobalUse getGlobalUse() { result = globalUse }
-
-  override DataFlowCallable getEnclosingCallable() {
-    result.asSourceCallable() = this.getFunction()
-  }
-
-  override Declaration getFunction() { result = globalUse.getIRFunction().getFunction() }
-
-  override Type getType() {
-    exists(int indirectionIndex |
-      indirectionIndex = globalUse.getIndirectionIndex() and
-      result = getTypeImpl(globalUse.getUnderlyingType(), indirectionIndex)
-    )
-  }
-
-  final override Location getLocationImpl() { result = globalUse.getLocation() }
-
-  override string toStringImpl() { result = globalUse.toString() }
-}
-
-/**
- * INTERNAL: do not use.
- *
- * A node representing the value of a global variable just after entering
- * a function body.
- */
-class InitialGlobalValue extends Node, TInitialGlobalValue {
-  SsaImpl::GlobalDef globalDef;
-
-  InitialGlobalValue() { this = TInitialGlobalValue(globalDef) }
-
-  /** Gets the underlying SSA definition. */
-  SsaImpl::GlobalDef getGlobalDef() { result = globalDef }
-
-  override DataFlowCallable getEnclosingCallable() {
-    result.asSourceCallable() = this.getFunction()
-  }
-
-  override Declaration getFunction() { result = globalDef.getFunction() }
-
-  final override predicate isGLValue() { globalDef.getIndirectionIndex() = 0 }
-
-  override Type getType() { result = globalDef.getUnderlyingType() }
-
-  final override Location getLocationImpl() { result = globalDef.getLocation() }
-
-  override string toStringImpl() { result = globalDef.toString() }
-}
-
-/**
- * INTERNAL: do not use.
- *
- * A node representing a parameter for a function with no body.
- */
-class BodyLessParameterNodeImpl extends Node, TBodyLessParameterNodeImpl {
-  Parameter p;
-  int indirectionIndex;
-
-  BodyLessParameterNodeImpl() { this = TBodyLessParameterNodeImpl(p, indirectionIndex) }
-
-  override DataFlowCallable getEnclosingCallable() {
-    result.asSourceCallable() = this.getFunction()
-  }
-
-  override Declaration getFunction() { result = p.getFunction() }
-
-  /** Gets the indirection index of this node. */
-  int getIndirectionIndex() { result = indirectionIndex }
-
-  override Type getType() {
-    result = getTypeImpl(p.getUnderlyingType(), this.getIndirectionIndex())
-  }
-
-  final override Location getLocationImpl() {
-    result = unique( | | p.getLocation())
-    or
-    count(p.getLocation()) != 1 and
-    result instanceof UnknownLocation
-  }
-
-  final override string toStringImpl() {
-    exists(string prefix | prefix = stars(this) | result = prefix + p.toString())
-  }
-}
-
-/**
- * A data-flow node used to model flow summaries. That is, a dataflow node
- * that is synthesized to represent a parameter, return value, or other part
- * of a models-as-data modeled function.
- */
-class FlowSummaryNode extends Node, TFlowSummaryNode {
-  /**
-   * Gets the models-as-data `SummaryNode` associated with this dataflow
-   * `FlowSummaryNode`.
-   */
-  FlowSummaryImpl::Private::SummaryNode getSummaryNode() { this = TFlowSummaryNode(result) }
-
-  /**
-   * Gets the summarized callable that this node belongs to.
-   */
-  FlowSummaryImpl::Public::SummarizedCallable getSummarizedCallable() {
-    result = this.getSummaryNode().getSummarizedCallable()
-  }
-
-  /**
-   * Gets the enclosing callable. For a `FlowSummaryNode` this is always the
-   * summarized function this node is part of.
-   */
-  override DataFlowCallable getEnclosingCallable() {
-    result.asSummarizedCallable() = this.getSummarizedCallable()
-  }
-
-  override Location getLocationImpl() { result = this.getSummarizedCallable().getLocation() }
-
-  override string toStringImpl() { result = this.getSummaryNode().toString() }
-}
-
-/**
- * INTERNAL: do not use.
- *
- * A node representing the indirection of a value that is
- * about to be returned from a function.
- */
-class IndirectReturnNode extends Node {
-  IndirectReturnNode() {
-    this instanceof FinalParameterNode
-    or
-    this.(IndirectOperand)
-        .hasOperandAndIndirectionIndex(any(ReturnValueInstruction ret).getReturnAddressOperand(), _)
-  }
-
-  override SourceCallable getEnclosingCallable() { result.asSourceCallable() = this.getFunction() }
-
-  /**
-   * Holds if this node represents the value that is returned to the caller
-   * through a `return` statement.
-   */
-  predicate isNormalReturn() { this instanceof IndirectOperand }
-
-  /**
-   * Holds if this node represents the value that is returned to the caller
-   * by writing to the `argumentIndex`'th argument of the call.
-   */
-  predicate isParameterReturn(int argumentIndex) {
-    this.(FinalParameterNode).getArgumentIndex() = argumentIndex
-  }
-
-  /** Gets the indirection index of this indirect return node. */
-  int getIndirectionIndex() {
-    result = this.(FinalParameterNode).getIndirectionIndex()
-    or
-    this.(IndirectOperand).hasOperandAndIndirectionIndex(_, result)
-  }
-}
-
-/**
- * INTERNAL: do not use.
- *
- * A node representing the indirection of a value after it
- * has been returned from a function.
- */
-class IndirectArgumentOutNode extends PostUpdateNodeImpl {
-  override ArgumentOperand operand;
-
-  int getArgumentIndex() {
-    exists(CallInstruction call | call.getArgumentOperand(result) = operand)
-  }
-
-  Operand getAddressOperand() { result = operand }
-
-  CallInstruction getCallInstruction() { result.getAnArgumentOperand() = operand }
-
-  /**
-   * Gets the `Function` that the call targets, if this is statically known.
-   */
-  Function getStaticCallTarget() { result = this.getCallInstruction().getStaticCallTarget() }
-
-  override string toStringImpl() {
-    exists(string prefix | if indirectionIndex > 0 then prefix = "" else prefix = "pointer to " |
-      // This string should be unique enough to be helpful but common enough to
-      // avoid storing too many different strings.
-      result = prefix + this.getStaticCallTarget().getName() + " output argument"
-      or
-      not exists(this.getStaticCallTarget()) and
-      result = prefix + "output argument"
-    )
-  }
-}
-
-/**
- * Holds if `node` is an indirect operand with columns `(operand, indirectionIndex)`, and
- * `operand` represents a use of the fully converted value of `call`.
- */
-private predicate hasOperand(Node node, CallInstruction call, int indirectionIndex, Operand operand) {
-  operandForFullyConvertedCall(operand, call) and
-  hasOperandAndIndex(node, operand, indirectionIndex)
-}
-
-/**
- * Holds if `node` is an indirect instruction with columns `(instr, indirectionIndex)`, and
- * `instr` represents a use of the fully converted value of `call`.
- *
- * Note that `hasOperand(node, _, _, _)` implies `not hasInstruction(node, _, _, _)`.
- */
-private predicate hasInstruction(
-  Node node, CallInstruction call, int indirectionIndex, Instruction instr
-) {
-  instructionForFullyConvertedCall(instr, call) and
-  hasInstructionAndIndex(node, instr, indirectionIndex)
-}
-
-/**
- * INTERNAL: do not use.
- *
- * A node representing the indirect value of a function call (i.e., a value hidden
- * behind a number of indirections).
- */
-class IndirectReturnOutNode extends Node {
-  CallInstruction call;
-  int indirectionIndex;
-
-  IndirectReturnOutNode() {
-    // Annoyingly, we need to pick the fully converted value as the output of the function to
-    // make flow through in the shared dataflow library work correctly.
-    hasOperand(this, call, indirectionIndex, _)
-    or
-    hasInstruction(this, call, indirectionIndex, _)
-  }
-
-  CallInstruction getCallInstruction() { result = call }
-
-  int getIndirectionIndex() { result = indirectionIndex }
-
-  /** Gets the operand associated with this node, if any. */
-  Operand getOperand() { hasOperand(this, call, indirectionIndex, result) }
-
-  /** Gets the instruction associated with this node, if any. */
-  Instruction getInstruction() { hasInstruction(this, call, indirectionIndex, result) }
-}
-
-/**
- * An `IndirectReturnOutNode` which is used as a destination of a store operation.
- * When it's used for a store operation it's useful to have this be a `PostUpdateNode` for
- * the shared dataflow library's flow-through mechanism to detect flow in cases such as:
- * ```cpp
- * struct MyInt {
- *   int i;
- *   int& getRef() { return i; }
- * };
- * ...
- * MyInt mi;
- * mi.getRef() = source(); // this is detected as a store to `i` via flow-through.
- * sink(mi.i);
- * ```
- */
-private class PostIndirectReturnOutNode extends IndirectReturnOutNode, PostUpdateNode {
-  PostIndirectReturnOutNode() {
-    any(StoreInstruction store).getDestinationAddressOperand() = this.getOperand()
-  }
-
-  override Node getPreUpdateNode() { result = this }
-}
-
-/**
- * INTERNAL: Do not use.
- *
- * Returns `t`, but stripped of the outer-most `indirectionIndex` number of indirections.
- */
-private Type getTypeImpl0(Type t, int indirectionIndex) {
-  indirectionIndex = 0 and
-  result = t
-  or
-  indirectionIndex > 0 and
-  exists(Type stripped |
-    stripped = stripPointer(t.stripTopLevelSpecifiers()) and
-    // We need to avoid the case where `stripPointer(t) = t` (which can happen
-    // on iterators that specify a `value_type` that is the iterator itself).
-    // Such a type would create an infinite loop otherwise. For these cases we
-    // simply don't produce a result for `getTypeImpl`.
-    // To be on the safe side, we check whether the _unspecified_ type has
-    // changed since this also prevents an infinite loop when `stripped` and
-    // `t` only differ by const'ness or volatile'ness.
-    stripped.getUnspecifiedType() != t.getUnspecifiedType() and
-    result = getTypeImpl0(stripped, indirectionIndex - 1)
-  )
-}
-
-/**
- * INTERNAL: Do not use.
- *
- * Returns `t`, but stripped of the outer-most `indirectionIndex` number of indirections.
- *
- * If `indirectionIndex` cannot be stripped off `t`, an `UnknownType` is returned.
- */
-bindingset[t, indirectionIndex]
-pragma[inline_late]
-Type getTypeImpl(Type t, int indirectionIndex) {
-  result = getTypeImpl0(t, indirectionIndex)
-  or
-  // If we cannot produce the right type we return an error type.
-  // This can sometimes happen when we don't know the real
-  // type of a void pointer.
-  not exists(getTypeImpl0(t, indirectionIndex)) and
-  result instanceof UnknownType
-}
-
-private module RawIndirectNodes {
-  /**
-   * INTERNAL: Do not use.
-   *
-   * A node that represents the indirect value of an operand in the IR
-   * after `index` number of loads.
-   */
-  private class RawIndirectOperand0 extends Node, TRawIndirectOperand0 {
-    Node0Impl node;
-    int indirectionIndex;
-
-    RawIndirectOperand0() { this = TRawIndirectOperand0(node, indirectionIndex) }
-
-    /** Gets the underlying instruction. */
-    Operand getOperand() { result = node.asOperand() }
-
-    /** Gets the underlying indirection index. */
-    int getIndirectionIndex() { result = indirectionIndex }
-
-    override Declaration getFunction() { result = node.getFunction() }
-
-    override DataFlowCallable getEnclosingCallable() {
-      result.asSourceCallable() = node.getEnclosingCallable()
-    }
-
-    override predicate isGLValue() { this.getOperand().isGLValue() }
-
-    override Type getType() {
-      exists(int sub, Type type, boolean isGLValue |
-        type = getOperandType(this.getOperand(), isGLValue) and
-        if isGLValue = true then sub = 1 else sub = 0
-      |
-        result = getTypeImpl(type.getUnderlyingType(), indirectionIndex - sub)
-      )
-    }
-
-    final override Location getLocationImpl() {
-      if exists(this.getOperand().getLocation())
-      then result = this.getOperand().getLocation()
-      else result instanceof UnknownLocation
-    }
-
-    override string toStringImpl() {
-      result = stars(this) + operandNode(this.getOperand()).toStringImpl()
-    }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   *
-   * A node that represents the indirect value of an instruction in the IR
-   * after `index` number of loads.
-   */
-  private class RawIndirectInstruction0 extends Node, TRawIndirectInstruction0 {
-    Node0Impl node;
-    int indirectionIndex;
-
-    RawIndirectInstruction0() { this = TRawIndirectInstruction0(node, indirectionIndex) }
-
-    /** Gets the underlying instruction. */
-    Instruction getInstruction() { result = node.asInstruction() }
-
-    /** Gets the underlying indirection index. */
-    int getIndirectionIndex() { result = indirectionIndex }
-
-    override Declaration getFunction() { result = node.getFunction() }
-
-    override DataFlowCallable getEnclosingCallable() {
-      result.asSourceCallable() = node.getEnclosingCallable()
-    }
-
-    override predicate isGLValue() { this.getInstruction().isGLValue() }
-
-    override Type getType() {
-      exists(int sub, Type type, boolean isGLValue |
-        type = getInstructionType(this.getInstruction(), isGLValue) and
-        if isGLValue = true then sub = 1 else sub = 0
-      |
-        result = getTypeImpl(type.getUnderlyingType(), indirectionIndex - sub)
-      )
-    }
-
-    final override Location getLocationImpl() {
-      if exists(this.getInstruction().getLocation())
-      then result = this.getInstruction().getLocation()
-      else result instanceof UnknownLocation
-    }
-
-    override string toStringImpl() {
-      result = stars(this) + instructionNode(this.getInstruction()).toStringImpl()
-    }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   *
-   * A node that represents the indirect value of an operand in the IR
-   * after a number of loads.
-   */
-  class RawIndirectOperand extends Node {
-    int indirectionIndex;
-    Operand operand;
-
-    RawIndirectOperand() {
-      exists(Node0Impl node | operand = node.asOperand() |
-        this = TRawIndirectOperand0(node, indirectionIndex)
-        or
-        this = TRawIndirectInstruction0(node, indirectionIndex)
-      )
-    }
-
-    /** Gets the operand associated with this node. */
-    Operand getOperand() { result = operand }
-
-    /** Gets the underlying indirection index. */
-    int getIndirectionIndex() { result = indirectionIndex }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   *
-   * A node that represents the indirect value of an instruction in the IR
-   * after a number of loads.
-   */
-  class RawIndirectInstruction extends Node {
-    int indirectionIndex;
-    Instruction instr;
-
-    RawIndirectInstruction() {
-      exists(Node0Impl node | instr = node.asInstruction() |
-        this = TRawIndirectOperand0(node, indirectionIndex)
-        or
-        this = TRawIndirectInstruction0(node, indirectionIndex)
-      )
-    }
-
-    /** Gets the instruction associated with this node. */
-    Instruction getInstruction() { result = instr }
-
-    /** Gets the underlying indirection index. */
-    int getIndirectionIndex() { result = indirectionIndex }
-  }
-}
-
-import RawIndirectNodes
-
-/**
- * INTERNAL: do not use.
- *
- * A node representing the value of an output parameter
- * just before reaching the end of a function.
- */
-class FinalParameterNode extends Node, TFinalParameterNode {
-  Parameter p;
-  int indirectionIndex;
-
-  FinalParameterNode() { this = TFinalParameterNode(p, indirectionIndex) }
-
-  /** Gets the parameter associated with this final use. */
-  Parameter getParameter() { result = p }
-
-  /** Gets the underlying indirection index. */
-  int getIndirectionIndex() { result = indirectionIndex }
-
-  /** Gets the argument index associated with this final use. */
-  final int getArgumentIndex() { result = p.getIndex() }
-
-  override Declaration getFunction() { result = p.getFunction() }
-
-  override DataFlowCallable getEnclosingCallable() {
-    result.asSourceCallable() = this.getFunction()
-  }
-
-  override Type getType() { result = getTypeImpl(p.getUnderlyingType(), indirectionIndex) }
-
-  final override Location getLocationImpl() {
-    // Parameters can have multiple locations. When there's a unique location we use
-    // that one, but if multiple locations exist we default to an unknown location.
-    result = unique( | | p.getLocation())
-    or
-    not exists(unique( | | p.getLocation())) and
-    result instanceof UnknownLocation
-  }
-
-  override string toStringImpl() { result = stars(this) + p.toString() }
-}
-
-/**
- * The value of an uninitialized local variable, viewed as a node in a data
- * flow graph.
- */
-class UninitializedNode extends Node {
-  LocalVariable v;
-
-  UninitializedNode() {
-    exists(SsaImpl::Definition def, SsaImpl::SourceVariable sv |
-      def.getIndirectionIndex() = 0 and
-      def.getValue().asInstruction() instanceof UninitializedInstruction and
-      SsaImpl::defToNode(this, def, sv) and
-      v = sv.getBaseVariable().(SsaImpl::BaseIRVariable).getIRVariable().getAst()
-    )
-  }
-
-  /** Gets the uninitialized local variable corresponding to this node. */
-  LocalVariable getLocalVariable() { result = v }
-}
-
-abstract private class AbstractParameterNode extends Node {
-  /**
-   * Holds if this node is the parameter of `f` at the specified position. The
-   * implicit `this` parameter is considered to have position `-1`, and
-   * pointer-indirection parameters are at further negative positions.
-   */
-  predicate isSourceParameterOf(Function f, ParameterPosition pos) { none() }
-
-  /**
-   * Holds if this node is the parameter of `sc` at the specified position. The
-   * implicit `this` parameter is considered to have position `-1`, and
-   * pointer-indirection parameters are at further negative positions.
-   */
-  predicate isSummaryParameterOf(
-    FlowSummaryImpl::Public::SummarizedCallable sc, ParameterPosition pos
-  ) {
-    none()
-  }
-
-  /**
-   * Holds if this node is the parameter of `c` at the specified position. The
-   * implicit `this` parameter is considered to have position `-1`, and
-   * pointer-indirection parameters are at further negative positions.
-   */
-  final predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) {
-    this.isSummaryParameterOf(c.asSummarizedCallable(), pos)
-    or
-    this.isSourceParameterOf(c.asSourceCallable(), pos)
-  }
-
-  /** Gets the `Parameter` associated with this node, if it exists. */
-  Parameter getParameter() { none() } // overridden by subclasses
-}
-
-abstract private class AbstractIndirectParameterNode extends AbstractParameterNode {
-  /** Gets the indirection index of this parameter node. */
-  abstract int getIndirectionIndex();
-}
-
-/**
- * INTERNAL: do not use.
- *
- * A node representing an indirection of a parameter.
- */
-final class IndirectParameterNode = AbstractIndirectParameterNode;
-
-pragma[noinline]
-private predicate indirectParameterNodeHasArgumentIndexAndIndex(
-  IndirectInstructionParameterNode node, int argumentIndex, int indirectionIndex
-) {
-  node.hasInstructionAndIndirectionIndex(_, indirectionIndex) and
-  node.getArgumentIndex() = argumentIndex
-}
-
-pragma[noinline]
-private predicate indirectPositionHasArgumentIndexAndIndex(
-  IndirectionPosition pos, int argumentIndex, int indirectionIndex
-) {
-  pos.getArgumentIndex() = argumentIndex and
-  pos.getIndirectionIndex() = indirectionIndex
-}
-
-private class IndirectInstructionParameterNode extends AbstractIndirectParameterNode instanceof IndirectInstruction
-{
-  InitializeParameterInstruction init;
-
-  IndirectInstructionParameterNode() {
-    IndirectInstruction.super.hasInstructionAndIndirectionIndex(init, _)
-  }
-
-  int getArgumentIndex() { init.hasIndex(result) }
-
-  override string toStringImpl() {
-    exists(string prefix | prefix = stars(this) |
-      result = prefix + this.getParameter().toString()
-      or
-      not exists(this.getParameter()) and
-      result = prefix + "this"
-    )
-  }
-
-  /** Gets the parameter whose indirection is initialized. */
-  override Parameter getParameter() { result = init.getParameter() }
-
-  override DataFlowCallable getEnclosingCallable() {
-    result.asSourceCallable() = this.getFunction()
-  }
-
-  override Declaration getFunction() { result = init.getEnclosingFunction() }
-
-  override predicate isSourceParameterOf(Function f, ParameterPosition pos) {
-    this.getFunction() = f and
-    exists(int argumentIndex, int indirectionIndex |
-      indirectPositionHasArgumentIndexAndIndex(pos, argumentIndex, indirectionIndex) and
-      indirectParameterNodeHasArgumentIndexAndIndex(this, argumentIndex, indirectionIndex)
-    )
-  }
-
-  /** Gets the underlying operand and the underlying indirection index. */
-  predicate hasInstructionAndIndirectionIndex(Instruction instr, int index) {
-    IndirectInstruction.super.hasInstructionAndIndirectionIndex(instr, index)
-  }
-
-  final override int getIndirectionIndex() { this.hasInstructionAndIndirectionIndex(init, result) }
-}
-
-/**
- * The value of a parameter at function entry, viewed as a node in a data
- * flow graph. This includes both explicit parameters such as `x` in `f(x)`
- * and implicit parameters such as `this` in `x.f()`.
- *
- * To match a specific kind of parameter, consider using one of the subclasses
- * `ExplicitParameterNode`, `ThisParameterNode`, or
- * `ParameterIndirectionNode`.
- */
-final class ParameterNode = AbstractParameterNode;
-
-abstract private class AbstractDirectParameterNode extends AbstractParameterNode { }
-
-/** An explicit positional parameter, including `this`, but not `...`. */
-final class DirectParameterNode = AbstractDirectParameterNode;
-
-/**
- * INTERNAL: Do not use.
- *
- * A non-indirect parameter node that is represented as an `Instruction`.
- */
-abstract class InstructionDirectParameterNode extends InstructionNode, AbstractDirectParameterNode {
-  final override InitializeParameterInstruction instr;
-
-  /**
-   * INTERNAL: Do not use.
-   *
-   * Gets the `IRVariable` that this parameter references.
-   */
-  final IRVariable getIRVariable() { result = instr.getIRVariable() }
-}
-
-abstract private class AbstractExplicitParameterNode extends AbstractDirectParameterNode { }
-
-final class ExplicitParameterNode = AbstractExplicitParameterNode;
-
-/** An explicit positional parameter, not including `this` or `...`. */
-private class ExplicitParameterInstructionNode extends AbstractExplicitParameterNode,
-  InstructionDirectParameterNode
-{
-  ExplicitParameterInstructionNode() { exists(instr.getParameter()) }
-
-  override predicate isSourceParameterOf(Function f, ParameterPosition pos) {
-    f.getParameter(pos.(DirectPosition).getArgumentIndex()) = instr.getParameter()
-  }
-
-  override string toStringImpl() { result = instr.getParameter().toString() }
-
-  override Parameter getParameter() { result = instr.getParameter() }
-}
-
-/** An implicit `this` parameter. */
-class ThisParameterInstructionNode extends AbstractExplicitParameterNode,
-  InstructionDirectParameterNode
-{
-  ThisParameterInstructionNode() { instr.getIRVariable() instanceof IRThisVariable }
-
-  override predicate isSourceParameterOf(Function f, ParameterPosition pos) {
-    pos.(DirectPosition).getArgumentIndex() = -1 and
-    instr.getEnclosingFunction() = f
-  }
-
-  override string toStringImpl() { result = "this" }
-}
-
-/**
- * A parameter node that is part of a summary.
- */
-class SummaryParameterNode extends AbstractParameterNode, FlowSummaryNode {
-  SummaryParameterNode() {
-    FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), _)
-  }
-
-  private ParameterPosition getPosition() {
-    FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), result)
-  }
-
-  override predicate isSummaryParameterOf(
-    FlowSummaryImpl::Public::SummarizedCallable c, ParameterPosition p
-  ) {
-    c = this.getSummarizedCallable() and
-    p = this.getPosition()
-  }
-}
-
-private class DirectBodyLessParameterNode extends AbstractExplicitParameterNode,
-  BodyLessParameterNodeImpl
-{
-  DirectBodyLessParameterNode() { indirectionIndex = 0 }
-
-  override predicate isSourceParameterOf(Function f, ParameterPosition pos) {
-    this.getFunction() = f and
-    f.getParameter(pos.(DirectPosition).getArgumentIndex()) = p
-  }
-
-  override Parameter getParameter() { result = p }
-}
-
-private class IndirectBodyLessParameterNode extends AbstractIndirectParameterNode,
-  BodyLessParameterNodeImpl
-{
-  IndirectBodyLessParameterNode() { not this instanceof DirectBodyLessParameterNode }
-
-  override predicate isSourceParameterOf(Function f, ParameterPosition pos) {
-    exists(int argumentPosition |
-      this.getFunction() = f and
-      f.getParameter(argumentPosition) = p and
-      indirectPositionHasArgumentIndexAndIndex(pos, argumentPosition, indirectionIndex)
-    )
-  }
-
-  override int getIndirectionIndex() {
-    result = BodyLessParameterNodeImpl.super.getIndirectionIndex()
-  }
-
-  override Parameter getParameter() { result = p }
-}
-
-/**
- * A node associated with an object after an operation that might have
- * changed its state.
- *
- * This can be either the argument to a callable after the callable returns
- * (which might have mutated the argument), or the qualifier of a field after
- * an update to the field.
- *
- * Nodes corresponding to AST elements, for example `ExprNode`, usually refer
- * to the value before the update with the exception of `ClassInstanceExpr`,
- * which represents the value after the constructor has run.
- */
-abstract class PostUpdateNode extends Node {
-  /**
-   * Gets the node before the state update.
-   */
-  abstract Node getPreUpdateNode();
-
-  final override Type getType() { result = this.getPreUpdateNode().getType() }
-}
-
-/**
- * The base class for nodes that perform "partial definitions".
- *
- * In contrast to a normal "definition", which provides a new value for
- * something, a partial definition is an expression that may affect a
- * value, but does not necessarily replace it entirely. For example:
- * ```
- * x.y = 1; // a partial definition of the object `x`.
- * x.y.z = 1; // a partial definition of the object `x.y` and `x`.
- * x.setY(1); // a partial definition of the object `x`.
- * setY(&x); // a partial definition of the object `x`.
- * ```
- */
-abstract private class PartialDefinitionNode extends PostUpdateNode {
-  /** Gets the indirection index of this node. */
-  abstract int getIndirectionIndex();
-
-  /** Gets the expression that is partially defined by this node. */
-  abstract Expr getDefinedExpr();
-}
-
-/**
- * A `PostUpdateNode` that is part of a flow summary. These are synthesized,
- * for example, when a models-as-data summary models a write to a field since
- * the write needs to target a `PostUpdateNode`.
- */
-class SummaryPostUpdateNode extends FlowSummaryNode, PostUpdateNode {
-  SummaryPostUpdateNode() {
-    FlowSummaryImpl::Private::summaryPostUpdateNode(this.getSummaryNode(), _)
-  }
-
-  override Node getPreUpdateNode() {
-    FlowSummaryImpl::Private::summaryPostUpdateNode(this.getSummaryNode(),
-      result.(FlowSummaryNode).getSummaryNode())
-  }
-}
-
-/**
- * A node that represents the value of a variable after a function call that
- * may have changed the variable because it's passed by reference.
- *
- * A typical example would be a call `f(&x)`. Firstly, there will be flow into
- * `x` from previous definitions of `x`. Secondly, there will be a
- * `DefinitionByReferenceNode` to represent the value of `x` after the call has
- * returned. This node will have its `getArgument()` equal to `&x` and its
- * `getVariableAccess()` equal to `x`.
- */
-class DefinitionByReferenceNode extends IndirectArgumentOutNode {
-  DefinitionByReferenceNode() { this.getIndirectionIndex() > 0 }
-
-  /** Gets the unconverted argument corresponding to this node. */
-  Expr getArgument() { result = this.getAddressOperand().getDef().getUnconvertedResultExpression() }
-
-  /** Gets the parameter through which this value is assigned. */
-  Parameter getParameter() {
-    result = this.getCallInstruction().getStaticCallTarget().getParameter(this.getArgumentIndex())
-  }
-}
-
-/**
- * A `Node` corresponding to a global (or `static` local) variable in the
- * program, as opposed to the value of that variable at some particular point.
- * This is used to model flow through global variables (and `static` local
- * variables).
- *
- * There is no `VariableNode` for non-`static` local variables.
- */
-class VariableNode extends Node, TGlobalLikeVariableNode {
-  Variable v;
-  int indirectionIndex;
-
-  VariableNode() { this = TGlobalLikeVariableNode(v, indirectionIndex) }
-
-  /** Gets the variable corresponding to this node. */
-  Variable getVariable() { result = v }
-
-  /** Gets the indirection index of this node. */
-  int getIndirectionIndex() { result = indirectionIndex }
-
-  override Declaration getFunction() { none() }
-
-  override DataFlowCallable getEnclosingCallable() {
-    // When flow crosses from one _enclosing callable_ to another, the
-    // interprocedural data-flow library discards call contexts and inserts a
-    // node in the big-step relation used for human-readable path explanations.
-    // Therefore we want a distinct enclosing callable for each `VariableNode`,
-    // and that can be the `Variable` itself.
-    result.asSourceCallable() = v
-  }
-
-  override Type getType() { result = getTypeImpl(v.getUnderlyingType(), indirectionIndex - 1) }
-
-  final override Location getLocationImpl() {
-    // Certain variables (such as parameters) can have multiple locations.
-    // When there's a unique location we use that one, but if multiple locations
-    // exist we default to an unknown location.
-    result = unique( | | v.getLocation())
-    or
-    not exists(unique( | | v.getLocation())) and
-    result instanceof UnknownLocation
-  }
-
-  override string toStringImpl() { result = stars(this) + v.toString() }
-}
-
-/**
- * Gets the node corresponding to `instr`.
- */
-InstructionNode instructionNode(Instruction instr) { result.getInstruction() = instr }
-
-/**
- * Gets the node corresponding to `operand`.
- */
-OperandNode operandNode(Operand operand) { result.getOperand() = operand }
-
-/**
- * Gets the `Node` corresponding to the value of evaluating `e` or any of its
- * conversions. There is no result if `e` is a `Conversion`. For data flowing
- * _out of_ an expression, like when an argument is passed by reference, use
- * `definitionByReferenceNodeFromArgument` instead.
- */
-ExprNode exprNode(Expr e) { result.getExpr(_) = e }
-
-/**
- * Gets the `Node` corresponding to the value of evaluating `e`. Here, `e` may
- * be a `Conversion`. For data flowing _out of_ an expression, like when an
- * argument is passed by reference, use
- * `definitionByReferenceNodeFromArgument` instead.
- */
-ExprNode convertedExprNode(Expr e) { result.getConvertedExpr(_) = e }
-
-/**
- * Gets the `Node` corresponding to the value of `p` at function entry.
- */
-ExplicitParameterNode parameterNode(Parameter p) { result.getParameter() = p }
-
-/**
- * Gets the `Node` corresponding to a definition by reference of the variable
- * that is passed as unconverted `argument` of a call.
- */
-DefinitionByReferenceNode definitionByReferenceNodeFromArgument(Expr argument) {
-  result.getArgument() = argument
-}
-
-/** Gets the `VariableNode` corresponding to the variable `v`. */
-VariableNode variableNode(Variable v) {
-  result.getVariable() = v and result.getIndirectionIndex() = 1
-}
-
-/**
- * DEPRECATED: See UninitializedNode.
- *
- * Gets the `Node` corresponding to the value of an uninitialized local
- * variable `v`.
- */
-Node uninitializedNode(LocalVariable v) { none() }
-
-predicate hasOperandAndIndex(IndirectOperand indirectOperand, Operand operand, int indirectionIndex) {
-  indirectOperand.hasOperandAndIndirectionIndex(operand, indirectionIndex)
-}
-
-predicate hasInstructionAndIndex(
-  IndirectInstruction indirectInstr, Instruction instr, int indirectionIndex
-) {
-  indirectInstr.hasInstructionAndIndirectionIndex(instr, indirectionIndex)
-}
+private import DataFlowNodes
+import DataFlowNodes::Public
 
 cached
 private module Cached {
@@ -1818,6 +122,7 @@ private module Cached {
   cached
   predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo, string model) {
     (
+      TaintTrackingUtil::forceCachingInSameStage() and
       // Def-use/Use-use flow
       SsaImpl::ssaFlow(nodeFrom, nodeTo)
       or
@@ -1919,35 +224,7 @@ private module Cached {
       )
     )
   }
-}
 
-import Cached
-
-/**
- * Holds if data flows from `source` to `sink` in zero or more local
- * (intra-procedural) steps.
- */
-pragma[inline]
-predicate localFlow(Node source, Node sink) { localFlowStep*(source, sink) }
-
-/**
- * Holds if data can flow from `i1` to `i2` in zero or more
- * local (intra-procedural) steps.
- */
-pragma[inline]
-predicate localInstructionFlow(Instruction e1, Instruction e2) {
-  localFlow(instructionNode(e1), instructionNode(e2))
-}
-
-/**
- * INTERNAL: Do not use.
- *
- * Ideally this module would be private, but the `asExprInternal` predicate is
- * needed in `DefaultTaintTrackingImpl`. Once `DefaultTaintTrackingImpl` is gone
- * we can make this module private.
- */
-cached
-module ExprFlowCached {
   /**
    * Holds if `n` is an indirect operand of a `PointerArithmeticInstruction`, and
    * `e` is the result of loading from the `PointerArithmeticInstruction`.
@@ -1997,8 +274,7 @@ module ExprFlowCached {
    * `x[i]` steps to the expression `x[i - 1]` without traversing the
    * entire chain.
    */
-  cached
-  Expr asExprInternal(Node n) {
+  private Expr asExprInternal(Node n) {
     isIndirectBaseOfArrayAccess(n, result)
     or
     not isIndirectBaseOfArrayAccess(n, _) and
@@ -2060,7 +336,23 @@ module ExprFlowCached {
   predicate localExprFlowStep(Expr e1, Expr e2) { localExprFlowStepImpl(_, e1, _, e2) }
 }
 
-import ExprFlowCached
+import Cached
+
+/**
+ * Holds if data flows from `source` to `sink` in zero or more local
+ * (intra-procedural) steps.
+ */
+pragma[inline]
+predicate localFlow(Node source, Node sink) { localFlowStep*(source, sink) }
+
+/**
+ * Holds if data can flow from `i1` to `i2` in zero or more
+ * local (intra-procedural) steps.
+ */
+pragma[inline]
+predicate localInstructionFlow(Instruction e1, Instruction e2) {
+  localFlow(instructionNode(e1), instructionNode(e2))
+}
 
 /**
  * Holds if data can flow from `e1` to `e2` in one or more
@@ -2080,158 +372,6 @@ predicate localExprFlow(Expr e1, Expr e2) {
   localExprFlowPlus(e1, e2)
 }
 
-/**
- * A canonical representation of a field.
- *
- * For performance reasons we want a unique `Content` that represents
- * a given field across any template instantiation of a class.
- *
- * This is possible in _almost_ all cases, but there are cases where it is
- * not possible to map between a field in the uninstantiated template to a
- * field in the instantiated template. This happens in the case of local class
- * definitions (because the local class is not the template that constructs
- * the instantiation - it is the enclosing function). So this abstract class
- * has two implementations: a non-local case (where we can represent a
- * canonical field as the field declaration from an uninstantiated class
- * template or a non-templated class), and a local case (where we simply use
- * the field from the instantiated class).
- */
-abstract private class CanonicalField extends Field {
-  /** Gets a field represented by this canonical field. */
-  abstract Field getAField();
-
-  /**
-   * Gets a class that declares a field represented by this canonical field.
-   */
-  abstract Class getADeclaringType();
-
-  /**
-   * Gets a type that this canonical field may have. Note that this may
-   * not be a unique type. For example, consider this case:
-   * ```
-   * template<typename T>
-   * struct S { T x; };
-   *
-   * S<int> s1;
-   * S<char> s2;
-   * ```
-   * In this case the canonical field corresponding to `S::x` has two types:
-   * `int` and `char`.
-   */
-  Type getAType() { result = this.getAField().getType() }
-
-  Type getAnUnspecifiedType() { result = this.getAType().getUnspecifiedType() }
-}
-
-private class NonLocalCanonicalField extends CanonicalField {
-  Class declaringType;
-
-  NonLocalCanonicalField() {
-    declaringType = this.getDeclaringType() and
-    not declaringType.isFromTemplateInstantiation(_) and
-    not declaringType.isLocal() // handled in LocalCanonicalField
-  }
-
-  override Field getAField() {
-    exists(Class c | result.getDeclaringType() = c |
-      // Either the declaring class of the field is a template instantiation
-      // that has been constructed from this canonical declaration
-      c.isConstructedFrom(declaringType) and
-      pragma[only_bind_out](result.getName()) = pragma[only_bind_out](this.getName())
-      or
-      // or this canonical declaration is not a template.
-      not c.isConstructedFrom(_) and
-      result = this
-    )
-  }
-
-  override Class getADeclaringType() {
-    result = this.getDeclaringType()
-    or
-    result.isConstructedFrom(this.getDeclaringType())
-  }
-}
-
-private class LocalCanonicalField extends CanonicalField {
-  Class declaringType;
-
-  LocalCanonicalField() {
-    declaringType = this.getDeclaringType() and
-    declaringType.isLocal()
-  }
-
-  override Field getAField() { result = this }
-
-  override Class getADeclaringType() { result = declaringType }
-}
-
-/**
- * A canonical representation of a `Union`. See `CanonicalField` for the explanation for
- * why we need a canonical representation.
- */
-abstract private class CanonicalUnion extends Union {
-  /** Gets a union represented by this canonical union. */
-  abstract Union getAUnion();
-
-  /** Gets a canonical field of this canonical union. */
-  CanonicalField getACanonicalField() { result.getDeclaringType() = this }
-}
-
-private class NonLocalCanonicalUnion extends CanonicalUnion {
-  NonLocalCanonicalUnion() { not this.isFromTemplateInstantiation(_) and not this.isLocal() }
-
-  override Union getAUnion() {
-    result = this
-    or
-    result.isConstructedFrom(this)
-  }
-}
-
-private class LocalCanonicalUnion extends CanonicalUnion {
-  LocalCanonicalUnion() { this.isLocal() }
-
-  override Union getAUnion() { result = this }
-}
-
-bindingset[f]
-pragma[inline_late]
-private int getFieldSize(CanonicalField f) { result = max(f.getAType().getSize()) }
-
-/**
- * Gets a field in the union `u` whose size
- * is `bytes` number of bytes.
- */
-private CanonicalField getAFieldWithSize(CanonicalUnion u, int bytes) {
-  result = u.getACanonicalField() and
-  bytes = getFieldSize(result)
-}
-
-cached
-private newtype TContent =
-  TNonUnionContent(CanonicalField f, int indirectionIndex) {
-    // the indirection index for field content starts at 1 (because `TNonUnionContent` is thought of as
-    // the address of the field, `FieldAddress` in the IR).
-    indirectionIndex = [1 .. max(SsaImpl::getMaxIndirectionsForType(f.getAnUnspecifiedType()))] and
-    // Reads and writes of union fields are tracked using `UnionContent`.
-    not f.getDeclaringType() instanceof Union
-  } or
-  TUnionContent(CanonicalUnion u, int bytes, int indirectionIndex) {
-    exists(CanonicalField f |
-      f = u.getACanonicalField() and
-      bytes = getFieldSize(f) and
-      // We key `UnionContent` by the union instead of its fields since a write to one
-      // field can be read by any read of the union's fields. Again, the indirection index
-      // is 1-based (because 0 is considered the address).
-      indirectionIndex =
-        [1 .. max(SsaImpl::getMaxIndirectionsForType(getAFieldWithSize(u, bytes)
-                    .getAnUnspecifiedType())
-          )]
-    )
-  } or
-  TElementContent(int indirectionIndex) {
-    indirectionIndex = [1 .. getMaxElementContentIndirectionIndex()]
-  }
-
 /**
  * A description of the way data may be stored inside an object. Examples
  * include instance fields, the contents of a collection object, or the contents
@@ -2641,7 +781,54 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
     exists(unit)
   }
 
-  import ParameterizedBarrierGuard<Unit, guardChecks/4>
+  private module P = ParameterizedBarrierGuard<Unit, guardChecks/4>;
+
+  predicate getABarrierNode = P::getABarrierNode/0;
+
+  /**
+   * Gets an indirect expression node with indirection index `indirectionIndex` that is
+   * safely guarded by the given guard check.
+   *
+   * For example, given the following code:
+   * ```cpp
+   * int* p;
+   * // ...
+   * *p = source();
+   * if(is_safe_pointer(p)) {
+   *   sink(*p);
+   * }
+   * ```
+   * and the following barrier guard check:
+   * ```ql
+   * predicate myGuardChecks(IRGuardCondition g, Expr e, boolean branch) {
+   *   exists(Call call |
+   *     g.getUnconvertedResultExpression() = call and
+   *     call.getTarget().hasName("is_safe_pointer") and
+   *     e = call.getAnArgument() and
+   *     branch = true
+   *   )
+   * }
+   * ```
+   * implementing `isBarrier` as:
+   * ```ql
+   * predicate isBarrier(DataFlow::Node barrier) {
+   *   barrier = DataFlow::BarrierGuard<myGuardChecks/3>::getAnIndirectBarrierNode(1)
+   * }
+   * ```
+   * will block flow from `x = source()` to `sink(x)`.
+   *
+   * NOTE: If a non-indirect expression is tracked, use `getABarrierNode` instead.
+   */
+  Node getAnIndirectBarrierNode(int indirectionIndex) {
+    result = P::getAnIndirectBarrierNode(indirectionIndex, _)
+  }
+
+  /**
+   * Gets an indirect expression node that is safely guarded by the given guard check.
+   *
+   * See `getAnIndirectBarrierNode/1` for examples.
+   */
+  Node getAnIndirectBarrierNode() { result = getAnIndirectBarrierNode(_) }
 }
 
 private module InstrWithParam<ParamSig P> {
@@ -2752,7 +939,20 @@ module InstructionBarrierGuard<instructionGuardChecksSig/3 instructionGuardCheck
     exists(unit)
   }
 
-  import ParameterizedInstructionBarrierGuard<Unit, instructionGuardChecks/4>
+  private module P = ParameterizedInstructionBarrierGuard<Unit, instructionGuardChecks/4>;
+
+  predicate getABarrierNode = P::getABarrierNode/0;
+
+  /**
+   * Gets an indirect node with indirection index `indirectionIndex` that is
+   * safely guarded by the given guard check.
+   */
+  Node getAnIndirectBarrierNode(int indirectionIndex) {
+    result = P::getAnIndirectBarrierNode(indirectionIndex, _)
+  }
+
+  /** Gets an indirect node that is safely guarded by the given guard check. */
+  Node getAnIndirectBarrierNode() { result = getAnIndirectBarrierNode(_) }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ExprNodes.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ExprNodes.qll
index 6d69dd11e80..927d2ea9028 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ExprNodes.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ExprNodes.qll
@@ -6,8 +6,8 @@ private import cpp
 private import semmle.code.cpp.ir.IR
 private import DataFlowUtil
 private import DataFlowPrivate
-private import semmle.code.cpp.ir.implementation.raw.internal.TranslatedExpr
-private import semmle.code.cpp.ir.implementation.raw.internal.InstructionTag
+private import DataFlowNodes
+private import semmle.code.cpp.ir.implementation.raw.internal.IRConstruction as IRConstruction
 
 cached
 private module Cached {
@@ -73,17 +73,9 @@ private module Cached {
     // a result for `getConvertedResultExpression`. We remap this here so that
     // this `ConvertInstruction` maps to the result of the expression that
     // represents the extent.
-    exists(TranslatedNonConstantAllocationSize tas |
-      result = tas.getExtent().getExpr() and
-      instr = tas.getInstruction(AllocationExtentConvertTag())
-    )
+    result = IRConstruction::Raw::getAllocationExtentConvertExpr(instr)
     or
-    // There's no instruction that returns `ParenthesisExpr`, but some queries
-    // expect this
-    exists(TranslatedTransparentConversion ttc |
-      result = ttc.getExpr().(ParenthesisExpr) and
-      instr = ttc.getResult()
-    )
+    result = IRConstruction::Raw::getTransparentConversionParenthesisExpr(instr)
     or
     // Certain expressions generate `CopyValueInstruction`s only when they
     // are needed. Examples of this include crement operations and compound
@@ -112,10 +104,10 @@ private module Cached {
     // needed, and in that case the only value that will propagate forward in
     // the program is the value that's been updated. So in those cases we just
     // use the result of `node.asDefinition()` as the result of `node.asExpr()`.
-    exists(TranslatedCoreExpr tco |
-      tco.getInstruction(_) = instr and
-      tco.producesExprResult() and
-      result = asDefinitionImpl0(instr)
+    exists(StoreInstruction store |
+      store = instr and
+      IRConstruction::Raw::instructionProducesExprResult(store) and
+      result = asDefinitionImpl0(store)
     )
     or
     // IR construction breaks an array aggregate literal `{1, 2, 3}` into a
@@ -145,18 +137,9 @@ private module Cached {
     // For an expression such as `i += 2` we pretend that the generated
     // `StoreInstruction` contains the result of the expression even though
     // this isn't totally aligned with the C/C++ standard.
-    exists(TranslatedAssignOperation tao |
-      store = tao.getInstruction(AssignmentStoreTag()) and
-      result = tao.getExpr()
-    )
+    result = IRConstruction::Raw::getAssignOperationStoreExpr(store)
     or
-    // Similarly for `i++` and `++i` we pretend that the generated
-    // `StoreInstruction` contains the result of the expression even though
-    // this isn't totally aligned with the C/C++ standard.
-    exists(TranslatedCrementOperation tco |
-      store = tco.getInstruction(CrementStoreTag()) and
-      result = tco.getExpr()
-    )
+    result = IRConstruction::Raw::getCrementOperationStoreExpr(store)
   }
 
   /**
@@ -166,11 +149,7 @@ private module Cached {
    */
   private predicate excludeAsDefinitionResult(StoreInstruction store) {
     // Exclude the store to the temporary generated by a ternary expression.
-    exists(TranslatedConditionalExpr tce |
-      store = tce.getInstruction(ConditionValueFalseStoreTag())
-      or
-      store = tce.getInstruction(ConditionValueTrueStoreTag())
-    )
+    IRConstruction::Raw::isConditionalExprTempStore(store)
   }
 
   /**
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ModelUtil.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ModelUtil.qll
index f880bee1c1c..5fd7bb4567b 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ModelUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ModelUtil.qll
@@ -6,6 +6,7 @@
 private import semmle.code.cpp.ir.IR
 private import semmle.code.cpp.models.interfaces.FunctionInputsAndOutputs
 private import DataFlowUtil
+private import DataFlowNodes
 private import DataFlowPrivate
 private import SsaImpl as Ssa
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/PrintIRFieldFlowSteps.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/PrintIRFieldFlowSteps.qll
index c0976f8c3e9..93d4ddfda68 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/PrintIRFieldFlowSteps.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/PrintIRFieldFlowSteps.qll
@@ -6,6 +6,7 @@ private import cpp
 private import semmle.code.cpp.ir.IR
 private import semmle.code.cpp.ir.dataflow.internal.DataFlowUtil
 private import semmle.code.cpp.ir.dataflow.internal.DataFlowPrivate
+private import semmle.code.cpp.ir.dataflow.internal.DataFlowNodes
 private import PrintIRUtilities
 
 /** A property provider for local IR dataflow store steps. */
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/PrintIRLocalFlow.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/PrintIRLocalFlow.qll
index e310db31931..2c741e244d1 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/PrintIRLocalFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/PrintIRLocalFlow.qll
@@ -2,6 +2,7 @@ private import cpp
 private import semmle.code.cpp.ir.IR
 private import semmle.code.cpp.ir.dataflow.internal.DataFlowUtil
 private import semmle.code.cpp.ir.dataflow.internal.DataFlowPrivate
+private import semmle.code.cpp.ir.dataflow.internal.DataFlowNodes
 private import SsaImpl as Ssa
 private import PrintIRUtilities
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/PrintIRUtilities.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/PrintIRUtilities.qll
index 5dfe53c946b..2e092851b3b 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/PrintIRUtilities.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/PrintIRUtilities.qll
@@ -6,6 +6,7 @@ private import cpp
 private import semmle.code.cpp.ir.IR
 private import semmle.code.cpp.ir.dataflow.internal.DataFlowUtil
 private import semmle.code.cpp.ir.dataflow.internal.DataFlowPrivate
+private import semmle.code.cpp.ir.dataflow.internal.DataFlowNodes
 
 private Instruction getInstruction(Node n, string stars) {
   result = [n.asInstruction(), n.(RawIndirectInstruction).getInstruction()] and
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 80b440fff22..f1bdd6b8c52 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
@@ -10,8 +10,9 @@ private import semmle.code.cpp.models.interfaces.PartialFlow as PartialFlow
 private import semmle.code.cpp.models.interfaces.FunctionInputsAndOutputs as FIO
 private import semmle.code.cpp.ir.internal.IRCppLanguage
 private import semmle.code.cpp.ir.dataflow.internal.ModelUtil
-private import semmle.code.cpp.ir.implementation.raw.internal.TranslatedInitialization
+private import semmle.code.cpp.ir.implementation.raw.internal.IRConstruction as IRConstruction
 private import DataFlowPrivate
+private import DataFlowNodes
 import SsaImplCommon
 
 private module SourceVariables {
@@ -438,10 +439,7 @@ private predicate sourceVariableHasBaseAndIndex(SourceVariable v, BaseSourceVari
  * initialize `v`.
  */
 private Instruction getInitializationTargetAddress(IRVariable v) {
-  exists(TranslatedVariableInitialization init |
-    init.getIRVariable() = v and
-    result = init.getTargetAddress()
-  )
+  result = IRConstruction::Raw::getInitializationTargetAddress(v)
 }
 
 /** An initial definition of an SSA variable address. */
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 10ebfdb5be0..45a6755356b 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
@@ -4,47 +4,12 @@ import semmle.code.cpp.ir.internal.IRCppLanguage
 private import semmle.code.cpp.ir.implementation.raw.internal.SideEffects as SideEffects
 private import DataFlowImplCommon as DataFlowImplCommon
 private import DataFlowUtil
+private import DataFlowNodes
 private import semmle.code.cpp.models.interfaces.PointerWrapper
 private import DataFlowPrivate
 private import TypeFlow
 private import semmle.code.cpp.ir.ValueNumbering
 
-/**
- * Holds if `operand` is an operand that is not used by the dataflow library.
- * Ignored operands are not recognized as uses by SSA, and they don't have a
- * corresponding `(Indirect)OperandNode`.
- */
-predicate ignoreOperand(Operand operand) {
-  operand = any(Instruction instr | ignoreInstruction(instr)).getAnOperand() or
-  operand = any(Instruction instr | ignoreInstruction(instr)).getAUse() or
-  operand instanceof MemoryOperand
-}
-
-/**
- * Holds if `instr` is an instruction that is not used by the dataflow library.
- * Ignored instructions are not recognized as reads/writes by SSA, and they
- * don't have a corresponding `(Indirect)InstructionNode`.
- */
-predicate ignoreInstruction(Instruction instr) {
-  DataFlowImplCommon::forceCachingInSameStage() and
-  (
-    instr instanceof CallSideEffectInstruction or
-    instr instanceof CallReadSideEffectInstruction or
-    instr instanceof ExitFunctionInstruction or
-    instr instanceof EnterFunctionInstruction or
-    instr instanceof WriteSideEffectInstruction or
-    instr instanceof PhiInstruction or
-    instr instanceof ReadSideEffectInstruction or
-    instr instanceof ChiInstruction or
-    instr instanceof InitializeIndirectionInstruction or
-    instr instanceof AliasedDefinitionInstruction or
-    instr instanceof AliasedUseInstruction or
-    instr instanceof InitializeNonLocalInstruction or
-    instr instanceof ReturnIndirectionInstruction or
-    instr instanceof UninitializedGroupInstruction
-  )
-}
-
 /**
  * Gets the C++ type of `this` in the member function `f`.
  * The result is a glvalue if `isGLValue` is true, and
@@ -55,26 +20,6 @@ private CppType getThisType(Cpp::MemberFunction f, boolean isGLValue) {
   result.hasType(f.getTypeOfThis(), isGLValue)
 }
 
-/**
- * Gets the C++ type of the instruction `i`.
- *
- * This is equivalent to `i.getResultLanguageType()` with the exception
- * of instructions that directly references a `this` IRVariable. In this
- * case, `i.getResultLanguageType()` gives an unknown type, whereas the
- * predicate gives the expected type (i.e., a potentially cv-qualified
- * type `A*` where `A` is the declaring type of the member function that
- * contains `i`).
- */
-cached
-CppType getResultLanguageType(Instruction i) {
-  if i.(VariableAddressInstruction).getIRVariable() instanceof IRThisVariable
-  then
-    if i.isGLValue()
-    then result = getThisType(i.getEnclosingFunction(), true)
-    else result = getThisType(i.getEnclosingFunction(), false)
-  else result = i.getResultLanguageType()
-}
-
 /**
  * Gets the C++ type of the operand `operand`.
  * This is equivalent to the type of the operand's defining instruction.
@@ -347,10 +292,6 @@ predicate isWrite(Node0Impl value, Operand address, boolean certain) {
   )
 }
 
-predicate isAdditionalConversionFlow(Operand opFrom, Instruction instrTo) {
-  any(Indirection ind).isAdditionalConversionFlow(opFrom, instrTo)
-}
-
 newtype TBaseSourceVariable =
   // Each IR variable gets its own source variable
   TBaseIRVariable(IRVariable var) or
@@ -572,6 +513,69 @@ private class BaseCallInstruction extends BaseSourceVariableInstruction, CallIns
 
 cached
 private module Cached {
+  /**
+   * Holds if `operand` is an operand that is not used by the dataflow library.
+   * Ignored operands are not recognized as uses by SSA, and they don't have a
+   * corresponding `(Indirect)OperandNode`.
+   */
+  cached
+  predicate ignoreOperand(Operand operand) {
+    operand = any(Instruction instr | ignoreInstruction(instr)).getAnOperand() or
+    operand = any(Instruction instr | ignoreInstruction(instr)).getAUse() or
+    operand instanceof MemoryOperand
+  }
+
+  /**
+   * Holds if `instr` is an instruction that is not used by the dataflow library.
+   * Ignored instructions are not recognized as reads/writes by SSA, and they
+   * don't have a corresponding `(Indirect)InstructionNode`.
+   */
+  cached
+  predicate ignoreInstruction(Instruction instr) {
+    DataFlowImplCommon::forceCachingInSameStage() and
+    (
+      instr instanceof CallSideEffectInstruction or
+      instr instanceof CallReadSideEffectInstruction or
+      instr instanceof ExitFunctionInstruction or
+      instr instanceof EnterFunctionInstruction or
+      instr instanceof WriteSideEffectInstruction or
+      instr instanceof PhiInstruction or
+      instr instanceof ReadSideEffectInstruction or
+      instr instanceof ChiInstruction or
+      instr instanceof InitializeIndirectionInstruction or
+      instr instanceof AliasedDefinitionInstruction or
+      instr instanceof AliasedUseInstruction or
+      instr instanceof InitializeNonLocalInstruction or
+      instr instanceof ReturnIndirectionInstruction or
+      instr instanceof UninitializedGroupInstruction
+    )
+  }
+
+  cached
+  predicate isAdditionalConversionFlow(Operand opFrom, Instruction instrTo) {
+    any(Indirection ind).isAdditionalConversionFlow(opFrom, instrTo)
+  }
+
+  /**
+   * Gets the C++ type of the instruction `i`.
+   *
+   * This is equivalent to `i.getResultLanguageType()` with the exception
+   * of instructions that directly references a `this` IRVariable. In this
+   * case, `i.getResultLanguageType()` gives an unknown type, whereas the
+   * predicate gives the expected type (i.e., a potentially cv-qualified
+   * type `A*` where `A` is the declaring type of the member function that
+   * contains `i`).
+   */
+  cached
+  CppType getResultLanguageType(Instruction i) {
+    if i.(VariableAddressInstruction).getIRVariable() instanceof IRThisVariable
+    then
+      if i.isGLValue()
+      then result = getThisType(i.getEnclosingFunction(), true)
+      else result = getThisType(i.getEnclosingFunction(), false)
+    else result = i.getResultLanguageType()
+  }
+
   /** Holds if `op` is the only use of its defining instruction, and that op is used in a conversation */
   private predicate isConversion(Operand op) {
     exists(Instruction def, Operand use |
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll
index f190569330f..3e85489b126 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll
@@ -5,64 +5,81 @@ private import semmle.code.cpp.models.interfaces.DataFlow
 private import semmle.code.cpp.models.interfaces.SideEffect
 private import DataFlowUtil
 private import DataFlowPrivate
+private import DataFlowNodes
 private import SsaImpl as Ssa
 private import semmle.code.cpp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 private import semmle.code.cpp.ir.dataflow.FlowSteps
 
-/**
- * Holds if taint propagates from `nodeFrom` to `nodeTo` in exactly one local
- * (intra-procedural) step. This relation is only used for local taint flow
- * (for example `TaintTracking::localTaint(source, sink)`) so it may contain
- * special cases that should only apply to local taint flow.
- */
-predicate localTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
-  // dataflow step
-  DataFlow::localFlowStep(nodeFrom, nodeTo)
-  or
-  // taint flow step
-  localAdditionalTaintStep(nodeFrom, nodeTo, _)
-  or
-  // models-as-data summarized flow for local data flow (i.e. special case for flow
-  // through calls to modeled functions, without relying on global dataflow to join
-  // the dots).
-  FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(nodeFrom, nodeTo, _)
+cached
+private module Cached {
+  private import DataFlowImplCommon as DataFlowImplCommon
+
+  /**
+   * This predicate exists to collapse the `cached` predicates in this module with the
+   * `cached` predicates in other C/C++ dataflow files, which is then collapsed
+   * with the `cached` predicates in `DataFlowImplCommon.qll`.
+   */
+  cached
+  predicate forceCachingInSameStage() { DataFlowImplCommon::forceCachingInSameStage() }
+
+  /**
+   * Holds if taint propagates from `nodeFrom` to `nodeTo` in exactly one local
+   * (intra-procedural) step. This relation is only used for local taint flow
+   * (for example `TaintTracking::localTaint(source, sink)`) so it may contain
+   * special cases that should only apply to local taint flow.
+   */
+  cached
+  predicate localTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
+    // dataflow step
+    DataFlow::localFlowStep(nodeFrom, nodeTo)
+    or
+    // taint flow step
+    localAdditionalTaintStep(nodeFrom, nodeTo, _)
+    or
+    // models-as-data summarized flow for local data flow (i.e. special case for flow
+    // through calls to modeled functions, without relying on global dataflow to join
+    // the dots).
+    FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(nodeFrom, nodeTo, _)
+  }
+
+  /**
+   * Holds if taint can flow in one local step from `nodeFrom` to `nodeTo` excluding
+   * local data flow steps. That is, `nodeFrom` and `nodeTo` are likely to represent
+   * different objects.
+   */
+  cached
+  predicate localAdditionalTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo, string model) {
+    operandToInstructionTaintStep(nodeFrom.asOperand(), nodeTo.asInstruction()) and
+    model = ""
+    or
+    modeledTaintStep(nodeFrom, nodeTo, model)
+    or
+    // Flow from (the indirection of) an operand of a pointer arithmetic instruction to the
+    // indirection of the pointer arithmetic instruction. This provides flow from `source`
+    // in `x[source]` to the result of the associated load instruction.
+    exists(PointerArithmeticInstruction pai, int indirectionIndex |
+      nodeHasOperand(nodeFrom, pai.getAnOperand(), pragma[only_bind_into](indirectionIndex)) and
+      hasInstructionAndIndex(nodeTo, pai, indirectionIndex + 1)
+    ) and
+    model = ""
+    or
+    any(Ssa::Indirection ind).isAdditionalTaintStep(nodeFrom, nodeTo) and
+    model = ""
+    or
+    // models-as-data summarized flow
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom.(FlowSummaryNode).getSummaryNode(),
+      nodeTo.(FlowSummaryNode).getSummaryNode(), false, model)
+    or
+    // object->field conflation for content that is a `TaintInheritingContent`.
+    exists(DataFlow::ContentSet f |
+      readStep(nodeFrom, f, nodeTo) and
+      f.getAReadContent() instanceof TaintInheritingContent
+    ) and
+    model = ""
+  }
 }
 
-/**
- * Holds if taint can flow in one local step from `nodeFrom` to `nodeTo` excluding
- * local data flow steps. That is, `nodeFrom` and `nodeTo` are likely to represent
- * different objects.
- */
-cached
-predicate localAdditionalTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo, string model) {
-  operandToInstructionTaintStep(nodeFrom.asOperand(), nodeTo.asInstruction()) and
-  model = ""
-  or
-  modeledTaintStep(nodeFrom, nodeTo, model)
-  or
-  // Flow from (the indirection of) an operand of a pointer arithmetic instruction to the
-  // indirection of the pointer arithmetic instruction. This provides flow from `source`
-  // in `x[source]` to the result of the associated load instruction.
-  exists(PointerArithmeticInstruction pai, int indirectionIndex |
-    nodeHasOperand(nodeFrom, pai.getAnOperand(), pragma[only_bind_into](indirectionIndex)) and
-    hasInstructionAndIndex(nodeTo, pai, indirectionIndex + 1)
-  ) and
-  model = ""
-  or
-  any(Ssa::Indirection ind).isAdditionalTaintStep(nodeFrom, nodeTo) and
-  model = ""
-  or
-  // models-as-data summarized flow
-  FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom.(FlowSummaryNode).getSummaryNode(),
-    nodeTo.(FlowSummaryNode).getSummaryNode(), false, model)
-  or
-  // object->field conflation for content that is a `TaintInheritingContent`.
-  exists(DataFlow::ContentSet f |
-    readStep(nodeFrom, f, nodeTo) and
-    f.getAReadContent() instanceof TaintInheritingContent
-  ) and
-  model = ""
-}
+import Cached
 
 /**
  * Holds if taint propagates from `nodeFrom` to `nodeTo` in exactly one local
@@ -196,7 +213,7 @@ predicate modeledTaintStep(DataFlow::Node nodeIn, DataFlow::Node nodeOut, string
   // Taint flow from a pointer argument to an output, when the model specifies flow from the deref
   // to that output, but the deref is not modeled in the IR for the caller.
   exists(
-    CallInstruction call, DataFlow::SideEffectOperandNode indirectArgument, Function func,
+    CallInstruction call, SideEffectOperandNode indirectArgument, Function func,
     FunctionInput modelIn, FunctionOutput modelOut
   |
     indirectArgument = callInput(call, modelIn) and
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/IRConstruction.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/IRConstruction.qll
index 594e37b668d..9e9a47a5b4f 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/IRConstruction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/IRConstruction.qll
@@ -15,6 +15,7 @@ private import TranslatedCall
 private import TranslatedStmt
 private import TranslatedFunction
 private import TranslatedGlobalVar
+private import TranslatedInitialization
 
 TranslatedElement getInstructionTranslatedElement(Instruction instruction) {
   instruction = TRawInstruction(result, _)
@@ -194,6 +195,89 @@ module Raw {
   Expr getInstructionUnconvertedResultExpression(Instruction instruction) {
     result = getInstructionConvertedResultExpression(instruction).getUnconverted()
   }
+
+  /**
+   * Gets the expression associated with the instruction `instr` that computes
+   * the `Convert` instruction on the extent expression of an allocation.
+   */
+  cached
+  Expr getAllocationExtentConvertExpr(Instruction instr) {
+    exists(TranslatedNonConstantAllocationSize tas |
+      instr = tas.getInstruction(AllocationExtentConvertTag()) and
+      result = tas.getExtent().getExpr()
+    )
+  }
+
+  /**
+   * Gets the `ParenthesisExpr` associated with a transparent conversion
+   * instruction, if any.
+   */
+  cached
+  ParenthesisExpr getTransparentConversionParenthesisExpr(Instruction instr) {
+    exists(TranslatedTransparentConversion ttc |
+      result = ttc.getExpr() and
+      instr = ttc.getResult()
+    )
+  }
+
+  /**
+   * Holds if `instr` belongs to a `TranslatedCoreExpr` that produces an
+   * expression result. This indicates that the instruction represents a
+   * definition whose result should be mapped back to the expression.
+   */
+  cached
+  predicate instructionProducesExprResult(Instruction instr) {
+    exists(TranslatedCoreExpr tco |
+      tco.getInstruction(_) = instr and
+      tco.producesExprResult()
+    )
+  }
+
+  /**
+   * Gets the expression associated with a `StoreInstruction` generated
+   * by an `TranslatedAssignOperation`.
+   */
+  cached
+  Expr getAssignOperationStoreExpr(StoreInstruction store) {
+    exists(TranslatedAssignOperation tao |
+      store = tao.getInstruction(AssignmentStoreTag()) and
+      result = tao.getExpr()
+    )
+  }
+
+  /**
+   * Gets the expression associated with a `StoreInstruction` generated
+   * by an `TranslatedCrementOperation`.
+   */
+  cached
+  Expr getCrementOperationStoreExpr(StoreInstruction store) {
+    exists(TranslatedCrementOperation tco |
+      store = tco.getInstruction(CrementStoreTag()) and
+      result = tco.getExpr()
+    )
+  }
+
+  /**
+   * Holds if `store` is a `StoreInstruction` that defines the temporary
+   * `IRVariable` generated as part of the translation of a ternary expression.
+   */
+  cached
+  predicate isConditionalExprTempStore(StoreInstruction store) {
+    exists(TranslatedConditionalExpr tce |
+      store = tce.getInstruction(ConditionValueFalseStoreTag())
+      or
+      store = tce.getInstruction(ConditionValueTrueStoreTag())
+    )
+  }
+
+  /** Gets the instruction that computes the address used to initialize `v`. */
+  cached
+  Instruction getInitializationTargetAddress(IRVariable v) {
+    exists(TranslatedVariableInitialization init |
+      init.getIRVariable() = v and
+      result = init.getTargetAddress()
+    )
+  }
 }
 
 class TStageInstruction = TRawInstruction or TRawUnreachedInstruction;
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 7e7c2f55670..770002bb023 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -245,6 +245,25 @@ trap_filename(
     string filename: string ref
 );
 
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
 /**
  * In `build-mode: none` overlay mode, indicates that `source_file`
  * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
@@ -252,16 +271,25 @@ trap_filename(
  * includes, or a template instantiation it transitively uses.
  */
 source_file_uses_trap(
-    string source_file: string ref,
+    int source_file: @source_file ref,
     int trap_file: @trap ref
 );
 
 /**
- * Holds if there is a definition of `element` in TRAP file `trap_file`.
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
  */
-in_trap(
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
     int element: @element ref,
-    int trap_file: @trap ref
+    int t: @trap_or_tag ref
 );
 
 pch_uses(
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 1c53061ef50..ab81be3fa7c 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>12592</v>
+            <v>12591</v>
         </e>
         <e>
             <k>@externalDataElement</k>
@@ -10,11 +10,11 @@
         </e>
         <e>
             <k>@file</k>
-            <v>64952</v>
+            <v>64946</v>
         </e>
         <e>
             <k>@folder</k>
-            <v>12340</v>
+            <v>12339</v>
         </e>
         <e>
             <k>@diagnostic</k>
@@ -25,16 +25,24 @@
             <v>1</v>
         </e>
         <e>
-            <k>@location_default</k>
-            <v>46837429</v>
+            <k>@tag</k>
+            <v>1</v>
+        </e>
+        <e>
+            <k>@source_file</k>
+            <v>1</v>
         </e>
         <e>
             <k>@pch</k>
             <v>248</v>
         </e>
+        <e>
+            <k>@location_default</k>
+            <v>46837435</v>
+        </e>
         <e>
             <k>@macro_expansion</k>
-            <v>40306124</v>
+            <v>40309769</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
@@ -42,7 +50,7 @@
         </e>
         <e>
             <k>@normal_function</k>
-            <v>2734381</v>
+            <v>2734631</v>
         </e>
         <e>
             <k>@unknown_function</k>
@@ -50,7 +58,7 @@
         </e>
         <e>
             <k>@constructor</k>
-            <v>694333</v>
+            <v>694343</v>
         </e>
         <e>
             <k>@destructor</k>
@@ -74,11 +82,11 @@
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4193664</v>
+            <v>4193416</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>9368481</v>
+            <v>9367984</v>
         </e>
         <e>
             <k>@type_decl</k>
@@ -86,11 +94,11 @@
         </e>
         <e>
             <k>@namespace_decl</k>
-            <v>407977</v>
+            <v>408755</v>
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>266868</v>
+            <v>266845</v>
         </e>
         <e>
             <k>@using_directive</k>
@@ -102,15 +110,15 @@
         </e>
         <e>
             <k>@static_assert</k>
-            <v>172750</v>
+            <v>172739</v>
         </e>
         <e>
             <k>@parameter</k>
-            <v>7010805</v>
+            <v>7011801</v>
         </e>
         <e>
             <k>@membervariable</k>
-            <v>1500528</v>
+            <v>1502766</v>
         </e>
         <e>
             <k>@globalvariable</k>
@@ -118,11 +126,11 @@
         </e>
         <e>
             <k>@localvariable</k>
-            <v>724674</v>
+            <v>724688</v>
         </e>
         <e>
             <k>@enumconstant</k>
-            <v>347955</v>
+            <v>348040</v>
         </e>
         <e>
             <k>@errortype</k>
@@ -370,7 +378,7 @@
         </e>
         <e>
             <k>@routineptr</k>
-            <v>679846</v>
+            <v>679857</v>
         </e>
         <e>
             <k>@reference</k>
@@ -396,6 +404,10 @@
             <k>@scalable_vector</k>
             <v>1</v>
         </e>
+        <e>
+            <k>@decltype</k>
+            <v>101757</v>
+        </e>
         <e>
             <k>@typeof</k>
             <v>811</v>
@@ -476,13 +488,9 @@
             <k>@remove_reference</k>
             <v>5705</v>
         </e>
-        <e>
-            <k>@decltype</k>
-            <v>101757</v>
-        </e>
         <e>
             <k>@struct</k>
-            <v>976682</v>
+            <v>976600</v>
         </e>
         <e>
             <k>@union</k>
@@ -490,15 +498,15 @@
         </e>
         <e>
             <k>@enum</k>
-            <v>41554</v>
+            <v>41605</v>
         </e>
         <e>
             <k>@template_parameter</k>
-            <v>864494</v>
+            <v>864421</v>
         </e>
         <e>
             <k>@alias</k>
-            <v>1755899</v>
+            <v>1755750</v>
         </e>
         <e>
             <k>@unknown_usertype</k>
@@ -510,11 +518,11 @@
         </e>
         <e>
             <k>@template_template_parameter</k>
-            <v>6091</v>
+            <v>6090</v>
         </e>
         <e>
             <k>@proxy_class</k>
-            <v>48246</v>
+            <v>48241</v>
         </e>
         <e>
             <k>@scoped_enum</k>
@@ -522,7 +530,7 @@
         </e>
         <e>
             <k>@template_struct</k>
-            <v>211194</v>
+            <v>211176</v>
         </e>
         <e>
             <k>@template_class</k>
@@ -534,11 +542,11 @@
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6349610</v>
+            <v>6349611</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>5911109</v>
+            <v>5913261</v>
         </e>
         <e>
             <k>@concept_template</k>
@@ -546,11 +554,11 @@
         </e>
         <e>
             <k>@routinetype</k>
-            <v>600577</v>
+            <v>600586</v>
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>9678</v>
+            <v>9677</v>
         </e>
         <e>
             <k>@specifier</k>
@@ -566,7 +574,7 @@
         </e>
         <e>
             <k>@declspec</k>
-            <v>330310</v>
+            <v>330396</v>
         </e>
         <e>
             <k>@msattribute</k>
@@ -578,11 +586,11 @@
         </e>
         <e>
             <k>@attribute_arg_token</k>
-            <v>16584</v>
+            <v>16585</v>
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>71632</v>
+            <v>71626</v>
         </e>
         <e>
             <k>@attribute_arg_expr</k>
@@ -602,19 +610,19 @@
         </e>
         <e>
             <k>@derivation</k>
-            <v>473787</v>
+            <v>473794</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>767814</v>
+            <v>767534</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>11208576</v>
+            <v>11208578</v>
         </e>
         <e>
             <k>@namespace</k>
-            <v>8616</v>
+            <v>8615</v>
         </e>
         <e>
             <k>@specialnamequalifyingelement</k>
@@ -622,15 +630,15 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>3042541</v>
+            <v>3042471</v>
         </e>
         <e>
             <k>@value</k>
-            <v>13541563</v>
+            <v>13541565</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>2244830</v>
+            <v>2245206</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -646,7 +654,7 @@
         </e>
         <e>
             <k>@parexpr</k>
-            <v>4915711</v>
+            <v>4915712</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
@@ -666,7 +674,7 @@
         </e>
         <e>
             <k>@postincrexpr</k>
-            <v>84579</v>
+            <v>84573</v>
         </e>
         <e>
             <k>@postdecrexpr</k>
@@ -698,11 +706,11 @@
         </e>
         <e>
             <k>@divexpr</k>
-            <v>52392</v>
+            <v>52388</v>
         </e>
         <e>
             <k>@remexpr</k>
-            <v>15907</v>
+            <v>15908</v>
         </e>
         <e>
             <k>@paddexpr</k>
@@ -710,7 +718,7 @@
         </e>
         <e>
             <k>@psubexpr</k>
-            <v>68022</v>
+            <v>68017</v>
         </e>
         <e>
             <k>@pdiffexpr</k>
@@ -726,7 +734,7 @@
         </e>
         <e>
             <k>@andexpr</k>
-            <v>483234</v>
+            <v>483235</v>
         </e>
         <e>
             <k>@orexpr</k>
@@ -734,7 +742,7 @@
         </e>
         <e>
             <k>@xorexpr</k>
-            <v>73958</v>
+            <v>73953</v>
         </e>
         <e>
             <k>@eqexpr</k>
@@ -754,7 +762,7 @@
         </e>
         <e>
             <k>@geexpr</k>
-            <v>81365</v>
+            <v>81360</v>
         </e>
         <e>
             <k>@leexpr</k>
@@ -762,7 +770,7 @@
         </e>
         <e>
             <k>@assignexpr</k>
-            <v>1281279</v>
+            <v>1281280</v>
         </e>
         <e>
             <k>@assignaddexpr</k>
@@ -822,7 +830,7 @@
         </e>
         <e>
             <k>@commaexpr</k>
-            <v>167880</v>
+            <v>167881</v>
         </e>
         <e>
             <k>@subscriptexpr</k>
@@ -830,11 +838,11 @@
         </e>
         <e>
             <k>@callexpr</k>
-            <v>238856</v>
+            <v>238860</v>
         </e>
         <e>
             <k>@vastartexpr</k>
-            <v>4964</v>
+            <v>4963</v>
         </e>
         <e>
             <k>@vaargexpr</k>
@@ -850,7 +858,7 @@
         </e>
         <e>
             <k>@varaccess</k>
-            <v>8255502</v>
+            <v>8255503</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
@@ -858,7 +866,7 @@
         </e>
         <e>
             <k>@runtime_alignof</k>
-            <v>49551</v>
+            <v>49552</v>
         </e>
         <e>
             <k>@expr_stmt</k>
@@ -866,11 +874,11 @@
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>5726119</v>
+            <v>5725988</v>
         </e>
         <e>
             <k>@type_operand</k>
-            <v>1405527</v>
+            <v>1405528</v>
         </e>
         <e>
             <k>@offsetofexpr</k>
@@ -882,7 +890,7 @@
         </e>
         <e>
             <k>@literal</k>
-            <v>7985002</v>
+            <v>7991777</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
@@ -890,23 +898,23 @@
         </e>
         <e>
             <k>@c_style_cast</k>
-            <v>6027721</v>
+            <v>6027720</v>
         </e>
         <e>
             <k>@temp_init</k>
-            <v>980663</v>
+            <v>980525</v>
         </e>
         <e>
             <k>@errorexpr</k>
-            <v>45185</v>
+            <v>45186</v>
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1880187</v>
+            <v>1880002</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>2094067</v>
+            <v>2094099</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
@@ -914,7 +922,7 @@
         </e>
         <e>
             <k>@assume</k>
-            <v>4138</v>
+            <v>4137</v>
         </e>
         <e>
             <k>@conjugation</k>
@@ -966,7 +974,7 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1553675</v>
+            <v>1553582</v>
         </e>
         <e>
             <k>@new_expr</k>
@@ -978,11 +986,11 @@
         </e>
         <e>
             <k>@throw_expr</k>
-            <v>23840</v>
+            <v>23817</v>
         </e>
         <e>
             <k>@condition_decl</k>
-            <v>407678</v>
+            <v>407669</v>
         </e>
         <e>
             <k>@braced_init_list</k>
@@ -990,7 +998,7 @@
         </e>
         <e>
             <k>@type_id</k>
-            <v>47588</v>
+            <v>47589</v>
         </e>
         <e>
             <k>@sizeof_pack</k>
@@ -1082,7 +1090,7 @@
         </e>
         <e>
             <k>@uuidof</k>
-            <v>26691</v>
+            <v>26787</v>
         </e>
         <e>
             <k>@delete_array_expr</k>
@@ -1098,7 +1106,7 @@
         </e>
         <e>
             <k>@ctordirectinit</k>
-            <v>112100</v>
+            <v>112102</v>
         </e>
         <e>
             <k>@ctorvirtualinit</k>
@@ -1114,7 +1122,7 @@
         </e>
         <e>
             <k>@dtordirectdestruct</k>
-            <v>39194</v>
+            <v>39195</v>
         </e>
         <e>
             <k>@dtorvirtualdestruct</k>
@@ -1122,7 +1130,7 @@
         </e>
         <e>
             <k>@dtorfielddestruct</k>
-            <v>39566</v>
+            <v>39567</v>
         </e>
         <e>
             <k>@static_cast</k>
@@ -1130,7 +1138,7 @@
         </e>
         <e>
             <k>@reinterpret_cast</k>
-            <v>39964</v>
+            <v>39962</v>
         </e>
         <e>
             <k>@const_cast</k>
@@ -1138,15 +1146,15 @@
         </e>
         <e>
             <k>@dynamic_cast</k>
-            <v>789</v>
+            <v>788</v>
         </e>
         <e>
             <k>@lambdaexpr</k>
-            <v>18998</v>
+            <v>18997</v>
         </e>
         <e>
             <k>@param_ref</k>
-            <v>162180</v>
+            <v>162057</v>
         </e>
         <e>
             <k>@noopexpr</k>
@@ -1250,7 +1258,7 @@
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>28138</v>
+            <v>28017</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1422,7 +1430,7 @@
         </e>
         <e>
             <k>@reuseexpr</k>
-            <v>844466</v>
+            <v>844446</v>
         </e>
         <e>
             <k>@istriviallycopyassignable</k>
@@ -1522,7 +1530,7 @@
         </e>
         <e>
             <k>@requires_expr</k>
-            <v>16453</v>
+            <v>16452</v>
         </e>
         <e>
             <k>@nested_requirement</k>
@@ -1534,7 +1542,7 @@
         </e>
         <e>
             <k>@concept_id</k>
-            <v>90159</v>
+            <v>90157</v>
         </e>
         <e>
             <k>@isinvocable</k>
@@ -1550,11 +1558,11 @@
         </e>
         <e>
             <k>@lambdacapture</k>
-            <v>31866</v>
+            <v>31864</v>
         </e>
         <e>
             <k>@stmt_expr</k>
-            <v>2031828</v>
+            <v>2031829</v>
         </e>
         <e>
             <k>@stmt_if</k>
@@ -1566,15 +1574,15 @@
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>157278</v>
+            <v>157265</v>
         </e>
         <e>
             <k>@stmt_label</k>
-            <v>77734</v>
+            <v>77727</v>
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1238238</v>
+            <v>1238112</v>
         </e>
         <e>
             <k>@stmt_block</k>
@@ -1590,11 +1598,11 @@
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>833612</v>
+            <v>833592</v>
         </e>
         <e>
             <k>@stmt_switch</k>
-            <v>410617</v>
+            <v>410607</v>
         </e>
         <e>
             <k>@stmt_asm</k>
@@ -1602,11 +1610,11 @@
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>770031</v>
+            <v>769985</v>
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>428121</v>
+            <v>428111</v>
         </e>
         <e>
             <k>@stmt_continue</k>
@@ -1614,11 +1622,11 @@
         </e>
         <e>
             <k>@stmt_break</k>
-            <v>137507</v>
+            <v>137498</v>
         </e>
         <e>
             <k>@stmt_try_block</k>
-            <v>26372</v>
+            <v>26379</v>
         </e>
         <e>
             <k>@stmt_microsoft_try</k>
@@ -1642,7 +1650,7 @@
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>43218</v>
+            <v>43224</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
@@ -1674,11 +1682,11 @@
         </e>
         <e>
             <k>@ppd_ifndef</k>
-            <v>160444</v>
+            <v>160487</v>
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>21829</v>
+            <v>21827</v>
         </e>
         <e>
             <k>@ppd_else</k>
@@ -1690,7 +1698,7 @@
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>317291</v>
+            <v>317265</v>
         </e>
         <e>
             <k>@ppd_define</k>
@@ -1772,11 +1780,11 @@
     <stats>
         <relation>
             <name>compilations</name>
-            <cardinality>12592</cardinality>
+            <cardinality>12591</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12592</v>
+                    <v>12591</v>
                 </e>
                 <e>
                     <k>cwd</k>
@@ -1794,7 +1802,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12592</v>
+                                    <v>12591</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1820,11 +1828,11 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>1008169</cardinality>
+            <cardinality>1008084</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12592</v>
+                    <v>12591</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -1832,7 +1840,7 @@
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29151</v>
+                    <v>29149</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -1891,7 +1899,7 @@
                                 <b>
                                     <a>98</a>
                                     <b>99</b>
-                                    <v>1336</v>
+                                    <v>1335</v>
                                 </b>
                                 <b>
                                     <a>100</a>
@@ -2160,12 +2168,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13350</v>
+                                    <v>13349</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12634</v>
+                                    <v>12633</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2191,7 +2199,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19304</v>
+                                    <v>19303</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2211,11 +2219,11 @@
         </relation>
         <relation>
             <name>compilation_expanded_args</name>
-            <cardinality>1008169</cardinality>
+            <cardinality>1008084</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12592</v>
+                    <v>12591</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -2223,7 +2231,7 @@
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29151</v>
+                    <v>29149</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2282,7 +2290,7 @@
                                 <b>
                                     <a>98</a>
                                     <b>99</b>
-                                    <v>1336</v>
+                                    <v>1335</v>
                                 </b>
                                 <b>
                                     <a>100</a>
@@ -2551,12 +2559,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13350</v>
+                                    <v>13349</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12634</v>
+                                    <v>12633</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2582,7 +2590,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19304</v>
+                                    <v>19303</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2650,11 +2658,11 @@
         </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>
@@ -2662,7 +2670,7 @@
                 </e>
                 <e>
                     <k>file</k>
-                    <v>13669</v>
+                    <v>13668</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2850,7 +2858,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12308</v>
+                                    <v>12307</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2876,7 +2884,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12526</v>
+                                    <v>12525</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2896,11 +2904,11 @@
         </relation>
         <relation>
             <name>compilation_time</name>
-            <cardinality>62957</cardinality>
+            <cardinality>62953</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2723</v>
+                    <v>2722</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -2912,7 +2920,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>15412</v>
+                    <v>16990</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2977,7 +2985,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2723</v>
+                                    <v>2722</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2993,21 +3001,21 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1034</v>
+                                    <v>381</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>326</v>
+                                    <v>980</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>7</b>
-                                    <v>163</v>
+                                    <b>9</b>
+                                    <v>217</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
+                                    <a>9</a>
+                                    <b>10</b>
                                     <v>163</v>
                                 </b>
                                 <b>
@@ -3017,24 +3025,24 @@
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>13</b>
-                                    <v>217</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>17</b>
+                                    <b>15</b>
                                     <v>217</v>
                                 </b>
                                 <b>
                                     <a>17</a>
-                                    <b>21</b>
+                                    <b>20</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>24</a>
-                                    <b>94</b>
+                                    <a>20</a>
+                                    <b>26</b>
                                     <v>217</v>
                                 </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>132</b>
+                                    <v>163</v>
+                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -3101,12 +3109,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1143</v>
+                                    <v>871</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1252</v>
+                                    <v>1579</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -3116,33 +3124,33 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>653</v>
+                                    <v>326</v>
                                 </b>
                                 <b>
                                     <a>7</a>
+                                    <b>8</b>
+                                    <v>435</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
                                     <b>9</b>
-                                    <v>217</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>9</a>
-                                    <b>10</b>
+                                    <b>11</b>
+                                    <v>381</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>30</b>
+                                    <v>381</v>
+                                </b>
+                                <b>
+                                    <a>40</a>
+                                    <b>95</b>
                                     <v>217</v>
                                 </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>15</b>
-                                    <v>381</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>45</b>
-                                    <v>381</v>
-                                </b>
-                                <b>
-                                    <a>50</a>
-                                    <b>94</b>
-                                    <v>108</v>
-                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -3189,21 +3197,16 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
+                                    <v>108</v>
+                                </b>
+                                <b>
+                                    <a>177</a>
+                                    <b>178</b>
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>148</a>
-                                    <b>149</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>160</a>
-                                    <b>161</b>
+                                    <a>183</a>
+                                    <b>184</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -3220,21 +3223,21 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9421</v>
+                                    <v>10020</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3104</v>
+                                    <v>3975</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1797</v>
+                                    <v>1906</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>44</b>
+                                    <b>47</b>
                                     <v>1089</v>
                                 </b>
                             </bs>
@@ -3251,32 +3254,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8604</v>
+                                    <v>9639</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2668</v>
+                                    <v>3757</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1851</v>
+                                    <v>1579</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>925</v>
+                                    <v>1143</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>15</b>
-                                    <v>1198</v>
-                                </b>
-                                <b>
-                                    <a>43</a>
-                                    <b>73</b>
-                                    <v>163</v>
+                                    <b>72</b>
+                                    <v>871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3292,12 +3290,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13560</v>
+                                    <v>13941</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1851</v>
+                                    <v>3049</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3573,19 +3571,19 @@
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>12592</cardinality>
+            <cardinality>12591</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12592</v>
+                    <v>12591</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>9489</v>
+                    <v>9593</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>231</v>
+                    <v>210</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3599,7 +3597,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12592</v>
+                                    <v>12591</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3615,7 +3613,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12592</v>
+                                    <v>12591</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3631,17 +3629,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7953</v>
+                                    <v>8289</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1052</v>
+                                    <v>967</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>29</b>
-                                    <v>483</v>
+                                    <b>33</b>
+                                    <v>336</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3657,12 +3655,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8847</v>
+                                    <v>9004</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>641</v>
+                                    <v>589</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3678,16 +3676,21 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73</v>
+                                    <v>31</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>5</b>
-                                    <v>21</v>
+                                    <b>3</b>
+                                    <v>31</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>9</b>
+                                    <b>6</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
                                     <v>21</v>
                                 </b>
                                 <b>
@@ -3696,28 +3699,48 @@
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
+                                    <a>13</a>
                                     <b>14</b>
-                                    <v>21</v>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>19</a>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>32</a>
                                     <b>33</b>
-                                    <v>21</v>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>60</a>
-                                    <b>179</b>
-                                    <v>21</v>
+                                    <a>69</a>
+                                    <b>70</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>233</a>
-                                    <b>293</b>
-                                    <v>21</v>
+                                    <a>182</a>
+                                    <b>183</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>312</a>
-                                    <b>313</b>
+                                    <a>216</a>
+                                    <b>217</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>288</a>
+                                    <b>289</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>319</a>
+                                    <b>320</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -3734,46 +3757,76 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73</v>
+                                    <v>31</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>5</b>
-                                    <v>21</v>
+                                    <b>3</b>
+                                    <v>31</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>9</b>
+                                    <b>6</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
                                     <v>21</v>
                                 </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>10</v>
+                                </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>21</v>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
+                                    <a>13</a>
                                     <b>14</b>
-                                    <v>21</v>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>32</b>
-                                    <v>21</v>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>59</a>
-                                    <b>154</b>
-                                    <v>21</v>
+                                    <a>16</a>
+                                    <b>17</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>168</a>
-                                    <b>219</b>
-                                    <v>21</v>
+                                    <a>32</a>
+                                    <b>33</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>245</a>
-                                    <b>246</b>
+                                    <a>67</a>
+                                    <b>68</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>163</a>
+                                    <b>164</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>170</a>
+                                    <b>171</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>206</a>
+                                    <b>207</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>240</a>
+                                    <b>241</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -4011,11 +4064,11 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>46837429</cardinality>
+            <cardinality>46837435</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>46837429</v>
+                    <v>46837435</v>
                 </e>
                 <e>
                     <k>file</k>
@@ -4023,7 +4076,7 @@
                 </e>
                 <e>
                     <k>beginLine</k>
-                    <v>7483211</v>
+                    <v>7483212</v>
                 </e>
                 <e>
                     <k>beginColumn</k>
@@ -4031,7 +4084,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>7484207</v>
+                    <v>7484208</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -4049,7 +4102,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837429</v>
+                                    <v>46837435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4065,7 +4118,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837429</v>
+                                    <v>46837435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4081,7 +4134,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837429</v>
+                                    <v>46837435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4097,7 +4150,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837429</v>
+                                    <v>46837435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4113,7 +4166,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837429</v>
+                                    <v>46837435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4514,7 +4567,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4945831</v>
+                                    <v>4945832</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -4555,7 +4608,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5008055</v>
+                                    <v>5008056</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -4591,12 +4644,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5629551</v>
+                                    <v>5629552</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>483108</v>
+                                    <v>483109</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -4627,12 +4680,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7018147</v>
+                                    <v>7018148</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>85</b>
-                                    <v>465063</v>
+                                    <v>465064</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5110,7 +5163,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5005068</v>
+                                    <v>5005069</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5146,7 +5199,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7035321</v>
+                                    <v>7035322</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5167,7 +5220,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5628182</v>
+                                    <v>5628183</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5203,7 +5256,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5012784</v>
+                                    <v>5012785</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5223,7 +5276,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>72</b>
-                                    <v>561635</v>
+                                    <v>561636</v>
                                 </b>
                                 <b>
                                     <a>72</a>
@@ -5543,15 +5596,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>64952</cardinality>
+            <cardinality>64946</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>64952</v>
+                    <v>64946</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>64952</v>
+                    <v>64946</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5565,7 +5618,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>64952</v>
+                                    <v>64946</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5581,7 +5634,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>64952</v>
+                                    <v>64946</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5591,15 +5644,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>12340</cardinality>
+            <cardinality>12339</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12340</v>
+                    <v>12339</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>12340</v>
+                    <v>12339</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5613,7 +5666,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12340</v>
+                                    <v>12339</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5629,7 +5682,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12340</v>
+                                    <v>12339</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5639,15 +5692,15 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>77271</cardinality>
+            <cardinality>77264</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>12340</v>
+                    <v>12339</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>77271</v>
+                    <v>77264</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5661,7 +5714,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6007</v>
+                                    <v>6006</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5696,7 +5749,7 @@
                                 <b>
                                     <a>44</a>
                                     <b>151</b>
-                                    <v>263</v>
+                                    <v>262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5712,7 +5765,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77271</v>
+                                    <v>77264</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6864,6 +6917,102 @@
                 </dep>
             </dependencies>
         </relation>
+        <relation>
+            <name>tag_name</name>
+            <cardinality>1</cardinality>
+            <columnsizes>
+                <e>
+                    <k>tag</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>1</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>tag</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>tag</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>source_file_name</name>
+            <cardinality>1</cardinality>
+            <columnsizes>
+                <e>
+                    <k>sf</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>1</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>sf</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>sf</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
         <relation>
             <name>source_file_uses_trap</name>
             <cardinality>1</cardinality>
@@ -6913,22 +7062,22 @@
             </dependencies>
         </relation>
         <relation>
-            <name>in_trap</name>
+            <name>trap_uses_tag</name>
             <cardinality>1</cardinality>
             <columnsizes>
                 <e>
-                    <k>element</k>
+                    <k>trap_file</k>
                     <v>1</v>
                 </e>
                 <e>
-                    <k>trap_file</k>
+                    <k>tag</k>
                     <v>1</v>
                 </e>
             </columnsizes>
             <dependencies>
                 <dep>
-                    <src>element</src>
-                    <trg>trap_file</trg>
+                    <src>trap_file</src>
+                    <trg>tag</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -6943,7 +7092,55 @@
                     </val>
                 </dep>
                 <dep>
-                    <src>trap_file</src>
+                    <src>tag</src>
+                    <trg>trap_file</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>in_trap_or_tag</name>
+            <cardinality>1</cardinality>
+            <columnsizes>
+                <e>
+                    <k>element</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>t</k>
+                    <v>1</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>element</src>
+                    <trg>t</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>t</src>
                     <trg>element</trg>
                     <val>
                         <hist>
@@ -7344,11 +7541,11 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>4183771</cardinality>
+            <cardinality>4183417</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5744</v>
+                    <v>5743</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -7356,11 +7553,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>58482</v>
+                    <v>58477</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>39356</v>
+                    <v>39353</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7379,7 +7576,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5544</v>
+                                    <v>5543</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7605,7 +7802,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10983</v>
+                                    <v>10982</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7615,7 +7812,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>5039</v>
+                                    <v>5038</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -7625,12 +7822,12 @@
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>4576</v>
+                                    <v>4575</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>4313</v>
+                                    <v>4312</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -7645,7 +7842,7 @@
                                 <b>
                                     <a>27</a>
                                     <b>47</b>
-                                    <v>4818</v>
+                                    <v>4817</v>
                                 </b>
                                 <b>
                                     <a>47</a>
@@ -7676,7 +7873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58482</v>
+                                    <v>58477</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7692,7 +7889,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11540</v>
+                                    <v>11539</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7707,7 +7904,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4050</v>
+                                    <v>4049</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -7737,7 +7934,7 @@
                                 <b>
                                     <a>41</a>
                                     <b>95</b>
-                                    <v>4450</v>
+                                    <v>4449</v>
                                 </b>
                                 <b>
                                     <a>95</a>
@@ -7768,7 +7965,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3177</v>
+                                    <v>3176</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -7778,7 +7975,7 @@
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>2956</v>
+                                    <v>2955</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -7793,7 +7990,7 @@
                                 <b>
                                     <a>24</a>
                                     <b>51</b>
-                                    <v>3524</v>
+                                    <v>3523</v>
                                 </b>
                                 <b>
                                     <a>51</a>
@@ -7839,7 +8036,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39345</v>
+                                    <v>39342</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7885,7 +8082,7 @@
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>3440</v>
+                                    <v>3439</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -7895,7 +8092,7 @@
                                 <b>
                                     <a>28</a>
                                     <b>34</b>
-                                    <v>3135</v>
+                                    <v>3134</v>
                                 </b>
                                 <b>
                                     <a>34</a>
@@ -7905,7 +8102,7 @@
                                 <b>
                                     <a>41</a>
                                     <b>66</b>
-                                    <v>2977</v>
+                                    <v>2976</v>
                                 </b>
                                 <b>
                                     <a>66</a>
@@ -7915,7 +8112,7 @@
                                 <b>
                                     <a>92</a>
                                     <b>113</b>
-                                    <v>2977</v>
+                                    <v>2976</v>
                                 </b>
                                 <b>
                                     <a>113</a>
@@ -7935,11 +8132,11 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>150011419</cardinality>
+            <cardinality>150011437</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24673500</v>
+                    <v>24673503</v>
                 </e>
                 <e>
                     <k>inv</k>
@@ -7972,12 +8169,12 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>6583219</v>
+                                    <v>6583220</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>8719893</v>
+                                    <v>8719894</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -8013,7 +8210,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>481561</v>
+                                    <v>481562</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -8038,7 +8235,7 @@
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>444695</v>
+                                    <v>444696</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -8063,11 +8260,11 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>48740832</cardinality>
+            <cardinality>48740838</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7045463</v>
+                    <v>7045464</v>
                 </e>
                 <e>
                     <k>inv</k>
@@ -8146,7 +8343,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>342973</v>
+                                    <v>342974</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -8181,7 +8378,7 @@
                                 <b>
                                     <a>18</a>
                                     <b>20</b>
-                                    <v>344290</v>
+                                    <v>344291</v>
                                 </b>
                                 <b>
                                     <a>20</a>
@@ -8201,19 +8398,19 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>40387489</cardinality>
+            <cardinality>40391183</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>40387489</v>
+                    <v>40391183</v>
                 </e>
                 <e>
                     <k>macro_id</k>
-                    <v>182555</v>
+                    <v>182706</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5925541</v>
+                    <v>5926766</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -8231,7 +8428,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40387489</v>
+                                    <v>40391183</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8247,7 +8444,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40387489</v>
+                                    <v>40391183</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8263,7 +8460,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40387489</v>
+                                    <v>40391183</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8279,17 +8476,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61106</v>
+                                    <v>61156</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27666</v>
+                                    <v>27664</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17972</v>
+                                    <v>18080</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -8299,27 +8496,27 @@
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>13833</v>
+                                    <v>13832</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>13</b>
-                                    <v>14704</v>
+                                    <v>14703</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>33</b>
-                                    <v>13724</v>
+                                    <v>13723</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>182</b>
-                                    <v>13724</v>
+                                    <v>13723</v>
                                 </b>
                                 <b>
-                                    <a>185</a>
-                                    <b>72208</b>
-                                    <v>9803</v>
+                                    <a>186</a>
+                                    <b>72214</b>
+                                    <v>9802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8335,42 +8532,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77607</v>
+                                    <v>77765</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30661</v>
+                                    <v>30659</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>14377</v>
+                                    <v>14376</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>10293</v>
+                                    <v>10292</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>14051</v>
+                                    <v>14050</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>18</b>
-                                    <v>14214</v>
+                                    <v>14213</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>90</b>
-                                    <v>13778</v>
+                                    <v>13723</v>
                                 </b>
                                 <b>
                                     <a>90</a>
-                                    <b>12205</b>
-                                    <v>7570</v>
+                                    <b>12207</b>
+                                    <v>7624</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8386,7 +8583,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178035</v>
+                                    <v>178186</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8407,17 +8604,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5261599</v>
+                                    <v>5262706</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>429484</v>
+                                    <v>429618</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>72208</b>
-                                    <v>234457</v>
+                                    <b>72214</b>
+                                    <v>234441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8433,12 +8630,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5903376</v>
+                                    <v>5904602</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>37</b>
-                                    <v>22165</v>
+                                    <v>22164</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8454,7 +8651,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5925541</v>
+                                    <v>5926766</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8468,13 +8665,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1494</a>
-                                    <b>1495</b>
+                                    <a>1495</a>
+                                    <b>1496</b>
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>740082</a>
-                                    <b>740083</b>
+                                    <a>740200</a>
+                                    <b>740201</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -8494,8 +8691,8 @@
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>3146</a>
-                                    <b>3147</b>
+                                    <a>3149</a>
+                                    <b>3150</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -8510,13 +8707,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1076</a>
-                                    <b>1077</b>
+                                    <a>1077</a>
+                                    <b>1078</b>
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>107726</a>
-                                    <b>107727</b>
+                                    <a>107755</a>
+                                    <b>107756</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -8527,15 +8724,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>33684452</cardinality>
+            <cardinality>33686920</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33684452</v>
+                    <v>33686920</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>15941266</v>
+                    <v>15942726</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8549,7 +8746,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33684452</v>
+                                    <v>33686920</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8565,27 +8762,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7815090</v>
+                                    <v>7816185</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1595836</v>
+                                    <v>1595835</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4707397</v>
+                                    <v>4707507</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1296896</v>
+                                    <v>1297133</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>205</b>
-                                    <v>526045</v>
+                                    <v>526063</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8595,15 +8792,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>6022573</cardinality>
+            <cardinality>6023015</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4208559</v>
+                    <v>4209042</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2272360</v>
+                    <v>2272308</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8617,12 +8814,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3285153</v>
+                                    <v>3285657</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>489021</v>
+                                    <v>489010</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8632,7 +8829,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>412633</v>
+                                    <v>412624</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -8653,12 +8850,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1332200</v>
+                                    <v>1332170</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>481406</v>
+                                    <v>481395</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8668,7 +8865,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>426920</v>
+                                    <v>426910</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -8683,11 +8880,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>82174179</cardinality>
+            <cardinality>82169670</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26181675</v>
+                    <v>26181901</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -8695,7 +8892,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>341898</v>
+                    <v>341869</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8709,22 +8906,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9641676</v>
+                                    <v>9643301</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9734381</v>
+                                    <v>9733558</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4982956</v>
+                                    <v>4982534</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1822661</v>
+                                    <v>1822507</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8740,22 +8937,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9823583</v>
+                                    <v>9825192</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9751897</v>
+                                    <v>9751073</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4826877</v>
+                                    <v>4826468</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1779317</v>
+                                    <v>1779167</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8780,7 +8977,7 @@
                                 </b>
                                 <b>
                                     <a>646904</a>
-                                    <b>2488685</b>
+                                    <b>2488917</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -8823,52 +9020,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39545</v>
+                                    <v>39542</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>62080</v>
+                                    <v>62074</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>20935</v>
+                                    <v>20933</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>34443</v>
+                                    <v>34440</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>39093</v>
+                                    <v>39090</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>30750</v>
+                                    <v>30748</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>28878</v>
+                                    <v>28875</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>26</b>
-                                    <v>25774</v>
+                                    <v>25772</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>57</b>
-                                    <v>27026</v>
+                                    <v>27024</v>
                                 </b>
                                 <b>
                                     <a>57</a>
                                     <b>517</b>
-                                    <v>25911</v>
+                                    <v>25909</v>
                                 </b>
                                 <b>
                                     <a>518</a>
@@ -8889,17 +9086,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>242208</v>
+                                    <v>242188</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>89517</v>
+                                    <v>89509</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>10173</v>
+                                    <v>10172</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8909,11 +9106,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>82174179</cardinality>
+            <cardinality>82169670</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26181675</v>
+                    <v>26181901</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -8921,7 +9118,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>207070</v>
+                    <v>207053</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8935,22 +9132,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9641676</v>
+                                    <v>9643301</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9734381</v>
+                                    <v>9733558</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4982956</v>
+                                    <v>4982534</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1822661</v>
+                                    <v>1822507</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8966,22 +9163,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12589703</v>
+                                    <v>12591079</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8396895</v>
+                                    <v>8396184</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4208641</v>
+                                    <v>4208285</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>986434</v>
+                                    <v>986351</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9006,7 +9203,7 @@
                                 </b>
                                 <b>
                                     <a>646904</a>
-                                    <b>2488685</b>
+                                    <b>2488917</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -9049,22 +9246,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21745</v>
+                                    <v>21743</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26753</v>
+                                    <v>26750</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>43301</v>
+                                    <v>43297</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>15843</v>
+                                    <v>15842</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -9074,32 +9271,32 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>18326</v>
+                                    <v>18324</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>18883</v>
+                                    <v>18882</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>19</b>
-                                    <v>18252</v>
+                                    <v>18251</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>51</b>
-                                    <v>15696</v>
+                                    <v>15694</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>251</b>
-                                    <v>15548</v>
+                                    <v>15547</v>
                                 </b>
                                 <b>
                                     <a>251</a>
-                                    <b>1169416</b>
-                                    <v>9468</v>
+                                    <b>1169648</b>
+                                    <v>9467</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9115,17 +9312,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>104634</v>
+                                    <v>104625</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>88559</v>
+                                    <v>88552</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>66</b>
-                                    <v>13876</v>
+                                    <v>13875</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9135,11 +9332,11 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>4042957</cardinality>
+            <cardinality>4043207</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4042957</v>
+                    <v>4043207</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -9161,7 +9358,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4042957</v>
+                                    <v>4043207</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9177,7 +9374,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4042957</v>
+                                    <v>4043207</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9193,12 +9390,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1441611</v>
+                                    <v>1441362</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>140128</v>
+                                    <v>140377</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -9268,8 +9465,8 @@
                                     <v>124</v>
                                 </b>
                                 <b>
-                                    <a>21972</a>
-                                    <b>21973</b>
+                                    <a>21974</a>
+                                    <b>21975</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -9326,26 +9523,26 @@
         </relation>
         <relation>
             <name>builtin_functions</name>
-            <cardinality>30803</cardinality>
+            <cardinality>30800</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>30803</v>
+                    <v>30800</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1134646</cardinality>
+            <cardinality>1134663</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1130923</v>
+                    <v>1130940</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1134646</v>
+                    <v>1134663</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9359,7 +9556,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1127741</v>
+                                    <v>1127758</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9380,7 +9577,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1134646</v>
+                                    <v>1134663</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9390,11 +9587,11 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4060256</cardinality>
+            <cardinality>4060505</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4042957</v>
+                    <v>4043207</v>
                 </e>
                 <e>
                     <k>return_type</k>
@@ -9412,7 +9609,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4025659</v>
+                                    <v>4025908</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9733,44 +9930,44 @@
         </relation>
         <relation>
             <name>purefunctions</name>
-            <cardinality>131546</cardinality>
+            <cardinality>131903</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>131546</v>
+                    <v>131903</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>87799</cardinality>
+            <cardinality>87797</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>87799</v>
+                    <v>87797</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>51525</cardinality>
+            <cardinality>51524</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>51525</v>
+                    <v>51524</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>4041464</cardinality>
+            <cardinality>4041713</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4041464</v>
+                    <v>4041713</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -9928,15 +10125,15 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4199638</cardinality>
+            <cardinality>4199390</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4193664</v>
+                    <v>4193416</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>4018441</v>
+                    <v>4018690</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -9948,7 +10145,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2806437</v>
+                    <v>2806438</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9962,7 +10159,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4193664</v>
+                                    <v>4193416</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9978,7 +10175,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4187691</v>
+                                    <v>4187442</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9999,7 +10196,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4193664</v>
+                                    <v>4193416</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10015,7 +10212,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4193664</v>
+                                    <v>4193416</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10031,12 +10228,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3857778</v>
+                                    <v>3858525</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>160662</v>
+                                    <v>160165</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10052,7 +10249,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4000147</v>
+                                    <v>4000396</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10073,7 +10270,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4018441</v>
+                                    <v>4018690</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10089,12 +10286,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3877814</v>
+                                    <v>3878437</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>140626</v>
+                                    <v>140253</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10129,7 +10326,7 @@
                                 </b>
                                 <b>
                                     <a>364</a>
-                                    <b>10296</b>
+                                    <b>10294</b>
                                     <v>1244</v>
                                 </b>
                             </bs>
@@ -10146,7 +10343,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>304400</v>
+                                    <v>304401</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10164,7 +10361,7 @@
                                     <v>45797</v>
                                 </b>
                                 <b>
-                                    <a>1483</a>
+                                    <a>1485</a>
                                     <b>9907</b>
                                     <v>248</v>
                                 </b>
@@ -10254,12 +10451,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>129426</v>
+                                    <v>129550</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>3169</b>
-                                    <v>36587</v>
+                                    <v>36463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10275,12 +10472,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1441113</v>
+                                    <v>1440864</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>140626</v>
+                                    <v>140875</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -10348,12 +10545,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2413180</v>
+                                    <v>2413305</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>252132</v>
+                                    <v>252008</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10374,12 +10571,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2431847</v>
+                                    <v>2431972</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>233963</v>
+                                    <v>233838</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10421,7 +10618,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2767360</v>
+                                    <v>2767361</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10473,7 +10670,7 @@
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1744269</v>
+                    <v>1744270</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -10703,26 +10900,26 @@
         </relation>
         <relation>
             <name>fun_decl_empty_throws</name>
-            <cardinality>420764</cardinality>
+            <cardinality>421590</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>420764</v>
+                    <v>421590</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>140904</cardinality>
+            <cardinality>140906</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>140904</v>
+                    <v>140906</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>140464</v>
+                    <v>140466</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10736,7 +10933,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>140904</v>
+                                    <v>140906</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10752,7 +10949,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>140024</v>
+                                    <v>140026</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10767,11 +10964,11 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>1160979</cardinality>
+            <cardinality>1160855</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1160979</v>
+                    <v>1160855</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -10876,11 +11073,11 @@
         </relation>
         <relation>
             <name>fun_requires</name>
-            <cardinality>29023</cardinality>
+            <cardinality>29022</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>10082</v>
+                    <v>10081</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -10888,7 +11085,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>28787</v>
+                    <v>28786</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11006,7 +11203,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28551</v>
+                                    <v>28550</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11027,7 +11224,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28787</v>
+                                    <v>28786</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11037,11 +11234,11 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>7295169</cardinality>
+            <cardinality>7294672</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7295169</v>
+                    <v>7294672</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -11049,7 +11246,7 @@
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3524256</v>
+                    <v>3524008</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11063,7 +11260,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7295169</v>
+                                    <v>7294672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11079,7 +11276,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7295169</v>
+                                    <v>7294672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11114,12 +11311,12 @@
                                 </b>
                                 <b>
                                     <a>343</a>
-                                    <b>16219</b>
+                                    <b>16218</b>
                                     <v>622</v>
                                 </b>
                                 <b>
-                                    <a>28319</a>
-                                    <b>28320</b>
+                                    <a>28317</a>
+                                    <b>28318</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -11155,12 +11352,12 @@
                                 </b>
                                 <b>
                                     <a>343</a>
-                                    <b>16219</b>
+                                    <b>16218</b>
                                     <v>622</v>
                                 </b>
                                 <b>
-                                    <a>28319</a>
-                                    <b>28320</b>
+                                    <a>28317</a>
+                                    <b>28318</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -11177,7 +11374,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1505951</v>
+                                    <v>1505826</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11187,7 +11384,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>600837</v>
+                                    <v>600712</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -11213,7 +11410,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1505951</v>
+                                    <v>1505826</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11223,7 +11420,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>600837</v>
+                                    <v>600712</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -11243,15 +11440,15 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>9374952</cardinality>
+            <cardinality>9374456</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9368481</v>
+                    <v>9367984</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>9026372</v>
+                    <v>9027369</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -11259,11 +11456,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>850480</v>
+                    <v>850481</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6259509</v>
+                    <v>6259510</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11277,7 +11474,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9368481</v>
+                                    <v>9367984</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11293,7 +11490,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9362010</v>
+                                    <v>9361513</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11314,7 +11511,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9368481</v>
+                                    <v>9367984</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11330,7 +11527,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9368481</v>
+                                    <v>9367984</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11346,12 +11543,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8701686</v>
+                                    <v>8704176</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>324686</v>
+                                    <v>323192</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11367,7 +11564,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8973357</v>
+                                    <v>8974354</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11388,7 +11585,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8921213</v>
+                                    <v>8922210</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11409,12 +11606,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8780711</v>
+                                    <v>8783076</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>245661</v>
+                                    <v>244292</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11466,7 +11663,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>868525</v>
+                                    <v>868526</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11485,7 +11682,7 @@
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>2870</b>
+                                    <b>2872</b>
                                     <v>80891</v>
                                 </b>
                             </bs>
@@ -11593,7 +11790,7 @@
                                 </b>
                                 <b>
                                     <a>25</a>
-                                    <b>27138</b>
+                                    <b>27137</b>
                                     <v>31236</v>
                                 </b>
                             </bs>
@@ -11610,12 +11807,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>476015</v>
+                                    <v>475766</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>164769</v>
+                                    <v>164894</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -11625,7 +11822,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>72055</v>
+                                    <v>72180</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -11718,16 +11915,16 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5758231</v>
+                                    <v>5758605</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>471161</v>
+                                    <v>470788</v>
                                 </b>
                                 <b>
                                     <a>20</a>
-                                    <b>2942</b>
+                                    <b>2941</b>
                                     <v>30116</v>
                                 </b>
                             </bs>
@@ -11744,12 +11941,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5838873</v>
+                                    <v>5839247</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2935</b>
-                                    <v>420635</v>
+                                    <v>420262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11765,7 +11962,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5961704</v>
+                                    <v>5961705</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11801,11 +11998,11 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3763197</cardinality>
+            <cardinality>3763198</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3763197</v>
+                    <v>3763198</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -11967,7 +12164,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1543658</v>
+                    <v>1543659</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12034,7 +12231,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1594433</v>
+                                    <v>1594434</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12102,18 +12299,18 @@
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>675760</cardinality>
+            <cardinality>676476</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>675760</v>
+                    <v>676476</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_requires</name>
-            <cardinality>7658</cardinality>
+            <cardinality>7657</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -12171,7 +12368,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7615</v>
+                                    <v>7614</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12186,11 +12383,11 @@
         </relation>
         <relation>
             <name>namespace_decls</name>
-            <cardinality>407977</cardinality>
+            <cardinality>408755</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>407977</v>
+                    <v>408755</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
@@ -12198,11 +12395,11 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>407977</v>
+                    <v>408755</v>
                 </e>
                 <e>
                     <k>bodylocation</k>
-                    <v>407977</v>
+                    <v>408755</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12216,7 +12413,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407977</v>
+                                    <v>408755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12232,7 +12429,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407977</v>
+                                    <v>408755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12248,7 +12445,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407977</v>
+                                    <v>408755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12308,12 +12505,12 @@
                                 </b>
                                 <b>
                                     <a>263</a>
-                                    <b>1509</b>
+                                    <b>1517</b>
                                     <v>145</v>
                                 </b>
                                 <b>
-                                    <a>1882</a>
-                                    <b>12507</b>
+                                    <a>1890</a>
+                                    <b>12533</b>
                                     <v>40</v>
                                 </b>
                             </bs>
@@ -12374,12 +12571,12 @@
                                 </b>
                                 <b>
                                     <a>263</a>
-                                    <b>1509</b>
+                                    <b>1517</b>
                                     <v>145</v>
                                 </b>
                                 <b>
-                                    <a>1882</a>
-                                    <b>12507</b>
+                                    <a>1890</a>
+                                    <b>12533</b>
                                     <v>40</v>
                                 </b>
                             </bs>
@@ -12440,12 +12637,12 @@
                                 </b>
                                 <b>
                                     <a>263</a>
-                                    <b>1509</b>
+                                    <b>1517</b>
                                     <v>145</v>
                                 </b>
                                 <b>
-                                    <a>1882</a>
-                                    <b>12507</b>
+                                    <a>1890</a>
+                                    <b>12533</b>
                                     <v>40</v>
                                 </b>
                             </bs>
@@ -12462,7 +12659,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407977</v>
+                                    <v>408755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12478,7 +12675,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407977</v>
+                                    <v>408755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12494,7 +12691,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407977</v>
+                                    <v>408755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12510,7 +12707,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407977</v>
+                                    <v>408755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12526,7 +12723,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407977</v>
+                                    <v>408755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12542,7 +12739,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407977</v>
+                                    <v>408755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12552,19 +12749,19 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>271002</cardinality>
+            <cardinality>270979</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>271002</v>
+                    <v>270979</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>58818</v>
+                    <v>58813</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>26742</v>
+                    <v>26740</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -12582,7 +12779,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>271002</v>
+                                    <v>270979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12598,7 +12795,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>271002</v>
+                                    <v>270979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12614,7 +12811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>271002</v>
+                                    <v>270979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12630,12 +12827,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51118</v>
+                                    <v>51113</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5365</v>
+                                    <v>5364</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -12656,12 +12853,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51118</v>
+                                    <v>51113</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5365</v>
+                                    <v>5364</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -12682,7 +12879,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58818</v>
+                                    <v>58813</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12698,7 +12895,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21093</v>
+                                    <v>21091</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12729,7 +12926,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21093</v>
+                                    <v>21091</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12760,7 +12957,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26742</v>
+                                    <v>26740</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12833,15 +13030,15 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>577847</cardinality>
+            <cardinality>577799</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>21808</v>
+                    <v>21806</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>271002</v>
+                    <v>270979</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12885,7 +13082,7 @@
                                 <b>
                                     <a>145</a>
                                     <b>146</b>
-                                    <v>2609</v>
+                                    <v>2608</v>
                                 </b>
                                 <b>
                                     <a>146</a>
@@ -12906,27 +13103,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96218</v>
+                                    <v>96210</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>119805</v>
+                                    <v>119794</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>20020</v>
+                                    <v>20018</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>26605</v>
+                                    <v>26603</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>8353</v>
+                                    <v>8352</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12936,23 +13133,23 @@
         </relation>
         <relation>
             <name>static_asserts</name>
-            <cardinality>172750</cardinality>
+            <cardinality>172739</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>172750</v>
+                    <v>172739</v>
                 </e>
                 <e>
                     <k>condition</k>
-                    <v>172750</v>
+                    <v>172739</v>
                 </e>
                 <e>
                     <k>message</k>
-                    <v>38652</v>
+                    <v>38650</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>22585</v>
+                    <v>22584</v>
                 </e>
                 <e>
                     <k>enclosing</k>
@@ -12970,7 +13167,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172750</v>
+                                    <v>172739</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12986,7 +13183,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172750</v>
+                                    <v>172739</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13002,7 +13199,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172750</v>
+                                    <v>172739</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13018,7 +13215,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172750</v>
+                                    <v>172739</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13034,7 +13231,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172750</v>
+                                    <v>172739</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13050,7 +13247,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172750</v>
+                                    <v>172739</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13066,7 +13263,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172750</v>
+                                    <v>172739</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13082,7 +13279,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172750</v>
+                                    <v>172739</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13098,7 +13295,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28416</v>
+                                    <v>28414</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13139,7 +13336,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28416</v>
+                                    <v>28414</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13180,7 +13377,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35818</v>
+                                    <v>35816</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13201,7 +13398,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30222</v>
+                                    <v>30220</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13211,12 +13408,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3385</v>
+                                    <v>3384</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>1903</v>
+                                    <v>1902</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -13242,7 +13439,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3717</v>
+                                    <v>3716</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13257,7 +13454,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4721</v>
+                                    <v>4720</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -13267,7 +13464,7 @@
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>2640</v>
+                                    <v>2639</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -13277,7 +13474,7 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>4381</v>
+                                    <v>4380</v>
                                 </b>
                                 <b>
                                     <a>19</a>
@@ -13303,7 +13500,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3717</v>
+                                    <v>3716</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13318,7 +13515,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4721</v>
+                                    <v>4720</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -13328,7 +13525,7 @@
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>2640</v>
+                                    <v>2639</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -13338,7 +13535,7 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>4381</v>
+                                    <v>4380</v>
                                 </b>
                                 <b>
                                     <a>19</a>
@@ -13359,7 +13556,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6940</v>
+                                    <v>6939</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13369,7 +13566,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7758</v>
+                                    <v>7757</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -13390,7 +13587,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5053</v>
+                                    <v>5052</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13415,7 +13612,7 @@
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>2640</v>
+                                    <v>2639</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -13436,7 +13633,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5709</v>
+                                    <v>5708</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13467,7 +13664,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5709</v>
+                                    <v>5708</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13498,7 +13695,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5863</v>
+                                    <v>5862</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13544,15 +13741,15 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>7051250</cardinality>
+            <cardinality>7052247</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7010805</v>
+                    <v>7011801</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3400056</v>
+                    <v>3400306</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -13574,7 +13771,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7010805</v>
+                                    <v>7011801</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13590,7 +13787,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7010805</v>
+                                    <v>7011801</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13606,7 +13803,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6970359</v>
+                                    <v>6971355</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13632,7 +13829,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>924652</v>
+                                    <v>924776</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13647,7 +13844,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>145853</v>
+                                    <v>145978</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13668,7 +13865,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>924652</v>
+                                    <v>924776</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13683,7 +13880,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>145853</v>
+                                    <v>145978</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13704,7 +13901,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1029188</v>
+                                    <v>1029313</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13714,7 +13911,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>11</b>
-                                    <v>154813</v>
+                                    <v>154938</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13748,13 +13945,13 @@
                                     <v>622</v>
                                 </b>
                                 <b>
-                                    <a>321</a>
-                                    <b>15503</b>
+                                    <a>322</a>
+                                    <b>15505</b>
                                     <v>622</v>
                                 </b>
                                 <b>
-                                    <a>27321</a>
-                                    <b>27322</b>
+                                    <a>27323</a>
+                                    <b>27324</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -13789,13 +13986,13 @@
                                     <v>622</v>
                                 </b>
                                 <b>
-                                    <a>321</a>
-                                    <b>15503</b>
+                                    <a>322</a>
+                                    <b>15505</b>
                                     <v>622</v>
                                 </b>
                                 <b>
-                                    <a>27321</a>
-                                    <b>27322</b>
+                                    <a>27323</a>
+                                    <b>27324</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -13853,7 +14050,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>735614</v>
+                                    <v>735615</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13945,15 +14142,15 @@
         </relation>
         <relation>
             <name>overrides</name>
-            <cardinality>159153</cardinality>
+            <cardinality>159143</cardinality>
             <columnsizes>
                 <e>
                     <k>new</k>
-                    <v>150383</v>
+                    <v>150374</v>
                 </e>
                 <e>
                     <k>old</k>
-                    <v>17799</v>
+                    <v>17798</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13967,12 +14164,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>141620</v>
+                                    <v>141612</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>8762</v>
+                                    <v>8761</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13988,7 +14185,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9685</v>
+                                    <v>9684</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14023,19 +14220,19 @@
         </relation>
         <relation>
             <name>membervariables</name>
-            <cardinality>1502979</cardinality>
+            <cardinality>1505217</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1500528</v>
+                    <v>1502766</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>457641</v>
+                    <v>457991</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>642756</v>
+                    <v>644237</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14049,7 +14246,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1498186</v>
+                                    <v>1500425</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14070,7 +14267,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1500528</v>
+                                    <v>1502766</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14086,22 +14283,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>339459</v>
+                                    <v>339817</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>72597</v>
+                                    <v>72592</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>35454</v>
+                                    <v>35397</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>4445</b>
-                                    <v>10129</v>
+                                    <v>10183</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14117,17 +14314,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>357050</v>
+                                    <v>357407</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64754</v>
+                                    <v>64750</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>57</b>
-                                    <v>34365</v>
+                                    <v>34362</v>
                                 </b>
                                 <b>
                                     <a>60</a>
@@ -14148,22 +14345,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>422023</v>
+                                    <v>423356</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>122484</v>
+                                    <v>122584</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>58056</v>
+                                    <v>58106</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>664</b>
-                                    <v>40192</v>
+                                    <v>40189</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14179,17 +14376,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>525010</v>
+                                    <v>526390</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>73196</v>
+                                    <v>73300</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>668</b>
-                                    <v>44549</v>
+                                    <v>44546</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14385,19 +14582,19 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>724674</cardinality>
+            <cardinality>724688</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>724674</v>
+                    <v>724688</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>53296</v>
+                    <v>53301</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>101406</v>
+                    <v>101408</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14411,7 +14608,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724674</v>
+                                    <v>724688</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14427,7 +14624,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724674</v>
+                                    <v>724688</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14443,7 +14640,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28788</v>
+                                    <v>28793</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14489,12 +14686,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38247</v>
+                                    <v>38252</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6703</v>
+                                    <v>6704</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14520,7 +14717,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62400</v>
+                                    <v>62401</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14561,12 +14758,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84396</v>
+                                    <v>84398</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8392</v>
+                                    <v>8393</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14654,15 +14851,15 @@
         </relation>
         <relation>
             <name>orphaned_variables</name>
-            <cardinality>44034</cardinality>
+            <cardinality>44035</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>44034</v>
+                    <v>44035</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>40785</v>
+                    <v>40786</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14676,7 +14873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44034</v>
+                                    <v>44035</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14707,19 +14904,19 @@
         </relation>
         <relation>
             <name>enumconstants</name>
-            <cardinality>347955</cardinality>
+            <cardinality>348040</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>347955</v>
+                    <v>348040</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>41554</v>
+                    <v>41605</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>13942</v>
+                    <v>13941</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -14727,11 +14924,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>347574</v>
+                    <v>347659</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>320561</v>
+                    <v>320648</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14745,7 +14942,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347955</v>
+                                    <v>348040</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14761,7 +14958,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347955</v>
+                                    <v>348040</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14777,7 +14974,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347955</v>
+                                    <v>348040</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14793,7 +14990,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347955</v>
+                                    <v>348040</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14809,7 +15006,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347955</v>
+                                    <v>348040</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14830,7 +15027,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5772</v>
+                                    <v>5826</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14840,7 +15037,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5555</v>
+                                    <v>5554</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -14865,7 +15062,7 @@
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>3431</v>
+                                    <v>3430</v>
                                 </b>
                                 <b>
                                     <a>15</a>
@@ -14875,7 +15072,7 @@
                                 <b>
                                     <a>33</a>
                                     <b>257</b>
-                                    <v>1307</v>
+                                    <v>1306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14896,7 +15093,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5772</v>
+                                    <v>5826</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14906,7 +15103,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5555</v>
+                                    <v>5554</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -14931,7 +15128,7 @@
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>3431</v>
+                                    <v>3430</v>
                                 </b>
                                 <b>
                                     <a>15</a>
@@ -14941,7 +15138,7 @@
                                 <b>
                                     <a>33</a>
                                     <b>257</b>
-                                    <v>1307</v>
+                                    <v>1306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14957,7 +15154,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41554</v>
+                                    <v>41605</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14978,7 +15175,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5772</v>
+                                    <v>5826</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14988,7 +15185,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5555</v>
+                                    <v>5554</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -15013,7 +15210,7 @@
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>3431</v>
+                                    <v>3430</v>
                                 </b>
                                 <b>
                                     <a>15</a>
@@ -15023,7 +15220,7 @@
                                 <b>
                                     <a>33</a>
                                     <b>257</b>
-                                    <v>1307</v>
+                                    <v>1306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15039,17 +15236,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2124</v>
+                                    <v>2123</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5990</v>
+                                    <v>6044</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8768</v>
+                                    <v>8767</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -15144,7 +15341,7 @@
                                 </b>
                                 <b>
                                     <a>64</a>
-                                    <b>764</b>
+                                    <b>765</b>
                                     <v>980</v>
                                 </b>
                             </bs>
@@ -15200,7 +15397,7 @@
                                 </b>
                                 <b>
                                     <a>64</a>
-                                    <b>764</b>
+                                    <b>765</b>
                                     <v>980</v>
                                 </b>
                             </bs>
@@ -15217,7 +15414,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13942</v>
+                                    <v>13941</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15272,7 +15469,7 @@
                                 </b>
                                 <b>
                                     <a>64</a>
-                                    <b>761</b>
+                                    <b>762</b>
                                     <v>980</v>
                                 </b>
                             </bs>
@@ -15328,7 +15525,7 @@
                                 </b>
                                 <b>
                                     <a>64</a>
-                                    <b>764</b>
+                                    <b>765</b>
                                     <v>980</v>
                                 </b>
                             </bs>
@@ -15343,8 +15540,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>6389</a>
-                                    <b>6390</b>
+                                    <a>6391</a>
+                                    <b>6392</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -15359,8 +15556,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>763</a>
-                                    <b>764</b>
+                                    <a>764</a>
+                                    <b>765</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -15391,8 +15588,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>6382</a>
-                                    <b>6383</b>
+                                    <a>6384</a>
+                                    <b>6385</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -15407,8 +15604,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>5886</a>
-                                    <b>5887</b>
+                                    <a>5888</a>
+                                    <b>5889</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -15425,7 +15622,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347193</v>
+                                    <v>347278</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15446,7 +15643,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347193</v>
+                                    <v>347278</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15467,7 +15664,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347574</v>
+                                    <v>347659</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15483,7 +15680,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347574</v>
+                                    <v>347659</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15499,7 +15696,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347193</v>
+                                    <v>347278</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15520,7 +15717,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>319526</v>
+                                    <v>319613</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15541,7 +15738,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>320561</v>
+                                    <v>320648</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15557,7 +15754,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>319526</v>
+                                    <v>319613</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15578,7 +15775,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>320561</v>
+                                    <v>320648</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15594,7 +15791,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>319526</v>
+                                    <v>319613</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16301,11 +16498,11 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>3023724</cardinality>
+            <cardinality>3023725</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3023724</v>
+                    <v>3023725</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -16317,7 +16514,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1942142</v>
+                    <v>1942143</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16331,7 +16528,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3023724</v>
+                                    <v>3023725</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16347,7 +16544,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3023724</v>
+                                    <v>3023725</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16363,7 +16560,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3023724</v>
+                                    <v>3023725</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16642,7 +16839,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>123203</v>
+                                    <v>123204</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -16657,11 +16854,11 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>2242063</cardinality>
+            <cardinality>2242064</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2242063</v>
+                    <v>2242064</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -16683,7 +16880,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2242063</v>
+                                    <v>2242064</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16699,7 +16896,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2242063</v>
+                                    <v>2242064</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17222,15 +17419,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1755899</cardinality>
+            <cardinality>1755750</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1755899</v>
+                    <v>1755750</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>834290</v>
+                    <v>834219</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17244,7 +17441,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1755899</v>
+                                    <v>1755750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17260,22 +17457,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>659390</v>
+                                    <v>659334</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>80764</v>
+                                    <v>80757</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>63921</v>
+                                    <v>63915</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>4525</b>
-                                    <v>30214</v>
+                                    <v>30211</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17749,7 +17946,7 @@
                 </e>
                 <e>
                     <k>base_type</k>
-                    <v>5234</v>
+                    <v>5233</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18049,15 +18246,15 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>4137871</cardinality>
+            <cardinality>4137521</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4137871</v>
+                    <v>4137521</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>915412</v>
+                    <v>915335</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -18075,7 +18272,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4137871</v>
+                                    <v>4137521</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18091,7 +18288,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4137871</v>
+                                    <v>4137521</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18107,22 +18304,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>652110</v>
+                                    <v>652055</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>158098</v>
+                                    <v>158085</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>70349</v>
+                                    <v>70343</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>32667</b>
-                                    <v>34853</v>
+                                    <v>34850</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18138,12 +18335,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>863873</v>
+                                    <v>863800</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>51538</v>
+                                    <v>51534</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18295,11 +18492,11 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1359715</cardinality>
+            <cardinality>1359600</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1359715</v>
+                    <v>1359600</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -18321,7 +18518,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1359715</v>
+                                    <v>1359600</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18337,7 +18534,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1359715</v>
+                                    <v>1359600</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18542,15 +18739,15 @@
         </relation>
         <relation>
             <name>usertype_uuid</name>
-            <cardinality>47795</cardinality>
+            <cardinality>47930</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>47795</v>
+                    <v>47930</v>
                 </e>
                 <e>
                     <k>uuid</k>
-                    <v>47252</v>
+                    <v>47387</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18564,7 +18761,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47795</v>
+                                    <v>47930</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18580,7 +18777,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46710</v>
+                                    <v>46845</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18595,11 +18792,11 @@
         </relation>
         <relation>
             <name>usertype_alias_kind</name>
-            <cardinality>1755899</cardinality>
+            <cardinality>1755750</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1755899</v>
+                    <v>1755750</v>
                 </e>
                 <e>
                     <k>alias_kind</k>
@@ -18617,7 +18814,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1755899</v>
+                                    <v>1755750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18648,18 +18845,18 @@
         </relation>
         <relation>
             <name>nontype_template_parameters</name>
-            <cardinality>761282</cardinality>
+            <cardinality>761293</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>761282</v>
+                    <v>761293</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_template_type_constraint</name>
-            <cardinality>27071</cardinality>
+            <cardinality>27070</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -18667,7 +18864,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>25934</v>
+                    <v>25933</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18717,7 +18914,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24797</v>
+                                    <v>24796</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18732,15 +18929,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>7910194</cardinality>
+            <cardinality>7910444</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7910194</v>
+                    <v>7910444</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6349610</v>
+                    <v>6349611</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -18758,7 +18955,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7910194</v>
+                                    <v>7910444</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18774,7 +18971,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7910194</v>
+                                    <v>7910444</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18790,12 +18987,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6016461</v>
+                                    <v>6016213</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1120</b>
-                                    <v>333148</v>
+                                    <v>333397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18811,7 +19008,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6349610</v>
+                                    <v>6349611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18830,8 +19027,8 @@
                                     <v>124</v>
                                 </b>
                                 <b>
-                                    <a>63556</a>
-                                    <b>63557</b>
+                                    <a>63558</a>
+                                    <b>63559</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -18863,59 +19060,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>590965</cardinality>
+            <cardinality>590973</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>590965</v>
+                    <v>590973</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1120631</cardinality>
+            <cardinality>1120536</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1120631</v>
+                    <v>1120536</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1341620</cardinality>
+            <cardinality>1341507</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1341620</v>
+                    <v>1341507</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>231204</cardinality>
+            <cardinality>231184</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>231204</v>
+                    <v>231184</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1122283</cardinality>
+            <cardinality>1122188</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1119253</v>
+                    <v>1119158</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>71527</v>
+                    <v>71521</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18929,12 +19126,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1117128</v>
+                                    <v>1117033</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>2125</v>
+                                    <v>2124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18950,12 +19147,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20388</v>
+                                    <v>20386</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12834</v>
+                                    <v>12833</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18980,12 +19177,12 @@
                                 <b>
                                     <a>10</a>
                                     <b>17</b>
-                                    <v>5891</v>
+                                    <v>5890</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>51</b>
-                                    <v>5365</v>
+                                    <v>5364</v>
                                 </b>
                                 <b>
                                     <a>51</a>
@@ -19000,11 +19197,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>2887609</cardinality>
+            <cardinality>2887364</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1362314</v>
+                    <v>1362199</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -19012,7 +19209,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>818825</v>
+                    <v>818756</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19026,27 +19223,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>577774</v>
+                                    <v>577725</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408671</v>
+                                    <v>408636</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>249962</v>
+                                    <v>249940</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>102688</v>
+                                    <v>102679</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>113</b>
-                                    <v>23218</v>
+                                    <v>23216</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19062,22 +19259,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>606210</v>
+                                    <v>606159</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>422610</v>
+                                    <v>422574</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>250793</v>
+                                    <v>250771</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>82699</v>
+                                    <v>82692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19185,22 +19382,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>511601</v>
+                                    <v>511558</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>166904</v>
+                                    <v>166890</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>74925</v>
+                                    <v>74919</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>46</b>
-                                    <v>61417</v>
+                                    <v>61412</v>
                                 </b>
                                 <b>
                                     <a>46</a>
@@ -19221,17 +19418,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>720934</v>
+                                    <v>720873</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>79596</v>
+                                    <v>79589</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>22</b>
-                                    <v>18294</v>
+                                    <v>18293</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19241,11 +19438,11 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>506788</cardinality>
+            <cardinality>506795</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>204502</v>
+                    <v>204505</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -19253,7 +19450,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>506652</v>
+                    <v>506660</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19267,12 +19464,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>154815</v>
+                                    <v>154817</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>43086</v>
+                                    <v>43087</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -19293,7 +19490,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>146996</v>
+                                    <v>146998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19436,7 +19633,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>506517</v>
+                                    <v>506524</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19457,7 +19654,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>506652</v>
+                                    <v>506660</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19467,15 +19664,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>48246</cardinality>
+            <cardinality>48241</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>48246</v>
+                    <v>48241</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>45584</v>
+                    <v>45580</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19489,7 +19686,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>48246</v>
+                                    <v>48241</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19505,7 +19702,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44869</v>
+                                    <v>44865</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19520,19 +19717,19 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>5911109</cardinality>
+            <cardinality>5913261</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5911109</v>
+                    <v>5913261</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>277863</v>
+                    <v>278007</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5854796</v>
+                    <v>5856951</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -19550,7 +19747,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5911109</v>
+                                    <v>5913261</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19566,7 +19763,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5911109</v>
+                                    <v>5913261</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19582,7 +19779,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5911109</v>
+                                    <v>5913261</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19598,42 +19795,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137297</v>
+                                    <v>137451</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31206</v>
+                                    <v>31204</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11654</v>
+                                    <v>11653</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14976</v>
+                                    <v>14975</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>19932</v>
+                                    <v>19931</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>21839</v>
+                                    <v>21783</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>28</b>
-                                    <v>21022</v>
+                                    <v>21020</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>8941</b>
-                                    <v>19932</v>
+                                    <v>19986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19649,42 +19846,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137297</v>
+                                    <v>137451</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31206</v>
+                                    <v>31204</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11654</v>
+                                    <v>11653</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14976</v>
+                                    <v>14975</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>19932</v>
+                                    <v>19931</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>21839</v>
+                                    <v>21783</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>28</b>
-                                    <v>21022</v>
+                                    <v>21020</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>8941</b>
-                                    <v>19932</v>
+                                    <v>19986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19700,7 +19897,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>277863</v>
+                                    <v>278007</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19716,12 +19913,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5809102</v>
+                                    <v>5811261</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>45693</v>
+                                    <v>45690</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19737,12 +19934,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5809102</v>
+                                    <v>5811261</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>45693</v>
+                                    <v>45690</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19758,7 +19955,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5854796</v>
+                                    <v>5856951</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19772,8 +19969,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>108537</a>
-                                    <b>108538</b>
+                                    <a>108584</a>
+                                    <b>108585</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -19788,8 +19985,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>5102</a>
-                                    <b>5103</b>
+                                    <a>5105</a>
+                                    <b>5106</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -19804,8 +20001,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>107503</a>
-                                    <b>107504</b>
+                                    <a>107550</a>
+                                    <b>107551</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -19827,15 +20024,15 @@
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>967578</cardinality>
+            <cardinality>967592</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>967578</v>
+                    <v>967592</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>181520</v>
+                    <v>181523</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19849,7 +20046,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>967578</v>
+                                    <v>967592</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19865,12 +20062,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>109832</v>
+                                    <v>109834</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42545</v>
+                                    <v>42546</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -19895,11 +20092,11 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2468684</cardinality>
+            <cardinality>2468721</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1443870</v>
+                    <v>1443892</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -19907,7 +20104,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>296057</v>
+                    <v>296062</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19921,22 +20118,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>777934</v>
+                                    <v>777946</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>410494</v>
+                                    <v>410500</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>170689</v>
+                                    <v>170691</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>84752</v>
+                                    <v>84753</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19952,22 +20149,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>796956</v>
+                                    <v>796968</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408598</v>
+                                    <v>408604</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>168523</v>
+                                    <v>168525</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>69792</v>
+                                    <v>69793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20105,7 +20302,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173634</v>
+                                    <v>173636</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20130,7 +20327,7 @@
                                 <b>
                                     <a>11</a>
                                     <b>76</b>
-                                    <v>23218</v>
+                                    <v>23219</v>
                                 </b>
                                 <b>
                                     <a>79</a>
@@ -20151,12 +20348,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>255137</v>
+                                    <v>255140</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31917</v>
+                                    <v>31918</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20171,11 +20368,11 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>449824</cardinality>
+            <cardinality>449830</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>195499</v>
+                    <v>195502</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -20183,7 +20380,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>447150</v>
+                    <v>447156</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20197,7 +20394,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>150415</v>
+                                    <v>150417</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20223,7 +20420,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>143544</v>
+                                    <v>143546</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20376,7 +20573,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>444476</v>
+                                    <v>444482</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20397,7 +20594,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>447150</v>
+                                    <v>447156</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20976,11 +21173,11 @@
         </relation>
         <relation>
             <name>template_template_argument</name>
-            <cardinality>9636</cardinality>
+            <cardinality>9635</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>6091</v>
+                    <v>6090</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -20988,7 +21185,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>9047</v>
+                    <v>9046</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21002,7 +21199,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4997</v>
+                                    <v>4996</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21033,7 +21230,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5018</v>
+                                    <v>5017</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21207,7 +21404,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9026</v>
+                                    <v>9025</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21454,11 +21651,11 @@
         </relation>
         <relation>
             <name>concept_instantiation</name>
-            <cardinality>90159</cardinality>
+            <cardinality>90157</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>90159</v>
+                    <v>90157</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -21476,7 +21673,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>90159</v>
+                                    <v>90157</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21572,22 +21769,22 @@
         </relation>
         <relation>
             <name>is_type_constraint</name>
-            <cardinality>36788</cardinality>
+            <cardinality>36787</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>36788</v>
+                    <v>36787</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>concept_template_argument</name>
-            <cardinality>112704</cardinality>
+            <cardinality>112701</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>76151</v>
+                    <v>76149</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -21595,7 +21792,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>21365</v>
+                    <v>21364</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21609,12 +21806,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46334</v>
+                                    <v>46333</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24604</v>
+                                    <v>24603</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21635,12 +21832,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>49938</v>
+                                    <v>49937</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>22309</v>
+                                    <v>22308</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21794,7 +21991,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17976</v>
+                                    <v>17975</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21945,15 +22142,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>600577</cardinality>
+            <cardinality>600586</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>600577</v>
+                    <v>600586</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>282011</v>
+                    <v>282015</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21967,7 +22164,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>600577</v>
+                                    <v>600586</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21983,12 +22180,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>232561</v>
+                                    <v>232564</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>34997</v>
+                                    <v>34998</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22003,11 +22200,11 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>1178605</cardinality>
+            <cardinality>1178524</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
-                    <v>416032</v>
+                    <v>416004</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22015,7 +22212,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>112082</v>
+                    <v>112074</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22029,32 +22226,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82945</v>
+                                    <v>82939</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>126078</v>
+                                    <v>126070</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>107888</v>
+                                    <v>107881</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>49287</v>
+                                    <v>49284</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>33167</v>
+                                    <v>33164</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>19</b>
-                                    <v>16665</v>
+                                    <v>16664</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22070,27 +22267,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88935</v>
+                                    <v>88929</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>138713</v>
+                                    <v>138704</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>114641</v>
+                                    <v>114633</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>40737</v>
+                                    <v>40734</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10</b>
-                                    <v>32894</v>
+                                    <v>32892</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -22288,32 +22485,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33276</v>
+                                    <v>33273</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15576</v>
+                                    <v>15574</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>13288</v>
+                                    <v>13287</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>
@@ -22323,7 +22520,7 @@
                                 <b>
                                     <a>13</a>
                                     <b>26</b>
-                                    <v>8659</v>
+                                    <v>8658</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -22344,22 +22541,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79405</v>
+                                    <v>79399</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17536</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>
@@ -22369,11 +22566,11 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>9678</cardinality>
+            <cardinality>9677</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9678</v>
+                    <v>9677</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -22395,7 +22592,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9678</v>
+                                    <v>9677</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22411,7 +22608,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9678</v>
+                                    <v>9677</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22427,7 +22624,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7732</v>
+                                    <v>7731</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22448,7 +22645,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7732</v>
+                                    <v>7731</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22686,11 +22883,11 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>9693167</cardinality>
+            <cardinality>9694786</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>4002387</v>
+                    <v>4002636</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -22708,17 +22905,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1527356</v>
+                                    <v>1526111</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>504514</v>
+                                    <v>506132</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1034166</v>
+                                    <v>1034042</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -22822,8 +23019,8 @@
                                     <v>124</v>
                                 </b>
                                 <b>
-                                    <a>15135</a>
-                                    <b>15136</b>
+                                    <a>15137</a>
+                                    <b>15138</b>
                                     <v>124</v>
                                 </b>
                                 <b>
@@ -22832,8 +23029,8 @@
                                     <v>124</v>
                                 </b>
                                 <b>
-                                    <a>22767</a>
-                                    <b>22768</b>
+                                    <a>22778</a>
+                                    <b>22779</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -24086,11 +24283,11 @@
         </relation>
         <relation>
             <name>attribute_arg_value</name>
-            <cardinality>16584</cardinality>
+            <cardinality>16585</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>16584</v>
+                    <v>16585</v>
                 </e>
                 <e>
                     <k>value</k>
@@ -24108,7 +24305,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16584</v>
+                                    <v>16585</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24242,15 +24439,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>71632</cardinality>
+            <cardinality>71626</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>71632</v>
+                    <v>71626</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>71632</v>
+                    <v>71626</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24264,7 +24461,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71632</v>
+                                    <v>71626</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24280,7 +24477,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71632</v>
+                                    <v>71626</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24701,11 +24898,11 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>7228465</cardinality>
+            <cardinality>7228466</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>7228465</v>
+                    <v>7228466</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
@@ -24723,7 +24920,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7228465</v>
+                                    <v>7228466</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24764,7 +24961,7 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>4182091</cardinality>
+            <cardinality>4182340</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -24776,7 +24973,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>4177486</v>
+                    <v>4177735</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24825,7 +25022,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>41067</v>
+                                    <v>41068</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -25054,7 +25251,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4177486</v>
+                                    <v>4177735</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25070,7 +25267,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4172881</v>
+                                    <v>4173131</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25085,15 +25282,15 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>114986</cardinality>
+            <cardinality>114977</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>114986</v>
+                    <v>114977</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>69097</v>
+                    <v>69091</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25107,7 +25304,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>114986</v>
+                                    <v>114977</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25123,12 +25320,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37473</v>
+                                    <v>37470</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24480</v>
+                                    <v>24478</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -25148,15 +25345,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>473787</cardinality>
+            <cardinality>473794</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>473787</v>
+                    <v>473794</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>452193</v>
+                    <v>452200</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25164,11 +25361,11 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>234016</v>
+                    <v>234020</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>35166</v>
+                    <v>35167</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25182,7 +25379,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>473787</v>
+                                    <v>473794</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25198,7 +25395,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>473787</v>
+                                    <v>473794</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25214,7 +25411,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>473787</v>
+                                    <v>473794</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25230,7 +25427,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>473787</v>
+                                    <v>473794</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25246,7 +25443,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435777</v>
+                                    <v>435784</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25267,7 +25464,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435777</v>
+                                    <v>435784</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25288,7 +25485,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435777</v>
+                                    <v>435784</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25309,7 +25506,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435777</v>
+                                    <v>435784</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25469,12 +25666,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>224268</v>
+                                    <v>224272</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1655</b>
-                                    <v>9747</v>
+                                    <v>9748</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25490,12 +25687,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>224268</v>
+                                    <v>224272</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1655</b>
-                                    <v>9747</v>
+                                    <v>9748</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25511,7 +25708,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>233576</v>
+                                    <v>233580</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25532,12 +25729,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>228702</v>
+                                    <v>228706</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>81</b>
-                                    <v>5313</v>
+                                    <v>5314</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25553,7 +25750,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26332</v>
+                                    <v>26333</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25589,7 +25786,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26332</v>
+                                    <v>26333</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25625,7 +25822,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35166</v>
+                                    <v>35167</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25641,7 +25838,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28532</v>
+                                    <v>28533</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25666,11 +25863,11 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>475547</cardinality>
+            <cardinality>475554</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>473347</v>
+                    <v>473354</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -25688,7 +25885,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>471147</v>
+                                    <v>471154</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25734,11 +25931,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>447048</cardinality>
+            <cardinality>447055</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>447048</v>
+                    <v>447055</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -25756,7 +25953,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>447048</v>
+                                    <v>447055</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25953,23 +26150,23 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>767814</cardinality>
+            <cardinality>767534</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>767814</v>
+                    <v>767534</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>54357</v>
+                    <v>54340</v>
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>100728</v>
+                    <v>100695</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6058</v>
+                    <v>6056</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25983,7 +26180,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>767814</v>
+                                    <v>767534</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25999,7 +26196,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>767814</v>
+                                    <v>767534</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26015,7 +26212,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>767814</v>
+                                    <v>767534</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26031,37 +26228,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5584</v>
+                                    <v>5582</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24978</v>
+                                    <v>25004</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>4806</v>
+                                    <v>4770</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>17</b>
-                                    <v>4738</v>
+                                    <v>4737</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>27</b>
-                                    <v>4467</v>
+                                    <v>4466</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>45</b>
-                                    <v>4298</v>
+                                    <v>4297</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>81</b>
-                                    <v>4738</v>
+                                    <v>4737</v>
                                 </b>
                                 <b>
                                     <a>102</a>
@@ -26082,37 +26279,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5584</v>
+                                    <v>5582</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24978</v>
+                                    <v>25004</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>4806</v>
+                                    <v>4770</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>17</b>
-                                    <v>4738</v>
+                                    <v>4737</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>27</b>
-                                    <v>4467</v>
+                                    <v>4466</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>45</b>
-                                    <v>4298</v>
+                                    <v>4297</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>81</b>
-                                    <v>4738</v>
+                                    <v>4737</v>
                                 </b>
                                 <b>
                                     <a>102</a>
@@ -26133,7 +26330,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53004</v>
+                                    <v>52987</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26154,27 +26351,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>67490</v>
+                                    <v>67502</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8157</v>
+                                    <v>8120</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>9206</v>
+                                    <v>9203</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>24</b>
-                                    <v>7615</v>
+                                    <v>7613</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>136</b>
-                                    <v>7649</v>
+                                    <v>7646</v>
                                 </b>
                                 <b>
                                     <a>136</a>
@@ -26195,27 +26392,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>67490</v>
+                                    <v>67502</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8157</v>
+                                    <v>8120</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>9206</v>
+                                    <v>9203</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>24</b>
-                                    <v>7615</v>
+                                    <v>7613</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>136</b>
-                                    <v>7649</v>
+                                    <v>7646</v>
                                 </b>
                                 <b>
                                     <a>136</a>
@@ -26236,7 +26433,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99509</v>
+                                    <v>99477</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26257,11 +26454,11 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5686</v>
+                                    <v>5684</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>22496</b>
+                                    <b>22495</b>
                                     <v>372</v>
                                 </b>
                             </bs>
@@ -26278,7 +26475,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5923</v>
+                                    <v>5921</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26299,7 +26496,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5720</v>
+                                    <v>5718</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26314,19 +26511,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>11208576</cardinality>
+            <cardinality>11208578</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11208576</v>
+                    <v>11208578</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>4294965</v>
+                    <v>4294966</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>11208576</v>
+                    <v>11208578</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26340,7 +26537,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11208576</v>
+                                    <v>11208578</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26356,7 +26553,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11208576</v>
+                                    <v>11208578</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26424,7 +26621,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11208576</v>
+                                    <v>11208578</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26440,7 +26637,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11208576</v>
+                                    <v>11208578</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26450,7 +26647,7 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3905317</cardinality>
+            <cardinality>3905318</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -26458,7 +26655,7 @@
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3740174</v>
+                    <v>3740175</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26472,7 +26669,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3281208</v>
+                                    <v>3281209</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26508,15 +26705,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>9634074</cardinality>
+            <cardinality>9634075</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>9633969</v>
+                    <v>9633970</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>9634074</v>
+                    <v>9634075</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26530,7 +26727,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9633863</v>
+                                    <v>9633864</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26551,7 +26748,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9634074</v>
+                                    <v>9634075</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26561,22 +26758,22 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>9923438</cardinality>
+            <cardinality>9923218</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9923438</v>
+                    <v>9923218</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>1666623</cardinality>
+            <cardinality>1666585</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>1241183</v>
+                    <v>1241154</v>
                 </e>
                 <e>
                     <k>i</k>
@@ -26584,7 +26781,7 @@
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>1666623</v>
+                    <v>1666585</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26598,12 +26795,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>826168</v>
+                                    <v>826149</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408236</v>
+                                    <v>408226</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26624,12 +26821,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>826168</v>
+                                    <v>826149</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408236</v>
+                                    <v>408226</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26782,7 +26979,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1666623</v>
+                                    <v>1666585</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26798,7 +26995,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1666623</v>
+                                    <v>1666585</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26808,15 +27005,15 @@
         </relation>
         <relation>
             <name>namespaces</name>
-            <cardinality>8616</cardinality>
+            <cardinality>8615</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8616</v>
+                    <v>8615</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>4555</v>
+                    <v>4554</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26830,7 +27027,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8616</v>
+                                    <v>8615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26846,12 +27043,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3724</v>
+                                    <v>3723</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>526</v>
+                                    <v>525</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26985,11 +27182,11 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>19456296</cardinality>
+            <cardinality>19456298</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>19456296</v>
+                    <v>19456298</v>
                 </e>
                 <e>
                     <k>child_index</k>
@@ -26997,7 +27194,7 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>12941380</v>
+                    <v>12941382</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27011,7 +27208,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19456296</v>
+                                    <v>19456298</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27027,7 +27224,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19456296</v>
+                                    <v>19456298</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27145,7 +27342,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7395565</v>
+                                    <v>7395566</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27171,7 +27368,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7395565</v>
+                                    <v>7395566</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27191,22 +27388,22 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>6898025</cardinality>
+            <cardinality>6897613</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6898025</v>
+                    <v>6897613</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>conversionkinds</name>
-            <cardinality>6051177</cardinality>
+            <cardinality>6051176</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6051177</v>
+                    <v>6051176</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -27224,7 +27421,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6051177</v>
+                                    <v>6051176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27268,8 +27465,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>5832067</a>
-                                    <b>5832068</b>
+                                    <a>5832066</a>
+                                    <b>5832067</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -27280,11 +27477,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>5790730</cardinality>
+            <cardinality>5790597</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>5790730</v>
+                    <v>5790597</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -27302,7 +27499,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5790730</v>
+                                    <v>5790597</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27464,23 +27661,23 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>3042541</cardinality>
+            <cardinality>3042471</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3042541</v>
+                    <v>3042471</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>3042541</v>
+                    <v>3042471</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
-                    <v>47728</v>
+                    <v>47727</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>554597</v>
+                    <v>554584</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27494,7 +27691,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042541</v>
+                                    <v>3042471</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27510,7 +27707,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042541</v>
+                                    <v>3042471</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27526,7 +27723,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042541</v>
+                                    <v>3042471</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27542,7 +27739,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042541</v>
+                                    <v>3042471</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27558,7 +27755,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042541</v>
+                                    <v>3042471</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27574,7 +27771,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042541</v>
+                                    <v>3042471</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27590,7 +27787,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31447</v>
+                                    <v>31446</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27600,7 +27797,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4140</v>
+                                    <v>4139</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -27626,7 +27823,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31447</v>
+                                    <v>31446</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27636,7 +27833,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4140</v>
+                                    <v>4139</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -27662,7 +27859,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34665</v>
+                                    <v>34664</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27693,22 +27890,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79412</v>
+                                    <v>79410</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>41014</v>
+                                    <v>41013</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>397789</v>
+                                    <v>397780</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>36381</v>
+                                    <v>36380</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27724,22 +27921,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79412</v>
+                                    <v>79410</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>41014</v>
+                                    <v>41013</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>397789</v>
+                                    <v>397780</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>36381</v>
+                                    <v>36380</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27755,22 +27952,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>114956</v>
+                                    <v>114953</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>13321</v>
+                                    <v>13320</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>414049</v>
+                                    <v>414040</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>33</b>
-                                    <v>12270</v>
+                                    <v>12269</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27780,15 +27977,15 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>8255502</cardinality>
+            <cardinality>8255503</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>8255502</v>
+                    <v>8255503</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>1050486</v>
+                    <v>1050487</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27802,7 +27999,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8255502</v>
+                                    <v>8255503</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27873,15 +28070,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>5806003</cardinality>
+            <cardinality>5805870</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>5803536</v>
+                    <v>5803403</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>275282</v>
+                    <v>275275</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27895,7 +28092,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5801069</v>
+                                    <v>5800937</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27916,12 +28113,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>181068</v>
+                                    <v>181064</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>38311</v>
+                                    <v>38310</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27931,7 +28128,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>22931</v>
+                                    <v>22930</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -27946,11 +28143,11 @@
         </relation>
         <relation>
             <name>expr_allocator</name>
-            <cardinality>44948</cardinality>
+            <cardinality>44949</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>44948</v>
+                    <v>44949</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -27972,7 +28169,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44948</v>
+                                    <v>44949</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27988,7 +28185,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44948</v>
+                                    <v>44949</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28072,11 +28269,11 @@
         </relation>
         <relation>
             <name>expr_deallocator</name>
-            <cardinality>53477</cardinality>
+            <cardinality>53478</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>53477</v>
+                    <v>53478</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -28098,7 +28295,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53477</v>
+                                    <v>53478</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28114,7 +28311,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53477</v>
+                                    <v>53478</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28363,11 +28560,11 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>13541563</cardinality>
+            <cardinality>13541565</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13541563</v>
+                    <v>13541565</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -28385,7 +28582,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13541563</v>
+                                    <v>13541565</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28431,11 +28628,11 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>6637568</cardinality>
+            <cardinality>6637657</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6637568</v>
+                    <v>6637657</v>
                 </e>
                 <e>
                     <k>text</k>
@@ -28453,7 +28650,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6637568</v>
+                                    <v>6637657</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28483,7 +28680,7 @@
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>593723</b>
+                                    <b>593719</b>
                                     <v>27872</v>
                                 </b>
                             </bs>
@@ -28494,15 +28691,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>13649714</cardinality>
+            <cardinality>13649715</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>13541563</v>
+                    <v>13541565</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>13649714</v>
+                    <v>13649715</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28516,7 +28713,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13451406</v>
+                                    <v>13451407</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28537,7 +28734,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13649714</v>
+                                    <v>13649715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28547,15 +28744,15 @@
         </relation>
         <relation>
             <name>fieldoffsets</name>
-            <cardinality>1500528</cardinality>
+            <cardinality>1502766</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1500528</v>
+                    <v>1502766</v>
                 </e>
                 <e>
                     <k>byteoffset</k>
-                    <v>31369</v>
+                    <v>31367</v>
                 </e>
                 <e>
                     <k>bitoffset</k>
@@ -28573,7 +28770,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1500528</v>
+                                    <v>1502766</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28589,7 +28786,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1500528</v>
+                                    <v>1502766</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28605,7 +28802,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17700</v>
+                                    <v>17698</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28620,22 +28817,22 @@
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>2614</v>
+                                    <v>2613</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>35</b>
-                                    <v>2450</v>
-                                </b>
-                                <b>
-                                    <a>35</a>
-                                    <b>211</b>
                                     <v>2396</v>
                                 </b>
                                 <b>
-                                    <a>250</a>
-                                    <b>5971</b>
-                                    <v>1089</v>
+                                    <a>35</a>
+                                    <b>200</b>
+                                    <v>2396</v>
+                                </b>
+                                <b>
+                                    <a>210</a>
+                                    <b>5988</b>
+                                    <v>1143</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28651,7 +28848,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30335</v>
+                                    <v>30333</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28680,13 +28877,13 @@
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>45</a>
-                                    <b>46</b>
+                                    <a>46</a>
+                                    <b>47</b>
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>46</a>
-                                    <b>47</b>
+                                    <a>47</a>
+                                    <b>48</b>
                                     <v>54</v>
                                 </b>
                                 <b>
@@ -28695,18 +28892,18 @@
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>65</a>
-                                    <b>66</b>
+                                    <a>67</a>
+                                    <b>68</b>
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>82</a>
-                                    <b>83</b>
+                                    <a>84</a>
+                                    <b>85</b>
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>27193</a>
-                                    <b>27194</b>
+                                    <a>27230</a>
+                                    <b>27231</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -28939,23 +29136,23 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>2244830</cardinality>
+            <cardinality>2245206</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>2244830</v>
+                    <v>2245206</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>978850</v>
+                    <v>979091</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>2244830</v>
+                    <v>2245206</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>515724</v>
+                    <v>515984</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28969,7 +29166,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244830</v>
+                                    <v>2245206</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28985,7 +29182,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244830</v>
+                                    <v>2245206</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29001,7 +29198,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244830</v>
+                                    <v>2245206</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29017,17 +29214,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>868820</v>
+                                    <v>869052</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>37292</v>
+                                    <v>37306</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>72737</v>
+                                    <v>72733</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29043,17 +29240,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>868820</v>
+                                    <v>869052</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>37292</v>
+                                    <v>37306</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>72737</v>
+                                    <v>72733</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29069,7 +29266,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>978842</v>
+                                    <v>979083</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29090,7 +29287,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244830</v>
+                                    <v>2245206</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29106,7 +29303,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244830</v>
+                                    <v>2245206</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29122,7 +29319,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244830</v>
+                                    <v>2245206</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29138,22 +29335,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414197</v>
+                                    <v>414456</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33502</v>
+                                    <v>33500</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>41940</v>
+                                    <v>41937</v>
                                 </b>
                                 <b>
                                     <a>13</a>
-                                    <b>111925</b>
-                                    <v>26084</v>
+                                    <b>111939</b>
+                                    <v>26090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29169,17 +29366,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>443423</v>
+                                    <v>443688</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>34409</v>
+                                    <v>34407</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>12247</b>
-                                    <v>37891</v>
+                                    <b>12248</b>
+                                    <v>37889</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29195,22 +29392,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414197</v>
+                                    <v>414456</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33502</v>
+                                    <v>33500</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>41940</v>
+                                    <v>41937</v>
                                 </b>
                                 <b>
                                     <a>13</a>
-                                    <b>111925</b>
-                                    <v>26084</v>
+                                    <b>111939</b>
+                                    <v>26090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29220,26 +29417,26 @@
         </relation>
         <relation>
             <name>braced_initialisers</name>
-            <cardinality>67652</cardinality>
+            <cardinality>67650</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>67652</v>
+                    <v>67650</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>1672586</cardinality>
+            <cardinality>1672548</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>1672586</v>
+                    <v>1672548</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>837108</v>
+                    <v>837089</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29253,7 +29450,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1672586</v>
+                                    <v>1672548</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29269,17 +29466,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17032</v>
+                                    <v>17031</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>810037</v>
+                                    <v>810018</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>10039</v>
+                                    <v>10038</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29289,11 +29486,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>25213262</cardinality>
+            <cardinality>25213265</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25213262</v>
+                    <v>25213265</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -29301,7 +29498,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>10586811</v>
+                    <v>10586812</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29315,7 +29512,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25213262</v>
+                                    <v>25213265</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29331,7 +29528,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25213262</v>
+                                    <v>25213265</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29509,7 +29706,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8904644</v>
+                                    <v>8904645</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29540,7 +29737,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9044063</v>
+                                    <v>9044064</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29560,15 +29757,15 @@
         </relation>
         <relation>
             <name>expr_reuse</name>
-            <cardinality>844466</cardinality>
+            <cardinality>844446</cardinality>
             <columnsizes>
                 <e>
                     <k>reuse</k>
-                    <v>844466</v>
+                    <v>844446</v>
                 </e>
                 <e>
                     <k>original</k>
-                    <v>844466</v>
+                    <v>844446</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -29586,7 +29783,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>844466</v>
+                                    <v>844446</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29602,7 +29799,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>844466</v>
+                                    <v>844446</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29618,7 +29815,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>844466</v>
+                                    <v>844446</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29634,7 +29831,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>844466</v>
+                                    <v>844446</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29686,11 +29883,11 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>25213262</cardinality>
+            <cardinality>25213265</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25213262</v>
+                    <v>25213265</v>
                 </e>
                 <e>
                     <k>typeid</k>
@@ -29712,7 +29909,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25213262</v>
+                                    <v>25213265</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29728,7 +29925,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25213262</v>
+                                    <v>25213265</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29759,7 +29956,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14530</v>
+                                    <v>14531</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -29881,7 +30078,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>27212</v>
+                    <v>27213</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29916,7 +30113,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14384</v>
+                                    <v>14385</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -31341,15 +31538,15 @@
         </relation>
         <relation>
             <name>condition_decl_bind</name>
-            <cardinality>407678</cardinality>
+            <cardinality>407669</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>407678</v>
+                    <v>407669</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>407678</v>
+                    <v>407669</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31363,7 +31560,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407678</v>
+                                    <v>407669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31379,7 +31576,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407678</v>
+                                    <v>407669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31389,11 +31586,11 @@
         </relation>
         <relation>
             <name>typeid_bind</name>
-            <cardinality>47588</cardinality>
+            <cardinality>47589</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>47588</v>
+                    <v>47589</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -31411,7 +31608,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47588</v>
+                                    <v>47589</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31447,15 +31644,15 @@
         </relation>
         <relation>
             <name>uuidof_bind</name>
-            <cardinality>26691</cardinality>
+            <cardinality>26787</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>26691</v>
+                    <v>26787</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>26440</v>
+                    <v>26536</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31469,7 +31666,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26691</v>
+                                    <v>26787</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31485,7 +31682,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26229</v>
+                                    <v>26325</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31631,11 +31828,11 @@
         </relation>
         <relation>
             <name>lambdas</name>
-            <cardinality>18998</cardinality>
+            <cardinality>18997</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>18998</v>
+                    <v>18997</v>
                 </e>
                 <e>
                     <k>default_capture</k>
@@ -31661,7 +31858,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18998</v>
+                                    <v>18997</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31677,7 +31874,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18998</v>
+                                    <v>18997</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31693,7 +31890,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18998</v>
+                                    <v>18997</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31877,15 +32074,15 @@
         </relation>
         <relation>
             <name>lambda_capture</name>
-            <cardinality>31866</cardinality>
+            <cardinality>31864</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>31866</v>
+                    <v>31864</v>
                 </e>
                 <e>
                     <k>lambda</k>
-                    <v>15443</v>
+                    <v>15442</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -31893,7 +32090,7 @@
                 </e>
                 <e>
                     <k>field</k>
-                    <v>31866</v>
+                    <v>31864</v>
                 </e>
                 <e>
                     <k>captured_by_reference</k>
@@ -31905,7 +32102,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>17888</v>
+                    <v>17887</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31919,7 +32116,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31866</v>
+                                    <v>31864</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31935,7 +32132,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31866</v>
+                                    <v>31864</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31951,7 +32148,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31866</v>
+                                    <v>31864</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31967,7 +32164,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31866</v>
+                                    <v>31864</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31983,7 +32180,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31866</v>
+                                    <v>31864</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31999,7 +32196,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31866</v>
+                                    <v>31864</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32015,7 +32212,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8187</v>
+                                    <v>8186</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32025,7 +32222,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1652</v>
+                                    <v>1651</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -32051,7 +32248,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8187</v>
+                                    <v>8186</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32061,7 +32258,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1652</v>
+                                    <v>1651</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -32087,7 +32284,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8187</v>
+                                    <v>8186</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32097,7 +32294,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1652</v>
+                                    <v>1651</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -32123,12 +32320,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14204</v>
+                                    <v>14203</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1239</v>
+                                    <v>1238</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32144,7 +32341,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15321</v>
+                                    <v>15320</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32165,7 +32362,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8778</v>
+                                    <v>8777</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32627,7 +32824,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31866</v>
+                                    <v>31864</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32643,7 +32840,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31866</v>
+                                    <v>31864</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32659,7 +32856,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31866</v>
+                                    <v>31864</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32675,7 +32872,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31866</v>
+                                    <v>31864</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32691,7 +32888,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31866</v>
+                                    <v>31864</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32707,7 +32904,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31866</v>
+                                    <v>31864</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32965,7 +33162,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15645</v>
+                                    <v>15644</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32991,7 +33188,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16220</v>
+                                    <v>16219</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33017,7 +33214,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17200</v>
+                                    <v>17199</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33038,7 +33235,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15645</v>
+                                    <v>15644</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33064,7 +33261,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17864</v>
+                                    <v>17863</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33085,7 +33282,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17888</v>
+                                    <v>17887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33221,11 +33418,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>6349665</cardinality>
+            <cardinality>6349367</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6349665</v>
+                    <v>6349367</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -33233,7 +33430,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2676171</v>
+                    <v>2676092</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33247,7 +33444,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6349665</v>
+                                    <v>6349367</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33263,7 +33460,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6349665</v>
+                                    <v>6349367</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33362,13 +33559,13 @@
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>119906</a>
-                                    <b>119907</b>
+                                    <a>119911</a>
+                                    <b>119912</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>200140</a>
-                                    <b>200141</b>
+                                    <a>200145</a>
+                                    <b>200146</b>
                                     <v>8</v>
                                 </b>
                                 <b>
@@ -33473,13 +33670,13 @@
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>49040</a>
-                                    <b>49041</b>
+                                    <a>49045</a>
+                                    <b>49046</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>86406</a>
-                                    <b>86407</b>
+                                    <a>86411</a>
+                                    <b>86412</b>
                                     <v>8</v>
                                 </b>
                                 <b>
@@ -33501,22 +33698,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2218098</v>
+                                    <v>2218046</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>181666</v>
+                                    <v>181655</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>201547</v>
+                                    <v>201535</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>1789</b>
-                                    <v>74859</v>
+                                    <v>74855</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33532,12 +33729,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2593464</v>
+                                    <v>2593391</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>82706</v>
+                                    <v>82701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33750,15 +33947,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>435779</cardinality>
+            <cardinality>435769</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>435779</v>
+                    <v>435769</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>435779</v>
+                    <v>435769</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33772,7 +33969,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435779</v>
+                                    <v>435769</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33788,7 +33985,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435779</v>
+                                    <v>435769</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34182,11 +34379,11 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>833612</cardinality>
+            <cardinality>833592</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>410617</v>
+                    <v>410607</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -34194,7 +34391,7 @@
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>833612</v>
+                    <v>833592</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34213,7 +34410,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>407742</v>
+                                    <v>407733</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -34239,7 +34436,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>407742</v>
+                                    <v>407733</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -34402,7 +34599,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>833612</v>
+                                    <v>833592</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34418,7 +34615,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>833612</v>
+                                    <v>833592</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34428,15 +34625,15 @@
         </relation>
         <relation>
             <name>switch_body</name>
-            <cardinality>410617</cardinality>
+            <cardinality>410607</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>410617</v>
+                    <v>410607</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>410617</v>
+                    <v>410607</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34450,7 +34647,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>410617</v>
+                                    <v>410607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34466,7 +34663,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>410617</v>
+                                    <v>410607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34668,19 +34865,19 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>5611103</cardinality>
+            <cardinality>5610809</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5611103</v>
+                    <v>5610809</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>15726</v>
+                    <v>15725</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>2374344</v>
+                    <v>2374243</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34694,7 +34891,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5611103</v>
+                                    <v>5610809</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34710,7 +34907,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5611103</v>
+                                    <v>5610809</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34770,7 +34967,7 @@
                                 </b>
                                 <b>
                                     <a>78</a>
-                                    <b>209703</b>
+                                    <b>209708</b>
                                     <v>898</v>
                                 </b>
                             </bs>
@@ -34831,7 +35028,7 @@
                                 </b>
                                 <b>
                                     <a>78</a>
-                                    <b>209703</b>
+                                    <b>209708</b>
                                     <v>898</v>
                                 </b>
                             </bs>
@@ -34848,32 +35045,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1355059</v>
+                                    <v>1355019</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>515764</v>
+                                    <v>515733</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>151047</v>
+                                    <v>151038</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>155242</v>
+                                    <v>155232</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>178313</v>
+                                    <v>178303</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>1943</b>
-                                    <v>18917</v>
+                                    <v>18916</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34889,32 +35086,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1355059</v>
+                                    <v>1355019</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>515764</v>
+                                    <v>515733</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>151047</v>
+                                    <v>151038</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>155242</v>
+                                    <v>155232</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>178313</v>
+                                    <v>178303</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>1943</b>
-                                    <v>18917</v>
+                                    <v>18916</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34924,22 +35121,22 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>43218</cardinality>
+            <cardinality>43224</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>43218</v>
+                    <v>43224</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>stmt_decl_bind</name>
-            <cardinality>723620</cardinality>
+            <cardinality>723577</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>713084</v>
+                    <v>713042</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -34947,7 +35144,7 @@
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>723620</v>
+                    <v>723577</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34961,12 +35158,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>705642</v>
+                                    <v>705600</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>7442</v>
+                                    <v>7441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34982,12 +35179,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>705642</v>
+                                    <v>705600</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>7442</v>
+                                    <v>7441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35115,7 +35312,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>723620</v>
+                                    <v>723577</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35131,7 +35328,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>723620</v>
+                                    <v>723577</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35141,11 +35338,11 @@
         </relation>
         <relation>
             <name>stmt_decl_entry_bind</name>
-            <cardinality>723620</cardinality>
+            <cardinality>723577</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>713084</v>
+                    <v>713042</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -35153,7 +35350,7 @@
                 </e>
                 <e>
                     <k>decl_entry</k>
-                    <v>723620</v>
+                    <v>723577</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35167,12 +35364,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>705642</v>
+                                    <v>705600</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>7442</v>
+                                    <v>7441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35188,12 +35385,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>705642</v>
+                                    <v>705600</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>7442</v>
+                                    <v>7441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35321,7 +35518,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>723620</v>
+                                    <v>723577</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35337,7 +35534,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>723620</v>
+                                    <v>723577</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35385,7 +35582,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1291401</v>
+                                    <v>1291402</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35586,11 +35783,11 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>5395214</cardinality>
+            <cardinality>5395215</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5395214</v>
+                    <v>5395215</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -35598,7 +35795,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5392103</v>
+                    <v>5392104</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35612,7 +35809,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5395214</v>
+                                    <v>5395215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35628,7 +35825,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5395214</v>
+                                    <v>5395215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35797,7 +35994,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5392103</v>
+                                    <v>5392104</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35887,11 +36084,11 @@
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>4341758</cardinality>
+            <cardinality>4341759</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4341758</v>
+                    <v>4341759</v>
                 </e>
                 <e>
                     <k>head</k>
@@ -35913,7 +36110,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4341758</v>
+                                    <v>4341759</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35929,7 +36126,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4341758</v>
+                                    <v>4341759</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35950,7 +36147,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>798</b>
-                                    <v>198121</v>
+                                    <v>198122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35987,7 +36184,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1531462</v>
+                                    <v>1531463</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36033,15 +36230,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>317365</cardinality>
+            <cardinality>317338</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>317365</v>
+                    <v>317338</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>58461</v>
+                    <v>58456</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36055,7 +36252,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>317365</v>
+                                    <v>317338</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36071,17 +36268,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28930</v>
+                                    <v>28928</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9405</v>
+                                    <v>9404</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4934</v>
+                                    <v>4933</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -36207,11 +36404,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>30224721</cardinality>
+            <cardinality>30225171</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>3843710</v>
+                    <v>3843767</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -36229,17 +36426,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>527062</v>
+                                    <v>527070</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>26772</v>
+                                    <v>26773</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3289875</v>
+                                    <v>3289924</v>
                                 </b>
                             </bs>
                         </hist>
diff --git a/cpp/ql/lib/upgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/in_trap_or_tag.ql b/cpp/ql/lib/upgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/in_trap_or_tag.ql
new file mode 100644
index 00000000000..331806e01fd
--- /dev/null
+++ b/cpp/ql/lib/upgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/in_trap_or_tag.ql
@@ -0,0 +1,11 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class Trap extends @trap {
+  string toString() { none() }
+}
+
+from Element e, Trap trap
+where in_trap(e, trap)
+select e, trap
diff --git a/cpp/ql/lib/upgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/old.dbscheme b/cpp/ql/lib/upgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/old.dbscheme
new file mode 100644
index 00000000000..7e7c2f55670
--- /dev/null
+++ b/cpp/ql/lib/upgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/old.dbscheme
@@ -0,0 +1,2517 @@
+
+/*- 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
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_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
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    string source_file: string ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file `trap_file`.
+ */
+in_trap(
+    int element: @element ref,
+    int trap_file: @trap 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
+// ... 41 _Decimal64
+// ... 42 _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
+                       | @decltype;
+
+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
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@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
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+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
+);
+
+param_ref_to_this(
+    int expr: @param_ref 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
+| 17 = @ppd_embed
+| 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
+);
+
+embeds(
+    unique int id: @ppd_embed 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
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string 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/7e7c2f55670f8123d514cf542ccb1938118ac561/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..770002bb023
--- /dev/null
+++ b/cpp/ql/lib/upgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/semmlecode.cpp.dbscheme
@@ -0,0 +1,2545 @@
+
+/*- 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
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_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
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag 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
+// ... 41 _Decimal64
+// ... 42 _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
+                       | @decltype;
+
+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
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@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
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+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
+);
+
+param_ref_to_this(
+    int expr: @param_ref 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
+| 17 = @ppd_embed
+| 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
+);
+
+embeds(
+    unique int id: @ppd_embed 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
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string 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/7e7c2f55670f8123d514cf542ccb1938118ac561/source_files.ql b/cpp/ql/lib/upgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/source_files.ql
new file mode 100644
index 00000000000..19c08d64ece
--- /dev/null
+++ b/cpp/ql/lib/upgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/source_files.ql
@@ -0,0 +1,22 @@
+newtype TSourceFile = MkSourceFile(string name) { source_file_uses_trap(name, _) }
+
+module FreshSourceFile = QlBuiltins::NewEntity<TSourceFile>;
+
+class SourceFile extends FreshSourceFile::EntityId {
+  string toString() { none() }
+}
+
+class Trap extends @trap {
+  string toString() { none() }
+}
+
+query predicate mk_source_file_name(SourceFile source_file, string name) {
+  source_file = FreshSourceFile::map(MkSourceFile(name))
+}
+
+query predicate mk_source_file_uses_trap(SourceFile source_file, Trap trap) {
+  exists(string name |
+    source_file_uses_trap(name, trap) and
+    mk_source_file_name(source_file, name)
+  )
+}
diff --git a/cpp/ql/lib/upgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/upgrade.properties b/cpp/ql/lib/upgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/upgrade.properties
new file mode 100644
index 00000000000..26400eeded8
--- /dev/null
+++ b/cpp/ql/lib/upgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/upgrade.properties
@@ -0,0 +1,6 @@
+description: Add source_file_name
+compatibility: backwards
+source_file_uses_trap.rel: run source_files.ql mk_source_file_uses_trap
+source_file_name.rel: run source_files.ql mk_source_file_name
+in_trap.rel: delete
+in_trap_or_tag.rel: run in_trap_or_tag.ql
diff --git a/cpp/ql/src/CHANGELOG.md b/cpp/ql/src/CHANGELOG.md
index 640b66a910d..c29eaa31e44 100644
--- a/cpp/ql/src/CHANGELOG.md
+++ b/cpp/ql/src/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.5.13
+
+No user-facing changes.
+
+## 1.5.12
+
+No user-facing changes.
+
 ## 1.5.11
 
 No user-facing changes.
diff --git a/cpp/ql/src/Likely Bugs/Arithmetic/IntMultToLong.ql b/cpp/ql/src/Likely Bugs/Arithmetic/IntMultToLong.ql
index a54ac9020c8..6747d177c80 100644
--- a/cpp/ql/src/Likely Bugs/Arithmetic/IntMultToLong.ql	
+++ b/cpp/ql/src/Likely Bugs/Arithmetic/IntMultToLong.ql	
@@ -218,7 +218,9 @@ where
   // only report if we cannot prove that the result of the
   // multiplication will be less (resp. greater) than the
   // maximum (resp. minimum) number we can compute.
-  overflows(me, t1)
+  overflows(me, t1) and
+  // exclude cases where the expression type may not have been extracted accurately
+  not me.getParent().(Call).getTarget().hasAmbiguousReturnType()
 select me,
   "Multiplication result may overflow '" + me.getType().toString() + "' before it is converted to '"
     + me.getFullyConverted().getType().toString() + "'."
diff --git a/cpp/ql/src/Likely Bugs/Format/WrongTypeFormatArguments.ql b/cpp/ql/src/Likely Bugs/Format/WrongTypeFormatArguments.ql
index 33fe3a0b7a1..7f0a4833cb5 100644
--- a/cpp/ql/src/Likely Bugs/Format/WrongTypeFormatArguments.ql	
+++ b/cpp/ql/src/Likely Bugs/Format/WrongTypeFormatArguments.ql	
@@ -168,9 +168,11 @@ where
     formatOtherArgType(ffc, n, expected, arg, actual) and
     not actual.getUnspecifiedType().(IntegralType).getSize() = sizeof_IntType()
   ) and
+  // Exclude some cases where we're less confident the result is correct / clear / valuable
   not arg.isAffectedByMacro() and
   not arg.isFromUninstantiatedTemplate(_) and
   not actual.stripType() instanceof ErroneousType and
+  not arg.getType().stripType().(RoutineType).getReturnType() instanceof ErroneousType and
   not arg.(Call).mayBeFromImplicitlyDeclaredFunction() and
   // Make sure that the format function definition is consistent
   count(ffc.getTarget().getFormatParameterIndex()) = 1
diff --git a/cpp/ql/src/Likely Bugs/Memory Management/AllocaInLoop.ql b/cpp/ql/src/Likely Bugs/Memory Management/AllocaInLoop.ql
index b4e517b3bab..c85b33a9727 100644
--- a/cpp/ql/src/Likely Bugs/Memory Management/AllocaInLoop.ql	
+++ b/cpp/ql/src/Likely Bugs/Memory Management/AllocaInLoop.ql	
@@ -15,6 +15,7 @@
 import cpp
 import semmle.code.cpp.rangeanalysis.RangeAnalysisUtils
 import semmle.code.cpp.ir.dataflow.DataFlow
+private import semmle.code.cpp.ir.dataflow.internal.DataFlowNodes
 
 /** Gets a loop that contains `e`. */
 Loop getAnEnclosingLoopOfExpr(Expr e) { result = getAnEnclosingLoopOfStmt(e.getEnclosingStmt()) }
@@ -45,9 +46,9 @@ private Expr getExpr(DataFlow::Node node) {
   or
   result = node.asOperand().getUse().getAst()
   or
-  result = node.(DataFlow::RawIndirectInstruction).getInstruction().getAst()
+  result = node.(RawIndirectInstruction).getInstruction().getAst()
   or
-  result = node.(DataFlow::RawIndirectOperand).getOperand().getUse().getAst()
+  result = node.(RawIndirectOperand).getOperand().getUse().getAst()
 }
 
 /**
@@ -208,7 +209,7 @@ class LoopWithAlloca extends Stmt {
       this.conditionRequiresInequality(va, _, _) and
       DataFlow::localFlow(result, DataFlow::exprNode(va)) and
       // Phi nodes will be preceded by nodes that represent actual definitions
-      not result instanceof DataFlow::SsaSynthNode and
+      not result instanceof SsaSynthNode and
       // A source is outside the loop if it's not inside the loop
       not exists(Expr e | e = getExpr(result) | this = getAnEnclosingLoopOfExpr(e))
     )
diff --git a/cpp/ql/src/Security/CWE/CWE-079/CgiXss.ql b/cpp/ql/src/Security/CWE/CWE-079/CgiXss.ql
index 994aba733d2..0e4a8f9741c 100644
--- a/cpp/ql/src/Security/CWE/CWE-079/CgiXss.ql
+++ b/cpp/ql/src/Security/CWE/CWE-079/CgiXss.ql
@@ -4,7 +4,7 @@
  *              allows for a cross-site scripting vulnerability.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 6.1
+ * @security-severity 7.8
  * @precision high
  * @id cpp/cgi-xss
  * @tags security
diff --git a/cpp/ql/src/Security/CWE/CWE-134/UncontrolledFormatString.ql b/cpp/ql/src/Security/CWE/CWE-134/UncontrolledFormatString.ql
index 37e3fa0c49f..bf6f014672f 100644
--- a/cpp/ql/src/Security/CWE/CWE-134/UncontrolledFormatString.ql
+++ b/cpp/ql/src/Security/CWE/CWE-134/UncontrolledFormatString.ql
@@ -23,13 +23,31 @@ import Flow::PathGraph
 
 predicate isSource(FlowSource source, string sourceType) { sourceType = source.getSourceType() }
 
+/**
+ * Holds if `f` is a printf-like function or a (possibly nested) wrapper
+ * that forwards a format-string parameter to one.
+ *
+ * Functions that *implement* printf-like behavior (e.g. a custom
+ * `vsnprintf` variant) internally parse the caller-supplied format string
+ * and build small, bounded, local format strings such as `"%d"` or `"%ld"`
+ * for inner `sprintf` calls.  Taint that reaches those inner calls via the
+ * parsed format specifier is not exploitable, so sinks inside such
+ * functions should be excluded.
+ */
+private predicate isPrintfImplementation(Function f) {
+  f instanceof PrintfLikeFunction
+  or
+  exists(PrintfLikeFunction printf | printf.wrapperFunction(f, _, _))
+}
+
 module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node node) { isSource(node, _) }
 
   predicate isSink(DataFlow::Node node) {
     exists(PrintfLikeFunction printf |
       printf.outermostWrapperFunctionCall([node.asExpr(), node.asIndirectExpr()], _)
-    )
+    ) and
+    not isPrintfImplementation([node.asExpr(), node.asIndirectExpr()].getEnclosingFunction())
   }
 
   private predicate isArithmeticNonCharType(ArithmeticType type) {
diff --git a/cpp/ql/src/Security/CWE/CWE-468/SuspiciousAddWithSizeof.ql b/cpp/ql/src/Security/CWE/CWE-468/SuspiciousAddWithSizeof.ql
index d9c9df4fd91..343e96a00d3 100644
--- a/cpp/ql/src/Security/CWE/CWE-468/SuspiciousAddWithSizeof.ql
+++ b/cpp/ql/src/Security/CWE/CWE-468/SuspiciousAddWithSizeof.ql
@@ -18,7 +18,8 @@ import IncorrectPointerScalingCommon
 private predicate isCharSzPtrExpr(Expr e) {
   exists(PointerType pt | pt = e.getFullyConverted().getUnspecifiedType() |
     pt.getBaseType() instanceof CharType or
-    pt.getBaseType() instanceof VoidType
+    pt.getBaseType() instanceof VoidType or
+    pt.getBaseType() instanceof ErroneousType // this could be char / void type in a successful compilation
   )
 }
 
diff --git a/cpp/ql/src/Telemetry/DatabaseQuality.qll b/cpp/ql/src/Telemetry/DatabaseQuality.qll
new file mode 100644
index 00000000000..04351052986
--- /dev/null
+++ b/cpp/ql/src/Telemetry/DatabaseQuality.qll
@@ -0,0 +1,48 @@
+import cpp
+import codeql.util.ReportStats
+
+/** A file that is included in the quality statistics. */
+private class RelevantFile extends File {
+  RelevantFile() { this.fromSource() and exists(this.getRelativePath()) }
+}
+
+module CallTargetStats implements StatsSig {
+  private class RelevantCall extends Call {
+    RelevantCall() { this.getFile() instanceof RelevantFile }
+  }
+
+  // We assume that calls with an implicit target are calls that could not be
+  // resolved. This is accurate in the vast majority of cases, but is inaccurate
+  // for calls that deliberately rely on implicitly declared functions.
+  private predicate hasImplicitTarget(RelevantCall call) {
+    call.getTarget().getADeclarationEntry().isImplicit()
+  }
+
+  int getNumberOfOk() { result = count(RelevantCall call | not hasImplicitTarget(call)) }
+
+  int getNumberOfNotOk() { result = count(RelevantCall call | hasImplicitTarget(call)) }
+
+  string getOkText() { result = "calls with call target" }
+
+  string getNotOkText() { result = "calls with missing call target" }
+}
+
+private class SourceExpr extends Expr {
+  SourceExpr() { this.getFile() instanceof RelevantFile }
+}
+
+private predicate hasGoodType(Expr e) { not e.getType() instanceof ErroneousType }
+
+module ExprTypeStats implements StatsSig {
+  int getNumberOfOk() { result = count(SourceExpr e | hasGoodType(e)) }
+
+  int getNumberOfNotOk() { result = count(SourceExpr e | not hasGoodType(e)) }
+
+  string getOkText() { result = "expressions with known type" }
+
+  string getNotOkText() { result = "expressions with unknown type" }
+}
+
+module CallTargetStatsReport = ReportStats<CallTargetStats>;
+
+module ExprTypeStatsReport = ReportStats<ExprTypeStats>;
diff --git a/cpp/ql/src/Telemetry/ExtractorInformation.ql b/cpp/ql/src/Telemetry/ExtractorInformation.ql
new file mode 100644
index 00000000000..a82b3b86ace
--- /dev/null
+++ b/cpp/ql/src/Telemetry/ExtractorInformation.ql
@@ -0,0 +1,28 @@
+/**
+ * @name C/C++ extraction information
+ * @description Information about the extraction for a C/C++ database
+ * @kind metric
+ * @tags summary telemetry
+ * @id cpp/telemetry/extraction-information
+ */
+
+import cpp
+import DatabaseQuality
+
+from string key, float value
+where
+  (
+    CallTargetStatsReport::numberOfOk(key, value) or
+    CallTargetStatsReport::numberOfNotOk(key, value) or
+    CallTargetStatsReport::percentageOfOk(key, value) or
+    ExprTypeStatsReport::numberOfOk(key, value) or
+    ExprTypeStatsReport::numberOfNotOk(key, value) or
+    ExprTypeStatsReport::percentageOfOk(key, value)
+  ) and
+  /* Infinity */
+  value != 1.0 / 0.0 and
+  /* -Infinity */
+  value != -1.0 / 0.0 and
+  /* NaN */
+  value != 0.0 / 0.0
+select key, value
diff --git a/cpp/ql/src/change-notes/2026-03-11-integer-multiplication-cast-to-long.md b/cpp/ql/src/change-notes/2026-03-11-integer-multiplication-cast-to-long.md
new file mode 100644
index 00000000000..4d4a66c0a22
--- /dev/null
+++ b/cpp/ql/src/change-notes/2026-03-11-integer-multiplication-cast-to-long.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Fixed an issue with the "Multiplication result converted to larger type" (`cpp/integer-multiplication-cast-to-long`) query causing false positive results in `build-mode: none` databases.
diff --git a/cpp/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md b/cpp/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md
new file mode 100644
index 00000000000..0810e9c49ba
--- /dev/null
+++ b/cpp/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md
@@ -0,0 +1,4 @@
+---
+category: queryMetadata
+---
+* The `@security-severity` metadata of `cpp/cgi-xss` has been increased from 6.1 (medium) to 7.8 (high).
diff --git a/cpp/ql/src/change-notes/2026-03-16-wrong-type-format-argument.md b/cpp/ql/src/change-notes/2026-03-16-wrong-type-format-argument.md
new file mode 100644
index 00000000000..84aef7791fc
--- /dev/null
+++ b/cpp/ql/src/change-notes/2026-03-16-wrong-type-format-argument.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Fixed an issue with the "Wrong type of arguments to formatting function" (`cpp/wrong-type-format-argument`) query causing false positive results in `build-mode: none` databases.
diff --git a/cpp/ql/src/change-notes/2026-03-19-suspicious-add-sizeof.md b/cpp/ql/src/change-notes/2026-03-19-suspicious-add-sizeof.md
new file mode 100644
index 00000000000..387e2d44b46
--- /dev/null
+++ b/cpp/ql/src/change-notes/2026-03-19-suspicious-add-sizeof.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Fixed an issue with the "Suspicious add with sizeof" (`cpp/suspicious-add-sizeof`) query causing false positive results in `build-mode: none` databases.
diff --git a/cpp/ql/src/change-notes/2026-03-19-tainted-format-string.md b/cpp/ql/src/change-notes/2026-03-19-tainted-format-string.md
new file mode 100644
index 00000000000..6a1133917bf
--- /dev/null
+++ b/cpp/ql/src/change-notes/2026-03-19-tainted-format-string.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Fixed an issue with the "Uncontrolled format string" (`cpp/tainted-format-string`) query involving certain kinds of formatting function implementations.
diff --git a/cpp/ql/src/change-notes/released/1.5.12.md b/cpp/ql/src/change-notes/released/1.5.12.md
new file mode 100644
index 00000000000..6c2f3cd309b
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.5.12.md
@@ -0,0 +1,3 @@
+## 1.5.12
+
+No user-facing changes.
diff --git a/cpp/ql/src/change-notes/released/1.5.13.md b/cpp/ql/src/change-notes/released/1.5.13.md
new file mode 100644
index 00000000000..293a8ca4ee1
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.5.13.md
@@ -0,0 +1,3 @@
+## 1.5.13
+
+No user-facing changes.
diff --git a/cpp/ql/src/codeql-pack.release.yml b/cpp/ql/src/codeql-pack.release.yml
index 7e8e8103d99..63816b66f59 100644
--- a/cpp/ql/src/codeql-pack.release.yml
+++ b/cpp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.5.11
+lastReleaseVersion: 1.5.13
diff --git a/cpp/ql/src/qlpack.yml b/cpp/ql/src/qlpack.yml
index d8620439fe6..1b32be0402f 100644
--- a/cpp/ql/src/qlpack.yml
+++ b/cpp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-queries
-version: 1.5.12-dev
+version: 1.5.14-dev
 groups:
   - cpp
   - queries
diff --git a/cpp/ql/src/utils/modelgenerator/internal/CaptureModels.qll b/cpp/ql/src/utils/modelgenerator/internal/CaptureModels.qll
index f2c621d04cb..90160df3c21 100644
--- a/cpp/ql/src/utils/modelgenerator/internal/CaptureModels.qll
+++ b/cpp/ql/src/utils/modelgenerator/internal/CaptureModels.qll
@@ -8,6 +8,7 @@ private import semmle.code.cpp.dataflow.ExternalFlow as ExternalFlow
 private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplCommon as DataFlowImplCommon
 private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplSpecific
 private import semmle.code.cpp.ir.dataflow.internal.DataFlowPrivate as DataFlowPrivate
+private import semmle.code.cpp.ir.dataflow.internal.DataFlowNodes as DataFlowNodes
 private import semmle.code.cpp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 private import semmle.code.cpp.ir.dataflow.internal.TaintTrackingImplSpecific
 private import semmle.code.cpp.dataflow.new.TaintTracking as Tt
@@ -403,7 +404,7 @@ private module SinkModelGeneratorInput implements SinkModelGeneratorInputSig {
   }
 
   predicate apiSource(DataFlow::Node source) {
-    DataFlowPrivate::nodeHasOperand(source, any(DataFlow::FieldAddress fa), 1)
+    DataFlowPrivate::nodeHasOperand(source, any(DataFlowNodes::FieldAddress fa), 1)
     or
     source instanceof DataFlow::ParameterNode
   }
@@ -416,7 +417,7 @@ private module SinkModelGeneratorInput implements SinkModelGeneratorInputSig {
       result = "Argument[" + DataFlow::repeatStars(indirectionIndex) + argumentIndex + "]"
     )
     or
-    DataFlowPrivate::nodeHasOperand(source, any(DataFlow::FieldAddress fa), 1) and
+    DataFlowPrivate::nodeHasOperand(source, any(DataFlowNodes::FieldAddress fa), 1) and
     result = qualifierString()
   }
 
diff --git a/cpp/ql/test/library-tests/dataflow/fields/A.cpp b/cpp/ql/test/library-tests/dataflow/fields/A.cpp
index a3a151576e5..d65fa7c543d 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/A.cpp
+++ b/cpp/ql/test/library-tests/dataflow/fields/A.cpp
@@ -46,7 +46,7 @@ public:
   {
     C *c = new C();
     B *b = B::make(c);
-    sink(b->c); // $ast,ir
+    sink(b->c); // $ ast,ir
   }
 
   void f2()
diff --git a/cpp/ql/test/library-tests/dataflow/fields/C.cpp b/cpp/ql/test/library-tests/dataflow/fields/C.cpp
index 96bbb25a3b6..6e5165caa9a 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/C.cpp
+++ b/cpp/ql/test/library-tests/dataflow/fields/C.cpp
@@ -26,9 +26,9 @@ public:
 
   void func()
   {
-    sink(s1); // $ast,ir
+    sink(s1); // $ ast,ir
     sink(s2); // $ MISSING: ast,ir
-    sink(s3); // $ast,ir
+    sink(s3); // $ ast,ir
     sink(s4); // $ MISSING: ast,ir
   }
 };
diff --git a/cpp/ql/test/library-tests/dataflow/fields/D.cpp b/cpp/ql/test/library-tests/dataflow/fields/D.cpp
index ee51e6e5428..b2c882a6982 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/D.cpp
+++ b/cpp/ql/test/library-tests/dataflow/fields/D.cpp
@@ -19,7 +19,7 @@ public:
   };
 
   static void sinkWrap(Box2* b2) {
-    sink(b2->getBox1()->getElem()); // $ast,ir=28:15 ast,ir=35:15 ast,ir=42:15 ast,ir=49:15
+    sink(b2->getBox1()->getElem()); // $ ast,ir=28:15 ast,ir=35:15 ast,ir=42:15 ast,ir=49:15
   }
 
   Box2* boxfield;
diff --git a/cpp/ql/test/library-tests/dataflow/fields/by_reference.cpp b/cpp/ql/test/library-tests/dataflow/fields/by_reference.cpp
index d8c6a194151..680b1489228 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/by_reference.cpp
+++ b/cpp/ql/test/library-tests/dataflow/fields/by_reference.cpp
@@ -48,25 +48,25 @@ struct S {
 void test_setDirectly() {
   S s;
   s.setDirectly(user_input());
-  sink(s.getDirectly()); // $ast ir
+  sink(s.getDirectly()); // $ ast ir
 }
 
 void test_setIndirectly() {
   S s;
   s.setIndirectly(user_input());
-  sink(s.getIndirectly()); // $ast ir
+  sink(s.getIndirectly()); // $ ast ir
 }
 
 void test_setThroughNonMember() {
   S s;
   s.setThroughNonMember(user_input());
-  sink(s.getThroughNonMember()); // $ast ir
+  sink(s.getThroughNonMember()); // $ ast ir
 }
 
 void test_nonMemberSetA() {
   S s;
   nonMemberSetA(&s, user_input());
-  sink(nonMemberGetA(&s)); // $ast,ir
+  sink(nonMemberGetA(&s)); // $ ast,ir
 }
 
 ////////////////////
@@ -112,7 +112,7 @@ void test_outer_with_ptr(Outer *pouter) {
   sink(outer.a); // $ ast,ir
 
   sink(pouter->inner_nested.a); // $ ast,ir
-  sink(pouter->inner_ptr->a); // $ast,ir
+  sink(pouter->inner_ptr->a); // $ ast,ir
   sink(pouter->a); // $ ast,ir
 }
 
diff --git a/cpp/ql/test/library-tests/dataflow/fields/simple.cpp b/cpp/ql/test/library-tests/dataflow/fields/simple.cpp
index d220b416e1a..fb598bd9d71 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/simple.cpp
+++ b/cpp/ql/test/library-tests/dataflow/fields/simple.cpp
@@ -64,7 +64,7 @@ void single_field_test()
     A a;
     a.i = user_input();
     A a2 = a;
-    sink(a2.i); //$ ast,ir
+    sink(a2.i); // $ ast,ir
 }
 
 struct C {
@@ -81,7 +81,7 @@ struct C2
 
     void m() {
         f2.f1 = user_input();
-        sink(getf2f1()); //$ ast,ir
+        sink(getf2f1()); // $ ast,ir
     }
 };
 
@@ -91,7 +91,7 @@ void single_field_test_typedef(A_typedef a)
 {
     a.i = user_input();
     A_typedef a2 = a;
-    sink(a2.i); //$ ast,ir
+    sink(a2.i); // $ ast,ir
 }
 
 namespace TestAdditionalCallTargets {
@@ -168,4 +168,4 @@ void test_union_with_two_instantiations_of_different_sizes() {
   sink(u_int.y); // $ MISSING: ir
 }
 
-} // namespace Simple
\ No newline at end of file
+} // namespace Simple
diff --git a/cpp/ql/test/library-tests/dataflow/fields/struct_init.c b/cpp/ql/test/library-tests/dataflow/fields/struct_init.c
index d2abfeefc08..2b6716a4bc3 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/struct_init.c
+++ b/cpp/ql/test/library-tests/dataflow/fields/struct_init.c
@@ -12,14 +12,14 @@ struct Outer {
 };
 
 void absink(struct AB *ab) {
-  sink(ab->a); //$ ast,ir=20:20 ast,ir=27:7 ast,ir=40:20
+  sink(ab->a); // $ ast,ir=20:20 ast,ir=27:7 ast,ir=40:20
   sink(ab->b); // no flow
 }
 
 int struct_init(void) {
   struct AB ab = { user_input(), 0 };
 
-  sink(ab.a); //$ ast,ir
+  sink(ab.a); // $ ast,ir
   sink(ab.b); // no flow
   absink(&ab);
 
@@ -28,9 +28,9 @@ int struct_init(void) {
     &ab,
   };
 
-  sink(outer.nestedAB.a); //$ ast,ir
+  sink(outer.nestedAB.a); // $ ast,ir
   sink(outer.nestedAB.b); // no flow
-  sink(outer.pointerAB->a); //$ ast,ir
+  sink(outer.pointerAB->a); // $ ast,ir
   sink(outer.pointerAB->b); // no flow
 
   absink(&outer.nestedAB);
diff --git a/cpp/ql/test/library-tests/dataflow/ir-barrier-guards/test.ql b/cpp/ql/test/library-tests/dataflow/ir-barrier-guards/test.ql
index 8948c65e33c..ce7b7999102 100644
--- a/cpp/ql/test/library-tests/dataflow/ir-barrier-guards/test.ql
+++ b/cpp/ql/test/library-tests/dataflow/ir-barrier-guards/test.ql
@@ -15,7 +15,10 @@ predicate instructionGuardChecks(IRGuardCondition gc, Instruction checked, boole
 module BarrierGuard = DataFlow::InstructionBarrierGuard<instructionGuardChecks/3>;
 
 predicate indirectBarrierGuard(DataFlow::Node node, string s) {
-  node = BarrierGuard::getAnIndirectBarrierNode(_) and
+  // This any(...) could technically be removed, but it helps us verify that we don't
+  // accidentially change the API of this predicate (for instance, by having
+  // the column be a unit parameter).
+  node = BarrierGuard::getAnIndirectBarrierNode(any(int indirectionIndex)) and
   if node.isGLValue()
   then s = "glval<" + node.getType().toString().replaceAll(" ", "") + ">"
   else s = node.getType().toString().replaceAll(" ", "")
diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/FlowSummaryNode.ql b/cpp/ql/test/library-tests/dataflow/models-as-data/FlowSummaryNode.ql
index 399e2e129b3..7b551515b46 100644
--- a/cpp/ql/test/library-tests/dataflow/models-as-data/FlowSummaryNode.ql
+++ b/cpp/ql/test/library-tests/dataflow/models-as-data/FlowSummaryNode.ql
@@ -1,6 +1,7 @@
 import testModels
 private import semmle.code.cpp.ir.dataflow.internal.DataFlowPrivate
 private import semmle.code.cpp.ir.dataflow.internal.DataFlowUtil
+private import semmle.code.cpp.ir.dataflow.internal.DataFlowNodes
 
 string describe(DataFlow::Node n) {
   n instanceof ParameterNode and result = "ParameterNode"
diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/tests.cpp b/cpp/ql/test/library-tests/dataflow/models-as-data/tests.cpp
index 92397bc91c3..cb2bf965083 100644
--- a/cpp/ql/test/library-tests/dataflow/models-as-data/tests.cpp
+++ b/cpp/ql/test/library-tests/dataflow/models-as-data/tests.cpp
@@ -75,7 +75,7 @@ void test_sources() {
 	int e = localMadSource();
 	sink(e); // $ ir
 
-	sink(MyNamespace::namespaceLocalMadSource()); // $: ir
+	sink(MyNamespace::namespaceLocalMadSource()); // $ ir
 	sink(MyNamespace::namespaceLocalMadSourceVar); // $ ir
 	sink(MyNamespace::MyNamespace2::namespace2LocalMadSource()); // $ ir
 	sink(MyNamespace::localMadSource()); // $ (the MyNamespace version of this function is not a source)
@@ -475,4 +475,4 @@ void test_receive_array() {
 	int array[10] = {x};
 	int y = receive_array(array);
 	sink(y); // $ ir
-}
\ No newline at end of file
+}
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 70d5b8c7b00..fa32e192239 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
@@ -450,7 +450,7 @@ void test_qualifiers()
 	b.member = source();
 	sink(b); // $ ir MISSING: ast
 	sink(b.member); // $ ast,ir
-	sink(b.getMember()); // $  MISSING: ir ast
+	sink(b.getMember()); // $ MISSING: ir ast
 
 	c = new MyClass2(0);
 
@@ -865,4 +865,4 @@ void test_iconv(size_t size) {
 	size_t size_out;
 	iconv(0, &s, &size, &p, &size_out);
 	sink(*p); // $ ast,ir
-}
\ No newline at end of file
+}
diff --git a/cpp/ql/test/library-tests/ir/points_to/points_to.cpp b/cpp/ql/test/library-tests/ir/points_to/points_to.cpp
index fa4d062c5f8..43a3077d051 100644
--- a/cpp/ql/test/library-tests/ir/points_to/points_to.cpp
+++ b/cpp/ql/test/library-tests/ir/points_to/points_to.cpp
@@ -24,64 +24,64 @@ struct DerivedVI : virtual Base1 {
 };
 
 void Locals() {
-  Point pt = {  //$ussa=pt
-    1,  //$ussa=pt[0..4)<int>
-    2  //$ussa=pt[4..8)<int>
+  Point pt = {  // $ ussa=pt
+    1,  // $ ussa=pt[0..4)<int>
+    2  // $ ussa=pt[4..8)<int>
   };
-  int i = pt.x;  //$ussa=pt[0..4)<int>
-  i = pt.y;  //$ussa=pt[4..8)<int>
+  int i = pt.x;  // $ ussa=pt[0..4)<int>
+  i = pt.y;  // $ ussa=pt[4..8)<int>
   int* p = &pt.x;
-  i = *p;  //$ussa=pt[0..4)<int>
+  i = *p;  // $ ussa=pt[0..4)<int>
   p = &pt.y;
-  i = *p;  //$ussa=pt[4..8)<int>
+  i = *p;  // $ ussa=pt[4..8)<int>
 }
 
 void PointsTo(
-  int a,         //$raw=a
-  Point& b,      //$raw=b ussa=*b
-  Point* c,      //$raw=c ussa=*c
-  int* d,        //$raw=d ussa=*d
-  DerivedSI* e,  //$raw=e ussa=*e
-  DerivedMI* f,  //$raw=f ussa=*f
-  DerivedVI* g   //$raw=g ussa=*g
+  int a,         // $ raw=a
+  Point& b,      // $ raw=b ussa=*b
+  Point* c,      // $ raw=c ussa=*c
+  int* d,        // $ raw=d ussa=*d
+  DerivedSI* e,  // $ raw=e ussa=*e
+  DerivedMI* f,  // $ raw=f ussa=*f
+  DerivedVI* g   // $ raw=g ussa=*g
 ) {
 
-  int i = a;  //$raw=a
-  i = *&a;  //$raw=a
-  i = *(&a + 0);  //$raw=a
-  i = b.x;  //$raw=b ussa=*b[0..4)<int>
-  i = b.y;  //$raw=b ussa=*b[4..8)<int>
-  i = c->x;  //$raw=c ussa=*c[0..4)<int>
-  i = c->y;  //$raw=c ussa=*c[4..8)<int>
-  i = *d;  //$raw=d ussa=*d[0..4)<int>
-  i = *(d + 0);  //$raw=d ussa=*d[0..4)<int>
-  i = d[5];  //$raw=d ussa=*d[20..24)<int>
-  i = 5[d];  //$raw=d ussa=*d[20..24)<int>
-  i = d[a];  //$raw=d raw=a ussa=*d[?..?)<int>
-  i = a[d];  //$raw=d raw=a ussa=*d[?..?)<int>
+  int i = a;  // $ raw=a
+  i = *&a;  // $ raw=a
+  i = *(&a + 0);  // $ raw=a
+  i = b.x;  // $ raw=b ussa=*b[0..4)<int>
+  i = b.y;  // $ raw=b ussa=*b[4..8)<int>
+  i = c->x;  // $ raw=c ussa=*c[0..4)<int>
+  i = c->y;  // $ raw=c ussa=*c[4..8)<int>
+  i = *d;  // $ raw=d ussa=*d[0..4)<int>
+  i = *(d + 0);  // $ raw=d ussa=*d[0..4)<int>
+  i = d[5];  // $ raw=d ussa=*d[20..24)<int>
+  i = 5[d];  // $ raw=d ussa=*d[20..24)<int>
+  i = d[a];  // $ raw=d raw=a ussa=*d[?..?)<int>
+  i = a[d];  // $ raw=d raw=a ussa=*d[?..?)<int>
 
-  int* p = &b.x;  //$raw=b
-  i = *p;  //$ussa=*b[0..4)<int>
-  p = &b.y;  //$raw=b
-  i = *p;  //$ussa=*b[4..8)<int>
-  p = &c->x;  //$raw=c
-  i = *p;  //$ussa=*c[0..4)<int>
-  p = &c->y;  //$raw=c
-  i = *p;  //$ussa=*c[4..8)<int>
-  p = &d[5];  //$raw=d
-  i = *p;  //$ussa=*d[20..24)<int>
-  p = &d[a];  //$raw=d raw=a
-  i = *p;  //$ussa=*d[?..?)<int>
+  int* p = &b.x;  // $ raw=b
+  i = *p;  // $ ussa=*b[0..4)<int>
+  p = &b.y;  // $ raw=b
+  i = *p;  // $ ussa=*b[4..8)<int>
+  p = &c->x;  // $ raw=c
+  i = *p;  // $ ussa=*c[0..4)<int>
+  p = &c->y;  // $ raw=c
+  i = *p;  // $ ussa=*c[4..8)<int>
+  p = &d[5];  // $ raw=d
+  i = *p;  // $ ussa=*d[20..24)<int>
+  p = &d[a];  // $ raw=d raw=a
+  i = *p;  // $ ussa=*d[?..?)<int>
 
-  Point* q = &c[a];  //$raw=c raw=a
-  i = q->x;  //$ussa=*c[?..?)<int>
-  i = q->y;  //$ussa=*c[?..?)<int>
+  Point* q = &c[a];  // $ raw=c raw=a
+  i = q->x;  // $ ussa=*c[?..?)<int>
+  i = q->y;  // $ ussa=*c[?..?)<int>
 
-  i = e->b1;  //$raw=e ussa=*e[0..4)<int>
-  i = e->dsi;  //$raw=e ussa=*e[4..8)<int>
-  i = f->b1;  //$raw=f ussa=*f[0..4)<int>
-  i = f->b2;  //$raw=f ussa=*f[4..8)<int>
-  i = f->dmi;  //$raw=f ussa=*f[8..12)<int>
-  i = g->b1;  //$raw=g ussa=*g[?..?)<int>
-  i = g->dvi;  //$raw=g ussa=*g[8..12)<int>
-}
\ No newline at end of file
+  i = e->b1;  // $ raw=e ussa=*e[0..4)<int>
+  i = e->dsi;  // $ raw=e ussa=*e[4..8)<int>
+  i = f->b1;  // $ raw=f ussa=*f[0..4)<int>
+  i = f->b2;  // $ raw=f ussa=*f[4..8)<int>
+  i = f->dmi;  // $ raw=f ussa=*f[8..12)<int>
+  i = g->b1;  // $ raw=g ussa=*g[?..?)<int>
+  i = g->dvi;  // $ raw=g ussa=*g[8..12)<int>
+}
diff --git a/cpp/ql/test/library-tests/ir/points_to/smart_pointer.cpp b/cpp/ql/test/library-tests/ir/points_to/smart_pointer.cpp
index db6be36e42a..0e5d26875d6 100644
--- a/cpp/ql/test/library-tests/ir/points_to/smart_pointer.cpp
+++ b/cpp/ql/test/library-tests/ir/points_to/smart_pointer.cpp
@@ -10,24 +10,24 @@ struct S {
 
 void unique_ptr_init(S s) {
     unique_ptr<S> p(new S); // MISSING: $ussa=dynamic{1}
-    int i = (*p).x; //$ MISSING: ussa=dynamic{1}[0..4)<int>
-    *p = s;  //$ MISSING: ussa=dynamic{1}[0..4)<S>
+    int i = (*p).x; // $ MISSING: ussa=dynamic{1}[0..4)<int>
+    *p = s;  // $ MISSING: ussa=dynamic{1}[0..4)<S>
     unique_ptr<S> q = std::move(p);
-    *(q.get()) = s;  //$ MISSING: ussa=dynamic{1}[0..4)<S>
+    *(q.get()) = s;  // $ MISSING: ussa=dynamic{1}[0..4)<S>
     shared_ptr<S> t(std::move(q));
-    t->x = 5; //$ MISSING: ussa=dynamic{1}[0..4)<int>
-    *t = s; //$ MISSING: ussa=dynamic{1}[0..4)<S>
-    *(t.get()) = s; //$ MISSING: ussa=dynamic{1}[0..4)<S>
+    t->x = 5; // $ MISSING: ussa=dynamic{1}[0..4)<int>
+    *t = s; // $ MISSING: ussa=dynamic{1}[0..4)<S>
+    *(t.get()) = s; // $ MISSING: ussa=dynamic{1}[0..4)<S>
 }
 
 void shared_ptr_init(S s) {
-    shared_ptr<S> p(new S); //$ MISSING: ussa=dynamic{1}
-    int i = (*p).x; //$ MISSING: ussa=dynamic{1}[0..4)<int>
-    *p = s;  //$ MISSING: ussa=dynamic{1}[0..4)<S>
+    shared_ptr<S> p(new S); // $ MISSING: ussa=dynamic{1}
+    int i = (*p).x; // $ MISSING: ussa=dynamic{1}[0..4)<int>
+    *p = s;  // $ MISSING: ussa=dynamic{1}[0..4)<S>
     shared_ptr<S> q = std::move(p);
-    *(q.get()) = s;  //$ MISSING: ussa=dynamic{1}[0..4)<S>
+    *(q.get()) = s;  // $ MISSING: ussa=dynamic{1}[0..4)<S>
     shared_ptr<S> t(q);
-    t->x = 5; //$ MISSING: ussa=dynamic{1}[0..4)<int>
-    *t = s; //$ MISSING: ussa=dynamic{1}[0..4)<S>
-    *(t.get()) = s; //$ MISSING: ussa=dynamic{1}[0..4)<S>
+    t->x = 5; // $ MISSING: ussa=dynamic{1}[0..4)<int>
+    *t = s; // $ MISSING: ussa=dynamic{1}[0..4)<S>
+    *(t.get()) = s; // $ MISSING: ussa=dynamic{1}[0..4)<S>
 }
diff --git a/cpp/ql/test/library-tests/ir/range-analysis/SimpleRangeAnalysis_tests.cpp b/cpp/ql/test/library-tests/ir/range-analysis/SimpleRangeAnalysis_tests.cpp
index 649d99a7575..05b11b793c3 100644
--- a/cpp/ql/test/library-tests/ir/range-analysis/SimpleRangeAnalysis_tests.cpp
+++ b/cpp/ql/test/library-tests/ir/range-analysis/SimpleRangeAnalysis_tests.cpp
@@ -46,7 +46,7 @@ int test4() {
   }
   range(total); // $ MISSING: range=>=0
   range(i); // $ range===2
-  range(total + i); // $ range="<=Phi: i+2" MISSING: range===i+2 range=>=2 range=>=i+0 
+  range(total + i); // $ range="<=Phi: i+2" MISSING: range===i+2 range=>=2 range=>=i+0
   return total + i;
 }
 
@@ -210,7 +210,7 @@ int test14(int x) {
   int x3 = (int)(unsigned int)x;
   range(x3);
   char c0 = x;
-  range(c0); 
+  range(c0);
   unsigned short s0 = x;
   range(s0);
   range(x0 + x1 + x2 + x3 + c0 + s0); // $ overflow=+ overflow=+-
@@ -218,7 +218,7 @@ int test14(int x) {
 }
 
 long long test15(long long x) {
-  return (x > 0 && (range(x), x == (int)x)) ? // $ range=>=1 
+  return (x > 0 && (range(x), x == (int)x)) ? // $ range=>=1
     (range(x), x) : // $ range=>=1
     (range(x), -1);
 }
@@ -228,7 +228,7 @@ int test_unary(int a) {
   int total = 0;
 
   if (3 <= a && a <= 11) {
-    range(a); // $ range=<=11 range=>=3 
+    range(a); // $ range=<=11 range=>=3
     int b = +a;
     range(b); // $ range=<=11 range=>=3
     int c = -a;
@@ -384,7 +384,7 @@ int test_mult02(int a, int b) {
     total += r;
     range(total); // $ range=">=Phi: 0-143" range=">=Phi: 0-286"
   }
-  range(total); // $range=">=Phi: 0-143" range=">=Phi: 0-286"
+  range(total); // $ range=">=Phi: 0-143" range=">=Phi: 0-286"
   return total;
 }
 
@@ -467,7 +467,7 @@ int test_mult04(int a, int b) {
     range(a); // $ range=<=0 range=>=-17
     range(b); // $ range=<=0 range=>=-13
     int r = a*b;  // 0 .. 221
-    range(r); // $ range=<=221 range=>=0 
+    range(r); // $ range=<=221 range=>=0
     total += r;
     range(total); // $ range="<=Phi: - ...+221"
   }
@@ -1030,7 +1030,7 @@ void test_negate_signed(int s) {
   }
 }
 
-// By setting the guard after the use in another guard we 
+// By setting the guard after the use in another guard we
 // don't get the useful information
 void test_guard_after_use(int pos, int size, int offset) {
   if (pos + offset >= size) { // $ overflow=+-
@@ -1040,12 +1040,12 @@ void test_guard_after_use(int pos, int size, int offset) {
     return;
   }
   range(pos + 1); // $ overflow=+ range="==InitializeParameter: pos+1" MISSING: range="<=InitializeParameter: size-1"
-} 
+}
 
 int cond();
 
 
-// This is basically what we get when we have a loop that calls 
+// This is basically what we get when we have a loop that calls
 // realloc in some iterations
 void alloc_in_loop(int origLen) {
   if (origLen <= 10) {
@@ -1066,12 +1066,12 @@ void alloc_in_loop(int origLen) {
   }
 }
 
-// This came from a case where it handled the leftovers before an unrolled loop 
+// This came from a case where it handled the leftovers before an unrolled loop
 void mask_at_start(int len) {
   if (len < 0) {
     return;
   }
-  int leftOver = len & 63; 
+  int leftOver = len & 63;
   for (int i = 0; i < leftOver; i++) {
     range(i); // $ range=<=62 range=>=0  range="<=Store: ... & ... | Store: leftOver-1" range="<=InitializeParameter: len-1"
   }
diff --git a/cpp/ql/test/library-tests/ir/types/complex.c b/cpp/ql/test/library-tests/ir/types/complex.c
index d8b18746281..4584bdf104b 100644
--- a/cpp/ql/test/library-tests/ir/types/complex.c
+++ b/cpp/ql/test/library-tests/ir/types/complex.c
@@ -1,14 +1,14 @@
 void Complex(void) {
-  _Complex float cf;  //$irtype=cfloat8
-  _Complex double cd;  //$irtype=cfloat16
-  _Complex long double cld;  //$irtype=cfloat32
+  _Complex float cf;  // $ irtype=cfloat8
+  _Complex double cd;  // $ irtype=cfloat16
+  _Complex long double cld;  // $ irtype=cfloat32
   // _Complex __float128 cf128;
 }
 
 void Imaginary(void) {
-  _Imaginary float jf;  //$irtype=ifloat4
-  _Imaginary double jd;  //$irtype=ifloat8
-  _Imaginary long double jld;  //$irtype=ifloat16
+  _Imaginary float jf;  // $ irtype=ifloat4
+  _Imaginary double jd;  // $ irtype=ifloat8
+  _Imaginary long double jld;  // $ irtype=ifloat16
   // _Imaginary __float128 jf128;
 }
 
diff --git a/cpp/ql/test/library-tests/ir/types/irtypes.cpp b/cpp/ql/test/library-tests/ir/types/irtypes.cpp
index 321382567b7..ddc2df8e96d 100644
--- a/cpp/ql/test/library-tests/ir/types/irtypes.cpp
+++ b/cpp/ql/test/library-tests/ir/types/irtypes.cpp
@@ -22,44 +22,44 @@ enum class ScopedE {
 };
 
 void IRTypes() {
-  char c;  //$irtype=int1
-  signed char sc;  //$irtype=int1
-  unsigned char uc;  //$irtype=uint1
-  short s;  //$irtype=int2
-  signed short ss;  //$irtype=int2
-  unsigned short us;  //$irtype=uint2
-  int i;  //$irtype=int4
-  signed int si;  //$irtype=int4
-  unsigned int ui;  //$irtype=uint4
-  long l;  //$irtype=int8
-  signed long sl;  //$irtype=int8
-  unsigned long ul;  //$irtype=uint8
-  long long ll;  //$irtype=int8
-  signed long long sll;  //$irtype=int8
-  unsigned long long ull;  //$irtype=uint8
-  bool b;  //$irtype=bool1
-  float f;  //$irtype=float4
-  double d;  //$irtype=float8
-  long double ld;  //$irtype=float16
-  __float128 f128;  //$irtype=float16
+  char c;  // $ irtype=int1
+  signed char sc;  // $ irtype=int1
+  unsigned char uc;  // $ irtype=uint1
+  short s;  // $ irtype=int2
+  signed short ss;  // $ irtype=int2
+  unsigned short us;  // $ irtype=uint2
+  int i;  // $ irtype=int4
+  signed int si;  // $ irtype=int4
+  unsigned int ui;  // $ irtype=uint4
+  long l;  // $ irtype=int8
+  signed long sl;  // $ irtype=int8
+  unsigned long ul;  // $ irtype=uint8
+  long long ll;  // $ irtype=int8
+  signed long long sll;  // $ irtype=int8
+  unsigned long long ull;  // $ irtype=uint8
+  bool b;  // $ irtype=bool1
+  float f;  // $ irtype=float4
+  double d;  // $ irtype=float8
+  long double ld;  // $ irtype=float16
+  __float128 f128;  // $ irtype=float16
 
-  wchar_t wc;  //$irtype=uint4
-//  char8_t c8;  //$irtype=uint1
-  char16_t c16;  //$irtype=uint2
-  char32_t c32;  //$irtype=uint4
+  wchar_t wc;  // $ irtype=uint4
+//  char8_t c8;  // $ irtype=uint1
+  char16_t c16;  // $ irtype=uint2
+  char32_t c32;  // $ irtype=uint4
 
-  int* pi;  //$irtype=addr8
-  int& ri = i;  //$irtype=addr8
-  void (*pfn)() = nullptr;  //$irtype=func8
-  void (&rfn)() = IRTypes;  //$irtype=func8
+  int* pi;  // $ irtype=addr8
+  int& ri = i;  // $ irtype=addr8
+  void (*pfn)() = nullptr;  // $ irtype=func8
+  void (&rfn)() = IRTypes;  // $ irtype=func8
 
-  A s_a;  //$irtype=opaque4{A}
-  B s_b;  //$irtype=opaque16{B}
+  A s_a;  // $ irtype=opaque4{A}
+  B s_b;  // $ irtype=opaque16{B}
 
-  E e;  //$irtype=uint4
-  ScopedE se;  //$irtype=uint4
+  E e;  // $ irtype=uint4
+  ScopedE se;  // $ irtype=uint4
 
-  B a_b[10];  //$irtype=opaque160{B[10]}
+  B a_b[10];  // $ irtype=opaque160{B[10]}
 }
 
 // semmle-extractor-options: -std=c++17 --clang
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Arithmetic/IntMultToLong/Buildless.c b/cpp/ql/test/query-tests/Likely Bugs/Arithmetic/IntMultToLong/Buildless.c
new file mode 100644
index 00000000000..3d01a28fae0
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Arithmetic/IntMultToLong/Buildless.c	
@@ -0,0 +1,28 @@
+// semmle-extractor-options: --expect_errors
+
+void test_float_double1(float f, double d) {
+    float r1 = f * f; // GOOD
+    float r2 = f * d; // GOOD
+    double r3 = f * f; // BAD
+    double r4 = f * d; // GOOD
+
+    float f1 = fabsf(f * f); // GOOD
+    float f2 = fabsf(f * d); // GOOD
+    double f3 = fabs(f * f); // BAD [NOT DETECTED]
+    double f4 = fabs(f * d); // GOOD
+}
+
+double fabs(double f);
+float fabsf(float f);
+
+void test_float_double2(float f, double d) {
+    float r1 = f * f; // GOOD
+    float r2 = f * d; // GOOD
+    double r3 = f * f; // BAD
+    double r4 = f * d; // GOOD
+
+    float f1 = fabsf(f * f); // GOOD
+    float f2 = fabsf(f * d); // GOOD
+    double f3 = fabs(f * f); // BAD [NOT DETECTED]
+    double f4 = fabs(f * d); // GOOD
+}
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Arithmetic/IntMultToLong/IntMultToLong.expected b/cpp/ql/test/query-tests/Likely Bugs/Arithmetic/IntMultToLong/IntMultToLong.expected
index 2806aaa809f..05b2b7e1ea3 100644
--- a/cpp/ql/test/query-tests/Likely Bugs/Arithmetic/IntMultToLong/IntMultToLong.expected	
+++ b/cpp/ql/test/query-tests/Likely Bugs/Arithmetic/IntMultToLong/IntMultToLong.expected	
@@ -1,3 +1,5 @@
+| Buildless.c:6:17:6:21 | ... * ... | Multiplication result may overflow 'float' before it is converted to 'double'. |
+| Buildless.c:21:17:21:21 | ... * ... | Multiplication result may overflow 'float' before it is converted to 'double'. |
 | IntMultToLong.c:4:10:4:14 | ... * ... | Multiplication result may overflow 'int' before it is converted to 'long long'. |
 | IntMultToLong.c:7:16:7:20 | ... * ... | Multiplication result may overflow 'int' before it is converted to 'long long'. |
 | IntMultToLong.c:18:19:18:23 | ... * ... | Multiplication result may overflow 'float' before it is converted to 'double'. |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Buildless/WrongTypeFormatArguments.expected b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Buildless/WrongTypeFormatArguments.expected
index 745f2f790f7..8eefcc95a24 100644
--- a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Buildless/WrongTypeFormatArguments.expected	
+++ b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Buildless/WrongTypeFormatArguments.expected	
@@ -1 +1,3 @@
+| second.cpp:26:18:26:39 | ... - ... | This format specifier for type 'int' does not match the argument type 'long'. |
+| second.cpp:29:18:29:39 | ... - ... | This format specifier for type 'unsigned int' does not match the argument type 'long'. |
 | tests.c:7:18:7:18 | 1 | This format specifier for type 'char *' does not match the argument type 'int'. |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Buildless/first.cpp b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Buildless/first.cpp
new file mode 100644
index 00000000000..8973ace78c7
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Buildless/first.cpp	
@@ -0,0 +1,3 @@
+
+// defines type size_t plausibly
+typedef unsigned long size_t;
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Buildless/second.cpp b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Buildless/second.cpp
new file mode 100644
index 00000000000..0345e8352be
--- /dev/null
+++ b/cpp/ql/test/query-tests/Likely Bugs/Format/WrongTypeFormatArguments/Buildless/second.cpp	
@@ -0,0 +1,32 @@
+// semmle-extractor-options: --expect_errors
+
+int printf(const char * format, ...);
+
+// defines type `myFunctionPointerType`, referencing `size_t`
+typedef size_t (*myFunctionPointerType) ();
+
+void test_size_t() {
+    size_t s = 0;
+
+    printf("%zd", s); // GOOD
+    printf("%zi", s); // GOOD
+    printf("%zu", s); // GOOD (we generally permit signedness changes)
+    printf("%zx", s); // GOOD (we generally permit signedness changes)
+    printf("%d", s); // BAD [NOT DETECTED]
+    printf("%ld", s); // DUBIOUS [NOT DETECTED]
+    printf("%lld", s); // DUBIOUS [NOT DETECTED]
+    printf("%u", s); // BAD [NOT DETECTED]
+
+    char buffer[1024];
+
+    printf("%zd", &buffer[1023] - buffer); // GOOD
+    printf("%zi", &buffer[1023] - buffer); // GOOD
+    printf("%zu", &buffer[1023] - buffer); // GOOD
+    printf("%zx", &buffer[1023] - buffer); // GOOD
+    printf("%d", &buffer[1023] - buffer); // BAD
+    printf("%ld", &buffer[1023] - buffer); // DUBIOUS [NOT DETECTED]
+    printf("%lld", &buffer[1023] - buffer); // DUBIOUS [NOT DETECTED]
+    printf("%u", &buffer[1023] - buffer); // BAD
+    // (for the `%ld` and `%lld` cases, the signedness and type sizes match, `%zd` would be most correct
+    //  and robust but the developer may know enough to make this safe)
+}
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Leap Year/UncheckedLeapYearAfterYearModification/test.cpp b/cpp/ql/test/query-tests/Likely Bugs/Leap Year/UncheckedLeapYearAfterYearModification/test.cpp
index a2dce39cc85..6e0320e8d84 100644
--- a/cpp/ql/test/query-tests/Likely Bugs/Leap Year/UncheckedLeapYearAfterYearModification/test.cpp	
+++ b/cpp/ql/test/query-tests/Likely Bugs/Leap Year/UncheckedLeapYearAfterYearModification/test.cpp	
@@ -1338,7 +1338,7 @@ void indirect_time_conversion_check(WORD year, WORD offset){
 void set_time(WORD year, WORD month, WORD day){
 	SYSTEMTIME tmp;
 
-	tmp.wYear = year; //$ Alert[cpp/leap-year/unchecked-after-arithmetic-year-modification]
+	tmp.wYear = year; // $ Alert[cpp/leap-year/unchecked-after-arithmetic-year-modification]
 	tmp.wMonth = month;
 	tmp.wDay = day;
 }
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-468/semmle/SuspiciousAddWithSizeof/SuspiciousAddWithSizeof.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-468/semmle/SuspiciousAddWithSizeof/SuspiciousAddWithSizeof.expected
index 8b67b3f8bc9..dbff4230f25 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-468/semmle/SuspiciousAddWithSizeof/SuspiciousAddWithSizeof.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-468/semmle/SuspiciousAddWithSizeof/SuspiciousAddWithSizeof.expected
@@ -1,3 +1,5 @@
+| buildless.cpp:5:15:5:25 | sizeof(int) | Suspicious sizeof offset in a pointer arithmetic expression. The type of the pointer is $@. | file://:0:0:0:0 | const short * | const short * |
+| buildless.cpp:6:13:6:23 | sizeof(int) | Suspicious sizeof offset in a pointer arithmetic expression. The type of the pointer is $@. | file://:0:0:0:0 | const int * | const int * |
 | test.cpp:6:30:6:40 | sizeof(int) | Suspicious sizeof offset in a pointer arithmetic expression. The type of the pointer is $@. | file://:0:0:0:0 | int * | int * |
 | test.cpp:14:30:14:40 | sizeof(int) | Suspicious sizeof offset in a pointer arithmetic expression. The type of the pointer is $@. | file://:0:0:0:0 | int * | int * |
 | test.cpp:22:25:22:35 | sizeof(int) | Suspicious sizeof offset in a pointer arithmetic expression. The type of the pointer is $@. | file://:0:0:0:0 | int * | int * |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-468/semmle/SuspiciousAddWithSizeof/buildless.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-468/semmle/SuspiciousAddWithSizeof/buildless.cpp
new file mode 100644
index 00000000000..b0b590fba69
--- /dev/null
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-468/semmle/SuspiciousAddWithSizeof/buildless.cpp
@@ -0,0 +1,10 @@
+// semmle-extractor-options: --expect_errors
+
+void test_buildless(const char *p_c, const short *p_short, const int *p_int, const uint8_t *p_8, const uint16_t *p_16, const uint32_t *p_32) {
+  *(p_c + sizeof(int)); // GOOD (`sizeof(char)` is 1)
+  *(p_short + sizeof(int)); // BAD
+  *(p_int + sizeof(int)); // BAD
+  *(p_8 + sizeof(int)); // GOOD (`sizeof(uint8_t)` is 1, but there's an error in the type)
+  *(p_16 + sizeof(int)); // BAD [NOT DETECTED]
+  *(p_32 + sizeof(int)); // BAD [NOT DETECTED]
+}
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-468/semmle/SuspiciousAddWithSizeof/test.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-468/semmle/SuspiciousAddWithSizeof/test.cpp
index f2ad227417e..fa2bd934cca 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-468/semmle/SuspiciousAddWithSizeof/test.cpp
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-468/semmle/SuspiciousAddWithSizeof/test.cpp
@@ -93,3 +93,9 @@ private:
   myChar * const myCharsPointer;
   myInt * const myIntsPointer;
 };
+
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned int uint32_t;
+
+void test_buildless(const char *p_c, const short *p_short, const int *p_int, const uint8_t *p_8, const uint16_t *p_16, const uint32_t *p_32);
diff --git a/csharp/documentation/library-coverage/coverage.csv b/csharp/documentation/library-coverage/coverage.csv
index 5dbefc4c816..a70a9175562 100644
--- a/csharp/documentation/library-coverage/coverage.csv
+++ b/csharp/documentation/library-coverage/coverage.csv
@@ -44,5 +44,5 @@ NHibernate,3,,,,,,,,,,,,3,,,,,,,,,,
 Newtonsoft.Json,,,91,,,,,,,,,,,,,,,,,,,73,18
 ServiceStack,194,,7,27,,,,,75,,,,92,,,,,,,,,7,
 SourceGenerators,,,5,,,,,,,,,,,,,,,,,,,,5
-System,59,47,12495,,6,5,12,,,4,1,,31,2,,6,15,17,4,3,,6382,6113
+System,59,48,12495,,6,5,12,,,4,1,,31,2,,6,15,17,5,3,,6382,6113
 Windows.Security.Cryptography.Core,1,,,,,,,1,,,,,,,,,,,,,,,
diff --git a/csharp/documentation/library-coverage/coverage.rst b/csharp/documentation/library-coverage/coverage.rst
index 4061f675b85..f487850e54b 100644
--- a/csharp/documentation/library-coverage/coverage.rst
+++ b/csharp/documentation/library-coverage/coverage.rst
@@ -8,7 +8,7 @@ C# framework & library support
 
    Framework / library,Package,Flow sources,Taint & value steps,Sinks (total),`CWE-079` :sub:`Cross-site scripting`
    `ServiceStack <https://servicestack.net/>`_,"``ServiceStack.*``, ``ServiceStack``",,7,194,
-   System,"``System.*``, ``System``",47,12495,59,5
+   System,"``System.*``, ``System``",48,12495,59,5
    Others,"``Amazon.Lambda.APIGatewayEvents``, ``Amazon.Lambda.Core``, ``Dapper``, ``ILCompiler``, ``ILLink.RoslynAnalyzer``, ``ILLink.Shared``, ``ILLink.Tasks``, ``Internal.IL``, ``Internal.Pgo``, ``Internal.TypeSystem``, ``Microsoft.ApplicationBlocks.Data``, ``Microsoft.AspNetCore.Components``, ``Microsoft.AspNetCore.Http``, ``Microsoft.AspNetCore.Mvc``, ``Microsoft.AspNetCore.WebUtilities``, ``Microsoft.CSharp``, ``Microsoft.Data.SqlClient``, ``Microsoft.Diagnostics.Tools.Pgo``, ``Microsoft.DotNet.Build.Tasks``, ``Microsoft.DotNet.PlatformAbstractions``, ``Microsoft.EntityFrameworkCore``, ``Microsoft.Extensions.Caching.Distributed``, ``Microsoft.Extensions.Caching.Memory``, ``Microsoft.Extensions.Configuration``, ``Microsoft.Extensions.DependencyInjection``, ``Microsoft.Extensions.DependencyModel``, ``Microsoft.Extensions.Diagnostics.Metrics``, ``Microsoft.Extensions.FileProviders``, ``Microsoft.Extensions.FileSystemGlobbing``, ``Microsoft.Extensions.Hosting``, ``Microsoft.Extensions.Http``, ``Microsoft.Extensions.Logging``, ``Microsoft.Extensions.Options``, ``Microsoft.Extensions.Primitives``, ``Microsoft.Interop``, ``Microsoft.JSInterop``, ``Microsoft.NET.Build.Tasks``, ``Microsoft.VisualBasic``, ``Microsoft.Win32``, ``Mono.Linker``, ``MySql.Data.MySqlClient``, ``NHibernate``, ``Newtonsoft.Json``, ``SourceGenerators``, ``Windows.Security.Cryptography.Core``",60,2406,162,4
-   Totals,,107,14908,415,9
+   Totals,,108,14908,415,9
 
diff --git a/csharp/downgrades/19b8cc3e2dc768d4cbc03d6e3773b709bbebd036/assignments.ql b/csharp/downgrades/19b8cc3e2dc768d4cbc03d6e3773b709bbebd036/assignments.ql
new file mode 100644
index 00000000000..199385e830e
--- /dev/null
+++ b/csharp/downgrades/19b8cc3e2dc768d4cbc03d6e3773b709bbebd036/assignments.ql
@@ -0,0 +1,177 @@
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+class Location extends @location {
+  string toString() { none() }
+}
+
+newtype TAddedElement =
+  TAssignment(CompoundAssignmentExpr e) or
+  TLhs(CompoundAssignmentExpr e) or
+  TRhs(CompoundAssignmentExpr e)
+
+module Fresh = QlBuiltins::NewEntity<TAddedElement>;
+
+class TNewExpr = @expr or Fresh::EntityId;
+
+class NewExpr extends TNewExpr {
+  string toString() { none() }
+}
+
+class TNewControlFlowElement = @control_flow_element or Fresh::EntityId;
+
+class NewControlFlowElement extends TNewControlFlowElement {
+  string toString() { none() }
+}
+
+class TypeOrRef extends @type_or_ref {
+  string toString() { none() }
+}
+
+class Callable extends @callable {
+  string toString() { none() }
+}
+
+class Accessible extends @accessible {
+  string toString() { none() }
+}
+
+predicate assignmentKind(int kind) {
+  // | 63 = @simple_assign_expr
+  // | 80 = @add_event_expr
+  // | 81 = @remove_event_expr
+  // | 83 = @local_var_decl_expr
+  kind = [63, 80, 81, 83]
+}
+
+predicate compoundAssignmentKind(int kind) {
+  // | 64 = @assign_add_expr
+  // | 65 = @assign_sub_expr
+  // | 66 = @assign_mul_expr
+  // | 67 = @assign_div_expr
+  // | 68 = @assign_rem_expr
+  // | 69 = @assign_and_expr
+  // | 70 = @assign_xor_expr
+  // | 71 = @assign_or_expr
+  // | 72 = @assign_lshift_expr
+  // | 73 = @assign_rshift_expr
+  // | 119 = @assign_coalesce_expr
+  // | 134 = @assign_urshift_expr
+  kind = [64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 119, 134]
+}
+
+int getOperatorKindFromAssignmentKind(int kind) {
+  kind = 64 and result = 44 // @assign_add_expr -> @add_expr
+  or
+  kind = 65 and result = 45 // @assign_sub_expr -> @sub_expr
+  or
+  kind = 66 and result = 41 // @assign_mul_expr -> @mul_expr
+  or
+  kind = 67 and result = 42 // @assign_div_expr -> @div_expr
+  or
+  kind = 68 and result = 43 // @assign_rem_expr -> @rem_expr
+  or
+  kind = 69 and result = 54 // @assign_and_expr -> @bit_and_expr
+  or
+  kind = 70 and result = 55 // @assign_xor_expr -> @bit_xor_expr
+  or
+  kind = 71 and result = 56 // @assign_or_expr -> @bit_or_expr
+  or
+  kind = 72 and result = 46 // @assign_lshift_expr -> @lshift_expr
+  or
+  kind = 73 and result = 47 // @assign_rshift_expr -> @rshift_expr
+  or
+  kind = 119 and result = 61 // @assign_coalesce_expr -> @coalesce_expr
+  or
+  kind = 134 and result = 133 // @assign_urshift_expr -> @urshift_expr
+}
+
+predicate isAssignment(Expr ass) {
+  exists(int kind | assignmentKind(kind) | expressions(ass, kind, _))
+}
+
+class CompoundAssignmentExpr extends Expr {
+  CompoundAssignmentExpr() {
+    exists(int kind | compoundAssignmentKind(kind) | expressions(this, kind, _))
+  }
+}
+
+query predicate new_expressions(NewExpr e, int kind, TypeOrRef t) {
+  expressions(e, kind, t)
+  or
+  // Introduce expanded expression nodes.
+  exists(CompoundAssignmentExpr compound, int kind0, Expr e1, int kind1 |
+    expressions(compound, kind0, t) and
+    expressions(e1, kind1, _) and
+    expr_parent(e1, 0, compound)
+  |
+    Fresh::map(TAssignment(compound)) = e and kind = 63
+    or
+    Fresh::map(TLhs(compound)) = e and kind = kind1
+    or
+    Fresh::map(TRhs(compound)) = e and kind = getOperatorKindFromAssignmentKind(kind0)
+  )
+}
+
+query predicate new_expr_parent(NewExpr e, int child, NewControlFlowElement parent) {
+  if isAssignment(parent)
+  then
+    // Swap children for assignments, local variable declarations and add/remove event.
+    child = 0 and expr_parent(e, 1, parent)
+    or
+    child = 1 and expr_parent(e, 0, parent)
+  else (
+    exists(CompoundAssignmentExpr compound |
+      Fresh::map(TAssignment(compound)) = e and child = 2 and parent = compound
+      or
+      Fresh::map(TLhs(compound)) = e and child = 1 and parent = Fresh::map(TAssignment(compound))
+      or
+      Fresh::map(TRhs(compound)) = e and child = 0 and parent = Fresh::map(TAssignment(compound))
+      or
+      expr_parent(e, child, compound) and parent = Fresh::map(TRhs(compound))
+    )
+    or
+    // Copy the expr_parent relation except for compound assignment edges.
+    expr_parent(e, child, parent) and not parent instanceof CompoundAssignmentExpr
+  )
+}
+
+query predicate new_expr_location(NewExpr e, Location loc) {
+  expr_location(e, loc)
+  or
+  exists(CompoundAssignmentExpr compound |
+    Fresh::map(TAssignment(compound)) = e and expr_location(compound, loc)
+    or
+    Fresh::map(TLhs(compound)) = e and
+    exists(Expr child | expr_location(child, loc) and expr_parent(child, 0, compound))
+    or
+    Fresh::map(TRhs(compound)) = e and expr_location(compound, loc)
+  )
+}
+
+query predicate new_expr_call(NewExpr e, Callable c) {
+  expr_call(e, c) and not e instanceof CompoundAssignmentExpr
+  or
+  exists(CompoundAssignmentExpr compound |
+    Fresh::map(TRhs(compound)) = e and expr_call(compound, c)
+  )
+}
+
+query predicate new_dynamic_member_name(NewExpr e, string name) {
+  dynamic_member_name(e, name) and not e instanceof CompoundAssignmentExpr
+  or
+  exists(CompoundAssignmentExpr compound |
+    Fresh::map(TRhs(compound)) = e and dynamic_member_name(compound, name)
+  )
+}
+
+query predicate new_expr_access(NewExpr e, Accessible a) {
+  expr_access(e, a)
+  or
+  exists(CompoundAssignmentExpr compound, Expr access |
+    expr_parent(access, 0, compound) and
+    expr_access(access, a) and
+    Fresh::map(TLhs(compound)) = e
+  )
+}
diff --git a/csharp/downgrades/19b8cc3e2dc768d4cbc03d6e3773b709bbebd036/old.dbscheme b/csharp/downgrades/19b8cc3e2dc768d4cbc03d6e3773b709bbebd036/old.dbscheme
new file mode 100644
index 00000000000..19b8cc3e2dc
--- /dev/null
+++ b/csharp/downgrades/19b8cc3e2dc768d4cbc03d6e3773b709bbebd036/old.dbscheme
@@ -0,0 +1,1504 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+compilation_info(
+  int id : @compilation ref,
+  string info_key: string ref,
+  string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile.rsp` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_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(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string 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
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * Overlay support
+ */
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+@locatable = @declaration_with_accessors | @callable_accessor | @declaration_or_directive
+           | @diagnostic | @extractor_message | @preprocessor_directive | @attribute | @type_mention | @type_parameter_constraints
+           | @declaration_with_accessors | @callable_accessor | @operator | @method
+           | @constructor | @destructor | @field | @local_variable | @parameter | @stmt | @expr
+           | @xmllocatable | @commentline | @commentblock | @asp_element
+
+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);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+| 34 = @inline_array_type
+| 35 = @extension_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type | @void_type | @inline_array_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type | @extension_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extension_receiver_type(
+  unique int extension: @extension_type ref,
+  int receiver_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type | @extension_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, params/array = 3, this = 4, in = 5, ref readonly = 6 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* C# 12.0 */
+| 136 = @collection_expr
+| 137 = @spread_element_expr
+| 138 = @interpolated_string_insert_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_call_expr = @assign_arith_expr | @assign_bitwise_expr
+@assign_op_expr =  @assign_op_call_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@add_operation = @add_expr | @assign_add_expr;
+@sub_operation = @sub_expr | @assign_sub_expr;
+@mul_operation = @mul_expr | @assign_mul_expr;
+@div_operation = @div_expr | @assign_div_expr;
+@rem_operation = @rem_expr | @assign_rem_expr;
+@and_operation = @bit_and_expr | @assign_and_expr;
+@xor_operation = @bit_xor_expr | @assign_xor_expr;
+@or_operation = @bit_or_expr | @assign_or_expr;
+@lshift_operation = @lshift_expr | @assign_lshift_expr;
+@rshift_operation = @rshift_expr | @assign_rshift_expr;
+@urshift_operation = @urshift_expr | @assign_urshift_expr;
+@null_coalescing_operation = @null_coalescing_expr | @assign_coalesce_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @assign_expr | @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@op_invoke_expr = @operator_invocation_expr | @assign_op_call_expr
+@call = @method_invocation_expr | @constructor_init_expr | @op_invoke_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @op_invoke_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/* Compiler generated */
+
+compiler_generated(unique int id: @element ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* 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;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
diff --git a/csharp/downgrades/19b8cc3e2dc768d4cbc03d6e3773b709bbebd036/semmlecode.csharp.dbscheme b/csharp/downgrades/19b8cc3e2dc768d4cbc03d6e3773b709bbebd036/semmlecode.csharp.dbscheme
new file mode 100644
index 00000000000..e73ca2c93df
--- /dev/null
+++ b/csharp/downgrades/19b8cc3e2dc768d4cbc03d6e3773b709bbebd036/semmlecode.csharp.dbscheme
@@ -0,0 +1,1489 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+compilation_info(
+  int id : @compilation ref,
+  string info_key: string ref,
+  string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile.rsp` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_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(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string 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
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * Overlay support
+ */
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+@locatable = @declaration_with_accessors | @callable_accessor | @declaration_or_directive
+           | @diagnostic | @extractor_message | @preprocessor_directive | @attribute | @type_mention | @type_parameter_constraints
+           | @declaration_with_accessors | @callable_accessor | @operator | @method
+           | @constructor | @destructor | @field | @local_variable | @parameter | @stmt | @expr
+           | @xmllocatable | @commentline | @commentblock | @asp_element
+
+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);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+| 34 = @inline_array_type
+| 35 = @extension_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type | @void_type | @inline_array_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type | @extension_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extension_receiver_type(
+  unique int extension: @extension_type ref,
+  int receiver_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type | @extension_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, params/array = 3, this = 4, in = 5, ref readonly = 6 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* C# 12.0 */
+| 136 = @collection_expr
+| 137 = @spread_element_expr
+| 138 = @interpolated_string_insert_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @assign_expr | @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/* Compiler generated */
+
+compiler_generated(unique int id: @element ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* 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;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
diff --git a/csharp/downgrades/19b8cc3e2dc768d4cbc03d6e3773b709bbebd036/upgrade.properties b/csharp/downgrades/19b8cc3e2dc768d4cbc03d6e3773b709bbebd036/upgrade.properties
new file mode 100644
index 00000000000..41d57dd067b
--- /dev/null
+++ b/csharp/downgrades/19b8cc3e2dc768d4cbc03d6e3773b709bbebd036/upgrade.properties
@@ -0,0 +1,8 @@
+description: Remove operation kinds for operations, introduce expanded assignments and rotate assignment child expressions.
+compatibility: partial
+expr_parent.rel: run assignments.ql new_expr_parent
+expressions.rel: run assignments.ql new_expressions
+expr_location.rel: run assignments.ql new_expr_location
+expr_call.rel: run assignments.ql new_expr_call
+dynamic_member_name.rel: run assignments.ql new_dynamic_member_name
+expr_access.rel: run assignments.ql new_expr_access
diff --git a/csharp/downgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/old.dbscheme b/csharp/downgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/old.dbscheme
new file mode 100644
index 00000000000..e73ca2c93df
--- /dev/null
+++ b/csharp/downgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/old.dbscheme
@@ -0,0 +1,1489 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+compilation_info(
+  int id : @compilation ref,
+  string info_key: string ref,
+  string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile.rsp` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_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(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string 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
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * Overlay support
+ */
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+@locatable = @declaration_with_accessors | @callable_accessor | @declaration_or_directive
+           | @diagnostic | @extractor_message | @preprocessor_directive | @attribute | @type_mention | @type_parameter_constraints
+           | @declaration_with_accessors | @callable_accessor | @operator | @method
+           | @constructor | @destructor | @field | @local_variable | @parameter | @stmt | @expr
+           | @xmllocatable | @commentline | @commentblock | @asp_element
+
+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);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+| 34 = @inline_array_type
+| 35 = @extension_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type | @void_type | @inline_array_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type | @extension_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extension_receiver_type(
+  unique int extension: @extension_type ref,
+  int receiver_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type | @extension_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, params/array = 3, this = 4, in = 5, ref readonly = 6 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* C# 12.0 */
+| 136 = @collection_expr
+| 137 = @spread_element_expr
+| 138 = @interpolated_string_insert_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @assign_expr | @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/* Compiler generated */
+
+compiler_generated(unique int id: @element ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* 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;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
diff --git a/csharp/downgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/semmlecode.csharp.dbscheme b/csharp/downgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/semmlecode.csharp.dbscheme
new file mode 100644
index 00000000000..178a7e6cf33
--- /dev/null
+++ b/csharp/downgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/semmlecode.csharp.dbscheme
@@ -0,0 +1,1489 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+compilation_info(
+  int id : @compilation ref,
+  string info_key: string ref,
+  string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile.rsp` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_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(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string 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
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * Overlay support
+ */
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+@locatable = @declaration_with_accessors | @callable_accessor | @declaration_or_directive
+           | @diagnostic | @extractor_message | @preprocessor_directive | @attribute | @type_mention | @type_parameter_constraints
+           | @declaration_with_accessors | @callable_accessor | @operator | @method
+           | @constructor | @destructor | @field | @local_variable | @parameter | @stmt | @expr
+           | @xmllocatable | @commentline | @commentblock | @asp_element
+
+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);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+| 34 = @inline_array_type
+| 35 = @extension_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type | @void_type | @inline_array_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type | @extension_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extension_receiver_type(
+  unique int extension: @extension_type ref,
+  int receiver_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type | @extension_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, params/array = 3, this = 4, in = 5, ref readonly = 6 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* C# 12.0 */
+| 136 = @collection_expr
+| 137 = @spread_element_expr
+| 138 = @interpolated_string_insert_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/* Compiler generated */
+
+compiler_generated(unique int id: @element ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* 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;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
diff --git a/csharp/downgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/upgrade.properties b/csharp/downgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/upgrade.properties
new file mode 100644
index 00000000000..8a1d7d33e59
--- /dev/null
+++ b/csharp/downgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/upgrade.properties
@@ -0,0 +1,2 @@
+description: Remove inclusion of @assign_expr in @bin_op
+compatibility: full
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNetCliInvoker.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNetCliInvoker.cs
index 61d0ea4260d..ef5bcd4753b 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNetCliInvoker.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNetCliInvoker.cs
@@ -12,16 +12,18 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 
         /// <summary>
         /// A minimal environment for running the .NET CLI.
-        /// 
+        ///
         /// DOTNET_CLI_UI_LANGUAGE: The .NET CLI language is set to English to avoid localized output.
         /// MSBUILDDISABLENODEREUSE: To ensure clean environment for each build.
         /// DOTNET_SKIP_FIRST_TIME_EXPERIENCE: To skip first time experience messages.
+        /// DOTNET_CLI_TELEMETRY_OPTOUT: To skip any dotnet telemetry: it's unnecessary and can even cause issues.
         /// </summary>
         static ReadOnlyDictionary<string, string> MinimalEnvironment { get; } = new(new Dictionary<string, string>
         {
             {"DOTNET_CLI_UI_LANGUAGE", "en"},
             {"MSBUILDDISABLENODEREUSE", "1"},
-            {"DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "true"}
+            {"DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "true"},
+            {"DOTNET_CLI_TELEMETRY_OPTOUT", "1"}
         });
 
         /// <summary>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs b/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs
index c108a18f136..fbc1b52c99b 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs
@@ -728,6 +728,15 @@ namespace Semmle.Extraction.CSharp
         public static INamedTypeSymbol? GetNonObjectBaseType(this ITypeSymbol symbol, Context cx) =>
             symbol is ITypeParameterSymbol || SymbolEqualityComparer.Default.Equals(symbol.BaseType, cx.Compilation.ObjectType) ? null : symbol.BaseType;
 
+        public static IMethodSymbol GetBodyDeclaringSymbol(this IMethodSymbol method) =>
+            method.PartialImplementationPart ?? method;
+
+        public static IPropertySymbol GetBodyDeclaringSymbol(this IPropertySymbol property) =>
+            property.PartialImplementationPart ?? property;
+
+        public static IEventSymbol GetBodyDeclaringSymbol(this IEventSymbol symbol) =>
+            symbol.PartialImplementationPart ?? symbol;
+
         [return: NotNullIfNotNull(nameof(symbol))]
         public static IEntity? CreateEntity(this Context cx, ISymbol symbol)
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs
index fe01e0f9b58..ed409e23b39 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Accessor.cs
@@ -70,7 +70,7 @@ namespace Semmle.Extraction.CSharp.Entities
 
             Overrides(trapFile);
 
-            if (Symbol.FromSource() && Block is null)
+            if (Symbol.FromSource() && !HasBody)
             {
                 trapFile.compiler_generated(this);
             }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedSymbol.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedSymbol.cs
index 1a69b0e08b2..26f31c66979 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedSymbol.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedSymbol.cs
@@ -9,9 +9,14 @@ namespace Semmle.Extraction.CSharp.Entities
 {
     internal abstract class CachedSymbol<T> : CachedEntity<T> where T : class, ISymbol
     {
+        private readonly Lazy<BlockSyntax?> blockLazy;
+        private readonly Lazy<ExpressionSyntax?> expressionBodyLazy;
+
         protected CachedSymbol(Context cx, T init)
             : base(cx, init)
         {
+            blockLazy = new Lazy<BlockSyntax?>(() => GetBlock(Symbol));
+            expressionBodyLazy = new Lazy<ExpressionSyntax?>(() => GetExpressionBody(Symbol));
         }
 
         public virtual Type? ContainingType => Symbol.ContainingType is not null
@@ -87,31 +92,29 @@ namespace Semmle.Extraction.CSharp.Entities
                 Context.BindComments(this, FullLocation);
         }
 
-        protected virtual T BodyDeclaringSymbol => Symbol;
-
-        public BlockSyntax? Block
+        private static BlockSyntax? GetBlock(T symbol)
         {
-            get
-            {
-                return BodyDeclaringSymbol.DeclaringSyntaxReferences
+            return symbol.DeclaringSyntaxReferences
                     .SelectMany(r => r.GetSyntax().ChildNodes())
                     .OfType<BlockSyntax>()
                     .FirstOrDefault();
-            }
         }
 
-        public ExpressionSyntax? ExpressionBody
+        private static ExpressionSyntax? GetExpressionBody(T symbol)
         {
-            get
-            {
-                return BodyDeclaringSymbol.DeclaringSyntaxReferences
+            return symbol.DeclaringSyntaxReferences
                     .SelectMany(r => r.GetSyntax().ChildNodes())
                     .OfType<ArrowExpressionClauseSyntax>()
                     .Select(arrow => arrow.Expression)
                     .FirstOrDefault();
-            }
         }
 
+        public BlockSyntax? Block => blockLazy.Value;
+
+        public ExpressionSyntax? ExpressionBody => expressionBodyLazy.Value;
+
+        public bool HasBody => Block is not null || ExpressionBody is not null;
+
         public virtual bool IsSourceDeclaration => Symbol.IsSourceDeclaration();
 
         public override bool NeedsPopulation => Context.Defines(Symbol);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs
index 14d9b548015..58c94cf047a 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
@@ -12,7 +13,9 @@ namespace Semmle.Extraction.CSharp.Entities
     internal class Constructor : Method
     {
         private readonly List<SyntaxNode> declaringReferenceSyntax;
-
+        private readonly Lazy<ConstructorDeclarationSyntax?> ordinaryConstructorSyntaxLazy;
+        private readonly Lazy<TypeDeclarationSyntax?> primaryConstructorSyntaxLazy;
+        private readonly Lazy<PrimaryConstructorBaseTypeSyntax?> primaryBaseLazy;
         private Constructor(Context cx, IMethodSymbol init)
             : base(cx, init)
         {
@@ -20,8 +23,28 @@ namespace Semmle.Extraction.CSharp.Entities
                 Symbol.DeclaringSyntaxReferences
                     .Select(r => r.GetSyntax())
                     .ToList();
+            ordinaryConstructorSyntaxLazy = new Lazy<ConstructorDeclarationSyntax?>(() =>
+                declaringReferenceSyntax
+                .OfType<ConstructorDeclarationSyntax>()
+                .FirstOrDefault());
+            primaryConstructorSyntaxLazy = new Lazy<TypeDeclarationSyntax?>(() =>
+                declaringReferenceSyntax
+                    .OfType<TypeDeclarationSyntax>()
+                    .FirstOrDefault(t => t is ClassDeclarationSyntax or StructDeclarationSyntax or RecordDeclarationSyntax));
+            primaryBaseLazy = new Lazy<PrimaryConstructorBaseTypeSyntax?>(() =>
+                PrimaryConstructorSyntax?
+                    .BaseList?
+                    .Types
+                    .OfType<PrimaryConstructorBaseTypeSyntax>()
+                    .FirstOrDefault());
         }
 
+        private ConstructorDeclarationSyntax? OrdinaryConstructorSyntax => ordinaryConstructorSyntaxLazy.Value;
+
+        private TypeDeclarationSyntax? PrimaryConstructorSyntax => primaryConstructorSyntaxLazy.Value;
+
+        private PrimaryConstructorBaseTypeSyntax? PrimaryBase => primaryBaseLazy.Value;
+
         public override void Populate(TextWriter trapFile)
         {
             PopulateMethod(trapFile);
@@ -42,7 +65,7 @@ namespace Semmle.Extraction.CSharp.Entities
                 return;
             }
 
-            if (MakeSynthetic)
+            if (MakeSyntheticBody)
             {
                 // Create a synthetic empty body for primary and default constructors.
                 Statements.SyntheticEmptyBlock.Create(Context, this, 0, Location);
@@ -60,7 +83,7 @@ namespace Semmle.Extraction.CSharp.Entities
             // Do not extract initializers for constructed types.
             // Extract initializers for constructors with a body, primary constructors
             // and default constructors for classes and structs declared in source code.
-            if (Block is null && ExpressionBody is null && !MakeSynthetic || Context.OnlyScaffold)
+            if (!HasBody && !MakeSyntheticBody || Context.OnlyScaffold)
             {
                 return;
             }
@@ -176,23 +199,6 @@ namespace Semmle.Extraction.CSharp.Entities
             init.PopulateArguments(trapFile, arguments, 0);
         }
 
-        private ConstructorDeclarationSyntax? OrdinaryConstructorSyntax =>
-            declaringReferenceSyntax
-                .OfType<ConstructorDeclarationSyntax>()
-                .FirstOrDefault();
-
-        private TypeDeclarationSyntax? PrimaryConstructorSyntax =>
-            declaringReferenceSyntax
-                    .OfType<TypeDeclarationSyntax>()
-                    .FirstOrDefault(t => t is ClassDeclarationSyntax or StructDeclarationSyntax or RecordDeclarationSyntax);
-
-        private PrimaryConstructorBaseTypeSyntax? PrimaryBase =>
-            PrimaryConstructorSyntax?
-                .BaseList?
-                .Types
-                .OfType<PrimaryConstructorBaseTypeSyntax>()
-                .FirstOrDefault();
-
         private bool IsPrimary => PrimaryConstructorSyntax is not null;
 
         // This is a default constructor in a class or struct declared in source.
@@ -211,7 +217,7 @@ namespace Semmle.Extraction.CSharp.Entities
         /// </summary>
         private bool IsBestSourceLocation => ReportingLocation is not null && Context.IsLocationInContext(ReportingLocation);
 
-        private bool MakeSynthetic => (IsPrimary || (IsDefault && IsBestSourceLocation)) && !Context.OnlyScaffold;
+        private bool MakeSyntheticBody => (IsPrimary || (IsDefault && IsBestSourceLocation)) && !Context.OnlyScaffold;
 
         [return: NotNullIfNotNull(nameof(constructor))]
         public static new Constructor? Create(Context cx, IMethodSymbol? constructor)
@@ -223,7 +229,7 @@ namespace Semmle.Extraction.CSharp.Entities
             {
                 case MethodKind.StaticConstructor:
                 case MethodKind.Constructor:
-                    return ConstructorFactory.Instance.CreateEntityFromSymbol(cx, constructor);
+                    return ConstructorFactory.Instance.CreateEntityFromSymbol(cx, constructor.GetBodyDeclaringSymbol());
                 default:
                     throw new InternalError(constructor, "Attempt to create a Constructor from a symbol that isn't a constructor");
             }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Event.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Event.cs
index c93df9ccc4f..bed4a87d5da 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Event.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Event.cs
@@ -11,10 +11,6 @@ namespace Semmle.Extraction.CSharp.Entities
         private Event(Context cx, IEventSymbol init)
             : base(cx, init) { }
 
-        protected override IEventSymbol BodyDeclaringSymbol => Symbol.PartialImplementationPart ?? Symbol;
-
-        public override Microsoft.CodeAnalysis.Location? ReportingLocation => BodyDeclaringSymbol.Locations.BestOrDefault();
-
         public override void WriteId(EscapingTextWriter trapFile)
         {
             trapFile.WriteSubId(ContainingType!);
@@ -31,8 +27,8 @@ namespace Semmle.Extraction.CSharp.Entities
             var type = Type.Create(Context, Symbol.Type);
             trapFile.events(this, Symbol.GetName(), ContainingType!, type.TypeRef, Create(Context, Symbol.OriginalDefinition));
 
-            var adder = BodyDeclaringSymbol.AddMethod;
-            var remover = BodyDeclaringSymbol.RemoveMethod;
+            var adder = Symbol.AddMethod;
+            var remover = Symbol.RemoveMethod;
 
             if (adder is not null)
                 Method.Create(Context, adder);
@@ -76,7 +72,7 @@ namespace Semmle.Extraction.CSharp.Entities
             }
         }
 
-        public static Event Create(Context cx, IEventSymbol symbol) => EventFactory.Instance.CreateEntityFromSymbol(cx, symbol);
+        public static Event Create(Context cx, IEventSymbol symbol) => EventFactory.Instance.CreateEntityFromSymbol(cx, symbol.GetBodyDeclaringSymbol());
 
         private class EventFactory : CachedEntityFactory<IEventSymbol, Event>
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/EventAccessor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/EventAccessor.cs
index 3e8ab9431be..05518119858 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/EventAccessor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/EventAccessor.cs
@@ -59,7 +59,7 @@ namespace Semmle.Extraction.CSharp.Entities
 
             Overrides(trapFile);
 
-            if (Symbol.FromSource() && Block is null)
+            if (Symbol.FromSource() && !HasBody)
             {
                 trapFile.compiler_generated(this);
             }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Assignment.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Assignment.cs
index f3e2e510cd6..67e49b2919c 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Assignment.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Assignment.cs
@@ -22,26 +22,12 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
 
         protected override void PopulateExpression(TextWriter trapFile)
         {
-            var operatorKind = OperatorKind;
-            if (operatorKind.HasValue)
-            {
-                // Convert assignment such as `a += b` into `a = a + b`.
-                var simpleAssignExpr = new Expression(new ExpressionInfo(Context, Type, Location, ExprKind.SIMPLE_ASSIGN, this, 2, isCompilerGenerated: true, null));
-                Create(Context, Syntax.Left, simpleAssignExpr, 1);
-                var opexpr = new Expression(new ExpressionInfo(Context, Type, Location, operatorKind.Value, simpleAssignExpr, 0, isCompilerGenerated: true, null));
-                Create(Context, Syntax.Left, opexpr, 0, isCompilerGenerated: true);
-                Create(Context, Syntax.Right, opexpr, 1);
-                opexpr.OperatorCall(trapFile, Syntax);
-            }
-            else
-            {
-                Create(Context, Syntax.Left, this, 1);
-                Create(Context, Syntax.Right, this, 0);
+            Create(Context, Syntax.Left, this, 0);
+            Create(Context, Syntax.Right, this, 1);
 
-                if (Kind == ExprKind.ADD_EVENT || Kind == ExprKind.REMOVE_EVENT)
-                {
-                    OperatorCall(trapFile, Syntax);
-                }
+            if (Kind != ExprKind.SIMPLE_ASSIGN && Kind != ExprKind.ASSIGN_COALESCE)
+            {
+                OperatorCall(trapFile, Syntax);
             }
         }
 
@@ -108,56 +94,5 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
 
             return kind;
         }
-
-        /// <summary>
-        /// Gets the kind of this assignment operator (<code>null</code> if the
-        /// assignment is not an assignment operator). For example, the operator
-        /// kind of `*=` is `*`.
-        /// </summary>
-        private ExprKind? OperatorKind
-        {
-            get
-            {
-                var kind = Kind;
-                if (kind == ExprKind.REMOVE_EVENT || kind == ExprKind.ADD_EVENT || kind == ExprKind.SIMPLE_ASSIGN)
-                    return null;
-
-                if (CallType.AdjustKind(kind) == ExprKind.OPERATOR_INVOCATION)
-                    return ExprKind.OPERATOR_INVOCATION;
-
-                switch (kind)
-                {
-                    case ExprKind.ASSIGN_ADD:
-                        return ExprKind.ADD;
-                    case ExprKind.ASSIGN_AND:
-                        return ExprKind.BIT_AND;
-                    case ExprKind.ASSIGN_DIV:
-                        return ExprKind.DIV;
-                    case ExprKind.ASSIGN_LSHIFT:
-                        return ExprKind.LSHIFT;
-                    case ExprKind.ASSIGN_MUL:
-                        return ExprKind.MUL;
-                    case ExprKind.ASSIGN_OR:
-                        return ExprKind.BIT_OR;
-                    case ExprKind.ASSIGN_REM:
-                        return ExprKind.REM;
-                    case ExprKind.ASSIGN_RSHIFT:
-                        return ExprKind.RSHIFT;
-                    case ExprKind.ASSIGN_URSHIFT:
-                        return ExprKind.URSHIFT;
-                    case ExprKind.ASSIGN_SUB:
-                        return ExprKind.SUB;
-                    case ExprKind.ASSIGN_XOR:
-                        return ExprKind.BIT_XOR;
-                    case ExprKind.ASSIGN_COALESCE:
-                        return ExprKind.NULL_COALESCING;
-                    default:
-                        Context.ModelError(Syntax, $"Couldn't unfold assignment of type {kind}");
-                        return ExprKind.UNKNOWN;
-                }
-            }
-        }
-
-        public new CallType CallType => GetCallType(Context, Syntax);
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Initializer.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Initializer.cs
index 92e2b910f99..63024cd47fc 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Initializer.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Initializer.cs
@@ -83,8 +83,22 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
                 {
                     var assignmentInfo = new ExpressionNodeInfo(Context, init, this, child++).SetKind(ExprKind.SIMPLE_ASSIGN);
                     var assignmentEntity = new Expression(assignmentInfo);
+                    var target = Context.GetSymbolInfo(assignment.Left);
+
+                    // If the target is null, then assume that this is an array initializer (of the form `[...] = ...`)
+                    var access = target.Symbol is null ?
+                        new Expression(new ExpressionNodeInfo(Context, assignment.Left, assignmentEntity, 0).SetKind(ExprKind.ARRAY_ACCESS)) :
+                        Access.Create(new ExpressionNodeInfo(Context, assignment.Left, assignmentEntity, 0), target.Symbol, false, Context.CreateEntity(target.Symbol));
+
+                    if (assignment.Left is ImplicitElementAccessSyntax iea)
+                    {
+                        // An array/indexer initializer of the form `[...] = ...`
+                        access.PopulateArguments(trapFile, iea.ArgumentList.Arguments, 0);
+                    }
+
                     var typeInfoRight = Context.GetTypeInfo(assignment.Right);
                     if (typeInfoRight.Type is null)
+                    {
                         // The type may be null for nested initializers such as
                         // ```csharp
                         // new ClassWithArrayField() { As = { [0] = a } }
@@ -92,21 +106,8 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
                         // In this case we take the type from the assignment
                         // `As = { [0] = a }` instead
                         typeInfoRight = assignmentInfo.TypeInfo;
-                    CreateFromNode(new ExpressionNodeInfo(Context, assignment.Right, assignmentEntity, 0, typeInfoRight));
-
-                    var target = Context.GetSymbolInfo(assignment.Left);
-
-                    // If the target is null, then assume that this is an array initializer (of the form `[...] = ...`)
-
-                    var access = target.Symbol is null ?
-                        new Expression(new ExpressionNodeInfo(Context, assignment.Left, assignmentEntity, 1).SetKind(ExprKind.ARRAY_ACCESS)) :
-                        Access.Create(new ExpressionNodeInfo(Context, assignment.Left, assignmentEntity, 1), target.Symbol, false, Context.CreateEntity(target.Symbol));
-
-                    if (assignment.Left is ImplicitElementAccessSyntax iea)
-                    {
-                        // An array/indexer initializer of the form `[...] = ...`
-                        access.PopulateArguments(trapFile, iea.ArgumentList.Arguments, 0);
                     }
+                    CreateFromNode(new ExpressionNodeInfo(Context, assignment.Right, assignmentEntity, 1, typeInfoRight));
                 }
                 else
                 {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ObjectCreation/AnonymousObjectCreation.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ObjectCreation/AnonymousObjectCreation.cs
index a6f94f53338..1fdf03171b9 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ObjectCreation/AnonymousObjectCreation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ObjectCreation/AnonymousObjectCreation.cs
@@ -41,11 +41,11 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
                 var loc = Context.CreateLocation(init.GetLocation());
 
                 var assignment = new Expression(new ExpressionInfo(Context, type, loc, ExprKind.SIMPLE_ASSIGN, objectInitializer, child++, isCompilerGenerated: false, null));
-                Create(Context, init.Expression, assignment, 0);
                 Property.Create(Context, property);
-
-                var access = new Expression(new ExpressionInfo(Context, type, loc, ExprKind.PROPERTY_ACCESS, assignment, 1, isCompilerGenerated: false, null));
+                var access = new Expression(new ExpressionInfo(Context, type, loc, ExprKind.PROPERTY_ACCESS, assignment, 0, isCompilerGenerated: false, null));
                 trapFile.expr_access(access, propEntity);
+
+                Create(Context, init.Expression, assignment, 1);
             }
         }
     }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Query.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Query.cs
index 85a1ceda47c..aadf06f2dee 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Query.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Query.cs
@@ -94,12 +94,12 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
                     child
                     );
 
-                Expression.Create(cx, Expr, decl, 0);
-
                 var nameLoc = cx.CreateLocation(name.GetLocation());
-                var access = new Expression(new ExpressionInfo(cx, type, nameLoc, ExprKind.LOCAL_VARIABLE_ACCESS, decl, 1, isCompilerGenerated: false, null));
+                var access = new Expression(new ExpressionInfo(cx, type, nameLoc, ExprKind.LOCAL_VARIABLE_ACCESS, decl, 0, isCompilerGenerated: false, null));
                 cx.TrapWriter.Writer.expr_access(access, LocalVariable.Create(cx, variableSymbol));
 
+                Expression.Create(cx, Expr, decl, 1);
+
                 return decl;
             }
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/VariableDeclaration.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/VariableDeclaration.cs
index c44f9e2b946..47ecee3e037 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/VariableDeclaration.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/VariableDeclaration.cs
@@ -176,11 +176,11 @@ namespace Semmle.Extraction.CSharp.Entities.Expressions
 
                 if (d.Initializer is not null)
                 {
-                    Create(cx, d.Initializer.Value, ret, 0);
-
                     // Create an access
-                    var access = new Expression(new ExpressionInfo(cx, type, localVar.Location, ExprKind.LOCAL_VARIABLE_ACCESS, ret, 1, isCompilerGenerated: false, null));
+                    var access = new Expression(new ExpressionInfo(cx, type, localVar.Location, ExprKind.LOCAL_VARIABLE_ACCESS, ret, 0, isCompilerGenerated: false, null));
                     cx.TrapWriter.Writer.expr_access(access, localVar);
+
+                    Create(cx, d.Initializer.Value, ret, 1);
                 }
 
                 if (d.Parent is VariableDeclarationSyntax decl)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs
index 329115f11c7..708c00d2f73 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Field.cs
@@ -116,9 +116,9 @@ namespace Semmle.Extraction.CSharp.Entities
         {
             var type = Symbol.GetAnnotatedType();
             var simpleAssignExpr = new Expression(new ExpressionInfo(Context, type, loc, ExprKind.SIMPLE_ASSIGN, this, child++, isCompilerGenerated: true, constValue));
-            Expression.CreateFromNode(new ExpressionNodeInfo(Context, initializer, simpleAssignExpr, 0));
-            var access = new Expression(new ExpressionInfo(Context, type, Location, ExprKind.FIELD_ACCESS, simpleAssignExpr, 1, isCompilerGenerated: true, constValue));
+            var access = new Expression(new ExpressionInfo(Context, type, Location, ExprKind.FIELD_ACCESS, simpleAssignExpr, 0, isCompilerGenerated: true, constValue));
             trapFile.expr_access(access, this);
+            Expression.CreateFromNode(new ExpressionNodeInfo(Context, initializer, simpleAssignExpr, 1));
             return access;
         }
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Indexer.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Indexer.cs
index 870c2eb7650..10f17abef18 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Indexer.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Indexer.cs
@@ -20,8 +20,8 @@ namespace Semmle.Extraction.CSharp.Entities
             var type = Type.Create(Context, Symbol.Type);
             trapFile.indexers(this, Symbol.GetName(useMetadataName: true), ContainingType!, type.TypeRef, OriginalDefinition);
 
-            var getter = BodyDeclaringSymbol.GetMethod;
-            var setter = BodyDeclaringSymbol.SetMethod;
+            var getter = Symbol.GetMethod;
+            var setter = Symbol.SetMethod;
 
             if (getter is null && setter is null)
                 Context.ModelError(Symbol, "No indexer accessor defined");
@@ -81,7 +81,7 @@ namespace Semmle.Extraction.CSharp.Entities
                 TypeMention.Create(Context, syntax.Type, this, type);
         }
 
-        public static new Indexer Create(Context cx, IPropertySymbol prop) => IndexerFactory.Instance.CreateEntityFromSymbol(cx, prop);
+        public static new Indexer Create(Context cx, IPropertySymbol prop) => IndexerFactory.Instance.CreateEntityFromSymbol(cx, prop.GetBodyDeclaringSymbol());
 
         public override void WriteId(EscapingTextWriter trapFile)
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
index 5a437c3d358..d2c7a05c4f8 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
@@ -85,7 +85,7 @@ namespace Semmle.Extraction.CSharp.Entities
                        else
                            Expression.Create(Context, expr!, this, 0);
 
-                       NumberOfLines(trapFile, BodyDeclaringSymbol, this);
+                       NumberOfLines(trapFile, Symbol, this);
                    });
             }
         }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs
index 2fb148358e8..fa7e4473ded 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/OrdinaryMethod.cs
@@ -14,14 +14,12 @@ namespace Semmle.Extraction.CSharp.Entities
 
         public override string Name => Symbol.GetName();
 
-        protected override IMethodSymbol BodyDeclaringSymbol => Symbol.PartialImplementationPart ?? Symbol;
-
         public IMethodSymbol SourceDeclaration => Symbol.OriginalDefinition;
 
         public override Microsoft.CodeAnalysis.Location ReportingLocation =>
             IsCompilerGeneratedDelegate()
                 ? Symbol.ContainingType.GetSymbolLocation()
-                : BodyDeclaringSymbol.GetSymbolLocation();
+                : Symbol.GetSymbolLocation();
 
         public override bool NeedsPopulation =>
             (base.NeedsPopulation || IsCompilerGeneratedDelegate()) &&
@@ -77,7 +75,7 @@ namespace Semmle.Extraction.CSharp.Entities
                 cx.ExtractionContext.Logger.LogWarning("Reduced extension method symbols should not be directly extracted.");
             }
 
-            return OrdinaryMethodFactory.Instance.CreateEntityFromSymbol(cx, method);
+            return OrdinaryMethodFactory.Instance.CreateEntityFromSymbol(cx, method.GetBodyDeclaringSymbol());
         }
 
         private class OrdinaryMethodFactory : CachedEntityFactory<IMethodSymbol, OrdinaryMethod>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs
index d48d778cb75..988ca843927 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs
@@ -21,10 +21,6 @@ namespace Semmle.Extraction.CSharp.Entities
 
         private Type Type => type.Value;
 
-        protected override IPropertySymbol BodyDeclaringSymbol => Symbol.PartialImplementationPart ?? Symbol;
-
-        public override Microsoft.CodeAnalysis.Location? ReportingLocation => BodyDeclaringSymbol.Locations.BestOrDefault();
-
         public override void WriteId(EscapingTextWriter trapFile)
         {
             trapFile.WriteSubId(Type);
@@ -46,8 +42,8 @@ namespace Semmle.Extraction.CSharp.Entities
             var type = Type;
             trapFile.properties(this, Symbol.GetName(), ContainingType!, type.TypeRef, Create(Context, Symbol.OriginalDefinition));
 
-            var getter = BodyDeclaringSymbol.GetMethod;
-            var setter = BodyDeclaringSymbol.SetMethod;
+            var getter = Symbol.GetMethod;
+            var setter = Symbol.SetMethod;
 
             if (getter is not null)
                 Method.Create(Context, getter);
@@ -98,9 +94,9 @@ namespace Semmle.Extraction.CSharp.Entities
                         var loc = Context.CreateLocation(initializer!.GetLocation());
                         var annotatedType = AnnotatedTypeSymbol.CreateNotAnnotated(Symbol.Type);
                         var simpleAssignExpr = new Expression(new ExpressionInfo(Context, annotatedType, loc, ExprKind.SIMPLE_ASSIGN, this, child++, isCompilerGenerated: true, null));
-                        Expression.CreateFromNode(new ExpressionNodeInfo(Context, initializer.Value, simpleAssignExpr, 0));
-                        var access = new Expression(new ExpressionInfo(Context, annotatedType, Location, ExprKind.PROPERTY_ACCESS, simpleAssignExpr, 1, isCompilerGenerated: true, null));
+                        var access = new Expression(new ExpressionInfo(Context, annotatedType, Location, ExprKind.PROPERTY_ACCESS, simpleAssignExpr, 0, isCompilerGenerated: true, null));
                         trapFile.expr_access(access, this);
+                        Expression.CreateFromNode(new ExpressionNodeInfo(Context, initializer.Value, simpleAssignExpr, 1));
                         if (!Symbol.IsStatic)
                         {
                             This.CreateImplicit(Context, Symbol.ContainingType, Location, access, -1);
@@ -132,7 +128,7 @@ namespace Semmle.Extraction.CSharp.Entities
         {
             var isIndexer = prop.IsIndexer || prop.Parameters.Any();
 
-            return isIndexer ? Indexer.Create(cx, prop) : PropertyFactory.Instance.CreateEntityFromSymbol(cx, prop);
+            return isIndexer ? Indexer.Create(cx, prop) : PropertyFactory.Instance.CreateEntityFromSymbol(cx, prop.GetBodyDeclaringSymbol());
         }
 
         private class PropertyFactory : CachedEntityFactory<IPropertySymbol, Property>
diff --git a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
index df4169a1174..86119cf97c4 100644
--- a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.7.61
+
+No user-facing changes.
+
+## 1.7.60
+
+No user-facing changes.
+
 ## 1.7.59
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.60.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.60.md
new file mode 100644
index 00000000000..d247647bd3c
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.60.md
@@ -0,0 +1,3 @@
+## 1.7.60
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.61.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.61.md
new file mode 100644
index 00000000000..260a59b90af
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.61.md
@@ -0,0 +1,3 @@
+## 1.7.61
+
+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 45a32aec800..4235ee0663a 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.59
+lastReleaseVersion: 1.7.61
diff --git a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
index 2bf13d256c9..90919d238b8 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.60-dev
+version: 1.7.62-dev
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
index df4169a1174..86119cf97c4 100644
--- a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.7.61
+
+No user-facing changes.
+
+## 1.7.60
+
+No user-facing changes.
+
 ## 1.7.59
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/ModifiedFnvFunctionDetection.ql b/csharp/ql/campaigns/Solorigate/src/ModifiedFnvFunctionDetection.ql
index e09d00807e6..ca153bfb97d 100644
--- a/csharp/ql/campaigns/Solorigate/src/ModifiedFnvFunctionDetection.ql
+++ b/csharp/ql/campaigns/Solorigate/src/ModifiedFnvFunctionDetection.ql
@@ -16,16 +16,9 @@ import experimental.code.csharp.Cryptography.NonCryptographicHashes
 from Variable v, Literal l, LoopStmt loop, Expr additional_xor
 where
   maybeUsedInFnvFunction(v, _, _, loop) and
-  (
-    exists(BitwiseXorExpr xor2 | xor2.getAnOperand() = l and additional_xor = xor2 |
-      loop.getAControlFlowExitNode().getASuccessor*() = xor2.getAControlFlowNode() and
-      xor2.getAnOperand() = v.getAnAccess()
-    )
-    or
-    exists(AssignXorExpr xor2 | xor2.getAnOperand() = l and additional_xor = xor2 |
-      loop.getAControlFlowExitNode().getASuccessor*() = xor2.getAControlFlowNode() and
-      xor2.getAnOperand() = v.getAnAccess()
-    )
+  exists(BitwiseXorOperation xor2 | xor2.getAnOperand() = l and additional_xor = xor2 |
+    loop.getAControlFlowExitNode().getASuccessor*() = xor2.getAControlFlowNode() and
+    xor2.getAnOperand() = v.getAnAccess()
   )
 select l, "This literal is used in an $@ after an FNV-like hash calculation with variable $@.",
   additional_xor, "additional xor", v, v.toString()
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.60.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.60.md
new file mode 100644
index 00000000000..d247647bd3c
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.60.md
@@ -0,0 +1,3 @@
+## 1.7.60
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.61.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.61.md
new file mode 100644
index 00000000000..260a59b90af
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.61.md
@@ -0,0 +1,3 @@
+## 1.7.61
+
+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 45a32aec800..4235ee0663a 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.59
+lastReleaseVersion: 1.7.61
diff --git a/csharp/ql/campaigns/Solorigate/src/qlpack.yml b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
index 780301f353c..ee4e92178bf 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.60-dev
+version: 1.7.62-dev
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/consistency-queries/CfgConsistency.ql b/csharp/ql/consistency-queries/CfgConsistency.ql
index d7f0c091538..4b0d15f8a81 100644
--- a/csharp/ql/consistency-queries/CfgConsistency.ql
+++ b/csharp/ql/consistency-queries/CfgConsistency.ql
@@ -1,63 +1,5 @@
 import csharp
 import semmle.code.csharp.controlflow.internal.Completion
-import semmle.code.csharp.controlflow.internal.PreBasicBlocks
 import ControlFlow
 import semmle.code.csharp.controlflow.internal.ControlFlowGraphImpl::Consistency
 import semmle.code.csharp.controlflow.internal.Splitting
-
-private predicate splitBB(ControlFlow::BasicBlock bb) {
-  exists(ControlFlow::Node first |
-    first = bb.getFirstNode() and
-    first.isJoin() and
-    strictcount(first.getAPredecessor().getAstNode()) = 1
-  )
-}
-
-private class RelevantBasicBlock extends ControlFlow::BasicBlock {
-  RelevantBasicBlock() { not splitBB(this) }
-}
-
-predicate bbStartInconsistency(ControlFlowElement cfe) {
-  exists(RelevantBasicBlock bb | bb.getFirstNode() = cfe.getAControlFlowNode()) and
-  not cfe = any(PreBasicBlock bb).getFirstElement()
-}
-
-predicate bbSuccInconsistency(ControlFlowElement pred, ControlFlowElement succ) {
-  exists(RelevantBasicBlock predBB, RelevantBasicBlock succBB |
-    predBB.getLastNode() = pred.getAControlFlowNode() and
-    succBB = predBB.getASuccessor() and
-    succBB.getFirstNode() = succ.getAControlFlowNode()
-  ) and
-  not exists(PreBasicBlock predBB, PreBasicBlock succBB |
-    predBB.getLastNode() = pred and
-    succBB = predBB.getASuccessor() and
-    succBB.getFirstElement() = succ
-  )
-}
-
-predicate bbIntraSuccInconsistency(ControlFlowElement pred, ControlFlowElement succ) {
-  exists(ControlFlow::BasicBlock bb, int i |
-    pred.getAControlFlowNode() = bb.getNode(i) and
-    succ.getAControlFlowNode() = bb.getNode(i + 1)
-  ) and
-  not exists(PreBasicBlock bb |
-    bb.getLastNode() = pred and
-    bb.getASuccessor().getFirstElement() = succ
-  ) and
-  not exists(PreBasicBlock bb, int i |
-    bb.getNode(i) = pred and
-    bb.getNode(i + 1) = succ
-  )
-}
-
-query predicate preBasicBlockConsistency(ControlFlowElement cfe1, ControlFlowElement cfe2, string s) {
-  bbStartInconsistency(cfe1) and
-  cfe2 = cfe1 and
-  s = "start inconsistency"
-  or
-  bbSuccInconsistency(cfe1, cfe2) and
-  s = "succ inconsistency"
-  or
-  bbIntraSuccInconsistency(cfe1, cfe2) and
-  s = "intra succ inconsistency"
-}
diff --git a/csharp/ql/consistency-queries/DataFlowConsistency.ql b/csharp/ql/consistency-queries/DataFlowConsistency.ql
index 638bace3892..03e0f3f1b74 100644
--- a/csharp/ql/consistency-queries/DataFlowConsistency.ql
+++ b/csharp/ql/consistency-queries/DataFlowConsistency.ql
@@ -35,9 +35,7 @@ private module Input implements InputSig<Location, CsharpDataFlow> {
     or
     n.asExpr().(ObjectCreation).hasInitializer()
     or
-    exists(
-      n.(PostUpdateNode).getPreUpdateNode().asExprAtNode(LocalFlow::getPostUpdateReverseStep(_))
-    )
+    n.(PostUpdateNode).getPreUpdateNode().asExpr() = LocalFlow::getPostUpdateReverseStep(_)
   }
 
   predicate argHasPostUpdateExclude(ArgumentNode n) {
diff --git a/csharp/ql/integration-tests/all-platforms/autobuild/global.json b/csharp/ql/integration-tests/all-platforms/autobuild/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/autobuild/global.json
+++ b/csharp/ql/integration-tests/all-platforms/autobuild/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/autobuild_slnx/global.json b/csharp/ql/integration-tests/all-platforms/autobuild_slnx/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/autobuild_slnx/global.json
+++ b/csharp/ql/integration-tests/all-platforms/autobuild_slnx/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/binlog/global.json b/csharp/ql/integration-tests/all-platforms/binlog/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/binlog/global.json
+++ b/csharp/ql/integration-tests/all-platforms/binlog/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/binlog_multiple/global.json b/csharp/ql/integration-tests/all-platforms/binlog_multiple/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/binlog_multiple/global.json
+++ b/csharp/ql/integration-tests/all-platforms/binlog_multiple/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/blazor/BlazorTest/global.json b/csharp/ql/integration-tests/all-platforms/blazor/BlazorTest/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/blazor/BlazorTest/global.json
+++ b/csharp/ql/integration-tests/all-platforms/blazor/BlazorTest/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/blazor/Files.expected b/csharp/ql/integration-tests/all-platforms/blazor/Files.expected
index cd035dc7ae9..0ced64bd9b0 100644
--- a/csharp/ql/integration-tests/all-platforms/blazor/Files.expected
+++ b/csharp/ql/integration-tests/all-platforms/blazor/Files.expected
@@ -14,12 +14,12 @@
 | BlazorTest/obj/Debug/net10.0/EmbeddedAttribute.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/EmbeddedAttribute.cs |
 | BlazorTest/obj/Debug/net10.0/ValidatableTypeAttribute.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/ValidatableTypeAttribute.cs |
 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.AspNetCore.App.SourceGenerators/Microsoft.AspNetCore.SourceGenerators.PublicProgramSourceGenerator/PublicTopLevelProgram.Generated.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.AspNetCore.App.SourceGenerators/Microsoft.AspNetCore.SourceGenerators.PublicProgramSourceGenerator/PublicTopLevelProgram.Generated.g.cs |
-| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_App_razor.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_App_razor.g.cs |
-| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Layout_MainLayout_razor.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Layout_MainLayout_razor.g.cs |
-| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Layout_NavMenu_razor.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Layout_NavMenu_razor.g.cs |
-| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_MyInput_razor.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_MyInput_razor.g.cs |
-| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_MyOutput_razor.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_MyOutput_razor.g.cs |
-| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_Error_razor.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_Error_razor.g.cs |
-| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs |
-| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Routes_razor.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Routes_razor.g.cs |
-| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components__Imports_razor.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components__Imports_razor.g.cs |
+| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/App_razor.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/App_razor.g.cs |
+| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Layout/MainLayout_razor.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Layout/MainLayout_razor.g.cs |
+| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Layout/NavMenu_razor.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Layout/NavMenu_razor.g.cs |
+| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/MyInput_razor.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/MyInput_razor.g.cs |
+| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/MyOutput_razor.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/MyOutput_razor.g.cs |
+| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Pages/Error_razor.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Pages/Error_razor.g.cs |
+| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Pages/TestPage_razor.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Pages/TestPage_razor.g.cs |
+| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Routes_razor.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Routes_razor.g.cs |
+| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/_Imports_razor.g.cs:0:0:0:0 | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/_Imports_razor.g.cs |
diff --git a/csharp/ql/integration-tests/all-platforms/blazor/XSS.expected b/csharp/ql/integration-tests/all-platforms/blazor/XSS.expected
index 6518eb74a9f..d4f4f7cdd73 100644
--- a/csharp/ql/integration-tests/all-platforms/blazor/XSS.expected
+++ b/csharp/ql/integration-tests/all-platforms/blazor/XSS.expected
@@ -3,8 +3,8 @@
 | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | $@ flows to here and is written to HTML or JavaScript. | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | User-provided value |
 | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | $@ flows to here and is written to HTML or JavaScript. | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | User-provided value |
 edges
-| BlazorTest/Components/Pages/TestPage.razor:85:23:85:32 | access to property QueryParam : String | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:553:16:561:13 | call to method TypeCheck<String> : String | provenance | Src:MaD:2 MaD:3 |
-| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:553:16:561:13 | call to method TypeCheck<String> : String | BlazorTest/Components/MyOutput.razor:5:53:5:57 | access to property Value | provenance | Sink:MaD:1 |
+| BlazorTest/Components/Pages/TestPage.razor:85:23:85:32 | access to property QueryParam : String | BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Pages/TestPage_razor.g.cs:553:16:561:13 | call to method TypeCheck<String> : String | provenance | Src:MaD:2 MaD:3 |
+| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Pages/TestPage_razor.g.cs:553:16:561:13 | call to method TypeCheck<String> : String | BlazorTest/Components/MyOutput.razor:5:53:5:57 | access to property Value | provenance | Sink:MaD:1 |
 models
 | 1 | Sink: Microsoft.AspNetCore.Components; MarkupString; false; MarkupString; (System.String); ; Argument[0]; html-injection; manual |
 | 2 | Source: Microsoft.AspNetCore.Components; SupplyParameterFromQueryAttribute; false; ; ; Attribute.Getter; ReturnValue; remote; manual |
@@ -14,5 +14,5 @@ nodes
 | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | semmle.label | access to property UrlParam |
 | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | semmle.label | access to property QueryParam |
 | BlazorTest/Components/Pages/TestPage.razor:85:23:85:32 | access to property QueryParam : String | semmle.label | access to property QueryParam : String |
-| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:553:16:561:13 | call to method TypeCheck<String> : String | semmle.label | call to method TypeCheck<String> : String |
+| BlazorTest/obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Pages/TestPage_razor.g.cs:553:16:561:13 | call to method TypeCheck<String> : String | semmle.label | call to method TypeCheck<String> : String |
 subpaths
diff --git a/csharp/ql/integration-tests/all-platforms/blazor/global.json b/csharp/ql/integration-tests/all-platforms/blazor/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/blazor/global.json
+++ b/csharp/ql/integration-tests/all-platforms/blazor/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/BlazorTest/global.json b/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/BlazorTest/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/BlazorTest/global.json
+++ b/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/BlazorTest/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/Files.expected b/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/Files.expected
index 8811ba1c0c7..a9028ed1530 100644
--- a/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/Files.expected
+++ b/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/Files.expected
@@ -8,13 +8,13 @@
 | BlazorTest/Components/Routes.razor |
 | BlazorTest/Components/_Imports.razor |
 | BlazorTest/Program.cs |
-| [...]/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_App_razor.g.cs |
-| [...]/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Layout_MainLayout_razor.g.cs |
-| [...]/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Layout_NavMenu_razor.g.cs |
-| [...]/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_MyInput_razor.g.cs |
-| [...]/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_MyOutput_razor.g.cs |
-| [...]/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_Error_razor.g.cs |
-| [...]/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs |
-| [...]/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Routes_razor.g.cs |
-| [...]/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components__Imports_razor.g.cs |
+| [...]/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/App_razor.g.cs |
+| [...]/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Layout/MainLayout_razor.g.cs |
+| [...]/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Layout/NavMenu_razor.g.cs |
+| [...]/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/MyInput_razor.g.cs |
+| [...]/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/MyOutput_razor.g.cs |
+| [...]/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Pages/Error_razor.g.cs |
+| [...]/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Pages/TestPage_razor.g.cs |
+| [...]/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Routes_razor.g.cs |
+| [...]/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/_Imports_razor.g.cs |
 | test-db/working/implicitUsings/GlobalUsings.g.cs |
diff --git a/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/XSS.expected b/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/XSS.expected
index f20ca29ee85..2ebaaaaf6aa 100644
--- a/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/XSS.expected
+++ b/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/XSS.expected
@@ -3,8 +3,8 @@
 | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | $@ flows to here and is written to HTML or JavaScript. | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | User-provided value |
 | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | $@ flows to here and is written to HTML or JavaScript. | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | User-provided value |
 edges
-| BlazorTest/Components/Pages/TestPage.razor:85:23:85:32 | access to property QueryParam : String | test-db/working/razor/AC613014E59A413B9538FF8068364499/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:553:16:561:13 | call to method TypeCheck<String> : String | provenance | Src:MaD:2 MaD:3 |
-| test-db/working/razor/AC613014E59A413B9538FF8068364499/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:553:16:561:13 | call to method TypeCheck<String> : String | BlazorTest/Components/MyOutput.razor:5:53:5:57 | access to property Value | provenance | Sink:MaD:1 |
+| BlazorTest/Components/Pages/TestPage.razor:85:23:85:32 | access to property QueryParam : String | test-db/working/razor/AC613014E59A413B9538FF8068364499/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Pages/TestPage_razor.g.cs:553:16:561:13 | call to method TypeCheck<String> : String | provenance | Src:MaD:2 MaD:3 |
+| test-db/working/razor/AC613014E59A413B9538FF8068364499/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Pages/TestPage_razor.g.cs:553:16:561:13 | call to method TypeCheck<String> : String | BlazorTest/Components/MyOutput.razor:5:53:5:57 | access to property Value | provenance | Sink:MaD:1 |
 models
 | 1 | Sink: Microsoft.AspNetCore.Components; MarkupString; false; MarkupString; (System.String); ; Argument[0]; html-injection; manual |
 | 2 | Source: Microsoft.AspNetCore.Components; SupplyParameterFromQueryAttribute; false; ; ; Attribute.Getter; ReturnValue; remote; manual |
@@ -14,5 +14,5 @@ nodes
 | BlazorTest/Components/Pages/TestPage.razor:11:48:11:55 | access to property UrlParam | semmle.label | access to property UrlParam |
 | BlazorTest/Components/Pages/TestPage.razor:20:60:20:69 | access to property QueryParam | semmle.label | access to property QueryParam |
 | BlazorTest/Components/Pages/TestPage.razor:85:23:85:32 | access to property QueryParam : String | semmle.label | access to property QueryParam : String |
-| test-db/working/razor/AC613014E59A413B9538FF8068364499/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components_Pages_TestPage_razor.g.cs:553:16:561:13 | call to method TypeCheck<String> : String | semmle.label | call to method TypeCheck<String> : String |
+| test-db/working/razor/AC613014E59A413B9538FF8068364499/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Components/Pages/TestPage_razor.g.cs:553:16:561:13 | call to method TypeCheck<String> : String | semmle.label | call to method TypeCheck<String> : String |
 subpaths
diff --git a/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/global.json b/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/global.json
+++ b/csharp/ql/integration-tests/all-platforms/blazor_build_mode_none/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/conditional_compilation/global.json b/csharp/ql/integration-tests/all-platforms/conditional_compilation/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/conditional_compilation/global.json
+++ b/csharp/ql/integration-tests/all-platforms/conditional_compilation/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml/Files.expected b/csharp/ql/integration-tests/all-platforms/cshtml/Files.expected
index ef4dc96389f..4acc37f35e1 100644
--- a/csharp/ql/integration-tests/all-platforms/cshtml/Files.expected
+++ b/csharp/ql/integration-tests/all-platforms/cshtml/Files.expected
@@ -5,4 +5,4 @@
 | obj/Debug/net10.0/cshtml.GlobalUsings.g.cs:0:0:0:0 | obj/Debug/net10.0/cshtml.GlobalUsings.g.cs |
 | obj/Debug/net10.0/cshtml.RazorAssemblyInfo.cs:0:0:0:0 | obj/Debug/net10.0/cshtml.RazorAssemblyInfo.cs |
 | obj/Debug/net10.0/generated/Microsoft.AspNetCore.App.SourceGenerators/Microsoft.AspNetCore.SourceGenerators.PublicProgramSourceGenerator/PublicTopLevelProgram.Generated.g.cs:0:0:0:0 | obj/Debug/net10.0/generated/Microsoft.AspNetCore.App.SourceGenerators/Microsoft.AspNetCore.SourceGenerators.PublicProgramSourceGenerator/PublicTopLevelProgram.Generated.g.cs |
-| obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Views_Home_Index_cshtml.g.cs:0:0:0:0 | obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Views_Home_Index_cshtml.g.cs |
+| obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Views/Home/Index_cshtml.g.cs:0:0:0:0 | obj/Debug/net10.0/generated/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Views/Home/Index_cshtml.g.cs |
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml/global.json b/csharp/ql/integration-tests/all-platforms/cshtml/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/cshtml/global.json
+++ b/csharp/ql/integration-tests/all-platforms/cshtml/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone/Files.expected b/csharp/ql/integration-tests/all-platforms/cshtml_standalone/Files.expected
index 2b6fea50a1b..c5ff8dee794 100644
--- a/csharp/ql/integration-tests/all-platforms/cshtml_standalone/Files.expected
+++ b/csharp/ql/integration-tests/all-platforms/cshtml_standalone/Files.expected
@@ -1,4 +1,4 @@
 | Program.cs |
 | Views/Home/Index.cshtml |
 | test-db/working/implicitUsings/GlobalUsings.g.cs |
-| test-db/working/razor/EC52D77FE9BF67AD10C5C3F248392316/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Views_Home_Index_cshtml.g.cs |
+| test-db/working/razor/EC52D77FE9BF67AD10C5C3F248392316/Microsoft.CodeAnalysis.Razor.Compiler/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Views/Home/Index_cshtml.g.cs |
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone/global.json b/csharp/ql/integration-tests/all-platforms/cshtml_standalone/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/cshtml_standalone/global.json
+++ b/csharp/ql/integration-tests/all-platforms/cshtml_standalone/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/global.json b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/global.json
+++ b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_disabled/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_flowsteps/global.json b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_flowsteps/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_flowsteps/global.json
+++ b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_flowsteps/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_net6/Files.expected b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_net6/Files.expected
index 4059eb70333..843b4651ea3 100644
--- a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_net6/Files.expected
+++ b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_net6/Files.expected
@@ -1,4 +1,4 @@
 | Program.cs |
 | Views/Home/Index.cshtml |
 | test-db/working/implicitUsings/GlobalUsings.g.cs |
-| test-db/working/razor/EC52D77FE9BF67AD10C5C3F248392316/[...]/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Views_Home_Index_cshtml.g.cs |
+| test-db/working/razor/EC52D77FE9BF67AD10C5C3F248392316/[...]/Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator/Views/Home/Index_cshtml.g.cs |
diff --git a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_net6/global.json b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_net6/global.json
index 2715bb6d9b0..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/cshtml_standalone_net6/global.json
+++ b/csharp/ql/integration-tests/all-platforms/cshtml_standalone_net6/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "6.0.418"
+        "version": "10.0.201"
     }
-}
\ No newline at end of file
+}
diff --git a/csharp/ql/integration-tests/all-platforms/diag_dotnet_incompatible/global.json b/csharp/ql/integration-tests/all-platforms/diag_dotnet_incompatible/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/diag_dotnet_incompatible/global.json
+++ b/csharp/ql/integration-tests/all-platforms/diag_dotnet_incompatible/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/diag_missing_project_files/global.json b/csharp/ql/integration-tests/all-platforms/diag_missing_project_files/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/diag_missing_project_files/global.json
+++ b/csharp/ql/integration-tests/all-platforms/diag_missing_project_files/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/diag_missing_xamarin_sdk/global.json b/csharp/ql/integration-tests/all-platforms/diag_missing_xamarin_sdk/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/diag_missing_xamarin_sdk/global.json
+++ b/csharp/ql/integration-tests/all-platforms/diag_missing_xamarin_sdk/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/global.json b/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/global.json
+++ b/csharp/ql/integration-tests/all-platforms/diag_recursive_generics/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_10/global.json b/csharp/ql/integration-tests/all-platforms/dotnet_10/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_10/global.json
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_10/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_build/global.json b/csharp/ql/integration-tests/all-platforms/dotnet_build/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_build/global.json
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_build/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_no_args_inject/global.json b/csharp/ql/integration-tests/all-platforms/dotnet_no_args_inject/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_no_args_inject/global.json
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_no_args_inject/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_pack/global.json b/csharp/ql/integration-tests/all-platforms/dotnet_pack/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_pack/global.json
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_pack/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_publish/global.json b/csharp/ql/integration-tests/all-platforms/dotnet_publish/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_publish/global.json
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_publish/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_run/global.json b/csharp/ql/integration-tests/all-platforms/dotnet_run/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_run/global.json
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_run/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/source_generator/global.json b/csharp/ql/integration-tests/all-platforms/source_generator/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/source_generator/global.json
+++ b/csharp/ql/integration-tests/all-platforms/source_generator/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone/global.json b/csharp/ql/integration-tests/all-platforms/standalone/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone/global.json
+++ b/csharp/ql/integration-tests/all-platforms/standalone/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_buildless_option/global.json b/csharp/ql/integration-tests/all-platforms/standalone_buildless_option/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_buildless_option/global.json
+++ b/csharp/ql/integration-tests/all-platforms/standalone_buildless_option/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/global.json b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/global.json
index 376af49c07f..ce67766bbb5 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/global.json
+++ b/csharp/ql/integration-tests/all-platforms/standalone_dependencies_net48/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "10.0.100"
+    "version": "10.0.201"
   }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_dependency_dir/proj/global.json b/csharp/ql/integration-tests/all-platforms/standalone_dependency_dir/proj/global.json
index 376af49c07f..ce67766bbb5 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_dependency_dir/proj/global.json
+++ b/csharp/ql/integration-tests/all-platforms/standalone_dependency_dir/proj/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "10.0.100"
+    "version": "10.0.201"
   }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_failed/global.json b/csharp/ql/integration-tests/all-platforms/standalone_failed/global.json
index 376af49c07f..ce67766bbb5 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_failed/global.json
+++ b/csharp/ql/integration-tests/all-platforms/standalone_failed/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "10.0.100"
+    "version": "10.0.201"
   }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_resx/global.json b/csharp/ql/integration-tests/all-platforms/standalone_resx/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_resx/global.json
+++ b/csharp/ql/integration-tests/all-platforms/standalone_resx/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_slnx/global.json b/csharp/ql/integration-tests/all-platforms/standalone_slnx/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_slnx/global.json
+++ b/csharp/ql/integration-tests/all-platforms/standalone_slnx/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_winforms/Assemblies.expected b/csharp/ql/integration-tests/all-platforms/standalone_winforms/Assemblies.expected
index aa00093875c..3419be9d7e8 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_winforms/Assemblies.expected
+++ b/csharp/ql/integration-tests/all-platforms/standalone_winforms/Assemblies.expected
@@ -1,50 +1,50 @@
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/Accessibility.dll:0:0:0:0 | Accessibility, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/Microsoft.VisualBasic.Forms.dll:0:0:0:0 | Microsoft.VisualBasic.Forms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/Microsoft.Win32.Registry.AccessControl.dll:0:0:0:0 | Microsoft.Win32.Registry.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/Microsoft.Win32.SystemEvents.dll:0:0:0:0 | Microsoft.Win32.SystemEvents, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/PresentationCore.dll:0:0:0:0 | PresentationCore, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/PresentationFramework.Aero2.dll:0:0:0:0 | PresentationFramework.Aero2, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/PresentationFramework.Aero.dll:0:0:0:0 | PresentationFramework.Aero, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/PresentationFramework.AeroLite.dll:0:0:0:0 | PresentationFramework.AeroLite, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/PresentationFramework.Classic.dll:0:0:0:0 | PresentationFramework.Classic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/PresentationFramework.Luna.dll:0:0:0:0 | PresentationFramework.Luna, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/PresentationFramework.Royale.dll:0:0:0:0 | PresentationFramework.Royale, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/PresentationFramework.dll:0:0:0:0 | PresentationFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/PresentationUI.dll:0:0:0:0 | PresentationUI, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/ReachFramework.dll:0:0:0:0 | ReachFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.CodeDom.dll:0:0:0:0 | System.CodeDom, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Configuration.ConfigurationManager.dll:0:0:0:0 | System.Configuration.ConfigurationManager, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Design.dll:0:0:0:0 | System.Design, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Diagnostics.EventLog.dll:0:0:0:0 | System.Diagnostics.EventLog, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Diagnostics.PerformanceCounter.dll:0:0:0:0 | System.Diagnostics.PerformanceCounter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.DirectoryServices.dll:0:0:0:0 | System.DirectoryServices, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Drawing.Common.dll:0:0:0:0 | System.Drawing.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Drawing.Design.dll:0:0:0:0 | System.Drawing.Design, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Formats.Nrbf.dll:0:0:0:0 | System.Formats.Nrbf, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.IO.Packaging.dll:0:0:0:0 | System.IO.Packaging, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Printing.dll:0:0:0:0 | System.Printing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Private.Windows.Core.dll:0:0:0:0 | System.Private.Windows.Core, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Private.Windows.GdiPlus.dll:0:0:0:0 | System.Private.Windows.GdiPlus, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Resources.Extensions.dll:0:0:0:0 | System.Resources.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Pkcs.dll:0:0:0:0 | System.Security.Cryptography.Pkcs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.ProtectedData.dll:0:0:0:0 | System.Security.Cryptography.ProtectedData, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Xml.dll:0:0:0:0 | System.Security.Cryptography.Xml, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Security.Permissions.dll:0:0:0:0 | System.Security.Permissions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Windows.Controls.Ribbon.dll:0:0:0:0 | System.Windows.Controls.Ribbon, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Windows.Extensions.dll:0:0:0:0 | System.Windows.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Windows.Forms.Design.Editors.dll:0:0:0:0 | System.Windows.Forms.Design.Editors, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Windows.Forms.Design.dll:0:0:0:0 | System.Windows.Forms.Design, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Windows.Forms.Primitives.dll:0:0:0:0 | System.Windows.Forms.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Windows.Forms.dll:0:0:0:0 | System.Windows.Forms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Windows.Input.Manipulations.dll:0:0:0:0 | System.Windows.Input.Manipulations, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Windows.Presentation.dll:0:0:0:0 | System.Windows.Presentation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Windows.Primitives.dll:0:0:0:0 | System.Windows.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Xaml.dll:0:0:0:0 | System.Xaml, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/UIAutomationClient.dll:0:0:0:0 | UIAutomationClient, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/UIAutomationClientSideProviders.dll:0:0:0:0 | UIAutomationClientSideProviders, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/UIAutomationProvider.dll:0:0:0:0 | UIAutomationProvider, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/UIAutomationTypes.dll:0:0:0:0 | UIAutomationTypes, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/WindowsFormsIntegration.dll:0:0:0:0 | WindowsFormsIntegration, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/Accessibility.dll:0:0:0:0 | Accessibility, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/Microsoft.VisualBasic.Forms.dll:0:0:0:0 | Microsoft.VisualBasic.Forms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/Microsoft.Win32.Registry.AccessControl.dll:0:0:0:0 | Microsoft.Win32.Registry.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/Microsoft.Win32.SystemEvents.dll:0:0:0:0 | Microsoft.Win32.SystemEvents, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/PresentationCore.dll:0:0:0:0 | PresentationCore, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/PresentationFramework.Aero2.dll:0:0:0:0 | PresentationFramework.Aero2, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/PresentationFramework.Aero.dll:0:0:0:0 | PresentationFramework.Aero, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/PresentationFramework.AeroLite.dll:0:0:0:0 | PresentationFramework.AeroLite, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/PresentationFramework.Classic.dll:0:0:0:0 | PresentationFramework.Classic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/PresentationFramework.Luna.dll:0:0:0:0 | PresentationFramework.Luna, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/PresentationFramework.Royale.dll:0:0:0:0 | PresentationFramework.Royale, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/PresentationFramework.dll:0:0:0:0 | PresentationFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/PresentationUI.dll:0:0:0:0 | PresentationUI, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/ReachFramework.dll:0:0:0:0 | ReachFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.CodeDom.dll:0:0:0:0 | System.CodeDom, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Configuration.ConfigurationManager.dll:0:0:0:0 | System.Configuration.ConfigurationManager, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Design.dll:0:0:0:0 | System.Design, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Diagnostics.EventLog.dll:0:0:0:0 | System.Diagnostics.EventLog, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Diagnostics.PerformanceCounter.dll:0:0:0:0 | System.Diagnostics.PerformanceCounter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.DirectoryServices.dll:0:0:0:0 | System.DirectoryServices, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Drawing.Common.dll:0:0:0:0 | System.Drawing.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Drawing.Design.dll:0:0:0:0 | System.Drawing.Design, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Formats.Nrbf.dll:0:0:0:0 | System.Formats.Nrbf, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.IO.Packaging.dll:0:0:0:0 | System.IO.Packaging, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Printing.dll:0:0:0:0 | System.Printing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Private.Windows.Core.dll:0:0:0:0 | System.Private.Windows.Core, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Private.Windows.GdiPlus.dll:0:0:0:0 | System.Private.Windows.GdiPlus, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Resources.Extensions.dll:0:0:0:0 | System.Resources.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Pkcs.dll:0:0:0:0 | System.Security.Cryptography.Pkcs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.ProtectedData.dll:0:0:0:0 | System.Security.Cryptography.ProtectedData, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Xml.dll:0:0:0:0 | System.Security.Cryptography.Xml, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Security.Permissions.dll:0:0:0:0 | System.Security.Permissions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Windows.Controls.Ribbon.dll:0:0:0:0 | System.Windows.Controls.Ribbon, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Windows.Extensions.dll:0:0:0:0 | System.Windows.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Windows.Forms.Design.Editors.dll:0:0:0:0 | System.Windows.Forms.Design.Editors, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Windows.Forms.Design.dll:0:0:0:0 | System.Windows.Forms.Design, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Windows.Forms.Primitives.dll:0:0:0:0 | System.Windows.Forms.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Windows.Forms.dll:0:0:0:0 | System.Windows.Forms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Windows.Input.Manipulations.dll:0:0:0:0 | System.Windows.Input.Manipulations, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Windows.Presentation.dll:0:0:0:0 | System.Windows.Presentation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Windows.Primitives.dll:0:0:0:0 | System.Windows.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Xaml.dll:0:0:0:0 | System.Xaml, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/UIAutomationClient.dll:0:0:0:0 | UIAutomationClient, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/UIAutomationClientSideProviders.dll:0:0:0:0 | UIAutomationClientSideProviders, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/UIAutomationProvider.dll:0:0:0:0 | UIAutomationProvider, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/UIAutomationTypes.dll:0:0:0:0 | UIAutomationTypes, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/WindowsFormsIntegration.dll:0:0:0:0 | WindowsFormsIntegration, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
diff --git a/csharp/ql/integration-tests/all-platforms/standalone_winforms/global.json b/csharp/ql/integration-tests/all-platforms/standalone_winforms/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/all-platforms/standalone_winforms/global.json
+++ b/csharp/ql/integration-tests/all-platforms/standalone_winforms/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/linux/compiler_args/CompilerArgs.expected b/csharp/ql/integration-tests/linux/compiler_args/CompilerArgs.expected
index 67a23e2d941..13f7aedb656 100644
--- a/csharp/ql/integration-tests/linux/compiler_args/CompilerArgs.expected
+++ b/csharp/ql/integration-tests/linux/compiler_args/CompilerArgs.expected
@@ -1,7 +1,7 @@
 | 0 | /noconfig |
 | 1 | /unsafe- |
 | 2 | /checked- |
-| 3 | /nowarn:1701,1702,1701,1702 |
+| 3 | /nowarn:1701,1702,1701,1702,8002 |
 | 4 | /fullpaths |
 | 5 | /nostdlib+ |
 | 6 | /errorreport:prompt |
@@ -10,173 +10,173 @@
 | 9 | /preferreduilang:en |
 | 10 | /highentropyva+ |
 | 11 | /nullable:enable |
-| 12 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/Microsoft.CSharp.dll |
-| 13 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/Microsoft.VisualBasic.Core.dll |
-| 14 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/Microsoft.VisualBasic.dll |
-| 15 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/Microsoft.Win32.Primitives.dll |
-| 16 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/Microsoft.Win32.Registry.dll |
-| 17 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/mscorlib.dll |
-| 18 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/netstandard.dll |
-| 19 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.AppContext.dll |
-| 20 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Buffers.dll |
-| 21 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Collections.Concurrent.dll |
-| 22 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Collections.dll |
-| 23 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Collections.Immutable.dll |
-| 24 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Collections.NonGeneric.dll |
-| 25 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Collections.Specialized.dll |
-| 26 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.ComponentModel.Annotations.dll |
-| 27 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.ComponentModel.DataAnnotations.dll |
-| 28 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.ComponentModel.dll |
-| 29 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.ComponentModel.EventBasedAsync.dll |
-| 30 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.ComponentModel.Primitives.dll |
-| 31 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.ComponentModel.TypeConverter.dll |
-| 32 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Configuration.dll |
-| 33 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Console.dll |
-| 34 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Core.dll |
-| 35 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Data.Common.dll |
-| 36 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Data.DataSetExtensions.dll |
-| 37 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Data.dll |
-| 38 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Diagnostics.Contracts.dll |
-| 39 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Diagnostics.Debug.dll |
-| 40 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Diagnostics.DiagnosticSource.dll |
-| 41 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Diagnostics.FileVersionInfo.dll |
-| 42 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Diagnostics.Process.dll |
-| 43 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Diagnostics.StackTrace.dll |
-| 44 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Diagnostics.TextWriterTraceListener.dll |
-| 45 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Diagnostics.Tools.dll |
-| 46 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Diagnostics.TraceSource.dll |
-| 47 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Diagnostics.Tracing.dll |
-| 48 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.dll |
-| 49 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Drawing.dll |
-| 50 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Drawing.Primitives.dll |
-| 51 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Dynamic.Runtime.dll |
-| 52 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Formats.Asn1.dll |
-| 53 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Formats.Tar.dll |
-| 54 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Globalization.Calendars.dll |
-| 55 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Globalization.dll |
-| 56 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Globalization.Extensions.dll |
-| 57 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.IO.Compression.Brotli.dll |
-| 58 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.IO.Compression.dll |
-| 59 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.IO.Compression.FileSystem.dll |
-| 60 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.IO.Compression.ZipFile.dll |
-| 61 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.IO.dll |
-| 62 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.IO.FileSystem.AccessControl.dll |
-| 63 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.IO.FileSystem.dll |
-| 64 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.IO.FileSystem.DriveInfo.dll |
-| 65 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.IO.FileSystem.Primitives.dll |
-| 66 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.IO.FileSystem.Watcher.dll |
-| 67 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.IO.IsolatedStorage.dll |
-| 68 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.IO.MemoryMappedFiles.dll |
-| 69 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.IO.Pipelines.dll |
-| 70 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.IO.Pipes.AccessControl.dll |
-| 71 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.IO.Pipes.dll |
-| 72 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.IO.UnmanagedMemoryStream.dll |
-| 73 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Linq.AsyncEnumerable.dll |
-| 74 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Linq.dll |
-| 75 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Linq.Expressions.dll |
-| 76 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Linq.Parallel.dll |
-| 77 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Linq.Queryable.dll |
-| 78 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Memory.dll |
-| 79 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.dll |
-| 80 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.Http.dll |
-| 81 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.Http.Json.dll |
-| 82 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.HttpListener.dll |
-| 83 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.Mail.dll |
-| 84 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.NameResolution.dll |
-| 85 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.NetworkInformation.dll |
-| 86 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.Ping.dll |
-| 87 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.Primitives.dll |
-| 88 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.Quic.dll |
-| 89 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.Requests.dll |
-| 90 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.Security.dll |
-| 91 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.ServerSentEvents.dll |
-| 92 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.ServicePoint.dll |
-| 93 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.Sockets.dll |
-| 94 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.WebClient.dll |
-| 95 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.WebHeaderCollection.dll |
-| 96 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.WebProxy.dll |
-| 97 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.WebSockets.Client.dll |
-| 98 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Net.WebSockets.dll |
-| 99 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Numerics.dll |
-| 100 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Numerics.Vectors.dll |
-| 101 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.ObjectModel.dll |
-| 102 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Reflection.DispatchProxy.dll |
-| 103 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Reflection.dll |
-| 104 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Reflection.Emit.dll |
-| 105 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Reflection.Emit.ILGeneration.dll |
-| 106 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Reflection.Emit.Lightweight.dll |
-| 107 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Reflection.Extensions.dll |
-| 108 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Reflection.Metadata.dll |
-| 109 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Reflection.Primitives.dll |
-| 110 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Reflection.TypeExtensions.dll |
-| 111 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Resources.Reader.dll |
-| 112 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Resources.ResourceManager.dll |
-| 113 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Resources.Writer.dll |
-| 114 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Runtime.CompilerServices.Unsafe.dll |
-| 115 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Runtime.CompilerServices.VisualC.dll |
-| 116 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Runtime.dll |
-| 117 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Runtime.Extensions.dll |
-| 118 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Runtime.Handles.dll |
-| 119 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Runtime.InteropServices.dll |
-| 120 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Runtime.InteropServices.JavaScript.dll |
-| 121 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Runtime.InteropServices.RuntimeInformation.dll |
-| 122 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Runtime.Intrinsics.dll |
-| 123 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Runtime.Loader.dll |
-| 124 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Runtime.Numerics.dll |
-| 125 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Runtime.Serialization.dll |
-| 126 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Formatters.dll |
-| 127 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Json.dll |
-| 128 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Primitives.dll |
-| 129 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Xml.dll |
-| 130 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Security.AccessControl.dll |
-| 131 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Security.Claims.dll |
-| 132 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Security.Cryptography.Algorithms.dll |
-| 133 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Security.Cryptography.Cng.dll |
-| 134 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Security.Cryptography.Csp.dll |
-| 135 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Security.Cryptography.dll |
-| 136 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Security.Cryptography.Encoding.dll |
-| 137 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Security.Cryptography.OpenSsl.dll |
-| 138 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Security.Cryptography.Primitives.dll |
-| 139 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Security.Cryptography.X509Certificates.dll |
-| 140 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Security.dll |
-| 141 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Security.Principal.dll |
-| 142 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Security.Principal.Windows.dll |
-| 143 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Security.SecureString.dll |
-| 144 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.ServiceModel.Web.dll |
-| 145 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.ServiceProcess.dll |
-| 146 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Text.Encoding.CodePages.dll |
-| 147 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Text.Encoding.dll |
-| 148 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Text.Encoding.Extensions.dll |
-| 149 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Text.Encodings.Web.dll |
-| 150 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Text.Json.dll |
-| 151 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Text.RegularExpressions.dll |
-| 152 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Threading.AccessControl.dll |
-| 153 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Threading.Channels.dll |
-| 154 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Threading.dll |
-| 155 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Threading.Overlapped.dll |
-| 156 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Threading.Tasks.Dataflow.dll |
-| 157 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Threading.Tasks.dll |
-| 158 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Threading.Tasks.Extensions.dll |
-| 159 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Threading.Tasks.Parallel.dll |
-| 160 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Threading.Thread.dll |
-| 161 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Threading.ThreadPool.dll |
-| 162 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Threading.Timer.dll |
-| 163 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Transactions.dll |
-| 164 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Transactions.Local.dll |
-| 165 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.ValueTuple.dll |
-| 166 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Web.dll |
-| 167 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Web.HttpUtility.dll |
-| 168 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Windows.dll |
-| 169 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Xml.dll |
-| 170 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Xml.Linq.dll |
-| 171 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Xml.ReaderWriter.dll |
-| 172 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Xml.Serialization.dll |
-| 173 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Xml.XDocument.dll |
-| 174 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Xml.XmlDocument.dll |
-| 175 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Xml.XmlSerializer.dll |
-| 176 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Xml.XPath.dll |
-| 177 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/System.Xml.XPath.XDocument.dll |
-| 178 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/ref/net10.0/WindowsBase.dll |
+| 12 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/Microsoft.CSharp.dll |
+| 13 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/Microsoft.VisualBasic.Core.dll |
+| 14 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/Microsoft.VisualBasic.dll |
+| 15 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/Microsoft.Win32.Primitives.dll |
+| 16 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/Microsoft.Win32.Registry.dll |
+| 17 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/mscorlib.dll |
+| 18 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/netstandard.dll |
+| 19 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.AppContext.dll |
+| 20 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Buffers.dll |
+| 21 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Collections.Concurrent.dll |
+| 22 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Collections.dll |
+| 23 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Collections.Immutable.dll |
+| 24 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Collections.NonGeneric.dll |
+| 25 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Collections.Specialized.dll |
+| 26 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.ComponentModel.Annotations.dll |
+| 27 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.ComponentModel.DataAnnotations.dll |
+| 28 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.ComponentModel.dll |
+| 29 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.ComponentModel.EventBasedAsync.dll |
+| 30 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.ComponentModel.Primitives.dll |
+| 31 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.ComponentModel.TypeConverter.dll |
+| 32 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Configuration.dll |
+| 33 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Console.dll |
+| 34 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Core.dll |
+| 35 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Data.Common.dll |
+| 36 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Data.DataSetExtensions.dll |
+| 37 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Data.dll |
+| 38 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Diagnostics.Contracts.dll |
+| 39 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Diagnostics.Debug.dll |
+| 40 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Diagnostics.DiagnosticSource.dll |
+| 41 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Diagnostics.FileVersionInfo.dll |
+| 42 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Diagnostics.Process.dll |
+| 43 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Diagnostics.StackTrace.dll |
+| 44 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Diagnostics.TextWriterTraceListener.dll |
+| 45 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Diagnostics.Tools.dll |
+| 46 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Diagnostics.TraceSource.dll |
+| 47 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Diagnostics.Tracing.dll |
+| 48 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.dll |
+| 49 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Drawing.dll |
+| 50 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Drawing.Primitives.dll |
+| 51 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Dynamic.Runtime.dll |
+| 52 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Formats.Asn1.dll |
+| 53 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Formats.Tar.dll |
+| 54 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Globalization.Calendars.dll |
+| 55 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Globalization.dll |
+| 56 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Globalization.Extensions.dll |
+| 57 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.IO.Compression.Brotli.dll |
+| 58 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.IO.Compression.dll |
+| 59 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.IO.Compression.FileSystem.dll |
+| 60 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.IO.Compression.ZipFile.dll |
+| 61 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.IO.dll |
+| 62 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.IO.FileSystem.AccessControl.dll |
+| 63 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.IO.FileSystem.dll |
+| 64 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.IO.FileSystem.DriveInfo.dll |
+| 65 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.IO.FileSystem.Primitives.dll |
+| 66 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.IO.FileSystem.Watcher.dll |
+| 67 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.IO.IsolatedStorage.dll |
+| 68 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.IO.MemoryMappedFiles.dll |
+| 69 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.IO.Pipelines.dll |
+| 70 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.IO.Pipes.AccessControl.dll |
+| 71 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.IO.Pipes.dll |
+| 72 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.IO.UnmanagedMemoryStream.dll |
+| 73 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Linq.AsyncEnumerable.dll |
+| 74 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Linq.dll |
+| 75 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Linq.Expressions.dll |
+| 76 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Linq.Parallel.dll |
+| 77 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Linq.Queryable.dll |
+| 78 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Memory.dll |
+| 79 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.dll |
+| 80 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.Http.dll |
+| 81 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.Http.Json.dll |
+| 82 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.HttpListener.dll |
+| 83 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.Mail.dll |
+| 84 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.NameResolution.dll |
+| 85 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.NetworkInformation.dll |
+| 86 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.Ping.dll |
+| 87 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.Primitives.dll |
+| 88 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.Quic.dll |
+| 89 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.Requests.dll |
+| 90 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.Security.dll |
+| 91 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.ServerSentEvents.dll |
+| 92 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.ServicePoint.dll |
+| 93 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.Sockets.dll |
+| 94 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.WebClient.dll |
+| 95 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.WebHeaderCollection.dll |
+| 96 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.WebProxy.dll |
+| 97 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.WebSockets.Client.dll |
+| 98 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Net.WebSockets.dll |
+| 99 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Numerics.dll |
+| 100 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Numerics.Vectors.dll |
+| 101 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.ObjectModel.dll |
+| 102 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Reflection.DispatchProxy.dll |
+| 103 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Reflection.dll |
+| 104 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Reflection.Emit.dll |
+| 105 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Reflection.Emit.ILGeneration.dll |
+| 106 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Reflection.Emit.Lightweight.dll |
+| 107 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Reflection.Extensions.dll |
+| 108 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Reflection.Metadata.dll |
+| 109 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Reflection.Primitives.dll |
+| 110 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Reflection.TypeExtensions.dll |
+| 111 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Resources.Reader.dll |
+| 112 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Resources.ResourceManager.dll |
+| 113 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Resources.Writer.dll |
+| 114 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Runtime.CompilerServices.Unsafe.dll |
+| 115 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Runtime.CompilerServices.VisualC.dll |
+| 116 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Runtime.dll |
+| 117 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Runtime.Extensions.dll |
+| 118 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Runtime.Handles.dll |
+| 119 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Runtime.InteropServices.dll |
+| 120 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Runtime.InteropServices.JavaScript.dll |
+| 121 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Runtime.InteropServices.RuntimeInformation.dll |
+| 122 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Runtime.Intrinsics.dll |
+| 123 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Runtime.Loader.dll |
+| 124 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Runtime.Numerics.dll |
+| 125 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Runtime.Serialization.dll |
+| 126 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Formatters.dll |
+| 127 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Json.dll |
+| 128 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Primitives.dll |
+| 129 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Xml.dll |
+| 130 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Security.AccessControl.dll |
+| 131 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Security.Claims.dll |
+| 132 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Security.Cryptography.Algorithms.dll |
+| 133 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Security.Cryptography.Cng.dll |
+| 134 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Security.Cryptography.Csp.dll |
+| 135 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Security.Cryptography.dll |
+| 136 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Security.Cryptography.Encoding.dll |
+| 137 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Security.Cryptography.OpenSsl.dll |
+| 138 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Security.Cryptography.Primitives.dll |
+| 139 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Security.Cryptography.X509Certificates.dll |
+| 140 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Security.dll |
+| 141 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Security.Principal.dll |
+| 142 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Security.Principal.Windows.dll |
+| 143 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Security.SecureString.dll |
+| 144 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.ServiceModel.Web.dll |
+| 145 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.ServiceProcess.dll |
+| 146 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Text.Encoding.CodePages.dll |
+| 147 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Text.Encoding.dll |
+| 148 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Text.Encoding.Extensions.dll |
+| 149 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Text.Encodings.Web.dll |
+| 150 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Text.Json.dll |
+| 151 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Text.RegularExpressions.dll |
+| 152 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Threading.AccessControl.dll |
+| 153 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Threading.Channels.dll |
+| 154 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Threading.dll |
+| 155 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Threading.Overlapped.dll |
+| 156 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Threading.Tasks.Dataflow.dll |
+| 157 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Threading.Tasks.dll |
+| 158 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Threading.Tasks.Extensions.dll |
+| 159 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Threading.Tasks.Parallel.dll |
+| 160 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Threading.Thread.dll |
+| 161 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Threading.ThreadPool.dll |
+| 162 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Threading.Timer.dll |
+| 163 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Transactions.dll |
+| 164 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Transactions.Local.dll |
+| 165 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.ValueTuple.dll |
+| 166 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Web.dll |
+| 167 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Web.HttpUtility.dll |
+| 168 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Windows.dll |
+| 169 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Xml.dll |
+| 170 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Xml.Linq.dll |
+| 171 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Xml.ReaderWriter.dll |
+| 172 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Xml.Serialization.dll |
+| 173 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Xml.XDocument.dll |
+| 174 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Xml.XmlDocument.dll |
+| 175 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Xml.XmlSerializer.dll |
+| 176 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Xml.XPath.dll |
+| 177 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/System.Xml.XPath.XDocument.dll |
+| 178 | /reference:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/ref/net10.0/WindowsBase.dll |
 | 179 | /features:"InterceptorsNamespaces=;Microsoft.Extensions.Validation.Generated" |
 | 180 | /debug+ |
 | 181 | /debug:portable |
@@ -191,15 +191,15 @@
 | 190 | /deterministic+ |
 | 191 | /langversion:14.0 |
 | 192 | /analyzerconfig:obj/Debug/net10.0/test.GeneratedMSBuildEditorConfig.editorconfig |
-| 193 | /analyzerconfig:/usr/share/dotnet/sdk/10.0.100/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_10_default.globalconfig |
-| 194 | /analyzer:/usr/share/dotnet/sdk/10.0.100/Sdks/Microsoft.NET.Sdk/targets/../analyzers/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll |
-| 195 | /analyzer:/usr/share/dotnet/sdk/10.0.100/Sdks/Microsoft.NET.Sdk/targets/../analyzers/Microsoft.CodeAnalysis.NetAnalyzers.dll |
-| 196 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/analyzers/dotnet/cs/Microsoft.Interop.ComInterfaceGenerator.dll |
-| 197 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/analyzers/dotnet/cs/Microsoft.Interop.JavaScript.JSImportGenerator.dll |
-| 198 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/analyzers/dotnet/cs/Microsoft.Interop.LibraryImportGenerator.dll |
-| 199 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/analyzers/dotnet/cs/Microsoft.Interop.SourceGeneration.dll |
-| 200 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.dll |
-| 201 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.0/analyzers/dotnet/cs/System.Text.RegularExpressions.Generator.dll |
+| 193 | /analyzerconfig:/usr/share/dotnet/sdk/10.0.201/Sdks/Microsoft.NET.Sdk/analyzers/build/config/analysislevel_10_default.globalconfig |
+| 194 | /analyzer:/usr/share/dotnet/sdk/10.0.201/Sdks/Microsoft.NET.Sdk/targets/../analyzers/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll |
+| 195 | /analyzer:/usr/share/dotnet/sdk/10.0.201/Sdks/Microsoft.NET.Sdk/targets/../analyzers/Microsoft.CodeAnalysis.NetAnalyzers.dll |
+| 196 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/analyzers/dotnet/cs/Microsoft.Interop.ComInterfaceGenerator.dll |
+| 197 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/analyzers/dotnet/cs/Microsoft.Interop.JavaScript.JSImportGenerator.dll |
+| 198 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/analyzers/dotnet/cs/Microsoft.Interop.LibraryImportGenerator.dll |
+| 199 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/analyzers/dotnet/cs/Microsoft.Interop.SourceGeneration.dll |
+| 200 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.dll |
+| 201 | /analyzer:/usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/10.0.5/analyzers/dotnet/cs/System.Text.RegularExpressions.Generator.dll |
 | 202 | Program.cs |
 | 203 | obj/Debug/net10.0/test.GlobalUsings.g.cs |
 | 204 | obj/Debug/net10.0/.NETCoreApp,Version=v10.0.AssemblyAttributes.cs |
diff --git a/csharp/ql/integration-tests/linux/compiler_args/global.json b/csharp/ql/integration-tests/linux/compiler_args/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/linux/compiler_args/global.json
+++ b/csharp/ql/integration-tests/linux/compiler_args/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/linux/diag_nuget_config_casing/global.json b/csharp/ql/integration-tests/linux/diag_nuget_config_casing/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/linux/diag_nuget_config_casing/global.json
+++ b/csharp/ql/integration-tests/linux/diag_nuget_config_casing/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/linux/standalone_dependencies_non_utf8_filename/global.json b/csharp/ql/integration-tests/linux/standalone_dependencies_non_utf8_filename/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/linux/standalone_dependencies_non_utf8_filename/global.json
+++ b/csharp/ql/integration-tests/linux/standalone_dependencies_non_utf8_filename/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/dotnet_test/global.json b/csharp/ql/integration-tests/posix/dotnet_test/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/posix/dotnet_test/global.json
+++ b/csharp/ql/integration-tests/posix/dotnet_test/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/dotnet_test_mstest/global.json b/csharp/ql/integration-tests/posix/dotnet_test_mstest/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/posix/dotnet_test_mstest/global.json
+++ b/csharp/ql/integration-tests/posix/dotnet_test_mstest/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/inherit-env-vars/global.json b/csharp/ql/integration-tests/posix/inherit-env-vars/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/posix/inherit-env-vars/global.json
+++ b/csharp/ql/integration-tests/posix/inherit-env-vars/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies/Assemblies.expected b/csharp/ql/integration-tests/posix/standalone_dependencies/Assemblies.expected
index 619475882b5..8a3fdeb74b6 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies/Assemblies.expected
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies/Assemblies.expected
@@ -1,170 +1,170 @@
 | test-db/working/packages/avalara.avatax/23.11.0/lib/netstandard2.0/Avalara.AvaTax.RestClient.dll:0:0:0:0 | Avalara.AvaTax.RestClient, Version=0.0.0.0, Culture=neutral, PublicKeyToken=be94eb8ba37fd33c |
 | test-db/working/packages/microsoft.bcl.asyncinterfaces/8.0.0/lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll:0:0:0:0 | Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.DataAnnotations.dll:0:0:0:0 | System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Configuration.dll:0:0:0:0 | System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Console.dll:0:0:0:0 | System.Console, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Core.dll:0:0:0:0 | System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Data.dll:0:0:0:0 | System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Compression.FileSystem.dll:0:0:0:0 | System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.dll:0:0:0:0 | System.IO, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.AsyncEnumerable.dll:0:0:0:0 | System.Linq.AsyncEnumerable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.ServerSentEvents.dll:0:0:0:0 | System.Net.ServerSentEvents, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.dll:0:0:0:0 | System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Numerics.dll:0:0:0:0 | System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.dll:0:0:0:0 | System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.dll:0:0:0:0 | System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ServiceModel.Web.dll:0:0:0:0 | System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ServiceProcess.dll:0:0:0:0 | System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.AccessControl.dll:0:0:0:0 | System.Threading.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Transactions.dll:0:0:0:0 | System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Web.dll:0:0:0:0 | System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Windows.dll:0:0:0:0 | System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.Linq.dll:0:0:0:0 | System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.Serialization.dll:0:0:0:0 | System.Xml.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.dll:0:0:0:0 | System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.dll:0:0:0:0 | System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/mscorlib.dll:0:0:0:0 | mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/netstandard.dll:0:0:0:0 | netstandard, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.DataAnnotations.dll:0:0:0:0 | System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Configuration.dll:0:0:0:0 | System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Console.dll:0:0:0:0 | System.Console, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Core.dll:0:0:0:0 | System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Data.dll:0:0:0:0 | System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Compression.FileSystem.dll:0:0:0:0 | System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.dll:0:0:0:0 | System.IO, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.AsyncEnumerable.dll:0:0:0:0 | System.Linq.AsyncEnumerable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.ServerSentEvents.dll:0:0:0:0 | System.Net.ServerSentEvents, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.dll:0:0:0:0 | System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Numerics.dll:0:0:0:0 | System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.dll:0:0:0:0 | System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.dll:0:0:0:0 | System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ServiceModel.Web.dll:0:0:0:0 | System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ServiceProcess.dll:0:0:0:0 | System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.AccessControl.dll:0:0:0:0 | System.Threading.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Transactions.dll:0:0:0:0 | System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Web.dll:0:0:0:0 | System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Windows.dll:0:0:0:0 | System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.Linq.dll:0:0:0:0 | System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.Serialization.dll:0:0:0:0 | System.Xml.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.dll:0:0:0:0 | System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.dll:0:0:0:0 | System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/mscorlib.dll:0:0:0:0 | mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/netstandard.dll:0:0:0:0 | netstandard, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
 | test-db/working/packages/newtonsoft.json/12.0.1/lib/netstandard2.0/Newtonsoft.Json.dll:0:0:0:0 | Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed |
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies/global.json
index 376af49c07f..ce67766bbb5 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies/global.json
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "10.0.100"
+    "version": "10.0.201"
   }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/Assemblies.expected b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/Assemblies.expected
index 619475882b5..8a3fdeb74b6 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/Assemblies.expected
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/Assemblies.expected
@@ -1,170 +1,170 @@
 | test-db/working/packages/avalara.avatax/23.11.0/lib/netstandard2.0/Avalara.AvaTax.RestClient.dll:0:0:0:0 | Avalara.AvaTax.RestClient, Version=0.0.0.0, Culture=neutral, PublicKeyToken=be94eb8ba37fd33c |
 | test-db/working/packages/microsoft.bcl.asyncinterfaces/8.0.0/lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll:0:0:0:0 | Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.DataAnnotations.dll:0:0:0:0 | System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Configuration.dll:0:0:0:0 | System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Console.dll:0:0:0:0 | System.Console, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Core.dll:0:0:0:0 | System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Data.dll:0:0:0:0 | System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Compression.FileSystem.dll:0:0:0:0 | System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.dll:0:0:0:0 | System.IO, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.AsyncEnumerable.dll:0:0:0:0 | System.Linq.AsyncEnumerable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.ServerSentEvents.dll:0:0:0:0 | System.Net.ServerSentEvents, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.dll:0:0:0:0 | System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Numerics.dll:0:0:0:0 | System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.dll:0:0:0:0 | System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.dll:0:0:0:0 | System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ServiceModel.Web.dll:0:0:0:0 | System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ServiceProcess.dll:0:0:0:0 | System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.AccessControl.dll:0:0:0:0 | System.Threading.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Transactions.dll:0:0:0:0 | System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Web.dll:0:0:0:0 | System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Windows.dll:0:0:0:0 | System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.Linq.dll:0:0:0:0 | System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.Serialization.dll:0:0:0:0 | System.Xml.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.dll:0:0:0:0 | System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.dll:0:0:0:0 | System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/mscorlib.dll:0:0:0:0 | mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/netstandard.dll:0:0:0:0 | netstandard, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.DataAnnotations.dll:0:0:0:0 | System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Configuration.dll:0:0:0:0 | System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Console.dll:0:0:0:0 | System.Console, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Core.dll:0:0:0:0 | System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Data.dll:0:0:0:0 | System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Compression.FileSystem.dll:0:0:0:0 | System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.dll:0:0:0:0 | System.IO, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.AsyncEnumerable.dll:0:0:0:0 | System.Linq.AsyncEnumerable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.ServerSentEvents.dll:0:0:0:0 | System.Net.ServerSentEvents, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.dll:0:0:0:0 | System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Numerics.dll:0:0:0:0 | System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.dll:0:0:0:0 | System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.dll:0:0:0:0 | System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ServiceModel.Web.dll:0:0:0:0 | System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ServiceProcess.dll:0:0:0:0 | System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.AccessControl.dll:0:0:0:0 | System.Threading.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Transactions.dll:0:0:0:0 | System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Web.dll:0:0:0:0 | System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Windows.dll:0:0:0:0 | System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.Linq.dll:0:0:0:0 | System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.Serialization.dll:0:0:0:0 | System.Xml.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.dll:0:0:0:0 | System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.dll:0:0:0:0 | System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/mscorlib.dll:0:0:0:0 | mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/netstandard.dll:0:0:0:0 | netstandard, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
 | test-db/working/packages/newtonsoft.json/12.0.1/lib/netstandard2.0/Newtonsoft.Json.dll:0:0:0:0 | Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed |
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/global.json
index 376af49c07f..ce67766bbb5 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/global.json
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_project/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "10.0.100"
+    "version": "10.0.201"
   }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/Assemblies.expected b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/Assemblies.expected
index 7e3b8f6e453..c3861c7a846 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/Assemblies.expected
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/Assemblies.expected
@@ -1,167 +1,167 @@
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.DataAnnotations.dll:0:0:0:0 | System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Configuration.dll:0:0:0:0 | System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Console.dll:0:0:0:0 | System.Console, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Core.dll:0:0:0:0 | System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Data.dll:0:0:0:0 | System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Compression.FileSystem.dll:0:0:0:0 | System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.dll:0:0:0:0 | System.IO, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.AsyncEnumerable.dll:0:0:0:0 | System.Linq.AsyncEnumerable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.ServerSentEvents.dll:0:0:0:0 | System.Net.ServerSentEvents, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.dll:0:0:0:0 | System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Numerics.dll:0:0:0:0 | System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.dll:0:0:0:0 | System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.dll:0:0:0:0 | System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ServiceModel.Web.dll:0:0:0:0 | System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ServiceProcess.dll:0:0:0:0 | System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.AccessControl.dll:0:0:0:0 | System.Threading.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Transactions.dll:0:0:0:0 | System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Web.dll:0:0:0:0 | System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Windows.dll:0:0:0:0 | System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.Linq.dll:0:0:0:0 | System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.Serialization.dll:0:0:0:0 | System.Xml.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.dll:0:0:0:0 | System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.dll:0:0:0:0 | System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/mscorlib.dll:0:0:0:0 | mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/netstandard.dll:0:0:0:0 | netstandard, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.DataAnnotations.dll:0:0:0:0 | System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Configuration.dll:0:0:0:0 | System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Console.dll:0:0:0:0 | System.Console, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Core.dll:0:0:0:0 | System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Data.dll:0:0:0:0 | System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Compression.FileSystem.dll:0:0:0:0 | System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.dll:0:0:0:0 | System.IO, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.AsyncEnumerable.dll:0:0:0:0 | System.Linq.AsyncEnumerable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.ServerSentEvents.dll:0:0:0:0 | System.Net.ServerSentEvents, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.dll:0:0:0:0 | System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Numerics.dll:0:0:0:0 | System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.dll:0:0:0:0 | System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.dll:0:0:0:0 | System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ServiceModel.Web.dll:0:0:0:0 | System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ServiceProcess.dll:0:0:0:0 | System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.AccessControl.dll:0:0:0:0 | System.Threading.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Transactions.dll:0:0:0:0 | System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Web.dll:0:0:0:0 | System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Windows.dll:0:0:0:0 | System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.Linq.dll:0:0:0:0 | System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.Serialization.dll:0:0:0:0 | System.Xml.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.dll:0:0:0:0 | System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.dll:0:0:0:0 | System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/mscorlib.dll:0:0:0:0 | mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/netstandard.dll:0:0:0:0 | netstandard, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/global.json
index 376af49c07f..ce67766bbb5 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/global.json
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_multi_target/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "10.0.100"
+    "version": "10.0.201"
   }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_no_framework/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_no_framework/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_no_framework/global.json
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_no_framework/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget with_space/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget with_space/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget with_space/global.json	
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget with_space/global.json	
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget/global.json
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/global.json
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/global.json
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_error_timeout/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/global.json
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_config_fallback/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_no_sources/proj/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_no_sources/proj/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_no_sources/proj/global.json
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_no_sources/proj/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_versions/global.json b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_versions/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_versions/global.json
+++ b/csharp/ql/integration-tests/posix/standalone_dependencies_nuget_versions/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/posix/warn_as_error/global.json b/csharp/ql/integration-tests/posix/warn_as_error/global.json
index 481e95ec7be..ed604974070 100644
--- a/csharp/ql/integration-tests/posix/warn_as_error/global.json
+++ b/csharp/ql/integration-tests/posix/warn_as_error/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "10.0.100"
+        "version": "10.0.201"
     }
 }
diff --git a/csharp/ql/integration-tests/windows/standalone_dependencies/Assemblies.expected b/csharp/ql/integration-tests/windows/standalone_dependencies/Assemblies.expected
index 90a2806afe5..c4532a2d554 100644
--- a/csharp/ql/integration-tests/windows/standalone_dependencies/Assemblies.expected
+++ b/csharp/ql/integration-tests/windows/standalone_dependencies/Assemblies.expected
@@ -1,217 +1,217 @@
 | test-db/working/packages/avalara.avatax/23.11.0/lib/netstandard2.0/Avalara.AvaTax.RestClient.dll:0:0:0:0 | Avalara.AvaTax.RestClient, Version=0.0.0.0, Culture=neutral, PublicKeyToken=be94eb8ba37fd33c |
 | test-db/working/packages/microsoft.bcl.asyncinterfaces/8.0.0/lib/netstandard2.1/Microsoft.Bcl.AsyncInterfaces.dll:0:0:0:0 | Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.DataAnnotations.dll:0:0:0:0 | System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Configuration.dll:0:0:0:0 | System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Console.dll:0:0:0:0 | System.Console, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Core.dll:0:0:0:0 | System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Data.dll:0:0:0:0 | System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Compression.FileSystem.dll:0:0:0:0 | System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.IO.dll:0:0:0:0 | System.IO, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.AsyncEnumerable.dll:0:0:0:0 | System.Linq.AsyncEnumerable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.ServerSentEvents.dll:0:0:0:0 | System.Net.ServerSentEvents, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Net.dll:0:0:0:0 | System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Numerics.dll:0:0:0:0 | System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.Serialization.dll:0:0:0:0 | System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Security.dll:0:0:0:0 | System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ServiceModel.Web.dll:0:0:0:0 | System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ServiceProcess.dll:0:0:0:0 | System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.AccessControl.dll:0:0:0:0 | System.Threading.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Transactions.dll:0:0:0:0 | System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Web.dll:0:0:0:0 | System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Windows.dll:0:0:0:0 | System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.Linq.dll:0:0:0:0 | System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.Serialization.dll:0:0:0:0 | System.Xml.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.Xml.dll:0:0:0:0 | System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/System.dll:0:0:0:0 | System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/mscorlib.dll:0:0:0:0 | mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.netcore.app.ref/10.0.0/ref/net10.0/netstandard.dll:0:0:0:0 | netstandard, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/Accessibility.dll:0:0:0:0 | Accessibility, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/Microsoft.VisualBasic.Forms.dll:0:0:0:0 | Microsoft.VisualBasic.Forms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/Microsoft.Win32.Registry.AccessControl.dll:0:0:0:0 | Microsoft.Win32.Registry.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/Microsoft.Win32.SystemEvents.dll:0:0:0:0 | Microsoft.Win32.SystemEvents, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/PresentationCore.dll:0:0:0:0 | PresentationCore, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/PresentationFramework.Aero2.dll:0:0:0:0 | PresentationFramework.Aero2, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/PresentationFramework.Aero.dll:0:0:0:0 | PresentationFramework.Aero, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/PresentationFramework.AeroLite.dll:0:0:0:0 | PresentationFramework.AeroLite, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/PresentationFramework.Classic.dll:0:0:0:0 | PresentationFramework.Classic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/PresentationFramework.Luna.dll:0:0:0:0 | PresentationFramework.Luna, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/PresentationFramework.Royale.dll:0:0:0:0 | PresentationFramework.Royale, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/PresentationFramework.dll:0:0:0:0 | PresentationFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/PresentationUI.dll:0:0:0:0 | PresentationUI, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/ReachFramework.dll:0:0:0:0 | ReachFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.CodeDom.dll:0:0:0:0 | System.CodeDom, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Configuration.ConfigurationManager.dll:0:0:0:0 | System.Configuration.ConfigurationManager, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Design.dll:0:0:0:0 | System.Design, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Diagnostics.EventLog.dll:0:0:0:0 | System.Diagnostics.EventLog, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Diagnostics.PerformanceCounter.dll:0:0:0:0 | System.Diagnostics.PerformanceCounter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.DirectoryServices.dll:0:0:0:0 | System.DirectoryServices, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Drawing.Common.dll:0:0:0:0 | System.Drawing.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Drawing.Design.dll:0:0:0:0 | System.Drawing.Design, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Formats.Nrbf.dll:0:0:0:0 | System.Formats.Nrbf, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.IO.Packaging.dll:0:0:0:0 | System.IO.Packaging, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Printing.dll:0:0:0:0 | System.Printing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Private.Windows.Core.dll:0:0:0:0 | System.Private.Windows.Core, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Private.Windows.GdiPlus.dll:0:0:0:0 | System.Private.Windows.GdiPlus, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Resources.Extensions.dll:0:0:0:0 | System.Resources.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Pkcs.dll:0:0:0:0 | System.Security.Cryptography.Pkcs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.ProtectedData.dll:0:0:0:0 | System.Security.Cryptography.ProtectedData, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Security.Cryptography.Xml.dll:0:0:0:0 | System.Security.Cryptography.Xml, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Security.Permissions.dll:0:0:0:0 | System.Security.Permissions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Windows.Controls.Ribbon.dll:0:0:0:0 | System.Windows.Controls.Ribbon, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Windows.Extensions.dll:0:0:0:0 | System.Windows.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Windows.Forms.Design.Editors.dll:0:0:0:0 | System.Windows.Forms.Design.Editors, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Windows.Forms.Design.dll:0:0:0:0 | System.Windows.Forms.Design, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Windows.Forms.Primitives.dll:0:0:0:0 | System.Windows.Forms.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Windows.Forms.dll:0:0:0:0 | System.Windows.Forms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Windows.Input.Manipulations.dll:0:0:0:0 | System.Windows.Input.Manipulations, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Windows.Presentation.dll:0:0:0:0 | System.Windows.Presentation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Windows.Primitives.dll:0:0:0:0 | System.Windows.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/System.Xaml.dll:0:0:0:0 | System.Xaml, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/UIAutomationClient.dll:0:0:0:0 | UIAutomationClient, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/UIAutomationClientSideProviders.dll:0:0:0:0 | UIAutomationClientSideProviders, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/UIAutomationProvider.dll:0:0:0:0 | UIAutomationProvider, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/UIAutomationTypes.dll:0:0:0:0 | UIAutomationTypes, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
-| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.0/ref/net10.0/WindowsFormsIntegration.dll:0:0:0:0 | WindowsFormsIntegration, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.CSharp.dll:0:0:0:0 | Microsoft.CSharp, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.VisualBasic.Core.dll:0:0:0:0 | Microsoft.VisualBasic.Core, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.Win32.Primitives.dll:0:0:0:0 | Microsoft.Win32.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/Microsoft.Win32.Registry.dll:0:0:0:0 | Microsoft.Win32.Registry, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.AppContext.dll:0:0:0:0 | System.AppContext, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Buffers.dll:0:0:0:0 | System.Buffers, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.Concurrent.dll:0:0:0:0 | System.Collections.Concurrent, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.Immutable.dll:0:0:0:0 | System.Collections.Immutable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.NonGeneric.dll:0:0:0:0 | System.Collections.NonGeneric, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.Specialized.dll:0:0:0:0 | System.Collections.Specialized, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Collections.dll:0:0:0:0 | System.Collections, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.Annotations.dll:0:0:0:0 | System.ComponentModel.Annotations, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.DataAnnotations.dll:0:0:0:0 | System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.EventBasedAsync.dll:0:0:0:0 | System.ComponentModel.EventBasedAsync, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.Primitives.dll:0:0:0:0 | System.ComponentModel.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.TypeConverter.dll:0:0:0:0 | System.ComponentModel.TypeConverter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ComponentModel.dll:0:0:0:0 | System.ComponentModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Configuration.dll:0:0:0:0 | System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Console.dll:0:0:0:0 | System.Console, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Core.dll:0:0:0:0 | System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Data.Common.dll:0:0:0:0 | System.Data.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Data.DataSetExtensions.dll:0:0:0:0 | System.Data.DataSetExtensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Data.dll:0:0:0:0 | System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Contracts.dll:0:0:0:0 | System.Diagnostics.Contracts, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Debug.dll:0:0:0:0 | System.Diagnostics.Debug, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.DiagnosticSource.dll:0:0:0:0 | System.Diagnostics.DiagnosticSource, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.FileVersionInfo.dll:0:0:0:0 | System.Diagnostics.FileVersionInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Process.dll:0:0:0:0 | System.Diagnostics.Process, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.StackTrace.dll:0:0:0:0 | System.Diagnostics.StackTrace, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.TextWriterTraceListener.dll:0:0:0:0 | System.Diagnostics.TextWriterTraceListener, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Tools.dll:0:0:0:0 | System.Diagnostics.Tools, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.TraceSource.dll:0:0:0:0 | System.Diagnostics.TraceSource, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Diagnostics.Tracing.dll:0:0:0:0 | System.Diagnostics.Tracing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Drawing.Primitives.dll:0:0:0:0 | System.Drawing.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Dynamic.Runtime.dll:0:0:0:0 | System.Dynamic.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Formats.Asn1.dll:0:0:0:0 | System.Formats.Asn1, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Formats.Tar.dll:0:0:0:0 | System.Formats.Tar, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Globalization.Calendars.dll:0:0:0:0 | System.Globalization.Calendars, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Globalization.Extensions.dll:0:0:0:0 | System.Globalization.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Globalization.dll:0:0:0:0 | System.Globalization, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Compression.Brotli.dll:0:0:0:0 | System.IO.Compression.Brotli, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Compression.FileSystem.dll:0:0:0:0 | System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Compression.ZipFile.dll:0:0:0:0 | System.IO.Compression.ZipFile, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Compression.dll:0:0:0:0 | System.IO.Compression, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.AccessControl.dll:0:0:0:0 | System.IO.FileSystem.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.DriveInfo.dll:0:0:0:0 | System.IO.FileSystem.DriveInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.Primitives.dll:0:0:0:0 | System.IO.FileSystem.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.Watcher.dll:0:0:0:0 | System.IO.FileSystem.Watcher, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.FileSystem.dll:0:0:0:0 | System.IO.FileSystem, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.IsolatedStorage.dll:0:0:0:0 | System.IO.IsolatedStorage, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.MemoryMappedFiles.dll:0:0:0:0 | System.IO.MemoryMappedFiles, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Pipelines.dll:0:0:0:0 | System.IO.Pipelines, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Pipes.AccessControl.dll:0:0:0:0 | System.IO.Pipes.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.Pipes.dll:0:0:0:0 | System.IO.Pipes, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.UnmanagedMemoryStream.dll:0:0:0:0 | System.IO.UnmanagedMemoryStream, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.IO.dll:0:0:0:0 | System.IO, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.AsyncEnumerable.dll:0:0:0:0 | System.Linq.AsyncEnumerable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.Expressions.dll:0:0:0:0 | System.Linq.Expressions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.Parallel.dll:0:0:0:0 | System.Linq.Parallel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.Queryable.dll:0:0:0:0 | System.Linq.Queryable, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Linq.dll:0:0:0:0 | System.Linq, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Memory.dll:0:0:0:0 | System.Memory, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Http.Json.dll:0:0:0:0 | System.Net.Http.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Http.dll:0:0:0:0 | System.Net.Http, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.HttpListener.dll:0:0:0:0 | System.Net.HttpListener, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Mail.dll:0:0:0:0 | System.Net.Mail, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.NameResolution.dll:0:0:0:0 | System.Net.NameResolution, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.NetworkInformation.dll:0:0:0:0 | System.Net.NetworkInformation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Ping.dll:0:0:0:0 | System.Net.Ping, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Primitives.dll:0:0:0:0 | System.Net.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Quic.dll:0:0:0:0 | System.Net.Quic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Requests.dll:0:0:0:0 | System.Net.Requests, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Security.dll:0:0:0:0 | System.Net.Security, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.ServerSentEvents.dll:0:0:0:0 | System.Net.ServerSentEvents, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.ServicePoint.dll:0:0:0:0 | System.Net.ServicePoint, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.Sockets.dll:0:0:0:0 | System.Net.Sockets, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebClient.dll:0:0:0:0 | System.Net.WebClient, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebHeaderCollection.dll:0:0:0:0 | System.Net.WebHeaderCollection, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebProxy.dll:0:0:0:0 | System.Net.WebProxy, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebSockets.Client.dll:0:0:0:0 | System.Net.WebSockets.Client, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.WebSockets.dll:0:0:0:0 | System.Net.WebSockets, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Net.dll:0:0:0:0 | System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Numerics.Vectors.dll:0:0:0:0 | System.Numerics.Vectors, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Numerics.dll:0:0:0:0 | System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ObjectModel.dll:0:0:0:0 | System.ObjectModel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.DispatchProxy.dll:0:0:0:0 | System.Reflection.DispatchProxy, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Emit.ILGeneration.dll:0:0:0:0 | System.Reflection.Emit.ILGeneration, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Emit.Lightweight.dll:0:0:0:0 | System.Reflection.Emit.Lightweight, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Emit.dll:0:0:0:0 | System.Reflection.Emit, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Extensions.dll:0:0:0:0 | System.Reflection.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Metadata.dll:0:0:0:0 | System.Reflection.Metadata, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.Primitives.dll:0:0:0:0 | System.Reflection.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.TypeExtensions.dll:0:0:0:0 | System.Reflection.TypeExtensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Reflection.dll:0:0:0:0 | System.Reflection, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Resources.Reader.dll:0:0:0:0 | System.Resources.Reader, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Resources.ResourceManager.dll:0:0:0:0 | System.Resources.ResourceManager, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Resources.Writer.dll:0:0:0:0 | System.Resources.Writer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.CompilerServices.Unsafe.dll:0:0:0:0 | System.Runtime.CompilerServices.Unsafe, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.CompilerServices.VisualC.dll:0:0:0:0 | System.Runtime.CompilerServices.VisualC, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Extensions.dll:0:0:0:0 | System.Runtime.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Handles.dll:0:0:0:0 | System.Runtime.Handles, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.InteropServices.JavaScript.dll:0:0:0:0 | System.Runtime.InteropServices.JavaScript, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.InteropServices.RuntimeInformation.dll:0:0:0:0 | System.Runtime.InteropServices.RuntimeInformation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.InteropServices.dll:0:0:0:0 | System.Runtime.InteropServices, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Intrinsics.dll:0:0:0:0 | System.Runtime.Intrinsics, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Loader.dll:0:0:0:0 | System.Runtime.Loader, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Numerics.dll:0:0:0:0 | System.Runtime.Numerics, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Formatters.dll:0:0:0:0 | System.Runtime.Serialization.Formatters, Version=8.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Json.dll:0:0:0:0 | System.Runtime.Serialization.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Primitives.dll:0:0:0:0 | System.Runtime.Serialization.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.Xml.dll:0:0:0:0 | System.Runtime.Serialization.Xml, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.Serialization.dll:0:0:0:0 | System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Runtime.dll:0:0:0:0 | System.Runtime, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.AccessControl.dll:0:0:0:0 | System.Security.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Claims.dll:0:0:0:0 | System.Security.Claims, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Algorithms.dll:0:0:0:0 | System.Security.Cryptography.Algorithms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Cng.dll:0:0:0:0 | System.Security.Cryptography.Cng, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Csp.dll:0:0:0:0 | System.Security.Cryptography.Csp, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Encoding.dll:0:0:0:0 | System.Security.Cryptography.Encoding, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.OpenSsl.dll:0:0:0:0 | System.Security.Cryptography.OpenSsl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Primitives.dll:0:0:0:0 | System.Security.Cryptography.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.X509Certificates.dll:0:0:0:0 | System.Security.Cryptography.X509Certificates, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.dll:0:0:0:0 | System.Security.Cryptography, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Principal.Windows.dll:0:0:0:0 | System.Security.Principal.Windows, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.Principal.dll:0:0:0:0 | System.Security.Principal, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.SecureString.dll:0:0:0:0 | System.Security.SecureString, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Security.dll:0:0:0:0 | System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ServiceModel.Web.dll:0:0:0:0 | System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ServiceProcess.dll:0:0:0:0 | System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Encoding.CodePages.dll:0:0:0:0 | System.Text.Encoding.CodePages, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Encoding.Extensions.dll:0:0:0:0 | System.Text.Encoding.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Encoding.dll:0:0:0:0 | System.Text.Encoding, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Encodings.Web.dll:0:0:0:0 | System.Text.Encodings.Web, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.Json.dll:0:0:0:0 | System.Text.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Text.RegularExpressions.dll:0:0:0:0 | System.Text.RegularExpressions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.AccessControl.dll:0:0:0:0 | System.Threading.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Channels.dll:0:0:0:0 | System.Threading.Channels, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Overlapped.dll:0:0:0:0 | System.Threading.Overlapped, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Tasks.Dataflow.dll:0:0:0:0 | System.Threading.Tasks.Dataflow, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Tasks.Extensions.dll:0:0:0:0 | System.Threading.Tasks.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Tasks.Parallel.dll:0:0:0:0 | System.Threading.Tasks.Parallel, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Tasks.dll:0:0:0:0 | System.Threading.Tasks, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Thread.dll:0:0:0:0 | System.Threading.Thread, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.ThreadPool.dll:0:0:0:0 | System.Threading.ThreadPool, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.Timer.dll:0:0:0:0 | System.Threading.Timer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Threading.dll:0:0:0:0 | System.Threading, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Transactions.Local.dll:0:0:0:0 | System.Transactions.Local, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Transactions.dll:0:0:0:0 | System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.ValueTuple.dll:0:0:0:0 | System.ValueTuple, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Web.HttpUtility.dll:0:0:0:0 | System.Web.HttpUtility, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Web.dll:0:0:0:0 | System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Windows.dll:0:0:0:0 | System.Windows, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.Linq.dll:0:0:0:0 | System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.ReaderWriter.dll:0:0:0:0 | System.Xml.ReaderWriter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.Serialization.dll:0:0:0:0 | System.Xml.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XDocument.dll:0:0:0:0 | System.Xml.XDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XPath.XDocument.dll:0:0:0:0 | System.Xml.XPath.XDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XPath.dll:0:0:0:0 | System.Xml.XPath, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XmlDocument.dll:0:0:0:0 | System.Xml.XmlDocument, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.XmlSerializer.dll:0:0:0:0 | System.Xml.XmlSerializer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.Xml.dll:0:0:0:0 | System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/System.dll:0:0:0:0 | System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/mscorlib.dll:0:0:0:0 | mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.netcore.app.ref/10.0.5/ref/net10.0/netstandard.dll:0:0:0:0 | netstandard, Version=2.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/Accessibility.dll:0:0:0:0 | Accessibility, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/Microsoft.VisualBasic.Forms.dll:0:0:0:0 | Microsoft.VisualBasic.Forms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/Microsoft.VisualBasic.dll:0:0:0:0 | Microsoft.VisualBasic, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/Microsoft.Win32.Registry.AccessControl.dll:0:0:0:0 | Microsoft.Win32.Registry.AccessControl, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/Microsoft.Win32.SystemEvents.dll:0:0:0:0 | Microsoft.Win32.SystemEvents, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/PresentationCore.dll:0:0:0:0 | PresentationCore, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/PresentationFramework.Aero2.dll:0:0:0:0 | PresentationFramework.Aero2, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/PresentationFramework.Aero.dll:0:0:0:0 | PresentationFramework.Aero, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/PresentationFramework.AeroLite.dll:0:0:0:0 | PresentationFramework.AeroLite, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/PresentationFramework.Classic.dll:0:0:0:0 | PresentationFramework.Classic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/PresentationFramework.Luna.dll:0:0:0:0 | PresentationFramework.Luna, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/PresentationFramework.Royale.dll:0:0:0:0 | PresentationFramework.Royale, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/PresentationFramework.dll:0:0:0:0 | PresentationFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/PresentationUI.dll:0:0:0:0 | PresentationUI, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/ReachFramework.dll:0:0:0:0 | ReachFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.CodeDom.dll:0:0:0:0 | System.CodeDom, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Configuration.ConfigurationManager.dll:0:0:0:0 | System.Configuration.ConfigurationManager, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Design.dll:0:0:0:0 | System.Design, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Diagnostics.EventLog.dll:0:0:0:0 | System.Diagnostics.EventLog, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Diagnostics.PerformanceCounter.dll:0:0:0:0 | System.Diagnostics.PerformanceCounter, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.DirectoryServices.dll:0:0:0:0 | System.DirectoryServices, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Drawing.Common.dll:0:0:0:0 | System.Drawing.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Drawing.Design.dll:0:0:0:0 | System.Drawing.Design, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Drawing.dll:0:0:0:0 | System.Drawing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Formats.Nrbf.dll:0:0:0:0 | System.Formats.Nrbf, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.IO.Packaging.dll:0:0:0:0 | System.IO.Packaging, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Printing.dll:0:0:0:0 | System.Printing, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Private.Windows.Core.dll:0:0:0:0 | System.Private.Windows.Core, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Private.Windows.GdiPlus.dll:0:0:0:0 | System.Private.Windows.GdiPlus, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Resources.Extensions.dll:0:0:0:0 | System.Resources.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Pkcs.dll:0:0:0:0 | System.Security.Cryptography.Pkcs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.ProtectedData.dll:0:0:0:0 | System.Security.Cryptography.ProtectedData, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Security.Cryptography.Xml.dll:0:0:0:0 | System.Security.Cryptography.Xml, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Security.Permissions.dll:0:0:0:0 | System.Security.Permissions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Windows.Controls.Ribbon.dll:0:0:0:0 | System.Windows.Controls.Ribbon, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Windows.Extensions.dll:0:0:0:0 | System.Windows.Extensions, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Windows.Forms.Design.Editors.dll:0:0:0:0 | System.Windows.Forms.Design.Editors, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Windows.Forms.Design.dll:0:0:0:0 | System.Windows.Forms.Design, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Windows.Forms.Primitives.dll:0:0:0:0 | System.Windows.Forms.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Windows.Forms.dll:0:0:0:0 | System.Windows.Forms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Windows.Input.Manipulations.dll:0:0:0:0 | System.Windows.Input.Manipulations, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Windows.Presentation.dll:0:0:0:0 | System.Windows.Presentation, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Windows.Primitives.dll:0:0:0:0 | System.Windows.Primitives, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/System.Xaml.dll:0:0:0:0 | System.Xaml, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/UIAutomationClient.dll:0:0:0:0 | UIAutomationClient, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/UIAutomationClientSideProviders.dll:0:0:0:0 | UIAutomationClientSideProviders, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/UIAutomationProvider.dll:0:0:0:0 | UIAutomationProvider, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/UIAutomationTypes.dll:0:0:0:0 | UIAutomationTypes, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/WindowsBase.dll:0:0:0:0 | WindowsBase, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
+| test-db/working/packages/microsoft.windowsdesktop.app.ref/10.0.5/ref/net10.0/WindowsFormsIntegration.dll:0:0:0:0 | WindowsFormsIntegration, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35 |
 | test-db/working/packages/newtonsoft.json/12.0.1/lib/netstandard2.0/Newtonsoft.Json.dll:0:0:0:0 | Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed |
diff --git a/csharp/ql/integration-tests/windows/standalone_dependencies/global.json b/csharp/ql/integration-tests/windows/standalone_dependencies/global.json
index 376af49c07f..ce67766bbb5 100644
--- a/csharp/ql/integration-tests/windows/standalone_dependencies/global.json
+++ b/csharp/ql/integration-tests/windows/standalone_dependencies/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "10.0.100"
+    "version": "10.0.201"
   }
 }
diff --git a/csharp/ql/lib/CHANGELOG.md b/csharp/ql/lib/CHANGELOG.md
index 21b19c8a09a..695a5611d94 100644
--- a/csharp/ql/lib/CHANGELOG.md
+++ b/csharp/ql/lib/CHANGELOG.md
@@ -1,3 +1,24 @@
+## 5.4.9
+
+### Minor Analysis Improvements
+
+* Inline expectations test comments, which are of the form `// $ tag` or `// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the `$` symbol.
+* Added `System.Net.WebSockets::ReceiveAsync` as a remote flow source.
+* Added reverse taint flow from implicit conversion operator calls to their arguments.
+* Added post-update nodes for struct-type arguments, allowing data flow out of method calls via those arguments.
+* C# 14: Added support for partial constructors.
+
+## 5.4.8
+
+### Minor Analysis Improvements
+
+* C# 14: Added support for partial events.
+* C# 14: Added support for the `field` keyword in properties.
+
+### Bug Fixes
+
+* Fixed an issue where the body of a partial member could be extracted twice. When both a *defining* and an *implementing* declaration exist, only the *implementing* declaration is now extracted.
+
 ## 5.4.7
 
 ### Minor Analysis Improvements
diff --git a/csharp/ql/lib/change-notes/2026-02-12-field-keyword.md b/csharp/ql/lib/change-notes/2026-02-12-field-keyword.md
deleted file mode 100644
index 7ca6548b27f..00000000000
--- a/csharp/ql/lib/change-notes/2026-02-12-field-keyword.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* C# 14: Added support for the `field` keyword in properties.
diff --git a/csharp/ql/lib/change-notes/2026-02-16-partial-events.md b/csharp/ql/lib/change-notes/2026-02-16-partial-events.md
deleted file mode 100644
index 3bbc1ae829a..00000000000
--- a/csharp/ql/lib/change-notes/2026-02-16-partial-events.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* C# 14: Added support for partial events.
diff --git a/csharp/ql/lib/change-notes/2026-03-19-fix-log-forging-extension-methods.md b/csharp/ql/lib/change-notes/2026-03-19-fix-log-forging-extension-methods.md
new file mode 100644
index 00000000000..65ce217b105
--- /dev/null
+++ b/csharp/ql/lib/change-notes/2026-03-19-fix-log-forging-extension-methods.md
@@ -0,0 +1,7 @@
+---
+category: minorAnalysis
+---
+* The `cs/log-forging` query no longer treats arguments to extension methods with
+  source code on `ILogger` types as sinks. Instead, taint is tracked interprocedurally
+  through extension method bodies, reducing false positives when extension methods
+  sanitize input internally.
diff --git a/csharp/ql/lib/change-notes/2026-03-26-expanded-assignments.md b/csharp/ql/lib/change-notes/2026-03-26-expanded-assignments.md
new file mode 100644
index 00000000000..159ab1ee3c6
--- /dev/null
+++ b/csharp/ql/lib/change-notes/2026-03-26-expanded-assignments.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The extractor no longer synthesizes expanded forms of compound assignments. This may have a small impact on the results of queries that explicitly or implicitly rely on the expanded form of compound assignments.
diff --git a/csharp/ql/lib/change-notes/released/5.4.8.md b/csharp/ql/lib/change-notes/released/5.4.8.md
new file mode 100644
index 00000000000..57a2d8f0830
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/5.4.8.md
@@ -0,0 +1,10 @@
+## 5.4.8
+
+### Minor Analysis Improvements
+
+* C# 14: Added support for partial events.
+* C# 14: Added support for the `field` keyword in properties.
+
+### Bug Fixes
+
+* Fixed an issue where the body of a partial member could be extracted twice. When both a *defining* and an *implementing* declaration exist, only the *implementing* declaration is now extracted.
diff --git a/csharp/ql/lib/change-notes/released/5.4.9.md b/csharp/ql/lib/change-notes/released/5.4.9.md
new file mode 100644
index 00000000000..00b802f5aba
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/5.4.9.md
@@ -0,0 +1,9 @@
+## 5.4.9
+
+### Minor Analysis Improvements
+
+* Inline expectations test comments, which are of the form `// $ tag` or `// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the `$` symbol.
+* Added `System.Net.WebSockets::ReceiveAsync` as a remote flow source.
+* Added reverse taint flow from implicit conversion operator calls to their arguments.
+* Added post-update nodes for struct-type arguments, allowing data flow out of method calls via those arguments.
+* C# 14: Added support for partial constructors.
diff --git a/csharp/ql/lib/codeql-pack.release.yml b/csharp/ql/lib/codeql-pack.release.yml
index 4db516ab415..b33412cd939 100644
--- a/csharp/ql/lib/codeql-pack.release.yml
+++ b/csharp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 5.4.7
+lastReleaseVersion: 5.4.9
diff --git a/csharp/ql/lib/experimental/code/csharp/Cryptography/NonCryptographicHashes.qll b/csharp/ql/lib/experimental/code/csharp/Cryptography/NonCryptographicHashes.qll
index 49dd011658d..b09251cf6e4 100644
--- a/csharp/ql/lib/experimental/code/csharp/Cryptography/NonCryptographicHashes.qll
+++ b/csharp/ql/lib/experimental/code/csharp/Cryptography/NonCryptographicHashes.qll
@@ -48,7 +48,7 @@ private predicate maybeUsedInElfHashFunction(Variable v, Operation xor, Operatio
     Expr e1, Expr e2, AssignExpr addAssign, AssignExpr xorAssign, Operation notOp,
     AssignExpr notAssign
   |
-    (add instanceof AddExpr or add instanceof AssignAddExpr) and
+    add instanceof AddOperation and
     e1.getAChild*() = add.getAnOperand() and
     e1 instanceof BinaryBitwiseOperation and
     e2 = e1.(BinaryBitwiseOperation).getLeftOperand() and
diff --git a/csharp/ql/lib/ext/System.Net.WebSockets.model.yml b/csharp/ql/lib/ext/System.Net.WebSockets.model.yml
new file mode 100644
index 00000000000..23a14504a57
--- /dev/null
+++ b/csharp/ql/lib/ext/System.Net.WebSockets.model.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: codeql/csharp-all
+      extensible: sourceModel
+    data:
+      - ["System.Net.WebSockets", "WebSocket", True, "ReceiveAsync", "", "", "Argument[0]", "remote", "manual"]
diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml
index 30f75e74304..0153dbbfb30 100644
--- a/csharp/ql/lib/qlpack.yml
+++ b/csharp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-all
-version: 5.4.8-dev
+version: 5.4.10-dev
 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 3c7170a6f84..a0e575218ad 100644
--- a/csharp/ql/lib/semmle/code/csharp/Assignable.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Assignable.qll
@@ -78,6 +78,8 @@ class AssignableRead extends AssignableAccess {
       this.isRefArgument()
       or
       this = any(AssignableDefinitions::AddressOfDefinition def).getTargetAccess()
+      or
+      this = any(AssignableDefinitions::AssignOperationDefinition def).getTargetAccess()
     ) and
     not nameOfChild(_, this)
   }
@@ -271,6 +273,8 @@ module AssignableInternal {
     def = TAddressOfDefinition(result)
     or
     def = TPatternDefinition(result)
+    or
+    def = TAssignOperationDefinition(result)
   }
 
   /** A local variable declaration at the top-level of a pattern. */
@@ -286,7 +290,11 @@ module AssignableInternal {
   private module Cached {
     cached
     newtype TAssignableDefinition =
-      TAssignmentDefinition(Assignment a) { not a.getLValue() instanceof TupleExpr } or
+      TAssignmentDefinition(Assignment a) {
+        not a.getLValue() instanceof TupleExpr and
+        not a instanceof AssignCallOperation and
+        not a instanceof AssignCoalesceExpr
+      } or
       TTupleAssignmentDefinition(AssignExpr ae, Expr leaf) { tupleAssignmentDefinition(ae, leaf) } or
       TOutRefDefinition(AssignableAccess aa) {
         aa.isOutArgument()
@@ -309,7 +317,11 @@ module AssignableInternal {
         )
       } or
       TAddressOfDefinition(AddressOfExpr aoe) or
-      TPatternDefinition(TopLevelPatternDecl tlpd)
+      TPatternDefinition(TopLevelPatternDecl tlpd) or
+      TAssignOperationDefinition(AssignOperation ao) {
+        ao instanceof AssignCallOperation or
+        ao instanceof AssignCoalesceExpr
+      }
 
     /**
      * Gets the source expression assigned in tuple definition `def`, if any.
@@ -355,6 +367,8 @@ module AssignableInternal {
       def = TMutationDefinition(any(MutatorOperation mo | mo.getOperand() = result))
       or
       def = TAddressOfDefinition(any(AddressOfExpr aoe | aoe.getOperand() = result))
+      or
+      def = TAssignOperationDefinition(any(AssignOperation ao | ao.getLeftOperand() = result))
     }
 
     /**
@@ -369,8 +383,10 @@ module AssignableInternal {
       or
       exists(Assignment ass | ac = ass.getLValue() |
         result = ass.getRValue() and
-        not ass.(AssignOperation).hasExpandedAssignment()
+        not ass instanceof AssignOperation
       )
+      or
+      exists(AssignOperation ao | ac = ao.getLeftOperand() | result = ao)
     }
   }
 
@@ -388,8 +404,9 @@ private import AssignableInternal
  * a mutation update (`AssignableDefinitions::MutationDefinition`), a local variable
  * declaration without an initializer (`AssignableDefinitions::LocalVariableDefinition`),
  * an implicit parameter definition (`AssignableDefinitions::ImplicitParameterDefinition`),
- * an address-of definition (`AssignableDefinitions::AddressOfDefinition`), or a pattern
- * definition (`AssignableDefinitions::PatternDefinition`).
+ * an address-of definition (`AssignableDefinitions::AddressOfDefinition`), a pattern
+ * definition (`AssignableDefinitions::PatternDefinition`), or a compound assignment
+ * operation definition (`AssignableDefinitions::AssignOperationDefinition`)
  */
 class AssignableDefinition extends TAssignableDefinition {
   /**
@@ -511,7 +528,7 @@ module AssignableDefinitions {
 
     override Expr getSource() {
       result = a.getRValue() and
-      not a instanceof AssignOperation
+      not a instanceof AddOrRemoveEventExpr
     }
 
     override string toString() { result = a.toString() }
@@ -735,4 +752,17 @@ module AssignableDefinitions {
     /** Gets the assignable (field or property) being initialized. */
     Assignable getAssignable() { result = fieldOrProp }
   }
+
+  /**
+   * A definition by a compound assignment operation, for example `x += y`.
+   */
+  class AssignOperationDefinition extends AssignableDefinition, TAssignOperationDefinition {
+    AssignOperation ao;
+
+    AssignOperationDefinition() { this = TAssignOperationDefinition(ao) }
+
+    override Expr getSource() { result = ao }
+
+    override string toString() { result = ao.toString() }
+  }
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/Callable.qll b/csharp/ql/lib/semmle/code/csharp/Callable.qll
index f8346cfe01e..611b578b859 100644
--- a/csharp/ql/lib/semmle/code/csharp/Callable.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Callable.qll
@@ -336,6 +336,22 @@ class ExtensionTypeExtensionMethod extends ExtensionMethodImpl {
   ExtensionTypeExtensionMethod() { this.isInExtension() }
 }
 
+/**
+ * A non-static member with an initializer, for example a field `int Field = 0`.
+ */
+private class InitializedInstanceMember extends Member {
+  private AssignExpr ae;
+
+  InitializedInstanceMember() {
+    not this.isStatic() and
+    expr_parent_top_level(ae, _, this) and
+    not ae = getExpressionBody(_)
+  }
+
+  /** Gets the initializer expression. */
+  AssignExpr getInitializer() { result = ae }
+}
+
 /**
  * An object initializer method.
  *
@@ -347,6 +363,17 @@ class ExtensionTypeExtensionMethod extends ExtensionMethodImpl {
  */
 class ObjectInitMethod extends Method {
   ObjectInitMethod() { this.getName() = "<object initializer>" }
+
+  /**
+   * Holds if this object initializer method performs the initialization
+   * of a member via assignment `init`.
+   */
+  predicate initializes(AssignExpr init) {
+    exists(InitializedInstanceMember m |
+      this.getDeclaringType().getAMember() = m and
+      init = m.getInitializer()
+    )
+  }
 }
 
 /**
diff --git a/csharp/ql/lib/semmle/code/csharp/ExprOrStmtParent.qll b/csharp/ql/lib/semmle/code/csharp/ExprOrStmtParent.qll
index aa834ef9103..8102b4a0288 100644
--- a/csharp/ql/lib/semmle/code/csharp/ExprOrStmtParent.qll
+++ b/csharp/ql/lib/semmle/code/csharp/ExprOrStmtParent.qll
@@ -20,7 +20,7 @@ class ExprOrStmtParent extends Element, @exprorstmt_parent {
 
   /** Gets the `i`th child expression of this element (zero-based). */
   final Expr getChildExpr(int i) {
-    expr_parent_adjusted(result, i, this) or
+    expr_parent(result, i, this) or
     expr_parent_top_level_adjusted(result, i, this)
   }
 
@@ -118,67 +118,9 @@ private module Cached {
     i = 0
   }
 
-  /**
-   * The `expr_parent()` relation adjusted for expandable assignments. For example,
-   * the assignment `x += y` is extracted as
-   *
-   * ```
-   *          +=
-   *           |
-   *           2
-   *           |
-   *           =
-   *          / \
-   *         1   0
-   *        /     \
-   *       x       +
-   *              / \
-   *             1   0
-   *            /     \
-   *           x       y
-   * ```
-   *
-   * in order to be able to retrieve the expanded assignment `x = x + y` as the 2nd
-   * child. This predicate changes the diagram above into
-   *
-   * ```
-   *          +=
-   *         /  \
-   *        1    0
-   *       /      \
-   *      x        y
-   * ```
-   */
-  cached
-  predicate expr_parent_adjusted(Expr child, int i, ControlFlowElement parent) {
-    if parent instanceof AssignOperation
-    then
-      parent =
-        any(AssignOperation ao |
-          exists(AssignExpr ae | ae = ao.getExpandedAssignment() |
-            i = 0 and
-            exists(Expr right |
-              // right = `x + y`
-              expr_parent(right, 0, ae)
-            |
-              expr_parent(child, 1, right)
-            )
-            or
-            i = 1 and
-            expr_parent(child, 1, ae)
-          )
-          or
-          not ao.hasExpandedAssignment() and
-          expr_parent(child, i, parent)
-        )
-    else expr_parent(child, i, parent)
-  }
-
   private Expr getAChildExpr(ExprOrStmtParent parent) {
     result = parent.getAChildExpr() and
     not result = parent.(DeclarationWithGetSetAccessors).getExpressionBody()
-    or
-    result = parent.(AssignOperation).getExpandedAssignment()
   }
 
   private ControlFlowElement getAChild(ExprOrStmtParent parent) {
@@ -214,6 +156,8 @@ private module Cached {
     parent*(enclosingStart(cfe), c.(Constructor).getInitializer())
     or
     parent*(cfe, c.(Constructor).getObjectInitializerCall())
+    or
+    parent*(cfe, any(AssignExpr init | c.(ObjectInitMethod).initializes(init)))
   }
 
   /** Holds if the enclosing statement of expression `e` is `s`. */
diff --git a/csharp/ql/lib/semmle/code/csharp/Property.qll b/csharp/ql/lib/semmle/code/csharp/Property.qll
index 88665280d5b..bbd4fdd9d8e 100644
--- a/csharp/ql/lib/semmle/code/csharp/Property.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Property.qll
@@ -226,7 +226,7 @@ class Property extends DeclarationWithGetSetAccessors, @property {
    * }
    * ```
    */
-  Expr getInitializer() { result = this.getChildExpr(1).getChildExpr(0) }
+  Expr getInitializer() { result = this.getChildExpr(1).getChildExpr(1) }
 
   /**
    * Holds if this property has an initial value. For example, the initial
diff --git a/csharp/ql/lib/semmle/code/csharp/Stmt.qll b/csharp/ql/lib/semmle/code/csharp/Stmt.qll
index aea8b037819..4d79bf9fa54 100644
--- a/csharp/ql/lib/semmle/code/csharp/Stmt.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Stmt.qll
@@ -183,9 +183,10 @@ class SwitchStmt extends SelectionStmt, Switch, @switch_stmt {
    *     return 3;
    * }
    * ```
-   * Note that this reorders the `default` case to always be at the end.
    */
-  override CaseStmt getCase(int i) { result = SwithStmtInternal::getCase(this, i) }
+  override CaseStmt getCase(int i) {
+    result = rank[i + 1](CaseStmt cs, int idx | cs = this.getChildStmt(idx) | cs order by idx)
+  }
 
   /** Gets a case of this `switch` statement. */
   override CaseStmt getACase() { result = this.getCase(_) }
@@ -208,87 +209,29 @@ class SwitchStmt extends SelectionStmt, Switch, @switch_stmt {
    * ```csharp
    * switch (x) {
    *   case "abc":              // i = 0
-   *     return 0;
-   *   case int i when i > 0:   // i = 1
-   *     return 1;
-   *   case string s:           // i = 2
-   *     Console.WriteLine(s);
-   *     return 2;              // i = 3
-   *   default:                 // i = 4
-   *     return 3;              // i = 5
+   *     return 0;              // i = 1
+   *   case int i when i > 0:   // i = 2
+   *     return 1;              // i = 3
+   *   case string s:           // i = 4
+   *     Console.WriteLine(s);  // i = 5
+   *     return 2;              // i = 6
+   *   default:                 // i = 7
+   *     return 3;              // i = 8
    * }
    * ```
-   *
-   * Note that each non-`default` case is a labeled statement, so the statement
-   * that follows is a child of the labeled statement, and not the `switch` block.
    */
-  Stmt getStmt(int i) { result = SwithStmtInternal::getStmt(this, i) }
+  Stmt getStmt(int i) { result = this.getChildStmt(i) }
 
   /** Gets a statement in the body of this `switch` statement. */
   Stmt getAStmt() { result = this.getStmt(_) }
 }
 
-cached
-private module SwithStmtInternal {
-  cached
-  CaseStmt getCase(SwitchStmt ss, int i) {
-    exists(int index, int rankIndex |
-      caseIndex(ss, result, index) and
-      rankIndex = i + 1 and
-      index = rank[rankIndex](int j, CaseStmt cs | caseIndex(ss, cs, j) | j)
-    )
-  }
-
-  /** Implicitly reorder case statements to put the default case last if needed. */
-  private predicate caseIndex(SwitchStmt ss, CaseStmt case, int index) {
-    exists(int i | case = ss.getChildStmt(i) |
-      if case instanceof DefaultCase
-      then index = max(int j | exists(ss.getChildStmt(j))) + 1
-      else index = i
-    )
-  }
-
-  cached
-  Stmt getStmt(SwitchStmt ss, int i) {
-    exists(int index, int rankIndex |
-      result = ss.getChildStmt(index) and
-      rankIndex = i + 1 and
-      index =
-        rank[rankIndex](int j, Stmt s |
-          // `getChild` includes both labeled statements and the targeted
-          // statements of labeled statement as separate children, but we
-          // only want the labeled statement
-          s = getLabeledStmt(ss, j)
-        |
-          j
-        )
-    )
-  }
-
-  private Stmt getLabeledStmt(SwitchStmt ss, int i) {
-    result = ss.getChildStmt(i) and
-    not result = any(CaseStmt cs).getBody()
-  }
-}
-
 /** A `case` statement. */
 class CaseStmt extends Case, @case_stmt {
   override Expr getExpr() { result = any(SwitchStmt ss | ss.getACase() = this).getExpr() }
 
   override PatternExpr getPattern() { result = this.getChild(0) }
 
-  override Stmt getBody() {
-    exists(int i, Stmt next |
-      this = this.getParent().getChild(i) and
-      next = this.getParent().getChild(i + 1)
-    |
-      result = next and
-      not result instanceof CaseStmt
-      or
-      result = next.(CaseStmt).getBody()
-    )
-  }
-
   /**
    * Gets the condition on this case, if any. For example, the type case on line 3
    * has no condition, and the type case on line 4 has condition `s.Length > 0`, in
diff --git a/csharp/ql/lib/semmle/code/csharp/Variable.qll b/csharp/ql/lib/semmle/code/csharp/Variable.qll
index 746ea6acd2f..6d59816373d 100644
--- a/csharp/ql/lib/semmle/code/csharp/Variable.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Variable.qll
@@ -408,7 +408,7 @@ class Field extends Variable, AssignableMember, Attributable, TopLevelExprParent
    * }
    * ```
    */
-  final override Expr getInitializer() { result = this.getChildExpr(0).getChildExpr(0) }
+  final override Expr getInitializer() { result = this.getChildExpr(0).getChildExpr(1) }
 
   /**
    * Holds if this field has an initial value. For example, the initial
diff --git a/csharp/ql/lib/semmle/code/csharp/commons/Strings.qll b/csharp/ql/lib/semmle/code/csharp/commons/Strings.qll
index bdf9e558539..678a1f92816 100644
--- a/csharp/ql/lib/semmle/code/csharp/commons/Strings.qll
+++ b/csharp/ql/lib/semmle/code/csharp/commons/Strings.qll
@@ -49,6 +49,11 @@ class ImplicitToStringExpr extends Expr {
       this = add.getOtherOperand(o).stripImplicit()
     )
     or
+    exists(AssignAddExpr add, Expr o | o = add.getLeftOperand() |
+      o.stripImplicit().getType() instanceof StringType and
+      this = add.getRightOperand().stripImplicit()
+    )
+    or
     this = any(InterpolatedStringExpr ise).getAnInsert().stripImplicit()
   }
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll
index 414cfc2d50a..03a5aa7e2b7 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll
@@ -119,14 +119,14 @@ private module GuardsInput implements
   class AndExpr extends BinExpr {
     AndExpr() {
       this instanceof LogicalAndExpr or
-      this instanceof BitwiseAndExpr
+      this instanceof BitwiseAndOperation
     }
   }
 
   class OrExpr extends BinExpr {
     OrExpr() {
       this instanceof LogicalOrExpr or
-      this instanceof BitwiseOrExpr
+      this instanceof BitwiseOrOperation
     }
   }
 
@@ -142,6 +142,7 @@ private module GuardsInput implements
     }
   }
 
+  pragma[nomagic]
   predicate equalityTest(Expr eqtest, Expr left, Expr right, boolean polarity) {
     exists(ComparisonTest ct |
       ct.getExpr() = eqtest and
@@ -291,7 +292,7 @@ private module LogicInput implements GuardsImpl::LogicInputSig {
     v1.isNonNullValue() and
     v2 = v1
     or
-    g2 = g1.(NullCoalescingExpr).getAnOperand() and
+    g2 = g1.(NullCoalescingOperation).getAnOperand() and
     v1.isNullValue() and
     v2 = v1
     or
@@ -410,6 +411,22 @@ private predicate typePattern(PatternMatch pm, TypePatternExpr tpe, Type t) {
   t = pm.getExpr().getType()
 }
 
+pragma[nomagic]
+private predicate dereferenceableExpr(Expr e, boolean isNullableType) {
+  exists(Type t | t = e.getType() |
+    t instanceof NullableType and
+    isNullableType = true
+    or
+    t instanceof RefType and
+    isNullableType = false
+  )
+  or
+  exists(Expr parent |
+    dereferenceableExpr(parent, isNullableType) and
+    e = getNullEquivParent(parent)
+  )
+}
+
 /**
  * An expression that evaluates to a value that can be dereferenced. That is,
  * an expression that may evaluate to `null`.
@@ -418,21 +435,12 @@ class DereferenceableExpr extends Expr {
   private boolean isNullableType;
 
   DereferenceableExpr() {
-    exists(Expr e, Type t |
-      // There is currently a bug in the extractor: the type of `x?.Length` is
-      // incorrectly `int`, while it should have been `int?`. We apply
-      // `getNullEquivParent()` as a workaround
-      this = getNullEquivParent*(e) and
-      t = e.getType() and
-      not this instanceof SwitchCaseExpr and
-      not this instanceof PatternExpr
-    |
-      t instanceof NullableType and
-      isNullableType = true
-      or
-      t instanceof RefType and
-      isNullableType = false
-    )
+    // There is currently a bug in the extractor: the type of `x?.Length` is
+    // incorrectly `int`, while it should have been `int?`. We apply
+    // `getNullEquivParent()` as a workaround
+    dereferenceableExpr(this, isNullableType) and
+    not this instanceof SwitchCaseExpr and
+    not this instanceof PatternExpr
   }
 
   /** Holds if this expression has a nullable type `T?`. */
@@ -832,14 +840,14 @@ module Internal {
     or
     e1 = e2.(Cast).getExpr()
     or
-    e2 = e1.(NullCoalescingExpr).getAnOperand()
+    e2 = e1.(NullCoalescingOperation).getAnOperand()
   }
 
   /** Holds if expression `e3` is a `null` value whenever `e1` and `e2` are. */
   predicate nullValueImpliedBinary(Expr e1, Expr e2, Expr e3) {
     e3 = any(ConditionalExpr ce | e1 = ce.getThen() and e2 = ce.getElse())
     or
-    e3 = any(NullCoalescingExpr nce | e1 = nce.getLeftOperand() and e2 = nce.getRightOperand())
+    e3 = any(NullCoalescingOperation no | e1 = no.getLeftOperand() and e2 = no.getRightOperand())
   }
 
   predicate nullValueImplied(Expr e) {
@@ -899,7 +907,7 @@ module Internal {
     or
     // "In string concatenation operations, the C# compiler treats a null string the same as an empty string."
     // (https://docs.microsoft.com/en-us/dotnet/csharp/how-to/concatenate-multiple-strings)
-    e instanceof AddExpr and
+    e instanceof AddOperation and
     e.getType() instanceof StringType
     or
     e.(DefaultValueExpr).getType().isValueType()
@@ -914,11 +922,9 @@ module Internal {
 
   /** Holds if expression `e2` is a non-`null` value whenever `e1` is. */
   predicate nonNullValueImpliedUnary(Expr e1, Expr e2) {
-    e1 = e2.(CastExpr).getExpr()
-    or
-    e1 = e2.(AssignExpr).getRValue()
-    or
-    e1 = e2.(NullCoalescingExpr).getAnOperand()
+    e1 = e2.(CastExpr).getExpr() or
+    e1 = e2.(AssignExpr).getRValue() or
+    e1 = e2.(NullCoalescingOperation).getAnOperand()
   }
 
   /**
@@ -945,10 +951,13 @@ module Internal {
       )
     or
     // In C#, `null + 1` has type `int?` with value `null`
-    exists(BinaryArithmeticOperation bao, Expr o |
-      result = bao and
-      bao.getAnOperand() = e and
-      bao.getAnOperand() = o and
+    exists(BinaryOperation bo, Expr o |
+      bo instanceof BinaryArithmeticOperation or
+      bo instanceof AssignArithmeticOperation
+    |
+      result = bo and
+      bo.getAnOperand() = e and
+      bo.getAnOperand() = o and
       // The other operand must be provably non-null in order
       // for `only if` to hold
       nonNullValueImplied(o) and
@@ -964,10 +973,10 @@ module Internal {
       any(QualifiableExpr qe |
         qe.isConditional() and
         result = qe.getQualifier()
-      )
-    or
+      ) or
     // In C#, `null + 1` has type `int?` with value `null`
-    e = any(BinaryArithmeticOperation bao | result = bao.getAnOperand())
+    e = any(BinaryArithmeticOperation bao | result = bao.getAnOperand()) or
+    e = any(AssignArithmeticOperation aao | result = aao.getAnOperand())
   }
 
   deprecated predicate isGuard(Expr e, GuardValue val) {
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 ab8bb233e2c..e734e79402b 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Completion.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Completion.qll
@@ -344,7 +344,7 @@ private class TriedControlFlowElement extends ControlFlowElement {
     result instanceof SystemOutOfMemoryExceptionClass
     or
     this =
-      any(AddExpr ae |
+      any(AddOperation ae |
         ae.getType() instanceof StringType and
         result instanceof SystemOutOfMemoryExceptionClass
         or
@@ -353,24 +353,24 @@ private class TriedControlFlowElement extends ControlFlowElement {
       )
     or
     this =
-      any(SubExpr se |
+      any(SubOperation se |
         se.getType() instanceof IntegralType and
         result instanceof SystemOverflowExceptionClass
       )
     or
     this =
-      any(MulExpr me |
+      any(MulOperation me |
         me.getType() instanceof IntegralType and
         result instanceof SystemOverflowExceptionClass
       )
     or
     this =
-      any(DivExpr de |
+      any(DivOperation de |
         not de.getDenominator().getValue().toFloat() != 0 and
         result instanceof SystemDivideByZeroExceptionClass
       )
     or
-    this instanceof RemExpr and
+    this instanceof RemOperation and
     result instanceof SystemDivideByZeroExceptionClass
     or
     this instanceof DynamicExpr and
@@ -447,7 +447,7 @@ private predicate inBooleanContext(Expr e) {
     e in [ce.getThen(), ce.getElse()]
   )
   or
-  e = any(NullCoalescingExpr nce | inBooleanContext(nce)).getAnOperand()
+  e = any(NullCoalescingOperation nce | inBooleanContext(nce)).getAnOperand()
   or
   e = any(SwitchExpr se | inBooleanContext(se)).getACase()
   or
@@ -467,13 +467,13 @@ private predicate mustHaveNullnessCompletion(Expr e) {
  * that `e` evaluates to determines a `null`/non-`null` branch successor.
  */
 private predicate inNullnessContext(Expr e) {
-  e = any(NullCoalescingExpr nce).getLeftOperand()
+  e = any(NullCoalescingOperation nce).getLeftOperand()
   or
   exists(QualifiableExpr qe | qe.isConditional() | e = qe.getChildExpr(-1))
   or
   exists(ConditionalExpr ce | inNullnessContext(ce) | (e = ce.getThen() or e = ce.getElse()))
   or
-  exists(NullCoalescingExpr nce | inNullnessContext(nce) | e = nce.getRightOperand())
+  exists(NullCoalescingOperation nce | inNullnessContext(nce) | e = nce.getRightOperand())
   or
   e = any(SwitchExpr se | inNullnessContext(se)).getACase()
   or
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImpl.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImpl.qll
index 6be79a17be2..e29e92d26eb 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/ControlFlowGraphImpl.qll
@@ -10,42 +10,15 @@ private import semmle.code.csharp.ExprOrStmtParent
 private import semmle.code.csharp.commons.Compilation
 
 private module Initializers {
-  /**
-   * A non-static member with an initializer, for example a field `int Field = 0`.
-   */
-  class InitializedInstanceMember extends Member {
-    private AssignExpr ae;
-
-    InitializedInstanceMember() {
-      not this.isStatic() and
-      expr_parent_top_level(ae, _, this) and
-      not ae = any(Callable c).getExpressionBody()
-    }
-
-    /** Gets the initializer expression. */
-    AssignExpr getInitializer() { result = ae }
-  }
-
-  /**
-   * Holds if `obinit` is an object initializer method that performs the initialization
-   * of a member via assignment `init`.
-   */
-  predicate obinitInitializes(ObjectInitMethod obinit, AssignExpr init) {
-    exists(InitializedInstanceMember m |
-      obinit.getDeclaringType().getAMember() = m and
-      init = m.getInitializer()
-    )
-  }
-
   /**
    * Gets the `i`th member initializer expression for object initializer method `obinit`
    * in compilation `comp`.
    */
   AssignExpr initializedInstanceMemberOrder(ObjectInitMethod obinit, CompilationExt comp, int i) {
-    obinitInitializes(obinit, result) and
+    obinit.initializes(result) and
     result =
       rank[i + 1](AssignExpr ae0, Location l |
-        obinitInitializes(obinit, ae0) and
+        obinit.initializes(ae0) and
         l = ae0.getLocation() and
         getCompilation(l.getFile()) = comp
       |
@@ -74,7 +47,7 @@ class CfgScope extends Element, @top_level_exprorstmt_parent {
         any(Callable c |
           c.(Constructor).hasInitializer()
           or
-          Initializers::obinitInitializes(c, _)
+          c.(ObjectInitMethod).initializes(_)
           or
           c.hasBody()
         )
@@ -89,14 +62,19 @@ class CfgScope extends Element, @top_level_exprorstmt_parent {
 
 private class TAstNode = @callable or @control_flow_element;
 
-private Element getAChild(Element p) {
-  result = p.getAChild() or
-  result = p.(AssignOperation).getExpandedAssignment()
+pragma[nomagic]
+private predicate astNode(Element e) {
+  e = any(@top_level_exprorstmt_parent p | not p instanceof Attribute)
+  or
+  exists(Element parent |
+    astNode(parent) and
+    e = parent.getAChild()
+  )
 }
 
 /** An AST node. */
 class AstNode extends Element, TAstNode {
-  AstNode() { this = getAChild*(any(@top_level_exprorstmt_parent p | not p instanceof Attribute)) }
+  AstNode() { astNode(this) }
 
   int getId() { idOf(this, result) }
 }
@@ -298,6 +276,93 @@ private class ConstructorTree extends ControlFlowTree instanceof Constructor {
   }
 }
 
+cached
+private module SwithStmtInternal {
+  // Reorders default to be last if needed
+  cached
+  CaseStmt getCase(SwitchStmt ss, int i) {
+    exists(int index, int rankIndex |
+      caseIndex(ss, result, index) and
+      rankIndex = i + 1 and
+      index = rank[rankIndex](int j, CaseStmt cs | caseIndex(ss, cs, j) | j)
+    )
+  }
+
+  /** Implicitly reorder case statements to put the default case last if needed. */
+  private predicate caseIndex(SwitchStmt ss, CaseStmt case, int index) {
+    exists(int i | case = ss.getChildStmt(i) |
+      if case instanceof DefaultCase
+      then index = max(int j | exists(ss.getChildStmt(j))) + 1
+      else index = i
+    )
+  }
+
+  /**
+   * Gets the `i`th statement in the body of this `switch` statement.
+   *
+   * Example:
+   *
+   * ```csharp
+   * switch (x) {
+   *   case "abc":              // i = 0
+   *     return 0;
+   *   case int i when i > 0:   // i = 1
+   *     return 1;
+   *   case string s:           // i = 2
+   *     Console.WriteLine(s);
+   *     return 2;              // i = 3
+   *   default:                 // i = 4
+   *     return 3;              // i = 5
+   * }
+   * ```
+   *
+   * Note that each non-`default` case is a labeled statement, so the statement
+   * that follows is a child of the labeled statement, and not the `switch` block.
+   */
+  cached
+  Stmt getStmt(SwitchStmt ss, int i) {
+    exists(int index, int rankIndex |
+      result = ss.getChildStmt(index) and
+      rankIndex = i + 1 and
+      index =
+        rank[rankIndex](int j, Stmt s |
+          // `getChild` includes both labeled statements and the targeted
+          // statements of labeled statement as separate children, but we
+          // only want the labeled statement
+          s = getLabeledStmt(ss, j)
+        |
+          j
+        )
+    )
+  }
+
+  private Stmt getLabeledStmt(SwitchStmt ss, int i) {
+    result = ss.getChildStmt(i) and
+    not result = caseStmtGetBody(_)
+  }
+}
+
+private ControlFlowElement caseGetBody(Case c) {
+  result = c.getBody() or result = caseStmtGetBody(c)
+}
+
+private ControlFlowElement caseStmtGetBody(CaseStmt c) {
+  exists(int i, Stmt next |
+    c = c.getParent().getChild(i) and
+    next = c.getParent().getChild(i + 1)
+  |
+    result = next and
+    not result instanceof CaseStmt
+    or
+    result = caseStmtGetBody(next)
+  )
+}
+
+// Reorders default to be last if needed
+private Case switchGetCase(Switch s, int i) {
+  result = s.(SwitchExpr).getCase(i) or result = SwithStmtInternal::getCase(s, i)
+}
+
 abstract private class SwitchTree extends ControlFlowTree instanceof Switch {
   override predicate propagatesAbnormal(AstNode child) { child = super.getExpr() }
 
@@ -305,27 +370,27 @@ abstract private class SwitchTree extends ControlFlowTree instanceof Switch {
     // Flow from last element of switch expression to first element of first case
     last(super.getExpr(), pred, c) and
     c instanceof NormalCompletion and
-    first(super.getCase(0), succ)
+    first(switchGetCase(this, 0), succ)
     or
     // Flow from last element of case pattern to next case
-    exists(Case case, int i | case = super.getCase(i) |
+    exists(Case case, int i | case = switchGetCase(this, i) |
       last(case.getPattern(), pred, c) and
       c.(MatchingCompletion).isNonMatch() and
-      first(super.getCase(i + 1), succ)
+      first(switchGetCase(this, i + 1), succ)
     )
     or
     // Flow from last element of condition to next case
-    exists(Case case, int i | case = super.getCase(i) |
+    exists(Case case, int i | case = switchGetCase(this, i) |
       last(case.getCondition(), pred, c) and
       c instanceof FalseCompletion and
-      first(super.getCase(i + 1), succ)
+      first(switchGetCase(this, i + 1), succ)
     )
   }
 }
 
 abstract private class CaseTree extends ControlFlowTree instanceof Case {
   final override predicate propagatesAbnormal(AstNode child) {
-    child in [super.getPattern().(ControlFlowElement), super.getCondition(), super.getBody()]
+    child in [super.getPattern().(ControlFlowElement), super.getCondition(), caseGetBody(this)]
   }
 
   override predicate succ(AstNode pred, AstNode succ, Completion c) {
@@ -338,13 +403,13 @@ abstract private class CaseTree extends ControlFlowTree instanceof Case {
         first(super.getCondition(), succ)
       else
         // Flow from last element of pattern to first element of body
-        first(super.getBody(), succ)
+        first(caseGetBody(this), succ)
     )
     or
     // Flow from last element of condition to first element of body
     last(super.getCondition(), pred, c) and
     c instanceof TrueCompletion and
-    first(super.getBody(), succ)
+    first(caseGetBody(this), succ)
   }
 }
 
@@ -377,7 +442,6 @@ module Expressions {
   private AstNode getExprChild0(Expr e, int i) {
     not e instanceof NameOfExpr and
     not e instanceof QualifiableExpr and
-    not e instanceof Assignment and
     not e instanceof AnonymousFunctionExpr and
     result = e.getChild(i)
     or
@@ -388,14 +452,6 @@ module Expressions {
         not qe instanceof ExtensionMethodCall and
         result = qe.getChild(i)
       )
-    or
-    e =
-      any(Assignment a |
-        // The left-hand side of an assignment is evaluated before the right-hand side
-        i = 0 and result = a.getLValue()
-        or
-        i = 1 and result = a.getRValue()
-      )
   }
 
   private AstNode getExprChild(Expr e, int i) {
@@ -421,9 +477,8 @@ module Expressions {
       not this instanceof LogicalNotExpr and
       not this instanceof LogicalAndExpr and
       not this instanceof LogicalOrExpr and
-      not this instanceof NullCoalescingExpr and
+      not this instanceof NullCoalescingOperation and
       not this instanceof ConditionalExpr and
-      not this instanceof AssignOperationWithExpandedAssignment and
       not this instanceof ConditionallyQualifiedExpr and
       not this instanceof ThrowExpr and
       not this instanceof ObjectCreation and
@@ -520,8 +575,7 @@ module Expressions {
     QualifiedAccessorWrite() {
       def.getExpr() = this and
       def.getTargetAccess().(WriteAccess) instanceof QualifiableExpr and
-      not def instanceof AssignableDefinitions::OutRefDefinition and
-      not this instanceof AssignOperationWithExpandedAssignment
+      not def instanceof AssignableDefinitions::OutRefDefinition
     }
 
     /**
@@ -653,7 +707,8 @@ module Expressions {
     }
   }
 
-  private class NullCoalescingExprTree extends PostOrderTree instanceof NullCoalescingExpr {
+  private class NullCoalescingOperationTree extends PostOrderTree instanceof NullCoalescingOperation
+  {
     final override predicate propagatesAbnormal(AstNode child) {
       child in [super.getLeftOperand(), super.getRightOperand()]
     }
@@ -704,26 +759,6 @@ module Expressions {
     }
   }
 
-  /**
-   * An assignment operation that has an expanded version. We use the expanded
-   * version in the control flow graph in order to get better data flow / taint
-   * tracking.
-   */
-  private class AssignOperationWithExpandedAssignment extends ControlFlowTree instanceof AssignOperation
-  {
-    private Expr expanded;
-
-    AssignOperationWithExpandedAssignment() { expanded = this.getExpandedAssignment() }
-
-    final override predicate first(AstNode first) { first(expanded, first) }
-
-    final override predicate last(AstNode last, Completion c) { last(expanded, last, c) }
-
-    final override predicate propagatesAbnormal(AstNode child) { none() }
-
-    final override predicate succ(AstNode pred, AstNode succ, Completion c) { none() }
-  }
-
   /** A conditionally qualified expression. */
   private class ConditionallyQualifiedExpr extends PostOrderTree instanceof QualifiableExpr {
     private Expr qualifier;
@@ -1216,10 +1251,11 @@ module Statements {
       c instanceof NormalCompletion
       or
       // A statement exits with a `break` completion
-      last(super.getStmt(_), last, c.(NestedBreakCompletion).getAnInnerCompatibleCompletion())
+      last(SwithStmtInternal::getStmt(this, _), last,
+        c.(NestedBreakCompletion).getAnInnerCompatibleCompletion())
       or
       // A statement exits abnormally
-      last(super.getStmt(_), last, c) and
+      last(SwithStmtInternal::getStmt(this, _), last, c) and
       not c instanceof BreakCompletion and
       not c instanceof NormalCompletion and
       not any(LabeledStmtTree t |
@@ -1228,8 +1264,8 @@ module Statements {
       or
       // Last case exits with a non-match
       exists(CaseStmt cs, int last_ |
-        last_ = max(int i | exists(super.getCase(i))) and
-        cs = super.getCase(last_)
+        last_ = max(int i | exists(SwithStmtInternal::getCase(this, i))) and
+        cs = SwithStmtInternal::getCase(this, last_)
       |
         last(cs.getPattern(), last, c) and
         not c.(MatchingCompletion).isMatch()
@@ -1248,22 +1284,22 @@ module Statements {
       c instanceof SimpleCompletion
       or
       // Flow from last element of non-`case` statement `i` to first element of statement `i+1`
-      exists(int i | last(super.getStmt(i), pred, c) |
-        not super.getStmt(i) instanceof CaseStmt and
+      exists(int i | last(SwithStmtInternal::getStmt(this, i), pred, c) |
+        not SwithStmtInternal::getStmt(this, i) instanceof CaseStmt and
         c instanceof NormalCompletion and
-        first(super.getStmt(i + 1), succ)
+        first(SwithStmtInternal::getStmt(this, i + 1), succ)
       )
       or
       // Flow from last element of `case` statement `i` to first element of statement `i+1`
       exists(int i, Stmt body |
-        body = super.getStmt(i).(CaseStmt).getBody() and
+        body = caseStmtGetBody(SwithStmtInternal::getStmt(this, i)) and
         // in case of fall-through cases, make sure to not jump from their shared body back
         // to one of the fall-through cases
-        not body = super.getStmt(i + 1).(CaseStmt).getBody() and
+        not body = caseStmtGetBody(SwithStmtInternal::getStmt(this, i + 1)) and
         last(body, pred, c)
       |
         c instanceof NormalCompletion and
-        first(super.getStmt(i + 1), succ)
+        first(SwithStmtInternal::getStmt(this, i + 1), succ)
       )
     }
   }
@@ -1279,7 +1315,7 @@ module Statements {
       not c.(MatchingCompletion).isMatch()
       or
       // Case body exits with any completion
-      last(super.getBody(), last, c)
+      last(caseStmtGetBody(this), last, c)
     }
 
     final override predicate succ(AstNode pred, AstNode succ, Completion c) {
@@ -1480,7 +1516,7 @@ module Statements {
   /** Gets a child of `cfe` that is in CFG scope `scope`. */
   pragma[noinline]
   private ControlFlowElement getAChildInScope(AstNode cfe, Callable scope) {
-    result = getAChild(cfe) and
+    result = cfe.getAChild() and
     scope = result.getEnclosingCallable()
   }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreBasicBlocks.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreBasicBlocks.qll
deleted file mode 100644
index 38eca378edf..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreBasicBlocks.qll
+++ /dev/null
@@ -1,175 +0,0 @@
-/**
- * INTERNAL: Do not use.
- *
- * Provides a basic block implementation on control flow elements. That is,
- * a "pre-CFG" where the nodes are (unsplit) control flow elements and the
- * successor relation is `succ = succ(pred, _)`.
- *
- * The logic is duplicated from the implementation in `BasicBlocks.qll`, and
- * being an internal class, all predicate documentation has been removed.
- */
-
-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
-  (
-    succ(cfe, _, _)
-    or
-    scopeLast(_, cfe, _)
-  )
-  or
-  strictcount(ControlFlowElement pred, Completion c | succ(pred, cfe, c)) > 1
-  or
-  succ(_, cfe, any(ConditionalCompletion c))
-  or
-  exists(ControlFlowElement pred, int i |
-    succ(pred, cfe, _) and
-    i = count(ControlFlowElement succ, Completion c | succ(pred, succ, c))
-  |
-    i > 1
-    or
-    i = 1 and
-    scopeLast(_, pred, _)
-  )
-}
-
-private predicate intraBBSucc(ControlFlowElement pred, ControlFlowElement succ) {
-  succ(pred, succ, _) and
-  not startsBB(succ)
-}
-
-private predicate bbIndex(ControlFlowElement bbStart, ControlFlowElement cfe, int i) =
-  shortestDistances(startsBB/1, intraBBSucc/2)(bbStart, cfe, i)
-
-private predicate succBB(PreBasicBlock pred, PreBasicBlock succ) { succ = pred.getASuccessor() }
-
-private predicate entryBB(PreBasicBlock bb) { scopeFirst(_, bb) }
-
-private predicate bbIDominates(PreBasicBlock dom, PreBasicBlock bb) =
-  idominance(entryBB/1, succBB/2)(_, dom, bb)
-
-class PreBasicBlock extends ControlFlowElement {
-  PreBasicBlock() { startsBB(this) }
-
-  PreBasicBlock getASuccessor(Cfg::SuccessorType t) {
-    succ(this.getLastNode(), result, any(Completion c | t = c.getAMatchingSuccessorType()))
-  }
-
-  deprecated PreBasicBlock getASuccessorByType(Cfg::SuccessorType t) {
-    result = this.getASuccessor(t)
-  }
-
-  PreBasicBlock getASuccessor() { result = this.getASuccessor(_) }
-
-  PreBasicBlock getAPredecessor() { result.getASuccessor() = this }
-
-  ControlFlowElement getNode(int pos) { bbIndex(this, result, pos) }
-
-  deprecated ControlFlowElement getElement(int pos) { result = this.getNode(pos) }
-
-  ControlFlowElement getAnElement() { result = this.getNode(_) }
-
-  ControlFlowElement getFirstElement() { result = this }
-
-  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]
-  predicate strictlyDominates(PreBasicBlock bb) { this.immediatelyDominates+(bb) }
-
-  pragma[inline]
-  predicate dominates(PreBasicBlock bb) {
-    bb = this
-    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.getLastNode(), _, c)
-      or
-      scopeLast(_, this.getLastNode(), c)
-    )
-  }
-
-  pragma[nomagic]
-  predicate controls(PreBasicBlock controlled, Cfg::ConditionalSuccessor s) {
-    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 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/Splitting.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll
index 55b75ed31a7..173179216f3 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll
@@ -95,7 +95,7 @@ module ConditionalCompletionSplitting {
         child = parent.(SwitchCaseExpr).getBody()
         or
         parent =
-          any(NullCoalescingExpr nce |
+          any(NullCoalescingOperation nce |
             if childCompletion instanceof NullnessCompletion
             then child = nce.getRightOperand()
             else child = nce.getAnOperand()
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
index c7ac34d3d01..a82779eaa5d 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
@@ -42,7 +42,7 @@ private Expr maybeNullExpr(Expr reason) {
       ce.getElse() = maybeNullExpr(reason)
     )
   or
-  result.(NullCoalescingExpr).getRightOperand() = maybeNullExpr(reason)
+  result.(NullCoalescingOperation).getRightOperand() = maybeNullExpr(reason)
   or
   result =
     any(QualifiableExpr qe |
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ControlFlowReachability.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ControlFlowReachability.qll
deleted file mode 100644
index 8ab7bb0fba4..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ControlFlowReachability.qll
+++ /dev/null
@@ -1,215 +0,0 @@
-import csharp
-
-private class ControlFlowScope extends ControlFlowElement {
-  private boolean exactScope;
-
-  ControlFlowScope() {
-    exists(ControlFlowReachabilityConfiguration c |
-      c.candidate(_, _, this, exactScope, _) or
-      c.candidateDef(_, _, this, exactScope, _)
-    )
-  }
-
-  predicate isExact() { exactScope = true }
-
-  predicate isNonExact() { exactScope = false }
-}
-
-private ControlFlowElement getANonExactScopeChild(ControlFlowScope scope) {
-  scope.isNonExact() and
-  result = scope
-  or
-  result = getANonExactScopeChild(scope).getAChild()
-}
-
-pragma[noinline]
-private ControlFlow::BasicBlock getABasicBlockInScope(ControlFlowScope scope, boolean exactScope) {
-  result.getANode().getAstNode() = getANonExactScopeChild(scope) and
-  exactScope = false
-  or
-  scope.isExact() and
-  result.getANode().getAstNode() = scope and
-  exactScope = true
-}
-
-/**
- * A helper class for determining control-flow reachability for pairs of
- * elements.
- *
- * This is useful when defining for example expression-based data-flow steps in
- * the presence of control-flow splitting, where a data-flow step should make
- * sure to stay in the same split.
- *
- * For example, in
- *
- * ```csharp
- * if (b)
- *     ....
- * var x = "foo";
- * if (b)
- *     ....
- * ```
- *
- * there should only be steps from `[b = true] "foo"` to `[b = true] SSA def(x)`
- * and `[b = false] "foo"` to `[b = false] SSA def(x)`, and for example not from
- * `[b = true] "foo"` to `[b = false] SSA def(x)`
- */
-abstract class ControlFlowReachabilityConfiguration extends string {
-  bindingset[this]
-  ControlFlowReachabilityConfiguration() { any() }
-
-  /**
-   * Holds if `e1` and `e2` are expressions for which we want to find a
-   * control-flow path that follows control flow successors (resp.
-   * predecessors, as specified by `isSuccessor`) inside the syntactic scope
-   * `scope`. The Boolean `exactScope` indicates whether a transitive child
-   * of `scope` is allowed (`exactScope = false`).
-   */
-  predicate candidate(
-    Expr e1, Expr e2, ControlFlowElement scope, boolean exactScope, boolean isSuccessor
-  ) {
-    none()
-  }
-
-  /**
-   * Holds if `e` and `def` are elements for which we want to find a
-   * control-flow path that follows control flow successors (resp.
-   * predecessors, as specified by `isSuccessor`) inside the syntactic scope
-   * `scope`. The Boolean `exactScope` indicates whether a transitive child
-   * of `scope` is allowed (`exactScope = false`).
-   */
-  predicate candidateDef(
-    Expr e, AssignableDefinition def, ControlFlowElement scope, boolean exactScope,
-    boolean isSuccessor
-  ) {
-    none()
-  }
-
-  pragma[nomagic]
-  private predicate reachesBasicBlockExprBase(
-    Expr e1, Expr e2, boolean isSuccessor, ControlFlow::Nodes::ElementNode cfn1, int i,
-    ControlFlow::BasicBlock bb
-  ) {
-    this.candidate(e1, e2, _, _, isSuccessor) and
-    cfn1 = e1.getAControlFlowNode() and
-    bb.getNode(i) = cfn1
-  }
-
-  pragma[nomagic]
-  private predicate reachesBasicBlockExprRec(
-    Expr e1, Expr e2, boolean isSuccessor, ControlFlow::Nodes::ElementNode cfn1,
-    ControlFlow::BasicBlock bb
-  ) {
-    exists(ControlFlow::BasicBlock mid |
-      this.reachesBasicBlockExpr(e1, e2, isSuccessor, cfn1, mid)
-    |
-      isSuccessor = true and
-      bb = mid.getASuccessor()
-      or
-      isSuccessor = false and
-      bb = mid.getAPredecessor()
-    )
-  }
-
-  pragma[nomagic]
-  private predicate reachesBasicBlockExpr(
-    Expr e1, Expr e2, boolean isSuccessor, ControlFlow::Nodes::ElementNode cfn1,
-    ControlFlow::BasicBlock bb
-  ) {
-    this.reachesBasicBlockExprBase(e1, e2, isSuccessor, cfn1, _, bb)
-    or
-    exists(ControlFlowElement scope, boolean exactScope |
-      this.candidate(e1, e2, scope, exactScope, isSuccessor) and
-      this.reachesBasicBlockExprRec(e1, e2, isSuccessor, cfn1, bb) and
-      bb = getABasicBlockInScope(scope, exactScope)
-    )
-  }
-
-  pragma[nomagic]
-  private predicate reachesBasicBlockDefinitionBase(
-    Expr e, AssignableDefinition def, boolean isSuccessor, ControlFlow::Nodes::ElementNode cfn,
-    int i, ControlFlow::BasicBlock bb
-  ) {
-    this.candidateDef(e, def, _, _, isSuccessor) and
-    cfn = e.getAControlFlowNode() and
-    bb.getNode(i) = cfn
-  }
-
-  pragma[nomagic]
-  private predicate reachesBasicBlockDefinitionRec(
-    Expr e, AssignableDefinition def, boolean isSuccessor, ControlFlow::Nodes::ElementNode cfn,
-    ControlFlow::BasicBlock bb
-  ) {
-    exists(ControlFlow::BasicBlock mid |
-      this.reachesBasicBlockDefinition(e, def, isSuccessor, cfn, mid)
-    |
-      isSuccessor = true and
-      bb = mid.getASuccessor()
-      or
-      isSuccessor = false and
-      bb = mid.getAPredecessor()
-    )
-  }
-
-  pragma[nomagic]
-  private predicate reachesBasicBlockDefinition(
-    Expr e, AssignableDefinition def, boolean isSuccessor, ControlFlow::Nodes::ElementNode cfn,
-    ControlFlow::BasicBlock bb
-  ) {
-    this.reachesBasicBlockDefinitionBase(e, def, isSuccessor, cfn, _, bb)
-    or
-    exists(ControlFlowElement scope, boolean exactScope |
-      this.candidateDef(e, def, scope, exactScope, isSuccessor) and
-      this.reachesBasicBlockDefinitionRec(e, def, isSuccessor, cfn, bb) and
-      bb = getABasicBlockInScope(scope, exactScope)
-    )
-  }
-
-  /**
-   * Holds if there is a control-flow path from `cfn1` to `cfn2`, where `cfn1` is a
-   * control-flow node for `e1` and `cfn2` is a control-flow node for `e2`.
-   */
-  pragma[nomagic]
-  predicate hasExprPath(Expr e1, ControlFlow::Node cfn1, Expr e2, ControlFlow::Node cfn2) {
-    exists(ControlFlow::BasicBlock bb, boolean isSuccessor, int i, int j |
-      this.reachesBasicBlockExprBase(e1, e2, isSuccessor, cfn1, i, bb) and
-      cfn2 = bb.getNode(j) and
-      cfn2 = e2.getAControlFlowNode()
-    |
-      isSuccessor = true and j >= i
-      or
-      isSuccessor = false and i >= j
-    )
-    or
-    exists(ControlFlow::BasicBlock bb |
-      this.reachesBasicBlockExprRec(e1, e2, _, cfn1, bb) and
-      cfn2 = bb.getANode() and
-      cfn2 = e2.getAControlFlowNode()
-    )
-  }
-
-  /**
-   * Holds if there is a control-flow path from `cfn` to `cfnDef`, where `cfn` is a
-   * control-flow node for `e` and `cfnDef` is a control-flow node for `def`.
-   */
-  pragma[nomagic]
-  predicate hasDefPath(
-    Expr e, ControlFlow::Node cfn, AssignableDefinition def, ControlFlow::Node cfnDef
-  ) {
-    exists(ControlFlow::BasicBlock bb, boolean isSuccessor, int i, int j |
-      this.reachesBasicBlockDefinitionBase(e, def, isSuccessor, cfn, i, bb) and
-      cfnDef = bb.getNode(j) and
-      def.getExpr().getAControlFlowNode() = cfnDef
-    |
-      isSuccessor = true and j >= i
-      or
-      isSuccessor = false and i >= j
-    )
-    or
-    exists(ControlFlow::BasicBlock bb |
-      this.reachesBasicBlockDefinitionRec(e, def, _, cfn, bb) and
-      def.getExpr().getAControlFlowNode() = cfnDef and
-      cfnDef = bb.getANode()
-    )
-  }
-}
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 1b3de63495f..afb09f85835 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
@@ -2,11 +2,12 @@ private import csharp
 private import DataFlowPublic
 private import DataFlowDispatch
 private import DataFlowImplCommon
-private import ControlFlowReachability
 private import FlowSummaryImpl as FlowSummaryImpl
 private import semmle.code.csharp.dataflow.FlowSummary as FlowSummary
 private import semmle.code.csharp.dataflow.internal.ExternalFlow
+private import semmle.code.csharp.commons.Collections
 private import semmle.code.csharp.Conversion
+private import semmle.code.csharp.exprs.internal.Expr
 private import semmle.code.csharp.dataflow.internal.SsaImpl as SsaImpl
 private import semmle.code.csharp.ExprOrStmtParent
 private import semmle.code.csharp.Unification
@@ -16,7 +17,6 @@ private import semmle.code.csharp.frameworks.EntityFramework
 private import semmle.code.csharp.frameworks.system.linq.Expressions
 private import semmle.code.csharp.frameworks.NHibernate
 private import semmle.code.csharp.frameworks.Razor
-private import semmle.code.csharp.frameworks.system.Collections
 private import semmle.code.csharp.frameworks.system.threading.Tasks
 private import semmle.code.csharp.internal.Location
 private import codeql.util.Unit
@@ -258,34 +258,16 @@ private module ThisFlow {
   }
 }
 
-/**
- * Holds if there is a control-flow path from `n1` to `n2`. `n2` is either an
- * expression node or an SSA definition node.
- */
-pragma[nomagic]
-predicate hasNodePath(ControlFlowReachabilityConfiguration conf, ExprNode n1, Node n2) {
-  exists(ControlFlow::Node cfn1, ControlFlow::Node cfn2 | conf.hasExprPath(_, cfn1, _, cfn2) |
-    cfn1 = n1.getControlFlowNode() and
-    cfn2 = n2.(ExprNode).getControlFlowNode()
-  )
-  or
-  exists(ControlFlow::Node cfn, AssignableDefinition def, ControlFlow::Node cfnDef |
-    conf.hasDefPath(_, cfn, def, cfnDef) and
-    cfn = n1.getControlFlowNode() and
-    n2 = TAssignableDefinitionNode(def, cfnDef)
-  )
-}
-
 /** 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)
+    e1.getExpr() = LocalFlow::getALastEvalNode(e2.getExpr())
     or
     exists(Ssa::Definition def, AssignableDefinition adef |
-      LocalFlow::defAssigns(adef, _, e1) and
+      LocalFlow::defAssigns(adef, _, _, e1) and
       def.getAnUltimateDefinition().(Ssa::ExplicitDefinition).getADefinition() = adef and
       exists(def.getAReadAtNode(e2))
     )
@@ -378,7 +360,7 @@ module VariableCapture {
         this = def.getExpr().getAControlFlowNode()
       }
 
-      ControlFlow::Node getRhs() { LocalFlow::defAssigns(def, this, result) }
+      ControlFlow::Node getRhs() { LocalFlow::defAssigns(def, this, _, result) }
 
       CapturedVariable getVariable() { result = v }
     }
@@ -527,127 +509,74 @@ module SsaFlow {
 
 /** Provides predicates related to local data flow. */
 module LocalFlow {
-  class LocalExprStepConfiguration extends ControlFlowReachabilityConfiguration {
-    LocalExprStepConfiguration() { this = "LocalExprStepConfiguration" }
-
-    override predicate candidate(
-      Expr e1, Expr e2, ControlFlowElement scope, boolean exactScope, boolean isSuccessor
-    ) {
-      exactScope = false and
-      (
-        e1 = e2.(ParenthesizedExpr).getExpr() and
-        scope = e2 and
-        isSuccessor = true
-        or
-        e1 = e2.(NullCoalescingExpr).getAnOperand() and
-        scope = e2 and
-        isSuccessor = true
-        or
-        e1 = e2.(SuppressNullableWarningExpr).getExpr() and
-        scope = e2 and
-        isSuccessor = true
-        or
-        e2 =
-          any(ConditionalExpr ce |
-            e1 = ce.getThen() or
-            e1 = ce.getElse()
-          ) and
-        scope = e2 and
-        isSuccessor = true
-        or
-        e1 = e2.(Cast).getExpr() and
-        scope = e2 and
-        isSuccessor = true
-        or
-        // An `=` expression, where the result of the expression is used
-        e2 =
-          any(AssignExpr ae |
-            ae.getParent() = any(ControlFlowElement cfe | not cfe instanceof ExprStmt) and
-            e1 = ae.getRValue()
-          ) and
-        scope = e2 and
-        isSuccessor = true
-        or
-        e1 = e2.(ObjectCreation).getInitializer() and
-        scope = e2 and
-        isSuccessor = false
-        or
-        e1 = e2.(ArrayCreation).getInitializer() and
-        scope = e2 and
-        isSuccessor = false
-        or
-        e1 = e2.(SwitchExpr).getACase().getBody() and
-        scope = e2 and
-        isSuccessor = true
-        or
-        e1 = e2.(CheckedExpr).getExpr() and
-        scope = e2 and
-        isSuccessor = true
-        or
-        e1 = e2.(UncheckedExpr).getExpr() and
-        scope = e2 and
-        isSuccessor = true
-        or
-        e1 = e2.(CollectionExpression).getAnElement() and
-        e1 instanceof SpreadElementExpr and
-        scope = e2 and
-        isSuccessor = true
-        or
-        e1 = e2.(SpreadElementExpr).getExpr() and
-        scope = e2 and
-        isSuccessor = true
-        or
-        exists(WithExpr we |
-          scope = we and
-          isSuccessor = true
-        |
-          e1 = we.getExpr() and
-          e2 = we.getInitializer()
-          or
-          e1 = we.getInitializer() and
-          e2 = we
-        )
-        or
-        scope = any(AssignExpr ae | ae.getLValue().(TupleExpr) = e2 and ae.getRValue() = e1) and
-        isSuccessor = false
-        or
-        isSuccessor = true and
-        exists(ControlFlowElement cfe | cfe = e2.(TupleExpr).(PatternExpr).getPatternMatch() |
-          cfe.(IsExpr).getExpr() = e1 and scope = cfe
-          or
-          exists(Switch sw | sw.getACase() = cfe and sw.getExpr() = e1 and scope = sw)
-        )
+  predicate localExprStep(Expr e1, Expr e2) {
+    e1 = e2.(ParenthesizedExpr).getExpr()
+    or
+    e1 = e2.(NullCoalescingOperation).getAnOperand()
+    or
+    e1 = e2.(SuppressNullableWarningExpr).getExpr()
+    or
+    e2 =
+      any(ConditionalExpr ce |
+        e1 = ce.getThen() or
+        e1 = ce.getElse()
       )
-    }
-
-    override predicate candidateDef(
-      Expr e, AssignableDefinition def, ControlFlowElement scope, boolean exactScope,
-      boolean isSuccessor
-    ) {
-      // Flow from source to definition
-      exactScope = false and
-      def.getSource() = e and
-      (
-        scope = def.getExpr() and
-        isSuccessor = true
-        or
-        scope = def.(AssignableDefinitions::PatternDefinition).getMatch().(IsExpr) and
-        isSuccessor = false
-        or
-        exists(Switch s |
-          s.getACase() = def.(AssignableDefinitions::PatternDefinition).getMatch() and
-          isSuccessor = true
-        |
-          scope = s.getExpr()
-          or
-          scope = s.getACase()
-        )
+    or
+    e1 = e2.(Cast).getExpr()
+    or
+    // An `=` expression, where the result of the expression is used
+    e2 =
+      any(AssignExpr ae |
+        ae.getParent() = any(ControlFlowElement cfe | not cfe instanceof ExprStmt) and
+        e1 = ae.getRValue()
       )
-    }
+    or
+    e1 = e2.(ObjectCreation).getInitializer()
+    or
+    e1 = e2.(ArrayCreation).getInitializer()
+    or
+    e1 = e2.(SwitchExpr).getACase().getBody()
+    or
+    e1 = e2.(CheckedExpr).getExpr()
+    or
+    e1 = e2.(UncheckedExpr).getExpr()
+    or
+    e1 = e2.(CollectionExpression).getAnElement() and
+    e1 instanceof SpreadElementExpr
+    or
+    e1 = e2.(SpreadElementExpr).getExpr()
+    or
+    exists(WithExpr we |
+      e1 = we.getExpr() and
+      e2 = we.getInitializer()
+      or
+      e1 = we.getInitializer() and
+      e2 = we
+    )
+    or
+    exists(AssignExpr ae | ae.getLValue().(TupleExpr) = e2 and ae.getRValue() = e1)
+    or
+    exists(ControlFlowElement cfe | cfe = e2.(TupleExpr).(PatternExpr).getPatternMatch() |
+      cfe.(IsExpr).getExpr() = e1
+      or
+      exists(Switch sw | sw.getACase() = cfe and sw.getExpr() = e1)
+    )
   }
 
-  predicate defAssigns(AssignableDefinition def, ControlFlow::Node cfnDef, ControlFlow::Node value) {
-    any(LocalExprStepConfiguration x).hasDefPath(_, value, def, cfnDef)
+  predicate defAssigns(
+    AssignableDefinition def, ControlFlow::Node cfnDef, Expr value, ControlFlow::Node valueCfn
+  ) {
+    def.getSource() = value and
+    valueCfn = value.getControlFlowNode() and
+    cfnDef = def.getExpr().getAControlFlowNode()
+  }
+
+  private predicate defAssigns(ExprNode value, AssignableDefinitionNode defNode) {
+    exists(ControlFlow::Node cfn, AssignableDefinition def, ControlFlow::Node cfnDef |
+      defAssigns(def, cfnDef, value.getExpr(), _) and
+      cfn = value.getControlFlowNode() and
+      defNode = TAssignableDefinitionNode(def, cfnDef)
+    )
   }
 
   /**
@@ -658,7 +587,9 @@ module LocalFlow {
   }
 
   predicate localFlowStepCommon(Node nodeFrom, Node nodeTo) {
-    hasNodePath(any(LocalExprStepConfiguration x), nodeFrom, nodeTo)
+    localExprStep(nodeFrom.asExpr(), nodeTo.asExpr())
+    or
+    defAssigns(nodeFrom, nodeTo)
     or
     ThisFlow::adjacentThisRefs(nodeFrom, nodeTo) and
     nodeFrom != nodeTo
@@ -684,14 +615,15 @@ module LocalFlow {
   }
 
   /**
-   * Gets a node that may execute last in `n`, and which, when it executes last,
-   * will be the value of `n`.
+   * Gets a node that may execute last in `e`, and which, when it executes last,
+   * will be the value of `e`.
    */
-  ControlFlow::Nodes::ExprNode getALastEvalNode(ControlFlow::Nodes::ExprNode cfn) {
-    exists(Expr e | any(LocalExprStepConfiguration x).hasExprPath(_, result, e, cfn) |
+  Expr getALastEvalNode(Expr e) {
+    localExprStep(result, e) and
+    (
       e instanceof ConditionalExpr or
       e instanceof Cast or
-      e instanceof NullCoalescingExpr or
+      e instanceof NullCoalescingOperation or
       e instanceof SwitchExpr or
       e instanceof SuppressNullableWarningExpr or
       e instanceof AssignExpr
@@ -712,9 +644,7 @@ module LocalFlow {
    * we add a reverse flow step from `[post] b ? x : y` to `[post] x` and to
    * `[post] y`, in order for the side-effect of `m` to reach both `x` and `y`.
    */
-  ControlFlow::Nodes::ExprNode getPostUpdateReverseStep(ControlFlow::Nodes::ExprNode e) {
-    result = getALastEvalNode(e)
-  }
+  Expr getPostUpdateReverseStep(Expr e) { result = getALastEvalNode(e) }
 
   /**
    * Holds if the value of `node2` is given by `node1`.
@@ -728,9 +658,10 @@ module LocalFlow {
       e instanceof ThisAccess or e instanceof BaseAccess
     )
     or
-    hasNodePath(any(LocalExprStepConfiguration x), node1, node2) and
+    defAssigns(node1, node2)
+    or
+    localExprStep(node1.asExpr(), node2.asExpr()) and
     (
-      node2 instanceof AssignableDefinitionNode or
       node2.asExpr() instanceof Cast or
       node2.asExpr() instanceof AssignExpr
     )
@@ -774,12 +705,8 @@ predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo, string model) {
     or
     nodeTo = nodeFrom.(LocalFunctionCreationNode).getAnAccess(true)
     or
-    nodeTo.(PostUpdateNode).getPreUpdateNode().(ExprNode).getControlFlowNode() =
-      LocalFlow::getPostUpdateReverseStep(nodeFrom
-            .(PostUpdateNode)
-            .getPreUpdateNode()
-            .(ExprNode)
-            .getControlFlowNode())
+    nodeTo.(PostUpdateNode).getPreUpdateNode().asExpr() =
+      LocalFlow::getPostUpdateReverseStep(nodeFrom.(PostUpdateNode).getPreUpdateNode().asExpr())
   ) and
   model = ""
   or
@@ -833,11 +760,11 @@ private class Argument extends Expr {
 }
 
 /**
- * Holds if `e` is an assignment of `src` to field or property `c` of `q`.
+ * Holds if there is an assignment of `src` to field or property `c` of `q`.
  *
  * `postUpdate` indicates whether the store targets a post-update node.
  */
-private predicate fieldOrPropertyStore(Expr e, ContentSet c, Expr src, Expr q, boolean postUpdate) {
+private predicate fieldOrPropertyStore(ContentSet c, Expr src, Expr q, boolean postUpdate) {
   exists(FieldOrProperty f |
     c = f.getContentSet() and
     (
@@ -860,25 +787,20 @@ private predicate fieldOrPropertyStore(Expr e, ContentSet c, Expr src, Expr q, b
       f = fa.getTarget() and
       src = def.getSource() and
       q = fa.getQualifier() and
-      e = def.getExpr() and
       postUpdate = true
     )
     or
     // `with` expression initializer, `x with { f = src }`
-    e =
-      any(WithExpr we |
-        exists(MemberInitializer mi |
-          q = we and
-          mi = we.getInitializer().getAMemberInitializer() and
-          f = mi.getInitializedMember() and
-          src = mi.getRValue() and
-          postUpdate = false
-        )
-      )
+    exists(WithExpr we, MemberInitializer mi |
+      q = we and
+      mi = we.getInitializer().getAMemberInitializer() and
+      f = mi.getInitializedMember() and
+      src = mi.getRValue() and
+      postUpdate = false
+    )
     or
     // Object initializer, `new C() { f = src }`
     exists(MemberInitializer mi |
-      e = q and
       mi = q.(ObjectInitializer).getAMemberInitializer() and
       q.getParent() instanceof ObjectCreation and
       f = mi.getInitializedMember() and
@@ -887,16 +809,13 @@ private predicate fieldOrPropertyStore(Expr e, ContentSet c, Expr src, Expr q, b
     )
     or
     // Tuple element, `(..., src, ...)` `f` is `ItemX` of tuple `q`
-    e =
-      any(TupleExpr te |
-        exists(int i |
-          e = q and
-          src = te.getArgument(i) and
-          te.isConstruction() and
-          f = q.getType().(TupleType).getElement(i) and
-          postUpdate = false
-        )
-      )
+    exists(TupleExpr te, int i |
+      te = q and
+      src = te.getArgument(i) and
+      te.isConstruction() and
+      f = q.getType().(TupleType).getElement(i) and
+      postUpdate = false
+    )
   )
   or
   // A write to a dynamic property
@@ -906,7 +825,6 @@ private predicate fieldOrPropertyStore(Expr e, ContentSet c, Expr src, Expr q, b
     c.isDynamicProperty(dp) and
     src = def.getSource() and
     q = dma.getQualifier() and
-    e = def.getExpr() and
     postUpdate = true
   )
 }
@@ -942,22 +860,20 @@ private predicate collectionStore(Expr src, CollectionExpression ce) {
 }
 
 /**
- * Holds if `e` is an expression that adds `src` to array `a`.
+ * Holds if there is an expression that adds `src` to array `a`.
  *
  * `postUpdate` indicates whether the store targets a post-update node.
  */
-private predicate arrayStore(Expr e, Expr src, Expr a, boolean postUpdate) {
+private predicate arrayStore(Expr src, Expr a, boolean postUpdate) {
   // Direct assignment, `a[i] = src`
   exists(AssignableDefinition def |
     a = def.getTargetAccess().(ArrayWrite).getQualifier() and
     src = def.getSource() and
-    e = def.getExpr() and
     postUpdate = true
   )
   or
   // Array initializer, `new [] { src }`
   src = a.(ArrayInitializer).getAnElement() and
-  e = a and
   postUpdate = false
   or
   // Member initializer, `new C { Array = { [i] = src } }`
@@ -965,7 +881,6 @@ private predicate arrayStore(Expr e, Expr src, Expr a, boolean postUpdate) {
     mi = a.(ObjectInitializer).getAMemberInitializer() and
     mi.getLValue() instanceof ArrayAccess and
     mi.getRValue() = src and
-    e = a and
     postUpdate = false
   )
 }
@@ -1087,7 +1002,7 @@ predicate exprMayHavePostUpdateNode(Expr e) {
     or
     t = any(TypeParameter tp | not tp.isValueType())
     or
-    t.isRefLikeType()
+    t instanceof Struct
   )
 }
 
@@ -1140,17 +1055,17 @@ private module Cached {
       (
         cfn.getExpr() instanceof Argument
         or
-        cfn =
-          LocalFlow::getPostUpdateReverseStep(any(ControlFlow::Nodes::ExprNode e |
-              exists(any(SourcePostUpdateNode p).getPreUpdateNode().asExprAtNode(e))
-            ))
+        cfn.getExpr() =
+          LocalFlow::getPostUpdateReverseStep(any(SourcePostUpdateNode p)
+                .getPreUpdateNode()
+                .asExpr())
       ) and
       exprMayHavePostUpdateNode(cfn.getExpr())
       or
       exists(Expr e | e = cfn.getExpr() |
-        fieldOrPropertyStore(_, _, _, e, true)
+        fieldOrPropertyStore(_, _, e, true)
         or
-        arrayStore(_, _, e, true)
+        arrayStore(_, e, true)
         or
         // needed for reverse stores; e.g. `x.f1.f2 = y` induces
         // a store step of `f1` into `x`
@@ -1165,7 +1080,7 @@ private module Cached {
         )
       )
       or
-      lambdaCallExpr(_, cfn)
+      lambdaCallExpr(_, _, cfn)
     } or
     TFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn) {
       sn.getSummarizedCallable() instanceof CallableUsedInSource
@@ -1562,35 +1477,15 @@ abstract private class ArgumentNodeImpl extends Node {
 }
 
 private module ArgumentNodes {
-  private class ArgumentConfiguration extends ControlFlowReachabilityConfiguration {
-    ArgumentConfiguration() { this = "ArgumentConfiguration" }
-
-    override predicate candidate(
-      Expr e1, Expr e2, ControlFlowElement scope, boolean exactScope, boolean isSuccessor
-    ) {
-      e1.(Argument).isArgumentOf(e2, _) and
-      exactScope = false and
-      isSuccessor = true and
-      if e2 instanceof PropertyWrite
-      then
-        exists(AssignableDefinition def |
-          def.getTargetAccess() = e2 and
-          scope = def.getExpr()
-        )
-      else scope = e2
-    }
-  }
-
   /** A data-flow node that represents an explicit call argument. */
   class ExplicitArgumentNode extends ArgumentNodeImpl {
     ExplicitArgumentNode() { this.asExpr() instanceof Argument }
 
     override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
-      exists(ArgumentConfiguration x, Expr c, Argument arg |
+      exists(Expr c, Argument arg |
         arg = this.asExpr() and
         c = call.getExpr() and
-        arg.isArgumentOf(c, pos) and
-        x.hasExprPath(_, this.getControlFlowNode(), _, call.getControlFlowNode())
+        arg.isArgumentOf(c, pos)
       )
     }
   }
@@ -1599,7 +1494,7 @@ private module ArgumentNodes {
   class DelegateSelfArgumentNode extends ArgumentNodeImpl, ExprNode {
     private DataFlowCall call_;
 
-    DelegateSelfArgumentNode() { lambdaCallExpr(call_, this.getControlFlowNode()) }
+    DelegateSelfArgumentNode() { lambdaCallExpr(call_, this.getExpr(), _) }
 
     override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
       call = call_ and
@@ -1856,27 +1751,6 @@ private module OutNodes {
     }
   }
 
-  class ObjectOrCollectionInitializerConfiguration extends ControlFlowReachabilityConfiguration {
-    ObjectOrCollectionInitializerConfiguration() {
-      this = "ObjectOrCollectionInitializerConfiguration"
-    }
-
-    override predicate candidate(
-      Expr e1, Expr e2, ControlFlowElement scope, boolean exactScope, boolean isSuccessor
-    ) {
-      exactScope = false and
-      scope = e1 and
-      isSuccessor = true and
-      exists(ObjectOrCollectionInitializer init | init = e1.(ObjectCreation).getInitializer() |
-        // E.g. `new Dictionary<int, string>{ {0, "a"}, {1, "b"} }`
-        e2 = init.(CollectionInitializer).getAnElementInitializer()
-        or
-        // E.g. `new Dictionary<int, string>() { [0] = "a", [1] = "b" }`
-        e2 = init.(ObjectInitializer).getAMemberInitializer().getLValue()
-      )
-    }
-  }
-
   /**
    * A data-flow node that reads a value returned by a callable using an
    * `out` or `ref` parameter.
@@ -2235,30 +2109,6 @@ predicate jumpStep(Node pred, Node succ) {
   succ = pred.(LocalFunctionCreationNode).getAnAccess(false)
 }
 
-private class StoreStepConfiguration extends ControlFlowReachabilityConfiguration {
-  StoreStepConfiguration() { this = "StoreStepConfiguration" }
-
-  override predicate candidate(
-    Expr e1, Expr e2, ControlFlowElement scope, boolean exactScope, boolean isSuccessor
-  ) {
-    exactScope = false and
-    fieldOrPropertyStore(scope, _, e1, e2, isSuccessor.booleanNot())
-    or
-    exactScope = false and
-    arrayStore(scope, e1, e2, isSuccessor.booleanNot())
-    or
-    exactScope = false and
-    isSuccessor = true and
-    collectionStore(e1, e2) and
-    scope = e2
-    or
-    exactScope = false and
-    isSuccessor = true and
-    isParamsArg(e2, e1, _) and
-    scope = e2
-  }
-}
-
 pragma[nomagic]
 private ContentSet getResultContent() {
   result.isProperty(any(SystemThreadingTasksTaskTClass c_).getResultProperty())
@@ -2281,21 +2131,17 @@ private predicate recordParameter(RecordType t, Parameter p, string name) {
 }
 
 private predicate storeContentStep(Node node1, Content c, Node node2) {
-  exists(StoreStepConfiguration x, ExprNode node, boolean postUpdate |
-    hasNodePath(x, node1, node) and
+  exists(ExprNode node, boolean postUpdate |
     if postUpdate = true then node = node2.(PostUpdateNode).getPreUpdateNode() else node = node2
   |
-    arrayStore(_, node1.asExpr(), node.getExpr(), postUpdate) and c instanceof ElementContent
+    arrayStore(node1.asExpr(), node.getExpr(), postUpdate) and c instanceof ElementContent
   )
   or
-  exists(StoreStepConfiguration x | hasNodePath(x, node1, node2) |
-    collectionStore(node1.asExpr(), node2.asExpr()) and c instanceof ElementContent
-  )
+  collectionStore(node1.asExpr(), node2.asExpr()) and c instanceof ElementContent
   or
-  exists(StoreStepConfiguration x, Expr arg, ControlFlow::Node callCfn |
-    x.hasExprPath(arg, node1.(ExprNode).getControlFlowNode(), _, callCfn) and
-    node2 = TParamsArgumentNode(callCfn) and
-    isParamsArg(_, arg, _) and
+  exists(Call call |
+    node2 = TParamsArgumentNode(call.getControlFlowNode()) and
+    isParamsArg(call, node1.asExpr(), _) and
     c instanceof ElementContent
   )
   or
@@ -2351,11 +2197,10 @@ predicate storeStep(Node node1, ContentSet c, Node node2) {
     c.isSingleton(cont)
   )
   or
-  exists(StoreStepConfiguration x, ExprNode node, boolean postUpdate |
-    hasNodePath(x, node1, node) and
+  exists(ExprNode node, boolean postUpdate |
     if postUpdate = true then node = node2.(PostUpdateNode).getPreUpdateNode() else node = node2
   |
-    fieldOrPropertyStore(_, c, node1.asExpr(), node.getExpr(), postUpdate)
+    fieldOrPropertyStore(c, node1.asExpr(), node.getExpr(), postUpdate)
   )
   or
   exists(Expr e |
@@ -2377,123 +2222,51 @@ predicate storeStep(Node node1, ContentSet c, Node node2) {
   storeStepDelegateCall(node1, c, node2)
 }
 
-private class ReadStepConfiguration extends ControlFlowReachabilityConfiguration {
-  ReadStepConfiguration() { this = "ReadStepConfiguration" }
-
-  override predicate candidate(
-    Expr e1, Expr e2, ControlFlowElement scope, boolean exactScope, boolean isSuccessor
-  ) {
-    exactScope = false and
-    isSuccessor = true and
-    fieldOrPropertyRead(e1, _, e2) and
-    scope = e2
-    or
-    exactScope = false and
-    isSuccessor = true and
-    dynamicPropertyRead(e1, _, e2) and
-    scope = e2
-    or
-    exactScope = false and
-    isSuccessor = true and
-    arrayRead(e1, e2) and
-    scope = e2
-    or
-    exactScope = false and
-    e1 = e2.(AwaitExpr).getExpr() and
-    scope = e2 and
-    isSuccessor = true
-    or
-    exactScope = false and
-    e2 = e1.(TupleExpr).getAnArgument() and
-    scope = e1 and
-    isSuccessor = false
-  }
-
-  override predicate candidateDef(
-    Expr e, AssignableDefinition defTo, ControlFlowElement scope, boolean exactScope,
-    boolean isSuccessor
-  ) {
-    exists(ForeachStmt fs |
-      e = fs.getIterableExpr() and
-      defTo.(AssignableDefinitions::LocalVariableDefinition).getDeclaration() =
-        fs.getVariableDeclExpr() and
-      isSuccessor = true
-    |
-      scope = fs and
-      exactScope = true
-      or
-      scope = fs.getIterableExpr() and
-      exactScope = false
-      or
-      scope = fs.getVariableDeclExpr() and
-      exactScope = false
-    )
-    or
-    scope =
-      any(AssignExpr ae |
-        ae = defTo.(AssignableDefinitions::TupleAssignmentDefinition).getAssignment() and
-        e = ae.getLValue().getAChildExpr*().(TupleExpr) and
-        exactScope = false and
-        isSuccessor = true
-      )
-    or
-    scope =
-      any(TupleExpr te |
-        te.getAnArgument() = defTo.(AssignableDefinitions::LocalVariableDefinition).getDeclaration() and
-        e = te and
-        exactScope = false and
-        isSuccessor = false
-      )
-  }
-}
-
 private predicate readContentStep(Node node1, Content c, Node node2) {
-  exists(ReadStepConfiguration x |
-    hasNodePath(x, node1, node2) and
-    arrayRead(node1.asExpr(), node2.asExpr()) and
+  arrayRead(node1.asExpr(), node2.asExpr()) and
+  c instanceof ElementContent
+  or
+  exists(
+    ForeachStmt fs, Ssa::ExplicitDefinition def,
+    AssignableDefinitions::LocalVariableDefinition defTo
+  |
+    node1.asExpr() = fs.getIterableExpr() and
+    defTo.getDeclaration() = fs.getVariableDeclExpr() and
+    def.getADefinition() = defTo and
+    node2.(SsaDefinitionNode).getDefinition() = def and
     c instanceof ElementContent
+  )
+  or
+  node1 =
+    any(InstanceParameterAccessPreNode n |
+      n.getUnderlyingControlFlowNode() = node2.(ExprNode).getControlFlowNode() and
+      n.getParameter() = c.(PrimaryConstructorParameterContent).getParameter()
+    ) and
+  node2.asExpr() instanceof ParameterRead
+  or
+  // node1 = (..., node2, ...)
+  // node1.ItemX flows to node2
+  exists(TupleExpr te, int i, Expr item |
+    te = node1.asExpr() and
+    not te.isConstruction() and
+    c.(FieldContent).getField() = te.getType().(TupleType).getElement(i).getUnboundDeclaration() and
+    // node1 = (..., item, ...)
+    te.getArgument(i) = item
+  |
+    // item = (..., ..., ...) in node1 = (..., (..., ..., ...), ...)
+    node2.asExpr().(TupleExpr) = item
     or
-    exists(ForeachStmt fs, Ssa::ExplicitDefinition def |
-      x.hasDefPath(fs.getIterableExpr(), node1.getControlFlowNode(), def.getADefinition(),
-        def.getControlFlowNode()) and
-      node2.(SsaDefinitionNode).getDefinition() = def and
-      c instanceof ElementContent
+    // item = variable in node1 = (..., variable, ...)
+    exists(AssignableDefinitions::TupleAssignmentDefinition tad |
+      node2.(AssignableDefinitionNode).getDefinition() = tad and
+      tad.getLeaf() = item
     )
     or
-    node1 =
-      any(InstanceParameterAccessPreNode n |
-        n.getUnderlyingControlFlowNode() = node2.(ExprNode).getControlFlowNode() and
-        n.getParameter() = c.(PrimaryConstructorParameterContent).getParameter()
-      ) and
-    node2.asExpr() instanceof ParameterRead
-    or
-    // node1 = (..., node2, ...)
-    // node1.ItemX flows to node2
-    exists(TupleExpr te, int i, Expr item |
-      te = node1.asExpr() and
-      not te.isConstruction() and
-      c.(FieldContent).getField() = te.getType().(TupleType).getElement(i).getUnboundDeclaration() and
-      // node1 = (..., item, ...)
-      te.getArgument(i) = item
-    |
-      // item = (..., ..., ...) in node1 = (..., (..., ..., ...), ...)
-      node2.asExpr().(TupleExpr) = item and
-      hasNodePath(x, node1, node2)
-      or
-      // item = variable in node1 = (..., variable, ...)
-      exists(AssignableDefinitions::TupleAssignmentDefinition tad |
-        node2.(AssignableDefinitionNode).getDefinition() = tad and
-        tad.getLeaf() = item and
-        hasNodePath(x, node1, node2)
-      )
-      or
-      // item = variable in node1 = (..., variable, ...) in a case/is var (..., ...)
-      te = any(PatternExpr pe).getAChildExpr*() and
-      exists(AssignableDefinitions::LocalVariableDefinition lvd |
-        node2.(AssignableDefinitionNode).getDefinition() = lvd and
-        lvd.getDeclaration() = item and
-        hasNodePath(x, node1, node2)
-      )
+    // item = variable in node1 = (..., variable, ...) in a case/is var (..., ...)
+    isPatternExprDescendant(te) and
+    exists(AssignableDefinitions::LocalVariableDefinition lvd |
+      node2.(AssignableDefinitionNode).getDefinition() = lvd and
+      lvd.getDeclaration() = item
     )
   )
   or
@@ -2524,14 +2297,12 @@ predicate readStep(Node node1, ContentSet c, Node node2) {
     c.isSingleton(cont)
   )
   or
-  exists(ReadStepConfiguration x | hasNodePath(x, node1, node2) |
-    fieldOrPropertyRead(node1.asExpr(), c, node2.asExpr())
-    or
-    dynamicPropertyRead(node1.asExpr(), c, node2.asExpr())
-    or
-    node2.asExpr().(AwaitExpr).getExpr() = node1.asExpr() and
-    c = getResultContent()
-  )
+  fieldOrPropertyRead(node1.asExpr(), c, node2.asExpr())
+  or
+  dynamicPropertyRead(node1.asExpr(), c, node2.asExpr())
+  or
+  node2.asExpr().(AwaitExpr).getExpr() = node1.asExpr() and
+  c = getResultContent()
   or
   FlowSummaryImpl::Private::Steps::summaryReadStep(node1.(FlowSummaryNode).getSummaryNode(), c,
     node2.(FlowSummaryNode).getSummaryNode())
@@ -2545,6 +2316,7 @@ private predicate clearsCont(Node n, Content c) {
     a.getType() = s and
     f = s.getAField() and
     c.(FieldContent).getField() = f.getUnboundDeclaration() and
+    not f.getType() instanceof CollectionType and
     not f.isRef()
   )
   or
@@ -2564,9 +2336,9 @@ predicate clearsContent(Node n, ContentSet c) {
     c.isSingleton(cont)
   )
   or
-  fieldOrPropertyStore(_, c, _, n.asExpr(), true)
+  fieldOrPropertyStore(c, _, n.asExpr(), true)
   or
-  fieldOrPropertyStore(_, c, _, n.(ObjectInitializerNode).getInitializer(), false)
+  fieldOrPropertyStore(c, _, n.(ObjectInitializerNode).getInitializer(), false)
   or
   FlowSummaryImpl::Private::Steps::summaryClearsContent(n.(FlowSummaryNode).getSummaryNode(), c)
   or
@@ -2805,8 +2577,13 @@ module PostUpdateNodes {
 
     override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
       pos.isQualifier() and
-      any(ObjectOrCollectionInitializerConfiguration x)
-          .hasExprPath(_, cfn, _, call.getControlFlowNode())
+      exists(ObjectOrCollectionInitializer init | init = oc.getInitializer() |
+        // E.g. `new Dictionary<int, string>{ {0, "a"}, {1, "b"} }`
+        call.getExpr() = init.(CollectionInitializer).getAnElementInitializer()
+        or
+        // E.g. `new Dictionary<int, string>() { [0] = "a", [1] = "b" }`
+        call.getExpr() = init.(ObjectInitializer).getAMemberInitializer().getLValue()
+      )
     }
 
     override DataFlowCallable getEnclosingCallableImpl() {
@@ -2968,45 +2745,26 @@ private predicate isLocalFunctionCallReceiver(
   f = receiver.getTarget().getUnboundDeclaration()
 }
 
-private class LambdaConfiguration extends ControlFlowReachabilityConfiguration {
-  LambdaConfiguration() { this = "LambdaConfiguration" }
-
-  override predicate candidate(
-    Expr e1, Expr e2, ControlFlowElement scope, boolean exactScope, boolean isSuccessor
-  ) {
-    e1 = e2.(DelegateLikeCall).getExpr() and
-    exactScope = false and
-    scope = e2 and
-    isSuccessor = true
-    or
-    e1 = e2.(DelegateCreation).getArgument() and
-    exactScope = false and
-    scope = e2 and
-    isSuccessor = true
-    or
-    isLocalFunctionCallReceiver(e2, e1, _) and
-    exactScope = false and
-    scope = e2 and
-    isSuccessor = true
-  }
-}
-
-private predicate lambdaCallExpr(DataFlowCall call, ControlFlow::Node receiver) {
-  exists(LambdaConfiguration x, DelegateLikeCall dc |
-    x.hasExprPath(dc.getExpr(), receiver, dc, call.getControlFlowNode())
+private predicate lambdaCallExpr(DataFlowCall call, Expr receiver, ControlFlow::Node receiverCfn) {
+  exists(DelegateLikeCall dc |
+    call.(ExplicitDelegateLikeDataFlowCall).getCall() = dc and
+    receiver = dc.getExpr() and
+    receiverCfn = receiver.getControlFlowNode()
   )
   or
   // In local function calls, `F()`, we use the local function access `F`
   // to represent the receiver. Only needed for flow through captured variables.
-  exists(LambdaConfiguration x, LocalFunctionCall fc |
-    x.hasExprPath(fc.getAChild(), receiver, fc, call.getControlFlowNode())
+  exists(LocalFunctionCall fc |
+    receiver = fc.getAChild() and
+    receiverCfn = receiver.getControlFlowNode() and
+    fc.getControlFlowNode() = call.getControlFlowNode()
   )
 }
 
 /** Holds if `call` is a lambda call where `receiver` is the lambda expression. */
 predicate lambdaCall(DataFlowCall call, LambdaCallKind kind, Node receiver) {
   (
-    lambdaCallExpr(call, receiver.(ExprNode).getControlFlowNode()) and
+    lambdaCallExpr(call, receiver.asExpr(), _) and
     // local function calls can be resolved directly without a flow analysis
     not call.getControlFlowNode().getAstNode() instanceof LocalFunctionCall
     or
@@ -3016,9 +2774,9 @@ predicate lambdaCall(DataFlowCall call, LambdaCallKind kind, Node receiver) {
 }
 
 private predicate delegateCreationStep(Node nodeFrom, Node nodeTo) {
-  exists(LambdaConfiguration x, DelegateCreation dc |
-    x.hasExprPath(dc.getArgument(), nodeFrom.(ExprNode).getControlFlowNode(), dc,
-      nodeTo.(ExprNode).getControlFlowNode())
+  exists(DelegateCreation dc |
+    dc.getArgument() = nodeFrom.asExpr() and
+    dc = nodeTo.asExpr()
   )
 }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlow.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlow.qll
index edfaae018e9..024e9cf119d 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlow.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/ExternalFlow.qll
@@ -239,12 +239,25 @@ module ModelValidation {
     )
   }
 
+  private string getIncorrectConstructorSummaryOutput() {
+    exists(string namespace, string type, string name, string output |
+      type = name or
+      type = name + "<" + any(string s)
+    |
+      summaryModel(namespace, type, _, name, _, _, _, output, _, _, _) and
+      output.matches("ReturnValue%") and
+      result =
+        "Constructor model for " + namespace + "." + type +
+          " should use `Argument[this]` in the output, not `ReturnValue`."
+    )
+  }
+
   /** Holds if some row in a MaD flow model appears to contain typos. */
   query predicate invalidModelRow(string msg) {
     msg =
       [
         getInvalidModelSignature(), getInvalidModelInput(), getInvalidModelOutput(),
-        KindVal::getInvalidModelKind()
+        getIncorrectConstructorSummaryOutput(), KindVal::getInvalidModelKind()
       ]
   }
 }
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 b24a104d388..d3ae19c6d18 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll
@@ -4,7 +4,6 @@ private import FlowSummaryImpl as FlowSummaryImpl
 private import semmle.code.csharp.Caching
 private import semmle.code.csharp.dataflow.internal.DataFlowDispatch
 private import semmle.code.csharp.dataflow.internal.DataFlowPrivate
-private import semmle.code.csharp.dataflow.internal.ControlFlowReachability
 private import semmle.code.csharp.dispatch.Dispatch
 private import semmle.code.csharp.commons.ComparisonTest
 // import `TaintedMember` definitions from other files to avoid potential reevaluation
@@ -45,72 +44,58 @@ predicate defaultImplicitTaintRead(DataFlow::Node node, DataFlow::ContentSet c)
   )
 }
 
-private class LocalTaintExprStepConfiguration extends ControlFlowReachabilityConfiguration {
-  LocalTaintExprStepConfiguration() { this = "LocalTaintExprStepConfiguration" }
-
-  override predicate candidate(
-    Expr e1, Expr e2, ControlFlowElement scope, boolean exactScope, boolean isSuccessor
-  ) {
-    exactScope = false and
-    isSuccessor = true and
-    (
-      e1 = e2.(ElementAccess).getQualifier() and
-      scope = e2
-      or
-      e1 = e2.(AddExpr).getAnOperand() and
-      scope = e2
-      or
-      // A comparison expression where taint can flow from one of the
-      // operands if the other operand is a constant value.
-      exists(ComparisonTest ct, Expr other |
-        ct.getExpr() = e2 and
-        e1 = ct.getAnArgument() and
-        other = ct.getAnArgument() and
-        other.stripCasts().hasValue() and
-        e1 != other and
-        scope = e2
-      )
-      or
-      e1 = e2.(UnaryLogicalOperation).getAnOperand() and
-      scope = e2
-      or
-      e1 = e2.(BinaryLogicalOperation).getAnOperand() and
-      scope = e2
-      or
-      e1 = e2.(InterpolatedStringExpr).getAChild() and
-      scope = e2
-      or
-      e1 = e2.(InterpolatedStringInsertExpr).getInsert() and
-      scope = e2
-      or
-      e2 =
-        any(OperatorCall oc |
-          oc.getTarget().(ConversionOperator).fromLibrary() and
-          e1 = oc.getAnArgument() and
-          scope = e2
-        )
-      or
-      e1 = e2.(AwaitExpr).getExpr() and
-      scope = e2
-      or
-      // Taint flows from the operand of a cast to the cast expression if the cast is to an interpolated string handler.
-      e2 =
-        any(CastExpr ce |
-          e1 = ce.getExpr() and
-          scope = ce and
-          ce.getTargetType()
-              .(Attributable)
-              .getAnAttribute()
-              .getType()
-              .hasFullyQualifiedName("System.Runtime.CompilerServices",
-                "InterpolatedStringHandlerAttribute")
-        )
+private predicate localTaintExprStep(Expr e1, Expr e2) {
+  e1 = e2.(ElementAccess).getQualifier()
+  or
+  e1 = e2.(AddOperation).getAnOperand()
+  or
+  // A comparison expression where taint can flow from one of the
+  // operands if the other operand is a constant value.
+  exists(ComparisonTest ct, Expr other |
+    ct.getExpr() = e2 and
+    e1 = ct.getAnArgument() and
+    other = ct.getAnArgument() and
+    other.stripCasts().hasValue() and
+    e1 != other
+  )
+  or
+  e1 = e2.(UnaryLogicalOperation).getAnOperand()
+  or
+  e1 = e2.(BinaryLogicalOperation).getAnOperand()
+  or
+  e1 = e2.(InterpolatedStringExpr).getAChild()
+  or
+  e1 = e2.(InterpolatedStringInsertExpr).getInsert()
+  or
+  e2 =
+    any(OperatorCall oc |
+      oc.getTarget().(ConversionOperator).fromLibrary() and
+      e1 = oc.getAnArgument()
+    )
+  or
+  e1 = e2.(AwaitExpr).getExpr()
+  or
+  // Taint flows from the operand of a cast to the cast expression if the cast is to an interpolated string handler.
+  e2 =
+    any(CastExpr ce |
+      e1 = ce.getExpr() and
+      ce.getTargetType()
+          .(Attributable)
+          .getAnAttribute()
+          .getType()
+          .hasFullyQualifiedName("System.Runtime.CompilerServices",
+            "InterpolatedStringHandlerAttribute")
     )
-  }
 }
 
+private Expr getALastEvalNode(OperatorCall oc) {
+  localTaintExprStep(result, oc) and oc.getTarget() instanceof ImplicitConversionOperator
+}
+
+private Expr getPostUpdateReverseStep(Expr e) { result = getALastEvalNode(e) }
+
 private predicate localTaintStepCommon(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
-  hasNodePath(any(LocalTaintExprStepConfiguration x), nodeFrom, nodeTo)
+  localTaintExprStep(nodeFrom.asExpr(), nodeTo.asExpr())
 }
 
 cached
@@ -177,6 +162,12 @@ private module Cached {
       readStep(nodeFrom, any(DataFlow::ContentSet c | c.isElement()), nodeTo)
       or
       nodeTo = nodeFrom.(DataFlow::NonLocalJumpNode).getAJumpSuccessor(false)
+      or
+      // Allow reverse update flow for implicit conversion operator calls.
+      // This is needed to support flow out of method call arguments, where an implicit conversion is applied
+      // to a call argument.
+      nodeTo.(PostUpdateNode).getPreUpdateNode().asExpr() =
+        getPostUpdateReverseStep(nodeFrom.(PostUpdateNode).getPreUpdateNode().asExpr())
     ) and
     model = ""
     or
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/ControlFlowReachability.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/ControlFlowReachability.qll
deleted file mode 100644
index 8ab7bb0fba4..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/ControlFlowReachability.qll
+++ /dev/null
@@ -1,215 +0,0 @@
-import csharp
-
-private class ControlFlowScope extends ControlFlowElement {
-  private boolean exactScope;
-
-  ControlFlowScope() {
-    exists(ControlFlowReachabilityConfiguration c |
-      c.candidate(_, _, this, exactScope, _) or
-      c.candidateDef(_, _, this, exactScope, _)
-    )
-  }
-
-  predicate isExact() { exactScope = true }
-
-  predicate isNonExact() { exactScope = false }
-}
-
-private ControlFlowElement getANonExactScopeChild(ControlFlowScope scope) {
-  scope.isNonExact() and
-  result = scope
-  or
-  result = getANonExactScopeChild(scope).getAChild()
-}
-
-pragma[noinline]
-private ControlFlow::BasicBlock getABasicBlockInScope(ControlFlowScope scope, boolean exactScope) {
-  result.getANode().getAstNode() = getANonExactScopeChild(scope) and
-  exactScope = false
-  or
-  scope.isExact() and
-  result.getANode().getAstNode() = scope and
-  exactScope = true
-}
-
-/**
- * A helper class for determining control-flow reachability for pairs of
- * elements.
- *
- * This is useful when defining for example expression-based data-flow steps in
- * the presence of control-flow splitting, where a data-flow step should make
- * sure to stay in the same split.
- *
- * For example, in
- *
- * ```csharp
- * if (b)
- *     ....
- * var x = "foo";
- * if (b)
- *     ....
- * ```
- *
- * there should only be steps from `[b = true] "foo"` to `[b = true] SSA def(x)`
- * and `[b = false] "foo"` to `[b = false] SSA def(x)`, and for example not from
- * `[b = true] "foo"` to `[b = false] SSA def(x)`
- */
-abstract class ControlFlowReachabilityConfiguration extends string {
-  bindingset[this]
-  ControlFlowReachabilityConfiguration() { any() }
-
-  /**
-   * Holds if `e1` and `e2` are expressions for which we want to find a
-   * control-flow path that follows control flow successors (resp.
-   * predecessors, as specified by `isSuccessor`) inside the syntactic scope
-   * `scope`. The Boolean `exactScope` indicates whether a transitive child
-   * of `scope` is allowed (`exactScope = false`).
-   */
-  predicate candidate(
-    Expr e1, Expr e2, ControlFlowElement scope, boolean exactScope, boolean isSuccessor
-  ) {
-    none()
-  }
-
-  /**
-   * Holds if `e` and `def` are elements for which we want to find a
-   * control-flow path that follows control flow successors (resp.
-   * predecessors, as specified by `isSuccessor`) inside the syntactic scope
-   * `scope`. The Boolean `exactScope` indicates whether a transitive child
-   * of `scope` is allowed (`exactScope = false`).
-   */
-  predicate candidateDef(
-    Expr e, AssignableDefinition def, ControlFlowElement scope, boolean exactScope,
-    boolean isSuccessor
-  ) {
-    none()
-  }
-
-  pragma[nomagic]
-  private predicate reachesBasicBlockExprBase(
-    Expr e1, Expr e2, boolean isSuccessor, ControlFlow::Nodes::ElementNode cfn1, int i,
-    ControlFlow::BasicBlock bb
-  ) {
-    this.candidate(e1, e2, _, _, isSuccessor) and
-    cfn1 = e1.getAControlFlowNode() and
-    bb.getNode(i) = cfn1
-  }
-
-  pragma[nomagic]
-  private predicate reachesBasicBlockExprRec(
-    Expr e1, Expr e2, boolean isSuccessor, ControlFlow::Nodes::ElementNode cfn1,
-    ControlFlow::BasicBlock bb
-  ) {
-    exists(ControlFlow::BasicBlock mid |
-      this.reachesBasicBlockExpr(e1, e2, isSuccessor, cfn1, mid)
-    |
-      isSuccessor = true and
-      bb = mid.getASuccessor()
-      or
-      isSuccessor = false and
-      bb = mid.getAPredecessor()
-    )
-  }
-
-  pragma[nomagic]
-  private predicate reachesBasicBlockExpr(
-    Expr e1, Expr e2, boolean isSuccessor, ControlFlow::Nodes::ElementNode cfn1,
-    ControlFlow::BasicBlock bb
-  ) {
-    this.reachesBasicBlockExprBase(e1, e2, isSuccessor, cfn1, _, bb)
-    or
-    exists(ControlFlowElement scope, boolean exactScope |
-      this.candidate(e1, e2, scope, exactScope, isSuccessor) and
-      this.reachesBasicBlockExprRec(e1, e2, isSuccessor, cfn1, bb) and
-      bb = getABasicBlockInScope(scope, exactScope)
-    )
-  }
-
-  pragma[nomagic]
-  private predicate reachesBasicBlockDefinitionBase(
-    Expr e, AssignableDefinition def, boolean isSuccessor, ControlFlow::Nodes::ElementNode cfn,
-    int i, ControlFlow::BasicBlock bb
-  ) {
-    this.candidateDef(e, def, _, _, isSuccessor) and
-    cfn = e.getAControlFlowNode() and
-    bb.getNode(i) = cfn
-  }
-
-  pragma[nomagic]
-  private predicate reachesBasicBlockDefinitionRec(
-    Expr e, AssignableDefinition def, boolean isSuccessor, ControlFlow::Nodes::ElementNode cfn,
-    ControlFlow::BasicBlock bb
-  ) {
-    exists(ControlFlow::BasicBlock mid |
-      this.reachesBasicBlockDefinition(e, def, isSuccessor, cfn, mid)
-    |
-      isSuccessor = true and
-      bb = mid.getASuccessor()
-      or
-      isSuccessor = false and
-      bb = mid.getAPredecessor()
-    )
-  }
-
-  pragma[nomagic]
-  private predicate reachesBasicBlockDefinition(
-    Expr e, AssignableDefinition def, boolean isSuccessor, ControlFlow::Nodes::ElementNode cfn,
-    ControlFlow::BasicBlock bb
-  ) {
-    this.reachesBasicBlockDefinitionBase(e, def, isSuccessor, cfn, _, bb)
-    or
-    exists(ControlFlowElement scope, boolean exactScope |
-      this.candidateDef(e, def, scope, exactScope, isSuccessor) and
-      this.reachesBasicBlockDefinitionRec(e, def, isSuccessor, cfn, bb) and
-      bb = getABasicBlockInScope(scope, exactScope)
-    )
-  }
-
-  /**
-   * Holds if there is a control-flow path from `cfn1` to `cfn2`, where `cfn1` is a
-   * control-flow node for `e1` and `cfn2` is a control-flow node for `e2`.
-   */
-  pragma[nomagic]
-  predicate hasExprPath(Expr e1, ControlFlow::Node cfn1, Expr e2, ControlFlow::Node cfn2) {
-    exists(ControlFlow::BasicBlock bb, boolean isSuccessor, int i, int j |
-      this.reachesBasicBlockExprBase(e1, e2, isSuccessor, cfn1, i, bb) and
-      cfn2 = bb.getNode(j) and
-      cfn2 = e2.getAControlFlowNode()
-    |
-      isSuccessor = true and j >= i
-      or
-      isSuccessor = false and i >= j
-    )
-    or
-    exists(ControlFlow::BasicBlock bb |
-      this.reachesBasicBlockExprRec(e1, e2, _, cfn1, bb) and
-      cfn2 = bb.getANode() and
-      cfn2 = e2.getAControlFlowNode()
-    )
-  }
-
-  /**
-   * Holds if there is a control-flow path from `cfn` to `cfnDef`, where `cfn` is a
-   * control-flow node for `e` and `cfnDef` is a control-flow node for `def`.
-   */
-  pragma[nomagic]
-  predicate hasDefPath(
-    Expr e, ControlFlow::Node cfn, AssignableDefinition def, ControlFlow::Node cfnDef
-  ) {
-    exists(ControlFlow::BasicBlock bb, boolean isSuccessor, int i, int j |
-      this.reachesBasicBlockDefinitionBase(e, def, isSuccessor, cfn, i, bb) and
-      cfnDef = bb.getNode(j) and
-      def.getExpr().getAControlFlowNode() = cfnDef
-    |
-      isSuccessor = true and j >= i
-      or
-      isSuccessor = false and i >= j
-    )
-    or
-    exists(ControlFlow::BasicBlock bb |
-      this.reachesBasicBlockDefinitionRec(e, def, _, cfn, bb) and
-      def.getExpr().getAControlFlowNode() = cfnDef and
-      cfnDef = bb.getANode()
-    )
-  }
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/ModulusAnalysisSpecific.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/ModulusAnalysisSpecific.qll
index c9c3a937ef9..ca0aa83f29f 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/ModulusAnalysisSpecific.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/ModulusAnalysisSpecific.qll
@@ -20,17 +20,17 @@ module Private {
 
   class ConditionalExpr = RU::ExprNode::ConditionalExpr;
 
-  class AddExpr = RU::ExprNode::AddExpr;
+  class AddExpr = RU::ExprNode::AddOperation;
 
-  class SubExpr = RU::ExprNode::SubExpr;
+  class SubExpr = RU::ExprNode::SubOperation;
 
-  class RemExpr = RU::ExprNode::RemExpr;
+  class RemExpr = RU::ExprNode::RemOperation;
 
-  class BitwiseAndExpr = RU::ExprNode::BitwiseAndExpr;
+  class BitwiseAndExpr = RU::ExprNode::BitwiseAndOperation;
 
-  class MulExpr = RU::ExprNode::MulExpr;
+  class MulExpr = RU::ExprNode::MulOperation;
 
-  class LeftShiftExpr = RU::ExprNode::LeftShiftExpr;
+  class LeftShiftExpr = RU::ExprNode::LeftShiftOperation;
 
   predicate guardControlsSsaRead = RU::guardControlsSsaRead/3;
 
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/RangeUtils.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/RangeUtils.qll
index 71d177a48bb..46153f18dae 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/RangeUtils.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/RangeUtils.qll
@@ -8,32 +8,24 @@ private module Impl {
   private import ConstantUtils
   private import SsaReadPositionCommon
   private import semmle.code.csharp.controlflow.Guards as G
-  private import ControlFlowReachability
 
   private class ExprNode = ControlFlow::Nodes::ExprNode;
 
-  private class ExprChildReachability extends ControlFlowReachabilityConfiguration {
-    ExprChildReachability() { this = "ExprChildReachability" }
-
-    override predicate candidate(
-      Expr e1, Expr e2, ControlFlowElement scope, boolean exactScope, boolean isSuccessor
-    ) {
-      e2 = e1.getAChild() and
-      scope = e1 and
-      exactScope = false and
-      isSuccessor in [false, true]
-    }
-  }
-
   /** Holds if `parent` having child `child` implies `parentNode` having child `childNode`. */
   predicate hasChild(Expr parent, Expr child, ExprNode parentNode, ExprNode childNode) {
-    any(ExprChildReachability x).hasExprPath(parent, parentNode, child, childNode)
+    parent.getAChild() = child and
+    parentNode = parent.getControlFlowNode() and
+    childNode = child.getControlFlowNode()
   }
 
   /** Holds if SSA definition `def` equals `e + delta`. */
   predicate ssaUpdateStep(ExplicitDefinition def, ExprNode e, int delta) {
     exists(ControlFlow::Node cfn | cfn = def.getControlFlowNode() |
-      e = cfn.(ExprNode::Assignment).getRValue() and delta = 0
+      e = cfn.(ExprNode::Assignment).getRValue() and
+      delta = 0 and
+      not cfn instanceof ExprNode::AssignOperation
+      or
+      e = cfn.(ExprNode::AssignOperation) and delta = 0
       or
       e = cfn.(ExprNode::PostIncrExpr).getOperand() and delta = 1
       or
@@ -60,15 +52,15 @@ private module Impl {
     e2.(ExprNode::PreDecrExpr).getOperand() = e1 and delta = -1
     or
     exists(ConstantIntegerExpr x |
-      e2.(ExprNode::AddExpr).getAnOperand() = e1 and
-      e2.(ExprNode::AddExpr).getAnOperand() = x and
+      e2.(ExprNode::AddOperation).getAnOperand() = e1 and
+      e2.(ExprNode::AddOperation).getAnOperand() = x and
       e1 != x and
       x.getIntValue() = delta
     )
     or
     exists(ConstantIntegerExpr x |
-      e2.(ExprNode::SubExpr).getLeftOperand() = e1 and
-      e2.(ExprNode::SubExpr).getRightOperand() = x and
+      e2.(ExprNode::SubOperation).getLeftOperand() = e1 and
+      e2.(ExprNode::SubOperation).getRightOperand() = x and
       x.getIntValue() = -delta
     )
     or
@@ -230,6 +222,11 @@ module ExprNode {
     override CS::AssignExpr e;
   }
 
+  /** A compound assignment operation. */
+  class AssignOperation extends Assignment, BinaryOperation {
+    override CS::AssignOperation e;
+  }
+
   /** A unary operation. */
   class UnaryOperation extends ExprNode {
     override CS::UnaryOperation e;
@@ -321,78 +318,78 @@ module ExprNode {
   }
 
   /** An addition operation. */
-  class AddExpr extends BinaryOperation {
-    override CS::AddExpr e;
+  class AddOperation extends BinaryOperation {
+    override CS::AddOperation e;
 
     override TAddOp getOp() { any() }
   }
 
   /** A subtraction operation. */
-  class SubExpr extends BinaryOperation {
-    override CS::SubExpr e;
+  class SubOperation extends BinaryOperation {
+    override CS::SubOperation e;
 
     override TSubOp getOp() { any() }
   }
 
   /** A multiplication operation. */
-  class MulExpr extends BinaryOperation {
-    override CS::MulExpr e;
+  class MulOperation extends BinaryOperation {
+    override CS::MulOperation e;
 
     override TMulOp getOp() { any() }
   }
 
   /** A division operation. */
-  class DivExpr extends BinaryOperation {
-    override CS::DivExpr e;
+  class DivOperation extends BinaryOperation {
+    override CS::DivOperation e;
 
     override TDivOp getOp() { any() }
   }
 
   /** A remainder operation. */
-  class RemExpr extends BinaryOperation {
-    override CS::RemExpr e;
+  class RemOperation extends BinaryOperation {
+    override CS::RemOperation e;
 
     override TRemOp getOp() { any() }
   }
 
   /** A bitwise-and operation. */
-  class BitwiseAndExpr extends BinaryOperation {
-    override CS::BitwiseAndExpr e;
+  class BitwiseAndOperation extends BinaryOperation {
+    override CS::BitwiseAndOperation e;
 
     override TBitAndOp getOp() { any() }
   }
 
   /** A bitwise-or operation. */
-  class BitwiseOrExpr extends BinaryOperation {
-    override CS::BitwiseOrExpr e;
+  class BitwiseOrOperation extends BinaryOperation {
+    override CS::BitwiseOrOperation e;
 
     override TBitOrOp getOp() { any() }
   }
 
   /** A bitwise-xor operation. */
-  class BitwiseXorExpr extends BinaryOperation {
-    override CS::BitwiseXorExpr e;
+  class BitwiseXorOperation extends BinaryOperation {
+    override CS::BitwiseXorOperation e;
 
     override TBitXorOp getOp() { any() }
   }
 
   /** A left-shift operation. */
-  class LeftShiftExpr extends BinaryOperation {
-    override CS::LeftShiftExpr e;
+  class LeftShiftOperation extends BinaryOperation {
+    override CS::LeftShiftOperation e;
 
     override TLeftShiftOp getOp() { any() }
   }
 
   /** A right-shift operation. */
-  class RightShiftExpr extends BinaryOperation {
-    override CS::RightShiftExpr e;
+  class RightShiftOperation extends BinaryOperation {
+    override CS::RightShiftOperation e;
 
     override TRightShiftOp getOp() { any() }
   }
 
   /** An unsigned right-shift operation. */
-  class UnsignedRightShiftExpr extends BinaryOperation {
-    override CS::UnsignedRightShiftExpr e;
+  class UnsignedRightShiftOperation extends BinaryOperation {
+    override CS::UnsignedRightShiftOperation e;
 
     override TUnsignedRightShiftOp getOp() { any() }
   }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
index 1bd86e19f34..d59d7958765 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
@@ -41,7 +41,7 @@ module Private {
 
   class RealLiteral = RU::ExprNode::RealLiteral;
 
-  class DivExpr = RU::ExprNode::DivExpr;
+  class DivExpr = RU::ExprNode::DivOperation;
 
   class UnaryOperation = RU::ExprNode::UnaryOperation;
 
@@ -130,6 +130,11 @@ private module Impl {
       adef = def.getADefinition() and
       hasChild(adef.getExpr(), adef.getSource(), def.getControlFlowNode(), result)
     )
+    or
+    exists(AssignableDefinitions::AssignOperationDefinition adef |
+      adef = def.getADefinition() and
+      result.getExpr() = adef.getSource()
+    )
   }
 
   /** Holds if `def` can have any sign. */
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaUtils.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaUtils.qll
index b26082b6250..89117d90ba7 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaUtils.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaUtils.qll
@@ -29,7 +29,7 @@ ExprNode getAnExplicitDefinitionRead(ExprNode src) {
 ExprNode ssaRead(Definition v, int delta) {
   exists(v.getAReadAtNode(result)) and delta = 0
   or
-  exists(ExprNode::AddExpr add, int d1, ConstantIntegerExpr c |
+  exists(ExprNode::AddOperation add, int d1, ConstantIntegerExpr c |
     result = add and
     delta = d1 - c.getIntValue()
   |
@@ -38,7 +38,7 @@ ExprNode ssaRead(Definition v, int delta) {
     add.getRightOperand() = ssaRead(v, d1) and add.getLeftOperand() = c
   )
   or
-  exists(ExprNode::SubExpr sub, int d1, ConstantIntegerExpr c |
+  exists(ExprNode::SubOperation sub, int d1, ConstantIntegerExpr c |
     result = sub and
     sub.getLeftOperand() = ssaRead(v, d1) and
     sub.getRightOperand() = c and
diff --git a/csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll b/csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll
index a83967441d7..f7f6c7a50be 100644
--- a/csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll
@@ -202,11 +202,9 @@ private module Internal {
   private predicate isPotentialEventCall(
     AssignArithmeticOperation aao, DynamicMemberAccess dma, string name
   ) {
-    exists(DynamicOperatorCall doc, AssignExpr ae |
-      ae = aao.getExpandedAssignment() and
-      dma = ae.getLValue() and
-      doc = ae.getRValue()
-    |
+    aao instanceof DynamicOperatorCall and
+    dma = aao.getLeftOperand() and
+    (
       aao instanceof AssignAddExpr and
       name = "add_" + dma.getLateBoundTargetName()
       or
diff --git a/csharp/ql/lib/semmle/code/csharp/exprs/ArithmeticOperation.qll b/csharp/ql/lib/semmle/code/csharp/exprs/ArithmeticOperation.qll
index f20bfba1589..193c48ed3a2 100644
--- a/csharp/ql/lib/semmle/code/csharp/exprs/ArithmeticOperation.qll
+++ b/csharp/ql/lib/semmle/code/csharp/exprs/ArithmeticOperation.qll
@@ -107,7 +107,7 @@ class BinaryArithmeticOperation extends ArithmeticOperation, BinaryOperation, @b
 /**
  * An addition operation, for example `x + y`.
  */
-class AddExpr extends BinaryArithmeticOperation, @add_expr {
+class AddExpr extends BinaryArithmeticOperation, AddOperation, @add_expr {
   override string getOperator() { result = "+" }
 
   override string getAPrimaryQlClass() { result = "AddExpr" }
@@ -116,7 +116,7 @@ class AddExpr extends BinaryArithmeticOperation, @add_expr {
 /**
  * A subtraction operation, for example `x - y`.
  */
-class SubExpr extends BinaryArithmeticOperation, @sub_expr {
+class SubExpr extends BinaryArithmeticOperation, SubOperation, @sub_expr {
   override string getOperator() { result = "-" }
 
   override string getAPrimaryQlClass() { result = "SubExpr" }
@@ -125,7 +125,7 @@ class SubExpr extends BinaryArithmeticOperation, @sub_expr {
 /**
  * A multiplication operation, for example `x * y`.
  */
-class MulExpr extends BinaryArithmeticOperation, @mul_expr {
+class MulExpr extends BinaryArithmeticOperation, MulOperation, @mul_expr {
   override string getOperator() { result = "*" }
 
   override string getAPrimaryQlClass() { result = "MulExpr" }
@@ -134,22 +134,16 @@ class MulExpr extends BinaryArithmeticOperation, @mul_expr {
 /**
  * A division operation, for example `x / y`.
  */
-class DivExpr extends BinaryArithmeticOperation, @div_expr {
+class DivExpr extends BinaryArithmeticOperation, DivOperation, @div_expr {
   override string getOperator() { result = "/" }
 
-  /** Gets the numerator of this division operation. */
-  Expr getNumerator() { result = this.getLeftOperand() }
-
-  /** Gets the denominator of this division operation. */
-  Expr getDenominator() { result = this.getRightOperand() }
-
   override string getAPrimaryQlClass() { result = "DivExpr" }
 }
 
 /**
  * A remainder operation, for example `x % y`.
  */
-class RemExpr extends BinaryArithmeticOperation, @rem_expr {
+class RemExpr extends BinaryArithmeticOperation, RemOperation, @rem_expr {
   override string getOperator() { result = "%" }
 
   override string getAPrimaryQlClass() { result = "RemExpr" }
diff --git a/csharp/ql/lib/semmle/code/csharp/exprs/Assignment.qll b/csharp/ql/lib/semmle/code/csharp/exprs/Assignment.qll
index a5576f023d7..467149011d2 100644
--- a/csharp/ql/lib/semmle/code/csharp/exprs/Assignment.qll
+++ b/csharp/ql/lib/semmle/code/csharp/exprs/Assignment.qll
@@ -11,20 +11,20 @@ import Expr
  * (`LocalVariableDeclAndInitExpr`), a simple assignment (`AssignExpr`), or
  * an assignment operation (`AssignOperation`).
  */
-class Assignment extends Operation, @assign_expr {
+class Assignment extends BinaryOperation, @assign_expr {
   Assignment() {
     this instanceof LocalVariableDeclExpr
     implies
     // Same as `this.(LocalVariableDeclExpr).hasInitializer()` but avoids
     // negative recursion
-    expr_parent(_, 0, this)
+    expr_parent(_, 1, this)
   }
 
   /** Gets the left operand of this assignment. */
-  Expr getLValue() { result = this.getChild(1) }
+  Expr getLValue() { result = this.getLeftOperand() }
 
   /** Gets the right operand of this assignment. */
-  Expr getRValue() { result = this.getChild(0) }
+  Expr getRValue() { result = this.getRightOperand() }
 
   /** Gets the variable being assigned to, if any. */
   Variable getTargetVariable() { result.getAnAccess() = this.getLValue() }
@@ -61,36 +61,36 @@ class AssignExpr extends Assignment, @simple_assign_expr {
 /**
  * An assignment operation. Either an arithmetic assignment operation
  * (`AssignArithmeticOperation`), a bitwise assignment operation
- * (`AssignBitwiseOperation`), or an event assignment (`AddOrRemoveEventExpr`).
+ * (`AssignBitwiseOperation`), an event assignment (`AddOrRemoveEventExpr`), or
+ * a null-coalescing assignment (`AssignCoalesceExpr`).
  */
 class AssignOperation extends Assignment, @assign_op_expr {
   override string getOperator() { none() }
 
   /**
-   * Gets the expanded version of this assignment operation, if any.
-   *
-   * For example, if this assignment operation is `x += y` then
-   * the expanded assignment is `x = x + y`.
-   *
-   * If an expanded version exists, then it is used in the control
-   * flow graph.
+   * Expanded versions of compound assignments are no longer extracted.
    */
-  AssignExpr getExpandedAssignment() { expr_parent(result, 2, this) }
+  deprecated AssignExpr getExpandedAssignment() { none() }
 
   /**
-   * Holds if this assignment operation has an expanded version.
-   *
-   * For example, if this assignment operation is `x += y` then
-   * it has the expanded version `x = x + y`.
-   *
-   * If an expanded version exists, then it is used in the control
-   * flow graph.
+   * Expanded versions of compound assignments are no longer extracted.
    */
-  predicate hasExpandedAssignment() { exists(this.getExpandedAssignment()) }
+  deprecated predicate hasExpandedAssignment() { none() }
 
   override string toString() { result = "... " + this.getOperator() + " ..." }
 }
 
+/**
+ * A compound assignment operation that implicitly invokes an operator.
+ * For example, `x += y` assigns the result of `x + y` to `x`.
+ *
+ * Either an arithmetic assignment operation (`AssignArithmeticOperation`) or a bitwise
+ * assignment operation (`AssignBitwiseOperation`).
+ */
+class AssignCallOperation extends AssignOperation, OperatorCall, @assign_op_call_expr {
+  override string toString() { result = AssignOperation.super.toString() }
+}
+
 /**
  * An arithmetic assignment operation. Either an addition assignment operation
  * (`AssignAddExpr`), a subtraction assignment operation (`AssignSubExpr`), a
@@ -98,12 +98,12 @@ class AssignOperation extends Assignment, @assign_op_expr {
  * operation (`AssignDivExpr`), or a remainder assignment operation
  * (`AssignRemExpr`).
  */
-class AssignArithmeticOperation extends AssignOperation, @assign_arith_expr { }
+class AssignArithmeticOperation extends AssignCallOperation, @assign_arith_expr { }
 
 /**
  * An addition assignment operation, for example `x += y`.
  */
-class AssignAddExpr extends AssignArithmeticOperation, @assign_add_expr {
+class AssignAddExpr extends AssignArithmeticOperation, AddOperation, @assign_add_expr {
   override string getOperator() { result = "+=" }
 
   override string getAPrimaryQlClass() { result = "AssignAddExpr" }
@@ -112,7 +112,7 @@ class AssignAddExpr extends AssignArithmeticOperation, @assign_add_expr {
 /**
  * A subtraction assignment operation, for example `x -= y`.
  */
-class AssignSubExpr extends AssignArithmeticOperation, @assign_sub_expr {
+class AssignSubExpr extends AssignArithmeticOperation, SubOperation, @assign_sub_expr {
   override string getOperator() { result = "-=" }
 
   override string getAPrimaryQlClass() { result = "AssignSubExpr" }
@@ -121,7 +121,7 @@ class AssignSubExpr extends AssignArithmeticOperation, @assign_sub_expr {
 /**
  * An multiplication assignment operation, for example `x *= y`.
  */
-class AssignMulExpr extends AssignArithmeticOperation, @assign_mul_expr {
+class AssignMulExpr extends AssignArithmeticOperation, MulOperation, @assign_mul_expr {
   override string getOperator() { result = "*=" }
 
   override string getAPrimaryQlClass() { result = "AssignMulExpr" }
@@ -130,7 +130,7 @@ class AssignMulExpr extends AssignArithmeticOperation, @assign_mul_expr {
 /**
  * An division assignment operation, for example `x /= y`.
  */
-class AssignDivExpr extends AssignArithmeticOperation, @assign_div_expr {
+class AssignDivExpr extends AssignArithmeticOperation, DivOperation, @assign_div_expr {
   override string getOperator() { result = "/=" }
 
   override string getAPrimaryQlClass() { result = "AssignDivExpr" }
@@ -139,7 +139,7 @@ class AssignDivExpr extends AssignArithmeticOperation, @assign_div_expr {
 /**
  * A remainder assignment operation, for example `x %= y`.
  */
-class AssignRemExpr extends AssignArithmeticOperation, @assign_rem_expr {
+class AssignRemExpr extends AssignArithmeticOperation, RemOperation, @assign_rem_expr {
   override string getOperator() { result = "%=" }
 
   override string getAPrimaryQlClass() { result = "AssignRemExpr" }
@@ -154,12 +154,12 @@ class AssignRemExpr extends AssignArithmeticOperation, @assign_rem_expr {
  * operation (`AssignRightShiftExpr`), or an unsigned right-shift assignment
  * operation (`AssignUnsignedRightShiftExpr`).
  */
-class AssignBitwiseOperation extends AssignOperation, @assign_bitwise_expr { }
+class AssignBitwiseOperation extends AssignCallOperation, @assign_bitwise_expr { }
 
 /**
  * A bitwise-and assignment operation, for example `x &= y`.
  */
-class AssignAndExpr extends AssignBitwiseOperation, @assign_and_expr {
+class AssignAndExpr extends AssignBitwiseOperation, BitwiseAndOperation, @assign_and_expr {
   override string getOperator() { result = "&=" }
 
   override string getAPrimaryQlClass() { result = "AssignAndExpr" }
@@ -168,7 +168,7 @@ class AssignAndExpr extends AssignBitwiseOperation, @assign_and_expr {
 /**
  * A bitwise-or assignment operation, for example `x |= y`.
  */
-class AssignOrExpr extends AssignBitwiseOperation, @assign_or_expr {
+class AssignOrExpr extends AssignBitwiseOperation, BitwiseOrOperation, @assign_or_expr {
   override string getOperator() { result = "|=" }
 
   override string getAPrimaryQlClass() { result = "AssignOrExpr" }
@@ -177,7 +177,7 @@ class AssignOrExpr extends AssignBitwiseOperation, @assign_or_expr {
 /**
  * A bitwise exclusive-or assignment operation, for example `x ^= y`.
  */
-class AssignXorExpr extends AssignBitwiseOperation, @assign_xor_expr {
+class AssignXorExpr extends AssignBitwiseOperation, BitwiseXorOperation, @assign_xor_expr {
   override string getOperator() { result = "^=" }
 
   override string getAPrimaryQlClass() { result = "AssignXorExpr" }
@@ -186,7 +186,7 @@ class AssignXorExpr extends AssignBitwiseOperation, @assign_xor_expr {
 /**
  * A left-shift assignment operation, for example `x <<= y`.
  */
-class AssignLeftShiftExpr extends AssignBitwiseOperation, @assign_lshift_expr {
+class AssignLeftShiftExpr extends AssignBitwiseOperation, LeftShiftOperation, @assign_lshift_expr {
   override string getOperator() { result = "<<=" }
 
   override string getAPrimaryQlClass() { result = "AssignLeftShiftExpr" }
@@ -195,7 +195,7 @@ class AssignLeftShiftExpr extends AssignBitwiseOperation, @assign_lshift_expr {
 /**
  * A right-shift assignment operation, for example `x >>= y`.
  */
-class AssignRightShiftExpr extends AssignBitwiseOperation, @assign_rshift_expr {
+class AssignRightShiftExpr extends AssignBitwiseOperation, RightShiftOperation, @assign_rshift_expr {
   override string getOperator() { result = ">>=" }
 
   override string getAPrimaryQlClass() { result = "AssignRightShiftExpr" }
@@ -204,12 +204,19 @@ class AssignRightShiftExpr extends AssignBitwiseOperation, @assign_rshift_expr {
 /**
  * An unsigned right-shift assignment operation, for example `x >>>= y`.
  */
-class AssignUnsighedRightShiftExpr extends AssignBitwiseOperation, @assign_urshift_expr {
+class AssignUnsignedRightShiftExpr extends AssignBitwiseOperation, UnsignedRightShiftOperation,
+  @assign_urshift_expr
+{
   override string getOperator() { result = ">>>=" }
 
-  override string getAPrimaryQlClass() { result = "AssignUnsighedRightShiftExpr" }
+  override string getAPrimaryQlClass() { result = "AssignUnsignedRightShiftExpr" }
 }
 
+/**
+ *  DEPRECATED: Use `AssignUnsignedRightShiftExpr` instead.
+ */
+deprecated class AssignUnsighedRightShiftExpr = AssignUnsignedRightShiftExpr;
+
 /**
  * An event assignment. Either an event addition (`AddEventExpr`) or an event
  * removal (`RemoveEventExpr`).
@@ -218,9 +225,9 @@ class AddOrRemoveEventExpr extends AssignOperation, @assign_event_expr {
   /** Gets the event targeted by this event assignment. */
   Event getTarget() { result = this.getLValue().getTarget() }
 
-  override EventAccess getLValue() { result = this.getChild(1) }
+  override EventAccess getLValue() { result = this.getChild(0) }
 
-  override Expr getRValue() { result = this.getChild(0) }
+  override EventAccess getLeftOperand() { result = this.getChild(0) }
 }
 
 /**
@@ -272,7 +279,7 @@ class RemoveEventExpr extends AddOrRemoveEventExpr, @remove_event_expr {
 /**
  * A null-coalescing assignment operation, for example `x ??= y`.
  */
-class AssignCoalesceExpr extends AssignOperation, @assign_coalesce_expr {
+class AssignCoalesceExpr extends AssignOperation, NullCoalescingOperation, @assign_coalesce_expr {
   override string toString() { result = "... ??= ..." }
 
   override string getAPrimaryQlClass() { result = "AssignCoalesceExpr" }
diff --git a/csharp/ql/lib/semmle/code/csharp/exprs/BitwiseOperation.qll b/csharp/ql/lib/semmle/code/csharp/exprs/BitwiseOperation.qll
index d818a1d08f8..14bb3d74e2b 100644
--- a/csharp/ql/lib/semmle/code/csharp/exprs/BitwiseOperation.qll
+++ b/csharp/ql/lib/semmle/code/csharp/exprs/BitwiseOperation.qll
@@ -41,7 +41,7 @@ class BinaryBitwiseOperation extends BitwiseOperation, BinaryOperation, @bin_bit
 /**
  * A left-shift operation, for example `x << y`.
  */
-class LeftShiftExpr extends BinaryBitwiseOperation, @lshift_expr {
+class LeftShiftExpr extends BinaryBitwiseOperation, LeftShiftOperation, @lshift_expr {
   override string getOperator() { result = "<<" }
 
   override string getAPrimaryQlClass() { result = "LeftShiftExpr" }
@@ -50,7 +50,7 @@ class LeftShiftExpr extends BinaryBitwiseOperation, @lshift_expr {
 /**
  * A right-shift operation, for example `x >> y`.
  */
-class RightShiftExpr extends BinaryBitwiseOperation, @rshift_expr {
+class RightShiftExpr extends BinaryBitwiseOperation, RightShiftOperation, @rshift_expr {
   override string getOperator() { result = ">>" }
 
   override string getAPrimaryQlClass() { result = "RightShiftExpr" }
@@ -59,7 +59,9 @@ class RightShiftExpr extends BinaryBitwiseOperation, @rshift_expr {
 /**
  * An unsigned right-shift operation, for example `x >>> y`.
  */
-class UnsignedRightShiftExpr extends BinaryBitwiseOperation, @urshift_expr {
+class UnsignedRightShiftExpr extends BinaryBitwiseOperation, UnsignedRightShiftOperation,
+  @urshift_expr
+{
   override string getOperator() { result = ">>>" }
 
   override string getAPrimaryQlClass() { result = "UnsignedRightShiftExpr" }
@@ -68,7 +70,7 @@ class UnsignedRightShiftExpr extends BinaryBitwiseOperation, @urshift_expr {
 /**
  * A bitwise-and operation, for example `x & y`.
  */
-class BitwiseAndExpr extends BinaryBitwiseOperation, @bit_and_expr {
+class BitwiseAndExpr extends BinaryBitwiseOperation, BitwiseAndOperation, @bit_and_expr {
   override string getOperator() { result = "&" }
 
   override string getAPrimaryQlClass() { result = "BitwiseAndExpr" }
@@ -77,7 +79,7 @@ class BitwiseAndExpr extends BinaryBitwiseOperation, @bit_and_expr {
 /**
  * A bitwise-or operation, for example `x | y`.
  */
-class BitwiseOrExpr extends BinaryBitwiseOperation, @bit_or_expr {
+class BitwiseOrExpr extends BinaryBitwiseOperation, BitwiseOrOperation, @bit_or_expr {
   override string getOperator() { result = "|" }
 
   override string getAPrimaryQlClass() { result = "BitwiseOrExpr" }
@@ -86,7 +88,7 @@ class BitwiseOrExpr extends BinaryBitwiseOperation, @bit_or_expr {
 /**
  * A bitwise exclusive-or operation, for example `x ^ y`.
  */
-class BitwiseXorExpr extends BinaryBitwiseOperation, @bit_xor_expr {
+class BitwiseXorExpr extends BinaryBitwiseOperation, BitwiseXorOperation, @bit_xor_expr {
   override string getOperator() { result = "^" }
 
   override string getAPrimaryQlClass() { result = "BitwiseXorExpr" }
diff --git a/csharp/ql/lib/semmle/code/csharp/exprs/Call.qll b/csharp/ql/lib/semmle/code/csharp/exprs/Call.qll
index f8b51a990ed..0d9e414a5c4 100644
--- a/csharp/ql/lib/semmle/code/csharp/exprs/Call.qll
+++ b/csharp/ql/lib/semmle/code/csharp/exprs/Call.qll
@@ -478,7 +478,7 @@ class ConstructorInitializer extends Call, @constructor_init_expr {
 }
 
 /**
- * A call to a user-defined operator, for example `this + other`
+ * A call to an operator, for example `this + other`
  * on line 7 in
  *
  * ```csharp
@@ -493,12 +493,16 @@ class ConstructorInitializer extends Call, @constructor_init_expr {
  * }
  * ```
  */
-class OperatorCall extends Call, LateBindableExpr, @operator_invocation_expr {
+class OperatorCall extends Call, LateBindableExpr, @op_invoke_expr {
   override Operator getTarget() { expr_call(this, result) }
 
   override Operator getARuntimeTarget() { result = Call.super.getARuntimeTarget() }
 
-  override string toString() { result = "call to operator " + this.getTarget().getName() }
+  override string toString() {
+    if this instanceof DynamicOperatorCall
+    then result = "dynamic call to operator " + this.getLateBoundTargetName()
+    else result = "call to operator " + this.getTarget().getName()
+  }
 
   override string getAPrimaryQlClass() { result = "OperatorCall" }
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/exprs/Dynamic.qll b/csharp/ql/lib/semmle/code/csharp/exprs/Dynamic.qll
index 04ea9f062a5..bfc5c36ff37 100644
--- a/csharp/ql/lib/semmle/code/csharp/exprs/Dynamic.qll
+++ b/csharp/ql/lib/semmle/code/csharp/exprs/Dynamic.qll
@@ -96,13 +96,7 @@ class DynamicMethodCall extends DynamicExpr, MethodCall {
  * Unlike an ordinary call to a user-defined operator (`OperatorCall`), the
  * target operator may not be known at compile-time (as in the example above).
  */
-class DynamicOperatorCall extends DynamicExpr, OperatorCall {
-  override string toString() {
-    result = "dynamic call to operator " + this.getLateBoundTargetName()
-  }
-
-  override string getAPrimaryQlClass() { result = "DynamicOperatorCall" }
-}
+class DynamicOperatorCall extends DynamicExpr, OperatorCall { }
 
 /**
  * A call to a user-defined mutator operator where the operand is a `dynamic`
diff --git a/csharp/ql/lib/semmle/code/csharp/exprs/Expr.qll b/csharp/ql/lib/semmle/code/csharp/exprs/Expr.qll
index ada01065258..66764d06479 100644
--- a/csharp/ql/lib/semmle/code/csharp/exprs/Expr.qll
+++ b/csharp/ql/lib/semmle/code/csharp/exprs/Expr.qll
@@ -14,6 +14,7 @@ import Creation
 import Dynamic
 import Literal
 import LogicalOperation
+import Operation
 import semmle.code.csharp.controlflow.ControlFlowElement
 import semmle.code.csharp.Location
 import semmle.code.csharp.Stmt
@@ -21,6 +22,7 @@ import semmle.code.csharp.Type
 private import semmle.code.csharp.ExprOrStmtParent
 private import semmle.code.csharp.frameworks.System
 private import semmle.code.csharp.TypeRef
+private import internal.Expr
 
 /**
  * An expression. Either an access (`Access`), a call (`Call`), an object or
@@ -68,11 +70,7 @@ class Expr extends ControlFlowElement, @expr {
    * Holds if this expression is generated by the compiler and does not appear
    * explicitly in the source code.
    */
-  final predicate isImplicit() {
-    compiler_generated(this) or
-    this =
-      any(AssignOperation op).getExpandedAssignment().getRValue().getChildExpr(0).getAChildExpr+()
-  }
+  final predicate isImplicit() { compiler_generated(this) }
 
   /**
    * Gets an expression that is the result of stripping (recursively) all
@@ -157,7 +155,7 @@ class LocalVariableDeclExpr extends Expr, @local_var_decl_expr {
   string getName() { result = this.getVariable().getName() }
 
   /** Gets the initializer expression of this local variable declaration, if any. */
-  Expr getInitializer() { result = this.getChild(0) }
+  Expr getInitializer() { result = this.getChild(1) }
 
   /** Holds if this local variable declaration has an initializer. */
   predicate hasInitializer() { exists(this.getInitializer()) }
@@ -177,7 +175,7 @@ class LocalVariableDeclExpr extends Expr, @local_var_decl_expr {
 
   /** Gets the variable access used in this declaration, if any. */
   LocalVariableAccess getAccess() {
-    result = this.getChild(1) or
+    result = this.getChild(0) or
     result = this // `out` argument
   }
 
@@ -233,7 +231,8 @@ class UnaryOperation extends Operation, @un_op {
  * A binary operation. Either a binary arithmetic operation
  * (`BinaryArithmeticOperation`), a binary bitwise operation
  * (`BinaryBitwiseOperation`), a comparison operation (`ComparisonOperation`),
- * or a binary logical operation (`BinaryLogicalOperation`).
+ * a binary logical operation (`BinaryLogicalOperation`), or an
+ * assignment (`Assignment`).
  */
 class BinaryOperation extends Operation, @bin_op {
   /** Gets the left operand of this binary operation. */
@@ -1133,7 +1132,7 @@ class TupleExpr extends Expr, @tuple_expr {
   /** Holds if this expression is a tuple construction. */
   predicate isConstruction() {
     not this = getAnAssignOrForeachChild() and
-    not this = any(PatternExpr pe).getAChildExpr*()
+    not isPatternExprDescendant(this)
   }
 
   override string getAPrimaryQlClass() { result = "TupleExpr" }
diff --git a/csharp/ql/lib/semmle/code/csharp/exprs/LogicalOperation.qll b/csharp/ql/lib/semmle/code/csharp/exprs/LogicalOperation.qll
index e94d8ff93e7..4161f734c9b 100644
--- a/csharp/ql/lib/semmle/code/csharp/exprs/LogicalOperation.qll
+++ b/csharp/ql/lib/semmle/code/csharp/exprs/LogicalOperation.qll
@@ -65,7 +65,9 @@ class LogicalOrExpr extends BinaryLogicalOperation, @log_or_expr {
  * }
  * ```
  */
-class NullCoalescingExpr extends BinaryLogicalOperation, @null_coalescing_expr {
+class NullCoalescingExpr extends BinaryLogicalOperation, NullCoalescingOperation,
+  @null_coalescing_expr
+{
   override string getOperator() { result = "??" }
 
   override string getAPrimaryQlClass() { result = "NullCoalescingExpr" }
diff --git a/csharp/ql/lib/semmle/code/csharp/exprs/Operation.qll b/csharp/ql/lib/semmle/code/csharp/exprs/Operation.qll
new file mode 100644
index 00000000000..1f816baea86
--- /dev/null
+++ b/csharp/ql/lib/semmle/code/csharp/exprs/Operation.qll
@@ -0,0 +1,71 @@
+/**
+ * Provides classes for operations that also have compound assignment forms.
+ */
+
+import Expr
+
+/**
+ * An addition operation, either `x + y` or `x += y`.
+ */
+class AddOperation extends BinaryOperation, @add_operation { }
+
+/**
+ * A subtraction operation, either `x - y` or `x -= y`.
+ */
+class SubOperation extends BinaryOperation, @sub_operation { }
+
+/**
+ * A multiplication operation, either `x * y` or `x *= y`.
+ */
+class MulOperation extends BinaryOperation, @mul_operation { }
+
+/**
+ * A division operation, either `x / y` or `x /= y`.
+ */
+class DivOperation extends BinaryOperation, @div_operation {
+  /** Gets the numerator of this division operation. */
+  Expr getNumerator() { result = this.getLeftOperand() }
+
+  /** Gets the denominator of this division operation. */
+  Expr getDenominator() { result = this.getRightOperand() }
+}
+
+/**
+ * A remainder operation, either `x % y` or `x %= y`.
+ */
+class RemOperation extends BinaryOperation, @rem_operation { }
+
+/**
+ * A bitwise-and operation, either `x & y` or `x &= y`.
+ */
+class BitwiseAndOperation extends BinaryOperation, @and_operation { }
+
+/**
+ * A bitwise-or operation, either `x | y` or `x |= y`.
+ */
+class BitwiseOrOperation extends BinaryOperation, @or_operation { }
+
+/**
+ * A bitwise exclusive-or operation, either `x ^ y` or `x ^= y`.
+ */
+class BitwiseXorOperation extends BinaryOperation, @xor_operation { }
+
+/**
+ * A left-shift operation, either `x << y` or `x <<= y`.
+ */
+class LeftShiftOperation extends BinaryOperation, @lshift_operation { }
+
+/**
+ * A right-shift operation, either `x >> y` or `x >>= y`.
+ */
+class RightShiftOperation extends BinaryOperation, @rshift_operation { }
+
+/**
+ * An unsigned right-shift operation, either `x >>> y` or `x >>>= y`.
+ */
+class UnsignedRightShiftOperation extends BinaryOperation, @urshift_operation { }
+
+/**
+ * A null-coalescing operation, either `x ?? y` or `x ??= y`.
+ */
+class NullCoalescingOperation extends BinaryOperation, @null_coalescing_operation { }
diff --git a/csharp/ql/lib/semmle/code/csharp/exprs/internal/Expr.qll b/csharp/ql/lib/semmle/code/csharp/exprs/internal/Expr.qll
new file mode 100644
index 00000000000..94dfac72193
--- /dev/null
+++ b/csharp/ql/lib/semmle/code/csharp/exprs/internal/Expr.qll
@@ -0,0 +1,11 @@
+private import csharp
+
+pragma[nomagic]
+predicate isPatternExprDescendant(Expr e) {
+  e instanceof PatternExpr
+  or
+  exists(Expr parent |
+    isPatternExprDescendant(parent) and
+    e = parent.getAChildExpr()
+  )
+}
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/system/Xml.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/system/Xml.qll
index c0edf9e110e..798a8ed3822 100644
--- a/csharp/ql/lib/semmle/code/csharp/frameworks/system/Xml.qll
+++ b/csharp/ql/lib/semmle/code/csharp/frameworks/system/Xml.qll
@@ -131,7 +131,7 @@ class SystemXmlSchemaXmlSchemaValidationFlags extends EnumConstant {
   }
 }
 
-private Expr getBitwiseOrOperand(Expr e) { result = e.(BitwiseOrExpr).getAnOperand() }
+private Expr getBitwiseOrOperand(Expr e) { result = e.(BitwiseOrOperation).getAnOperand() }
 
 /** A creation of an instance of `System.Xml.XmlReaderSettings`. */
 class XmlReaderSettingsCreation extends ObjectCreation {
diff --git a/csharp/ql/lib/semmle/code/csharp/metrics/Complexity.qll b/csharp/ql/lib/semmle/code/csharp/metrics/Complexity.qll
index 2f37d23fe49..392f13d118e 100644
--- a/csharp/ql/lib/semmle/code/csharp/metrics/Complexity.qll
+++ b/csharp/ql/lib/semmle/code/csharp/metrics/Complexity.qll
@@ -32,7 +32,7 @@ private predicate branchingExpr(Expr expr) {
   expr instanceof ConditionalExpr or
   expr instanceof LogicalAndExpr or
   expr instanceof LogicalOrExpr or
-  expr instanceof NullCoalescingExpr
+  expr instanceof NullCoalescingOperation
 }
 
 /**
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/LogForgingQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/LogForgingQuery.qll
index 22023ebc409..293b8ff9b8b 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/LogForgingQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/LogForgingQuery.qll
@@ -52,9 +52,17 @@ private class HtmlSanitizer extends Sanitizer {
 }
 
 /**
- * An argument to a call to a method on a logger class.
+ * An argument to a call to a method on a logger class, excluding extension methods
+ * with source code which are analyzed interprocedurally.
  */
-private class LogForgingLogMessageSink extends Sink, LogMessageSink { }
+private class LogForgingLogMessageSink extends Sink, LogMessageSink {
+  LogForgingLogMessageSink() {
+    not exists(ExtensionMethodCall mc |
+      this.getExpr() = mc.getAnArgument() and
+      mc.getTarget().fromSource()
+    )
+  }
+}
 
 /**
  * An argument to a call to a method on a trace class.
diff --git a/csharp/ql/lib/semmlecode.csharp.dbscheme b/csharp/ql/lib/semmlecode.csharp.dbscheme
index 178a7e6cf33..19b8cc3e2dc 100644
--- a/csharp/ql/lib/semmlecode.csharp.dbscheme
+++ b/csharp/ql/lib/semmlecode.csharp.dbscheme
@@ -1216,9 +1216,23 @@ case @expr.kind of
               | @string_literal_expr | @null_literal_expr;
 
 @assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
-@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_op_call_expr = @assign_arith_expr | @assign_bitwise_expr
+@assign_op_expr =  @assign_op_call_expr | @assign_event_expr | @assign_coalesce_expr;
 @assign_event_expr = @add_event_expr | @remove_event_expr;
 
+@add_operation = @add_expr | @assign_add_expr;
+@sub_operation = @sub_expr | @assign_sub_expr;
+@mul_operation = @mul_expr | @assign_mul_expr;
+@div_operation = @div_expr | @assign_div_expr;
+@rem_operation = @rem_expr | @assign_rem_expr;
+@and_operation = @bit_and_expr | @assign_and_expr;
+@xor_operation = @bit_xor_expr | @assign_xor_expr;
+@or_operation = @bit_or_expr | @assign_or_expr;
+@lshift_operation = @lshift_expr | @assign_lshift_expr;
+@rshift_operation = @rshift_expr | @assign_rshift_expr;
+@urshift_operation = @urshift_expr | @assign_urshift_expr;
+@null_coalescing_operation = @null_coalescing_expr | @assign_coalesce_expr;
+
 @assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
                    | @assign_rem_expr
 @assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
@@ -1261,23 +1275,24 @@ case @expr.kind of
 @rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
 @comp_expr = @equality_op_expr | @rel_op_expr;
 
-@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+@op_expr = @un_op | @bin_op | @ternary_op;
 
 @ternary_op = @ternary_log_op_expr;
-@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@bin_op = @assign_expr | @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
 @un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
        | @pointer_indirection_expr | @address_of_expr;
 
 @anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
 
-@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+@op_invoke_expr = @operator_invocation_expr | @assign_op_call_expr
+@call = @method_invocation_expr | @constructor_init_expr | @op_invoke_expr
       | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
       | @local_function_invocation_expr | @function_pointer_invocation_expr;
 
 @call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
 
 @late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
-                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+                    | @object_creation_expr | @method_invocation_expr | @op_invoke_expr;
 
 @throw_element = @throw_expr | @throw_stmt;
 
diff --git a/csharp/ql/lib/upgrades/178a7e6cf335486d33d4e49543148e3f57f04a9a/old.dbscheme b/csharp/ql/lib/upgrades/178a7e6cf335486d33d4e49543148e3f57f04a9a/old.dbscheme
new file mode 100644
index 00000000000..178a7e6cf33
--- /dev/null
+++ b/csharp/ql/lib/upgrades/178a7e6cf335486d33d4e49543148e3f57f04a9a/old.dbscheme
@@ -0,0 +1,1489 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+compilation_info(
+  int id : @compilation ref,
+  string info_key: string ref,
+  string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile.rsp` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_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(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string 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
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * Overlay support
+ */
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+@locatable = @declaration_with_accessors | @callable_accessor | @declaration_or_directive
+           | @diagnostic | @extractor_message | @preprocessor_directive | @attribute | @type_mention | @type_parameter_constraints
+           | @declaration_with_accessors | @callable_accessor | @operator | @method
+           | @constructor | @destructor | @field | @local_variable | @parameter | @stmt | @expr
+           | @xmllocatable | @commentline | @commentblock | @asp_element
+
+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);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+| 34 = @inline_array_type
+| 35 = @extension_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type | @void_type | @inline_array_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type | @extension_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extension_receiver_type(
+  unique int extension: @extension_type ref,
+  int receiver_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type | @extension_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, params/array = 3, this = 4, in = 5, ref readonly = 6 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* C# 12.0 */
+| 136 = @collection_expr
+| 137 = @spread_element_expr
+| 138 = @interpolated_string_insert_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @assign_expr | @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/* Compiler generated */
+
+compiler_generated(unique int id: @element ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* 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;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
diff --git a/csharp/ql/lib/upgrades/178a7e6cf335486d33d4e49543148e3f57f04a9a/semmlecode.csharp.dbscheme b/csharp/ql/lib/upgrades/178a7e6cf335486d33d4e49543148e3f57f04a9a/semmlecode.csharp.dbscheme
new file mode 100644
index 00000000000..e73ca2c93df
--- /dev/null
+++ b/csharp/ql/lib/upgrades/178a7e6cf335486d33d4e49543148e3f57f04a9a/semmlecode.csharp.dbscheme
@@ -0,0 +1,1489 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+compilation_info(
+  int id : @compilation ref,
+  string info_key: string ref,
+  string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile.rsp` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_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(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string 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
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * Overlay support
+ */
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+@locatable = @declaration_with_accessors | @callable_accessor | @declaration_or_directive
+           | @diagnostic | @extractor_message | @preprocessor_directive | @attribute | @type_mention | @type_parameter_constraints
+           | @declaration_with_accessors | @callable_accessor | @operator | @method
+           | @constructor | @destructor | @field | @local_variable | @parameter | @stmt | @expr
+           | @xmllocatable | @commentline | @commentblock | @asp_element
+
+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);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+| 34 = @inline_array_type
+| 35 = @extension_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type | @void_type | @inline_array_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type | @extension_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extension_receiver_type(
+  unique int extension: @extension_type ref,
+  int receiver_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type | @extension_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, params/array = 3, this = 4, in = 5, ref readonly = 6 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* C# 12.0 */
+| 136 = @collection_expr
+| 137 = @spread_element_expr
+| 138 = @interpolated_string_insert_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @assign_expr | @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/* Compiler generated */
+
+compiler_generated(unique int id: @element ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* 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;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
diff --git a/csharp/ql/lib/upgrades/178a7e6cf335486d33d4e49543148e3f57f04a9a/upgrade.properties b/csharp/ql/lib/upgrades/178a7e6cf335486d33d4e49543148e3f57f04a9a/upgrade.properties
new file mode 100644
index 00000000000..0722ccf985d
--- /dev/null
+++ b/csharp/ql/lib/upgrades/178a7e6cf335486d33d4e49543148e3f57f04a9a/upgrade.properties
@@ -0,0 +1,2 @@
+description: Expand @bin_op union to include @assign_expr
+compatibility: full
diff --git a/csharp/ql/lib/upgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/assignments.ql b/csharp/ql/lib/upgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/assignments.ql
new file mode 100644
index 00000000000..89e39a6e722
--- /dev/null
+++ b/csharp/ql/lib/upgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/assignments.ql
@@ -0,0 +1,117 @@
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+class Location extends @location {
+  string toString() { none() }
+}
+
+class ControlFlowElement extends @control_flow_element {
+  string toString() { none() }
+}
+
+class TypeOrRef extends @type_or_ref {
+  string toString() { none() }
+}
+
+class Callable extends @callable {
+  string toString() { none() }
+}
+
+class Accessible extends @accessible {
+  string toString() { none() }
+}
+
+predicate assignmentKind(int kind) {
+  // | 63 = @simple_assign_expr
+  // | 80 = @add_event_expr
+  // | 81 = @remove_event_expr
+  // | 83 = @local_var_decl_expr
+  kind = [63, 80, 81, 83]
+}
+
+predicate compoundAssignmentKind(int kind) {
+  // | 64 = @assign_add_expr
+  // | 65 = @assign_sub_expr
+  // | 66 = @assign_mul_expr
+  // | 67 = @assign_div_expr
+  // | 68 = @assign_rem_expr
+  // | 69 = @assign_and_expr
+  // | 70 = @assign_xor_expr
+  // | 71 = @assign_or_expr
+  // | 72 = @assign_lshift_expr
+  // | 73 = @assign_rshift_expr
+  // | 119 = @assign_coalesce_expr
+  // | 134 = @assign_urshift_expr
+  kind = [64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 119, 134]
+}
+
+class CompoundAssignmentExpr extends Expr {
+  CompoundAssignmentExpr() {
+    exists(int kind | compoundAssignmentKind(kind) | expressions(this, kind, _))
+  }
+}
+
+predicate isAssignment(Expr ass) {
+  exists(int kind | assignmentKind(kind) |
+    expressions(ass, kind, _) and
+    // Exclude assignments that are part of a compound assignment. These are handled seperatly.
+    not exists(CompoundAssignmentExpr e | expr_parent(ass, 2, e))
+  )
+}
+
+Expr getOperatorCall(CompoundAssignmentExpr e) {
+  exists(Expr assignment |
+    expr_parent(assignment, 2, e) and
+    expr_parent(result, 0, assignment)
+  )
+}
+
+query predicate new_expressions(Expr e, int kind, TypeOrRef t) {
+  expressions(e, kind, t) and
+  // Remove the unused expanded assignment expressions.
+  not exists(CompoundAssignmentExpr parent, Expr assignment | expr_parent(assignment, 2, parent) |
+    e = assignment or
+    expr_parent(e, 0, assignment) or
+    expr_parent(e, 1, assignment)
+  )
+}
+
+query predicate new_expr_parent(Expr e, int child, ControlFlowElement parent) {
+  if isAssignment(parent)
+  then
+    // Swap children for assignments, local variable declarations and add/remove event.
+    child = 0 and expr_parent(e, 1, parent)
+    or
+    child = 1 and expr_parent(e, 0, parent)
+  else (
+    // Case for compound assignments. The parent child relation is contracted.
+    exists(Expr op | op = getOperatorCall(parent) | expr_parent(e, child, op))
+    or
+    // For other expressions (as long as they are included in the new expressions
+    // table), the parent child relation is unchanged.
+    expr_parent(e, child, parent) and
+    new_expressions(e, _, _) and
+    (not parent instanceof Expr or new_expressions(parent, _, _))
+  )
+}
+
+query predicate new_expr_location(Expr e, Location loc) {
+  expr_location(e, loc) and new_expressions(e, _, _)
+}
+
+query predicate new_expr_call(Expr e, Callable c) {
+  exists(Expr op | op = getOperatorCall(e) | expr_call(op, c))
+  or
+  expr_call(e, c) and not e = getOperatorCall(_)
+}
+
+query predicate new_dynamic_member_name(Expr e, string name) {
+  exists(Expr op | op = getOperatorCall(e) | dynamic_member_name(op, name))
+  or
+  dynamic_member_name(e, name) and not e = getOperatorCall(_)
+}
+
+query predicate new_expr_access(Expr e, Accessible a) {
+  expr_access(e, a) and new_expressions(e, _, _)
+}
diff --git a/csharp/ql/lib/upgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/old.dbscheme b/csharp/ql/lib/upgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/old.dbscheme
new file mode 100644
index 00000000000..e73ca2c93df
--- /dev/null
+++ b/csharp/ql/lib/upgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/old.dbscheme
@@ -0,0 +1,1489 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+compilation_info(
+  int id : @compilation ref,
+  string info_key: string ref,
+  string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile.rsp` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_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(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string 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
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * Overlay support
+ */
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+@locatable = @declaration_with_accessors | @callable_accessor | @declaration_or_directive
+           | @diagnostic | @extractor_message | @preprocessor_directive | @attribute | @type_mention | @type_parameter_constraints
+           | @declaration_with_accessors | @callable_accessor | @operator | @method
+           | @constructor | @destructor | @field | @local_variable | @parameter | @stmt | @expr
+           | @xmllocatable | @commentline | @commentblock | @asp_element
+
+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);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+| 34 = @inline_array_type
+| 35 = @extension_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type | @void_type | @inline_array_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type | @extension_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extension_receiver_type(
+  unique int extension: @extension_type ref,
+  int receiver_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type | @extension_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, params/array = 3, this = 4, in = 5, ref readonly = 6 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* C# 12.0 */
+| 136 = @collection_expr
+| 137 = @spread_element_expr
+| 138 = @interpolated_string_insert_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_expr =  @assign_arith_expr | @assign_bitwise_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @assign_expr | @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@call = @method_invocation_expr | @constructor_init_expr | @operator_invocation_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @operator_invocation_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/* Compiler generated */
+
+compiler_generated(unique int id: @element ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* 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;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
diff --git a/csharp/ql/lib/upgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/semmlecode.csharp.dbscheme b/csharp/ql/lib/upgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/semmlecode.csharp.dbscheme
new file mode 100644
index 00000000000..19b8cc3e2dc
--- /dev/null
+++ b/csharp/ql/lib/upgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/semmlecode.csharp.dbscheme
@@ -0,0 +1,1504 @@
+/* This is a dummy line to alter the dbscheme, so we can make a database upgrade
+ * without actually changing any of the dbscheme predicates. It contains a date
+ * to allow for such updates in the future as well.
+ *
+ * 2021-07-14
+ *
+ * DO NOT remove this comment carelessly, since it can revert the dbscheme back to a
+ * previously seen state (matching a previously seen SHA), which would make the upgrade
+ * mechanism not work properly.
+ */
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+compilation_info(
+  int id : @compilation ref,
+  string info_key: string ref,
+  string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | --compiler
+ * 1   | *path to compiler*
+ * 2   | f1.cs
+ * 3   | f2.cs
+ * 4   | f3.cs
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile.rsp` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.cs
+ * 1   | f2.cs
+ * 2   | f3.cs
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The references used by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   csc f1.cs f2.cs f3.cs /r:ref1.dll /r:ref2.dll /r:ref3.dll
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | ref1.dll
+ * 1   | ref2.dll
+ * 2   | ref3.dll
+ */
+#keyset[id, num]
+compilation_referencing_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(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+extractor_messages(
+    unique int id: @extractor_message,
+    int severity: int ref,
+    string origin : string ref,
+    string text : string ref,
+    string entity : string ref,
+    int location: @location ref,
+    string stack_trace : string 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
+);
+
+compilation_assembly(
+  unique int id : @compilation ref,
+  int assembly: @assembly ref
+)
+
+// Populated by the CSV extractor
+externalData(
+   int id: @externalDataElement,
+   string path: string ref,
+   int column: int ref,
+   string value: string ref);
+
+sourceLocationPrefix(
+  string prefix: string ref);
+
+/*
+ * Overlay support
+ */
+
+/**
+ * The CLI will automatically emit the tuple `databaseMetadata("isOverlay", "true")`,
+ * along with an `overlayChangedFiles` tuple for each new/modified/deleted file,
+ * when building an overlay database, and these can be used by the discard predicates.
+ */
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path : string ref
+);
+
+/*
+ * C# dbscheme
+ */
+
+/** ELEMENTS **/
+
+@element = @declaration | @stmt | @expr | @modifier | @attribute | @namespace_declaration
+         | @using_directive | @type_parameter_constraints | @externalDataElement
+         | @xmllocatable | @asp_element | @namespace | @preprocessor_directive;
+
+@declaration = @callable | @generic | @assignable | @namespace;
+
+@named_element = @namespace | @declaration;
+
+@declaration_with_accessors = @property | @indexer | @event;
+
+@assignable = @variable | @assignable_with_accessors | @event;
+
+@assignable_with_accessors = @property | @indexer;
+
+@attributable = @assembly | @field | @parameter | @operator | @method | @constructor
+              | @destructor | @callable_accessor | @value_or_ref_type | @declaration_with_accessors
+              | @local_function | @lambda_expr;
+
+/** LOCATIONS, ASEMMBLIES, MODULES, FILES and FOLDERS **/
+
+@location = @location_default | @assembly;
+
+@locatable = @declaration_with_accessors | @callable_accessor | @declaration_or_directive
+           | @diagnostic | @extractor_message | @preprocessor_directive | @attribute | @type_mention | @type_parameter_constraints
+           | @declaration_with_accessors | @callable_accessor | @operator | @method
+           | @constructor | @destructor | @field | @local_variable | @parameter | @stmt | @expr
+           | @xmllocatable | @commentline | @commentblock | @asp_element
+
+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);
+
+locations_mapped(
+  unique int id: @location_default ref,
+  int mapped_to: @location_default ref);
+
+@sourceline = @file | @callable | @xmllocatable;
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref);
+
+assemblies(
+  unique int id: @assembly,
+  int file: @file ref,
+  string fullname: string ref,
+  string name: string ref,
+  string version: string ref);
+
+files(
+  unique int id: @file,
+  string name: string ref);
+
+folders(
+  unique int id: @folder,
+  string name: string ref);
+
+@container = @folder | @file ;
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref);
+
+file_extraction_mode(
+  unique int file: @file ref,
+  int mode: int ref
+  /* 0 = normal, 1 = standalone extractor */
+  );
+
+/** NAMESPACES **/
+
+@type_container = @namespace | @type;
+
+namespaces(
+  unique int id: @namespace,
+  string name: string ref);
+
+namespace_declarations(
+  unique int id: @namespace_declaration,
+  int namespace_id: @namespace ref);
+
+namespace_declaration_location(
+  unique int id: @namespace_declaration ref,
+  int loc: @location ref);
+
+parent_namespace(
+  unique int child_id: @type_container ref,
+  int namespace_id: @namespace ref);
+
+@declaration_or_directive = @namespace_declaration | @type | @using_directive;
+
+parent_namespace_declaration(
+  int child_id: @declaration_or_directive ref, // cannot be unique because of partial classes
+  int namespace_id: @namespace_declaration ref);
+
+@using_directive = @using_namespace_directive | @using_static_directive;
+
+using_global(
+  unique int id: @using_directive ref
+);
+
+using_namespace_directives(
+  unique int id: @using_namespace_directive,
+  int namespace_id: @namespace ref);
+
+using_static_directives(
+  unique int id: @using_static_directive,
+  int type_id: @type_or_ref ref);
+
+using_directive_location(
+  unique int id: @using_directive ref,
+  int loc: @location ref);
+
+@preprocessor_directive = @pragma_warning | @pragma_checksum | @directive_define | @directive_undefine | @directive_warning
+  | @directive_error | @directive_nullable | @directive_line | @directive_region | @directive_endregion | @directive_if
+  | @directive_elif | @directive_else | @directive_endif;
+
+@conditional_directive = @directive_if | @directive_elif;
+@branch_directive = @directive_if | @directive_elif | @directive_else;
+
+directive_ifs(
+  unique int id: @directive_if,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref); /* 0: false, 1: true */
+
+directive_elifs(
+  unique int id: @directive_elif,
+  int branchTaken: int ref,     /* 0: false, 1: true */
+  int conditionValue: int ref,  /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+directive_elses(
+  unique int id: @directive_else,
+  int branchTaken: int ref,   /* 0: false, 1: true */
+  int parent: @directive_if ref,
+  int index: int ref);
+
+#keyset[id, start]
+directive_endifs(
+  unique int id: @directive_endif,
+  unique int start: @directive_if ref);
+
+directive_define_symbols(
+  unique int id: @define_symbol_expr ref,
+  string name: string ref);
+
+directive_regions(
+  unique int id: @directive_region,
+  string name: string ref);
+
+#keyset[id, start]
+directive_endregions(
+  unique int id: @directive_endregion,
+  unique int start: @directive_region ref);
+
+directive_lines(
+  unique int id: @directive_line,
+  int kind: int ref); /* 0: default, 1: hidden, 2: numeric, 3: span */
+
+directive_line_value(
+  unique int id: @directive_line ref,
+  int line: int ref);
+
+directive_line_file(
+  unique int id: @directive_line ref,
+  int file: @file ref);
+
+directive_line_offset(
+  unique int id: @directive_line ref,
+  int offset: int ref);
+
+directive_line_span(
+  unique int id: @directive_line ref,
+  int startLine: int ref,
+  int startColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref);
+
+directive_nullables(
+  unique int id: @directive_nullable,
+  int setting: int ref, /* 0: disable, 1: enable, 2: restore */
+  int target: int ref); /* 0: none, 1: annotations, 2: warnings */
+
+directive_warnings(
+  unique int id: @directive_warning,
+  string message: string ref);
+
+directive_errors(
+  unique int id: @directive_error,
+  string message: string ref);
+
+directive_undefines(
+  unique int id: @directive_undefine,
+  string name: string ref);
+
+directive_defines(
+  unique int id: @directive_define,
+  string name: string ref);
+
+pragma_checksums(
+  unique int id: @pragma_checksum,
+  int file: @file ref,
+  string guid: string ref,
+  string bytes: string ref);
+
+pragma_warnings(
+  unique int id: @pragma_warning,
+  int kind: int ref /* 0 = disable, 1 = restore */);
+
+#keyset[id, index]
+pragma_warning_error_codes(
+  int id: @pragma_warning ref,
+  string errorCode: string ref,
+  int index: int ref);
+
+preprocessor_directive_location(
+  unique int id: @preprocessor_directive ref,
+  int loc: @location ref);
+
+preprocessor_directive_compilation(
+  int id: @preprocessor_directive ref,
+  int compilation: @compilation ref);
+
+preprocessor_directive_active(
+  unique int id: @preprocessor_directive ref,
+  int active: int ref);  /* 0: false, 1: true */
+
+/** TYPES **/
+
+types(
+  unique int id: @type,
+  int kind: int ref,
+  string name: string ref);
+
+case @type.kind of
+   1 = @bool_type
+|  2 = @char_type
+|  3 = @decimal_type
+|  4 = @sbyte_type
+|  5 = @short_type
+|  6 = @int_type
+|  7 = @long_type
+|  8 = @byte_type
+|  9 = @ushort_type
+| 10 = @uint_type
+| 11 = @ulong_type
+| 12 = @float_type
+| 13 = @double_type
+| 14 = @enum_type
+| 15 = @struct_type
+| 17 = @class_type
+| 19 = @interface_type
+| 20 = @delegate_type
+| 21 = @null_type
+| 22 = @type_parameter
+| 23 = @pointer_type
+| 24 = @nullable_type
+| 25 = @array_type
+| 26 = @void_type
+| 27 = @int_ptr_type
+| 28 = @uint_ptr_type
+| 29 = @dynamic_type
+| 30 = @arglist_type
+| 31 = @unknown_type
+| 32 = @tuple_type
+| 33 = @function_pointer_type
+| 34 = @inline_array_type
+| 35 = @extension_type
+  ;
+
+@simple_type = @bool_type | @char_type | @integral_type | @floating_point_type | @decimal_type;
+@integral_type = @signed_integral_type | @unsigned_integral_type;
+@signed_integral_type = @sbyte_type | @short_type | @int_type | @long_type;
+@unsigned_integral_type = @byte_type  | @ushort_type | @uint_type | @ulong_type;
+@floating_point_type = @float_type | @double_type;
+@value_type = @simple_type | @enum_type | @struct_type | @nullable_type | @int_ptr_type
+            | @uint_ptr_type | @tuple_type | @void_type | @inline_array_type;
+@ref_type = @class_type | @interface_type | @array_type | @delegate_type | @null_type
+          | @dynamic_type | @extension_type;
+@value_or_ref_type = @value_type | @ref_type;
+
+typerefs(
+  unique int id: @typeref,
+  string name: string ref);
+
+typeref_type(
+  int id: @typeref ref,
+  unique int typeId: @type ref);
+
+@type_or_ref = @type | @typeref;
+
+array_element_type(
+  unique int array: @array_type ref,
+  int dimension: int ref,
+  int rank: int ref,
+  int element: @type_or_ref ref);
+
+nullable_underlying_type(
+  unique int nullable: @nullable_type ref,
+  int underlying: @type_or_ref ref);
+
+pointer_referent_type(
+  unique int pointer: @pointer_type ref,
+  int referent: @type_or_ref ref);
+
+enum_underlying_type(
+  unique int enum_id: @enum_type ref,
+  int underlying_type_id: @type_or_ref ref);
+
+delegate_return_type(
+  unique int delegate_id: @delegate_type ref,
+  int return_type_id: @type_or_ref ref);
+
+function_pointer_return_type(
+    unique int function_pointer_id: @function_pointer_type ref,
+    int return_type_id: @type_or_ref ref);
+
+extension_receiver_type(
+  unique int extension: @extension_type ref,
+  int receiver_type_id: @type_or_ref ref);
+
+extend(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+anonymous_types(
+  unique int id: @type ref);
+
+@interface_or_ref = @interface_type | @typeref;
+
+implement(
+  int sub: @type ref,
+  int super: @type_or_ref ref);
+
+type_location(
+  int id: @type ref,
+  int loc: @location ref);
+
+tuple_underlying_type(
+  unique int tuple: @tuple_type ref,
+  int struct: @type_or_ref ref);
+
+#keyset[tuple, index]
+tuple_element(
+  int tuple: @tuple_type ref,
+  int index: int ref,
+  unique int field: @field ref);
+
+attributes(
+  unique int id: @attribute,
+  int kind: int ref,
+  int type_id: @type_or_ref ref,
+  int target:  @attributable ref);
+
+case @attribute.kind of
+  0 = @attribute_default
+| 1 = @attribute_return
+| 2 = @attribute_assembly
+| 3 = @attribute_module
+;
+
+attribute_location(
+  int id: @attribute ref,
+  int loc: @location ref);
+
+@type_mention_parent = @element | @type_mention;
+
+type_mention(
+  unique int id: @type_mention,
+  int type_id: @type_or_ref ref,
+  int parent: @type_mention_parent ref);
+
+type_mention_location(
+  unique int id: @type_mention ref,
+  int loc: @location ref);
+
+@has_type_annotation = @assignable | @type_parameter | @callable | @expr | @delegate_type | @generic | @function_pointer_type;
+
+/**
+ * A direct annotation on an entity, for example `string? x;`.
+ *
+ * Annotations:
+ * 2 = reftype is not annotated "!"
+ * 3 = reftype is annotated "?"
+ * 4 = readonly ref type / in parameter
+ * 5 = ref type parameter, return or local variable
+ * 6 = out parameter
+ *
+ * Note that the annotation depends on the element it annotates.
+ * @assignable: The annotation is on the type of the assignable, for example the variable type.
+ * @type_parameter: The annotation is on the reftype constraint
+ * @callable: The annotation is on the return type
+ * @array_type: The annotation is on the element type
+ */
+type_annotation(int id: @has_type_annotation ref, int annotation: int ref);
+
+nullability(unique int nullability: @nullability, int kind: int ref);
+
+case @nullability.kind of
+  0 = @oblivious
+| 1 = @not_annotated
+| 2 = @annotated
+;
+
+#keyset[parent, index]
+nullability_parent(int nullability: @nullability ref, int index: int ref, int parent: @nullability ref)
+
+type_nullability(int id: @has_type_annotation ref, int nullability: @nullability ref);
+
+/**
+ * The nullable flow state of an expression, as determined by Roslyn.
+ *   0 = none (default, not populated)
+ *   1 = not null
+ *   2 = maybe null
+ */
+expr_flowstate(unique int id: @expr ref, int state: int ref);
+
+/** GENERICS **/
+
+@generic = @type | @method | @local_function;
+
+type_parameters(
+  unique int id: @type_parameter ref,
+  int index: int ref,
+  int generic_id: @generic ref,
+  int variance: int ref /* none = 0, out = 1, in = 2 */);
+
+#keyset[constructed_id, index]
+type_arguments(
+  int id: @type_or_ref ref,
+  int index: int ref,
+  int constructed_id: @generic_or_ref ref);
+
+@generic_or_ref = @generic | @typeref;
+
+constructed_generic(
+  unique int constructed: @generic ref,
+  int generic: @generic_or_ref ref);
+
+type_parameter_constraints(
+  unique int id: @type_parameter_constraints,
+  int param_id: @type_parameter ref);
+
+type_parameter_constraints_location(
+  int id: @type_parameter_constraints ref,
+  int loc: @location ref);
+
+general_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int kind: int ref /* class = 1, struct = 2, new = 3 */);
+
+specific_type_parameter_constraints(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref);
+
+specific_type_parameter_nullability(
+  int id: @type_parameter_constraints ref,
+  int base_id: @type_or_ref ref,
+  int nullability: @nullability ref);
+
+/** FUNCTION POINTERS */
+
+function_pointer_calling_conventions(
+  int id: @function_pointer_type ref,
+  int kind: int ref);
+
+#keyset[id, index]
+has_unmanaged_calling_conventions(
+  int id: @function_pointer_type ref,
+  int index: int ref,
+  int conv_id: @type_or_ref ref);
+
+/** MODIFIERS */
+
+@modifiable = @modifiable_direct | @event_accessor;
+
+@modifiable_direct = @member | @accessor | @local_function | @anonymous_function_expr;
+
+modifiers(
+  unique int id: @modifier,
+  string name: string ref);
+
+has_modifiers(
+  int id: @modifiable_direct ref,
+  int mod_id: @modifier ref);
+
+/** MEMBERS **/
+
+@member = @method | @constructor | @destructor | @field | @property | @event | @operator | @indexer | @type;
+
+@named_exprorstmt = @goto_stmt | @labeled_stmt | @expr;
+
+@virtualizable = @method | @property | @indexer | @event | @operator;
+
+exprorstmt_name(
+  unique int parent_id: @named_exprorstmt ref,
+  string name: string ref);
+
+nested_types(
+  unique int id: @type ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @type ref);
+
+properties(
+  unique int id: @property,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @property ref);
+
+property_location(
+  int id: @property ref,
+  int loc: @location ref);
+
+indexers(
+  unique int id: @indexer,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @indexer ref);
+
+indexer_location(
+  int id: @indexer ref,
+  int loc: @location ref);
+
+accessors(
+  unique int id: @accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_member_id: @member ref,
+  int unbound_id: @accessor ref);
+
+case @accessor.kind of
+  1 = @getter
+| 2 = @setter
+  ;
+
+init_only_accessors(
+  unique int id: @accessor ref);
+
+accessor_location(
+  int id: @accessor ref,
+  int loc: @location ref);
+
+events(
+  unique int id: @event,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @event ref);
+
+event_location(
+  int id: @event ref,
+  int loc: @location ref);
+
+event_accessors(
+  unique int id: @event_accessor,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_event_id: @event ref,
+  int unbound_id: @event_accessor ref);
+
+case @event_accessor.kind of
+  1 = @add_event_accessor
+| 2 = @remove_event_accessor
+  ;
+
+event_accessor_location(
+  int id: @event_accessor ref,
+  int loc: @location ref);
+
+operators(
+  unique int id: @operator,
+  string name: string ref,
+  string symbol: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @operator ref);
+
+operator_location(
+  int id: @operator ref,
+  int loc: @location ref);
+
+constant_value(
+  int id: @variable ref,
+  string value: string ref);
+
+/** CALLABLES **/
+
+@callable = @method | @constructor | @destructor | @operator | @callable_accessor | @anonymous_function_expr | @local_function;
+
+@callable_accessor = @accessor | @event_accessor;
+
+methods(
+  unique int id: @method,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @method ref);
+
+method_location(
+  int id: @method ref,
+  int loc: @location ref);
+
+constructors(
+  unique int id: @constructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @constructor ref);
+
+constructor_location(
+  int id: @constructor ref,
+  int loc: @location ref);
+
+destructors(
+  unique int id: @destructor,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int unbound_id: @destructor ref);
+
+destructor_location(
+  int id: @destructor ref,
+  int loc: @location ref);
+
+overrides(
+  int id: @callable ref,
+  int base_id: @callable ref);
+
+explicitly_implements(
+  int id: @member ref,
+  int interface_id: @interface_or_ref ref);
+
+local_functions(
+    unique int id: @local_function,
+    string name: string ref,
+    int return_type: @type ref,
+    int unbound_id: @local_function ref);
+
+local_function_stmts(
+    unique int fn: @local_function_stmt ref,
+    int stmt: @local_function ref);
+
+/** VARIABLES **/
+
+@variable = @local_scope_variable | @field;
+
+@local_scope_variable = @local_variable | @parameter;
+
+fields(
+  unique int id: @field,
+  int kind: int ref,
+  string name: string ref,
+  int declaring_type_id: @type ref,
+  int type_id: @type_or_ref ref,
+  int unbound_id: @field ref);
+
+case @field.kind of
+  1 = @addressable_field
+| 2 = @constant
+  ;
+
+field_location(
+  int id: @field ref,
+  int loc: @location ref);
+
+localvars(
+  unique int id: @local_variable,
+  int kind: int ref,
+  string name: string ref,
+  int implicitly_typed: int ref /* 0 = no, 1 = yes */,
+  int type_id: @type_or_ref ref,
+  int parent_id: @local_var_decl_expr ref);
+
+case @local_variable.kind of
+  1 = @addressable_local_variable
+| 2 = @local_constant
+| 3 = @local_variable_ref
+  ;
+
+localvar_location(
+  unique int id: @local_variable ref,
+  int loc: @location ref);
+
+@parameterizable = @callable | @delegate_type | @indexer | @function_pointer_type | @extension_type;
+
+#keyset[name, parent_id]
+#keyset[index, parent_id]
+params(
+  unique int id: @parameter,
+  string name: string ref,
+  int type_id: @type_or_ref ref,
+  int index: int ref,
+  int mode: int ref, /* value = 0, ref = 1, out = 2, params/array = 3, this = 4, in = 5, ref readonly = 6 */
+  int parent_id: @parameterizable ref,
+  int unbound_id: @parameter ref);
+
+param_location(
+  int id: @parameter ref,
+  int loc: @location ref);
+
+@has_scoped_annotation = @local_scope_variable
+
+scoped_annotation(
+  int id: @has_scoped_annotation ref,
+  int kind: int ref // scoped ref = 1, scoped value = 2
+  );
+
+/** STATEMENTS **/
+
+@exprorstmt_parent = @control_flow_element | @top_level_exprorstmt_parent;
+
+statements(
+  unique int id: @stmt,
+  int kind: int ref);
+
+#keyset[index, parent]
+stmt_parent(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_stmt_parent = @callable;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+stmt_parent_top_level(
+  unique int stmt: @stmt ref,
+  int index: int ref,
+  int parent: @top_level_stmt_parent ref);
+
+case @stmt.kind of
+   1 = @block_stmt
+|  2 = @expr_stmt
+|  3 = @if_stmt
+|  4 = @switch_stmt
+|  5 = @while_stmt
+|  6 = @do_stmt
+|  7 = @for_stmt
+|  8 = @foreach_stmt
+|  9 = @break_stmt
+| 10 = @continue_stmt
+| 11 = @goto_stmt
+| 12 = @goto_case_stmt
+| 13 = @goto_default_stmt
+| 14 = @throw_stmt
+| 15 = @return_stmt
+| 16 = @yield_stmt
+| 17 = @try_stmt
+| 18 = @checked_stmt
+| 19 = @unchecked_stmt
+| 20 = @lock_stmt
+| 21 = @using_block_stmt
+| 22 = @var_decl_stmt
+| 23 = @const_decl_stmt
+| 24 = @empty_stmt
+| 25 = @unsafe_stmt
+| 26 = @fixed_stmt
+| 27 = @label_stmt
+| 28 = @catch
+| 29 = @case_stmt
+| 30 = @local_function_stmt
+| 31 = @using_decl_stmt
+  ;
+
+@using_stmt = @using_block_stmt | @using_decl_stmt;
+
+@labeled_stmt = @label_stmt | @case;
+
+@decl_stmt = @var_decl_stmt | @const_decl_stmt | @using_decl_stmt;
+
+@cond_stmt = @if_stmt | @switch_stmt;
+
+@loop_stmt = @while_stmt | @do_stmt | @for_stmt | @foreach_stmt;
+
+@jump_stmt = @break_stmt | @goto_any_stmt | @continue_stmt | @throw_stmt | @return_stmt
+           | @yield_stmt;
+
+@goto_any_stmt = @goto_default_stmt | @goto_case_stmt | @goto_stmt;
+
+
+stmt_location(
+  unique int id: @stmt ref,
+  int loc: @location ref);
+
+catch_type(
+  unique int catch_id: @catch ref,
+  int type_id: @type_or_ref ref,
+  int kind: int ref /* explicit = 1, implicit = 2 */);
+
+foreach_stmt_info(
+  unique int id: @foreach_stmt ref,
+  int kind: int ref /* non-async = 1, async = 2 */);
+
+@foreach_symbol =  @method | @property | @type_or_ref;
+
+#keyset[id, kind]
+foreach_stmt_desugar(
+  int id: @foreach_stmt ref,
+  int symbol: @foreach_symbol ref,
+  int kind: int ref /* GetEnumeratorMethod = 1, CurrentProperty = 2, MoveNextMethod = 3, DisposeMethod = 4, ElementType = 5 */);
+
+/** EXPRESSIONS **/
+
+expressions(
+  unique int id: @expr,
+  int kind: int ref,
+  int type_id: @type_or_ref ref);
+
+#keyset[index, parent]
+expr_parent(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @control_flow_element ref);
+
+@top_level_expr_parent = @attribute | @field | @property | @indexer | @parameter | @directive_if | @directive_elif;
+
+@top_level_exprorstmt_parent = @top_level_expr_parent | @top_level_stmt_parent;
+
+// [index, parent] is not a keyset because the same parent may be compiled multiple times
+expr_parent_top_level(
+  unique int expr: @expr ref,
+  int index: int ref,
+  int parent: @top_level_exprorstmt_parent ref);
+
+case @expr.kind of
+/* literal */
+   1 = @bool_literal_expr
+|  2 = @char_literal_expr
+|  3 = @decimal_literal_expr
+|  4 = @int_literal_expr
+|  5 = @long_literal_expr
+|  6 = @uint_literal_expr
+|  7 = @ulong_literal_expr
+|  8 = @float_literal_expr
+|  9 = @double_literal_expr
+| 10 = @utf16_string_literal_expr
+| 11 = @null_literal_expr
+/* primary & unary */
+| 12 = @this_access_expr
+| 13 = @base_access_expr
+| 14 = @local_variable_access_expr
+| 15 = @parameter_access_expr
+| 16 = @field_access_expr
+| 17 = @property_access_expr
+| 18 = @method_access_expr
+| 19 = @event_access_expr
+| 20 = @indexer_access_expr
+| 21 = @array_access_expr
+| 22 = @type_access_expr
+| 23 = @typeof_expr
+| 24 = @method_invocation_expr
+| 25 = @delegate_invocation_expr
+| 26 = @operator_invocation_expr
+| 27 = @cast_expr
+| 28 = @object_creation_expr
+| 29 = @explicit_delegate_creation_expr
+| 30 = @implicit_delegate_creation_expr
+| 31 = @array_creation_expr
+| 32 = @default_expr
+| 33 = @plus_expr
+| 34 = @minus_expr
+| 35 = @bit_not_expr
+| 36 = @log_not_expr
+| 37 = @post_incr_expr
+| 38 = @post_decr_expr
+| 39 = @pre_incr_expr
+| 40 = @pre_decr_expr
+/* multiplicative */
+| 41 = @mul_expr
+| 42 = @div_expr
+| 43 = @rem_expr
+/* additive */
+| 44 = @add_expr
+| 45 = @sub_expr
+/* shift */
+| 46 = @lshift_expr
+| 47 = @rshift_expr
+/* relational */
+| 48 = @lt_expr
+| 49 = @gt_expr
+| 50 = @le_expr
+| 51 = @ge_expr
+/* equality */
+| 52 = @eq_expr
+| 53 = @ne_expr
+/* logical */
+| 54 = @bit_and_expr
+| 55 = @bit_xor_expr
+| 56 = @bit_or_expr
+| 57 = @log_and_expr
+| 58 = @log_or_expr
+/* type testing */
+| 59 = @is_expr
+| 60 = @as_expr
+/* null coalescing */
+| 61 = @null_coalescing_expr
+/* conditional */
+| 62 = @conditional_expr
+/* assignment */
+| 63 = @simple_assign_expr
+| 64 = @assign_add_expr
+| 65 = @assign_sub_expr
+| 66 = @assign_mul_expr
+| 67 = @assign_div_expr
+| 68 = @assign_rem_expr
+| 69 = @assign_and_expr
+| 70 = @assign_xor_expr
+| 71 = @assign_or_expr
+| 72 = @assign_lshift_expr
+| 73 = @assign_rshift_expr
+/* more */
+| 74 = @object_init_expr
+| 75 = @collection_init_expr
+| 76 = @array_init_expr
+| 77 = @checked_expr
+| 78 = @unchecked_expr
+| 79 = @constructor_init_expr
+| 80 = @add_event_expr
+| 81 = @remove_event_expr
+| 82 = @par_expr
+| 83 = @local_var_decl_expr
+| 84 = @lambda_expr
+| 85 = @anonymous_method_expr
+| 86 = @namespace_expr
+/* dynamic */
+| 92 = @dynamic_element_access_expr
+| 93 = @dynamic_member_access_expr
+/* unsafe */
+| 100 = @pointer_indirection_expr
+| 101 = @address_of_expr
+| 102 = @sizeof_expr
+/* async */
+| 103 = @await_expr
+/* C# 6.0 */
+| 104 = @nameof_expr
+| 105 = @interpolated_string_expr
+| 106 = @unknown_expr
+/* C# 7.0 */
+| 107 = @throw_expr
+| 108 = @tuple_expr
+| 109 = @local_function_invocation_expr
+| 110 = @ref_expr
+| 111 = @discard_expr
+/* C# 8.0 */
+| 112 = @range_expr
+| 113 = @index_expr
+| 114 = @switch_expr
+| 115 = @recursive_pattern_expr
+| 116 = @property_pattern_expr
+| 117 = @positional_pattern_expr
+| 118 = @switch_case_expr
+| 119 = @assign_coalesce_expr
+| 120 = @suppress_nullable_warning_expr
+| 121 = @namespace_access_expr
+/* C# 9.0 */
+| 122 = @lt_pattern_expr
+| 123 = @gt_pattern_expr
+| 124 = @le_pattern_expr
+| 125 = @ge_pattern_expr
+| 126 = @not_pattern_expr
+| 127 = @and_pattern_expr
+| 128 = @or_pattern_expr
+| 129 = @function_pointer_invocation_expr
+| 130 = @with_expr
+/* C# 11.0 */
+| 131 = @list_pattern_expr
+| 132 = @slice_pattern_expr
+| 133 = @urshift_expr
+| 134 = @assign_urshift_expr
+| 135 = @utf8_string_literal_expr
+/* C# 12.0 */
+| 136 = @collection_expr
+| 137 = @spread_element_expr
+| 138 = @interpolated_string_insert_expr
+/* Preprocessor */
+| 999 = @define_symbol_expr
+;
+
+@switch = @switch_stmt | @switch_expr;
+@case = @case_stmt | @switch_case_expr;
+@pattern_match = @case | @is_expr;
+@unary_pattern_expr = @not_pattern_expr;
+@relational_pattern_expr = @gt_pattern_expr | @lt_pattern_expr | @ge_pattern_expr | @le_pattern_expr;
+@binary_pattern_expr = @and_pattern_expr | @or_pattern_expr;
+
+@integer_literal_expr = @int_literal_expr | @long_literal_expr | @uint_literal_expr | @ulong_literal_expr;
+@real_literal_expr = @float_literal_expr | @double_literal_expr | @decimal_literal_expr;
+@string_literal_expr = @utf16_string_literal_expr | @utf8_string_literal_expr;
+@literal_expr = @bool_literal_expr | @char_literal_expr | @integer_literal_expr | @real_literal_expr
+              | @string_literal_expr | @null_literal_expr;
+
+@assign_expr = @simple_assign_expr | @assign_op_expr | @local_var_decl_expr;
+@assign_op_call_expr = @assign_arith_expr | @assign_bitwise_expr
+@assign_op_expr =  @assign_op_call_expr | @assign_event_expr | @assign_coalesce_expr;
+@assign_event_expr = @add_event_expr | @remove_event_expr;
+
+@add_operation = @add_expr | @assign_add_expr;
+@sub_operation = @sub_expr | @assign_sub_expr;
+@mul_operation = @mul_expr | @assign_mul_expr;
+@div_operation = @div_expr | @assign_div_expr;
+@rem_operation = @rem_expr | @assign_rem_expr;
+@and_operation = @bit_and_expr | @assign_and_expr;
+@xor_operation = @bit_xor_expr | @assign_xor_expr;
+@or_operation = @bit_or_expr | @assign_or_expr;
+@lshift_operation = @lshift_expr | @assign_lshift_expr;
+@rshift_operation = @rshift_expr | @assign_rshift_expr;
+@urshift_operation = @urshift_expr | @assign_urshift_expr;
+@null_coalescing_operation = @null_coalescing_expr | @assign_coalesce_expr;
+
+@assign_arith_expr = @assign_add_expr | @assign_sub_expr | @assign_mul_expr | @assign_div_expr
+                   | @assign_rem_expr
+@assign_bitwise_expr = @assign_and_expr | @assign_or_expr | @assign_xor_expr
+                   | @assign_lshift_expr | @assign_rshift_expr | @assign_urshift_expr;
+
+@member_access_expr = @field_access_expr | @property_access_expr | @indexer_access_expr | @event_access_expr
+                    | @method_access_expr | @type_access_expr | @dynamic_member_access_expr;
+@access_expr = @member_access_expr | @this_access_expr | @base_access_expr | @assignable_access_expr | @namespace_access_expr;
+@element_access_expr = @indexer_access_expr | @array_access_expr | @dynamic_element_access_expr;
+
+@local_variable_access = @local_variable_access_expr | @local_var_decl_expr;
+@local_scope_variable_access_expr = @parameter_access_expr | @local_variable_access;
+@variable_access_expr = @local_scope_variable_access_expr | @field_access_expr;
+
+@assignable_access_expr = @variable_access_expr | @property_access_expr | @element_access_expr
+                        | @event_access_expr | @dynamic_member_access_expr;
+
+@objectorcollection_init_expr = @object_init_expr | @collection_init_expr;
+
+@delegate_creation_expr = @explicit_delegate_creation_expr | @implicit_delegate_creation_expr;
+
+@bin_arith_op_expr = @mul_expr | @div_expr | @rem_expr | @add_expr | @sub_expr;
+@incr_op_expr =  @pre_incr_expr | @post_incr_expr;
+@decr_op_expr =  @pre_decr_expr | @post_decr_expr;
+@mut_op_expr = @incr_op_expr | @decr_op_expr;
+@un_arith_op_expr = @plus_expr | @minus_expr | @mut_op_expr;
+@arith_op_expr = @bin_arith_op_expr | @un_arith_op_expr;
+
+@ternary_log_op_expr = @conditional_expr;
+@bin_log_op_expr = @log_and_expr | @log_or_expr | @null_coalescing_expr;
+@un_log_op_expr = @log_not_expr;
+@log_expr = @un_log_op_expr | @bin_log_op_expr | @ternary_log_op_expr;
+
+@bin_bit_op_expr =  @bit_and_expr | @bit_or_expr | @bit_xor_expr | @lshift_expr
+                 | @rshift_expr | @urshift_expr;
+@un_bit_op_expr = @bit_not_expr;
+@bit_expr = @un_bit_op_expr | @bin_bit_op_expr;
+
+@equality_op_expr =  @eq_expr | @ne_expr;
+@rel_op_expr = @gt_expr | @lt_expr| @ge_expr | @le_expr;
+@comp_expr = @equality_op_expr | @rel_op_expr;
+
+@op_expr = @un_op | @bin_op | @ternary_op;
+
+@ternary_op = @ternary_log_op_expr;
+@bin_op = @assign_expr | @bin_arith_op_expr | @bin_log_op_expr | @bin_bit_op_expr | @comp_expr;
+@un_op = @un_arith_op_expr | @un_log_op_expr | @un_bit_op_expr | @sizeof_expr
+       | @pointer_indirection_expr | @address_of_expr;
+
+@anonymous_function_expr = @lambda_expr | @anonymous_method_expr;
+
+@op_invoke_expr = @operator_invocation_expr | @assign_op_call_expr
+@call = @method_invocation_expr | @constructor_init_expr | @op_invoke_expr
+      | @delegate_invocation_expr | @object_creation_expr | @call_access_expr
+      | @local_function_invocation_expr | @function_pointer_invocation_expr;
+
+@call_access_expr = @property_access_expr | @event_access_expr | @indexer_access_expr;
+
+@late_bindable_expr = @dynamic_element_access_expr | @dynamic_member_access_expr
+                    | @object_creation_expr | @method_invocation_expr | @op_invoke_expr;
+
+@throw_element = @throw_expr | @throw_stmt;
+
+@implicitly_typeable_object_creation_expr = @object_creation_expr | @explicit_delegate_creation_expr;
+
+implicitly_typed_array_creation(
+  unique int id: @array_creation_expr ref);
+
+explicitly_sized_array_creation(
+  unique int id: @array_creation_expr ref);
+
+stackalloc_array_creation(
+  unique int id: @array_creation_expr ref);
+
+implicitly_typed_object_creation(
+  unique int id: @implicitly_typeable_object_creation_expr ref);
+
+mutator_invocation_mode(
+  unique int id: @operator_invocation_expr ref,
+  int mode: int ref /* prefix = 1, postfix = 2*/);
+
+expr_value(
+  unique int id: @expr ref,
+  string value: string ref);
+
+expr_call(
+  unique int caller_id: @expr ref,
+  int target_id: @callable ref);
+
+expr_access(
+  unique int accesser_id: @access_expr ref,
+  int target_id: @accessible ref);
+
+@accessible = @method | @assignable | @local_function | @namespace;
+
+expr_location(
+  unique int id: @expr ref,
+  int loc: @location ref);
+
+dynamic_member_name(
+  unique int id: @late_bindable_expr ref,
+  string name: string ref);
+
+@qualifiable_expr = @member_access_expr
+                  | @method_invocation_expr
+                  | @element_access_expr;
+
+conditional_access(
+  unique int id: @qualifiable_expr ref);
+
+expr_argument(
+  unique int id: @expr ref,
+  int mode: int ref);
+  /* mode is the same as params: value = 0, ref = 1, out = 2 */
+
+expr_argument_name(
+  unique int id: @expr ref,
+  string name: string ref);
+
+lambda_expr_return_type(
+  unique int id: @lambda_expr ref,
+  int type_id: @type_or_ref ref);
+
+/* Compiler generated */
+
+compiler_generated(unique int id: @element ref);
+
+/** CONTROL/DATA FLOW **/
+
+@control_flow_element = @stmt | @expr;
+
+/* 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;
+
+/* Comments */
+
+commentline(
+  unique int id: @commentline,
+  int kind: int ref,
+  string text: string ref,
+  string rawtext: string ref);
+
+case @commentline.kind of
+  0 = @singlelinecomment
+| 1 = @xmldoccomment
+| 2 = @multilinecomment;
+
+commentline_location(
+  unique int id: @commentline ref,
+  int loc: @location ref);
+
+commentblock(
+  unique int id : @commentblock);
+
+commentblock_location(
+  unique int id: @commentblock ref,
+  int loc: @location ref);
+
+commentblock_binding(
+  int id: @commentblock ref,
+  int entity: @element ref,
+  int bindtype: int ref);    /* 0: Parent, 1: Best, 2: Before, 3: After */
+
+commentblock_child(
+  int id: @commentblock ref,
+  int commentline: @commentline ref,
+  int index: int ref);
+
+/* ASP.NET */
+
+case @asp_element.kind of
+  0=@asp_close_tag
+| 1=@asp_code
+| 2=@asp_comment
+| 3=@asp_data_binding
+| 4=@asp_directive
+| 5=@asp_open_tag
+| 6=@asp_quoted_string
+| 7=@asp_text
+| 8=@asp_xml_directive;
+
+@asp_attribute = @asp_code | @asp_data_binding | @asp_quoted_string;
+
+asp_elements(
+  unique int id: @asp_element,
+  int kind: int ref,
+  int loc: @location ref);
+
+asp_comment_server(unique int comment: @asp_comment ref);
+asp_code_inline(unique int code: @asp_code ref);
+asp_directive_attribute(
+  int directive: @asp_directive ref,
+  int index: int ref,
+  string name: string ref,
+  int value: @asp_quoted_string ref);
+asp_directive_name(
+  unique int directive: @asp_directive ref,
+  string name: string ref);
+asp_element_body(
+  unique int element: @asp_element ref,
+  string body: string ref);
+asp_tag_attribute(
+  int tag: @asp_open_tag ref,
+  int index: int ref,
+  string name: string ref,
+  int attribute: @asp_attribute ref);
+asp_tag_name(
+  unique int tag: @asp_open_tag ref,
+  string name: string ref);
+asp_tag_isempty(int tag: @asp_open_tag ref);
diff --git a/csharp/ql/lib/upgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/upgrade.properties b/csharp/ql/lib/upgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/upgrade.properties
new file mode 100644
index 00000000000..542231966ed
--- /dev/null
+++ b/csharp/ql/lib/upgrades/e73ca2c93df8aae162f1704edc4817a5cb330529/upgrade.properties
@@ -0,0 +1,8 @@
+description: Add operation kinds for operations, cleanup expanded assignments and rotate assignment child expressions.
+compatibility: partial
+expr_parent.rel: run assignments.ql new_expr_parent
+expressions.rel: run assignments.ql new_expressions
+expr_location.rel: run assignments.ql new_expr_location
+expr_call.rel: run assignments.ql new_expr_call
+dynamic_member_name.rel: run assignments.ql new_dynamic_member_name
+expr_access.rel: run assignments.ql new_expr_access
diff --git a/csharp/ql/src/Bad Practices/Control-Flow/ConstantCondition.ql b/csharp/ql/src/Bad Practices/Control-Flow/ConstantCondition.ql
index 386b238e049..a58e19049ff 100644
--- a/csharp/ql/src/Bad Practices/Control-Flow/ConstantCondition.ql	
+++ b/csharp/ql/src/Bad Practices/Control-Flow/ConstantCondition.ql	
@@ -43,7 +43,7 @@ module ConstCondImpl = ConstCond::Make<Location, Cfg, ConstCondInput>;
 predicate nullCheck(Expr e, boolean direct) {
   exists(QualifiableExpr qe | qe.isConditional() and qe.getQualifier() = e and direct = true)
   or
-  exists(NullCoalescingExpr nce | nce.getLeftOperand() = e and direct = true)
+  exists(NullCoalescingOperation nce | nce.getLeftOperand() = e and direct = true)
   or
   exists(ConditionalExpr ce | ce.getThen() = e or ce.getElse() = e |
     nullCheck(ce, _) and direct = false
@@ -114,7 +114,7 @@ class ConstantBooleanCondition extends ConstantCondition {
 
   override predicate isWhiteListed() {
     // E.g. `x ?? false`
-    this.(BoolLiteral) = any(NullCoalescingExpr nce).getRightOperand() or
+    this.(BoolLiteral) = any(NullCoalescingOperation nce).getRightOperand() or
     // No need to flag logical operations when the operands are constant
     isConstantCondition(this.(LogicalNotExpr).getOperand(), _) or
     this =
diff --git a/csharp/ql/src/CHANGELOG.md b/csharp/ql/src/CHANGELOG.md
index 8f2e918ca55..35b5ab1e24e 100644
--- a/csharp/ql/src/CHANGELOG.md
+++ b/csharp/ql/src/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.6.4
+
+No user-facing changes.
+
+## 1.6.3
+
+No user-facing changes.
+
 ## 1.6.2
 
 ### Bug Fixes
diff --git a/csharp/ql/src/Complexity/ComplexCondition.ql b/csharp/ql/src/Complexity/ComplexCondition.ql
index 0afb27e2a94..0a4d37705a3 100644
--- a/csharp/ql/src/Complexity/ComplexCondition.ql
+++ b/csharp/ql/src/Complexity/ComplexCondition.ql
@@ -12,19 +12,38 @@
 
 import csharp
 
-predicate nontrivialLogicalOperator(BinaryLogicalOperation e) {
-  not exists(BinaryLogicalOperation parent |
+abstract class RelevantBinaryOperations extends Operation { }
+
+private class AddBinaryLogicalOperationRelevantBinaryOperations extends RelevantBinaryOperations,
+  BinaryLogicalOperation
+{ }
+
+private class AddAssignCoalesceExprRelevantBinaryOperations extends RelevantBinaryOperations,
+  AssignCoalesceExpr
+{ }
+
+abstract class RelevantOperations extends Operation { }
+
+private class AddLogicalOperationRelevantOperations extends RelevantOperations, LogicalOperation { }
+
+private class AddAssignCoalesceExprRelevantOperations extends RelevantOperations, AssignCoalesceExpr
+{ }
+
+predicate nontrivialLogicalOperator(RelevantBinaryOperations e) {
+  not exists(RelevantBinaryOperations parent |
     parent = e.getParent() and
     parent.getOperator() = e.getOperator()
   )
 }
 
-predicate logicalParent(LogicalOperation op, LogicalOperation parent) { parent = op.getParent() }
+predicate logicalParent(RelevantOperations op, RelevantOperations parent) {
+  parent = op.getParent()
+}
 
 from Expr e, int operators
 where
-  not e.getParent() instanceof LogicalOperation and
+  not e.getParent() instanceof RelevantOperations and
   operators =
-    count(BinaryLogicalOperation op | logicalParent*(op, e) and nontrivialLogicalOperator(op)) and
+    count(RelevantBinaryOperations op | logicalParent*(op, e) and nontrivialLogicalOperator(op)) and
   operators > 3
 select e, "Complex condition: too many logical operations in this expression."
diff --git a/csharp/ql/src/Dead Code/DeadStoreOfLocal.ql b/csharp/ql/src/Dead Code/DeadStoreOfLocal.ql
index 0f6e6d11fb2..59816a18b3f 100644
--- a/csharp/ql/src/Dead Code/DeadStoreOfLocal.ql	
+++ b/csharp/ql/src/Dead Code/DeadStoreOfLocal.ql	
@@ -84,6 +84,8 @@ class RelevantDefinition extends AssignableDefinition {
       )
     or
     this instanceof AssignableDefinitions::PatternDefinition
+    or
+    this instanceof AssignableDefinitions::AssignOperationDefinition
   }
 
   /** Holds if this assignment may be live. */
diff --git a/csharp/ql/src/Language Abuse/UselessNullCoalescingExpression.ql b/csharp/ql/src/Language Abuse/UselessNullCoalescingExpression.ql
index 7790fc5ba4a..0b2201570fb 100644
--- a/csharp/ql/src/Language Abuse/UselessNullCoalescingExpression.ql	
+++ b/csharp/ql/src/Language Abuse/UselessNullCoalescingExpression.ql	
@@ -15,22 +15,30 @@
 import csharp
 import semmle.code.csharp.commons.StructuralComparison
 
-pragma[noinline]
-private predicate same(AssignableAccess x, AssignableAccess y) {
-  exists(NullCoalescingExpr nce |
-    x = nce.getLeftOperand() and
-    y = nce.getRightOperand().getAChildExpr*()
-  ) and
-  sameGvn(x, y)
+pragma[nomagic]
+private predicate relevant(Expr left, Expr right) {
+  exists(NullCoalescingOperation nce |
+    left = nce.getLeftOperand() and
+    right = nce.getRightOperand()
+  )
 }
 
-private predicate uselessNullCoalescingExpr(NullCoalescingExpr nce) {
+pragma[noinline]
+private predicate same(AssignableAccess x, AssignableAccess y) {
+  exists(Expr e |
+    relevant(x, e) and
+    y = e.getAChildExpr*() and
+    sameGvn(x, y)
+  )
+}
+
+private predicate uselessNullCoalescingOperation(NullCoalescingOperation nce) {
   exists(AssignableAccess x |
     nce.getLeftOperand() = x and
     forex(AssignableAccess y | same(x, y) | y instanceof AssignableRead and not y.isRefArgument())
   )
 }
 
-from NullCoalescingExpr nce
-where uselessNullCoalescingExpr(nce)
+from NullCoalescingOperation nce
+where uselessNullCoalescingOperation(nce)
 select nce, "Both operands of this null-coalescing expression access the same variable or property."
diff --git a/csharp/ql/src/Likely Bugs/Collections/WriteOnlyContainer.ql b/csharp/ql/src/Likely Bugs/Collections/WriteOnlyContainer.ql
index 5a24a1f5f51..5fcb140e679 100644
--- a/csharp/ql/src/Likely Bugs/Collections/WriteOnlyContainer.ql	
+++ b/csharp/ql/src/Likely Bugs/Collections/WriteOnlyContainer.ql	
@@ -23,7 +23,9 @@ where
   ) and
   forex(Access a | a = v.getAnAccess() |
     a = any(ModifierMethodCall m).getQualifier() or
-    a = any(Assignment ass | ass.getRValue() instanceof ObjectCreation).getLValue()
+    a = any(AssignExpr ass | ass.getRValue() instanceof ObjectCreation).getLValue() or
+    a =
+      any(LocalVariableDeclAndInitExpr ass | ass.getRValue() instanceof ObjectCreation).getLValue()
   ) and
   not v = any(ForeachStmt fs).getVariable() and
   not v = any(BindingPatternExpr vpe).getVariableDeclExpr().getVariable() and
diff --git a/csharp/ql/src/Likely Bugs/DangerousNonShortCircuitLogic.ql b/csharp/ql/src/Likely Bugs/DangerousNonShortCircuitLogic.ql
index d40a28450fc..8c77a6376d6 100644
--- a/csharp/ql/src/Likely Bugs/DangerousNonShortCircuitLogic.ql	
+++ b/csharp/ql/src/Likely Bugs/DangerousNonShortCircuitLogic.ql	
@@ -15,10 +15,34 @@
 
 import csharp
 
-/** An expression containing a qualified member access, a method call, or an array access. */
-class DangerousExpression extends Expr {
-  DangerousExpression() {
-    exists(Expr e | this = e.getParent*() |
+/** A use of `&` or `|` on operands of type boolean. */
+class NonShortCircuit extends BinaryBitwiseOperation {
+  NonShortCircuit() {
+    (
+      this instanceof BitwiseAndExpr
+      or
+      this instanceof BitwiseOrExpr
+    ) and
+    this.getLeftOperand().getType() instanceof BoolType and
+    this.getRightOperand().getType() instanceof BoolType
+  }
+
+  pragma[nomagic]
+  private predicate hasRightOperandDescendant(Expr e) {
+    e = this.getRightOperand()
+    or
+    exists(Expr parent |
+      this.hasRightOperandDescendant(parent) and
+      e.getParent() = parent
+    )
+  }
+
+  /**
+   * Holds if this non-short-circuit expression contains a qualified member access,
+   * a method call, or an array access inside the right operand.
+   */
+  predicate isDangerous() {
+    exists(Expr e | this.hasRightOperandDescendant(e) |
       exists(Expr q | q = e.(MemberAccess).getQualifier() |
         not q instanceof ThisAccess and
         not q instanceof BaseAccess
@@ -28,24 +52,12 @@ class DangerousExpression extends Expr {
       or
       e instanceof ArrayAccess
     ) and
-    not exists(Expr e | this = e.getParent*() | e.(Call).getTarget().getAParameter().isOutOrRef())
-  }
-}
-
-/** A use of `&` or `|` on operands of type boolean. */
-class NonShortCircuit extends BinaryBitwiseOperation {
-  NonShortCircuit() {
-    (
-      this instanceof BitwiseAndExpr
-      or
-      this instanceof BitwiseOrExpr
-    ) and
-    not exists(AssignBitwiseOperation abo | abo.getExpandedAssignment().getRValue() = this) and
-    this.getLeftOperand().getType() instanceof BoolType and
-    this.getRightOperand().getType() instanceof BoolType and
-    this.getRightOperand() instanceof DangerousExpression
+    not exists(Expr e | this.hasRightOperandDescendant(e) |
+      e.(Call).getTarget().getAParameter().isOutOrRef()
+    )
   }
 }
 
 from NonShortCircuit e
+where e.isDangerous()
 select e, "Potentially dangerous use of non-short circuit logic."
diff --git a/csharp/ql/src/Likely Bugs/PossibleLossOfPrecision.ql b/csharp/ql/src/Likely Bugs/PossibleLossOfPrecision.ql
index c66bbbeedbd..8b719bb92a5 100644
--- a/csharp/ql/src/Likely Bugs/PossibleLossOfPrecision.ql	
+++ b/csharp/ql/src/Likely Bugs/PossibleLossOfPrecision.ql	
@@ -27,13 +27,13 @@ predicate convertedToFloatOrDecimal(Expr e, Type t) {
     t instanceof DecimalType
   )
   or
-  exists(BinaryArithmeticOperation op |
+  exists(BinaryOperation op |
     op.getAnOperand() = e and
     convertedToFloatOrDecimal(op, t)
   |
-    op instanceof AddExpr or
-    op instanceof SubExpr or
-    op instanceof MulExpr
+    op instanceof AddOperation or
+    op instanceof SubOperation or
+    op instanceof MulOperation
   )
 }
 
diff --git a/csharp/ql/src/Performance/StringConcatenationInLoop.ql b/csharp/ql/src/Performance/StringConcatenationInLoop.ql
index a015771610d..3b3228588a4 100644
--- a/csharp/ql/src/Performance/StringConcatenationInLoop.ql
+++ b/csharp/ql/src/Performance/StringConcatenationInLoop.ql
@@ -23,7 +23,6 @@ class StringCat extends AddExpr {
  * where `v` is a simple variable (and not, for example, a property).
  */
 predicate isSelfConcatAssignExpr(AssignExpr e, Variable v) {
-  not e = any(AssignAddExpr a).getExpandedAssignment() and
   exists(VariableAccess use |
     stringCatContains(e.getRValue(), use) and
     use.getTarget() = e.getTargetVariable() and
diff --git a/csharp/ql/src/Security Features/CWE-079/XSS.ql b/csharp/ql/src/Security Features/CWE-079/XSS.ql
index 8735d89ef50..b819ed06bf8 100644
--- a/csharp/ql/src/Security Features/CWE-079/XSS.ql	
+++ b/csharp/ql/src/Security Features/CWE-079/XSS.ql	
@@ -4,7 +4,7 @@
  *              allows for a cross-site scripting vulnerability.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 6.1
+ * @security-severity 7.8
  * @precision high
  * @id cs/web/xss
  * @tags security
diff --git a/csharp/ql/src/Security Features/CWE-117/LogForging.ql b/csharp/ql/src/Security Features/CWE-117/LogForging.ql
index 9494af33570..a922f1c02f8 100644
--- a/csharp/ql/src/Security Features/CWE-117/LogForging.ql	
+++ b/csharp/ql/src/Security Features/CWE-117/LogForging.ql	
@@ -4,7 +4,7 @@
  *              insertion of forged log entries by a malicious user.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 7.8
+ * @security-severity 6.1
  * @precision high
  * @id cs/log-forging
  * @tags security
diff --git a/csharp/ql/src/Security Features/CWE-119/LocalUnvalidatedArithmetic.ql b/csharp/ql/src/Security Features/CWE-119/LocalUnvalidatedArithmetic.ql
index 57d6e500134..d5efb1304af 100644
--- a/csharp/ql/src/Security Features/CWE-119/LocalUnvalidatedArithmetic.ql	
+++ b/csharp/ql/src/Security Features/CWE-119/LocalUnvalidatedArithmetic.ql	
@@ -18,7 +18,7 @@
 import csharp
 import semmle.code.csharp.controlflow.Guards
 
-from AddExpr add, VirtualMethodCall taintSrc
+from AddOperation add, VirtualMethodCall taintSrc
 where
   // `add` is performing pointer arithmetic
   add.getType() instanceof PointerType and
diff --git a/csharp/ql/src/Security Features/InsecureRandomness.ql b/csharp/ql/src/Security Features/InsecureRandomness.ql
index 2c2df7010c6..8237afdff13 100644
--- a/csharp/ql/src/Security Features/InsecureRandomness.ql	
+++ b/csharp/ql/src/Security Features/InsecureRandomness.ql	
@@ -89,11 +89,7 @@ module Random {
         e = any(SensitiveLibraryParameter v).getAnAssignedArgument()
         or
         // Assignment operation, e.g. += or similar
-        exists(AssignOperation ao |
-          ao.getRValue() = e and
-          // "expanded" assignments will be covered by simple assignment
-          not ao.hasExpandedAssignment()
-        |
+        exists(AssignOperation ao | ao.getRValue() = e |
           ao.getLValue() = any(SensitiveVariable v).getAnAccess() or
           ao.getLValue() = any(SensitiveProperty v).getAnAccess() or
           ao.getLValue() = any(SensitiveLibraryParameter v).getAnAccess()
diff --git a/csharp/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md b/csharp/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md
new file mode 100644
index 00000000000..c317194bc25
--- /dev/null
+++ b/csharp/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md
@@ -0,0 +1,5 @@
+---
+category: queryMetadata
+---
+* The `@security-severity` metadata of `cs/log-forging` has been reduced from 7.8 (high) to 6.1 (medium).
+* The `@security-severity` metadata of `cs/web/xss` has been increased from 6.1 (medium) to 7.8 (high).
diff --git a/csharp/ql/src/change-notes/released/1.6.3.md b/csharp/ql/src/change-notes/released/1.6.3.md
new file mode 100644
index 00000000000..a000ecf7025
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.6.3.md
@@ -0,0 +1,3 @@
+## 1.6.3
+
+No user-facing changes.
diff --git a/csharp/ql/src/change-notes/released/1.6.4.md b/csharp/ql/src/change-notes/released/1.6.4.md
new file mode 100644
index 00000000000..5c811dc4638
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.6.4.md
@@ -0,0 +1,3 @@
+## 1.6.4
+
+No user-facing changes.
diff --git a/csharp/ql/src/codeql-pack.release.yml b/csharp/ql/src/codeql-pack.release.yml
index 5f5beb68311..1910e09d6a6 100644
--- a/csharp/ql/src/codeql-pack.release.yml
+++ b/csharp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.6.2
+lastReleaseVersion: 1.6.4
diff --git a/csharp/ql/src/experimental/CWE-918/RequestForgery.qll b/csharp/ql/src/experimental/CWE-918/RequestForgery.qll
index 84ea534a50f..12af7fd7d33 100644
--- a/csharp/ql/src/experimental/CWE-918/RequestForgery.qll
+++ b/csharp/ql/src/experimental/CWE-918/RequestForgery.qll
@@ -211,7 +211,7 @@ module RequestForgery {
   }
 
   private predicate stringConcatStep(DataFlow::Node prev, DataFlow::Node succ) {
-    exists(AddExpr a |
+    exists(AddOperation a |
       a.getLeftOperand() = prev.asExpr()
       or
       a.getRightOperand() = prev.asExpr() and
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 f175723c099..d43050c2deb 100644
--- a/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql	
+++ b/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql	
@@ -174,7 +174,7 @@ module HashWithoutSaltConfig implements DataFlow::ConfigSig {
       mc.getAnArgument() = node.asExpr()
     )
     or
-    exists(AddExpr e | node.asExpr() = e.getAnOperand()) // password+salt
+    exists(AddOperation e | node.asExpr() = e.getAnOperand()) // password+salt
     or
     exists(InterpolatedStringExpr e | node.asExpr() = e.getAnInsert())
     or
diff --git a/csharp/ql/src/qlpack.yml b/csharp/ql/src/qlpack.yml
index d43afd632c1..807071e116b 100644
--- a/csharp/ql/src/qlpack.yml
+++ b/csharp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-queries
-version: 1.6.3-dev
+version: 1.6.5-dev
 groups:
   - csharp
   - queries
diff --git a/csharp/ql/test/library-tests/arguments/argumentByName.expected b/csharp/ql/test/library-tests/arguments/argumentByName.expected
index 6fcb9021d17..065d7070312 100644
--- a/csharp/ql/test/library-tests/arguments/argumentByName.expected
+++ b/csharp/ql/test/library-tests/arguments/argumentByName.expected
@@ -33,14 +33,16 @@
 | arguments.cs:59:16:59:25 | access to indexer | arguments.cs:59:21:59:21 | 3 | a |
 | arguments.cs:59:16:59:25 | access to indexer | arguments.cs:59:24:59:24 | 4 | b |
 | arguments.cs:59:16:59:25 | access to indexer | arguments.cs:59:34:59:34 | 6 | value |
-| arguments.cs:61:9:61:12 | access to property Prop | arguments.cs:61:9:61:17 | ... + ... | value |
+| arguments.cs:61:9:61:12 | access to property Prop | arguments.cs:61:9:61:17 | ... += ... | value |
+| arguments.cs:61:9:61:17 | ... += ... | arguments.cs:61:9:61:12 | access to property Prop | left |
+| arguments.cs:61:9:61:17 | ... += ... | arguments.cs:61:17:61:17 | 7 | right |
 | arguments.cs:62:9:62:18 | access to indexer | arguments.cs:62:14:62:14 | 8 | a |
 | arguments.cs:62:9:62:18 | access to indexer | arguments.cs:62:17:62:17 | 9 | b |
-| arguments.cs:63:9:63:20 | access to indexer | arguments.cs:63:9:63:26 | ... + ... | value |
-| arguments.cs:63:9:63:20 | access to indexer | arguments.cs:63:14:63:15 | 10 | a |
+| arguments.cs:63:9:63:20 | access to indexer | arguments.cs:63:9:63:26 | ... += ... | value |
 | arguments.cs:63:9:63:20 | access to indexer | arguments.cs:63:14:63:15 | 10 | a |
 | arguments.cs:63:9:63:20 | access to indexer | arguments.cs:63:18:63:19 | 11 | b |
-| arguments.cs:63:9:63:20 | access to indexer | arguments.cs:63:18:63:19 | 11 | b |
+| arguments.cs:63:9:63:26 | ... += ... | arguments.cs:63:9:63:20 | access to indexer | left |
+| arguments.cs:63:9:63:26 | ... += ... | arguments.cs:63:25:63:26 | 12 | right |
 | arguments.cs:65:16:65:27 | access to indexer | arguments.cs:65:21:65:22 | 15 | a |
 | arguments.cs:65:16:65:27 | access to indexer | arguments.cs:65:25:65:26 | 16 | b |
 | arguments.cs:76:9:76:31 | call to method f8`1 | arguments.cs:76:12:76:12 | 0 | o |
diff --git a/csharp/ql/test/library-tests/arguments/argumentByParameter.expected b/csharp/ql/test/library-tests/arguments/argumentByParameter.expected
index ac354d31e28..c0465859253 100644
--- a/csharp/ql/test/library-tests/arguments/argumentByParameter.expected
+++ b/csharp/ql/test/library-tests/arguments/argumentByParameter.expected
@@ -33,12 +33,12 @@
 | arguments.cs:59:16:59:25 | access to indexer | arguments.cs:59:21:59:21 | 3 | arguments.cs:53:18:53:18 | a |
 | arguments.cs:59:16:59:25 | access to indexer | arguments.cs:59:24:59:24 | 4 | arguments.cs:53:25:53:25 | b |
 | arguments.cs:59:16:59:25 | access to indexer | arguments.cs:59:34:59:34 | 6 | arguments.cs:53:44:53:46 | value |
-| arguments.cs:61:9:61:12 | access to property Prop | arguments.cs:61:9:61:17 | ... + ... | arguments.cs:51:21:51:23 | value |
+| arguments.cs:61:9:61:12 | access to property Prop | arguments.cs:61:9:61:17 | ... += ... | arguments.cs:51:21:51:23 | value |
 | arguments.cs:62:9:62:18 | access to indexer | arguments.cs:62:14:62:14 | 8 | arguments.cs:53:18:53:18 | a |
 | arguments.cs:62:9:62:18 | access to indexer | arguments.cs:62:14:62:14 | 8 | arguments.cs:53:18:53:18 | a |
 | arguments.cs:62:9:62:18 | access to indexer | arguments.cs:62:17:62:17 | 9 | arguments.cs:53:25:53:25 | b |
 | arguments.cs:62:9:62:18 | access to indexer | arguments.cs:62:17:62:17 | 9 | arguments.cs:53:25:53:25 | b |
-| arguments.cs:63:9:63:20 | access to indexer | arguments.cs:63:9:63:26 | ... + ... | arguments.cs:53:44:53:46 | value |
+| arguments.cs:63:9:63:20 | access to indexer | arguments.cs:63:9:63:26 | ... += ... | arguments.cs:53:44:53:46 | value |
 | arguments.cs:63:9:63:20 | access to indexer | arguments.cs:63:14:63:15 | 10 | arguments.cs:53:18:53:18 | a |
 | arguments.cs:63:9:63:20 | access to indexer | arguments.cs:63:14:63:15 | 10 | arguments.cs:53:18:53:18 | a |
 | arguments.cs:63:9:63:20 | access to indexer | arguments.cs:63:18:63:19 | 11 | arguments.cs:53:25:53:25 | b |
diff --git a/csharp/ql/test/library-tests/arguments/argumentType.expected b/csharp/ql/test/library-tests/arguments/argumentType.expected
index 0dac7019345..fa148e657b4 100644
--- a/csharp/ql/test/library-tests/arguments/argumentType.expected
+++ b/csharp/ql/test/library-tests/arguments/argumentType.expected
@@ -36,8 +36,6 @@
 | arguments.cs:62:14:62:14 | 8 | 0 |
 | arguments.cs:62:17:62:17 | 9 | 0 |
 | arguments.cs:63:14:63:15 | 10 | 0 |
-| arguments.cs:63:14:63:15 | 10 | 0 |
-| arguments.cs:63:18:63:19 | 11 | 0 |
 | arguments.cs:63:18:63:19 | 11 | 0 |
 | arguments.cs:64:22:64:23 | 13 | 0 |
 | arguments.cs:64:26:64:27 | 14 | 0 |
diff --git a/csharp/ql/test/library-tests/arguments/parameterGetArguments.expected b/csharp/ql/test/library-tests/arguments/parameterGetArguments.expected
index 6f25b07e2e5..9f830954efb 100644
--- a/csharp/ql/test/library-tests/arguments/parameterGetArguments.expected
+++ b/csharp/ql/test/library-tests/arguments/parameterGetArguments.expected
@@ -28,7 +28,7 @@
 | arguments.cs:51:21:51:23 | value | arguments.cs:57:16:57:16 | 0 |
 | arguments.cs:51:21:51:23 | value | arguments.cs:58:16:58:25 | access to indexer |
 | arguments.cs:51:21:51:23 | value | arguments.cs:59:31:59:31 | 5 |
-| arguments.cs:51:21:51:23 | value | arguments.cs:61:9:61:17 | ... + ... |
+| arguments.cs:51:21:51:23 | value | arguments.cs:61:9:61:17 | ... += ... |
 | arguments.cs:53:18:53:18 | a | arguments.cs:58:21:58:21 | 1 |
 | arguments.cs:53:18:53:18 | a | arguments.cs:59:21:59:21 | 3 |
 | arguments.cs:53:18:53:18 | a | arguments.cs:62:14:62:14 | 8 |
@@ -44,7 +44,7 @@
 | arguments.cs:53:25:53:25 | b | arguments.cs:63:18:63:19 | 11 |
 | arguments.cs:53:25:53:25 | b | arguments.cs:65:25:65:26 | 16 |
 | arguments.cs:53:44:53:46 | value | arguments.cs:59:34:59:34 | 6 |
-| arguments.cs:53:44:53:46 | value | arguments.cs:63:9:63:26 | ... + ... |
+| arguments.cs:53:44:53:46 | value | arguments.cs:63:9:63:26 | ... += ... |
 | arguments.cs:74:20:74:20 | o | arguments.cs:76:12:76:12 | 0 |
 | arguments.cs:74:20:74:20 | o | arguments.cs:77:12:77:12 | 0 |
 | arguments.cs:74:20:74:20 | o | arguments.cs:78:12:78:12 | 0 |
diff --git a/csharp/ql/test/library-tests/assignments/AssignOperationExpanded.expected b/csharp/ql/test/library-tests/assignments/AssignOperationExpanded.expected
deleted file mode 100644
index bcc9d11c42f..00000000000
--- a/csharp/ql/test/library-tests/assignments/AssignOperationExpanded.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| Assignments.cs:6:9:6:14 | ... += ... | Assignments.cs:6:9:6:14 | ... = ... | Assignments.cs:6:9:6:9 | access to local variable x | Assignments.cs:6:9:6:14 | ... + ... | Assignments.cs:6:9:6:9 | access to local variable x | Assignments.cs:6:14:6:14 | 1 |
-| Assignments.cs:9:9:9:14 | ... -= ... | Assignments.cs:9:9:9:14 | ... = ... | Assignments.cs:9:9:9:9 | access to local variable d | Assignments.cs:9:9:9:14 | dynamic call to operator - | Assignments.cs:9:9:9:9 | access to local variable d | Assignments.cs:9:14:9:14 | 2 |
-| Assignments.cs:12:9:12:17 | ... += ... | Assignments.cs:12:9:12:17 | ... = ... | Assignments.cs:12:9:12:9 | access to local variable a | Assignments.cs:12:9:12:17 | call to operator + | Assignments.cs:12:9:12:9 | access to local variable a | Assignments.cs:12:14:12:17 | this access |
diff --git a/csharp/ql/test/library-tests/assignments/AssignOperationExpanded.ql b/csharp/ql/test/library-tests/assignments/AssignOperationExpanded.ql
deleted file mode 100644
index bd67776520f..00000000000
--- a/csharp/ql/test/library-tests/assignments/AssignOperationExpanded.ql
+++ /dev/null
@@ -1,22 +0,0 @@
-import csharp
-
-predicate getExpandedOperatorArgs(Expr e, Expr left, Expr right) {
-  e =
-    any(BinaryArithmeticOperation bo |
-      bo.getLeftOperand() = left and
-      bo.getRightOperand() = right
-    )
-  or
-  e =
-    any(OperatorCall oc |
-      oc.getArgument(0) = left and
-      oc.getArgument(1) = right
-    )
-}
-
-from AssignOperation ao, AssignExpr ae, Expr op, Expr left, Expr right
-where
-  ae = ao.getExpandedAssignment() and
-  op = ae.getRValue() and
-  getExpandedOperatorArgs(op, left, right)
-select ao, ae, ae.getLValue(), op, left, right
diff --git a/csharp/ql/test/library-tests/controlflow/graph/BasicBlock.expected b/csharp/ql/test/library-tests/controlflow/graph/BasicBlock.expected
index 30f2b105155..9802f2b0195 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/BasicBlock.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/BasicBlock.expected
@@ -7,11 +7,11 @@
 | AccessorCalls.cs:19:10:19:11 | enter M2 | AccessorCalls.cs:19:10:19:11 | exit M2 | 42 |
 | AccessorCalls.cs:28:10:28:11 | enter M3 | AccessorCalls.cs:28:10:28:11 | exit M3 | 17 |
 | AccessorCalls.cs:35:10:35:11 | enter M4 | AccessorCalls.cs:35:10:35:11 | exit M4 | 20 |
-| AccessorCalls.cs:42:10:42:11 | enter M5 | AccessorCalls.cs:42:10:42:11 | exit M5 | 34 |
-| AccessorCalls.cs:49:10:49:11 | enter M6 | AccessorCalls.cs:49:10:49:11 | exit M6 | 43 |
+| AccessorCalls.cs:42:10:42:11 | enter M5 | AccessorCalls.cs:42:10:42:11 | exit M5 | 24 |
+| AccessorCalls.cs:49:10:49:11 | enter M6 | AccessorCalls.cs:49:10:49:11 | exit M6 | 30 |
 | AccessorCalls.cs:56:10:56:11 | enter M7 | AccessorCalls.cs:56:10:56:11 | exit M7 | 25 |
 | AccessorCalls.cs:61:10:61:11 | enter M8 | AccessorCalls.cs:61:10:61:11 | exit M8 | 31 |
-| AccessorCalls.cs:66:10:66:11 | enter M9 | AccessorCalls.cs:66:10:66:11 | exit M9 | 58 |
+| AccessorCalls.cs:66:10:66:11 | enter M9 | AccessorCalls.cs:66:10:66:11 | exit M9 | 51 |
 | ArrayCreation.cs:1:7:1:19 | enter ArrayCreation | ArrayCreation.cs:1:7:1:19 | exit ArrayCreation | 7 |
 | ArrayCreation.cs:3:11:3:12 | enter M1 | ArrayCreation.cs:3:11:3:12 | exit M1 | 5 |
 | ArrayCreation.cs:5:12:5:13 | enter M2 | ArrayCreation.cs:5:12:5:13 | exit M2 | 6 |
@@ -164,7 +164,7 @@
 | Assert.cs:138:10:138:12 | exit M13 (abnormal) | Assert.cs:138:10:138:12 | exit M13 (abnormal) | 1 |
 | Assert.cs:141:9:141:15 | return ...; | Assert.cs:138:10:138:12 | exit M13 (normal) | 2 |
 | Assignments.cs:1:7:1:17 | enter Assignments | Assignments.cs:1:7:1:17 | exit Assignments | 7 |
-| Assignments.cs:3:10:3:10 | enter M | Assignments.cs:3:10:3:10 | exit M | 34 |
+| Assignments.cs:3:10:3:10 | enter M | Assignments.cs:3:10:3:10 | exit M | 31 |
 | Assignments.cs:14:18:14:35 | enter (...) => ... | Assignments.cs:14:18:14:35 | exit (...) => ... | 4 |
 | Assignments.cs:17:40:17:40 | enter + | Assignments.cs:17:40:17:40 | exit + | 6 |
 | Assignments.cs:27:10:27:23 | enter SetParamSingle | Assignments.cs:27:10:27:23 | exit SetParamSingle | 7 |
@@ -250,7 +250,6 @@
 | ConditionalAccess.cs:42:9:42:11 | enter get_Item | ConditionalAccess.cs:42:9:42:11 | exit get_Item | 6 |
 | ConditionalAccess.cs:43:9:43:11 | enter set_Item | ConditionalAccess.cs:43:9:43:11 | exit set_Item | 4 |
 | ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:48:9:48:10 | access to parameter ca | 4 |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:46:10:46:11 | exit M9 | 2 |
 | ConditionalAccess.cs:48:24:48:25 | 42 | ConditionalAccess.cs:48:12:48:25 | ... = ... | 3 |
 | ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:49:9:49:10 | access to parameter ca | 2 |
 | ConditionalAccess.cs:49:26:49:32 | "Hello" | ConditionalAccess.cs:49:12:49:32 | ... = ... | 3 |
@@ -262,14 +261,11 @@
 | ConditionalAccess.cs:52:9:52:16 | access to property Prop | ConditionalAccess.cs:52:9:52:16 | access to property Prop | 1 |
 | ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:52:9:52:10 | access to parameter ca | 2 |
 | ConditionalAccess.cs:52:32:52:38 | "World" | ConditionalAccess.cs:52:18:52:38 | ... = ... | 3 |
-| ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | 1 |
 | ConditionalAccess.cs:53:9:53:20 | access to field IntField | ConditionalAccess.cs:53:9:53:20 | access to field IntField | 1 |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | 2 |
-| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:53:12:53:25 | ... = ... | 4 |
-| ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | 1 |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | 4 |
 | ConditionalAccess.cs:54:9:54:22 | access to property StringProp | ConditionalAccess.cs:54:9:54:22 | access to property StringProp | 1 |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | 2 |
-| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:54:12:54:29 | ... = ... | 4 |
+| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:46:10:46:11 | exit M9 | 4 |
 | ConditionalAccess.cs:60:26:60:38 | enter CommaJoinWith | ConditionalAccess.cs:60:26:60:38 | exit CommaJoinWith | 8 |
 | Conditions.cs:1:7:1:16 | enter Conditions | Conditions.cs:1:7:1:16 | exit Conditions | 7 |
 | Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:5:13:5:15 | access to parameter inc | 4 |
@@ -331,12 +327,12 @@
 | Conditions.cs:97:17:97:20 | ...; | Conditions.cs:97:17:97:19 | ...++ | 3 |
 | Conditions.cs:99:16:99:16 | access to local variable x | Conditions.cs:86:9:86:10 | exit M7 | 4 |
 | Conditions.cs:102:12:102:13 | enter M8 | Conditions.cs:105:13:105:13 | access to parameter b | 8 |
-| Conditions.cs:106:13:106:20 | ...; | Conditions.cs:106:13:106:19 | ... = ... | 5 |
+| Conditions.cs:106:13:106:20 | ...; | Conditions.cs:106:13:106:19 | ... += ... | 4 |
 | Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:107:13:107:24 | ... > ... | 5 |
 | Conditions.cs:108:13:109:24 | if (...) ... | Conditions.cs:108:18:108:18 | access to parameter b | 2 |
 | Conditions.cs:108:17:108:18 | [false] !... | Conditions.cs:108:17:108:18 | [false] !... | 1 |
 | Conditions.cs:108:17:108:18 | [true] !... | Conditions.cs:108:17:108:18 | [true] !... | 1 |
-| Conditions.cs:109:17:109:24 | ...; | Conditions.cs:109:17:109:23 | ... = ... | 5 |
+| Conditions.cs:109:17:109:24 | ...; | Conditions.cs:109:17:109:23 | ... += ... | 4 |
 | Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:102:12:102:13 | exit M8 | 4 |
 | Conditions.cs:113:10:113:11 | enter M9 | Conditions.cs:116:18:116:22 | Int32 i = ... | 8 |
 | Conditions.cs:113:10:113:11 | exit M9 (normal) | Conditions.cs:113:10:113:11 | exit M9 | 2 |
@@ -533,7 +529,7 @@
 | Finally.cs:254:13:254:45 | ...; | Finally.cs:254:13:254:44 | call to method WriteLine | 3 |
 | Finally.cs:257:9:259:9 | {...} | Finally.cs:258:13:258:46 | call to method WriteLine | 4 |
 | Finally.cs:260:9:260:34 | ...; | Finally.cs:233:10:233:12 | exit M12 (normal) | 4 |
-| Finally.cs:263:10:263:12 | enter M13 | Finally.cs:272:13:272:18 | ... = ... | 16 |
+| Finally.cs:263:10:263:12 | enter M13 | Finally.cs:272:13:272:18 | ... += ... | 15 |
 | Finally.cs:263:10:263:12 | exit M13 | Finally.cs:263:10:263:12 | exit M13 | 1 |
 | Finally.cs:263:10:263:12 | exit M13 (abnormal) | Finally.cs:263:10:263:12 | exit M13 (abnormal) | 1 |
 | Finally.cs:263:10:263:12 | exit M13 (normal) | Finally.cs:263:10:263:12 | exit M13 (normal) | 1 |
@@ -1130,7 +1126,7 @@
 | cflow.cs:201:9:205:9 | {...} | cflow.cs:193:10:193:17 | exit Booleans (abnormal) | 5 |
 | cflow.cs:208:10:208:11 | enter Do | cflow.cs:210:9:221:36 | do ... while (...); | 3 |
 | cflow.cs:208:10:208:11 | exit Do (normal) | cflow.cs:208:10:208:11 | exit Do | 2 |
-| cflow.cs:211:9:221:9 | {...} | cflow.cs:213:17:213:32 | ... > ... | 15 |
+| cflow.cs:211:9:221:9 | {...} | cflow.cs:213:17:213:32 | ... > ... | 12 |
 | cflow.cs:214:13:216:13 | {...} | cflow.cs:215:17:215:25 | continue; | 2 |
 | cflow.cs:217:13:220:13 | if (...) ... | cflow.cs:217:17:217:32 | ... < ... | 6 |
 | cflow.cs:218:13:220:13 | {...} | cflow.cs:219:17:219:22 | break; | 2 |
@@ -1138,7 +1134,7 @@
 | cflow.cs:224:10:224:16 | enter Foreach | cflow.cs:226:27:226:64 | call to method Repeat<String> | 5 |
 | cflow.cs:224:10:224:16 | exit Foreach (normal) | cflow.cs:224:10:224:16 | exit Foreach | 2 |
 | cflow.cs:226:9:237:9 | foreach (... ... in ...) ... | cflow.cs:226:9:237:9 | foreach (... ... in ...) ... | 1 |
-| cflow.cs:226:22:226:22 | String x | cflow.cs:229:17:229:32 | ... > ... | 16 |
+| cflow.cs:226:22:226:22 | String x | cflow.cs:229:17:229:32 | ... > ... | 13 |
 | cflow.cs:230:13:232:13 | {...} | cflow.cs:231:17:231:25 | continue; | 2 |
 | cflow.cs:233:13:236:13 | if (...) ... | cflow.cs:233:17:233:32 | ... < ... | 6 |
 | cflow.cs:234:13:236:13 | {...} | cflow.cs:235:17:235:22 | break; | 2 |
diff --git a/csharp/ql/test/library-tests/controlflow/graph/Condition.expected b/csharp/ql/test/library-tests/controlflow/graph/Condition.expected
index 3ef1d481abe..cda25b6abd1 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/Condition.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/Condition.expected
@@ -100,14 +100,8 @@ conditionBlock
 | ConditionalAccess.cs:52:9:52:16 | access to property Prop | ConditionalAccess.cs:52:32:52:38 | "World" | false |
 | ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:52:9:52:16 | access to property Prop | false |
 | ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:52:32:52:38 | "World" | false |
-| ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:9:53:20 | access to field IntField | false |
-| ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | false |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:53:9:53:20 | access to field IntField | false |
-| ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:53:25:53:25 | 1 | false |
-| ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:9:54:22 | access to property StringProp | false |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | false |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:54:9:54:22 | access to property StringProp | false |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:54:27:54:29 | "!" | false |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:54:9:54:22 | access to property StringProp | false |
 | Conditions.cs:3:10:3:19 | enter IncrOrDecr | Conditions.cs:6:13:6:16 | ...; | true |
 | Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:7:13:7:16 | [false] !... | true |
 | Conditions.cs:7:9:8:16 | if (...) ... | Conditions.cs:7:13:7:16 | [true] !... | false |
diff --git a/csharp/ql/test/library-tests/controlflow/graph/Dominance.expected b/csharp/ql/test/library-tests/controlflow/graph/Dominance.expected
index 204092c6df2..072d874d8d4 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/Dominance.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/Dominance.expected
@@ -129,77 +129,54 @@ dominance
 | AccessorCalls.cs:42:10:42:11 | enter M5 | AccessorCalls.cs:43:5:47:5 | {...} |
 | AccessorCalls.cs:42:10:42:11 | exit M5 (normal) | AccessorCalls.cs:42:10:42:11 | exit M5 |
 | AccessorCalls.cs:43:5:47:5 | {...} | AccessorCalls.cs:44:9:44:33 | ...; |
-| AccessorCalls.cs:44:9:44:12 | this access | AccessorCalls.cs:44:9:44:12 | this access |
 | AccessorCalls.cs:44:9:44:12 | this access | AccessorCalls.cs:44:9:44:18 | access to field Field |
-| AccessorCalls.cs:44:9:44:18 | access to field Field | AccessorCalls.cs:44:9:44:32 | ... = ... |
 | AccessorCalls.cs:44:9:44:18 | access to field Field | AccessorCalls.cs:44:23:44:26 | this access |
-| AccessorCalls.cs:44:9:44:32 | ... + ... | AccessorCalls.cs:44:9:44:18 | access to field Field |
-| AccessorCalls.cs:44:9:44:32 | ... = ... | AccessorCalls.cs:45:9:45:31 | ...; |
+| AccessorCalls.cs:44:9:44:32 | ... += ... | AccessorCalls.cs:45:9:45:31 | ...; |
 | AccessorCalls.cs:44:9:44:33 | ...; | AccessorCalls.cs:44:9:44:12 | this access |
 | AccessorCalls.cs:44:23:44:26 | this access | AccessorCalls.cs:44:23:44:32 | access to field Field |
-| AccessorCalls.cs:44:23:44:32 | access to field Field | AccessorCalls.cs:44:9:44:32 | ... + ... |
-| AccessorCalls.cs:45:9:45:12 | this access | AccessorCalls.cs:45:9:45:12 | this access |
+| AccessorCalls.cs:44:23:44:32 | access to field Field | AccessorCalls.cs:44:9:44:32 | ... += ... |
 | AccessorCalls.cs:45:9:45:12 | this access | AccessorCalls.cs:45:9:45:17 | access to property Prop |
-| AccessorCalls.cs:45:9:45:17 | access to property Prop | AccessorCalls.cs:45:9:45:30 | ... = ... |
 | AccessorCalls.cs:45:9:45:17 | access to property Prop | AccessorCalls.cs:45:22:45:25 | this access |
-| AccessorCalls.cs:45:9:45:30 | ... + ... | AccessorCalls.cs:45:9:45:17 | access to property Prop |
-| AccessorCalls.cs:45:9:45:30 | ... = ... | AccessorCalls.cs:46:9:46:27 | ...; |
+| AccessorCalls.cs:45:9:45:30 | ... += ... | AccessorCalls.cs:46:9:46:27 | ...; |
 | AccessorCalls.cs:45:9:45:31 | ...; | AccessorCalls.cs:45:9:45:12 | this access |
 | AccessorCalls.cs:45:22:45:25 | this access | AccessorCalls.cs:45:22:45:30 | access to property Prop |
-| AccessorCalls.cs:45:22:45:30 | access to property Prop | AccessorCalls.cs:45:9:45:30 | ... + ... |
+| AccessorCalls.cs:45:22:45:30 | access to property Prop | AccessorCalls.cs:45:9:45:30 | ... += ... |
 | AccessorCalls.cs:46:9:46:12 | this access | AccessorCalls.cs:46:14:46:14 | 0 |
-| AccessorCalls.cs:46:9:46:12 | this access | AccessorCalls.cs:46:14:46:14 | 0 |
-| AccessorCalls.cs:46:9:46:15 | access to indexer | AccessorCalls.cs:46:9:46:26 | ... = ... |
 | AccessorCalls.cs:46:9:46:15 | access to indexer | AccessorCalls.cs:46:20:46:23 | this access |
-| AccessorCalls.cs:46:9:46:26 | ... + ... | AccessorCalls.cs:46:9:46:15 | access to indexer |
-| AccessorCalls.cs:46:9:46:26 | ... = ... | AccessorCalls.cs:42:10:42:11 | exit M5 (normal) |
+| AccessorCalls.cs:46:9:46:26 | ... += ... | AccessorCalls.cs:42:10:42:11 | exit M5 (normal) |
 | AccessorCalls.cs:46:9:46:27 | ...; | AccessorCalls.cs:46:9:46:12 | this access |
-| AccessorCalls.cs:46:14:46:14 | 0 | AccessorCalls.cs:46:9:46:12 | this access |
 | AccessorCalls.cs:46:14:46:14 | 0 | AccessorCalls.cs:46:9:46:15 | access to indexer |
 | AccessorCalls.cs:46:20:46:23 | this access | AccessorCalls.cs:46:25:46:25 | 0 |
-| AccessorCalls.cs:46:20:46:26 | access to indexer | AccessorCalls.cs:46:9:46:26 | ... + ... |
+| AccessorCalls.cs:46:20:46:26 | access to indexer | AccessorCalls.cs:46:9:46:26 | ... += ... |
 | AccessorCalls.cs:46:25:46:25 | 0 | AccessorCalls.cs:46:20:46:26 | access to indexer |
 | AccessorCalls.cs:49:10:49:11 | enter M6 | AccessorCalls.cs:50:5:54:5 | {...} |
 | AccessorCalls.cs:49:10:49:11 | exit M6 (normal) | AccessorCalls.cs:49:10:49:11 | exit M6 |
 | AccessorCalls.cs:50:5:54:5 | {...} | AccessorCalls.cs:51:9:51:37 | ...; |
 | AccessorCalls.cs:51:9:51:12 | this access | AccessorCalls.cs:51:9:51:14 | access to field x |
-| AccessorCalls.cs:51:9:51:12 | this access | AccessorCalls.cs:51:9:51:14 | access to field x |
-| AccessorCalls.cs:51:9:51:14 | access to field x | AccessorCalls.cs:51:9:51:12 | this access |
 | AccessorCalls.cs:51:9:51:14 | access to field x | AccessorCalls.cs:51:9:51:20 | access to field Field |
-| AccessorCalls.cs:51:9:51:20 | access to field Field | AccessorCalls.cs:51:9:51:36 | ... = ... |
 | AccessorCalls.cs:51:9:51:20 | access to field Field | AccessorCalls.cs:51:25:51:28 | this access |
-| AccessorCalls.cs:51:9:51:36 | ... + ... | AccessorCalls.cs:51:9:51:20 | access to field Field |
-| AccessorCalls.cs:51:9:51:36 | ... = ... | AccessorCalls.cs:52:9:52:35 | ...; |
+| AccessorCalls.cs:51:9:51:36 | ... += ... | AccessorCalls.cs:52:9:52:35 | ...; |
 | AccessorCalls.cs:51:9:51:37 | ...; | AccessorCalls.cs:51:9:51:12 | this access |
 | AccessorCalls.cs:51:25:51:28 | this access | AccessorCalls.cs:51:25:51:30 | access to field x |
 | AccessorCalls.cs:51:25:51:30 | access to field x | AccessorCalls.cs:51:25:51:36 | access to field Field |
-| AccessorCalls.cs:51:25:51:36 | access to field Field | AccessorCalls.cs:51:9:51:36 | ... + ... |
+| AccessorCalls.cs:51:25:51:36 | access to field Field | AccessorCalls.cs:51:9:51:36 | ... += ... |
 | AccessorCalls.cs:52:9:52:12 | this access | AccessorCalls.cs:52:9:52:14 | access to field x |
-| AccessorCalls.cs:52:9:52:12 | this access | AccessorCalls.cs:52:9:52:14 | access to field x |
-| AccessorCalls.cs:52:9:52:14 | access to field x | AccessorCalls.cs:52:9:52:12 | this access |
 | AccessorCalls.cs:52:9:52:14 | access to field x | AccessorCalls.cs:52:9:52:19 | access to property Prop |
-| AccessorCalls.cs:52:9:52:19 | access to property Prop | AccessorCalls.cs:52:9:52:34 | ... = ... |
 | AccessorCalls.cs:52:9:52:19 | access to property Prop | AccessorCalls.cs:52:24:52:27 | this access |
-| AccessorCalls.cs:52:9:52:34 | ... + ... | AccessorCalls.cs:52:9:52:19 | access to property Prop |
-| AccessorCalls.cs:52:9:52:34 | ... = ... | AccessorCalls.cs:53:9:53:31 | ...; |
+| AccessorCalls.cs:52:9:52:34 | ... += ... | AccessorCalls.cs:53:9:53:31 | ...; |
 | AccessorCalls.cs:52:9:52:35 | ...; | AccessorCalls.cs:52:9:52:12 | this access |
 | AccessorCalls.cs:52:24:52:27 | this access | AccessorCalls.cs:52:24:52:29 | access to field x |
 | AccessorCalls.cs:52:24:52:29 | access to field x | AccessorCalls.cs:52:24:52:34 | access to property Prop |
-| AccessorCalls.cs:52:24:52:34 | access to property Prop | AccessorCalls.cs:52:9:52:34 | ... + ... |
-| AccessorCalls.cs:53:9:53:12 | this access | AccessorCalls.cs:53:9:53:14 | access to field x |
+| AccessorCalls.cs:52:24:52:34 | access to property Prop | AccessorCalls.cs:52:9:52:34 | ... += ... |
 | AccessorCalls.cs:53:9:53:12 | this access | AccessorCalls.cs:53:9:53:14 | access to field x |
 | AccessorCalls.cs:53:9:53:14 | access to field x | AccessorCalls.cs:53:16:53:16 | 0 |
-| AccessorCalls.cs:53:9:53:14 | access to field x | AccessorCalls.cs:53:16:53:16 | 0 |
-| AccessorCalls.cs:53:9:53:17 | access to indexer | AccessorCalls.cs:53:9:53:30 | ... = ... |
 | AccessorCalls.cs:53:9:53:17 | access to indexer | AccessorCalls.cs:53:22:53:25 | this access |
-| AccessorCalls.cs:53:9:53:30 | ... + ... | AccessorCalls.cs:53:9:53:17 | access to indexer |
-| AccessorCalls.cs:53:9:53:30 | ... = ... | AccessorCalls.cs:49:10:49:11 | exit M6 (normal) |
+| AccessorCalls.cs:53:9:53:30 | ... += ... | AccessorCalls.cs:49:10:49:11 | exit M6 (normal) |
 | AccessorCalls.cs:53:9:53:31 | ...; | AccessorCalls.cs:53:9:53:12 | this access |
-| AccessorCalls.cs:53:16:53:16 | 0 | AccessorCalls.cs:53:9:53:12 | this access |
 | AccessorCalls.cs:53:16:53:16 | 0 | AccessorCalls.cs:53:9:53:17 | access to indexer |
 | AccessorCalls.cs:53:22:53:25 | this access | AccessorCalls.cs:53:22:53:27 | access to field x |
 | AccessorCalls.cs:53:22:53:27 | access to field x | AccessorCalls.cs:53:29:53:29 | 0 |
-| AccessorCalls.cs:53:22:53:30 | access to indexer | AccessorCalls.cs:53:9:53:30 | ... + ... |
+| AccessorCalls.cs:53:22:53:30 | access to indexer | AccessorCalls.cs:53:9:53:30 | ... += ... |
 | AccessorCalls.cs:53:29:53:29 | 0 | AccessorCalls.cs:53:22:53:30 | access to indexer |
 | AccessorCalls.cs:56:10:56:11 | enter M7 | AccessorCalls.cs:57:5:59:5 | {...} |
 | AccessorCalls.cs:56:10:56:11 | exit M7 (normal) | AccessorCalls.cs:56:10:56:11 | exit M7 |
@@ -271,25 +248,18 @@ dominance
 | AccessorCalls.cs:70:9:70:19 | dynamic access to member MaybeProp | AccessorCalls.cs:70:9:70:21 | dynamic call to operator ++ |
 | AccessorCalls.cs:70:9:70:21 | dynamic call to operator ++ | AccessorCalls.cs:71:9:71:26 | ...; |
 | AccessorCalls.cs:70:9:70:22 | ...; | AccessorCalls.cs:70:9:70:9 | access to local variable d |
-| AccessorCalls.cs:71:9:71:9 | access to local variable d | AccessorCalls.cs:71:9:71:9 | access to local variable d |
 | AccessorCalls.cs:71:9:71:9 | access to local variable d | AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent |
-| AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent | AccessorCalls.cs:71:9:71:25 | ... = ... |
 | AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent | AccessorCalls.cs:71:25:71:25 | access to parameter e |
-| AccessorCalls.cs:71:9:71:25 | ... = ... | AccessorCalls.cs:72:9:72:21 | ...; |
-| AccessorCalls.cs:71:9:71:25 | dynamic call to operator + | AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent |
+| AccessorCalls.cs:71:9:71:25 | ... += ... | AccessorCalls.cs:72:9:72:21 | ...; |
 | AccessorCalls.cs:71:9:71:26 | ...; | AccessorCalls.cs:71:9:71:9 | access to local variable d |
-| AccessorCalls.cs:71:25:71:25 | access to parameter e | AccessorCalls.cs:71:9:71:25 | dynamic call to operator + |
+| AccessorCalls.cs:71:25:71:25 | access to parameter e | AccessorCalls.cs:71:9:71:25 | ... += ... |
 | AccessorCalls.cs:72:9:72:9 | access to local variable d | AccessorCalls.cs:72:11:72:11 | 0 |
-| AccessorCalls.cs:72:9:72:9 | access to local variable d | AccessorCalls.cs:72:11:72:11 | 0 |
-| AccessorCalls.cs:72:9:72:12 | dynamic access to element | AccessorCalls.cs:72:9:72:20 | ... = ... |
 | AccessorCalls.cs:72:9:72:12 | dynamic access to element | AccessorCalls.cs:72:17:72:17 | access to local variable d |
-| AccessorCalls.cs:72:9:72:20 | ... = ... | AccessorCalls.cs:73:9:73:84 | ...; |
-| AccessorCalls.cs:72:9:72:20 | dynamic call to operator + | AccessorCalls.cs:72:9:72:12 | dynamic access to element |
+| AccessorCalls.cs:72:9:72:20 | ... += ... | AccessorCalls.cs:73:9:73:84 | ...; |
 | AccessorCalls.cs:72:9:72:21 | ...; | AccessorCalls.cs:72:9:72:9 | access to local variable d |
-| AccessorCalls.cs:72:11:72:11 | 0 | AccessorCalls.cs:72:9:72:9 | access to local variable d |
 | AccessorCalls.cs:72:11:72:11 | 0 | AccessorCalls.cs:72:9:72:12 | dynamic access to element |
 | AccessorCalls.cs:72:17:72:17 | access to local variable d | AccessorCalls.cs:72:19:72:19 | 1 |
-| AccessorCalls.cs:72:17:72:20 | dynamic access to element | AccessorCalls.cs:72:9:72:20 | dynamic call to operator + |
+| AccessorCalls.cs:72:17:72:20 | dynamic access to element | AccessorCalls.cs:72:9:72:20 | ... += ... |
 | AccessorCalls.cs:72:19:72:19 | 1 | AccessorCalls.cs:72:17:72:20 | dynamic access to element |
 | AccessorCalls.cs:73:9:73:44 | (..., ...) | AccessorCalls.cs:73:49:73:49 | access to local variable d |
 | AccessorCalls.cs:73:9:73:83 | ... = ... | AccessorCalls.cs:66:10:66:11 | exit M9 (normal) |
@@ -732,27 +702,24 @@ dominance
 | Assignments.cs:5:13:5:17 | Int32 x = ... | Assignments.cs:6:9:6:15 | ...; |
 | Assignments.cs:5:17:5:17 | 0 | Assignments.cs:5:13:5:17 | Int32 x = ... |
 | Assignments.cs:6:9:6:9 | access to local variable x | Assignments.cs:6:14:6:14 | 1 |
-| Assignments.cs:6:9:6:14 | ... + ... | Assignments.cs:6:9:6:14 | ... = ... |
-| Assignments.cs:6:9:6:14 | ... = ... | Assignments.cs:8:9:8:22 | ... ...; |
+| Assignments.cs:6:9:6:14 | ... += ... | Assignments.cs:8:9:8:22 | ... ...; |
 | Assignments.cs:6:9:6:15 | ...; | Assignments.cs:6:9:6:9 | access to local variable x |
-| Assignments.cs:6:14:6:14 | 1 | Assignments.cs:6:9:6:14 | ... + ... |
+| Assignments.cs:6:14:6:14 | 1 | Assignments.cs:6:9:6:14 | ... += ... |
 | Assignments.cs:8:9:8:22 | ... ...; | Assignments.cs:8:21:8:21 | 0 |
 | Assignments.cs:8:17:8:21 | dynamic d = ... | Assignments.cs:9:9:9:15 | ...; |
 | Assignments.cs:8:21:8:21 | 0 | Assignments.cs:8:21:8:21 | (...) ... |
 | Assignments.cs:8:21:8:21 | (...) ... | Assignments.cs:8:17:8:21 | dynamic d = ... |
 | Assignments.cs:9:9:9:9 | access to local variable d | Assignments.cs:9:14:9:14 | 2 |
-| Assignments.cs:9:9:9:14 | ... = ... | Assignments.cs:11:9:11:34 | ... ...; |
-| Assignments.cs:9:9:9:14 | dynamic call to operator - | Assignments.cs:9:9:9:14 | ... = ... |
+| Assignments.cs:9:9:9:14 | ... -= ... | Assignments.cs:11:9:11:34 | ... ...; |
 | Assignments.cs:9:9:9:15 | ...; | Assignments.cs:9:9:9:9 | access to local variable d |
-| Assignments.cs:9:14:9:14 | 2 | Assignments.cs:9:9:9:14 | dynamic call to operator - |
+| Assignments.cs:9:14:9:14 | 2 | Assignments.cs:9:9:9:14 | ... -= ... |
 | Assignments.cs:11:9:11:34 | ... ...; | Assignments.cs:11:17:11:33 | object creation of type Assignments |
 | Assignments.cs:11:13:11:33 | Assignments a = ... | Assignments.cs:12:9:12:18 | ...; |
 | Assignments.cs:11:17:11:33 | object creation of type Assignments | Assignments.cs:11:13:11:33 | Assignments a = ... |
 | Assignments.cs:12:9:12:9 | access to local variable a | Assignments.cs:12:14:12:17 | this access |
-| Assignments.cs:12:9:12:17 | ... = ... | Assignments.cs:14:9:14:36 | ...; |
-| Assignments.cs:12:9:12:17 | call to operator + | Assignments.cs:12:9:12:17 | ... = ... |
+| Assignments.cs:12:9:12:17 | ... += ... | Assignments.cs:14:9:14:36 | ...; |
 | Assignments.cs:12:9:12:18 | ...; | Assignments.cs:12:9:12:9 | access to local variable a |
-| Assignments.cs:12:14:12:17 | this access | Assignments.cs:12:9:12:17 | call to operator + |
+| Assignments.cs:12:14:12:17 | this access | Assignments.cs:12:9:12:17 | ... += ... |
 | Assignments.cs:14:9:14:13 | access to event Event | Assignments.cs:14:9:14:35 | ... += ... |
 | Assignments.cs:14:9:14:13 | this access | Assignments.cs:14:18:14:35 | (...) => ... |
 | Assignments.cs:14:9:14:35 | ... += ... | Assignments.cs:3:10:3:10 | exit M (normal) |
@@ -1058,22 +1025,16 @@ dominance
 | ConditionalAccess.cs:52:9:52:28 | access to property StringProp | ConditionalAccess.cs:52:18:52:38 | ... = ... |
 | ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:52:9:52:10 | access to parameter ca |
 | ConditionalAccess.cs:52:32:52:38 | "World" | ConditionalAccess.cs:52:9:52:28 | access to property StringProp |
-| ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
 | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:9:53:20 | access to field IntField |
 | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:25:53:25 | 1 |
-| ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:54:9:54:30 | ...; |
-| ConditionalAccess.cs:53:9:53:20 | access to field IntField | ConditionalAccess.cs:53:12:53:25 | ... = ... |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
-| ConditionalAccess.cs:53:12:53:25 | ... - ... | ConditionalAccess.cs:53:9:53:20 | access to field IntField |
-| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:53:12:53:25 | ... - ... |
-| ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) |
-| ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
+| ConditionalAccess.cs:53:12:53:25 | ... -= ... | ConditionalAccess.cs:54:9:54:30 | ...; |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:53:12:53:25 | ... -= ... |
 | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:9:54:22 | access to property StringProp |
 | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:27:54:29 | "!" |
-| ConditionalAccess.cs:54:9:54:22 | access to property StringProp | ConditionalAccess.cs:54:12:54:29 | ... = ... |
 | ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
-| ConditionalAccess.cs:54:12:54:29 | ... + ... | ConditionalAccess.cs:54:9:54:22 | access to property StringProp |
-| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:54:12:54:29 | ... + ... |
+| ConditionalAccess.cs:54:12:54:29 | ... += ... | ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) |
+| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:54:12:54:29 | ... += ... |
 | ConditionalAccess.cs:60:26:60:38 | enter CommaJoinWith | ConditionalAccess.cs:60:70:60:71 | access to parameter s1 |
 | ConditionalAccess.cs:60:26:60:38 | exit CommaJoinWith (normal) | ConditionalAccess.cs:60:26:60:38 | exit CommaJoinWith |
 | ConditionalAccess.cs:60:70:60:71 | access to parameter s1 | ConditionalAccess.cs:60:75:60:78 | ", " |
@@ -1295,9 +1256,8 @@ dominance
 | Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:106:13:106:20 | ...; |
 | Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:107:9:109:24 | if (...) ... |
 | Conditions.cs:106:13:106:13 | access to local variable x | Conditions.cs:106:18:106:19 | "" |
-| Conditions.cs:106:13:106:19 | ... + ... | Conditions.cs:106:13:106:19 | ... = ... |
 | Conditions.cs:106:13:106:20 | ...; | Conditions.cs:106:13:106:13 | access to local variable x |
-| Conditions.cs:106:18:106:19 | "" | Conditions.cs:106:13:106:19 | ... + ... |
+| Conditions.cs:106:18:106:19 | "" | Conditions.cs:106:13:106:19 | ... += ... |
 | Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:107:13:107:13 | access to local variable x |
 | Conditions.cs:107:13:107:13 | access to local variable x | Conditions.cs:107:13:107:20 | access to property Length |
 | Conditions.cs:107:13:107:20 | access to property Length | Conditions.cs:107:24:107:24 | 0 |
@@ -1309,9 +1269,8 @@ dominance
 | Conditions.cs:108:18:108:18 | access to parameter b | Conditions.cs:108:17:108:18 | [false] !... |
 | Conditions.cs:108:18:108:18 | access to parameter b | Conditions.cs:108:17:108:18 | [true] !... |
 | Conditions.cs:109:17:109:17 | access to local variable x | Conditions.cs:109:22:109:23 | "" |
-| Conditions.cs:109:17:109:23 | ... + ... | Conditions.cs:109:17:109:23 | ... = ... |
 | Conditions.cs:109:17:109:24 | ...; | Conditions.cs:109:17:109:17 | access to local variable x |
-| Conditions.cs:109:22:109:23 | "" | Conditions.cs:109:17:109:23 | ... + ... |
+| Conditions.cs:109:22:109:23 | "" | Conditions.cs:109:17:109:23 | ... += ... |
 | Conditions.cs:110:9:110:17 | return ...; | Conditions.cs:102:12:102:13 | exit M8 (normal) |
 | Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:110:9:110:17 | return ...; |
 | Conditions.cs:113:10:113:11 | enter M9 | Conditions.cs:114:5:124:5 | {...} |
@@ -1939,11 +1898,10 @@ dominance
 | Finally.cs:271:13:271:35 | ...; | Finally.cs:271:31:271:33 | "3" |
 | Finally.cs:271:31:271:33 | "3" | Finally.cs:271:13:271:34 | call to method WriteLine |
 | Finally.cs:272:13:272:13 | access to parameter i | Finally.cs:272:18:272:18 | 3 |
-| Finally.cs:272:13:272:18 | ... + ... | Finally.cs:272:13:272:18 | ... = ... |
-| Finally.cs:272:13:272:18 | ... = ... | Finally.cs:263:10:263:12 | exit M13 (abnormal) |
-| Finally.cs:272:13:272:18 | ... = ... | Finally.cs:263:10:263:12 | exit M13 (normal) |
+| Finally.cs:272:13:272:18 | ... += ... | Finally.cs:263:10:263:12 | exit M13 (abnormal) |
+| Finally.cs:272:13:272:18 | ... += ... | Finally.cs:263:10:263:12 | exit M13 (normal) |
 | Finally.cs:272:13:272:19 | ...; | Finally.cs:272:13:272:13 | access to parameter i |
-| Finally.cs:272:18:272:18 | 3 | Finally.cs:272:13:272:18 | ... + ... |
+| Finally.cs:272:18:272:18 | 3 | Finally.cs:272:13:272:18 | ... += ... |
 | Foreach.cs:4:7:4:13 | call to constructor Object | Foreach.cs:4:7:4:13 | {...} |
 | Foreach.cs:4:7:4:13 | call to method <object initializer> | Foreach.cs:4:7:4:13 | call to constructor Object |
 | Foreach.cs:4:7:4:13 | enter Foreach | Foreach.cs:4:7:4:13 | this access |
@@ -3819,14 +3777,11 @@ dominance
 | cflow.cs:209:5:222:5 | {...} | cflow.cs:210:9:221:36 | do ... while (...); |
 | cflow.cs:210:9:221:36 | do ... while (...); | cflow.cs:211:9:221:9 | {...} |
 | cflow.cs:211:9:221:9 | {...} | cflow.cs:212:13:212:25 | ...; |
-| cflow.cs:212:13:212:17 | access to field Field | cflow.cs:212:13:212:24 | ... = ... |
 | cflow.cs:212:13:212:17 | access to field Field | cflow.cs:212:22:212:24 | "a" |
 | cflow.cs:212:13:212:17 | this access | cflow.cs:212:13:212:17 | access to field Field |
-| cflow.cs:212:13:212:17 | this access | cflow.cs:212:13:212:17 | this access |
-| cflow.cs:212:13:212:24 | ... + ... | cflow.cs:212:13:212:17 | access to field Field |
-| cflow.cs:212:13:212:24 | ... = ... | cflow.cs:213:13:216:13 | if (...) ... |
+| cflow.cs:212:13:212:24 | ... += ... | cflow.cs:213:13:216:13 | if (...) ... |
 | cflow.cs:212:13:212:25 | ...; | cflow.cs:212:13:212:17 | this access |
-| cflow.cs:212:22:212:24 | "a" | cflow.cs:212:13:212:24 | ... + ... |
+| cflow.cs:212:22:212:24 | "a" | cflow.cs:212:13:212:24 | ... += ... |
 | cflow.cs:213:13:216:13 | if (...) ... | cflow.cs:213:17:213:21 | this access |
 | cflow.cs:213:17:213:21 | access to field Field | cflow.cs:213:17:213:28 | access to property Length |
 | cflow.cs:213:17:213:21 | this access | cflow.cs:213:17:213:21 | access to field Field |
@@ -3856,14 +3811,11 @@ dominance
 | cflow.cs:226:57:226:59 | "a" | cflow.cs:226:62:226:63 | 10 |
 | cflow.cs:226:62:226:63 | 10 | cflow.cs:226:27:226:64 | call to method Repeat<String> |
 | cflow.cs:227:9:237:9 | {...} | cflow.cs:228:13:228:23 | ...; |
-| cflow.cs:228:13:228:17 | access to field Field | cflow.cs:228:13:228:22 | ... = ... |
 | cflow.cs:228:13:228:17 | access to field Field | cflow.cs:228:22:228:22 | access to local variable x |
 | cflow.cs:228:13:228:17 | this access | cflow.cs:228:13:228:17 | access to field Field |
-| cflow.cs:228:13:228:17 | this access | cflow.cs:228:13:228:17 | this access |
-| cflow.cs:228:13:228:22 | ... + ... | cflow.cs:228:13:228:17 | access to field Field |
-| cflow.cs:228:13:228:22 | ... = ... | cflow.cs:229:13:232:13 | if (...) ... |
+| cflow.cs:228:13:228:22 | ... += ... | cflow.cs:229:13:232:13 | if (...) ... |
 | cflow.cs:228:13:228:23 | ...; | cflow.cs:228:13:228:17 | this access |
-| cflow.cs:228:22:228:22 | access to local variable x | cflow.cs:228:13:228:22 | ... + ... |
+| cflow.cs:228:22:228:22 | access to local variable x | cflow.cs:228:13:228:22 | ... += ... |
 | cflow.cs:229:13:232:13 | if (...) ... | cflow.cs:229:17:229:21 | this access |
 | cflow.cs:229:17:229:21 | access to field Field | cflow.cs:229:17:229:28 | access to property Length |
 | cflow.cs:229:17:229:21 | this access | cflow.cs:229:17:229:21 | access to field Field |
@@ -4138,75 +4090,52 @@ postDominance
 | AccessorCalls.cs:39:9:39:20 | ...; | AccessorCalls.cs:38:9:38:21 | ...++ |
 | AccessorCalls.cs:39:16:39:16 | 0 | AccessorCalls.cs:39:9:39:14 | access to field x |
 | AccessorCalls.cs:42:10:42:11 | exit M5 | AccessorCalls.cs:42:10:42:11 | exit M5 (normal) |
-| AccessorCalls.cs:42:10:42:11 | exit M5 (normal) | AccessorCalls.cs:46:9:46:26 | ... = ... |
+| AccessorCalls.cs:42:10:42:11 | exit M5 (normal) | AccessorCalls.cs:46:9:46:26 | ... += ... |
 | AccessorCalls.cs:43:5:47:5 | {...} | AccessorCalls.cs:42:10:42:11 | enter M5 |
-| AccessorCalls.cs:44:9:44:12 | this access | AccessorCalls.cs:44:9:44:12 | this access |
 | AccessorCalls.cs:44:9:44:12 | this access | AccessorCalls.cs:44:9:44:33 | ...; |
 | AccessorCalls.cs:44:9:44:18 | access to field Field | AccessorCalls.cs:44:9:44:12 | this access |
-| AccessorCalls.cs:44:9:44:18 | access to field Field | AccessorCalls.cs:44:9:44:32 | ... + ... |
-| AccessorCalls.cs:44:9:44:32 | ... + ... | AccessorCalls.cs:44:23:44:32 | access to field Field |
-| AccessorCalls.cs:44:9:44:32 | ... = ... | AccessorCalls.cs:44:9:44:18 | access to field Field |
+| AccessorCalls.cs:44:9:44:32 | ... += ... | AccessorCalls.cs:44:23:44:32 | access to field Field |
 | AccessorCalls.cs:44:9:44:33 | ...; | AccessorCalls.cs:43:5:47:5 | {...} |
 | AccessorCalls.cs:44:23:44:26 | this access | AccessorCalls.cs:44:9:44:18 | access to field Field |
 | AccessorCalls.cs:44:23:44:32 | access to field Field | AccessorCalls.cs:44:23:44:26 | this access |
-| AccessorCalls.cs:45:9:45:12 | this access | AccessorCalls.cs:45:9:45:12 | this access |
 | AccessorCalls.cs:45:9:45:12 | this access | AccessorCalls.cs:45:9:45:31 | ...; |
 | AccessorCalls.cs:45:9:45:17 | access to property Prop | AccessorCalls.cs:45:9:45:12 | this access |
-| AccessorCalls.cs:45:9:45:17 | access to property Prop | AccessorCalls.cs:45:9:45:30 | ... + ... |
-| AccessorCalls.cs:45:9:45:30 | ... + ... | AccessorCalls.cs:45:22:45:30 | access to property Prop |
-| AccessorCalls.cs:45:9:45:30 | ... = ... | AccessorCalls.cs:45:9:45:17 | access to property Prop |
-| AccessorCalls.cs:45:9:45:31 | ...; | AccessorCalls.cs:44:9:44:32 | ... = ... |
+| AccessorCalls.cs:45:9:45:30 | ... += ... | AccessorCalls.cs:45:22:45:30 | access to property Prop |
+| AccessorCalls.cs:45:9:45:31 | ...; | AccessorCalls.cs:44:9:44:32 | ... += ... |
 | AccessorCalls.cs:45:22:45:25 | this access | AccessorCalls.cs:45:9:45:17 | access to property Prop |
 | AccessorCalls.cs:45:22:45:30 | access to property Prop | AccessorCalls.cs:45:22:45:25 | this access |
 | AccessorCalls.cs:46:9:46:12 | this access | AccessorCalls.cs:46:9:46:27 | ...; |
-| AccessorCalls.cs:46:9:46:12 | this access | AccessorCalls.cs:46:14:46:14 | 0 |
-| AccessorCalls.cs:46:9:46:15 | access to indexer | AccessorCalls.cs:46:9:46:26 | ... + ... |
 | AccessorCalls.cs:46:9:46:15 | access to indexer | AccessorCalls.cs:46:14:46:14 | 0 |
-| AccessorCalls.cs:46:9:46:26 | ... + ... | AccessorCalls.cs:46:20:46:26 | access to indexer |
-| AccessorCalls.cs:46:9:46:26 | ... = ... | AccessorCalls.cs:46:9:46:15 | access to indexer |
-| AccessorCalls.cs:46:9:46:27 | ...; | AccessorCalls.cs:45:9:45:30 | ... = ... |
-| AccessorCalls.cs:46:14:46:14 | 0 | AccessorCalls.cs:46:9:46:12 | this access |
+| AccessorCalls.cs:46:9:46:26 | ... += ... | AccessorCalls.cs:46:20:46:26 | access to indexer |
+| AccessorCalls.cs:46:9:46:27 | ...; | AccessorCalls.cs:45:9:45:30 | ... += ... |
 | AccessorCalls.cs:46:14:46:14 | 0 | AccessorCalls.cs:46:9:46:12 | this access |
 | AccessorCalls.cs:46:20:46:23 | this access | AccessorCalls.cs:46:9:46:15 | access to indexer |
 | AccessorCalls.cs:46:20:46:26 | access to indexer | AccessorCalls.cs:46:25:46:25 | 0 |
 | AccessorCalls.cs:46:25:46:25 | 0 | AccessorCalls.cs:46:20:46:23 | this access |
 | AccessorCalls.cs:49:10:49:11 | exit M6 | AccessorCalls.cs:49:10:49:11 | exit M6 (normal) |
-| AccessorCalls.cs:49:10:49:11 | exit M6 (normal) | AccessorCalls.cs:53:9:53:30 | ... = ... |
+| AccessorCalls.cs:49:10:49:11 | exit M6 (normal) | AccessorCalls.cs:53:9:53:30 | ... += ... |
 | AccessorCalls.cs:50:5:54:5 | {...} | AccessorCalls.cs:49:10:49:11 | enter M6 |
-| AccessorCalls.cs:51:9:51:12 | this access | AccessorCalls.cs:51:9:51:14 | access to field x |
 | AccessorCalls.cs:51:9:51:12 | this access | AccessorCalls.cs:51:9:51:37 | ...; |
 | AccessorCalls.cs:51:9:51:14 | access to field x | AccessorCalls.cs:51:9:51:12 | this access |
-| AccessorCalls.cs:51:9:51:14 | access to field x | AccessorCalls.cs:51:9:51:12 | this access |
 | AccessorCalls.cs:51:9:51:20 | access to field Field | AccessorCalls.cs:51:9:51:14 | access to field x |
-| AccessorCalls.cs:51:9:51:20 | access to field Field | AccessorCalls.cs:51:9:51:36 | ... + ... |
-| AccessorCalls.cs:51:9:51:36 | ... + ... | AccessorCalls.cs:51:25:51:36 | access to field Field |
-| AccessorCalls.cs:51:9:51:36 | ... = ... | AccessorCalls.cs:51:9:51:20 | access to field Field |
+| AccessorCalls.cs:51:9:51:36 | ... += ... | AccessorCalls.cs:51:25:51:36 | access to field Field |
 | AccessorCalls.cs:51:9:51:37 | ...; | AccessorCalls.cs:50:5:54:5 | {...} |
 | AccessorCalls.cs:51:25:51:28 | this access | AccessorCalls.cs:51:9:51:20 | access to field Field |
 | AccessorCalls.cs:51:25:51:30 | access to field x | AccessorCalls.cs:51:25:51:28 | this access |
 | AccessorCalls.cs:51:25:51:36 | access to field Field | AccessorCalls.cs:51:25:51:30 | access to field x |
-| AccessorCalls.cs:52:9:52:12 | this access | AccessorCalls.cs:52:9:52:14 | access to field x |
 | AccessorCalls.cs:52:9:52:12 | this access | AccessorCalls.cs:52:9:52:35 | ...; |
 | AccessorCalls.cs:52:9:52:14 | access to field x | AccessorCalls.cs:52:9:52:12 | this access |
-| AccessorCalls.cs:52:9:52:14 | access to field x | AccessorCalls.cs:52:9:52:12 | this access |
 | AccessorCalls.cs:52:9:52:19 | access to property Prop | AccessorCalls.cs:52:9:52:14 | access to field x |
-| AccessorCalls.cs:52:9:52:19 | access to property Prop | AccessorCalls.cs:52:9:52:34 | ... + ... |
-| AccessorCalls.cs:52:9:52:34 | ... + ... | AccessorCalls.cs:52:24:52:34 | access to property Prop |
-| AccessorCalls.cs:52:9:52:34 | ... = ... | AccessorCalls.cs:52:9:52:19 | access to property Prop |
-| AccessorCalls.cs:52:9:52:35 | ...; | AccessorCalls.cs:51:9:51:36 | ... = ... |
+| AccessorCalls.cs:52:9:52:34 | ... += ... | AccessorCalls.cs:52:24:52:34 | access to property Prop |
+| AccessorCalls.cs:52:9:52:35 | ...; | AccessorCalls.cs:51:9:51:36 | ... += ... |
 | AccessorCalls.cs:52:24:52:27 | this access | AccessorCalls.cs:52:9:52:19 | access to property Prop |
 | AccessorCalls.cs:52:24:52:29 | access to field x | AccessorCalls.cs:52:24:52:27 | this access |
 | AccessorCalls.cs:52:24:52:34 | access to property Prop | AccessorCalls.cs:52:24:52:29 | access to field x |
 | AccessorCalls.cs:53:9:53:12 | this access | AccessorCalls.cs:53:9:53:31 | ...; |
-| AccessorCalls.cs:53:9:53:12 | this access | AccessorCalls.cs:53:16:53:16 | 0 |
 | AccessorCalls.cs:53:9:53:14 | access to field x | AccessorCalls.cs:53:9:53:12 | this access |
-| AccessorCalls.cs:53:9:53:14 | access to field x | AccessorCalls.cs:53:9:53:12 | this access |
-| AccessorCalls.cs:53:9:53:17 | access to indexer | AccessorCalls.cs:53:9:53:30 | ... + ... |
 | AccessorCalls.cs:53:9:53:17 | access to indexer | AccessorCalls.cs:53:16:53:16 | 0 |
-| AccessorCalls.cs:53:9:53:30 | ... + ... | AccessorCalls.cs:53:22:53:30 | access to indexer |
-| AccessorCalls.cs:53:9:53:30 | ... = ... | AccessorCalls.cs:53:9:53:17 | access to indexer |
-| AccessorCalls.cs:53:9:53:31 | ...; | AccessorCalls.cs:52:9:52:34 | ... = ... |
-| AccessorCalls.cs:53:16:53:16 | 0 | AccessorCalls.cs:53:9:53:14 | access to field x |
+| AccessorCalls.cs:53:9:53:30 | ... += ... | AccessorCalls.cs:53:22:53:30 | access to indexer |
+| AccessorCalls.cs:53:9:53:31 | ...; | AccessorCalls.cs:52:9:52:34 | ... += ... |
 | AccessorCalls.cs:53:16:53:16 | 0 | AccessorCalls.cs:53:9:53:14 | access to field x |
 | AccessorCalls.cs:53:22:53:25 | this access | AccessorCalls.cs:53:9:53:17 | access to indexer |
 | AccessorCalls.cs:53:22:53:27 | access to field x | AccessorCalls.cs:53:22:53:25 | this access |
@@ -4282,29 +4211,22 @@ postDominance
 | AccessorCalls.cs:70:9:70:19 | dynamic access to member MaybeProp | AccessorCalls.cs:70:9:70:9 | access to local variable d |
 | AccessorCalls.cs:70:9:70:21 | dynamic call to operator ++ | AccessorCalls.cs:70:9:70:19 | dynamic access to member MaybeProp |
 | AccessorCalls.cs:70:9:70:22 | ...; | AccessorCalls.cs:69:9:69:35 | ... = ... |
-| AccessorCalls.cs:71:9:71:9 | access to local variable d | AccessorCalls.cs:71:9:71:9 | access to local variable d |
 | AccessorCalls.cs:71:9:71:9 | access to local variable d | AccessorCalls.cs:71:9:71:26 | ...; |
 | AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent | AccessorCalls.cs:71:9:71:9 | access to local variable d |
-| AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent | AccessorCalls.cs:71:9:71:25 | dynamic call to operator + |
-| AccessorCalls.cs:71:9:71:25 | ... = ... | AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent |
-| AccessorCalls.cs:71:9:71:25 | dynamic call to operator + | AccessorCalls.cs:71:25:71:25 | access to parameter e |
+| AccessorCalls.cs:71:9:71:25 | ... += ... | AccessorCalls.cs:71:25:71:25 | access to parameter e |
 | AccessorCalls.cs:71:9:71:26 | ...; | AccessorCalls.cs:70:9:70:21 | dynamic call to operator ++ |
 | AccessorCalls.cs:71:25:71:25 | access to parameter e | AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent |
 | AccessorCalls.cs:72:9:72:9 | access to local variable d | AccessorCalls.cs:72:9:72:21 | ...; |
-| AccessorCalls.cs:72:9:72:9 | access to local variable d | AccessorCalls.cs:72:11:72:11 | 0 |
-| AccessorCalls.cs:72:9:72:12 | dynamic access to element | AccessorCalls.cs:72:9:72:20 | dynamic call to operator + |
 | AccessorCalls.cs:72:9:72:12 | dynamic access to element | AccessorCalls.cs:72:11:72:11 | 0 |
-| AccessorCalls.cs:72:9:72:20 | ... = ... | AccessorCalls.cs:72:9:72:12 | dynamic access to element |
-| AccessorCalls.cs:72:9:72:20 | dynamic call to operator + | AccessorCalls.cs:72:17:72:20 | dynamic access to element |
-| AccessorCalls.cs:72:9:72:21 | ...; | AccessorCalls.cs:71:9:71:25 | ... = ... |
-| AccessorCalls.cs:72:11:72:11 | 0 | AccessorCalls.cs:72:9:72:9 | access to local variable d |
+| AccessorCalls.cs:72:9:72:20 | ... += ... | AccessorCalls.cs:72:17:72:20 | dynamic access to element |
+| AccessorCalls.cs:72:9:72:21 | ...; | AccessorCalls.cs:71:9:71:25 | ... += ... |
 | AccessorCalls.cs:72:11:72:11 | 0 | AccessorCalls.cs:72:9:72:9 | access to local variable d |
 | AccessorCalls.cs:72:17:72:17 | access to local variable d | AccessorCalls.cs:72:9:72:12 | dynamic access to element |
 | AccessorCalls.cs:72:17:72:20 | dynamic access to element | AccessorCalls.cs:72:19:72:19 | 1 |
 | AccessorCalls.cs:72:19:72:19 | 1 | AccessorCalls.cs:72:17:72:17 | access to local variable d |
 | AccessorCalls.cs:73:9:73:44 | (..., ...) | AccessorCalls.cs:73:35:73:43 | (..., ...) |
 | AccessorCalls.cs:73:9:73:83 | ... = ... | AccessorCalls.cs:73:39:73:42 | dynamic access to element |
-| AccessorCalls.cs:73:9:73:84 | ...; | AccessorCalls.cs:72:9:72:20 | ... = ... |
+| AccessorCalls.cs:73:9:73:84 | ...; | AccessorCalls.cs:72:9:72:20 | ... += ... |
 | AccessorCalls.cs:73:10:73:10 | access to local variable d | AccessorCalls.cs:73:9:73:84 | ...; |
 | AccessorCalls.cs:73:10:73:21 | dynamic access to member MaybeProp1 | AccessorCalls.cs:73:48:73:83 | (..., ...) |
 | AccessorCalls.cs:73:24:73:27 | this access | AccessorCalls.cs:73:10:73:10 | access to local variable d |
@@ -4730,31 +4652,28 @@ postDominance
 | Assignments.cs:5:13:5:17 | Int32 x = ... | Assignments.cs:5:17:5:17 | 0 |
 | Assignments.cs:5:17:5:17 | 0 | Assignments.cs:5:9:5:18 | ... ...; |
 | Assignments.cs:6:9:6:9 | access to local variable x | Assignments.cs:6:9:6:15 | ...; |
-| Assignments.cs:6:9:6:14 | ... + ... | Assignments.cs:6:14:6:14 | 1 |
-| Assignments.cs:6:9:6:14 | ... = ... | Assignments.cs:6:9:6:14 | ... + ... |
+| Assignments.cs:6:9:6:14 | ... += ... | Assignments.cs:6:14:6:14 | 1 |
 | Assignments.cs:6:9:6:15 | ...; | Assignments.cs:5:13:5:17 | Int32 x = ... |
 | Assignments.cs:6:14:6:14 | 1 | Assignments.cs:6:9:6:9 | access to local variable x |
-| Assignments.cs:8:9:8:22 | ... ...; | Assignments.cs:6:9:6:14 | ... = ... |
+| Assignments.cs:8:9:8:22 | ... ...; | Assignments.cs:6:9:6:14 | ... += ... |
 | Assignments.cs:8:17:8:21 | dynamic d = ... | Assignments.cs:8:21:8:21 | (...) ... |
 | Assignments.cs:8:21:8:21 | 0 | Assignments.cs:8:9:8:22 | ... ...; |
 | Assignments.cs:8:21:8:21 | (...) ... | Assignments.cs:8:21:8:21 | 0 |
 | Assignments.cs:9:9:9:9 | access to local variable d | Assignments.cs:9:9:9:15 | ...; |
-| Assignments.cs:9:9:9:14 | ... = ... | Assignments.cs:9:9:9:14 | dynamic call to operator - |
-| Assignments.cs:9:9:9:14 | dynamic call to operator - | Assignments.cs:9:14:9:14 | 2 |
+| Assignments.cs:9:9:9:14 | ... -= ... | Assignments.cs:9:14:9:14 | 2 |
 | Assignments.cs:9:9:9:15 | ...; | Assignments.cs:8:17:8:21 | dynamic d = ... |
 | Assignments.cs:9:14:9:14 | 2 | Assignments.cs:9:9:9:9 | access to local variable d |
-| Assignments.cs:11:9:11:34 | ... ...; | Assignments.cs:9:9:9:14 | ... = ... |
+| Assignments.cs:11:9:11:34 | ... ...; | Assignments.cs:9:9:9:14 | ... -= ... |
 | Assignments.cs:11:13:11:33 | Assignments a = ... | Assignments.cs:11:17:11:33 | object creation of type Assignments |
 | Assignments.cs:11:17:11:33 | object creation of type Assignments | Assignments.cs:11:9:11:34 | ... ...; |
 | Assignments.cs:12:9:12:9 | access to local variable a | Assignments.cs:12:9:12:18 | ...; |
-| Assignments.cs:12:9:12:17 | ... = ... | Assignments.cs:12:9:12:17 | call to operator + |
-| Assignments.cs:12:9:12:17 | call to operator + | Assignments.cs:12:14:12:17 | this access |
+| Assignments.cs:12:9:12:17 | ... += ... | Assignments.cs:12:14:12:17 | this access |
 | Assignments.cs:12:9:12:18 | ...; | Assignments.cs:11:13:11:33 | Assignments a = ... |
 | Assignments.cs:12:14:12:17 | this access | Assignments.cs:12:9:12:9 | access to local variable a |
 | Assignments.cs:14:9:14:13 | access to event Event | Assignments.cs:14:18:14:35 | (...) => ... |
 | Assignments.cs:14:9:14:13 | this access | Assignments.cs:14:9:14:36 | ...; |
 | Assignments.cs:14:9:14:35 | ... += ... | Assignments.cs:14:9:14:13 | access to event Event |
-| Assignments.cs:14:9:14:36 | ...; | Assignments.cs:12:9:12:17 | ... = ... |
+| Assignments.cs:14:9:14:36 | ...; | Assignments.cs:12:9:12:17 | ... += ... |
 | Assignments.cs:14:18:14:35 | (...) => ... | Assignments.cs:14:9:14:13 | this access |
 | Assignments.cs:14:18:14:35 | exit (...) => ... | Assignments.cs:14:18:14:35 | exit (...) => ... (normal) |
 | Assignments.cs:14:18:14:35 | exit (...) => ... (normal) | Assignments.cs:14:33:14:35 | {...} |
@@ -5022,8 +4941,7 @@ postDominance
 | ConditionalAccess.cs:43:9:43:11 | exit set_Item (normal) | ConditionalAccess.cs:43:13:43:15 | {...} |
 | ConditionalAccess.cs:43:13:43:15 | {...} | ConditionalAccess.cs:43:9:43:11 | enter set_Item |
 | ConditionalAccess.cs:46:10:46:11 | exit M9 | ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:54:12:54:29 | ... = ... |
+| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:54:12:54:29 | ... += ... |
 | ConditionalAccess.cs:47:5:55:5 | {...} | ConditionalAccess.cs:46:10:46:11 | enter M9 |
 | ConditionalAccess.cs:48:9:48:10 | access to parameter ca | ConditionalAccess.cs:48:9:48:26 | ...; |
 | ConditionalAccess.cs:48:9:48:20 | access to field IntField | ConditionalAccess.cs:48:24:48:25 | 42 |
@@ -5052,20 +4970,15 @@ postDominance
 | ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:51:18:51:31 | ... = ... |
 | ConditionalAccess.cs:52:18:52:38 | ... = ... | ConditionalAccess.cs:52:9:52:28 | access to property StringProp |
 | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:9:53:26 | ...; |
-| ConditionalAccess.cs:53:9:53:20 | access to field IntField | ConditionalAccess.cs:53:12:53:25 | ... - ... |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:52:9:52:10 | access to parameter ca |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:52:9:52:16 | access to property Prop |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:52:18:52:38 | ... = ... |
-| ConditionalAccess.cs:53:12:53:25 | ... - ... | ConditionalAccess.cs:53:25:53:25 | 1 |
-| ConditionalAccess.cs:53:12:53:25 | ... = ... | ConditionalAccess.cs:53:9:53:20 | access to field IntField |
+| ConditionalAccess.cs:53:12:53:25 | ... -= ... | ConditionalAccess.cs:53:25:53:25 | 1 |
 | ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
 | ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:53:9:53:20 | access to field IntField |
 | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:9:54:30 | ...; |
-| ConditionalAccess.cs:54:9:54:22 | access to property StringProp | ConditionalAccess.cs:54:12:54:29 | ... + ... |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:53:12:53:25 | ... = ... |
-| ConditionalAccess.cs:54:12:54:29 | ... + ... | ConditionalAccess.cs:54:27:54:29 | "!" |
-| ConditionalAccess.cs:54:12:54:29 | ... = ... | ConditionalAccess.cs:54:9:54:22 | access to property StringProp |
+| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:53:12:53:25 | ... -= ... |
+| ConditionalAccess.cs:54:12:54:29 | ... += ... | ConditionalAccess.cs:54:27:54:29 | "!" |
 | ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
 | ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:54:9:54:22 | access to property StringProp |
 | ConditionalAccess.cs:60:26:60:38 | exit CommaJoinWith | ConditionalAccess.cs:60:26:60:38 | exit CommaJoinWith (normal) |
@@ -5287,25 +5200,23 @@ postDominance
 | Conditions.cs:105:9:106:20 | if (...) ... | Conditions.cs:104:13:104:28 | String x = ... |
 | Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:105:9:106:20 | if (...) ... |
 | Conditions.cs:106:13:106:13 | access to local variable x | Conditions.cs:106:13:106:20 | ...; |
-| Conditions.cs:106:13:106:19 | ... + ... | Conditions.cs:106:18:106:19 | "" |
-| Conditions.cs:106:13:106:19 | ... = ... | Conditions.cs:106:13:106:19 | ... + ... |
+| Conditions.cs:106:13:106:19 | ... += ... | Conditions.cs:106:18:106:19 | "" |
 | Conditions.cs:106:18:106:19 | "" | Conditions.cs:106:13:106:13 | access to local variable x |
 | Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:105:13:105:13 | access to parameter b |
-| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:106:13:106:19 | ... = ... |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:106:13:106:19 | ... += ... |
 | Conditions.cs:107:13:107:13 | access to local variable x | Conditions.cs:107:9:109:24 | if (...) ... |
 | Conditions.cs:107:13:107:20 | access to property Length | Conditions.cs:107:13:107:13 | access to local variable x |
 | Conditions.cs:107:13:107:24 | ... > ... | Conditions.cs:107:24:107:24 | 0 |
 | Conditions.cs:107:24:107:24 | 0 | Conditions.cs:107:13:107:20 | access to property Length |
 | Conditions.cs:108:18:108:18 | access to parameter b | Conditions.cs:108:13:109:24 | if (...) ... |
 | Conditions.cs:109:17:109:17 | access to local variable x | Conditions.cs:109:17:109:24 | ...; |
-| Conditions.cs:109:17:109:23 | ... + ... | Conditions.cs:109:22:109:23 | "" |
-| Conditions.cs:109:17:109:23 | ... = ... | Conditions.cs:109:17:109:23 | ... + ... |
+| Conditions.cs:109:17:109:23 | ... += ... | Conditions.cs:109:22:109:23 | "" |
 | Conditions.cs:109:17:109:24 | ...; | Conditions.cs:108:17:108:18 | [true] !... |
 | Conditions.cs:109:22:109:23 | "" | Conditions.cs:109:17:109:17 | access to local variable x |
 | Conditions.cs:110:9:110:17 | return ...; | Conditions.cs:110:16:110:16 | access to local variable x |
 | Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:107:13:107:24 | ... > ... |
 | Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:108:17:108:18 | [false] !... |
-| Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:109:17:109:23 | ... = ... |
+| Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:109:17:109:23 | ... += ... |
 | Conditions.cs:113:10:113:11 | exit M9 | Conditions.cs:113:10:113:11 | exit M9 (normal) |
 | Conditions.cs:113:10:113:11 | exit M9 (normal) | Conditions.cs:116:25:116:39 | ... < ... |
 | Conditions.cs:114:5:124:5 | {...} | Conditions.cs:113:10:113:11 | enter M9 |
@@ -5890,7 +5801,7 @@ postDominance
 | Finally.cs:260:9:260:33 | call to method WriteLine | Finally.cs:260:27:260:32 | "Done" |
 | Finally.cs:260:9:260:34 | ...; | Finally.cs:258:13:258:46 | call to method WriteLine |
 | Finally.cs:260:27:260:32 | "Done" | Finally.cs:260:9:260:34 | ...; |
-| Finally.cs:263:10:263:12 | exit M13 (normal) | Finally.cs:272:13:272:18 | ... = ... |
+| Finally.cs:263:10:263:12 | exit M13 (normal) | Finally.cs:272:13:272:18 | ... += ... |
 | Finally.cs:264:5:274:5 | {...} | Finally.cs:263:10:263:12 | enter M13 |
 | Finally.cs:265:9:273:9 | try {...} ... | Finally.cs:264:5:274:5 | {...} |
 | Finally.cs:266:9:268:9 | {...} | Finally.cs:265:9:273:9 | try {...} ... |
@@ -5902,8 +5813,7 @@ postDominance
 | Finally.cs:271:13:271:35 | ...; | Finally.cs:270:9:273:9 | {...} |
 | Finally.cs:271:31:271:33 | "3" | Finally.cs:271:13:271:35 | ...; |
 | Finally.cs:272:13:272:13 | access to parameter i | Finally.cs:272:13:272:19 | ...; |
-| Finally.cs:272:13:272:18 | ... + ... | Finally.cs:272:18:272:18 | 3 |
-| Finally.cs:272:13:272:18 | ... = ... | Finally.cs:272:13:272:18 | ... + ... |
+| Finally.cs:272:13:272:18 | ... += ... | Finally.cs:272:18:272:18 | 3 |
 | Finally.cs:272:13:272:19 | ...; | Finally.cs:271:13:271:34 | call to method WriteLine |
 | Finally.cs:272:18:272:18 | 3 | Finally.cs:272:13:272:13 | access to parameter i |
 | Foreach.cs:4:7:4:13 | call to constructor Object | Foreach.cs:4:7:4:13 | call to method <object initializer> |
@@ -7720,14 +7630,11 @@ postDominance
 | cflow.cs:210:9:221:36 | do ... while (...); | cflow.cs:209:5:222:5 | {...} |
 | cflow.cs:211:9:221:9 | {...} | cflow.cs:210:9:221:36 | do ... while (...); |
 | cflow.cs:212:13:212:17 | access to field Field | cflow.cs:212:13:212:17 | this access |
-| cflow.cs:212:13:212:17 | access to field Field | cflow.cs:212:13:212:24 | ... + ... |
-| cflow.cs:212:13:212:17 | this access | cflow.cs:212:13:212:17 | this access |
 | cflow.cs:212:13:212:17 | this access | cflow.cs:212:13:212:25 | ...; |
-| cflow.cs:212:13:212:24 | ... + ... | cflow.cs:212:22:212:24 | "a" |
-| cflow.cs:212:13:212:24 | ... = ... | cflow.cs:212:13:212:17 | access to field Field |
+| cflow.cs:212:13:212:24 | ... += ... | cflow.cs:212:22:212:24 | "a" |
 | cflow.cs:212:13:212:25 | ...; | cflow.cs:211:9:221:9 | {...} |
 | cflow.cs:212:22:212:24 | "a" | cflow.cs:212:13:212:17 | access to field Field |
-| cflow.cs:213:13:216:13 | if (...) ... | cflow.cs:212:13:212:24 | ... = ... |
+| cflow.cs:213:13:216:13 | if (...) ... | cflow.cs:212:13:212:24 | ... += ... |
 | cflow.cs:213:17:213:21 | access to field Field | cflow.cs:213:17:213:21 | this access |
 | cflow.cs:213:17:213:21 | this access | cflow.cs:213:13:216:13 | if (...) ... |
 | cflow.cs:213:17:213:28 | access to property Length | cflow.cs:213:17:213:21 | access to field Field |
@@ -7756,14 +7663,11 @@ postDominance
 | cflow.cs:226:62:226:63 | 10 | cflow.cs:226:57:226:59 | "a" |
 | cflow.cs:227:9:237:9 | {...} | cflow.cs:226:22:226:22 | String x |
 | cflow.cs:228:13:228:17 | access to field Field | cflow.cs:228:13:228:17 | this access |
-| cflow.cs:228:13:228:17 | access to field Field | cflow.cs:228:13:228:22 | ... + ... |
-| cflow.cs:228:13:228:17 | this access | cflow.cs:228:13:228:17 | this access |
 | cflow.cs:228:13:228:17 | this access | cflow.cs:228:13:228:23 | ...; |
-| cflow.cs:228:13:228:22 | ... + ... | cflow.cs:228:22:228:22 | access to local variable x |
-| cflow.cs:228:13:228:22 | ... = ... | cflow.cs:228:13:228:17 | access to field Field |
+| cflow.cs:228:13:228:22 | ... += ... | cflow.cs:228:22:228:22 | access to local variable x |
 | cflow.cs:228:13:228:23 | ...; | cflow.cs:227:9:237:9 | {...} |
 | cflow.cs:228:22:228:22 | access to local variable x | cflow.cs:228:13:228:17 | access to field Field |
-| cflow.cs:229:13:232:13 | if (...) ... | cflow.cs:228:13:228:22 | ... = ... |
+| cflow.cs:229:13:232:13 | if (...) ... | cflow.cs:228:13:228:22 | ... += ... |
 | cflow.cs:229:17:229:21 | access to field Field | cflow.cs:229:17:229:21 | this access |
 | cflow.cs:229:17:229:21 | this access | cflow.cs:229:13:232:13 | if (...) ... |
 | cflow.cs:229:17:229:28 | access to property Length | cflow.cs:229:17:229:21 | access to field Field |
@@ -9077,7 +8981,6 @@ blockDominance
 | ConditionalAccess.cs:42:9:42:11 | enter get_Item | ConditionalAccess.cs:42:9:42:11 | enter get_Item |
 | ConditionalAccess.cs:43:9:43:11 | enter set_Item | ConditionalAccess.cs:43:9:43:11 | enter set_Item |
 | ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:46:10:46:11 | enter M9 |
-| ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) |
 | ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:48:24:48:25 | 42 |
 | ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:49:9:49:33 | ...; |
 | ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:49:26:49:32 | "Hello" |
@@ -9089,17 +8992,12 @@ blockDominance
 | ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:52:9:52:16 | access to property Prop |
 | ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:52:9:52:39 | ...; |
 | ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:52:32:52:38 | "World" |
-| ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
 | ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:53:9:53:20 | access to field IntField |
 | ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:53:9:53:26 | ...; |
 | ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:53:25:53:25 | 1 |
-| ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
 | ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:54:9:54:22 | access to property StringProp |
-| ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:54:9:54:30 | ...; |
 | ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:54:27:54:29 | "!" |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) |
 | ConditionalAccess.cs:48:24:48:25 | 42 | ConditionalAccess.cs:48:24:48:25 | 42 |
-| ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) |
 | ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:49:9:49:33 | ...; |
 | ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:49:26:49:32 | "Hello" |
 | ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:50:9:50:24 | ...; |
@@ -9110,16 +9008,12 @@ blockDominance
 | ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:52:9:52:16 | access to property Prop |
 | ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:52:9:52:39 | ...; |
 | ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:52:32:52:38 | "World" |
-| ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
 | ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:53:9:53:20 | access to field IntField |
 | ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:53:9:53:26 | ...; |
 | ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:53:25:53:25 | 1 |
-| ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
 | ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:54:9:54:22 | access to property StringProp |
-| ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:54:9:54:30 | ...; |
 | ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:54:27:54:29 | "!" |
 | ConditionalAccess.cs:49:26:49:32 | "Hello" | ConditionalAccess.cs:49:26:49:32 | "Hello" |
-| ConditionalAccess.cs:50:9:50:24 | ...; | ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) |
 | ConditionalAccess.cs:50:9:50:24 | ...; | ConditionalAccess.cs:50:9:50:24 | ...; |
 | ConditionalAccess.cs:50:9:50:24 | ...; | ConditionalAccess.cs:50:13:50:13 | 0 |
 | ConditionalAccess.cs:50:9:50:24 | ...; | ConditionalAccess.cs:51:9:51:16 | access to property Prop |
@@ -9128,71 +9022,47 @@ blockDominance
 | ConditionalAccess.cs:50:9:50:24 | ...; | ConditionalAccess.cs:52:9:52:16 | access to property Prop |
 | ConditionalAccess.cs:50:9:50:24 | ...; | ConditionalAccess.cs:52:9:52:39 | ...; |
 | ConditionalAccess.cs:50:9:50:24 | ...; | ConditionalAccess.cs:52:32:52:38 | "World" |
-| ConditionalAccess.cs:50:9:50:24 | ...; | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
 | ConditionalAccess.cs:50:9:50:24 | ...; | ConditionalAccess.cs:53:9:53:20 | access to field IntField |
 | ConditionalAccess.cs:50:9:50:24 | ...; | ConditionalAccess.cs:53:9:53:26 | ...; |
 | ConditionalAccess.cs:50:9:50:24 | ...; | ConditionalAccess.cs:53:25:53:25 | 1 |
-| ConditionalAccess.cs:50:9:50:24 | ...; | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
 | ConditionalAccess.cs:50:9:50:24 | ...; | ConditionalAccess.cs:54:9:54:22 | access to property StringProp |
-| ConditionalAccess.cs:50:9:50:24 | ...; | ConditionalAccess.cs:54:9:54:30 | ...; |
 | ConditionalAccess.cs:50:9:50:24 | ...; | ConditionalAccess.cs:54:27:54:29 | "!" |
 | ConditionalAccess.cs:50:13:50:13 | 0 | ConditionalAccess.cs:50:13:50:13 | 0 |
 | ConditionalAccess.cs:51:9:51:16 | access to property Prop | ConditionalAccess.cs:51:9:51:16 | access to property Prop |
 | ConditionalAccess.cs:51:9:51:16 | access to property Prop | ConditionalAccess.cs:51:30:51:31 | 84 |
-| ConditionalAccess.cs:51:9:51:32 | ...; | ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) |
 | ConditionalAccess.cs:51:9:51:32 | ...; | ConditionalAccess.cs:51:9:51:16 | access to property Prop |
 | ConditionalAccess.cs:51:9:51:32 | ...; | ConditionalAccess.cs:51:9:51:32 | ...; |
 | ConditionalAccess.cs:51:9:51:32 | ...; | ConditionalAccess.cs:51:30:51:31 | 84 |
 | ConditionalAccess.cs:51:9:51:32 | ...; | ConditionalAccess.cs:52:9:52:16 | access to property Prop |
 | ConditionalAccess.cs:51:9:51:32 | ...; | ConditionalAccess.cs:52:9:52:39 | ...; |
 | ConditionalAccess.cs:51:9:51:32 | ...; | ConditionalAccess.cs:52:32:52:38 | "World" |
-| ConditionalAccess.cs:51:9:51:32 | ...; | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
 | ConditionalAccess.cs:51:9:51:32 | ...; | ConditionalAccess.cs:53:9:53:20 | access to field IntField |
 | ConditionalAccess.cs:51:9:51:32 | ...; | ConditionalAccess.cs:53:9:53:26 | ...; |
 | ConditionalAccess.cs:51:9:51:32 | ...; | ConditionalAccess.cs:53:25:53:25 | 1 |
-| ConditionalAccess.cs:51:9:51:32 | ...; | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
 | ConditionalAccess.cs:51:9:51:32 | ...; | ConditionalAccess.cs:54:9:54:22 | access to property StringProp |
-| ConditionalAccess.cs:51:9:51:32 | ...; | ConditionalAccess.cs:54:9:54:30 | ...; |
 | ConditionalAccess.cs:51:9:51:32 | ...; | ConditionalAccess.cs:54:27:54:29 | "!" |
 | ConditionalAccess.cs:51:30:51:31 | 84 | ConditionalAccess.cs:51:30:51:31 | 84 |
 | ConditionalAccess.cs:52:9:52:16 | access to property Prop | ConditionalAccess.cs:52:9:52:16 | access to property Prop |
 | ConditionalAccess.cs:52:9:52:16 | access to property Prop | ConditionalAccess.cs:52:32:52:38 | "World" |
-| ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) |
 | ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:52:9:52:16 | access to property Prop |
 | ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:52:9:52:39 | ...; |
 | ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:52:32:52:38 | "World" |
-| ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
 | ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:53:9:53:20 | access to field IntField |
 | ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:53:9:53:26 | ...; |
 | ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:53:25:53:25 | 1 |
-| ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
 | ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:54:9:54:22 | access to property StringProp |
-| ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:54:9:54:30 | ...; |
 | ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:54:27:54:29 | "!" |
 | ConditionalAccess.cs:52:32:52:38 | "World" | ConditionalAccess.cs:52:32:52:38 | "World" |
-| ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
-| ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:9:53:20 | access to field IntField |
-| ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:25:53:25 | 1 |
 | ConditionalAccess.cs:53:9:53:20 | access to field IntField | ConditionalAccess.cs:53:9:53:20 | access to field IntField |
-| ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) |
-| ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:53:9:53:20 | access to field IntField |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:53:9:53:26 | ...; |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:53:25:53:25 | 1 |
-| ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:54:9:54:22 | access to property StringProp |
-| ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:54:9:54:30 | ...; |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:54:27:54:29 | "!" |
 | ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:53:25:53:25 | 1 |
-| ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
-| ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:9:54:22 | access to property StringProp |
-| ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:27:54:29 | "!" |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:54:9:54:22 | access to property StringProp |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:54:27:54:29 | "!" |
 | ConditionalAccess.cs:54:9:54:22 | access to property StringProp | ConditionalAccess.cs:54:9:54:22 | access to property StringProp |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:54:9:54:22 | access to property StringProp |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:54:9:54:30 | ...; |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:54:27:54:29 | "!" |
 | ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:54:27:54:29 | "!" |
 | ConditionalAccess.cs:60:26:60:38 | enter CommaJoinWith | ConditionalAccess.cs:60:26:60:38 | enter CommaJoinWith |
 | Conditions.cs:1:7:1:16 | enter Conditions | Conditions.cs:1:7:1:16 | enter Conditions |
@@ -13005,27 +12875,6 @@ postBlockDominance
 | ConditionalAccess.cs:42:9:42:11 | enter get_Item | ConditionalAccess.cs:42:9:42:11 | enter get_Item |
 | ConditionalAccess.cs:43:9:43:11 | enter set_Item | ConditionalAccess.cs:43:9:43:11 | enter set_Item |
 | ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:46:10:46:11 | enter M9 |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:46:10:46:11 | enter M9 |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:48:24:48:25 | 42 |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:49:9:49:33 | ...; |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:49:26:49:32 | "Hello" |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:50:9:50:24 | ...; |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:50:13:50:13 | 0 |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:51:9:51:16 | access to property Prop |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:51:9:51:32 | ...; |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:51:30:51:31 | 84 |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:52:9:52:16 | access to property Prop |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:52:9:52:39 | ...; |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:52:32:52:38 | "World" |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:53:9:53:20 | access to field IntField |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:53:9:53:26 | ...; |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:53:25:53:25 | 1 |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:54:9:54:22 | access to property StringProp |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:54:9:54:30 | ...; |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:54:27:54:29 | "!" |
 | ConditionalAccess.cs:48:24:48:25 | 42 | ConditionalAccess.cs:48:24:48:25 | 42 |
 | ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:46:10:46:11 | enter M9 |
 | ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:48:24:48:25 | 42 |
@@ -13058,7 +12907,6 @@ postBlockDominance
 | ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:51:30:51:31 | 84 |
 | ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:52:9:52:39 | ...; |
 | ConditionalAccess.cs:52:32:52:38 | "World" | ConditionalAccess.cs:52:32:52:38 | "World" |
-| ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
 | ConditionalAccess.cs:53:9:53:20 | access to field IntField | ConditionalAccess.cs:53:9:53:20 | access to field IntField |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:46:10:46:11 | enter M9 |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:48:24:48:25 | 42 |
@@ -13073,29 +12921,37 @@ postBlockDominance
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:52:9:52:39 | ...; |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:52:32:52:38 | "World" |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:53:9:53:26 | ...; |
-| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:46:10:46:11 | enter M9 |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:48:24:48:25 | 42 |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:49:9:49:33 | ...; |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:49:26:49:32 | "Hello" |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:50:9:50:24 | ...; |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:50:13:50:13 | 0 |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:51:9:51:16 | access to property Prop |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:51:9:51:32 | ...; |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:51:30:51:31 | 84 |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:52:9:52:16 | access to property Prop |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:52:9:52:39 | ...; |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:52:32:52:38 | "World" |
 | ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:53:9:53:20 | access to field IntField |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:53:9:53:26 | ...; |
 | ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:53:25:53:25 | 1 |
-| ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
 | ConditionalAccess.cs:54:9:54:22 | access to property StringProp | ConditionalAccess.cs:54:9:54:22 | access to property StringProp |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:46:10:46:11 | enter M9 |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:48:24:48:25 | 42 |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:49:9:49:33 | ...; |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:49:26:49:32 | "Hello" |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:50:9:50:24 | ...; |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:50:13:50:13 | 0 |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:51:9:51:16 | access to property Prop |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:51:9:51:32 | ...; |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:51:30:51:31 | 84 |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:52:9:52:16 | access to property Prop |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:52:9:52:39 | ...; |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:52:32:52:38 | "World" |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:53:9:53:20 | access to field IntField |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:53:9:53:26 | ...; |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:53:25:53:25 | 1 |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:54:9:54:30 | ...; |
-| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
+| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:46:10:46:11 | enter M9 |
+| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:48:24:48:25 | 42 |
+| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:49:9:49:33 | ...; |
+| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:49:26:49:32 | "Hello" |
+| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:50:9:50:24 | ...; |
+| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:50:13:50:13 | 0 |
+| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:51:9:51:16 | access to property Prop |
+| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:51:9:51:32 | ...; |
+| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:51:30:51:31 | 84 |
+| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:52:9:52:16 | access to property Prop |
+| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:52:9:52:39 | ...; |
+| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:52:32:52:38 | "World" |
+| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:53:9:53:20 | access to field IntField |
+| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:53:9:53:26 | ...; |
+| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:53:25:53:25 | 1 |
 | ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:54:9:54:22 | access to property StringProp |
 | ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:54:27:54:29 | "!" |
 | ConditionalAccess.cs:60:26:60:38 | enter CommaJoinWith | ConditionalAccess.cs:60:26:60:38 | enter CommaJoinWith |
diff --git a/csharp/ql/test/library-tests/controlflow/graph/EnclosingCallable.expected b/csharp/ql/test/library-tests/controlflow/graph/EnclosingCallable.expected
index 8f48cd46fc3..99f8c25b49e 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/EnclosingCallable.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/EnclosingCallable.expected
@@ -140,32 +140,22 @@ nodeEnclosing
 | AccessorCalls.cs:42:10:42:11 | exit M5 (normal) | AccessorCalls.cs:42:10:42:11 | M5 |
 | AccessorCalls.cs:43:5:47:5 | {...} | AccessorCalls.cs:42:10:42:11 | M5 |
 | AccessorCalls.cs:44:9:44:12 | this access | AccessorCalls.cs:42:10:42:11 | M5 |
-| AccessorCalls.cs:44:9:44:12 | this access | AccessorCalls.cs:42:10:42:11 | M5 |
 | AccessorCalls.cs:44:9:44:18 | access to field Field | AccessorCalls.cs:42:10:42:11 | M5 |
-| AccessorCalls.cs:44:9:44:18 | access to field Field | AccessorCalls.cs:42:10:42:11 | M5 |
-| AccessorCalls.cs:44:9:44:32 | ... + ... | AccessorCalls.cs:42:10:42:11 | M5 |
-| AccessorCalls.cs:44:9:44:32 | ... = ... | AccessorCalls.cs:42:10:42:11 | M5 |
+| AccessorCalls.cs:44:9:44:32 | ... += ... | AccessorCalls.cs:42:10:42:11 | M5 |
 | AccessorCalls.cs:44:9:44:33 | ...; | AccessorCalls.cs:42:10:42:11 | M5 |
 | AccessorCalls.cs:44:23:44:26 | this access | AccessorCalls.cs:42:10:42:11 | M5 |
 | AccessorCalls.cs:44:23:44:32 | access to field Field | AccessorCalls.cs:42:10:42:11 | M5 |
 | AccessorCalls.cs:45:9:45:12 | this access | AccessorCalls.cs:42:10:42:11 | M5 |
-| AccessorCalls.cs:45:9:45:12 | this access | AccessorCalls.cs:42:10:42:11 | M5 |
 | AccessorCalls.cs:45:9:45:17 | access to property Prop | AccessorCalls.cs:42:10:42:11 | M5 |
-| AccessorCalls.cs:45:9:45:17 | access to property Prop | AccessorCalls.cs:42:10:42:11 | M5 |
-| AccessorCalls.cs:45:9:45:30 | ... + ... | AccessorCalls.cs:42:10:42:11 | M5 |
-| AccessorCalls.cs:45:9:45:30 | ... = ... | AccessorCalls.cs:42:10:42:11 | M5 |
+| AccessorCalls.cs:45:9:45:30 | ... += ... | AccessorCalls.cs:42:10:42:11 | M5 |
 | AccessorCalls.cs:45:9:45:31 | ...; | AccessorCalls.cs:42:10:42:11 | M5 |
 | AccessorCalls.cs:45:22:45:25 | this access | AccessorCalls.cs:42:10:42:11 | M5 |
 | AccessorCalls.cs:45:22:45:30 | access to property Prop | AccessorCalls.cs:42:10:42:11 | M5 |
 | AccessorCalls.cs:46:9:46:12 | this access | AccessorCalls.cs:42:10:42:11 | M5 |
-| AccessorCalls.cs:46:9:46:12 | this access | AccessorCalls.cs:42:10:42:11 | M5 |
 | AccessorCalls.cs:46:9:46:15 | access to indexer | AccessorCalls.cs:42:10:42:11 | M5 |
-| AccessorCalls.cs:46:9:46:15 | access to indexer | AccessorCalls.cs:42:10:42:11 | M5 |
-| AccessorCalls.cs:46:9:46:26 | ... + ... | AccessorCalls.cs:42:10:42:11 | M5 |
-| AccessorCalls.cs:46:9:46:26 | ... = ... | AccessorCalls.cs:42:10:42:11 | M5 |
+| AccessorCalls.cs:46:9:46:26 | ... += ... | AccessorCalls.cs:42:10:42:11 | M5 |
 | AccessorCalls.cs:46:9:46:27 | ...; | AccessorCalls.cs:42:10:42:11 | M5 |
 | AccessorCalls.cs:46:14:46:14 | 0 | AccessorCalls.cs:42:10:42:11 | M5 |
-| AccessorCalls.cs:46:14:46:14 | 0 | AccessorCalls.cs:42:10:42:11 | M5 |
 | AccessorCalls.cs:46:20:46:23 | this access | AccessorCalls.cs:42:10:42:11 | M5 |
 | AccessorCalls.cs:46:20:46:26 | access to indexer | AccessorCalls.cs:42:10:42:11 | M5 |
 | AccessorCalls.cs:46:25:46:25 | 0 | AccessorCalls.cs:42:10:42:11 | M5 |
@@ -174,40 +164,27 @@ nodeEnclosing
 | AccessorCalls.cs:49:10:49:11 | exit M6 (normal) | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:50:5:54:5 | {...} | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:51:9:51:12 | this access | AccessorCalls.cs:49:10:49:11 | M6 |
-| AccessorCalls.cs:51:9:51:12 | this access | AccessorCalls.cs:49:10:49:11 | M6 |
-| AccessorCalls.cs:51:9:51:14 | access to field x | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:51:9:51:14 | access to field x | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:51:9:51:20 | access to field Field | AccessorCalls.cs:49:10:49:11 | M6 |
-| AccessorCalls.cs:51:9:51:20 | access to field Field | AccessorCalls.cs:49:10:49:11 | M6 |
-| AccessorCalls.cs:51:9:51:36 | ... + ... | AccessorCalls.cs:49:10:49:11 | M6 |
-| AccessorCalls.cs:51:9:51:36 | ... = ... | AccessorCalls.cs:49:10:49:11 | M6 |
+| AccessorCalls.cs:51:9:51:36 | ... += ... | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:51:9:51:37 | ...; | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:51:25:51:28 | this access | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:51:25:51:30 | access to field x | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:51:25:51:36 | access to field Field | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:52:9:52:12 | this access | AccessorCalls.cs:49:10:49:11 | M6 |
-| AccessorCalls.cs:52:9:52:12 | this access | AccessorCalls.cs:49:10:49:11 | M6 |
-| AccessorCalls.cs:52:9:52:14 | access to field x | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:52:9:52:14 | access to field x | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:52:9:52:19 | access to property Prop | AccessorCalls.cs:49:10:49:11 | M6 |
-| AccessorCalls.cs:52:9:52:19 | access to property Prop | AccessorCalls.cs:49:10:49:11 | M6 |
-| AccessorCalls.cs:52:9:52:34 | ... + ... | AccessorCalls.cs:49:10:49:11 | M6 |
-| AccessorCalls.cs:52:9:52:34 | ... = ... | AccessorCalls.cs:49:10:49:11 | M6 |
+| AccessorCalls.cs:52:9:52:34 | ... += ... | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:52:9:52:35 | ...; | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:52:24:52:27 | this access | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:52:24:52:29 | access to field x | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:52:24:52:34 | access to property Prop | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:53:9:53:12 | this access | AccessorCalls.cs:49:10:49:11 | M6 |
-| AccessorCalls.cs:53:9:53:12 | this access | AccessorCalls.cs:49:10:49:11 | M6 |
-| AccessorCalls.cs:53:9:53:14 | access to field x | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:53:9:53:14 | access to field x | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:53:9:53:17 | access to indexer | AccessorCalls.cs:49:10:49:11 | M6 |
-| AccessorCalls.cs:53:9:53:17 | access to indexer | AccessorCalls.cs:49:10:49:11 | M6 |
-| AccessorCalls.cs:53:9:53:30 | ... + ... | AccessorCalls.cs:49:10:49:11 | M6 |
-| AccessorCalls.cs:53:9:53:30 | ... = ... | AccessorCalls.cs:49:10:49:11 | M6 |
+| AccessorCalls.cs:53:9:53:30 | ... += ... | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:53:9:53:31 | ...; | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:53:16:53:16 | 0 | AccessorCalls.cs:49:10:49:11 | M6 |
-| AccessorCalls.cs:53:16:53:16 | 0 | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:53:22:53:25 | this access | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:53:22:53:27 | access to field x | AccessorCalls.cs:49:10:49:11 | M6 |
 | AccessorCalls.cs:53:22:53:30 | access to indexer | AccessorCalls.cs:49:10:49:11 | M6 |
@@ -286,22 +263,15 @@ nodeEnclosing
 | AccessorCalls.cs:70:9:70:21 | dynamic call to operator ++ | AccessorCalls.cs:66:10:66:11 | M9 |
 | AccessorCalls.cs:70:9:70:22 | ...; | AccessorCalls.cs:66:10:66:11 | M9 |
 | AccessorCalls.cs:71:9:71:9 | access to local variable d | AccessorCalls.cs:66:10:66:11 | M9 |
-| AccessorCalls.cs:71:9:71:9 | access to local variable d | AccessorCalls.cs:66:10:66:11 | M9 |
 | AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent | AccessorCalls.cs:66:10:66:11 | M9 |
-| AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent | AccessorCalls.cs:66:10:66:11 | M9 |
-| AccessorCalls.cs:71:9:71:25 | ... = ... | AccessorCalls.cs:66:10:66:11 | M9 |
-| AccessorCalls.cs:71:9:71:25 | dynamic call to operator + | AccessorCalls.cs:66:10:66:11 | M9 |
+| AccessorCalls.cs:71:9:71:25 | ... += ... | AccessorCalls.cs:66:10:66:11 | M9 |
 | AccessorCalls.cs:71:9:71:26 | ...; | AccessorCalls.cs:66:10:66:11 | M9 |
 | AccessorCalls.cs:71:25:71:25 | access to parameter e | AccessorCalls.cs:66:10:66:11 | M9 |
 | AccessorCalls.cs:72:9:72:9 | access to local variable d | AccessorCalls.cs:66:10:66:11 | M9 |
-| AccessorCalls.cs:72:9:72:9 | access to local variable d | AccessorCalls.cs:66:10:66:11 | M9 |
 | AccessorCalls.cs:72:9:72:12 | dynamic access to element | AccessorCalls.cs:66:10:66:11 | M9 |
-| AccessorCalls.cs:72:9:72:12 | dynamic access to element | AccessorCalls.cs:66:10:66:11 | M9 |
-| AccessorCalls.cs:72:9:72:20 | ... = ... | AccessorCalls.cs:66:10:66:11 | M9 |
-| AccessorCalls.cs:72:9:72:20 | dynamic call to operator + | AccessorCalls.cs:66:10:66:11 | M9 |
+| AccessorCalls.cs:72:9:72:20 | ... += ... | AccessorCalls.cs:66:10:66:11 | M9 |
 | AccessorCalls.cs:72:9:72:21 | ...; | AccessorCalls.cs:66:10:66:11 | M9 |
 | AccessorCalls.cs:72:11:72:11 | 0 | AccessorCalls.cs:66:10:66:11 | M9 |
-| AccessorCalls.cs:72:11:72:11 | 0 | AccessorCalls.cs:66:10:66:11 | M9 |
 | AccessorCalls.cs:72:17:72:17 | access to local variable d | AccessorCalls.cs:66:10:66:11 | M9 |
 | AccessorCalls.cs:72:17:72:20 | dynamic access to element | AccessorCalls.cs:66:10:66:11 | M9 |
 | AccessorCalls.cs:72:19:72:19 | 1 | AccessorCalls.cs:66:10:66:11 | M9 |
@@ -803,8 +773,7 @@ nodeEnclosing
 | Assignments.cs:5:13:5:17 | Int32 x = ... | Assignments.cs:3:10:3:10 | M |
 | Assignments.cs:5:17:5:17 | 0 | Assignments.cs:3:10:3:10 | M |
 | Assignments.cs:6:9:6:9 | access to local variable x | Assignments.cs:3:10:3:10 | M |
-| Assignments.cs:6:9:6:14 | ... + ... | Assignments.cs:3:10:3:10 | M |
-| Assignments.cs:6:9:6:14 | ... = ... | Assignments.cs:3:10:3:10 | M |
+| Assignments.cs:6:9:6:14 | ... += ... | Assignments.cs:3:10:3:10 | M |
 | Assignments.cs:6:9:6:15 | ...; | Assignments.cs:3:10:3:10 | M |
 | Assignments.cs:6:14:6:14 | 1 | Assignments.cs:3:10:3:10 | M |
 | Assignments.cs:8:9:8:22 | ... ...; | Assignments.cs:3:10:3:10 | M |
@@ -812,16 +781,14 @@ nodeEnclosing
 | Assignments.cs:8:21:8:21 | 0 | Assignments.cs:3:10:3:10 | M |
 | Assignments.cs:8:21:8:21 | (...) ... | Assignments.cs:3:10:3:10 | M |
 | Assignments.cs:9:9:9:9 | access to local variable d | Assignments.cs:3:10:3:10 | M |
-| Assignments.cs:9:9:9:14 | ... = ... | Assignments.cs:3:10:3:10 | M |
-| Assignments.cs:9:9:9:14 | dynamic call to operator - | Assignments.cs:3:10:3:10 | M |
+| Assignments.cs:9:9:9:14 | ... -= ... | Assignments.cs:3:10:3:10 | M |
 | Assignments.cs:9:9:9:15 | ...; | Assignments.cs:3:10:3:10 | M |
 | Assignments.cs:9:14:9:14 | 2 | Assignments.cs:3:10:3:10 | M |
 | Assignments.cs:11:9:11:34 | ... ...; | Assignments.cs:3:10:3:10 | M |
 | Assignments.cs:11:13:11:33 | Assignments a = ... | Assignments.cs:3:10:3:10 | M |
 | Assignments.cs:11:17:11:33 | object creation of type Assignments | Assignments.cs:3:10:3:10 | M |
 | Assignments.cs:12:9:12:9 | access to local variable a | Assignments.cs:3:10:3:10 | M |
-| Assignments.cs:12:9:12:17 | ... = ... | Assignments.cs:3:10:3:10 | M |
-| Assignments.cs:12:9:12:17 | call to operator + | Assignments.cs:3:10:3:10 | M |
+| Assignments.cs:12:9:12:17 | ... += ... | Assignments.cs:3:10:3:10 | M |
 | Assignments.cs:12:9:12:18 | ...; | Assignments.cs:3:10:3:10 | M |
 | Assignments.cs:12:14:12:17 | this access | Assignments.cs:3:10:3:10 | M |
 | Assignments.cs:14:9:14:13 | access to event Event | Assignments.cs:3:10:3:10 | M |
@@ -1165,20 +1132,14 @@ nodeEnclosing
 | ConditionalAccess.cs:52:18:52:38 | ... = ... | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:52:32:52:38 | "World" | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:46:10:46:11 | M9 |
-| ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:46:10:46:11 | M9 |
-| ConditionalAccess.cs:53:9:53:20 | access to field IntField | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:53:9:53:20 | access to field IntField | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:46:10:46:11 | M9 |
-| ConditionalAccess.cs:53:12:53:25 | ... - ... | ConditionalAccess.cs:46:10:46:11 | M9 |
-| ConditionalAccess.cs:53:12:53:25 | ... = ... | ConditionalAccess.cs:46:10:46:11 | M9 |
+| ConditionalAccess.cs:53:12:53:25 | ... -= ... | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:46:10:46:11 | M9 |
-| ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:46:10:46:11 | M9 |
-| ConditionalAccess.cs:54:9:54:22 | access to property StringProp | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:54:9:54:22 | access to property StringProp | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:46:10:46:11 | M9 |
-| ConditionalAccess.cs:54:12:54:29 | ... + ... | ConditionalAccess.cs:46:10:46:11 | M9 |
-| ConditionalAccess.cs:54:12:54:29 | ... = ... | ConditionalAccess.cs:46:10:46:11 | M9 |
+| ConditionalAccess.cs:54:12:54:29 | ... += ... | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:60:26:60:38 | enter CommaJoinWith | ConditionalAccess.cs:60:26:60:38 | CommaJoinWith |
 | ConditionalAccess.cs:60:26:60:38 | exit CommaJoinWith | ConditionalAccess.cs:60:26:60:38 | CommaJoinWith |
@@ -1412,8 +1373,7 @@ nodeEnclosing
 | Conditions.cs:105:9:106:20 | if (...) ... | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:106:13:106:13 | access to local variable x | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:106:13:106:19 | ... + ... | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:106:13:106:19 | ... = ... | Conditions.cs:102:12:102:13 | M8 |
+| Conditions.cs:106:13:106:19 | ... += ... | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:106:13:106:20 | ...; | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:106:18:106:19 | "" | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:102:12:102:13 | M8 |
@@ -1426,8 +1386,7 @@ nodeEnclosing
 | Conditions.cs:108:17:108:18 | [true] !... | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:108:18:108:18 | access to parameter b | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:109:17:109:17 | access to local variable x | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:109:17:109:23 | ... + ... | Conditions.cs:102:12:102:13 | M8 |
-| Conditions.cs:109:17:109:23 | ... = ... | Conditions.cs:102:12:102:13 | M8 |
+| Conditions.cs:109:17:109:23 | ... += ... | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:109:17:109:24 | ...; | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:109:22:109:23 | "" | Conditions.cs:102:12:102:13 | M8 |
 | Conditions.cs:110:9:110:17 | return ...; | Conditions.cs:102:12:102:13 | M8 |
@@ -2131,8 +2090,7 @@ nodeEnclosing
 | Finally.cs:271:13:271:35 | ...; | Finally.cs:263:10:263:12 | M13 |
 | Finally.cs:271:31:271:33 | "3" | Finally.cs:263:10:263:12 | M13 |
 | Finally.cs:272:13:272:13 | access to parameter i | Finally.cs:263:10:263:12 | M13 |
-| Finally.cs:272:13:272:18 | ... + ... | Finally.cs:263:10:263:12 | M13 |
-| Finally.cs:272:13:272:18 | ... = ... | Finally.cs:263:10:263:12 | M13 |
+| Finally.cs:272:13:272:18 | ... += ... | Finally.cs:263:10:263:12 | M13 |
 | Finally.cs:272:13:272:19 | ...; | Finally.cs:263:10:263:12 | M13 |
 | Finally.cs:272:18:272:18 | 3 | Finally.cs:263:10:263:12 | M13 |
 | Foreach.cs:4:7:4:13 | call to constructor Object | Foreach.cs:4:7:4:13 | Foreach |
@@ -4204,11 +4162,8 @@ nodeEnclosing
 | cflow.cs:210:9:221:36 | do ... while (...); | cflow.cs:208:10:208:11 | Do |
 | cflow.cs:211:9:221:9 | {...} | cflow.cs:208:10:208:11 | Do |
 | cflow.cs:212:13:212:17 | access to field Field | cflow.cs:208:10:208:11 | Do |
-| cflow.cs:212:13:212:17 | access to field Field | cflow.cs:208:10:208:11 | Do |
 | cflow.cs:212:13:212:17 | this access | cflow.cs:208:10:208:11 | Do |
-| cflow.cs:212:13:212:17 | this access | cflow.cs:208:10:208:11 | Do |
-| cflow.cs:212:13:212:24 | ... + ... | cflow.cs:208:10:208:11 | Do |
-| cflow.cs:212:13:212:24 | ... = ... | cflow.cs:208:10:208:11 | Do |
+| cflow.cs:212:13:212:24 | ... += ... | cflow.cs:208:10:208:11 | Do |
 | cflow.cs:212:13:212:25 | ...; | cflow.cs:208:10:208:11 | Do |
 | cflow.cs:212:22:212:24 | "a" | cflow.cs:208:10:208:11 | Do |
 | cflow.cs:213:13:216:13 | if (...) ... | cflow.cs:208:10:208:11 | Do |
@@ -4243,11 +4198,8 @@ nodeEnclosing
 | cflow.cs:226:62:226:63 | 10 | cflow.cs:224:10:224:16 | Foreach |
 | cflow.cs:227:9:237:9 | {...} | cflow.cs:224:10:224:16 | Foreach |
 | cflow.cs:228:13:228:17 | access to field Field | cflow.cs:224:10:224:16 | Foreach |
-| cflow.cs:228:13:228:17 | access to field Field | cflow.cs:224:10:224:16 | Foreach |
 | cflow.cs:228:13:228:17 | this access | cflow.cs:224:10:224:16 | Foreach |
-| cflow.cs:228:13:228:17 | this access | cflow.cs:224:10:224:16 | Foreach |
-| cflow.cs:228:13:228:22 | ... + ... | cflow.cs:224:10:224:16 | Foreach |
-| cflow.cs:228:13:228:22 | ... = ... | cflow.cs:224:10:224:16 | Foreach |
+| cflow.cs:228:13:228:22 | ... += ... | cflow.cs:224:10:224:16 | Foreach |
 | cflow.cs:228:13:228:23 | ...; | cflow.cs:224:10:224:16 | Foreach |
 | cflow.cs:228:22:228:22 | access to local variable x | cflow.cs:224:10:224:16 | Foreach |
 | cflow.cs:229:13:232:13 | if (...) ... | cflow.cs:224:10:224:16 | Foreach |
@@ -4666,7 +4618,6 @@ blockEnclosing
 | ConditionalAccess.cs:42:9:42:11 | enter get_Item | ConditionalAccess.cs:42:9:42:11 | get_Item |
 | ConditionalAccess.cs:43:9:43:11 | enter set_Item | ConditionalAccess.cs:43:9:43:11 | set_Item |
 | ConditionalAccess.cs:46:10:46:11 | enter M9 | ConditionalAccess.cs:46:10:46:11 | M9 |
-| ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:48:24:48:25 | 42 | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:49:9:49:33 | ...; | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:49:26:49:32 | "Hello" | ConditionalAccess.cs:46:10:46:11 | M9 |
@@ -4678,13 +4629,10 @@ blockEnclosing
 | ConditionalAccess.cs:52:9:52:16 | access to property Prop | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:52:32:52:38 | "World" | ConditionalAccess.cs:46:10:46:11 | M9 |
-| ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:53:9:53:20 | access to field IntField | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:46:10:46:11 | M9 |
-| ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:54:9:54:22 | access to property StringProp | ConditionalAccess.cs:46:10:46:11 | M9 |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:46:10:46:11 | M9 |
 | ConditionalAccess.cs:60:26:60:38 | enter CommaJoinWith | ConditionalAccess.cs:60:26:60:38 | CommaJoinWith |
 | Conditions.cs:1:7:1:16 | enter Conditions | Conditions.cs:1:7:1:16 | Conditions |
diff --git a/csharp/ql/test/library-tests/controlflow/graph/EntryElement.expected b/csharp/ql/test/library-tests/controlflow/graph/EntryElement.expected
index 410916afabd..248562dbc83 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/EntryElement.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/EntryElement.expected
@@ -109,77 +109,48 @@
 | AccessorCalls.cs:39:16:39:16 | 0 | AccessorCalls.cs:39:16:39:16 | 0 |
 | AccessorCalls.cs:43:5:47:5 | {...} | AccessorCalls.cs:43:5:47:5 | {...} |
 | AccessorCalls.cs:44:9:44:12 | this access | AccessorCalls.cs:44:9:44:12 | this access |
-| AccessorCalls.cs:44:9:44:12 | this access | AccessorCalls.cs:44:9:44:12 | this access |
 | AccessorCalls.cs:44:9:44:18 | access to field Field | AccessorCalls.cs:44:9:44:12 | this access |
-| AccessorCalls.cs:44:9:44:18 | access to field Field | AccessorCalls.cs:44:9:44:12 | this access |
-| AccessorCalls.cs:44:9:44:32 | ... + ... | AccessorCalls.cs:44:9:44:12 | this access |
 | AccessorCalls.cs:44:9:44:32 | ... += ... | AccessorCalls.cs:44:9:44:12 | this access |
-| AccessorCalls.cs:44:9:44:32 | ... = ... | AccessorCalls.cs:44:9:44:12 | this access |
 | AccessorCalls.cs:44:9:44:33 | ...; | AccessorCalls.cs:44:9:44:33 | ...; |
 | AccessorCalls.cs:44:23:44:26 | this access | AccessorCalls.cs:44:23:44:26 | this access |
 | AccessorCalls.cs:44:23:44:32 | access to field Field | AccessorCalls.cs:44:23:44:26 | this access |
 | AccessorCalls.cs:45:9:45:12 | this access | AccessorCalls.cs:45:9:45:12 | this access |
-| AccessorCalls.cs:45:9:45:12 | this access | AccessorCalls.cs:45:9:45:12 | this access |
 | AccessorCalls.cs:45:9:45:17 | access to property Prop | AccessorCalls.cs:45:9:45:12 | this access |
-| AccessorCalls.cs:45:9:45:17 | access to property Prop | AccessorCalls.cs:45:9:45:12 | this access |
-| AccessorCalls.cs:45:9:45:30 | ... + ... | AccessorCalls.cs:45:9:45:12 | this access |
 | AccessorCalls.cs:45:9:45:30 | ... += ... | AccessorCalls.cs:45:9:45:12 | this access |
-| AccessorCalls.cs:45:9:45:30 | ... = ... | AccessorCalls.cs:45:9:45:12 | this access |
 | AccessorCalls.cs:45:9:45:31 | ...; | AccessorCalls.cs:45:9:45:31 | ...; |
 | AccessorCalls.cs:45:22:45:25 | this access | AccessorCalls.cs:45:22:45:25 | this access |
 | AccessorCalls.cs:45:22:45:30 | access to property Prop | AccessorCalls.cs:45:22:45:25 | this access |
 | AccessorCalls.cs:46:9:46:12 | this access | AccessorCalls.cs:46:9:46:12 | this access |
-| AccessorCalls.cs:46:9:46:12 | this access | AccessorCalls.cs:46:9:46:12 | this access |
 | AccessorCalls.cs:46:9:46:15 | access to indexer | AccessorCalls.cs:46:9:46:12 | this access |
-| AccessorCalls.cs:46:9:46:15 | access to indexer | AccessorCalls.cs:46:9:46:12 | this access |
-| AccessorCalls.cs:46:9:46:26 | ... + ... | AccessorCalls.cs:46:9:46:12 | this access |
 | AccessorCalls.cs:46:9:46:26 | ... += ... | AccessorCalls.cs:46:9:46:12 | this access |
-| AccessorCalls.cs:46:9:46:26 | ... = ... | AccessorCalls.cs:46:9:46:12 | this access |
 | AccessorCalls.cs:46:9:46:27 | ...; | AccessorCalls.cs:46:9:46:27 | ...; |
 | AccessorCalls.cs:46:14:46:14 | 0 | AccessorCalls.cs:46:14:46:14 | 0 |
-| AccessorCalls.cs:46:14:46:14 | 0 | AccessorCalls.cs:46:14:46:14 | 0 |
 | AccessorCalls.cs:46:20:46:23 | this access | AccessorCalls.cs:46:20:46:23 | this access |
 | AccessorCalls.cs:46:20:46:26 | access to indexer | AccessorCalls.cs:46:20:46:23 | this access |
 | AccessorCalls.cs:46:25:46:25 | 0 | AccessorCalls.cs:46:25:46:25 | 0 |
 | AccessorCalls.cs:50:5:54:5 | {...} | AccessorCalls.cs:50:5:54:5 | {...} |
 | AccessorCalls.cs:51:9:51:12 | this access | AccessorCalls.cs:51:9:51:12 | this access |
-| AccessorCalls.cs:51:9:51:12 | this access | AccessorCalls.cs:51:9:51:12 | this access |
-| AccessorCalls.cs:51:9:51:14 | access to field x | AccessorCalls.cs:51:9:51:12 | this access |
 | AccessorCalls.cs:51:9:51:14 | access to field x | AccessorCalls.cs:51:9:51:12 | this access |
 | AccessorCalls.cs:51:9:51:20 | access to field Field | AccessorCalls.cs:51:9:51:12 | this access |
-| AccessorCalls.cs:51:9:51:20 | access to field Field | AccessorCalls.cs:51:9:51:12 | this access |
-| AccessorCalls.cs:51:9:51:36 | ... + ... | AccessorCalls.cs:51:9:51:12 | this access |
 | AccessorCalls.cs:51:9:51:36 | ... += ... | AccessorCalls.cs:51:9:51:12 | this access |
-| AccessorCalls.cs:51:9:51:36 | ... = ... | AccessorCalls.cs:51:9:51:12 | this access |
 | AccessorCalls.cs:51:9:51:37 | ...; | AccessorCalls.cs:51:9:51:37 | ...; |
 | AccessorCalls.cs:51:25:51:28 | this access | AccessorCalls.cs:51:25:51:28 | this access |
 | AccessorCalls.cs:51:25:51:30 | access to field x | AccessorCalls.cs:51:25:51:28 | this access |
 | AccessorCalls.cs:51:25:51:36 | access to field Field | AccessorCalls.cs:51:25:51:28 | this access |
 | AccessorCalls.cs:52:9:52:12 | this access | AccessorCalls.cs:52:9:52:12 | this access |
-| AccessorCalls.cs:52:9:52:12 | this access | AccessorCalls.cs:52:9:52:12 | this access |
-| AccessorCalls.cs:52:9:52:14 | access to field x | AccessorCalls.cs:52:9:52:12 | this access |
 | AccessorCalls.cs:52:9:52:14 | access to field x | AccessorCalls.cs:52:9:52:12 | this access |
 | AccessorCalls.cs:52:9:52:19 | access to property Prop | AccessorCalls.cs:52:9:52:12 | this access |
-| AccessorCalls.cs:52:9:52:19 | access to property Prop | AccessorCalls.cs:52:9:52:12 | this access |
-| AccessorCalls.cs:52:9:52:34 | ... + ... | AccessorCalls.cs:52:9:52:12 | this access |
 | AccessorCalls.cs:52:9:52:34 | ... += ... | AccessorCalls.cs:52:9:52:12 | this access |
-| AccessorCalls.cs:52:9:52:34 | ... = ... | AccessorCalls.cs:52:9:52:12 | this access |
 | AccessorCalls.cs:52:9:52:35 | ...; | AccessorCalls.cs:52:9:52:35 | ...; |
 | AccessorCalls.cs:52:24:52:27 | this access | AccessorCalls.cs:52:24:52:27 | this access |
 | AccessorCalls.cs:52:24:52:29 | access to field x | AccessorCalls.cs:52:24:52:27 | this access |
 | AccessorCalls.cs:52:24:52:34 | access to property Prop | AccessorCalls.cs:52:24:52:27 | this access |
 | AccessorCalls.cs:53:9:53:12 | this access | AccessorCalls.cs:53:9:53:12 | this access |
-| AccessorCalls.cs:53:9:53:12 | this access | AccessorCalls.cs:53:9:53:12 | this access |
-| AccessorCalls.cs:53:9:53:14 | access to field x | AccessorCalls.cs:53:9:53:12 | this access |
 | AccessorCalls.cs:53:9:53:14 | access to field x | AccessorCalls.cs:53:9:53:12 | this access |
 | AccessorCalls.cs:53:9:53:17 | access to indexer | AccessorCalls.cs:53:9:53:12 | this access |
-| AccessorCalls.cs:53:9:53:17 | access to indexer | AccessorCalls.cs:53:9:53:12 | this access |
-| AccessorCalls.cs:53:9:53:30 | ... + ... | AccessorCalls.cs:53:9:53:12 | this access |
 | AccessorCalls.cs:53:9:53:30 | ... += ... | AccessorCalls.cs:53:9:53:12 | this access |
-| AccessorCalls.cs:53:9:53:30 | ... = ... | AccessorCalls.cs:53:9:53:12 | this access |
 | AccessorCalls.cs:53:9:53:31 | ...; | AccessorCalls.cs:53:9:53:31 | ...; |
 | AccessorCalls.cs:53:16:53:16 | 0 | AccessorCalls.cs:53:16:53:16 | 0 |
-| AccessorCalls.cs:53:16:53:16 | 0 | AccessorCalls.cs:53:16:53:16 | 0 |
 | AccessorCalls.cs:53:22:53:25 | this access | AccessorCalls.cs:53:22:53:25 | this access |
 | AccessorCalls.cs:53:22:53:27 | access to field x | AccessorCalls.cs:53:22:53:25 | this access |
 | AccessorCalls.cs:53:22:53:30 | access to indexer | AccessorCalls.cs:53:22:53:25 | this access |
@@ -249,24 +220,15 @@
 | AccessorCalls.cs:70:9:70:21 | dynamic call to operator ++ | AccessorCalls.cs:70:9:70:9 | access to local variable d |
 | AccessorCalls.cs:70:9:70:22 | ...; | AccessorCalls.cs:70:9:70:22 | ...; |
 | AccessorCalls.cs:71:9:71:9 | access to local variable d | AccessorCalls.cs:71:9:71:9 | access to local variable d |
-| AccessorCalls.cs:71:9:71:9 | access to local variable d | AccessorCalls.cs:71:9:71:9 | access to local variable d |
-| AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent | AccessorCalls.cs:71:9:71:9 | access to local variable d |
 | AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent | AccessorCalls.cs:71:9:71:9 | access to local variable d |
 | AccessorCalls.cs:71:9:71:25 | ... += ... | AccessorCalls.cs:71:9:71:9 | access to local variable d |
-| AccessorCalls.cs:71:9:71:25 | ... = ... | AccessorCalls.cs:71:9:71:9 | access to local variable d |
-| AccessorCalls.cs:71:9:71:25 | dynamic call to operator + | AccessorCalls.cs:71:9:71:9 | access to local variable d |
 | AccessorCalls.cs:71:9:71:26 | ...; | AccessorCalls.cs:71:9:71:26 | ...; |
 | AccessorCalls.cs:71:25:71:25 | access to parameter e | AccessorCalls.cs:71:25:71:25 | access to parameter e |
 | AccessorCalls.cs:72:9:72:9 | access to local variable d | AccessorCalls.cs:72:9:72:9 | access to local variable d |
-| AccessorCalls.cs:72:9:72:9 | access to local variable d | AccessorCalls.cs:72:9:72:9 | access to local variable d |
-| AccessorCalls.cs:72:9:72:12 | dynamic access to element | AccessorCalls.cs:72:9:72:9 | access to local variable d |
 | AccessorCalls.cs:72:9:72:12 | dynamic access to element | AccessorCalls.cs:72:9:72:9 | access to local variable d |
 | AccessorCalls.cs:72:9:72:20 | ... += ... | AccessorCalls.cs:72:9:72:9 | access to local variable d |
-| AccessorCalls.cs:72:9:72:20 | ... = ... | AccessorCalls.cs:72:9:72:9 | access to local variable d |
-| AccessorCalls.cs:72:9:72:20 | dynamic call to operator + | AccessorCalls.cs:72:9:72:9 | access to local variable d |
 | AccessorCalls.cs:72:9:72:21 | ...; | AccessorCalls.cs:72:9:72:21 | ...; |
 | AccessorCalls.cs:72:11:72:11 | 0 | AccessorCalls.cs:72:11:72:11 | 0 |
-| AccessorCalls.cs:72:11:72:11 | 0 | AccessorCalls.cs:72:11:72:11 | 0 |
 | AccessorCalls.cs:72:17:72:17 | access to local variable d | AccessorCalls.cs:72:17:72:17 | access to local variable d |
 | AccessorCalls.cs:72:17:72:20 | dynamic access to element | AccessorCalls.cs:72:17:72:17 | access to local variable d |
 | AccessorCalls.cs:72:19:72:19 | 1 | AccessorCalls.cs:72:19:72:19 | 1 |
@@ -689,9 +651,7 @@
 | Assignments.cs:5:13:5:17 | Int32 x = ... | Assignments.cs:5:17:5:17 | 0 |
 | Assignments.cs:5:17:5:17 | 0 | Assignments.cs:5:17:5:17 | 0 |
 | Assignments.cs:6:9:6:9 | access to local variable x | Assignments.cs:6:9:6:9 | access to local variable x |
-| Assignments.cs:6:9:6:14 | ... + ... | Assignments.cs:6:9:6:9 | access to local variable x |
 | Assignments.cs:6:9:6:14 | ... += ... | Assignments.cs:6:9:6:9 | access to local variable x |
-| Assignments.cs:6:9:6:14 | ... = ... | Assignments.cs:6:9:6:9 | access to local variable x |
 | Assignments.cs:6:9:6:15 | ...; | Assignments.cs:6:9:6:15 | ...; |
 | Assignments.cs:6:14:6:14 | 1 | Assignments.cs:6:14:6:14 | 1 |
 | Assignments.cs:8:9:8:22 | ... ...; | Assignments.cs:8:9:8:22 | ... ...; |
@@ -700,8 +660,6 @@
 | Assignments.cs:8:21:8:21 | (...) ... | Assignments.cs:8:21:8:21 | 0 |
 | Assignments.cs:9:9:9:9 | access to local variable d | Assignments.cs:9:9:9:9 | access to local variable d |
 | Assignments.cs:9:9:9:14 | ... -= ... | Assignments.cs:9:9:9:9 | access to local variable d |
-| Assignments.cs:9:9:9:14 | ... = ... | Assignments.cs:9:9:9:9 | access to local variable d |
-| Assignments.cs:9:9:9:14 | dynamic call to operator - | Assignments.cs:9:9:9:9 | access to local variable d |
 | Assignments.cs:9:9:9:15 | ...; | Assignments.cs:9:9:9:15 | ...; |
 | Assignments.cs:9:14:9:14 | 2 | Assignments.cs:9:14:9:14 | 2 |
 | Assignments.cs:11:9:11:34 | ... ...; | Assignments.cs:11:9:11:34 | ... ...; |
@@ -709,8 +667,6 @@
 | Assignments.cs:11:17:11:33 | object creation of type Assignments | Assignments.cs:11:17:11:33 | object creation of type Assignments |
 | Assignments.cs:12:9:12:9 | access to local variable a | Assignments.cs:12:9:12:9 | access to local variable a |
 | Assignments.cs:12:9:12:17 | ... += ... | Assignments.cs:12:9:12:9 | access to local variable a |
-| Assignments.cs:12:9:12:17 | ... = ... | Assignments.cs:12:9:12:9 | access to local variable a |
-| Assignments.cs:12:9:12:17 | call to operator + | Assignments.cs:12:9:12:9 | access to local variable a |
 | Assignments.cs:12:9:12:18 | ...; | Assignments.cs:12:9:12:18 | ...; |
 | Assignments.cs:12:14:12:17 | this access | Assignments.cs:12:14:12:17 | this access |
 | Assignments.cs:14:9:14:13 | access to event Event | Assignments.cs:14:9:14:13 | this access |
@@ -966,22 +922,14 @@
 | ConditionalAccess.cs:52:18:52:38 | ... = ... | ConditionalAccess.cs:52:9:52:10 | access to parameter ca |
 | ConditionalAccess.cs:52:32:52:38 | "World" | ConditionalAccess.cs:52:32:52:38 | "World" |
 | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
-| ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
-| ConditionalAccess.cs:53:9:53:20 | access to field IntField | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
 | ConditionalAccess.cs:53:9:53:20 | access to field IntField | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:53:9:53:26 | ...; |
-| ConditionalAccess.cs:53:12:53:25 | ... - ... | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
 | ConditionalAccess.cs:53:12:53:25 | ... -= ... | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
-| ConditionalAccess.cs:53:12:53:25 | ... = ... | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |
 | ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:53:25:53:25 | 1 |
 | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
-| ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
-| ConditionalAccess.cs:54:9:54:22 | access to property StringProp | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
 | ConditionalAccess.cs:54:9:54:22 | access to property StringProp | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
 | ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:54:9:54:30 | ...; |
-| ConditionalAccess.cs:54:12:54:29 | ... + ... | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
 | ConditionalAccess.cs:54:12:54:29 | ... += ... | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
-| ConditionalAccess.cs:54:12:54:29 | ... = ... | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |
 | ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:54:27:54:29 | "!" |
 | ConditionalAccess.cs:60:70:60:71 | access to parameter s1 | ConditionalAccess.cs:60:70:60:71 | access to parameter s1 |
 | ConditionalAccess.cs:60:70:60:78 | ... + ... | ConditionalAccess.cs:60:70:60:71 | access to parameter s1 |
@@ -1180,9 +1128,7 @@
 | Conditions.cs:105:9:106:20 | if (...) ... | Conditions.cs:105:9:106:20 | if (...) ... |
 | Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:105:13:105:13 | access to parameter b |
 | Conditions.cs:106:13:106:13 | access to local variable x | Conditions.cs:106:13:106:13 | access to local variable x |
-| Conditions.cs:106:13:106:19 | ... + ... | Conditions.cs:106:13:106:13 | access to local variable x |
 | Conditions.cs:106:13:106:19 | ... += ... | Conditions.cs:106:13:106:13 | access to local variable x |
-| Conditions.cs:106:13:106:19 | ... = ... | Conditions.cs:106:13:106:13 | access to local variable x |
 | Conditions.cs:106:13:106:20 | ...; | Conditions.cs:106:13:106:20 | ...; |
 | Conditions.cs:106:18:106:19 | "" | Conditions.cs:106:18:106:19 | "" |
 | Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:107:9:109:24 | if (...) ... |
@@ -1194,9 +1140,7 @@
 | Conditions.cs:108:17:108:18 | !... | Conditions.cs:108:18:108:18 | access to parameter b |
 | Conditions.cs:108:18:108:18 | access to parameter b | Conditions.cs:108:18:108:18 | access to parameter b |
 | Conditions.cs:109:17:109:17 | access to local variable x | Conditions.cs:109:17:109:17 | access to local variable x |
-| Conditions.cs:109:17:109:23 | ... + ... | Conditions.cs:109:17:109:17 | access to local variable x |
 | Conditions.cs:109:17:109:23 | ... += ... | Conditions.cs:109:17:109:17 | access to local variable x |
-| Conditions.cs:109:17:109:23 | ... = ... | Conditions.cs:109:17:109:17 | access to local variable x |
 | Conditions.cs:109:17:109:24 | ...; | Conditions.cs:109:17:109:24 | ...; |
 | Conditions.cs:109:22:109:23 | "" | Conditions.cs:109:22:109:23 | "" |
 | Conditions.cs:110:9:110:17 | return ...; | Conditions.cs:110:16:110:16 | access to local variable x |
@@ -1776,9 +1720,7 @@
 | Finally.cs:271:13:271:35 | ...; | Finally.cs:271:13:271:35 | ...; |
 | Finally.cs:271:31:271:33 | "3" | Finally.cs:271:31:271:33 | "3" |
 | Finally.cs:272:13:272:13 | access to parameter i | Finally.cs:272:13:272:13 | access to parameter i |
-| Finally.cs:272:13:272:18 | ... + ... | Finally.cs:272:13:272:13 | access to parameter i |
 | Finally.cs:272:13:272:18 | ... += ... | Finally.cs:272:13:272:13 | access to parameter i |
-| Finally.cs:272:13:272:18 | ... = ... | Finally.cs:272:13:272:13 | access to parameter i |
 | Finally.cs:272:13:272:19 | ...; | Finally.cs:272:13:272:19 | ...; |
 | Finally.cs:272:18:272:18 | 3 | Finally.cs:272:18:272:18 | 3 |
 | Foreach.cs:4:7:4:13 | call to constructor Object | Foreach.cs:4:7:4:13 | call to constructor Object |
@@ -3417,12 +3359,8 @@
 | cflow.cs:210:9:221:36 | do ... while (...); | cflow.cs:210:9:221:36 | do ... while (...); |
 | cflow.cs:211:9:221:9 | {...} | cflow.cs:211:9:221:9 | {...} |
 | cflow.cs:212:13:212:17 | access to field Field | cflow.cs:212:13:212:17 | this access |
-| cflow.cs:212:13:212:17 | access to field Field | cflow.cs:212:13:212:17 | this access |
 | cflow.cs:212:13:212:17 | this access | cflow.cs:212:13:212:17 | this access |
-| cflow.cs:212:13:212:17 | this access | cflow.cs:212:13:212:17 | this access |
-| cflow.cs:212:13:212:24 | ... + ... | cflow.cs:212:13:212:17 | this access |
 | cflow.cs:212:13:212:24 | ... += ... | cflow.cs:212:13:212:17 | this access |
-| cflow.cs:212:13:212:24 | ... = ... | cflow.cs:212:13:212:17 | this access |
 | cflow.cs:212:13:212:25 | ...; | cflow.cs:212:13:212:25 | ...; |
 | cflow.cs:212:22:212:24 | "a" | cflow.cs:212:22:212:24 | "a" |
 | cflow.cs:213:13:216:13 | if (...) ... | cflow.cs:213:13:216:13 | if (...) ... |
@@ -3454,12 +3392,8 @@
 | cflow.cs:226:62:226:63 | 10 | cflow.cs:226:62:226:63 | 10 |
 | cflow.cs:227:9:237:9 | {...} | cflow.cs:227:9:237:9 | {...} |
 | cflow.cs:228:13:228:17 | access to field Field | cflow.cs:228:13:228:17 | this access |
-| cflow.cs:228:13:228:17 | access to field Field | cflow.cs:228:13:228:17 | this access |
 | cflow.cs:228:13:228:17 | this access | cflow.cs:228:13:228:17 | this access |
-| cflow.cs:228:13:228:17 | this access | cflow.cs:228:13:228:17 | this access |
-| cflow.cs:228:13:228:22 | ... + ... | cflow.cs:228:13:228:17 | this access |
 | cflow.cs:228:13:228:22 | ... += ... | cflow.cs:228:13:228:17 | this access |
-| cflow.cs:228:13:228:22 | ... = ... | cflow.cs:228:13:228:17 | this access |
 | cflow.cs:228:13:228:23 | ...; | cflow.cs:228:13:228:23 | ...; |
 | cflow.cs:228:22:228:22 | access to local variable x | cflow.cs:228:22:228:22 | access to local variable x |
 | cflow.cs:229:13:232:13 | if (...) ... | cflow.cs:229:13:232:13 | if (...) ... |
diff --git a/csharp/ql/test/library-tests/controlflow/graph/ExitElement.expected b/csharp/ql/test/library-tests/controlflow/graph/ExitElement.expected
index a6794112ebd..602dd8c2a52 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/ExitElement.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/ExitElement.expected
@@ -107,78 +107,49 @@
 | AccessorCalls.cs:39:9:39:19 | ...++ | AccessorCalls.cs:39:9:39:19 | ...++ | normal |
 | AccessorCalls.cs:39:9:39:20 | ...; | AccessorCalls.cs:39:9:39:19 | ...++ | normal |
 | AccessorCalls.cs:39:16:39:16 | 0 | AccessorCalls.cs:39:16:39:16 | 0 | normal |
-| AccessorCalls.cs:43:5:47:5 | {...} | AccessorCalls.cs:46:9:46:26 | ... = ... | normal |
+| AccessorCalls.cs:43:5:47:5 | {...} | AccessorCalls.cs:46:9:46:26 | ... += ... | normal |
 | AccessorCalls.cs:44:9:44:12 | this access | AccessorCalls.cs:44:9:44:12 | this access | normal |
-| AccessorCalls.cs:44:9:44:12 | this access | AccessorCalls.cs:44:9:44:12 | this access | normal |
-| AccessorCalls.cs:44:9:44:18 | access to field Field | AccessorCalls.cs:44:9:44:12 | this access | normal |
 | AccessorCalls.cs:44:9:44:18 | access to field Field | AccessorCalls.cs:44:9:44:18 | access to field Field | normal |
-| AccessorCalls.cs:44:9:44:32 | ... + ... | AccessorCalls.cs:44:9:44:32 | ... + ... | normal |
-| AccessorCalls.cs:44:9:44:32 | ... += ... | AccessorCalls.cs:44:9:44:32 | ... = ... | normal |
-| AccessorCalls.cs:44:9:44:32 | ... = ... | AccessorCalls.cs:44:9:44:32 | ... = ... | normal |
-| AccessorCalls.cs:44:9:44:33 | ...; | AccessorCalls.cs:44:9:44:32 | ... = ... | normal |
+| AccessorCalls.cs:44:9:44:32 | ... += ... | AccessorCalls.cs:44:9:44:32 | ... += ... | normal |
+| AccessorCalls.cs:44:9:44:33 | ...; | AccessorCalls.cs:44:9:44:32 | ... += ... | normal |
 | AccessorCalls.cs:44:23:44:26 | this access | AccessorCalls.cs:44:23:44:26 | this access | normal |
 | AccessorCalls.cs:44:23:44:32 | access to field Field | AccessorCalls.cs:44:23:44:32 | access to field Field | normal |
 | AccessorCalls.cs:45:9:45:12 | this access | AccessorCalls.cs:45:9:45:12 | this access | normal |
-| AccessorCalls.cs:45:9:45:12 | this access | AccessorCalls.cs:45:9:45:12 | this access | normal |
-| AccessorCalls.cs:45:9:45:17 | access to property Prop | AccessorCalls.cs:45:9:45:12 | this access | normal |
 | AccessorCalls.cs:45:9:45:17 | access to property Prop | AccessorCalls.cs:45:9:45:17 | access to property Prop | normal |
-| AccessorCalls.cs:45:9:45:30 | ... + ... | AccessorCalls.cs:45:9:45:30 | ... + ... | normal |
-| AccessorCalls.cs:45:9:45:30 | ... += ... | AccessorCalls.cs:45:9:45:30 | ... = ... | normal |
-| AccessorCalls.cs:45:9:45:30 | ... = ... | AccessorCalls.cs:45:9:45:30 | ... = ... | normal |
-| AccessorCalls.cs:45:9:45:31 | ...; | AccessorCalls.cs:45:9:45:30 | ... = ... | normal |
+| AccessorCalls.cs:45:9:45:30 | ... += ... | AccessorCalls.cs:45:9:45:30 | ... += ... | normal |
+| AccessorCalls.cs:45:9:45:31 | ...; | AccessorCalls.cs:45:9:45:30 | ... += ... | normal |
 | AccessorCalls.cs:45:22:45:25 | this access | AccessorCalls.cs:45:22:45:25 | this access | normal |
 | AccessorCalls.cs:45:22:45:30 | access to property Prop | AccessorCalls.cs:45:22:45:30 | access to property Prop | normal |
 | AccessorCalls.cs:46:9:46:12 | this access | AccessorCalls.cs:46:9:46:12 | this access | normal |
-| AccessorCalls.cs:46:9:46:12 | this access | AccessorCalls.cs:46:9:46:12 | this access | normal |
 | AccessorCalls.cs:46:9:46:15 | access to indexer | AccessorCalls.cs:46:9:46:15 | access to indexer | normal |
-| AccessorCalls.cs:46:9:46:15 | access to indexer | AccessorCalls.cs:46:14:46:14 | 0 | normal |
-| AccessorCalls.cs:46:9:46:26 | ... + ... | AccessorCalls.cs:46:9:46:26 | ... + ... | normal |
-| AccessorCalls.cs:46:9:46:26 | ... += ... | AccessorCalls.cs:46:9:46:26 | ... = ... | normal |
-| AccessorCalls.cs:46:9:46:26 | ... = ... | AccessorCalls.cs:46:9:46:26 | ... = ... | normal |
-| AccessorCalls.cs:46:9:46:27 | ...; | AccessorCalls.cs:46:9:46:26 | ... = ... | normal |
-| AccessorCalls.cs:46:14:46:14 | 0 | AccessorCalls.cs:46:14:46:14 | 0 | normal |
+| AccessorCalls.cs:46:9:46:26 | ... += ... | AccessorCalls.cs:46:9:46:26 | ... += ... | normal |
+| AccessorCalls.cs:46:9:46:27 | ...; | AccessorCalls.cs:46:9:46:26 | ... += ... | normal |
 | AccessorCalls.cs:46:14:46:14 | 0 | AccessorCalls.cs:46:14:46:14 | 0 | normal |
 | AccessorCalls.cs:46:20:46:23 | this access | AccessorCalls.cs:46:20:46:23 | this access | normal |
 | AccessorCalls.cs:46:20:46:26 | access to indexer | AccessorCalls.cs:46:20:46:26 | access to indexer | normal |
 | AccessorCalls.cs:46:25:46:25 | 0 | AccessorCalls.cs:46:25:46:25 | 0 | normal |
-| AccessorCalls.cs:50:5:54:5 | {...} | AccessorCalls.cs:53:9:53:30 | ... = ... | normal |
-| AccessorCalls.cs:51:9:51:12 | this access | AccessorCalls.cs:51:9:51:12 | this access | normal |
+| AccessorCalls.cs:50:5:54:5 | {...} | AccessorCalls.cs:53:9:53:30 | ... += ... | normal |
 | AccessorCalls.cs:51:9:51:12 | this access | AccessorCalls.cs:51:9:51:12 | this access | normal |
 | AccessorCalls.cs:51:9:51:14 | access to field x | AccessorCalls.cs:51:9:51:14 | access to field x | normal |
-| AccessorCalls.cs:51:9:51:14 | access to field x | AccessorCalls.cs:51:9:51:14 | access to field x | normal |
-| AccessorCalls.cs:51:9:51:20 | access to field Field | AccessorCalls.cs:51:9:51:14 | access to field x | normal |
 | AccessorCalls.cs:51:9:51:20 | access to field Field | AccessorCalls.cs:51:9:51:20 | access to field Field | normal |
-| AccessorCalls.cs:51:9:51:36 | ... + ... | AccessorCalls.cs:51:9:51:36 | ... + ... | normal |
-| AccessorCalls.cs:51:9:51:36 | ... += ... | AccessorCalls.cs:51:9:51:36 | ... = ... | normal |
-| AccessorCalls.cs:51:9:51:36 | ... = ... | AccessorCalls.cs:51:9:51:36 | ... = ... | normal |
-| AccessorCalls.cs:51:9:51:37 | ...; | AccessorCalls.cs:51:9:51:36 | ... = ... | normal |
+| AccessorCalls.cs:51:9:51:36 | ... += ... | AccessorCalls.cs:51:9:51:36 | ... += ... | normal |
+| AccessorCalls.cs:51:9:51:37 | ...; | AccessorCalls.cs:51:9:51:36 | ... += ... | normal |
 | AccessorCalls.cs:51:25:51:28 | this access | AccessorCalls.cs:51:25:51:28 | this access | normal |
 | AccessorCalls.cs:51:25:51:30 | access to field x | AccessorCalls.cs:51:25:51:30 | access to field x | normal |
 | AccessorCalls.cs:51:25:51:36 | access to field Field | AccessorCalls.cs:51:25:51:36 | access to field Field | normal |
 | AccessorCalls.cs:52:9:52:12 | this access | AccessorCalls.cs:52:9:52:12 | this access | normal |
-| AccessorCalls.cs:52:9:52:12 | this access | AccessorCalls.cs:52:9:52:12 | this access | normal |
 | AccessorCalls.cs:52:9:52:14 | access to field x | AccessorCalls.cs:52:9:52:14 | access to field x | normal |
-| AccessorCalls.cs:52:9:52:14 | access to field x | AccessorCalls.cs:52:9:52:14 | access to field x | normal |
-| AccessorCalls.cs:52:9:52:19 | access to property Prop | AccessorCalls.cs:52:9:52:14 | access to field x | normal |
 | AccessorCalls.cs:52:9:52:19 | access to property Prop | AccessorCalls.cs:52:9:52:19 | access to property Prop | normal |
-| AccessorCalls.cs:52:9:52:34 | ... + ... | AccessorCalls.cs:52:9:52:34 | ... + ... | normal |
-| AccessorCalls.cs:52:9:52:34 | ... += ... | AccessorCalls.cs:52:9:52:34 | ... = ... | normal |
-| AccessorCalls.cs:52:9:52:34 | ... = ... | AccessorCalls.cs:52:9:52:34 | ... = ... | normal |
-| AccessorCalls.cs:52:9:52:35 | ...; | AccessorCalls.cs:52:9:52:34 | ... = ... | normal |
+| AccessorCalls.cs:52:9:52:34 | ... += ... | AccessorCalls.cs:52:9:52:34 | ... += ... | normal |
+| AccessorCalls.cs:52:9:52:35 | ...; | AccessorCalls.cs:52:9:52:34 | ... += ... | normal |
 | AccessorCalls.cs:52:24:52:27 | this access | AccessorCalls.cs:52:24:52:27 | this access | normal |
 | AccessorCalls.cs:52:24:52:29 | access to field x | AccessorCalls.cs:52:24:52:29 | access to field x | normal |
 | AccessorCalls.cs:52:24:52:34 | access to property Prop | AccessorCalls.cs:52:24:52:34 | access to property Prop | normal |
 | AccessorCalls.cs:53:9:53:12 | this access | AccessorCalls.cs:53:9:53:12 | this access | normal |
-| AccessorCalls.cs:53:9:53:12 | this access | AccessorCalls.cs:53:9:53:12 | this access | normal |
-| AccessorCalls.cs:53:9:53:14 | access to field x | AccessorCalls.cs:53:9:53:14 | access to field x | normal |
 | AccessorCalls.cs:53:9:53:14 | access to field x | AccessorCalls.cs:53:9:53:14 | access to field x | normal |
 | AccessorCalls.cs:53:9:53:17 | access to indexer | AccessorCalls.cs:53:9:53:17 | access to indexer | normal |
-| AccessorCalls.cs:53:9:53:17 | access to indexer | AccessorCalls.cs:53:16:53:16 | 0 | normal |
-| AccessorCalls.cs:53:9:53:30 | ... + ... | AccessorCalls.cs:53:9:53:30 | ... + ... | normal |
-| AccessorCalls.cs:53:9:53:30 | ... += ... | AccessorCalls.cs:53:9:53:30 | ... = ... | normal |
-| AccessorCalls.cs:53:9:53:30 | ... = ... | AccessorCalls.cs:53:9:53:30 | ... = ... | normal |
-| AccessorCalls.cs:53:9:53:31 | ...; | AccessorCalls.cs:53:9:53:30 | ... = ... | normal |
-| AccessorCalls.cs:53:16:53:16 | 0 | AccessorCalls.cs:53:16:53:16 | 0 | normal |
+| AccessorCalls.cs:53:9:53:30 | ... += ... | AccessorCalls.cs:53:9:53:30 | ... += ... | normal |
+| AccessorCalls.cs:53:9:53:31 | ...; | AccessorCalls.cs:53:9:53:30 | ... += ... | normal |
 | AccessorCalls.cs:53:16:53:16 | 0 | AccessorCalls.cs:53:16:53:16 | 0 | normal |
 | AccessorCalls.cs:53:22:53:25 | this access | AccessorCalls.cs:53:22:53:25 | this access | normal |
 | AccessorCalls.cs:53:22:53:27 | access to field x | AccessorCalls.cs:53:22:53:27 | access to field x | normal |
@@ -249,23 +220,14 @@
 | AccessorCalls.cs:70:9:70:21 | dynamic call to operator ++ | AccessorCalls.cs:70:9:70:21 | dynamic call to operator ++ | normal |
 | AccessorCalls.cs:70:9:70:22 | ...; | AccessorCalls.cs:70:9:70:21 | dynamic call to operator ++ | normal |
 | AccessorCalls.cs:71:9:71:9 | access to local variable d | AccessorCalls.cs:71:9:71:9 | access to local variable d | normal |
-| AccessorCalls.cs:71:9:71:9 | access to local variable d | AccessorCalls.cs:71:9:71:9 | access to local variable d | normal |
-| AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent | AccessorCalls.cs:71:9:71:9 | access to local variable d | normal |
 | AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent | AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent | normal |
-| AccessorCalls.cs:71:9:71:25 | ... += ... | AccessorCalls.cs:71:9:71:25 | ... = ... | normal |
-| AccessorCalls.cs:71:9:71:25 | ... = ... | AccessorCalls.cs:71:9:71:25 | ... = ... | normal |
-| AccessorCalls.cs:71:9:71:25 | dynamic call to operator + | AccessorCalls.cs:71:9:71:25 | dynamic call to operator + | normal |
-| AccessorCalls.cs:71:9:71:26 | ...; | AccessorCalls.cs:71:9:71:25 | ... = ... | normal |
+| AccessorCalls.cs:71:9:71:25 | ... += ... | AccessorCalls.cs:71:9:71:25 | ... += ... | normal |
+| AccessorCalls.cs:71:9:71:26 | ...; | AccessorCalls.cs:71:9:71:25 | ... += ... | normal |
 | AccessorCalls.cs:71:25:71:25 | access to parameter e | AccessorCalls.cs:71:25:71:25 | access to parameter e | normal |
 | AccessorCalls.cs:72:9:72:9 | access to local variable d | AccessorCalls.cs:72:9:72:9 | access to local variable d | normal |
-| AccessorCalls.cs:72:9:72:9 | access to local variable d | AccessorCalls.cs:72:9:72:9 | access to local variable d | normal |
 | AccessorCalls.cs:72:9:72:12 | dynamic access to element | AccessorCalls.cs:72:9:72:12 | dynamic access to element | normal |
-| AccessorCalls.cs:72:9:72:12 | dynamic access to element | AccessorCalls.cs:72:11:72:11 | 0 | normal |
-| AccessorCalls.cs:72:9:72:20 | ... += ... | AccessorCalls.cs:72:9:72:20 | ... = ... | normal |
-| AccessorCalls.cs:72:9:72:20 | ... = ... | AccessorCalls.cs:72:9:72:20 | ... = ... | normal |
-| AccessorCalls.cs:72:9:72:20 | dynamic call to operator + | AccessorCalls.cs:72:9:72:20 | dynamic call to operator + | normal |
-| AccessorCalls.cs:72:9:72:21 | ...; | AccessorCalls.cs:72:9:72:20 | ... = ... | normal |
-| AccessorCalls.cs:72:11:72:11 | 0 | AccessorCalls.cs:72:11:72:11 | 0 | normal |
+| AccessorCalls.cs:72:9:72:20 | ... += ... | AccessorCalls.cs:72:9:72:20 | ... += ... | normal |
+| AccessorCalls.cs:72:9:72:21 | ...; | AccessorCalls.cs:72:9:72:20 | ... += ... | normal |
 | AccessorCalls.cs:72:11:72:11 | 0 | AccessorCalls.cs:72:11:72:11 | 0 | normal |
 | AccessorCalls.cs:72:17:72:17 | access to local variable d | AccessorCalls.cs:72:17:72:17 | access to local variable d | normal |
 | AccessorCalls.cs:72:17:72:20 | dynamic access to element | AccessorCalls.cs:72:17:72:20 | dynamic access to element | normal |
@@ -788,29 +750,23 @@
 | Assignments.cs:5:13:5:17 | Int32 x = ... | Assignments.cs:5:13:5:17 | Int32 x = ... | normal |
 | Assignments.cs:5:17:5:17 | 0 | Assignments.cs:5:17:5:17 | 0 | normal |
 | Assignments.cs:6:9:6:9 | access to local variable x | Assignments.cs:6:9:6:9 | access to local variable x | normal |
-| Assignments.cs:6:9:6:14 | ... + ... | Assignments.cs:6:9:6:14 | ... + ... | normal |
-| Assignments.cs:6:9:6:14 | ... += ... | Assignments.cs:6:9:6:14 | ... = ... | normal |
-| Assignments.cs:6:9:6:14 | ... = ... | Assignments.cs:6:9:6:14 | ... = ... | normal |
-| Assignments.cs:6:9:6:15 | ...; | Assignments.cs:6:9:6:14 | ... = ... | normal |
+| Assignments.cs:6:9:6:14 | ... += ... | Assignments.cs:6:9:6:14 | ... += ... | normal |
+| Assignments.cs:6:9:6:15 | ...; | Assignments.cs:6:9:6:14 | ... += ... | normal |
 | Assignments.cs:6:14:6:14 | 1 | Assignments.cs:6:14:6:14 | 1 | normal |
 | Assignments.cs:8:9:8:22 | ... ...; | Assignments.cs:8:17:8:21 | dynamic d = ... | normal |
 | Assignments.cs:8:17:8:21 | dynamic d = ... | Assignments.cs:8:17:8:21 | dynamic d = ... | normal |
 | Assignments.cs:8:21:8:21 | 0 | Assignments.cs:8:21:8:21 | 0 | normal |
 | Assignments.cs:8:21:8:21 | (...) ... | Assignments.cs:8:21:8:21 | (...) ... | normal |
 | Assignments.cs:9:9:9:9 | access to local variable d | Assignments.cs:9:9:9:9 | access to local variable d | normal |
-| Assignments.cs:9:9:9:14 | ... -= ... | Assignments.cs:9:9:9:14 | ... = ... | normal |
-| Assignments.cs:9:9:9:14 | ... = ... | Assignments.cs:9:9:9:14 | ... = ... | normal |
-| Assignments.cs:9:9:9:14 | dynamic call to operator - | Assignments.cs:9:9:9:14 | dynamic call to operator - | normal |
-| Assignments.cs:9:9:9:15 | ...; | Assignments.cs:9:9:9:14 | ... = ... | normal |
+| Assignments.cs:9:9:9:14 | ... -= ... | Assignments.cs:9:9:9:14 | ... -= ... | normal |
+| Assignments.cs:9:9:9:15 | ...; | Assignments.cs:9:9:9:14 | ... -= ... | normal |
 | Assignments.cs:9:14:9:14 | 2 | Assignments.cs:9:14:9:14 | 2 | normal |
 | Assignments.cs:11:9:11:34 | ... ...; | Assignments.cs:11:13:11:33 | Assignments a = ... | normal |
 | Assignments.cs:11:13:11:33 | Assignments a = ... | Assignments.cs:11:13:11:33 | Assignments a = ... | normal |
 | Assignments.cs:11:17:11:33 | object creation of type Assignments | Assignments.cs:11:17:11:33 | object creation of type Assignments | normal |
 | Assignments.cs:12:9:12:9 | access to local variable a | Assignments.cs:12:9:12:9 | access to local variable a | normal |
-| Assignments.cs:12:9:12:17 | ... += ... | Assignments.cs:12:9:12:17 | ... = ... | normal |
-| Assignments.cs:12:9:12:17 | ... = ... | Assignments.cs:12:9:12:17 | ... = ... | normal |
-| Assignments.cs:12:9:12:17 | call to operator + | Assignments.cs:12:9:12:17 | call to operator + | normal |
-| Assignments.cs:12:9:12:18 | ...; | Assignments.cs:12:9:12:17 | ... = ... | normal |
+| Assignments.cs:12:9:12:17 | ... += ... | Assignments.cs:12:9:12:17 | ... += ... | normal |
+| Assignments.cs:12:9:12:18 | ...; | Assignments.cs:12:9:12:17 | ... += ... | normal |
 | Assignments.cs:12:14:12:17 | this access | Assignments.cs:12:14:12:17 | this access | normal |
 | Assignments.cs:14:9:14:13 | access to event Event | Assignments.cs:14:9:14:13 | this access | normal |
 | Assignments.cs:14:9:14:13 | this access | Assignments.cs:14:9:14:13 | this access | normal |
@@ -1120,8 +1076,7 @@
 | ConditionalAccess.cs:42:15:42:26 | return ...; | ConditionalAccess.cs:42:15:42:26 | return ...; | return |
 | ConditionalAccess.cs:42:22:42:25 | null | ConditionalAccess.cs:42:22:42:25 | null | normal |
 | ConditionalAccess.cs:43:13:43:15 | {...} | ConditionalAccess.cs:43:13:43:15 | {...} | normal |
-| ConditionalAccess.cs:47:5:55:5 | {...} | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | null |
-| ConditionalAccess.cs:47:5:55:5 | {...} | ConditionalAccess.cs:54:12:54:29 | ... = ... | normal |
+| ConditionalAccess.cs:47:5:55:5 | {...} | ConditionalAccess.cs:54:12:54:29 | ... += ... | normal |
 | ConditionalAccess.cs:48:9:48:10 | access to parameter ca | ConditionalAccess.cs:48:9:48:10 | access to parameter ca | non-null |
 | ConditionalAccess.cs:48:9:48:10 | access to parameter ca | ConditionalAccess.cs:48:9:48:10 | access to parameter ca | null |
 | ConditionalAccess.cs:48:9:48:20 | access to field IntField | ConditionalAccess.cs:48:9:48:10 | access to parameter ca | non-null |
@@ -1181,36 +1136,18 @@
 | ConditionalAccess.cs:52:18:52:38 | ... = ... | ConditionalAccess.cs:52:18:52:38 | ... = ... | normal |
 | ConditionalAccess.cs:52:32:52:38 | "World" | ConditionalAccess.cs:52:32:52:38 | "World" | normal |
 | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | non-null |
-| ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | non-null |
 | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | null |
-| ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | null |
-| ConditionalAccess.cs:53:9:53:20 | access to field IntField | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | non-null |
-| ConditionalAccess.cs:53:9:53:20 | access to field IntField | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | null |
 | ConditionalAccess.cs:53:9:53:20 | access to field IntField | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | null |
 | ConditionalAccess.cs:53:9:53:20 | access to field IntField | ConditionalAccess.cs:53:9:53:20 | access to field IntField | normal |
-| ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | null |
-| ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:53:12:53:25 | ... = ... | normal |
-| ConditionalAccess.cs:53:12:53:25 | ... - ... | ConditionalAccess.cs:53:12:53:25 | ... - ... | normal |
-| ConditionalAccess.cs:53:12:53:25 | ... -= ... | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | null |
-| ConditionalAccess.cs:53:12:53:25 | ... -= ... | ConditionalAccess.cs:53:12:53:25 | ... = ... | normal |
-| ConditionalAccess.cs:53:12:53:25 | ... = ... | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | null |
-| ConditionalAccess.cs:53:12:53:25 | ... = ... | ConditionalAccess.cs:53:12:53:25 | ... = ... | normal |
+| ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:53:12:53:25 | ... -= ... | normal |
+| ConditionalAccess.cs:53:12:53:25 | ... -= ... | ConditionalAccess.cs:53:12:53:25 | ... -= ... | normal |
 | ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:53:25:53:25 | 1 | normal |
 | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | non-null |
-| ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | non-null |
 | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | null |
-| ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | null |
-| ConditionalAccess.cs:54:9:54:22 | access to property StringProp | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | non-null |
-| ConditionalAccess.cs:54:9:54:22 | access to property StringProp | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | null |
 | ConditionalAccess.cs:54:9:54:22 | access to property StringProp | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | null |
 | ConditionalAccess.cs:54:9:54:22 | access to property StringProp | ConditionalAccess.cs:54:9:54:22 | access to property StringProp | normal |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | null |
-| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:54:12:54:29 | ... = ... | normal |
-| ConditionalAccess.cs:54:12:54:29 | ... + ... | ConditionalAccess.cs:54:12:54:29 | ... + ... | normal |
-| ConditionalAccess.cs:54:12:54:29 | ... += ... | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | null |
-| ConditionalAccess.cs:54:12:54:29 | ... += ... | ConditionalAccess.cs:54:12:54:29 | ... = ... | normal |
-| ConditionalAccess.cs:54:12:54:29 | ... = ... | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | null |
-| ConditionalAccess.cs:54:12:54:29 | ... = ... | ConditionalAccess.cs:54:12:54:29 | ... = ... | normal |
+| ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:54:12:54:29 | ... += ... | normal |
+| ConditionalAccess.cs:54:12:54:29 | ... += ... | ConditionalAccess.cs:54:12:54:29 | ... += ... | normal |
 | ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:54:27:54:29 | "!" | normal |
 | ConditionalAccess.cs:60:70:60:71 | access to parameter s1 | ConditionalAccess.cs:60:70:60:71 | access to parameter s1 | normal |
 | ConditionalAccess.cs:60:70:60:78 | ... + ... | ConditionalAccess.cs:60:70:60:78 | ... + ... | normal |
@@ -1458,34 +1395,30 @@
 | Conditions.cs:104:17:104:17 | access to parameter b | Conditions.cs:104:17:104:17 | access to parameter b | normal |
 | Conditions.cs:104:17:104:28 | call to method ToString | Conditions.cs:104:17:104:28 | call to method ToString | normal |
 | Conditions.cs:105:9:106:20 | if (...) ... | Conditions.cs:105:13:105:13 | access to parameter b | false |
-| Conditions.cs:105:9:106:20 | if (...) ... | Conditions.cs:106:13:106:19 | ... = ... | normal |
+| Conditions.cs:105:9:106:20 | if (...) ... | Conditions.cs:106:13:106:19 | ... += ... | normal |
 | Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:105:13:105:13 | access to parameter b | false |
 | Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:105:13:105:13 | access to parameter b | true |
 | Conditions.cs:106:13:106:13 | access to local variable x | Conditions.cs:106:13:106:13 | access to local variable x | normal |
-| Conditions.cs:106:13:106:19 | ... + ... | Conditions.cs:106:13:106:19 | ... + ... | normal |
-| Conditions.cs:106:13:106:19 | ... += ... | Conditions.cs:106:13:106:19 | ... = ... | normal |
-| Conditions.cs:106:13:106:19 | ... = ... | Conditions.cs:106:13:106:19 | ... = ... | normal |
-| Conditions.cs:106:13:106:20 | ...; | Conditions.cs:106:13:106:19 | ... = ... | normal |
+| Conditions.cs:106:13:106:19 | ... += ... | Conditions.cs:106:13:106:19 | ... += ... | normal |
+| Conditions.cs:106:13:106:20 | ...; | Conditions.cs:106:13:106:19 | ... += ... | normal |
 | Conditions.cs:106:18:106:19 | "" | Conditions.cs:106:18:106:19 | "" | normal |
 | Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:107:13:107:24 | ... > ... | false |
 | Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:108:17:108:18 | !... | false |
-| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:109:17:109:23 | ... = ... | normal |
+| Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:109:17:109:23 | ... += ... | normal |
 | Conditions.cs:107:13:107:13 | access to local variable x | Conditions.cs:107:13:107:13 | access to local variable x | normal |
 | Conditions.cs:107:13:107:20 | access to property Length | Conditions.cs:107:13:107:20 | access to property Length | normal |
 | Conditions.cs:107:13:107:24 | ... > ... | Conditions.cs:107:13:107:24 | ... > ... | false |
 | Conditions.cs:107:13:107:24 | ... > ... | Conditions.cs:107:13:107:24 | ... > ... | true |
 | Conditions.cs:107:24:107:24 | 0 | Conditions.cs:107:24:107:24 | 0 | normal |
 | Conditions.cs:108:13:109:24 | if (...) ... | Conditions.cs:108:17:108:18 | !... | false |
-| Conditions.cs:108:13:109:24 | if (...) ... | Conditions.cs:109:17:109:23 | ... = ... | normal |
+| Conditions.cs:108:13:109:24 | if (...) ... | Conditions.cs:109:17:109:23 | ... += ... | normal |
 | Conditions.cs:108:17:108:18 | !... | Conditions.cs:108:17:108:18 | !... | false |
 | Conditions.cs:108:17:108:18 | !... | Conditions.cs:108:17:108:18 | !... | true |
 | Conditions.cs:108:18:108:18 | access to parameter b | Conditions.cs:108:18:108:18 | access to parameter b | false |
 | Conditions.cs:108:18:108:18 | access to parameter b | Conditions.cs:108:18:108:18 | access to parameter b | true |
 | Conditions.cs:109:17:109:17 | access to local variable x | Conditions.cs:109:17:109:17 | access to local variable x | normal |
-| Conditions.cs:109:17:109:23 | ... + ... | Conditions.cs:109:17:109:23 | ... + ... | normal |
-| Conditions.cs:109:17:109:23 | ... += ... | Conditions.cs:109:17:109:23 | ... = ... | normal |
-| Conditions.cs:109:17:109:23 | ... = ... | Conditions.cs:109:17:109:23 | ... = ... | normal |
-| Conditions.cs:109:17:109:24 | ...; | Conditions.cs:109:17:109:23 | ... = ... | normal |
+| Conditions.cs:109:17:109:23 | ... += ... | Conditions.cs:109:17:109:23 | ... += ... | normal |
+| Conditions.cs:109:17:109:24 | ...; | Conditions.cs:109:17:109:23 | ... += ... | normal |
 | Conditions.cs:109:22:109:23 | "" | Conditions.cs:109:22:109:23 | "" | normal |
 | Conditions.cs:110:9:110:17 | return ...; | Conditions.cs:110:9:110:17 | return ...; | return |
 | Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:110:16:110:16 | access to local variable x | normal |
@@ -2405,10 +2338,10 @@
 | Finally.cs:260:9:260:33 | call to method WriteLine | Finally.cs:260:9:260:33 | call to method WriteLine | normal |
 | Finally.cs:260:9:260:34 | ...; | Finally.cs:260:9:260:33 | call to method WriteLine | normal |
 | Finally.cs:260:27:260:32 | "Done" | Finally.cs:260:27:260:32 | "Done" | normal |
-| Finally.cs:264:5:274:5 | {...} | Finally.cs:272:13:272:18 | ... = ... | normal |
-| Finally.cs:264:5:274:5 | {...} | Finally.cs:272:13:272:18 | ... = ... | throw(Exception) [normal] (0) |
-| Finally.cs:265:9:273:9 | try {...} ... | Finally.cs:272:13:272:18 | ... = ... | normal |
-| Finally.cs:265:9:273:9 | try {...} ... | Finally.cs:272:13:272:18 | ... = ... | throw(Exception) [normal] (0) |
+| Finally.cs:264:5:274:5 | {...} | Finally.cs:272:13:272:18 | ... += ... | normal |
+| Finally.cs:264:5:274:5 | {...} | Finally.cs:272:13:272:18 | ... += ... | throw(Exception) [normal] (0) |
+| Finally.cs:265:9:273:9 | try {...} ... | Finally.cs:272:13:272:18 | ... += ... | normal |
+| Finally.cs:265:9:273:9 | try {...} ... | Finally.cs:272:13:272:18 | ... += ... | throw(Exception) [normal] (0) |
 | Finally.cs:266:9:268:9 | {...} | Finally.cs:267:13:267:34 | call to method WriteLine | normal |
 | Finally.cs:266:9:268:9 | {...} | Finally.cs:267:13:267:34 | call to method WriteLine | throw(Exception) |
 | Finally.cs:267:13:267:34 | call to method WriteLine | Finally.cs:267:13:267:34 | call to method WriteLine | normal |
@@ -2416,15 +2349,13 @@
 | Finally.cs:267:13:267:35 | ...; | Finally.cs:267:13:267:34 | call to method WriteLine | normal |
 | Finally.cs:267:13:267:35 | ...; | Finally.cs:267:13:267:34 | call to method WriteLine | throw(Exception) |
 | Finally.cs:267:31:267:33 | "1" | Finally.cs:267:31:267:33 | "1" | normal |
-| Finally.cs:270:9:273:9 | {...} | Finally.cs:272:13:272:18 | ... = ... | normal |
+| Finally.cs:270:9:273:9 | {...} | Finally.cs:272:13:272:18 | ... += ... | normal |
 | Finally.cs:271:13:271:34 | call to method WriteLine | Finally.cs:271:13:271:34 | call to method WriteLine | normal |
 | Finally.cs:271:13:271:35 | ...; | Finally.cs:271:13:271:34 | call to method WriteLine | normal |
 | Finally.cs:271:31:271:33 | "3" | Finally.cs:271:31:271:33 | "3" | normal |
 | Finally.cs:272:13:272:13 | access to parameter i | Finally.cs:272:13:272:13 | access to parameter i | normal |
-| Finally.cs:272:13:272:18 | ... + ... | Finally.cs:272:13:272:18 | ... + ... | normal |
-| Finally.cs:272:13:272:18 | ... += ... | Finally.cs:272:13:272:18 | ... = ... | normal |
-| Finally.cs:272:13:272:18 | ... = ... | Finally.cs:272:13:272:18 | ... = ... | normal |
-| Finally.cs:272:13:272:19 | ...; | Finally.cs:272:13:272:18 | ... = ... | normal |
+| Finally.cs:272:13:272:18 | ... += ... | Finally.cs:272:13:272:18 | ... += ... | normal |
+| Finally.cs:272:13:272:19 | ...; | Finally.cs:272:13:272:18 | ... += ... | normal |
 | Finally.cs:272:18:272:18 | 3 | Finally.cs:272:18:272:18 | 3 | normal |
 | Foreach.cs:4:7:4:13 | call to constructor Object | Foreach.cs:4:7:4:13 | call to constructor Object | normal |
 | Foreach.cs:4:7:4:13 | call to method <object initializer> | Foreach.cs:4:7:4:13 | call to method <object initializer> | normal |
@@ -4403,13 +4334,9 @@
 | cflow.cs:211:9:221:9 | {...} | cflow.cs:217:17:217:32 | ... < ... | false |
 | cflow.cs:211:9:221:9 | {...} | cflow.cs:219:17:219:22 | break; | break |
 | cflow.cs:212:13:212:17 | access to field Field | cflow.cs:212:13:212:17 | access to field Field | normal |
-| cflow.cs:212:13:212:17 | access to field Field | cflow.cs:212:13:212:17 | this access | normal |
 | cflow.cs:212:13:212:17 | this access | cflow.cs:212:13:212:17 | this access | normal |
-| cflow.cs:212:13:212:17 | this access | cflow.cs:212:13:212:17 | this access | normal |
-| cflow.cs:212:13:212:24 | ... + ... | cflow.cs:212:13:212:24 | ... + ... | normal |
-| cflow.cs:212:13:212:24 | ... += ... | cflow.cs:212:13:212:24 | ... = ... | normal |
-| cflow.cs:212:13:212:24 | ... = ... | cflow.cs:212:13:212:24 | ... = ... | normal |
-| cflow.cs:212:13:212:25 | ...; | cflow.cs:212:13:212:24 | ... = ... | normal |
+| cflow.cs:212:13:212:24 | ... += ... | cflow.cs:212:13:212:24 | ... += ... | normal |
+| cflow.cs:212:13:212:25 | ...; | cflow.cs:212:13:212:24 | ... += ... | normal |
 | cflow.cs:212:22:212:24 | "a" | cflow.cs:212:22:212:24 | "a" | normal |
 | cflow.cs:213:13:216:13 | if (...) ... | cflow.cs:213:17:213:32 | ... > ... | false |
 | cflow.cs:213:13:216:13 | if (...) ... | cflow.cs:215:17:215:25 | continue; | continue |
@@ -4449,13 +4376,9 @@
 | cflow.cs:227:9:237:9 | {...} | cflow.cs:233:17:233:32 | ... < ... | false |
 | cflow.cs:227:9:237:9 | {...} | cflow.cs:235:17:235:22 | break; | break |
 | cflow.cs:228:13:228:17 | access to field Field | cflow.cs:228:13:228:17 | access to field Field | normal |
-| cflow.cs:228:13:228:17 | access to field Field | cflow.cs:228:13:228:17 | this access | normal |
 | cflow.cs:228:13:228:17 | this access | cflow.cs:228:13:228:17 | this access | normal |
-| cflow.cs:228:13:228:17 | this access | cflow.cs:228:13:228:17 | this access | normal |
-| cflow.cs:228:13:228:22 | ... + ... | cflow.cs:228:13:228:22 | ... + ... | normal |
-| cflow.cs:228:13:228:22 | ... += ... | cflow.cs:228:13:228:22 | ... = ... | normal |
-| cflow.cs:228:13:228:22 | ... = ... | cflow.cs:228:13:228:22 | ... = ... | normal |
-| cflow.cs:228:13:228:23 | ...; | cflow.cs:228:13:228:22 | ... = ... | normal |
+| cflow.cs:228:13:228:22 | ... += ... | cflow.cs:228:13:228:22 | ... += ... | normal |
+| cflow.cs:228:13:228:23 | ...; | cflow.cs:228:13:228:22 | ... += ... | normal |
 | cflow.cs:228:22:228:22 | access to local variable x | cflow.cs:228:22:228:22 | access to local variable x | normal |
 | cflow.cs:229:13:232:13 | if (...) ... | cflow.cs:229:17:229:32 | ... > ... | false |
 | cflow.cs:229:13:232:13 | if (...) ... | cflow.cs:231:17:231:25 | continue; | continue |
diff --git a/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected b/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected
index 4ce98d5096f..544bc1bd776 100644
--- a/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected
+++ b/csharp/ql/test/library-tests/controlflow/graph/NodeGraph.expected
@@ -128,77 +128,54 @@
 | AccessorCalls.cs:42:10:42:11 | enter M5 | AccessorCalls.cs:43:5:47:5 | {...} |  |
 | AccessorCalls.cs:42:10:42:11 | exit M5 (normal) | AccessorCalls.cs:42:10:42:11 | exit M5 |  |
 | AccessorCalls.cs:43:5:47:5 | {...} | AccessorCalls.cs:44:9:44:33 | ...; |  |
-| AccessorCalls.cs:44:9:44:12 | this access | AccessorCalls.cs:44:9:44:12 | this access |  |
 | AccessorCalls.cs:44:9:44:12 | this access | AccessorCalls.cs:44:9:44:18 | access to field Field |  |
-| AccessorCalls.cs:44:9:44:18 | access to field Field | AccessorCalls.cs:44:9:44:32 | ... = ... |  |
 | AccessorCalls.cs:44:9:44:18 | access to field Field | AccessorCalls.cs:44:23:44:26 | this access |  |
-| AccessorCalls.cs:44:9:44:32 | ... + ... | AccessorCalls.cs:44:9:44:18 | access to field Field |  |
-| AccessorCalls.cs:44:9:44:32 | ... = ... | AccessorCalls.cs:45:9:45:31 | ...; |  |
+| AccessorCalls.cs:44:9:44:32 | ... += ... | AccessorCalls.cs:45:9:45:31 | ...; |  |
 | AccessorCalls.cs:44:9:44:33 | ...; | AccessorCalls.cs:44:9:44:12 | this access |  |
 | AccessorCalls.cs:44:23:44:26 | this access | AccessorCalls.cs:44:23:44:32 | access to field Field |  |
-| AccessorCalls.cs:44:23:44:32 | access to field Field | AccessorCalls.cs:44:9:44:32 | ... + ... |  |
-| AccessorCalls.cs:45:9:45:12 | this access | AccessorCalls.cs:45:9:45:12 | this access |  |
+| AccessorCalls.cs:44:23:44:32 | access to field Field | AccessorCalls.cs:44:9:44:32 | ... += ... |  |
 | AccessorCalls.cs:45:9:45:12 | this access | AccessorCalls.cs:45:9:45:17 | access to property Prop |  |
-| AccessorCalls.cs:45:9:45:17 | access to property Prop | AccessorCalls.cs:45:9:45:30 | ... = ... |  |
 | AccessorCalls.cs:45:9:45:17 | access to property Prop | AccessorCalls.cs:45:22:45:25 | this access |  |
-| AccessorCalls.cs:45:9:45:30 | ... + ... | AccessorCalls.cs:45:9:45:17 | access to property Prop |  |
-| AccessorCalls.cs:45:9:45:30 | ... = ... | AccessorCalls.cs:46:9:46:27 | ...; |  |
+| AccessorCalls.cs:45:9:45:30 | ... += ... | AccessorCalls.cs:46:9:46:27 | ...; |  |
 | AccessorCalls.cs:45:9:45:31 | ...; | AccessorCalls.cs:45:9:45:12 | this access |  |
 | AccessorCalls.cs:45:22:45:25 | this access | AccessorCalls.cs:45:22:45:30 | access to property Prop |  |
-| AccessorCalls.cs:45:22:45:30 | access to property Prop | AccessorCalls.cs:45:9:45:30 | ... + ... |  |
+| AccessorCalls.cs:45:22:45:30 | access to property Prop | AccessorCalls.cs:45:9:45:30 | ... += ... |  |
 | AccessorCalls.cs:46:9:46:12 | this access | AccessorCalls.cs:46:14:46:14 | 0 |  |
-| AccessorCalls.cs:46:9:46:12 | this access | AccessorCalls.cs:46:14:46:14 | 0 |  |
-| AccessorCalls.cs:46:9:46:15 | access to indexer | AccessorCalls.cs:46:9:46:26 | ... = ... |  |
 | AccessorCalls.cs:46:9:46:15 | access to indexer | AccessorCalls.cs:46:20:46:23 | this access |  |
-| AccessorCalls.cs:46:9:46:26 | ... + ... | AccessorCalls.cs:46:9:46:15 | access to indexer |  |
-| AccessorCalls.cs:46:9:46:26 | ... = ... | AccessorCalls.cs:42:10:42:11 | exit M5 (normal) |  |
+| AccessorCalls.cs:46:9:46:26 | ... += ... | AccessorCalls.cs:42:10:42:11 | exit M5 (normal) |  |
 | AccessorCalls.cs:46:9:46:27 | ...; | AccessorCalls.cs:46:9:46:12 | this access |  |
-| AccessorCalls.cs:46:14:46:14 | 0 | AccessorCalls.cs:46:9:46:12 | this access |  |
 | AccessorCalls.cs:46:14:46:14 | 0 | AccessorCalls.cs:46:9:46:15 | access to indexer |  |
 | AccessorCalls.cs:46:20:46:23 | this access | AccessorCalls.cs:46:25:46:25 | 0 |  |
-| AccessorCalls.cs:46:20:46:26 | access to indexer | AccessorCalls.cs:46:9:46:26 | ... + ... |  |
+| AccessorCalls.cs:46:20:46:26 | access to indexer | AccessorCalls.cs:46:9:46:26 | ... += ... |  |
 | AccessorCalls.cs:46:25:46:25 | 0 | AccessorCalls.cs:46:20:46:26 | access to indexer |  |
 | AccessorCalls.cs:49:10:49:11 | enter M6 | AccessorCalls.cs:50:5:54:5 | {...} |  |
 | AccessorCalls.cs:49:10:49:11 | exit M6 (normal) | AccessorCalls.cs:49:10:49:11 | exit M6 |  |
 | AccessorCalls.cs:50:5:54:5 | {...} | AccessorCalls.cs:51:9:51:37 | ...; |  |
 | AccessorCalls.cs:51:9:51:12 | this access | AccessorCalls.cs:51:9:51:14 | access to field x |  |
-| AccessorCalls.cs:51:9:51:12 | this access | AccessorCalls.cs:51:9:51:14 | access to field x |  |
-| AccessorCalls.cs:51:9:51:14 | access to field x | AccessorCalls.cs:51:9:51:12 | this access |  |
 | AccessorCalls.cs:51:9:51:14 | access to field x | AccessorCalls.cs:51:9:51:20 | access to field Field |  |
-| AccessorCalls.cs:51:9:51:20 | access to field Field | AccessorCalls.cs:51:9:51:36 | ... = ... |  |
 | AccessorCalls.cs:51:9:51:20 | access to field Field | AccessorCalls.cs:51:25:51:28 | this access |  |
-| AccessorCalls.cs:51:9:51:36 | ... + ... | AccessorCalls.cs:51:9:51:20 | access to field Field |  |
-| AccessorCalls.cs:51:9:51:36 | ... = ... | AccessorCalls.cs:52:9:52:35 | ...; |  |
+| AccessorCalls.cs:51:9:51:36 | ... += ... | AccessorCalls.cs:52:9:52:35 | ...; |  |
 | AccessorCalls.cs:51:9:51:37 | ...; | AccessorCalls.cs:51:9:51:12 | this access |  |
 | AccessorCalls.cs:51:25:51:28 | this access | AccessorCalls.cs:51:25:51:30 | access to field x |  |
 | AccessorCalls.cs:51:25:51:30 | access to field x | AccessorCalls.cs:51:25:51:36 | access to field Field |  |
-| AccessorCalls.cs:51:25:51:36 | access to field Field | AccessorCalls.cs:51:9:51:36 | ... + ... |  |
+| AccessorCalls.cs:51:25:51:36 | access to field Field | AccessorCalls.cs:51:9:51:36 | ... += ... |  |
 | AccessorCalls.cs:52:9:52:12 | this access | AccessorCalls.cs:52:9:52:14 | access to field x |  |
-| AccessorCalls.cs:52:9:52:12 | this access | AccessorCalls.cs:52:9:52:14 | access to field x |  |
-| AccessorCalls.cs:52:9:52:14 | access to field x | AccessorCalls.cs:52:9:52:12 | this access |  |
 | AccessorCalls.cs:52:9:52:14 | access to field x | AccessorCalls.cs:52:9:52:19 | access to property Prop |  |
-| AccessorCalls.cs:52:9:52:19 | access to property Prop | AccessorCalls.cs:52:9:52:34 | ... = ... |  |
 | AccessorCalls.cs:52:9:52:19 | access to property Prop | AccessorCalls.cs:52:24:52:27 | this access |  |
-| AccessorCalls.cs:52:9:52:34 | ... + ... | AccessorCalls.cs:52:9:52:19 | access to property Prop |  |
-| AccessorCalls.cs:52:9:52:34 | ... = ... | AccessorCalls.cs:53:9:53:31 | ...; |  |
+| AccessorCalls.cs:52:9:52:34 | ... += ... | AccessorCalls.cs:53:9:53:31 | ...; |  |
 | AccessorCalls.cs:52:9:52:35 | ...; | AccessorCalls.cs:52:9:52:12 | this access |  |
 | AccessorCalls.cs:52:24:52:27 | this access | AccessorCalls.cs:52:24:52:29 | access to field x |  |
 | AccessorCalls.cs:52:24:52:29 | access to field x | AccessorCalls.cs:52:24:52:34 | access to property Prop |  |
-| AccessorCalls.cs:52:24:52:34 | access to property Prop | AccessorCalls.cs:52:9:52:34 | ... + ... |  |
-| AccessorCalls.cs:53:9:53:12 | this access | AccessorCalls.cs:53:9:53:14 | access to field x |  |
+| AccessorCalls.cs:52:24:52:34 | access to property Prop | AccessorCalls.cs:52:9:52:34 | ... += ... |  |
 | AccessorCalls.cs:53:9:53:12 | this access | AccessorCalls.cs:53:9:53:14 | access to field x |  |
 | AccessorCalls.cs:53:9:53:14 | access to field x | AccessorCalls.cs:53:16:53:16 | 0 |  |
-| AccessorCalls.cs:53:9:53:14 | access to field x | AccessorCalls.cs:53:16:53:16 | 0 |  |
-| AccessorCalls.cs:53:9:53:17 | access to indexer | AccessorCalls.cs:53:9:53:30 | ... = ... |  |
 | AccessorCalls.cs:53:9:53:17 | access to indexer | AccessorCalls.cs:53:22:53:25 | this access |  |
-| AccessorCalls.cs:53:9:53:30 | ... + ... | AccessorCalls.cs:53:9:53:17 | access to indexer |  |
-| AccessorCalls.cs:53:9:53:30 | ... = ... | AccessorCalls.cs:49:10:49:11 | exit M6 (normal) |  |
+| AccessorCalls.cs:53:9:53:30 | ... += ... | AccessorCalls.cs:49:10:49:11 | exit M6 (normal) |  |
 | AccessorCalls.cs:53:9:53:31 | ...; | AccessorCalls.cs:53:9:53:12 | this access |  |
-| AccessorCalls.cs:53:16:53:16 | 0 | AccessorCalls.cs:53:9:53:12 | this access |  |
 | AccessorCalls.cs:53:16:53:16 | 0 | AccessorCalls.cs:53:9:53:17 | access to indexer |  |
 | AccessorCalls.cs:53:22:53:25 | this access | AccessorCalls.cs:53:22:53:27 | access to field x |  |
 | AccessorCalls.cs:53:22:53:27 | access to field x | AccessorCalls.cs:53:29:53:29 | 0 |  |
-| AccessorCalls.cs:53:22:53:30 | access to indexer | AccessorCalls.cs:53:9:53:30 | ... + ... |  |
+| AccessorCalls.cs:53:22:53:30 | access to indexer | AccessorCalls.cs:53:9:53:30 | ... += ... |  |
 | AccessorCalls.cs:53:29:53:29 | 0 | AccessorCalls.cs:53:22:53:30 | access to indexer |  |
 | AccessorCalls.cs:56:10:56:11 | enter M7 | AccessorCalls.cs:57:5:59:5 | {...} |  |
 | AccessorCalls.cs:56:10:56:11 | exit M7 (normal) | AccessorCalls.cs:56:10:56:11 | exit M7 |  |
@@ -270,25 +247,18 @@
 | AccessorCalls.cs:70:9:70:19 | dynamic access to member MaybeProp | AccessorCalls.cs:70:9:70:21 | dynamic call to operator ++ |  |
 | AccessorCalls.cs:70:9:70:21 | dynamic call to operator ++ | AccessorCalls.cs:71:9:71:26 | ...; |  |
 | AccessorCalls.cs:70:9:70:22 | ...; | AccessorCalls.cs:70:9:70:9 | access to local variable d |  |
-| AccessorCalls.cs:71:9:71:9 | access to local variable d | AccessorCalls.cs:71:9:71:9 | access to local variable d |  |
 | AccessorCalls.cs:71:9:71:9 | access to local variable d | AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent |  |
-| AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent | AccessorCalls.cs:71:9:71:25 | ... = ... |  |
 | AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent | AccessorCalls.cs:71:25:71:25 | access to parameter e |  |
-| AccessorCalls.cs:71:9:71:25 | ... = ... | AccessorCalls.cs:72:9:72:21 | ...; |  |
-| AccessorCalls.cs:71:9:71:25 | dynamic call to operator + | AccessorCalls.cs:71:9:71:20 | dynamic access to member MaybeEvent |  |
+| AccessorCalls.cs:71:9:71:25 | ... += ... | AccessorCalls.cs:72:9:72:21 | ...; |  |
 | AccessorCalls.cs:71:9:71:26 | ...; | AccessorCalls.cs:71:9:71:9 | access to local variable d |  |
-| AccessorCalls.cs:71:25:71:25 | access to parameter e | AccessorCalls.cs:71:9:71:25 | dynamic call to operator + |  |
+| AccessorCalls.cs:71:25:71:25 | access to parameter e | AccessorCalls.cs:71:9:71:25 | ... += ... |  |
 | AccessorCalls.cs:72:9:72:9 | access to local variable d | AccessorCalls.cs:72:11:72:11 | 0 |  |
-| AccessorCalls.cs:72:9:72:9 | access to local variable d | AccessorCalls.cs:72:11:72:11 | 0 |  |
-| AccessorCalls.cs:72:9:72:12 | dynamic access to element | AccessorCalls.cs:72:9:72:20 | ... = ... |  |
 | AccessorCalls.cs:72:9:72:12 | dynamic access to element | AccessorCalls.cs:72:17:72:17 | access to local variable d |  |
-| AccessorCalls.cs:72:9:72:20 | ... = ... | AccessorCalls.cs:73:9:73:84 | ...; |  |
-| AccessorCalls.cs:72:9:72:20 | dynamic call to operator + | AccessorCalls.cs:72:9:72:12 | dynamic access to element |  |
+| AccessorCalls.cs:72:9:72:20 | ... += ... | AccessorCalls.cs:73:9:73:84 | ...; |  |
 | AccessorCalls.cs:72:9:72:21 | ...; | AccessorCalls.cs:72:9:72:9 | access to local variable d |  |
-| AccessorCalls.cs:72:11:72:11 | 0 | AccessorCalls.cs:72:9:72:9 | access to local variable d |  |
 | AccessorCalls.cs:72:11:72:11 | 0 | AccessorCalls.cs:72:9:72:12 | dynamic access to element |  |
 | AccessorCalls.cs:72:17:72:17 | access to local variable d | AccessorCalls.cs:72:19:72:19 | 1 |  |
-| AccessorCalls.cs:72:17:72:20 | dynamic access to element | AccessorCalls.cs:72:9:72:20 | dynamic call to operator + |  |
+| AccessorCalls.cs:72:17:72:20 | dynamic access to element | AccessorCalls.cs:72:9:72:20 | ... += ... |  |
 | AccessorCalls.cs:72:19:72:19 | 1 | AccessorCalls.cs:72:17:72:20 | dynamic access to element |  |
 | AccessorCalls.cs:73:9:73:44 | (..., ...) | AccessorCalls.cs:73:49:73:49 | access to local variable d |  |
 | AccessorCalls.cs:73:9:73:83 | ... = ... | AccessorCalls.cs:66:10:66:11 | exit M9 (normal) |  |
@@ -819,27 +789,24 @@
 | Assignments.cs:5:13:5:17 | Int32 x = ... | Assignments.cs:6:9:6:15 | ...; |  |
 | Assignments.cs:5:17:5:17 | 0 | Assignments.cs:5:13:5:17 | Int32 x = ... |  |
 | Assignments.cs:6:9:6:9 | access to local variable x | Assignments.cs:6:14:6:14 | 1 |  |
-| Assignments.cs:6:9:6:14 | ... + ... | Assignments.cs:6:9:6:14 | ... = ... |  |
-| Assignments.cs:6:9:6:14 | ... = ... | Assignments.cs:8:9:8:22 | ... ...; |  |
+| Assignments.cs:6:9:6:14 | ... += ... | Assignments.cs:8:9:8:22 | ... ...; |  |
 | Assignments.cs:6:9:6:15 | ...; | Assignments.cs:6:9:6:9 | access to local variable x |  |
-| Assignments.cs:6:14:6:14 | 1 | Assignments.cs:6:9:6:14 | ... + ... |  |
+| Assignments.cs:6:14:6:14 | 1 | Assignments.cs:6:9:6:14 | ... += ... |  |
 | Assignments.cs:8:9:8:22 | ... ...; | Assignments.cs:8:21:8:21 | 0 |  |
 | Assignments.cs:8:17:8:21 | dynamic d = ... | Assignments.cs:9:9:9:15 | ...; |  |
 | Assignments.cs:8:21:8:21 | 0 | Assignments.cs:8:21:8:21 | (...) ... |  |
 | Assignments.cs:8:21:8:21 | (...) ... | Assignments.cs:8:17:8:21 | dynamic d = ... |  |
 | Assignments.cs:9:9:9:9 | access to local variable d | Assignments.cs:9:14:9:14 | 2 |  |
-| Assignments.cs:9:9:9:14 | ... = ... | Assignments.cs:11:9:11:34 | ... ...; |  |
-| Assignments.cs:9:9:9:14 | dynamic call to operator - | Assignments.cs:9:9:9:14 | ... = ... |  |
+| Assignments.cs:9:9:9:14 | ... -= ... | Assignments.cs:11:9:11:34 | ... ...; |  |
 | Assignments.cs:9:9:9:15 | ...; | Assignments.cs:9:9:9:9 | access to local variable d |  |
-| Assignments.cs:9:14:9:14 | 2 | Assignments.cs:9:9:9:14 | dynamic call to operator - |  |
+| Assignments.cs:9:14:9:14 | 2 | Assignments.cs:9:9:9:14 | ... -= ... |  |
 | Assignments.cs:11:9:11:34 | ... ...; | Assignments.cs:11:17:11:33 | object creation of type Assignments |  |
 | Assignments.cs:11:13:11:33 | Assignments a = ... | Assignments.cs:12:9:12:18 | ...; |  |
 | Assignments.cs:11:17:11:33 | object creation of type Assignments | Assignments.cs:11:13:11:33 | Assignments a = ... |  |
 | Assignments.cs:12:9:12:9 | access to local variable a | Assignments.cs:12:14:12:17 | this access |  |
-| Assignments.cs:12:9:12:17 | ... = ... | Assignments.cs:14:9:14:36 | ...; |  |
-| Assignments.cs:12:9:12:17 | call to operator + | Assignments.cs:12:9:12:17 | ... = ... |  |
+| Assignments.cs:12:9:12:17 | ... += ... | Assignments.cs:14:9:14:36 | ...; |  |
 | Assignments.cs:12:9:12:18 | ...; | Assignments.cs:12:9:12:9 | access to local variable a |  |
-| Assignments.cs:12:14:12:17 | this access | Assignments.cs:12:9:12:17 | call to operator + |  |
+| Assignments.cs:12:14:12:17 | this access | Assignments.cs:12:9:12:17 | ... += ... |  |
 | Assignments.cs:14:9:14:13 | access to event Event | Assignments.cs:14:9:14:35 | ... += ... |  |
 | Assignments.cs:14:9:14:13 | this access | Assignments.cs:14:18:14:35 | (...) => ... |  |
 | Assignments.cs:14:9:14:35 | ... += ... | Assignments.cs:3:10:3:10 | exit M (normal) |  |
@@ -1187,26 +1154,18 @@
 | ConditionalAccess.cs:52:9:52:39 | ...; | ConditionalAccess.cs:52:9:52:10 | access to parameter ca |  |
 | ConditionalAccess.cs:52:18:52:38 | ... = ... | ConditionalAccess.cs:53:9:53:26 | ...; |  |
 | ConditionalAccess.cs:52:32:52:38 | "World" | ConditionalAccess.cs:52:9:52:28 | access to property StringProp |  |
-| ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | non-null |
 | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:9:53:20 | access to field IntField | non-null |
 | ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:53:25:53:25 | 1 | null |
-| ConditionalAccess.cs:53:9:53:10 | access to parameter ca | ConditionalAccess.cs:54:9:54:30 | ...; | null |
-| ConditionalAccess.cs:53:9:53:20 | access to field IntField | ConditionalAccess.cs:53:12:53:25 | ... = ... |  |
 | ConditionalAccess.cs:53:9:53:20 | access to field IntField | ConditionalAccess.cs:53:25:53:25 | 1 |  |
 | ConditionalAccess.cs:53:9:53:26 | ...; | ConditionalAccess.cs:53:9:53:10 | access to parameter ca |  |
-| ConditionalAccess.cs:53:12:53:25 | ... - ... | ConditionalAccess.cs:53:9:53:20 | access to field IntField |  |
-| ConditionalAccess.cs:53:12:53:25 | ... = ... | ConditionalAccess.cs:54:9:54:30 | ...; |  |
-| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:53:12:53:25 | ... - ... |  |
-| ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) | null |
-| ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | non-null |
+| ConditionalAccess.cs:53:12:53:25 | ... -= ... | ConditionalAccess.cs:54:9:54:30 | ...; |  |
+| ConditionalAccess.cs:53:25:53:25 | 1 | ConditionalAccess.cs:53:12:53:25 | ... -= ... |  |
 | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:9:54:22 | access to property StringProp | non-null |
 | ConditionalAccess.cs:54:9:54:10 | access to parameter ca | ConditionalAccess.cs:54:27:54:29 | "!" | null |
-| ConditionalAccess.cs:54:9:54:22 | access to property StringProp | ConditionalAccess.cs:54:12:54:29 | ... = ... |  |
 | ConditionalAccess.cs:54:9:54:22 | access to property StringProp | ConditionalAccess.cs:54:27:54:29 | "!" |  |
 | ConditionalAccess.cs:54:9:54:30 | ...; | ConditionalAccess.cs:54:9:54:10 | access to parameter ca |  |
-| ConditionalAccess.cs:54:12:54:29 | ... + ... | ConditionalAccess.cs:54:9:54:22 | access to property StringProp |  |
-| ConditionalAccess.cs:54:12:54:29 | ... = ... | ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) |  |
-| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:54:12:54:29 | ... + ... |  |
+| ConditionalAccess.cs:54:12:54:29 | ... += ... | ConditionalAccess.cs:46:10:46:11 | exit M9 (normal) |  |
+| ConditionalAccess.cs:54:27:54:29 | "!" | ConditionalAccess.cs:54:12:54:29 | ... += ... |  |
 | ConditionalAccess.cs:60:26:60:38 | enter CommaJoinWith | ConditionalAccess.cs:60:70:60:71 | access to parameter s1 |  |
 | ConditionalAccess.cs:60:26:60:38 | exit CommaJoinWith (normal) | ConditionalAccess.cs:60:26:60:38 | exit CommaJoinWith |  |
 | ConditionalAccess.cs:60:70:60:71 | access to parameter s1 | ConditionalAccess.cs:60:75:60:78 | ", " |  |
@@ -1453,10 +1412,9 @@
 | Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:106:13:106:20 | ...; | true |
 | Conditions.cs:105:13:105:13 | access to parameter b | Conditions.cs:107:9:109:24 | if (...) ... | false |
 | Conditions.cs:106:13:106:13 | access to local variable x | Conditions.cs:106:18:106:19 | "" |  |
-| Conditions.cs:106:13:106:19 | ... + ... | Conditions.cs:106:13:106:19 | ... = ... |  |
-| Conditions.cs:106:13:106:19 | ... = ... | Conditions.cs:107:9:109:24 | if (...) ... |  |
+| Conditions.cs:106:13:106:19 | ... += ... | Conditions.cs:107:9:109:24 | if (...) ... |  |
 | Conditions.cs:106:13:106:20 | ...; | Conditions.cs:106:13:106:13 | access to local variable x |  |
-| Conditions.cs:106:18:106:19 | "" | Conditions.cs:106:13:106:19 | ... + ... |  |
+| Conditions.cs:106:18:106:19 | "" | Conditions.cs:106:13:106:19 | ... += ... |  |
 | Conditions.cs:107:9:109:24 | if (...) ... | Conditions.cs:107:13:107:13 | access to local variable x |  |
 | Conditions.cs:107:13:107:13 | access to local variable x | Conditions.cs:107:13:107:20 | access to property Length |  |
 | Conditions.cs:107:13:107:20 | access to property Length | Conditions.cs:107:24:107:24 | 0 |  |
@@ -1469,10 +1427,9 @@
 | Conditions.cs:108:18:108:18 | access to parameter b | Conditions.cs:108:17:108:18 | [false] !... | true |
 | Conditions.cs:108:18:108:18 | access to parameter b | Conditions.cs:108:17:108:18 | [true] !... | false |
 | Conditions.cs:109:17:109:17 | access to local variable x | Conditions.cs:109:22:109:23 | "" |  |
-| Conditions.cs:109:17:109:23 | ... + ... | Conditions.cs:109:17:109:23 | ... = ... |  |
-| Conditions.cs:109:17:109:23 | ... = ... | Conditions.cs:110:16:110:16 | access to local variable x |  |
+| Conditions.cs:109:17:109:23 | ... += ... | Conditions.cs:110:16:110:16 | access to local variable x |  |
 | Conditions.cs:109:17:109:24 | ...; | Conditions.cs:109:17:109:17 | access to local variable x |  |
-| Conditions.cs:109:22:109:23 | "" | Conditions.cs:109:17:109:23 | ... + ... |  |
+| Conditions.cs:109:22:109:23 | "" | Conditions.cs:109:17:109:23 | ... += ... |  |
 | Conditions.cs:110:9:110:17 | return ...; | Conditions.cs:102:12:102:13 | exit M8 (normal) | return |
 | Conditions.cs:110:16:110:16 | access to local variable x | Conditions.cs:110:9:110:17 | return ...; |  |
 | Conditions.cs:113:10:113:11 | enter M9 | Conditions.cs:114:5:124:5 | {...} |  |
@@ -2205,11 +2162,10 @@
 | Finally.cs:271:13:271:35 | ...; | Finally.cs:271:31:271:33 | "3" |  |
 | Finally.cs:271:31:271:33 | "3" | Finally.cs:271:13:271:34 | call to method WriteLine |  |
 | Finally.cs:272:13:272:13 | access to parameter i | Finally.cs:272:18:272:18 | 3 |  |
-| Finally.cs:272:13:272:18 | ... + ... | Finally.cs:272:13:272:18 | ... = ... |  |
-| Finally.cs:272:13:272:18 | ... = ... | Finally.cs:263:10:263:12 | exit M13 (abnormal) | exception |
-| Finally.cs:272:13:272:18 | ... = ... | Finally.cs:263:10:263:12 | exit M13 (normal) |  |
+| Finally.cs:272:13:272:18 | ... += ... | Finally.cs:263:10:263:12 | exit M13 (abnormal) | exception |
+| Finally.cs:272:13:272:18 | ... += ... | Finally.cs:263:10:263:12 | exit M13 (normal) |  |
 | Finally.cs:272:13:272:19 | ...; | Finally.cs:272:13:272:13 | access to parameter i |  |
-| Finally.cs:272:18:272:18 | 3 | Finally.cs:272:13:272:18 | ... + ... |  |
+| Finally.cs:272:18:272:18 | 3 | Finally.cs:272:13:272:18 | ... += ... |  |
 | Foreach.cs:4:7:4:13 | call to constructor Object | Foreach.cs:4:7:4:13 | {...} |  |
 | Foreach.cs:4:7:4:13 | call to method <object initializer> | Foreach.cs:4:7:4:13 | call to constructor Object |  |
 | Foreach.cs:4:7:4:13 | enter Foreach | Foreach.cs:4:7:4:13 | this access |  |
@@ -4305,14 +4261,11 @@
 | cflow.cs:209:5:222:5 | {...} | cflow.cs:210:9:221:36 | do ... while (...); |  |
 | cflow.cs:210:9:221:36 | do ... while (...); | cflow.cs:211:9:221:9 | {...} |  |
 | cflow.cs:211:9:221:9 | {...} | cflow.cs:212:13:212:25 | ...; |  |
-| cflow.cs:212:13:212:17 | access to field Field | cflow.cs:212:13:212:24 | ... = ... |  |
 | cflow.cs:212:13:212:17 | access to field Field | cflow.cs:212:22:212:24 | "a" |  |
 | cflow.cs:212:13:212:17 | this access | cflow.cs:212:13:212:17 | access to field Field |  |
-| cflow.cs:212:13:212:17 | this access | cflow.cs:212:13:212:17 | this access |  |
-| cflow.cs:212:13:212:24 | ... + ... | cflow.cs:212:13:212:17 | access to field Field |  |
-| cflow.cs:212:13:212:24 | ... = ... | cflow.cs:213:13:216:13 | if (...) ... |  |
+| cflow.cs:212:13:212:24 | ... += ... | cflow.cs:213:13:216:13 | if (...) ... |  |
 | cflow.cs:212:13:212:25 | ...; | cflow.cs:212:13:212:17 | this access |  |
-| cflow.cs:212:22:212:24 | "a" | cflow.cs:212:13:212:24 | ... + ... |  |
+| cflow.cs:212:22:212:24 | "a" | cflow.cs:212:13:212:24 | ... += ... |  |
 | cflow.cs:213:13:216:13 | if (...) ... | cflow.cs:213:17:213:21 | this access |  |
 | cflow.cs:213:17:213:21 | access to field Field | cflow.cs:213:17:213:28 | access to property Length |  |
 | cflow.cs:213:17:213:21 | this access | cflow.cs:213:17:213:21 | access to field Field |  |
@@ -4347,14 +4300,11 @@
 | cflow.cs:226:57:226:59 | "a" | cflow.cs:226:62:226:63 | 10 |  |
 | cflow.cs:226:62:226:63 | 10 | cflow.cs:226:27:226:64 | call to method Repeat<String> |  |
 | cflow.cs:227:9:237:9 | {...} | cflow.cs:228:13:228:23 | ...; |  |
-| cflow.cs:228:13:228:17 | access to field Field | cflow.cs:228:13:228:22 | ... = ... |  |
 | cflow.cs:228:13:228:17 | access to field Field | cflow.cs:228:22:228:22 | access to local variable x |  |
 | cflow.cs:228:13:228:17 | this access | cflow.cs:228:13:228:17 | access to field Field |  |
-| cflow.cs:228:13:228:17 | this access | cflow.cs:228:13:228:17 | this access |  |
-| cflow.cs:228:13:228:22 | ... + ... | cflow.cs:228:13:228:17 | access to field Field |  |
-| cflow.cs:228:13:228:22 | ... = ... | cflow.cs:229:13:232:13 | if (...) ... |  |
+| cflow.cs:228:13:228:22 | ... += ... | cflow.cs:229:13:232:13 | if (...) ... |  |
 | cflow.cs:228:13:228:23 | ...; | cflow.cs:228:13:228:17 | this access |  |
-| cflow.cs:228:22:228:22 | access to local variable x | cflow.cs:228:13:228:22 | ... + ... |  |
+| cflow.cs:228:22:228:22 | access to local variable x | cflow.cs:228:13:228:22 | ... += ... |  |
 | cflow.cs:229:13:232:13 | if (...) ... | cflow.cs:229:17:229:21 | this access |  |
 | cflow.cs:229:17:229:21 | access to field Field | cflow.cs:229:17:229:28 | access to property Length |  |
 | cflow.cs:229:17:229:21 | this access | cflow.cs:229:17:229:21 | access to field Field |  |
diff --git a/csharp/ql/test/library-tests/csharp11/PrintAst.expected b/csharp/ql/test/library-tests/csharp11/PrintAst.expected
index 391c41540ec..cf501daa763 100644
--- a/csharp/ql/test/library-tests/csharp11/PrintAst.expected
+++ b/csharp/ql/test/library-tests/csharp11/PrintAst.expected
@@ -614,7 +614,7 @@ Operators.cs:
 #   12|           1: [UnaryMinusExpr] -...
 #   12|             0: [IntLiteral] 4
 #   13|       5: [ExprStmt] ...;
-#   13|         0: [AssignUnsighedRightShiftExpr] ... >>>= ...
+#   13|         0: [AssignUnsignedRightShiftExpr] ... >>>= ...
 #   13|           0: [LocalVariableAccess] access to local variable z
 #   13|           1: [IntLiteral] 5
 #   17| [Class] MyOperatorClass
diff --git a/csharp/ql/test/library-tests/csharp11/operators.expected b/csharp/ql/test/library-tests/csharp11/operators.expected
index 2c7bda6800d..177019a3ea0 100644
--- a/csharp/ql/test/library-tests/csharp11/operators.expected
+++ b/csharp/ql/test/library-tests/csharp11/operators.expected
@@ -1,8 +1,7 @@
 binarybitwise
 | Operators.cs:7:18:7:25 | ... >>> ... | Operators.cs:7:18:7:19 | access to local variable x1 | Operators.cs:7:25:7:25 | 2 | >>> | UnsignedRightShiftExpr |
 | Operators.cs:10:18:10:25 | ... >>> ... | Operators.cs:10:18:10:19 | access to local variable y1 | Operators.cs:10:25:10:25 | 3 | >>> | UnsignedRightShiftExpr |
-| Operators.cs:13:9:13:16 | ... >>> ... | Operators.cs:13:9:13:9 | access to local variable z | Operators.cs:13:16:13:16 | 5 | >>> | UnsignedRightShiftExpr |
 assignbitwise
-| Operators.cs:13:9:13:16 | ... >>>= ... | Operators.cs:13:9:13:9 | access to local variable z | Operators.cs:13:16:13:16 | 5 | >>>= | AssignUnsighedRightShiftExpr |
+| Operators.cs:13:9:13:16 | ... >>>= ... | Operators.cs:13:9:13:9 | access to local variable z | Operators.cs:13:16:13:16 | 5 | >>>= | AssignUnsignedRightShiftExpr |
 userdefined
 | Operators.cs:19:44:19:46 | >>> | op_UnsignedRightShift | UnsignedRightShiftOperator |
diff --git a/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.expected b/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.expected
index ebe04faf725..90ef19f62fe 100644
--- a/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.expected
+++ b/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.expected
@@ -26,6 +26,7 @@
 | CSharp7.cs:31:16:31:16 | access to parameter i | CSharp7.cs:31:16:31:20 | ... > ... |
 | CSharp7.cs:31:16:31:16 | access to parameter i | CSharp7.cs:31:24:31:24 | access to parameter i |
 | CSharp7.cs:31:24:31:24 | access to parameter i | CSharp7.cs:31:16:31:59 | ... ? ... : ... |
+| CSharp7.cs:31:28:31:59 | throw ... | CSharp7.cs:31:16:31:59 | ... ? ... : ... |
 | CSharp7.cs:35:7:35:18 | this | CSharp7.cs:35:7:35:18 | this access |
 | CSharp7.cs:39:9:39:9 | access to parameter x | CSharp7.cs:39:9:39:21 | SSA def(x) |
 | CSharp7.cs:39:13:39:21 | "tainted" | CSharp7.cs:39:9:39:9 | access to parameter x |
@@ -253,6 +254,7 @@
 | CSharp7.cs:233:13:233:13 | access to local variable o | CSharp7.cs:235:13:235:42 | [input] SSA phi read(o) |
 | CSharp7.cs:233:13:233:13 | access to local variable o | CSharp7.cs:237:18:237:18 | access to local variable o |
 | CSharp7.cs:233:13:233:23 | [false] ... is ... | CSharp7.cs:233:13:233:33 | [false] ... && ... |
+| CSharp7.cs:233:13:233:23 | [false] ... is ... | CSharp7.cs:233:13:233:33 | [true] ... && ... |
 | CSharp7.cs:233:13:233:23 | [true] ... is ... | CSharp7.cs:233:13:233:33 | [false] ... && ... |
 | CSharp7.cs:233:13:233:23 | [true] ... is ... | CSharp7.cs:233:13:233:33 | [true] ... && ... |
 | CSharp7.cs:233:18:233:23 | Int32 i1 | CSharp7.cs:233:18:233:23 | SSA def(i1) |
@@ -321,6 +323,7 @@
 | CSharp7.cs:283:20:283:62 | call to method Select<KeyValuePair<Int32,String>,(Int32,String)> | CSharp7.cs:283:13:283:16 | access to local variable list |
 | CSharp7.cs:283:32:283:35 | SSA param(item) | CSharp7.cs:283:41:283:44 | access to parameter item |
 | CSharp7.cs:283:32:283:35 | item | CSharp7.cs:283:32:283:35 | SSA param(item) |
+| CSharp7.cs:283:41:283:44 | [post] access to parameter item | CSharp7.cs:283:51:283:54 | access to parameter item |
 | CSharp7.cs:283:41:283:44 | access to parameter item | CSharp7.cs:283:41:283:48 | access to property Key |
 | CSharp7.cs:283:41:283:44 | access to parameter item | CSharp7.cs:283:51:283:54 | access to parameter item |
 | CSharp7.cs:283:51:283:54 | access to parameter item | CSharp7.cs:283:51:283:60 | access to property Value |
@@ -337,6 +340,8 @@
 | CSharp7.cs:297:35:297:35 | access to local variable x | CSharp7.cs:297:40:297:44 | Int32 y |
 | CSharp7.cs:297:35:297:35 | access to local variable x | CSharp7.cs:297:49:297:49 | access to local variable x |
 | CSharp7.cs:297:35:297:44 | [false] ... is ... | CSharp7.cs:297:25:297:44 | [false] ... && ... |
+| CSharp7.cs:297:35:297:44 | [false] ... is ... | CSharp7.cs:297:25:297:44 | [true] ... && ... |
+| CSharp7.cs:297:35:297:44 | [true] ... is ... | CSharp7.cs:297:25:297:44 | [false] ... && ... |
 | CSharp7.cs:297:35:297:44 | [true] ... is ... | CSharp7.cs:297:25:297:44 | [true] ... && ... |
 | CSharp7.cs:297:40:297:44 | Int32 y | CSharp7.cs:297:40:297:44 | SSA def(y) |
 | CSharp7.cs:297:40:297:44 | SSA def(y) | CSharp7.cs:299:31:299:31 | access to local variable y |
diff --git a/csharp/ql/test/library-tests/csharp8/NullCoalescingAssignment.expected b/csharp/ql/test/library-tests/csharp8/NullCoalescingAssignment.expected
index d388d2fdb7c..1b4f30ad6e7 100644
--- a/csharp/ql/test/library-tests/csharp8/NullCoalescingAssignment.expected
+++ b/csharp/ql/test/library-tests/csharp8/NullCoalescingAssignment.expected
@@ -1,5 +1,4 @@
 nullcoalescing
-| NullCoalescingAssignment.cs:8:9:8:18 | ... ?? ... |
 | NullableRefTypes.cs:94:17:94:25 | ... ?? ... |
 assignments
-| NullCoalescingAssignment.cs:8:9:8:18 | ... ??= ... | NullCoalescingAssignment.cs:8:9:8:18 | ... = ... |
+| NullCoalescingAssignment.cs:8:9:8:18 | ... ??= ... |
diff --git a/csharp/ql/test/library-tests/csharp8/NullCoalescingAssignment.ql b/csharp/ql/test/library-tests/csharp8/NullCoalescingAssignment.ql
index a3a8ca20e92..1a452274677 100644
--- a/csharp/ql/test/library-tests/csharp8/NullCoalescingAssignment.ql
+++ b/csharp/ql/test/library-tests/csharp8/NullCoalescingAssignment.ql
@@ -2,6 +2,4 @@ import csharp
 
 query predicate nullcoalescing(NullCoalescingExpr expr) { any() }
 
-query predicate assignments(AssignCoalesceExpr expr, Expr expanded) {
-  expanded = expr.getExpandedAssignment()
-}
+query predicate assignments(AssignCoalesceExpr expr) { any() }
diff --git a/csharp/ql/test/library-tests/csharp8/NullCoalescingControlFlow.expected b/csharp/ql/test/library-tests/csharp8/NullCoalescingControlFlow.expected
index 2657c450d68..b8d360d1608 100644
--- a/csharp/ql/test/library-tests/csharp8/NullCoalescingControlFlow.expected
+++ b/csharp/ql/test/library-tests/csharp8/NullCoalescingControlFlow.expected
@@ -4,9 +4,8 @@
 | NullCoalescingAssignment.cs:7:9:7:24 | ... ...; | NullCoalescingAssignment.cs:7:20:7:23 | null | semmle.label | successor |
 | NullCoalescingAssignment.cs:7:16:7:23 | Object o = ... | NullCoalescingAssignment.cs:8:9:8:19 | ...; | semmle.label | successor |
 | NullCoalescingAssignment.cs:7:20:7:23 | null | NullCoalescingAssignment.cs:7:16:7:23 | Object o = ... | semmle.label | successor |
-| NullCoalescingAssignment.cs:8:9:8:9 | access to local variable o | NullCoalescingAssignment.cs:8:9:8:18 | ... ?? ... | semmle.label | non-null |
+| NullCoalescingAssignment.cs:8:9:8:9 | access to local variable o | NullCoalescingAssignment.cs:8:9:8:18 | ... ??= ... | semmle.label | non-null |
 | NullCoalescingAssignment.cs:8:9:8:9 | access to local variable o | NullCoalescingAssignment.cs:8:15:8:18 | this access | semmle.label | null |
-| NullCoalescingAssignment.cs:8:9:8:18 | ... = ... | NullCoalescingAssignment.cs:5:10:5:23 | exit NullCoalescing (normal) | semmle.label | successor |
-| NullCoalescingAssignment.cs:8:9:8:18 | ... ?? ... | NullCoalescingAssignment.cs:8:9:8:18 | ... = ... | semmle.label | successor |
+| NullCoalescingAssignment.cs:8:9:8:18 | ... ??= ... | NullCoalescingAssignment.cs:5:10:5:23 | exit NullCoalescing (normal) | semmle.label | successor |
 | NullCoalescingAssignment.cs:8:9:8:19 | ...; | NullCoalescingAssignment.cs:8:9:8:9 | access to local variable o | semmle.label | successor |
-| NullCoalescingAssignment.cs:8:15:8:18 | this access | NullCoalescingAssignment.cs:8:9:8:18 | ... ?? ... | semmle.label | successor |
+| NullCoalescingAssignment.cs:8:15:8:18 | this access | NullCoalescingAssignment.cs:8:9:8:18 | ... ??= ... | semmle.label | successor |
diff --git a/csharp/ql/test/library-tests/dataflow/constructors/ConstructorFlow.expected b/csharp/ql/test/library-tests/dataflow/constructors/ConstructorFlow.expected
index 678dca279ff..6e063d49ef6 100644
--- a/csharp/ql/test/library-tests/dataflow/constructors/ConstructorFlow.expected
+++ b/csharp/ql/test/library-tests/dataflow/constructors/ConstructorFlow.expected
@@ -122,6 +122,16 @@ edges
 | Constructors.cs:143:29:143:30 | access to local variable o2 : Object | Constructors.cs:143:18:143:31 | object creation of type R1 : R1 [property Obj2] : Object | provenance |  |
 | Constructors.cs:144:14:144:15 | access to local variable r1 : R1 [property Obj1] : Object | Constructors.cs:144:14:144:20 | access to property Obj1 | provenance |  |
 | Constructors.cs:145:14:145:15 | access to local variable r1 : R1 [property Obj2] : Object | Constructors.cs:145:14:145:20 | access to property Obj2 | provenance |  |
+| Constructors.cs:157:40:157:40 | o : Object | Constructors.cs:157:52:157:52 | access to parameter o : Object | provenance |  |
+| Constructors.cs:157:46:157:48 | [post] this access : CPartial [property Obj] : Object | Constructors.cs:157:24:157:31 | this [Return] : CPartial [property Obj] : Object | provenance |  |
+| Constructors.cs:157:52:157:52 | access to parameter o : Object | Constructors.cs:157:46:157:48 | [post] this access : CPartial [property Obj] : Object | provenance |  |
+| Constructors.cs:162:13:162:13 | access to local variable o : Object | Constructors.cs:163:37:163:37 | access to local variable o : Object | provenance |  |
+| Constructors.cs:162:17:162:34 | call to method Source<Object> : Object | Constructors.cs:162:13:162:13 | access to local variable o : Object | provenance |  |
+| Constructors.cs:163:13:163:20 | access to local variable cPartial : CPartial [property Obj] : Object | Constructors.cs:164:14:164:21 | access to local variable cPartial : CPartial [property Obj] : Object | provenance |  |
+| Constructors.cs:163:24:163:38 | object creation of type CPartial : CPartial [property Obj] : Object | Constructors.cs:163:13:163:20 | access to local variable cPartial : CPartial [property Obj] : Object | provenance |  |
+| Constructors.cs:163:37:163:37 | access to local variable o : Object | Constructors.cs:157:40:157:40 | o : Object | provenance |  |
+| Constructors.cs:163:37:163:37 | access to local variable o : Object | Constructors.cs:163:24:163:38 | object creation of type CPartial : CPartial [property Obj] : Object | provenance |  |
+| Constructors.cs:164:14:164:21 | access to local variable cPartial : CPartial [property Obj] : Object | Constructors.cs:164:14:164:25 | access to property Obj | provenance |  |
 nodes
 | Constructors.cs:3:18:3:26 | [post] this access : C_no_ctor [field s1] : Object | semmle.label | [post] this access : C_no_ctor [field s1] : Object |
 | Constructors.cs:5:24:5:25 | [post] this access : C_no_ctor [field s1] : Object | semmle.label | [post] this access : C_no_ctor [field s1] : Object |
@@ -255,6 +265,17 @@ nodes
 | Constructors.cs:144:14:144:20 | access to property Obj1 | semmle.label | access to property Obj1 |
 | Constructors.cs:145:14:145:15 | access to local variable r1 : R1 [property Obj2] : Object | semmle.label | access to local variable r1 : R1 [property Obj2] : Object |
 | Constructors.cs:145:14:145:20 | access to property Obj2 | semmle.label | access to property Obj2 |
+| Constructors.cs:157:24:157:31 | this [Return] : CPartial [property Obj] : Object | semmle.label | this [Return] : CPartial [property Obj] : Object |
+| Constructors.cs:157:40:157:40 | o : Object | semmle.label | o : Object |
+| Constructors.cs:157:46:157:48 | [post] this access : CPartial [property Obj] : Object | semmle.label | [post] this access : CPartial [property Obj] : Object |
+| Constructors.cs:157:52:157:52 | access to parameter o : Object | semmle.label | access to parameter o : Object |
+| Constructors.cs:162:13:162:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Constructors.cs:162:17:162:34 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Constructors.cs:163:13:163:20 | access to local variable cPartial : CPartial [property Obj] : Object | semmle.label | access to local variable cPartial : CPartial [property Obj] : Object |
+| Constructors.cs:163:24:163:38 | object creation of type CPartial : CPartial [property Obj] : Object | semmle.label | object creation of type CPartial : CPartial [property Obj] : Object |
+| Constructors.cs:163:37:163:37 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Constructors.cs:164:14:164:21 | access to local variable cPartial : CPartial [property Obj] : Object | semmle.label | access to local variable cPartial : CPartial [property Obj] : Object |
+| Constructors.cs:164:14:164:25 | access to property Obj | semmle.label | access to property Obj |
 subpaths
 | Constructors.cs:44:18:44:19 | this access : C2 [parameter o21param] : Object | Constructors.cs:46:23:46:27 | this access : C2 [parameter o21param] : Object | Constructors.cs:46:23:46:27 | [post] this access : C2 [field Obj21] : Object | Constructors.cs:44:18:44:19 | [post] this access : C2 [field Obj21] : Object |
 | Constructors.cs:64:37:64:37 | access to parameter o : Object | Constructors.cs:57:54:57:55 | o2 : Object | Constructors.cs:59:13:59:14 | access to parameter o1 : Object | Constructors.cs:64:27:64:34 | access to parameter o22param : Object |
@@ -273,6 +294,7 @@ subpaths
 | Constructors.cs:132:29:132:30 | access to local variable o2 : Object | Constructors.cs:121:38:121:40 | oc2 : Object | Constructors.cs:121:16:121:17 | this [Return] : C4 [property Obj2] : Object | Constructors.cs:132:18:132:31 | object creation of type C4 : C4 [property Obj2] : Object |
 | Constructors.cs:143:25:143:26 | access to local variable o1 : Object | Constructors.cs:137:29:137:32 | Obj1 : Object | Constructors.cs:137:19:137:20 | this [Return] : R1 [property Obj1] : Object | Constructors.cs:143:18:143:31 | object creation of type R1 : R1 [property Obj1] : Object |
 | Constructors.cs:143:29:143:30 | access to local variable o2 : Object | Constructors.cs:137:42:137:45 | Obj2 : Object | Constructors.cs:137:19:137:20 | this [Return] : R1 [property Obj2] : Object | Constructors.cs:143:18:143:31 | object creation of type R1 : R1 [property Obj2] : Object |
+| Constructors.cs:163:37:163:37 | access to local variable o : Object | Constructors.cs:157:40:157:40 | o : Object | Constructors.cs:157:24:157:31 | this [Return] : CPartial [property Obj] : Object | Constructors.cs:163:24:163:38 | object creation of type CPartial : CPartial [property Obj] : Object |
 testFailures
 #select
 | Constructors.cs:15:18:15:19 | access to field s1 | Constructors.cs:5:29:5:45 | call to method Source<Object> : Object | Constructors.cs:15:18:15:19 | access to field s1 | $@ | Constructors.cs:5:29:5:45 | call to method Source<Object> : Object | call to method Source<Object> : Object |
@@ -288,3 +310,4 @@ testFailures
 | Constructors.cs:134:14:134:20 | access to property Obj2 | Constructors.cs:131:18:131:34 | call to method Source<Object> : Object | Constructors.cs:134:14:134:20 | access to property Obj2 | $@ | Constructors.cs:131:18:131:34 | call to method Source<Object> : Object | call to method Source<Object> : Object |
 | Constructors.cs:144:14:144:20 | access to property Obj1 | Constructors.cs:141:18:141:34 | call to method Source<Object> : Object | Constructors.cs:144:14:144:20 | access to property Obj1 | $@ | Constructors.cs:141:18:141:34 | call to method Source<Object> : Object | call to method Source<Object> : Object |
 | Constructors.cs:145:14:145:20 | access to property Obj2 | Constructors.cs:142:18:142:35 | call to method Source<Object> : Object | Constructors.cs:145:14:145:20 | access to property Obj2 | $@ | Constructors.cs:142:18:142:35 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Constructors.cs:164:14:164:25 | access to property Obj | Constructors.cs:162:17:162:34 | call to method Source<Object> : Object | Constructors.cs:164:14:164:25 | access to property Obj | $@ | Constructors.cs:162:17:162:34 | call to method Source<Object> : Object | call to method Source<Object> : Object |
diff --git a/csharp/ql/test/library-tests/dataflow/constructors/Constructors.cs b/csharp/ql/test/library-tests/dataflow/constructors/Constructors.cs
index 9eae5079d84..94beb58544b 100644
--- a/csharp/ql/test/library-tests/dataflow/constructors/Constructors.cs
+++ b/csharp/ql/test/library-tests/dataflow/constructors/Constructors.cs
@@ -145,6 +145,25 @@ public class Constructors
         Sink(r1.Obj2); // $ hasValueFlow=10
     }
 
+    public partial class CPartial
+    {
+        public object Obj { get; }
+
+        public partial CPartial(object o);
+    }
+
+    public partial class CPartial
+    {
+        public partial CPartial(object o) => Obj = o;
+    }
+
+    public void M8()
+    {
+        var o = Source<object>(11);
+        var cPartial = new CPartial(o);
+        Sink(cPartial.Obj); // $ hasValueFlow=11
+    }
+
     public static void Sink(object o) { }
 
     public static T Source<T>(object source) => throw null;
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/Sources.cs b/csharp/ql/test/library-tests/dataflow/external-models/Sources.cs
index 6f73f096ef9..10b8a37cc0f 100644
--- a/csharp/ql/test/library-tests/dataflow/external-models/Sources.cs
+++ b/csharp/ql/test/library-tests/dataflow/external-models/Sources.cs
@@ -21,6 +21,9 @@ namespace My.Qltest
 
             x = TaggedSrcPropertyGetter;
             x = this[0];
+
+            S s;
+            StructSrc(s);
         }
 
         [SourceAttribute]
@@ -65,7 +68,10 @@ namespace My.Qltest
 
         [SourceAttribute]
         object this[int i] => null;
+
+        void StructSrc(S s) { }
     }
 
+    struct S { }
     class SourceAttribute : System.Attribute { }
 }
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/srcs.expected b/csharp/ql/test/library-tests/dataflow/external-models/srcs.expected
index 855e51fca56..063626c0726 100644
--- a/csharp/ql/test/library-tests/dataflow/external-models/srcs.expected
+++ b/csharp/ql/test/library-tests/dataflow/external-models/srcs.expected
@@ -11,9 +11,10 @@ invalidModelRow
 | Sources.cs:20:17:20:33 | call to method SrcTwoArg | local |
 | Sources.cs:22:17:22:39 | access to property TaggedSrcPropertyGetter | local |
 | Sources.cs:23:17:23:23 | access to indexer | local |
-| Sources.cs:27:14:27:20 | this | local |
-| Sources.cs:27:29:27:45 | taggedMethodParam | local |
-| Sources.cs:31:47:31:60 | taggedSrcParam | local |
-| Sources.cs:43:45:43:45 | p | local |
-| Sources.cs:50:50:50:50 | p | local |
-| Sources.cs:56:16:56:30 | this | local |
+| Sources.cs:26:23:26:23 | [post] access to local variable s | local |
+| Sources.cs:30:14:30:20 | this | local |
+| Sources.cs:30:29:30:45 | taggedMethodParam | local |
+| Sources.cs:34:47:34:60 | taggedSrcParam | local |
+| Sources.cs:46:45:46:45 | p | local |
+| Sources.cs:53:50:53:50 | p | local |
+| Sources.cs:59:16:59:30 | this | local |
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/srcs.ext.yml b/csharp/ql/test/library-tests/dataflow/external-models/srcs.ext.yml
index ca5103b1cd5..b4dcd75be26 100644
--- a/csharp/ql/test/library-tests/dataflow/external-models/srcs.ext.yml
+++ b/csharp/ql/test/library-tests/dataflow/external-models/srcs.ext.yml
@@ -19,3 +19,4 @@ extensions:
       - ["My.Qltest", "SourceAttribute", false, "", "", "Attribute", "", "local", "manual"]
       - ["My.Qltest", "SourceAttribute", false, "", "", "Attribute.Getter", "ReturnValue", "local", "manual"]
       - ["My.Qltest", "A", false, "SrcTwoArg", "(System.String,System.String)", "", "ReturnValue", "local", "manual"]
+      - ["My.Qltest", "A", false, "StructSrc", "", "", "Argument[0]", "local", "manual"]
diff --git a/csharp/ql/test/library-tests/dataflow/flowsources/remote/RemoteFlowSource.cs b/csharp/ql/test/library-tests/dataflow/flowsources/remote/RemoteFlowSource.cs
index 1693e584435..5889183f525 100644
--- a/csharp/ql/test/library-tests/dataflow/flowsources/remote/RemoteFlowSource.cs
+++ b/csharp/ql/test/library-tests/dataflow/flowsources/remote/RemoteFlowSource.cs
@@ -44,5 +44,13 @@ namespace RemoteFlowSource
         {
             Use(request.Unvalidated.RawUrl);
         }
+
+        public static async void M3(System.Net.WebSockets.WebSocket webSocket)
+        {
+            var buffer = new byte[1024];
+            var segment = new ArraySegment<byte>(buffer);
+            var result = await webSocket.ReceiveAsync(segment, System.Threading.CancellationToken.None);
+            Use(segment);
+        }
     }
 }
diff --git a/csharp/ql/test/library-tests/dataflow/flowsources/remote/remoteFlowSource.expected b/csharp/ql/test/library-tests/dataflow/flowsources/remote/remoteFlowSource.expected
index a683f688cc7..f5f541d73d5 100644
--- a/csharp/ql/test/library-tests/dataflow/flowsources/remote/remoteFlowSource.expected
+++ b/csharp/ql/test/library-tests/dataflow/flowsources/remote/remoteFlowSource.expected
@@ -9,3 +9,4 @@
 | RemoteFlowSource.cs:40:17:40:23 | access to parameter request | ASP.NET query string |
 | RemoteFlowSource.cs:45:17:45:23 | access to parameter request | ASP.NET query string |
 | RemoteFlowSource.cs:45:17:45:42 | access to property RawUrl | ASP.NET unvalidated request data |
+| RemoteFlowSource.cs:52:55:52:61 | [post] access to local variable segment | external |
diff --git a/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected b/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
index b7ae291bf0f..9c7965a4b6a 100644
--- a/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
+++ b/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
@@ -185,6 +185,10 @@ source
 | System.IO;StreamWriter;StreamWriter;(System.String,System.IO.FileStreamOptions);Argument[this];file-write;manual |
 | System.IO;StreamWriter;StreamWriter;(System.String,System.Text.Encoding,System.IO.FileStreamOptions);Argument[this];file-write;manual |
 | System.Net.Sockets;TcpClient;GetStream;();ReturnValue;remote;manual |
+| System.Net.WebSockets;ClientWebSocket;ReceiveAsync;(System.ArraySegment<System.Byte>,System.Threading.CancellationToken);Argument[0];remote;manual |
+| System.Net.WebSockets;ClientWebSocket;ReceiveAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[0];remote;manual |
+| System.Net.WebSockets;WebSocket;ReceiveAsync;(System.ArraySegment<System.Byte>,System.Threading.CancellationToken);Argument[0];remote;manual |
+| System.Net.WebSockets;WebSocket;ReceiveAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[0];remote;manual |
 | System;Console;Read;();ReturnValue;stdin;manual |
 | System;Console;ReadKey;();ReturnValue;stdin;manual |
 | System;Console;ReadKey;(System.Boolean);ReturnValue;stdin;manual |
diff --git a/csharp/ql/test/library-tests/dataflow/local/DataFlowStep.expected b/csharp/ql/test/library-tests/dataflow/local/DataFlowStep.expected
index 861e4c519a8..29533a67083 100644
--- a/csharp/ql/test/library-tests/dataflow/local/DataFlowStep.expected
+++ b/csharp/ql/test/library-tests/dataflow/local/DataFlowStep.expected
@@ -32,13 +32,14 @@
 | LocalDataFlow.cs:59:13:59:25 | SSA def(sink1) | LocalDataFlow.cs:60:9:60:13 | access to local variable sink1 |
 | LocalDataFlow.cs:59:21:59:25 | "abc" | LocalDataFlow.cs:59:13:59:17 | access to local variable sink1 |
 | LocalDataFlow.cs:60:9:60:13 | access to local variable sink1 | LocalDataFlow.cs:60:9:60:22 | SSA def(sink1) |
-| LocalDataFlow.cs:60:9:60:22 | ... + ... | LocalDataFlow.cs:60:9:60:13 | access to local variable sink1 |
+| LocalDataFlow.cs:60:9:60:22 | ... += ... | LocalDataFlow.cs:60:9:60:13 | access to local variable sink1 |
 | LocalDataFlow.cs:60:9:60:22 | SSA def(sink1) | LocalDataFlow.cs:61:15:61:19 | access to local variable sink1 |
+| LocalDataFlow.cs:60:18:60:22 | [post] access to local variable sink0 | LocalDataFlow.cs:168:20:168:24 | access to local variable sink0 |
 | LocalDataFlow.cs:60:18:60:22 | access to local variable sink0 | LocalDataFlow.cs:168:20:168:24 | access to local variable sink0 |
 | LocalDataFlow.cs:61:15:61:19 | [post] access to local variable sink1 | LocalDataFlow.cs:68:21:68:25 | access to local variable sink1 |
 | LocalDataFlow.cs:61:15:61:19 | access to local variable sink1 | LocalDataFlow.cs:68:21:68:25 | access to local variable sink1 |
 | LocalDataFlow.cs:64:9:64:16 | access to local variable nonSink0 | LocalDataFlow.cs:64:9:64:25 | SSA def(nonSink0) |
-| LocalDataFlow.cs:64:9:64:25 | ... + ... | LocalDataFlow.cs:64:9:64:16 | access to local variable nonSink0 |
+| LocalDataFlow.cs:64:9:64:25 | ... += ... | LocalDataFlow.cs:64:9:64:16 | access to local variable nonSink0 |
 | LocalDataFlow.cs:64:9:64:25 | SSA def(nonSink0) | LocalDataFlow.cs:65:15:65:22 | access to local variable nonSink0 |
 | LocalDataFlow.cs:65:15:65:22 | [post] access to local variable nonSink0 | LocalDataFlow.cs:72:20:72:27 | access to local variable nonSink0 |
 | LocalDataFlow.cs:65:15:65:22 | access to local variable nonSink0 | LocalDataFlow.cs:72:20:72:27 | access to local variable nonSink0 |
diff --git a/csharp/ql/test/library-tests/dataflow/local/TaintTrackingStep.expected b/csharp/ql/test/library-tests/dataflow/local/TaintTrackingStep.expected
index 0950638d830..4be5dcf1295 100644
--- a/csharp/ql/test/library-tests/dataflow/local/TaintTrackingStep.expected
+++ b/csharp/ql/test/library-tests/dataflow/local/TaintTrackingStep.expected
@@ -31,19 +31,20 @@
 | LocalDataFlow.cs:59:13:59:17 | access to local variable sink1 | LocalDataFlow.cs:59:13:59:25 | SSA def(sink1) |
 | LocalDataFlow.cs:59:13:59:25 | SSA def(sink1) | LocalDataFlow.cs:60:9:60:13 | access to local variable sink1 |
 | LocalDataFlow.cs:59:21:59:25 | "abc" | LocalDataFlow.cs:59:13:59:17 | access to local variable sink1 |
-| LocalDataFlow.cs:60:9:60:13 | access to local variable sink1 | LocalDataFlow.cs:60:9:60:22 | ... + ... |
+| LocalDataFlow.cs:60:9:60:13 | access to local variable sink1 | LocalDataFlow.cs:60:9:60:22 | ... += ... |
 | LocalDataFlow.cs:60:9:60:13 | access to local variable sink1 | LocalDataFlow.cs:60:9:60:22 | SSA def(sink1) |
-| LocalDataFlow.cs:60:9:60:22 | ... + ... | LocalDataFlow.cs:60:9:60:13 | access to local variable sink1 |
+| LocalDataFlow.cs:60:9:60:22 | ... += ... | LocalDataFlow.cs:60:9:60:13 | access to local variable sink1 |
 | LocalDataFlow.cs:60:9:60:22 | SSA def(sink1) | LocalDataFlow.cs:61:15:61:19 | access to local variable sink1 |
-| LocalDataFlow.cs:60:18:60:22 | access to local variable sink0 | LocalDataFlow.cs:60:9:60:22 | ... + ... |
+| LocalDataFlow.cs:60:18:60:22 | [post] access to local variable sink0 | LocalDataFlow.cs:168:20:168:24 | access to local variable sink0 |
+| LocalDataFlow.cs:60:18:60:22 | access to local variable sink0 | LocalDataFlow.cs:60:9:60:22 | ... += ... |
 | LocalDataFlow.cs:60:18:60:22 | access to local variable sink0 | LocalDataFlow.cs:168:20:168:24 | access to local variable sink0 |
 | LocalDataFlow.cs:61:15:61:19 | [post] access to local variable sink1 | LocalDataFlow.cs:68:21:68:25 | access to local variable sink1 |
 | LocalDataFlow.cs:61:15:61:19 | access to local variable sink1 | LocalDataFlow.cs:68:21:68:25 | access to local variable sink1 |
-| LocalDataFlow.cs:64:9:64:16 | access to local variable nonSink0 | LocalDataFlow.cs:64:9:64:25 | ... + ... |
+| LocalDataFlow.cs:64:9:64:16 | access to local variable nonSink0 | LocalDataFlow.cs:64:9:64:25 | ... += ... |
 | LocalDataFlow.cs:64:9:64:16 | access to local variable nonSink0 | LocalDataFlow.cs:64:9:64:25 | SSA def(nonSink0) |
-| LocalDataFlow.cs:64:9:64:25 | ... + ... | LocalDataFlow.cs:64:9:64:16 | access to local variable nonSink0 |
+| LocalDataFlow.cs:64:9:64:25 | ... += ... | LocalDataFlow.cs:64:9:64:16 | access to local variable nonSink0 |
 | LocalDataFlow.cs:64:9:64:25 | SSA def(nonSink0) | LocalDataFlow.cs:65:15:65:22 | access to local variable nonSink0 |
-| LocalDataFlow.cs:64:21:64:25 | "abc" | LocalDataFlow.cs:64:9:64:25 | ... + ... |
+| LocalDataFlow.cs:64:21:64:25 | "abc" | LocalDataFlow.cs:64:9:64:25 | ... += ... |
 | LocalDataFlow.cs:65:15:65:22 | [post] access to local variable nonSink0 | LocalDataFlow.cs:72:20:72:27 | access to local variable nonSink0 |
 | LocalDataFlow.cs:65:15:65:22 | access to local variable nonSink0 | LocalDataFlow.cs:72:20:72:27 | access to local variable nonSink0 |
 | LocalDataFlow.cs:68:13:68:17 | access to local variable sink5 | LocalDataFlow.cs:68:13:68:32 | SSA def(sink5) |
diff --git a/csharp/ql/test/library-tests/dataflow/methods/MethodFlow.expected b/csharp/ql/test/library-tests/dataflow/methods/MethodFlow.expected
new file mode 100644
index 00000000000..c000c439371
--- /dev/null
+++ b/csharp/ql/test/library-tests/dataflow/methods/MethodFlow.expected
@@ -0,0 +1,40 @@
+models
+edges
+| Methods.cs:8:48:8:48 | o : Object | Methods.cs:10:16:10:16 | access to parameter o : Object | provenance |  |
+| Methods.cs:8:48:8:48 | o : Object | Methods.cs:10:16:10:16 | access to parameter o : Object | provenance |  |
+| Methods.cs:17:13:17:13 | access to local variable o : Object | Methods.cs:19:38:19:38 | access to local variable o : Object | provenance |  |
+| Methods.cs:17:13:17:13 | access to local variable o : Object | Methods.cs:19:38:19:38 | access to local variable o : Object | provenance |  |
+| Methods.cs:17:17:17:33 | call to method Source<Object> : Object | Methods.cs:17:13:17:13 | access to local variable o : Object | provenance |  |
+| Methods.cs:17:17:17:33 | call to method Source<Object> : Object | Methods.cs:17:13:17:13 | access to local variable o : Object | provenance |  |
+| Methods.cs:19:13:19:18 | access to local variable result : Object | Methods.cs:20:14:20:19 | access to local variable result | provenance |  |
+| Methods.cs:19:13:19:18 | access to local variable result : Object | Methods.cs:20:14:20:19 | access to local variable result | provenance |  |
+| Methods.cs:19:22:19:39 | call to method PartialMethod : Object | Methods.cs:19:13:19:18 | access to local variable result : Object | provenance |  |
+| Methods.cs:19:22:19:39 | call to method PartialMethod : Object | Methods.cs:19:13:19:18 | access to local variable result : Object | provenance |  |
+| Methods.cs:19:38:19:38 | access to local variable o : Object | Methods.cs:8:48:8:48 | o : Object | provenance |  |
+| Methods.cs:19:38:19:38 | access to local variable o : Object | Methods.cs:8:48:8:48 | o : Object | provenance |  |
+| Methods.cs:19:38:19:38 | access to local variable o : Object | Methods.cs:19:22:19:39 | call to method PartialMethod : Object | provenance |  |
+| Methods.cs:19:38:19:38 | access to local variable o : Object | Methods.cs:19:22:19:39 | call to method PartialMethod : Object | provenance |  |
+nodes
+| Methods.cs:8:48:8:48 | o : Object | semmle.label | o : Object |
+| Methods.cs:8:48:8:48 | o : Object | semmle.label | o : Object |
+| Methods.cs:10:16:10:16 | access to parameter o : Object | semmle.label | access to parameter o : Object |
+| Methods.cs:10:16:10:16 | access to parameter o : Object | semmle.label | access to parameter o : Object |
+| Methods.cs:17:13:17:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Methods.cs:17:13:17:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Methods.cs:17:17:17:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Methods.cs:17:17:17:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| Methods.cs:19:13:19:18 | access to local variable result : Object | semmle.label | access to local variable result : Object |
+| Methods.cs:19:13:19:18 | access to local variable result : Object | semmle.label | access to local variable result : Object |
+| Methods.cs:19:22:19:39 | call to method PartialMethod : Object | semmle.label | call to method PartialMethod : Object |
+| Methods.cs:19:22:19:39 | call to method PartialMethod : Object | semmle.label | call to method PartialMethod : Object |
+| Methods.cs:19:38:19:38 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Methods.cs:19:38:19:38 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| Methods.cs:20:14:20:19 | access to local variable result | semmle.label | access to local variable result |
+| Methods.cs:20:14:20:19 | access to local variable result | semmle.label | access to local variable result |
+subpaths
+| Methods.cs:19:38:19:38 | access to local variable o : Object | Methods.cs:8:48:8:48 | o : Object | Methods.cs:10:16:10:16 | access to parameter o : Object | Methods.cs:19:22:19:39 | call to method PartialMethod : Object |
+| Methods.cs:19:38:19:38 | access to local variable o : Object | Methods.cs:8:48:8:48 | o : Object | Methods.cs:10:16:10:16 | access to parameter o : Object | Methods.cs:19:22:19:39 | call to method PartialMethod : Object |
+testFailures
+#select
+| Methods.cs:20:14:20:19 | access to local variable result | Methods.cs:17:17:17:33 | call to method Source<Object> : Object | Methods.cs:20:14:20:19 | access to local variable result | $@ | Methods.cs:17:17:17:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| Methods.cs:20:14:20:19 | access to local variable result | Methods.cs:17:17:17:33 | call to method Source<Object> : Object | Methods.cs:20:14:20:19 | access to local variable result | $@ | Methods.cs:17:17:17:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
diff --git a/csharp/ql/test/library-tests/dataflow/methods/MethodFlow.ql b/csharp/ql/test/library-tests/dataflow/methods/MethodFlow.ql
new file mode 100644
index 00000000000..9ab95f59caf
--- /dev/null
+++ b/csharp/ql/test/library-tests/dataflow/methods/MethodFlow.ql
@@ -0,0 +1,12 @@
+/**
+ * @kind path-problem
+ */
+
+import csharp
+import utils.test.InlineFlowTest
+import DefaultFlowTest
+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/dataflow/methods/Methods.cs b/csharp/ql/test/library-tests/dataflow/methods/Methods.cs
new file mode 100644
index 00000000000..15e39d5f260
--- /dev/null
+++ b/csharp/ql/test/library-tests/dataflow/methods/Methods.cs
@@ -0,0 +1,26 @@
+public partial class Partial
+{
+    public partial object PartialMethod(object o);
+}
+
+public partial class Partial
+{
+    public partial object PartialMethod(object o)
+    {
+        return o;
+    }
+}
+public class C
+{
+    public void M()
+    {
+        var o = Source<object>(1);
+        var p = new Partial();
+        var result = p.PartialMethod(o);
+        Sink(result); // $ hasValueFlow=1
+    }
+
+    public static void Sink(object o) { }
+
+    static T Source<T>(object source) => throw null;
+}
diff --git a/csharp/ql/test/library-tests/dataflow/modulusanalysis/ModulusAnalysis.expected b/csharp/ql/test/library-tests/dataflow/modulusanalysis/ModulusAnalysis.expected
index ac03ba8b8f3..bc1f2cad5c7 100644
--- a/csharp/ql/test/library-tests/dataflow/modulusanalysis/ModulusAnalysis.expected
+++ b/csharp/ql/test/library-tests/dataflow/modulusanalysis/ModulusAnalysis.expected
@@ -153,8 +153,7 @@
 | ModulusAnalysis.cs:92:25:92:25 | access to local variable j | SSA phi(j) | 0 | 0 |
 | ModulusAnalysis.cs:92:29:92:31 | access to parameter cap | SSA param(cap) | 0 | 0 |
 | ModulusAnalysis.cs:92:34:92:34 | access to local variable j | SSA phi(j) | 0 | 0 |
-| ModulusAnalysis.cs:92:34:92:39 | ... + ... | SSA phi(j) | 1 | 0 |
-| ModulusAnalysis.cs:92:34:92:39 | ... = ... | SSA phi(j) | 1 | 0 |
+| ModulusAnalysis.cs:92:34:92:39 | ... += ... | SSA phi(j) | 1 | 0 |
 | ModulusAnalysis.cs:92:39:92:39 | 1 | 0 | 1 | 0 |
 | ModulusAnalysis.cs:93:38:93:38 | access to local variable j | SSA phi(j) | 0 | 0 |
 | ModulusAnalysis.cs:95:22:95:22 | 0 | 0 | 0 | 0 |
@@ -165,12 +164,9 @@
 | ModulusAnalysis.cs:95:34:95:34 | access to local variable k | 0 | 0 | 3 |
 | ModulusAnalysis.cs:95:34:95:34 | access to local variable k | SSA def(k) | 0 | 3 |
 | ModulusAnalysis.cs:95:34:95:34 | access to local variable k | SSA phi(k) | 0 | 0 |
-| ModulusAnalysis.cs:95:34:95:39 | ... + ... | 0 | 0 | 3 |
-| ModulusAnalysis.cs:95:34:95:39 | ... + ... | SSA def(k) | 0 | 3 |
-| ModulusAnalysis.cs:95:34:95:39 | ... + ... | SSA phi(k) | 3 | 0 |
-| ModulusAnalysis.cs:95:34:95:39 | ... = ... | 0 | 0 | 3 |
-| ModulusAnalysis.cs:95:34:95:39 | ... = ... | SSA def(k) | 0 | 3 |
-| ModulusAnalysis.cs:95:34:95:39 | ... = ... | SSA phi(k) | 3 | 0 |
+| ModulusAnalysis.cs:95:34:95:39 | ... += ... | 0 | 0 | 3 |
+| ModulusAnalysis.cs:95:34:95:39 | ... += ... | SSA def(k) | 0 | 3 |
+| ModulusAnalysis.cs:95:34:95:39 | ... += ... | SSA phi(k) | 3 | 0 |
 | ModulusAnalysis.cs:95:39:95:39 | 3 | 0 | 3 | 0 |
 | ModulusAnalysis.cs:96:38:96:38 | access to local variable k | 0 | 0 | 3 |
 | ModulusAnalysis.cs:96:38:96:38 | access to local variable k | SSA def(k) | 0 | 3 |
diff --git a/csharp/ql/test/library-tests/dataflow/nullcoalescing/NullCoalescing.cs b/csharp/ql/test/library-tests/dataflow/nullcoalescing/NullCoalescing.cs
new file mode 100644
index 00000000000..7231d1e1265
--- /dev/null
+++ b/csharp/ql/test/library-tests/dataflow/nullcoalescing/NullCoalescing.cs
@@ -0,0 +1,35 @@
+public class NullCoalescing
+{
+    public void M1()
+    {
+        var i = Source<int?>(1);
+        int? x = null;
+        x = x ?? i;
+        Sink(x); // $ hasValueFlow=1
+    }
+
+    public void M2()
+    {
+        var i = Source<int?>(2);
+        int? x = null;
+        x ??= i;
+        Sink(x); // $ hasValueFlow=2
+    }
+
+    public void M3(int? x)
+    {
+        var i = Source<int?>(3);
+        x = x ?? i;
+        Sink(x); // $ hasValueFlow=3
+    }
+
+    public void M4(int? x)
+    {
+        var i = Source<int?>(4);
+        x ??= i;
+        Sink(x); // $ hasValueFlow=4
+    }
+
+    public static void Sink(object o) { }
+    static T Source<T>(object source) => throw null;
+}
diff --git a/csharp/ql/test/library-tests/dataflow/nullcoalescing/nullCoalescingFlow.expected b/csharp/ql/test/library-tests/dataflow/nullcoalescing/nullCoalescingFlow.expected
new file mode 100644
index 00000000000..8894ec7006f
--- /dev/null
+++ b/csharp/ql/test/library-tests/dataflow/nullcoalescing/nullCoalescingFlow.expected
@@ -0,0 +1,70 @@
+models
+edges
+| NullCoalescing.cs:5:13:5:13 | access to local variable i : Nullable<Int32> | NullCoalescing.cs:7:9:7:9 | access to local variable x : Nullable<Int32> | provenance |  |
+| NullCoalescing.cs:5:13:5:13 | access to local variable i : Nullable<Int32> | NullCoalescing.cs:7:9:7:9 | access to local variable x : Nullable<Int32> | provenance |  |
+| NullCoalescing.cs:5:17:5:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | NullCoalescing.cs:5:13:5:13 | access to local variable i : Nullable<Int32> | provenance |  |
+| NullCoalescing.cs:5:17:5:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | NullCoalescing.cs:5:13:5:13 | access to local variable i : Nullable<Int32> | provenance |  |
+| NullCoalescing.cs:7:9:7:9 | access to local variable x : Nullable<Int32> | NullCoalescing.cs:8:14:8:14 | (...) ... | provenance |  |
+| NullCoalescing.cs:7:9:7:9 | access to local variable x : Nullable<Int32> | NullCoalescing.cs:8:14:8:14 | (...) ... | provenance |  |
+| NullCoalescing.cs:13:13:13:13 | access to local variable i : Nullable<Int32> | NullCoalescing.cs:15:9:15:9 | access to local variable x : Nullable<Int32> | provenance |  |
+| NullCoalescing.cs:13:13:13:13 | access to local variable i : Nullable<Int32> | NullCoalescing.cs:15:9:15:9 | access to local variable x : Nullable<Int32> | provenance |  |
+| NullCoalescing.cs:13:17:13:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | NullCoalescing.cs:13:13:13:13 | access to local variable i : Nullable<Int32> | provenance |  |
+| NullCoalescing.cs:13:17:13:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | NullCoalescing.cs:13:13:13:13 | access to local variable i : Nullable<Int32> | provenance |  |
+| NullCoalescing.cs:15:9:15:9 | access to local variable x : Nullable<Int32> | NullCoalescing.cs:16:14:16:14 | (...) ... | provenance |  |
+| NullCoalescing.cs:15:9:15:9 | access to local variable x : Nullable<Int32> | NullCoalescing.cs:16:14:16:14 | (...) ... | provenance |  |
+| NullCoalescing.cs:21:13:21:13 | access to local variable i : Nullable<Int32> | NullCoalescing.cs:22:9:22:9 | access to parameter x : Nullable<Int32> | provenance |  |
+| NullCoalescing.cs:21:13:21:13 | access to local variable i : Nullable<Int32> | NullCoalescing.cs:22:9:22:9 | access to parameter x : Nullable<Int32> | provenance |  |
+| NullCoalescing.cs:21:17:21:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | NullCoalescing.cs:21:13:21:13 | access to local variable i : Nullable<Int32> | provenance |  |
+| NullCoalescing.cs:21:17:21:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | NullCoalescing.cs:21:13:21:13 | access to local variable i : Nullable<Int32> | provenance |  |
+| NullCoalescing.cs:22:9:22:9 | access to parameter x : Nullable<Int32> | NullCoalescing.cs:23:14:23:14 | (...) ... | provenance |  |
+| NullCoalescing.cs:22:9:22:9 | access to parameter x : Nullable<Int32> | NullCoalescing.cs:23:14:23:14 | (...) ... | provenance |  |
+| NullCoalescing.cs:28:13:28:13 | access to local variable i : Nullable<Int32> | NullCoalescing.cs:29:9:29:9 | access to parameter x : Nullable<Int32> | provenance |  |
+| NullCoalescing.cs:28:13:28:13 | access to local variable i : Nullable<Int32> | NullCoalescing.cs:29:9:29:9 | access to parameter x : Nullable<Int32> | provenance |  |
+| NullCoalescing.cs:28:17:28:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | NullCoalescing.cs:28:13:28:13 | access to local variable i : Nullable<Int32> | provenance |  |
+| NullCoalescing.cs:28:17:28:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | NullCoalescing.cs:28:13:28:13 | access to local variable i : Nullable<Int32> | provenance |  |
+| NullCoalescing.cs:29:9:29:9 | access to parameter x : Nullable<Int32> | NullCoalescing.cs:30:14:30:14 | (...) ... | provenance |  |
+| NullCoalescing.cs:29:9:29:9 | access to parameter x : Nullable<Int32> | NullCoalescing.cs:30:14:30:14 | (...) ... | provenance |  |
+nodes
+| NullCoalescing.cs:5:13:5:13 | access to local variable i : Nullable<Int32> | semmle.label | access to local variable i : Nullable<Int32> |
+| NullCoalescing.cs:5:13:5:13 | access to local variable i : Nullable<Int32> | semmle.label | access to local variable i : Nullable<Int32> |
+| NullCoalescing.cs:5:17:5:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | semmle.label | call to method Source<Nullable<Int32>> : Nullable<Int32> |
+| NullCoalescing.cs:5:17:5:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | semmle.label | call to method Source<Nullable<Int32>> : Nullable<Int32> |
+| NullCoalescing.cs:7:9:7:9 | access to local variable x : Nullable<Int32> | semmle.label | access to local variable x : Nullable<Int32> |
+| NullCoalescing.cs:7:9:7:9 | access to local variable x : Nullable<Int32> | semmle.label | access to local variable x : Nullable<Int32> |
+| NullCoalescing.cs:8:14:8:14 | (...) ... | semmle.label | (...) ... |
+| NullCoalescing.cs:8:14:8:14 | (...) ... | semmle.label | (...) ... |
+| NullCoalescing.cs:13:13:13:13 | access to local variable i : Nullable<Int32> | semmle.label | access to local variable i : Nullable<Int32> |
+| NullCoalescing.cs:13:13:13:13 | access to local variable i : Nullable<Int32> | semmle.label | access to local variable i : Nullable<Int32> |
+| NullCoalescing.cs:13:17:13:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | semmle.label | call to method Source<Nullable<Int32>> : Nullable<Int32> |
+| NullCoalescing.cs:13:17:13:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | semmle.label | call to method Source<Nullable<Int32>> : Nullable<Int32> |
+| NullCoalescing.cs:15:9:15:9 | access to local variable x : Nullable<Int32> | semmle.label | access to local variable x : Nullable<Int32> |
+| NullCoalescing.cs:15:9:15:9 | access to local variable x : Nullable<Int32> | semmle.label | access to local variable x : Nullable<Int32> |
+| NullCoalescing.cs:16:14:16:14 | (...) ... | semmle.label | (...) ... |
+| NullCoalescing.cs:16:14:16:14 | (...) ... | semmle.label | (...) ... |
+| NullCoalescing.cs:21:13:21:13 | access to local variable i : Nullable<Int32> | semmle.label | access to local variable i : Nullable<Int32> |
+| NullCoalescing.cs:21:13:21:13 | access to local variable i : Nullable<Int32> | semmle.label | access to local variable i : Nullable<Int32> |
+| NullCoalescing.cs:21:17:21:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | semmle.label | call to method Source<Nullable<Int32>> : Nullable<Int32> |
+| NullCoalescing.cs:21:17:21:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | semmle.label | call to method Source<Nullable<Int32>> : Nullable<Int32> |
+| NullCoalescing.cs:22:9:22:9 | access to parameter x : Nullable<Int32> | semmle.label | access to parameter x : Nullable<Int32> |
+| NullCoalescing.cs:22:9:22:9 | access to parameter x : Nullable<Int32> | semmle.label | access to parameter x : Nullable<Int32> |
+| NullCoalescing.cs:23:14:23:14 | (...) ... | semmle.label | (...) ... |
+| NullCoalescing.cs:23:14:23:14 | (...) ... | semmle.label | (...) ... |
+| NullCoalescing.cs:28:13:28:13 | access to local variable i : Nullable<Int32> | semmle.label | access to local variable i : Nullable<Int32> |
+| NullCoalescing.cs:28:13:28:13 | access to local variable i : Nullable<Int32> | semmle.label | access to local variable i : Nullable<Int32> |
+| NullCoalescing.cs:28:17:28:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | semmle.label | call to method Source<Nullable<Int32>> : Nullable<Int32> |
+| NullCoalescing.cs:28:17:28:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | semmle.label | call to method Source<Nullable<Int32>> : Nullable<Int32> |
+| NullCoalescing.cs:29:9:29:9 | access to parameter x : Nullable<Int32> | semmle.label | access to parameter x : Nullable<Int32> |
+| NullCoalescing.cs:29:9:29:9 | access to parameter x : Nullable<Int32> | semmle.label | access to parameter x : Nullable<Int32> |
+| NullCoalescing.cs:30:14:30:14 | (...) ... | semmle.label | (...) ... |
+| NullCoalescing.cs:30:14:30:14 | (...) ... | semmle.label | (...) ... |
+subpaths
+testFailures
+#select
+| NullCoalescing.cs:8:14:8:14 | (...) ... | NullCoalescing.cs:5:17:5:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | NullCoalescing.cs:8:14:8:14 | (...) ... | $@ | NullCoalescing.cs:5:17:5:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | call to method Source<Nullable<Int32>> : Nullable<Int32> |
+| NullCoalescing.cs:8:14:8:14 | (...) ... | NullCoalescing.cs:5:17:5:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | NullCoalescing.cs:8:14:8:14 | (...) ... | $@ | NullCoalescing.cs:5:17:5:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | call to method Source<Nullable<Int32>> : Nullable<Int32> |
+| NullCoalescing.cs:16:14:16:14 | (...) ... | NullCoalescing.cs:13:17:13:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | NullCoalescing.cs:16:14:16:14 | (...) ... | $@ | NullCoalescing.cs:13:17:13:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | call to method Source<Nullable<Int32>> : Nullable<Int32> |
+| NullCoalescing.cs:16:14:16:14 | (...) ... | NullCoalescing.cs:13:17:13:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | NullCoalescing.cs:16:14:16:14 | (...) ... | $@ | NullCoalescing.cs:13:17:13:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | call to method Source<Nullable<Int32>> : Nullable<Int32> |
+| NullCoalescing.cs:23:14:23:14 | (...) ... | NullCoalescing.cs:21:17:21:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | NullCoalescing.cs:23:14:23:14 | (...) ... | $@ | NullCoalescing.cs:21:17:21:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | call to method Source<Nullable<Int32>> : Nullable<Int32> |
+| NullCoalescing.cs:23:14:23:14 | (...) ... | NullCoalescing.cs:21:17:21:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | NullCoalescing.cs:23:14:23:14 | (...) ... | $@ | NullCoalescing.cs:21:17:21:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | call to method Source<Nullable<Int32>> : Nullable<Int32> |
+| NullCoalescing.cs:30:14:30:14 | (...) ... | NullCoalescing.cs:28:17:28:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | NullCoalescing.cs:30:14:30:14 | (...) ... | $@ | NullCoalescing.cs:28:17:28:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | call to method Source<Nullable<Int32>> : Nullable<Int32> |
+| NullCoalescing.cs:30:14:30:14 | (...) ... | NullCoalescing.cs:28:17:28:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | NullCoalescing.cs:30:14:30:14 | (...) ... | $@ | NullCoalescing.cs:28:17:28:31 | call to method Source<Nullable<Int32>> : Nullable<Int32> | call to method Source<Nullable<Int32>> : Nullable<Int32> |
diff --git a/csharp/ql/test/library-tests/dataflow/nullcoalescing/nullCoalescingFlow.ql b/csharp/ql/test/library-tests/dataflow/nullcoalescing/nullCoalescingFlow.ql
new file mode 100644
index 00000000000..9ab95f59caf
--- /dev/null
+++ b/csharp/ql/test/library-tests/dataflow/nullcoalescing/nullCoalescingFlow.ql
@@ -0,0 +1,12 @@
+/**
+ * @kind path-problem
+ */
+
+import csharp
+import utils.test.InlineFlowTest
+import DefaultFlowTest
+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/dataflow/operators/ImplicitConversionOperator.cs b/csharp/ql/test/library-tests/dataflow/operators/ImplicitConversionOperator.cs
new file mode 100644
index 00000000000..05be934ecb3
--- /dev/null
+++ b/csharp/ql/test/library-tests/dataflow/operators/ImplicitConversionOperator.cs
@@ -0,0 +1,14 @@
+using System;
+
+public class TestImplicitConversionOperator
+{
+    static void Sink(object o) { }
+    static void TaintArgument(ArraySegment<byte> segment) { }
+
+    public void M1()
+    {
+        byte[] bytes = new byte[1];
+        TaintArgument(bytes);
+        Sink(bytes);
+    }
+}
diff --git a/csharp/ql/test/library-tests/dataflow/operators/implicitConversionOperatorFlow.expected b/csharp/ql/test/library-tests/dataflow/operators/implicitConversionOperatorFlow.expected
new file mode 100644
index 00000000000..e9daee309cc
--- /dev/null
+++ b/csharp/ql/test/library-tests/dataflow/operators/implicitConversionOperatorFlow.expected
@@ -0,0 +1,8 @@
+edges
+| ImplicitConversionOperator.cs:11:23:11:27 | [post] call to operator implicit conversion : ArraySegment<Byte> | ImplicitConversionOperator.cs:12:14:12:18 | access to local variable bytes | provenance |  |
+nodes
+| ImplicitConversionOperator.cs:11:23:11:27 | [post] call to operator implicit conversion : ArraySegment<Byte> | semmle.label | [post] call to operator implicit conversion : ArraySegment<Byte> |
+| ImplicitConversionOperator.cs:12:14:12:18 | access to local variable bytes | semmle.label | access to local variable bytes |
+subpaths
+#select
+| ImplicitConversionOperator.cs:12:14:12:18 | access to local variable bytes | ImplicitConversionOperator.cs:11:23:11:27 | [post] call to operator implicit conversion : ArraySegment<Byte> | ImplicitConversionOperator.cs:12:14:12:18 | access to local variable bytes | $@ | ImplicitConversionOperator.cs:11:23:11:27 | [post] call to operator implicit conversion : ArraySegment<Byte> | [post] call to operator implicit conversion : ArraySegment<Byte> |
diff --git a/csharp/ql/test/library-tests/dataflow/operators/implicitConversionOperatorFlow.ql b/csharp/ql/test/library-tests/dataflow/operators/implicitConversionOperatorFlow.ql
new file mode 100644
index 00000000000..74f7947a7c8
--- /dev/null
+++ b/csharp/ql/test/library-tests/dataflow/operators/implicitConversionOperatorFlow.ql
@@ -0,0 +1,29 @@
+/**
+ * @kind path-problem
+ */
+
+import csharp
+import semmle.code.csharp.dataflow.internal.DataFlowPrivate as DataFlowPrivate
+import Taint::PathGraph
+
+module TaintConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node src) {
+    exists(MethodCall mc |
+      mc.getTarget().hasName("TaintArgument") and
+      mc.getAnArgument() = src.(DataFlowPrivate::PostUpdateNode).getPreUpdateNode().asExpr()
+    )
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    exists(MethodCall mc |
+      mc.getTarget().hasName("Sink") and
+      mc.getAnArgument() = sink.asExpr()
+    )
+  }
+}
+
+module Taint = TaintTracking::Global<TaintConfig>;
+
+from Taint::PathNode source, Taint::PathNode sink
+where Taint::flowPath(source, sink)
+select sink, source, sink, "$@", source, source.toString()
diff --git a/csharp/ql/test/library-tests/dataflow/signanalysis/SignAnalysis.expected b/csharp/ql/test/library-tests/dataflow/signanalysis/SignAnalysis.expected
index 9f87bf59eeb..4dce60d9c2d 100644
--- a/csharp/ql/test/library-tests/dataflow/signanalysis/SignAnalysis.expected
+++ b/csharp/ql/test/library-tests/dataflow/signanalysis/SignAnalysis.expected
@@ -52,8 +52,7 @@
 | SignAnalysis.cs:80:13:80:17 | ... = ... | strictlyNegative |
 | SignAnalysis.cs:80:17:80:17 | access to parameter i | strictlyNegative |
 | SignAnalysis.cs:81:13:81:13 | access to local variable x | strictlyNegative |
-| SignAnalysis.cs:81:13:81:18 | ... + ... | strictlyNegative |
-| SignAnalysis.cs:81:13:81:18 | ... = ... | strictlyNegative |
+| SignAnalysis.cs:81:13:81:18 | ... += ... | strictlyNegative |
 | SignAnalysis.cs:81:18:81:18 | access to parameter i | strictlyNegative |
 | SignAnalysis.cs:82:38:82:38 | access to local variable x | strictlyNegative |
 | SignAnalysis.cs:87:21:87:21 | access to parameter i | strictlyNegative |
diff --git a/csharp/ql/test/library-tests/dataflow/ssa/DefAdjacentRead.expected b/csharp/ql/test/library-tests/dataflow/ssa/DefAdjacentRead.expected
index 13036f0f0ae..9246392b662 100644
--- a/csharp/ql/test/library-tests/dataflow/ssa/DefAdjacentRead.expected
+++ b/csharp/ql/test/library-tests/dataflow/ssa/DefAdjacentRead.expected
@@ -46,7 +46,7 @@
 | DefUse.cs:89:13:89:14 | x3 | DefUse.cs:89:13:89:18 | Int32 x3 = ... | DefUse.cs:92:15:92:16 | access to local variable x3 |
 | DefUse.cs:89:13:89:14 | x3 | DefUse.cs:92:15:92:16 | access to local variable x3 | DefUse.cs:94:13:94:14 | access to local variable x3 |
 | DefUse.cs:90:13:90:14 | x4 | DefUse.cs:93:15:93:16 | access to local variable x4 | DefUse.cs:95:13:95:14 | access to local variable x4 |
-| DefUse.cs:97:13:97:14 | x5 | DefUse.cs:104:9:104:15 | ... = ... | DefUse.cs:105:13:105:14 | access to local variable x5 |
+| DefUse.cs:97:13:97:14 | x5 | DefUse.cs:104:9:104:15 | ... += ... | DefUse.cs:105:13:105:14 | access to local variable x5 |
 | DefUse.cs:118:45:118:45 | i | DefUse.cs:118:45:118:45 | i | DefUse.cs:118:65:118:65 | access to parameter i |
 | DefUse.cs:120:17:120:21 | Field | DefUse.cs:53:9:53:17 | ... = ... | DefUse.cs:54:13:54:17 | access to field Field |
 | DefUse.cs:122:16:122:21 | Field2 | DefUse.cs:63:9:63:18 | ... = ... | DefUse.cs:64:13:64:18 | access to field Field2 |
diff --git a/csharp/ql/test/library-tests/dataflow/ssa/SsaDefElement.expected b/csharp/ql/test/library-tests/dataflow/ssa/SsaDefElement.expected
index 4bbe88295ed..923d62a96ec 100644
--- a/csharp/ql/test/library-tests/dataflow/ssa/SsaDefElement.expected
+++ b/csharp/ql/test/library-tests/dataflow/ssa/SsaDefElement.expected
@@ -76,7 +76,7 @@
 | DefUse.cs:97:13:97:18 | SSA def(x5) | DefUse.cs:97:13:97:18 | Int32 x5 = ... |
 | DefUse.cs:98:16:98:17 | SSA phi(x5) | DefUse.cs:98:16:98:17 | access to local variable x5 |
 | DefUse.cs:101:13:101:23 | SSA def(x5) | DefUse.cs:101:13:101:23 | ... = ... |
-| DefUse.cs:104:9:104:15 | SSA def(x5) | DefUse.cs:104:9:104:15 | ... = ... |
+| DefUse.cs:104:9:104:15 | SSA def(x5) | DefUse.cs:104:9:104:15 | ... += ... |
 | DefUse.cs:114:47:114:52 | SSA def(i) | DefUse.cs:114:47:114:52 | ... = ... |
 | DefUse.cs:116:47:116:51 | SSA def(i) | DefUse.cs:116:47:116:51 | ... = ... |
 | DefUse.cs:118:45:118:45 | SSA param(i) | DefUse.cs:118:45:118:45 | i |
@@ -245,7 +245,7 @@
 | Test.cs:14:17:14:19 | SSA def(x) | Test.cs:14:17:14:19 | ++... |
 | Test.cs:15:13:15:17 | SSA def(z) | Test.cs:15:13:15:17 | ... = ... |
 | Test.cs:19:13:19:17 | SSA def(y) | Test.cs:19:13:19:17 | ... = ... |
-| Test.cs:20:13:20:18 | SSA def(y) | Test.cs:20:13:20:18 | ... = ... |
+| Test.cs:20:13:20:18 | SSA def(y) | Test.cs:20:13:20:18 | ... += ... |
 | Test.cs:21:13:21:22 | SSA def(this.field) | Test.cs:21:13:21:22 | ... = ... |
 | Test.cs:22:13:22:17 | SSA def(z) | Test.cs:22:13:22:17 | ... = ... |
 | Test.cs:24:9:24:15 | SSA phi(this.field) | Test.cs:24:9:24:15 | ...; |
@@ -255,16 +255,16 @@
 | Test.cs:25:16:25:16 | SSA phi(param1) | Test.cs:25:16:25:16 | access to local variable x |
 | Test.cs:25:16:25:16 | SSA phi(y) | Test.cs:25:16:25:16 | access to local variable x |
 | Test.cs:27:17:27:24 | SSA def(param1) | Test.cs:27:17:27:24 | ...++ |
-| Test.cs:31:13:31:18 | SSA def(y) | Test.cs:31:13:31:18 | ... = ... |
+| Test.cs:31:13:31:18 | SSA def(y) | Test.cs:31:13:31:18 | ... -= ... |
 | Test.cs:33:9:33:19 | SSA phi(param1) | Test.cs:33:9:33:19 | ...; |
 | Test.cs:34:18:34:22 | SSA def(i) | Test.cs:34:18:34:22 | Int32 i = ... |
 | Test.cs:34:25:34:25 | SSA phi(i) | Test.cs:34:25:34:25 | access to local variable i |
 | Test.cs:34:25:34:25 | SSA phi(x) | Test.cs:34:25:34:25 | access to local variable i |
 | Test.cs:34:33:34:35 | SSA def(i) | Test.cs:34:33:34:35 | ...++ |
-| Test.cs:36:13:36:18 | SSA def(x) | Test.cs:36:13:36:18 | ... = ... |
+| Test.cs:36:13:36:18 | SSA def(x) | Test.cs:36:13:36:18 | ... += ... |
 | Test.cs:39:9:42:9 | SSA phi(param1) | Test.cs:39:9:42:9 | foreach (... ... in ...) ... |
 | Test.cs:39:22:39:22 | SSA def(w) | Test.cs:39:22:39:22 | Int32 w |
-| Test.cs:41:13:41:23 | SSA def(param1) | Test.cs:41:13:41:23 | ... = ... |
+| Test.cs:41:13:41:23 | SSA def(param1) | Test.cs:41:13:41:23 | ... += ... |
 | Test.cs:46:10:46:10 | SSA entry def(this.field) | Test.cs:46:10:46:10 | g |
 | Test.cs:46:16:46:18 | SSA param(in) | Test.cs:46:16:46:18 | in |
 | Test.cs:50:13:50:20 | SSA def(out) | Test.cs:50:13:50:20 | ... = ... |
diff --git a/csharp/ql/test/library-tests/dataflow/ssa/SsaExplicitDef.expected b/csharp/ql/test/library-tests/dataflow/ssa/SsaExplicitDef.expected
index a8bcd3e4daf..8582dd1cf6e 100644
--- a/csharp/ql/test/library-tests/dataflow/ssa/SsaExplicitDef.expected
+++ b/csharp/ql/test/library-tests/dataflow/ssa/SsaExplicitDef.expected
@@ -47,7 +47,7 @@
 | DefUse.cs:90:13:90:14 | x4 | DefUse.cs:93:15:93:16 | SSA def(x4) | DefUse.cs:93:15:93:16 | access to local variable x4 |
 | DefUse.cs:97:13:97:14 | x5 | DefUse.cs:97:13:97:18 | SSA def(x5) | DefUse.cs:97:13:97:18 | Int32 x5 = ... |
 | DefUse.cs:97:13:97:14 | x5 | DefUse.cs:101:13:101:23 | SSA def(x5) | DefUse.cs:101:13:101:23 | ... = ... |
-| DefUse.cs:97:13:97:14 | x5 | DefUse.cs:104:9:104:15 | SSA def(x5) | DefUse.cs:104:9:104:15 | ... = ... |
+| DefUse.cs:97:13:97:14 | x5 | DefUse.cs:104:9:104:15 | SSA def(x5) | DefUse.cs:104:9:104:15 | ... += ... |
 | DefUse.cs:114:42:114:42 | i | DefUse.cs:114:47:114:52 | SSA def(i) | DefUse.cs:114:47:114:52 | ... = ... |
 | DefUse.cs:116:42:116:42 | i | DefUse.cs:116:47:116:51 | SSA def(i) | DefUse.cs:116:47:116:51 | ... = ... |
 | DefUse.cs:118:45:118:45 | i | DefUse.cs:118:68:118:72 | SSA def(i) | DefUse.cs:118:68:118:72 | ... = ... |
@@ -117,17 +117,17 @@
 | Properties.cs:78:9:78:15 | this.xs | Properties.cs:81:9:81:22 | SSA def(this.xs) | Properties.cs:81:9:81:22 | ... = ... |
 | Properties.cs:78:9:78:15 | this.xs | Properties.cs:83:9:83:22 | SSA def(this.xs) | Properties.cs:83:9:83:22 | ... = ... |
 | Test.cs:5:15:5:20 | param1 | Test.cs:27:17:27:24 | SSA def(param1) | Test.cs:27:17:27:24 | ...++ |
-| Test.cs:5:15:5:20 | param1 | Test.cs:41:13:41:23 | SSA def(param1) | Test.cs:41:13:41:23 | ... = ... |
+| Test.cs:5:15:5:20 | param1 | Test.cs:41:13:41:23 | SSA def(param1) | Test.cs:41:13:41:23 | ... += ... |
 | Test.cs:7:9:7:13 | this.field | Test.cs:7:9:7:17 | SSA def(this.field) | Test.cs:7:9:7:17 | ... = ... |
 | Test.cs:7:9:7:13 | this.field | Test.cs:21:13:21:22 | SSA def(this.field) | Test.cs:21:13:21:22 | ... = ... |
 | Test.cs:8:13:8:13 | x | Test.cs:8:13:8:17 | SSA def(x) | Test.cs:8:13:8:17 | Int32 x = ... |
 | Test.cs:8:13:8:13 | x | Test.cs:13:13:13:15 | SSA def(x) | Test.cs:13:13:13:15 | ...++ |
 | Test.cs:8:13:8:13 | x | Test.cs:14:17:14:19 | SSA def(x) | Test.cs:14:17:14:19 | ++... |
-| Test.cs:8:13:8:13 | x | Test.cs:36:13:36:18 | SSA def(x) | Test.cs:36:13:36:18 | ... = ... |
+| Test.cs:8:13:8:13 | x | Test.cs:36:13:36:18 | SSA def(x) | Test.cs:36:13:36:18 | ... += ... |
 | Test.cs:9:13:9:13 | y | Test.cs:14:13:14:19 | SSA def(y) | Test.cs:14:13:14:19 | ... = ... |
 | Test.cs:9:13:9:13 | y | Test.cs:19:13:19:17 | SSA def(y) | Test.cs:19:13:19:17 | ... = ... |
-| Test.cs:9:13:9:13 | y | Test.cs:20:13:20:18 | SSA def(y) | Test.cs:20:13:20:18 | ... = ... |
-| Test.cs:9:13:9:13 | y | Test.cs:31:13:31:18 | SSA def(y) | Test.cs:31:13:31:18 | ... = ... |
+| Test.cs:9:13:9:13 | y | Test.cs:20:13:20:18 | SSA def(y) | Test.cs:20:13:20:18 | ... += ... |
+| Test.cs:9:13:9:13 | y | Test.cs:31:13:31:18 | SSA def(y) | Test.cs:31:13:31:18 | ... -= ... |
 | Test.cs:10:13:10:13 | z | Test.cs:15:13:15:17 | SSA def(z) | Test.cs:15:13:15:17 | ... = ... |
 | Test.cs:10:13:10:13 | z | Test.cs:22:13:22:17 | SSA def(z) | Test.cs:22:13:22:17 | ... = ... |
 | Test.cs:34:18:34:18 | i | Test.cs:34:18:34:22 | SSA def(i) | Test.cs:34:18:34:22 | Int32 i = ... |
diff --git a/csharp/ql/test/library-tests/dataflow/structs/StructFlow.expected b/csharp/ql/test/library-tests/dataflow/structs/StructFlow.expected
new file mode 100644
index 00000000000..be27c832f11
--- /dev/null
+++ b/csharp/ql/test/library-tests/dataflow/structs/StructFlow.expected
@@ -0,0 +1,92 @@
+models
+edges
+| structs.cs:10:27:10:30 | args : Object[] [element] : Object | structs.cs:12:25:12:28 | access to parameter args : Object[] [element] : Object | provenance |  |
+| structs.cs:10:27:10:30 | args : Object[] [element] : Object | structs.cs:12:25:12:28 | access to parameter args : Object[] [element] : Object | provenance |  |
+| structs.cs:12:13:12:16 | [post] this access : S [field args, element] : Object | structs.cs:10:16:10:16 | this [Return] : S [field args, element] : Object | provenance |  |
+| structs.cs:12:13:12:16 | [post] this access : S [field args, element] : Object | structs.cs:10:16:10:16 | this [Return] : S [field args, element] : Object | provenance |  |
+| structs.cs:12:25:12:28 | access to parameter args : Object[] [element] : Object | structs.cs:12:13:12:16 | [post] this access : S [field args, element] : Object | provenance |  |
+| structs.cs:12:25:12:28 | access to parameter args : Object[] [element] : Object | structs.cs:12:13:12:16 | [post] this access : S [field args, element] : Object | provenance |  |
+| structs.cs:16:30:16:30 | s [Return] : S [field args, element] : Object | structs.cs:32:20:32:20 | [post] access to local variable s : S [field args, element] : Object | provenance |  |
+| structs.cs:16:30:16:30 | s [Return] : S [field args, element] : Object | structs.cs:32:20:32:20 | [post] access to local variable s : S [field args, element] : Object | provenance |  |
+| structs.cs:18:9:18:9 | [post] access to parameter s : S [field args, element] : Object | structs.cs:16:30:16:30 | s [Return] : S [field args, element] : Object | provenance |  |
+| structs.cs:18:9:18:9 | [post] access to parameter s : S [field args, element] : Object | structs.cs:16:30:16:30 | s [Return] : S [field args, element] : Object | provenance |  |
+| structs.cs:18:9:18:14 | [post] access to field args : Object[] [element] : Object | structs.cs:18:9:18:9 | [post] access to parameter s : S [field args, element] : Object | provenance |  |
+| structs.cs:18:9:18:14 | [post] access to field args : Object[] [element] : Object | structs.cs:18:9:18:9 | [post] access to parameter s : S [field args, element] : Object | provenance |  |
+| structs.cs:18:21:18:37 | call to method Source<Object> : Object | structs.cs:18:9:18:14 | [post] access to field args : Object[] [element] : Object | provenance |  |
+| structs.cs:18:21:18:37 | call to method Source<Object> : Object | structs.cs:18:9:18:14 | [post] access to field args : Object[] [element] : Object | provenance |  |
+| structs.cs:24:13:24:13 | access to local variable o : Object | structs.cs:25:24:25:24 | access to local variable o : Object | provenance |  |
+| structs.cs:24:13:24:13 | access to local variable o : Object | structs.cs:25:24:25:24 | access to local variable o : Object | provenance |  |
+| structs.cs:24:17:24:33 | call to method Source<Object> : Object | structs.cs:24:13:24:13 | access to local variable o : Object | provenance |  |
+| structs.cs:24:17:24:33 | call to method Source<Object> : Object | structs.cs:24:13:24:13 | access to local variable o : Object | provenance |  |
+| structs.cs:25:13:25:13 | access to local variable s : S [field args, element] : Object | structs.cs:26:14:26:14 | access to local variable s : S [field args, element] : Object | provenance |  |
+| structs.cs:25:13:25:13 | access to local variable s : S [field args, element] : Object | structs.cs:26:14:26:14 | access to local variable s : S [field args, element] : Object | provenance |  |
+| structs.cs:25:17:25:26 | object creation of type S : S [field args, element] : Object | structs.cs:25:13:25:13 | access to local variable s : S [field args, element] : Object | provenance |  |
+| structs.cs:25:17:25:26 | object creation of type S : S [field args, element] : Object | structs.cs:25:13:25:13 | access to local variable s : S [field args, element] : Object | provenance |  |
+| structs.cs:25:23:25:25 | [...] : Object[] [element] : Object | structs.cs:10:27:10:30 | args : Object[] [element] : Object | provenance |  |
+| structs.cs:25:23:25:25 | [...] : Object[] [element] : Object | structs.cs:10:27:10:30 | args : Object[] [element] : Object | provenance |  |
+| structs.cs:25:23:25:25 | [...] : Object[] [element] : Object | structs.cs:25:17:25:26 | object creation of type S : S [field args, element] : Object | provenance |  |
+| structs.cs:25:23:25:25 | [...] : Object[] [element] : Object | structs.cs:25:17:25:26 | object creation of type S : S [field args, element] : Object | provenance |  |
+| structs.cs:25:24:25:24 | access to local variable o : Object | structs.cs:25:23:25:25 | [...] : Object[] [element] : Object | provenance |  |
+| structs.cs:25:24:25:24 | access to local variable o : Object | structs.cs:25:23:25:25 | [...] : Object[] [element] : Object | provenance |  |
+| structs.cs:26:14:26:14 | access to local variable s : S [field args, element] : Object | structs.cs:26:14:26:19 | access to field args : Object[] [element] : Object | provenance |  |
+| structs.cs:26:14:26:14 | access to local variable s : S [field args, element] : Object | structs.cs:26:14:26:19 | access to field args : Object[] [element] : Object | provenance |  |
+| structs.cs:26:14:26:19 | access to field args : Object[] [element] : Object | structs.cs:26:14:26:22 | access to array element | provenance |  |
+| structs.cs:26:14:26:19 | access to field args : Object[] [element] : Object | structs.cs:26:14:26:22 | access to array element | provenance |  |
+| structs.cs:32:20:32:20 | [post] access to local variable s : S [field args, element] : Object | structs.cs:33:14:33:14 | access to local variable s : S [field args, element] : Object | provenance |  |
+| structs.cs:32:20:32:20 | [post] access to local variable s : S [field args, element] : Object | structs.cs:33:14:33:14 | access to local variable s : S [field args, element] : Object | provenance |  |
+| structs.cs:33:14:33:14 | access to local variable s : S [field args, element] : Object | structs.cs:33:14:33:19 | access to field args : Object[] [element] : Object | provenance |  |
+| structs.cs:33:14:33:14 | access to local variable s : S [field args, element] : Object | structs.cs:33:14:33:19 | access to field args : Object[] [element] : Object | provenance |  |
+| structs.cs:33:14:33:19 | access to field args : Object[] [element] : Object | structs.cs:33:14:33:22 | access to array element | provenance |  |
+| structs.cs:33:14:33:19 | access to field args : Object[] [element] : Object | structs.cs:33:14:33:22 | access to array element | provenance |  |
+nodes
+| structs.cs:10:16:10:16 | this [Return] : S [field args, element] : Object | semmle.label | this [Return] : S [field args, element] : Object |
+| structs.cs:10:16:10:16 | this [Return] : S [field args, element] : Object | semmle.label | this [Return] : S [field args, element] : Object |
+| structs.cs:10:27:10:30 | args : Object[] [element] : Object | semmle.label | args : Object[] [element] : Object |
+| structs.cs:10:27:10:30 | args : Object[] [element] : Object | semmle.label | args : Object[] [element] : Object |
+| structs.cs:12:13:12:16 | [post] this access : S [field args, element] : Object | semmle.label | [post] this access : S [field args, element] : Object |
+| structs.cs:12:13:12:16 | [post] this access : S [field args, element] : Object | semmle.label | [post] this access : S [field args, element] : Object |
+| structs.cs:12:25:12:28 | access to parameter args : Object[] [element] : Object | semmle.label | access to parameter args : Object[] [element] : Object |
+| structs.cs:12:25:12:28 | access to parameter args : Object[] [element] : Object | semmle.label | access to parameter args : Object[] [element] : Object |
+| structs.cs:16:30:16:30 | s [Return] : S [field args, element] : Object | semmle.label | s [Return] : S [field args, element] : Object |
+| structs.cs:16:30:16:30 | s [Return] : S [field args, element] : Object | semmle.label | s [Return] : S [field args, element] : Object |
+| structs.cs:18:9:18:9 | [post] access to parameter s : S [field args, element] : Object | semmle.label | [post] access to parameter s : S [field args, element] : Object |
+| structs.cs:18:9:18:9 | [post] access to parameter s : S [field args, element] : Object | semmle.label | [post] access to parameter s : S [field args, element] : Object |
+| structs.cs:18:9:18:14 | [post] access to field args : Object[] [element] : Object | semmle.label | [post] access to field args : Object[] [element] : Object |
+| structs.cs:18:9:18:14 | [post] access to field args : Object[] [element] : Object | semmle.label | [post] access to field args : Object[] [element] : Object |
+| structs.cs:18:21:18:37 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| structs.cs:18:21:18:37 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| structs.cs:24:13:24:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| structs.cs:24:13:24:13 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| structs.cs:24:17:24:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| structs.cs:24:17:24:33 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| structs.cs:25:13:25:13 | access to local variable s : S [field args, element] : Object | semmle.label | access to local variable s : S [field args, element] : Object |
+| structs.cs:25:13:25:13 | access to local variable s : S [field args, element] : Object | semmle.label | access to local variable s : S [field args, element] : Object |
+| structs.cs:25:17:25:26 | object creation of type S : S [field args, element] : Object | semmle.label | object creation of type S : S [field args, element] : Object |
+| structs.cs:25:17:25:26 | object creation of type S : S [field args, element] : Object | semmle.label | object creation of type S : S [field args, element] : Object |
+| structs.cs:25:23:25:25 | [...] : Object[] [element] : Object | semmle.label | [...] : Object[] [element] : Object |
+| structs.cs:25:23:25:25 | [...] : Object[] [element] : Object | semmle.label | [...] : Object[] [element] : Object |
+| structs.cs:25:24:25:24 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| structs.cs:25:24:25:24 | access to local variable o : Object | semmle.label | access to local variable o : Object |
+| structs.cs:26:14:26:14 | access to local variable s : S [field args, element] : Object | semmle.label | access to local variable s : S [field args, element] : Object |
+| structs.cs:26:14:26:14 | access to local variable s : S [field args, element] : Object | semmle.label | access to local variable s : S [field args, element] : Object |
+| structs.cs:26:14:26:19 | access to field args : Object[] [element] : Object | semmle.label | access to field args : Object[] [element] : Object |
+| structs.cs:26:14:26:19 | access to field args : Object[] [element] : Object | semmle.label | access to field args : Object[] [element] : Object |
+| structs.cs:26:14:26:22 | access to array element | semmle.label | access to array element |
+| structs.cs:26:14:26:22 | access to array element | semmle.label | access to array element |
+| structs.cs:32:20:32:20 | [post] access to local variable s : S [field args, element] : Object | semmle.label | [post] access to local variable s : S [field args, element] : Object |
+| structs.cs:32:20:32:20 | [post] access to local variable s : S [field args, element] : Object | semmle.label | [post] access to local variable s : S [field args, element] : Object |
+| structs.cs:33:14:33:14 | access to local variable s : S [field args, element] : Object | semmle.label | access to local variable s : S [field args, element] : Object |
+| structs.cs:33:14:33:14 | access to local variable s : S [field args, element] : Object | semmle.label | access to local variable s : S [field args, element] : Object |
+| structs.cs:33:14:33:19 | access to field args : Object[] [element] : Object | semmle.label | access to field args : Object[] [element] : Object |
+| structs.cs:33:14:33:19 | access to field args : Object[] [element] : Object | semmle.label | access to field args : Object[] [element] : Object |
+| structs.cs:33:14:33:22 | access to array element | semmle.label | access to array element |
+| structs.cs:33:14:33:22 | access to array element | semmle.label | access to array element |
+subpaths
+| structs.cs:25:23:25:25 | [...] : Object[] [element] : Object | structs.cs:10:27:10:30 | args : Object[] [element] : Object | structs.cs:10:16:10:16 | this [Return] : S [field args, element] : Object | structs.cs:25:17:25:26 | object creation of type S : S [field args, element] : Object |
+| structs.cs:25:23:25:25 | [...] : Object[] [element] : Object | structs.cs:10:27:10:30 | args : Object[] [element] : Object | structs.cs:10:16:10:16 | this [Return] : S [field args, element] : Object | structs.cs:25:17:25:26 | object creation of type S : S [field args, element] : Object |
+testFailures
+#select
+| structs.cs:26:14:26:22 | access to array element | structs.cs:24:17:24:33 | call to method Source<Object> : Object | structs.cs:26:14:26:22 | access to array element | $@ | structs.cs:24:17:24:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| structs.cs:26:14:26:22 | access to array element | structs.cs:24:17:24:33 | call to method Source<Object> : Object | structs.cs:26:14:26:22 | access to array element | $@ | structs.cs:24:17:24:33 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| structs.cs:33:14:33:22 | access to array element | structs.cs:18:21:18:37 | call to method Source<Object> : Object | structs.cs:33:14:33:22 | access to array element | $@ | structs.cs:18:21:18:37 | call to method Source<Object> : Object | call to method Source<Object> : Object |
+| structs.cs:33:14:33:22 | access to array element | structs.cs:18:21:18:37 | call to method Source<Object> : Object | structs.cs:33:14:33:22 | access to array element | $@ | structs.cs:18:21:18:37 | call to method Source<Object> : Object | call to method Source<Object> : Object |
diff --git a/csharp/ql/test/library-tests/dataflow/structs/StructFlow.ql b/csharp/ql/test/library-tests/dataflow/structs/StructFlow.ql
new file mode 100644
index 00000000000..9ab95f59caf
--- /dev/null
+++ b/csharp/ql/test/library-tests/dataflow/structs/StructFlow.ql
@@ -0,0 +1,12 @@
+/**
+ * @kind path-problem
+ */
+
+import csharp
+import utils.test.InlineFlowTest
+import DefaultFlowTest
+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/dataflow/structs/structs.cs b/csharp/ql/test/library-tests/dataflow/structs/structs.cs
new file mode 100644
index 00000000000..275e27512e4
--- /dev/null
+++ b/csharp/ql/test/library-tests/dataflow/structs/structs.cs
@@ -0,0 +1,40 @@
+using System;
+
+public class Test
+{
+    public struct S
+    {
+        public int field;
+        public object[] args;
+
+        public S(object[] args)
+        {
+            this.args = args;
+        }
+    }
+
+    public void SetTainted(S s)
+    {
+        s.args[0] = Source<object>(2);
+        s.field = Source<int>(3);
+    }
+
+    public void M1()
+    {
+        var o = Source<object>(1);
+        var s = new S([o]);
+        Sink(s.args[0]); // $ hasValueFlow=1
+    }
+
+    public void M2()
+    {
+        var s = new S(new object[1]);
+        SetTainted(s);
+        Sink(s.args[0]); // $ hasValueFlow=2
+        Sink(s.field); // $ no flow.
+    }
+
+    public static void Sink(object o) { }
+
+    static T Source<T>(object source) => throw null;
+}
diff --git a/csharp/ql/test/library-tests/dispatch/CallContext.expected b/csharp/ql/test/library-tests/dispatch/CallContext.expected
index 2ef2223ebd7..09fe22783aa 100644
--- a/csharp/ql/test/library-tests/dispatch/CallContext.expected
+++ b/csharp/ql/test/library-tests/dispatch/CallContext.expected
@@ -20,12 +20,12 @@ mayBenefitFromCallContext
 | ViableCallable.cs:245:9:245:15 | call to method M<Int32> |
 | ViableCallable.cs:294:9:294:15 | call to method M<Int32> |
 | ViableCallable.cs:297:9:297:20 | call to method M<Int32> |
-| ViableCallable.cs:425:9:425:18 | call to method M<Int32> |
-| ViableCallable.cs:469:9:469:30 | call to method M2<T> |
-| ViableCallable.cs:475:9:475:30 | call to method M2<T> |
-| ViableCallable.cs:577:18:577:22 | call to operator / |
-| ViableCallable.cs:580:26:580:30 | call to operator checked / |
-| ViableCallable.cs:586:9:586:15 | call to method M12 |
-| ViableCallable.cs:619:9:619:13 | call to method M |
-| ViableCallable.cs:683:9:683:16 | call to method M |
-| ViableCallable.cs:687:9:687:16 | call to method M |
+| ViableCallable.cs:426:9:426:18 | call to method M<Int32> |
+| ViableCallable.cs:470:9:470:30 | call to method M2<T> |
+| ViableCallable.cs:476:9:476:30 | call to method M2<T> |
+| ViableCallable.cs:578:18:578:22 | call to operator / |
+| ViableCallable.cs:581:26:581:30 | call to operator checked / |
+| ViableCallable.cs:587:9:587:15 | call to method M12 |
+| ViableCallable.cs:620:9:620:13 | call to method M |
+| ViableCallable.cs:684:9:684:16 | call to method M |
+| ViableCallable.cs:688:9:688:16 | call to method M |
diff --git a/csharp/ql/test/library-tests/dispatch/CallGraph.expected b/csharp/ql/test/library-tests/dispatch/CallGraph.expected
index 2feb959dd86..8c93277cb54 100644
--- a/csharp/ql/test/library-tests/dispatch/CallGraph.expected
+++ b/csharp/ql/test/library-tests/dispatch/CallGraph.expected
@@ -24,6 +24,7 @@
 | ExactCallable.cs:15:25:15:35 | Run`2 | ExactCallable.cs:172:21:172:33 | MethodWithOut |
 | ExactCallable.cs:15:25:15:35 | Run`2 | ExactCallable.cs:177:21:177:34 | MethodWithOut2 |
 | ExactCallable.cs:182:21:182:22 | M1 | ExactCallable.cs:187:21:187:22 | M2 |
+| TypeFlow.cs:3:7:3:14 | <object initializer> | TypeFlow.cs:22:20:22:22 | set_Prop |
 | TypeFlow.cs:5:5:5:12 | TypeFlow | TypeFlow.cs:24:10:24:12 | Run |
 | TypeFlow.cs:24:10:24:12 | Run | TypeFlow.cs:12:29:12:34 | Method |
 | TypeFlow.cs:24:10:24:12 | Run | TypeFlow.cs:17:30:17:35 | Method |
@@ -218,61 +219,62 @@
 | ViableCallable.cs:308:17:308:19 | Run | ViableCallable.cs:286:24:286:28 | M`1 |
 | ViableCallable.cs:308:17:308:19 | Run | ViableCallable.cs:303:26:303:30 | M`1 |
 | ViableCallable.cs:361:17:361:19 | Run | ViableCallable.cs:359:10:359:10 | M |
-| ViableCallable.cs:361:17:361:19 | Run | ViableCallable.cs:375:5:375:7 | C11 |
-| ViableCallable.cs:389:10:389:16 | Run`1 | ViableCallable.cs:385:33:385:33 | M |
-| ViableCallable.cs:395:10:395:17 | Run2`1 | ViableCallable.cs:389:10:389:16 | Run<T2> |
-| ViableCallable.cs:400:10:400:13 | Run3 | ViableCallable.cs:395:10:395:17 | Run2<C13> |
-| ViableCallable.cs:422:10:422:12 | Run | ViableCallable.cs:213:21:213:27 | Mock<A4> |
-| ViableCallable.cs:422:10:422:12 | Run | ViableCallable.cs:410:36:410:40 | M`1 |
-| ViableCallable.cs:422:10:422:12 | Run | ViableCallable.cs:416:53:416:57 | M`1 |
-| ViableCallable.cs:422:10:422:12 | Run | ViableCallable.cs:418:42:418:46 | M`1 |
-| ViableCallable.cs:444:22:444:26 | M2`1 | ViableCallable.cs:469:14:469:29 | (...) => ... |
-| ViableCallable.cs:444:22:444:26 | M2`1 | ViableCallable.cs:475:14:475:29 | (...) => ... |
-| ViableCallable.cs:449:10:449:11 | M1 | ViableCallable.cs:443:23:443:24 | M1 |
-| ViableCallable.cs:449:10:449:11 | M1 | ViableCallable.cs:458:23:458:27 | M2`1 |
-| ViableCallable.cs:458:23:458:27 | M2`1 | ViableCallable.cs:455:17:455:23 | (...) => ... |
-| ViableCallable.cs:458:23:458:27 | M2`1 | ViableCallable.cs:463:14:463:20 | (...) => ... |
-| ViableCallable.cs:458:23:458:27 | M2`1 | ViableCallable.cs:469:14:469:29 | (...) => ... |
-| ViableCallable.cs:458:23:458:27 | M2`1 | ViableCallable.cs:475:14:475:29 | (...) => ... |
-| ViableCallable.cs:460:10:460:14 | M3`1 | ViableCallable.cs:458:23:458:27 | M2`1 |
-| ViableCallable.cs:466:10:466:14 | M4`1 | ViableCallable.cs:444:22:444:26 | M2`1 |
-| ViableCallable.cs:466:10:466:14 | M4`1 | ViableCallable.cs:458:23:458:27 | M2`1 |
-| ViableCallable.cs:472:10:472:14 | M5`1 | ViableCallable.cs:444:22:444:26 | M2`1 |
-| ViableCallable.cs:472:10:472:14 | M5`1 | ViableCallable.cs:458:23:458:27 | M2`1 |
-| ViableCallable.cs:489:10:489:12 | Run | ViableCallable.cs:482:10:482:11 | M2 |
-| ViableCallable.cs:489:10:489:12 | Run | ViableCallable.cs:487:17:487:18 | M1 |
-| ViableCallable.cs:506:10:506:12 | Run | ViableCallable.cs:501:32:501:32 | + |
-| ViableCallable.cs:506:10:506:12 | Run | ViableCallable.cs:502:40:502:40 | checked + |
-| ViableCallable.cs:506:10:506:12 | Run | ViableCallable.cs:503:28:503:35 | explicit conversion |
-| ViableCallable.cs:506:10:506:12 | Run | ViableCallable.cs:504:28:504:35 | checked explicit conversion |
-| ViableCallable.cs:556:10:556:15 | Run`1 | ViableCallable.cs:528:39:528:39 | checked - |
-| ViableCallable.cs:556:10:556:15 | Run`1 | ViableCallable.cs:530:31:530:31 | * |
-| ViableCallable.cs:556:10:556:15 | Run`1 | ViableCallable.cs:531:39:531:39 | checked * |
-| ViableCallable.cs:556:10:556:15 | Run`1 | ViableCallable.cs:533:31:533:31 | / |
-| ViableCallable.cs:556:10:556:15 | Run`1 | ViableCallable.cs:534:39:534:39 | checked / |
-| ViableCallable.cs:556:10:556:15 | Run`1 | ViableCallable.cs:538:18:538:20 | M12 |
-| ViableCallable.cs:556:10:556:15 | Run`1 | ViableCallable.cs:540:18:540:20 | M13 |
-| ViableCallable.cs:556:10:556:15 | Run`1 | ViableCallable.cs:545:32:545:32 | + |
-| ViableCallable.cs:556:10:556:15 | Run`1 | ViableCallable.cs:546:40:546:40 | checked + |
-| ViableCallable.cs:556:10:556:15 | Run`1 | ViableCallable.cs:548:32:548:32 | - |
-| ViableCallable.cs:556:10:556:15 | Run`1 | ViableCallable.cs:550:32:550:32 | / |
-| ViableCallable.cs:556:10:556:15 | Run`1 | ViableCallable.cs:551:40:551:40 | checked / |
-| ViableCallable.cs:556:10:556:15 | Run`1 | ViableCallable.cs:553:17:553:19 | M11 |
-| ViableCallable.cs:556:10:556:15 | Run`1 | ViableCallable.cs:554:17:554:19 | M12 |
-| ViableCallable.cs:610:17:610:23 | Run1`1 | ViableCallable.cs:602:21:602:21 | M |
-| ViableCallable.cs:616:17:616:23 | Run2`1 | ViableCallable.cs:602:21:602:21 | M |
-| ViableCallable.cs:616:17:616:23 | Run2`1 | ViableCallable.cs:607:21:607:21 | M |
-| ViableCallable.cs:657:17:657:20 | Run1 | ViableCallable.cs:635:21:635:21 | M |
-| ViableCallable.cs:657:17:657:20 | Run1 | ViableCallable.cs:637:21:637:21 | M |
-| ViableCallable.cs:668:17:668:20 | Run2 | ViableCallable.cs:651:21:651:21 | M |
-| ViableCallable.cs:668:17:668:20 | Run2 | ViableCallable.cs:654:21:654:21 | M |
-| ViableCallable.cs:679:17:679:20 | Run3 | ViableCallable.cs:635:21:635:21 | M |
-| ViableCallable.cs:679:17:679:20 | Run3 | ViableCallable.cs:637:21:637:21 | M |
-| ViableCallable.cs:679:17:679:20 | Run3 | ViableCallable.cs:646:21:646:21 | M |
-| ViableCallable.cs:679:17:679:20 | Run3 | ViableCallable.cs:648:21:648:21 | M |
-| ViableCallable.cs:709:17:709:20 | Run1 | ViableCallable.cs:703:42:703:44 | get_Property |
-| ViableCallable.cs:709:17:709:20 | Run1 | ViableCallable.cs:703:63:703:65 | set_Property |
-| ViableCallable.cs:709:17:709:20 | Run1 | ViableCallable.cs:705:49:705:51 | get_Item |
-| ViableCallable.cs:709:17:709:20 | Run1 | ViableCallable.cs:705:70:705:72 | set_Item |
-| ViableCallable.cs:709:17:709:20 | Run1 | ViableCallable.cs:706:51:706:53 | add_Event |
-| ViableCallable.cs:709:17:709:20 | Run1 | ViableCallable.cs:706:59:706:64 | remove_Event |
+| ViableCallable.cs:361:17:361:19 | Run | ViableCallable.cs:376:5:376:7 | C11 |
+| ViableCallable.cs:390:10:390:16 | Run`1 | ViableCallable.cs:386:33:386:33 | M |
+| ViableCallable.cs:396:10:396:17 | Run2`1 | ViableCallable.cs:390:10:390:16 | Run<T2> |
+| ViableCallable.cs:401:10:401:13 | Run3 | ViableCallable.cs:396:10:396:17 | Run2<C13> |
+| ViableCallable.cs:423:10:423:12 | Run | ViableCallable.cs:213:21:213:27 | Mock<A4> |
+| ViableCallable.cs:423:10:423:12 | Run | ViableCallable.cs:411:36:411:40 | M`1 |
+| ViableCallable.cs:423:10:423:12 | Run | ViableCallable.cs:417:53:417:57 | M`1 |
+| ViableCallable.cs:423:10:423:12 | Run | ViableCallable.cs:419:42:419:46 | M`1 |
+| ViableCallable.cs:445:22:445:26 | M2`1 | ViableCallable.cs:470:14:470:29 | (...) => ... |
+| ViableCallable.cs:445:22:445:26 | M2`1 | ViableCallable.cs:476:14:476:29 | (...) => ... |
+| ViableCallable.cs:450:10:450:11 | M1 | ViableCallable.cs:444:23:444:24 | M1 |
+| ViableCallable.cs:450:10:450:11 | M1 | ViableCallable.cs:459:23:459:27 | M2`1 |
+| ViableCallable.cs:459:23:459:27 | M2`1 | ViableCallable.cs:456:17:456:23 | (...) => ... |
+| ViableCallable.cs:459:23:459:27 | M2`1 | ViableCallable.cs:464:14:464:20 | (...) => ... |
+| ViableCallable.cs:459:23:459:27 | M2`1 | ViableCallable.cs:470:14:470:29 | (...) => ... |
+| ViableCallable.cs:459:23:459:27 | M2`1 | ViableCallable.cs:476:14:476:29 | (...) => ... |
+| ViableCallable.cs:461:10:461:14 | M3`1 | ViableCallable.cs:459:23:459:27 | M2`1 |
+| ViableCallable.cs:467:10:467:14 | M4`1 | ViableCallable.cs:445:22:445:26 | M2`1 |
+| ViableCallable.cs:467:10:467:14 | M4`1 | ViableCallable.cs:459:23:459:27 | M2`1 |
+| ViableCallable.cs:473:10:473:14 | M5`1 | ViableCallable.cs:445:22:445:26 | M2`1 |
+| ViableCallable.cs:473:10:473:14 | M5`1 | ViableCallable.cs:459:23:459:27 | M2`1 |
+| ViableCallable.cs:490:10:490:12 | Run | ViableCallable.cs:483:10:483:11 | M2 |
+| ViableCallable.cs:490:10:490:12 | Run | ViableCallable.cs:488:17:488:18 | M1 |
+| ViableCallable.cs:507:10:507:12 | Run | ViableCallable.cs:502:32:502:32 | + |
+| ViableCallable.cs:507:10:507:12 | Run | ViableCallable.cs:503:40:503:40 | checked + |
+| ViableCallable.cs:507:10:507:12 | Run | ViableCallable.cs:504:28:504:35 | explicit conversion |
+| ViableCallable.cs:507:10:507:12 | Run | ViableCallable.cs:505:28:505:35 | checked explicit conversion |
+| ViableCallable.cs:557:10:557:15 | Run`1 | ViableCallable.cs:529:39:529:39 | checked - |
+| ViableCallable.cs:557:10:557:15 | Run`1 | ViableCallable.cs:531:31:531:31 | * |
+| ViableCallable.cs:557:10:557:15 | Run`1 | ViableCallable.cs:532:39:532:39 | checked * |
+| ViableCallable.cs:557:10:557:15 | Run`1 | ViableCallable.cs:534:31:534:31 | / |
+| ViableCallable.cs:557:10:557:15 | Run`1 | ViableCallable.cs:535:39:535:39 | checked / |
+| ViableCallable.cs:557:10:557:15 | Run`1 | ViableCallable.cs:539:18:539:20 | M12 |
+| ViableCallable.cs:557:10:557:15 | Run`1 | ViableCallable.cs:541:18:541:20 | M13 |
+| ViableCallable.cs:557:10:557:15 | Run`1 | ViableCallable.cs:546:32:546:32 | + |
+| ViableCallable.cs:557:10:557:15 | Run`1 | ViableCallable.cs:547:40:547:40 | checked + |
+| ViableCallable.cs:557:10:557:15 | Run`1 | ViableCallable.cs:549:32:549:32 | - |
+| ViableCallable.cs:557:10:557:15 | Run`1 | ViableCallable.cs:551:32:551:32 | / |
+| ViableCallable.cs:557:10:557:15 | Run`1 | ViableCallable.cs:552:40:552:40 | checked / |
+| ViableCallable.cs:557:10:557:15 | Run`1 | ViableCallable.cs:554:17:554:19 | M11 |
+| ViableCallable.cs:557:10:557:15 | Run`1 | ViableCallable.cs:555:17:555:19 | M12 |
+| ViableCallable.cs:611:17:611:23 | Run1`1 | ViableCallable.cs:603:21:603:21 | M |
+| ViableCallable.cs:617:17:617:23 | Run2`1 | ViableCallable.cs:603:21:603:21 | M |
+| ViableCallable.cs:617:17:617:23 | Run2`1 | ViableCallable.cs:608:21:608:21 | M |
+| ViableCallable.cs:658:17:658:20 | Run1 | ViableCallable.cs:636:21:636:21 | M |
+| ViableCallable.cs:658:17:658:20 | Run1 | ViableCallable.cs:638:21:638:21 | M |
+| ViableCallable.cs:669:17:669:20 | Run2 | ViableCallable.cs:652:21:652:21 | M |
+| ViableCallable.cs:669:17:669:20 | Run2 | ViableCallable.cs:655:21:655:21 | M |
+| ViableCallable.cs:680:17:680:20 | Run3 | ViableCallable.cs:636:21:636:21 | M |
+| ViableCallable.cs:680:17:680:20 | Run3 | ViableCallable.cs:638:21:638:21 | M |
+| ViableCallable.cs:680:17:680:20 | Run3 | ViableCallable.cs:647:21:647:21 | M |
+| ViableCallable.cs:680:17:680:20 | Run3 | ViableCallable.cs:649:21:649:21 | M |
+| ViableCallable.cs:712:17:712:20 | Run1 | ViableCallable.cs:705:24:705:31 | Partial1 |
+| ViableCallable.cs:712:17:712:20 | Run1 | ViableCallable.cs:706:42:706:44 | get_Property |
+| ViableCallable.cs:712:17:712:20 | Run1 | ViableCallable.cs:706:63:706:65 | set_Property |
+| ViableCallable.cs:712:17:712:20 | Run1 | ViableCallable.cs:708:49:708:51 | get_Item |
+| ViableCallable.cs:712:17:712:20 | Run1 | ViableCallable.cs:708:70:708:72 | set_Item |
+| ViableCallable.cs:712:17:712:20 | Run1 | ViableCallable.cs:709:51:709:53 | add_Event |
+| ViableCallable.cs:712:17:712:20 | Run1 | ViableCallable.cs:709:59:709:64 | remove_Event |
diff --git a/csharp/ql/test/library-tests/dispatch/GetADynamicTarget.expected b/csharp/ql/test/library-tests/dispatch/GetADynamicTarget.expected
index 5d6b4be4f87..82376653095 100644
--- a/csharp/ql/test/library-tests/dispatch/GetADynamicTarget.expected
+++ b/csharp/ql/test/library-tests/dispatch/GetADynamicTarget.expected
@@ -467,60 +467,61 @@
 | ViableCallable.cs:311:9:311:15 | call to method M<Int32> | C7`1.M<T3>(T1, T3) |
 | ViableCallable.cs:314:9:314:20 | call to method M<Int32> | C7`1.M<T3>(T1, T3) |
 | ViableCallable.cs:317:9:317:20 | call to method M<Int32> | C6<T1,System.Byte>.M<T3>(T1, T3) |
-| ViableCallable.cs:367:9:367:14 | dynamic call to method M | C11.M(dynamic) |
-| ViableCallable.cs:369:9:369:18 | dynamic object creation of type C11 | C11.C11(C11) |
-| ViableCallable.cs:392:9:392:13 | call to method M | C12+C13.M() |
-| ViableCallable.cs:397:9:397:14 | call to method Run<T2> | C12.Run<T2>(T2) |
-| ViableCallable.cs:402:9:402:23 | call to method Run2<C13> | C12.Run2<C13>(C13) |
-| ViableCallable.cs:425:9:425:18 | call to method M<Int32> | C15+A1.M<T1>() |
-| ViableCallable.cs:425:9:425:18 | call to method M<Int32> | C15+A4.M<T1>() |
-| ViableCallable.cs:425:9:425:18 | call to method M<Int32> | C15+A5.M<T1>() |
-| ViableCallable.cs:429:9:429:19 | call to method M<Boolean> | C15+A1.M<T1>() |
-| ViableCallable.cs:433:9:433:21 | call to method M<String> | C15+A4.M<T1>() |
-| ViableCallable.cs:435:13:435:37 | call to method Mock<A4> | ViableCallable.Mock<A4>() |
-| ViableCallable.cs:437:9:437:21 | call to method M<String> | C15+A4.M<T1>() |
-| ViableCallable.cs:437:9:437:21 | call to method M<String> | C15+A5.M<T1>() |
-| ViableCallable.cs:452:9:452:19 | call to method M1 | C16<System.String,System.Int32>.M1(string) |
-| ViableCallable.cs:455:9:455:24 | call to method M2<Int32> | C17.M2<T>(Func<T>) |
-| ViableCallable.cs:463:9:463:21 | call to method M2<String> | C17.M2<T>(Func<T>) |
-| ViableCallable.cs:469:9:469:30 | call to method M2<T> | C16<T,System.Int32>.M2<T>(Func<T>) |
-| ViableCallable.cs:469:9:469:30 | call to method M2<T> | C17.M2<T>(Func<T>) |
-| ViableCallable.cs:475:9:475:30 | call to method M2<T> | C16<T,System.Int32>.M2<T>(Func<T>) |
-| ViableCallable.cs:475:9:475:30 | call to method M2<T> | C17.M2<T>(Func<T>) |
-| ViableCallable.cs:492:9:492:14 | call to method M1 | C18.M1() |
-| ViableCallable.cs:495:9:495:14 | call to method M2 | I2.M2() |
-| ViableCallable.cs:509:18:509:22 | call to operator + | C19.+(C19, C19) |
-| ViableCallable.cs:512:26:512:30 | call to operator checked + | C19.checked +(C19, C19) |
-| ViableCallable.cs:515:18:515:23 | call to operator explicit conversion | C19.explicit conversion(C19) |
-| ViableCallable.cs:518:26:518:31 | call to operator checked explicit conversion | C19.checked explicit conversion(C19) |
-| ViableCallable.cs:559:18:559:22 | call to operator + | C20.+(C20, C20) |
-| ViableCallable.cs:562:26:562:30 | call to operator checked + | C20.checked +(C20, C20) |
-| ViableCallable.cs:565:18:565:22 | call to operator - | C20.-(C20, C20) |
-| ViableCallable.cs:568:26:568:30 | call to operator checked - | I3<T>.checked -(T, T) |
-| ViableCallable.cs:571:18:571:22 | call to operator * | I3<T>.*(T, T) |
-| ViableCallable.cs:574:26:574:30 | call to operator checked * | I3<T>.checked *(T, T) |
-| ViableCallable.cs:577:18:577:22 | call to operator / | C20./(C20, C20) |
-| ViableCallable.cs:577:18:577:22 | call to operator / | I3<T>./(T, T) |
-| ViableCallable.cs:580:26:580:30 | call to operator checked / | C20.checked /(C20, C20) |
-| ViableCallable.cs:580:26:580:30 | call to operator checked / | I3<T>.checked /(T, T) |
-| ViableCallable.cs:583:9:583:15 | call to method M11 | C20.M11() |
-| ViableCallable.cs:586:9:586:15 | call to method M12 | C20.M12() |
-| ViableCallable.cs:586:9:586:15 | call to method M12 | I3<T>.M12() |
-| ViableCallable.cs:589:9:589:15 | call to method M13 | I3<T>.M13() |
-| ViableCallable.cs:613:9:613:13 | call to method M | C21+A1.M() |
-| ViableCallable.cs:619:9:619:13 | call to method M | C21+A1.M() |
-| ViableCallable.cs:619:9:619:13 | call to method M | C21+A2.M() |
-| ViableCallable.cs:661:9:661:16 | call to method M | C22+TestOverloadResolution1<System.Int32>.M(Int32[]) |
-| ViableCallable.cs:665:9:665:16 | call to method M | C22+TestOverloadResolution1<System.Int32>.M(List<int>) |
-| ViableCallable.cs:672:9:672:16 | call to method M | C22+TestOverloadResolution2<System.Int32>.M(ReadOnlySpan<int>) |
-| ViableCallable.cs:676:9:676:16 | call to method M | C22+TestOverloadResolution2<System.Int32>.M(IEnumerable<int>) |
-| ViableCallable.cs:683:9:683:16 | call to method M | C22+TestOverloadResolution1<System.Int32>.M(Int32[]) |
-| ViableCallable.cs:683:9:683:16 | call to method M | C22+TestOverloadResolution2<System.Int32>.M(Int32[]) |
-| ViableCallable.cs:687:9:687:16 | call to method M | C22+TestOverloadResolution1<System.Int32>.M(List<int>) |
-| ViableCallable.cs:687:9:687:16 | call to method M | C22+TestOverloadResolution2<System.Int32>.M(List<int>) |
-| ViableCallable.cs:714:9:714:18 | access to property Property | C23+Partial1.set_Property(object) |
-| ViableCallable.cs:717:13:717:22 | access to property Property | C23+Partial1.get_Property() |
-| ViableCallable.cs:720:9:720:12 | access to indexer | C23+Partial1.set_Item(int, object) |
-| ViableCallable.cs:723:13:723:16 | access to indexer | C23+Partial1.get_Item(int) |
-| ViableCallable.cs:726:9:726:15 | access to event Event | C23+Partial1.add_Event(EventHandler) |
-| ViableCallable.cs:729:9:729:15 | access to event Event | C23+Partial1.remove_Event(EventHandler) |
+| ViableCallable.cs:368:9:368:14 | dynamic call to method M | C11.M(dynamic) |
+| ViableCallable.cs:370:9:370:18 | dynamic object creation of type C11 | C11.C11(C11) |
+| ViableCallable.cs:393:9:393:13 | call to method M | C12+C13.M() |
+| ViableCallable.cs:398:9:398:14 | call to method Run<T2> | C12.Run<T2>(T2) |
+| ViableCallable.cs:403:9:403:23 | call to method Run2<C13> | C12.Run2<C13>(C13) |
+| ViableCallable.cs:426:9:426:18 | call to method M<Int32> | C15+A1.M<T1>() |
+| ViableCallable.cs:426:9:426:18 | call to method M<Int32> | C15+A4.M<T1>() |
+| ViableCallable.cs:426:9:426:18 | call to method M<Int32> | C15+A5.M<T1>() |
+| ViableCallable.cs:430:9:430:19 | call to method M<Boolean> | C15+A1.M<T1>() |
+| ViableCallable.cs:434:9:434:21 | call to method M<String> | C15+A4.M<T1>() |
+| ViableCallable.cs:436:13:436:37 | call to method Mock<A4> | ViableCallable.Mock<A4>() |
+| ViableCallable.cs:438:9:438:21 | call to method M<String> | C15+A4.M<T1>() |
+| ViableCallable.cs:438:9:438:21 | call to method M<String> | C15+A5.M<T1>() |
+| ViableCallable.cs:453:9:453:19 | call to method M1 | C16<System.String,System.Int32>.M1(string) |
+| ViableCallable.cs:456:9:456:24 | call to method M2<Int32> | C17.M2<T>(Func<T>) |
+| ViableCallable.cs:464:9:464:21 | call to method M2<String> | C17.M2<T>(Func<T>) |
+| ViableCallable.cs:470:9:470:30 | call to method M2<T> | C16<T,System.Int32>.M2<T>(Func<T>) |
+| ViableCallable.cs:470:9:470:30 | call to method M2<T> | C17.M2<T>(Func<T>) |
+| ViableCallable.cs:476:9:476:30 | call to method M2<T> | C16<T,System.Int32>.M2<T>(Func<T>) |
+| ViableCallable.cs:476:9:476:30 | call to method M2<T> | C17.M2<T>(Func<T>) |
+| ViableCallable.cs:493:9:493:14 | call to method M1 | C18.M1() |
+| ViableCallable.cs:496:9:496:14 | call to method M2 | I2.M2() |
+| ViableCallable.cs:510:18:510:22 | call to operator + | C19.+(C19, C19) |
+| ViableCallable.cs:513:26:513:30 | call to operator checked + | C19.checked +(C19, C19) |
+| ViableCallable.cs:516:18:516:23 | call to operator explicit conversion | C19.explicit conversion(C19) |
+| ViableCallable.cs:519:26:519:31 | call to operator checked explicit conversion | C19.checked explicit conversion(C19) |
+| ViableCallable.cs:560:18:560:22 | call to operator + | C20.+(C20, C20) |
+| ViableCallable.cs:563:26:563:30 | call to operator checked + | C20.checked +(C20, C20) |
+| ViableCallable.cs:566:18:566:22 | call to operator - | C20.-(C20, C20) |
+| ViableCallable.cs:569:26:569:30 | call to operator checked - | I3<T>.checked -(T, T) |
+| ViableCallable.cs:572:18:572:22 | call to operator * | I3<T>.*(T, T) |
+| ViableCallable.cs:575:26:575:30 | call to operator checked * | I3<T>.checked *(T, T) |
+| ViableCallable.cs:578:18:578:22 | call to operator / | C20./(C20, C20) |
+| ViableCallable.cs:578:18:578:22 | call to operator / | I3<T>./(T, T) |
+| ViableCallable.cs:581:26:581:30 | call to operator checked / | C20.checked /(C20, C20) |
+| ViableCallable.cs:581:26:581:30 | call to operator checked / | I3<T>.checked /(T, T) |
+| ViableCallable.cs:584:9:584:15 | call to method M11 | C20.M11() |
+| ViableCallable.cs:587:9:587:15 | call to method M12 | C20.M12() |
+| ViableCallable.cs:587:9:587:15 | call to method M12 | I3<T>.M12() |
+| ViableCallable.cs:590:9:590:15 | call to method M13 | I3<T>.M13() |
+| ViableCallable.cs:614:9:614:13 | call to method M | C21+A1.M() |
+| ViableCallable.cs:620:9:620:13 | call to method M | C21+A1.M() |
+| ViableCallable.cs:620:9:620:13 | call to method M | C21+A2.M() |
+| ViableCallable.cs:662:9:662:16 | call to method M | C22+TestOverloadResolution1<System.Int32>.M(Int32[]) |
+| ViableCallable.cs:666:9:666:16 | call to method M | C22+TestOverloadResolution1<System.Int32>.M(List<int>) |
+| ViableCallable.cs:673:9:673:16 | call to method M | C22+TestOverloadResolution2<System.Int32>.M(ReadOnlySpan<int>) |
+| ViableCallable.cs:677:9:677:16 | call to method M | C22+TestOverloadResolution2<System.Int32>.M(IEnumerable<int>) |
+| ViableCallable.cs:684:9:684:16 | call to method M | C22+TestOverloadResolution1<System.Int32>.M(Int32[]) |
+| ViableCallable.cs:684:9:684:16 | call to method M | C22+TestOverloadResolution2<System.Int32>.M(Int32[]) |
+| ViableCallable.cs:688:9:688:16 | call to method M | C22+TestOverloadResolution1<System.Int32>.M(List<int>) |
+| ViableCallable.cs:688:9:688:16 | call to method M | C22+TestOverloadResolution2<System.Int32>.M(List<int>) |
+| ViableCallable.cs:717:9:717:18 | access to property Property | C23+Partial1.set_Property(object) |
+| ViableCallable.cs:720:13:720:22 | access to property Property | C23+Partial1.get_Property() |
+| ViableCallable.cs:723:9:723:12 | access to indexer | C23+Partial1.set_Item(int, object) |
+| ViableCallable.cs:726:13:726:16 | access to indexer | C23+Partial1.get_Item(int) |
+| ViableCallable.cs:729:9:729:15 | access to event Event | C23+Partial1.add_Event(EventHandler) |
+| ViableCallable.cs:732:9:732:15 | access to event Event | C23+Partial1.remove_Event(EventHandler) |
+| ViableCallable.cs:735:18:735:43 | object creation of type Partial1 | C23+Partial1.Partial1(object) |
diff --git a/csharp/ql/test/library-tests/dispatch/ViableCallable.cs b/csharp/ql/test/library-tests/dispatch/ViableCallable.cs
index e904eb01a86..61dfef7444c 100644
--- a/csharp/ql/test/library-tests/dispatch/ViableCallable.cs
+++ b/csharp/ql/test/library-tests/dispatch/ViableCallable.cs
@@ -362,6 +362,7 @@ public class C11
     {
         dynamic d = this;
         int x = 0;
+        // Viable callables: int.+
         x += 42;
         // Viable callables: C11.M()
         d.M(x);
@@ -692,6 +693,7 @@ public class C23
 {
     public partial class Partial1
     {
+        public partial Partial1(object obj);
         public partial object Property { get; set; }
 
         public partial object this[int index] { get; set; }
@@ -700,6 +702,7 @@ public class C23
 
     public partial class Partial1
     {
+        public partial Partial1(object obj) { }
         public partial object Property { get { return null; } set { } }
 
         public partial object this[int index] { get { return null; } set { } }
@@ -727,5 +730,8 @@ public class C23
 
         // Viable callable: Partial1.remove_Event
         p.Event -= (sender, e) => { };
+
+        // Viable callable: Partial1.Partial1(object)
+        var p0 = new Partial1(new object());
     }
 }
diff --git a/csharp/ql/test/library-tests/dispatch/viableCallable.expected b/csharp/ql/test/library-tests/dispatch/viableCallable.expected
index c4abbbd2e58..8791bd0ae41 100644
--- a/csharp/ql/test/library-tests/dispatch/viableCallable.expected
+++ b/csharp/ql/test/library-tests/dispatch/viableCallable.expected
@@ -271,35 +271,36 @@
 | ViableCallable.cs:311:9:311:15 | call to method M<Int32> | M`1 | C7`1 |
 | ViableCallable.cs:314:9:314:20 | call to method M<Int32> | M`1 | C7`1 |
 | ViableCallable.cs:317:9:317:20 | call to method M<Int32> | M`1 | C6`2 |
-| ViableCallable.cs:367:9:367:14 | dynamic call to method M | M | C11 |
-| ViableCallable.cs:369:9:369:18 | dynamic object creation of type C11 | C11 | C11 |
-| ViableCallable.cs:392:9:392:13 | call to method M | M | C13 |
-| ViableCallable.cs:425:9:425:18 | call to method M<Int32> | M`1 | A1 |
-| ViableCallable.cs:425:9:425:18 | call to method M<Int32> | M`1 | A4 |
-| ViableCallable.cs:425:9:425:18 | call to method M<Int32> | M`1 | A5 |
-| ViableCallable.cs:427:13:427:20 | object creation of type A3 | A3 | A3 |
-| ViableCallable.cs:429:9:429:19 | call to method M<Boolean> | M`1 | A1 |
-| ViableCallable.cs:431:13:431:20 | object creation of type A4 | A4 | A4 |
-| ViableCallable.cs:433:9:433:21 | call to method M<String> | M`1 | A4 |
-| ViableCallable.cs:437:9:437:21 | call to method M<String> | M`1 | A4 |
-| ViableCallable.cs:437:9:437:21 | call to method M<String> | M`1 | A5 |
-| ViableCallable.cs:492:9:492:14 | call to method M1 | M1 | C18 |
-| ViableCallable.cs:495:9:495:14 | call to method M2 | M2 | I2 |
-| ViableCallable.cs:509:18:509:22 | call to operator + | + | C19 |
-| ViableCallable.cs:512:26:512:30 | call to operator checked + | checked + | C19 |
-| ViableCallable.cs:515:18:515:23 | call to operator explicit conversion | explicit conversion | C19 |
-| ViableCallable.cs:518:26:518:31 | call to operator checked explicit conversion | checked explicit conversion | C19 |
-| ViableCallable.cs:559:18:559:22 | call to operator + | + | C20 |
-| ViableCallable.cs:562:26:562:30 | call to operator checked + | checked + | C20 |
-| ViableCallable.cs:565:18:565:22 | call to operator - | - | C20 |
-| ViableCallable.cs:568:26:568:30 | call to operator checked - | checked - | I3`1 |
-| ViableCallable.cs:571:18:571:22 | call to operator * | * | I3`1 |
-| ViableCallable.cs:574:26:574:30 | call to operator checked * | checked * | I3`1 |
-| ViableCallable.cs:577:18:577:22 | call to operator / | / | C20 |
-| ViableCallable.cs:577:18:577:22 | call to operator / | / | I3`1 |
-| ViableCallable.cs:580:26:580:30 | call to operator checked / | checked / | C20 |
-| ViableCallable.cs:580:26:580:30 | call to operator checked / | checked / | I3`1 |
-| ViableCallable.cs:583:9:583:15 | call to method M11 | M11 | C20 |
-| ViableCallable.cs:586:9:586:15 | call to method M12 | M12 | C20 |
-| ViableCallable.cs:586:9:586:15 | call to method M12 | M12 | I3`1 |
-| ViableCallable.cs:589:9:589:15 | call to method M13 | M13 | I3`1 |
+| ViableCallable.cs:366:9:366:15 | ... += ... | + | Int32 |
+| ViableCallable.cs:368:9:368:14 | dynamic call to method M | M | C11 |
+| ViableCallable.cs:370:9:370:18 | dynamic object creation of type C11 | C11 | C11 |
+| ViableCallable.cs:393:9:393:13 | call to method M | M | C13 |
+| ViableCallable.cs:426:9:426:18 | call to method M<Int32> | M`1 | A1 |
+| ViableCallable.cs:426:9:426:18 | call to method M<Int32> | M`1 | A4 |
+| ViableCallable.cs:426:9:426:18 | call to method M<Int32> | M`1 | A5 |
+| ViableCallable.cs:428:13:428:20 | object creation of type A3 | A3 | A3 |
+| ViableCallable.cs:430:9:430:19 | call to method M<Boolean> | M`1 | A1 |
+| ViableCallable.cs:432:13:432:20 | object creation of type A4 | A4 | A4 |
+| ViableCallable.cs:434:9:434:21 | call to method M<String> | M`1 | A4 |
+| ViableCallable.cs:438:9:438:21 | call to method M<String> | M`1 | A4 |
+| ViableCallable.cs:438:9:438:21 | call to method M<String> | M`1 | A5 |
+| ViableCallable.cs:493:9:493:14 | call to method M1 | M1 | C18 |
+| ViableCallable.cs:496:9:496:14 | call to method M2 | M2 | I2 |
+| ViableCallable.cs:510:18:510:22 | call to operator + | + | C19 |
+| ViableCallable.cs:513:26:513:30 | call to operator checked + | checked + | C19 |
+| ViableCallable.cs:516:18:516:23 | call to operator explicit conversion | explicit conversion | C19 |
+| ViableCallable.cs:519:26:519:31 | call to operator checked explicit conversion | checked explicit conversion | C19 |
+| ViableCallable.cs:560:18:560:22 | call to operator + | + | C20 |
+| ViableCallable.cs:563:26:563:30 | call to operator checked + | checked + | C20 |
+| ViableCallable.cs:566:18:566:22 | call to operator - | - | C20 |
+| ViableCallable.cs:569:26:569:30 | call to operator checked - | checked - | I3`1 |
+| ViableCallable.cs:572:18:572:22 | call to operator * | * | I3`1 |
+| ViableCallable.cs:575:26:575:30 | call to operator checked * | checked * | I3`1 |
+| ViableCallable.cs:578:18:578:22 | call to operator / | / | C20 |
+| ViableCallable.cs:578:18:578:22 | call to operator / | / | I3`1 |
+| ViableCallable.cs:581:26:581:30 | call to operator checked / | checked / | C20 |
+| ViableCallable.cs:581:26:581:30 | call to operator checked / | checked / | I3`1 |
+| ViableCallable.cs:584:9:584:15 | call to method M11 | M11 | C20 |
+| ViableCallable.cs:587:9:587:15 | call to method M12 | M12 | C20 |
+| ViableCallable.cs:587:9:587:15 | call to method M12 | M12 | I3`1 |
+| ViableCallable.cs:590:9:590:15 | call to method M13 | M13 | I3`1 |
diff --git a/csharp/ql/test/library-tests/dynamic/DynamicOperatorCall.expected b/csharp/ql/test/library-tests/dynamic/DynamicOperatorCall.expected
index 6c0a054c84a..6e98bffaf6f 100644
--- a/csharp/ql/test/library-tests/dynamic/DynamicOperatorCall.expected
+++ b/csharp/ql/test/library-tests/dynamic/DynamicOperatorCall.expected
@@ -1,6 +1,6 @@
 | dynamic.cs:35:13:35:14 | dynamic call to operator - | - | 0 | dynamic.cs:35:14:35:14 | access to local variable d |
 | dynamic.cs:36:13:36:17 | dynamic call to operator + | + | 0 | dynamic.cs:36:13:36:13 | access to local variable d |
 | dynamic.cs:36:13:36:17 | dynamic call to operator + | + | 1 | dynamic.cs:36:17:36:17 | access to local variable d |
-| dynamic.cs:37:9:37:14 | dynamic call to operator + | + | 0 | dynamic.cs:37:9:37:9 | access to local variable d |
-| dynamic.cs:37:9:37:14 | dynamic call to operator + | + | 1 | dynamic.cs:37:14:37:14 | access to local variable d |
+| dynamic.cs:37:9:37:14 | ... += ... | + | 0 | dynamic.cs:37:9:37:9 | access to local variable d |
+| dynamic.cs:37:9:37:14 | ... += ... | + | 1 | dynamic.cs:37:14:37:14 | access to local variable d |
 | dynamic.cs:47:9:47:11 | dynamic call to operator ++ | ++ | 0 | dynamic.cs:47:9:47:9 | access to local variable d |
diff --git a/csharp/ql/test/library-tests/dynamic/PrintAst.expected b/csharp/ql/test/library-tests/dynamic/PrintAst.expected
index 3bde4d42d86..3526e0b6bf5 100644
--- a/csharp/ql/test/library-tests/dynamic/PrintAst.expected
+++ b/csharp/ql/test/library-tests/dynamic/PrintAst.expected
@@ -105,12 +105,12 @@ dynamic.cs:
 #   35|       15: [ExprStmt] ...;
 #   35|         0: [AssignExpr] ... = ...
 #   35|           0: [LocalVariableAccess] access to local variable d
-#   35|           1: [DynamicOperatorCall] dynamic call to operator -
+#   35|           1: [OperatorCall] dynamic call to operator -
 #   35|             0: [LocalVariableAccess] access to local variable d
 #   36|       16: [ExprStmt] ...;
 #   36|         0: [AssignExpr] ... = ...
 #   36|           0: [LocalVariableAccess] access to local variable d
-#   36|           1: [DynamicOperatorCall] dynamic call to operator +
+#   36|           1: [OperatorCall] dynamic call to operator +
 #   36|             0: [LocalVariableAccess] access to local variable d
 #   36|             1: [LocalVariableAccess] access to local variable d
 #   37|       17: [ExprStmt] ...;
@@ -141,7 +141,7 @@ dynamic.cs:
 #   44|         0: [PostIncrExpr] ...++
 #   44|           0: [LocalVariableAccess] access to local variable i
 #   47|       23: [ExprStmt] ...;
-#   47|         0: [DynamicOperatorCall] dynamic call to operator ++
+#   47|         0: [OperatorCall] dynamic call to operator ++
 #   47|           0: [LocalVariableAccess] access to local variable d
 #   50|       24: [ExprStmt] ...;
 #   50|         0: [PostIncrExpr] ...++
diff --git a/csharp/ql/test/library-tests/linq/Linq2.ql b/csharp/ql/test/library-tests/linq/Linq2.ql
index b3909f88b70..5f1fc3de85b 100644
--- a/csharp/ql/test/library-tests/linq/Linq2.ql
+++ b/csharp/ql/test/library-tests/linq/Linq2.ql
@@ -5,4 +5,5 @@
 import csharp
 
 from BinaryOperation e
+where not e instanceof Assignment
 select e, e.getAnOperand()
diff --git a/csharp/ql/test/library-tests/partial/MethodIsPartial.expected b/csharp/ql/test/library-tests/partial/MethodIsPartial.expected
index a0f1f88fb98..484540d72b2 100644
--- a/csharp/ql/test/library-tests/partial/MethodIsPartial.expected
+++ b/csharp/ql/test/library-tests/partial/MethodIsPartial.expected
@@ -1,7 +1,8 @@
-| Partial.cs:6:18:6:42 | PartialMethodWithoutBody1 | true |
-| Partial.cs:7:17:7:23 | Method2 | false |
-| Partial.cs:18:18:18:39 | PartialMethodWithBody1 | true |
-| Partial.cs:19:17:19:23 | Method3 | false |
-| Partial.cs:41:18:41:42 | PartialMethodWithoutBody2 | true |
-| Partial.cs:42:17:42:23 | Method4 | false |
-| Partial.cs:47:17:47:23 | Method5 | false |
+| Partial.cs:9:18:9:42 | PartialMethodWithoutBody1 | true |
+| Partial.cs:10:17:10:23 | Method2 | false |
+| Partial.cs:23:18:23:39 | PartialMethodWithBody1 | true |
+| Partial.cs:24:27:24:48 | PartialMethodWithBody2 | true |
+| Partial.cs:28:17:28:23 | Method3 | false |
+| Partial.cs:50:18:50:42 | PartialMethodWithoutBody2 | true |
+| Partial.cs:51:17:51:23 | Method4 | false |
+| Partial.cs:57:17:57:23 | Method5 | false |
diff --git a/csharp/ql/test/library-tests/partial/Partial.cs b/csharp/ql/test/library-tests/partial/Partial.cs
index 8dd757fcd24..6ab87c95e8b 100644
--- a/csharp/ql/test/library-tests/partial/Partial.cs
+++ b/csharp/ql/test/library-tests/partial/Partial.cs
@@ -2,7 +2,10 @@ using System;
 
 partial class TwoPartClass
 {
+    // Declaring declaration.
+    public partial TwoPartClass(object obj);
     partial void PartialMethodWithBody1();
+    public partial object PartialMethodWithBody2(object obj);
     partial void PartialMethodWithoutBody1();
     public void Method2() { }
     // Declaring declaration.
@@ -15,7 +18,13 @@ partial class TwoPartClass
 
 partial class TwoPartClass
 {
+    // Implementation declaration.
+    public partial TwoPartClass(object obj) { }
     partial void PartialMethodWithBody1() { }
+    public partial object PartialMethodWithBody2(object obj)
+    {
+        return obj;
+    }
     public void Method3() { }
     private object _backingField;
     // Implementation declaration.
@@ -44,6 +53,7 @@ partial class OnePartPartialClass
 
 class NonPartialClass
 {
+    public NonPartialClass(object obj) { }
     public void Method5() { }
     public object Property { get; set; }
     public object this[int index]
diff --git a/csharp/ql/test/library-tests/partial/Partial1.expected b/csharp/ql/test/library-tests/partial/Partial1.expected
index fe8f5658f48..b5421182c8d 100644
--- a/csharp/ql/test/library-tests/partial/Partial1.expected
+++ b/csharp/ql/test/library-tests/partial/Partial1.expected
@@ -1,17 +1,19 @@
 | Partial.cs:3:15:3:26 | TwoPartClass |
-| Partial.cs:6:18:6:42 | PartialMethodWithoutBody1 |
-| Partial.cs:16:15:16:26 | TwoPartClass |
-| Partial.cs:18:18:18:39 | PartialMethodWithBody1 |
-| Partial.cs:22:27:22:42 | PartialProperty1 |
-| Partial.cs:24:9:24:11 | get_PartialProperty1 |
-| Partial.cs:25:9:25:11 | set_PartialProperty1 |
-| Partial.cs:29:27:29:30 | Item |
-| Partial.cs:31:9:31:11 | get_Item |
-| Partial.cs:32:9:32:11 | set_Item |
-| Partial.cs:36:39:36:51 | PartialEvent1 |
-| Partial.cs:36:55:36:57 | add_PartialEvent1 |
-| Partial.cs:36:63:36:68 | remove_PartialEvent1 |
-| Partial.cs:39:15:39:33 | OnePartPartialClass |
-| Partial.cs:41:18:41:42 | PartialMethodWithoutBody2 |
+| Partial.cs:9:18:9:42 | PartialMethodWithoutBody1 |
+| Partial.cs:19:15:19:26 | TwoPartClass |
+| Partial.cs:22:20:22:31 | TwoPartClass |
+| Partial.cs:23:18:23:39 | PartialMethodWithBody1 |
+| Partial.cs:24:27:24:48 | PartialMethodWithBody2 |
+| Partial.cs:31:27:31:42 | PartialProperty1 |
+| Partial.cs:33:9:33:11 | get_PartialProperty1 |
+| Partial.cs:34:9:34:11 | set_PartialProperty1 |
+| Partial.cs:38:27:38:30 | Item |
+| Partial.cs:40:9:40:11 | get_Item |
+| Partial.cs:41:9:41:11 | set_Item |
+| Partial.cs:45:39:45:51 | PartialEvent1 |
+| Partial.cs:45:55:45:57 | add_PartialEvent1 |
+| Partial.cs:45:63:45:68 | remove_PartialEvent1 |
+| Partial.cs:48:15:48:33 | OnePartPartialClass |
+| Partial.cs:50:18:50:42 | PartialMethodWithoutBody2 |
 | PartialMultipleFiles1.cs:1:22:1:41 | PartialMultipleFiles |
 | PartialMultipleFiles2.cs:1:22:1:41 | PartialMultipleFiles |
diff --git a/csharp/ql/test/library-tests/partial/Partial2.expected b/csharp/ql/test/library-tests/partial/Partial2.expected
index 8d608c26011..4d5e0aa79a4 100644
--- a/csharp/ql/test/library-tests/partial/Partial2.expected
+++ b/csharp/ql/test/library-tests/partial/Partial2.expected
@@ -1,15 +1,17 @@
 | Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:3:15:3:26 | <object initializer> |
-| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:6:18:6:42 | PartialMethodWithoutBody1 |
-| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:7:17:7:23 | Method2 |
-| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:18:18:18:39 | PartialMethodWithBody1 |
-| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:19:17:19:23 | Method3 |
-| Partial.cs:16:15:16:26 | TwoPartClass | Partial.cs:3:15:3:26 | <object initializer> |
-| Partial.cs:16:15:16:26 | TwoPartClass | Partial.cs:6:18:6:42 | PartialMethodWithoutBody1 |
-| Partial.cs:16:15:16:26 | TwoPartClass | Partial.cs:7:17:7:23 | Method2 |
-| Partial.cs:16:15:16:26 | TwoPartClass | Partial.cs:18:18:18:39 | PartialMethodWithBody1 |
-| Partial.cs:16:15:16:26 | TwoPartClass | Partial.cs:19:17:19:23 | Method3 |
-| Partial.cs:39:15:39:33 | OnePartPartialClass | Partial.cs:39:15:39:33 | <object initializer> |
-| Partial.cs:39:15:39:33 | OnePartPartialClass | Partial.cs:41:18:41:42 | PartialMethodWithoutBody2 |
-| Partial.cs:39:15:39:33 | OnePartPartialClass | Partial.cs:42:17:42:23 | Method4 |
+| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:9:18:9:42 | PartialMethodWithoutBody1 |
+| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:10:17:10:23 | Method2 |
+| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:23:18:23:39 | PartialMethodWithBody1 |
+| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:24:27:24:48 | PartialMethodWithBody2 |
+| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:28:17:28:23 | Method3 |
+| Partial.cs:19:15:19:26 | TwoPartClass | Partial.cs:3:15:3:26 | <object initializer> |
+| Partial.cs:19:15:19:26 | TwoPartClass | Partial.cs:9:18:9:42 | PartialMethodWithoutBody1 |
+| Partial.cs:19:15:19:26 | TwoPartClass | Partial.cs:10:17:10:23 | Method2 |
+| Partial.cs:19:15:19:26 | TwoPartClass | Partial.cs:23:18:23:39 | PartialMethodWithBody1 |
+| Partial.cs:19:15:19:26 | TwoPartClass | Partial.cs:24:27:24:48 | PartialMethodWithBody2 |
+| Partial.cs:19:15:19:26 | TwoPartClass | Partial.cs:28:17:28:23 | Method3 |
+| Partial.cs:48:15:48:33 | OnePartPartialClass | Partial.cs:48:15:48:33 | <object initializer> |
+| Partial.cs:48:15:48:33 | OnePartPartialClass | Partial.cs:50:18:50:42 | PartialMethodWithoutBody2 |
+| Partial.cs:48:15:48:33 | OnePartPartialClass | Partial.cs:51:17:51:23 | Method4 |
 | PartialMultipleFiles1.cs:1:22:1:41 | PartialMultipleFiles | PartialMultipleFiles1.cs:1:22:1:41 | <object initializer> |
 | PartialMultipleFiles2.cs:1:22:1:41 | PartialMultipleFiles | PartialMultipleFiles1.cs:1:22:1:41 | <object initializer> |
diff --git a/csharp/ql/test/library-tests/partial/PartialAccessors.expected b/csharp/ql/test/library-tests/partial/PartialAccessors.expected
index a9d70645420..c09756d252e 100644
--- a/csharp/ql/test/library-tests/partial/PartialAccessors.expected
+++ b/csharp/ql/test/library-tests/partial/PartialAccessors.expected
@@ -1,12 +1,12 @@
-| Partial.cs:24:9:24:11 | get_PartialProperty1 | true |
-| Partial.cs:25:9:25:11 | set_PartialProperty1 | true |
-| Partial.cs:31:9:31:11 | get_Item | true |
-| Partial.cs:32:9:32:11 | set_Item | true |
-| Partial.cs:36:55:36:57 | add_PartialEvent1 | true |
-| Partial.cs:36:63:36:68 | remove_PartialEvent1 | true |
-| Partial.cs:48:30:48:32 | get_Property | false |
-| Partial.cs:48:35:48:37 | set_Property | false |
-| Partial.cs:51:9:51:11 | get_Item | false |
-| Partial.cs:52:9:52:11 | set_Item | false |
-| Partial.cs:54:31:54:35 | add_Event | false |
-| Partial.cs:54:31:54:35 | remove_Event | false |
+| Partial.cs:33:9:33:11 | get_PartialProperty1 | true |
+| Partial.cs:34:9:34:11 | set_PartialProperty1 | true |
+| Partial.cs:40:9:40:11 | get_Item | true |
+| Partial.cs:41:9:41:11 | set_Item | true |
+| Partial.cs:45:55:45:57 | add_PartialEvent1 | true |
+| Partial.cs:45:63:45:68 | remove_PartialEvent1 | true |
+| Partial.cs:58:30:58:32 | get_Property | false |
+| Partial.cs:58:35:58:37 | set_Property | false |
+| Partial.cs:61:9:61:11 | get_Item | false |
+| Partial.cs:62:9:62:11 | set_Item | false |
+| Partial.cs:64:31:64:35 | add_Event | false |
+| Partial.cs:64:31:64:35 | remove_Event | false |
diff --git a/csharp/ql/test/library-tests/partial/PartialConstructors.expected b/csharp/ql/test/library-tests/partial/PartialConstructors.expected
index 69cabb244f5..943ac0ae4b6 100644
--- a/csharp/ql/test/library-tests/partial/PartialConstructors.expected
+++ b/csharp/ql/test/library-tests/partial/PartialConstructors.expected
@@ -1,4 +1,4 @@
-| Partial.cs:3:15:3:26 | TwoPartClass | Partial.cs:3:15:3:26 | {...} |
-| Partial.cs:39:15:39:33 | OnePartPartialClass | Partial.cs:39:15:39:33 | {...} |
-| Partial.cs:45:7:45:21 | NonPartialClass | Partial.cs:45:7:45:21 | {...} |
+| Partial.cs:22:20:22:31 | TwoPartClass | Partial.cs:22:45:22:47 | {...} |
+| Partial.cs:48:15:48:33 | OnePartPartialClass | Partial.cs:48:15:48:33 | {...} |
+| Partial.cs:56:12:56:26 | NonPartialClass | Partial.cs:56:40:56:42 | {...} |
 | PartialMultipleFiles1.cs:1:22:1:41 | PartialMultipleFiles | PartialMultipleFiles1.cs:1:22:1:41 | {...} |
diff --git a/csharp/ql/test/library-tests/partial/PartialEvents.expected b/csharp/ql/test/library-tests/partial/PartialEvents.expected
index b12f8a07a9d..4c7e610c37d 100644
--- a/csharp/ql/test/library-tests/partial/PartialEvents.expected
+++ b/csharp/ql/test/library-tests/partial/PartialEvents.expected
@@ -1,2 +1,2 @@
-| Partial.cs:36:39:36:51 | PartialEvent1 | true |
-| Partial.cs:54:31:54:35 | Event | false |
+| Partial.cs:45:39:45:51 | PartialEvent1 | true |
+| Partial.cs:64:31:64:35 | Event | false |
diff --git a/csharp/ql/test/library-tests/partial/PartialIndexers.expected b/csharp/ql/test/library-tests/partial/PartialIndexers.expected
index be625fc4ad5..425a9897a47 100644
--- a/csharp/ql/test/library-tests/partial/PartialIndexers.expected
+++ b/csharp/ql/test/library-tests/partial/PartialIndexers.expected
@@ -1,2 +1,2 @@
-| Partial.cs:29:27:29:30 | Item | true |
-| Partial.cs:49:19:49:22 | Item | false |
+| Partial.cs:38:27:38:30 | Item | true |
+| Partial.cs:59:19:59:22 | Item | false |
diff --git a/csharp/ql/test/library-tests/partial/PartialMethodBody.expected b/csharp/ql/test/library-tests/partial/PartialMethodBody.expected
index a91a156cb62..c15189262ca 100644
--- a/csharp/ql/test/library-tests/partial/PartialMethodBody.expected
+++ b/csharp/ql/test/library-tests/partial/PartialMethodBody.expected
@@ -1,3 +1,4 @@
-| Partial.cs:6:18:6:42 | PartialMethodWithoutBody1 | false |
-| Partial.cs:18:18:18:39 | PartialMethodWithBody1 | true |
-| Partial.cs:41:18:41:42 | PartialMethodWithoutBody2 | false |
+| Partial.cs:9:18:9:42 | PartialMethodWithoutBody1 | false | 0 |
+| Partial.cs:23:18:23:39 | PartialMethodWithBody1 | true | 1 |
+| Partial.cs:24:27:24:48 | PartialMethodWithBody2 | true | 1 |
+| Partial.cs:50:18:50:42 | PartialMethodWithoutBody2 | false | 0 |
diff --git a/csharp/ql/test/library-tests/partial/PartialMethodBody.ql b/csharp/ql/test/library-tests/partial/PartialMethodBody.ql
index 53cb9be250a..9b01ffa0a69 100644
--- a/csharp/ql/test/library-tests/partial/PartialMethodBody.ql
+++ b/csharp/ql/test/library-tests/partial/PartialMethodBody.ql
@@ -4,4 +4,4 @@ private boolean hasBody(Method m) { if m.hasBody() then result = true else resul
 
 from Method m
 where m.fromSource() and m.isPartial()
-select m, hasBody(m)
+select m, hasBody(m), count(m.getBody())
diff --git a/csharp/ql/test/library-tests/partial/PartialProperties.expected b/csharp/ql/test/library-tests/partial/PartialProperties.expected
index 4686bbf087a..5510fd53ad6 100644
--- a/csharp/ql/test/library-tests/partial/PartialProperties.expected
+++ b/csharp/ql/test/library-tests/partial/PartialProperties.expected
@@ -1,2 +1,2 @@
-| Partial.cs:22:27:22:42 | PartialProperty1 | true |
-| Partial.cs:48:19:48:26 | Property | false |
+| Partial.cs:31:27:31:42 | PartialProperty1 | true |
+| Partial.cs:58:19:58:26 | Property | false |
diff --git a/csharp/ql/test/library-tests/partial/PrintAst.expected b/csharp/ql/test/library-tests/partial/PrintAst.expected
index 315de869fb3..c49afdc169f 100644
--- a/csharp/ql/test/library-tests/partial/PrintAst.expected
+++ b/csharp/ql/test/library-tests/partial/PrintAst.expected
@@ -1,112 +1,126 @@
 Partial.cs:
 #    3| [Class] TwoPartClass
-#    6|   6: [Method] PartialMethodWithoutBody1
-#    6|     -1: [TypeMention] Void
-#    7|   7: [Method] Method2
-#    7|     -1: [TypeMention] Void
-#    7|     4: [BlockStmt] {...}
-#   18|   8: [Method] PartialMethodWithBody1
-#    5|     -1: [TypeMention] Void
-#   18|     4: [BlockStmt] {...}
-#   19|   9: [Method] Method3
-#   19|     -1: [TypeMention] Void
-#   19|     4: [BlockStmt] {...}
-#   20|   10: [Field] _backingField
-#   20|     -1: [TypeMention] object
-#   22|   11: [Property] PartialProperty1
-#    9|     -1: [TypeMention] object
-#   22|     -1: [TypeMention] object
-#   24|     3: [Getter] get_PartialProperty1
-#   24|       4: [BlockStmt] {...}
-#   24|         0: [ReturnStmt] return ...;
-#   24|           0: [FieldAccess] access to field _backingField
-#   25|     4: [Setter] set_PartialProperty1
-#-----|       2: (Parameters)
-#   25|         0: [Parameter] value
-#   25|       4: [BlockStmt] {...}
-#   25|         0: [ExprStmt] ...;
-#   25|           0: [AssignExpr] ... = ...
-#   25|             0: [FieldAccess] access to field _backingField
-#   25|             1: [ParameterAccess] access to parameter value
-#   27|   12: [Field] _backingArray
-#   27|     -1: [TypeMention] Object[]
-#   27|       1: [TypeMention] object
-#   29|   13: [Indexer] Item
-#   11|     -1: [TypeMention] object
+#    9|   5: [Method] PartialMethodWithoutBody1
+#    9|     -1: [TypeMention] Void
+#   10|   6: [Method] Method2
+#   10|     -1: [TypeMention] Void
+#   10|     4: [BlockStmt] {...}
+#   22|   7: [InstanceConstructor] TwoPartClass
+#-----|     2: (Parameters)
+#   22|       0: [Parameter] obj
+#   22|         -1: [TypeMention] object
+#   22|     4: [BlockStmt] {...}
+#   23|   8: [Method] PartialMethodWithBody1
+#   23|     -1: [TypeMention] Void
+#   23|     4: [BlockStmt] {...}
+#   24|   9: [Method] PartialMethodWithBody2
+#   24|     -1: [TypeMention] object
+#-----|     2: (Parameters)
+#   24|       0: [Parameter] obj
+#   24|         -1: [TypeMention] object
+#   25|     4: [BlockStmt] {...}
+#   26|       0: [ReturnStmt] return ...;
+#   26|         0: [ParameterAccess] access to parameter obj
+#   28|   10: [Method] Method3
+#   28|     -1: [TypeMention] Void
+#   28|     4: [BlockStmt] {...}
+#   29|   11: [Field] _backingField
 #   29|     -1: [TypeMention] object
+#   31|   12: [Property] PartialProperty1
+#   31|     -1: [TypeMention] object
+#   33|     3: [Getter] get_PartialProperty1
+#   33|       4: [BlockStmt] {...}
+#   33|         0: [ReturnStmt] return ...;
+#   33|           0: [FieldAccess] access to field _backingField
+#   34|     4: [Setter] set_PartialProperty1
+#-----|       2: (Parameters)
+#   34|         0: [Parameter] value
+#   34|       4: [BlockStmt] {...}
+#   34|         0: [ExprStmt] ...;
+#   34|           0: [AssignExpr] ... = ...
+#   34|             0: [FieldAccess] access to field _backingField
+#   34|             1: [ParameterAccess] access to parameter value
+#   36|   13: [Field] _backingArray
+#   36|     -1: [TypeMention] Object[]
+#   36|       1: [TypeMention] object
+#   38|   14: [Indexer] Item
+#   38|     -1: [TypeMention] object
 #-----|     1: (Parameters)
-#   11|       0: [Parameter] index
-#   11|         -1: [TypeMention] int
-#   29|         -1: [TypeMention] int
-#   31|     3: [Getter] get_Item
+#   38|       0: [Parameter] index
+#   38|         -1: [TypeMention] int
+#   40|     3: [Getter] get_Item
 #-----|       2: (Parameters)
-#   29|         0: [Parameter] index
-#   31|       4: [BlockStmt] {...}
-#   31|         0: [ReturnStmt] return ...;
-#   31|           0: [ArrayAccess] access to array element
-#   31|             -1: [FieldAccess] access to field _backingArray
-#   31|             0: [ParameterAccess] access to parameter index
-#   32|     4: [Setter] set_Item
+#   38|         0: [Parameter] index
+#   40|       4: [BlockStmt] {...}
+#   40|         0: [ReturnStmt] return ...;
+#   40|           0: [ArrayAccess] access to array element
+#   40|             -1: [FieldAccess] access to field _backingArray
+#   40|             0: [ParameterAccess] access to parameter index
+#   41|     4: [Setter] set_Item
 #-----|       2: (Parameters)
-#   29|         0: [Parameter] index
-#   32|         1: [Parameter] value
-#   32|       4: [BlockStmt] {...}
-#   32|         0: [ExprStmt] ...;
-#   32|           0: [AssignExpr] ... = ...
-#   32|             0: [ArrayAccess] access to array element
-#   32|               -1: [FieldAccess] access to field _backingArray
-#   32|               0: [ParameterAccess] access to parameter index
-#   32|             1: [ParameterAccess] access to parameter value
-#   36|   14: [Event] PartialEvent1
-#   13|     -1: [TypeMention] EventHandler
-#   36|     3: [AddEventAccessor] add_PartialEvent1
+#   38|         0: [Parameter] index
+#   41|         1: [Parameter] value
+#   41|       4: [BlockStmt] {...}
+#   41|         0: [ExprStmt] ...;
+#   41|           0: [AssignExpr] ... = ...
+#   41|             0: [ArrayAccess] access to array element
+#   41|               -1: [FieldAccess] access to field _backingArray
+#   41|               0: [ParameterAccess] access to parameter index
+#   41|             1: [ParameterAccess] access to parameter value
+#   45|   15: [Event] PartialEvent1
+#   45|     3: [AddEventAccessor] add_PartialEvent1
 #-----|       2: (Parameters)
-#   36|         0: [Parameter] value
-#   36|       4: [BlockStmt] {...}
-#   36|     4: [RemoveEventAccessor] remove_PartialEvent1
+#   45|         0: [Parameter] value
+#   45|       4: [BlockStmt] {...}
+#   45|     4: [RemoveEventAccessor] remove_PartialEvent1
 #-----|       2: (Parameters)
-#   36|         0: [Parameter] value
-#   36|       4: [BlockStmt] {...}
-#   39| [Class] OnePartPartialClass
-#   41|   6: [Method] PartialMethodWithoutBody2
-#   41|     -1: [TypeMention] Void
-#   42|   7: [Method] Method4
-#   42|     -1: [TypeMention] Void
-#   42|     4: [BlockStmt] {...}
-#   45| [Class] NonPartialClass
-#   47|   6: [Method] Method5
-#   47|     -1: [TypeMention] Void
-#   47|     4: [BlockStmt] {...}
-#   48|   7: [Property] Property
-#   48|     -1: [TypeMention] object
-#   48|     3: [Getter] get_Property
-#   48|     4: [Setter] set_Property
+#   45|         0: [Parameter] value
+#   45|       4: [BlockStmt] {...}
+#   48| [Class] OnePartPartialClass
+#   50|   6: [Method] PartialMethodWithoutBody2
+#   50|     -1: [TypeMention] Void
+#   51|   7: [Method] Method4
+#   51|     -1: [TypeMention] Void
+#   51|     4: [BlockStmt] {...}
+#   54| [Class] NonPartialClass
+#   56|   5: [InstanceConstructor] NonPartialClass
+#-----|     2: (Parameters)
+#   56|       0: [Parameter] obj
+#   56|         -1: [TypeMention] object
+#   56|     4: [BlockStmt] {...}
+#   57|   6: [Method] Method5
+#   57|     -1: [TypeMention] Void
+#   57|     4: [BlockStmt] {...}
+#   58|   7: [Property] Property
+#   58|     -1: [TypeMention] object
+#   58|     3: [Getter] get_Property
+#   58|     4: [Setter] set_Property
 #-----|       2: (Parameters)
-#   48|         0: [Parameter] value
-#   49|   8: [Indexer] Item
-#   49|     -1: [TypeMention] object
+#   58|         0: [Parameter] value
+#   59|   8: [Indexer] Item
+#   59|     -1: [TypeMention] object
 #-----|     1: (Parameters)
-#   49|       0: [Parameter] index
-#   49|         -1: [TypeMention] int
-#   51|     3: [Getter] get_Item
+#   59|       0: [Parameter] index
+#   59|         -1: [TypeMention] int
+#   61|     3: [Getter] get_Item
 #-----|       2: (Parameters)
-#   49|         0: [Parameter] index
-#   51|       4: [BlockStmt] {...}
-#   51|         0: [ReturnStmt] return ...;
-#   51|           0: [NullLiteral] null
-#   52|     4: [Setter] set_Item
+#   59|         0: [Parameter] index
+#   61|       4: [BlockStmt] {...}
+#   61|         0: [ReturnStmt] return ...;
+#   61|           0: [NullLiteral] null
+#   62|     4: [Setter] set_Item
 #-----|       2: (Parameters)
-#   49|         0: [Parameter] index
-#   52|         1: [Parameter] value
-#   52|       4: [BlockStmt] {...}
-#   54|   9: [Event] Event
-#   54|     -1: [TypeMention] EventHandler
-#   54|     3: [AddEventAccessor] add_Event
+#   59|         0: [Parameter] index
+#   62|         1: [Parameter] value
+#   62|       4: [BlockStmt] {...}
+#   64|   9: [Event] Event
+#   64|     -1: [TypeMention] EventHandler
+#   64|     3: [AddEventAccessor] add_Event
 #-----|       2: (Parameters)
-#   54|         0: [Parameter] value
-#   54|     4: [RemoveEventAccessor] remove_Event
+#   64|         0: [Parameter] value
+#   64|     4: [RemoveEventAccessor] remove_Event
 #-----|       2: (Parameters)
-#   54|         0: [Parameter] value
+#   64|         0: [Parameter] value
 PartialMultipleFiles1.cs:
 #    1| [Class] PartialMultipleFiles
 PartialMultipleFiles2.cs:
diff --git a/csharp/ql/test/library-tests/structuralcomparison/structuralComparison.expected b/csharp/ql/test/library-tests/structuralcomparison/structuralComparison.expected
index 0f131d8c25c..1d15c2e6169 100644
--- a/csharp/ql/test/library-tests/structuralcomparison/structuralComparison.expected
+++ b/csharp/ql/test/library-tests/structuralcomparison/structuralComparison.expected
@@ -56,65 +56,65 @@ gvn
 | StructuralComparison.cs:3:14:3:18 | this access | (kind:Expr(12),false,Class) |
 | StructuralComparison.cs:3:14:3:18 | {...} | (kind:Stmt(1)) |
 | StructuralComparison.cs:5:26:5:26 | access to field x | (kind:Expr(16),true,x) |
-| StructuralComparison.cs:5:26:5:26 | this access | (kind:Expr(12)) |
-| StructuralComparison.cs:5:26:5:30 | ... = ... | ((kind:Expr(16),true,x) :: (0 :: (kind:Expr(63)))) |
+| StructuralComparison.cs:5:26:5:26 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:5:26:5:30 | ... = ... | (0 :: ((kind:Expr(16),true,x) :: (kind:Expr(63)))) |
 | StructuralComparison.cs:5:30:5:30 | 0 | 0 |
 | StructuralComparison.cs:6:26:6:26 | access to field y | (kind:Expr(16),true,y) |
-| StructuralComparison.cs:6:26:6:26 | this access | (kind:Expr(12)) |
-| StructuralComparison.cs:6:26:6:30 | ... = ... | ((kind:Expr(16),true,y) :: (1 :: (kind:Expr(63)))) |
+| StructuralComparison.cs:6:26:6:26 | this access | (kind:Expr(12),false,Class) |
+| StructuralComparison.cs:6:26:6:30 | ... = ... | (1 :: ((kind:Expr(16),true,y) :: (kind:Expr(63)))) |
 | StructuralComparison.cs:6:30:6:30 | 1 | 1 |
 | StructuralComparison.cs:8:24:8:24 | 0 | 0 |
 | StructuralComparison.cs:9:29:9:29 | access to parameter a | (kind:Expr(15),false,a) |
 | StructuralComparison.cs:10:38:10:39 | access to parameter v1 | (kind:Expr(15),false,v1) |
 | StructuralComparison.cs:10:38:10:44 | ... + ... | ((kind:Expr(15),false,v2) :: ((kind:Expr(15),false,v1) :: (kind:Expr(44)))) |
 | StructuralComparison.cs:10:43:10:44 | access to parameter v2 | (kind:Expr(15),false,v2) |
-| StructuralComparison.cs:14:5:17:5 | {...} | ((((kind:Expr(14),false,z2) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(14),false,z1) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: (kind:Stmt(1)))) |
-| StructuralComparison.cs:15:9:15:23 | ... ...; | (((kind:Expr(14),false,z1) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:14:5:17:5 | {...} | (((((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) :: ((kind:Expr(14),false,z2) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: (((((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) :: ((kind:Expr(14),false,z1) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: (kind:Stmt(1)))) |
+| StructuralComparison.cs:15:9:15:23 | ... ...; | ((((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) :: ((kind:Expr(14),false,z1) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
 | StructuralComparison.cs:15:13:15:14 | access to local variable z1 | (kind:Expr(14),false,z1) |
-| StructuralComparison.cs:15:13:15:22 | Int32 z1 = ... | ((kind:Expr(14),false,z1) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:15:13:15:22 | Int32 z1 = ... | (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) :: ((kind:Expr(14),false,z1) :: (kind:Expr(83)))) |
 | StructuralComparison.cs:15:18:15:18 | access to field x | (kind:Expr(16),true,x) |
 | StructuralComparison.cs:15:18:15:18 | this access | (kind:Expr(12),false,Class) |
 | StructuralComparison.cs:15:18:15:22 | ... + ... | ((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) |
 | StructuralComparison.cs:15:22:15:22 | access to field y | (kind:Expr(16),true,y) |
 | StructuralComparison.cs:15:22:15:22 | this access | (kind:Expr(12),false,Class) |
-| StructuralComparison.cs:16:9:16:23 | ... ...; | (((kind:Expr(14),false,z2) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:16:9:16:23 | ... ...; | ((((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) :: ((kind:Expr(14),false,z2) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
 | StructuralComparison.cs:16:13:16:14 | access to local variable z2 | (kind:Expr(14),false,z2) |
-| StructuralComparison.cs:16:13:16:22 | Int32 z2 = ... | ((kind:Expr(14),false,z2) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:16:13:16:22 | Int32 z2 = ... | (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) :: ((kind:Expr(14),false,z2) :: (kind:Expr(83)))) |
 | StructuralComparison.cs:16:18:16:18 | access to field x | (kind:Expr(16),true,x) |
 | StructuralComparison.cs:16:18:16:18 | this access | (kind:Expr(12),false,Class) |
 | StructuralComparison.cs:16:18:16:22 | ... + ... | ((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: (kind:Expr(44)))) |
 | StructuralComparison.cs:16:22:16:22 | access to field y | (kind:Expr(16),true,y) |
 | StructuralComparison.cs:16:22:16:22 | this access | (kind:Expr(12),false,Class) |
-| StructuralComparison.cs:20:5:29:5 | {...} | ((((kind:Expr(16),true,x) :: ((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Stmt(2))) :: ((((kind:Expr(16),true,x) :: ((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Stmt(2))) :: ((((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Stmt(2))) :: ((((kind:Expr(14),false,z7) :: ((((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Expr(44)))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(14),false,z6) :: (((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M0)) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(14),false,z5) :: (((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(14),false,z4) :: (((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(14),false,z3) :: (((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: (kind:Stmt(1)))))))))) |
-| StructuralComparison.cs:21:9:21:23 | ... ...; | (((kind:Expr(14),false,z3) :: (((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:20:5:29:5 | {...} | ((((kind:Expr(16),true,x) :: ((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Stmt(2))) :: ((((kind:Expr(16),true,x) :: ((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Stmt(2))) :: ((((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Stmt(2))) :: ((((((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Expr(44)))) :: ((kind:Expr(14),false,z7) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: (((((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M0)) :: ((kind:Expr(14),false,z6) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: (((((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: ((kind:Expr(14),false,z5) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: (((((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: ((kind:Expr(14),false,z4) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: (((((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: ((kind:Expr(14),false,z3) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: (kind:Stmt(1)))))))))) |
+| StructuralComparison.cs:21:9:21:23 | ... ...; | ((((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: ((kind:Expr(14),false,z3) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
 | StructuralComparison.cs:21:13:21:14 | access to local variable z3 | (kind:Expr(14),false,z3) |
-| StructuralComparison.cs:21:13:21:22 | Int32 z3 = ... | ((kind:Expr(14),false,z3) :: (((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:21:13:21:22 | Int32 z3 = ... | (((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: ((kind:Expr(14),false,z3) :: (kind:Expr(83)))) |
 | StructuralComparison.cs:21:18:21:22 | call to method M1 | ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) |
 | StructuralComparison.cs:21:18:21:22 | this access | (kind:Expr(12),false,Class) |
 | StructuralComparison.cs:21:21:21:21 | access to field x | (kind:Expr(16),true,x) |
 | StructuralComparison.cs:21:21:21:21 | this access | (kind:Expr(12),false,Class) |
-| StructuralComparison.cs:22:9:22:23 | ... ...; | (((kind:Expr(14),false,z4) :: (((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:22:9:22:23 | ... ...; | ((((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: ((kind:Expr(14),false,z4) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
 | StructuralComparison.cs:22:13:22:14 | access to local variable z4 | (kind:Expr(14),false,z4) |
-| StructuralComparison.cs:22:13:22:22 | Int32 z4 = ... | ((kind:Expr(14),false,z4) :: (((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:22:13:22:22 | Int32 z4 = ... | (((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: ((kind:Expr(14),false,z4) :: (kind:Expr(83)))) |
 | StructuralComparison.cs:22:18:22:22 | call to method M1 | ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) |
 | StructuralComparison.cs:22:18:22:22 | this access | (kind:Expr(12),false,Class) |
 | StructuralComparison.cs:22:21:22:21 | access to field x | (kind:Expr(16),true,x) |
 | StructuralComparison.cs:22:21:22:21 | this access | (kind:Expr(12),false,Class) |
-| StructuralComparison.cs:23:9:23:23 | ... ...; | (((kind:Expr(14),false,z5) :: (((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:23:9:23:23 | ... ...; | ((((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: ((kind:Expr(14),false,z5) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
 | StructuralComparison.cs:23:13:23:14 | access to local variable z5 | (kind:Expr(14),false,z5) |
-| StructuralComparison.cs:23:13:23:22 | Int32 z5 = ... | ((kind:Expr(14),false,z5) :: (((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:23:13:23:22 | Int32 z5 = ... | (((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) :: ((kind:Expr(14),false,z5) :: (kind:Expr(83)))) |
 | StructuralComparison.cs:23:18:23:22 | call to method M1 | ((kind:Expr(16),true,y) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M1))) |
 | StructuralComparison.cs:23:18:23:22 | this access | (kind:Expr(12),false,Class) |
 | StructuralComparison.cs:23:21:23:21 | access to field y | (kind:Expr(16),true,y) |
 | StructuralComparison.cs:23:21:23:21 | this access | (kind:Expr(12),false,Class) |
-| StructuralComparison.cs:24:9:24:22 | ... ...; | (((kind:Expr(14),false,z6) :: (((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M0)) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:24:9:24:22 | ... ...; | ((((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M0)) :: ((kind:Expr(14),false,z6) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
 | StructuralComparison.cs:24:13:24:14 | access to local variable z6 | (kind:Expr(14),false,z6) |
-| StructuralComparison.cs:24:13:24:21 | Int32 z6 = ... | ((kind:Expr(14),false,z6) :: (((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M0)) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:24:13:24:21 | Int32 z6 = ... | (((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M0)) :: ((kind:Expr(14),false,z6) :: (kind:Expr(83)))) |
 | StructuralComparison.cs:24:18:24:21 | call to method M0 | ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M0)) |
 | StructuralComparison.cs:24:18:24:21 | this access | (kind:Expr(12),false,Class) |
-| StructuralComparison.cs:25:9:25:37 | ... ...; | (((kind:Expr(14),false,z7) :: ((((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Expr(44)))) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:25:9:25:37 | ... ...; | (((((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Expr(44)))) :: ((kind:Expr(14),false,z7) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
 | StructuralComparison.cs:25:13:25:14 | access to local variable z7 | (kind:Expr(14),false,z7) |
-| StructuralComparison.cs:25:13:25:36 | Int32 z7 = ... | ((kind:Expr(14),false,z7) :: ((((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Expr(44)))) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:25:13:25:36 | Int32 z7 = ... | ((((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Expr(44)))) :: ((kind:Expr(14),false,z7) :: (kind:Expr(83)))) |
 | StructuralComparison.cs:25:18:25:25 | call to method M2 | ((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) |
 | StructuralComparison.cs:25:18:25:25 | this access | (kind:Expr(12),false,Class) |
 | StructuralComparison.cs:25:18:25:36 | ... + ... | (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (((kind:Expr(16),true,y) :: ((kind:Expr(16),true,x) :: ((kind:Expr(12),false,Class) :: (kind:Expr(24),false,M2)))) :: (kind:Expr(44)))) |
@@ -157,35 +157,35 @@ gvn
 | StructuralComparison.cs:38:14:38:25 | call to method <object initializer> | ((kind:Expr(12),false,DerivedClass) :: (kind:Expr(24),false,<object initializer>)) |
 | StructuralComparison.cs:38:14:38:25 | this access | (kind:Expr(12),false,DerivedClass) |
 | StructuralComparison.cs:38:14:38:25 | {...} | (kind:Stmt(1)) |
-| StructuralComparison.cs:41:5:45:5 | {...} | ((((kind:Expr(14),false,x3) :: ((kind:Expr(16),true,Field) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(14),false,x2) :: ((kind:Expr(16),true,Field) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(14),false,x1) :: ((kind:Expr(16),true,Field) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: (kind:Stmt(1))))) |
-| StructuralComparison.cs:42:9:42:28 | ... ...; | (((kind:Expr(14),false,x1) :: ((kind:Expr(16),true,Field) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:41:5:45:5 | {...} | ((((kind:Expr(16),true,Field) :: ((kind:Expr(14),false,x3) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(16),true,Field) :: ((kind:Expr(14),false,x2) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(16),true,Field) :: ((kind:Expr(14),false,x1) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: (kind:Stmt(1))))) |
+| StructuralComparison.cs:42:9:42:28 | ... ...; | (((kind:Expr(16),true,Field) :: ((kind:Expr(14),false,x1) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
 | StructuralComparison.cs:42:13:42:14 | access to local variable x1 | (kind:Expr(14),false,x1) |
-| StructuralComparison.cs:42:13:42:27 | Int32 x1 = ... | ((kind:Expr(14),false,x1) :: ((kind:Expr(16),true,Field) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:42:13:42:27 | Int32 x1 = ... | ((kind:Expr(16),true,Field) :: ((kind:Expr(14),false,x1) :: (kind:Expr(83)))) |
 | StructuralComparison.cs:42:18:42:21 | base access | (kind:Expr(13),false,BaseClass) |
 | StructuralComparison.cs:42:18:42:27 | access to field Field | (kind:Expr(16),true,Field) |
-| StructuralComparison.cs:43:9:43:23 | ... ...; | (((kind:Expr(14),false,x2) :: ((kind:Expr(16),true,Field) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:43:9:43:23 | ... ...; | (((kind:Expr(16),true,Field) :: ((kind:Expr(14),false,x2) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
 | StructuralComparison.cs:43:13:43:14 | access to local variable x2 | (kind:Expr(14),false,x2) |
-| StructuralComparison.cs:43:13:43:22 | Int32 x2 = ... | ((kind:Expr(14),false,x2) :: ((kind:Expr(16),true,Field) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:43:13:43:22 | Int32 x2 = ... | ((kind:Expr(16),true,Field) :: ((kind:Expr(14),false,x2) :: (kind:Expr(83)))) |
 | StructuralComparison.cs:43:18:43:22 | access to field Field | (kind:Expr(16),true,Field) |
 | StructuralComparison.cs:43:18:43:22 | this access | (kind:Expr(12),false,DerivedClass) |
-| StructuralComparison.cs:44:9:44:28 | ... ...; | (((kind:Expr(14),false,x3) :: ((kind:Expr(16),true,Field) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:44:9:44:28 | ... ...; | (((kind:Expr(16),true,Field) :: ((kind:Expr(14),false,x3) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
 | StructuralComparison.cs:44:13:44:14 | access to local variable x3 | (kind:Expr(14),false,x3) |
-| StructuralComparison.cs:44:13:44:27 | Int32 x3 = ... | ((kind:Expr(14),false,x3) :: ((kind:Expr(16),true,Field) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:44:13:44:27 | Int32 x3 = ... | ((kind:Expr(16),true,Field) :: ((kind:Expr(14),false,x3) :: (kind:Expr(83)))) |
 | StructuralComparison.cs:44:18:44:21 | this access | (kind:Expr(12),false,DerivedClass) |
 | StructuralComparison.cs:44:18:44:27 | access to field Field | (kind:Expr(16),true,Field) |
-| StructuralComparison.cs:48:5:52:5 | {...} | ((((kind:Expr(14),false,y3) :: ((kind:Expr(17),true,Prop) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(14),false,y2) :: ((kind:Expr(17),true,Prop) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(14),false,y1) :: ((kind:Expr(17),true,Prop) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: (kind:Stmt(1))))) |
-| StructuralComparison.cs:49:9:49:27 | ... ...; | (((kind:Expr(14),false,y1) :: ((kind:Expr(17),true,Prop) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:48:5:52:5 | {...} | ((((kind:Expr(17),true,Prop) :: ((kind:Expr(14),false,y3) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(17),true,Prop) :: ((kind:Expr(14),false,y2) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: ((((kind:Expr(17),true,Prop) :: ((kind:Expr(14),false,y1) :: (kind:Expr(83)))) :: (kind:Stmt(22))) :: (kind:Stmt(1))))) |
+| StructuralComparison.cs:49:9:49:27 | ... ...; | (((kind:Expr(17),true,Prop) :: ((kind:Expr(14),false,y1) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
 | StructuralComparison.cs:49:13:49:14 | access to local variable y1 | (kind:Expr(14),false,y1) |
-| StructuralComparison.cs:49:13:49:26 | Object y1 = ... | ((kind:Expr(14),false,y1) :: ((kind:Expr(17),true,Prop) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:49:13:49:26 | Object y1 = ... | ((kind:Expr(17),true,Prop) :: ((kind:Expr(14),false,y1) :: (kind:Expr(83)))) |
 | StructuralComparison.cs:49:18:49:21 | base access | (kind:Expr(13),false,BaseClass) |
 | StructuralComparison.cs:49:18:49:26 | access to property Prop | (kind:Expr(17),true,Prop) |
-| StructuralComparison.cs:50:9:50:22 | ... ...; | (((kind:Expr(14),false,y2) :: ((kind:Expr(17),true,Prop) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:50:9:50:22 | ... ...; | (((kind:Expr(17),true,Prop) :: ((kind:Expr(14),false,y2) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
 | StructuralComparison.cs:50:13:50:14 | access to local variable y2 | (kind:Expr(14),false,y2) |
-| StructuralComparison.cs:50:13:50:21 | Object y2 = ... | ((kind:Expr(14),false,y2) :: ((kind:Expr(17),true,Prop) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:50:13:50:21 | Object y2 = ... | ((kind:Expr(17),true,Prop) :: ((kind:Expr(14),false,y2) :: (kind:Expr(83)))) |
 | StructuralComparison.cs:50:18:50:21 | access to property Prop | (kind:Expr(17),true,Prop) |
 | StructuralComparison.cs:50:18:50:21 | this access | (kind:Expr(12),false,DerivedClass) |
-| StructuralComparison.cs:51:9:51:27 | ... ...; | (((kind:Expr(14),false,y3) :: ((kind:Expr(17),true,Prop) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
+| StructuralComparison.cs:51:9:51:27 | ... ...; | (((kind:Expr(17),true,Prop) :: ((kind:Expr(14),false,y3) :: (kind:Expr(83)))) :: (kind:Stmt(22))) |
 | StructuralComparison.cs:51:13:51:14 | access to local variable y3 | (kind:Expr(14),false,y3) |
-| StructuralComparison.cs:51:13:51:26 | Object y3 = ... | ((kind:Expr(14),false,y3) :: ((kind:Expr(17),true,Prop) :: (kind:Expr(83)))) |
+| StructuralComparison.cs:51:13:51:26 | Object y3 = ... | ((kind:Expr(17),true,Prop) :: ((kind:Expr(14),false,y3) :: (kind:Expr(83)))) |
 | StructuralComparison.cs:51:18:51:21 | this access | (kind:Expr(12),false,DerivedClass) |
 | StructuralComparison.cs:51:18:51:26 | access to property Prop | (kind:Expr(17),true,Prop) |
diff --git a/csharp/ql/test/query-tests/Concurrency/SynchSetUnsynchGet/SynchSetUnsynchGet.cs b/csharp/ql/test/query-tests/Concurrency/SynchSetUnsynchGet/SynchSetUnsynchGet.cs
index 7d90bb69b5c..8b41604a9e6 100644
--- a/csharp/ql/test/query-tests/Concurrency/SynchSetUnsynchGet/SynchSetUnsynchGet.cs
+++ b/csharp/ql/test/query-tests/Concurrency/SynchSetUnsynchGet/SynchSetUnsynchGet.cs
@@ -89,4 +89,25 @@ class C1
             lock (mutex) GoodProperty3 = value;
         }
     }
+
+    // GOOD: both getter and setter are locked.
+    int? property2;
+    int? GoodProperty5
+    {
+        get
+        {
+            lock (mutex)
+            {
+                property2 ??= 0;
+                return property2;
+            }
+        }
+        set
+        {
+            lock (mutex)
+            {
+                property2 = value;
+            }
+        }
+    }
 }
diff --git a/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.expected b/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.expected
index 6271d6276c7..2073fce06a7 100644
--- a/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.expected	
+++ b/csharp/ql/test/query-tests/Dead Code/DeadStoreOfLocal/DeadStoreOfLocal.expected	
@@ -1,7 +1,7 @@
 | DeadStoreOfLocal.cs:12:13:12:20 | Int32 x = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:12:13:12:13 | x | x |
 | DeadStoreOfLocal.cs:19:21:19:25 | ... = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:18:13:18:13 | x | x |
 | DeadStoreOfLocal.cs:44:13:44:20 | Int32 x = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:44:13:44:13 | x | x |
-| DeadStoreOfLocal.cs:50:9:50:14 | ... = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:49:13:49:13 | x | x |
+| DeadStoreOfLocal.cs:50:9:50:14 | ... += ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:49:13:49:13 | x | x |
 | DeadStoreOfLocal.cs:56:9:56:11 | ...++ | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:55:13:55:13 | x | x |
 | DeadStoreOfLocal.cs:82:22:82:24 | String val | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:82:22:82:24 | val | val |
 | DeadStoreOfLocal.cs:101:13:101:37 | ... = ... | This assignment to $@ is useless, since its value is never read. | DeadStoreOfLocal.cs:94:40:94:44 | extra | extra |
diff --git a/csharp/ql/test/query-tests/Language Abuse/UselessNullCoalescingExpression/UselessNullCoalescingExpression.cs b/csharp/ql/test/query-tests/Language Abuse/UselessNullCoalescingExpression/UselessNullCoalescingExpression.cs
index ab8588d0255..f05782416fd 100644
--- a/csharp/ql/test/query-tests/Language Abuse/UselessNullCoalescingExpression/UselessNullCoalescingExpression.cs	
+++ b/csharp/ql/test/query-tests/Language Abuse/UselessNullCoalescingExpression/UselessNullCoalescingExpression.cs	
@@ -12,6 +12,8 @@ class Tests
         a = param ?? param;      // BAD
         a = a ?? use(a);         // BAD
         a = Field ?? this.Field; // BAD
+        a ??= a;                 // BAD
+        a ??= b = a;             // BAD
 
         a = a ?? cache(ref a);   // GOOD
         a = a ?? store(out a);   // GOOD
@@ -23,6 +25,7 @@ class Tests
               ?? a;              // GOOD
         a = a ?? store(out a)
               ?? a;              // GOOD
+        a ??= param;             // GOOD
     }
 
     int? cache(ref int? a)
diff --git a/csharp/ql/test/query-tests/Language Abuse/UselessNullCoalescingExpression/UselessNullCoalescingExpression.expected b/csharp/ql/test/query-tests/Language Abuse/UselessNullCoalescingExpression/UselessNullCoalescingExpression.expected
index 2b68f731870..3f4af5b8210 100644
--- a/csharp/ql/test/query-tests/Language Abuse/UselessNullCoalescingExpression/UselessNullCoalescingExpression.expected	
+++ b/csharp/ql/test/query-tests/Language Abuse/UselessNullCoalescingExpression/UselessNullCoalescingExpression.expected	
@@ -4,3 +4,5 @@
 | UselessNullCoalescingExpression.cs:12:13:12:26 | ... ?? ... | Both operands of this null-coalescing expression access the same variable or property. |
 | UselessNullCoalescingExpression.cs:13:13:13:23 | ... ?? ... | Both operands of this null-coalescing expression access the same variable or property. |
 | UselessNullCoalescingExpression.cs:14:13:14:31 | ... ?? ... | Both operands of this null-coalescing expression access the same variable or property. |
+| UselessNullCoalescingExpression.cs:15:9:15:15 | ... ??= ... | Both operands of this null-coalescing expression access the same variable or property. |
+| UselessNullCoalescingExpression.cs:16:9:16:19 | ... ??= ... | Both operands of this null-coalescing expression access the same variable or property. |
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/NoPolicy/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/NoPolicy/Program.cs
index 4df46f20c8c..4d0d6a5d390 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/NoPolicy/Program.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/AspNetCore/NoPolicy/Program.cs	
@@ -2,12 +2,12 @@ public class MyController : Microsoft.AspNetCore.Mvc.Controller
 {
     public void CookieDefault()
     {
-        Response.Cookies.Append("auth", "value"); // $Alert // BAD: HttpOnly is set to false by default
+        Response.Cookies.Append("auth", "value"); // $ Alert // BAD: HttpOnly is set to false by default
     }
 
     public void CookieDefault2()
     {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $Alert 
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $ Alert
         Response.Cookies.Append("auth", "value", cookieOptions); // BAD: HttpOnly is set to false by default
     }
 
@@ -39,14 +39,14 @@ public class MyController : Microsoft.AspNetCore.Mvc.Controller
 
     void CookieDirectFalse()
     {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $Alert 
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $ Alert
         cookieOptions.HttpOnly = false;
         Response.Cookies.Append("auth", "secret", cookieOptions); // BAD
     }
 
     void CookieDirectFalseInitializer()
     {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { HttpOnly = false }; // $Alert 
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { HttpOnly = false }; // $ Alert
         Response.Cookies.Append("auth", "secret", cookieOptions); // BAD
     }
 
@@ -67,7 +67,7 @@ public class MyController : Microsoft.AspNetCore.Mvc.Controller
 
     void CookieIntermediateFalse()
     {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $MISSING:Alert
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $ MISSING:Alert
         bool v = false;
         cookieOptions.HttpOnly = v;
         Response.Cookies.Append("auth", "secret", cookieOptions); // BAD, but not detected
@@ -76,7 +76,7 @@ public class MyController : Microsoft.AspNetCore.Mvc.Controller
     void CookieIntermediateFalseInitializer()
     {
         bool v = false;
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { HttpOnly = v }; // $MISSING:Alert 
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { HttpOnly = v }; // $ MISSING:Alert
         Response.Cookies.Append("auth", "secret", cookieOptions); // BAD, but not detected
     }
 }
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesFalse/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesFalse/Program.cs
index 3e63963712f..94f50e78a3e 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesFalse/Program.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-1004/HttpOnlyCookie/SystemWeb/HttpOnlyCookiesFalse/Program.cs	
@@ -13,7 +13,7 @@ class Program
 
     void CookieDefault()
     {
-        var cookie = new System.Web.HttpCookie("sessionID"); // $Alert // BAD: httpOnlyCookies is set to false by default
+        var cookie = new System.Web.HttpCookie("sessionID"); // $ Alert // BAD: httpOnlyCookies is set to false by default
     }
 
     void CookieDefaultForgery()
@@ -29,13 +29,13 @@ class Program
 
     void CookieDirectFalse()
     {
-        var cookie = new System.Web.HttpCookie("sessionID"); // $Alert 
+        var cookie = new System.Web.HttpCookie("sessionID"); // $ Alert
         cookie.HttpOnly = false; // BAD
     }
 
     void CookieDirectFalseInitializer()
     {
-        var cookie = new System.Web.HttpCookie("sessionID") { HttpOnly = false };  // $Alert // BAD
+        var cookie = new System.Web.HttpCookie("sessionID") { HttpOnly = false };  // $ Alert // BAD
     }
 
     void CookieIntermediateTrue()
@@ -53,7 +53,7 @@ class Program
 
     void CookieIntermediateFalse()
     {
-        var cookie = new System.Web.HttpCookie("sessionID"); // MISSING:Alert 
+        var cookie = new System.Web.HttpCookie("sessionID"); // MISSING:Alert
         bool v = false;
         cookie.HttpOnly = v; // BAD
     }
@@ -61,6 +61,6 @@ class Program
     void CookieIntermediateFalseInitializer()
     {
         bool v = false;
-        var cookie = new System.Web.HttpCookie("sessionID") { HttpOnly = v };  // $MISSING:Alert // BAD
+        var cookie = new System.Web.HttpCookie("sessionID") { HttpOnly = v };  // $ MISSING:Alert // BAD
     }
 }
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-117/LogForging.cs b/csharp/ql/test/query-tests/Security Features/CWE-117/LogForging.cs
index 18169e4a4b0..10ff408e226 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-117/LogForging.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-117/LogForging.cs	
@@ -33,6 +33,11 @@ public class LogForgingHandler : IHttpHandler
         Microsoft.Extensions.Logging.ILogger logger2 = null;
         // BAD: Logged as-is
         logger2.LogError(username); // $ Alert
+
+        // GOOD: uses safe extension method that sanitizes internally
+        logger.WarnSafe(username + " logged in");
+        // BAD: uses unsafe extension method that does not sanitize
+        logger.WarnUnsafe(username + " logged in");
     }
 
     public bool IsReusable
@@ -43,3 +48,16 @@ public class LogForgingHandler : IHttpHandler
         }
     }
 }
+
+static class UserLoggerExtensions
+{
+    public static void WarnSafe(this ILogger logger, string message)
+    {
+        logger.Warn(message.ReplaceLineEndings(""));
+    }
+
+    public static void WarnUnsafe(this ILogger logger, string message)
+    {
+        logger.Warn(message); // $ Alert
+    }
+}
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-117/LogForging.expected b/csharp/ql/test/query-tests/Security Features/CWE-117/LogForging.expected
index 1820eaa07d9..994cabadc75 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-117/LogForging.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-117/LogForging.expected	
@@ -2,14 +2,18 @@
 | LogForging.cs:21:21:21:43 | ... + ... | LogForging.cs:18:27:18:49 | access to property QueryString : NameValueCollection | LogForging.cs:21:21:21:43 | ... + ... | This log entry depends on a $@. | LogForging.cs:18:27:18:49 | access to property QueryString | user-provided value |
 | LogForging.cs:31:50:31:72 | ... + ... | LogForging.cs:18:27:18:49 | access to property QueryString : NameValueCollection | LogForging.cs:31:50:31:72 | ... + ... | This log entry depends on a $@. | LogForging.cs:18:27:18:49 | access to property QueryString | user-provided value |
 | LogForging.cs:35:26:35:33 | access to local variable username | LogForging.cs:18:27:18:49 | access to property QueryString : NameValueCollection | LogForging.cs:35:26:35:33 | access to local variable username | This log entry depends on a $@. | LogForging.cs:18:27:18:49 | access to property QueryString | user-provided value |
+| LogForging.cs:61:21:61:27 | access to parameter message | LogForging.cs:18:27:18:49 | access to property QueryString : NameValueCollection | LogForging.cs:61:21:61:27 | access to parameter message | This log entry depends on a $@. | LogForging.cs:18:27:18:49 | access to property QueryString | user-provided value |
 | LogForgingAsp.cs:17:21:17:43 | ... + ... | LogForgingAsp.cs:13:32:13:39 | username : String | LogForgingAsp.cs:17:21:17:43 | ... + ... | This log entry depends on a $@. | LogForgingAsp.cs:13:32:13:39 | username | user-provided value |
 edges
 | LogForging.cs:18:16:18:23 | access to local variable username : String | LogForging.cs:21:21:21:43 | ... + ... | provenance |  |
 | LogForging.cs:18:16:18:23 | access to local variable username : String | LogForging.cs:31:50:31:72 | ... + ... | provenance |  |
 | LogForging.cs:18:16:18:23 | access to local variable username : String | LogForging.cs:35:26:35:33 | access to local variable username | provenance |  |
+| LogForging.cs:18:16:18:23 | access to local variable username : String | LogForging.cs:40:27:40:49 | ... + ... : String | provenance |  |
 | LogForging.cs:18:27:18:49 | access to property QueryString : NameValueCollection | LogForging.cs:18:16:18:23 | access to local variable username : String | provenance |  |
 | LogForging.cs:18:27:18:49 | access to property QueryString : NameValueCollection | LogForging.cs:18:27:18:61 | access to indexer : String | provenance | MaD:1 |
 | LogForging.cs:18:27:18:61 | access to indexer : String | LogForging.cs:18:16:18:23 | access to local variable username : String | provenance |  |
+| LogForging.cs:40:27:40:49 | ... + ... : String | LogForging.cs:59:63:59:69 | message : String | provenance |  |
+| LogForging.cs:59:63:59:69 | message : String | LogForging.cs:61:21:61:27 | access to parameter message | provenance |  |
 | LogForgingAsp.cs:13:32:13:39 | username : String | LogForgingAsp.cs:17:21:17:43 | ... + ... | provenance |  |
 models
 | 1 | Summary: System.Collections.Specialized; NameValueCollection; false; get_Item; (System.String); ; Argument[this]; ReturnValue; taint; df-generated |
@@ -20,6 +24,9 @@ nodes
 | LogForging.cs:21:21:21:43 | ... + ... | semmle.label | ... + ... |
 | LogForging.cs:31:50:31:72 | ... + ... | semmle.label | ... + ... |
 | LogForging.cs:35:26:35:33 | access to local variable username | semmle.label | access to local variable username |
+| LogForging.cs:40:27:40:49 | ... + ... : String | semmle.label | ... + ... : String |
+| LogForging.cs:59:63:59:69 | message : String | semmle.label | message : String |
+| LogForging.cs:61:21:61:27 | access to parameter message | semmle.label | access to parameter message |
 | LogForgingAsp.cs:13:32:13:39 | username : String | semmle.label | username : String |
 | LogForgingAsp.cs:17:21:17:43 | ... + ... | semmle.label | ... + ... |
 subpaths
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/NoPolicy/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/NoPolicy/Program.cs
index 733e2d71fcc..d21b19cf399 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/NoPolicy/Program.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/AspNetCore/NoPolicy/Program.cs	
@@ -2,12 +2,12 @@ public class MyController : Microsoft.AspNetCore.Mvc.Controller
 {
     public void CookieDefault()
     {
-        Response.Cookies.Append("name", "value"); // $Alert // BAD: Secure is set to false by default
+        Response.Cookies.Append("name", "value"); // $ Alert // BAD: Secure is set to false by default
     }
 
     public void CookieDefault2()
     {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $Alert 
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $ Alert
         Response.Cookies.Append("name", "value", cookieOptions); // BAD: Secure is set to false by default
     }
 
@@ -32,14 +32,14 @@ public class MyController : Microsoft.AspNetCore.Mvc.Controller
 
     void CookieDirectFalse()
     {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $Alert 
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $ Alert
         cookieOptions.Secure = false;
         Response.Cookies.Append("auth", "secret", cookieOptions); // BAD
     }
 
     void CookieDirectFalseInitializer()
     {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { Secure = false }; // $Alert 
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { Secure = false }; // $ Alert
         Response.Cookies.Append("auth", "secret", cookieOptions); // BAD
     }
 
@@ -60,7 +60,7 @@ public class MyController : Microsoft.AspNetCore.Mvc.Controller
 
     void CookieIntermediateFalse()
     {
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $MISSING:Alert
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions(); // $ MISSING:Alert
         bool v = false;
         cookieOptions.Secure = v;
         Response.Cookies.Append("auth", "secret", cookieOptions); // BAD, but not detected
@@ -69,7 +69,7 @@ public class MyController : Microsoft.AspNetCore.Mvc.Controller
     void CookieIntermediateFalseInitializer()
     {
         bool v = false;
-        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { Secure = v }; // $MISSING:Alert 
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions() { Secure = v }; // $ MISSING:Alert
         Response.Cookies.Append("auth", "secret", cookieOptions); // BAD, but not detected
     }
 }
diff --git a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLFalse/Program.cs b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLFalse/Program.cs
index 250b1f7780e..b026100269f 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLFalse/Program.cs	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-614/InsecureCookie/SystemWeb/RequireSSLFalse/Program.cs	
@@ -2,7 +2,7 @@ class Program
 {
     void CookieDefault()
     {
-        var cookie = new System.Web.HttpCookie("cookieName"); // $Alert // BAD: requireSSL is set to false by default
+        var cookie = new System.Web.HttpCookie("cookieName"); // $ Alert // BAD: requireSSL is set to false by default
     }
 
     void CookieDirectTrue()
@@ -31,18 +31,18 @@ class Program
 
     void CookieDirectFalse()
     {
-        var cookie = new System.Web.HttpCookie("cookieName"); // $Alert 
+        var cookie = new System.Web.HttpCookie("cookieName"); // $ Alert
         cookie.Secure = false; // BAD
     }
 
     void CookieDirectFalseInitializer()
     {
-        var cookie = new System.Web.HttpCookie("cookieName") { Secure = false }; // $Alert // BAD
+        var cookie = new System.Web.HttpCookie("cookieName") { Secure = false }; // $ Alert // BAD
     }
 
         void CookieIntermediateFalse()
     {
-        var cookie = new System.Web.HttpCookie("cookieName"); // $MISSING:Alert
+        var cookie = new System.Web.HttpCookie("cookieName"); // $ MISSING:Alert
         bool v = false;
         cookie.Secure = v; // BAD, but not detected
     }
@@ -50,6 +50,6 @@ class Program
     void CookieIntermediateFalseInitializer()
     {
         bool v = false;
-        var cookie = new System.Web.HttpCookie("cookieName") { Secure = v }; // $MISSING:Alert // BAD, but not detected
+        var cookie = new System.Web.HttpCookie("cookieName") { Secure = v }; // $ MISSING:Alert // BAD, but not detected
     }
 }
diff --git a/csharp/ql/test/query-tests/WriteOnlyContainer/WriteOnlyContainer.cs b/csharp/ql/test/query-tests/WriteOnlyContainer/WriteOnlyContainer.cs
index 97c33685a95..6d870cad08b 100644
--- a/csharp/ql/test/query-tests/WriteOnlyContainer/WriteOnlyContainer.cs
+++ b/csharp/ql/test/query-tests/WriteOnlyContainer/WriteOnlyContainer.cs
@@ -307,4 +307,10 @@ public class ContainerTest
     {
         Out(out var strings); // BAD: but allow for now (only C# 7 allows discards)
     }
+
+    IList<int> TestNullcoalescingInitializations()
+    {
+        var l = new List<int> { 1, 2, 3 }; // GOOD: returned
+        return l ??= new List<int>();
+    }
 }
diff --git a/docs/codeql/codeql-language-guides/customizing-library-models-for-javascript.rst b/docs/codeql/codeql-language-guides/customizing-library-models-for-javascript.rst
index 413471be885..b8f064c7574 100644
--- a/docs/codeql/codeql-language-guides/customizing-library-models-for-javascript.rst
+++ b/docs/codeql/codeql-language-guides/customizing-library-models-for-javascript.rst
@@ -406,7 +406,7 @@ Adds a new taint source. Most taint-tracking queries will use the new source.
 
 - **type**: Name of a type from which to evaluate **path**.
 - **path**: Access path leading to the source.
-- **kind**: Kind of source to add. Currently only **remote** is used.
+- **kind**: Kind of source to add. See the section on source kinds for a list of supported kinds.
 
 Example:
 
@@ -553,7 +553,16 @@ Kinds
 Source kinds
 ~~~~~~~~~~~~
 
-See documentation below for :ref:`Threat models <threat-models-javascript>`.
+- **remote**: A general source of remote flow.
+- **browser**: A source in the browser environment that does not fit a more specific browser kind.
+- **browser-url-query**: A source derived from the query parameters of the browser URL, such as ``location.search``.
+- **browser-url-fragment**: A source derived from the fragment part of the browser URL, such as ``location.hash``.
+- **browser-url-path**: A source derived from the pathname of the browser URL, such as ``location.pathname``.
+- **browser-url**: A source derived from the browser URL, where the untrusted part is prefixed by trusted data such as the scheme and hostname.
+- **browser-window-name**: A source derived from the window name, such as ``window.name``.
+- **browser-message-event**: A source derived from cross-window message passing, such as ``event`` in ``window.onmessage = event => {...}``.
+
+See also :ref:`Threat models <threat-models-javascript>`.
 
 Sink kinds
 ~~~~~~~~~~
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.1.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.1.rst
index f2948d0db67..39d4d36537c 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.1.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.1.rst
@@ -129,7 +129,7 @@ Java/Kotlin
 """""""""""
 
 *   The Java extractor and QL libraries now support Java 23.
-*   Kotlin versions up to 2.1.0\ *x* are now supported.
+*   Kotlin versions up to 2.1.0*x* are now supported.
 
 Python
 """"""
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.3.rst
index 71a8e3a6824..fffe94c04b8 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.21.3.rst
@@ -144,7 +144,7 @@ New Features
 Java/Kotlin
 """""""""""
 
-*   Kotlin versions up to 2.2.0\ *x* are now supported. Support for the Kotlin 1.5.x series is dropped (so the minimum Kotlin version is now 1.6.0).
+*   Kotlin versions up to 2.2.0*x* are now supported. Support for the Kotlin 1.5.x series is dropped (so the minimum Kotlin version is now 1.6.0).
 
 Swift
 """""
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.3.rst
index 4f1d34ff2dd..8e5a18a0c74 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.3.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.3.rst
@@ -98,4 +98,4 @@ C/C++
 Java/Kotlin
 """""""""""
 
-*   Kotlin versions up to 2.2.2\ *x* are now supported.
+*   Kotlin versions up to 2.2.2*x* are now supported.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.24.2.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.24.2.rst
new file mode 100644
index 00000000000..27da2f3eaf9
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.24.2.rst
@@ -0,0 +1,109 @@
+.. _codeql-cli-2.24.2:
+
+==========================
+CodeQL 2.24.2 (2026-02-20)
+==========================
+
+.. 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/application-security/>`__, `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.24.2 runs a total of 491 security queries when configured with the Default suite (covering 166 CWE). The Extended suite enables an additional 135 queries (covering 35 more CWE).
+
+CodeQL CLI
+----------
+
+Bug Fixes
+~~~~~~~~~
+
+*   Fixed SARIF output to generate RFC 1738 compatible file URIs. File URIs now always use the :code:`file:///` format instead of :code:`file:/` for better interoperability with SARIF consumers.
+
+Query Packs
+-----------
+
+Bug Fixes
+~~~~~~~~~
+
+C#
+""
+
+*   The :code:`cs/web/missing-token-validation` ("Missing cross-site request forgery token validation") query now recognizes antiforgery attributes on base controller classes, fixing false positives when :code:`[ValidateAntiForgeryToken]` or :code:`[AutoValidateAntiforgeryToken]` is applied to a parent class.
+
+Language Libraries
+------------------
+
+Bug Fixes
+~~~~~~~~~
+
+Python
+""""""
+
+*   Using :code:`=` as a fill character in a format specifier (e.g. :code:`f"{x:=^20}"`) now no longer results in a syntax error during parsing.
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+Golang
+""""""
+
+*   The :code:`BasicBlock` class is now defined using the shared basic blocks library. :code:`BasicBlock.getRoot` has been replaced by :code:`BasicBlock.getScope`. :code:`BasicBlock.getAPredecessor` and :code:`BasicBlock.getASuccessor` now take a :code:`SuccessorType` argument. :code:`ReachableJoinBlock.inDominanceFrontierOf` has been removed, so use :code:`BasicBlock.inDominanceFrontier` instead, swapping the receiver and the argument.
+
+Major Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Golang
+""""""
+
+*   Go 1.26 is now supported.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added remote flow source models for the :code:`winhttp.h` windows header and the Azure SDK core library for C/C++.
+
+C#
+""
+
+*   The model for :code:`System.Web.HttpUtility` has been modified to better model the flow of tainted URIs.
+*   C# 14: Added support for :code:`extension` members in the extractor, QL library, data flow, and Models as Data, covering extension methods, properties, and operators.
+
+Java/Kotlin
+"""""""""""
+
+*   Using a regular expression to check that a string doesn't contain any line breaks is already a sanitizer for :code:`java/log-injection`. Additional ways of doing the regular expression check are now recognised, including annotation with :code:`@javax.validation.constraints.Pattern`.
+*   More ways of checking that a string matches a regular expression are now considered as sanitizers for various queries, including :code:`java/ssrf` and :code:`java/path-injection`. In particular, being annotated with :code:`@javax.validation.constraints.Pattern` is now recognised as a sanitizer for those queries.
+*   Kotlin versions up to 2.3.10 are now supported.
+
+Python
+""""""
+
+*   Added request forgery sink models for the Azure SDK.
+*   Made it so that models-as-data sinks with the kind :code:`request-forgery` contribute to the class :code:`Http::Client::Request` which represents HTTP client requests.
+
+Deprecated APIs
+~~~~~~~~~~~~~~~
+
+Java/Kotlin
+"""""""""""
+
+*   The :code:`UnreachableBlocks.qll` library has been deprecated.
+*   Renamed the following predicates to increase uniformity across languages. The :code:`getBody` predicate already existed on :code:`LoopStmt`, but is now properly inherited.
+
+    *   :code:`UnaryExpr.getExpr` to :code:`getOperand`.
+    *   :code:`ConditionalExpr.getTrueExpr` to :code:`getThen`.
+    *   :code:`ConditionalExpr.getFalseExpr` to :code:`getElse`.
+    *   :code:`ReturnStmt.getResult` to :code:`getExpr`.
+    *   :code:`WhileStmt.getStmt` to :code:`getBody`.
+    *   :code:`DoStmt.getStmt` to :code:`getBody`.
+    *   :code:`ForStmt.getStmt` to :code:`getBody`.
+    *   :code:`EnhancedForStmt.getStmt` to :code:`getBody`.
+    
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.24.3.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.24.3.rst
new file mode 100644
index 00000000000..7c4f99e10d2
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.24.3.rst
@@ -0,0 +1,121 @@
+.. _codeql-cli-2.24.3:
+
+==========================
+CodeQL 2.24.3 (2026-03-05)
+==========================
+
+.. 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/application-security/>`__, `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.24.3 runs a total of 491 security queries when configured with the Default suite (covering 166 CWE). The Extended suite enables an additional 135 queries (covering 35 more CWE).
+
+CodeQL CLI
+----------
+
+Bug Fixes
+~~~~~~~~~
+
+*   Fixed a race condition that could cause flaky failures in overlay CodeQL tests. Test extraction now skips :code:`*.testproj` directories by name, preventing interference from concurrently cleaned-up test databases.
+*   Fixed spurious "OOPS" warnings that could appear in help output for commands using mutually exclusive option groups, such as :code:`codeql query run`.
+
+Query Packs
+-----------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Java/Kotlin
+"""""""""""
+
+*   The Java extractor and QL libraries now support Java 26.
+*   Java analysis now selects the Java version to use informed by Maven POM files across all project modules. It also tries to use Java 17 or higher for all Maven projects if possible, for improved build compatibility.
+
+Rust
+""""
+
+*   The macro resolution metric has been removed from :code:`rust/diagnostic/database-quality`. This metric was found to be an unreliable indicator of database quality in many cases, leading to false alarms on the tool status page.
+
+Language Libraries
+------------------
+
+Bug Fixes
+~~~~~~~~~
+
+C/C++
+"""""
+
+*   The :code:`allowInterproceduralFlow` predicate of must-flow data flow configurations now correctly handles direct recursion.
+
+C#
+""
+
+*   Fixed an issue where the body of a partial member could be extracted twice. When both a *defining* and an *implementing* declaration exist, only the *implementing* declaration is now extracted.
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   CodeQL version 2.24.2 accidentally introduced a syntactical breaking change to :code:`BarrierGuard<...>::getAnIndirectBarrierNode` and :code:`InstructionBarrierGuard<...>::getAnIndirectBarrierNode`. These breaking changes have now been reverted so that the original code compiles again.
+*   :code:`MustFlow`, the inter-procedural must-flow data flow analysis library, has been re-worked to use parameterized modules. Like in the case of data flow and taint tracking, instead of extending the :code:`MustFlowConfiguration` class, the user should now implement a module with the :code:`MustFlow::ConfigSig` signature, and instantiate the :code:`MustFlow::Global` parameterized module with the implemented module.
+
+Python
+""""""
+
+*   The :code:`Metrics` library no longer contains code that depends on the points-to analysis. The removed functionality has instead been moved to the :code:`LegacyPointsTo` module, to classes like :code:`ModuleMetricsWithPointsTo` etc. If you depend on any of these classes, you must now remember to import :code:`LegacyPointsTo`, and use the appropriate types in order to use the points-to-based functionality.
+
+Major Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Python
+""""""
+
+*   The CodeQL Python libraries have been updated to be compatible with overlay evaluation. This should result in a significant speedup on analyses for which a base database already exists. Note that it may be necessary to add :code:`overlay[local?] module;` to user-managed libraries that extend classes that are now marked as :code:`overlay[local]`.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Refactored the "Year field changed using an arithmetic operation without checking for leap year" query (:code:`cpp/leap-year/unchecked-after-arithmetic-year-modification`) to address large numbers of false positive results.
+
+C#
+""
+
+*   C# 14: Added support for partial events.
+*   C# 14: Added support for the :code:`field` keyword in properties.
+
+Java/Kotlin
+"""""""""""
+
+*   Some modelling which previously only worked for Java EE packages beginning with "javax" will now also work for Java EE packages beginning with "jakarta" as well. This may lead to some alert changes.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Added support for React components wrapped by :code:`observer` from :code:`mobx-react` and :code:`mobx-react-lite`.
+
+Python
+""""""
+
+*   Added new full SSRF sanitization barrier from the new AntiSSRF library.
+*   When a guard such as :code:`isSafe(x)` is defined, we now also automatically handle :code:`isSafe(x) == true` and :code:`isSafe(x) != false`.
+
+Ruby
+""""
+
+*   We now track taint flow through :code:`Shellwords.escape` and :code:`Shellwords.shellescape` for all queries except command injection, for which they are sanitizers.
+
+Rust
+""""
+
+*   Added support for neutral models (:code:`extensible: neutralModel`) to control where generated source, sink and flow summary models apply.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.25.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.25.0.rst
new file mode 100644
index 00000000000..7c371a3a365
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.25.0.rst
@@ -0,0 +1,131 @@
+.. _codeql-cli-2.25.0:
+
+==========================
+CodeQL 2.25.0 (2026-03-19)
+==========================
+
+.. 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/application-security/>`__, `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.25.0 runs a total of 491 security queries when configured with the Default suite (covering 166 CWE). The Extended suite enables an additional 135 queries (covering 35 more CWE).
+
+CodeQL CLI
+----------
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+*   :code:`codeql database interpret-results` and :code:`codeql database analyze` no longer attempt to reconstruct file baseline information from databases created with CLI versions before 2.11.2.
+
+Bug Fixes
+~~~~~~~~~
+
+*   Upgraded Jackson library from 2.16.1 to 2.18.6 to address a high-severity denial of service vulnerability (GHSA-72hv-8253-57qq) in jackson-core's async JSON parser.
+*   Upgraded snakeyaml (which is a dependency of jackson-dataformat-yaml) from 2.2 to 2.3.
+
+Language Libraries
+------------------
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+Java/Kotlin
+"""""""""""
+
+*   The Java control flow graph (CFG) implementation has been completely rewritten. The CFG now includes additional nodes to more accurately represent certain constructs. This also means that any existing code that implicitly relies on very specific details about the CFG may need to be updated.
+    The CFG now only includes the nodes that are reachable from the entry point.
+    Additionally, the following breaking changes have been made:
+
+    *   :code:`ControlFlowNode.asCall` has been removed - use :code:`Call.getControlFlowNode` instead.
+    *   :code:`ControlFlowNode.getEnclosingStmt` has been removed.
+    *   :code:`ControlFlow::ExprNode` has been removed.
+    *   :code:`ControlFlow::StmtNode` has been removed.
+    *   :code:`ControlFlow::Node` has been removed - this was merely an alias of
+        :code:`ControlFlowNode`, which is still available.
+    *   Previously deprecated predicates on :code:`BasicBlock` have been removed.
+
+Major Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Swift
+"""""
+
+*   Upgraded to allow analysis of Swift 6.2.4.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Inline expectations test comments, which are of the form :code:`// $ tag` or :code:`// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the :code:`$` symbol.
+
+C#
+""
+
+*   Inline expectations test comments, which are of the form :code:`// $ tag` or :code:`// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the :code:`$` symbol.
+*   Added :code:`System.Net.WebSockets::ReceiveAsync` as a remote flow source.
+*   Added reverse taint flow from implicit conversion operator calls to their arguments.
+*   Added post-update nodes for struct-type arguments, allowing data flow out of method calls via those arguments.
+*   C# 14: Added support for partial constructors.
+
+Golang
+""""""
+
+*   Inline expectations test comments, which are of the form :code:`// $ tag` or :code:`// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the :code:`$` symbol.
+
+Java/Kotlin
+"""""""""""
+
+*   Inline expectations test comments, which are of the form :code:`// $ tag` or :code:`// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the :code:`$` symbol.
+*   The class :code:`Assignment` now extends :code:`BinaryExpr`. Uses of :code:`BinaryExpr` may in some cases need slight adjustment.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Added support for browser-specific source kinds (:code:`browser`, :code:`browser-url-query`, :code:`browser-url-fragment`, :code:`browser-url-path`, :code:`browser-url`, :code:`browser-window-name`, :code:`browser-message-event`) that can be used in data extensions to model sources in browser environments.
+*   Inline expectations test comments, which are of the form :code:`// $ tag` or :code:`// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the :code:`$` symbol.
+
+Python
+""""""
+
+*   The call graph resolution no longer considers methods marked using |link-code-typing-overload-1|_ as valid targets. This ensures that only the method that contains the actual implementation gets resolved as a target.
+*   Inline expectations test comments, which are of the form :code:`# $ tag` or :code:`# $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the :code:`$` symbol.
+
+Ruby
+""""
+
+*   Inline expectations test comments, which are of the form :code:`# $ tag` or :code:`# $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the :code:`$` symbol.
+
+Swift
+"""""
+
+*   Inline expectations test comments, which are of the form :code:`// $ tag` or :code:`// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the :code:`$` symbol.
+
+Rust
+""""
+
+*   Inline expectations test comments, which are of the form :code:`// $ tag` or :code:`// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the :code:`$` symbol.
+*   Added neutral models to inhibit spurious generated sink models for :code:`map` and :code:`from`. This fixes some false positive query results.
+
+Shared Libraries
+----------------
+
+New Features
+~~~~~~~~~~~~
+
+Dataflow Analysis
+"""""""""""""""""
+
+*   Two new flow features :code:`FeatureEscapesSourceCallContext` and :code:`FeatureEscapesSourceCallContextOrEqualSourceSinkCallContext` have been added. The former implies that the sink must be reached from the source by escaping the source call context, that is, flow must either return from the callable containing the source or use a jump-step before reaching the sink. The latter is the disjunction of the former and the existing :code:`FeatureEqualSourceSinkCallContext` flow feature.
+
+.. |link-code-typing-overload-1| replace:: :code:`@typing.overload`\ 
+.. _link-code-typing-overload-1: https://typing.python.org/en/latest/spec/overload.html#overloads
+
diff --git a/docs/codeql/codeql-overview/codeql-changelog/index.rst b/docs/codeql/codeql-overview/codeql-changelog/index.rst
index 318366d1e69..d880a7e56d8 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/index.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/index.rst
@@ -11,6 +11,9 @@ A list of queries for each suite and language `is available here <https://docs.g
 .. toctree::
    :maxdepth: 1
 
+   codeql-cli-2.25.0
+   codeql-cli-2.24.3
+   codeql-cli-2.24.2
    codeql-cli-2.24.1
    codeql-cli-2.24.0
    codeql-cli-2.23.9
diff --git a/go/extractor/BUILD.bazel b/go/extractor/BUILD.bazel
index 860dcef5e73..fbc53f20720 100644
--- a/go/extractor/BUILD.bazel
+++ b/go/extractor/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@rules_go//go:def.bzl", "go_library")
+load("@rules_java//java:defs.bzl", "java_library")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 
 # gazelle:prefix github.com/github/codeql-go/extractor
diff --git a/go/extractor/go.mod b/go/extractor/go.mod
index 46d189d005e..ae43e8a51bd 100644
--- a/go/extractor/go.mod
+++ b/go/extractor/go.mod
@@ -9,8 +9,8 @@ toolchain go1.26.0
 // when adding or removing dependencies, run
 //    bazel mod tidy
 require (
-	golang.org/x/mod v0.33.0
-	golang.org/x/tools v0.42.0
+	golang.org/x/mod v0.34.0
+	golang.org/x/tools v0.43.0
 )
 
 require github.com/stretchr/testify v1.11.1
@@ -18,6 +18,6 @@ require github.com/stretchr/testify v1.11.1
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/sync v0.19.0 // indirect
+	golang.org/x/sync v0.20.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go/extractor/go.sum b/go/extractor/go.sum
index ade080a41ad..8bb3f3dc9fc 100644
--- a/go/extractor/go.sum
+++ b/go/extractor/go.sum
@@ -6,12 +6,12 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
-golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
-golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
-golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
-golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
-golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
+golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
+golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
+golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
+golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s=
+golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
diff --git a/go/ql/consistency-queries/CHANGELOG.md b/go/ql/consistency-queries/CHANGELOG.md
index e91058f491a..83afe3edcec 100644
--- a/go/ql/consistency-queries/CHANGELOG.md
+++ b/go/ql/consistency-queries/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.0.44
+
+No user-facing changes.
+
+## 1.0.43
+
+No user-facing changes.
+
 ## 1.0.42
 
 No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.43.md b/go/ql/consistency-queries/change-notes/released/1.0.43.md
new file mode 100644
index 00000000000..ace72ed890f
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.43.md
@@ -0,0 +1,3 @@
+## 1.0.43
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.44.md b/go/ql/consistency-queries/change-notes/released/1.0.44.md
new file mode 100644
index 00000000000..9a8d400d319
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.44.md
@@ -0,0 +1,3 @@
+## 1.0.44
+
+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 53e8667626a..59728e63980 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.42
+lastReleaseVersion: 1.0.44
diff --git a/go/ql/consistency-queries/qlpack.yml b/go/ql/consistency-queries/qlpack.yml
index 6f9302c9ac4..dfa143a5866 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.43-dev
+version: 1.0.45-dev
 groups:
   - go
   - queries
diff --git a/go/ql/lib/CHANGELOG.md b/go/ql/lib/CHANGELOG.md
index 34751dc5d8a..1093bb81803 100644
--- a/go/ql/lib/CHANGELOG.md
+++ b/go/ql/lib/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 7.0.2
+
+### Minor Analysis Improvements
+
+* Inline expectations test comments, which are of the form `// $ tag` or `// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the `$` symbol.
+
+## 7.0.1
+
+No user-facing changes.
+
 ## 7.0.0
 
 ### Breaking Changes
diff --git a/go/ql/lib/Customizations.qll b/go/ql/lib/Customizations.qll
index 127840de9dd..56824bc03eb 100644
--- a/go/ql/lib/Customizations.qll
+++ b/go/ql/lib/Customizations.qll
@@ -8,5 +8,7 @@
  * `FileSystemAccess`, or the `Source` and `Sink` classes associated with the security queries
  * to model frameworks that are not covered by the standard library.
  */
+overlay[local?]
+module;
 
 import go
diff --git a/go/ql/lib/change-notes/released/7.0.1.md b/go/ql/lib/change-notes/released/7.0.1.md
new file mode 100644
index 00000000000..b5ef70820b2
--- /dev/null
+++ b/go/ql/lib/change-notes/released/7.0.1.md
@@ -0,0 +1,3 @@
+## 7.0.1
+
+No user-facing changes.
diff --git a/go/ql/lib/change-notes/released/7.0.2.md b/go/ql/lib/change-notes/released/7.0.2.md
new file mode 100644
index 00000000000..88cadec6237
--- /dev/null
+++ b/go/ql/lib/change-notes/released/7.0.2.md
@@ -0,0 +1,5 @@
+## 7.0.2
+
+### Minor Analysis Improvements
+
+* Inline expectations test comments, which are of the form `// $ tag` or `// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the `$` symbol.
diff --git a/go/ql/lib/codeql-pack.release.yml b/go/ql/lib/codeql-pack.release.yml
index e0db21c7869..1f4c0c554e9 100644
--- a/go/ql/lib/codeql-pack.release.yml
+++ b/go/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 7.0.0
+lastReleaseVersion: 7.0.2
diff --git a/go/ql/lib/go.qll b/go/ql/lib/go.qll
index 1b8bf94a0d2..af9f676e013 100644
--- a/go/ql/lib/go.qll
+++ b/go/ql/lib/go.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with Go programs.
  */
+overlay[local?]
+module;
 
 import Customizations
 import semmle.go.Architectures
diff --git a/go/ql/lib/ideContextual.qll b/go/ql/lib/ideContextual.qll
index b28a23a6e00..2f96afdeffe 100644
--- a/go/ql/lib/ideContextual.qll
+++ b/go/ql/lib/ideContextual.qll
@@ -2,6 +2,8 @@
  * Provides classes and predicates related to contextual queries
  * in the code viewer.
  */
+overlay[local?]
+module;
 
 import go
 private import codeql.util.FileSystem
diff --git a/go/ql/lib/qlpack.yml b/go/ql/lib/qlpack.yml
index ac5f63a29bc..2bcd5042425 100644
--- a/go/ql/lib/qlpack.yml
+++ b/go/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-all
-version: 7.0.1-dev
+version: 7.0.3-dev
 groups: go
 dbscheme: go.dbscheme
 extractor: go
diff --git a/go/ql/lib/semmle/go/AST.qll b/go/ql/lib/semmle/go/AST.qll
index 6a840f81cbb..a0715f6ca0e 100644
--- a/go/ql/lib/semmle/go/AST.qll
+++ b/go/ql/lib/semmle/go/AST.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with AST nodes.
  */
+overlay[local]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/Architectures.qll b/go/ql/lib/semmle/go/Architectures.qll
index bb4face2407..0daef5147b4 100644
--- a/go/ql/lib/semmle/go/Architectures.qll
+++ b/go/ql/lib/semmle/go/Architectures.qll
@@ -1,4 +1,6 @@
 /** Provides classes for working with architectures. */
+overlay[local]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/Comments.qll b/go/ql/lib/semmle/go/Comments.qll
index b55810311f8..08a0fabc1ca 100644
--- a/go/ql/lib/semmle/go/Comments.qll
+++ b/go/ql/lib/semmle/go/Comments.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with code comments.
  */
+overlay[local]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/Concepts.qll b/go/ql/lib/semmle/go/Concepts.qll
index 4e328ed76c4..ffa48ea9654 100644
--- a/go/ql/lib/semmle/go/Concepts.qll
+++ b/go/ql/lib/semmle/go/Concepts.qll
@@ -3,6 +3,8 @@
  * access or system command execution, for which individual framework libraries
  * provide concrete subclasses.
  */
+overlay[local?]
+module;
 
 import go
 import semmle.go.dataflow.FunctionInputsAndOutputs
diff --git a/go/ql/lib/semmle/go/Decls.qll b/go/ql/lib/semmle/go/Decls.qll
index 9d1e4d2611a..7588ab913be 100644
--- a/go/ql/lib/semmle/go/Decls.qll
+++ b/go/ql/lib/semmle/go/Decls.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with declarations.
  */
+overlay[local]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/DiagnosticsReporting.qll b/go/ql/lib/semmle/go/DiagnosticsReporting.qll
index 691c430aa73..c7d0b547a86 100644
--- a/go/ql/lib/semmle/go/DiagnosticsReporting.qll
+++ b/go/ql/lib/semmle/go/DiagnosticsReporting.qll
@@ -1,4 +1,6 @@
 /** Provides classes for working with errors and warnings recorded during extraction. */
+overlay[local]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/Errors.qll b/go/ql/lib/semmle/go/Errors.qll
index 2e138e8de61..4ea0ed2c015 100644
--- a/go/ql/lib/semmle/go/Errors.qll
+++ b/go/ql/lib/semmle/go/Errors.qll
@@ -1,4 +1,6 @@
 /** Provides classes for working with Go frontend errors recorded during extraction. */
+overlay[local]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/Expr.qll b/go/ql/lib/semmle/go/Expr.qll
index 4a4ab00f053..0dcc707b19d 100644
--- a/go/ql/lib/semmle/go/Expr.qll
+++ b/go/ql/lib/semmle/go/Expr.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with expressions.
  */
+overlay[local]
+module;
 
 import go
 
@@ -829,7 +831,7 @@ class ConversionExpr extends CallOrConversionExpr {
 /**
  * A function call expression.
  *
- * On snapshots with incomplete type information, type conversions may be misclassified
+ * On databases with incomplete type information, type conversions may be misclassified
  * as function call expressions.
  *
  * Examples:
@@ -2035,6 +2037,9 @@ class ConstantName extends ValueName {
   override string getAPrimaryQlClass() { result = "ConstantName" }
 }
 
+/** Holds if `e` is an expression that refers to the `nil` constant. */
+predicate exprRefersToNil(Expr e) { e.(ConstantName).getTarget() = Builtin::nil() }
+
 /**
  * A name referring to a variable.
  *
@@ -2093,7 +2098,7 @@ class LabelName extends Name {
  * Holds if `e` is a type expression, as determined by a bottom-up syntactic
  * analysis starting with `TypeName`s.
  *
- * On a snapshot with full type information, this predicate covers all type
+ * On a database with full type information, this predicate covers all type
  * expressions. However, if type information is missing then not all type names
  * may be identified as such, so not all type expressions can be determined by
  * a bottom-up analysis. In such cases, `isTypeExprTopDown` below is useful.
@@ -2131,11 +2136,12 @@ private predicate isTypeExprBottomUp(Expr e) {
  * Holds if `e` must be a type expression because it either occurs in a syntactic
  * position where a type is expected, or it is part of a larger type expression.
  *
- * This predicate is only needed on snapshots for which type information is
- * incomplete. It is an underapproximation; in cases where it is syntactically ambiguous
- * whether an expression refers to a type or a value, we conservatively assume that
- * it may be the latter and so this predicate does not consider the expression to be
- * a type expression.
+ * This predicate is only needed on databases for which type information is
+ * incomplete - for example, when some dependencies could not be reached during
+ * extraction. It is an underapproximation; in cases where it is syntactically
+ * ambiguous whether an expression refers to a type or a value, we conservatively
+ * assume that it may be the latter and so this predicate does not consider the
+ * expression to be a type expression.
  */
 pragma[nomagic]
 private predicate isTypeExprTopDown(Expr e) {
@@ -2145,20 +2151,12 @@ private predicate isTypeExprTopDown(Expr e) {
   or
   e = any(ArrayTypeExpr ae).getElement()
   or
-  e = any(FieldDecl f).getTypeExpr()
-  or
-  e = any(ParameterDecl pd).getTypeExpr()
+  e = any(FieldBase fb).getTypeExpr()
   or
   e = any(TypeParamDecl tpd).getTypeConstraintExpr()
   or
   e = any(TypeParamDecl tpd).getNameExpr(_)
   or
-  e = any(ReceiverDecl rd).getTypeExpr()
-  or
-  e = any(ResultVariableDecl rvd).getTypeExpr()
-  or
-  e = any(MethodSpec md).getTypeExpr()
-  or
   e = any(MapTypeExpr mt).getKeyTypeExpr()
   or
   e = any(MapTypeExpr mt).getValueTypeExpr()
@@ -2175,7 +2173,7 @@ private predicate isTypeExprTopDown(Expr e) {
   or
   e = any(TypeSwitchStmt s).getACase().getExpr(_) and
   // special case: `nil` is allowed in a type case but isn't a type
-  not e = Builtin::nil().getAReference()
+  not exprRefersToNil(e)
   or
   e = any(SelectorExpr sel | isTypeExprTopDown(sel)).getBase()
   or
diff --git a/go/ql/lib/semmle/go/Files.qll b/go/ql/lib/semmle/go/Files.qll
index cda168482ca..ab4e2e084ed 100644
--- a/go/ql/lib/semmle/go/Files.qll
+++ b/go/ql/lib/semmle/go/Files.qll
@@ -1,4 +1,6 @@
 /** Provides classes for working with files and folders. */
+overlay[local]
+module;
 
 import go
 private import codeql.util.FileSystem
diff --git a/go/ql/lib/semmle/go/GoMod.qll b/go/ql/lib/semmle/go/GoMod.qll
index 119339c18eb..6a899cd1d60 100644
--- a/go/ql/lib/semmle/go/GoMod.qll
+++ b/go/ql/lib/semmle/go/GoMod.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with go.mod files.
  */
+overlay[local]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/HTML.qll b/go/ql/lib/semmle/go/HTML.qll
index 2f0e411a88d..01f8a069fe9 100644
--- a/go/ql/lib/semmle/go/HTML.qll
+++ b/go/ql/lib/semmle/go/HTML.qll
@@ -1,4 +1,6 @@
 /** Provides classes for working with HTML documents. */
+overlay[local]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/Locations.qll b/go/ql/lib/semmle/go/Locations.qll
index 7503421c0ff..da55799e6df 100644
--- a/go/ql/lib/semmle/go/Locations.qll
+++ b/go/ql/lib/semmle/go/Locations.qll
@@ -1,4 +1,6 @@
 /** Provides classes for working with locations and program elements that have locations. */
+overlay[local]
+module;
 
 import go
 private import semmle.go.Overlay
diff --git a/go/ql/lib/semmle/go/Packages.qll b/go/ql/lib/semmle/go/Packages.qll
index d1163350446..f37ddb0507e 100644
--- a/go/ql/lib/semmle/go/Packages.qll
+++ b/go/ql/lib/semmle/go/Packages.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with packages.
  */
+overlay[local]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/PrintAst.qll b/go/ql/lib/semmle/go/PrintAst.qll
index bee97008dbd..6ea5fcc3971 100644
--- a/go/ql/lib/semmle/go/PrintAst.qll
+++ b/go/ql/lib/semmle/go/PrintAst.qll
@@ -1,6 +1,8 @@
 /**
  * Provides queries to pretty-print a Go AST as a graph.
  */
+overlay[local]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/Scopes.qll b/go/ql/lib/semmle/go/Scopes.qll
index 2ab08b5b5b4..4e9a13c8ea1 100644
--- a/go/ql/lib/semmle/go/Scopes.qll
+++ b/go/ql/lib/semmle/go/Scopes.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with scopes and declared objects.
  */
+overlay[local]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/Stmt.qll b/go/ql/lib/semmle/go/Stmt.qll
index 8719ad543cf..aa6fe7c24de 100644
--- a/go/ql/lib/semmle/go/Stmt.qll
+++ b/go/ql/lib/semmle/go/Stmt.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with statements.
  */
+overlay[local]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/StringOps.qll b/go/ql/lib/semmle/go/StringOps.qll
index 3463e4fdf87..6af2946f95c 100644
--- a/go/ql/lib/semmle/go/StringOps.qll
+++ b/go/ql/lib/semmle/go/StringOps.qll
@@ -1,6 +1,8 @@
 /**
  * Provides predicates and classes for working with string operations.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/Types.qll b/go/ql/lib/semmle/go/Types.qll
index d377cb2c9d8..574d7568543 100644
--- a/go/ql/lib/semmle/go/Types.qll
+++ b/go/ql/lib/semmle/go/Types.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with Go types.
  */
+overlay[local]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/Util.qll b/go/ql/lib/semmle/go/Util.qll
index 02175f2d66a..a6fe2a6b2b5 100644
--- a/go/ql/lib/semmle/go/Util.qll
+++ b/go/ql/lib/semmle/go/Util.qll
@@ -1,4 +1,6 @@
 /** This module provides general utility classes and predicates. */
+overlay[local]
+module;
 
 /**
  * A Boolean value.
diff --git a/go/ql/lib/semmle/go/VariableWithFields.qll b/go/ql/lib/semmle/go/VariableWithFields.qll
index 0fce5247dcd..277a7dcc326 100644
--- a/go/ql/lib/semmle/go/VariableWithFields.qll
+++ b/go/ql/lib/semmle/go/VariableWithFields.qll
@@ -1,4 +1,6 @@
 /** Provides the `VariableWithFields` class, for working with variables with a chain of field or element accesses chained to it. */
+overlay[local]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/concepts/GeneratedFile.qll b/go/ql/lib/semmle/go/concepts/GeneratedFile.qll
index d1067b60ad0..683a8be7e05 100644
--- a/go/ql/lib/semmle/go/concepts/GeneratedFile.qll
+++ b/go/ql/lib/semmle/go/concepts/GeneratedFile.qll
@@ -1,4 +1,6 @@
 /** Provides a class for generated files. */
+overlay[local]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/concepts/HTTP.qll b/go/ql/lib/semmle/go/concepts/HTTP.qll
index b3990edd084..73f3bfb8784 100644
--- a/go/ql/lib/semmle/go/concepts/HTTP.qll
+++ b/go/ql/lib/semmle/go/concepts/HTTP.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with HTTP-related concepts such as requests and responses.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/controlflow/BasicBlocks.qll b/go/ql/lib/semmle/go/controlflow/BasicBlocks.qll
index 43b8c7e8dd3..dc52abb25ab 100644
--- a/go/ql/lib/semmle/go/controlflow/BasicBlocks.qll
+++ b/go/ql/lib/semmle/go/controlflow/BasicBlocks.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with basic blocks.
  */
+overlay[local]
+module;
 
 import go
 private import ControlFlowGraphImpl
diff --git a/go/ql/lib/semmle/go/controlflow/ControlFlowGraph.qll b/go/ql/lib/semmle/go/controlflow/ControlFlowGraph.qll
index 88adb88c026..77bb94d89f8 100644
--- a/go/ql/lib/semmle/go/controlflow/ControlFlowGraph.qll
+++ b/go/ql/lib/semmle/go/controlflow/ControlFlowGraph.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with a CFG-based program representation.
  */
+overlay[local]
+module;
 
 import go
 private import ControlFlowGraphImpl
@@ -62,6 +64,7 @@ module ControlFlow {
     BasicBlock getBasicBlock() { result.getANode() = this }
 
     /** Holds if this node dominates `dominee` in the control-flow graph. */
+    overlay[caller?]
     pragma[inline]
     predicate dominatesNode(ControlFlow::Node dominee) {
       exists(ReachableBasicBlock thisbb, ReachableBasicBlock dbb, int i, int j |
diff --git a/go/ql/lib/semmle/go/controlflow/ControlFlowGraphImpl.qll b/go/ql/lib/semmle/go/controlflow/ControlFlowGraphImpl.qll
index 71bd0ea561f..a26ab3adaf5 100644
--- a/go/ql/lib/semmle/go/controlflow/ControlFlowGraphImpl.qll
+++ b/go/ql/lib/semmle/go/controlflow/ControlFlowGraphImpl.qll
@@ -3,6 +3,8 @@
  *
  * Provides predicates for building intra-procedural CFGs.
  */
+overlay[local]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/controlflow/IR.qll b/go/ql/lib/semmle/go/controlflow/IR.qll
index 144f0df6e7d..a4c73004108 100644
--- a/go/ql/lib/semmle/go/controlflow/IR.qll
+++ b/go/ql/lib/semmle/go/controlflow/IR.qll
@@ -9,6 +9,8 @@
  * Each instruction is also a control-flow node, but there are control-flow nodes that are not
  * instructions (synthetic entry and exit nodes, as well as no-op skip nodes).
  */
+overlay[local]
+module;
 
 import go
 private import semmle.go.controlflow.ControlFlowGraphImpl
@@ -294,7 +296,7 @@ module IR {
   /**
    * An IR instruction that reads the value of a field.
    *
-   * On snapshots with incomplete type information, method expressions may sometimes be
+   * On databases with incomplete type information, method expressions may sometimes be
    * misclassified as field reads.
    */
   class FieldReadInstruction extends ComponentReadInstruction {
diff --git a/go/ql/lib/semmle/go/dataflow/DataFlow.qll b/go/ql/lib/semmle/go/dataflow/DataFlow.qll
index c26adbfd2c2..bc0d310566e 100644
--- a/go/ql/lib/semmle/go/dataflow/DataFlow.qll
+++ b/go/ql/lib/semmle/go/dataflow/DataFlow.qll
@@ -14,6 +14,8 @@
  * (intraprocedural) data flow, invoke `DataFlow::localFlow` or
  * `DataFlow::LocalFlowStep` with arguments of type `DataFlow::Node`.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll b/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
index 388921224ad..e1170aeda24 100644
--- a/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
+++ b/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
@@ -84,6 +84,8 @@
  *    "taint" indicates a default additional taint step and "value" indicates a
  *    globally applicable value-preserving step.
  */
+overlay[local?]
+module;
 
 private import go
 private import internal.ExternalFlowExtensions::Extensions as Extensions
diff --git a/go/ql/lib/semmle/go/dataflow/FlowSummary.qll b/go/ql/lib/semmle/go/dataflow/FlowSummary.qll
index 749e1c92e06..632697b341f 100644
--- a/go/ql/lib/semmle/go/dataflow/FlowSummary.qll
+++ b/go/ql/lib/semmle/go/dataflow/FlowSummary.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes and predicates for defining flow summaries.
  */
+overlay[local?]
+module;
 
 import go
 private import internal.FlowSummaryImpl as Impl
diff --git a/go/ql/lib/semmle/go/dataflow/FunctionInputsAndOutputs.qll b/go/ql/lib/semmle/go/dataflow/FunctionInputsAndOutputs.qll
index 89d3c297fed..5f437f81576 100644
--- a/go/ql/lib/semmle/go/dataflow/FunctionInputsAndOutputs.qll
+++ b/go/ql/lib/semmle/go/dataflow/FunctionInputsAndOutputs.qll
@@ -2,6 +2,8 @@
  * Provides QL classes for indicating data flow through a function parameter, return value,
  * or receiver.
  */
+overlay[local]
+module;
 
 import go
 private import semmle.go.dataflow.internal.DataFlowPrivate
diff --git a/go/ql/lib/semmle/go/dataflow/GlobalValueNumbering.qll b/go/ql/lib/semmle/go/dataflow/GlobalValueNumbering.qll
index e566ca41c2f..88a659f6f82 100644
--- a/go/ql/lib/semmle/go/dataflow/GlobalValueNumbering.qll
+++ b/go/ql/lib/semmle/go/dataflow/GlobalValueNumbering.qll
@@ -29,6 +29,8 @@
  * common reason for this is that the analysis cannot prove that there
  * are no side-effects that might cause the computed value to change.
  */
+overlay[local]
+module;
 
 /*
  * Note to developers: the correctness of this module depends on the
diff --git a/go/ql/lib/semmle/go/dataflow/Properties.qll b/go/ql/lib/semmle/go/dataflow/Properties.qll
index f7df3391f40..573b001a3c3 100644
--- a/go/ql/lib/semmle/go/dataflow/Properties.qll
+++ b/go/ql/lib/semmle/go/dataflow/Properties.qll
@@ -1,6 +1,8 @@
 /**
  * Provides a class for representing and reasoning about properties of data-flow nodes.
  */
+overlay[local]
+module;
 
 import go
 
@@ -22,7 +24,7 @@ class Property extends TProperty {
       isTrue = eq.getPolarity().booleanXor(e.getBoolValue().booleanXor(outcome))
       or
       this = IsNil(isTrue) and
-      e = Builtin::nil().getAReference() and
+      exprRefersToNil(e) and
       isTrue = eq.getPolarity().booleanXor(outcome).booleanNot()
     )
     or
diff --git a/go/ql/lib/semmle/go/dataflow/SSA.qll b/go/ql/lib/semmle/go/dataflow/SSA.qll
index 69fffa393c1..46ce4da3935 100644
--- a/go/ql/lib/semmle/go/dataflow/SSA.qll
+++ b/go/ql/lib/semmle/go/dataflow/SSA.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with static single assignment form (SSA).
  */
+overlay[local]
+module;
 
 import go
 private import SsaImpl
diff --git a/go/ql/lib/semmle/go/dataflow/SsaImpl.qll b/go/ql/lib/semmle/go/dataflow/SsaImpl.qll
index 026c8114f9f..9648335a6dd 100644
--- a/go/ql/lib/semmle/go/dataflow/SsaImpl.qll
+++ b/go/ql/lib/semmle/go/dataflow/SsaImpl.qll
@@ -3,6 +3,8 @@
  *
  * Provides predicates for constructing an SSA representation for functions.
  */
+overlay[local]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/dataflow/TaintTracking.qll b/go/ql/lib/semmle/go/dataflow/TaintTracking.qll
index c469574b3b9..89b43de0738 100644
--- a/go/ql/lib/semmle/go/dataflow/TaintTracking.qll
+++ b/go/ql/lib/semmle/go/dataflow/TaintTracking.qll
@@ -2,6 +2,8 @@
  * Provides classes for performing local (intra-procedural) and
  * global (inter-procedural) taint-tracking analyses.
  */
+overlay[local?]
+module;
 
 import semmle.go.dataflow.DataFlow
 
diff --git a/go/ql/lib/semmle/go/dataflow/barrierguardutil/RedirectCheckBarrierGuard.qll b/go/ql/lib/semmle/go/dataflow/barrierguardutil/RedirectCheckBarrierGuard.qll
index d185f9f78f3..cd5490e63c0 100644
--- a/go/ql/lib/semmle/go/dataflow/barrierguardutil/RedirectCheckBarrierGuard.qll
+++ b/go/ql/lib/semmle/go/dataflow/barrierguardutil/RedirectCheckBarrierGuard.qll
@@ -1,6 +1,8 @@
 /**
  * Provides an implementation of a commonly used barrier guard for sanitizing untrusted URLs.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/dataflow/barrierguardutil/RegexpCheck.qll b/go/ql/lib/semmle/go/dataflow/barrierguardutil/RegexpCheck.qll
index 8cdc3b2e1ac..4b669a305f5 100644
--- a/go/ql/lib/semmle/go/dataflow/barrierguardutil/RegexpCheck.qll
+++ b/go/ql/lib/semmle/go/dataflow/barrierguardutil/RegexpCheck.qll
@@ -1,6 +1,8 @@
 /**
  * Provides an implementation of a commonly used barrier guard for sanitizing untrusted URLs.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/dataflow/barrierguardutil/UrlCheck.qll b/go/ql/lib/semmle/go/dataflow/barrierguardutil/UrlCheck.qll
index 8abcfb327cc..8a105cc8fa9 100644
--- a/go/ql/lib/semmle/go/dataflow/barrierguardutil/UrlCheck.qll
+++ b/go/ql/lib/semmle/go/dataflow/barrierguardutil/UrlCheck.qll
@@ -1,6 +1,8 @@
 /**
  * Provides an implementation of a commonly used barrier guard for sanitizing untrusted URLs.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/dataflow/internal/ContainerFlow.qll b/go/ql/lib/semmle/go/dataflow/internal/ContainerFlow.qll
index e978cb3e587..05897354061 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/ContainerFlow.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/ContainerFlow.qll
@@ -1,4 +1,6 @@
 /** Contains predicates for dealing with container flow. */
+overlay[local?]
+module;
 
 import go
 private import DataFlowNodes
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowDispatch.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowDispatch.qll
index a06edad0be2..10455f84edb 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowDispatch.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowDispatch.qll
@@ -1,3 +1,6 @@
+overlay[local?]
+module;
+
 private import go
 private import DataFlowPrivate
 
@@ -119,6 +122,7 @@ class ArgumentPosition extends int {
 }
 
 /** Holds if arguments at position `apos` match parameters at position `ppos`. */
+overlay[caller?]
 pragma[inline]
 predicate parameterMatch(ParameterPosition ppos, ArgumentPosition apos) { ppos = apos }
 
@@ -130,6 +134,7 @@ private predicate isInterfaceMethod(Method c) {
  * Holds if `call` is passing `arg` to param `p` in any circumstance except passing
  * a receiver parameter to a concrete method.
  */
+overlay[caller?]
 pragma[inline]
 predicate golangSpecificParamArgFilter(
   DataFlowCall call, DataFlow::ParameterNode p, DataFlow::ArgumentNode arg
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl.qll
index c9761d21702..ae10681799f 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl.qll
@@ -1,3 +1,6 @@
+overlay[local?]
+module;
+
 private import DataFlowImplSpecific
 private import codeql.dataflow.internal.DataFlowImpl
 private import semmle.go.Locations
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImplCommon.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImplCommon.qll
index 6df86bde023..27db6081e49 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImplCommon.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImplCommon.qll
@@ -1,3 +1,6 @@
+overlay[local?]
+module;
+
 private import DataFlowImplSpecific
 private import codeql.dataflow.internal.DataFlowImplCommon
 private import semmle.go.Locations
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImplConsistency.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImplConsistency.qll
index b4d92771150..cf4794a9715 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImplConsistency.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImplConsistency.qll
@@ -2,6 +2,8 @@
  * Provides consistency queries for checking invariants in the language-specific
  * data-flow classes and predicates.
  */
+overlay[local?]
+module;
 
 private import go
 private import DataFlowImplSpecific as Impl
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImplSpecific.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImplSpecific.qll
index c680778ce4d..c2c6b0b7c43 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImplSpecific.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImplSpecific.qll
@@ -1,6 +1,8 @@
 /**
  * Provides Go-specific definitions for use in the data flow library.
  */
+overlay[local?]
+module;
 
 private import codeql.dataflow.DataFlow
 private import semmle.go.Locations
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
index 4fb767e548c..8fca4bec8c6 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowNodes.qll
@@ -1,3 +1,6 @@
+overlay[local]
+module;
+
 private import go
 private import semmle.go.dataflow.FunctionInputsAndOutputs
 private import semmle.go.dataflow.FlowSummary
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll
index 76b0ef363e3..33149bf0057 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll
@@ -1,3 +1,6 @@
+overlay[local?]
+module;
+
 private import go
 private import DataFlowUtil
 private import DataFlowImplCommon
@@ -478,5 +481,6 @@ predicate allowParameterReturnInSelf(ParameterNode p) {
 class ContentApprox = Unit;
 
 /** Gets an approximated value for content `c`. */
+overlay[caller?]
 pragma[inline]
 ContentApprox getContentApprox(Content c) { any() }
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
index 404eca4b4a2..b29ff7d5ea8 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
@@ -1,6 +1,8 @@
 /**
  * Provides Go-specific definitions for use in the data flow library.
  */
+overlay[local?]
+module;
 
 private import go
 private import semmle.go.dataflow.FunctionInputsAndOutputs
@@ -147,6 +149,7 @@ predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo, string model) {
  * Holds if data flows from `source` to `sink` in zero or more local
  * (intra-procedural) steps.
  */
+overlay[caller?]
 pragma[inline]
 predicate localFlow(Node source, Node sink) { localFlowStep*(source, sink) }
 
@@ -560,7 +563,7 @@ private predicate onlyPossibleReturnOfBool(FuncDecl fd, FunctionOutput res, Node
  */
 predicate possiblyReturnsNonNil(FuncDecl fd, FunctionOutput res, Node ret) {
   ret = res.getEntryNode(fd) and
-  not ret.asExpr() = Builtin::nil().getAReference()
+  not exprRefersToNil(ret.asExpr())
 }
 
 /**
@@ -570,7 +573,7 @@ predicate possiblyReturnsNonNil(FuncDecl fd, FunctionOutput res, Node ret) {
 private predicate onlyPossibleReturnOfNonNil(FuncDecl fd, FunctionOutput res, Node ret) {
   possiblyReturnsNonNil(fd, res, ret) and
   forall(Node otherRet | otherRet = res.getEntryNode(fd) and otherRet != ret |
-    otherRet.asExpr() = Builtin::nil().getAReference()
+    exprRefersToNil(otherRet.asExpr())
   )
 }
 
@@ -609,7 +612,7 @@ private predicate isCertainlyNotNil(DataFlow::Node node) {
  */
 private predicate onlyPossibleReturnOfNil(FuncDecl fd, FunctionOutput res, DataFlow::Node ret) {
   ret = res.getEntryNode(fd) and
-  ret.asExpr() = Builtin::nil().getAReference() and
+  exprRefersToNil(ret.asExpr()) and
   forall(DataFlow::Node otherRet | otherRet = res.getEntryNode(fd) and otherRet != ret |
     isCertainlyNotNil(otherRet)
   )
diff --git a/go/ql/lib/semmle/go/dataflow/internal/ExternalFlowExtensions.qll b/go/ql/lib/semmle/go/dataflow/internal/ExternalFlowExtensions.qll
index 2e962299f3e..5d43cf674c1 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/ExternalFlowExtensions.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/ExternalFlowExtensions.qll
@@ -1,6 +1,8 @@
 /**
  * This module provides extensible predicates for defining MaD models.
  */
+overlay[local?]
+module;
 
 private import codeql.mad.static.ModelsAsData as SharedMaD
 
diff --git a/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll b/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll
index f09f42872ea..240665bd492 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes and predicates for defining flow summaries.
  */
+overlay[local?]
+module;
 
 private import go
 private import codeql.dataflow.internal.FlowSummaryImpl
diff --git a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingImplSpecific.qll b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingImplSpecific.qll
index b9795bb14d3..e0c416087fd 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingImplSpecific.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingImplSpecific.qll
@@ -1,6 +1,8 @@
 /**
  * Provides Go-specific definitions for use in the taint tracking library.
  */
+overlay[local?]
+module;
 
 private import codeql.dataflow.TaintTracking
 private import DataFlowImplSpecific
diff --git a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
index af28f7f4020..f9f14874493 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll
@@ -1,6 +1,8 @@
 /**
  * Provides Go-specific definitions for use in the taint-tracking library.
  */
+overlay[local?]
+module;
 
 private import go
 private import FlowSummaryImpl as FlowSummaryImpl
@@ -11,6 +13,7 @@ private import DataFlowPrivate as DataFlowPrivate
  * Holds if taint can flow from `src` to `sink` in zero or more
  * local (intra-procedural) steps.
  */
+overlay[caller?]
 pragma[inline]
 predicate localTaint(DataFlow::Node src, DataFlow::Node sink) { localTaintStep*(src, sink) }
 
@@ -18,6 +21,7 @@ predicate localTaint(DataFlow::Node src, DataFlow::Node sink) { localTaintStep*(
  * Holds if taint can flow from `src` to `sink` in zero or more
  * local (intra-procedural) steps.
  */
+overlay[caller?]
 pragma[inline]
 predicate localExprTaint(Expr src, Expr sink) {
   localTaint(DataFlow::exprNode(src), DataFlow::exprNode(sink))
@@ -418,7 +422,7 @@ predicate functionEnsuresInputIsConstant(
     forex(DataFlow::Node ret, IR::ReturnInstruction ri |
       ret = outp.getEntryNode(fd) and
       ri.getReturnStmt().getAnExpr() = ret.asExpr() and
-      ret.asExpr() = Builtin::nil().getAReference()
+      exprRefersToNil(ret.asExpr())
     |
       DataFlow::localFlow(inp.getExitNode(fd), _) and
       mustPassConstantCaseTestToReach(ri, inp.getExitNode(fd))
diff --git a/go/ql/lib/semmle/go/dependencies/Dependencies.qll b/go/ql/lib/semmle/go/dependencies/Dependencies.qll
index d8c8ee52d29..6c9537c72c4 100644
--- a/go/ql/lib/semmle/go/dependencies/Dependencies.qll
+++ b/go/ql/lib/semmle/go/dependencies/Dependencies.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for modeling go.mod dependencies.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/dependencies/SemVer.qll b/go/ql/lib/semmle/go/dependencies/SemVer.qll
index 88d37563931..290617781ec 100644
--- a/go/ql/lib/semmle/go/dependencies/SemVer.qll
+++ b/go/ql/lib/semmle/go/dependencies/SemVer.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for dealing with semantic versions, for dependency versions.
  */
+overlay[local?]
+module;
 
 import semmle.go.dependencies.Dependencies
 
diff --git a/go/ql/lib/semmle/go/frameworks/Afero.qll b/go/ql/lib/semmle/go/frameworks/Afero.qll
index c03bf611433..22704a6af8e 100644
--- a/go/ql/lib/semmle/go/frameworks/Afero.qll
+++ b/go/ql/lib/semmle/go/frameworks/Afero.qll
@@ -2,6 +2,8 @@
  * Provides classes for working with sinks and taint propagators
  * from the `github.com/spf13/afero` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/AwsLambda.qll b/go/ql/lib/semmle/go/frameworks/AwsLambda.qll
index 28f21c9101b..f366a877097 100644
--- a/go/ql/lib/semmle/go/frameworks/AwsLambda.qll
+++ b/go/ql/lib/semmle/go/frameworks/AwsLambda.qll
@@ -2,6 +2,8 @@
  * Provides classes for working with remote flow sources, sinks and taint propagators
  * from the `github.com/aws/aws-lambda-go/lambda` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Beego.qll b/go/ql/lib/semmle/go/frameworks/Beego.qll
index 383be8ec42a..5f3f2e986c2 100644
--- a/go/ql/lib/semmle/go/frameworks/Beego.qll
+++ b/go/ql/lib/semmle/go/frameworks/Beego.qll
@@ -2,6 +2,8 @@
  * Provides classes for working with remote flow sources, sinks and taint propagators
  * from the `github.com/beego/beego` package.
  */
+overlay[local?]
+module;
 
 import go
 import semmle.go.security.Xss
diff --git a/go/ql/lib/semmle/go/frameworks/BeegoOrm.qll b/go/ql/lib/semmle/go/frameworks/BeegoOrm.qll
index 925b0f19fa3..e1bc5c481bd 100644
--- a/go/ql/lib/semmle/go/frameworks/BeegoOrm.qll
+++ b/go/ql/lib/semmle/go/frameworks/BeegoOrm.qll
@@ -2,6 +2,8 @@
  * Provides classes for working with remote flow sources, sinks and taint propagators
  * from the `github.com/astaxie/beego/orm` subpackage.
  */
+overlay[local?]
+module;
 
 import go
 private import semmle.go.security.StoredXssCustomizations
diff --git a/go/ql/lib/semmle/go/frameworks/Bun.qll b/go/ql/lib/semmle/go/frameworks/Bun.qll
index 5be82d2cacc..8637c8f5704 100644
--- a/go/ql/lib/semmle/go/frameworks/Bun.qll
+++ b/go/ql/lib/semmle/go/frameworks/Bun.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `Bun` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Couchbase.qll b/go/ql/lib/semmle/go/frameworks/Couchbase.qll
index b5bfbcb22a2..d1be1a73205 100644
--- a/go/ql/lib/semmle/go/frameworks/Couchbase.qll
+++ b/go/ql/lib/semmle/go/frameworks/Couchbase.qll
@@ -1,6 +1,8 @@
 /**
  * Provides models of commonly used functions in the official Couchbase Go SDK library.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/CryptoLibraries.qll b/go/ql/lib/semmle/go/frameworks/CryptoLibraries.qll
index 154ac82e7a2..7f0e52b449a 100644
--- a/go/ql/lib/semmle/go/frameworks/CryptoLibraries.qll
+++ b/go/ql/lib/semmle/go/frameworks/CryptoLibraries.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for modeling cryptographic libraries.
  */
+overlay[local?]
+module;
 
 import go
 import semmle.go.Concepts::Cryptography
diff --git a/go/ql/lib/semmle/go/frameworks/Echo.qll b/go/ql/lib/semmle/go/frameworks/Echo.qll
index a2a6e7d846a..865d8c3972b 100644
--- a/go/ql/lib/semmle/go/frameworks/Echo.qll
+++ b/go/ql/lib/semmle/go/frameworks/Echo.qll
@@ -2,6 +2,8 @@
  * Provides classes for working with remote flow sources, taint propagators, and HTTP sinks
  * from the `github.com/labstack/echo` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/ElazarlGoproxy.qll b/go/ql/lib/semmle/go/frameworks/ElazarlGoproxy.qll
index b1bf4571216..23f3a8c2d4d 100644
--- a/go/ql/lib/semmle/go/frameworks/ElazarlGoproxy.qll
+++ b/go/ql/lib/semmle/go/frameworks/ElazarlGoproxy.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with concepts relating to the [github.com/elazarl/goproxy](https://pkg.go.dev/github.com/elazarl/goproxy) package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Email.qll b/go/ql/lib/semmle/go/frameworks/Email.qll
index ba4cf8be415..97894806f6f 100644
--- a/go/ql/lib/semmle/go/frameworks/Email.qll
+++ b/go/ql/lib/semmle/go/frameworks/Email.qll
@@ -1,4 +1,6 @@
 /** Provides classes for working with email-related APIs. */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Encoding.qll b/go/ql/lib/semmle/go/frameworks/Encoding.qll
index 201e2c9001d..45f83021a0c 100644
--- a/go/ql/lib/semmle/go/frameworks/Encoding.qll
+++ b/go/ql/lib/semmle/go/frameworks/Encoding.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling taint propagation through marshalling and encoding functions.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Fasthttp.qll b/go/ql/lib/semmle/go/frameworks/Fasthttp.qll
index 941e6b44945..2dea987ade6 100644
--- a/go/ql/lib/semmle/go/frameworks/Fasthttp.qll
+++ b/go/ql/lib/semmle/go/frameworks/Fasthttp.qll
@@ -2,6 +2,8 @@
  * Provides classes for working with remote flow sources, sinks and taint propagators
  * from the `github.com/valyala/fasthttp` package.
  */
+overlay[local?]
+module;
 
 import go
 private import semmle.go.security.RequestForgeryCustomizations
diff --git a/go/ql/lib/semmle/go/frameworks/Gin.qll b/go/ql/lib/semmle/go/frameworks/Gin.qll
index 71ed5d931fa..f6d2bf8ff55 100644
--- a/go/ql/lib/semmle/go/frameworks/Gin.qll
+++ b/go/ql/lib/semmle/go/frameworks/Gin.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for modeling the `github.com/gin-gonic/gin` package.
  */
+overlay[local?]
+module;
 
 import go
 import semmle.go.concepts.HTTP
diff --git a/go/ql/lib/semmle/go/frameworks/GinCors.qll b/go/ql/lib/semmle/go/frameworks/GinCors.qll
index cc993ea4dee..cd742ac9ba2 100644
--- a/go/ql/lib/semmle/go/frameworks/GinCors.qll
+++ b/go/ql/lib/semmle/go/frameworks/GinCors.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for modeling the `github.com/gin-contrib/cors` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Glog.qll b/go/ql/lib/semmle/go/frameworks/Glog.qll
index 146b8a4f814..a9ffc432181 100644
--- a/go/ql/lib/semmle/go/frameworks/Glog.qll
+++ b/go/ql/lib/semmle/go/frameworks/Glog.qll
@@ -2,6 +2,8 @@
  * Provides models of commonly used functions in the `github.com/golang/glog` and `k8s.io/klog`
  * packages.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/GoJose.qll b/go/ql/lib/semmle/go/frameworks/GoJose.qll
index 509e289f586..6ee1feb5ab9 100644
--- a/go/ql/lib/semmle/go/frameworks/GoJose.qll
+++ b/go/ql/lib/semmle/go/frameworks/GoJose.qll
@@ -2,6 +2,8 @@
  * Provides classes for working with the `gopkg.in/square/go-jose` and `github.com/go-jose/go-jose`
  * packages.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/GoKit.qll b/go/ql/lib/semmle/go/frameworks/GoKit.qll
index e4a9e48d207..f56451b1b81 100644
--- a/go/ql/lib/semmle/go/frameworks/GoKit.qll
+++ b/go/ql/lib/semmle/go/frameworks/GoKit.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with concepts relating to the [github.com/go-kit/kit](https://pkg.go.dev/github.com/go-kit/kit) package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/GoMicro.qll b/go/ql/lib/semmle/go/frameworks/GoMicro.qll
index f01dcde9f1e..723f58899ff 100644
--- a/go/ql/lib/semmle/go/frameworks/GoMicro.qll
+++ b/go/ql/lib/semmle/go/frameworks/GoMicro.qll
@@ -1,6 +1,8 @@
 /**
  * Provides models of the [Go Micro library](https://github.com/go-micro/go-micro).
  */
+overlay[local?]
+module;
 
 import go
 private import semmle.go.security.RequestForgeryCustomizations
diff --git a/go/ql/lib/semmle/go/frameworks/Gorqlite.qll b/go/ql/lib/semmle/go/frameworks/Gorqlite.qll
index 65ac5d88bab..434c8148bd7 100644
--- a/go/ql/lib/semmle/go/frameworks/Gorqlite.qll
+++ b/go/ql/lib/semmle/go/frameworks/Gorqlite.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `gorqlite` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Gqlgen.qll b/go/ql/lib/semmle/go/frameworks/Gqlgen.qll
index 4edaab46b22..bcde5ce9a36 100644
--- a/go/ql/lib/semmle/go/frameworks/Gqlgen.qll
+++ b/go/ql/lib/semmle/go/frameworks/Gqlgen.qll
@@ -1,4 +1,6 @@
 /** Provides models of commonly used functions and types in the gqlgen packages. */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Jwt.qll b/go/ql/lib/semmle/go/frameworks/Jwt.qll
index 681ead26834..d139f48ae2b 100644
--- a/go/ql/lib/semmle/go/frameworks/Jwt.qll
+++ b/go/ql/lib/semmle/go/frameworks/Jwt.qll
@@ -2,6 +2,8 @@
  * Provides classes and predicates for working with the `github.com/golang-jwt/jwt` and
  * `github.com/dgrijalva/jwt-go` packages.
  */
+overlay[local?]
+module;
 
 import go
 private import semmle.go.security.MissingJwtSignatureCheckCustomizations::MissingJwtSignatureCheck
diff --git a/go/ql/lib/semmle/go/frameworks/K8sIoApiCoreV1.qll b/go/ql/lib/semmle/go/frameworks/K8sIoApiCoreV1.qll
index 6fe789dccc3..ea80d0eba37 100644
--- a/go/ql/lib/semmle/go/frameworks/K8sIoApiCoreV1.qll
+++ b/go/ql/lib/semmle/go/frameworks/K8sIoApiCoreV1.qll
@@ -1,4 +1,6 @@
 /** Provides models of commonly used functions in the `k8s.io/api/core/v1` package. */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/K8sIoApimachineryPkgRuntime.qll b/go/ql/lib/semmle/go/frameworks/K8sIoApimachineryPkgRuntime.qll
index 5c7481e5808..945904ba0ae 100644
--- a/go/ql/lib/semmle/go/frameworks/K8sIoApimachineryPkgRuntime.qll
+++ b/go/ql/lib/semmle/go/frameworks/K8sIoApimachineryPkgRuntime.qll
@@ -1,4 +1,6 @@
 /** Provides models of commonly used functions in the `k8s.io/apimachinery/pkg/runtime` package. */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/K8sIoClientGo.qll b/go/ql/lib/semmle/go/frameworks/K8sIoClientGo.qll
index c087cc26ff8..f23d069f4c0 100644
--- a/go/ql/lib/semmle/go/frameworks/K8sIoClientGo.qll
+++ b/go/ql/lib/semmle/go/frameworks/K8sIoClientGo.qll
@@ -1,4 +1,6 @@
 /** Provides models of commonly used functions in the `k8s.io/client-go/kubernetes/typed/core/v1` package. */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Logrus.qll b/go/ql/lib/semmle/go/frameworks/Logrus.qll
index 83278a4cd9e..33287462c05 100644
--- a/go/ql/lib/semmle/go/frameworks/Logrus.qll
+++ b/go/ql/lib/semmle/go/frameworks/Logrus.qll
@@ -1,4 +1,6 @@
 /** Provides models of commonly used functions in the `github.com/sirupsen/logrus` package. */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Macaron.qll b/go/ql/lib/semmle/go/frameworks/Macaron.qll
index 41e95095aa2..1c088804263 100644
--- a/go/ql/lib/semmle/go/frameworks/Macaron.qll
+++ b/go/ql/lib/semmle/go/frameworks/Macaron.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with concepts relating to the Macaron web framework
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Mux.qll b/go/ql/lib/semmle/go/frameworks/Mux.qll
index e9bb5968f70..a4790e3c5cd 100644
--- a/go/ql/lib/semmle/go/frameworks/Mux.qll
+++ b/go/ql/lib/semmle/go/frameworks/Mux.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with concepts in the Mux HTTP middleware library.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/NoSQL.qll b/go/ql/lib/semmle/go/frameworks/NoSQL.qll
index 2772182f4fc..463a3923496 100644
--- a/go/ql/lib/semmle/go/frameworks/NoSQL.qll
+++ b/go/ql/lib/semmle/go/frameworks/NoSQL.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with NoSQL-related concepts such as queries.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Protobuf.qll b/go/ql/lib/semmle/go/frameworks/Protobuf.qll
index 62443eb46af..246608159e5 100644
--- a/go/ql/lib/semmle/go/frameworks/Protobuf.qll
+++ b/go/ql/lib/semmle/go/frameworks/Protobuf.qll
@@ -1,4 +1,6 @@
 /** Provides models of commonly used functions and types in the protobuf packages. */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Revel.qll b/go/ql/lib/semmle/go/frameworks/Revel.qll
index a1eff5e736e..c6250c2f8a5 100644
--- a/go/ql/lib/semmle/go/frameworks/Revel.qll
+++ b/go/ql/lib/semmle/go/frameworks/Revel.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with remote flow sources from the `github.com/revel/revel` package.
  */
+overlay[local?]
+module;
 
 import go
 private import semmle.go.security.OpenUrlRedirectCustomizations
diff --git a/go/ql/lib/semmle/go/frameworks/RsCors.qll b/go/ql/lib/semmle/go/frameworks/RsCors.qll
index 52b4a7fe6d0..7609b27b58a 100644
--- a/go/ql/lib/semmle/go/frameworks/RsCors.qll
+++ b/go/ql/lib/semmle/go/frameworks/RsCors.qll
@@ -1,4 +1,6 @@
 /** Provides classes for modeling the `github.com/rs/cors` package. */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/SQL.qll b/go/ql/lib/semmle/go/frameworks/SQL.qll
index c5cf4989d1a..fad4722ad5c 100644
--- a/go/ql/lib/semmle/go/frameworks/SQL.qll
+++ b/go/ql/lib/semmle/go/frameworks/SQL.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with SQL-related concepts such as queries.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Spew.qll b/go/ql/lib/semmle/go/frameworks/Spew.qll
index f49a4aa4d89..4c8720868b7 100644
--- a/go/ql/lib/semmle/go/frameworks/Spew.qll
+++ b/go/ql/lib/semmle/go/frameworks/Spew.qll
@@ -1,6 +1,8 @@
 /**
  * Provides models of commonly used functions in the `github.com/davecgh/go-spew/spew` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Squirrel.qll b/go/ql/lib/semmle/go/frameworks/Squirrel.qll
index c7d75003cfe..28168c54107 100644
--- a/go/ql/lib/semmle/go/frameworks/Squirrel.qll
+++ b/go/ql/lib/semmle/go/frameworks/Squirrel.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `squirrel` ORM package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Stdlib.qll b/go/ql/lib/semmle/go/frameworks/Stdlib.qll
index 3b05627168d..4a8a2e8d0ea 100644
--- a/go/ql/lib/semmle/go/frameworks/Stdlib.qll
+++ b/go/ql/lib/semmle/go/frameworks/Stdlib.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the standard libraries.
  */
+overlay[local?]
+module;
 
 import go
 import semmle.go.frameworks.stdlib.ArchiveTar
diff --git a/go/ql/lib/semmle/go/frameworks/SystemCommandExecutors.qll b/go/ql/lib/semmle/go/frameworks/SystemCommandExecutors.qll
index 8abf2bbd368..d1bbbf41d89 100644
--- a/go/ql/lib/semmle/go/frameworks/SystemCommandExecutors.qll
+++ b/go/ql/lib/semmle/go/frameworks/SystemCommandExecutors.qll
@@ -2,6 +2,8 @@
  * Provides concrete classes for data-flow nodes that execute an
  * operating system command, for instance by spawning a new process.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Testing.qll b/go/ql/lib/semmle/go/frameworks/Testing.qll
index c0246c7df50..c6173ac099a 100644
--- a/go/ql/lib/semmle/go/frameworks/Testing.qll
+++ b/go/ql/lib/semmle/go/frameworks/Testing.qll
@@ -1,4 +1,6 @@
 /** Provides classes for working with tests. */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Twirp.qll b/go/ql/lib/semmle/go/frameworks/Twirp.qll
index 254949ad772..2fcd44da2ff 100644
--- a/go/ql/lib/semmle/go/frameworks/Twirp.qll
+++ b/go/ql/lib/semmle/go/frameworks/Twirp.qll
@@ -1,4 +1,6 @@
 /** Provides models of commonly used functions and types in the twirp packages. */
+overlay[local?]
+module;
 
 import go
 private import semmle.go.security.RequestForgeryCustomizations
diff --git a/go/ql/lib/semmle/go/frameworks/WebSocket.qll b/go/ql/lib/semmle/go/frameworks/WebSocket.qll
index eb6160214cc..36c6db5c453 100644
--- a/go/ql/lib/semmle/go/frameworks/WebSocket.qll
+++ b/go/ql/lib/semmle/go/frameworks/WebSocket.qll
@@ -1,4 +1,6 @@
 /** Provides classes for working with WebSocket-related APIs. */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/XNetHtml.qll b/go/ql/lib/semmle/go/frameworks/XNetHtml.qll
index 003c0e8570e..4eec0c9b331 100644
--- a/go/ql/lib/semmle/go/frameworks/XNetHtml.qll
+++ b/go/ql/lib/semmle/go/frameworks/XNetHtml.qll
@@ -6,6 +6,8 @@
  * that were already untrusted. We do not yet model adding a child `Node` to a tree then calling `Render`
  * yielding an untrustworthy string.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/XPath.qll b/go/ql/lib/semmle/go/frameworks/XPath.qll
index 0d8dc5d8176..d052a619c35 100644
--- a/go/ql/lib/semmle/go/frameworks/XPath.qll
+++ b/go/ql/lib/semmle/go/frameworks/XPath.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with XPath-related concepts such as XPath expressions.
  */
+overlay[local?]
+module;
 
 import go
 import semmle.go.dataflow.ExternalFlow
diff --git a/go/ql/lib/semmle/go/frameworks/Yaml.qll b/go/ql/lib/semmle/go/frameworks/Yaml.qll
index 22fc4f8c58c..160e5f18c6b 100644
--- a/go/ql/lib/semmle/go/frameworks/Yaml.qll
+++ b/go/ql/lib/semmle/go/frameworks/Yaml.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes for working with the [gopkg.in/yaml](https://pkg.go.dev/gopkg.in/yaml.v3) package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/Zap.qll b/go/ql/lib/semmle/go/frameworks/Zap.qll
index 0928d2b0595..b634d8e9795 100644
--- a/go/ql/lib/semmle/go/frameworks/Zap.qll
+++ b/go/ql/lib/semmle/go/frameworks/Zap.qll
@@ -1,6 +1,8 @@
 /**
  * Provides models of commonly used functions in the `go.uber.org/zap` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/ArchiveTar.qll b/go/ql/lib/semmle/go/frameworks/stdlib/ArchiveTar.qll
index 24d16f86b66..0798f187647 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/ArchiveTar.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/ArchiveTar.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `archive/tar` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/ArchiveZip.qll b/go/ql/lib/semmle/go/frameworks/stdlib/ArchiveZip.qll
index ed4061700dc..273b8ddff2c 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/ArchiveZip.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/ArchiveZip.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `archive/zip` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Bufio.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Bufio.qll
index 1ddb7e0889c..e79a5f16a90 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Bufio.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Bufio.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `bufio` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/CompressFlate.qll b/go/ql/lib/semmle/go/frameworks/stdlib/CompressFlate.qll
index 5df4ac972c9..1d63d0dda29 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/CompressFlate.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/CompressFlate.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `compress/flate` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/CompressGzip.qll b/go/ql/lib/semmle/go/frameworks/stdlib/CompressGzip.qll
index 29b731ec927..695c9ea5df5 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/CompressGzip.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/CompressGzip.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `compress/gzip` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/CompressLzw.qll b/go/ql/lib/semmle/go/frameworks/stdlib/CompressLzw.qll
index 4d8e2d1de93..319c1d4dd93 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/CompressLzw.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/CompressLzw.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `compress/lzw` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/CompressZlib.qll b/go/ql/lib/semmle/go/frameworks/stdlib/CompressZlib.qll
index be8d7fa69a0..26a2872ae1c 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/CompressZlib.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/CompressZlib.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `compress/zlib` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/CryptoTls.qll b/go/ql/lib/semmle/go/frameworks/stdlib/CryptoTls.qll
index 2bd85457cf8..a370f12c24d 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/CryptoTls.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/CryptoTls.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `crypto/tls` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/DatabaseSql.qll b/go/ql/lib/semmle/go/frameworks/stdlib/DatabaseSql.qll
index f4132688796..1969724b486 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/DatabaseSql.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/DatabaseSql.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `database/sql` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/EncodingAsn1.qll b/go/ql/lib/semmle/go/frameworks/stdlib/EncodingAsn1.qll
index 68d9655b11c..7a860608a90 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/EncodingAsn1.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/EncodingAsn1.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `encoding/asn1` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/EncodingCsv.qll b/go/ql/lib/semmle/go/frameworks/stdlib/EncodingCsv.qll
index 7606cdc16bd..283eeebacb6 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/EncodingCsv.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/EncodingCsv.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `encoding/csv` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/EncodingGob.qll b/go/ql/lib/semmle/go/frameworks/stdlib/EncodingGob.qll
index ada9f167f8d..01db1ec539a 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/EncodingGob.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/EncodingGob.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `encoding/gob` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/EncodingJson.qll b/go/ql/lib/semmle/go/frameworks/stdlib/EncodingJson.qll
index f38db392bd0..bf6e25ff9f1 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/EncodingJson.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/EncodingJson.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `encoding/json` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/EncodingPem.qll b/go/ql/lib/semmle/go/frameworks/stdlib/EncodingPem.qll
index cb2383d428a..4ef997c7815 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/EncodingPem.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/EncodingPem.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `encoding/pem` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/EncodingXml.qll b/go/ql/lib/semmle/go/frameworks/stdlib/EncodingXml.qll
index b36f9007084..b5206754529 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/EncodingXml.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/EncodingXml.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `encoding/xml` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Errors.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Errors.qll
index 133a69795b8..d20d0c1837e 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Errors.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Errors.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `errors` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll
index 6adbd542e9b..bc58441ada9 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `fmt` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Html.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Html.qll
index 82e5f13e130..c26d329f625 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Html.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Html.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `html` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/HtmlTemplate.qll b/go/ql/lib/semmle/go/frameworks/stdlib/HtmlTemplate.qll
index f61482c35d7..8d343bfa4fe 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/HtmlTemplate.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/HtmlTemplate.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `html/template` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Io.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Io.qll
index f44ca36ff85..41597e40f02 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Io.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Io.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `io` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/IoFs.qll b/go/ql/lib/semmle/go/frameworks/stdlib/IoFs.qll
index de7fafc514f..b071e56cbb5 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/IoFs.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/IoFs.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the 'io/fs' package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Log.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Log.qll
index ca74160bf0d..a5ebca68be5 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Log.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Log.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `log` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/MimeMultipart.qll b/go/ql/lib/semmle/go/frameworks/stdlib/MimeMultipart.qll
index ad60672e35e..d8c193d7f3e 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/MimeMultipart.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/MimeMultipart.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `mime/multipart` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/MimeQuotedprintable.qll b/go/ql/lib/semmle/go/frameworks/stdlib/MimeQuotedprintable.qll
index 0cf54c107a7..64b3d4c1755 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/MimeQuotedprintable.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/MimeQuotedprintable.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `mime/quotedprintable` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Net.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Net.qll
index 5b66e523bad..9d3f4abf6bd 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Net.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Net.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `net` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/NetHttp.qll b/go/ql/lib/semmle/go/frameworks/stdlib/NetHttp.qll
index a2aab2517d7..9bafe9721b7 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/NetHttp.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/NetHttp.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `net/http` package.
  */
+overlay[local?]
+module;
 
 import go
 private import semmle.go.dataflow.internal.DataFlowPrivate
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/NetHttpHttputil.qll b/go/ql/lib/semmle/go/frameworks/stdlib/NetHttpHttputil.qll
index f914626c770..465181bb39f 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/NetHttpHttputil.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/NetHttpHttputil.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `net/http/httputil` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/NetTextproto.qll b/go/ql/lib/semmle/go/frameworks/stdlib/NetTextproto.qll
index 9e19e719ce5..b1d314fdfd1 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/NetTextproto.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/NetTextproto.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `net/textproto` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll
index 72ea4cc6c57..0a633de08c8 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `os` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Path.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Path.qll
index 98215ecd00a..0bdf0b67ff0 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Path.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Path.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `path` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/PathFilepath.qll b/go/ql/lib/semmle/go/frameworks/stdlib/PathFilepath.qll
index 379c141fb2a..43deb8e1e7e 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/PathFilepath.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/PathFilepath.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `path/filepath` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Reflect.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Reflect.qll
index 62c09ef0c5e..9a4a74d70d5 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Reflect.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Reflect.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `reflect` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Regexp.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Regexp.qll
index 17cc0249908..6a28cd1709f 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Regexp.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Regexp.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `regexp` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Strconv.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Strconv.qll
index 0f3d2f95cc7..7048ddcbe0d 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Strconv.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Strconv.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `strconv` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Strings.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Strings.qll
index 96b07f5de34..2f514bf28f4 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Strings.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Strings.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `strings` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Syscall.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Syscall.qll
index b93a991e8e3..cb74560809f 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Syscall.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Syscall.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `syscall` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/TextTabwriter.qll b/go/ql/lib/semmle/go/frameworks/stdlib/TextTabwriter.qll
index 964afecb4e6..f0e78817c2d 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/TextTabwriter.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/TextTabwriter.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `text/tabwriter` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/TextTemplate.qll b/go/ql/lib/semmle/go/frameworks/stdlib/TextTemplate.qll
index c5a67f388f4..31d7f94ec57 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/TextTemplate.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/TextTemplate.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `text/template` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Unsafe.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Unsafe.qll
index d14598e6f79..307686feac6 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Unsafe.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Unsafe.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes modeling security-relevant aspects of the `unsafe` package.
  */
+overlay[local?]
+module;
 
 import go
 
diff --git a/go/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll b/go/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
index 1d185440772..3bdc948842c 100644
--- a/go/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
+++ b/go/ql/lib/utils/test/internal/InlineExpectationsTestImpl.qll
@@ -1,3 +1,6 @@
+overlay[local?]
+module;
+
 private import go as G
 private import codeql.util.test.InlineExpectationsTest
 
diff --git a/go/ql/src/CHANGELOG.md b/go/ql/src/CHANGELOG.md
index 95f203839c5..83e764ea9d3 100644
--- a/go/ql/src/CHANGELOG.md
+++ b/go/ql/src/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.5.8
+
+No user-facing changes.
+
+## 1.5.7
+
+No user-facing changes.
+
 ## 1.5.6
 
 No user-facing changes.
diff --git a/go/ql/src/RedundantCode/UnreachableStatement.ql b/go/ql/src/RedundantCode/UnreachableStatement.ql
index c177705a86f..12b035049e9 100644
--- a/go/ql/src/RedundantCode/UnreachableStatement.ql
+++ b/go/ql/src/RedundantCode/UnreachableStatement.ql
@@ -26,7 +26,7 @@ ControlFlow::Node nonGuardPredecessor(ControlFlow::Node nd) {
  * Matches if `retval` is a constant or a struct composed wholly of constants.
  */
 predicate isAllowedReturnValue(Expr retval) {
-  retval = Builtin::nil().getAReference()
+  exprRefersToNil(retval)
   or
   retval = Builtin::true_().getAReference()
   or
diff --git a/go/ql/src/Security/CWE-079/HtmlTemplateEscapingBypassXss.ql b/go/ql/src/Security/CWE-079/HtmlTemplateEscapingBypassXss.ql
index 15373ee85ed..f556630965c 100644
--- a/go/ql/src/Security/CWE-079/HtmlTemplateEscapingBypassXss.ql
+++ b/go/ql/src/Security/CWE-079/HtmlTemplateEscapingBypassXss.ql
@@ -5,7 +5,7 @@
  *              scripting vulnerability.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 6.1
+ * @security-severity 7.8
  * @precision high
  * @id go/html-template-escaping-bypass-xss
  * @tags security
diff --git a/go/ql/src/Security/CWE-079/ReflectedXss.ql b/go/ql/src/Security/CWE-079/ReflectedXss.ql
index 0fca12ac285..ebabb69f0a4 100644
--- a/go/ql/src/Security/CWE-079/ReflectedXss.ql
+++ b/go/ql/src/Security/CWE-079/ReflectedXss.ql
@@ -4,7 +4,7 @@
  *              a cross-site scripting vulnerability.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 6.1
+ * @security-severity 7.8
  * @precision high
  * @id go/reflected-xss
  * @tags security
diff --git a/go/ql/src/Security/CWE-079/StoredXss.ql b/go/ql/src/Security/CWE-079/StoredXss.ql
index 83628b31042..dcae0a5f9c1 100644
--- a/go/ql/src/Security/CWE-079/StoredXss.ql
+++ b/go/ql/src/Security/CWE-079/StoredXss.ql
@@ -4,7 +4,7 @@
  *              a stored cross-site scripting vulnerability.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 6.1
+ * @security-severity 7.8
  * @precision low
  * @id go/stored-xss
  * @tags security
diff --git a/go/ql/src/Security/CWE-117/LogInjection.ql b/go/ql/src/Security/CWE-117/LogInjection.ql
index 5b6586c8e4e..08febfd842e 100644
--- a/go/ql/src/Security/CWE-117/LogInjection.ql
+++ b/go/ql/src/Security/CWE-117/LogInjection.ql
@@ -4,7 +4,7 @@
  *              insertion of forged log entries by a malicious user.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 7.8
+ * @security-severity 6.1
  * @precision medium
  * @id go/log-injection
  * @tags security
diff --git a/go/ql/src/Security/CWE-327/examples/Crypto.go b/go/ql/src/Security/CWE-327/examples/Crypto.go
index b3f71f0772b..ec34c0c6cf5 100644
--- a/go/ql/src/Security/CWE-327/examples/Crypto.go
+++ b/go/ql/src/Security/CWE-327/examples/Crypto.go
@@ -13,7 +13,7 @@ func EncryptMessageWeak(key []byte, message []byte) (dst []byte) {
 }
 
 func EncryptMessageStrong(key []byte, message []byte) (dst []byte) {
-	// GOOD, AES is a weak crypto algorithm
+	// GOOD, AES is a strong crypto algorithm
 	block, _ := aes.NewCipher(key)
 	block.Encrypt(dst, message)
 	return
diff --git a/go/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md b/go/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md
new file mode 100644
index 00000000000..45320bcd719
--- /dev/null
+++ b/go/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md
@@ -0,0 +1,5 @@
+---
+category: queryMetadata
+---
+* The `@security-severity` metadata of `go/log-injection` has been reduced from 7.8 (high) to 6.1 (medium).
+* The `@security-severity` metadata of `go/html-template-escaping-bypass-xss`, `go/reflected-xss` and `go/stored-xss` has been increased from 6.1 (medium) to 7.8 (high).
diff --git a/go/ql/src/change-notes/released/1.5.7.md b/go/ql/src/change-notes/released/1.5.7.md
new file mode 100644
index 00000000000..c60c55034a6
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.5.7.md
@@ -0,0 +1,3 @@
+## 1.5.7
+
+No user-facing changes.
diff --git a/go/ql/src/change-notes/released/1.5.8.md b/go/ql/src/change-notes/released/1.5.8.md
new file mode 100644
index 00000000000..ec8f84e657f
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.5.8.md
@@ -0,0 +1,3 @@
+## 1.5.8
+
+No user-facing changes.
diff --git a/go/ql/src/codeql-pack.release.yml b/go/ql/src/codeql-pack.release.yml
index 9a0b3c9461b..d26e0a52764 100644
--- a/go/ql/src/codeql-pack.release.yml
+++ b/go/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.5.6
+lastReleaseVersion: 1.5.8
diff --git a/go/ql/src/experimental/CWE-203/Timing.ql b/go/ql/src/experimental/CWE-203/Timing.ql
index e488adf2f97..30ce6952e06 100644
--- a/go/ql/src/experimental/CWE-203/Timing.ql
+++ b/go/ql/src/experimental/CWE-203/Timing.ql
@@ -36,7 +36,7 @@ private class SensitiveStringCompareSink extends Sink {
       not op1 = nonSensitiveOperand and
       not (
         // Comparisons with `nil` should be excluded.
-        nonSensitiveOperand = Builtin::nil().getAReference()
+        exprRefersToNil(nonSensitiveOperand)
         or
         // Comparisons with empty string should also be excluded.
         nonSensitiveOperand.getStringValue().length() = 0
@@ -60,7 +60,7 @@ private class SensitiveCompareSink extends Sink {
       not op1 = op2 and
       not (
         // Comparisons with `nil` should be excluded.
-        op2 = Builtin::nil().getAReference()
+        exprRefersToNil(op2)
         or
         // Comparisons with empty string should also be excluded.
         op2.getStringValue().length() = 0
@@ -85,7 +85,7 @@ private class SensitiveStringSink extends Sink {
       not op1 = op2 and
       not (
         // Comparisons with `nil` should be excluded.
-        op2 = Builtin::nil().getAReference()
+        exprRefersToNil(op2)
         or
         // Comparisons with empty string should also be excluded.
         op2.getStringValue().length() = 0
diff --git a/go/ql/src/filters/ClassifyFiles.ql b/go/ql/src/filters/ClassifyFiles.ql
index f5ac1258375..8e353740c1a 100644
--- a/go/ql/src/filters/ClassifyFiles.ql
+++ b/go/ql/src/filters/ClassifyFiles.ql
@@ -1,6 +1,6 @@
 /**
  * @name Classify files
- * @description This query produces a list of all files in a snapshot that are classified as
+ * @description This query produces a list of all files in a database that are classified as
  *              generated code, test code or vendored-in library code.
  * @kind file-classifier
  * @id go/file-classifier
diff --git a/go/ql/src/qlpack.yml b/go/ql/src/qlpack.yml
index bbac3ffc212..a32eb17ebf7 100644
--- a/go/ql/src/qlpack.yml
+++ b/go/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-queries
-version: 1.5.7-dev
+version: 1.5.9-dev
 groups:
   - go
   - queries
diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.ql b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.ql
index 4ca15c10ac5..bbcaa16f28b 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.ql
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstExcludeComments.ql
@@ -5,6 +5,7 @@
 import go
 import semmle.go.PrintAst
 
+overlay[local]
 class Cfg extends PrintAstConfiguration {
   override predicate shouldPrintFunction(FuncDecl func) { any() }
 
diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.ql b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.ql
index eaddceacaa3..b04be6edfac 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.ql
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstNestedFunction.ql
@@ -5,6 +5,7 @@
 import go
 import semmle.go.PrintAst
 
+overlay[local]
 class Cfg extends PrintAstConfiguration {
   override predicate shouldPrintFunction(FuncDecl func) { func.getName() = "hasNested" }
 
diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.ql b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.ql
index 83d27b9cf26..60cda4f5045 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.ql
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFile.ql
@@ -5,6 +5,7 @@
 import go
 import semmle.go.PrintAst
 
+overlay[local]
 class Cfg extends PrintAstConfiguration {
   override predicate shouldPrintFunction(FuncDecl func) { any() }
 
diff --git a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFunction.ql b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFunction.ql
index 382fc397755..5b3501edc6c 100644
--- a/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFunction.ql
+++ b/go/ql/test/library-tests/semmle/go/PrintAst/PrintAstRestrictFunction.ql
@@ -5,6 +5,7 @@
 import go
 import semmle.go.PrintAst
 
+overlay[local]
 class Cfg extends PrintAstConfiguration {
   override predicate shouldPrintFunction(FuncDecl func) { func.getName() = "g" }
 
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_I1.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_I1.ql
index 181c55b29df..2468a57cac0 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_I1.ql
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_I1.ql
@@ -34,6 +34,7 @@ module FlowTest implements TestSig {
   }
 }
 
+overlay[local]
 class MyStep extends DataFlow::FunctionModel, Method {
   MyStep() { this.hasQualifiedName("github.com/nonexistent/test", "I1", "Step") }
 
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_P1.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_P1.ql
index e82a6cb4da1..788c8c028d2 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_P1.ql
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_P1.ql
@@ -44,6 +44,7 @@ module FlowTest implements TestSig {
   }
 }
 
+overlay[local]
 class MyStep extends DataFlow::FunctionModel, Method {
   MyStep() { this.hasQualifiedName("github.com/nonexistent/test", "P1", "Step") }
 
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_S1.ql b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_S1.ql
index c4124dcd10e..127fb0012a3 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_S1.ql
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_S1.ql
@@ -44,6 +44,7 @@ module FlowTest implements TestSig {
   }
 }
 
+overlay[local]
 class MyStep extends DataFlow::FunctionModel, Method {
   MyStep() { this.hasQualifiedName("github.com/nonexistent/test", "S1", "Step") }
 
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/VarArgsWithFunctionModels/Flows.ql b/go/ql/test/library-tests/semmle/go/dataflow/VarArgsWithFunctionModels/Flows.ql
index 78e21d534e0..bbe5618b568 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/VarArgsWithFunctionModels/Flows.ql
+++ b/go/ql/test/library-tests/semmle/go/dataflow/VarArgsWithFunctionModels/Flows.ql
@@ -4,6 +4,7 @@ import ModelValidation
 import utils.test.InlineFlowTest
 import DefaultFlowTest
 
+overlay[local]
 class SummaryModelTest extends DataFlow::FunctionModel {
   FunctionInput inp;
   FunctionOutput outp;
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/file/test.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/file/test.go
index 1a145751476..27bdff33a27 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/file/test.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/file/test.go
@@ -16,7 +16,7 @@ func open() {
 }
 
 func openFile() {
-	file, err := os.OpenFile("file.txt", os.O_RDWR, 0) // $source
+	file, err := os.OpenFile("file.txt", os.O_RDWR, 0) // $ source
 	if err != nil {
 		return
 	}
@@ -25,7 +25,7 @@ func openFile() {
 }
 
 func readFile() {
-	data, err := os.ReadFile("file.txt") // $source
+	data, err := os.ReadFile("file.txt") // $ source
 	if err != nil {
 		return
 	}
@@ -33,7 +33,7 @@ func readFile() {
 }
 
 func readFileIoUtil() {
-	data, err := ioutil.ReadFile("file.txt") // $source
+	data, err := ioutil.ReadFile("file.txt") // $ source
 	if err != nil {
 		return
 	}
@@ -45,14 +45,14 @@ func getFileFS() fs.ReadFileFS {
 }
 
 func readFileFs() {
-	data, err := fs.ReadFile(os.DirFS("."), "file.txt") // $source
+	data, err := fs.ReadFile(os.DirFS("."), "file.txt") // $ source
 	if err != nil {
 		return
 	}
 	_ = data
 
 	dir := getFileFS()
-	data, err = dir.ReadFile("file.txt") // $source
+	data, err = dir.ReadFile("file.txt") // $ source
 
 	if err != nil {
 		return
@@ -61,7 +61,7 @@ func readFileFs() {
 }
 
 func fsOpen() {
-	file, err := os.DirFS(".").Open("file.txt") // $source
+	file, err := os.DirFS(".").Open("file.txt") // $ source
 	if err != nil {
 		return
 	}
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.go b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.go
index 4166dc4000b..8a2830b73e3 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/test.go
@@ -12,37 +12,37 @@ func sink(string) {
 
 func readStdinBuffer() {
 	buf := make([]byte, 1024)
-	n, err := os.Stdin.Read(buf) // $source
+	n, err := os.Stdin.Read(buf) // $ source
 	if err != nil {
 		return
 	}
-	sink(string(buf[:n])) // $hasTaintFlow="type conversion"
+	sink(string(buf[:n])) // $ hasTaintFlow="type conversion"
 }
 
 func readStdinBuffReader() {
 	buf := make([]byte, 1024)
-	r := bufio.NewReader(os.Stdin) // $source
+	r := bufio.NewReader(os.Stdin) // $ source
 	n, err := r.Read(buf)
 	if err != nil {
 		return
 	}
-	sink(string(buf[:n])) // $hasTaintFlow="type conversion"
+	sink(string(buf[:n])) // $ hasTaintFlow="type conversion"
 }
 
 func scan() {
 	var username, email string
-	fmt.Scan(&username, &email) // $source
-	sink(username)              // $hasTaintFlow="username"
+	fmt.Scan(&username, &email) // $ source
+	sink(username)              // $ hasTaintFlow="username"
 }
 
 func scanf() {
 	var s string
-	fmt.Scanf("%s", &s) // $source
-	sink(s)             // $hasTaintFlow="s"
+	fmt.Scanf("%s", &s) // $ source
+	sink(s)             // $ hasTaintFlow="s"
 }
 
 func scanl() {
 	var s string
-	fmt.Scanln(&s) // $source
-	sink(s)        // $hasTaintFlow="s"
+	fmt.Scanln(&s) // $ source
+	sink(s)        // $ hasTaintFlow="s"
 }
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Macaron/sources.go b/go/ql/test/library-tests/semmle/go/frameworks/Macaron/sources.go
index 9cc46d5611e..eaf3ad51f43 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Macaron/sources.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Macaron/sources.go
@@ -7,16 +7,16 @@ import (
 )
 
 func sources(ctx *macaron.Context, body *macaron.RequestBody) {
-	_ = ctx.AllParams()                     // $RemoteFlowSource
-	_ = ctx.GetCookie("")                   // $RemoteFlowSource
-	_, _ = ctx.GetSecureCookie("")          // $RemoteFlowSource
-	_, _ = ctx.GetSuperSecureCookie("", "") // $RemoteFlowSource
-	_, _, _ = ctx.GetFile("")               // $RemoteFlowSource
-	_ = ctx.Params("")                      // $RemoteFlowSource
-	_ = ctx.ParamsEscape("")                // $RemoteFlowSource
-	_ = ctx.Query("")                       // $RemoteFlowSource
-	_ = ctx.QueryEscape("")                 // $RemoteFlowSource
-	_ = ctx.QueryStrings("")                // $RemoteFlowSource
-	_, _ = body.Bytes()                     // $RemoteFlowSource
-	_, _ = body.String()                    // $RemoteFlowSource
+	_ = ctx.AllParams()                     // $ RemoteFlowSource
+	_ = ctx.GetCookie("")                   // $ RemoteFlowSource
+	_, _ = ctx.GetSecureCookie("")          // $ RemoteFlowSource
+	_, _ = ctx.GetSuperSecureCookie("", "") // $ RemoteFlowSource
+	_, _, _ = ctx.GetFile("")               // $ RemoteFlowSource
+	_ = ctx.Params("")                      // $ RemoteFlowSource
+	_ = ctx.ParamsEscape("")                // $ RemoteFlowSource
+	_ = ctx.Query("")                       // $ RemoteFlowSource
+	_ = ctx.QueryEscape("")                 // $ RemoteFlowSource
+	_ = ctx.QueryStrings("")                // $ RemoteFlowSource
+	_, _ = body.Bytes()                     // $ RemoteFlowSource
+	_, _ = body.String()                    // $ RemoteFlowSource
 }
diff --git a/java/downgrades/de4ded61c8ae83f829aedaf05be73307ba25ca40/old.dbscheme b/java/downgrades/de4ded61c8ae83f829aedaf05be73307ba25ca40/old.dbscheme
new file mode 100644
index 00000000000..de4ded61c8a
--- /dev/null
+++ b/java/downgrades/de4ded61c8ae83f829aedaf05be73307ba25ca40/old.dbscheme
@@ -0,0 +1,1241 @@
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   javac A.java B.java C.java
+ *
+ * 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:
+     *
+     *   javac A.java B.java C.java
+     */
+    unique int id : @compilation,
+    int kind: int ref,
+    string cwd : string ref,
+    string name : string ref
+);
+
+case @compilation.kind of
+   1  = @javacompilation
+|  2  = @kotlincompilation
+;
+
+compilation_started(
+    int id : @compilation ref
+)
+
+compilation_info(
+    int id : @compilation ref,
+    string info_key: string ref,
+    string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   javac A.java B.java C.java
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--javac-args`
+ * 2   | A.java
+ * 3   | B.java
+ * 4   | C.java
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@@@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   javac A.java B.java C.java
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | A.java
+ * 1   | B.java
+ * 2   | C.java
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * For each file recorded in `compilation_compiling_files`,
+ * there will be a corresponding row in
+ * `compilation_compiling_files_completed` once extraction
+ * of that file is complete. The `result` will indicate the
+ * extraction result:
+ *
+ *     0: Successfully extracted
+ *     1: Errors were encountered, but extraction recovered
+ *     2: Errors were encountered, and extraction could not recover
+ */
+#keyset[id, num]
+compilation_compiling_files_completed(
+    int id : @compilation ref,
+    int num : int ref,
+    int result : int 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
+);
+
+/**
+ * The `cpu_seconds` and `elapsed_seconds` are the CPU time and elapsed
+ * time (respectively) that the original compilation (not the extraction)
+ * took for compiler invocation `id`.
+ */
+compilation_compiler_times(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float 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`.
+ * The `result` will indicate the extraction result:
+ *
+ *     0: Successfully extracted
+ *     1: Errors were encountered, but extraction recovered
+ *     2: Errors were encountered, and extraction could not recover
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref,
+    int result : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    string generated_by: string ref, // TODO: Sync this with the other languages?
+    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
+);
+
+/**
+ * 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(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/*
+ * External artifacts
+ */
+
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+sourceLocationPrefix(
+  string prefix : string ref
+);
+
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*
+ * SMAP
+ */
+
+smap_header(
+  int outputFileId: @file ref,
+  string outputFilename: string ref,
+  string defaultStratum: string ref
+);
+
+smap_files(
+  int outputFileId: @file ref,
+  string stratum: string ref,
+  int inputFileNum: int ref,
+  string inputFileName: string ref,
+  int inputFileId: @file ref
+);
+
+smap_lines(
+  int outputFileId: @file ref,
+  string stratum: string ref,
+  int inputFileNum: int ref,
+  int inputStartLine: int ref,
+  int inputLineCount: int ref,
+  int outputStartLine: int ref,
+  int outputLineIncrement: int ref
+);
+
+/*
+ * Locations and files
+ */
+
+@location = @location_default ;
+
+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
+);
+
+hasLocation(
+  int locatableid: @locatable ref,
+  int id: @location ref
+);
+
+@sourceline = @locatable ;
+
+#keyset[element_id]
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*
+ * Java
+ */
+
+cupackage(
+  unique int id: @file ref,
+  int packageid: @package ref
+);
+
+#keyset[fileid,keyName]
+jarManifestMain(
+  int fileid: @file ref,
+  string keyName: string ref,
+  string value: string ref
+);
+
+#keyset[fileid,entryName,keyName]
+jarManifestEntries(
+  int fileid: @file ref,
+  string entryName: string ref,
+  string keyName: string ref,
+  string value: string ref
+);
+
+packages(
+  unique int id: @package,
+  string nodeName: string ref
+);
+
+primitives(
+  unique int id: @primitive,
+  string nodeName: string ref
+);
+
+modifiers(
+  unique int id: @modifier,
+  string nodeName: string ref
+);
+
+/**
+ * An errortype is used when the extractor is unable to extract a type
+ * correctly for some reason.
+ */
+error_type(
+  unique int id: @errortype
+);
+
+classes_or_interfaces(
+  unique int id: @classorinterface,
+  string nodeName: string ref,
+  int parentid: @package ref,
+  int sourceid: @classorinterface ref
+);
+
+file_class(
+  int id: @classorinterface ref
+);
+
+class_object(
+  unique int id: @classorinterface ref,
+  unique int instance: @field ref
+);
+
+type_companion_object(
+  unique int id: @classorinterface ref,
+  unique int instance: @field ref,
+  unique int companion_object: @classorinterface ref
+);
+
+kt_nullable_types(
+  unique int id: @kt_nullable_type,
+  int classid: @reftype ref
+)
+
+kt_notnull_types(
+  unique int id: @kt_notnull_type,
+  int classid: @reftype ref
+)
+
+kt_type_alias(
+  unique int id: @kt_type_alias,
+  string name: string ref,
+  int kttypeid: @kt_type ref
+)
+
+@kt_type = @kt_nullable_type | @kt_notnull_type
+
+isInterface(
+  unique int id: @classorinterface ref
+);
+
+isRecord(
+  unique int id: @classorinterface ref
+);
+
+fielddecls(
+  unique int id: @fielddecl,
+  int parentid: @reftype ref
+);
+
+#keyset[fieldId] #keyset[fieldDeclId,pos]
+fieldDeclaredIn(
+  int fieldId: @field ref,
+  int fieldDeclId: @fielddecl ref,
+  int pos: int ref
+);
+
+fields(
+  unique int id: @field,
+  string nodeName: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref
+);
+
+fieldsKotlinType(
+  unique int id: @field ref,
+  int kttypeid: @kt_type ref
+);
+
+constrs(
+  unique int id: @constructor,
+  string nodeName: string ref,
+  string signature: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref,
+  int sourceid: @constructor ref
+);
+
+constrsKotlinType(
+  unique int id: @constructor ref,
+  int kttypeid: @kt_type ref
+);
+
+methods(
+  unique int id: @method,
+  string nodeName: string ref,
+  string signature: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref,
+  int sourceid: @method ref
+);
+
+methodsKotlinType(
+  unique int id: @method ref,
+  int kttypeid: @kt_type ref
+);
+
+#keyset[parentid,pos]
+params(
+  unique int id: @param,
+  int typeid: @type ref,
+  int pos: int ref,
+  int parentid: @callable ref,
+  int sourceid: @param ref
+);
+
+paramsKotlinType(
+  unique int id: @param ref,
+  int kttypeid: @kt_type ref
+);
+
+paramName(
+  unique int id: @param ref,
+  string nodeName: string ref
+);
+
+isVarargsParam(
+  int param: @param ref
+);
+
+exceptions(
+  unique int id: @exception,
+  int typeid: @type ref,
+  int parentid: @callable ref
+);
+
+isAnnotType(
+  int interfaceid: @classorinterface ref
+);
+
+isAnnotElem(
+  int methodid: @method ref
+);
+
+annotValue(
+  int parentid: @annotation ref,
+  int id2: @method ref,
+  unique int value: @expr ref
+);
+
+isEnumType(
+  int classid: @classorinterface ref
+);
+
+isEnumConst(
+  int fieldid: @field ref
+);
+
+#keyset[parentid,pos]
+typeVars(
+  unique int id: @typevariable,
+  string nodeName: string ref,
+  int pos: int ref,
+  int parentid: @classorinterfaceorcallable ref
+);
+
+wildcards(
+  unique int id: @wildcard,
+  string nodeName: string ref,
+  int kind: int ref
+);
+
+#keyset[parentid,pos]
+typeBounds(
+  unique int id: @typebound,
+  int typeid: @reftype ref,
+  int pos: int ref,
+  int parentid: @boundedtype ref
+);
+
+#keyset[parentid,pos]
+typeArgs(
+  int argumentid: @reftype ref,
+  int pos: int ref,
+  int parentid: @classorinterfaceorcallable ref
+);
+
+isParameterized(
+  int memberid: @member ref
+);
+
+isRaw(
+  int memberid: @member ref
+);
+
+#keyset[classid] #keyset[parent]
+isAnonymClass(
+  int classid: @classorinterface ref,
+  int parent: @classinstancexpr ref
+);
+
+#keyset[typeid] #keyset[parent]
+isLocalClassOrInterface(
+  int typeid: @classorinterface ref,
+  int parent: @localtypedeclstmt ref
+);
+
+isImplicitClass(
+  unique int classid: @classorinterface ref
+);
+
+isDefConstr(
+  int constructorid: @constructor ref
+);
+
+#keyset[exprId]
+lambdaKind(
+  int exprId: @lambdaexpr ref,
+  int bodyKind: int ref
+);
+
+isCanonicalConstr(
+  int constructorid: @constructor ref
+);
+
+arrays(
+  unique int id: @array,
+  string nodeName: string ref,
+  int elementtypeid: @type ref,
+  int dimension: int ref,
+  int componenttypeid: @type ref
+);
+
+enclInReftype(
+  unique int child: @reftype ref,
+  int parent: @reftype ref
+);
+
+extendsReftype(
+  int id1: @reftype ref,
+  int id2: @classorinterface ref
+);
+
+implInterface(
+  int id1: @classorarray ref,
+  int id2: @classorinterface ref
+);
+
+permits(
+  int id1: @classorinterface ref,
+  int id2: @classorinterface ref
+);
+
+hasModifier(
+  int id1: @modifiable ref,
+  int id2: @modifier ref
+);
+
+imports(
+  unique int id: @import,
+  int holder: @classorinterfaceorpackage ref,
+  string name: string ref,
+  int kind: int ref
+);
+
+#keyset[parent,idx]
+stmts(
+  unique int id: @stmt,
+  int kind: int ref,
+  int parent: @stmtparent ref,
+  int idx: int ref,
+  int bodydecl: @callable ref
+);
+
+@stmtparent = @callable | @stmt | @switchexpr | @whenexpr| @stmtexpr;
+
+case @stmt.kind of
+  0 = @block
+| 1 = @ifstmt
+| 2 = @forstmt
+| 3 = @enhancedforstmt
+| 4 = @whilestmt
+| 5 = @dostmt
+| 6 = @trystmt
+| 7 = @switchstmt
+| 8 = @synchronizedstmt
+| 9 = @returnstmt
+| 10 = @throwstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @emptystmt
+| 14 = @exprstmt
+| 15 = @labeledstmt
+| 16 = @assertstmt
+| 17 = @localvariabledeclstmt
+| 18 = @localtypedeclstmt
+| 19 = @constructorinvocationstmt
+| 20 = @superconstructorinvocationstmt
+| 21 = @case
+| 22 = @catchclause
+| 23 = @yieldstmt
+| 24 = @errorstmt
+| 25 = @whenbranch
+;
+
+#keyset[parent,idx]
+exprs(
+  unique int id: @expr,
+  int kind: int ref,
+  int typeid: @type ref,
+  int parent: @exprparent ref,
+  int idx: int ref
+);
+
+exprsKotlinType(
+  unique int id: @expr ref,
+  int kttypeid: @kt_type ref
+);
+
+callableEnclosingExpr(
+  unique int id: @expr ref,
+  int callable_id: @callable ref
+);
+
+statementEnclosingExpr(
+  unique int id: @expr ref,
+  int statement_id: @stmt ref
+);
+
+isParenthesized(
+  unique int id: @expr ref,
+  int parentheses: int ref
+);
+
+case @expr.kind of
+   1  = @arrayaccess
+|  2  = @arraycreationexpr
+|  3  = @arrayinit
+|  4  = @assignexpr
+|  5  = @assignaddexpr
+|  6  = @assignsubexpr
+|  7  = @assignmulexpr
+|  8  = @assigndivexpr
+|  9  = @assignremexpr
+| 10  = @assignandexpr
+| 11  = @assignorexpr
+| 12  = @assignxorexpr
+| 13  = @assignlshiftexpr
+| 14  = @assignrshiftexpr
+| 15  = @assignurshiftexpr
+| 16  = @booleanliteral
+| 17  = @integerliteral
+| 18  = @longliteral
+| 19  = @floatingpointliteral
+| 20  = @doubleliteral
+| 21  = @characterliteral
+| 22  = @stringliteral
+| 23  = @nullliteral
+| 24  = @mulexpr
+| 25  = @divexpr
+| 26  = @remexpr
+| 27  = @addexpr
+| 28  = @subexpr
+| 29  = @lshiftexpr
+| 30  = @rshiftexpr
+| 31  = @urshiftexpr
+| 32  = @andbitexpr
+| 33  = @orbitexpr
+| 34  = @xorbitexpr
+| 35  = @andlogicalexpr
+| 36  = @orlogicalexpr
+| 37  = @ltexpr
+| 38  = @gtexpr
+| 39  = @leexpr
+| 40  = @geexpr
+| 41  = @eqexpr
+| 42  = @neexpr
+| 43  = @postincexpr
+| 44  = @postdecexpr
+| 45  = @preincexpr
+| 46  = @predecexpr
+| 47  = @minusexpr
+| 48  = @plusexpr
+| 49  = @bitnotexpr
+| 50  = @lognotexpr
+| 51  = @castexpr
+| 52  = @newexpr
+| 53  = @conditionalexpr
+| 54  = @parexpr         // deprecated
+| 55  = @instanceofexpr
+| 56  = @localvariabledeclexpr
+| 57  = @typeliteral
+| 58  = @thisaccess
+| 59  = @superaccess
+| 60  = @varaccess
+| 61  = @methodaccess
+| 62  = @unannotatedtypeaccess
+| 63  = @arraytypeaccess
+| 64  = @packageaccess
+| 65  = @wildcardtypeaccess
+| 66  = @declannotation
+| 67  = @uniontypeaccess
+| 68  = @lambdaexpr
+| 69  = @memberref
+| 70  = @annotatedtypeaccess
+| 71  = @typeannotation
+| 72  = @intersectiontypeaccess
+| 73  = @switchexpr
+| 74  = @errorexpr
+| 75  = @whenexpr
+| 76  = @getclassexpr
+| 77  = @safecastexpr
+| 78  = @implicitcastexpr
+| 79  = @implicitnotnullexpr
+| 80  = @implicitcoerciontounitexpr
+| 81  = @notinstanceofexpr
+| 82  = @stmtexpr
+| 83  = @stringtemplateexpr
+| 84  = @notnullexpr
+| 85  = @unsafecoerceexpr
+| 86  = @valueeqexpr
+| 87  = @valueneexpr
+| 88  = @propertyref
+| 89  = @recordpatternexpr
+;
+
+/** Holds if this `when` expression was written as an `if` expression. */
+when_if(unique int id: @whenexpr ref);
+
+/** Holds if this `when` branch was written as an `else` branch. */
+when_branch_else(unique int id: @whenbranch ref);
+
+@classinstancexpr = @newexpr | @lambdaexpr | @memberref | @propertyref
+
+@annotation = @declannotation | @typeannotation
+@typeaccess = @unannotatedtypeaccess | @annotatedtypeaccess
+
+@assignment = @assignexpr
+             | @assignop;
+
+@unaryassignment = @postincexpr
+                 | @postdecexpr
+                 | @preincexpr
+                 | @predecexpr;
+
+@assignop = @assignaddexpr
+             | @assignsubexpr
+             | @assignmulexpr
+             | @assigndivexpr
+             | @assignremexpr
+             | @assignandexpr
+             | @assignorexpr
+             | @assignxorexpr
+             | @assignlshiftexpr
+             | @assignrshiftexpr
+             | @assignurshiftexpr;
+
+@literal = @booleanliteral
+             | @integerliteral
+             | @longliteral
+             | @floatingpointliteral
+             | @doubleliteral
+             | @characterliteral
+             | @stringliteral
+             | @nullliteral;
+
+@binaryexpr = @mulexpr
+             | @divexpr
+             | @remexpr
+             | @addexpr
+             | @subexpr
+             | @lshiftexpr
+             | @rshiftexpr
+             | @urshiftexpr
+             | @andbitexpr
+             | @orbitexpr
+             | @xorbitexpr
+             | @andlogicalexpr
+             | @orlogicalexpr
+             | @ltexpr
+             | @gtexpr
+             | @leexpr
+             | @geexpr
+             | @eqexpr
+             | @neexpr
+             | @assignment
+             | @valueeqexpr
+             | @valueneexpr;
+
+@unaryexpr =   @postincexpr
+             | @postdecexpr
+             | @preincexpr
+             | @predecexpr
+             | @minusexpr
+             | @plusexpr
+             | @bitnotexpr
+             | @lognotexpr
+             | @notnullexpr;
+
+@caller =  @classinstancexpr
+         | @methodaccess
+         | @constructorinvocationstmt
+         | @superconstructorinvocationstmt;
+
+callableBinding(
+  unique int callerid: @caller ref,
+  int callee: @callable ref
+);
+
+memberRefBinding(
+  unique int id: @expr ref,
+  int callable: @callable ref
+);
+
+propertyRefGetBinding(
+  unique int id: @expr ref,
+  int getter: @callable ref
+);
+
+propertyRefFieldBinding(
+  unique int id: @expr ref,
+  int field: @field ref
+);
+
+propertyRefSetBinding(
+  unique int id: @expr ref,
+  int setter: @callable ref
+);
+
+@exprparent = @stmt | @expr | @whenbranch | @callable | @field | @fielddecl | @classorinterface | @param | @localvar | @typevariable;
+
+variableBinding(
+  unique int expr: @varaccess ref,
+  int variable: @variable ref
+);
+
+@variable = @localscopevariable | @field;
+
+@localscopevariable = @localvar | @param;
+
+localvars(
+  unique int id: @localvar,
+  string nodeName: string ref,
+  int typeid: @type ref,
+  int parentid: @localvariabledeclexpr ref
+);
+
+localvarsKotlinType(
+  unique int id: @localvar ref,
+  int kttypeid: @kt_type ref
+);
+
+@namedexprorstmt = @breakstmt
+                 | @continuestmt
+                 | @labeledstmt
+                 | @literal;
+
+namestrings(
+  string name: string ref,
+  string value: string ref,
+  unique int parent: @namedexprorstmt ref
+);
+
+/*
+ * Modules
+ */
+
+#keyset[name]
+modules(
+  unique int id: @module,
+  string name: string ref
+);
+
+isOpen(
+  int id: @module ref
+);
+
+#keyset[fileId]
+cumodule(
+  int fileId: @file ref,
+  int moduleId: @module ref
+);
+
+@directive = @requires
+           | @exports
+           | @opens
+           | @uses
+           | @provides
+
+#keyset[directive]
+directives(
+  int id: @module ref,
+  int directive: @directive ref
+);
+
+requires(
+  unique int id: @requires,
+  int target: @module ref
+);
+
+isTransitive(
+  int id: @requires ref
+);
+
+isStatic(
+  int id: @requires ref
+);
+
+exports(
+  unique int id: @exports,
+  int target: @package ref
+);
+
+exportsTo(
+  int id: @exports ref,
+  int target: @module ref
+);
+
+opens(
+  unique int id: @opens,
+  int target: @package ref
+);
+
+opensTo(
+  int id: @opens ref,
+  int target: @module ref
+);
+
+uses(
+  unique int id: @uses,
+  string serviceInterface: string ref
+);
+
+provides(
+  unique int id: @provides,
+  string serviceInterface: string ref
+);
+
+providesWith(
+  int id: @provides ref,
+  string serviceImpl: string ref
+);
+
+isNullDefaultCase(
+  int id: @case ref
+);
+
+/*
+ * Javadoc
+ */
+
+javadoc(
+  unique int id: @javadoc
+);
+
+isNormalComment(
+  int commentid : @javadoc ref
+);
+
+isEolComment(
+  int commentid : @javadoc ref
+);
+
+hasJavadoc(
+  int documentableid: @member ref,
+  int javadocid: @javadoc ref
+);
+
+#keyset[parentid,idx]
+javadocTag(
+  unique int id: @javadocTag,
+  string name: string ref,
+  int parentid: @javadocParent ref,
+  int idx: int ref
+);
+
+#keyset[parentid,idx]
+javadocText(
+  unique int id: @javadocText,
+  string text: string ref,
+  int parentid: @javadocParent ref,
+  int idx: int ref
+);
+
+@javadocParent = @javadoc | @javadocTag;
+@javadocElement = @javadocTag | @javadocText;
+
+@classorinterfaceorpackage = @classorinterface | @package;
+@classorinterfaceorcallable = @classorinterface | @callable;
+@boundedtype = @typevariable | @wildcard;
+@reftype = @classorinterface | @array | @boundedtype | @errortype;
+@classorarray = @classorinterface | @array;
+@type = @primitive | @reftype;
+@callable = @method | @constructor;
+
+/** A program element that has a name. */
+@element = @package | @modifier | @annotation | @errortype |
+           @locatableElement;
+
+@locatableElement = @file | @primitive | @classorinterface | @method | @constructor | @param | @exception | @field |
+                    @boundedtype | @array | @localvar | @expr | @stmt | @import | @fielddecl | @kt_type | @kt_type_alias |
+                    @kt_property;
+
+@modifiable = @member_modifiable| @param | @localvar | @typevariable;
+
+@member_modifiable = @classorinterface | @method | @constructor | @field | @kt_property;
+
+@member = @method | @constructor | @field | @reftype ;
+
+/** A program element that has a location. */
+@locatable = @typebound | @javadoc | @javadocTag | @javadocText | @xmllocatable | @ktcomment |
+             @locatableElement;
+
+@top = @element | @locatable | @folder;
+
+/*
+ * 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;
+
+ktComments(
+  unique int id: @ktcomment,
+  int kind: int ref,
+  string text : string ref
+)
+
+ktCommentSections(
+  unique int id: @ktcommentsection,
+  int comment: @ktcomment ref,
+  string content : string ref
+)
+
+ktCommentSectionNames(
+  unique int id: @ktcommentsection ref,
+  string name : string ref
+)
+
+ktCommentSectionSubjectNames(
+  unique int id: @ktcommentsection ref,
+  string subjectname : string ref
+)
+
+#keyset[id, owner]
+ktCommentOwners(
+  int id: @ktcomment ref,
+  int owner: @top ref
+)
+
+ktExtensionFunctions(
+  unique int id: @method ref,
+  int typeid: @type ref,
+  int kttypeid: @kt_type ref
+)
+
+ktProperties(
+  unique int id: @kt_property,
+  string nodeName: string ref
+)
+
+ktPropertyGetters(
+  unique int id: @kt_property ref,
+  int getter: @method ref
+)
+
+ktPropertySetters(
+  unique int id: @kt_property ref,
+  int setter: @method ref
+)
+
+ktPropertyBackingFields(
+  unique int id: @kt_property ref,
+  int backingField: @field ref
+)
+
+ktSyntheticBody(
+  unique int id: @callable ref,
+  int kind: int ref
+  // 1: ENUM_VALUES
+  // 2: ENUM_VALUEOF
+  // 3: ENUM_ENTRIES
+)
+
+ktLocalFunction(
+  unique int id: @method ref
+)
+
+ktInitializerAssignment(
+  unique int id: @assignexpr ref
+)
+
+ktPropertyDelegates(
+  unique int id: @kt_property ref,
+  unique int variableId: @variable ref
+)
+
+/**
+ * If `id` is a compiler generated element, then the kind indicates the
+ * reason that the compiler generated it.
+ * See `Element.compilerGeneratedReason()` for an explanation of what
+ * each `kind` means.
+ */
+compiler_generated(
+  unique int id: @element ref,
+  int kind: int ref
+)
+
+ktFunctionOriginalNames(
+  unique int id: @method ref,
+  string name: string ref
+)
+
+ktDataClasses(
+  unique int id: @classorinterface ref
+)
diff --git a/java/downgrades/de4ded61c8ae83f829aedaf05be73307ba25ca40/semmlecode.dbscheme b/java/downgrades/de4ded61c8ae83f829aedaf05be73307ba25ca40/semmlecode.dbscheme
new file mode 100644
index 00000000000..9f6026c4009
--- /dev/null
+++ b/java/downgrades/de4ded61c8ae83f829aedaf05be73307ba25ca40/semmlecode.dbscheme
@@ -0,0 +1,1240 @@
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   javac A.java B.java C.java
+ *
+ * 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:
+     *
+     *   javac A.java B.java C.java
+     */
+    unique int id : @compilation,
+    int kind: int ref,
+    string cwd : string ref,
+    string name : string ref
+);
+
+case @compilation.kind of
+   1  = @javacompilation
+|  2  = @kotlincompilation
+;
+
+compilation_started(
+    int id : @compilation ref
+)
+
+compilation_info(
+    int id : @compilation ref,
+    string info_key: string ref,
+    string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   javac A.java B.java C.java
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--javac-args`
+ * 2   | A.java
+ * 3   | B.java
+ * 4   | C.java
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@@@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   javac A.java B.java C.java
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | A.java
+ * 1   | B.java
+ * 2   | C.java
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * For each file recorded in `compilation_compiling_files`,
+ * there will be a corresponding row in
+ * `compilation_compiling_files_completed` once extraction
+ * of that file is complete. The `result` will indicate the
+ * extraction result:
+ *
+ *     0: Successfully extracted
+ *     1: Errors were encountered, but extraction recovered
+ *     2: Errors were encountered, and extraction could not recover
+ */
+#keyset[id, num]
+compilation_compiling_files_completed(
+    int id : @compilation ref,
+    int num : int ref,
+    int result : int 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
+);
+
+/**
+ * The `cpu_seconds` and `elapsed_seconds` are the CPU time and elapsed
+ * time (respectively) that the original compilation (not the extraction)
+ * took for compiler invocation `id`.
+ */
+compilation_compiler_times(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float 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`.
+ * The `result` will indicate the extraction result:
+ *
+ *     0: Successfully extracted
+ *     1: Errors were encountered, but extraction recovered
+ *     2: Errors were encountered, and extraction could not recover
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref,
+    int result : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    string generated_by: string ref, // TODO: Sync this with the other languages?
+    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
+);
+
+/**
+ * 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(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/*
+ * External artifacts
+ */
+
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+sourceLocationPrefix(
+  string prefix : string ref
+);
+
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*
+ * SMAP
+ */
+
+smap_header(
+  int outputFileId: @file ref,
+  string outputFilename: string ref,
+  string defaultStratum: string ref
+);
+
+smap_files(
+  int outputFileId: @file ref,
+  string stratum: string ref,
+  int inputFileNum: int ref,
+  string inputFileName: string ref,
+  int inputFileId: @file ref
+);
+
+smap_lines(
+  int outputFileId: @file ref,
+  string stratum: string ref,
+  int inputFileNum: int ref,
+  int inputStartLine: int ref,
+  int inputLineCount: int ref,
+  int outputStartLine: int ref,
+  int outputLineIncrement: int ref
+);
+
+/*
+ * Locations and files
+ */
+
+@location = @location_default ;
+
+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
+);
+
+hasLocation(
+  int locatableid: @locatable ref,
+  int id: @location ref
+);
+
+@sourceline = @locatable ;
+
+#keyset[element_id]
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*
+ * Java
+ */
+
+cupackage(
+  unique int id: @file ref,
+  int packageid: @package ref
+);
+
+#keyset[fileid,keyName]
+jarManifestMain(
+  int fileid: @file ref,
+  string keyName: string ref,
+  string value: string ref
+);
+
+#keyset[fileid,entryName,keyName]
+jarManifestEntries(
+  int fileid: @file ref,
+  string entryName: string ref,
+  string keyName: string ref,
+  string value: string ref
+);
+
+packages(
+  unique int id: @package,
+  string nodeName: string ref
+);
+
+primitives(
+  unique int id: @primitive,
+  string nodeName: string ref
+);
+
+modifiers(
+  unique int id: @modifier,
+  string nodeName: string ref
+);
+
+/**
+ * An errortype is used when the extractor is unable to extract a type
+ * correctly for some reason.
+ */
+error_type(
+  unique int id: @errortype
+);
+
+classes_or_interfaces(
+  unique int id: @classorinterface,
+  string nodeName: string ref,
+  int parentid: @package ref,
+  int sourceid: @classorinterface ref
+);
+
+file_class(
+  int id: @classorinterface ref
+);
+
+class_object(
+  unique int id: @classorinterface ref,
+  unique int instance: @field ref
+);
+
+type_companion_object(
+  unique int id: @classorinterface ref,
+  unique int instance: @field ref,
+  unique int companion_object: @classorinterface ref
+);
+
+kt_nullable_types(
+  unique int id: @kt_nullable_type,
+  int classid: @reftype ref
+)
+
+kt_notnull_types(
+  unique int id: @kt_notnull_type,
+  int classid: @reftype ref
+)
+
+kt_type_alias(
+  unique int id: @kt_type_alias,
+  string name: string ref,
+  int kttypeid: @kt_type ref
+)
+
+@kt_type = @kt_nullable_type | @kt_notnull_type
+
+isInterface(
+  unique int id: @classorinterface ref
+);
+
+isRecord(
+  unique int id: @classorinterface ref
+);
+
+fielddecls(
+  unique int id: @fielddecl,
+  int parentid: @reftype ref
+);
+
+#keyset[fieldId] #keyset[fieldDeclId,pos]
+fieldDeclaredIn(
+  int fieldId: @field ref,
+  int fieldDeclId: @fielddecl ref,
+  int pos: int ref
+);
+
+fields(
+  unique int id: @field,
+  string nodeName: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref
+);
+
+fieldsKotlinType(
+  unique int id: @field ref,
+  int kttypeid: @kt_type ref
+);
+
+constrs(
+  unique int id: @constructor,
+  string nodeName: string ref,
+  string signature: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref,
+  int sourceid: @constructor ref
+);
+
+constrsKotlinType(
+  unique int id: @constructor ref,
+  int kttypeid: @kt_type ref
+);
+
+methods(
+  unique int id: @method,
+  string nodeName: string ref,
+  string signature: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref,
+  int sourceid: @method ref
+);
+
+methodsKotlinType(
+  unique int id: @method ref,
+  int kttypeid: @kt_type ref
+);
+
+#keyset[parentid,pos]
+params(
+  unique int id: @param,
+  int typeid: @type ref,
+  int pos: int ref,
+  int parentid: @callable ref,
+  int sourceid: @param ref
+);
+
+paramsKotlinType(
+  unique int id: @param ref,
+  int kttypeid: @kt_type ref
+);
+
+paramName(
+  unique int id: @param ref,
+  string nodeName: string ref
+);
+
+isVarargsParam(
+  int param: @param ref
+);
+
+exceptions(
+  unique int id: @exception,
+  int typeid: @type ref,
+  int parentid: @callable ref
+);
+
+isAnnotType(
+  int interfaceid: @classorinterface ref
+);
+
+isAnnotElem(
+  int methodid: @method ref
+);
+
+annotValue(
+  int parentid: @annotation ref,
+  int id2: @method ref,
+  unique int value: @expr ref
+);
+
+isEnumType(
+  int classid: @classorinterface ref
+);
+
+isEnumConst(
+  int fieldid: @field ref
+);
+
+#keyset[parentid,pos]
+typeVars(
+  unique int id: @typevariable,
+  string nodeName: string ref,
+  int pos: int ref,
+  int parentid: @classorinterfaceorcallable ref
+);
+
+wildcards(
+  unique int id: @wildcard,
+  string nodeName: string ref,
+  int kind: int ref
+);
+
+#keyset[parentid,pos]
+typeBounds(
+  unique int id: @typebound,
+  int typeid: @reftype ref,
+  int pos: int ref,
+  int parentid: @boundedtype ref
+);
+
+#keyset[parentid,pos]
+typeArgs(
+  int argumentid: @reftype ref,
+  int pos: int ref,
+  int parentid: @classorinterfaceorcallable ref
+);
+
+isParameterized(
+  int memberid: @member ref
+);
+
+isRaw(
+  int memberid: @member ref
+);
+
+#keyset[classid] #keyset[parent]
+isAnonymClass(
+  int classid: @classorinterface ref,
+  int parent: @classinstancexpr ref
+);
+
+#keyset[typeid] #keyset[parent]
+isLocalClassOrInterface(
+  int typeid: @classorinterface ref,
+  int parent: @localtypedeclstmt ref
+);
+
+isImplicitClass(
+  unique int classid: @classorinterface ref
+);
+
+isDefConstr(
+  int constructorid: @constructor ref
+);
+
+#keyset[exprId]
+lambdaKind(
+  int exprId: @lambdaexpr ref,
+  int bodyKind: int ref
+);
+
+isCanonicalConstr(
+  int constructorid: @constructor ref
+);
+
+arrays(
+  unique int id: @array,
+  string nodeName: string ref,
+  int elementtypeid: @type ref,
+  int dimension: int ref,
+  int componenttypeid: @type ref
+);
+
+enclInReftype(
+  unique int child: @reftype ref,
+  int parent: @reftype ref
+);
+
+extendsReftype(
+  int id1: @reftype ref,
+  int id2: @classorinterface ref
+);
+
+implInterface(
+  int id1: @classorarray ref,
+  int id2: @classorinterface ref
+);
+
+permits(
+  int id1: @classorinterface ref,
+  int id2: @classorinterface ref
+);
+
+hasModifier(
+  int id1: @modifiable ref,
+  int id2: @modifier ref
+);
+
+imports(
+  unique int id: @import,
+  int holder: @classorinterfaceorpackage ref,
+  string name: string ref,
+  int kind: int ref
+);
+
+#keyset[parent,idx]
+stmts(
+  unique int id: @stmt,
+  int kind: int ref,
+  int parent: @stmtparent ref,
+  int idx: int ref,
+  int bodydecl: @callable ref
+);
+
+@stmtparent = @callable | @stmt | @switchexpr | @whenexpr| @stmtexpr;
+
+case @stmt.kind of
+  0 = @block
+| 1 = @ifstmt
+| 2 = @forstmt
+| 3 = @enhancedforstmt
+| 4 = @whilestmt
+| 5 = @dostmt
+| 6 = @trystmt
+| 7 = @switchstmt
+| 8 = @synchronizedstmt
+| 9 = @returnstmt
+| 10 = @throwstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @emptystmt
+| 14 = @exprstmt
+| 15 = @labeledstmt
+| 16 = @assertstmt
+| 17 = @localvariabledeclstmt
+| 18 = @localtypedeclstmt
+| 19 = @constructorinvocationstmt
+| 20 = @superconstructorinvocationstmt
+| 21 = @case
+| 22 = @catchclause
+| 23 = @yieldstmt
+| 24 = @errorstmt
+| 25 = @whenbranch
+;
+
+#keyset[parent,idx]
+exprs(
+  unique int id: @expr,
+  int kind: int ref,
+  int typeid: @type ref,
+  int parent: @exprparent ref,
+  int idx: int ref
+);
+
+exprsKotlinType(
+  unique int id: @expr ref,
+  int kttypeid: @kt_type ref
+);
+
+callableEnclosingExpr(
+  unique int id: @expr ref,
+  int callable_id: @callable ref
+);
+
+statementEnclosingExpr(
+  unique int id: @expr ref,
+  int statement_id: @stmt ref
+);
+
+isParenthesized(
+  unique int id: @expr ref,
+  int parentheses: int ref
+);
+
+case @expr.kind of
+   1  = @arrayaccess
+|  2  = @arraycreationexpr
+|  3  = @arrayinit
+|  4  = @assignexpr
+|  5  = @assignaddexpr
+|  6  = @assignsubexpr
+|  7  = @assignmulexpr
+|  8  = @assigndivexpr
+|  9  = @assignremexpr
+| 10  = @assignandexpr
+| 11  = @assignorexpr
+| 12  = @assignxorexpr
+| 13  = @assignlshiftexpr
+| 14  = @assignrshiftexpr
+| 15  = @assignurshiftexpr
+| 16  = @booleanliteral
+| 17  = @integerliteral
+| 18  = @longliteral
+| 19  = @floatingpointliteral
+| 20  = @doubleliteral
+| 21  = @characterliteral
+| 22  = @stringliteral
+| 23  = @nullliteral
+| 24  = @mulexpr
+| 25  = @divexpr
+| 26  = @remexpr
+| 27  = @addexpr
+| 28  = @subexpr
+| 29  = @lshiftexpr
+| 30  = @rshiftexpr
+| 31  = @urshiftexpr
+| 32  = @andbitexpr
+| 33  = @orbitexpr
+| 34  = @xorbitexpr
+| 35  = @andlogicalexpr
+| 36  = @orlogicalexpr
+| 37  = @ltexpr
+| 38  = @gtexpr
+| 39  = @leexpr
+| 40  = @geexpr
+| 41  = @eqexpr
+| 42  = @neexpr
+| 43  = @postincexpr
+| 44  = @postdecexpr
+| 45  = @preincexpr
+| 46  = @predecexpr
+| 47  = @minusexpr
+| 48  = @plusexpr
+| 49  = @bitnotexpr
+| 50  = @lognotexpr
+| 51  = @castexpr
+| 52  = @newexpr
+| 53  = @conditionalexpr
+| 54  = @parexpr         // deprecated
+| 55  = @instanceofexpr
+| 56  = @localvariabledeclexpr
+| 57  = @typeliteral
+| 58  = @thisaccess
+| 59  = @superaccess
+| 60  = @varaccess
+| 61  = @methodaccess
+| 62  = @unannotatedtypeaccess
+| 63  = @arraytypeaccess
+| 64  = @packageaccess
+| 65  = @wildcardtypeaccess
+| 66  = @declannotation
+| 67  = @uniontypeaccess
+| 68  = @lambdaexpr
+| 69  = @memberref
+| 70  = @annotatedtypeaccess
+| 71  = @typeannotation
+| 72  = @intersectiontypeaccess
+| 73  = @switchexpr
+| 74  = @errorexpr
+| 75  = @whenexpr
+| 76  = @getclassexpr
+| 77  = @safecastexpr
+| 78  = @implicitcastexpr
+| 79  = @implicitnotnullexpr
+| 80  = @implicitcoerciontounitexpr
+| 81  = @notinstanceofexpr
+| 82  = @stmtexpr
+| 83  = @stringtemplateexpr
+| 84  = @notnullexpr
+| 85  = @unsafecoerceexpr
+| 86  = @valueeqexpr
+| 87  = @valueneexpr
+| 88  = @propertyref
+| 89  = @recordpatternexpr
+;
+
+/** Holds if this `when` expression was written as an `if` expression. */
+when_if(unique int id: @whenexpr ref);
+
+/** Holds if this `when` branch was written as an `else` branch. */
+when_branch_else(unique int id: @whenbranch ref);
+
+@classinstancexpr = @newexpr | @lambdaexpr | @memberref | @propertyref
+
+@annotation = @declannotation | @typeannotation
+@typeaccess = @unannotatedtypeaccess | @annotatedtypeaccess
+
+@assignment = @assignexpr
+             | @assignop;
+
+@unaryassignment = @postincexpr
+                 | @postdecexpr
+                 | @preincexpr
+                 | @predecexpr;
+
+@assignop = @assignaddexpr
+             | @assignsubexpr
+             | @assignmulexpr
+             | @assigndivexpr
+             | @assignremexpr
+             | @assignandexpr
+             | @assignorexpr
+             | @assignxorexpr
+             | @assignlshiftexpr
+             | @assignrshiftexpr
+             | @assignurshiftexpr;
+
+@literal = @booleanliteral
+             | @integerliteral
+             | @longliteral
+             | @floatingpointliteral
+             | @doubleliteral
+             | @characterliteral
+             | @stringliteral
+             | @nullliteral;
+
+@binaryexpr = @mulexpr
+             | @divexpr
+             | @remexpr
+             | @addexpr
+             | @subexpr
+             | @lshiftexpr
+             | @rshiftexpr
+             | @urshiftexpr
+             | @andbitexpr
+             | @orbitexpr
+             | @xorbitexpr
+             | @andlogicalexpr
+             | @orlogicalexpr
+             | @ltexpr
+             | @gtexpr
+             | @leexpr
+             | @geexpr
+             | @eqexpr
+             | @neexpr
+             | @valueeqexpr
+             | @valueneexpr;
+
+@unaryexpr =   @postincexpr
+             | @postdecexpr
+             | @preincexpr
+             | @predecexpr
+             | @minusexpr
+             | @plusexpr
+             | @bitnotexpr
+             | @lognotexpr
+             | @notnullexpr;
+
+@caller =  @classinstancexpr
+         | @methodaccess
+         | @constructorinvocationstmt
+         | @superconstructorinvocationstmt;
+
+callableBinding(
+  unique int callerid: @caller ref,
+  int callee: @callable ref
+);
+
+memberRefBinding(
+  unique int id: @expr ref,
+  int callable: @callable ref
+);
+
+propertyRefGetBinding(
+  unique int id: @expr ref,
+  int getter: @callable ref
+);
+
+propertyRefFieldBinding(
+  unique int id: @expr ref,
+  int field: @field ref
+);
+
+propertyRefSetBinding(
+  unique int id: @expr ref,
+  int setter: @callable ref
+);
+
+@exprparent = @stmt | @expr | @whenbranch | @callable | @field | @fielddecl | @classorinterface | @param | @localvar | @typevariable;
+
+variableBinding(
+  unique int expr: @varaccess ref,
+  int variable: @variable ref
+);
+
+@variable = @localscopevariable | @field;
+
+@localscopevariable = @localvar | @param;
+
+localvars(
+  unique int id: @localvar,
+  string nodeName: string ref,
+  int typeid: @type ref,
+  int parentid: @localvariabledeclexpr ref
+);
+
+localvarsKotlinType(
+  unique int id: @localvar ref,
+  int kttypeid: @kt_type ref
+);
+
+@namedexprorstmt = @breakstmt
+                 | @continuestmt
+                 | @labeledstmt
+                 | @literal;
+
+namestrings(
+  string name: string ref,
+  string value: string ref,
+  unique int parent: @namedexprorstmt ref
+);
+
+/*
+ * Modules
+ */
+
+#keyset[name]
+modules(
+  unique int id: @module,
+  string name: string ref
+);
+
+isOpen(
+  int id: @module ref
+);
+
+#keyset[fileId]
+cumodule(
+  int fileId: @file ref,
+  int moduleId: @module ref
+);
+
+@directive = @requires
+           | @exports
+           | @opens
+           | @uses
+           | @provides
+
+#keyset[directive]
+directives(
+  int id: @module ref,
+  int directive: @directive ref
+);
+
+requires(
+  unique int id: @requires,
+  int target: @module ref
+);
+
+isTransitive(
+  int id: @requires ref
+);
+
+isStatic(
+  int id: @requires ref
+);
+
+exports(
+  unique int id: @exports,
+  int target: @package ref
+);
+
+exportsTo(
+  int id: @exports ref,
+  int target: @module ref
+);
+
+opens(
+  unique int id: @opens,
+  int target: @package ref
+);
+
+opensTo(
+  int id: @opens ref,
+  int target: @module ref
+);
+
+uses(
+  unique int id: @uses,
+  string serviceInterface: string ref
+);
+
+provides(
+  unique int id: @provides,
+  string serviceInterface: string ref
+);
+
+providesWith(
+  int id: @provides ref,
+  string serviceImpl: string ref
+);
+
+isNullDefaultCase(
+  int id: @case ref
+);
+
+/*
+ * Javadoc
+ */
+
+javadoc(
+  unique int id: @javadoc
+);
+
+isNormalComment(
+  int commentid : @javadoc ref
+);
+
+isEolComment(
+  int commentid : @javadoc ref
+);
+
+hasJavadoc(
+  int documentableid: @member ref,
+  int javadocid: @javadoc ref
+);
+
+#keyset[parentid,idx]
+javadocTag(
+  unique int id: @javadocTag,
+  string name: string ref,
+  int parentid: @javadocParent ref,
+  int idx: int ref
+);
+
+#keyset[parentid,idx]
+javadocText(
+  unique int id: @javadocText,
+  string text: string ref,
+  int parentid: @javadocParent ref,
+  int idx: int ref
+);
+
+@javadocParent = @javadoc | @javadocTag;
+@javadocElement = @javadocTag | @javadocText;
+
+@classorinterfaceorpackage = @classorinterface | @package;
+@classorinterfaceorcallable = @classorinterface | @callable;
+@boundedtype = @typevariable | @wildcard;
+@reftype = @classorinterface | @array | @boundedtype | @errortype;
+@classorarray = @classorinterface | @array;
+@type = @primitive | @reftype;
+@callable = @method | @constructor;
+
+/** A program element that has a name. */
+@element = @package | @modifier | @annotation | @errortype |
+           @locatableElement;
+
+@locatableElement = @file | @primitive | @classorinterface | @method | @constructor | @param | @exception | @field |
+                    @boundedtype | @array | @localvar | @expr | @stmt | @import | @fielddecl | @kt_type | @kt_type_alias |
+                    @kt_property;
+
+@modifiable = @member_modifiable| @param | @localvar | @typevariable;
+
+@member_modifiable = @classorinterface | @method | @constructor | @field | @kt_property;
+
+@member = @method | @constructor | @field | @reftype ;
+
+/** A program element that has a location. */
+@locatable = @typebound | @javadoc | @javadocTag | @javadocText | @xmllocatable | @ktcomment |
+             @locatableElement;
+
+@top = @element | @locatable | @folder;
+
+/*
+ * 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;
+
+ktComments(
+  unique int id: @ktcomment,
+  int kind: int ref,
+  string text : string ref
+)
+
+ktCommentSections(
+  unique int id: @ktcommentsection,
+  int comment: @ktcomment ref,
+  string content : string ref
+)
+
+ktCommentSectionNames(
+  unique int id: @ktcommentsection ref,
+  string name : string ref
+)
+
+ktCommentSectionSubjectNames(
+  unique int id: @ktcommentsection ref,
+  string subjectname : string ref
+)
+
+#keyset[id, owner]
+ktCommentOwners(
+  int id: @ktcomment ref,
+  int owner: @top ref
+)
+
+ktExtensionFunctions(
+  unique int id: @method ref,
+  int typeid: @type ref,
+  int kttypeid: @kt_type ref
+)
+
+ktProperties(
+  unique int id: @kt_property,
+  string nodeName: string ref
+)
+
+ktPropertyGetters(
+  unique int id: @kt_property ref,
+  int getter: @method ref
+)
+
+ktPropertySetters(
+  unique int id: @kt_property ref,
+  int setter: @method ref
+)
+
+ktPropertyBackingFields(
+  unique int id: @kt_property ref,
+  int backingField: @field ref
+)
+
+ktSyntheticBody(
+  unique int id: @callable ref,
+  int kind: int ref
+  // 1: ENUM_VALUES
+  // 2: ENUM_VALUEOF
+  // 3: ENUM_ENTRIES
+)
+
+ktLocalFunction(
+  unique int id: @method ref
+)
+
+ktInitializerAssignment(
+  unique int id: @assignexpr ref
+)
+
+ktPropertyDelegates(
+  unique int id: @kt_property ref,
+  unique int variableId: @variable ref
+)
+
+/**
+ * If `id` is a compiler generated element, then the kind indicates the
+ * reason that the compiler generated it.
+ * See `Element.compilerGeneratedReason()` for an explanation of what
+ * each `kind` means.
+ */
+compiler_generated(
+  unique int id: @element ref,
+  int kind: int ref
+)
+
+ktFunctionOriginalNames(
+  unique int id: @method ref,
+  string name: string ref
+)
+
+ktDataClasses(
+  unique int id: @classorinterface ref
+)
diff --git a/java/downgrades/de4ded61c8ae83f829aedaf05be73307ba25ca40/upgrade.properties b/java/downgrades/de4ded61c8ae83f829aedaf05be73307ba25ca40/upgrade.properties
new file mode 100644
index 00000000000..3f8e5f96d0a
--- /dev/null
+++ b/java/downgrades/de4ded61c8ae83f829aedaf05be73307ba25ca40/upgrade.properties
@@ -0,0 +1,2 @@
+description: Remove inclusion of @assignment in @binaryexpr
+compatibility: full
diff --git a/java/ql/consistency-queries/BinaryExpr.ql b/java/ql/consistency-queries/BinaryExpr.ql
index ff4384a8d49..56763e9800f 100644
--- a/java/ql/consistency-queries/BinaryExpr.ql
+++ b/java/ql/consistency-queries/BinaryExpr.ql
@@ -10,5 +10,5 @@ where
     e.isNthChildOf(be, i) and i != 0 and i != 1 and reason = "Unexpected operand " + i.toString()
   )
   or
-  be.getOp() = " ?? " and reason = "No operator name"
+  be.getOp() = "??" and reason = "No operator name"
 select be, reason
diff --git a/java/ql/consistency-queries/CfgConsistency.ql b/java/ql/consistency-queries/CfgConsistency.ql
new file mode 100644
index 00000000000..38ed20134d1
--- /dev/null
+++ b/java/ql/consistency-queries/CfgConsistency.ql
@@ -0,0 +1,2 @@
+import java
+import ControlFlow::Consistency
diff --git a/java/ql/lib/CHANGELOG.md b/java/ql/lib/CHANGELOG.md
index fb2908a561e..24757112923 100644
--- a/java/ql/lib/CHANGELOG.md
+++ b/java/ql/lib/CHANGELOG.md
@@ -1,3 +1,32 @@
+## 9.0.0
+
+### Breaking Changes
+
+* The Java control flow graph (CFG) implementation has been completely
+  rewritten. The CFG now includes additional nodes to more accurately represent
+  certain constructs. This also means that any existing code that implicitly
+  relies on very specific details about the CFG may need to be updated.
+  The CFG now only includes the nodes that are reachable from the entry point.
+  Additionally, the following breaking changes have been made:
+  - `ControlFlowNode.asCall` has been removed - use `Call.getControlFlowNode` instead.
+  - `ControlFlowNode.getEnclosingStmt` has been removed.
+  - `ControlFlow::ExprNode` has been removed.
+  - `ControlFlow::StmtNode` has been removed.
+  - `ControlFlow::Node` has been removed - this was merely an alias of
+    `ControlFlowNode`, which is still available.
+  - Previously deprecated predicates on `BasicBlock` have been removed.
+
+### Minor Analysis Improvements
+
+* Inline expectations test comments, which are of the form `// $ tag` or `// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the `$` symbol.
+* The class `Assignment` now extends `BinaryExpr`. Uses of `BinaryExpr` may in some cases need slight adjustment.
+
+## 8.1.1
+
+### Minor Analysis Improvements
+
+* Some modelling which previously only worked for Java EE packages beginning with "javax" will now also work for Java EE packages beginning with "jakarta" as well. This may lead to some alert changes.
+
 ## 8.1.0
 
 ### Deprecated APIs
diff --git a/java/ql/lib/change-notes/2026-02-12-jakarta.md b/java/ql/lib/change-notes/released/8.1.1.md
similarity index 82%
rename from java/ql/lib/change-notes/2026-02-12-jakarta.md
rename to java/ql/lib/change-notes/released/8.1.1.md
index 062e202cb8a..083e23fb4ae 100644
--- a/java/ql/lib/change-notes/2026-02-12-jakarta.md
+++ b/java/ql/lib/change-notes/released/8.1.1.md
@@ -1,4 +1,5 @@
----
-category: minorAnalysis
----
+## 8.1.1
+
+### Minor Analysis Improvements
+
 * Some modelling which previously only worked for Java EE packages beginning with "javax" will now also work for Java EE packages beginning with "jakarta" as well. This may lead to some alert changes.
diff --git a/java/ql/lib/change-notes/released/9.0.0.md b/java/ql/lib/change-notes/released/9.0.0.md
new file mode 100644
index 00000000000..e0b4d7f10ab
--- /dev/null
+++ b/java/ql/lib/change-notes/released/9.0.0.md
@@ -0,0 +1,22 @@
+## 9.0.0
+
+### Breaking Changes
+
+* The Java control flow graph (CFG) implementation has been completely
+  rewritten. The CFG now includes additional nodes to more accurately represent
+  certain constructs. This also means that any existing code that implicitly
+  relies on very specific details about the CFG may need to be updated.
+  The CFG now only includes the nodes that are reachable from the entry point.
+  Additionally, the following breaking changes have been made:
+  - `ControlFlowNode.asCall` has been removed - use `Call.getControlFlowNode` instead.
+  - `ControlFlowNode.getEnclosingStmt` has been removed.
+  - `ControlFlow::ExprNode` has been removed.
+  - `ControlFlow::StmtNode` has been removed.
+  - `ControlFlow::Node` has been removed - this was merely an alias of
+    `ControlFlowNode`, which is still available.
+  - Previously deprecated predicates on `BasicBlock` have been removed.
+
+### Minor Analysis Improvements
+
+* Inline expectations test comments, which are of the form `// $ tag` or `// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the `$` symbol.
+* The class `Assignment` now extends `BinaryExpr`. Uses of `BinaryExpr` may in some cases need slight adjustment.
diff --git a/java/ql/lib/codeql-pack.release.yml b/java/ql/lib/codeql-pack.release.yml
index 59984961848..fd5f4a48b3c 100644
--- a/java/ql/lib/codeql-pack.release.yml
+++ b/java/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 8.1.0
+lastReleaseVersion: 9.0.0
diff --git a/java/ql/lib/config/semmlecode.dbscheme b/java/ql/lib/config/semmlecode.dbscheme
index 9f6026c4009..de4ded61c8a 100644
--- a/java/ql/lib/config/semmlecode.dbscheme
+++ b/java/ql/lib/config/semmlecode.dbscheme
@@ -815,6 +815,7 @@ when_branch_else(unique int id: @whenbranch ref);
              | @geexpr
              | @eqexpr
              | @neexpr
+             | @assignment
              | @valueeqexpr
              | @valueneexpr;
 
diff --git a/java/ql/lib/ext/java.net.model.yml b/java/ql/lib/ext/java.net.model.yml
index e69db468a4a..4db8c92b5f9 100644
--- a/java/ql/lib/ext/java.net.model.yml
+++ b/java/ql/lib/ext/java.net.model.yml
@@ -57,7 +57,7 @@ extensions:
       - ["java.net", "InetSocketAddress", True, "getPort", "()", "", "Argument[this].SyntheticField[java.net.InetSocketAddress.port]", "ReturnValue", "taint", "manual"]
       - ["java.net", "URI", False, "resolve", "(URI)", "", "Argument[this]", "ReturnValue", "taint", "ai-manual"]
       - ["java.net", "URI", False, "URI", "(String,String,String,int,String,String,String)", "", "Argument[5]", "Argument[this].SyntheticField[java.net.URI.query]", "taint", "ai-manual"]
-      - ["java.net", "URI", False, "URI", "(String,String,String)", "", "Argument[1]", "ReturnValue", "taint", "ai-manual"]
+      - ["java.net", "URI", False, "URI", "(String,String,String)", "", "Argument[1]", "Argument[this]", "taint", "ai-manual"]
       - ["java.net", "URI", False, "URI", "(String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["java.net", "URI", False, "create", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["java.net", "URI", False, "getPath", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
diff --git a/java/ql/lib/ext/java.util.zip.model.yml b/java/ql/lib/ext/java.util.zip.model.yml
index dc24570995f..852cf8afccb 100644
--- a/java/ql/lib/ext/java.util.zip.model.yml
+++ b/java/ql/lib/ext/java.util.zip.model.yml
@@ -4,7 +4,7 @@ extensions:
       extensible: summaryModel
     data:
       - ["java.util.zip", "GZIPInputStream", False, "GZIPInputStream", "", "", "Argument[0]", "Argument[this]", "taint", "manual"]
-      - ["java.util.zip", "ZipEntry", True, "ZipEntry", "(String)", "", "Argument[0]", "ReturnValue", "taint", "ai-manual"]
+      - ["java.util.zip", "ZipEntry", True, "ZipEntry", "(String)", "", "Argument[0]", "Argument[this]", "taint", "ai-manual"]
       - ["java.util.zip", "ZipFile", True, "ZipFile", "(File)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["java.util.zip", "ZipFile", True, "ZipFile", "(File,Charset)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["java.util.zip", "ZipFile", True, "ZipFile", "(File,int)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
diff --git a/java/ql/lib/ext/org.apache.hc.core5.http.io.entity.model.yml b/java/ql/lib/ext/org.apache.hc.core5.http.io.entity.model.yml
index 1cde9909d82..710e4d9bc07 100644
--- a/java/ql/lib/ext/org.apache.hc.core5.http.io.entity.model.yml
+++ b/java/ql/lib/ext/org.apache.hc.core5.http.io.entity.model.yml
@@ -3,8 +3,8 @@ extensions:
       pack: codeql/java-all
       extensible: summaryModel
     data:
-      - ["org.apache.hc.core5.http.io.entity", "BasicHttpEntity", True, "BasicHttpEntity", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["org.apache.hc.core5.http.io.entity", "BufferedHttpEntity", True, "BufferedHttpEntity", "(HttpEntity)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["org.apache.hc.core5.http.io.entity", "BasicHttpEntity", True, "BasicHttpEntity", "", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["org.apache.hc.core5.http.io.entity", "BufferedHttpEntity", True, "BufferedHttpEntity", "(HttpEntity)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["org.apache.hc.core5.http.io.entity", "ByteArrayEntity", True, "ByteArrayEntity", "", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["org.apache.hc.core5.http.io.entity", "EntityUtils", True, "parse", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["org.apache.hc.core5.http.io.entity", "EntityUtils", True, "toByteArray", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
@@ -14,6 +14,6 @@ extensions:
       - ["org.apache.hc.core5.http.io.entity", "HttpEntities", True, "createUrlEncoded", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["org.apache.hc.core5.http.io.entity", "HttpEntities", True, "gzip", "(HttpEntity)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["org.apache.hc.core5.http.io.entity", "HttpEntities", True, "withTrailers", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["org.apache.hc.core5.http.io.entity", "HttpEntityWrapper", True, "HttpEntityWrapper", "(HttpEntity)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["org.apache.hc.core5.http.io.entity", "InputStreamEntity", True, "InputStreamEntity", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["org.apache.hc.core5.http.io.entity", "HttpEntityWrapper", True, "HttpEntityWrapper", "(HttpEntity)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["org.apache.hc.core5.http.io.entity", "InputStreamEntity", True, "InputStreamEntity", "", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["org.apache.hc.core5.http.io.entity", "StringEntity", True, "StringEntity", "", "", "Argument[0]", "Argument[this]", "taint", "manual"]
diff --git a/java/ql/lib/ext/org.apache.http.entity.model.yml b/java/ql/lib/ext/org.apache.http.entity.model.yml
index 4d0f0d60466..6a8418049ca 100644
--- a/java/ql/lib/ext/org.apache.http.entity.model.yml
+++ b/java/ql/lib/ext/org.apache.http.entity.model.yml
@@ -4,8 +4,8 @@ extensions:
       extensible: summaryModel
     data:
       - ["org.apache.http.entity", "BasicHttpEntity", True, "setContent", "(InputStream)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
-      - ["org.apache.http.entity", "BufferedHttpEntity", True, "BufferedHttpEntity", "(HttpEntity)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["org.apache.http.entity", "BufferedHttpEntity", True, "BufferedHttpEntity", "(HttpEntity)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["org.apache.http.entity", "ByteArrayEntity", True, "ByteArrayEntity", "", "", "Argument[0]", "Argument[this]", "taint", "manual"]
-      - ["org.apache.http.entity", "HttpEntityWrapper", True, "HttpEntityWrapper", "(HttpEntity)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["org.apache.http.entity", "InputStreamEntity", True, "InputStreamEntity", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["org.apache.http.entity", "HttpEntityWrapper", True, "HttpEntityWrapper", "(HttpEntity)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["org.apache.http.entity", "InputStreamEntity", True, "InputStreamEntity", "", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["org.apache.http.entity", "StringEntity", True, "StringEntity", "", "", "Argument[0]", "Argument[this]", "taint", "manual"]
diff --git a/java/ql/lib/printCfg.ql b/java/ql/lib/printCfg.ql
index 5e3cc22644e..d90c4633de8 100644
--- a/java/ql/lib/printCfg.ql
+++ b/java/ql/lib/printCfg.ql
@@ -21,7 +21,7 @@ external int selectedSourceColumn();
 
 private predicate selectedSourceColumnAlias = selectedSourceColumn/0;
 
-module ViewCfgQueryInput implements ViewCfgQueryInputSig<File> {
+module ViewCfgQueryInput implements ControlFlow::ViewCfgQueryInputSig<File> {
   predicate selectedSourceFile = selectedSourceFileAlias/0;
 
   predicate selectedSourceLine = selectedSourceLineAlias/0;
@@ -42,4 +42,4 @@ module ViewCfgQueryInput implements ViewCfgQueryInputSig<File> {
   }
 }
 
-import ViewCfgQuery<File, ViewCfgQueryInput>
+import ControlFlow::ViewCfgQuery<File, ViewCfgQueryInput>
diff --git a/java/ql/lib/qlpack.yml b/java/ql/lib/qlpack.yml
index a1737f2d1cb..b9f061bcc3e 100644
--- a/java/ql/lib/qlpack.yml
+++ b/java/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-all
-version: 8.1.1-dev
+version: 9.0.1-dev
 groups: java
 dbscheme: config/semmlecode.dbscheme
 extractor: java
diff --git a/java/ql/lib/semmle/code/java/Completion.qll b/java/ql/lib/semmle/code/java/Completion.qll
deleted file mode 100644
index 35d3c83e2ee..00000000000
--- a/java/ql/lib/semmle/code/java/Completion.qll
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Provides classes and predicates for representing completions.
- */
-overlay[local?]
-module;
-
-/*
- * A completion represents how a statement or expression terminates.
- *
- * There are five kinds of completions: normal completion,
- * `return` completion, `break` completion,
- * `continue` completion, and `throw` completion.
- *
- * Normal completions are further subdivided into boolean completions and all
- * other normal completions. A boolean completion adds the information that the
- * cfg node terminated with the given boolean value due to a subexpression
- * terminating with the other given boolean value. This is only
- * relevant for conditional contexts in which the value controls the
- * control-flow successor.
- */
-
-import java
-
-/**
- * A label of a `LabeledStmt`.
- */
-newtype Label = MkLabel(string l) { exists(LabeledStmt lbl | l = lbl.getLabel()) }
-
-/**
- * Either a `Label` or nothing.
- */
-newtype MaybeLabel =
-  JustLabel(Label l) or
-  NoLabel()
-
-/**
- * A completion of a statement or an expression.
- */
-newtype Completion =
-  /**
-   * The statement or expression completes normally and continues to the next statement.
-   */
-  NormalCompletion() or
-  /**
-   * The statement or expression completes by returning from the function.
-   */
-  ReturnCompletion() or
-  /**
-   * The expression completes with value `outerValue` overall and with the last control
-   * flow node having value `innerValue`.
-   */
-  BooleanCompletion(boolean outerValue, boolean innerValue) {
-    (outerValue = true or outerValue = false) and
-    (innerValue = true or innerValue = false)
-  } or
-  /**
-   * The expression or statement completes via a `break` statement.
-   */
-  BreakCompletion(MaybeLabel l) or
-  /**
-   * The expression or statement completes via a `yield` statement.
-   */
-  YieldCompletion(NormalOrBooleanCompletion c) or
-  /**
-   * The expression or statement completes via a `continue` statement.
-   */
-  ContinueCompletion(MaybeLabel l) or
-  /**
-   * The expression or statement completes by throwing a `ThrowableType`.
-   */
-  ThrowCompletion(ThrowableType tt)
-
-/** A completion that is either a `NormalCompletion` or a `BooleanCompletion`. */
-class NormalOrBooleanCompletion extends Completion {
-  NormalOrBooleanCompletion() {
-    this instanceof NormalCompletion or this instanceof BooleanCompletion
-  }
-
-  /** Gets a textual representation of this completion. */
-  string toString() { result = "completion" }
-}
-
-/** Gets the completion `ContinueCompletion(NoLabel())`. */
-ContinueCompletion anonymousContinueCompletion() { result = ContinueCompletion(NoLabel()) }
-
-/** Gets the completion `ContinueCompletion(JustLabel(l))`. */
-ContinueCompletion labelledContinueCompletion(Label l) { result = ContinueCompletion(JustLabel(l)) }
-
-/** Gets the completion `BreakCompletion(NoLabel())`. */
-BreakCompletion anonymousBreakCompletion() { result = BreakCompletion(NoLabel()) }
-
-/** Gets the completion `BreakCompletion(JustLabel(l))`. */
-BreakCompletion labelledBreakCompletion(Label l) { result = BreakCompletion(JustLabel(l)) }
-
-/** Gets the completion `BooleanCompletion(value, value)`. */
-Completion basicBooleanCompletion(boolean value) { result = BooleanCompletion(value, value) }
diff --git a/java/ql/lib/semmle/code/java/ControlFlowGraph.qll b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
index 64449b6f93d..4ec8ff8450a 100644
--- a/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
+++ b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
@@ -1,317 +1,227 @@
 /**
- * Provides classes and predicates for computing expression-level intra-procedural control flow graphs.
- *
- * The only API exported by this library are the toplevel classes `ControlFlow::Node`
- * and its subclass `ConditionNode`, which wrap the successor relation and the
- * concept of true- and false-successors of conditions. A cfg node may either be a
- * statement, an expression, or an exit node for a callable, indicating that
- * execution of the callable terminates.
+ * Provides classes representing the control flow graph within callables.
  */
 overlay[local?]
 module;
 
-/*
- * The implementation is centered around the concept of a _completion_, which
- * models how the execution of a statement or expression terminates.
- * Completions are represented as an algebraic data type `Completion` defined in
- * `Completion.qll`.
- *
- * The CFG is built by structural recursion over the AST. To achieve this the
- * CFG edges related to a given AST node, `n`, is divided into three categories:
- *   1. The in-going edge that points to the first CFG node to execute when the
- *      `n` is going to be executed.
- *   2. The out-going edges for control-flow leaving `n` that are going to some
- *      other node in the surrounding context of `n`.
- *   3. The edges that have both of their end-points entirely within the AST
- *      node and its children.
- * The edges in (1) and (2) are inherently non-local and are therefore
- * initially calculated as half-edges, that is, the single node, `k`, of the
- * edge contained within `n`, by the predicates `k = first(n)` and
- * `last(n, k, _)`, respectively. The edges in (3) can then be enumerated
- * directly by the predicate `succ` by calling `first` and `last` recursively
- * on the children of `n` and connecting the end-points. This yields the entire
- * CFG, since all edges are in (3) for _some_ AST node.
- *
- * The third parameter of `last` is the completion, which is necessary to
- * distinguish the out-going edges from `n`. Note that the completion changes
- * as the calculation of `last` proceeds outward through the AST; for example,
- * a `breakCompletion` is caught up by its surrounding loop and turned into a
- * `normalCompletion`, or a `normalCompletion` proceeds outward through the end
- * of a `finally` block and is turned into whatever completion was caught by
- * the `finally`, or a `booleanCompletion(false, _)` occurs in a loop condition
- * and is turned into a `normalCompletion` of the entire loop. When the edge is
- * eventually connected we use the completion at that level of the AST as the
- * label of the edge, thus creating an edge-labelled CFG.
- *
- * An important goal of the CFG is to get the order of side-effects correct.
- * Most expressions can have side-effects and must therefore be modeled in the
- * CFG in AST post-order. For example, a `MethodCall` evaluates its arguments
- * before the call. Most statements don't have side-effects, but merely affect
- * the control-flow and some could therefore be excluded from the CFG. However,
- * as a design choice, all statements are included in the CFG and generally
- * serve as their own entry-points, thus executing in some version of AST
- * pre-order. A few notable exceptions are `ReturnStmt`, `ThrowStmt`,
- * `SynchronizedStmt`, `ThisConstructorInvocationStmt`, and
- * `SuperConstructorInvocationStmt`, which all have side-effects and therefore
- * are modeled in side-effect order. Loop statement nodes are only passed on
- * entry, after which control goes back and forth between body and loop
- * condition.
- *
- * Some out-going edges from boolean expressions have a known value and in some
- * contexts this affects the possible successors. For example, in `if(A || B)`
- * a short-circuit edge that skips `B` must be true and can therefore only lead
- * to the then-branch. If the `||` is modeled in post-order then this
- * information is lost, and consequently it is better to model `||` and `&&` in
- * pre-order. The conditional expression `? :` is also modeled in pre-order to
- * achieve consistent CFGs for the equivalent `A && B` and `A ? B : false`.
- * Finally, the logical negation is also modeled in pre-order to achieve
- * consistent CFGs for the equivalent `!(A || B)` and `!A && !B`. The boolean
- * value `b` is tracked with the completion `booleanCompletion(b, _)`.
- *
- * Note that the second parameter in a `booleanCompletion` isn't needed to
- * calculate the CFG. It is, however, needed to track the value of the
- * sub-expression. For example, this ensures that the false-successor of the
- * `ConditionNode` `A` in `if(!(A && B))` can be correctly identified as the
- * then-branch (even though this completion turns into a
- * `booleanCompletion(true, _)` from the perspective of the `if`-node).
- *
- * As a final note, expressions that aren't actually executed in the usual
- * sense are excluded from the CFG. This covers, for example, parentheses,
- * l-values that aren't r-values as well, and expressions in `ConstCase`s.
- * For example, the `x` in `x=3` is not in the CFG, but the `x` in `x+=3` is.
- */
-
 import java
+private import codeql.controlflow.ControlFlowGraph
 private import codeql.controlflow.SuccessorType
-private import codeql.util.Boolean
-private import Completion
 private import controlflow.internal.Preconditions
-private import controlflow.internal.SwitchCases
 
-/** Provides the definition of control flow nodes. */
-module ControlFlow {
-  private predicate hasControlFlow(Expr e) {
-    not exists(ConstCase cc | e = cc.getValue(_)) and
-    not e.getParent*() instanceof Annotation and
-    not e instanceof TypeAccess and
-    not e instanceof ArrayTypeAccess and
-    not e instanceof UnionTypeAccess and
-    not e instanceof IntersectionTypeAccess and
-    not e instanceof WildcardTypeAccess and
-    not exists(AssignExpr ae | ae.getDest() = e)
+private module Cfg0 = Make0<Location, Ast>;
+
+private module Cfg1 = Make1<Input>;
+
+private module Cfg2 = Make2<Input>;
+
+private import Cfg0
+private import Cfg1
+private import Cfg2
+import Public
+
+/** Provides an implementation of the AST signature for Java. */
+private module Ast implements AstSig<Location> {
+  private import java as J
+
+  class AstNode = ExprParent;
+
+  private predicate skipControlFlow(AstNode e) {
+    e.(Expr).getParent*() instanceof Annotation or
+    e instanceof TypeAccess or
+    e instanceof ArrayTypeAccess or
+    e instanceof UnionTypeAccess or
+    e instanceof IntersectionTypeAccess or
+    e instanceof WildcardTypeAccess or
+    // Switch cases of the form `case e1 -> e2;` skip the ExprStmt and treat
+    // the right-hand side as an expression. See `SwitchCase.getRuleExpression()`.
+    any(SwitchCase sc).getRuleExpression() = e.(J::ExprStmt).getExpr()
   }
 
-  private newtype TNode =
-    TExprNode(Expr e) { hasControlFlow(e) } or
-    TStmtNode(Stmt s) or
-    TAnnotatedExitNode(Callable c, Boolean normal) { exists(c.getBody()) } or
-    TExitNode(Callable c) { exists(c.getBody()) } or
-    TAssertThrowNode(AssertStmt s)
+  AstNode getChild(AstNode n, int index) {
+    not skipControlFlow(result) and
+    not skipControlFlow(n) and
+    result.(Expr).isNthChildOf(n, index)
+    or
+    result.(Stmt).isNthChildOf(n, index)
+    or
+    result = n.(SwitchCase).getRuleExpression() and index = -1
+  }
 
-  /** A node in the expression-level control-flow graph. */
-  class Node extends TNode {
-    /** Gets an immediate successor of this node. */
-    Node getASuccessor() { result = succ(this) }
+  Callable getEnclosingCallable(AstNode node) {
+    result = node.(Expr).getEnclosingCallable() or
+    result = node.(Stmt).getEnclosingCallable()
+  }
 
-    /** Gets an immediate predecessor of this node. */
-    Node getAPredecessor() { this = succ(result) }
+  class Callable = J::Callable;
 
-    /** Gets an exception successor of this node. */
-    Node getAnExceptionSuccessor() { result = succ(this, ThrowCompletion(_)) }
+  AstNode callableGetBody(Callable c) { result = c.getBody() }
 
-    /** Gets a successor of this node that is neither an exception successor nor a jump (break, continue, return). */
-    Node getANormalSuccessor() {
-      result = succ(this, BooleanCompletion(_, _)) or
-      result = succ(this, NormalCompletion())
+  class Stmt = J::Stmt;
+
+  class Expr = J::Expr;
+
+  class BlockStmt = J::BlockStmt;
+
+  class ExprStmt extends J::ExprStmt {
+    ExprStmt() { not skipControlFlow(this) }
+  }
+
+  class IfStmt = J::IfStmt;
+
+  class LoopStmt = J::LoopStmt;
+
+  class WhileStmt = J::WhileStmt;
+
+  class DoStmt = J::DoStmt;
+
+  class ForStmt = J::ForStmt;
+
+  final private class FinalEnhancedForStmt = J::EnhancedForStmt;
+
+  class ForeachStmt extends FinalEnhancedForStmt {
+    Expr getVariable() { result = super.getVariable() }
+
+    Expr getCollection() { result = super.getExpr() }
+  }
+
+  class BreakStmt extends Stmt {
+    BreakStmt() { this instanceof J::BreakStmt or this instanceof YieldStmt }
+  }
+
+  class ContinueStmt = J::ContinueStmt;
+
+  class ReturnStmt = J::ReturnStmt;
+
+  class ThrowStmt = J::ThrowStmt;
+
+  final private class FinalTryStmt = J::TryStmt;
+
+  class TryStmt extends FinalTryStmt {
+    Stmt getBody() { result = super.getBlock() }
+
+    CatchClause getCatch(int index) { result = super.getCatchClause(index) }
+
+    Stmt getFinally() { result = super.getFinally() }
+  }
+
+  AstNode getTryInit(TryStmt try, int index) { result = try.getResource(index) }
+
+  final private class FinalCatchClause = J::CatchClause;
+
+  class CatchClause extends FinalCatchClause {
+    AstNode getVariable() { result = super.getVariable() }
+
+    Expr getCondition() { none() }
+
+    Stmt getBody() { result = super.getBlock() }
+  }
+
+  class Switch extends AstNode {
+    Switch() {
+      this instanceof SwitchStmt or
+      this instanceof SwitchExpr
     }
 
-    /** Gets an immediate successor of this node of a given type, if any. */
-    Node getASuccessor(SuccessorType t) {
-      result = branchSuccessor(this, t.(BooleanSuccessor).getValue())
-      or
-      exists(Completion completion |
-        result = succ(this, completion) and
-        not result = branchSuccessor(this, _)
-      |
-        completion = NormalCompletion() and t instanceof DirectSuccessor
-        or
-        completion = ReturnCompletion() and t instanceof ReturnSuccessor
-        or
-        completion = BreakCompletion(_) and t instanceof BreakSuccessor
-        or
-        completion = YieldCompletion(_) and t instanceof BreakSuccessor
-        or
-        completion = ContinueCompletion(_) and t instanceof ContinueSuccessor
-        or
-        completion = ThrowCompletion(_) and t instanceof ExceptionSuccessor
-      )
+    Expr getExpr() {
+      result = this.(SwitchStmt).getExpr() or
+      result = this.(SwitchExpr).getExpr()
     }
 
-    /** Gets the basic block that contains this node. */
-    BasicBlock getBasicBlock() { result.getANode() = this }
-
-    /** Gets the statement containing this node, if any. */
-    Stmt getEnclosingStmt() { none() }
-
-    /** Gets the immediately enclosing callable whose body contains this node. */
-    Callable getEnclosingCallable() { none() }
-
-    /** Gets the statement this `Node` corresponds to, if any. */
-    Stmt asStmt() { this = TStmtNode(result) }
-
-    /** Gets the expression this `Node` corresponds to, if any. */
-    Expr asExpr() { this = TExprNode(result) }
-
-    /** Gets the call this `Node` corresponds to, if any. */
-    Call asCall() {
-      result = this.asExpr() or
-      result = this.asStmt()
+    Case getCase(int index) {
+      result = this.(SwitchStmt).getCase(index) or
+      result = this.(SwitchExpr).getCase(index)
     }
 
-    /** Gets a textual representation of this element. */
-    string toString() { none() }
+    Stmt getStmt(int index) {
+      result = this.(SwitchStmt).getStmt(index) or
+      result = this.(SwitchExpr).getStmt(index)
+    }
+  }
 
-    /** Gets the source location for this element. */
-    Location getLocation() { none() }
+  class Case extends AstNode instanceof J::SwitchCase {
+    /** Gets a pattern being matched by this case. */
+    AstNode getAPattern() {
+      result = this.(PatternCase).getAPattern() or
+      result = this.(ConstCase).getValue(_)
+    }
+
+    /** Gets the guard expression of this case, if any. */
+    Expr getGuard() { result = this.(PatternCase).getGuard() }
 
     /**
-     * Gets the most appropriate AST node for this control flow node, if any.
+     * Gets the body of this case, if any.
+     *
+     * A case can either have a body as a single child AST node given by this
+     * predicate, or it can have an implicit body given by the sequence of
+     * statements between this case and the next case.
      */
-    ExprParent getAstNode() { none() }
-  }
-
-  /** A control-flow node that represents the evaluation of an expression. */
-  class ExprNode extends Node, TExprNode {
-    Expr e;
-
-    ExprNode() { this = TExprNode(e) }
-
-    override Stmt getEnclosingStmt() { result = e.getEnclosingStmt() }
-
-    override Callable getEnclosingCallable() { result = e.getEnclosingCallable() }
-
-    override ExprParent getAstNode() { result = e }
-
-    /** Gets a textual representation of this element. */
-    override string toString() { result = e.toString() }
-
-    /** Gets the source location for this element. */
-    override Location getLocation() { result = e.getLocation() }
-  }
-
-  /** A control-flow node that represents a statement. */
-  class StmtNode extends Node, TStmtNode {
-    Stmt s;
-
-    StmtNode() { this = TStmtNode(s) }
-
-    override Stmt getEnclosingStmt() { result = s }
-
-    override Callable getEnclosingCallable() { result = s.getEnclosingCallable() }
-
-    override ExprParent getAstNode() { result = s }
-
-    override string toString() { result = s.toString() }
-
-    override Location getLocation() { result = s.getLocation() }
-  }
-
-  /** A control flow node indicating the normal or exceptional termination of a callable. */
-  class AnnotatedExitNode extends Node, TAnnotatedExitNode {
-    Callable c;
-    boolean normal;
-
-    AnnotatedExitNode() { this = TAnnotatedExitNode(c, normal) }
-
-    override Callable getEnclosingCallable() { result = c }
-
-    override ExprParent getAstNode() { result = c }
-
-    /** Gets a textual representation of this element. */
-    override string toString() {
-      normal = true and result = "Normal Exit"
+    AstNode getBody() {
+      result = this.(J::SwitchCase).getRuleExpression()
       or
-      normal = false and result = "Exceptional Exit"
+      result = this.(J::SwitchCase).getRuleStatement()
     }
-
-    /** Gets the source location for this element. */
-    override Location getLocation() { result = c.getLocation() }
   }
 
-  /** A control flow node indicating normal termination of a callable. */
-  class NormalExitNode extends AnnotatedExitNode {
-    NormalExitNode() { this = TAnnotatedExitNode(_, true) }
+  class DefaultCase extends Case instanceof J::DefaultCase { }
+
+  class ConditionalExpr = J::ConditionalExpr;
+
+  class BinaryExpr = J::BinaryExpr;
+
+  class LogicalAndExpr = AndLogicalExpr;
+
+  class LogicalOrExpr = OrLogicalExpr;
+
+  class NullCoalescingExpr extends BinaryExpr {
+    NullCoalescingExpr() { none() }
   }
 
-  /** A control flow node indicating exceptional termination of a callable. */
-  class ExceptionalExitNode extends AnnotatedExitNode {
-    ExceptionalExitNode() { this = TAnnotatedExitNode(_, false) }
-  }
+  class UnaryExpr = J::UnaryExpr;
 
-  /** A control flow node indicating the termination of a callable. */
-  class ExitNode extends Node, TExitNode {
-    Callable c;
+  class LogicalNotExpr = LogNotExpr;
 
-    ExitNode() { this = TExitNode(c) }
+  final private class FinalBooleanLiteral = J::BooleanLiteral;
 
-    override Callable getEnclosingCallable() { result = c }
-
-    override ExprParent getAstNode() { result = c }
-
-    /** Gets a textual representation of this element. */
-    override string toString() { result = "Exit" }
-
-    /** Gets the source location for this element. */
-    override Location getLocation() { result = c.getLocation() }
-  }
-
-  /** A control flow node indicating a failing assertion. */
-  class AssertThrowNode extends Node, TAssertThrowNode {
-    AssertStmt s;
-
-    AssertThrowNode() { this = TAssertThrowNode(s) }
-
-    override Stmt getEnclosingStmt() { result = s }
-
-    override Callable getEnclosingCallable() { result = s.getEnclosingCallable() }
-
-    override ExprParent getAstNode() { result = s }
-
-    /** Gets a textual representation of this element. */
-    override string toString() { result = "Assert Throw" }
-
-    /** Gets the source location for this element. */
-    override Location getLocation() { result = s.getLocation() }
+  class BooleanLiteral extends FinalBooleanLiteral {
+    boolean getValue() { result = this.getBooleanValue() }
   }
 }
 
-class ControlFlowNode = ControlFlow::Node;
-
-/** Gets the intra-procedural successor of `n`. */
-private ControlFlowNode succ(ControlFlowNode n) { result = succ(n, _) }
-
-cached
-private module ControlFlowGraphImpl {
-  private import ControlFlow
-
-  private class AstNode extends ExprParent {
-    AstNode() { this instanceof Expr or this instanceof Stmt }
-
-    Stmt getEnclosingStmt() {
-      result = this or
-      result = this.(Expr).getEnclosingStmt()
-    }
-
-    Node getCfgNode() { result.asExpr() = this or result.asStmt() = this }
+private module Exceptions {
+  private predicate methodMayThrow(Method m) {
+    exists(Stmt stmt |
+      stmt instanceof ThrowStmt and
+      not stmt.(ThrowStmt).getParent() = any(Method m0).getBody()
+      or
+      uncheckedExceptionFromMethod(any(MethodCall call | call.getEnclosingStmt() = stmt))
+    |
+      stmt.getEnclosingCallable() = m and
+      not exists(TryStmt try |
+        exists(try.getACatchClause()) and try.getBlock() = stmt.getEnclosingStmt*()
+      )
+    )
   }
 
   /**
-   * Gets a label that applies to this statement.
+   * Holds if an unchecked exception may occur in a precondition check or guard wrapper.
    */
-  private Label getLabel(Stmt s) {
-    exists(LabeledStmt l | s = l.getStmt() |
-      result = MkLabel(l.getLabel()) or
-      result = getLabel(l)
+  private predicate uncheckedExceptionFromMethod(MethodCall call) {
+    (methodCallChecksArgument(call) or methodCallUnconditionallyThrows(call))
+    or
+    methodMayThrow(call.getMethod().getSourceDeclaration())
+  }
+
+  /**
+   * Holds if an unchecked exception from `c` may transfer control to a finally
+   * block inside which `c` is nested.
+   */
+  private predicate uncheckedExceptionFromFinally(Call c) {
+    exists(TryStmt try |
+      c.getEnclosingStmt().getEnclosingStmt+() = try.getBlock() or
+      c.(Expr).getParent*() = try.getAResource()
+    |
+      exists(try.getFinally())
     )
   }
 
@@ -326,218 +236,92 @@ private module ControlFlowGraphImpl {
       this instanceof TypeException or
       this instanceof UncheckedThrowableType
     }
-
-    /**
-     * An unchecked throwable that is a subtype of this `UncheckedThrowableSuperType` and
-     * sits as high as possible in the type hierarchy. This is mostly unique except for
-     * `TypeThrowable` which results in both `TypeError` and `TypeRuntimeException`.
-     */
-    UncheckedThrowableType getAnUncheckedSubtype() {
-      result = this
-      or
-      result instanceof TypeError and this instanceof TypeThrowable
-      or
-      result instanceof TypeRuntimeException and
-      (this instanceof TypeThrowable or this instanceof TypeException)
-    }
   }
 
   /**
-   * Bind `t` to an exception type that may be thrown during execution of `n`,
-   * either because `n` is a `throw` statement, or because it is a call
-   * that may throw an exception, or because it is a cast and a
-   * `ClassCastException` is expected, or because it is a Kotlin not-null check
-   * and a `NullPointerException` is expected.
+   * Holds if an unchecked exception from `n` may be caught by an enclosing
+   * catch clause.
    */
-  private predicate mayThrow(AstNode n, ThrowableType t) {
-    t = n.(ThrowStmt).getThrownExceptionType()
-    or
-    exists(Call c | c = n |
-      t = c.getCallee().getAThrownExceptionType() or
-      uncheckedExceptionFromCatch(n, t) or
-      uncheckedExceptionFromFinally(n, t) or
-      uncheckedExceptionFromMethod(c, t)
-    )
-    or
-    exists(CastExpr c | c = n |
-      t instanceof TypeClassCastException and
-      uncheckedExceptionFromCatch(n, t)
-    )
-    or
-    exists(NotNullExpr nn | nn = n |
-      t instanceof TypeNullPointerException and
-      uncheckedExceptionFromCatch(n, t)
-    )
-  }
-
-  private predicate methodMayThrow(Method m, ThrowableType t) {
-    exists(AstNode n |
-      t = n.(ThrowStmt).getThrownExceptionType() and
-      not n.(ThrowStmt).getParent() = any(Method m0).getBody()
-      or
-      uncheckedExceptionFromMethod(n, t)
+  private predicate uncheckedExceptionFromCatch(Ast::AstNode n) {
+    exists(TryStmt try, UncheckedThrowableSuperType caught |
+      n.(Stmt).getEnclosingStmt+() = try.getBlock() or
+      n.(Expr).getEnclosingStmt().getEnclosingStmt+() = try.getBlock() or
+      n.(Expr).getParent*() = try.getAResource()
     |
-      n.getEnclosingStmt().getEnclosingCallable() = m and
-      not exists(TryStmt try |
-        exists(try.getACatchClause()) and try.getBlock() = n.getEnclosingStmt().getEnclosingStmt*()
+      try.getACatchClause().getACaughtType() = caught and
+      (
+        caught instanceof TypeClassCastException and n instanceof CastExpr
+        or
+        caught instanceof TypeNullPointerException and n instanceof NotNullExpr
+        or
+        n instanceof Call
       )
     )
   }
 
   /**
-   * Bind `t` to an unchecked exception that may occur in a precondition check or guard wrapper.
+   * Holds if a catch clause of `try` catches checked exceptions of type
+   * `caught`, and that `call` is contained within the try block.
    */
-  private predicate uncheckedExceptionFromMethod(MethodCall ma, ThrowableType t) {
-    (methodCallChecksArgument(ma) or methodCallUnconditionallyThrows(ma)) and
-    (t instanceof TypeError or t instanceof TypeRuntimeException)
-    or
-    methodMayThrow(ma.getMethod().getSourceDeclaration(), t)
+  private predicate checkedExceptionFromCatchCandidate(TryStmt try, RefType caught, Call call) {
+    (
+      call.getEnclosingStmt().getEnclosingStmt+() = try.getBlock() or
+      call.(Expr).getParent*() = try.getAResource()
+    ) and
+    try.getACatchClause().getACaughtType() = caught and
+    not caught instanceof UncheckedThrowableSuperType
   }
 
   /**
-   * Bind `t` to an unchecked exception that may transfer control to a finally
-   * block inside which `n` is nested.
+   * Holds if a catch clause of `try` catches checked exceptions of type
+   * `caught`, and that there is a call within the try block that declares that
+   * it may throw `caught` or a subtype thereof.
    */
-  private predicate uncheckedExceptionFromFinally(AstNode n, ThrowableType t) {
-    exists(TryStmt try |
-      n.getEnclosingStmt().getEnclosingStmt+() = try.getBlock() or
-      n.(Expr).getParent*() = try.getAResource()
-    |
-      exists(try.getFinally()) and
-      (t instanceof TypeError or t instanceof TypeRuntimeException)
+  private predicate declaredCheckedExceptionFromCatchCandidate(TryStmt try, RefType caught) {
+    exists(Call call |
+      checkedExceptionFromCatchCandidate(try, caught, call) and
+      call.getCallee().getAThrownExceptionType().getASourceSupertype*() = caught
     )
   }
 
   /**
-   * Bind `t` to all unchecked exceptions that may be caught by some
-   * `try-catch` inside which `n` is nested.
+   * Holds if `call` is contained within a try block that has a catch clause
+   * that catches a checked exception, but there is no call within the try
+   * block that declares that it may throw that exception, and no throw
+   * statement either. In this case, it is likely that the throws declaration
+   * for some reason was not extracted, so we conseratively assume that `call`
+   * may throw such an exception.
    */
-  private predicate uncheckedExceptionFromCatch(AstNode n, ThrowableType t) {
-    exists(TryStmt try, UncheckedThrowableSuperType caught |
-      n.getEnclosingStmt().getEnclosingStmt+() = try.getBlock() or
-      n.(Expr).getParent*() = try.getAResource()
-    |
-      t = caught.getAnUncheckedSubtype() and
-      try.getACatchClause().getACaughtType() = caught
-    )
-  }
-
-  private ThrowableType actualAssertionError() {
-    result.hasQualifiedName("java.lang", "AssertionError")
-  }
-
-  private ThrowableType assertionError() {
-    result = actualAssertionError()
-    or
-    // In case `AssertionError` is not extracted, we use `Error` as a fallback.
-    not exists(actualAssertionError()) and
-    result.hasQualifiedName("java.lang", "Error")
-  }
-
-  /**
-   * Gets an exception type that may be thrown during execution of the
-   * body or the resources (if any) of `try`.
-   */
-  private ThrowableType thrownInBody(TryStmt try) {
-    exists(AstNode n |
-      mayThrow(n, result)
-      or
-      n instanceof AssertStmt and result = assertionError()
-    |
-      n.getEnclosingStmt().getEnclosingStmt+() = try.getBlock() or
-      n.(Expr).getParent*() = try.getAResource()
+  private predicate checkedExceptionFromCatchCandidate(Call call) {
+    exists(TryStmt try, RefType caught |
+      checkedExceptionFromCatchCandidate(try, caught, call) and
+      not declaredCheckedExceptionFromCatchCandidate(try, caught) and
+      not exists(ThrowStmt throwstmt |
+        throwstmt.getEnclosingStmt+() = try.getBlock() and
+        throwstmt.getThrownExceptionType().getASourceSupertype*() = caught
+      )
     )
   }
 
   /**
-   * Bind `thrown` to an exception type that may be thrown during execution
-   * of the body or the resource declarations of the `try` block to which
-   * `c` belongs, such that `c` definitely catches that exception (if no
-   * prior catch clause handles it).
+   * Holds if `n` is expected to possibly throw an exception. This can either
+   * be due to a declared (likely checked) exception on a call target
+   * or due to an enclosing try/catch/finally.
    */
-  private predicate mustCatch(CatchClause c, ThrowableType thrown) {
-    thrown = thrownInBody(c.getTry()) and
-    hasDescendant(c.getACaughtType(), thrown)
-  }
-
-  /**
-   * Bind `thrown` to an exception type that may be thrown during execution
-   * of the body or the resource declarations of the `try` block to which
-   * `c` belongs, such that `c` may _not_ catch that exception.
-   *
-   * This predicate computes the complement of `mustCatch` over those
-   * exception types that are thrown in the body/resource declarations of
-   * the corresponding `try`.
-   */
-  private predicate mayNotCatch(CatchClause c, ThrowableType thrown) {
-    thrown = thrownInBody(c.getTry()) and
-    not hasDescendant(c.getACaughtType(), thrown)
-  }
-
-  /**
-   * Bind `thrown` to an exception type that may be thrown during execution
-   * of the body or the resource declarations of the `try` block to which
-   * `c` belongs, such that `c` possibly catches that exception.
-   */
-  private predicate mayCatch(CatchClause c, ThrowableType thrown) {
-    mustCatch(c, thrown)
-    or
-    mayNotCatch(c, thrown) and exists(c.getACaughtType().commonSubtype(thrown))
-  }
-
-  /**
-   * Given an exception type `thrown`, determine which catch clauses of
-   * `try` may possibly catch that exception.
-   */
-  private CatchClause handlingCatchClause(TryStmt try, ThrowableType thrown) {
-    exists(int i | result = try.getCatchClause(i) |
-      mayCatch(result, thrown) and
-      not exists(int j | j < i | mustCatch(try.getCatchClause(j), thrown))
-    )
-  }
-
-  /**
-   * Boolean expressions that occur in a context in which their value affect control flow.
-   * That is, contexts where the control-flow edges depend on `value` given that `b` ends
-   * with a `booleanCompletion(value, _)`.
-   */
-  private predicate inBooleanContext(AstNode b) {
-    exists(LogicExpr logexpr |
-      logexpr.(BinaryExpr).getLeftOperand() = b
-      or
-      logexpr.getAnOperand() = b and inBooleanContext(logexpr)
-    )
-    or
-    exists(ConditionalExpr condexpr |
-      condexpr.getCondition() = b
-      or
-      condexpr.getABranchExpr() = b and
-      inBooleanContext(condexpr)
-    )
-    or
-    exists(AssertStmt assertstmt | assertstmt.getExpr() = b)
-    or
-    exists(SwitchExpr switch |
-      inBooleanContext(switch) and
-      switch.getAResult() = b
-    )
-    or
-    exists(ConditionalStmt condstmt | condstmt.getCondition() = b)
-    or
-    exists(WhenBranch whenbranch | whenbranch.getCondition() = b)
-    or
-    exists(WhenExpr whenexpr |
-      inBooleanContext(whenexpr) and
-      whenexpr.getBranch(_).getAResult() = b
-    )
-    or
-    b = any(PatternCase pc).getGuard()
-    or
-    inBooleanContext(b.(ExprStmt).getExpr())
-    or
-    inBooleanContext(b.(StmtExpr).getStmt())
+  predicate mayThrow(Ast::AstNode n) {
+    exists(n.(Call).getCallee().getAThrownExceptionType())
+    or
+    checkedExceptionFromCatchCandidate(n)
+    or
+    uncheckedExceptionFromMethod(n)
+    or
+    uncheckedExceptionFromFinally(n)
+    or
+    uncheckedExceptionFromCatch(n)
   }
+}
 
+private module NonReturningCalls {
   /**
    * A virtual method with a unique implementation. That is, the method does not
    * participate in overriding and there are no call targets that could dispatch
@@ -608,7 +392,7 @@ private module ControlFlowGraphImpl {
   /**
    * Gets a `MethodCall` that always throws an exception or calls `exit`.
    */
-  private MethodCall nonReturningMethodCall() {
+  MethodCall nonReturningMethodCall() {
     methodCallUnconditionallyThrows(result) or
     result.getMethod().getSourceDeclaration() = nonReturningMethod() or
     result = likelyNonReturningMethod().getAnAccess()
@@ -650,1142 +434,247 @@ private module ControlFlowGraphImpl {
       )
     )
   }
+}
 
-  // Join order engineering -- first determine the switch block and the case indices required, then retrieve them.
-  bindingset[switch, i]
-  pragma[inline_late]
-  private predicate isNthCaseOf(SwitchBlock switch, SwitchCase c, int i) {
-    c.isNthCaseOf(switch, i)
-  }
+private module Input implements InputSig1, InputSig2 {
+  private import java as J
 
-  /**
-   * Gets a `SwitchCase` that may be `pred`'s direct successor, where `pred` is declared in block `switch`.
-   *
-   * This means any switch case that comes after `pred` up to the next pattern case, if any, except for `case null`.
-   *
-   * Because we know the switch block contains at least one pattern, we know by https://docs.oracle.com/javase/specs/jls/se21/html/jls-14.html#jls-14.11
-   * that any default case comes after the last pattern case.
-   */
-  private SwitchCase getASuccessorSwitchCase(PatternCase pred, SwitchBlock switch) {
-    // Note we do include `case null, default` (as well as plain old `default`) here.
-    not result.(ConstCase).getValue(_) instanceof NullLiteral and
-    exists(int maxCaseIndex |
-      switch = pred.getParent() and
-      if exists(getNextPatternCase(pred))
-      then maxCaseIndex = getNextPatternCase(pred).getCaseIndex()
-      else maxCaseIndex = lastCaseIndex(switch)
-    |
-      isNthCaseOf(switch, result, [pred.getCaseIndex() + 1 .. maxCaseIndex])
+  predicate cfgCachedStageRef() { CfgCachedStage::ref() }
+
+  /** Holds if this catch clause catches all exceptions. */
+  predicate catchAll(Ast::CatchClause catch) {
+    catch.getACaughtType() instanceof TypeThrowable
+    or
+    exists(TryStmt try, int last |
+      catch.getACaughtType() instanceof TypeException and
+      try.getCatchClause(last) = catch and
+      not exists(try.getCatchClause(last + 1))
     )
   }
 
-  /**
-   * Gets a `SwitchCase` that may occur first in `switch`.
-   *
-   * If the block contains at least one PatternCase, this is any case up to and including that case, or
-   * the case handling the null literal if any.
-   *
-   * Otherwise it is any case in the switch block.
-   */
-  private SwitchCase getAFirstSwitchCase(SwitchBlock switch) {
-    result.getParent() = switch and
+  /** Holds if this case matches all possible values. */
+  predicate matchAll(Ast::Case c) {
+    c instanceof DefaultCase
+    or
+    // Switch expressions and enhanced switch blocks (those that use pattern
+    // cases or match null) must be exhaustive, so the last case matches all
+    // remaining values.
+    // See https://docs.oracle.com/javase/specs/jls/se21/html/jls-14.html#jls-14.11.2
+    exists(Ast::Switch switch, int last |
+      switch instanceof SwitchExpr or
+      exists(switch.(SwitchStmt).getAPatternCase()) or
+      switch.(SwitchStmt).hasNullCase()
+    |
+      switch.getCase(last) = c and
+      not exists(switch.getCase(last + 1))
+    )
+    or
+    c.(J::PatternCase).getAPattern().getType() instanceof TypeObject
+  }
+
+  private newtype TLabel =
+    TJavaLabel(string l) { exists(LabeledStmt lbl | l = lbl.getLabel()) } or
+    TYield()
+
+  class Label extends TLabel {
+    string toString() {
+      exists(string l | this = TJavaLabel(l) and result = l)
+      or
+      this = TYield() and result = "yield"
+    }
+  }
+
+  private Label getLabelOfLoop(Stmt s) {
+    exists(LabeledStmt l | s = l.getStmt() |
+      result = TJavaLabel(l.getLabel()) or
+      result = getLabelOfLoop(l)
+    )
+  }
+
+  predicate hasLabel(Ast::AstNode n, Label l) {
+    l = getLabelOfLoop(n)
+    or
+    l = TJavaLabel(n.(BreakStmt).getLabel())
+    or
+    l = TJavaLabel(n.(ContinueStmt).getLabel())
+    or
+    l = TYield() and n instanceof YieldStmt
+    or
+    l = TYield() and n instanceof SwitchExpr
+  }
+
+  predicate inConditionalContext(Ast::AstNode n, ConditionKind kind) {
+    kind.isBoolean() and
     (
-      result.(ConstCase).getValue(_) instanceof NullLiteral
-      or
-      result instanceof NullDefaultCase
-      or
-      not exists(getFirstPatternCase(switch))
-      or
-      result.getIndex() <= getFirstPatternCase(switch).getIndex()
+      any(AssertStmt assertstmt).getExpr() = n or
+      any(WhenBranch whenbranch).getCondition() = n
     )
   }
 
-  private Stmt getSwitchStatement(SwitchBlock switch, int i) { result.isNthChildOf(switch, i) }
+  predicate preOrderExpr(Expr e) { e instanceof WhenExpr }
 
-  /**
-   * Holds if `last` is the last node in any of pattern case `pc`'s succeeding bind-and-test operations,
-   * immediately before either falling through to execute successor statements or execute a rule body
-   * if present. `completion` is the completion kind of the last operation.
-   */
-  private predicate lastPatternCaseMatchingOp(PatternCase pc, Node last, Completion completion) {
-    last(pc.getAPattern(), last, completion) and
-    completion = NormalCompletion() and
-    not exists(pc.getGuard())
+  predicate postOrInOrder(Ast::AstNode n) {
+    // expressions are already post-order, but we need the calls that are statements to be post-order as well
+    n instanceof Call
     or
-    last(pc.getGuard(), last, completion) and
-    completion = BooleanCompletion(true, _)
+    n instanceof SynchronizedStmt
+  }
+
+  private string assertThrowNodeTag() { result = "[assert-throw]" }
+
+  private string instanceofTrueNodeTag() { result = "[instanceof-true]" }
+
+  predicate additionalNode(Ast::AstNode n, string tag, NormalSuccessor t) {
+    n instanceof AssertStmt and tag = assertThrowNodeTag() and t instanceof DirectSuccessor
+    or
+    n.(InstanceOfExpr).isPattern() and
+    tag = instanceofTrueNodeTag() and
+    t.(BooleanSuccessor).getValue() = true
   }
 
   /**
-   * Expressions and statements with CFG edges in post-order AST traversal.
-   *
-   * This includes most expressions, except those that initiate or propagate branching control
-   * flow (`LogicExpr`, `ConditionalExpr`).
-   * Only a few statements are included; those with specific side-effects
-   * occurring after the evaluation of their children, that is, `Call`, `ReturnStmt`,
-   * and `ThrowStmt`. CFG nodes without child nodes in the CFG that may complete
-   * normally are also included.
+   * Holds if `ast` may result in an abrupt completion `c` originating at
+   * `n`. The boolean `always`  indicates whether the abrupt completion
+   * always occurs or whether `n` may also terminate normally.
    */
-  private class PostOrderNode extends AstNode {
-    PostOrderNode() {
-      // For VarAccess and ArrayAccess only read accesses (r-values) are included,
-      // as write accesses aren't included in the CFG.
-      this instanceof ArrayAccess and not exists(AssignExpr a | this = a.getDest())
-      or
-      this instanceof ArrayCreationExpr
-      or
-      this instanceof ArrayInit
-      or
-      this instanceof Assignment
-      or
-      this instanceof BinaryExpr and not this instanceof LogicExpr
-      or
-      this instanceof UnaryExpr and not this instanceof LogNotExpr
-      or
-      this instanceof CastingExpr
-      or
-      this instanceof InstanceOfExpr and not this.(InstanceOfExpr).isPattern()
-      or
-      this instanceof NotInstanceOfExpr
-      or
-      this instanceof LocalVariableDeclExpr
-      or
-      this instanceof StringTemplateExpr
-      or
-      this instanceof ClassExpr
-      or
-      this instanceof VarRead
-      or
-      this instanceof Call // includes both expressions and statements
-      or
-      this instanceof ErrorExpr
-      or
-      this instanceof ReturnStmt
-      or
-      this instanceof ThrowStmt
-      or
-      this instanceof Literal
-      or
-      this instanceof TypeLiteral
-      or
-      this instanceof ThisAccess
-      or
-      this instanceof SuperAccess
-      or
-      this.(BlockStmt).getNumStmt() = 0
-      or
-      this instanceof SwitchCase and
-      not this.(SwitchCase).isRule() and
-      not this instanceof PatternCase
-      or
-      this instanceof RecordPatternExpr
-      or
-      this instanceof EmptyStmt
-      or
-      this instanceof LocalTypeDeclStmt
-    }
-
-    /** Gets child nodes in their order of execution. Indexing starts at either -1 or 0. */
-    AstNode getChildNode(int index) {
-      exists(ArrayAccess e | e = this |
-        index = 0 and result = e.getArray()
-        or
-        index = 1 and result = e.getIndexExpr()
-      )
-      or
-      exists(ArrayCreationExpr e | e = this |
-        result = e.getDimension(index)
-        or
-        index = count(e.getADimension()) and result = e.getInit()
-      )
-      or
-      result = this.(ArrayInit).getInit(index) and index >= 0
-      or
-      exists(AssignExpr e, ArrayAccess lhs | e = this and lhs = e.getDest() |
-        index = 0 and result = lhs.getArray()
-        or
-        index = 1 and result = lhs.getIndexExpr()
-        or
-        index = 2 and result = e.getSource()
-      )
-      or
-      exists(AssignExpr e, VarAccess lhs | e = this and lhs = e.getDest() |
-        index = -1 and result = lhs.getQualifier() and not result instanceof TypeAccess
-        or
-        index = 0 and result = e.getSource()
-      )
-      or
-      exists(AssignOp e | e = this |
-        index = 0 and result = e.getDest()
-        or
-        index = 1 and result = e.getRhs()
-      )
-      or
-      exists(BinaryExpr e | e = this |
-        index = 0 and result = e.getLeftOperand()
-        or
-        index = 1 and result = e.getRightOperand()
-      )
-      or
-      index = 0 and result = this.(UnaryExpr).getOperand()
-      or
-      index = 0 and result = this.(CastingExpr).getExpr()
-      or
-      index = 0 and result = this.(InstanceOfExpr).getExpr()
-      or
-      index = 0 and result = this.(NotInstanceOfExpr).getExpr()
-      or
-      index = 0 and result = this.(LocalVariableDeclExpr).getInit()
-      or
-      index = 0 and result = this.(VarRead).getQualifier() and not result instanceof TypeAccess
-      or
-      exists(Call e | e = this |
-        index = -1 and result = e.getQualifier() and not result instanceof TypeAccess
-        or
-        result = e.getArgument(index)
-      )
-      or
-      exists(StringTemplateExpr e | e = this | result = e.getComponent(index))
-      or
-      index = 0 and result = this.(ClassExpr).getExpr()
-      or
-      index = 0 and result = this.(ReturnStmt).getExpr()
-      or
-      index = 0 and result = this.(ThrowStmt).getExpr()
-      or
-      result = this.(RecordPatternExpr).getSubPattern(index)
-    }
-
-    /** Gets the first child node, if any. */
-    AstNode firstChild() {
-      result = this.getChildNode(-1)
-      or
-      result = this.getChildNode(0) and not exists(this.getChildNode(-1))
-    }
-
-    /** Holds if this CFG node has any child nodes. */
-    predicate isLeafNode() { not exists(this.getChildNode(_)) }
-
-    /** Holds if this node can finish with a `normalCompletion`. */
-    predicate mayCompleteNormally() {
-      not this instanceof BooleanLiteral and
-      not this instanceof ReturnStmt and
-      not this instanceof ThrowStmt and
-      not this = nonReturningMethodCall()
-    }
+  predicate beginAbruptCompletion(
+    Ast::AstNode ast, PreControlFlowNode n, AbruptCompletion c, boolean always
+  ) {
+    ast instanceof AssertStmt and
+    n.isAdditional(ast, assertThrowNodeTag()) and
+    c.asSimpleAbruptCompletion() instanceof ExceptionSuccessor and
+    always = true
+    or
+    Exceptions::mayThrow(ast) and
+    n.isIn(ast) and
+    c.asSimpleAbruptCompletion() instanceof ExceptionSuccessor and
+    always = false
+    or
+    ast = NonReturningCalls::nonReturningMethodCall() and
+    n.isIn(ast) and
+    c.asSimpleAbruptCompletion() instanceof ExceptionSuccessor and
+    always = true
   }
 
   /**
-   * If the body of `loop` finishes with `completion`, the loop will
-   * continue executing (provided the loop condition still holds).
+   * Holds if an abrupt completion `c` from within `ast` is caught with
+   * flow continuing at `n`.
    */
-  private predicate continues(Completion completion, LoopStmt loop) {
-    completion = NormalCompletion()
-    or
-    // only consider continue completions if there actually is a `continue`
-    // somewhere inside this loop; we don't particularly care whether that
-    // `continue` could actually target this loop, we just want to restrict
-    // the size of the predicate
-    exists(ContinueStmt cnt | cnt.getEnclosingStmt+() = loop |
-      completion = anonymousContinueCompletion() or
-      completion = labelledContinueCompletion(getLabel(loop))
+  predicate endAbruptCompletion(Ast::AstNode ast, PreControlFlowNode n, AbruptCompletion c) {
+    exists(LabeledStmt lbl |
+      ast = lbl.getStmt() and
+      n.isAfter(lbl) and
+      c.getSuccessorType() instanceof BreakSuccessor and
+      c.hasLabel(TJavaLabel(lbl.getLabel()))
     )
   }
 
-  /**
-   * Determine the part of the AST node `n` that will be executed first.
-   */
-  private Node first(AstNode n) {
-    result.asExpr() = n and n instanceof LogicExpr
-    or
-    result.asExpr() = n and n instanceof ConditionalExpr
-    or
-    result.asExpr() = n and n instanceof WhenExpr
-    or
-    result.asStmt() = n and n instanceof WhenBranch
-    or
-    result.asExpr() = n and n instanceof StmtExpr
-    or
-    result = n.getCfgNode() and n.(PostOrderNode).isLeafNode()
-    or
-    result = first(n.(PostOrderNode).firstChild())
-    or
-    result = first(n.(InstanceOfExpr).getExpr())
-    or
-    result = first(n.(SynchronizedStmt).getExpr())
-    or
-    result = first(n.(AssertStmt).getExpr())
-    or
-    result.asStmt() = n and
-    not n instanceof PostOrderNode and
-    not n instanceof SynchronizedStmt and
-    not n instanceof AssertStmt
-    or
-    result.asExpr() = n and n instanceof SwitchExpr
-  }
-
-  /**
-   * Bind `last` to a node inside the body of `try` that may finish with `completion`
-   * such that control will be transferred to a `catch` block or the `finally` block of `try`.
-   *
-   * In other words, `last` is either a resource declaration that throws, or a
-   * node in the `try` block that may not complete normally, or a node in
-   * the `try` block that has no control flow successors inside the block.
-   */
-  private predicate catchOrFinallyCompletion(TryStmt try, Node last, Completion completion) {
-    last(try.getBlock(), last, completion)
-    or
-    last(try.getAResource(), last, completion) and completion = ThrowCompletion(_)
-  }
-
-  /**
-   * Bind `last` to a node inside the body of `try` that may finish with `completion`
-   * such that control may be transferred to the `finally` block (if it exists).
-   *
-   * In other words, if `last` throws an exception it is possibly not caught by any
-   * of the catch clauses.
-   */
-  private predicate uncaught(TryStmt try, Node last, Completion completion) {
-    catchOrFinallyCompletion(try, last, completion) and
-    (
-      exists(ThrowableType thrown |
-        thrown = thrownInBody(try) and
-        completion = ThrowCompletion(thrown) and
-        not mustCatch(try.getACatchClause(), thrown)
-      )
+  /** Holds if there is a local non-abrupt step from `n1` to `n2`. */
+  predicate step(PreControlFlowNode n1, PreControlFlowNode n2) {
+    exists(InstanceOfExpr ioe |
+      // common
+      n1.isBefore(ioe) and
+      n2.isBefore(ioe.getExpr())
       or
-      completion = NormalCompletion()
+      n1.isAfter(ioe.getExpr()) and
+      n2.isIn(ioe)
       or
-      completion = ReturnCompletion()
+      // std postorder:
+      not ioe.isPattern() and
+      n1.isIn(ioe) and
+      n2.isAfter(ioe)
       or
-      completion = anonymousBreakCompletion()
+      // pattern case:
+      ioe.isPattern() and
+      n1.isIn(ioe) and
+      n2.isAfterValue(ioe, any(BooleanSuccessor s | s.getValue() = false))
       or
-      completion = labelledBreakCompletion(_)
+      n1.isIn(ioe) and
+      n2.isAdditional(ioe, instanceofTrueNodeTag())
       or
-      completion = anonymousContinueCompletion()
+      n1.isAdditional(ioe, instanceofTrueNodeTag()) and
+      n2.isBefore(ioe.getPattern())
       or
-      completion = labelledContinueCompletion(_)
+      n1.isAfter(ioe.getPattern()) and
+      n2.isAfterValue(ioe, any(BooleanSuccessor s | s.getValue() = true))
     )
-  }
-
-  /**
-   * Bind `last` to a node inside `try` that may finish with `completion` such
-   * that control may be transferred to the `finally` block (if it exists).
-   *
-   * This is similar to `uncaught`, but also includes final statements of `catch`
-   * clauses.
-   */
-  private predicate finallyPred(TryStmt try, Node last, Completion completion) {
-    uncaught(try, last, completion) or
-    last(try.getACatchClause(), last, completion)
-  }
-
-  private predicate lastInFinally(TryStmt try, Node last) {
-    last(try.getFinally(), last, NormalCompletion())
-  }
-
-  private predicate isNextNormalSwitchStmt(SwitchBlock switch, Stmt pred, Stmt succ) {
-    exists(int i, Stmt immediateSucc |
-      getSwitchStatement(switch, i) = pred and
-      getSwitchStatement(switch, i + 1) = immediateSucc and
+    or
+    exists(AssertStmt assertstmt |
+      n1.isBefore(assertstmt) and
+      n2.isBefore(assertstmt.getExpr())
+      or
+      n1.isAfterValue(assertstmt.getExpr(), any(BooleanSuccessor s | s.getValue() = true)) and
+      n2.isAfter(assertstmt)
+      or
+      n1.isAfterValue(assertstmt.getExpr(), any(BooleanSuccessor s | s.getValue() = false)) and
       (
-        if immediateSucc instanceof PatternCase
-        then isNextNormalSwitchStmt(switch, immediateSucc, succ)
-        else succ = immediateSucc
-      )
-    )
-  }
-
-  /**
-   * Bind `last` to a cfg node nested inside `n` (or, indeed, `n` itself) such
-   * that `last` may be the last node during an execution of `n` and finish
-   * with the given completion.
-   *
-   * A `booleanCompletion` implies that `n` is an `Expr`. Any abnormal
-   * completion besides `throwCompletion` implies that `n` is a `Stmt`.
-   */
-  private predicate last(AstNode n, Node last, Completion completion) {
-    // Exceptions are propagated from any sub-expression.
-    // As are any break, yield, continue, or return completions.
-    exists(Expr e | e.getParent() = n |
-      last(e, last, completion) and not completion instanceof NormalOrBooleanCompletion
-    )
-    or
-    // If an expression doesn't finish with a throw completion, then it executes normally with
-    // either a `normalCompletion` or a `booleanCompletion`.
-    // A boolean completion in a non-boolean context just indicates a normal completion
-    // and a normal completion in a boolean context indicates an arbitrary boolean completion.
-    last(n, last, NormalCompletion()) and
-    inBooleanContext(n) and
-    completion = basicBooleanCompletion(_)
-    or
-    last(n, last, BooleanCompletion(_, _)) and
-    not inBooleanContext(n) and
-    completion = NormalCompletion() and
-    // PatternCase has both a boolean-true completion (guard success) and a normal one
-    // (variable declaration completion, when no guard is present).
-    not n instanceof PatternCase
-    or
-    // Logic expressions and conditional expressions are executed in AST pre-order to facilitate
-    // proper short-circuit representation. All other expressions are executed in post-order.
-    // The last node of a logic expression is either in the right operand with an arbitrary
-    // completion, or in the left operand with the corresponding boolean completion.
-    exists(AndLogicalExpr andexpr | andexpr = n |
-      last(andexpr.getLeftOperand(), last, completion) and completion = BooleanCompletion(false, _)
-      or
-      last(andexpr.getRightOperand(), last, completion)
-    )
-    or
-    exists(OrLogicalExpr orexpr | orexpr = n |
-      last(orexpr.getLeftOperand(), last, completion) and completion = BooleanCompletion(true, _)
-      or
-      last(orexpr.getRightOperand(), last, completion)
-    )
-    or
-    // The last node of a `LogNotExpr` is in its sub-expression with an inverted boolean completion
-    // (or a `normalCompletion`).
-    exists(Completion subcompletion | last(n.(LogNotExpr).getOperand(), last, subcompletion) |
-      subcompletion = NormalCompletion() and
-      completion = NormalCompletion() and
-      not inBooleanContext(n)
-      or
-      exists(boolean outervalue, boolean innervalue |
-        subcompletion = BooleanCompletion(outervalue, innervalue) and
-        completion = BooleanCompletion(outervalue.booleanNot(), innervalue)
-      )
-    )
-    or
-    // The last node of a `ConditionalExpr` is in either of its branches.
-    exists(ConditionalExpr condexpr | condexpr = n |
-      last(condexpr.getABranchExpr(), last, completion)
-    )
-    or
-    exists(InstanceOfExpr ioe | ioe.isPattern() and ioe = n |
-      last.asExpr() = n and completion = basicBooleanCompletion(false)
-      or
-      last(ioe.getPattern(), last, NormalCompletion()) and completion = basicBooleanCompletion(true)
-    )
-    or
-    // The last node of a node executed in post-order is the node itself.
-    exists(PostOrderNode p | p = n |
-      p.mayCompleteNormally() and last = p.getCfgNode() and completion = NormalCompletion()
-    )
-    or
-    last.asExpr() = n and completion = basicBooleanCompletion(n.(BooleanLiteral).getBooleanValue())
-    or
-    // The last statement in a block is any statement that does not complete normally,
-    // or the last statement.
-    exists(BlockStmt blk | blk = n |
-      last(blk.getAStmt(), last, completion) and completion != NormalCompletion()
-      or
-      last(blk.getStmt(blk.getNumStmt() - 1), last, completion)
-    )
-    or
-    // The last node in an `if` statement is the last node in either of its branches or
-    // the last node of the condition with a false-completion in the absence of an else-branch.
-    exists(IfStmt ifstmt | ifstmt = n |
-      last(ifstmt.getCondition(), last, BooleanCompletion(false, _)) and
-      completion = NormalCompletion() and
-      not exists(ifstmt.getElse())
-      or
-      last(ifstmt.getThen(), last, completion)
-      or
-      last(ifstmt.getElse(), last, completion)
-    )
-    or
-    // A loop may terminate normally if its condition is false...
-    exists(LoopStmt loop | loop = n |
-      last(loop.getCondition(), last, BooleanCompletion(false, _)) and
-      completion = NormalCompletion()
-      or
-      // ...or if it's an enhanced for loop running out of items to iterate over...
-      // ...which may happen either immediately after the loop expression...
-      last(loop.(EnhancedForStmt).getExpr(), last, completion) and completion = NormalCompletion()
-      or
-      exists(Completion bodyCompletion | last(loop.getBody(), last, bodyCompletion) |
-        // ...or after the last node in the loop's body in an iteration that would otherwise continue.
-        loop instanceof EnhancedForStmt and
-        continues(bodyCompletion, loop) and
-        completion = NormalCompletion()
+        n2.isBefore(assertstmt.getMessage())
         or
-        // Otherwise the last node is the last node in the loop's body...
-        // ...if it is an unlabelled `break` (causing the entire loop to complete normally)
-        (
-          if bodyCompletion = anonymousBreakCompletion()
-          then completion = NormalCompletion()
-          else (
-            // ...or if it is some other completion that does not continue the loop.
-            not continues(bodyCompletion, loop) and completion = bodyCompletion
-          )
-        )
-      )
-    )
-    or
-    // `try` statements are a bit more complicated:
-    exists(TryStmt try | try = n |
-      // the last node in a `try` is the last node in its `finally` block
-      // if the `finally` block completes normally, it resumes any completion that
-      // was current before the `finally` block was entered
-      lastInFinally(try, last) and
-      finallyPred(try, _, completion)
-      or
-      // otherwise, just take the completion of the `finally` block itself
-      last(try.getFinally(), last, completion) and
-      completion != NormalCompletion()
-      or
-      // if there is no `finally` block, take the last node of the body or
-      // any of the `catch` clauses
-      not exists(try.getFinally()) and finallyPred(try, last, completion)
-    )
-    or
-    // handle `switch` statements
-    exists(SwitchStmt switch | switch = n |
-      // unlabelled `break` causes the whole `switch` to complete normally
-      last(switch.getAStmt(), last, anonymousBreakCompletion()) and
-      completion = NormalCompletion()
-      or
-      // any other abnormal completion is propagated
-      last(switch.getAStmt(), last, completion) and
-      completion != anonymousBreakCompletion() and
-      not completion instanceof NormalOrBooleanCompletion
-      or
-      // if a statement without a non-pattern-case successor completes normally (or for a pattern case
-      // the guard succeeds) then the switch completes normally.
-      exists(Stmt lastNormalStmt, Completion stmtCompletion |
-        lastNormalStmt = getSwitchStatement(switch, _) and
-        not isNextNormalSwitchStmt(switch, lastNormalStmt, _) and
-        last(lastNormalStmt, last, stmtCompletion) and
-        (stmtCompletion = NormalCompletion() or stmtCompletion = BooleanCompletion(true, _)) and
-        completion = NormalCompletion()
+        not exists(assertstmt.getMessage()) and
+        n2.isAdditional(assertstmt, assertThrowNodeTag())
       )
       or
-      // if no default case exists, then normal completion of the expression may terminate the switch
-      // Note this can't happen if there are pattern cases or a null literal, as
-      // https://docs.oracle.com/javase/specs/jls/se21/html/jls-14.html#jls-14.11.2 requires that such
-      // an enhanced switch block is exhaustive.
-      not exists(switch.getDefaultCase()) and
-      not exists(switch.getAPatternCase()) and
-      not switch.hasNullCase() and
-      last(switch.getExpr(), last, completion) and
-      completion = NormalCompletion()
-    )
-    or
-    // handle `switch` expression
-    exists(SwitchExpr switch | switch = n |
-      // `yield` terminates the `switch`
-      last(switch.getAStmt(), last, YieldCompletion(completion))
-      or
-      // any other abnormal completion is propagated
-      last(switch.getAStmt(), last, completion) and
-      not completion instanceof YieldCompletion and
-      not completion instanceof NormalOrBooleanCompletion
-    )
-    or
-    // If a case rule right-hand-side completes then the switch breaks or yields, depending
-    // on whether this is a switch expression or statement. If it completes abruptly then the
-    // switch completes the same way.
-    exists(Completion caseCompletion, SwitchCase case |
-      case = n and
-      (
-        last(case.getRuleStatement(), last, caseCompletion)
-        or
-        last(case.getRuleExpression(), last, caseCompletion)
-      )
-    |
-      if caseCompletion instanceof NormalOrBooleanCompletion
-      then
-        case.getParent() instanceof SwitchStmt and completion = anonymousBreakCompletion()
-        or
-        case.getParent() instanceof SwitchExpr and completion = YieldCompletion(caseCompletion)
-      else completion = caseCompletion
-    )
-    or
-    // A pattern case statement can complete:
-    // * On failure of its final type test (boolean false)
-    // * On failure of its guard test if any (boolean false)
-    // * On completion of one of its pattern variable declarations, if it is not a rule and has no guard (normal completion)
-    // * On success of its guard test, if it is not a rule (boolean true)
-    // (the latter two cases are accounted for by lastPatternCaseMatchingOp)
-    exists(PatternCase pc | n = pc |
-      last.asStmt() = pc and completion = basicBooleanCompletion(false)
-      or
-      last(pc.getGuard(), last, completion) and
-      completion = BooleanCompletion(false, _)
-      or
-      not pc.isRule() and
-      lastPatternCaseMatchingOp(pc, last, completion)
-    )
-    or
-    // the last statement of a synchronized statement is the last statement of its body
-    last(n.(SynchronizedStmt).getBlock(), last, completion)
-    or
-    // `return` statements give rise to a `Return` completion
-    last.asStmt() = n.(ReturnStmt) and completion = ReturnCompletion()
-    or
-    exists(AssertStmt assertstmt | assertstmt = n |
-      // `assert` statements may complete normally - we use the `AssertStmt` itself
-      // to represent this outcome
-      last.asStmt() = assertstmt and completion = NormalCompletion()
-      or
-      // `assert` statements may throw
-      completion = ThrowCompletion(assertionError()) and
-      last.(AssertThrowNode).getAstNode() = assertstmt
-    )
-    or
-    // `throw` statements or throwing calls give rise to `Throw` completion
-    exists(ThrowableType tt | mayThrow(n, tt) |
-      last = n.getCfgNode() and completion = ThrowCompletion(tt)
-    )
-    or
-    // `break` statements give rise to a `Break` completion
-    exists(BreakStmt break | break = n and last.asStmt() = n |
-      completion = labelledBreakCompletion(MkLabel(break.getLabel()))
-      or
-      not exists(break.getLabel()) and completion = anonymousBreakCompletion()
-    )
-    or
-    // yield statements get their completion wrapped as a yield
-    exists(Completion caseCompletion |
-      last(n.(YieldStmt).getValue(), last, caseCompletion) and
-      if caseCompletion instanceof NormalOrBooleanCompletion
-      then completion = YieldCompletion(caseCompletion)
-      else completion = caseCompletion
-    )
-    or
-    // `continue` statements give rise to a `Continue` completion
-    exists(ContinueStmt cont | cont = n and last.asStmt() = n |
-      completion = labelledContinueCompletion(MkLabel(cont.getLabel()))
-      or
-      not exists(cont.getLabel()) and completion = anonymousContinueCompletion()
-    )
-    or
-    // the last node in an `ExprStmt` is the last node in the expression
-    last(n.(ExprStmt).getExpr(), last, completion) and
-    completion instanceof NormalOrBooleanCompletion
-    or
-    // the last node in a `StmtExpr` is the last node in the statement
-    last(n.(StmtExpr).getStmt(), last, completion)
-    or
-    // the last statement of a labeled statement is the last statement of its body...
-    exists(LabeledStmt lbl, Completion bodyCompletion |
-      lbl = n and last(lbl.getStmt(), last, bodyCompletion)
-    |
-      // ...except if it's a `break` that refers to this labelled statement
-      if bodyCompletion = labelledBreakCompletion(MkLabel(lbl.getLabel()))
-      then completion = NormalCompletion()
-      else completion = bodyCompletion
-    )
-    or
-    // the last statement of a `catch` clause is the last statement of its block
-    last(n.(CatchClause).getBlock(), last, completion)
-    or
-    // the last node in a variable declaration statement is in the last of its individual declarations
-    exists(LocalVariableDeclStmt s | s = n |
-      last(s.getVariable(count(s.getAVariable())), last, completion) and
-      completion = NormalCompletion()
-    )
-    or
-    // The last node in a `when` expression is the last node in any of its branches or
-    // the last node of the condition of the last branch in the absence of an else-branch.
-    exists(WhenExpr whenexpr | whenexpr = n |
-      // If we have no branches then we are the last node
-      last.asExpr() = n and
-      completion = NormalCompletion() and
-      not exists(whenexpr.getBranch(_))
-      or
-      // If our last branch condition is false then we are done
-      exists(int i |
-        last(whenexpr.getBranch(i), last, BooleanCompletion(false, _)) and
-        completion = NormalCompletion() and
-        not exists(whenexpr.getBranch(i + 1))
-      )
-      or
-      // Any branch getting an abnormal completion is propagated
-      last(whenexpr.getBranch(_), last, completion) and
-      not completion instanceof YieldCompletion and
-      not completion instanceof NormalOrBooleanCompletion
-      or
-      // The last node in any branch. This will be wrapped up as a
-      // YieldCompletion, so we need to unwrap it here.
-      last(whenexpr.getBranch(_), last, YieldCompletion(completion))
-    )
-    or
-    exists(WhenBranch whenbranch | whenbranch = n |
-      // If the condition completes with anything other than true
-      // (or "normal", which we will also see if we don't know how
-      // to make specific true/false edges for the condition)
-      // (e.g. false or an exception), then the branch is done.
-      last(whenbranch.getCondition(), last, completion) and
-      not completion = BooleanCompletion(true, _) and
-      not completion = NormalCompletion()
-      or
-      // Similarly any non-normal completion of the RHS
-      // should propagate outwards:
-      last(whenbranch.getRhs(), last, completion) and
-      not completion instanceof NormalOrBooleanCompletion
-      or
-      // Otherwise we wrap the completion up in a YieldCompletion
-      // so that the `when` expression can tell that we have finished,
-      // and it shouldn't go on to the next branch.
-      exists(Completion branchCompletion |
-        last(whenbranch.getRhs(), last, branchCompletion) and
-        completion = YieldCompletion(branchCompletion)
-      )
-    )
-  }
-
-  /**
-   * Compute the intra-procedural successors of cfg node `n`, assuming its
-   * execution finishes with the given completion.
-   */
-  cached
-  Node succ(Node n, Completion completion) {
-    // After executing the callable body, the final nodes are first the
-    // annotated exit node and then the final exit node.
-    exists(Callable c | last(c.getBody(), n, completion) |
-      if completion instanceof ThrowCompletion
-      then result.(ExceptionalExitNode).getEnclosingCallable() = c
-      else result.(NormalExitNode).getEnclosingCallable() = c
-    )
-    or
-    completion = NormalCompletion() and
-    n.(AnnotatedExitNode).getEnclosingCallable() = result.(ExitNode).getEnclosingCallable()
-    or
-    // Logic expressions and conditional expressions execute in AST pre-order.
-    completion = NormalCompletion() and
-    (
-      result = first(n.asExpr().(AndLogicalExpr).getLeftOperand()) or
-      result = first(n.asExpr().(OrLogicalExpr).getLeftOperand()) or
-      result = first(n.asExpr().(LogNotExpr).getOperand()) or
-      result = first(n.asExpr().(ConditionalExpr).getCondition())
-    )
-    or
-    // If a logic expression doesn't short-circuit then control flows from its left operand to its right.
-    exists(AndLogicalExpr e |
-      last(e.getLeftOperand(), n, completion) and
-      completion = BooleanCompletion(true, _) and
-      result = first(e.getRightOperand())
-    )
-    or
-    exists(OrLogicalExpr e |
-      last(e.getLeftOperand(), n, completion) and
-      completion = BooleanCompletion(false, _) and
-      result = first(e.getRightOperand())
-    )
-    or
-    // Control flows to the corresponding branch depending on the boolean completion of the condition.
-    exists(ConditionalExpr e, boolean branch |
-      last(e.getCondition(), n, completion) and
-      completion = BooleanCompletion(branch, _) and
-      result = first(e.getBranchExpr(branch))
-    )
-    or
-    exists(InstanceOfExpr ioe | ioe.isPattern() |
-      last(ioe.getExpr(), n, completion) and
-      completion = NormalCompletion() and
-      result.asExpr() = ioe
-      or
-      n.asExpr() = ioe and
-      result = first(ioe.getPattern()) and
-      completion = basicBooleanCompletion(true)
-    )
-    or
-    // In other expressions control flows from left to right and ends in the node itself.
-    exists(PostOrderNode p, int i |
-      last(p.getChildNode(i), n, completion) and completion = NormalCompletion()
-    |
-      result = first(p.getChildNode(i + 1))
-      or
-      not exists(p.getChildNode(i + 1)) and result = p.getCfgNode()
-    )
-    or
-    // Statements within a block execute sequentially.
-    result = first(n.asStmt().(BlockStmt).getStmt(0)) and completion = NormalCompletion()
-    or
-    exists(BlockStmt blk, int i |
-      last(blk.getStmt(i), n, completion) and
-      completion = NormalCompletion() and
-      result = first(blk.getStmt(i + 1))
-    )
-    or
-    // Control flows to the corresponding branch depending on the boolean completion of the condition.
-    exists(IfStmt s |
-      n.asStmt() = s and result = first(s.getCondition()) and completion = NormalCompletion()
-      or
-      last(s.getCondition(), n, completion) and
-      completion = BooleanCompletion(true, _) and
-      result = first(s.getThen())
-      or
-      last(s.getCondition(), n, completion) and
-      completion = BooleanCompletion(false, _) and
-      result = first(s.getElse())
-    )
-    or
-    // For statements:
-    exists(ForStmt for, Node condentry |
-      // Any part of the control flow that aims for the condition needs to hit either the condition...
-      condentry = first(for.getCondition())
-      or
-      // ...or the body if the for doesn't include a condition.
-      not exists(for.getCondition()) and condentry = first(for.getBody())
-    |
-      // From the entry point, which is the for statement itself, control goes to either the first init expression...
-      n.asStmt() = for and result = first(for.getInit(0)) and completion = NormalCompletion()
-      or
-      // ...or the condition if the for doesn't include init expressions.
-      n.asStmt() = for and
-      not exists(for.getAnInit()) and
-      result = condentry and
-      completion = NormalCompletion()
-      or
-      // Init expressions execute sequentially, after which control is transferred to the condition.
-      exists(int i | last(for.getInit(i), n, completion) and completion = NormalCompletion() |
-        result = first(for.getInit(i + 1))
-        or
-        not exists(for.getInit(i + 1)) and result = condentry
-      )
-      or
-      // The true-successor of the condition is the body of the for loop.
-      last(for.getCondition(), n, completion) and
-      completion = BooleanCompletion(true, _) and
-      result = first(for.getBody())
-      or
-      // The updates execute sequentially, after which control is transferred to the condition.
-      exists(int i | last(for.getUpdate(i), n, completion) and completion = NormalCompletion() |
-        result = first(for.getUpdate(i + 1))
-        or
-        not exists(for.getUpdate(i + 1)) and result = condentry
-      )
-      or
-      // The back edge of the loop: control goes to either the first update or the condition if no updates exist.
-      last(for.getBody(), n, completion) and
-      continues(completion, for) and
-      (
-        result = first(for.getUpdate(0))
-        or
-        result = condentry and not exists(for.getAnUpdate())
-      )
-    )
-    or
-    // Enhanced for statements:
-    exists(EnhancedForStmt for |
-      // First the expression gets evaluated...
-      n.asStmt() = for and result = first(for.getExpr()) and completion = NormalCompletion()
-      or
-      // ...then the variable gets assigned...
-      last(for.getExpr(), n, completion) and
-      completion = NormalCompletion() and
-      result.asExpr() = for.getVariable()
-      or
-      // ...and then control goes to the body of the loop.
-      n.asExpr() = for.getVariable() and
-      result = first(for.getBody()) and
-      completion = NormalCompletion()
-      or
-      // Finally, the back edge of the loop goes to reassign the variable.
-      last(for.getBody(), n, completion) and
-      continues(completion, for) and
-      result.asExpr() = for.getVariable()
-    )
-    or
-    // While loops start at the condition...
-    result = first(n.asStmt().(WhileStmt).getCondition()) and completion = NormalCompletion()
-    or
-    // ...and do-while loops start at the body.
-    result = first(n.asStmt().(DoStmt).getBody()) and completion = NormalCompletion()
-    or
-    exists(LoopStmt loop | loop instanceof WhileStmt or loop instanceof DoStmt |
-      // Control goes from the condition via a true-completion to the body...
-      last(loop.getCondition(), n, completion) and
-      completion = BooleanCompletion(true, _) and
-      result = first(loop.getBody())
-      or
-      // ...and through the back edge from the body back to the condition.
-      last(loop.getBody(), n, completion) and
-      continues(completion, loop) and
-      result = first(loop.getCondition())
-    )
-    or
-    // Resource declarations in a try-with-resources execute sequentially.
-    exists(TryStmt try, int i |
-      last(try.getResource(i), n, completion) and completion = NormalCompletion()
-    |
-      result = first(try.getResource(i + 1))
-      or
-      not exists(try.getResource(i + 1)) and result = first(try.getBlock())
-    )
-    or
-    // After the last resource declaration, control transfers to the body.
-    exists(TryStmt try | n.asStmt() = try and completion = NormalCompletion() |
-      result = first(try.getResource(0))
-      or
-      not exists(try.getAResource()) and result = first(try.getBlock())
-    )
-    or
-    // exceptional control flow
-    exists(TryStmt try | catchOrFinallyCompletion(try, n, completion) |
-      // if the body of the `try` throws...
-      exists(ThrowableType tt | completion = ThrowCompletion(tt) |
-        // ...control transfers to a catch clause...
-        result = first(handlingCatchClause(try, tt))
-        or
-        // ...or to the finally block
-        not mustCatch(try.getACatchClause(), tt) and result = first(try.getFinally())
-      )
-      or
-      // if the body completes normally, control transfers to the finally block
-      not completion = ThrowCompletion(_) and result = first(try.getFinally())
-    )
-    or
-    // after each catch clause, control transfers to the finally block
-    exists(TryStmt try | last(try.getACatchClause(), n, completion) |
-      result = first(try.getFinally())
-    )
-    or
-    // Catch clauses first assign their variable and then execute their block
-    exists(CatchClause cc | completion = NormalCompletion() |
-      n.asStmt() = cc and result = first(cc.getVariable())
-      or
-      last(cc.getVariable(), n, completion) and result = first(cc.getBlock())
-    )
-    or
-    // Switch statements and expressions
-    exists(SwitchBlock switch |
-      exists(Expr switchExpr |
-        switchExpr = switch.(SwitchStmt).getExpr() or switchExpr = switch.(SwitchExpr).getExpr()
-      |
-        // From the entry point control is transferred first to the expression...
-        n.getAstNode() = switch and
-        result = first(switchExpr) and
-        completion = NormalCompletion()
-        or
-        // ...and then to any case up to and including the first pattern case, if any.
-        last(switchExpr, n, completion) and
-        result = first(getAFirstSwitchCase(switch)) and
-        completion = NormalCompletion()
-      )
-      or
-      // Statements within a switch body execute sequentially.
-      // Note this includes non-rule case statements and the successful pattern match successor
-      // of a non-rule pattern case statement. Rule case statements do not complete normally
-      // (they always break or yield).
-      // Exception: falling through into a pattern case statement (which necessarily does not
-      // declare any named variables) must skip one or more such statements, otherwise we would
-      // incorrectly apply their type test and/or guard.
-      exists(Stmt pred, Stmt succ |
-        isNextNormalSwitchStmt(switch, pred, succ) and
-        last(pred, n, completion) and
-        result = first(succ) and
-        (completion = NormalCompletion() or completion = BooleanCompletion(true, _))
-      )
-      or
-      // A pattern case that completes boolean false (type test or guard failure) continues to consider other cases:
-      exists(PatternCase case | completion = BooleanCompletion(false, _) |
-        last(case, n, completion) and result.asStmt() = getASuccessorSwitchCase(case, switch)
-      )
-    )
-    or
-    // Pattern cases have internal edges:
-    // * Type test success -true-> one of the possible sets of variable declarations
-    //     n.b. for unnamed patterns (e.g. case A _, B _) this means that *one* of the
-    //          type tests has succeeded. There aren't enough nodes in the AST to describe
-    //          a sequential test in detail, so CFG consumers have to watch out for this case.
-    // * Variable declarations -normal-> guard evaluation
-    // * Variable declarations -normal-> rule execution (when there is no guard)
-    // * Guard success -true-> rule execution
-    exists(PatternCase pc |
-      n.asStmt() = pc and
-      completion = basicBooleanCompletion(true) and
-      result = first(pc.getAPattern())
-      or
-      last(pc.getAPattern(), n, completion) and
-      completion = NormalCompletion() and
-      result = first(pc.getGuard())
-      or
-      lastPatternCaseMatchingOp(pc, n, completion) and
-      (
-        result = first(pc.getRuleExpression())
-        or
-        result = first(pc.getRuleStatement())
-      )
-    )
-    or
-    // Non-pattern cases have an internal edge leading to their rule body if any when the case matches.
-    exists(SwitchCase case | n.asStmt() = case |
-      not case instanceof PatternCase and
-      completion = NormalCompletion() and
-      (
-        result = first(case.getRuleExpression())
-        or
-        result = first(case.getRuleStatement())
-      )
-    )
-    or
-    // Yield
-    exists(YieldStmt yield | completion = NormalCompletion() |
-      n.asStmt() = yield and result = first(yield.getValue())
+      n1.isAfter(assertstmt.getMessage()) and
+      n2.isAdditional(assertstmt, assertThrowNodeTag())
     )
     or
     // Synchronized statements execute their expression _before_ synchronization, so the CFG reflects that.
-    exists(SynchronizedStmt synch | completion = NormalCompletion() |
-      last(synch.getExpr(), n, completion) and result.asStmt() = synch
+    exists(SynchronizedStmt synch |
+      n1.isBefore(synch) and
+      n2.isBefore(synch.getExpr())
       or
-      n.asStmt() = synch and result = first(synch.getBlock())
+      n1.isAfter(synch.getExpr()) and
+      n2.isIn(synch)
+      or
+      n1.isIn(synch) and
+      n2.isBefore(synch.getBlock())
+      or
+      n1.isAfter(synch.getBlock()) and
+      n2.isAfter(synch)
     )
     or
-    result = first(n.asStmt().(ExprStmt).getExpr()) and completion = NormalCompletion()
-    or
-    result = first(n.asExpr().(StmtExpr).getStmt()) and completion = NormalCompletion()
-    or
-    result = first(n.asStmt().(LabeledStmt).getStmt()) and completion = NormalCompletion()
-    or
-    // Variable declarations in a variable declaration statement are executed sequentially.
-    exists(LocalVariableDeclStmt s | completion = NormalCompletion() |
-      n.asStmt() = s and result = first(s.getVariable(1))
-      or
-      exists(int i | last(s.getVariable(i), n, completion) and result = first(s.getVariable(i + 1)))
-    )
-    or
-    // Assert statements:
-    exists(AssertStmt assertstmt |
-      last(assertstmt.getExpr(), n, completion) and
-      completion = BooleanCompletion(true, _) and
-      result.asStmt() = assertstmt
-      or
-      last(assertstmt.getExpr(), n, completion) and
-      completion = BooleanCompletion(false, _) and
-      (
-        result = first(assertstmt.getMessage())
-        or
-        not exists(assertstmt.getMessage()) and
-        result.(AssertThrowNode).getAstNode() = assertstmt
-      )
-      or
-      last(assertstmt.getMessage(), n, completion) and
-      completion = NormalCompletion() and
-      result.(AssertThrowNode).getAstNode() = assertstmt
-    )
-    or
-    // When expressions:
     exists(WhenExpr whenexpr |
-      n.asExpr() = whenexpr and
-      result = first(whenexpr.getBranch(0)) and
-      completion = NormalCompletion()
+      n1.isBefore(whenexpr) and
+      n2.isBefore(whenexpr.getBranch(0))
       or
-      exists(int i |
-        last(whenexpr.getBranch(i), n, completion) and
-        completion = BooleanCompletion(false, _) and
-        result = first(whenexpr.getBranch(i + 1))
+      exists(int i, WhenBranch branch | branch = whenexpr.getBranch(i) |
+        // The `.isAfter(branch)` nodes are not needed, so they're simply skipped.
+        n1.isBefore(branch) and
+        n2.isBefore(branch.getCondition())
+        or
+        n1.isAfterTrue(branch.getCondition()) and
+        n2.isBefore(branch.getRhs())
+        or
+        n1.isAfterFalse(branch.getCondition()) and
+        (
+          n2.isBefore(whenexpr.getBranch(i + 1))
+          or
+          not exists(whenexpr.getBranch(i + 1)) and
+          n2.isAfter(whenexpr)
+        )
+        or
+        n1.isAfter(branch.getRhs()) and
+        n2.isAfter(whenexpr)
       )
     )
-    or
-    // When branches:
-    exists(WhenBranch whenbranch |
-      n.asStmt() = whenbranch and
-      completion = NormalCompletion() and
-      result = first(whenbranch.getCondition())
-      or
-      last(whenbranch.getCondition(), n, completion) and
-      completion = BooleanCompletion(true, _) and
-      result = first(whenbranch.getRhs())
-    )
-  }
-
-  /*
-   * Conditions give rise to nodes with two normal successors, a true successor
-   * and a false successor. At least one of them is completely contained in the
-   * AST node of the branching construct and is therefore tagged with the
-   * corresponding `booleanCompletion` in the `succ` relation (for example, the
-   * then-branch of an if-statement, or the right operand of a binary logic
-   * expression). The other successor may be tagged with either the corresponding
-   * `booleanCompletion` (for example in an if-statement with an else-branch or
-   * in a `ConditionalExpr`) or a `normalCompletion` (for example in an
-   * if-statement without an else-part).
-   *
-   * If the other successor ends a finally block it may also be tagged with an
-   * abnormal completion instead of a `normalCompletion`. This completion is
-   * calculated by the `resumption` predicate. In this case the successor might
-   * no longer be unique, as there can be multiple completions to be resumed
-   * after the finally block.
-   */
-
-  /**
-   * Gets the _resumption_ for cfg node `n`, that is, the completion according
-   * to which control flow is determined if `n` completes normally.
-   *
-   * In most cases, the resumption is simply the normal completion, except if
-   * `n` is the last node of a `finally` block, in which case it is the
-   * completion of any predecessors of the `finally` block as determined by
-   * predicate `finallyPred`, since their completion is resumed after normal
-   * completion of the `finally`.
-   */
-  private Completion resumption(Node n) {
-    exists(TryStmt try | lastInFinally(try, n) and finallyPred(try, _, result))
-    or
-    not lastInFinally(_, n) and result = NormalCompletion()
-  }
-
-  /**
-   * A true- or false-successor that is tagged with the corresponding `booleanCompletion`.
-   *
-   * That is, the `booleanCompletion` is the label of the edge in the CFG.
-   */
-  private Node mainBranchSucc(Node n, boolean b) { result = succ(n, BooleanCompletion(_, b)) }
-
-  /**
-   * A true- or false-successor that is not tagged with a `booleanCompletion`.
-   *
-   * That is, the label of the edge in the CFG is a `normalCompletion` or
-   * some other completion if `n` occurs as the last node in a finally block.
-   *
-   * In the latter case, when `n` occurs as the last node in a finally block, there might be
-   * multiple different such successors.
-   */
-  private Node otherBranchSucc(Node n, boolean b) {
-    exists(Node main | main = mainBranchSucc(n, b.booleanNot()) |
-      result = succ(n, resumption(n)) and
-      not result = main and
-      (b = true or b = false)
-    )
-  }
-
-  /** Gets a true- or false-successor of `n`. */
-  cached
-  Node branchSuccessor(Node n, boolean branch) {
-    result = mainBranchSucc(n, branch) or
-    result = otherBranchSucc(n, branch)
   }
 }
 
-private import ControlFlowGraphImpl
-
-/** A control-flow node that branches based on a condition. */
-class ConditionNode extends ControlFlow::Node {
-  ConditionNode() { exists(branchSuccessor(this, _)) }
+/** A control-flow node that branches based on a boolean condition. */
+class ConditionNode extends ControlFlowNode {
+  ConditionNode() { exists(this.getASuccessor(any(BooleanSuccessor t))) }
 
   /** Gets a true- or false-successor of the `ConditionNode`. */
-  ControlFlow::Node getABranchSuccessor(boolean branch) { result = branchSuccessor(this, branch) }
+  ControlFlowNode getABranchSuccessor(boolean branch) {
+    result = this.getASuccessor(any(BooleanSuccessor t | t.getValue() = branch))
+  }
 
   /** Gets a true-successor of the `ConditionNode`. */
-  ControlFlow::Node getATrueSuccessor() { result = this.getABranchSuccessor(true) }
+  ControlFlowNode getATrueSuccessor() { result = this.getABranchSuccessor(true) }
 
   /** Gets a false-successor of the `ConditionNode`. */
-  ControlFlow::Node getAFalseSuccessor() { result = this.getABranchSuccessor(false) }
+  ControlFlowNode getAFalseSuccessor() { result = this.getABranchSuccessor(false) }
 
   /** Gets the condition of this `ConditionNode`. */
   ExprParent getCondition() { result = this.asExpr() or result = this.asStmt() }
 }
-
-private import codeql.controlflow.PrintGraph as PrintGraph
-
-private module PrintGraphInput implements PrintGraph::InputSig<Location> {
-  private import java as J
-
-  class Callable = J::Callable;
-
-  class ControlFlowNode = J::ControlFlowNode;
-
-  ControlFlowNode getASuccessor(ControlFlowNode n, SuccessorType t) { result = n.getASuccessor(t) }
-}
-
-import PrintGraph::PrintGraph<Location, PrintGraphInput>
diff --git a/java/ql/lib/semmle/code/java/Expr.qll b/java/ql/lib/semmle/code/java/Expr.qll
index c609c35cd71..31135429e2d 100644
--- a/java/ql/lib/semmle/code/java/Expr.qll
+++ b/java/ql/lib/semmle/code/java/Expr.qll
@@ -392,7 +392,7 @@ class ArrayInit extends Expr, @arrayinit {
  * element assignments since there the assignment destination is not directly
  * the array variable but instead an `ArrayAccess`.
  */
-class Assignment extends Expr, @assignment {
+class Assignment extends BinaryExpr, @assignment {
   /** Gets the destination (left-hand side) of the assignment. */
   Expr getDest() { result.isNthChildOf(this, 0) }
 
@@ -417,6 +417,8 @@ class Assignment extends Expr, @assignment {
  * For example, `x = 23`.
  */
 class AssignExpr extends Assignment, @assignexpr {
+  override string getOp() { result = "=" }
+
   override string getAPrimaryQlClass() { result = "AssignExpr" }
 }
 
@@ -445,7 +447,7 @@ class AssignOp extends Assignment, @assignop {
   override Expr getSource() { result.getParent() = this }
 
   /** Gets a string representation of the assignment operator of this compound assignment. */
-  /*abstract*/ string getOp() { result = "??=" }
+  /*abstract*/ override string getOp() { result = "??=" }
 
   /** Gets a printable representation of this expression. */
   override string toString() { result = "..." + this.getOp() + "..." }
@@ -739,155 +741,155 @@ class BinaryExpr extends Expr, @binaryexpr {
   }
 
   /** Gets a printable representation of this expression. */
-  override string toString() { result = "..." + this.getOp() + "..." }
+  override string toString() { result = "... " + this.getOp() + " ..." }
 
   /** Gets a string representation of the operator of this binary expression. */
-  /*abstract*/ string getOp() { result = " ?? " }
+  /*abstract*/ string getOp() { result = "??" }
 }
 
 /** A binary expression using the `*` operator. */
 class MulExpr extends BinaryExpr, @mulexpr {
-  override string getOp() { result = " * " }
+  override string getOp() { result = "*" }
 
   override string getAPrimaryQlClass() { result = "MulExpr" }
 }
 
 /** A binary expression using the `/` operator. */
 class DivExpr extends BinaryExpr, @divexpr {
-  override string getOp() { result = " / " }
+  override string getOp() { result = "/" }
 
   override string getAPrimaryQlClass() { result = "DivExpr" }
 }
 
 /** A binary expression using the `%` operator. */
 class RemExpr extends BinaryExpr, @remexpr {
-  override string getOp() { result = " % " }
+  override string getOp() { result = "%" }
 
   override string getAPrimaryQlClass() { result = "RemExpr" }
 }
 
 /** A binary expression using the `+` operator. */
 class AddExpr extends BinaryExpr, @addexpr {
-  override string getOp() { result = " + " }
+  override string getOp() { result = "+" }
 
   override string getAPrimaryQlClass() { result = "AddExpr" }
 }
 
 /** A binary expression using the `-` operator. */
 class SubExpr extends BinaryExpr, @subexpr {
-  override string getOp() { result = " - " }
+  override string getOp() { result = "-" }
 
   override string getAPrimaryQlClass() { result = "SubExpr" }
 }
 
 /** A binary expression using the `<<` operator. */
 class LeftShiftExpr extends BinaryExpr, @lshiftexpr {
-  override string getOp() { result = " << " }
+  override string getOp() { result = "<<" }
 
   override string getAPrimaryQlClass() { result = "LeftShiftExpr" }
 }
 
 /** A binary expression using the `>>` operator. */
 class RightShiftExpr extends BinaryExpr, @rshiftexpr {
-  override string getOp() { result = " >> " }
+  override string getOp() { result = ">>" }
 
   override string getAPrimaryQlClass() { result = "RightShiftExpr" }
 }
 
 /** A binary expression using the `>>>` operator. */
 class UnsignedRightShiftExpr extends BinaryExpr, @urshiftexpr {
-  override string getOp() { result = " >>> " }
+  override string getOp() { result = ">>>" }
 
   override string getAPrimaryQlClass() { result = "UnsignedRightShiftExpr" }
 }
 
 /** A binary expression using the `&` operator. */
 class AndBitwiseExpr extends BinaryExpr, @andbitexpr {
-  override string getOp() { result = " & " }
+  override string getOp() { result = "&" }
 
   override string getAPrimaryQlClass() { result = "AndBitwiseExpr" }
 }
 
 /** A binary expression using the `|` operator. */
 class OrBitwiseExpr extends BinaryExpr, @orbitexpr {
-  override string getOp() { result = " | " }
+  override string getOp() { result = "|" }
 
   override string getAPrimaryQlClass() { result = "OrBitwiseExpr" }
 }
 
 /** A binary expression using the `^` operator. */
 class XorBitwiseExpr extends BinaryExpr, @xorbitexpr {
-  override string getOp() { result = " ^ " }
+  override string getOp() { result = "^" }
 
   override string getAPrimaryQlClass() { result = "XorBitwiseExpr" }
 }
 
 /** A binary expression using the `&&` operator. */
 class AndLogicalExpr extends BinaryExpr, @andlogicalexpr {
-  override string getOp() { result = " && " }
+  override string getOp() { result = "&&" }
 
   override string getAPrimaryQlClass() { result = "AndLogicalExpr" }
 }
 
 /** A binary expression using the `||` operator. */
 class OrLogicalExpr extends BinaryExpr, @orlogicalexpr {
-  override string getOp() { result = " || " }
+  override string getOp() { result = "||" }
 
   override string getAPrimaryQlClass() { result = "OrLogicalExpr" }
 }
 
 /** A binary expression using the `<` operator. */
 class LTExpr extends BinaryExpr, @ltexpr {
-  override string getOp() { result = " < " }
+  override string getOp() { result = "<" }
 
   override string getAPrimaryQlClass() { result = "LTExpr" }
 }
 
 /** A binary expression using the `>` operator. */
 class GTExpr extends BinaryExpr, @gtexpr {
-  override string getOp() { result = " > " }
+  override string getOp() { result = ">" }
 
   override string getAPrimaryQlClass() { result = "GTExpr" }
 }
 
 /** A binary expression using the `<=` operator. */
 class LEExpr extends BinaryExpr, @leexpr {
-  override string getOp() { result = " <= " }
+  override string getOp() { result = "<=" }
 
   override string getAPrimaryQlClass() { result = "LEExpr" }
 }
 
 /** A binary expression using the `>=` operator. */
 class GEExpr extends BinaryExpr, @geexpr {
-  override string getOp() { result = " >= " }
+  override string getOp() { result = ">=" }
 
   override string getAPrimaryQlClass() { result = "GEExpr" }
 }
 
 /** A binary expression using Java's `==` or Kotlin's `===` operator. */
 class EQExpr extends BinaryExpr, @eqexpr {
-  override string getOp() { result = " == " }
+  override string getOp() { result = "==" }
 
   override string getAPrimaryQlClass() { result = "EQExpr" }
 }
 
 /** A binary expression using the Kotlin `==` operator, semantically equivalent to `Objects.equals`. */
 class ValueEQExpr extends BinaryExpr, @valueeqexpr {
-  override string getOp() { result = " (value equals) " }
+  override string getOp() { result = "(value equals)" }
 
   override string getAPrimaryQlClass() { result = "ValueEQExpr" }
 }
 
 /** A binary expression using Java's `!=` or Kotlin's `!==` operator. */
 class NEExpr extends BinaryExpr, @neexpr {
-  override string getOp() { result = " != " }
+  override string getOp() { result = "!=" }
 
   override string getAPrimaryQlClass() { result = "NEExpr" }
 }
 
 /** A binary expression using the Kotlin `!=` operator, semantically equivalent to `Objects.equals`. */
 class ValueNEExpr extends BinaryExpr, @valueneexpr {
-  override string getOp() { result = " (value not-equals) " }
+  override string getOp() { result = "(value not-equals)" }
 
   override string getAPrimaryQlClass() { result = "ValueNEExpr" }
 }
@@ -1245,6 +1247,9 @@ class ClassInstanceExpr extends Expr, ConstructorCall, @classinstancexpr {
   /** Gets the immediately enclosing statement of this class instance creation expression. */
   override Stmt getEnclosingStmt() { result = Expr.super.getEnclosingStmt() }
 
+  /** Gets the `ControlFlowNode` corresponding to this call. */
+  override ControlFlowNode getControlFlowNode() { result = Expr.super.getControlFlowNode() }
+
   /** Gets a printable representation of this expression. */
   override string toString() {
     result = "new " + this.getConstructor().getName() + "(...)"
@@ -2113,6 +2118,9 @@ class MethodCall extends Expr, Call, @methodaccess {
   /** Gets the immediately enclosing statement that contains this method access. */
   override Stmt getEnclosingStmt() { result = Expr.super.getEnclosingStmt() }
 
+  /** Gets the `ControlFlowNode` corresponding to this call. */
+  override ControlFlowNode getControlFlowNode() { result = Expr.super.getControlFlowNode() }
+
   /** Gets a printable representation of this expression. */
   override string toString() {
     if exists(this.getMethod())
@@ -2305,6 +2313,9 @@ class Call extends ExprParent, @caller {
   /** Gets the enclosing statement of this call. */
   /*abstract*/ Stmt getEnclosingStmt() { none() }
 
+  /** Gets the `ControlFlowNode` corresponding to this call. */
+  /*abstract*/ ControlFlowNode getControlFlowNode() { none() }
+
   /** Gets the number of arguments provided in this call. */
   int getNumArgument() { count(this.getAnArgument()) = result }
 
diff --git a/java/ql/lib/semmle/code/java/PrettyPrintAst.qll b/java/ql/lib/semmle/code/java/PrettyPrintAst.qll
index 59a59cd9cdd..52374e6e384 100644
--- a/java/ql/lib/semmle/code/java/PrettyPrintAst.qll
+++ b/java/ql/lib/semmle/code/java/PrettyPrintAst.qll
@@ -207,29 +207,12 @@ private class PpArrayInit extends PpAst, ArrayInit {
   override PpAst getChild(int i) { exists(int j | result = this.getInit(j) and i = 1 + 2 * j) }
 }
 
-private class PpAssignment extends PpAst, Assignment {
-  override string getPart(int i) {
-    i = 1 and
-    this instanceof AssignExpr and
-    result = " = "
-    or
-    i = 1 and
-    result = " " + this.(AssignOp).getOp() + " "
-  }
-
-  override PpAst getChild(int i) {
-    i = 0 and result = this.getDest()
-    or
-    i = 2 and result = this.getRhs()
-  }
-}
-
 private class PpLiteral extends PpAst, Literal {
   override string getPart(int i) { i = 0 and result = this.getLiteral() }
 }
 
 private class PpBinaryExpr extends PpAst, BinaryExpr {
-  override string getPart(int i) { i = 1 and result = this.getOp() }
+  override string getPart(int i) { i = 1 and result = " " + this.getOp() + " " }
 
   override PpAst getChild(int i) {
     i = 0 and result = this.getLeftOperand()
diff --git a/java/ql/lib/semmle/code/java/Statement.qll b/java/ql/lib/semmle/code/java/Statement.qll
index 4366334dfbd..e2c7779b43c 100644
--- a/java/ql/lib/semmle/code/java/Statement.qll
+++ b/java/ql/lib/semmle/code/java/Statement.qll
@@ -61,7 +61,7 @@ class Stmt extends StmtParent, ExprParent, @stmt {
 }
 
 /** A statement parent is any element that can have a statement as its child. */
-class StmtParent extends @stmtparent, Top { }
+class StmtParent extends @stmtparent, ExprParent { }
 
 /**
  * An error statement.
@@ -960,6 +960,9 @@ class ThisConstructorInvocationStmt extends Stmt, ConstructorCall, @constructori
   /** Gets the immediately enclosing statement of this constructor invocation. */
   override Stmt getEnclosingStmt() { result = this }
 
+  /** Gets the `ControlFlowNode` corresponding to this call. */
+  override ControlFlowNode getControlFlowNode() { result = Stmt.super.getControlFlowNode() }
+
   override string pp() { result = "this(...)" }
 
   override string toString() { result = "this(...)" }
@@ -1001,6 +1004,9 @@ class SuperConstructorInvocationStmt extends Stmt, ConstructorCall, @superconstr
   /** Gets the immediately enclosing statement of this constructor invocation. */
   override Stmt getEnclosingStmt() { result = this }
 
+  /** Gets the `ControlFlowNode` corresponding to this call. */
+  override ControlFlowNode getControlFlowNode() { result = Stmt.super.getControlFlowNode() }
+
   override string pp() { result = "super(...)" }
 
   override string toString() { result = "super(...)" }
diff --git a/java/ql/lib/semmle/code/java/arithmetic/Overflow.qll b/java/ql/lib/semmle/code/java/arithmetic/Overflow.qll
index e82192b0fba..2cc3f8f0ad2 100644
--- a/java/ql/lib/semmle/code/java/arithmetic/Overflow.qll
+++ b/java/ql/lib/semmle/code/java/arithmetic/Overflow.qll
@@ -93,8 +93,7 @@ class ArithExpr extends Expr {
     ) and
     forall(Expr e |
       e = this.(BinaryExpr).getAnOperand() or
-      e = this.(UnaryAssignExpr).getOperand() or
-      e = this.(AssignOp).getSource()
+      e = this.(UnaryAssignExpr).getOperand()
     |
       e.getType() instanceof NumType
     )
@@ -114,21 +113,17 @@ class ArithExpr extends Expr {
    */
   Expr getLeftOperand() {
     result = this.(BinaryExpr).getLeftOperand() or
-    result = this.(UnaryAssignExpr).getOperand() or
-    result = this.(AssignOp).getDest()
+    result = this.(UnaryAssignExpr).getOperand()
   }
 
   /**
    * Gets the right-hand operand if this is a binary expression.
    */
-  Expr getRightOperand() {
-    result = this.(BinaryExpr).getRightOperand() or result = this.(AssignOp).getRhs()
-  }
+  Expr getRightOperand() { result = this.(BinaryExpr).getRightOperand() }
 
   /** Gets an operand of this arithmetic expression. */
   Expr getAnOperand() {
     result = this.(BinaryExpr).getAnOperand() or
-    result = this.(UnaryAssignExpr).getOperand() or
-    result = this.(AssignOp).getSource()
+    result = this.(UnaryAssignExpr).getOperand()
   }
 }
diff --git a/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll b/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll
index f214cbbd0b1..a5229bea590 100644
--- a/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll
+++ b/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll
@@ -6,151 +6,8 @@ module;
 
 import java
 import Dominance
-private import codeql.controlflow.BasicBlock as BB
-private import codeql.controlflow.SuccessorType
-
-private module Input implements BB::InputSig<Location> {
-  /** Hold if `t` represents a conditional successor type. */
-  predicate successorTypeIsCondition(SuccessorType t) { none() }
-
-  /** A delineated part of the AST with its own CFG. */
-  class CfgScope = Callable;
-
-  /** The class of control flow nodes. */
-  class Node = ControlFlowNode;
-
-  /** Gets the CFG scope in which this node occurs. */
-  CfgScope nodeGetCfgScope(Node node) { node.getEnclosingCallable() = result }
-
-  /** Gets an immediate successor of this node. */
-  Node nodeGetASuccessor(Node node, SuccessorType t) { result = node.getASuccessor(t) }
-
-  /**
-   * Holds if `node` represents an entry node to be used when calculating
-   * dominance.
-   */
-  predicate nodeIsDominanceEntry(Node node) {
-    exists(Stmt entrystmt | entrystmt = node.asStmt() |
-      exists(Callable c | entrystmt = c.getBody())
-      or
-      // This disjunct is technically superfluous, but safeguards against extractor problems.
-      entrystmt instanceof BlockStmt and
-      not exists(entrystmt.getEnclosingCallable()) and
-      not entrystmt.getParent() instanceof Stmt
-    )
-  }
-
-  /**
-   * Holds if `node` represents an exit node to be used when calculating
-   * post dominance.
-   */
-  predicate nodeIsPostDominanceExit(Node node) { node instanceof ControlFlow::NormalExitNode }
-}
-
-private module BbImpl = BB::Make<Location, Input>;
-
-import BbImpl
-
-/** Holds if the dominance relation is calculated for `bb`. */
-predicate hasDominanceInformation(BasicBlock bb) {
-  exists(BasicBlock entry |
-    Input::nodeIsDominanceEntry(entry.getFirstNode()) and entry.getASuccessor*() = bb
-  )
-}
-
-/**
- * A basic block, that is, a maximal straight-line sequence of control flow nodes
- * without branches or joins.
- */
-class BasicBlock extends BbImpl::BasicBlock {
-  /** Gets the immediately enclosing callable whose body contains this node. */
-  Callable getEnclosingCallable() { result = this.getScope() }
-
-  /**
-   * 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) { super.dominates(bb) }
-
-  /**
-   * 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) { super.strictlyDominates(bb) }
-
-  /** Gets an immediate successor of this basic block of a given type, if any. */
-  BasicBlock getASuccessor(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.
-   *
-   * Gets an immediate successor of this basic block.
-   */
-  deprecated BasicBlock getABBSuccessor() { result = this.getASuccessor() }
-
-  /**
-   * DEPRECATED: Use `getAPredecessor` instead.
-   *
-   * Gets an immediate predecessor of this basic block.
-   */
-  deprecated BasicBlock getABBPredecessor() { result.getASuccessor() = this }
-
-  /**
-   * DEPRECATED: Use `strictlyDominates` instead.
-   *
-   * Holds if this basic block strictly dominates `node`.
-   */
-  deprecated predicate bbStrictlyDominates(BasicBlock node) { this.strictlyDominates(node) }
-
-  /**
-   * DEPRECATED: Use `dominates` instead.
-   *
-   * Holds if this basic block dominates `node`. (This is reflexive.)
-   */
-  deprecated predicate bbDominates(BasicBlock node) { this.dominates(node) }
-
-  /**
-   * DEPRECATED: Use `strictlyPostDominates` instead.
-   *
-   * Holds if this basic block strictly post-dominates `node`.
-   */
-  deprecated predicate bbStrictlyPostDominates(BasicBlock node) { this.strictlyPostDominates(node) }
-
-  /**
-   * DEPRECATED: Use `postDominates` instead.
-   *
-   * Holds if this basic block post-dominates `node`. (This is reflexive.)
-   */
-  deprecated predicate bbPostDominates(BasicBlock node) { this.postDominates(node) }
-}
 
 /** A basic block that ends in an exit node. */
 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 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 49cd0d18941..23088bd2f80 100644
--- a/java/ql/lib/semmle/code/java/controlflow/Guards.qll
+++ b/java/ql/lib/semmle/code/java/controlflow/Guards.qll
@@ -10,6 +10,7 @@ private import semmle.code.java.controlflow.Dominance
 private import semmle.code.java.controlflow.internal.Preconditions
 private import semmle.code.java.controlflow.internal.SwitchCases
 private import codeql.controlflow.Guards as SharedGuards
+private import codeql.controlflow.SuccessorType
 
 /**
  * A basic block that terminates in a condition, splitting the subsequent control flow.
@@ -75,70 +76,6 @@ class ConditionBlock extends BasicBlock {
   }
 }
 
-// Join order engineering -- first determine the switch block and the case indices required, then retrieve them.
-bindingset[switch, i]
-pragma[inline_late]
-private predicate isNthCaseOf(SwitchBlock switch, SwitchCase c, int i) { c.isNthCaseOf(switch, i) }
-
-/**
- * Gets a switch case >= pred, up to but not including `pred`'s successor pattern case,
- * where `pred` is declared on `switch`.
- */
-private SwitchCase getACaseUpToNextPattern(PatternCase pred, SwitchBlock switch) {
-  // Note we do include `case null, default` (as well as plain old `default`) here.
-  not result.(ConstCase).getValue(_) instanceof NullLiteral and
-  exists(int maxCaseIndex |
-    switch = pred.getParent() and
-    if exists(getNextPatternCase(pred))
-    then maxCaseIndex = getNextPatternCase(pred).getCaseIndex() - 1
-    else maxCaseIndex = lastCaseIndex(switch)
-  |
-    isNthCaseOf(switch, result, [pred.getCaseIndex() .. maxCaseIndex])
-  )
-}
-
-/**
- * Gets the closest pattern case preceding `case`, including `case` itself, if any.
- */
-private PatternCase getClosestPrecedingPatternCase(SwitchCase case) {
-  case = getACaseUpToNextPattern(result, _)
-}
-
-/**
- * Holds if `pred` is a control-flow predecessor of switch case `sc` that is not a
- * fall-through from a previous case.
- *
- * For classic switches that means flow from the selector expression; for switches
- * involving pattern cases it can also mean flow from a previous pattern case's type
- * test or guard failing and proceeding to then consider subsequent cases.
- */
-private predicate isNonFallThroughPredecessor(SwitchCase sc, ControlFlowNode pred) {
-  pred = sc.getControlFlowNode().getAPredecessor() and
-  (
-    pred.asExpr().getParent*() = sc.getSelectorExpr()
-    or
-    // Ambiguous: in the case of `case String _ when x: case "SomeConstant":`, the guard `x`
-    // passing edge will fall through into the constant case, and the guard failing edge
-    // will test if the selector equals `"SomeConstant"` and if so branch to the same
-    // case statement. Therefore don't label this a non-fall-through predecessor.
-    exists(PatternCase previousPatternCase |
-      previousPatternCase = getClosestPrecedingPatternCase(sc)
-    |
-      pred.asExpr().getParent*() = previousPatternCase.getGuard() and
-      // Check there is any statement in between the previous pattern case and this one,
-      // or the case is a rule, so there is no chance of a fall-through.
-      (
-        previousPatternCase.isRule() or
-        not previousPatternCase.getIndex() = sc.getIndex() - 1
-      )
-    )
-    or
-    // Unambigious: on the test-passing edge there must be at least one intervening
-    // declaration node, including anonymous `_` declarations.
-    pred.asStmt() = getClosestPrecedingPatternCase(sc)
-  )
-}
-
 private module GuardsInput implements SharedGuards::InputSig<Location, ControlFlowNode, BasicBlock> {
   private import java as J
   private import semmle.code.java.dataflow.internal.BaseSSA as Base
@@ -231,39 +168,18 @@ private module GuardsInput implements SharedGuards::InputSig<Location, ControlFl
       )
     }
 
-    private predicate hasPatternCaseMatchEdge(BasicBlock bb1, BasicBlock bb2, boolean isMatch) {
-      exists(ConditionNode patterncase |
-        this instanceof PatternCase and
-        patterncase = super.getControlFlowNode() and
-        bb1.getLastNode() = patterncase and
-        bb2.getFirstNode() = patterncase.getABranchSuccessor(isMatch)
-      )
-    }
-
     predicate matchEdge(BasicBlock bb1, BasicBlock bb2) {
-      exists(ControlFlowNode pred |
-        // Pattern cases are handled as ConditionBlocks.
-        not this instanceof PatternCase and
-        bb2.getFirstNode() = super.getControlFlowNode() and
-        isNonFallThroughPredecessor(this, pred) and
-        bb1 = pred.getBasicBlock()
-      )
-      or
-      this.hasPatternCaseMatchEdge(bb1, bb2, true)
+      bb1.getASuccessor(any(MatchingSuccessor s | s.getValue() = true)) = bb2 and
+      bb1.getLastNode() = super.getControlFlowNode()
     }
 
     predicate nonMatchEdge(BasicBlock bb1, BasicBlock bb2) {
-      this.hasPatternCaseMatchEdge(bb1, bb2, false)
+      bb1.getASuccessor(any(MatchingSuccessor s | s.getValue() = false)) = bb2 and
+      bb1.getLastNode() = super.getControlFlowNode()
     }
   }
 
-  abstract private class BinExpr extends Expr {
-    Expr getAnOperand() {
-      result = this.(BinaryExpr).getAnOperand() or result = this.(AssignOp).getSource()
-    }
-  }
-
-  class AndExpr extends BinExpr {
+  class AndExpr extends BinaryExpr {
     AndExpr() {
       this instanceof AndBitwiseExpr or
       this instanceof AndLogicalExpr or
@@ -271,7 +187,7 @@ private module GuardsInput implements SharedGuards::InputSig<Location, ControlFl
     }
   }
 
-  class OrExpr extends BinExpr {
+  class OrExpr extends BinaryExpr {
     OrExpr() {
       this instanceof OrBitwiseExpr or
       this instanceof OrLogicalExpr or
diff --git a/java/ql/lib/semmle/code/java/controlflow/Paths.qll b/java/ql/lib/semmle/code/java/controlflow/Paths.qll
index abc56e32b5c..7cd4380a4c5 100644
--- a/java/ql/lib/semmle/code/java/controlflow/Paths.qll
+++ b/java/ql/lib/semmle/code/java/controlflow/Paths.qll
@@ -34,7 +34,7 @@ abstract class ActionConfiguration extends string {
 private BasicBlock actionBlock(ActionConfiguration conf) {
   exists(ControlFlowNode node | result = node.getBasicBlock() |
     conf.isAction(node) or
-    callAlwaysPerformsAction(node.asCall(), conf)
+    callAlwaysPerformsAction(any(Call call | call.getControlFlowNode() = node), conf)
   )
 }
 
@@ -66,10 +66,6 @@ private class JoinBlock extends BasicBlock {
   JoinBlock() { 2 <= strictcount(this.getAPredecessor()) }
 }
 
-private class ReachableBlock extends BasicBlock {
-  ReachableBlock() { hasDominanceInformation(this) }
-}
-
 /**
  * Holds if `bb` is a block that is collectively dominated by a set of one or
  * more actions that individually does not dominate the exit.
@@ -78,7 +74,7 @@ private predicate postActionBlock(BasicBlock bb, ActionConfiguration conf) {
   bb = nonDominatingActionBlock(conf)
   or
   if bb instanceof JoinBlock
-  then forall(ReachableBlock pred | pred = bb.getAPredecessor() | postActionBlock(pred, conf))
+  then forall(BasicBlock pred | pred = bb.getAPredecessor() | postActionBlock(pred, conf))
   else postActionBlock(bb.getAPredecessor(), conf)
 }
 
diff --git a/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll b/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
index 70c03f6fce4..1536c81aa08 100644
--- a/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
@@ -367,12 +367,24 @@ module ModelValidation {
     )
   }
 
+  private string getIncorrectConstructorSummaryOutput() {
+    exists(string namespace, string type, string name, string output |
+      summaryModel(namespace, type, _, name, _, _, _, output, _, _, _)
+    |
+      type = name and
+      output.matches("ReturnValue%") and
+      result =
+        "Constructor model for " + namespace + "." + type +
+          " should use `Argument[this]` in the output, not `ReturnValue`."
+    )
+  }
+
   /** Holds if some row in a MaD flow model appears to contain typos. */
   query predicate invalidModelRow(string msg) {
     msg =
       [
         getInvalidModelSignature(), getInvalidModelInput(), getInvalidModelOutput(),
-        KindVal::getInvalidModelKind()
+        getIncorrectConstructorSummaryOutput(), KindVal::getInvalidModelKind()
       ]
   }
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/InstanceAccess.qll b/java/ql/lib/semmle/code/java/dataflow/InstanceAccess.qll
index feeb0d100c6..60ed5591a95 100644
--- a/java/ql/lib/semmle/code/java/dataflow/InstanceAccess.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/InstanceAccess.qll
@@ -229,7 +229,7 @@ class InstanceAccessExt extends TInstanceAccessExt {
   /** Gets the control flow node associated with this instance access. */
   ControlFlowNode getCfgNode() {
     exists(ExprParent e | e = this.getAssociatedExprOrStmt() |
-      result.asCall() = e
+      result = e.(Call).getControlFlowNode()
       or
       e.(InstanceAccess).getControlFlowNode() = result
       or
diff --git a/java/ql/lib/semmle/code/java/dataflow/Nullness.qll b/java/ql/lib/semmle/code/java/dataflow/Nullness.qll
index ac568be7b91..99ca17162dd 100644
--- a/java/ql/lib/semmle/code/java/dataflow/Nullness.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/Nullness.qll
@@ -17,6 +17,7 @@ private import NullGuards
 private import semmle.code.java.Collections
 private import semmle.code.java.controlflow.internal.Preconditions
 private import semmle.code.java.controlflow.ControlFlowReachability
+private import codeql.controlflow.SuccessorType
 
 /** Gets an expression that may be `null`. */
 Expr nullExpr() { result = nullExpr(_) }
@@ -52,8 +53,6 @@ private predicate unboxed(Expr e) {
       assign.getDest().getType() instanceof PrimitiveType and assign.getSource() = e
     )
     or
-    exists(AssignOp assign | assign.getSource() = e and assign.getType() instanceof PrimitiveType)
-    or
     exists(EqualityTest eq |
       eq.getAnOperand() = e and eq.getAnOperand().getType() instanceof PrimitiveType
     )
@@ -61,6 +60,7 @@ private predicate unboxed(Expr e) {
     exists(BinaryExpr bin |
       bin.getAnOperand() = e and
       not bin instanceof EqualityTest and
+      not bin instanceof AssignExpr and
       bin.getType() instanceof PrimitiveType
     )
     or
@@ -230,14 +230,8 @@ private Expr nonEmptyExpr() {
 
 /** The control flow edge that exits an enhanced for loop if the `Iterable` is empty. */
 private predicate enhancedForEarlyExit(EnhancedForStmt for, ControlFlowNode n1, ControlFlowNode n2) {
-  exists(Expr forExpr |
-    n1.getANormalSuccessor() = n2 and
-    for.getExpr() = forExpr and
-    forExpr.getAChildExpr*() = n1.asExpr() and
-    not forExpr.getAChildExpr*() = n2.asExpr() and
-    n1.getANormalSuccessor().asExpr() = for.getVariable() and
-    not n2.asExpr() = for.getVariable()
-  )
+  n1.getASuccessor(any(EmptinessSuccessor t | t.isEmpty())) = n2 and
+  for.getExpr().getControlFlowNode() = n1
 }
 
 /** A control flow edge that cannot be taken. */
diff --git a/java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll b/java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll
index 0bca03f8118..75aa3bdbf31 100644
--- a/java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/RangeAnalysis.qll
@@ -86,23 +86,7 @@ module Sem implements Semantic<Location> {
 
   class ConstantIntegerExpr = RU::ConstantIntegerExpr;
 
-  abstract class BinaryExpr extends Expr {
-    Expr getLeftOperand() {
-      result = this.(J::BinaryExpr).getLeftOperand() or result = this.(J::AssignOp).getDest()
-    }
-
-    Expr getRightOperand() {
-      result = this.(J::BinaryExpr).getRightOperand() or result = this.(J::AssignOp).getRhs()
-    }
-
-    final Expr getAnOperand() { result = this.getLeftOperand() or result = this.getRightOperand() }
-
-    final predicate hasOperands(Expr e1, Expr e2) {
-      this.getLeftOperand() = e1 and this.getRightOperand() = e2
-      or
-      this.getLeftOperand() = e2 and this.getRightOperand() = e1
-    }
-  }
+  class BinaryExpr = J::BinaryExpr;
 
   class AddExpr extends BinaryExpr {
     AddExpr() { this instanceof J::AddExpr or this instanceof J::AssignAddExpr }
@@ -220,6 +204,8 @@ module Sem implements Semantic<Location> {
 
   int getBlockId1(BasicBlock bb) { idOf(bb, result) }
 
+  string getBlockId2(BasicBlock bb) { bb.getFirstNode().getIdTag() = result }
+
   class Guard extends G::Guards_v2::Guard {
     Expr asExpr() { result = this }
   }
diff --git a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
index 9aca7fad2f2..2c04a6413eb 100644
--- a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
@@ -326,20 +326,45 @@ private module Input implements TypeFlowInput<Location> {
     )
   }
 
-  /**
-   * Holds if `ioe` checks `v`, its true-successor is `bb`, and `bb` has multiple
-   * predecessors.
-   */
-  private predicate instanceofDisjunct(InstanceOfExpr ioe, BasicBlock bb, Base::SsaDefinition v) {
+  /** Holds if `ioe` checks `v` and its true-successor is `bb`. */
+  private predicate instanceofTrueSuccessor(InstanceOfExpr ioe, BasicBlock bb, Base::SsaDefinition v) {
     ioe.getExpr() = v.getARead() and
-    strictcount(bb.getAPredecessor()) > 1 and
     exists(ConditionBlock cb | cb.getCondition() = ioe and cb.getTestSuccessor(true) = bb)
   }
 
-  /** Holds if `bb` is disjunctively guarded by multiple `instanceof` tests on `v`. */
-  private predicate instanceofDisjunction(BasicBlock bb, Base::SsaDefinition v) {
-    strictcount(InstanceOfExpr ioe | instanceofDisjunct(ioe, bb, v)) =
-      strictcount(bb.getAPredecessor())
+  /**
+   * Holds if `bb` is disjunctively guarded by one (`trivial = true`) or more
+   * (`trivial = false`) `instanceof` tests on `v`.
+   */
+  private predicate instanceofDisjunction(BasicBlock bb, Base::SsaDefinition v, boolean trivial) {
+    exists(int preds |
+      strictcount(bb.getAPredecessor()) = preds and
+      strictcount(InstanceOfExpr ioe | instanceofTrueSuccessor(ioe, bb, v)) = preds and
+      if preds > 1 then trivial = false else trivial = true
+    )
+    or
+    strictcount(bb.getAPredecessor()) = 2 and
+    exists(BasicBlock pred1, BasicBlock pred2 |
+      pred1 != pred2 and
+      pred1 = bb.getAPredecessor() and
+      pred2 = bb.getAPredecessor() and
+      instanceofDisjunction(pred1, v, _) and
+      instanceofDisjunction(pred2, v, _) and
+      trivial = false
+    )
+  }
+
+  /**
+   * Holds if `bb` is disjunctively guarded by one or more `instanceof` tests
+   * on `v`, and `ioe` is one of those tests.
+   */
+  private predicate instanceofDisjunct(InstanceOfExpr ioe, BasicBlock bb, Base::SsaDefinition v) {
+    instanceofDisjunction(bb, v, _) and
+    (
+      instanceofTrueSuccessor(ioe, bb, v)
+      or
+      exists(BasicBlock pred | pred = bb.getAPredecessor() and instanceofDisjunct(ioe, pred, v))
+    )
   }
 
   /**
@@ -348,7 +373,7 @@ private module Input implements TypeFlowInput<Location> {
    */
   predicate instanceofDisjunctionGuarded(TypeFlowNode n, RefType t) {
     exists(BasicBlock bb, InstanceOfExpr ioe, Base::SsaDefinition v, VarAccess va |
-      instanceofDisjunction(bb, v) and
+      instanceofDisjunction(bb, v, false) and
       bb.dominates(va.getBasicBlock()) and
       va = v.getARead() and
       instanceofDisjunct(ioe, bb, v) and
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 5e3a8550e3c..07d871ab9bc 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
@@ -93,8 +93,7 @@ private module BaseSsaImpl {
   /** Holds if `n` updates the local variable `v`. */
   predicate variableUpdate(BaseSsaSourceVariable v, ControlFlowNode n, BasicBlock b, int i) {
     exists(VariableUpdate a | a.getControlFlowNode() = n | getDestVar(a) = v) and
-    b.getNode(i) = n and
-    hasDominanceInformation(b)
+    b.getNode(i) = n
   }
 
   /** Gets the definition point of a nested class in the parent scope. */
@@ -132,7 +131,7 @@ private module BaseSsaImpl {
       inner != outer and
       inner.getDeclaringType() = innerclass and
       result = parentDef(desugaredGetEnclosingType*(innerclass)) and
-      result.getEnclosingStmt().getEnclosingCallable() = outer and
+      result.getEnclosingCallable() = outer and
       capturedvar = TLocalVar(outer, v) and
       closurevar = TLocalVar(inner, v)
     )
@@ -178,15 +177,12 @@ private module SsaImplInput implements SsaImplCommon::InputSig<Location, BasicBl
    * Holds if the `i`th of basic block `bb` reads source variable `v`.
    */
   predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
-    hasDominanceInformation(bb) and
-    (
-      exists(VarRead use |
-        v.getAnAccess() = use and bb.getNode(i) = use.getControlFlowNode() and certain = true
-      )
-      or
-      variableCapture(v, _, bb, i) and
-      certain = false
+    exists(VarRead use |
+      v.getAnAccess() = use and bb.getNode(i) = use.getControlFlowNode() and certain = true
     )
+    or
+    variableCapture(v, _, bb, i) and
+    certain = false
   }
 }
 
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 409cf586363..019b507586f 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
@@ -115,7 +115,7 @@ private ControlFlowNode captureNode(TrackedVar capturedvar, TrackedVar closureva
     inner != outer and
     inner.getDeclaringType() = innerclass and
     result = parentDef(desugaredGetEnclosingType*(innerclass)) and
-    result.getEnclosingStmt().getEnclosingCallable() = outer and
+    result.getEnclosingCallable() = outer and
     capturedvar = TLocalVar(outer, v) and
     closurevar = TLocalVar(inner, v)
   )
@@ -130,8 +130,7 @@ private predicate variableCapture(TrackedVar capturedvar, TrackedVar closurevar,
 pragma[nomagic]
 private predicate certainVariableUpdate(TrackedVar v, ControlFlowNode n, BasicBlock b, int i) {
   exists(VariableUpdate a | a.getControlFlowNode() = n | getDestVar(a) = v) and
-  b.getNode(i) = n and
-  hasDominanceInformation(b)
+  b.getNode(i) = n
   or
   certainVariableUpdate(v.getQualifier(), n, b, i)
 }
@@ -153,9 +152,8 @@ private predicate hasEntryDef(TrackedVar v, BasicBlock b) {
 overlay[global]
 pragma[nomagic]
 private predicate uncertainVariableUpdateImpl(TrackedVar v, ControlFlowNode n, BasicBlock b, int i) {
-  exists(Call c | c = n.asCall() | updatesNamedField(c, v, _)) and
-  b.getNode(i) = n and
-  hasDominanceInformation(b)
+  exists(Call c | c.getControlFlowNode() = n | updatesNamedField(c, v, _)) and
+  b.getNode(i) = n
   or
   uncertainVariableUpdateImpl(v.getQualifier(), n, b, i)
 }
@@ -191,18 +189,15 @@ private module SsaImplInput implements SsaImplCommon::InputSig<Location, BasicBl
    * This includes implicit reads via calls.
    */
   predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
-    hasDominanceInformation(bb) and
-    (
-      exists(VarRead use |
-        v instanceof TrackedVar and
-        v.getAnAccess() = use and
-        bb.getNode(i) = use.getControlFlowNode() and
-        certain = true
-      )
-      or
-      variableCapture(v, _, bb, i) and
-      certain = false
+    exists(VarRead use |
+      v instanceof TrackedVar and
+      v.getAnAccess() = use and
+      bb.getNode(i) = use.getControlFlowNode() and
+      certain = true
     )
+    or
+    variableCapture(v, _, bb, i) and
+    certain = false
   }
 }
 
@@ -525,8 +520,11 @@ private module Cached {
   overlay[global]
   cached
   predicate defUpdatesNamedField(SsaImplicitWrite calldef, TrackedField f, Callable setter) {
-    f = calldef.getSourceVariable() and
-    updatesNamedField0(calldef.getControlFlowNode().asCall(), f, setter)
+    exists(Call call |
+      f = calldef.getSourceVariable() and
+      call.getControlFlowNode() = calldef.getControlFlowNode() and
+      updatesNamedField0(call, f, setter)
+    )
   }
 
   /** Holds if `init` is a closure variable that captures the value of `capturedvar`. */
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
index e4525ed36ea..a10cca653ce 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
@@ -161,13 +161,9 @@ module Private {
       this instanceof J::AssignUnsignedRightShiftExpr and result = TUnsignedRightShiftOp()
     }
 
-    Expr getLeftOperand() {
-      result = this.(J::BinaryExpr).getLeftOperand() or result = this.(J::AssignOp).getDest()
-    }
+    Expr getLeftOperand() { result = this.(J::BinaryExpr).getLeftOperand() }
 
-    Expr getRightOperand() {
-      result = this.(J::BinaryExpr).getRightOperand() or result = this.(J::AssignOp).getRhs()
-    }
+    Expr getRightOperand() { result = this.(J::BinaryExpr).getRightOperand() }
   }
 
   predicate ssaRead = RU::ssaRead/2;
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionSpecific.qll b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionSpecific.qll
index f826f192dca..9375c859f14 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionSpecific.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionSpecific.qll
@@ -23,7 +23,9 @@ private predicate idOfAst(BB::ExprParent x, int y) = equivalenceRelation(id/2)(x
 
 private predicate idOf(BasicBlock x, int y) { idOfAst(x.getFirstNode().getAstNode(), y) }
 
-private int getId(BasicBlock bb) { idOf(bb, result) }
+private int getId1(BasicBlock bb) { idOf(bb, result) }
+
+private string getId2(BasicBlock bb) { bb.getFirstNode().getIdTag() = result }
 
 /**
  * Declarations to be exposed to users of SsaReadPositionCommon
@@ -39,7 +41,7 @@ module Public {
       rank[r](SsaReadPositionPhiInputEdge e |
         e.phiInput(phi, _)
       |
-        e order by getId(e.getOrigBlock())
+        e order by getId1(e.getOrigBlock()), getId2(e.getOrigBlock())
       )
   }
 }
diff --git a/java/ql/lib/semmle/code/java/metrics/MetricCallable.qll b/java/ql/lib/semmle/code/java/metrics/MetricCallable.qll
index e6fa5d9e5c2..55753cc7bc8 100644
--- a/java/ql/lib/semmle/code/java/metrics/MetricCallable.qll
+++ b/java/ql/lib/semmle/code/java/metrics/MetricCallable.qll
@@ -71,18 +71,28 @@ class MetricCallable extends Callable {
   }
 }
 
+private predicate fallthroughSwitchCase(SwitchCase sc1, SwitchCase sc2) {
+  exists(SwitchStmt switch, int n | switch.getStmt(n) = sc1 and switch.getStmt(n + 1) = sc2)
+  or
+  exists(SwitchExpr switch, int n | switch.getStmt(n) = sc1 and switch.getStmt(n + 1) = sc2)
+}
+
 // Branching points in the sense of cyclomatic complexity are binary,
 // so there should be a branching point for each non-default switch
 // case (ignoring those that just fall through to the next case).
 private predicate branchingSwitchCase(ConstCase sc) {
-  not sc.getControlFlowNode().getASuccessor().asStmt() instanceof SwitchCase and
-  not defaultFallThrough(sc)
+  if sc.isRule()
+  then any()
+  else (
+    not fallthroughSwitchCase(sc, _) and
+    not defaultFallThrough(sc)
+  )
 }
 
 private predicate defaultFallThrough(ConstCase sc) {
-  exists(DefaultCase default | default.getControlFlowNode().getASuccessor().asStmt() = sc)
+  exists(DefaultCase default | fallthroughSwitchCase(default, sc))
   or
-  defaultFallThrough(sc.getControlFlowNode().getAPredecessor().asStmt())
+  exists(ConstCase mid | defaultFallThrough(mid) and fallthroughSwitchCase(mid, sc))
 }
 
 /** Holds if `stmt` is a branching statement used for the computation of cyclomatic complexity. */
diff --git a/java/ql/lib/semmle/code/java/security/InsecureRandomnessQuery.qll b/java/ql/lib/semmle/code/java/security/InsecureRandomnessQuery.qll
index 7474c977fe6..524de13513c 100644
--- a/java/ql/lib/semmle/code/java/security/InsecureRandomnessQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/InsecureRandomnessQuery.qll
@@ -73,7 +73,8 @@ module InsecureRandomnessConfig implements DataFlow::ConfigSig {
   predicate isBarrierOut(DataFlow::Node n) { isSink(n) }
 
   predicate isAdditionalFlowStep(DataFlow::Node n1, DataFlow::Node n2) {
-    n1.asExpr() = n2.asExpr().(BinaryExpr).getAnOperand()
+    n1.asExpr() = n2.asExpr().(BinaryExpr).getAnOperand() and
+    not n2.asExpr() instanceof AssignExpr
     or
     n1.asExpr() = n2.asExpr().(UnaryExpr).getOperand()
     or
diff --git a/java/ql/lib/semmle/code/java/security/NumericCastTaintedQuery.qll b/java/ql/lib/semmle/code/java/security/NumericCastTaintedQuery.qll
index 4b2d7709fbd..793871a4bd2 100644
--- a/java/ql/lib/semmle/code/java/security/NumericCastTaintedQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/NumericCastTaintedQuery.qll
@@ -31,10 +31,7 @@ class RightShiftOp extends Expr {
     this instanceof AssignUnsignedRightShiftExpr
   }
 
-  private Expr getLhs() {
-    this.(BinaryExpr).getLeftOperand() = result or
-    this.(Assignment).getDest() = result
-  }
+  private Expr getLhs() { this.(BinaryExpr).getLeftOperand() = result }
 
   /**
    * Gets the variable that is shifted.
diff --git a/java/ql/lib/semmle/code/java/security/RandomQuery.qll b/java/ql/lib/semmle/code/java/security/RandomQuery.qll
index 49174a1f61a..88f8611379c 100644
--- a/java/ql/lib/semmle/code/java/security/RandomQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/RandomQuery.qll
@@ -54,9 +54,8 @@ private module PredictableSeedFlowConfig implements DataFlow::ConfigSig {
 private module PredictableSeedFlow = DataFlow::Global<PredictableSeedFlowConfig>;
 
 private predicate predictableCalcStep(Expr e1, Expr e2) {
-  e2.(BinaryExpr).hasOperands(e1, any(PredictableSeedExpr p))
-  or
-  exists(AssignOp a | a = e2 | e1 = a.getDest() and a.getRhs() instanceof PredictableSeedExpr)
+  e2.(BinaryExpr).hasOperands(e1, any(PredictableSeedExpr p)) and
+  not e2 instanceof AssignExpr
   or
   exists(ConstructorCall cc, TypeNumber t | cc = e2 |
     cc.getArgument(0) = e1 and
diff --git a/java/ql/lib/upgrades/9f6026c400996c13842974b24f076a486ad1f69c/old.dbscheme b/java/ql/lib/upgrades/9f6026c400996c13842974b24f076a486ad1f69c/old.dbscheme
new file mode 100644
index 00000000000..9f6026c4009
--- /dev/null
+++ b/java/ql/lib/upgrades/9f6026c400996c13842974b24f076a486ad1f69c/old.dbscheme
@@ -0,0 +1,1240 @@
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   javac A.java B.java C.java
+ *
+ * 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:
+     *
+     *   javac A.java B.java C.java
+     */
+    unique int id : @compilation,
+    int kind: int ref,
+    string cwd : string ref,
+    string name : string ref
+);
+
+case @compilation.kind of
+   1  = @javacompilation
+|  2  = @kotlincompilation
+;
+
+compilation_started(
+    int id : @compilation ref
+)
+
+compilation_info(
+    int id : @compilation ref,
+    string info_key: string ref,
+    string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   javac A.java B.java C.java
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--javac-args`
+ * 2   | A.java
+ * 3   | B.java
+ * 4   | C.java
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@@@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   javac A.java B.java C.java
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | A.java
+ * 1   | B.java
+ * 2   | C.java
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * For each file recorded in `compilation_compiling_files`,
+ * there will be a corresponding row in
+ * `compilation_compiling_files_completed` once extraction
+ * of that file is complete. The `result` will indicate the
+ * extraction result:
+ *
+ *     0: Successfully extracted
+ *     1: Errors were encountered, but extraction recovered
+ *     2: Errors were encountered, and extraction could not recover
+ */
+#keyset[id, num]
+compilation_compiling_files_completed(
+    int id : @compilation ref,
+    int num : int ref,
+    int result : int 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
+);
+
+/**
+ * The `cpu_seconds` and `elapsed_seconds` are the CPU time and elapsed
+ * time (respectively) that the original compilation (not the extraction)
+ * took for compiler invocation `id`.
+ */
+compilation_compiler_times(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float 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`.
+ * The `result` will indicate the extraction result:
+ *
+ *     0: Successfully extracted
+ *     1: Errors were encountered, but extraction recovered
+ *     2: Errors were encountered, and extraction could not recover
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref,
+    int result : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    string generated_by: string ref, // TODO: Sync this with the other languages?
+    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
+);
+
+/**
+ * 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(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/*
+ * External artifacts
+ */
+
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+sourceLocationPrefix(
+  string prefix : string ref
+);
+
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*
+ * SMAP
+ */
+
+smap_header(
+  int outputFileId: @file ref,
+  string outputFilename: string ref,
+  string defaultStratum: string ref
+);
+
+smap_files(
+  int outputFileId: @file ref,
+  string stratum: string ref,
+  int inputFileNum: int ref,
+  string inputFileName: string ref,
+  int inputFileId: @file ref
+);
+
+smap_lines(
+  int outputFileId: @file ref,
+  string stratum: string ref,
+  int inputFileNum: int ref,
+  int inputStartLine: int ref,
+  int inputLineCount: int ref,
+  int outputStartLine: int ref,
+  int outputLineIncrement: int ref
+);
+
+/*
+ * Locations and files
+ */
+
+@location = @location_default ;
+
+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
+);
+
+hasLocation(
+  int locatableid: @locatable ref,
+  int id: @location ref
+);
+
+@sourceline = @locatable ;
+
+#keyset[element_id]
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*
+ * Java
+ */
+
+cupackage(
+  unique int id: @file ref,
+  int packageid: @package ref
+);
+
+#keyset[fileid,keyName]
+jarManifestMain(
+  int fileid: @file ref,
+  string keyName: string ref,
+  string value: string ref
+);
+
+#keyset[fileid,entryName,keyName]
+jarManifestEntries(
+  int fileid: @file ref,
+  string entryName: string ref,
+  string keyName: string ref,
+  string value: string ref
+);
+
+packages(
+  unique int id: @package,
+  string nodeName: string ref
+);
+
+primitives(
+  unique int id: @primitive,
+  string nodeName: string ref
+);
+
+modifiers(
+  unique int id: @modifier,
+  string nodeName: string ref
+);
+
+/**
+ * An errortype is used when the extractor is unable to extract a type
+ * correctly for some reason.
+ */
+error_type(
+  unique int id: @errortype
+);
+
+classes_or_interfaces(
+  unique int id: @classorinterface,
+  string nodeName: string ref,
+  int parentid: @package ref,
+  int sourceid: @classorinterface ref
+);
+
+file_class(
+  int id: @classorinterface ref
+);
+
+class_object(
+  unique int id: @classorinterface ref,
+  unique int instance: @field ref
+);
+
+type_companion_object(
+  unique int id: @classorinterface ref,
+  unique int instance: @field ref,
+  unique int companion_object: @classorinterface ref
+);
+
+kt_nullable_types(
+  unique int id: @kt_nullable_type,
+  int classid: @reftype ref
+)
+
+kt_notnull_types(
+  unique int id: @kt_notnull_type,
+  int classid: @reftype ref
+)
+
+kt_type_alias(
+  unique int id: @kt_type_alias,
+  string name: string ref,
+  int kttypeid: @kt_type ref
+)
+
+@kt_type = @kt_nullable_type | @kt_notnull_type
+
+isInterface(
+  unique int id: @classorinterface ref
+);
+
+isRecord(
+  unique int id: @classorinterface ref
+);
+
+fielddecls(
+  unique int id: @fielddecl,
+  int parentid: @reftype ref
+);
+
+#keyset[fieldId] #keyset[fieldDeclId,pos]
+fieldDeclaredIn(
+  int fieldId: @field ref,
+  int fieldDeclId: @fielddecl ref,
+  int pos: int ref
+);
+
+fields(
+  unique int id: @field,
+  string nodeName: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref
+);
+
+fieldsKotlinType(
+  unique int id: @field ref,
+  int kttypeid: @kt_type ref
+);
+
+constrs(
+  unique int id: @constructor,
+  string nodeName: string ref,
+  string signature: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref,
+  int sourceid: @constructor ref
+);
+
+constrsKotlinType(
+  unique int id: @constructor ref,
+  int kttypeid: @kt_type ref
+);
+
+methods(
+  unique int id: @method,
+  string nodeName: string ref,
+  string signature: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref,
+  int sourceid: @method ref
+);
+
+methodsKotlinType(
+  unique int id: @method ref,
+  int kttypeid: @kt_type ref
+);
+
+#keyset[parentid,pos]
+params(
+  unique int id: @param,
+  int typeid: @type ref,
+  int pos: int ref,
+  int parentid: @callable ref,
+  int sourceid: @param ref
+);
+
+paramsKotlinType(
+  unique int id: @param ref,
+  int kttypeid: @kt_type ref
+);
+
+paramName(
+  unique int id: @param ref,
+  string nodeName: string ref
+);
+
+isVarargsParam(
+  int param: @param ref
+);
+
+exceptions(
+  unique int id: @exception,
+  int typeid: @type ref,
+  int parentid: @callable ref
+);
+
+isAnnotType(
+  int interfaceid: @classorinterface ref
+);
+
+isAnnotElem(
+  int methodid: @method ref
+);
+
+annotValue(
+  int parentid: @annotation ref,
+  int id2: @method ref,
+  unique int value: @expr ref
+);
+
+isEnumType(
+  int classid: @classorinterface ref
+);
+
+isEnumConst(
+  int fieldid: @field ref
+);
+
+#keyset[parentid,pos]
+typeVars(
+  unique int id: @typevariable,
+  string nodeName: string ref,
+  int pos: int ref,
+  int parentid: @classorinterfaceorcallable ref
+);
+
+wildcards(
+  unique int id: @wildcard,
+  string nodeName: string ref,
+  int kind: int ref
+);
+
+#keyset[parentid,pos]
+typeBounds(
+  unique int id: @typebound,
+  int typeid: @reftype ref,
+  int pos: int ref,
+  int parentid: @boundedtype ref
+);
+
+#keyset[parentid,pos]
+typeArgs(
+  int argumentid: @reftype ref,
+  int pos: int ref,
+  int parentid: @classorinterfaceorcallable ref
+);
+
+isParameterized(
+  int memberid: @member ref
+);
+
+isRaw(
+  int memberid: @member ref
+);
+
+#keyset[classid] #keyset[parent]
+isAnonymClass(
+  int classid: @classorinterface ref,
+  int parent: @classinstancexpr ref
+);
+
+#keyset[typeid] #keyset[parent]
+isLocalClassOrInterface(
+  int typeid: @classorinterface ref,
+  int parent: @localtypedeclstmt ref
+);
+
+isImplicitClass(
+  unique int classid: @classorinterface ref
+);
+
+isDefConstr(
+  int constructorid: @constructor ref
+);
+
+#keyset[exprId]
+lambdaKind(
+  int exprId: @lambdaexpr ref,
+  int bodyKind: int ref
+);
+
+isCanonicalConstr(
+  int constructorid: @constructor ref
+);
+
+arrays(
+  unique int id: @array,
+  string nodeName: string ref,
+  int elementtypeid: @type ref,
+  int dimension: int ref,
+  int componenttypeid: @type ref
+);
+
+enclInReftype(
+  unique int child: @reftype ref,
+  int parent: @reftype ref
+);
+
+extendsReftype(
+  int id1: @reftype ref,
+  int id2: @classorinterface ref
+);
+
+implInterface(
+  int id1: @classorarray ref,
+  int id2: @classorinterface ref
+);
+
+permits(
+  int id1: @classorinterface ref,
+  int id2: @classorinterface ref
+);
+
+hasModifier(
+  int id1: @modifiable ref,
+  int id2: @modifier ref
+);
+
+imports(
+  unique int id: @import,
+  int holder: @classorinterfaceorpackage ref,
+  string name: string ref,
+  int kind: int ref
+);
+
+#keyset[parent,idx]
+stmts(
+  unique int id: @stmt,
+  int kind: int ref,
+  int parent: @stmtparent ref,
+  int idx: int ref,
+  int bodydecl: @callable ref
+);
+
+@stmtparent = @callable | @stmt | @switchexpr | @whenexpr| @stmtexpr;
+
+case @stmt.kind of
+  0 = @block
+| 1 = @ifstmt
+| 2 = @forstmt
+| 3 = @enhancedforstmt
+| 4 = @whilestmt
+| 5 = @dostmt
+| 6 = @trystmt
+| 7 = @switchstmt
+| 8 = @synchronizedstmt
+| 9 = @returnstmt
+| 10 = @throwstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @emptystmt
+| 14 = @exprstmt
+| 15 = @labeledstmt
+| 16 = @assertstmt
+| 17 = @localvariabledeclstmt
+| 18 = @localtypedeclstmt
+| 19 = @constructorinvocationstmt
+| 20 = @superconstructorinvocationstmt
+| 21 = @case
+| 22 = @catchclause
+| 23 = @yieldstmt
+| 24 = @errorstmt
+| 25 = @whenbranch
+;
+
+#keyset[parent,idx]
+exprs(
+  unique int id: @expr,
+  int kind: int ref,
+  int typeid: @type ref,
+  int parent: @exprparent ref,
+  int idx: int ref
+);
+
+exprsKotlinType(
+  unique int id: @expr ref,
+  int kttypeid: @kt_type ref
+);
+
+callableEnclosingExpr(
+  unique int id: @expr ref,
+  int callable_id: @callable ref
+);
+
+statementEnclosingExpr(
+  unique int id: @expr ref,
+  int statement_id: @stmt ref
+);
+
+isParenthesized(
+  unique int id: @expr ref,
+  int parentheses: int ref
+);
+
+case @expr.kind of
+   1  = @arrayaccess
+|  2  = @arraycreationexpr
+|  3  = @arrayinit
+|  4  = @assignexpr
+|  5  = @assignaddexpr
+|  6  = @assignsubexpr
+|  7  = @assignmulexpr
+|  8  = @assigndivexpr
+|  9  = @assignremexpr
+| 10  = @assignandexpr
+| 11  = @assignorexpr
+| 12  = @assignxorexpr
+| 13  = @assignlshiftexpr
+| 14  = @assignrshiftexpr
+| 15  = @assignurshiftexpr
+| 16  = @booleanliteral
+| 17  = @integerliteral
+| 18  = @longliteral
+| 19  = @floatingpointliteral
+| 20  = @doubleliteral
+| 21  = @characterliteral
+| 22  = @stringliteral
+| 23  = @nullliteral
+| 24  = @mulexpr
+| 25  = @divexpr
+| 26  = @remexpr
+| 27  = @addexpr
+| 28  = @subexpr
+| 29  = @lshiftexpr
+| 30  = @rshiftexpr
+| 31  = @urshiftexpr
+| 32  = @andbitexpr
+| 33  = @orbitexpr
+| 34  = @xorbitexpr
+| 35  = @andlogicalexpr
+| 36  = @orlogicalexpr
+| 37  = @ltexpr
+| 38  = @gtexpr
+| 39  = @leexpr
+| 40  = @geexpr
+| 41  = @eqexpr
+| 42  = @neexpr
+| 43  = @postincexpr
+| 44  = @postdecexpr
+| 45  = @preincexpr
+| 46  = @predecexpr
+| 47  = @minusexpr
+| 48  = @plusexpr
+| 49  = @bitnotexpr
+| 50  = @lognotexpr
+| 51  = @castexpr
+| 52  = @newexpr
+| 53  = @conditionalexpr
+| 54  = @parexpr         // deprecated
+| 55  = @instanceofexpr
+| 56  = @localvariabledeclexpr
+| 57  = @typeliteral
+| 58  = @thisaccess
+| 59  = @superaccess
+| 60  = @varaccess
+| 61  = @methodaccess
+| 62  = @unannotatedtypeaccess
+| 63  = @arraytypeaccess
+| 64  = @packageaccess
+| 65  = @wildcardtypeaccess
+| 66  = @declannotation
+| 67  = @uniontypeaccess
+| 68  = @lambdaexpr
+| 69  = @memberref
+| 70  = @annotatedtypeaccess
+| 71  = @typeannotation
+| 72  = @intersectiontypeaccess
+| 73  = @switchexpr
+| 74  = @errorexpr
+| 75  = @whenexpr
+| 76  = @getclassexpr
+| 77  = @safecastexpr
+| 78  = @implicitcastexpr
+| 79  = @implicitnotnullexpr
+| 80  = @implicitcoerciontounitexpr
+| 81  = @notinstanceofexpr
+| 82  = @stmtexpr
+| 83  = @stringtemplateexpr
+| 84  = @notnullexpr
+| 85  = @unsafecoerceexpr
+| 86  = @valueeqexpr
+| 87  = @valueneexpr
+| 88  = @propertyref
+| 89  = @recordpatternexpr
+;
+
+/** Holds if this `when` expression was written as an `if` expression. */
+when_if(unique int id: @whenexpr ref);
+
+/** Holds if this `when` branch was written as an `else` branch. */
+when_branch_else(unique int id: @whenbranch ref);
+
+@classinstancexpr = @newexpr | @lambdaexpr | @memberref | @propertyref
+
+@annotation = @declannotation | @typeannotation
+@typeaccess = @unannotatedtypeaccess | @annotatedtypeaccess
+
+@assignment = @assignexpr
+             | @assignop;
+
+@unaryassignment = @postincexpr
+                 | @postdecexpr
+                 | @preincexpr
+                 | @predecexpr;
+
+@assignop = @assignaddexpr
+             | @assignsubexpr
+             | @assignmulexpr
+             | @assigndivexpr
+             | @assignremexpr
+             | @assignandexpr
+             | @assignorexpr
+             | @assignxorexpr
+             | @assignlshiftexpr
+             | @assignrshiftexpr
+             | @assignurshiftexpr;
+
+@literal = @booleanliteral
+             | @integerliteral
+             | @longliteral
+             | @floatingpointliteral
+             | @doubleliteral
+             | @characterliteral
+             | @stringliteral
+             | @nullliteral;
+
+@binaryexpr = @mulexpr
+             | @divexpr
+             | @remexpr
+             | @addexpr
+             | @subexpr
+             | @lshiftexpr
+             | @rshiftexpr
+             | @urshiftexpr
+             | @andbitexpr
+             | @orbitexpr
+             | @xorbitexpr
+             | @andlogicalexpr
+             | @orlogicalexpr
+             | @ltexpr
+             | @gtexpr
+             | @leexpr
+             | @geexpr
+             | @eqexpr
+             | @neexpr
+             | @valueeqexpr
+             | @valueneexpr;
+
+@unaryexpr =   @postincexpr
+             | @postdecexpr
+             | @preincexpr
+             | @predecexpr
+             | @minusexpr
+             | @plusexpr
+             | @bitnotexpr
+             | @lognotexpr
+             | @notnullexpr;
+
+@caller =  @classinstancexpr
+         | @methodaccess
+         | @constructorinvocationstmt
+         | @superconstructorinvocationstmt;
+
+callableBinding(
+  unique int callerid: @caller ref,
+  int callee: @callable ref
+);
+
+memberRefBinding(
+  unique int id: @expr ref,
+  int callable: @callable ref
+);
+
+propertyRefGetBinding(
+  unique int id: @expr ref,
+  int getter: @callable ref
+);
+
+propertyRefFieldBinding(
+  unique int id: @expr ref,
+  int field: @field ref
+);
+
+propertyRefSetBinding(
+  unique int id: @expr ref,
+  int setter: @callable ref
+);
+
+@exprparent = @stmt | @expr | @whenbranch | @callable | @field | @fielddecl | @classorinterface | @param | @localvar | @typevariable;
+
+variableBinding(
+  unique int expr: @varaccess ref,
+  int variable: @variable ref
+);
+
+@variable = @localscopevariable | @field;
+
+@localscopevariable = @localvar | @param;
+
+localvars(
+  unique int id: @localvar,
+  string nodeName: string ref,
+  int typeid: @type ref,
+  int parentid: @localvariabledeclexpr ref
+);
+
+localvarsKotlinType(
+  unique int id: @localvar ref,
+  int kttypeid: @kt_type ref
+);
+
+@namedexprorstmt = @breakstmt
+                 | @continuestmt
+                 | @labeledstmt
+                 | @literal;
+
+namestrings(
+  string name: string ref,
+  string value: string ref,
+  unique int parent: @namedexprorstmt ref
+);
+
+/*
+ * Modules
+ */
+
+#keyset[name]
+modules(
+  unique int id: @module,
+  string name: string ref
+);
+
+isOpen(
+  int id: @module ref
+);
+
+#keyset[fileId]
+cumodule(
+  int fileId: @file ref,
+  int moduleId: @module ref
+);
+
+@directive = @requires
+           | @exports
+           | @opens
+           | @uses
+           | @provides
+
+#keyset[directive]
+directives(
+  int id: @module ref,
+  int directive: @directive ref
+);
+
+requires(
+  unique int id: @requires,
+  int target: @module ref
+);
+
+isTransitive(
+  int id: @requires ref
+);
+
+isStatic(
+  int id: @requires ref
+);
+
+exports(
+  unique int id: @exports,
+  int target: @package ref
+);
+
+exportsTo(
+  int id: @exports ref,
+  int target: @module ref
+);
+
+opens(
+  unique int id: @opens,
+  int target: @package ref
+);
+
+opensTo(
+  int id: @opens ref,
+  int target: @module ref
+);
+
+uses(
+  unique int id: @uses,
+  string serviceInterface: string ref
+);
+
+provides(
+  unique int id: @provides,
+  string serviceInterface: string ref
+);
+
+providesWith(
+  int id: @provides ref,
+  string serviceImpl: string ref
+);
+
+isNullDefaultCase(
+  int id: @case ref
+);
+
+/*
+ * Javadoc
+ */
+
+javadoc(
+  unique int id: @javadoc
+);
+
+isNormalComment(
+  int commentid : @javadoc ref
+);
+
+isEolComment(
+  int commentid : @javadoc ref
+);
+
+hasJavadoc(
+  int documentableid: @member ref,
+  int javadocid: @javadoc ref
+);
+
+#keyset[parentid,idx]
+javadocTag(
+  unique int id: @javadocTag,
+  string name: string ref,
+  int parentid: @javadocParent ref,
+  int idx: int ref
+);
+
+#keyset[parentid,idx]
+javadocText(
+  unique int id: @javadocText,
+  string text: string ref,
+  int parentid: @javadocParent ref,
+  int idx: int ref
+);
+
+@javadocParent = @javadoc | @javadocTag;
+@javadocElement = @javadocTag | @javadocText;
+
+@classorinterfaceorpackage = @classorinterface | @package;
+@classorinterfaceorcallable = @classorinterface | @callable;
+@boundedtype = @typevariable | @wildcard;
+@reftype = @classorinterface | @array | @boundedtype | @errortype;
+@classorarray = @classorinterface | @array;
+@type = @primitive | @reftype;
+@callable = @method | @constructor;
+
+/** A program element that has a name. */
+@element = @package | @modifier | @annotation | @errortype |
+           @locatableElement;
+
+@locatableElement = @file | @primitive | @classorinterface | @method | @constructor | @param | @exception | @field |
+                    @boundedtype | @array | @localvar | @expr | @stmt | @import | @fielddecl | @kt_type | @kt_type_alias |
+                    @kt_property;
+
+@modifiable = @member_modifiable| @param | @localvar | @typevariable;
+
+@member_modifiable = @classorinterface | @method | @constructor | @field | @kt_property;
+
+@member = @method | @constructor | @field | @reftype ;
+
+/** A program element that has a location. */
+@locatable = @typebound | @javadoc | @javadocTag | @javadocText | @xmllocatable | @ktcomment |
+             @locatableElement;
+
+@top = @element | @locatable | @folder;
+
+/*
+ * 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;
+
+ktComments(
+  unique int id: @ktcomment,
+  int kind: int ref,
+  string text : string ref
+)
+
+ktCommentSections(
+  unique int id: @ktcommentsection,
+  int comment: @ktcomment ref,
+  string content : string ref
+)
+
+ktCommentSectionNames(
+  unique int id: @ktcommentsection ref,
+  string name : string ref
+)
+
+ktCommentSectionSubjectNames(
+  unique int id: @ktcommentsection ref,
+  string subjectname : string ref
+)
+
+#keyset[id, owner]
+ktCommentOwners(
+  int id: @ktcomment ref,
+  int owner: @top ref
+)
+
+ktExtensionFunctions(
+  unique int id: @method ref,
+  int typeid: @type ref,
+  int kttypeid: @kt_type ref
+)
+
+ktProperties(
+  unique int id: @kt_property,
+  string nodeName: string ref
+)
+
+ktPropertyGetters(
+  unique int id: @kt_property ref,
+  int getter: @method ref
+)
+
+ktPropertySetters(
+  unique int id: @kt_property ref,
+  int setter: @method ref
+)
+
+ktPropertyBackingFields(
+  unique int id: @kt_property ref,
+  int backingField: @field ref
+)
+
+ktSyntheticBody(
+  unique int id: @callable ref,
+  int kind: int ref
+  // 1: ENUM_VALUES
+  // 2: ENUM_VALUEOF
+  // 3: ENUM_ENTRIES
+)
+
+ktLocalFunction(
+  unique int id: @method ref
+)
+
+ktInitializerAssignment(
+  unique int id: @assignexpr ref
+)
+
+ktPropertyDelegates(
+  unique int id: @kt_property ref,
+  unique int variableId: @variable ref
+)
+
+/**
+ * If `id` is a compiler generated element, then the kind indicates the
+ * reason that the compiler generated it.
+ * See `Element.compilerGeneratedReason()` for an explanation of what
+ * each `kind` means.
+ */
+compiler_generated(
+  unique int id: @element ref,
+  int kind: int ref
+)
+
+ktFunctionOriginalNames(
+  unique int id: @method ref,
+  string name: string ref
+)
+
+ktDataClasses(
+  unique int id: @classorinterface ref
+)
diff --git a/java/ql/lib/upgrades/9f6026c400996c13842974b24f076a486ad1f69c/semmlecode.dbscheme b/java/ql/lib/upgrades/9f6026c400996c13842974b24f076a486ad1f69c/semmlecode.dbscheme
new file mode 100644
index 00000000000..de4ded61c8a
--- /dev/null
+++ b/java/ql/lib/upgrades/9f6026c400996c13842974b24f076a486ad1f69c/semmlecode.dbscheme
@@ -0,0 +1,1241 @@
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   javac A.java B.java C.java
+ *
+ * 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:
+     *
+     *   javac A.java B.java C.java
+     */
+    unique int id : @compilation,
+    int kind: int ref,
+    string cwd : string ref,
+    string name : string ref
+);
+
+case @compilation.kind of
+   1  = @javacompilation
+|  2  = @kotlincompilation
+;
+
+compilation_started(
+    int id : @compilation ref
+)
+
+compilation_info(
+    int id : @compilation ref,
+    string info_key: string ref,
+    string info_value: string ref
+)
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   javac A.java B.java C.java
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--javac-args`
+ * 2   | A.java
+ * 3   | B.java
+ * 4   | C.java
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@@@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   javac A.java B.java C.java
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | A.java
+ * 1   | B.java
+ * 2   | C.java
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * For each file recorded in `compilation_compiling_files`,
+ * there will be a corresponding row in
+ * `compilation_compiling_files_completed` once extraction
+ * of that file is complete. The `result` will indicate the
+ * extraction result:
+ *
+ *     0: Successfully extracted
+ *     1: Errors were encountered, but extraction recovered
+ *     2: Errors were encountered, and extraction could not recover
+ */
+#keyset[id, num]
+compilation_compiling_files_completed(
+    int id : @compilation ref,
+    int num : int ref,
+    int result : int 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
+);
+
+/**
+ * The `cpu_seconds` and `elapsed_seconds` are the CPU time and elapsed
+ * time (respectively) that the original compilation (not the extraction)
+ * took for compiler invocation `id`.
+ */
+compilation_compiler_times(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float 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`.
+ * The `result` will indicate the extraction result:
+ *
+ *     0: Successfully extracted
+ *     1: Errors were encountered, but extraction recovered
+ *     2: Errors were encountered, and extraction could not recover
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref,
+    int result : int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    string generated_by: string ref, // TODO: Sync this with the other languages?
+    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
+);
+
+/**
+ * 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(
+    unique int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/*
+ * External artifacts
+ */
+
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+sourceLocationPrefix(
+  string prefix : string ref
+);
+
+databaseMetadata(
+  string metadataKey : string ref,
+  string value : string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*
+ * SMAP
+ */
+
+smap_header(
+  int outputFileId: @file ref,
+  string outputFilename: string ref,
+  string defaultStratum: string ref
+);
+
+smap_files(
+  int outputFileId: @file ref,
+  string stratum: string ref,
+  int inputFileNum: int ref,
+  string inputFileName: string ref,
+  int inputFileId: @file ref
+);
+
+smap_lines(
+  int outputFileId: @file ref,
+  string stratum: string ref,
+  int inputFileNum: int ref,
+  int inputStartLine: int ref,
+  int inputLineCount: int ref,
+  int outputStartLine: int ref,
+  int outputLineIncrement: int ref
+);
+
+/*
+ * Locations and files
+ */
+
+@location = @location_default ;
+
+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
+);
+
+hasLocation(
+  int locatableid: @locatable ref,
+  int id: @location ref
+);
+
+@sourceline = @locatable ;
+
+#keyset[element_id]
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*
+ * Java
+ */
+
+cupackage(
+  unique int id: @file ref,
+  int packageid: @package ref
+);
+
+#keyset[fileid,keyName]
+jarManifestMain(
+  int fileid: @file ref,
+  string keyName: string ref,
+  string value: string ref
+);
+
+#keyset[fileid,entryName,keyName]
+jarManifestEntries(
+  int fileid: @file ref,
+  string entryName: string ref,
+  string keyName: string ref,
+  string value: string ref
+);
+
+packages(
+  unique int id: @package,
+  string nodeName: string ref
+);
+
+primitives(
+  unique int id: @primitive,
+  string nodeName: string ref
+);
+
+modifiers(
+  unique int id: @modifier,
+  string nodeName: string ref
+);
+
+/**
+ * An errortype is used when the extractor is unable to extract a type
+ * correctly for some reason.
+ */
+error_type(
+  unique int id: @errortype
+);
+
+classes_or_interfaces(
+  unique int id: @classorinterface,
+  string nodeName: string ref,
+  int parentid: @package ref,
+  int sourceid: @classorinterface ref
+);
+
+file_class(
+  int id: @classorinterface ref
+);
+
+class_object(
+  unique int id: @classorinterface ref,
+  unique int instance: @field ref
+);
+
+type_companion_object(
+  unique int id: @classorinterface ref,
+  unique int instance: @field ref,
+  unique int companion_object: @classorinterface ref
+);
+
+kt_nullable_types(
+  unique int id: @kt_nullable_type,
+  int classid: @reftype ref
+)
+
+kt_notnull_types(
+  unique int id: @kt_notnull_type,
+  int classid: @reftype ref
+)
+
+kt_type_alias(
+  unique int id: @kt_type_alias,
+  string name: string ref,
+  int kttypeid: @kt_type ref
+)
+
+@kt_type = @kt_nullable_type | @kt_notnull_type
+
+isInterface(
+  unique int id: @classorinterface ref
+);
+
+isRecord(
+  unique int id: @classorinterface ref
+);
+
+fielddecls(
+  unique int id: @fielddecl,
+  int parentid: @reftype ref
+);
+
+#keyset[fieldId] #keyset[fieldDeclId,pos]
+fieldDeclaredIn(
+  int fieldId: @field ref,
+  int fieldDeclId: @fielddecl ref,
+  int pos: int ref
+);
+
+fields(
+  unique int id: @field,
+  string nodeName: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref
+);
+
+fieldsKotlinType(
+  unique int id: @field ref,
+  int kttypeid: @kt_type ref
+);
+
+constrs(
+  unique int id: @constructor,
+  string nodeName: string ref,
+  string signature: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref,
+  int sourceid: @constructor ref
+);
+
+constrsKotlinType(
+  unique int id: @constructor ref,
+  int kttypeid: @kt_type ref
+);
+
+methods(
+  unique int id: @method,
+  string nodeName: string ref,
+  string signature: string ref,
+  int typeid: @type ref,
+  int parentid: @reftype ref,
+  int sourceid: @method ref
+);
+
+methodsKotlinType(
+  unique int id: @method ref,
+  int kttypeid: @kt_type ref
+);
+
+#keyset[parentid,pos]
+params(
+  unique int id: @param,
+  int typeid: @type ref,
+  int pos: int ref,
+  int parentid: @callable ref,
+  int sourceid: @param ref
+);
+
+paramsKotlinType(
+  unique int id: @param ref,
+  int kttypeid: @kt_type ref
+);
+
+paramName(
+  unique int id: @param ref,
+  string nodeName: string ref
+);
+
+isVarargsParam(
+  int param: @param ref
+);
+
+exceptions(
+  unique int id: @exception,
+  int typeid: @type ref,
+  int parentid: @callable ref
+);
+
+isAnnotType(
+  int interfaceid: @classorinterface ref
+);
+
+isAnnotElem(
+  int methodid: @method ref
+);
+
+annotValue(
+  int parentid: @annotation ref,
+  int id2: @method ref,
+  unique int value: @expr ref
+);
+
+isEnumType(
+  int classid: @classorinterface ref
+);
+
+isEnumConst(
+  int fieldid: @field ref
+);
+
+#keyset[parentid,pos]
+typeVars(
+  unique int id: @typevariable,
+  string nodeName: string ref,
+  int pos: int ref,
+  int parentid: @classorinterfaceorcallable ref
+);
+
+wildcards(
+  unique int id: @wildcard,
+  string nodeName: string ref,
+  int kind: int ref
+);
+
+#keyset[parentid,pos]
+typeBounds(
+  unique int id: @typebound,
+  int typeid: @reftype ref,
+  int pos: int ref,
+  int parentid: @boundedtype ref
+);
+
+#keyset[parentid,pos]
+typeArgs(
+  int argumentid: @reftype ref,
+  int pos: int ref,
+  int parentid: @classorinterfaceorcallable ref
+);
+
+isParameterized(
+  int memberid: @member ref
+);
+
+isRaw(
+  int memberid: @member ref
+);
+
+#keyset[classid] #keyset[parent]
+isAnonymClass(
+  int classid: @classorinterface ref,
+  int parent: @classinstancexpr ref
+);
+
+#keyset[typeid] #keyset[parent]
+isLocalClassOrInterface(
+  int typeid: @classorinterface ref,
+  int parent: @localtypedeclstmt ref
+);
+
+isImplicitClass(
+  unique int classid: @classorinterface ref
+);
+
+isDefConstr(
+  int constructorid: @constructor ref
+);
+
+#keyset[exprId]
+lambdaKind(
+  int exprId: @lambdaexpr ref,
+  int bodyKind: int ref
+);
+
+isCanonicalConstr(
+  int constructorid: @constructor ref
+);
+
+arrays(
+  unique int id: @array,
+  string nodeName: string ref,
+  int elementtypeid: @type ref,
+  int dimension: int ref,
+  int componenttypeid: @type ref
+);
+
+enclInReftype(
+  unique int child: @reftype ref,
+  int parent: @reftype ref
+);
+
+extendsReftype(
+  int id1: @reftype ref,
+  int id2: @classorinterface ref
+);
+
+implInterface(
+  int id1: @classorarray ref,
+  int id2: @classorinterface ref
+);
+
+permits(
+  int id1: @classorinterface ref,
+  int id2: @classorinterface ref
+);
+
+hasModifier(
+  int id1: @modifiable ref,
+  int id2: @modifier ref
+);
+
+imports(
+  unique int id: @import,
+  int holder: @classorinterfaceorpackage ref,
+  string name: string ref,
+  int kind: int ref
+);
+
+#keyset[parent,idx]
+stmts(
+  unique int id: @stmt,
+  int kind: int ref,
+  int parent: @stmtparent ref,
+  int idx: int ref,
+  int bodydecl: @callable ref
+);
+
+@stmtparent = @callable | @stmt | @switchexpr | @whenexpr| @stmtexpr;
+
+case @stmt.kind of
+  0 = @block
+| 1 = @ifstmt
+| 2 = @forstmt
+| 3 = @enhancedforstmt
+| 4 = @whilestmt
+| 5 = @dostmt
+| 6 = @trystmt
+| 7 = @switchstmt
+| 8 = @synchronizedstmt
+| 9 = @returnstmt
+| 10 = @throwstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @emptystmt
+| 14 = @exprstmt
+| 15 = @labeledstmt
+| 16 = @assertstmt
+| 17 = @localvariabledeclstmt
+| 18 = @localtypedeclstmt
+| 19 = @constructorinvocationstmt
+| 20 = @superconstructorinvocationstmt
+| 21 = @case
+| 22 = @catchclause
+| 23 = @yieldstmt
+| 24 = @errorstmt
+| 25 = @whenbranch
+;
+
+#keyset[parent,idx]
+exprs(
+  unique int id: @expr,
+  int kind: int ref,
+  int typeid: @type ref,
+  int parent: @exprparent ref,
+  int idx: int ref
+);
+
+exprsKotlinType(
+  unique int id: @expr ref,
+  int kttypeid: @kt_type ref
+);
+
+callableEnclosingExpr(
+  unique int id: @expr ref,
+  int callable_id: @callable ref
+);
+
+statementEnclosingExpr(
+  unique int id: @expr ref,
+  int statement_id: @stmt ref
+);
+
+isParenthesized(
+  unique int id: @expr ref,
+  int parentheses: int ref
+);
+
+case @expr.kind of
+   1  = @arrayaccess
+|  2  = @arraycreationexpr
+|  3  = @arrayinit
+|  4  = @assignexpr
+|  5  = @assignaddexpr
+|  6  = @assignsubexpr
+|  7  = @assignmulexpr
+|  8  = @assigndivexpr
+|  9  = @assignremexpr
+| 10  = @assignandexpr
+| 11  = @assignorexpr
+| 12  = @assignxorexpr
+| 13  = @assignlshiftexpr
+| 14  = @assignrshiftexpr
+| 15  = @assignurshiftexpr
+| 16  = @booleanliteral
+| 17  = @integerliteral
+| 18  = @longliteral
+| 19  = @floatingpointliteral
+| 20  = @doubleliteral
+| 21  = @characterliteral
+| 22  = @stringliteral
+| 23  = @nullliteral
+| 24  = @mulexpr
+| 25  = @divexpr
+| 26  = @remexpr
+| 27  = @addexpr
+| 28  = @subexpr
+| 29  = @lshiftexpr
+| 30  = @rshiftexpr
+| 31  = @urshiftexpr
+| 32  = @andbitexpr
+| 33  = @orbitexpr
+| 34  = @xorbitexpr
+| 35  = @andlogicalexpr
+| 36  = @orlogicalexpr
+| 37  = @ltexpr
+| 38  = @gtexpr
+| 39  = @leexpr
+| 40  = @geexpr
+| 41  = @eqexpr
+| 42  = @neexpr
+| 43  = @postincexpr
+| 44  = @postdecexpr
+| 45  = @preincexpr
+| 46  = @predecexpr
+| 47  = @minusexpr
+| 48  = @plusexpr
+| 49  = @bitnotexpr
+| 50  = @lognotexpr
+| 51  = @castexpr
+| 52  = @newexpr
+| 53  = @conditionalexpr
+| 54  = @parexpr         // deprecated
+| 55  = @instanceofexpr
+| 56  = @localvariabledeclexpr
+| 57  = @typeliteral
+| 58  = @thisaccess
+| 59  = @superaccess
+| 60  = @varaccess
+| 61  = @methodaccess
+| 62  = @unannotatedtypeaccess
+| 63  = @arraytypeaccess
+| 64  = @packageaccess
+| 65  = @wildcardtypeaccess
+| 66  = @declannotation
+| 67  = @uniontypeaccess
+| 68  = @lambdaexpr
+| 69  = @memberref
+| 70  = @annotatedtypeaccess
+| 71  = @typeannotation
+| 72  = @intersectiontypeaccess
+| 73  = @switchexpr
+| 74  = @errorexpr
+| 75  = @whenexpr
+| 76  = @getclassexpr
+| 77  = @safecastexpr
+| 78  = @implicitcastexpr
+| 79  = @implicitnotnullexpr
+| 80  = @implicitcoerciontounitexpr
+| 81  = @notinstanceofexpr
+| 82  = @stmtexpr
+| 83  = @stringtemplateexpr
+| 84  = @notnullexpr
+| 85  = @unsafecoerceexpr
+| 86  = @valueeqexpr
+| 87  = @valueneexpr
+| 88  = @propertyref
+| 89  = @recordpatternexpr
+;
+
+/** Holds if this `when` expression was written as an `if` expression. */
+when_if(unique int id: @whenexpr ref);
+
+/** Holds if this `when` branch was written as an `else` branch. */
+when_branch_else(unique int id: @whenbranch ref);
+
+@classinstancexpr = @newexpr | @lambdaexpr | @memberref | @propertyref
+
+@annotation = @declannotation | @typeannotation
+@typeaccess = @unannotatedtypeaccess | @annotatedtypeaccess
+
+@assignment = @assignexpr
+             | @assignop;
+
+@unaryassignment = @postincexpr
+                 | @postdecexpr
+                 | @preincexpr
+                 | @predecexpr;
+
+@assignop = @assignaddexpr
+             | @assignsubexpr
+             | @assignmulexpr
+             | @assigndivexpr
+             | @assignremexpr
+             | @assignandexpr
+             | @assignorexpr
+             | @assignxorexpr
+             | @assignlshiftexpr
+             | @assignrshiftexpr
+             | @assignurshiftexpr;
+
+@literal = @booleanliteral
+             | @integerliteral
+             | @longliteral
+             | @floatingpointliteral
+             | @doubleliteral
+             | @characterliteral
+             | @stringliteral
+             | @nullliteral;
+
+@binaryexpr = @mulexpr
+             | @divexpr
+             | @remexpr
+             | @addexpr
+             | @subexpr
+             | @lshiftexpr
+             | @rshiftexpr
+             | @urshiftexpr
+             | @andbitexpr
+             | @orbitexpr
+             | @xorbitexpr
+             | @andlogicalexpr
+             | @orlogicalexpr
+             | @ltexpr
+             | @gtexpr
+             | @leexpr
+             | @geexpr
+             | @eqexpr
+             | @neexpr
+             | @assignment
+             | @valueeqexpr
+             | @valueneexpr;
+
+@unaryexpr =   @postincexpr
+             | @postdecexpr
+             | @preincexpr
+             | @predecexpr
+             | @minusexpr
+             | @plusexpr
+             | @bitnotexpr
+             | @lognotexpr
+             | @notnullexpr;
+
+@caller =  @classinstancexpr
+         | @methodaccess
+         | @constructorinvocationstmt
+         | @superconstructorinvocationstmt;
+
+callableBinding(
+  unique int callerid: @caller ref,
+  int callee: @callable ref
+);
+
+memberRefBinding(
+  unique int id: @expr ref,
+  int callable: @callable ref
+);
+
+propertyRefGetBinding(
+  unique int id: @expr ref,
+  int getter: @callable ref
+);
+
+propertyRefFieldBinding(
+  unique int id: @expr ref,
+  int field: @field ref
+);
+
+propertyRefSetBinding(
+  unique int id: @expr ref,
+  int setter: @callable ref
+);
+
+@exprparent = @stmt | @expr | @whenbranch | @callable | @field | @fielddecl | @classorinterface | @param | @localvar | @typevariable;
+
+variableBinding(
+  unique int expr: @varaccess ref,
+  int variable: @variable ref
+);
+
+@variable = @localscopevariable | @field;
+
+@localscopevariable = @localvar | @param;
+
+localvars(
+  unique int id: @localvar,
+  string nodeName: string ref,
+  int typeid: @type ref,
+  int parentid: @localvariabledeclexpr ref
+);
+
+localvarsKotlinType(
+  unique int id: @localvar ref,
+  int kttypeid: @kt_type ref
+);
+
+@namedexprorstmt = @breakstmt
+                 | @continuestmt
+                 | @labeledstmt
+                 | @literal;
+
+namestrings(
+  string name: string ref,
+  string value: string ref,
+  unique int parent: @namedexprorstmt ref
+);
+
+/*
+ * Modules
+ */
+
+#keyset[name]
+modules(
+  unique int id: @module,
+  string name: string ref
+);
+
+isOpen(
+  int id: @module ref
+);
+
+#keyset[fileId]
+cumodule(
+  int fileId: @file ref,
+  int moduleId: @module ref
+);
+
+@directive = @requires
+           | @exports
+           | @opens
+           | @uses
+           | @provides
+
+#keyset[directive]
+directives(
+  int id: @module ref,
+  int directive: @directive ref
+);
+
+requires(
+  unique int id: @requires,
+  int target: @module ref
+);
+
+isTransitive(
+  int id: @requires ref
+);
+
+isStatic(
+  int id: @requires ref
+);
+
+exports(
+  unique int id: @exports,
+  int target: @package ref
+);
+
+exportsTo(
+  int id: @exports ref,
+  int target: @module ref
+);
+
+opens(
+  unique int id: @opens,
+  int target: @package ref
+);
+
+opensTo(
+  int id: @opens ref,
+  int target: @module ref
+);
+
+uses(
+  unique int id: @uses,
+  string serviceInterface: string ref
+);
+
+provides(
+  unique int id: @provides,
+  string serviceInterface: string ref
+);
+
+providesWith(
+  int id: @provides ref,
+  string serviceImpl: string ref
+);
+
+isNullDefaultCase(
+  int id: @case ref
+);
+
+/*
+ * Javadoc
+ */
+
+javadoc(
+  unique int id: @javadoc
+);
+
+isNormalComment(
+  int commentid : @javadoc ref
+);
+
+isEolComment(
+  int commentid : @javadoc ref
+);
+
+hasJavadoc(
+  int documentableid: @member ref,
+  int javadocid: @javadoc ref
+);
+
+#keyset[parentid,idx]
+javadocTag(
+  unique int id: @javadocTag,
+  string name: string ref,
+  int parentid: @javadocParent ref,
+  int idx: int ref
+);
+
+#keyset[parentid,idx]
+javadocText(
+  unique int id: @javadocText,
+  string text: string ref,
+  int parentid: @javadocParent ref,
+  int idx: int ref
+);
+
+@javadocParent = @javadoc | @javadocTag;
+@javadocElement = @javadocTag | @javadocText;
+
+@classorinterfaceorpackage = @classorinterface | @package;
+@classorinterfaceorcallable = @classorinterface | @callable;
+@boundedtype = @typevariable | @wildcard;
+@reftype = @classorinterface | @array | @boundedtype | @errortype;
+@classorarray = @classorinterface | @array;
+@type = @primitive | @reftype;
+@callable = @method | @constructor;
+
+/** A program element that has a name. */
+@element = @package | @modifier | @annotation | @errortype |
+           @locatableElement;
+
+@locatableElement = @file | @primitive | @classorinterface | @method | @constructor | @param | @exception | @field |
+                    @boundedtype | @array | @localvar | @expr | @stmt | @import | @fielddecl | @kt_type | @kt_type_alias |
+                    @kt_property;
+
+@modifiable = @member_modifiable| @param | @localvar | @typevariable;
+
+@member_modifiable = @classorinterface | @method | @constructor | @field | @kt_property;
+
+@member = @method | @constructor | @field | @reftype ;
+
+/** A program element that has a location. */
+@locatable = @typebound | @javadoc | @javadocTag | @javadocText | @xmllocatable | @ktcomment |
+             @locatableElement;
+
+@top = @element | @locatable | @folder;
+
+/*
+ * 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;
+
+ktComments(
+  unique int id: @ktcomment,
+  int kind: int ref,
+  string text : string ref
+)
+
+ktCommentSections(
+  unique int id: @ktcommentsection,
+  int comment: @ktcomment ref,
+  string content : string ref
+)
+
+ktCommentSectionNames(
+  unique int id: @ktcommentsection ref,
+  string name : string ref
+)
+
+ktCommentSectionSubjectNames(
+  unique int id: @ktcommentsection ref,
+  string subjectname : string ref
+)
+
+#keyset[id, owner]
+ktCommentOwners(
+  int id: @ktcomment ref,
+  int owner: @top ref
+)
+
+ktExtensionFunctions(
+  unique int id: @method ref,
+  int typeid: @type ref,
+  int kttypeid: @kt_type ref
+)
+
+ktProperties(
+  unique int id: @kt_property,
+  string nodeName: string ref
+)
+
+ktPropertyGetters(
+  unique int id: @kt_property ref,
+  int getter: @method ref
+)
+
+ktPropertySetters(
+  unique int id: @kt_property ref,
+  int setter: @method ref
+)
+
+ktPropertyBackingFields(
+  unique int id: @kt_property ref,
+  int backingField: @field ref
+)
+
+ktSyntheticBody(
+  unique int id: @callable ref,
+  int kind: int ref
+  // 1: ENUM_VALUES
+  // 2: ENUM_VALUEOF
+  // 3: ENUM_ENTRIES
+)
+
+ktLocalFunction(
+  unique int id: @method ref
+)
+
+ktInitializerAssignment(
+  unique int id: @assignexpr ref
+)
+
+ktPropertyDelegates(
+  unique int id: @kt_property ref,
+  unique int variableId: @variable ref
+)
+
+/**
+ * If `id` is a compiler generated element, then the kind indicates the
+ * reason that the compiler generated it.
+ * See `Element.compilerGeneratedReason()` for an explanation of what
+ * each `kind` means.
+ */
+compiler_generated(
+  unique int id: @element ref,
+  int kind: int ref
+)
+
+ktFunctionOriginalNames(
+  unique int id: @method ref,
+  string name: string ref
+)
+
+ktDataClasses(
+  unique int id: @classorinterface ref
+)
diff --git a/java/ql/lib/upgrades/9f6026c400996c13842974b24f076a486ad1f69c/upgrade.properties b/java/ql/lib/upgrades/9f6026c400996c13842974b24f076a486ad1f69c/upgrade.properties
new file mode 100644
index 00000000000..6b5f3f72a62
--- /dev/null
+++ b/java/ql/lib/upgrades/9f6026c400996c13842974b24f076a486ad1f69c/upgrade.properties
@@ -0,0 +1,2 @@
+description: Expand @binaryexpr union to include @assignment
+compatibility: full
diff --git a/java/ql/lib/utils/test/AstCfg.qll b/java/ql/lib/utils/test/AstCfg.qll
new file mode 100644
index 00000000000..c44b14bee72
--- /dev/null
+++ b/java/ql/lib/utils/test/AstCfg.qll
@@ -0,0 +1,28 @@
+/**
+ * Provides utilities for getting an AST-based control flow graph in tests.
+ */
+overlay[local?]
+module;
+
+import java
+
+private predicate isAstNode(ControlFlowNode n) {
+  n.injects(_) or
+  n instanceof ControlFlow::EntryNode or
+  n instanceof ControlFlow::AnnotatedExitNode or
+  n instanceof ControlFlow::ExitNode
+}
+
+private predicate succToAst(ControlFlowNode n1, ControlFlowNode n2) {
+  n2 = n1.getASuccessor() and
+  isAstNode(n2)
+  or
+  exists(ControlFlowNode mid |
+    mid = n1.getASuccessor() and
+    not isAstNode(mid) and
+    succToAst(mid, n2)
+  )
+}
+
+/** Gets a control flow successor of `n` that skips over non-AST nodes. */
+ControlFlowNode getAnAstSuccessor(ControlFlowNode n) { isAstNode(n) and succToAst(n, result) }
diff --git a/java/ql/lib/utils/test/BasicBlock.qll b/java/ql/lib/utils/test/BasicBlock.qll
new file mode 100644
index 00000000000..c1f31f79182
--- /dev/null
+++ b/java/ql/lib/utils/test/BasicBlock.qll
@@ -0,0 +1,40 @@
+/**
+ * Provides utilities for working with basic blocks in tests.
+ */
+overlay[local?]
+module;
+
+import java
+import codeql.util.Boolean
+
+private predicate entryOrExit(ControlFlowNode n) {
+  n instanceof ControlFlow::EntryNode or
+  n instanceof ControlFlow::AnnotatedExitNode or
+  n instanceof ControlFlow::ExitNode
+}
+
+/** Gets the first AST node in the basic block `bb`, if any. */
+ControlFlowNode getFirstAstNode(BasicBlock bb) { result = getFirstAstNode(bb, false) }
+
+/**
+ * Gets the first AST node in the basic block `bb`, if any. Otherwise, gets
+ * the first synthetic node.
+ */
+ControlFlowNode getFirstAstNodeOrSynth(BasicBlock bb) { result = getFirstAstNode(bb, true) }
+
+private ControlFlowNode getFirstAstNode(BasicBlock bb, Boolean allowSynthetic) {
+  result =
+    min(ControlFlowNode n, int i, int astOrder |
+      bb.getNode(i) = n and
+      if n.injects(_)
+      then astOrder = 0
+      else
+        if entryOrExit(n)
+        then astOrder = 1
+        else (
+          allowSynthetic = true and astOrder = 2
+        )
+    |
+      n order by astOrder, i
+    )
+}
diff --git a/java/ql/src/CHANGELOG.md b/java/ql/src/CHANGELOG.md
index 20585a7e1cc..ae0e77925bd 100644
--- a/java/ql/src/CHANGELOG.md
+++ b/java/ql/src/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 1.10.9
+
+No user-facing changes.
+
+## 1.10.8
+
+### Minor Analysis Improvements
+
+* The Java extractor and QL libraries now support Java 26.
+* Java analysis now selects the Java version to use informed by Maven POM files across all project modules. It also tries to use Java 17 or higher for all Maven projects if possible, for improved build compatibility.
+
 ## 1.10.7
 
 No user-facing changes.
diff --git a/java/ql/src/Likely Bugs/Arithmetic/OctalLiteral.ql b/java/ql/src/Likely Bugs/Arithmetic/OctalLiteral.ql
index 1a8021253df..a7745860089 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/OctalLiteral.ql	
+++ b/java/ql/src/Likely Bugs/Arithmetic/OctalLiteral.ql	
@@ -19,6 +19,7 @@ where
   lit.getLiteral() = val and
   val.regexpMatch("0[0-7][0-7]+") and
   lit.getParent() instanceof BinaryExpr and
+  not lit.getParent() instanceof Assignment and
   not lit.getParent() instanceof BitwiseExpr and
   not lit.getParent() instanceof ComparisonExpr
 select lit, "Integer literal starts with 0."
diff --git a/java/ql/src/Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql b/java/ql/src/Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql
index 52a5850e7d1..45eb62c0def 100644
--- a/java/ql/src/Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql	
+++ b/java/ql/src/Likely Bugs/Arithmetic/WhitespaceContradictsPrecedence.ql	
@@ -138,13 +138,14 @@ int operatorWS(BinaryExpr expr) {
     endOfBinaryLhs(expr, line, lcol) and
     startOfBinaryRhs(expr, line, rcol) and
     parens = getParensNextToOp(expr) and
-    result = rcol - lcol + 1 - expr.getOp().length() - parens
+    result = rcol - lcol - 1 - expr.getOp().length() - parens
   )
 }
 
 /** Find nested binary expressions where the programmer may have made a precedence mistake. */
 predicate interestingNesting(BinaryExpr inner, BinaryExpr outer) {
   inner = outer.getAChildExpr() and
+  not outer instanceof Assignment and
   not inner instanceof AssocNestedExpr and
   not inner instanceof HarmlessNestedExpr and
   not inner.isParenthesized()
diff --git a/java/ql/src/Likely Bugs/Comparison/CompareIdenticalValues.ql b/java/ql/src/Likely Bugs/Comparison/CompareIdenticalValues.ql
index e46dd7c5f79..a5163bd9dfc 100644
--- a/java/ql/src/Likely Bugs/Comparison/CompareIdenticalValues.ql	
+++ b/java/ql/src/Likely Bugs/Comparison/CompareIdenticalValues.ql	
@@ -58,6 +58,7 @@ predicate equal(Expr left, Expr right) {
     sameVariable(left, right, _)
     or
     exists(BinaryExpr bLeft, BinaryExpr bRight | bLeft = left and bRight = right |
+      not bLeft instanceof Assignment and
       bLeft.getKind() = bRight.getKind() and
       equal(bLeft.getLeftOperand(), bRight.getLeftOperand()) and
       equal(bLeft.getRightOperand(), bRight.getRightOperand())
diff --git a/java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.ql b/java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.ql
index d9a1f8a3f65..88a956bb24c 100644
--- a/java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.ql	
+++ b/java/ql/src/Likely Bugs/Comparison/UselessComparisonTest.ql	
@@ -101,17 +101,10 @@ Expr overFlowCand() {
   |
     bin instanceof AddExpr or
     bin instanceof MulExpr or
-    bin instanceof LeftShiftExpr
-  )
-  or
-  exists(AssignOp op |
-    result = op and
-    positive(op.getDest()) and
-    positive(op.getRhs())
-  |
-    op instanceof AssignAddExpr or
-    op instanceof AssignMulExpr or
-    op instanceof AssignLeftShiftExpr
+    bin instanceof LeftShiftExpr or
+    bin instanceof AssignAddExpr or
+    bin instanceof AssignMulExpr or
+    bin instanceof AssignLeftShiftExpr
   )
   or
   exists(AddExpr add, CompileTimeConstantExpr c |
diff --git a/java/ql/src/Likely Bugs/Termination/ConstantLoopCondition.ql b/java/ql/src/Likely Bugs/Termination/ConstantLoopCondition.ql
index bf03191bdac..edc800405f7 100644
--- a/java/ql/src/Likely Bugs/Termination/ConstantLoopCondition.ql	
+++ b/java/ql/src/Likely Bugs/Termination/ConstantLoopCondition.ql	
@@ -57,13 +57,15 @@ predicate loopExitGuard(LoopStmt loop, Expr cond) {
  */
 predicate mainLoopCondition(LoopStmt loop, Expr cond) {
   loop.getCondition() = cond and
-  exists(Expr loopReentry, ControlFlowNode last |
-    if exists(loop.(ForStmt).getAnUpdate())
-    then loopReentry = loop.(ForStmt).getUpdate(0)
-    else loopReentry = cond
-  |
-    last.getEnclosingStmt().getEnclosingStmt*() = loop.getBody() and
-    last.getASuccessor().asExpr().getParent*() = loopReentry
+  exists(BasicBlock condBlock | condBlock.getANode().isBefore(cond) |
+    1 < strictcount(condBlock.getAPredecessor()) or loop instanceof DoStmt
+  )
+}
+
+predicate ssaDefinitionInLoop(LoopStmt loop, SsaDefinition ssa) {
+  exists(ControlFlowNode node | node = ssa.getControlFlowNode() |
+    node.getAstNode().(Stmt).getEnclosingStmt*() = loop or
+    node.getAstNode().(Expr).getEnclosingStmt().getEnclosingStmt*() = loop
   )
 }
 
@@ -76,7 +78,7 @@ where
   ) and
   // None of the ssa variables in `cond` are updated inside the loop.
   forex(SsaDefinition ssa, VarRead use | ssa.getARead() = use and use.getParent*() = cond |
-    not ssa.getControlFlowNode().getEnclosingStmt().getEnclosingStmt*() = loop or
+    not ssaDefinitionInLoop(loop, ssa) or
     ssa.getControlFlowNode().asExpr().getParent*() = loop.(ForStmt).getAnInit()
   ) and
   // And `cond` does not use method calls, field reads, or array reads.
diff --git a/java/ql/src/Security/CWE/CWE-079/AndroidWebViewAddJavascriptInterface.ql b/java/ql/src/Security/CWE/CWE-079/AndroidWebViewAddJavascriptInterface.ql
index 4368b537ab7..3b4abcaa7f6 100644
--- a/java/ql/src/Security/CWE/CWE-079/AndroidWebViewAddJavascriptInterface.ql
+++ b/java/ql/src/Security/CWE/CWE-079/AndroidWebViewAddJavascriptInterface.ql
@@ -4,7 +4,7 @@
  * @description Exposing a Java object in a WebView with a JavaScript interface can lead to malicious JavaScript controlling the application.
  * @kind problem
  * @problem.severity warning
- * @security-severity 6.1
+ * @security-severity 7.8
  * @precision medium
  * @tags security
  *       external/cwe/cwe-079
diff --git a/java/ql/src/Security/CWE/CWE-079/AndroidWebViewSettingsEnabledJavaScript.ql b/java/ql/src/Security/CWE/CWE-079/AndroidWebViewSettingsEnabledJavaScript.ql
index 561b2af8de0..3ea2b207c04 100644
--- a/java/ql/src/Security/CWE/CWE-079/AndroidWebViewSettingsEnabledJavaScript.ql
+++ b/java/ql/src/Security/CWE/CWE-079/AndroidWebViewSettingsEnabledJavaScript.ql
@@ -4,7 +4,7 @@
  * @kind problem
  * @id java/android/websettings-javascript-enabled
  * @problem.severity warning
- * @security-severity 6.1
+ * @security-severity 7.8
  * @precision medium
  * @tags security
  *       external/cwe/cwe-079
diff --git a/java/ql/src/Security/CWE/CWE-079/XSS.ql b/java/ql/src/Security/CWE/CWE-079/XSS.ql
index 9ae92a7e362..f1261ebff74 100644
--- a/java/ql/src/Security/CWE/CWE-079/XSS.ql
+++ b/java/ql/src/Security/CWE/CWE-079/XSS.ql
@@ -4,7 +4,7 @@
  *              allows for a cross-site scripting vulnerability.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 6.1
+ * @security-severity 7.8
  * @precision high
  * @id java/xss
  * @tags security
diff --git a/java/ql/src/Security/CWE/CWE-117/LogInjection.ql b/java/ql/src/Security/CWE/CWE-117/LogInjection.ql
index dd4ffb6a10a..f3efb578f76 100644
--- a/java/ql/src/Security/CWE/CWE-117/LogInjection.ql
+++ b/java/ql/src/Security/CWE/CWE-117/LogInjection.ql
@@ -4,7 +4,7 @@
  *              insertion of forged log entries by malicious users.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 7.8
+ * @security-severity 6.1
  * @precision medium
  * @id java/log-injection
  * @tags security
diff --git a/java/ql/src/Security/CWE/CWE-295/ImproperWebViewCertificateValidation.java b/java/ql/src/Security/CWE/CWE-295/ImproperWebViewCertificateValidation.java
index 358800c5746..59dd74ddba3 100644
--- a/java/ql/src/Security/CWE/CWE-295/ImproperWebViewCertificateValidation.java
+++ b/java/ql/src/Security/CWE/CWE-295/ImproperWebViewCertificateValidation.java
@@ -1,7 +1,7 @@
 class Bad extends WebViewClient {
     // BAD: All certificates are trusted.
-    public void onReceivedSslError (WebView view, SslErrorHandler handler, SslError error) { // $hasResult
-        handler.proceed(); 
+    public void onReceivedSslError (WebView view, SslErrorHandler handler, SslError error) { // $ hasResult
+        handler.proceed();
     }
 }
 
@@ -9,7 +9,7 @@ class Good extends WebViewClient {
     PublicKey myPubKey = ...;
 
     // GOOD: Only certificates signed by a certain public key are trusted.
-    public void onReceivedSslError (WebView view, SslErrorHandler handler, SslError error) { // $hasResult
+    public void onReceivedSslError (WebView view, SslErrorHandler handler, SslError error) { // $ hasResult
         try {
             X509Certificate cert = error.getCertificate().getX509Certificate();
             cert.verify(this.myPubKey);
@@ -18,5 +18,5 @@ class Good extends WebViewClient {
         catch (CertificateException|NoSuchAlgorithmException|InvalidKeyException|NoSuchProviderException|SignatureException e) {
             handler.cancel();
         }
-    }    
-}
\ No newline at end of file
+    }
+}
diff --git a/java/ql/src/Violations of Best Practice/Declarations/Common.qll b/java/ql/src/Violations of Best Practice/Declarations/Common.qll
index 9b3225db81a..45b978bd011 100644
--- a/java/ql/src/Violations of Best Practice/Declarations/Common.qll	
+++ b/java/ql/src/Violations of Best Practice/Declarations/Common.qll	
@@ -1,41 +1,15 @@
 import java
 
-private Stmt getASwitchChild(SwitchStmt s) {
-  result = s.getAChild()
-  or
-  exists(Stmt mid |
-    mid = getASwitchChild(s) and not mid instanceof SwitchStmt and result = mid.getAChild()
-  )
-}
-
-private predicate blockInSwitch(SwitchStmt s, BasicBlock b) {
-  b.getFirstNode().getEnclosingStmt() = getASwitchChild(s)
-}
-
-private predicate switchCaseControlFlow(SwitchStmt switch, BasicBlock b1, BasicBlock b2) {
-  blockInSwitch(switch, b1) and
-  b1.getASuccessor() = b2 and
-  blockInSwitch(switch, b2)
-}
-
-predicate switchCaseControlFlowPlus(SwitchStmt switch, BasicBlock b1, BasicBlock b2) {
-  switchCaseControlFlow(switch, b1, b2)
-  or
-  exists(BasicBlock mid |
-    switchCaseControlFlowPlus(switch, mid, b2) and
-    switchCaseControlFlow(switch, b1, mid) and
-    not mid.getFirstNode().asStmt() = switch.getACase()
-  )
-}
-
 predicate mayDropThroughWithoutComment(SwitchStmt switch, Stmt switchCase) {
-  switchCase = switch.getACase() and
-  exists(Stmt other, BasicBlock b1, BasicBlock b2 |
-    b1.getFirstNode().asStmt() = switchCase and
-    b2.getFirstNode().asStmt() = other and
-    switchCaseControlFlowPlus(switch, b1, b2) and
-    other = switch.getACase() and
-    not fallThroughCommented(other)
+  exists(int caseIx, SwitchCase next, int nextCaseStmtIx, Stmt lastInCase, ControlFlowNode node |
+    switch.getCase(caseIx) = switchCase and
+    switch.getCase(caseIx + 1) = next and
+    switch.getStmt(nextCaseStmtIx) = next and
+    switch.getStmt(nextCaseStmtIx - 1) = lastInCase and
+    lastInCase != switchCase and
+    node.isAfter(lastInCase) and
+    node.getANormalSuccessor().asStmt() = switch.getAStmt() and
+    not fallThroughCommented(next)
   )
 }
 
diff --git a/java/ql/src/Violations of Best Practice/legacy/AutoBoxing.ql b/java/ql/src/Violations of Best Practice/legacy/AutoBoxing.ql
index 0fc6527d258..88a653e3b51 100644
--- a/java/ql/src/Violations of Best Practice/legacy/AutoBoxing.ql	
+++ b/java/ql/src/Violations of Best Practice/legacy/AutoBoxing.ql	
@@ -36,6 +36,7 @@ Variable flowTarget(Expr arg) {
  */
 predicate unboxed(BoxedExpr e) {
   exists(BinaryExpr bin | e = bin.getAnOperand() |
+    not bin instanceof Assignment and
     if bin instanceof EqualityTest or bin instanceof ComparisonExpr
     then bin.getAnOperand() instanceof PrimitiveExpr
     else bin instanceof PrimitiveExpr
diff --git a/java/ql/src/change-notes/2026-02-17-support-java-26.md b/java/ql/src/change-notes/2026-02-17-support-java-26.md
deleted file mode 100644
index db0a108f0ca..00000000000
--- a/java/ql/src/change-notes/2026-02-17-support-java-26.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The Java extractor and QL libraries now support Java 26.
diff --git a/java/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md b/java/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md
new file mode 100644
index 00000000000..fa1288af16e
--- /dev/null
+++ b/java/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md
@@ -0,0 +1,5 @@
+---
+category: queryMetadata
+---
+* The `@security-severity` metadata of `java/log-injection` has been reduced from 7.8 (high) to 6.1 (medium).
+* The `@security-severity` metadata of `java/android/webview-addjavascriptinterface`, `java/android/websettings-javascript-enabled` and `java/xss` has been increased from 6.1 (medium) to 7.8 (high).
diff --git a/java/ql/src/change-notes/2025-11-13-maven-default-java-17.md b/java/ql/src/change-notes/released/1.10.8.md
similarity index 60%
rename from java/ql/src/change-notes/2025-11-13-maven-default-java-17.md
rename to java/ql/src/change-notes/released/1.10.8.md
index 26425b103ab..2347808a6d9 100644
--- a/java/ql/src/change-notes/2025-11-13-maven-default-java-17.md
+++ b/java/ql/src/change-notes/released/1.10.8.md
@@ -1,4 +1,6 @@
----
-category: minorAnalysis
----
-* Java analysis now selects the Java version to use informed by Maven POM files across all project modules. It also tries to use Java 17 or higher for all Maven projects if possible, for improved build compatibility.
\ No newline at end of file
+## 1.10.8
+
+### Minor Analysis Improvements
+
+* The Java extractor and QL libraries now support Java 26.
+* Java analysis now selects the Java version to use informed by Maven POM files across all project modules. It also tries to use Java 17 or higher for all Maven projects if possible, for improved build compatibility.
diff --git a/java/ql/src/change-notes/released/1.10.9.md b/java/ql/src/change-notes/released/1.10.9.md
new file mode 100644
index 00000000000..0babf4b0286
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.10.9.md
@@ -0,0 +1,3 @@
+## 1.10.9
+
+No user-facing changes.
diff --git a/java/ql/src/codeql-pack.release.yml b/java/ql/src/codeql-pack.release.yml
index 6e2189b76c6..947b9a72073 100644
--- a/java/ql/src/codeql-pack.release.yml
+++ b/java/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.10.7
+lastReleaseVersion: 1.10.9
diff --git a/java/ql/src/experimental/quantum/Examples/ArtifactReuse.qll b/java/ql/src/experimental/quantum/Examples/ArtifactReuse.qll
index 776510b52ad..1a20a7fa2b5 100644
--- a/java/ql/src/experimental/quantum/Examples/ArtifactReuse.qll
+++ b/java/ql/src/experimental/quantum/Examples/ArtifactReuse.qll
@@ -42,7 +42,7 @@ private DataFlow::Node getGeneratingWrapperSet(Crypto::NonceArtifactNode a) {
 }
 
 private predicate ancestorOfArtifact(
-  Crypto::ArtifactNode a, Callable enclosingCallable, ControlFlow::Node midOrTarget
+  Crypto::ArtifactNode a, Callable enclosingCallable, ControlFlowNode midOrTarget
 ) {
   a.asElement().(Expr).getEnclosingCallable() = enclosingCallable and
   (
@@ -87,7 +87,7 @@ predicate isArtifactReuse(Crypto::ArtifactNode a, Crypto::ArtifactNode b) {
       ancestorOfArtifact(b, commonParent, _)
     )
     implies
-    exists(Callable commonParent, ControlFlow::Node aMid, ControlFlow::Node bMid |
+    exists(Callable commonParent, ControlFlowNode aMid, ControlFlowNode bMid |
       ancestorOfArtifact(a, commonParent, aMid) and
       ancestorOfArtifact(b, commonParent, bMid) and
       a instanceof Crypto::NonceArtifactNode and
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
index fda7663d686..13700fa7199 100644
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-queries
-version: 1.10.8-dev
+version: 1.10.10-dev
 groups:
   - java
   - queries
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStmts.expected b/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStmts.expected
index 116bde45f98..484fb5ea042 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStmts.expected
+++ b/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStmts.expected
@@ -1,205 +1,386 @@
-| Test.kt:3:8:80:1 | Exceptional Exit | 0 | Test.kt:3:8:80:1 | Exceptional Exit |
-| Test.kt:3:8:80:1 | Exit | 0 | Test.kt:3:8:80:1 | Exit |
-| Test.kt:3:8:80:1 | { ... } | 0 | Test.kt:3:8:80:1 | { ... } |
-| Test.kt:3:8:80:1 | { ... } | 1 | Test.kt:3:1:80:1 | super(...) |
-| Test.kt:3:8:80:1 | { ... } | 2 | Test.kt:3:8:80:1 | { ... } |
-| Test.kt:3:8:80:1 | { ... } | 3 | Test.kt:3:8:80:1 | Normal Exit |
-| Test.kt:4:2:79:2 | Exceptional Exit | 0 | Test.kt:4:2:79:2 | Exceptional Exit |
-| Test.kt:4:2:79:2 | Exit | 0 | Test.kt:4:2:79:2 | Exit |
+| Test.kt:3:8:80:1 | Entry | 0 | Test.kt:3:8:80:1 | Entry |
+| Test.kt:3:8:80:1 | Entry | 1 | Test.kt:3:8:80:1 | { ... } |
+| Test.kt:3:8:80:1 | Entry | 2 | Test.kt:3:1:80:1 | Before super(...) |
+| Test.kt:3:8:80:1 | Entry | 3 | Test.kt:3:1:80:1 | super(...) |
+| Test.kt:3:8:80:1 | Entry | 4 | Test.kt:3:1:80:1 | After super(...) |
+| Test.kt:3:8:80:1 | Entry | 5 | Test.kt:3:8:80:1 | { ... } |
+| Test.kt:3:8:80:1 | Entry | 6 | Test.kt:3:8:80:1 | After { ... } |
+| Test.kt:3:8:80:1 | Entry | 7 | Test.kt:3:8:80:1 | Normal Exit |
+| Test.kt:3:8:80:1 | Entry | 8 | Test.kt:3:8:80:1 | Exit |
+| Test.kt:4:2:79:2 | Entry | 0 | Test.kt:4:2:79:2 | Entry |
+| Test.kt:4:2:79:2 | Entry | 1 | Test.kt:4:13:79:2 | { ... } |
+| Test.kt:4:2:79:2 | Entry | 2 | Test.kt:5:7:5:7 | var ...; |
+| Test.kt:4:2:79:2 | Entry | 3 | Test.kt:5:7:5:7 | Before x |
+| Test.kt:4:2:79:2 | Entry | 4 | Test.kt:5:16:5:16 | 0 |
+| Test.kt:4:2:79:2 | Entry | 5 | Test.kt:5:7:5:7 | x |
+| Test.kt:4:2:79:2 | Entry | 6 | Test.kt:5:7:5:7 | After x |
+| Test.kt:4:2:79:2 | Entry | 7 | Test.kt:5:7:5:7 | After var ...; |
+| Test.kt:4:2:79:2 | Entry | 8 | Test.kt:6:7:6:7 | var ...; |
+| Test.kt:4:2:79:2 | Entry | 9 | Test.kt:6:7:6:7 | Before y |
+| Test.kt:4:2:79:2 | Entry | 10 | Test.kt:6:17:6:18 | 50 |
+| Test.kt:4:2:79:2 | Entry | 11 | Test.kt:6:7:6:7 | y |
+| Test.kt:4:2:79:2 | Entry | 12 | Test.kt:6:7:6:7 | After y |
+| Test.kt:4:2:79:2 | Entry | 13 | Test.kt:6:7:6:7 | After var ...; |
+| Test.kt:4:2:79:2 | Entry | 14 | Test.kt:7:7:7:7 | var ...; |
+| Test.kt:4:2:79:2 | Entry | 15 | Test.kt:7:7:7:7 | Before z |
+| Test.kt:4:2:79:2 | Entry | 16 | Test.kt:7:16:7:16 | 0 |
+| Test.kt:4:2:79:2 | Entry | 17 | Test.kt:7:7:7:7 | z |
+| Test.kt:4:2:79:2 | Entry | 18 | Test.kt:7:7:7:7 | After z |
+| Test.kt:4:2:79:2 | Entry | 19 | Test.kt:7:7:7:7 | After var ...; |
+| Test.kt:4:2:79:2 | Entry | 20 | Test.kt:8:7:8:7 | var ...; |
+| Test.kt:4:2:79:2 | Entry | 21 | Test.kt:8:7:8:7 | Before w |
+| Test.kt:4:2:79:2 | Entry | 22 | Test.kt:8:16:8:16 | 0 |
+| Test.kt:4:2:79:2 | Entry | 23 | Test.kt:8:7:8:7 | w |
+| Test.kt:4:2:79:2 | Entry | 24 | Test.kt:8:7:8:7 | After w |
+| Test.kt:4:2:79:2 | Entry | 25 | Test.kt:8:7:8:7 | After var ...; |
+| Test.kt:4:2:79:2 | Entry | 26 | Test.kt:11:3:16:3 | <Expr>; |
+| Test.kt:4:2:79:2 | Entry | 27 | Test.kt:11:3:16:3 | when ... |
+| Test.kt:4:2:79:2 | Entry | 28 | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:4:2:79:2 | Entry | 29 | Test.kt:11:7:11:11 | Before ... > ... |
+| Test.kt:4:2:79:2 | Entry | 30 | Test.kt:11:7:11:7 | x |
+| Test.kt:4:2:79:2 | Entry | 31 | Test.kt:11:11:11:11 | 0 |
+| Test.kt:4:2:79:2 | Entry | 32 | Test.kt:11:7:11:11 | ... > ... |
 | Test.kt:4:2:79:2 | Normal Exit | 0 | Test.kt:4:2:79:2 | Normal Exit |
-| Test.kt:4:13:79:2 | { ... } | 0 | Test.kt:4:13:79:2 | { ... } |
-| Test.kt:4:13:79:2 | { ... } | 1 | Test.kt:5:7:5:7 | var ...; |
-| Test.kt:4:13:79:2 | { ... } | 2 | Test.kt:5:16:5:16 | 0 |
-| Test.kt:4:13:79:2 | { ... } | 3 | Test.kt:5:7:5:7 | x |
-| Test.kt:4:13:79:2 | { ... } | 4 | Test.kt:6:7:6:7 | var ...; |
-| Test.kt:4:13:79:2 | { ... } | 5 | Test.kt:6:17:6:18 | 50 |
-| Test.kt:4:13:79:2 | { ... } | 6 | Test.kt:6:7:6:7 | y |
-| Test.kt:4:13:79:2 | { ... } | 7 | Test.kt:7:7:7:7 | var ...; |
-| Test.kt:4:13:79:2 | { ... } | 8 | Test.kt:7:16:7:16 | 0 |
-| Test.kt:4:13:79:2 | { ... } | 9 | Test.kt:7:7:7:7 | z |
-| Test.kt:4:13:79:2 | { ... } | 10 | Test.kt:8:7:8:7 | var ...; |
-| Test.kt:4:13:79:2 | { ... } | 11 | Test.kt:8:16:8:16 | 0 |
-| Test.kt:4:13:79:2 | { ... } | 12 | Test.kt:8:7:8:7 | w |
-| Test.kt:4:13:79:2 | { ... } | 13 | Test.kt:11:3:16:3 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | 14 | Test.kt:11:3:16:3 | when ... |
-| Test.kt:4:13:79:2 | { ... } | 15 | Test.kt:11:3:16:3 | ... -> ... |
-| Test.kt:4:13:79:2 | { ... } | 16 | Test.kt:11:7:11:7 | x |
-| Test.kt:4:13:79:2 | { ... } | 17 | Test.kt:11:11:11:11 | 0 |
-| Test.kt:4:13:79:2 | { ... } | 18 | Test.kt:11:7:11:11 | ... > ... |
-| Test.kt:11:3:16:3 | ... -> ... | 0 | Test.kt:11:3:16:3 | ... -> ... |
-| Test.kt:11:3:16:3 | ... -> ... | 1 | Test.kt:11:3:16:3 | true |
-| Test.kt:11:3:16:3 | ... -> ... | 2 | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:11:3:16:3 | ... -> ... | 3 | Test.kt:15:4:15:4 | <Expr>; |
-| Test.kt:11:3:16:3 | ... -> ... | 4 | Test.kt:15:8:15:9 | 30 |
-| Test.kt:11:3:16:3 | ... -> ... | 5 | Test.kt:15:4:15:9 | ...=... |
-| Test.kt:11:14:14:3 | { ... } | 0 | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:11:14:14:3 | { ... } | 1 | Test.kt:12:4:12:4 | <Expr>; |
-| Test.kt:11:14:14:3 | { ... } | 2 | Test.kt:12:8:12:9 | 20 |
-| Test.kt:11:14:14:3 | { ... } | 3 | Test.kt:12:4:12:9 | ...=... |
-| Test.kt:11:14:14:3 | { ... } | 4 | Test.kt:13:4:13:4 | <Expr>; |
-| Test.kt:11:14:14:3 | { ... } | 5 | Test.kt:13:8:13:9 | 10 |
-| Test.kt:11:14:14:3 | { ... } | 6 | Test.kt:13:4:13:9 | ...=... |
-| Test.kt:18:3:18:3 | <Expr>; | 0 | Test.kt:18:3:18:3 | <Expr>; |
-| Test.kt:18:3:18:3 | <Expr>; | 1 | Test.kt:18:7:18:7 | 0 |
-| Test.kt:18:3:18:3 | <Expr>; | 2 | Test.kt:18:3:18:7 | ...=... |
-| Test.kt:18:3:18:3 | <Expr>; | 3 | Test.kt:21:3:24:9 | <Expr>; |
-| Test.kt:18:3:18:3 | <Expr>; | 4 | Test.kt:21:3:24:9 | when ... |
-| Test.kt:18:3:18:3 | <Expr>; | 5 | Test.kt:21:3:24:9 | ... -> ... |
-| Test.kt:18:3:18:3 | <Expr>; | 6 | Test.kt:21:6:21:6 | x |
-| Test.kt:18:3:18:3 | <Expr>; | 7 | Test.kt:21:10:21:10 | 0 |
-| Test.kt:18:3:18:3 | <Expr>; | 8 | Test.kt:21:6:21:10 | ... < ... |
-| Test.kt:21:3:24:9 | ... -> ... | 0 | Test.kt:21:3:24:9 | ... -> ... |
-| Test.kt:21:3:24:9 | ... -> ... | 1 | Test.kt:21:3:24:9 | true |
-| Test.kt:21:3:24:9 | ... -> ... | 2 | Test.kt:24:4:24:9 | INSTANCE |
-| Test.kt:21:3:24:9 | ... -> ... | 3 | Test.kt:24:4:24:9 | return ... |
-| Test.kt:22:4:22:4 | <Expr>; | 0 | Test.kt:22:4:22:4 | <Expr>; |
-| Test.kt:22:4:22:4 | <Expr>; | 1 | Test.kt:22:8:22:9 | 40 |
-| Test.kt:22:4:22:4 | <Expr>; | 2 | Test.kt:22:4:22:9 | ...=... |
-| Test.kt:22:4:22:4 | <Expr>; | 3 | Test.kt:27:3:27:3 | <Expr>; |
-| Test.kt:22:4:22:4 | <Expr>; | 4 | Test.kt:27:7:27:8 | 10 |
-| Test.kt:22:4:22:4 | <Expr>; | 5 | Test.kt:27:3:27:8 | ...=... |
-| Test.kt:22:4:22:4 | <Expr>; | 6 | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:22:4:22:4 | <Expr>; | 7 | Test.kt:30:3:33:3 | when ... |
-| Test.kt:22:4:22:4 | <Expr>; | 8 | Test.kt:30:3:33:3 | ... -> ... |
-| Test.kt:22:4:22:4 | <Expr>; | 9 | Test.kt:30:7:30:7 | x |
-| Test.kt:22:4:22:4 | <Expr>; | 10 | Test.kt:30:12:30:12 | 0 |
-| Test.kt:22:4:22:4 | <Expr>; | 11 | Test.kt:30:7:30:12 | ... (value equals) ... |
-| Test.kt:30:15:33:3 | { ... } | 0 | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:30:15:33:3 | { ... } | 1 | Test.kt:31:4:31:4 | <Expr>; |
-| Test.kt:30:15:33:3 | { ... } | 2 | Test.kt:31:8:31:9 | 60 |
-| Test.kt:30:15:33:3 | { ... } | 3 | Test.kt:31:4:31:9 | ...=... |
-| Test.kt:30:15:33:3 | { ... } | 4 | Test.kt:32:4:32:4 | <Expr>; |
-| Test.kt:30:15:33:3 | { ... } | 5 | Test.kt:32:8:32:9 | 10 |
-| Test.kt:30:15:33:3 | { ... } | 6 | Test.kt:32:4:32:9 | ...=... |
-| Test.kt:35:3:35:3 | <Expr>; | 0 | Test.kt:35:3:35:3 | <Expr>; |
-| Test.kt:35:3:35:3 | <Expr>; | 1 | Test.kt:35:7:35:8 | 20 |
-| Test.kt:35:3:35:3 | <Expr>; | 2 | Test.kt:35:3:35:8 | ...=... |
-| Test.kt:35:3:35:3 | <Expr>; | 3 | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:38:9:38:9 | x | 0 | Test.kt:38:9:38:9 | x |
-| Test.kt:38:9:38:9 | x | 1 | Test.kt:38:13:38:13 | 0 |
-| Test.kt:38:9:38:9 | x | 2 | Test.kt:38:9:38:13 | ... > ... |
-| Test.kt:38:16:41:3 | { ... } | 0 | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:38:16:41:3 | { ... } | 1 | Test.kt:39:4:39:4 | <Expr>; |
-| Test.kt:38:16:41:3 | { ... } | 2 | Test.kt:39:8:39:9 | 10 |
-| Test.kt:38:16:41:3 | { ... } | 3 | Test.kt:39:4:39:9 | ...=... |
-| Test.kt:38:16:41:3 | { ... } | 4 | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:38:16:41:3 | { ... } | 5 | Test.kt:40:4:40:6 | <Stmt> |
-| Test.kt:38:16:41:3 | { ... } | 6 | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:38:16:41:3 | { ... } | 7 | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:38:16:41:3 | { ... } | 8 | Test.kt:40:4:40:4 | x |
-| Test.kt:38:16:41:3 | { ... } | 9 | Test.kt:40:4:40:6 | tmp0 |
-| Test.kt:38:16:41:3 | { ... } | 10 | Test.kt:40:4:40:4 | <Expr>; |
-| Test.kt:38:16:41:3 | { ... } | 11 | Test.kt:40:4:40:6 | tmp0 |
-| Test.kt:38:16:41:3 | { ... } | 12 | Test.kt:40:4:40:6 | dec(...) |
-| Test.kt:38:16:41:3 | { ... } | 13 | Test.kt:40:4:40:6 | ...=... |
-| Test.kt:38:16:41:3 | { ... } | 14 | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:38:16:41:3 | { ... } | 15 | Test.kt:40:4:40:6 | tmp0 |
-| Test.kt:38:16:41:3 | { ... } | 16 | Test.kt:40:4:40:6 | <implicit coercion to unit> |
-| Test.kt:43:3:43:3 | <Expr>; | 0 | Test.kt:43:3:43:3 | <Expr>; |
-| Test.kt:43:3:43:3 | <Expr>; | 1 | Test.kt:43:7:43:8 | 30 |
-| Test.kt:43:3:43:3 | <Expr>; | 2 | Test.kt:43:3:43:8 | ...=... |
-| Test.kt:43:3:43:3 | <Expr>; | 3 | Test.kt:73:3:73:3 | <Expr>; |
-| Test.kt:43:3:43:3 | <Expr>; | 4 | Test.kt:73:7:73:8 | 50 |
-| Test.kt:43:3:43:3 | <Expr>; | 5 | Test.kt:73:3:73:8 | ...=... |
-| Test.kt:43:3:43:3 | <Expr>; | 6 | Test.kt:77:3:77:3 | <Expr>; |
-| Test.kt:43:3:43:3 | <Expr>; | 7 | Test.kt:77:7:77:8 | 40 |
-| Test.kt:43:3:43:3 | <Expr>; | 8 | Test.kt:77:3:77:8 | ...=... |
-| Test.kt:43:3:43:3 | <Expr>; | 9 | Test.kt:78:3:78:8 | INSTANCE |
-| Test.kt:43:3:43:3 | <Expr>; | 10 | Test.kt:78:3:78:8 | return ... |
-| Test.kt:82:1:89:1 | Exceptional Exit | 0 | Test.kt:82:1:89:1 | Exceptional Exit |
+| Test.kt:4:2:79:2 | Normal Exit | 1 | Test.kt:4:2:79:2 | Exit |
+| Test.kt:11:3:16:3 | After when ... | 0 | Test.kt:11:3:16:3 | After when ... |
+| Test.kt:11:3:16:3 | After when ... | 1 | Test.kt:11:3:16:3 | After <Expr>; |
+| Test.kt:11:3:16:3 | After when ... | 2 | Test.kt:18:3:18:3 | <Expr>; |
+| Test.kt:11:3:16:3 | After when ... | 3 | Test.kt:18:3:18:7 | Before ...=... |
+| Test.kt:11:3:16:3 | After when ... | 4 | Test.kt:18:3:18:3 | z |
+| Test.kt:11:3:16:3 | After when ... | 5 | Test.kt:18:7:18:7 | 0 |
+| Test.kt:11:3:16:3 | After when ... | 6 | Test.kt:18:3:18:7 | ...=... |
+| Test.kt:11:3:16:3 | After when ... | 7 | Test.kt:18:3:18:7 | After ...=... |
+| Test.kt:11:3:16:3 | After when ... | 8 | Test.kt:18:3:18:3 | After <Expr>; |
+| Test.kt:11:3:16:3 | After when ... | 9 | Test.kt:21:3:24:9 | <Expr>; |
+| Test.kt:11:3:16:3 | After when ... | 10 | Test.kt:21:3:24:9 | when ... |
+| Test.kt:11:3:16:3 | After when ... | 11 | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:11:3:16:3 | After when ... | 12 | Test.kt:21:6:21:10 | Before ... < ... |
+| Test.kt:11:3:16:3 | After when ... | 13 | Test.kt:21:6:21:6 | x |
+| Test.kt:11:3:16:3 | After when ... | 14 | Test.kt:21:10:21:10 | 0 |
+| Test.kt:11:3:16:3 | After when ... | 15 | Test.kt:21:6:21:10 | ... < ... |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 0 | Test.kt:11:7:11:11 | After ... > ... [false] |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 1 | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 2 | Test.kt:11:3:16:3 | true |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 3 | Test.kt:11:3:16:3 | After true [true] |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 4 | Test.kt:14:10:16:3 | { ... } |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 5 | Test.kt:15:4:15:4 | <Expr>; |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 6 | Test.kt:15:4:15:9 | Before ...=... |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 7 | Test.kt:15:4:15:4 | y |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 8 | Test.kt:15:8:15:9 | 30 |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 9 | Test.kt:15:4:15:9 | ...=... |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 10 | Test.kt:15:4:15:9 | After ...=... |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 11 | Test.kt:15:4:15:4 | After <Expr>; |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 12 | Test.kt:14:10:16:3 | After { ... } |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 0 | Test.kt:11:7:11:11 | After ... > ... [true] |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 1 | Test.kt:11:14:14:3 | { ... } |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 2 | Test.kt:12:4:12:4 | <Expr>; |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 3 | Test.kt:12:4:12:9 | Before ...=... |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 4 | Test.kt:12:4:12:4 | y |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 5 | Test.kt:12:8:12:9 | 20 |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 6 | Test.kt:12:4:12:9 | ...=... |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 7 | Test.kt:12:4:12:9 | After ...=... |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 8 | Test.kt:12:4:12:4 | After <Expr>; |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 9 | Test.kt:13:4:13:4 | <Expr>; |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 10 | Test.kt:13:4:13:9 | Before ...=... |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 11 | Test.kt:13:4:13:4 | z |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 12 | Test.kt:13:8:13:9 | 10 |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 13 | Test.kt:13:4:13:9 | ...=... |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 14 | Test.kt:13:4:13:9 | After ...=... |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 15 | Test.kt:13:4:13:4 | After <Expr>; |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 16 | Test.kt:11:14:14:3 | After { ... } |
+| Test.kt:21:6:21:10 | After ... < ... [false] | 0 | Test.kt:21:6:21:10 | After ... < ... [false] |
+| Test.kt:21:6:21:10 | After ... < ... [false] | 1 | Test.kt:21:3:24:9 | ... -> ... |
+| Test.kt:21:6:21:10 | After ... < ... [false] | 2 | Test.kt:21:3:24:9 | true |
+| Test.kt:21:6:21:10 | After ... < ... [false] | 3 | Test.kt:21:3:24:9 | After true [true] |
+| Test.kt:21:6:21:10 | After ... < ... [false] | 4 | Test.kt:24:4:24:9 | Before return ... |
+| Test.kt:21:6:21:10 | After ... < ... [false] | 5 | Test.kt:24:4:24:9 | INSTANCE |
+| Test.kt:21:6:21:10 | After ... < ... [false] | 6 | Test.kt:24:4:24:9 | return ... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 0 | Test.kt:21:6:21:10 | After ... < ... [true] |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 1 | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 2 | Test.kt:22:4:22:9 | Before ...=... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 3 | Test.kt:22:4:22:4 | y |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 4 | Test.kt:22:8:22:9 | 40 |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 5 | Test.kt:22:4:22:9 | ...=... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 6 | Test.kt:22:4:22:9 | After ...=... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 7 | Test.kt:22:4:22:4 | After <Expr>; |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 8 | Test.kt:21:3:24:9 | After when ... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 9 | Test.kt:21:3:24:9 | After <Expr>; |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 10 | Test.kt:27:3:27:3 | <Expr>; |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 11 | Test.kt:27:3:27:8 | Before ...=... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 12 | Test.kt:27:3:27:3 | z |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 13 | Test.kt:27:7:27:8 | 10 |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 14 | Test.kt:27:3:27:8 | ...=... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 15 | Test.kt:27:3:27:8 | After ...=... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 16 | Test.kt:27:3:27:3 | After <Expr>; |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 17 | Test.kt:30:3:33:3 | <Expr>; |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 18 | Test.kt:30:3:33:3 | when ... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 19 | Test.kt:30:3:33:3 | ... -> ... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 20 | Test.kt:30:7:30:12 | Before ... (value equals) ... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 21 | Test.kt:30:7:30:7 | x |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 22 | Test.kt:30:12:30:12 | 0 |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 23 | Test.kt:30:7:30:12 | ... (value equals) ... |
+| Test.kt:30:3:33:3 | After when ... | 0 | Test.kt:30:3:33:3 | After when ... |
+| Test.kt:30:3:33:3 | After when ... | 1 | Test.kt:30:3:33:3 | After <Expr>; |
+| Test.kt:30:3:33:3 | After when ... | 2 | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:30:3:33:3 | After when ... | 3 | Test.kt:35:3:35:8 | Before ...=... |
+| Test.kt:30:3:33:3 | After when ... | 4 | Test.kt:35:3:35:3 | z |
+| Test.kt:30:3:33:3 | After when ... | 5 | Test.kt:35:7:35:8 | 20 |
+| Test.kt:30:3:33:3 | After when ... | 6 | Test.kt:35:3:35:8 | ...=... |
+| Test.kt:30:3:33:3 | After when ... | 7 | Test.kt:35:3:35:8 | After ...=... |
+| Test.kt:30:3:33:3 | After when ... | 8 | Test.kt:35:3:35:3 | After <Expr>; |
+| Test.kt:30:3:33:3 | After when ... | 9 | Test.kt:38:3:41:3 | while (...) |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [false] | 0 | Test.kt:30:7:30:12 | After ... (value equals) ... [false] |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 0 | Test.kt:30:7:30:12 | After ... (value equals) ... [true] |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 1 | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 2 | Test.kt:31:4:31:4 | <Expr>; |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 3 | Test.kt:31:4:31:9 | Before ...=... |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 4 | Test.kt:31:4:31:4 | y |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 5 | Test.kt:31:8:31:9 | 60 |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 6 | Test.kt:31:4:31:9 | ...=... |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 7 | Test.kt:31:4:31:9 | After ...=... |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 8 | Test.kt:31:4:31:4 | After <Expr>; |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 9 | Test.kt:32:4:32:4 | <Expr>; |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 10 | Test.kt:32:4:32:9 | Before ...=... |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 11 | Test.kt:32:4:32:4 | z |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 12 | Test.kt:32:8:32:9 | 10 |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 13 | Test.kt:32:4:32:9 | ...=... |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 14 | Test.kt:32:4:32:9 | After ...=... |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 15 | Test.kt:32:4:32:4 | After <Expr>; |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 16 | Test.kt:30:15:33:3 | After { ... } |
+| Test.kt:38:3:41:3 | [LoopHeader] while (...) | 0 | Test.kt:38:3:41:3 | [LoopHeader] while (...) |
+| Test.kt:38:3:41:3 | [LoopHeader] while (...) | 1 | Test.kt:38:9:38:13 | Before ... > ... |
+| Test.kt:38:3:41:3 | [LoopHeader] while (...) | 2 | Test.kt:38:9:38:9 | x |
+| Test.kt:38:3:41:3 | [LoopHeader] while (...) | 3 | Test.kt:38:13:38:13 | 0 |
+| Test.kt:38:3:41:3 | [LoopHeader] while (...) | 4 | Test.kt:38:9:38:13 | ... > ... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 0 | Test.kt:38:9:38:13 | After ... > ... [false] |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 1 | Test.kt:38:3:41:3 | After while (...) |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 2 | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 3 | Test.kt:43:3:43:8 | Before ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 4 | Test.kt:43:3:43:3 | z |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 5 | Test.kt:43:7:43:8 | 30 |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 6 | Test.kt:43:3:43:8 | ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 7 | Test.kt:43:3:43:8 | After ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 8 | Test.kt:43:3:43:3 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 9 | Test.kt:73:3:73:3 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 10 | Test.kt:73:3:73:8 | Before ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 11 | Test.kt:73:3:73:3 | z |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 12 | Test.kt:73:7:73:8 | 50 |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 13 | Test.kt:73:3:73:8 | ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 14 | Test.kt:73:3:73:8 | After ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 15 | Test.kt:73:3:73:3 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 16 | Test.kt:77:3:77:3 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 17 | Test.kt:77:3:77:8 | Before ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 18 | Test.kt:77:3:77:3 | w |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 19 | Test.kt:77:7:77:8 | 40 |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 20 | Test.kt:77:3:77:8 | ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 21 | Test.kt:77:3:77:8 | After ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 22 | Test.kt:77:3:77:3 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 23 | Test.kt:78:3:78:8 | Before return ... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 24 | Test.kt:78:3:78:8 | INSTANCE |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 25 | Test.kt:78:3:78:8 | return ... |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 0 | Test.kt:38:9:38:13 | After ... > ... [true] |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 1 | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 2 | Test.kt:39:4:39:4 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 3 | Test.kt:39:4:39:9 | Before ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 4 | Test.kt:39:4:39:4 | y |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 5 | Test.kt:39:8:39:9 | 10 |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 6 | Test.kt:39:4:39:9 | ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 7 | Test.kt:39:4:39:9 | After ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 8 | Test.kt:39:4:39:4 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 9 | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 10 | Test.kt:40:4:40:6 | Before <implicit coercion to unit> |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 11 | Test.kt:40:4:40:6 | Before <Stmt> |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 12 | Test.kt:40:4:40:6 | { ... } |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 13 | Test.kt:40:4:40:6 | var ...; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 14 | Test.kt:40:4:40:6 | Before tmp0 |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 15 | Test.kt:40:4:40:4 | x |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 16 | Test.kt:40:4:40:6 | tmp0 |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 17 | Test.kt:40:4:40:6 | After tmp0 |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 18 | Test.kt:40:4:40:6 | After var ...; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 19 | Test.kt:40:4:40:4 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 20 | Test.kt:40:4:40:6 | Before ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 21 | Test.kt:40:4:40:4 | x |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 22 | Test.kt:40:4:40:6 | Before dec(...) |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 23 | Test.kt:40:4:40:6 | tmp0 |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 24 | Test.kt:40:4:40:6 | dec(...) |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 25 | Test.kt:40:4:40:6 | After dec(...) |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 26 | Test.kt:40:4:40:6 | ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 27 | Test.kt:40:4:40:6 | After ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 28 | Test.kt:40:4:40:4 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 29 | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 30 | Test.kt:40:4:40:6 | tmp0 |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 31 | Test.kt:40:4:40:6 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 32 | Test.kt:40:4:40:6 | After { ... } |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 33 | Test.kt:40:4:40:6 | <Stmt> |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 34 | Test.kt:40:4:40:6 | After <Stmt> |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 35 | Test.kt:40:4:40:6 | <implicit coercion to unit> |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 36 | Test.kt:40:4:40:6 | After <implicit coercion to unit> |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 37 | Test.kt:40:4:40:6 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 38 | Test.kt:38:16:41:3 | After { ... } |
+| Test.kt:82:1:89:1 | Entry | 0 | Test.kt:82:1:89:1 | Entry |
+| Test.kt:82:1:89:1 | Entry | 1 | Test.kt:82:21:89:1 | { ... } |
+| Test.kt:82:1:89:1 | Entry | 2 | Test.kt:83:2:88:2 | try ... |
+| Test.kt:82:1:89:1 | Entry | 3 | Test.kt:83:6:86:2 | { ... } |
+| Test.kt:82:1:89:1 | Entry | 4 | Test.kt:84:7:84:7 | var ...; |
+| Test.kt:82:1:89:1 | Entry | 5 | Test.kt:84:7:84:7 | Before x |
+| Test.kt:82:1:89:1 | Entry | 6 | Test.kt:84:11:84:18 | Before (...)... |
+| Test.kt:82:1:89:1 | Entry | 7 | Test.kt:84:11:84:11 | o |
+| Test.kt:82:1:89:1 | Entry | 8 | Test.kt:84:11:84:18 | (...)... |
 | Test.kt:82:1:89:1 | Exit | 0 | Test.kt:82:1:89:1 | Exit |
 | Test.kt:82:1:89:1 | Normal Exit | 0 | Test.kt:82:1:89:1 | Normal Exit |
-| Test.kt:82:21:89:1 | { ... } | 0 | Test.kt:82:21:89:1 | { ... } |
-| Test.kt:82:21:89:1 | { ... } | 1 | Test.kt:83:2:88:2 | try ... |
-| Test.kt:82:21:89:1 | { ... } | 2 | Test.kt:83:6:86:2 | { ... } |
-| Test.kt:82:21:89:1 | { ... } | 3 | Test.kt:84:7:84:7 | var ...; |
-| Test.kt:82:21:89:1 | { ... } | 4 | Test.kt:84:11:84:11 | o |
-| Test.kt:82:21:89:1 | { ... } | 5 | Test.kt:84:11:84:18 | (...)... |
-| Test.kt:84:7:84:7 | x | 0 | Test.kt:84:7:84:7 | x |
-| Test.kt:84:7:84:7 | x | 1 | Test.kt:85:10:85:10 | 1 |
-| Test.kt:84:7:84:7 | x | 2 | Test.kt:85:3:85:10 | return ... |
+| Test.kt:84:11:84:18 | After (...)... | 0 | Test.kt:84:11:84:18 | After (...)... |
+| Test.kt:84:11:84:18 | After (...)... | 1 | Test.kt:84:7:84:7 | x |
+| Test.kt:84:11:84:18 | After (...)... | 2 | Test.kt:84:7:84:7 | After x |
+| Test.kt:84:11:84:18 | After (...)... | 3 | Test.kt:84:7:84:7 | After var ...; |
+| Test.kt:84:11:84:18 | After (...)... | 4 | Test.kt:85:3:85:10 | Before return ... |
+| Test.kt:84:11:84:18 | After (...)... | 5 | Test.kt:85:10:85:10 | 1 |
+| Test.kt:84:11:84:18 | After (...)... | 6 | Test.kt:85:3:85:10 | return ... |
+| Test.kt:86:4:88:2 | After catch (...) [match] | 0 | Test.kt:86:4:88:2 | After catch (...) [match] |
+| Test.kt:86:4:88:2 | After catch (...) [match] | 1 | Test.kt:86:11:86:31 | e |
+| Test.kt:86:4:88:2 | After catch (...) [match] | 2 | Test.kt:86:34:88:2 | { ... } |
+| Test.kt:86:4:88:2 | After catch (...) [match] | 3 | Test.kt:87:3:87:10 | Before return ... |
+| Test.kt:86:4:88:2 | After catch (...) [match] | 4 | Test.kt:87:10:87:10 | 2 |
+| Test.kt:86:4:88:2 | After catch (...) [match] | 5 | Test.kt:87:3:87:10 | return ... |
+| Test.kt:86:4:88:2 | After catch (...) [no-match] | 0 | Test.kt:86:4:88:2 | After catch (...) [no-match] |
+| Test.kt:86:4:88:2 | After catch (...) [no-match] | 1 | Test.kt:82:1:89:1 | Exceptional Exit |
 | Test.kt:86:4:88:2 | catch (...) | 0 | Test.kt:86:4:88:2 | catch (...) |
-| Test.kt:86:4:88:2 | catch (...) | 1 | Test.kt:86:11:86:31 | e |
-| Test.kt:86:4:88:2 | catch (...) | 2 | Test.kt:86:34:88:2 | { ... } |
-| Test.kt:86:4:88:2 | catch (...) | 3 | Test.kt:87:10:87:10 | 2 |
-| Test.kt:86:4:88:2 | catch (...) | 4 | Test.kt:87:3:87:10 | return ... |
-| Test.kt:91:1:98:1 | Exceptional Exit | 0 | Test.kt:91:1:98:1 | Exceptional Exit |
+| Test.kt:91:1:98:1 | Entry | 0 | Test.kt:91:1:98:1 | Entry |
+| Test.kt:91:1:98:1 | Entry | 1 | Test.kt:91:22:98:1 | { ... } |
+| Test.kt:91:1:98:1 | Entry | 2 | Test.kt:92:2:97:2 | try ... |
+| Test.kt:91:1:98:1 | Entry | 3 | Test.kt:92:6:95:2 | { ... } |
+| Test.kt:91:1:98:1 | Entry | 4 | Test.kt:93:7:93:7 | var ...; |
+| Test.kt:91:1:98:1 | Entry | 5 | Test.kt:93:7:93:7 | Before x |
+| Test.kt:91:1:98:1 | Entry | 6 | Test.kt:93:12:93:13 | Before ...!! |
+| Test.kt:91:1:98:1 | Entry | 7 | Test.kt:93:11:93:11 | o |
+| Test.kt:91:1:98:1 | Entry | 8 | Test.kt:93:12:93:13 | ...!! |
 | Test.kt:91:1:98:1 | Exit | 0 | Test.kt:91:1:98:1 | Exit |
 | Test.kt:91:1:98:1 | Normal Exit | 0 | Test.kt:91:1:98:1 | Normal Exit |
-| Test.kt:91:22:98:1 | { ... } | 0 | Test.kt:91:22:98:1 | { ... } |
-| Test.kt:91:22:98:1 | { ... } | 1 | Test.kt:92:2:97:2 | try ... |
-| Test.kt:91:22:98:1 | { ... } | 2 | Test.kt:92:6:95:2 | { ... } |
-| Test.kt:91:22:98:1 | { ... } | 3 | Test.kt:93:7:93:7 | var ...; |
-| Test.kt:91:22:98:1 | { ... } | 4 | Test.kt:93:11:93:11 | o |
-| Test.kt:91:22:98:1 | { ... } | 5 | Test.kt:93:12:93:13 | ...!! |
-| Test.kt:93:7:93:7 | x | 0 | Test.kt:93:7:93:7 | x |
-| Test.kt:93:7:93:7 | x | 1 | Test.kt:94:10:94:10 | 1 |
-| Test.kt:93:7:93:7 | x | 2 | Test.kt:94:3:94:10 | return ... |
+| Test.kt:93:12:93:13 | After ...!! | 0 | Test.kt:93:12:93:13 | After ...!! |
+| Test.kt:93:12:93:13 | After ...!! | 1 | Test.kt:93:7:93:7 | x |
+| Test.kt:93:12:93:13 | After ...!! | 2 | Test.kt:93:7:93:7 | After x |
+| Test.kt:93:12:93:13 | After ...!! | 3 | Test.kt:93:7:93:7 | After var ...; |
+| Test.kt:93:12:93:13 | After ...!! | 4 | Test.kt:94:3:94:10 | Before return ... |
+| Test.kt:93:12:93:13 | After ...!! | 5 | Test.kt:94:10:94:10 | 1 |
+| Test.kt:93:12:93:13 | After ...!! | 6 | Test.kt:94:3:94:10 | return ... |
+| Test.kt:95:4:97:2 | After catch (...) [match] | 0 | Test.kt:95:4:97:2 | After catch (...) [match] |
+| Test.kt:95:4:97:2 | After catch (...) [match] | 1 | Test.kt:95:11:95:33 | e |
+| Test.kt:95:4:97:2 | After catch (...) [match] | 2 | Test.kt:95:36:97:2 | { ... } |
+| Test.kt:95:4:97:2 | After catch (...) [match] | 3 | Test.kt:96:3:96:10 | Before return ... |
+| Test.kt:95:4:97:2 | After catch (...) [match] | 4 | Test.kt:96:10:96:10 | 2 |
+| Test.kt:95:4:97:2 | After catch (...) [match] | 5 | Test.kt:96:3:96:10 | return ... |
+| Test.kt:95:4:97:2 | After catch (...) [no-match] | 0 | Test.kt:95:4:97:2 | After catch (...) [no-match] |
+| Test.kt:95:4:97:2 | After catch (...) [no-match] | 1 | Test.kt:91:1:98:1 | Exceptional Exit |
 | Test.kt:95:4:97:2 | catch (...) | 0 | Test.kt:95:4:97:2 | catch (...) |
-| Test.kt:95:4:97:2 | catch (...) | 1 | Test.kt:95:11:95:33 | e |
-| Test.kt:95:4:97:2 | catch (...) | 2 | Test.kt:95:36:97:2 | { ... } |
-| Test.kt:95:4:97:2 | catch (...) | 3 | Test.kt:96:10:96:10 | 2 |
-| Test.kt:95:4:97:2 | catch (...) | 4 | Test.kt:96:3:96:10 | return ... |
+| Test.kt:100:1:110:1 | Entry | 0 | Test.kt:100:1:110:1 | Entry |
+| Test.kt:100:1:110:1 | Entry | 1 | Test.kt:100:25:110:1 | { ... } |
+| Test.kt:100:1:110:1 | Entry | 2 | Test.kt:101:5:103:5 | <Expr>; |
+| Test.kt:100:1:110:1 | Entry | 3 | Test.kt:101:5:103:5 | when ... |
+| Test.kt:100:1:110:1 | Entry | 4 | Test.kt:101:5:103:5 | ... -> ... |
+| Test.kt:100:1:110:1 | Entry | 5 | Test.kt:101:9:101:30 | ... && ... |
+| Test.kt:100:1:110:1 | Entry | 6 | Test.kt:101:9:101:17 | Before ... (value equals) ... |
+| Test.kt:100:1:110:1 | Entry | 7 | Test.kt:101:9:101:9 | x |
+| Test.kt:100:1:110:1 | Entry | 8 | Test.kt:101:14:101:17 | null |
+| Test.kt:100:1:110:1 | Entry | 9 | Test.kt:101:9:101:17 | ... (value equals) ... |
 | Test.kt:100:1:110:1 | Exit | 0 | Test.kt:100:1:110:1 | Exit |
-| Test.kt:100:1:110:1 | Normal Exit | 0 | Test.kt:100:1:110:1 | Normal Exit |
-| Test.kt:100:25:110:1 | { ... } | 0 | Test.kt:100:25:110:1 | { ... } |
-| Test.kt:100:25:110:1 | { ... } | 1 | Test.kt:101:5:103:5 | <Expr>; |
-| Test.kt:100:25:110:1 | { ... } | 2 | Test.kt:101:5:103:5 | when ... |
-| Test.kt:100:25:110:1 | { ... } | 3 | Test.kt:101:5:103:5 | ... -> ... |
-| Test.kt:100:25:110:1 | { ... } | 4 | Test.kt:101:9:101:30 | ... && ... |
-| Test.kt:100:25:110:1 | { ... } | 5 | Test.kt:101:9:101:9 | x |
-| Test.kt:100:25:110:1 | { ... } | 6 | Test.kt:101:14:101:17 | null |
-| Test.kt:100:25:110:1 | { ... } | 7 | Test.kt:101:9:101:17 | ... (value equals) ... |
-| Test.kt:101:22:101:22 | y | 0 | Test.kt:101:22:101:22 | y |
-| Test.kt:101:22:101:22 | y | 1 | Test.kt:101:27:101:30 | null |
-| Test.kt:101:22:101:22 | y | 2 | Test.kt:101:22:101:30 | ... (value equals) ... |
-| Test.kt:101:33:103:5 | { ... } | 0 | Test.kt:101:33:103:5 | { ... } |
-| Test.kt:101:33:103:5 | { ... } | 1 | Test.kt:102:15:102:25 | new Exception(...) |
-| Test.kt:101:33:103:5 | { ... } | 2 | Test.kt:102:9:102:25 | throw ... |
-| Test.kt:101:33:103:5 | { ... } | 3 | Test.kt:100:1:110:1 | Exceptional Exit |
-| Test.kt:105:5:109:5 | <Expr>; | 0 | Test.kt:105:5:109:5 | <Expr>; |
-| Test.kt:105:5:109:5 | <Expr>; | 1 | Test.kt:105:5:109:5 | when ... |
-| Test.kt:105:5:109:5 | <Expr>; | 2 | Test.kt:105:9:107:5 | ... -> ... |
-| Test.kt:105:5:109:5 | <Expr>; | 3 | Test.kt:105:9:105:9 | x |
-| Test.kt:105:5:109:5 | <Expr>; | 4 | Test.kt:105:14:105:17 | null |
-| Test.kt:105:5:109:5 | <Expr>; | 5 | Test.kt:105:9:105:17 | ... (value not-equals) ... |
-| Test.kt:105:20:107:5 | { ... } | 0 | Test.kt:105:20:107:5 | { ... } |
-| Test.kt:105:20:107:5 | { ... } | 1 | Test.kt:106:9:106:29 | <Expr>; |
-| Test.kt:105:20:107:5 | { ... } | 2 | Test.kt:106:17:106:28 | "x not null" |
-| Test.kt:105:20:107:5 | { ... } | 3 | Test.kt:106:9:106:29 | println(...) |
-| Test.kt:107:16:109:5 | ... -> ... | 0 | Test.kt:107:16:109:5 | ... -> ... |
-| Test.kt:107:16:109:5 | ... -> ... | 1 | Test.kt:107:16:107:16 | y |
-| Test.kt:107:16:109:5 | ... -> ... | 2 | Test.kt:107:21:107:24 | null |
-| Test.kt:107:16:109:5 | ... -> ... | 3 | Test.kt:107:16:107:24 | ... (value not-equals) ... |
-| Test.kt:107:27:109:5 | { ... } | 0 | Test.kt:107:27:109:5 | { ... } |
-| Test.kt:107:27:109:5 | { ... } | 1 | Test.kt:108:9:108:29 | <Expr>; |
-| Test.kt:107:27:109:5 | { ... } | 2 | Test.kt:108:17:108:28 | "y not null" |
-| Test.kt:107:27:109:5 | { ... } | 3 | Test.kt:108:9:108:29 | println(...) |
-| Test.kt:112:1:116:1 | Exceptional Exit | 0 | Test.kt:112:1:116:1 | Exceptional Exit |
-| Test.kt:112:1:116:1 | Exit | 0 | Test.kt:112:1:116:1 | Exit |
-| Test.kt:112:1:116:1 | Normal Exit | 0 | Test.kt:112:1:116:1 | Normal Exit |
-| Test.kt:112:32:116:1 | { ... } | 0 | Test.kt:112:32:116:1 | { ... } |
-| Test.kt:112:32:116:1 | { ... } | 1 | Test.kt:113:5:115:5 | <Expr>; |
-| Test.kt:112:32:116:1 | { ... } | 2 | Test.kt:113:5:115:5 | when ... |
-| Test.kt:112:32:116:1 | { ... } | 3 | Test.kt:113:5:115:5 | ... -> ... |
-| Test.kt:112:32:116:1 | { ... } | 4 | Test.kt:113:9:113:14 | ... && ... |
-| Test.kt:112:32:116:1 | { ... } | 5 | Test.kt:113:9:113:9 | x |
-| Test.kt:113:14:113:14 | y | 0 | Test.kt:113:14:113:14 | y |
-| Test.kt:113:17:115:5 | { ... } | 0 | Test.kt:113:17:115:5 | { ... } |
-| Test.kt:118:1:124:1 | Exceptional Exit | 0 | Test.kt:118:1:124:1 | Exceptional Exit |
-| Test.kt:118:1:124:1 | Exit | 0 | Test.kt:118:1:124:1 | Exit |
-| Test.kt:118:1:124:1 | Normal Exit | 0 | Test.kt:118:1:124:1 | Normal Exit |
-| Test.kt:118:37:124:1 | { ... } | 0 | Test.kt:118:37:124:1 | { ... } |
-| Test.kt:118:37:124:1 | { ... } | 1 | Test.kt:119:2:123:12 | <Expr>; |
-| Test.kt:118:37:124:1 | { ... } | 2 | Test.kt:119:2:123:12 | when ... |
-| Test.kt:118:37:124:1 | { ... } | 3 | Test.kt:120:3:123:10 | ... -> ... |
-| Test.kt:118:37:124:1 | { ... } | 4 | Test.kt:120:3:123:3 | when ... |
-| Test.kt:118:37:124:1 | { ... } | 5 | Test.kt:121:4:121:9 | ... -> ... |
-| Test.kt:118:37:124:1 | { ... } | 6 | Test.kt:121:4:121:4 | x |
-| Test.kt:121:9:121:9 | <Expr>; | 0 | Test.kt:121:9:121:9 | <Expr>; |
-| Test.kt:121:9:121:9 | <Expr>; | 1 | Test.kt:121:9:121:9 | y |
-| Test.kt:122:12:122:16 | ... -> ... | 0 | Test.kt:122:12:122:16 | ... -> ... |
-| Test.kt:122:12:122:16 | ... -> ... | 1 | Test.kt:122:12:122:16 | true |
-| Test.kt:122:12:122:16 | ... -> ... | 2 | Test.kt:122:12:122:16 | <Expr>; |
-| Test.kt:122:12:122:16 | ... -> ... | 3 | Test.kt:122:12:122:16 | false |
-| Test.kt:123:8:123:10 | { ... } | 0 | Test.kt:123:8:123:10 | { ... } |
+| Test.kt:101:9:101:17 | After ... (value equals) ... [false] | 0 | Test.kt:101:9:101:17 | After ... (value equals) ... [false] |
+| Test.kt:101:9:101:17 | After ... (value equals) ... [true] | 0 | Test.kt:101:9:101:17 | After ... (value equals) ... [true] |
+| Test.kt:101:9:101:17 | After ... (value equals) ... [true] | 1 | Test.kt:101:22:101:30 | Before ... (value equals) ... |
+| Test.kt:101:9:101:17 | After ... (value equals) ... [true] | 2 | Test.kt:101:22:101:22 | y |
+| Test.kt:101:9:101:17 | After ... (value equals) ... [true] | 3 | Test.kt:101:27:101:30 | null |
+| Test.kt:101:9:101:17 | After ... (value equals) ... [true] | 4 | Test.kt:101:22:101:30 | ... (value equals) ... |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 0 | Test.kt:101:9:101:30 | After ... && ... [false] |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 1 | Test.kt:101:5:103:5 | After when ... |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 2 | Test.kt:101:5:103:5 | After <Expr>; |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 3 | Test.kt:105:5:109:5 | <Expr>; |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 4 | Test.kt:105:5:109:5 | when ... |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 5 | Test.kt:105:9:107:5 | ... -> ... |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 6 | Test.kt:105:9:105:17 | Before ... (value not-equals) ... |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 7 | Test.kt:105:9:105:9 | x |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 8 | Test.kt:105:14:105:17 | null |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 9 | Test.kt:105:9:105:17 | ... (value not-equals) ... |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [false] | 0 | Test.kt:101:22:101:30 | After ... (value equals) ... [false] |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [true] | 0 | Test.kt:101:22:101:30 | After ... (value equals) ... [true] |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [true] | 1 | Test.kt:101:9:101:30 | After ... && ... [true] |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [true] | 2 | Test.kt:101:33:103:5 | { ... } |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [true] | 3 | Test.kt:102:9:102:25 | Before throw ... |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [true] | 4 | Test.kt:102:15:102:25 | Before new Exception(...) |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [true] | 5 | Test.kt:102:15:102:25 | new Exception(...) |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [true] | 6 | Test.kt:102:15:102:25 | After new Exception(...) |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [true] | 7 | Test.kt:102:9:102:25 | throw ... |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [true] | 8 | Test.kt:100:1:110:1 | Exceptional Exit |
+| Test.kt:105:5:109:5 | After when ... | 0 | Test.kt:105:5:109:5 | After when ... |
+| Test.kt:105:5:109:5 | After when ... | 1 | Test.kt:105:5:109:5 | After <Expr>; |
+| Test.kt:105:5:109:5 | After when ... | 2 | Test.kt:100:25:110:1 | After { ... } |
+| Test.kt:105:5:109:5 | After when ... | 3 | Test.kt:100:1:110:1 | Normal Exit |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [false] | 0 | Test.kt:105:9:105:17 | After ... (value not-equals) ... [false] |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [false] | 1 | Test.kt:107:16:109:5 | ... -> ... |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [false] | 2 | Test.kt:107:16:107:24 | Before ... (value not-equals) ... |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [false] | 3 | Test.kt:107:16:107:16 | y |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [false] | 4 | Test.kt:107:21:107:24 | null |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [false] | 5 | Test.kt:107:16:107:24 | ... (value not-equals) ... |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] | 0 | Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] | 1 | Test.kt:105:20:107:5 | { ... } |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] | 2 | Test.kt:106:9:106:29 | <Expr>; |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] | 3 | Test.kt:106:9:106:29 | Before println(...) |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] | 4 | Test.kt:106:17:106:28 | "x not null" |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] | 5 | Test.kt:106:9:106:29 | println(...) |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] | 6 | Test.kt:106:9:106:29 | After println(...) |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] | 7 | Test.kt:106:9:106:29 | After <Expr>; |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] | 8 | Test.kt:105:20:107:5 | After { ... } |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [false] | 0 | Test.kt:107:16:107:24 | After ... (value not-equals) ... [false] |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] | 0 | Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] | 1 | Test.kt:107:27:109:5 | { ... } |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] | 2 | Test.kt:108:9:108:29 | <Expr>; |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] | 3 | Test.kt:108:9:108:29 | Before println(...) |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] | 4 | Test.kt:108:17:108:28 | "y not null" |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] | 5 | Test.kt:108:9:108:29 | println(...) |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] | 6 | Test.kt:108:9:108:29 | After println(...) |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] | 7 | Test.kt:108:9:108:29 | After <Expr>; |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] | 8 | Test.kt:107:27:109:5 | After { ... } |
+| Test.kt:112:1:116:1 | Entry | 0 | Test.kt:112:1:116:1 | Entry |
+| Test.kt:112:1:116:1 | Entry | 1 | Test.kt:112:32:116:1 | { ... } |
+| Test.kt:112:1:116:1 | Entry | 2 | Test.kt:113:5:115:5 | <Expr>; |
+| Test.kt:112:1:116:1 | Entry | 3 | Test.kt:113:5:115:5 | when ... |
+| Test.kt:112:1:116:1 | Entry | 4 | Test.kt:113:5:115:5 | ... -> ... |
+| Test.kt:112:1:116:1 | Entry | 5 | Test.kt:113:9:113:14 | ... && ... |
+| Test.kt:112:1:116:1 | Entry | 6 | Test.kt:113:9:113:9 | x |
+| Test.kt:113:5:115:5 | After when ... | 0 | Test.kt:113:5:115:5 | After when ... |
+| Test.kt:113:5:115:5 | After when ... | 1 | Test.kt:113:5:115:5 | After <Expr>; |
+| Test.kt:113:5:115:5 | After when ... | 2 | Test.kt:112:32:116:1 | After { ... } |
+| Test.kt:113:5:115:5 | After when ... | 3 | Test.kt:112:1:116:1 | Normal Exit |
+| Test.kt:113:5:115:5 | After when ... | 4 | Test.kt:112:1:116:1 | Exit |
+| Test.kt:113:9:113:9 | After x [false] | 0 | Test.kt:113:9:113:9 | After x [false] |
+| Test.kt:113:9:113:9 | After x [true] | 0 | Test.kt:113:9:113:9 | After x [true] |
+| Test.kt:113:9:113:9 | After x [true] | 1 | Test.kt:113:14:113:14 | y |
+| Test.kt:113:9:113:14 | After ... && ... [false] | 0 | Test.kt:113:9:113:14 | After ... && ... [false] |
+| Test.kt:113:14:113:14 | After y [false] | 0 | Test.kt:113:14:113:14 | After y [false] |
+| Test.kt:113:14:113:14 | After y [true] | 0 | Test.kt:113:14:113:14 | After y [true] |
+| Test.kt:113:14:113:14 | After y [true] | 1 | Test.kt:113:9:113:14 | After ... && ... [true] |
+| Test.kt:113:14:113:14 | After y [true] | 2 | Test.kt:113:17:115:5 | { ... } |
+| Test.kt:118:1:124:1 | Entry | 0 | Test.kt:118:1:124:1 | Entry |
+| Test.kt:118:1:124:1 | Entry | 1 | Test.kt:118:37:124:1 | { ... } |
+| Test.kt:118:1:124:1 | Entry | 2 | Test.kt:119:2:123:12 | <Expr>; |
+| Test.kt:118:1:124:1 | Entry | 3 | Test.kt:119:2:123:12 | when ... |
+| Test.kt:118:1:124:1 | Entry | 4 | Test.kt:120:3:123:10 | ... -> ... |
+| Test.kt:118:1:124:1 | Entry | 5 | Test.kt:120:3:123:3 | when ... |
+| Test.kt:118:1:124:1 | Entry | 6 | Test.kt:121:4:121:9 | ... -> ... |
+| Test.kt:118:1:124:1 | Entry | 7 | Test.kt:121:4:121:4 | x |
+| Test.kt:119:2:123:12 | After when ... | 0 | Test.kt:119:2:123:12 | After when ... |
+| Test.kt:119:2:123:12 | After when ... | 1 | Test.kt:119:2:123:12 | After <Expr>; |
+| Test.kt:119:2:123:12 | After when ... | 2 | Test.kt:118:37:124:1 | After { ... } |
+| Test.kt:119:2:123:12 | After when ... | 3 | Test.kt:118:1:124:1 | Normal Exit |
+| Test.kt:119:2:123:12 | After when ... | 4 | Test.kt:118:1:124:1 | Exit |
+| Test.kt:120:3:123:3 | After when ... [false] | 0 | Test.kt:120:3:123:3 | After when ... [false] |
+| Test.kt:120:3:123:3 | After when ... [true] | 0 | Test.kt:120:3:123:3 | After when ... [true] |
+| Test.kt:120:3:123:3 | After when ... [true] | 1 | Test.kt:123:8:123:10 | { ... } |
+| Test.kt:121:4:121:4 | After x [false] | 0 | Test.kt:121:4:121:4 | After x [false] |
+| Test.kt:121:4:121:4 | After x [false] | 1 | Test.kt:122:12:122:16 | ... -> ... |
+| Test.kt:121:4:121:4 | After x [false] | 2 | Test.kt:122:12:122:16 | true |
+| Test.kt:121:4:121:4 | After x [false] | 3 | Test.kt:122:12:122:16 | After true [true] |
+| Test.kt:121:4:121:4 | After x [false] | 4 | Test.kt:122:12:122:16 | <Expr>; |
+| Test.kt:121:4:121:4 | After x [false] | 5 | Test.kt:122:12:122:16 | false |
+| Test.kt:121:4:121:4 | After x [false] | 6 | Test.kt:122:12:122:16 | After <Expr>; |
+| Test.kt:121:4:121:4 | After x [true] | 0 | Test.kt:121:4:121:4 | After x [true] |
+| Test.kt:121:4:121:4 | After x [true] | 1 | Test.kt:121:9:121:9 | <Expr>; |
+| Test.kt:121:4:121:4 | After x [true] | 2 | Test.kt:121:9:121:9 | y |
+| Test.kt:121:4:121:4 | After x [true] | 3 | Test.kt:121:9:121:9 | After <Expr>; |
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStrictDominance.expected b/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStrictDominance.expected
index 6d0cb2bab71..bac6b722447 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStrictDominance.expected
+++ b/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStrictDominance.expected
@@ -1,6 +1,3 @@
-| Test.kt:3:8:80:1 | { ... } | Test.kt:3:8:80:1 | Exit |
-| Test.kt:4:2:79:2 | Normal Exit | Test.kt:4:2:79:2 | Exit |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:4:2:79:2 | Exit |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:4:2:79:2 | Normal Exit |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:11:3:16:3 | ... -> ... |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:11:14:14:3 | { ... } |
@@ -12,7 +9,6 @@
 | Test.kt:4:13:79:2 | { ... } | Test.kt:38:9:38:9 | x |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:38:16:41:3 | { ... } |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:43:3:43:3 | <Expr>; |
-| Test.kt:18:3:18:3 | <Expr>; | Test.kt:4:2:79:2 | Exit |
 | Test.kt:18:3:18:3 | <Expr>; | Test.kt:4:2:79:2 | Normal Exit |
 | Test.kt:18:3:18:3 | <Expr>; | Test.kt:21:3:24:9 | ... -> ... |
 | Test.kt:18:3:18:3 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
@@ -31,16 +27,22 @@
 | Test.kt:35:3:35:3 | <Expr>; | Test.kt:43:3:43:3 | <Expr>; |
 | Test.kt:38:9:38:9 | x | Test.kt:38:16:41:3 | { ... } |
 | Test.kt:38:9:38:9 | x | Test.kt:43:3:43:3 | <Expr>; |
-| Test.kt:82:1:89:1 | Normal Exit | Test.kt:82:1:89:1 | Exit |
+| Test.kt:82:21:89:1 | { ... } | Test.kt:82:1:89:1 | Exceptional Exit |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:82:1:89:1 | Exit |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:82:1:89:1 | Normal Exit |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:84:7:84:7 | x |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:86:4:88:2 | catch (...) |
-| Test.kt:91:1:98:1 | Normal Exit | Test.kt:91:1:98:1 | Exit |
+| Test.kt:82:21:89:1 | { ... } | Test.kt:86:11:86:31 | e |
+| Test.kt:86:4:88:2 | catch (...) | Test.kt:82:1:89:1 | Exceptional Exit |
+| Test.kt:86:4:88:2 | catch (...) | Test.kt:86:11:86:31 | e |
+| Test.kt:91:22:98:1 | { ... } | Test.kt:91:1:98:1 | Exceptional Exit |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:91:1:98:1 | Exit |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:91:1:98:1 | Normal Exit |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:93:7:93:7 | x |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:95:4:97:2 | catch (...) |
+| Test.kt:91:22:98:1 | { ... } | Test.kt:95:11:95:33 | e |
+| Test.kt:95:4:97:2 | catch (...) | Test.kt:91:1:98:1 | Exceptional Exit |
+| Test.kt:95:4:97:2 | catch (...) | Test.kt:95:11:95:33 | e |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:100:1:110:1 | Exit |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:100:1:110:1 | Normal Exit |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:101:22:101:22 | y |
@@ -55,16 +57,11 @@
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:107:16:109:5 | ... -> ... |
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:107:27:109:5 | { ... } |
 | Test.kt:107:16:109:5 | ... -> ... | Test.kt:107:27:109:5 | { ... } |
-| Test.kt:112:1:116:1 | Normal Exit | Test.kt:112:1:116:1 | Exit |
-| Test.kt:112:32:116:1 | { ... } | Test.kt:112:1:116:1 | Exit |
 | Test.kt:112:32:116:1 | { ... } | Test.kt:112:1:116:1 | Normal Exit |
 | Test.kt:112:32:116:1 | { ... } | Test.kt:113:14:113:14 | y |
 | Test.kt:112:32:116:1 | { ... } | Test.kt:113:17:115:5 | { ... } |
 | Test.kt:113:14:113:14 | y | Test.kt:113:17:115:5 | { ... } |
-| Test.kt:118:1:124:1 | Normal Exit | Test.kt:118:1:124:1 | Exit |
-| Test.kt:118:37:124:1 | { ... } | Test.kt:118:1:124:1 | Exit |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:118:1:124:1 | Normal Exit |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:121:9:121:9 | <Expr>; |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:122:12:122:16 | ... -> ... |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:123:8:123:10 | { ... } |
-| Test.kt:121:9:121:9 | <Expr>; | Test.kt:123:8:123:10 | { ... } |
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStrictDominance.ql b/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStrictDominance.ql
index de1e23b649c..72de0cc435d 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStrictDominance.ql
+++ b/java/ql/test-kotlin1/library-tests/controlflow/basic/bbStrictDominance.ql
@@ -1,6 +1,7 @@
 import java
 import semmle.code.java.controlflow.Dominance
+import utils.test.BasicBlock
 
 from BasicBlock b, BasicBlock b2
 where b.strictlyDominates(b2)
-select b, b2
+select getFirstAstNode(b), getFirstAstNode(b2)
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/basic/bbSuccessor.expected b/java/ql/test-kotlin1/library-tests/controlflow/basic/bbSuccessor.expected
index cf5da7c83b7..0596f159e22 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/basic/bbSuccessor.expected
+++ b/java/ql/test-kotlin1/library-tests/controlflow/basic/bbSuccessor.expected
@@ -1,7 +1,3 @@
-| Test.kt:3:8:80:1 | Exceptional Exit | Test.kt:3:8:80:1 | Exit |
-| Test.kt:3:8:80:1 | { ... } | Test.kt:3:8:80:1 | Exit |
-| Test.kt:4:2:79:2 | Exceptional Exit | Test.kt:4:2:79:2 | Exit |
-| Test.kt:4:2:79:2 | Normal Exit | Test.kt:4:2:79:2 | Exit |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:11:3:16:3 | ... -> ... |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:11:14:14:3 | { ... } |
 | Test.kt:11:3:16:3 | ... -> ... | Test.kt:18:3:18:3 | <Expr>; |
@@ -9,8 +5,9 @@
 | Test.kt:18:3:18:3 | <Expr>; | Test.kt:21:3:24:9 | ... -> ... |
 | Test.kt:18:3:18:3 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
 | Test.kt:21:3:24:9 | ... -> ... | Test.kt:4:2:79:2 | Normal Exit |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:7:30:12 | After ... (value equals) ... [false] |
 | Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:22:4:22:4 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [false] | Test.kt:35:3:35:3 | <Expr>; |
 | Test.kt:30:15:33:3 | { ... } | Test.kt:35:3:35:3 | <Expr>; |
 | Test.kt:35:3:35:3 | <Expr>; | Test.kt:38:9:38:9 | x |
 | Test.kt:38:9:38:9 | x | Test.kt:38:16:41:3 | { ... } |
@@ -22,37 +19,45 @@
 | Test.kt:82:21:89:1 | { ... } | Test.kt:84:7:84:7 | x |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:86:4:88:2 | catch (...) |
 | Test.kt:84:7:84:7 | x | Test.kt:82:1:89:1 | Normal Exit |
-| Test.kt:86:4:88:2 | catch (...) | Test.kt:82:1:89:1 | Normal Exit |
+| Test.kt:86:4:88:2 | catch (...) | Test.kt:82:1:89:1 | Exceptional Exit |
+| Test.kt:86:4:88:2 | catch (...) | Test.kt:86:11:86:31 | e |
+| Test.kt:86:11:86:31 | e | Test.kt:82:1:89:1 | Normal Exit |
 | Test.kt:91:1:98:1 | Exceptional Exit | Test.kt:91:1:98:1 | Exit |
 | Test.kt:91:1:98:1 | Normal Exit | Test.kt:91:1:98:1 | Exit |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:93:7:93:7 | x |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:95:4:97:2 | catch (...) |
 | Test.kt:93:7:93:7 | x | Test.kt:91:1:98:1 | Normal Exit |
-| Test.kt:95:4:97:2 | catch (...) | Test.kt:91:1:98:1 | Normal Exit |
+| Test.kt:95:4:97:2 | catch (...) | Test.kt:91:1:98:1 | Exceptional Exit |
+| Test.kt:95:4:97:2 | catch (...) | Test.kt:95:11:95:33 | e |
+| Test.kt:95:11:95:33 | e | Test.kt:91:1:98:1 | Normal Exit |
 | Test.kt:100:1:110:1 | Normal Exit | Test.kt:100:1:110:1 | Exit |
+| Test.kt:100:25:110:1 | { ... } | Test.kt:101:9:101:17 | After ... (value equals) ... [false] |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:101:22:101:22 | y |
-| Test.kt:100:25:110:1 | { ... } | Test.kt:105:5:109:5 | <Expr>; |
+| Test.kt:101:9:101:17 | After ... (value equals) ... [false] | Test.kt:105:5:109:5 | <Expr>; |
+| Test.kt:101:22:101:22 | y | Test.kt:101:22:101:30 | After ... (value equals) ... [false] |
 | Test.kt:101:22:101:22 | y | Test.kt:101:33:103:5 | { ... } |
-| Test.kt:101:22:101:22 | y | Test.kt:105:5:109:5 | <Expr>; |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [false] | Test.kt:105:5:109:5 | <Expr>; |
 | Test.kt:101:33:103:5 | { ... } | Test.kt:100:1:110:1 | Exit |
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:105:20:107:5 | { ... } |
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:107:16:109:5 | ... -> ... |
 | Test.kt:105:20:107:5 | { ... } | Test.kt:100:1:110:1 | Normal Exit |
-| Test.kt:107:16:109:5 | ... -> ... | Test.kt:100:1:110:1 | Normal Exit |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [false] | Test.kt:100:1:110:1 | Normal Exit |
+| Test.kt:107:16:109:5 | ... -> ... | Test.kt:107:16:107:24 | After ... (value not-equals) ... [false] |
 | Test.kt:107:16:109:5 | ... -> ... | Test.kt:107:27:109:5 | { ... } |
 | Test.kt:107:27:109:5 | { ... } | Test.kt:100:1:110:1 | Normal Exit |
-| Test.kt:112:1:116:1 | Exceptional Exit | Test.kt:112:1:116:1 | Exit |
-| Test.kt:112:1:116:1 | Normal Exit | Test.kt:112:1:116:1 | Exit |
-| Test.kt:112:32:116:1 | { ... } | Test.kt:112:1:116:1 | Normal Exit |
+| Test.kt:112:32:116:1 | { ... } | Test.kt:113:9:113:9 | After x [false] |
 | Test.kt:112:32:116:1 | { ... } | Test.kt:113:14:113:14 | y |
-| Test.kt:113:14:113:14 | y | Test.kt:112:1:116:1 | Normal Exit |
+| Test.kt:113:9:113:9 | After x [false] | Test.kt:113:9:113:14 | After ... && ... [false] |
+| Test.kt:113:9:113:14 | After ... && ... [false] | Test.kt:112:1:116:1 | Normal Exit |
+| Test.kt:113:14:113:14 | After y [false] | Test.kt:113:9:113:14 | After ... && ... [false] |
+| Test.kt:113:14:113:14 | y | Test.kt:113:14:113:14 | After y [false] |
 | Test.kt:113:14:113:14 | y | Test.kt:113:17:115:5 | { ... } |
 | Test.kt:113:17:115:5 | { ... } | Test.kt:112:1:116:1 | Normal Exit |
-| Test.kt:118:1:124:1 | Exceptional Exit | Test.kt:118:1:124:1 | Exit |
-| Test.kt:118:1:124:1 | Normal Exit | Test.kt:118:1:124:1 | Exit |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:121:9:121:9 | <Expr>; |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:122:12:122:16 | ... -> ... |
-| Test.kt:121:9:121:9 | <Expr>; | Test.kt:118:1:124:1 | Normal Exit |
+| Test.kt:120:3:123:3 | After when ... [false] | Test.kt:118:1:124:1 | Normal Exit |
+| Test.kt:121:9:121:9 | <Expr>; | Test.kt:120:3:123:3 | After when ... [false] |
 | Test.kt:121:9:121:9 | <Expr>; | Test.kt:123:8:123:10 | { ... } |
-| Test.kt:122:12:122:16 | ... -> ... | Test.kt:118:1:124:1 | Normal Exit |
+| Test.kt:122:12:122:16 | ... -> ... | Test.kt:120:3:123:3 | After when ... [false] |
+| Test.kt:122:12:122:16 | ... -> ... | Test.kt:123:8:123:10 | { ... } |
 | Test.kt:123:8:123:10 | { ... } | Test.kt:118:1:124:1 | Normal Exit |
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/basic/bbSuccessor.ql b/java/ql/test-kotlin1/library-tests/controlflow/basic/bbSuccessor.ql
index ae2d8a393b4..ae8dc5d188d 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/basic/bbSuccessor.ql
+++ b/java/ql/test-kotlin1/library-tests/controlflow/basic/bbSuccessor.ql
@@ -1,5 +1,6 @@
 import java
+import utils.test.BasicBlock
 
 from BasicBlock b, BasicBlock b2
 where b.getASuccessor() = b2
-select b, b2
+select getFirstAstNodeOrSynth(b), getFirstAstNodeOrSynth(b2)
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/basic/getASuccessor.expected b/java/ql/test-kotlin1/library-tests/controlflow/basic/getASuccessor.expected
index 1d07b13c9d7..8f9cce28160 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/basic/getASuccessor.expected
+++ b/java/ql/test-kotlin1/library-tests/controlflow/basic/getASuccessor.expected
@@ -1,12 +1,10 @@
 #select
 | Test.kt:3:1:80:1 | super(...) | SuperConstructorInvocationStmt | Test.kt:3:8:80:1 | { ... } | BlockStmt |
-| Test.kt:3:8:80:1 | Exceptional Exit | Constructor | Test.kt:3:8:80:1 | Exit | Constructor |
-| Test.kt:3:8:80:1 | Exit | Constructor | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:3:8:80:1 | Entry | Constructor | Test.kt:3:8:80:1 | { ... } | BlockStmt |
 | Test.kt:3:8:80:1 | Normal Exit | Constructor | Test.kt:3:8:80:1 | Exit | Constructor |
 | Test.kt:3:8:80:1 | { ... } | BlockStmt | Test.kt:3:1:80:1 | super(...) | SuperConstructorInvocationStmt |
 | Test.kt:3:8:80:1 | { ... } | BlockStmt | Test.kt:3:8:80:1 | Normal Exit | Constructor |
-| Test.kt:4:2:79:2 | Exceptional Exit | Method | Test.kt:4:2:79:2 | Exit | Method |
-| Test.kt:4:2:79:2 | Exit | Method | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:4:2:79:2 | Entry | Method | Test.kt:4:13:79:2 | { ... } | BlockStmt |
 | Test.kt:4:2:79:2 | Normal Exit | Method | Test.kt:4:2:79:2 | Exit | Method |
 | Test.kt:4:13:79:2 | { ... } | BlockStmt | Test.kt:5:7:5:7 | var ...; | LocalVariableDeclStmt |
 | Test.kt:5:7:5:7 | var ...; | LocalVariableDeclStmt | Test.kt:5:16:5:16 | 0 | IntegerLiteral |
@@ -31,17 +29,21 @@
 | Test.kt:11:7:11:11 | ... > ... | GTExpr | Test.kt:11:14:14:3 | { ... } | BlockStmt |
 | Test.kt:11:11:11:11 | 0 | IntegerLiteral | Test.kt:11:7:11:11 | ... > ... | GTExpr |
 | Test.kt:11:14:14:3 | { ... } | BlockStmt | Test.kt:12:4:12:4 | <Expr>; | ExprStmt |
-| Test.kt:12:4:12:4 | <Expr>; | ExprStmt | Test.kt:12:8:12:9 | 20 | LongLiteral |
+| Test.kt:12:4:12:4 | <Expr>; | ExprStmt | Test.kt:12:4:12:4 | y | VarAccess |
+| Test.kt:12:4:12:4 | y | VarAccess | Test.kt:12:8:12:9 | 20 | LongLiteral |
 | Test.kt:12:4:12:9 | ...=... | AssignExpr | Test.kt:13:4:13:4 | <Expr>; | ExprStmt |
 | Test.kt:12:8:12:9 | 20 | LongLiteral | Test.kt:12:4:12:9 | ...=... | AssignExpr |
-| Test.kt:13:4:13:4 | <Expr>; | ExprStmt | Test.kt:13:8:13:9 | 10 | IntegerLiteral |
+| Test.kt:13:4:13:4 | <Expr>; | ExprStmt | Test.kt:13:4:13:4 | z | VarAccess |
+| Test.kt:13:4:13:4 | z | VarAccess | Test.kt:13:8:13:9 | 10 | IntegerLiteral |
 | Test.kt:13:4:13:9 | ...=... | AssignExpr | Test.kt:18:3:18:3 | <Expr>; | ExprStmt |
 | Test.kt:13:8:13:9 | 10 | IntegerLiteral | Test.kt:13:4:13:9 | ...=... | AssignExpr |
 | Test.kt:14:10:16:3 | { ... } | BlockStmt | Test.kt:15:4:15:4 | <Expr>; | ExprStmt |
-| Test.kt:15:4:15:4 | <Expr>; | ExprStmt | Test.kt:15:8:15:9 | 30 | LongLiteral |
+| Test.kt:15:4:15:4 | <Expr>; | ExprStmt | Test.kt:15:4:15:4 | y | VarAccess |
+| Test.kt:15:4:15:4 | y | VarAccess | Test.kt:15:8:15:9 | 30 | LongLiteral |
 | Test.kt:15:4:15:9 | ...=... | AssignExpr | Test.kt:18:3:18:3 | <Expr>; | ExprStmt |
 | Test.kt:15:8:15:9 | 30 | LongLiteral | Test.kt:15:4:15:9 | ...=... | AssignExpr |
-| Test.kt:18:3:18:3 | <Expr>; | ExprStmt | Test.kt:18:7:18:7 | 0 | IntegerLiteral |
+| Test.kt:18:3:18:3 | <Expr>; | ExprStmt | Test.kt:18:3:18:3 | z | VarAccess |
+| Test.kt:18:3:18:3 | z | VarAccess | Test.kt:18:7:18:7 | 0 | IntegerLiteral |
 | Test.kt:18:3:18:7 | ...=... | AssignExpr | Test.kt:21:3:24:9 | <Expr>; | ExprStmt |
 | Test.kt:18:7:18:7 | 0 | IntegerLiteral | Test.kt:18:3:18:7 | ...=... | AssignExpr |
 | Test.kt:21:3:24:9 | ... -> ... | WhenBranch | Test.kt:21:3:24:9 | true | BooleanLiteral |
@@ -53,12 +55,14 @@
 | Test.kt:21:6:21:10 | ... < ... | LTExpr | Test.kt:21:3:24:9 | ... -> ... | WhenBranch |
 | Test.kt:21:6:21:10 | ... < ... | LTExpr | Test.kt:22:4:22:4 | <Expr>; | ExprStmt |
 | Test.kt:21:10:21:10 | 0 | IntegerLiteral | Test.kt:21:6:21:10 | ... < ... | LTExpr |
-| Test.kt:22:4:22:4 | <Expr>; | ExprStmt | Test.kt:22:8:22:9 | 40 | LongLiteral |
+| Test.kt:22:4:22:4 | <Expr>; | ExprStmt | Test.kt:22:4:22:4 | y | VarAccess |
+| Test.kt:22:4:22:4 | y | VarAccess | Test.kt:22:8:22:9 | 40 | LongLiteral |
 | Test.kt:22:4:22:9 | ...=... | AssignExpr | Test.kt:27:3:27:3 | <Expr>; | ExprStmt |
 | Test.kt:22:8:22:9 | 40 | LongLiteral | Test.kt:22:4:22:9 | ...=... | AssignExpr |
 | Test.kt:24:4:24:9 | INSTANCE | VarAccess | Test.kt:24:4:24:9 | return ... | ReturnStmt |
 | Test.kt:24:4:24:9 | return ... | ReturnStmt | Test.kt:4:2:79:2 | Normal Exit | Method |
-| Test.kt:27:3:27:3 | <Expr>; | ExprStmt | Test.kt:27:7:27:8 | 10 | IntegerLiteral |
+| Test.kt:27:3:27:3 | <Expr>; | ExprStmt | Test.kt:27:3:27:3 | z | VarAccess |
+| Test.kt:27:3:27:3 | z | VarAccess | Test.kt:27:7:27:8 | 10 | IntegerLiteral |
 | Test.kt:27:3:27:8 | ...=... | AssignExpr | Test.kt:30:3:33:3 | <Expr>; | ExprStmt |
 | Test.kt:27:7:27:8 | 10 | IntegerLiteral | Test.kt:27:3:27:8 | ...=... | AssignExpr |
 | Test.kt:30:3:33:3 | ... -> ... | WhenBranch | Test.kt:30:7:30:7 | x | VarAccess |
@@ -69,13 +73,16 @@
 | Test.kt:30:7:30:12 | ... (value equals) ... | ValueEQExpr | Test.kt:35:3:35:3 | <Expr>; | ExprStmt |
 | Test.kt:30:12:30:12 | 0 | IntegerLiteral | Test.kt:30:7:30:12 | ... (value equals) ... | ValueEQExpr |
 | Test.kt:30:15:33:3 | { ... } | BlockStmt | Test.kt:31:4:31:4 | <Expr>; | ExprStmt |
-| Test.kt:31:4:31:4 | <Expr>; | ExprStmt | Test.kt:31:8:31:9 | 60 | LongLiteral |
+| Test.kt:31:4:31:4 | <Expr>; | ExprStmt | Test.kt:31:4:31:4 | y | VarAccess |
+| Test.kt:31:4:31:4 | y | VarAccess | Test.kt:31:8:31:9 | 60 | LongLiteral |
 | Test.kt:31:4:31:9 | ...=... | AssignExpr | Test.kt:32:4:32:4 | <Expr>; | ExprStmt |
 | Test.kt:31:8:31:9 | 60 | LongLiteral | Test.kt:31:4:31:9 | ...=... | AssignExpr |
-| Test.kt:32:4:32:4 | <Expr>; | ExprStmt | Test.kt:32:8:32:9 | 10 | IntegerLiteral |
+| Test.kt:32:4:32:4 | <Expr>; | ExprStmt | Test.kt:32:4:32:4 | z | VarAccess |
+| Test.kt:32:4:32:4 | z | VarAccess | Test.kt:32:8:32:9 | 10 | IntegerLiteral |
 | Test.kt:32:4:32:9 | ...=... | AssignExpr | Test.kt:35:3:35:3 | <Expr>; | ExprStmt |
 | Test.kt:32:8:32:9 | 10 | IntegerLiteral | Test.kt:32:4:32:9 | ...=... | AssignExpr |
-| Test.kt:35:3:35:3 | <Expr>; | ExprStmt | Test.kt:35:7:35:8 | 20 | IntegerLiteral |
+| Test.kt:35:3:35:3 | <Expr>; | ExprStmt | Test.kt:35:3:35:3 | z | VarAccess |
+| Test.kt:35:3:35:3 | z | VarAccess | Test.kt:35:7:35:8 | 20 | IntegerLiteral |
 | Test.kt:35:3:35:8 | ...=... | AssignExpr | Test.kt:38:3:41:3 | while (...) | WhileStmt |
 | Test.kt:35:7:35:8 | 20 | IntegerLiteral | Test.kt:35:3:35:8 | ...=... | AssignExpr |
 | Test.kt:38:3:41:3 | while (...) | WhileStmt | Test.kt:38:9:38:9 | x | VarAccess |
@@ -84,35 +91,40 @@
 | Test.kt:38:9:38:13 | ... > ... | GTExpr | Test.kt:43:3:43:3 | <Expr>; | ExprStmt |
 | Test.kt:38:13:38:13 | 0 | IntegerLiteral | Test.kt:38:9:38:13 | ... > ... | GTExpr |
 | Test.kt:38:16:41:3 | { ... } | BlockStmt | Test.kt:39:4:39:4 | <Expr>; | ExprStmt |
-| Test.kt:39:4:39:4 | <Expr>; | ExprStmt | Test.kt:39:8:39:9 | 10 | LongLiteral |
+| Test.kt:39:4:39:4 | <Expr>; | ExprStmt | Test.kt:39:4:39:4 | y | VarAccess |
+| Test.kt:39:4:39:4 | y | VarAccess | Test.kt:39:8:39:9 | 10 | LongLiteral |
 | Test.kt:39:4:39:9 | ...=... | AssignExpr | Test.kt:40:4:40:6 | <Expr>; | ExprStmt |
 | Test.kt:39:8:39:9 | 10 | LongLiteral | Test.kt:39:4:39:9 | ...=... | AssignExpr |
-| Test.kt:40:4:40:4 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | tmp0 | VarAccess |
+| Test.kt:40:4:40:4 | <Expr>; | ExprStmt | Test.kt:40:4:40:4 | x | VarAccess |
 | Test.kt:40:4:40:4 | x | VarAccess | Test.kt:40:4:40:6 | tmp0 | LocalVariableDeclExpr |
+| Test.kt:40:4:40:4 | x | VarAccess | Test.kt:40:4:40:6 | tmp0 | VarAccess |
 | Test.kt:40:4:40:6 | ...=... | AssignExpr | Test.kt:40:4:40:6 | <Expr>; | ExprStmt |
-| Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | <Stmt> | StmtExpr |
 | Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | tmp0 | VarAccess |
-| Test.kt:40:4:40:6 | <Stmt> | StmtExpr | Test.kt:40:4:40:6 | { ... } | BlockStmt |
+| Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | { ... } | BlockStmt |
+| Test.kt:40:4:40:6 | <Stmt> | StmtExpr | Test.kt:40:4:40:6 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr |
 | Test.kt:40:4:40:6 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr | Test.kt:38:9:38:9 | x | VarAccess |
 | Test.kt:40:4:40:6 | dec(...) | MethodCall | Test.kt:40:4:40:6 | ...=... | AssignExpr |
 | Test.kt:40:4:40:6 | tmp0 | LocalVariableDeclExpr | Test.kt:40:4:40:4 | <Expr>; | ExprStmt |
-| Test.kt:40:4:40:6 | tmp0 | VarAccess | Test.kt:40:4:40:6 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr |
+| Test.kt:40:4:40:6 | tmp0 | VarAccess | Test.kt:40:4:40:6 | <Stmt> | StmtExpr |
 | Test.kt:40:4:40:6 | tmp0 | VarAccess | Test.kt:40:4:40:6 | dec(...) | MethodCall |
 | Test.kt:40:4:40:6 | var ...; | LocalVariableDeclStmt | Test.kt:40:4:40:4 | x | VarAccess |
 | Test.kt:40:4:40:6 | { ... } | BlockStmt | Test.kt:40:4:40:6 | var ...; | LocalVariableDeclStmt |
-| Test.kt:43:3:43:3 | <Expr>; | ExprStmt | Test.kt:43:7:43:8 | 30 | IntegerLiteral |
+| Test.kt:43:3:43:3 | <Expr>; | ExprStmt | Test.kt:43:3:43:3 | z | VarAccess |
+| Test.kt:43:3:43:3 | z | VarAccess | Test.kt:43:7:43:8 | 30 | IntegerLiteral |
 | Test.kt:43:3:43:8 | ...=... | AssignExpr | Test.kt:73:3:73:3 | <Expr>; | ExprStmt |
 | Test.kt:43:7:43:8 | 30 | IntegerLiteral | Test.kt:43:3:43:8 | ...=... | AssignExpr |
-| Test.kt:73:3:73:3 | <Expr>; | ExprStmt | Test.kt:73:7:73:8 | 50 | IntegerLiteral |
+| Test.kt:73:3:73:3 | <Expr>; | ExprStmt | Test.kt:73:3:73:3 | z | VarAccess |
+| Test.kt:73:3:73:3 | z | VarAccess | Test.kt:73:7:73:8 | 50 | IntegerLiteral |
 | Test.kt:73:3:73:8 | ...=... | AssignExpr | Test.kt:77:3:77:3 | <Expr>; | ExprStmt |
 | Test.kt:73:7:73:8 | 50 | IntegerLiteral | Test.kt:73:3:73:8 | ...=... | AssignExpr |
-| Test.kt:77:3:77:3 | <Expr>; | ExprStmt | Test.kt:77:7:77:8 | 40 | IntegerLiteral |
+| Test.kt:77:3:77:3 | <Expr>; | ExprStmt | Test.kt:77:3:77:3 | w | VarAccess |
+| Test.kt:77:3:77:3 | w | VarAccess | Test.kt:77:7:77:8 | 40 | IntegerLiteral |
 | Test.kt:77:3:77:8 | ...=... | AssignExpr | Test.kt:78:3:78:8 | INSTANCE | VarAccess |
 | Test.kt:77:7:77:8 | 40 | IntegerLiteral | Test.kt:77:3:77:8 | ...=... | AssignExpr |
 | Test.kt:78:3:78:8 | INSTANCE | VarAccess | Test.kt:78:3:78:8 | return ... | ReturnStmt |
 | Test.kt:78:3:78:8 | return ... | ReturnStmt | Test.kt:4:2:79:2 | Normal Exit | Method |
+| Test.kt:82:1:89:1 | Entry | Method | Test.kt:82:21:89:1 | { ... } | BlockStmt |
 | Test.kt:82:1:89:1 | Exceptional Exit | Method | Test.kt:82:1:89:1 | Exit | Method |
-| Test.kt:82:1:89:1 | Exit | Method | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:82:1:89:1 | Normal Exit | Method | Test.kt:82:1:89:1 | Exit | Method |
 | Test.kt:82:21:89:1 | { ... } | BlockStmt | Test.kt:83:2:88:2 | try ... | TryStmt |
 | Test.kt:83:2:88:2 | try ... | TryStmt | Test.kt:83:6:86:2 | { ... } | BlockStmt |
@@ -124,13 +136,14 @@
 | Test.kt:84:11:84:18 | (...)... | CastExpr | Test.kt:86:4:88:2 | catch (...) | CatchClause |
 | Test.kt:85:3:85:10 | return ... | ReturnStmt | Test.kt:82:1:89:1 | Normal Exit | Method |
 | Test.kt:85:10:85:10 | 1 | IntegerLiteral | Test.kt:85:3:85:10 | return ... | ReturnStmt |
+| Test.kt:86:4:88:2 | catch (...) | CatchClause | Test.kt:82:1:89:1 | Exceptional Exit | Method |
 | Test.kt:86:4:88:2 | catch (...) | CatchClause | Test.kt:86:11:86:31 | e | LocalVariableDeclExpr |
 | Test.kt:86:11:86:31 | e | LocalVariableDeclExpr | Test.kt:86:34:88:2 | { ... } | BlockStmt |
 | Test.kt:86:34:88:2 | { ... } | BlockStmt | Test.kt:87:10:87:10 | 2 | IntegerLiteral |
 | Test.kt:87:3:87:10 | return ... | ReturnStmt | Test.kt:82:1:89:1 | Normal Exit | Method |
 | Test.kt:87:10:87:10 | 2 | IntegerLiteral | Test.kt:87:3:87:10 | return ... | ReturnStmt |
+| Test.kt:91:1:98:1 | Entry | Method | Test.kt:91:22:98:1 | { ... } | BlockStmt |
 | Test.kt:91:1:98:1 | Exceptional Exit | Method | Test.kt:91:1:98:1 | Exit | Method |
-| Test.kt:91:1:98:1 | Exit | Method | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:91:1:98:1 | Normal Exit | Method | Test.kt:91:1:98:1 | Exit | Method |
 | Test.kt:91:22:98:1 | { ... } | BlockStmt | Test.kt:92:2:97:2 | try ... | TryStmt |
 | Test.kt:92:2:97:2 | try ... | TryStmt | Test.kt:92:6:95:2 | { ... } | BlockStmt |
@@ -142,13 +155,14 @@
 | Test.kt:93:12:93:13 | ...!! | NotNullExpr | Test.kt:95:4:97:2 | catch (...) | CatchClause |
 | Test.kt:94:3:94:10 | return ... | ReturnStmt | Test.kt:91:1:98:1 | Normal Exit | Method |
 | Test.kt:94:10:94:10 | 1 | IntegerLiteral | Test.kt:94:3:94:10 | return ... | ReturnStmt |
+| Test.kt:95:4:97:2 | catch (...) | CatchClause | Test.kt:91:1:98:1 | Exceptional Exit | Method |
 | Test.kt:95:4:97:2 | catch (...) | CatchClause | Test.kt:95:11:95:33 | e | LocalVariableDeclExpr |
 | Test.kt:95:11:95:33 | e | LocalVariableDeclExpr | Test.kt:95:36:97:2 | { ... } | BlockStmt |
 | Test.kt:95:36:97:2 | { ... } | BlockStmt | Test.kt:96:10:96:10 | 2 | IntegerLiteral |
 | Test.kt:96:3:96:10 | return ... | ReturnStmt | Test.kt:91:1:98:1 | Normal Exit | Method |
 | Test.kt:96:10:96:10 | 2 | IntegerLiteral | Test.kt:96:3:96:10 | return ... | ReturnStmt |
+| Test.kt:100:1:110:1 | Entry | Method | Test.kt:100:25:110:1 | { ... } | BlockStmt |
 | Test.kt:100:1:110:1 | Exceptional Exit | Method | Test.kt:100:1:110:1 | Exit | Method |
-| Test.kt:100:1:110:1 | Exit | Method | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:100:1:110:1 | Normal Exit | Method | Test.kt:100:1:110:1 | Exit | Method |
 | Test.kt:100:25:110:1 | { ... } | BlockStmt | Test.kt:101:5:103:5 | <Expr>; | ExprStmt |
 | Test.kt:101:5:103:5 | ... -> ... | WhenBranch | Test.kt:101:9:101:30 | ... && ... | AndLogicalExpr |
@@ -186,8 +200,7 @@
 | Test.kt:108:9:108:29 | <Expr>; | ExprStmt | Test.kt:108:17:108:28 | "y not null" | StringLiteral |
 | Test.kt:108:9:108:29 | println(...) | MethodCall | Test.kt:100:1:110:1 | Normal Exit | Method |
 | Test.kt:108:17:108:28 | "y not null" | StringLiteral | Test.kt:108:9:108:29 | println(...) | MethodCall |
-| Test.kt:112:1:116:1 | Exceptional Exit | Method | Test.kt:112:1:116:1 | Exit | Method |
-| Test.kt:112:1:116:1 | Exit | Method | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:112:1:116:1 | Entry | Method | Test.kt:112:32:116:1 | { ... } | BlockStmt |
 | Test.kt:112:1:116:1 | Normal Exit | Method | Test.kt:112:1:116:1 | Exit | Method |
 | Test.kt:112:32:116:1 | { ... } | BlockStmt | Test.kt:113:5:115:5 | <Expr>; | ExprStmt |
 | Test.kt:113:5:115:5 | ... -> ... | WhenBranch | Test.kt:113:9:113:14 | ... && ... | AndLogicalExpr |
@@ -199,8 +212,7 @@
 | Test.kt:113:14:113:14 | y | VarAccess | Test.kt:112:1:116:1 | Normal Exit | Method |
 | Test.kt:113:14:113:14 | y | VarAccess | Test.kt:113:17:115:5 | { ... } | BlockStmt |
 | Test.kt:113:17:115:5 | { ... } | BlockStmt | Test.kt:112:1:116:1 | Normal Exit | Method |
-| Test.kt:118:1:124:1 | Exceptional Exit | Method | Test.kt:118:1:124:1 | Exit | Method |
-| Test.kt:118:1:124:1 | Exit | Method | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:118:1:124:1 | Entry | Method | Test.kt:118:37:124:1 | { ... } | BlockStmt |
 | Test.kt:118:1:124:1 | Normal Exit | Method | Test.kt:118:1:124:1 | Exit | Method |
 | Test.kt:118:37:124:1 | { ... } | BlockStmt | Test.kt:119:2:123:12 | <Expr>; | ExprStmt |
 | Test.kt:119:2:123:12 | <Expr>; | ExprStmt | Test.kt:119:2:123:12 | when ... | WhenExpr |
@@ -216,6 +228,7 @@
 | Test.kt:122:12:122:16 | ... -> ... | WhenBranch | Test.kt:122:12:122:16 | true | BooleanLiteral |
 | Test.kt:122:12:122:16 | <Expr>; | ExprStmt | Test.kt:122:12:122:16 | false | BooleanLiteral |
 | Test.kt:122:12:122:16 | false | BooleanLiteral | Test.kt:118:1:124:1 | Normal Exit | Method |
+| Test.kt:122:12:122:16 | false | BooleanLiteral | Test.kt:123:8:123:10 | { ... } | BlockStmt |
 | Test.kt:122:12:122:16 | true | BooleanLiteral | Test.kt:122:12:122:16 | <Expr>; | ExprStmt |
 | Test.kt:123:8:123:10 | { ... } | BlockStmt | Test.kt:118:1:124:1 | Normal Exit | Method |
 missingSuccessor
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/basic/getASuccessor.ql b/java/ql/test-kotlin1/library-tests/controlflow/basic/getASuccessor.ql
index c097d7d5e93..9a334d18aae 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/basic/getASuccessor.ql
+++ b/java/ql/test-kotlin1/library-tests/controlflow/basic/getASuccessor.ql
@@ -1,53 +1,14 @@
 import java
+import utils.test.AstCfg
 
-newtype TMaybeControlFlowNode =
-  TControlFlowNode(ControlFlowNode c) or
-  TNoControlFlowNode()
-
-class MaybeControlFlowNode extends TMaybeControlFlowNode {
-  abstract string toString();
-
-  abstract Location getLocation();
-
-  abstract string getPrimaryQlClasses();
-}
-
-class YesMaybeControlFlowNode extends MaybeControlFlowNode {
-  ControlFlowNode c;
-
-  YesMaybeControlFlowNode() { this = TControlFlowNode(c) }
-
-  override string toString() { result = c.toString() }
-
-  override Location getLocation() { result = c.getLocation() }
-
-  override string getPrimaryQlClasses() { result = c.getAstNode().getPrimaryQlClasses() }
-}
-
-class NoMaybeControlFlowNode extends MaybeControlFlowNode {
-  NoMaybeControlFlowNode() { this = TNoControlFlowNode() }
-
-  override string toString() { result = "<none>" }
-
-  override Location getLocation() { result.toString() = "file://:0:0:0:0" }
-
-  override string getPrimaryQlClasses() { result = "<none>" }
-}
-
-MaybeControlFlowNode maybeSuccessor(ControlFlowNode n) {
-  if exists(n.getASuccessor())
-  then result = TControlFlowNode(n.getASuccessor())
-  else result = TNoControlFlowNode()
-}
-
-from ControlFlowNode n, MaybeControlFlowNode m
+from ControlFlowNode n, ControlFlowNode m
 where
-  m = maybeSuccessor(n) and
+  m = getAnAstSuccessor(n) and
   n.getLocation().getFile().(CompilationUnit).fromSource()
-select n, n.getAstNode().getPrimaryQlClasses(), m, m.getPrimaryQlClasses()
+select n, n.getAstNode().getPrimaryQlClasses(), m, m.getAstNode().getPrimaryQlClasses()
 
 query predicate missingSuccessor(Expr e) {
-  maybeSuccessor(e.getControlFlowNode()) instanceof NoMaybeControlFlowNode and
+  exists(ControlFlowNode n | n = e.getControlFlowNode() and not exists(n.getASuccessor())) and
   e.getFile().(CompilationUnit).fromSource() and
   not e instanceof TypeAccess and
   not e instanceof VarWrite
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/basic/strictDominance.expected b/java/ql/test-kotlin1/library-tests/controlflow/basic/strictDominance.expected
index a85a0c120b3..13d018efabd 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/basic/strictDominance.expected
+++ b/java/ql/test-kotlin1/library-tests/controlflow/basic/strictDominance.expected
@@ -562,5 +562,4 @@
 | Test.kt:121:4:121:9 | ... -> ... | Test.kt:122:12:122:16 | ... -> ... |
 | Test.kt:121:4:121:9 | ... -> ... | Test.kt:122:12:122:16 | <Expr>; |
 | Test.kt:121:4:121:9 | ... -> ... | Test.kt:123:8:123:10 | { ... } |
-| Test.kt:121:9:121:9 | <Expr>; | Test.kt:123:8:123:10 | { ... } |
 | Test.kt:122:12:122:16 | ... -> ... | Test.kt:122:12:122:16 | <Expr>; |
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominanceWrong.ql b/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominanceWrong.ql
index 4eadcddc61a..6deead2df73 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominanceWrong.ql
+++ b/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominanceWrong.ql
@@ -17,5 +17,6 @@ predicate dominanceCounterExample(ControlFlowNode entry, ControlFlowNode dom, Co
 from Callable c, ControlFlowNode dom, ControlFlowNode node
 where
   strictlyDominates(dom, node) and
-  dominanceCounterExample(c.getBody().getControlFlowNode(), dom, node)
+  dominanceCounterExample(any(ControlFlow::EntryNode entry | entry.getEnclosingCallable() = c), dom,
+    node)
 select c, dom, node
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.expected b/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.expected
index 31da586d630..3288b521887 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.expected
+++ b/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.expected
@@ -1,157 +1,21 @@
-| Test.kt:2:43:79:2 | { ... } | Test.kt:3:13:3:13 | var ...; |
-| Test.kt:3:13:3:13 | var ...; | Test.kt:3:17:3:18 | px |
-| Test.kt:3:13:3:13 | x | Test.kt:4:13:4:13 | var ...; |
-| Test.kt:3:17:3:18 | px | Test.kt:3:13:3:13 | x |
-| Test.kt:4:13:4:13 | var ...; | Test.kt:4:17:4:18 | pw |
-| Test.kt:4:13:4:13 | w | Test.kt:5:13:5:13 | var ...; |
-| Test.kt:4:17:4:18 | pw | Test.kt:4:13:4:13 | w |
-| Test.kt:5:13:5:13 | var ...; | Test.kt:5:17:5:18 | pz |
-| Test.kt:5:13:5:13 | z | Test.kt:7:7:7:7 | var ...; |
-| Test.kt:5:17:5:18 | pz | Test.kt:5:13:5:13 | z |
-| Test.kt:7:7:7:7 | j | Test.kt:8:7:8:7 | var ...; |
-| Test.kt:7:7:7:7 | var ...; | Test.kt:7:7:7:7 | j |
-| Test.kt:8:7:8:7 | var ...; | Test.kt:8:17:8:18 | 50 |
-| Test.kt:8:7:8:7 | y | Test.kt:11:3:16:3 | <Expr>; |
-| Test.kt:8:17:8:18 | 50 | Test.kt:8:7:8:7 | y |
-| Test.kt:11:3:16:3 | ... -> ... | Test.kt:11:3:16:3 | true |
-| Test.kt:11:3:16:3 | ... -> ... | Test.kt:11:7:11:7 | x |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:11:3:16:3 | when ... |
-| Test.kt:11:3:16:3 | true | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:11:3:16:3 | when ... | Test.kt:11:3:16:3 | ... -> ... |
-| Test.kt:11:7:11:7 | x | Test.kt:11:11:11:11 | 0 |
-| Test.kt:11:7:11:11 | ... > ... | Test.kt:11:3:16:3 | ... -> ... |
-| Test.kt:11:7:11:11 | ... > ... | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:11:7:11:11 | ... > ... | Test.kt:18:3:18:3 | <Expr>; |
-| Test.kt:11:11:11:11 | 0 | Test.kt:11:7:11:11 | ... > ... |
-| Test.kt:11:14:14:3 | { ... } | Test.kt:12:4:12:4 | <Expr>; |
-| Test.kt:12:4:12:4 | <Expr>; | Test.kt:12:8:12:9 | 20 |
-| Test.kt:12:4:12:9 | ...=... | Test.kt:13:4:13:4 | <Expr>; |
-| Test.kt:12:8:12:9 | 20 | Test.kt:12:4:12:9 | ...=... |
-| Test.kt:13:4:13:4 | <Expr>; | Test.kt:13:8:13:9 | 10 |
-| Test.kt:13:8:13:9 | 10 | Test.kt:13:4:13:9 | ...=... |
-| Test.kt:14:10:16:3 | { ... } | Test.kt:15:4:15:4 | <Expr>; |
-| Test.kt:15:4:15:4 | <Expr>; | Test.kt:15:8:15:9 | 30 |
-| Test.kt:15:8:15:9 | 30 | Test.kt:15:4:15:9 | ...=... |
-| Test.kt:18:3:18:3 | <Expr>; | Test.kt:18:8:18:8 | x |
-| Test.kt:18:3:18:20 | ...=... | Test.kt:21:3:24:11 | <Expr>; |
-| Test.kt:18:7:18:20 | (...)... | Test.kt:18:3:18:20 | ...=... |
-| Test.kt:18:8:18:8 | x | Test.kt:18:12:18:12 | y |
-| Test.kt:18:8:18:12 | ... + ... | Test.kt:18:7:18:20 | (...)... |
-| Test.kt:18:12:18:12 | y | Test.kt:18:8:18:12 | ... + ... |
-| Test.kt:21:3:24:11 | ... -> ... | Test.kt:21:3:24:11 | true |
-| Test.kt:21:3:24:11 | ... -> ... | Test.kt:21:7:21:7 | x |
-| Test.kt:21:3:24:11 | <Expr>; | Test.kt:21:3:24:11 | when ... |
-| Test.kt:21:3:24:11 | true | Test.kt:24:11:24:11 | z |
-| Test.kt:21:3:24:11 | when ... | Test.kt:21:3:24:11 | ... -> ... |
-| Test.kt:21:7:21:7 | x | Test.kt:21:11:21:11 | 0 |
-| Test.kt:21:7:21:11 | ... < ... | Test.kt:2:2:79:2 | Normal Exit |
-| Test.kt:21:7:21:11 | ... < ... | Test.kt:21:3:24:11 | ... -> ... |
-| Test.kt:21:7:21:11 | ... < ... | Test.kt:22:4:22:4 | <Expr>; |
-| Test.kt:21:11:21:11 | 0 | Test.kt:21:7:21:11 | ... < ... |
-| Test.kt:22:4:22:4 | <Expr>; | Test.kt:22:8:22:9 | 40 |
-| Test.kt:22:4:22:9 | ...=... | Test.kt:27:3:27:3 | <Expr>; |
-| Test.kt:22:8:22:9 | 40 | Test.kt:22:4:22:9 | ...=... |
-| Test.kt:24:11:24:11 | z | Test.kt:24:4:24:11 | return ... |
-| Test.kt:27:3:27:3 | <Expr>; | Test.kt:27:7:27:8 | 10 |
-| Test.kt:27:3:27:8 | ...=... | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:27:7:27:8 | 10 | Test.kt:27:3:27:8 | ...=... |
-| Test.kt:30:3:33:3 | ... -> ... | Test.kt:30:7:30:7 | x |
-| Test.kt:30:3:33:3 | <Expr>; | Test.kt:30:3:33:3 | when ... |
-| Test.kt:30:3:33:3 | when ... | Test.kt:30:3:33:3 | ... -> ... |
-| Test.kt:30:7:30:7 | x | Test.kt:30:12:30:12 | 0 |
-| Test.kt:30:7:30:12 | ... (value equals) ... | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:30:7:30:12 | ... (value equals) ... | Test.kt:35:3:35:3 | <Expr>; |
-| Test.kt:30:12:30:12 | 0 | Test.kt:30:7:30:12 | ... (value equals) ... |
-| Test.kt:30:15:33:3 | { ... } | Test.kt:31:4:31:4 | <Expr>; |
-| Test.kt:31:4:31:4 | <Expr>; | Test.kt:31:8:31:9 | 60 |
-| Test.kt:31:4:31:9 | ...=... | Test.kt:32:4:32:4 | <Expr>; |
-| Test.kt:31:8:31:9 | 60 | Test.kt:31:4:31:9 | ...=... |
-| Test.kt:32:4:32:4 | <Expr>; | Test.kt:32:8:32:9 | 10 |
-| Test.kt:32:8:32:9 | 10 | Test.kt:32:4:32:9 | ...=... |
-| Test.kt:35:3:35:3 | <Expr>; | Test.kt:35:3:35:3 | z |
-| Test.kt:35:3:35:3 | z | Test.kt:35:8:35:8 | x |
-| Test.kt:35:3:35:8 | ...+=... | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:35:8:35:8 | x | Test.kt:35:3:35:8 | ...+=... |
-| Test.kt:38:3:41:3 | while (...) | Test.kt:38:10:38:10 | x |
-| Test.kt:38:10:38:10 | x | Test.kt:38:14:38:14 | 0 |
-| Test.kt:38:10:38:14 | ... > ... | Test.kt:38:17:41:3 | { ... } |
-| Test.kt:38:10:38:14 | ... > ... | Test.kt:43:3:43:3 | <Expr>; |
-| Test.kt:38:14:38:14 | 0 | Test.kt:38:10:38:14 | ... > ... |
-| Test.kt:38:17:41:3 | { ... } | Test.kt:39:4:39:4 | <Expr>; |
-| Test.kt:39:4:39:4 | <Expr>; | Test.kt:39:8:39:9 | 10 |
-| Test.kt:39:4:39:9 | ...=... | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:39:8:39:9 | 10 | Test.kt:39:4:39:9 | ...=... |
-| Test.kt:40:4:40:4 | <Expr>; | Test.kt:40:4:40:6 | tmp0 |
-| Test.kt:40:4:40:4 | x | Test.kt:40:4:40:6 | tmp0 |
-| Test.kt:40:4:40:6 | ...=... | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | <Stmt> |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | tmp0 |
-| Test.kt:40:4:40:6 | <Stmt> | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:40:4:40:6 | dec(...) | Test.kt:40:4:40:6 | ...=... |
-| Test.kt:40:4:40:6 | tmp0 | Test.kt:40:4:40:4 | <Expr>; |
-| Test.kt:40:4:40:6 | tmp0 | Test.kt:40:4:40:6 | <implicit coercion to unit> |
-| Test.kt:40:4:40:6 | tmp0 | Test.kt:40:4:40:6 | dec(...) |
-| Test.kt:40:4:40:6 | var ...; | Test.kt:40:4:40:4 | x |
-| Test.kt:40:4:40:6 | { ... } | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:43:3:43:3 | <Expr>; | Test.kt:43:3:43:3 | z |
-| Test.kt:43:3:43:3 | z | Test.kt:43:8:43:8 | y |
-| Test.kt:43:3:43:15 | ...+=... | Test.kt:73:3:73:3 | <Expr>; |
-| Test.kt:43:8:43:8 | y | Test.kt:43:8:43:15 | (...)... |
-| Test.kt:43:8:43:15 | (...)... | Test.kt:43:3:43:15 | ...+=... |
-| Test.kt:73:3:73:3 | <Expr>; | Test.kt:73:3:73:3 | z |
-| Test.kt:73:3:73:3 | z | Test.kt:73:8:73:8 | x |
-| Test.kt:73:3:73:16 | ...+=... | Test.kt:77:3:77:3 | <Expr>; |
-| Test.kt:73:8:73:8 | x | Test.kt:73:12:73:12 | y |
-| Test.kt:73:8:73:12 | ... + ... | Test.kt:73:16:73:16 | w |
-| Test.kt:73:8:73:16 | ... + ... | Test.kt:73:3:73:16 | ...+=... |
-| Test.kt:73:12:73:12 | <implicit cast> | Test.kt:73:8:73:12 | ... + ... |
-| Test.kt:73:12:73:12 | y | Test.kt:73:12:73:12 | <implicit cast> |
-| Test.kt:73:16:73:16 | w | Test.kt:73:8:73:16 | ... + ... |
-| Test.kt:77:3:77:3 | <Expr>; | Test.kt:77:7:77:8 | 40 |
-| Test.kt:77:3:77:8 | ...=... | Test.kt:78:10:78:10 | w |
-| Test.kt:77:7:77:8 | 40 | Test.kt:77:3:77:8 | ...=... |
-| Test.kt:78:10:78:10 | w | Test.kt:78:3:78:10 | return ... |
-| Test.kt:81:25:98:2 | { ... } | Test.kt:83:7:83:7 | var ...; |
-| Test.kt:83:7:83:7 | b | Test.kt:84:7:84:7 | var ...; |
-| Test.kt:83:7:83:7 | var ...; | Test.kt:83:7:83:7 | b |
-| Test.kt:84:7:84:7 | c | Test.kt:85:3:85:3 | <Expr>; |
-| Test.kt:84:7:84:7 | var ...; | Test.kt:84:7:84:7 | c |
-| Test.kt:85:3:85:3 | <Expr>; | Test.kt:85:7:85:7 | 0 |
-| Test.kt:85:3:85:7 | ...=... | Test.kt:86:3:96:3 | while (...) |
-| Test.kt:85:7:85:7 | 0 | Test.kt:85:3:85:7 | ...=... |
-| Test.kt:86:3:96:3 | while (...) | Test.kt:86:9:86:12 | true |
-| Test.kt:86:9:86:12 | true | Test.kt:86:15:96:3 | { ... } |
-| Test.kt:86:15:96:3 | { ... } | Test.kt:87:4:87:4 | <Expr>; |
-| Test.kt:87:4:87:4 | <Expr>; | Test.kt:87:8:87:9 | 10 |
-| Test.kt:87:4:87:9 | ...=... | Test.kt:88:4:91:4 | <Expr>; |
-| Test.kt:87:8:87:9 | 10 | Test.kt:87:4:87:9 | ...=... |
-| Test.kt:88:4:91:4 | ... -> ... | Test.kt:88:8:88:8 | a |
-| Test.kt:88:4:91:4 | <Expr>; | Test.kt:88:4:91:4 | when ... |
-| Test.kt:88:4:91:4 | when ... | Test.kt:88:4:91:4 | ... -> ... |
-| Test.kt:88:8:88:8 | a | Test.kt:88:12:88:14 | 100 |
-| Test.kt:88:8:88:14 | ... > ... | Test.kt:88:17:91:4 | { ... } |
-| Test.kt:88:8:88:14 | ... > ... | Test.kt:92:4:93:9 | <Expr>; |
-| Test.kt:88:12:88:14 | 100 | Test.kt:88:8:88:14 | ... > ... |
-| Test.kt:88:17:91:4 | { ... } | Test.kt:89:5:89:5 | <Expr>; |
-| Test.kt:89:5:89:5 | <Expr>; | Test.kt:89:9:89:10 | 10 |
-| Test.kt:89:5:89:10 | ...=... | Test.kt:90:5:90:5 | <Expr>; |
-| Test.kt:89:9:89:10 | 10 | Test.kt:89:5:89:10 | ...=... |
-| Test.kt:90:5:90:5 | <Expr>; | Test.kt:90:9:90:9 | c |
-| Test.kt:90:9:90:9 | c | Test.kt:90:5:90:9 | ...=... |
-| Test.kt:92:4:93:9 | ... -> ... | Test.kt:92:8:92:8 | a |
-| Test.kt:92:4:93:9 | <Expr>; | Test.kt:92:4:93:9 | when ... |
-| Test.kt:92:4:93:9 | when ... | Test.kt:92:4:93:9 | ... -> ... |
-| Test.kt:92:8:92:8 | a | Test.kt:92:13:92:14 | 10 |
-| Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:81:2:98:2 | Normal Exit |
-| Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:93:5:93:9 | break |
-| Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:94:4:95:12 | <Expr>; |
-| Test.kt:92:13:92:14 | 10 | Test.kt:92:8:92:14 | ... (value equals) ... |
-| Test.kt:93:5:93:9 | break | Test.kt:97:10:97:10 | b |
-| Test.kt:94:4:95:12 | ... -> ... | Test.kt:94:8:94:8 | a |
-| Test.kt:94:4:95:12 | <Expr>; | Test.kt:94:4:95:12 | when ... |
-| Test.kt:94:4:95:12 | when ... | Test.kt:94:4:95:12 | ... -> ... |
-| Test.kt:94:8:94:8 | a | Test.kt:94:13:94:14 | 20 |
-| Test.kt:94:8:94:14 | ... (value equals) ... | Test.kt:95:12:95:12 | c |
-| Test.kt:94:13:94:14 | 20 | Test.kt:94:8:94:14 | ... (value equals) ... |
-| Test.kt:95:12:95:12 | c | Test.kt:95:5:95:12 | return ... |
-| Test.kt:97:10:97:10 | b | Test.kt:97:3:97:10 | return ... |
+| Test.kt:2:43:79:2 | { ... } | Test.kt:11:3:16:3 | ... -> ... |
+| Test.kt:2:43:79:2 | { ... } | Test.kt:11:14:14:3 | { ... } |
+| Test.kt:2:43:79:2 | { ... } | Test.kt:18:3:18:3 | <Expr>; |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:2:2:79:2 | Normal Exit |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:21:3:24:11 | ... -> ... |
+| Test.kt:18:3:18:3 | <Expr>; | Test.kt:22:4:22:4 | <Expr>; |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:7:30:12 | After ... (value equals) ... [false] |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:22:4:22:4 | <Expr>; | Test.kt:35:3:35:3 | <Expr>; |
+| Test.kt:35:3:35:3 | <Expr>; | Test.kt:38:10:38:10 | x |
+| Test.kt:38:10:38:10 | x | Test.kt:38:17:41:3 | { ... } |
+| Test.kt:38:10:38:10 | x | Test.kt:43:3:43:3 | <Expr>; |
+| Test.kt:81:25:98:2 | { ... } | Test.kt:86:9:86:12 | true |
+| Test.kt:86:9:86:12 | true | Test.kt:88:8:88:14 | After ... > ... [false] |
+| Test.kt:86:9:86:12 | true | Test.kt:88:17:91:4 | { ... } |
+| Test.kt:86:9:86:12 | true | Test.kt:92:4:93:9 | <Expr>; |
+| Test.kt:92:4:93:9 | <Expr>; | Test.kt:81:2:98:2 | Normal Exit |
+| Test.kt:92:4:93:9 | <Expr>; | Test.kt:93:5:93:9 | break |
+| Test.kt:92:4:93:9 | <Expr>; | Test.kt:94:4:95:12 | <Expr>; |
+| Test.kt:94:4:95:12 | <Expr>; | Test.kt:94:8:94:14 | After ... (value equals) ... [false] |
+| Test.kt:94:4:95:12 | <Expr>; | Test.kt:95:12:95:12 | c |
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.ql b/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.ql
index 701640bf720..7fc18484feb 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.ql
+++ b/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominator.ql
@@ -1,9 +1,9 @@
-import default
-import semmle.code.java.controlflow.Dominance
+import java
+import utils.test.BasicBlock
 
-from Method func, ControlFlowNode dominator, ControlFlowNode node
+from Method func, BasicBlock dominator, BasicBlock bb
 where
-  iDominates(dominator, node) and
-  dominator.getEnclosingStmt().getEnclosingCallable() = func and
+  dominator.immediatelyDominates(bb) and
+  dominator.getEnclosingCallable() = func and
   func.getDeclaringType().hasName("Test")
-select dominator, node
+select getFirstAstNodeOrSynth(dominator), getFirstAstNodeOrSynth(bb)
diff --git a/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominatorUnique.ql b/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominatorUnique.ql
index eaf75ab7bfa..54b0d186362 100644
--- a/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominatorUnique.ql
+++ b/java/ql/test-kotlin1/library-tests/controlflow/dominance/dominatorUnique.ql
@@ -7,5 +7,5 @@ where
   iDominates(dom1, node) and
   iDominates(dom2, node) and
   dom1 != dom2 and
-  func = node.getEnclosingStmt().getEnclosingCallable()
+  func = node.getEnclosingCallable()
 select func, node, dom1, dom2
diff --git a/java/ql/test-kotlin1/library-tests/exprs/binop.ql b/java/ql/test-kotlin1/library-tests/exprs/binop.ql
index d865d83fcf9..303eccba589 100644
--- a/java/ql/test-kotlin1/library-tests/exprs/binop.ql
+++ b/java/ql/test-kotlin1/library-tests/exprs/binop.ql
@@ -41,4 +41,5 @@ MaybeElement rhs(BinaryExpr e) {
 }
 
 from Expr e
+where not e instanceof Assignment
 select e, lhs(e), rhs(e)
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStmts.expected b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStmts.expected
index c66d50a722d..6a1994921f4 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStmts.expected
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStmts.expected
@@ -1,205 +1,386 @@
-| Test.kt:3:1:80:1 | Exceptional Exit | 0 | Test.kt:3:1:80:1 | Exceptional Exit |
-| Test.kt:3:1:80:1 | Exit | 0 | Test.kt:3:1:80:1 | Exit |
-| Test.kt:3:1:80:1 | { ... } | 0 | Test.kt:3:1:80:1 | { ... } |
-| Test.kt:3:1:80:1 | { ... } | 1 | Test.kt:3:1:80:1 | super(...) |
-| Test.kt:3:1:80:1 | { ... } | 2 | Test.kt:3:1:80:1 | { ... } |
-| Test.kt:3:1:80:1 | { ... } | 3 | Test.kt:3:1:80:1 | Normal Exit |
-| Test.kt:4:2:79:2 | Exceptional Exit | 0 | Test.kt:4:2:79:2 | Exceptional Exit |
-| Test.kt:4:2:79:2 | Exit | 0 | Test.kt:4:2:79:2 | Exit |
+| Test.kt:3:1:80:1 | Entry | 0 | Test.kt:3:1:80:1 | Entry |
+| Test.kt:3:1:80:1 | Entry | 1 | Test.kt:3:1:80:1 | { ... } |
+| Test.kt:3:1:80:1 | Entry | 2 | Test.kt:3:1:80:1 | Before super(...) |
+| Test.kt:3:1:80:1 | Entry | 3 | Test.kt:3:1:80:1 | super(...) |
+| Test.kt:3:1:80:1 | Entry | 4 | Test.kt:3:1:80:1 | After super(...) |
+| Test.kt:3:1:80:1 | Entry | 5 | Test.kt:3:1:80:1 | { ... } |
+| Test.kt:3:1:80:1 | Entry | 6 | Test.kt:3:1:80:1 | After { ... } |
+| Test.kt:3:1:80:1 | Entry | 7 | Test.kt:3:1:80:1 | Normal Exit |
+| Test.kt:3:1:80:1 | Entry | 8 | Test.kt:3:1:80:1 | Exit |
+| Test.kt:4:2:79:2 | Entry | 0 | Test.kt:4:2:79:2 | Entry |
+| Test.kt:4:2:79:2 | Entry | 1 | Test.kt:4:13:79:2 | { ... } |
+| Test.kt:4:2:79:2 | Entry | 2 | Test.kt:5:3:5:16 | var ...; |
+| Test.kt:4:2:79:2 | Entry | 3 | Test.kt:5:3:5:16 | Before x |
+| Test.kt:4:2:79:2 | Entry | 4 | Test.kt:5:16:5:16 | 0 |
+| Test.kt:4:2:79:2 | Entry | 5 | Test.kt:5:3:5:16 | x |
+| Test.kt:4:2:79:2 | Entry | 6 | Test.kt:5:3:5:16 | After x |
+| Test.kt:4:2:79:2 | Entry | 7 | Test.kt:5:3:5:16 | After var ...; |
+| Test.kt:4:2:79:2 | Entry | 8 | Test.kt:6:3:6:18 | var ...; |
+| Test.kt:4:2:79:2 | Entry | 9 | Test.kt:6:3:6:18 | Before y |
+| Test.kt:4:2:79:2 | Entry | 10 | Test.kt:6:17:6:18 | 50 |
+| Test.kt:4:2:79:2 | Entry | 11 | Test.kt:6:3:6:18 | y |
+| Test.kt:4:2:79:2 | Entry | 12 | Test.kt:6:3:6:18 | After y |
+| Test.kt:4:2:79:2 | Entry | 13 | Test.kt:6:3:6:18 | After var ...; |
+| Test.kt:4:2:79:2 | Entry | 14 | Test.kt:7:3:7:16 | var ...; |
+| Test.kt:4:2:79:2 | Entry | 15 | Test.kt:7:3:7:16 | Before z |
+| Test.kt:4:2:79:2 | Entry | 16 | Test.kt:7:16:7:16 | 0 |
+| Test.kt:4:2:79:2 | Entry | 17 | Test.kt:7:3:7:16 | z |
+| Test.kt:4:2:79:2 | Entry | 18 | Test.kt:7:3:7:16 | After z |
+| Test.kt:4:2:79:2 | Entry | 19 | Test.kt:7:3:7:16 | After var ...; |
+| Test.kt:4:2:79:2 | Entry | 20 | Test.kt:8:3:8:16 | var ...; |
+| Test.kt:4:2:79:2 | Entry | 21 | Test.kt:8:3:8:16 | Before w |
+| Test.kt:4:2:79:2 | Entry | 22 | Test.kt:8:16:8:16 | 0 |
+| Test.kt:4:2:79:2 | Entry | 23 | Test.kt:8:3:8:16 | w |
+| Test.kt:4:2:79:2 | Entry | 24 | Test.kt:8:3:8:16 | After w |
+| Test.kt:4:2:79:2 | Entry | 25 | Test.kt:8:3:8:16 | After var ...; |
+| Test.kt:4:2:79:2 | Entry | 26 | Test.kt:11:3:16:3 | <Expr>; |
+| Test.kt:4:2:79:2 | Entry | 27 | Test.kt:11:3:16:3 | when ... |
+| Test.kt:4:2:79:2 | Entry | 28 | Test.kt:11:7:14:3 | ... -> ... |
+| Test.kt:4:2:79:2 | Entry | 29 | Test.kt:11:7:11:11 | Before ... > ... |
+| Test.kt:4:2:79:2 | Entry | 30 | Test.kt:11:7:11:7 | x |
+| Test.kt:4:2:79:2 | Entry | 31 | Test.kt:11:11:11:11 | 0 |
+| Test.kt:4:2:79:2 | Entry | 32 | Test.kt:11:7:11:11 | ... > ... |
 | Test.kt:4:2:79:2 | Normal Exit | 0 | Test.kt:4:2:79:2 | Normal Exit |
-| Test.kt:4:13:79:2 | { ... } | 0 | Test.kt:4:13:79:2 | { ... } |
-| Test.kt:4:13:79:2 | { ... } | 1 | Test.kt:5:3:5:16 | var ...; |
-| Test.kt:4:13:79:2 | { ... } | 2 | Test.kt:5:16:5:16 | 0 |
-| Test.kt:4:13:79:2 | { ... } | 3 | Test.kt:5:3:5:16 | x |
-| Test.kt:4:13:79:2 | { ... } | 4 | Test.kt:6:3:6:18 | var ...; |
-| Test.kt:4:13:79:2 | { ... } | 5 | Test.kt:6:17:6:18 | 50 |
-| Test.kt:4:13:79:2 | { ... } | 6 | Test.kt:6:3:6:18 | y |
-| Test.kt:4:13:79:2 | { ... } | 7 | Test.kt:7:3:7:16 | var ...; |
-| Test.kt:4:13:79:2 | { ... } | 8 | Test.kt:7:16:7:16 | 0 |
-| Test.kt:4:13:79:2 | { ... } | 9 | Test.kt:7:3:7:16 | z |
-| Test.kt:4:13:79:2 | { ... } | 10 | Test.kt:8:3:8:16 | var ...; |
-| Test.kt:4:13:79:2 | { ... } | 11 | Test.kt:8:16:8:16 | 0 |
-| Test.kt:4:13:79:2 | { ... } | 12 | Test.kt:8:3:8:16 | w |
-| Test.kt:4:13:79:2 | { ... } | 13 | Test.kt:11:3:16:3 | <Expr>; |
-| Test.kt:4:13:79:2 | { ... } | 14 | Test.kt:11:3:16:3 | when ... |
-| Test.kt:4:13:79:2 | { ... } | 15 | Test.kt:11:7:14:3 | ... -> ... |
-| Test.kt:4:13:79:2 | { ... } | 16 | Test.kt:11:7:11:7 | x |
-| Test.kt:4:13:79:2 | { ... } | 17 | Test.kt:11:11:11:11 | 0 |
-| Test.kt:4:13:79:2 | { ... } | 18 | Test.kt:11:7:11:11 | ... > ... |
-| Test.kt:11:14:14:3 | { ... } | 0 | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:11:14:14:3 | { ... } | 1 | Test.kt:12:4:12:9 | <Expr>; |
-| Test.kt:11:14:14:3 | { ... } | 2 | Test.kt:12:8:12:9 | 20 |
-| Test.kt:11:14:14:3 | { ... } | 3 | Test.kt:12:4:12:9 | ...=... |
-| Test.kt:11:14:14:3 | { ... } | 4 | Test.kt:13:4:13:9 | <Expr>; |
-| Test.kt:11:14:14:3 | { ... } | 5 | Test.kt:13:8:13:9 | 10 |
-| Test.kt:11:14:14:3 | { ... } | 6 | Test.kt:13:4:13:9 | ...=... |
-| Test.kt:14:10:16:3 | ... -> ... | 0 | Test.kt:14:10:16:3 | ... -> ... |
-| Test.kt:14:10:16:3 | ... -> ... | 1 | Test.kt:14:10:16:3 | true |
-| Test.kt:14:10:16:3 | ... -> ... | 2 | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:14:10:16:3 | ... -> ... | 3 | Test.kt:15:4:15:9 | <Expr>; |
-| Test.kt:14:10:16:3 | ... -> ... | 4 | Test.kt:15:8:15:9 | 30 |
-| Test.kt:14:10:16:3 | ... -> ... | 5 | Test.kt:15:4:15:9 | ...=... |
-| Test.kt:18:3:18:7 | <Expr>; | 0 | Test.kt:18:3:18:7 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | 1 | Test.kt:18:7:18:7 | 0 |
-| Test.kt:18:3:18:7 | <Expr>; | 2 | Test.kt:18:3:18:7 | ...=... |
-| Test.kt:18:3:18:7 | <Expr>; | 3 | Test.kt:21:3:24:9 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | 4 | Test.kt:21:3:24:9 | when ... |
-| Test.kt:18:3:18:7 | <Expr>; | 5 | Test.kt:21:6:22:9 | ... -> ... |
-| Test.kt:18:3:18:7 | <Expr>; | 6 | Test.kt:21:6:21:6 | x |
-| Test.kt:18:3:18:7 | <Expr>; | 7 | Test.kt:21:10:21:10 | 0 |
-| Test.kt:18:3:18:7 | <Expr>; | 8 | Test.kt:21:6:21:10 | ... < ... |
-| Test.kt:22:4:22:9 | <Expr>; | 0 | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | 1 | Test.kt:22:8:22:9 | 40 |
-| Test.kt:22:4:22:9 | <Expr>; | 2 | Test.kt:22:4:22:9 | ...=... |
-| Test.kt:22:4:22:9 | <Expr>; | 3 | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | 4 | Test.kt:27:7:27:8 | 10 |
-| Test.kt:22:4:22:9 | <Expr>; | 5 | Test.kt:27:3:27:8 | ...=... |
-| Test.kt:22:4:22:9 | <Expr>; | 6 | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | 7 | Test.kt:30:3:33:3 | when ... |
-| Test.kt:22:4:22:9 | <Expr>; | 8 | Test.kt:30:7:33:3 | ... -> ... |
-| Test.kt:22:4:22:9 | <Expr>; | 9 | Test.kt:30:7:30:7 | x |
-| Test.kt:22:4:22:9 | <Expr>; | 10 | Test.kt:30:12:30:12 | 0 |
-| Test.kt:22:4:22:9 | <Expr>; | 11 | Test.kt:30:7:30:12 | ... (value equals) ... |
-| Test.kt:24:4:24:9 | ... -> ... | 0 | Test.kt:24:4:24:9 | ... -> ... |
-| Test.kt:24:4:24:9 | ... -> ... | 1 | Test.kt:24:4:24:9 | true |
-| Test.kt:24:4:24:9 | ... -> ... | 2 | Test.kt:24:10:24:10 | INSTANCE |
-| Test.kt:24:4:24:9 | ... -> ... | 3 | Test.kt:24:4:24:9 | return ... |
-| Test.kt:30:15:33:3 | { ... } | 0 | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:30:15:33:3 | { ... } | 1 | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:30:15:33:3 | { ... } | 2 | Test.kt:31:8:31:9 | 60 |
-| Test.kt:30:15:33:3 | { ... } | 3 | Test.kt:31:4:31:9 | ...=... |
-| Test.kt:30:15:33:3 | { ... } | 4 | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:30:15:33:3 | { ... } | 5 | Test.kt:32:8:32:9 | 10 |
-| Test.kt:30:15:33:3 | { ... } | 6 | Test.kt:32:4:32:9 | ...=... |
-| Test.kt:35:3:35:8 | <Expr>; | 0 | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:35:3:35:8 | <Expr>; | 1 | Test.kt:35:7:35:8 | 20 |
-| Test.kt:35:3:35:8 | <Expr>; | 2 | Test.kt:35:3:35:8 | ...=... |
-| Test.kt:35:3:35:8 | <Expr>; | 3 | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:38:9:38:9 | x | 0 | Test.kt:38:9:38:9 | x |
-| Test.kt:38:9:38:9 | x | 1 | Test.kt:38:13:38:13 | 0 |
-| Test.kt:38:9:38:9 | x | 2 | Test.kt:38:9:38:13 | ... > ... |
-| Test.kt:38:16:41:3 | { ... } | 0 | Test.kt:38:16:41:3 | { ... } |
-| Test.kt:38:16:41:3 | { ... } | 1 | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:38:16:41:3 | { ... } | 2 | Test.kt:39:8:39:9 | 10 |
-| Test.kt:38:16:41:3 | { ... } | 3 | Test.kt:39:4:39:9 | ...=... |
-| Test.kt:38:16:41:3 | { ... } | 4 | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:38:16:41:3 | { ... } | 5 | Test.kt:40:4:40:6 | <Stmt> |
-| Test.kt:38:16:41:3 | { ... } | 6 | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:38:16:41:3 | { ... } | 7 | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:38:16:41:3 | { ... } | 8 | Test.kt:40:4:40:4 | x |
-| Test.kt:38:16:41:3 | { ... } | 9 | Test.kt:40:4:40:6 | <unary> |
-| Test.kt:38:16:41:3 | { ... } | 10 | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:38:16:41:3 | { ... } | 11 | Test.kt:40:4:40:6 | <unary> |
-| Test.kt:38:16:41:3 | { ... } | 12 | Test.kt:40:4:40:6 | dec(...) |
-| Test.kt:38:16:41:3 | { ... } | 13 | Test.kt:40:4:40:6 | ...=... |
-| Test.kt:38:16:41:3 | { ... } | 14 | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:38:16:41:3 | { ... } | 15 | Test.kt:40:4:40:6 | <unary> |
-| Test.kt:38:16:41:3 | { ... } | 16 | Test.kt:40:4:40:6 | <implicit coercion to unit> |
-| Test.kt:43:3:43:8 | <Expr>; | 0 | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | 1 | Test.kt:43:7:43:8 | 30 |
-| Test.kt:43:3:43:8 | <Expr>; | 2 | Test.kt:43:3:43:8 | ...=... |
-| Test.kt:43:3:43:8 | <Expr>; | 3 | Test.kt:73:3:73:8 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | 4 | Test.kt:73:7:73:8 | 50 |
-| Test.kt:43:3:43:8 | <Expr>; | 5 | Test.kt:73:3:73:8 | ...=... |
-| Test.kt:43:3:43:8 | <Expr>; | 6 | Test.kt:77:3:77:8 | <Expr>; |
-| Test.kt:43:3:43:8 | <Expr>; | 7 | Test.kt:77:7:77:8 | 40 |
-| Test.kt:43:3:43:8 | <Expr>; | 8 | Test.kt:77:3:77:8 | ...=... |
-| Test.kt:43:3:43:8 | <Expr>; | 9 | Test.kt:78:9:78:9 | INSTANCE |
-| Test.kt:43:3:43:8 | <Expr>; | 10 | Test.kt:78:3:78:8 | return ... |
-| Test.kt:82:1:89:1 | Exceptional Exit | 0 | Test.kt:82:1:89:1 | Exceptional Exit |
+| Test.kt:4:2:79:2 | Normal Exit | 1 | Test.kt:4:2:79:2 | Exit |
+| Test.kt:11:3:16:3 | After when ... | 0 | Test.kt:11:3:16:3 | After when ... |
+| Test.kt:11:3:16:3 | After when ... | 1 | Test.kt:11:3:16:3 | After <Expr>; |
+| Test.kt:11:3:16:3 | After when ... | 2 | Test.kt:18:3:18:7 | <Expr>; |
+| Test.kt:11:3:16:3 | After when ... | 3 | Test.kt:18:3:18:7 | Before ...=... |
+| Test.kt:11:3:16:3 | After when ... | 4 | Test.kt:18:3:18:7 | z |
+| Test.kt:11:3:16:3 | After when ... | 5 | Test.kt:18:7:18:7 | 0 |
+| Test.kt:11:3:16:3 | After when ... | 6 | Test.kt:18:3:18:7 | ...=... |
+| Test.kt:11:3:16:3 | After when ... | 7 | Test.kt:18:3:18:7 | After ...=... |
+| Test.kt:11:3:16:3 | After when ... | 8 | Test.kt:18:3:18:7 | After <Expr>; |
+| Test.kt:11:3:16:3 | After when ... | 9 | Test.kt:21:3:24:9 | <Expr>; |
+| Test.kt:11:3:16:3 | After when ... | 10 | Test.kt:21:3:24:9 | when ... |
+| Test.kt:11:3:16:3 | After when ... | 11 | Test.kt:21:6:22:9 | ... -> ... |
+| Test.kt:11:3:16:3 | After when ... | 12 | Test.kt:21:6:21:10 | Before ... < ... |
+| Test.kt:11:3:16:3 | After when ... | 13 | Test.kt:21:6:21:6 | x |
+| Test.kt:11:3:16:3 | After when ... | 14 | Test.kt:21:10:21:10 | 0 |
+| Test.kt:11:3:16:3 | After when ... | 15 | Test.kt:21:6:21:10 | ... < ... |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 0 | Test.kt:11:7:11:11 | After ... > ... [false] |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 1 | Test.kt:14:10:16:3 | ... -> ... |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 2 | Test.kt:14:10:16:3 | true |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 3 | Test.kt:14:10:16:3 | After true [true] |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 4 | Test.kt:14:10:16:3 | { ... } |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 5 | Test.kt:15:4:15:9 | <Expr>; |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 6 | Test.kt:15:4:15:9 | Before ...=... |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 7 | Test.kt:15:4:15:9 | y |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 8 | Test.kt:15:8:15:9 | 30 |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 9 | Test.kt:15:4:15:9 | ...=... |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 10 | Test.kt:15:4:15:9 | After ...=... |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 11 | Test.kt:15:4:15:9 | After <Expr>; |
+| Test.kt:11:7:11:11 | After ... > ... [false] | 12 | Test.kt:14:10:16:3 | After { ... } |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 0 | Test.kt:11:7:11:11 | After ... > ... [true] |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 1 | Test.kt:11:14:14:3 | { ... } |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 2 | Test.kt:12:4:12:9 | <Expr>; |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 3 | Test.kt:12:4:12:9 | Before ...=... |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 4 | Test.kt:12:4:12:9 | y |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 5 | Test.kt:12:8:12:9 | 20 |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 6 | Test.kt:12:4:12:9 | ...=... |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 7 | Test.kt:12:4:12:9 | After ...=... |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 8 | Test.kt:12:4:12:9 | After <Expr>; |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 9 | Test.kt:13:4:13:9 | <Expr>; |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 10 | Test.kt:13:4:13:9 | Before ...=... |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 11 | Test.kt:13:4:13:9 | z |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 12 | Test.kt:13:8:13:9 | 10 |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 13 | Test.kt:13:4:13:9 | ...=... |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 14 | Test.kt:13:4:13:9 | After ...=... |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 15 | Test.kt:13:4:13:9 | After <Expr>; |
+| Test.kt:11:7:11:11 | After ... > ... [true] | 16 | Test.kt:11:14:14:3 | After { ... } |
+| Test.kt:21:6:21:10 | After ... < ... [false] | 0 | Test.kt:21:6:21:10 | After ... < ... [false] |
+| Test.kt:21:6:21:10 | After ... < ... [false] | 1 | Test.kt:24:4:24:9 | ... -> ... |
+| Test.kt:21:6:21:10 | After ... < ... [false] | 2 | Test.kt:24:4:24:9 | true |
+| Test.kt:21:6:21:10 | After ... < ... [false] | 3 | Test.kt:24:4:24:9 | After true [true] |
+| Test.kt:21:6:21:10 | After ... < ... [false] | 4 | Test.kt:24:4:24:9 | Before return ... |
+| Test.kt:21:6:21:10 | After ... < ... [false] | 5 | Test.kt:24:10:24:10 | INSTANCE |
+| Test.kt:21:6:21:10 | After ... < ... [false] | 6 | Test.kt:24:4:24:9 | return ... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 0 | Test.kt:21:6:21:10 | After ... < ... [true] |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 1 | Test.kt:22:4:22:9 | <Expr>; |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 2 | Test.kt:22:4:22:9 | Before ...=... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 3 | Test.kt:22:4:22:9 | y |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 4 | Test.kt:22:8:22:9 | 40 |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 5 | Test.kt:22:4:22:9 | ...=... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 6 | Test.kt:22:4:22:9 | After ...=... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 7 | Test.kt:22:4:22:9 | After <Expr>; |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 8 | Test.kt:21:3:24:9 | After when ... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 9 | Test.kt:21:3:24:9 | After <Expr>; |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 10 | Test.kt:27:3:27:8 | <Expr>; |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 11 | Test.kt:27:3:27:8 | Before ...=... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 12 | Test.kt:27:3:27:8 | z |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 13 | Test.kt:27:7:27:8 | 10 |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 14 | Test.kt:27:3:27:8 | ...=... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 15 | Test.kt:27:3:27:8 | After ...=... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 16 | Test.kt:27:3:27:8 | After <Expr>; |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 17 | Test.kt:30:3:33:3 | <Expr>; |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 18 | Test.kt:30:3:33:3 | when ... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 19 | Test.kt:30:7:33:3 | ... -> ... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 20 | Test.kt:30:7:30:12 | Before ... (value equals) ... |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 21 | Test.kt:30:7:30:7 | x |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 22 | Test.kt:30:12:30:12 | 0 |
+| Test.kt:21:6:21:10 | After ... < ... [true] | 23 | Test.kt:30:7:30:12 | ... (value equals) ... |
+| Test.kt:30:3:33:3 | After when ... | 0 | Test.kt:30:3:33:3 | After when ... |
+| Test.kt:30:3:33:3 | After when ... | 1 | Test.kt:30:3:33:3 | After <Expr>; |
+| Test.kt:30:3:33:3 | After when ... | 2 | Test.kt:35:3:35:8 | <Expr>; |
+| Test.kt:30:3:33:3 | After when ... | 3 | Test.kt:35:3:35:8 | Before ...=... |
+| Test.kt:30:3:33:3 | After when ... | 4 | Test.kt:35:3:35:8 | z |
+| Test.kt:30:3:33:3 | After when ... | 5 | Test.kt:35:7:35:8 | 20 |
+| Test.kt:30:3:33:3 | After when ... | 6 | Test.kt:35:3:35:8 | ...=... |
+| Test.kt:30:3:33:3 | After when ... | 7 | Test.kt:35:3:35:8 | After ...=... |
+| Test.kt:30:3:33:3 | After when ... | 8 | Test.kt:35:3:35:8 | After <Expr>; |
+| Test.kt:30:3:33:3 | After when ... | 9 | Test.kt:38:3:41:3 | while (...) |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [false] | 0 | Test.kt:30:7:30:12 | After ... (value equals) ... [false] |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 0 | Test.kt:30:7:30:12 | After ... (value equals) ... [true] |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 1 | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 2 | Test.kt:31:4:31:9 | <Expr>; |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 3 | Test.kt:31:4:31:9 | Before ...=... |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 4 | Test.kt:31:4:31:9 | y |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 5 | Test.kt:31:8:31:9 | 60 |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 6 | Test.kt:31:4:31:9 | ...=... |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 7 | Test.kt:31:4:31:9 | After ...=... |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 8 | Test.kt:31:4:31:9 | After <Expr>; |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 9 | Test.kt:32:4:32:9 | <Expr>; |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 10 | Test.kt:32:4:32:9 | Before ...=... |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 11 | Test.kt:32:4:32:9 | z |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 12 | Test.kt:32:8:32:9 | 10 |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 13 | Test.kt:32:4:32:9 | ...=... |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 14 | Test.kt:32:4:32:9 | After ...=... |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 15 | Test.kt:32:4:32:9 | After <Expr>; |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [true] | 16 | Test.kt:30:15:33:3 | After { ... } |
+| Test.kt:38:3:41:3 | [LoopHeader] while (...) | 0 | Test.kt:38:3:41:3 | [LoopHeader] while (...) |
+| Test.kt:38:3:41:3 | [LoopHeader] while (...) | 1 | Test.kt:38:9:38:13 | Before ... > ... |
+| Test.kt:38:3:41:3 | [LoopHeader] while (...) | 2 | Test.kt:38:9:38:9 | x |
+| Test.kt:38:3:41:3 | [LoopHeader] while (...) | 3 | Test.kt:38:13:38:13 | 0 |
+| Test.kt:38:3:41:3 | [LoopHeader] while (...) | 4 | Test.kt:38:9:38:13 | ... > ... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 0 | Test.kt:38:9:38:13 | After ... > ... [false] |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 1 | Test.kt:38:3:41:3 | After while (...) |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 2 | Test.kt:43:3:43:8 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 3 | Test.kt:43:3:43:8 | Before ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 4 | Test.kt:43:3:43:8 | z |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 5 | Test.kt:43:7:43:8 | 30 |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 6 | Test.kt:43:3:43:8 | ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 7 | Test.kt:43:3:43:8 | After ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 8 | Test.kt:43:3:43:8 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 9 | Test.kt:73:3:73:8 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 10 | Test.kt:73:3:73:8 | Before ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 11 | Test.kt:73:3:73:8 | z |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 12 | Test.kt:73:7:73:8 | 50 |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 13 | Test.kt:73:3:73:8 | ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 14 | Test.kt:73:3:73:8 | After ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 15 | Test.kt:73:3:73:8 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 16 | Test.kt:77:3:77:8 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 17 | Test.kt:77:3:77:8 | Before ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 18 | Test.kt:77:3:77:8 | w |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 19 | Test.kt:77:7:77:8 | 40 |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 20 | Test.kt:77:3:77:8 | ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 21 | Test.kt:77:3:77:8 | After ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 22 | Test.kt:77:3:77:8 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 23 | Test.kt:78:3:78:8 | Before return ... |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 24 | Test.kt:78:9:78:9 | INSTANCE |
+| Test.kt:38:9:38:13 | After ... > ... [false] | 25 | Test.kt:78:3:78:8 | return ... |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 0 | Test.kt:38:9:38:13 | After ... > ... [true] |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 1 | Test.kt:38:16:41:3 | { ... } |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 2 | Test.kt:39:4:39:9 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 3 | Test.kt:39:4:39:9 | Before ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 4 | Test.kt:39:4:39:9 | y |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 5 | Test.kt:39:8:39:9 | 10 |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 6 | Test.kt:39:4:39:9 | ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 7 | Test.kt:39:4:39:9 | After ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 8 | Test.kt:39:4:39:9 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 9 | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 10 | Test.kt:40:4:40:6 | Before <implicit coercion to unit> |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 11 | Test.kt:40:4:40:6 | Before <Stmt> |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 12 | Test.kt:40:4:40:6 | { ... } |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 13 | Test.kt:40:4:40:6 | var ...; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 14 | Test.kt:40:4:40:6 | Before <unary> |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 15 | Test.kt:40:4:40:4 | x |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 16 | Test.kt:40:4:40:6 | <unary> |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 17 | Test.kt:40:4:40:6 | After <unary> |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 18 | Test.kt:40:4:40:6 | After var ...; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 19 | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 20 | Test.kt:40:4:40:6 | Before ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 21 | Test.kt:40:4:40:6 | x |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 22 | Test.kt:40:4:40:6 | Before dec(...) |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 23 | Test.kt:40:4:40:6 | <unary> |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 24 | Test.kt:40:4:40:6 | dec(...) |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 25 | Test.kt:40:4:40:6 | After dec(...) |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 26 | Test.kt:40:4:40:6 | ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 27 | Test.kt:40:4:40:6 | After ...=... |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 28 | Test.kt:40:4:40:6 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 29 | Test.kt:40:4:40:6 | <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 30 | Test.kt:40:4:40:6 | <unary> |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 31 | Test.kt:40:4:40:6 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 32 | Test.kt:40:4:40:6 | After { ... } |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 33 | Test.kt:40:4:40:6 | <Stmt> |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 34 | Test.kt:40:4:40:6 | After <Stmt> |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 35 | Test.kt:40:4:40:6 | <implicit coercion to unit> |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 36 | Test.kt:40:4:40:6 | After <implicit coercion to unit> |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 37 | Test.kt:40:4:40:6 | After <Expr>; |
+| Test.kt:38:9:38:13 | After ... > ... [true] | 38 | Test.kt:38:16:41:3 | After { ... } |
+| Test.kt:82:1:89:1 | Entry | 0 | Test.kt:82:1:89:1 | Entry |
+| Test.kt:82:1:89:1 | Entry | 1 | Test.kt:82:21:89:1 | { ... } |
+| Test.kt:82:1:89:1 | Entry | 2 | Test.kt:83:2:88:2 | try ... |
+| Test.kt:82:1:89:1 | Entry | 3 | Test.kt:83:6:86:2 | { ... } |
+| Test.kt:82:1:89:1 | Entry | 4 | Test.kt:84:3:84:18 | var ...; |
+| Test.kt:82:1:89:1 | Entry | 5 | Test.kt:84:3:84:18 | Before x |
+| Test.kt:82:1:89:1 | Entry | 6 | Test.kt:84:11:84:18 | Before (...)... |
+| Test.kt:82:1:89:1 | Entry | 7 | Test.kt:84:11:84:11 | o |
+| Test.kt:82:1:89:1 | Entry | 8 | Test.kt:84:11:84:18 | (...)... |
 | Test.kt:82:1:89:1 | Exit | 0 | Test.kt:82:1:89:1 | Exit |
 | Test.kt:82:1:89:1 | Normal Exit | 0 | Test.kt:82:1:89:1 | Normal Exit |
-| Test.kt:82:21:89:1 | { ... } | 0 | Test.kt:82:21:89:1 | { ... } |
-| Test.kt:82:21:89:1 | { ... } | 1 | Test.kt:83:2:88:2 | try ... |
-| Test.kt:82:21:89:1 | { ... } | 2 | Test.kt:83:6:86:2 | { ... } |
-| Test.kt:82:21:89:1 | { ... } | 3 | Test.kt:84:3:84:18 | var ...; |
-| Test.kt:82:21:89:1 | { ... } | 4 | Test.kt:84:11:84:11 | o |
-| Test.kt:82:21:89:1 | { ... } | 5 | Test.kt:84:11:84:18 | (...)... |
-| Test.kt:84:3:84:18 | x | 0 | Test.kt:84:3:84:18 | x |
-| Test.kt:84:3:84:18 | x | 1 | Test.kt:85:10:85:10 | 1 |
-| Test.kt:84:3:84:18 | x | 2 | Test.kt:85:3:85:10 | return ... |
+| Test.kt:84:11:84:18 | After (...)... | 0 | Test.kt:84:11:84:18 | After (...)... |
+| Test.kt:84:11:84:18 | After (...)... | 1 | Test.kt:84:3:84:18 | x |
+| Test.kt:84:11:84:18 | After (...)... | 2 | Test.kt:84:3:84:18 | After x |
+| Test.kt:84:11:84:18 | After (...)... | 3 | Test.kt:84:3:84:18 | After var ...; |
+| Test.kt:84:11:84:18 | After (...)... | 4 | Test.kt:85:3:85:10 | Before return ... |
+| Test.kt:84:11:84:18 | After (...)... | 5 | Test.kt:85:10:85:10 | 1 |
+| Test.kt:84:11:84:18 | After (...)... | 6 | Test.kt:85:3:85:10 | return ... |
+| Test.kt:86:4:88:2 | After catch (...) [match] | 0 | Test.kt:86:4:88:2 | After catch (...) [match] |
+| Test.kt:86:4:88:2 | After catch (...) [match] | 1 | Test.kt:86:11:86:31 | e |
+| Test.kt:86:4:88:2 | After catch (...) [match] | 2 | Test.kt:86:34:88:2 | { ... } |
+| Test.kt:86:4:88:2 | After catch (...) [match] | 3 | Test.kt:87:3:87:10 | Before return ... |
+| Test.kt:86:4:88:2 | After catch (...) [match] | 4 | Test.kt:87:10:87:10 | 2 |
+| Test.kt:86:4:88:2 | After catch (...) [match] | 5 | Test.kt:87:3:87:10 | return ... |
+| Test.kt:86:4:88:2 | After catch (...) [no-match] | 0 | Test.kt:86:4:88:2 | After catch (...) [no-match] |
+| Test.kt:86:4:88:2 | After catch (...) [no-match] | 1 | Test.kt:82:1:89:1 | Exceptional Exit |
 | Test.kt:86:4:88:2 | catch (...) | 0 | Test.kt:86:4:88:2 | catch (...) |
-| Test.kt:86:4:88:2 | catch (...) | 1 | Test.kt:86:11:86:31 | e |
-| Test.kt:86:4:88:2 | catch (...) | 2 | Test.kt:86:34:88:2 | { ... } |
-| Test.kt:86:4:88:2 | catch (...) | 3 | Test.kt:87:10:87:10 | 2 |
-| Test.kt:86:4:88:2 | catch (...) | 4 | Test.kt:87:3:87:10 | return ... |
-| Test.kt:91:1:98:1 | Exceptional Exit | 0 | Test.kt:91:1:98:1 | Exceptional Exit |
+| Test.kt:91:1:98:1 | Entry | 0 | Test.kt:91:1:98:1 | Entry |
+| Test.kt:91:1:98:1 | Entry | 1 | Test.kt:91:22:98:1 | { ... } |
+| Test.kt:91:1:98:1 | Entry | 2 | Test.kt:92:2:97:2 | try ... |
+| Test.kt:91:1:98:1 | Entry | 3 | Test.kt:92:6:95:2 | { ... } |
+| Test.kt:91:1:98:1 | Entry | 4 | Test.kt:93:3:93:13 | var ...; |
+| Test.kt:91:1:98:1 | Entry | 5 | Test.kt:93:3:93:13 | Before x |
+| Test.kt:91:1:98:1 | Entry | 6 | Test.kt:93:11:93:13 | Before ...!! |
+| Test.kt:91:1:98:1 | Entry | 7 | Test.kt:93:11:93:11 | o |
+| Test.kt:91:1:98:1 | Entry | 8 | Test.kt:93:11:93:13 | ...!! |
 | Test.kt:91:1:98:1 | Exit | 0 | Test.kt:91:1:98:1 | Exit |
 | Test.kt:91:1:98:1 | Normal Exit | 0 | Test.kt:91:1:98:1 | Normal Exit |
-| Test.kt:91:22:98:1 | { ... } | 0 | Test.kt:91:22:98:1 | { ... } |
-| Test.kt:91:22:98:1 | { ... } | 1 | Test.kt:92:2:97:2 | try ... |
-| Test.kt:91:22:98:1 | { ... } | 2 | Test.kt:92:6:95:2 | { ... } |
-| Test.kt:91:22:98:1 | { ... } | 3 | Test.kt:93:3:93:13 | var ...; |
-| Test.kt:91:22:98:1 | { ... } | 4 | Test.kt:93:11:93:11 | o |
-| Test.kt:91:22:98:1 | { ... } | 5 | Test.kt:93:11:93:13 | ...!! |
-| Test.kt:93:3:93:13 | x | 0 | Test.kt:93:3:93:13 | x |
-| Test.kt:93:3:93:13 | x | 1 | Test.kt:94:10:94:10 | 1 |
-| Test.kt:93:3:93:13 | x | 2 | Test.kt:94:3:94:10 | return ... |
+| Test.kt:93:11:93:13 | After ...!! | 0 | Test.kt:93:11:93:13 | After ...!! |
+| Test.kt:93:11:93:13 | After ...!! | 1 | Test.kt:93:3:93:13 | x |
+| Test.kt:93:11:93:13 | After ...!! | 2 | Test.kt:93:3:93:13 | After x |
+| Test.kt:93:11:93:13 | After ...!! | 3 | Test.kt:93:3:93:13 | After var ...; |
+| Test.kt:93:11:93:13 | After ...!! | 4 | Test.kt:94:3:94:10 | Before return ... |
+| Test.kt:93:11:93:13 | After ...!! | 5 | Test.kt:94:10:94:10 | 1 |
+| Test.kt:93:11:93:13 | After ...!! | 6 | Test.kt:94:3:94:10 | return ... |
+| Test.kt:95:4:97:2 | After catch (...) [match] | 0 | Test.kt:95:4:97:2 | After catch (...) [match] |
+| Test.kt:95:4:97:2 | After catch (...) [match] | 1 | Test.kt:95:11:95:33 | e |
+| Test.kt:95:4:97:2 | After catch (...) [match] | 2 | Test.kt:95:36:97:2 | { ... } |
+| Test.kt:95:4:97:2 | After catch (...) [match] | 3 | Test.kt:96:3:96:10 | Before return ... |
+| Test.kt:95:4:97:2 | After catch (...) [match] | 4 | Test.kt:96:10:96:10 | 2 |
+| Test.kt:95:4:97:2 | After catch (...) [match] | 5 | Test.kt:96:3:96:10 | return ... |
+| Test.kt:95:4:97:2 | After catch (...) [no-match] | 0 | Test.kt:95:4:97:2 | After catch (...) [no-match] |
+| Test.kt:95:4:97:2 | After catch (...) [no-match] | 1 | Test.kt:91:1:98:1 | Exceptional Exit |
 | Test.kt:95:4:97:2 | catch (...) | 0 | Test.kt:95:4:97:2 | catch (...) |
-| Test.kt:95:4:97:2 | catch (...) | 1 | Test.kt:95:11:95:33 | e |
-| Test.kt:95:4:97:2 | catch (...) | 2 | Test.kt:95:36:97:2 | { ... } |
-| Test.kt:95:4:97:2 | catch (...) | 3 | Test.kt:96:10:96:10 | 2 |
-| Test.kt:95:4:97:2 | catch (...) | 4 | Test.kt:96:3:96:10 | return ... |
+| Test.kt:100:1:110:1 | Entry | 0 | Test.kt:100:1:110:1 | Entry |
+| Test.kt:100:1:110:1 | Entry | 1 | Test.kt:100:25:110:1 | { ... } |
+| Test.kt:100:1:110:1 | Entry | 2 | Test.kt:101:5:103:5 | <Expr>; |
+| Test.kt:100:1:110:1 | Entry | 3 | Test.kt:101:5:103:5 | when ... |
+| Test.kt:100:1:110:1 | Entry | 4 | Test.kt:101:9:103:5 | ... -> ... |
+| Test.kt:100:1:110:1 | Entry | 5 | Test.kt:101:9:101:30 | ... && ... |
+| Test.kt:100:1:110:1 | Entry | 6 | Test.kt:101:9:101:17 | Before ... (value equals) ... |
+| Test.kt:100:1:110:1 | Entry | 7 | Test.kt:101:9:101:9 | x |
+| Test.kt:100:1:110:1 | Entry | 8 | Test.kt:101:14:101:17 | null |
+| Test.kt:100:1:110:1 | Entry | 9 | Test.kt:101:9:101:17 | ... (value equals) ... |
 | Test.kt:100:1:110:1 | Exit | 0 | Test.kt:100:1:110:1 | Exit |
-| Test.kt:100:1:110:1 | Normal Exit | 0 | Test.kt:100:1:110:1 | Normal Exit |
-| Test.kt:100:25:110:1 | { ... } | 0 | Test.kt:100:25:110:1 | { ... } |
-| Test.kt:100:25:110:1 | { ... } | 1 | Test.kt:101:5:103:5 | <Expr>; |
-| Test.kt:100:25:110:1 | { ... } | 2 | Test.kt:101:5:103:5 | when ... |
-| Test.kt:100:25:110:1 | { ... } | 3 | Test.kt:101:9:103:5 | ... -> ... |
-| Test.kt:100:25:110:1 | { ... } | 4 | Test.kt:101:9:101:30 | ... && ... |
-| Test.kt:100:25:110:1 | { ... } | 5 | Test.kt:101:9:101:9 | x |
-| Test.kt:100:25:110:1 | { ... } | 6 | Test.kt:101:14:101:17 | null |
-| Test.kt:100:25:110:1 | { ... } | 7 | Test.kt:101:9:101:17 | ... (value equals) ... |
-| Test.kt:101:22:101:22 | y | 0 | Test.kt:101:22:101:22 | y |
-| Test.kt:101:22:101:22 | y | 1 | Test.kt:101:27:101:30 | null |
-| Test.kt:101:22:101:22 | y | 2 | Test.kt:101:22:101:30 | ... (value equals) ... |
-| Test.kt:101:33:103:5 | { ... } | 0 | Test.kt:101:33:103:5 | { ... } |
-| Test.kt:101:33:103:5 | { ... } | 1 | Test.kt:102:15:102:25 | new Exception(...) |
-| Test.kt:101:33:103:5 | { ... } | 2 | Test.kt:102:9:102:25 | throw ... |
-| Test.kt:101:33:103:5 | { ... } | 3 | Test.kt:100:1:110:1 | Exceptional Exit |
-| Test.kt:105:5:109:5 | <Expr>; | 0 | Test.kt:105:5:109:5 | <Expr>; |
-| Test.kt:105:5:109:5 | <Expr>; | 1 | Test.kt:105:5:109:5 | when ... |
-| Test.kt:105:5:109:5 | <Expr>; | 2 | Test.kt:105:9:107:5 | ... -> ... |
-| Test.kt:105:5:109:5 | <Expr>; | 3 | Test.kt:105:9:105:9 | x |
-| Test.kt:105:5:109:5 | <Expr>; | 4 | Test.kt:105:14:105:17 | null |
-| Test.kt:105:5:109:5 | <Expr>; | 5 | Test.kt:105:9:105:17 | ... (value not-equals) ... |
-| Test.kt:105:20:107:5 | { ... } | 0 | Test.kt:105:20:107:5 | { ... } |
-| Test.kt:105:20:107:5 | { ... } | 1 | Test.kt:106:9:106:29 | <Expr>; |
-| Test.kt:105:20:107:5 | { ... } | 2 | Test.kt:106:17:106:28 | "x not null" |
-| Test.kt:105:20:107:5 | { ... } | 3 | Test.kt:106:9:106:29 | println(...) |
-| Test.kt:107:16:109:5 | ... -> ... | 0 | Test.kt:107:16:109:5 | ... -> ... |
-| Test.kt:107:16:109:5 | ... -> ... | 1 | Test.kt:107:16:107:16 | y |
-| Test.kt:107:16:109:5 | ... -> ... | 2 | Test.kt:107:21:107:24 | null |
-| Test.kt:107:16:109:5 | ... -> ... | 3 | Test.kt:107:16:107:24 | ... (value not-equals) ... |
-| Test.kt:107:27:109:5 | { ... } | 0 | Test.kt:107:27:109:5 | { ... } |
-| Test.kt:107:27:109:5 | { ... } | 1 | Test.kt:108:9:108:29 | <Expr>; |
-| Test.kt:107:27:109:5 | { ... } | 2 | Test.kt:108:17:108:28 | "y not null" |
-| Test.kt:107:27:109:5 | { ... } | 3 | Test.kt:108:9:108:29 | println(...) |
-| Test.kt:112:1:116:1 | Exceptional Exit | 0 | Test.kt:112:1:116:1 | Exceptional Exit |
-| Test.kt:112:1:116:1 | Exit | 0 | Test.kt:112:1:116:1 | Exit |
-| Test.kt:112:1:116:1 | Normal Exit | 0 | Test.kt:112:1:116:1 | Normal Exit |
-| Test.kt:112:32:116:1 | { ... } | 0 | Test.kt:112:32:116:1 | { ... } |
-| Test.kt:112:32:116:1 | { ... } | 1 | Test.kt:113:5:115:5 | <Expr>; |
-| Test.kt:112:32:116:1 | { ... } | 2 | Test.kt:113:5:115:5 | when ... |
-| Test.kt:112:32:116:1 | { ... } | 3 | Test.kt:113:9:115:5 | ... -> ... |
-| Test.kt:112:32:116:1 | { ... } | 4 | Test.kt:113:9:113:14 | ... && ... |
-| Test.kt:112:32:116:1 | { ... } | 5 | Test.kt:113:9:113:9 | x |
-| Test.kt:113:14:113:14 | y | 0 | Test.kt:113:14:113:14 | y |
-| Test.kt:113:17:115:5 | { ... } | 0 | Test.kt:113:17:115:5 | { ... } |
-| Test.kt:118:1:124:1 | Exceptional Exit | 0 | Test.kt:118:1:124:1 | Exceptional Exit |
-| Test.kt:118:1:124:1 | Exit | 0 | Test.kt:118:1:124:1 | Exit |
-| Test.kt:118:1:124:1 | Normal Exit | 0 | Test.kt:118:1:124:1 | Normal Exit |
-| Test.kt:118:37:124:1 | { ... } | 0 | Test.kt:118:37:124:1 | { ... } |
-| Test.kt:118:37:124:1 | { ... } | 1 | Test.kt:119:2:123:12 | <Expr>; |
-| Test.kt:118:37:124:1 | { ... } | 2 | Test.kt:119:2:123:12 | when ... |
-| Test.kt:118:37:124:1 | { ... } | 3 | Test.kt:120:3:123:10 | ... -> ... |
-| Test.kt:118:37:124:1 | { ... } | 4 | Test.kt:120:3:123:3 | when ... |
-| Test.kt:118:37:124:1 | { ... } | 5 | Test.kt:121:4:121:9 | ... -> ... |
-| Test.kt:118:37:124:1 | { ... } | 6 | Test.kt:121:4:121:4 | x |
-| Test.kt:121:9:121:9 | <Expr>; | 0 | Test.kt:121:9:121:9 | <Expr>; |
-| Test.kt:121:9:121:9 | <Expr>; | 1 | Test.kt:121:9:121:9 | y |
-| Test.kt:122:12:122:16 | ... -> ... | 0 | Test.kt:122:12:122:16 | ... -> ... |
-| Test.kt:122:12:122:16 | ... -> ... | 1 | Test.kt:122:12:122:16 | true |
-| Test.kt:122:12:122:16 | ... -> ... | 2 | Test.kt:122:12:122:16 | <Expr>; |
-| Test.kt:122:12:122:16 | ... -> ... | 3 | Test.kt:122:12:122:16 | false |
-| Test.kt:123:8:123:10 | { ... } | 0 | Test.kt:123:8:123:10 | { ... } |
+| Test.kt:101:9:101:17 | After ... (value equals) ... [false] | 0 | Test.kt:101:9:101:17 | After ... (value equals) ... [false] |
+| Test.kt:101:9:101:17 | After ... (value equals) ... [true] | 0 | Test.kt:101:9:101:17 | After ... (value equals) ... [true] |
+| Test.kt:101:9:101:17 | After ... (value equals) ... [true] | 1 | Test.kt:101:22:101:30 | Before ... (value equals) ... |
+| Test.kt:101:9:101:17 | After ... (value equals) ... [true] | 2 | Test.kt:101:22:101:22 | y |
+| Test.kt:101:9:101:17 | After ... (value equals) ... [true] | 3 | Test.kt:101:27:101:30 | null |
+| Test.kt:101:9:101:17 | After ... (value equals) ... [true] | 4 | Test.kt:101:22:101:30 | ... (value equals) ... |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 0 | Test.kt:101:9:101:30 | After ... && ... [false] |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 1 | Test.kt:101:5:103:5 | After when ... |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 2 | Test.kt:101:5:103:5 | After <Expr>; |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 3 | Test.kt:105:5:109:5 | <Expr>; |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 4 | Test.kt:105:5:109:5 | when ... |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 5 | Test.kt:105:9:107:5 | ... -> ... |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 6 | Test.kt:105:9:105:17 | Before ... (value not-equals) ... |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 7 | Test.kt:105:9:105:9 | x |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 8 | Test.kt:105:14:105:17 | null |
+| Test.kt:101:9:101:30 | After ... && ... [false] | 9 | Test.kt:105:9:105:17 | ... (value not-equals) ... |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [false] | 0 | Test.kt:101:22:101:30 | After ... (value equals) ... [false] |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [true] | 0 | Test.kt:101:22:101:30 | After ... (value equals) ... [true] |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [true] | 1 | Test.kt:101:9:101:30 | After ... && ... [true] |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [true] | 2 | Test.kt:101:33:103:5 | { ... } |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [true] | 3 | Test.kt:102:9:102:25 | Before throw ... |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [true] | 4 | Test.kt:102:15:102:25 | Before new Exception(...) |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [true] | 5 | Test.kt:102:15:102:25 | new Exception(...) |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [true] | 6 | Test.kt:102:15:102:25 | After new Exception(...) |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [true] | 7 | Test.kt:102:9:102:25 | throw ... |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [true] | 8 | Test.kt:100:1:110:1 | Exceptional Exit |
+| Test.kt:105:5:109:5 | After when ... | 0 | Test.kt:105:5:109:5 | After when ... |
+| Test.kt:105:5:109:5 | After when ... | 1 | Test.kt:105:5:109:5 | After <Expr>; |
+| Test.kt:105:5:109:5 | After when ... | 2 | Test.kt:100:25:110:1 | After { ... } |
+| Test.kt:105:5:109:5 | After when ... | 3 | Test.kt:100:1:110:1 | Normal Exit |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [false] | 0 | Test.kt:105:9:105:17 | After ... (value not-equals) ... [false] |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [false] | 1 | Test.kt:107:16:109:5 | ... -> ... |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [false] | 2 | Test.kt:107:16:107:24 | Before ... (value not-equals) ... |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [false] | 3 | Test.kt:107:16:107:16 | y |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [false] | 4 | Test.kt:107:21:107:24 | null |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [false] | 5 | Test.kt:107:16:107:24 | ... (value not-equals) ... |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] | 0 | Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] | 1 | Test.kt:105:20:107:5 | { ... } |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] | 2 | Test.kt:106:9:106:29 | <Expr>; |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] | 3 | Test.kt:106:9:106:29 | Before println(...) |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] | 4 | Test.kt:106:17:106:28 | "x not null" |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] | 5 | Test.kt:106:9:106:29 | println(...) |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] | 6 | Test.kt:106:9:106:29 | After println(...) |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] | 7 | Test.kt:106:9:106:29 | After <Expr>; |
+| Test.kt:105:9:105:17 | After ... (value not-equals) ... [true] | 8 | Test.kt:105:20:107:5 | After { ... } |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [false] | 0 | Test.kt:107:16:107:24 | After ... (value not-equals) ... [false] |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] | 0 | Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] | 1 | Test.kt:107:27:109:5 | { ... } |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] | 2 | Test.kt:108:9:108:29 | <Expr>; |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] | 3 | Test.kt:108:9:108:29 | Before println(...) |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] | 4 | Test.kt:108:17:108:28 | "y not null" |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] | 5 | Test.kt:108:9:108:29 | println(...) |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] | 6 | Test.kt:108:9:108:29 | After println(...) |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] | 7 | Test.kt:108:9:108:29 | After <Expr>; |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [true] | 8 | Test.kt:107:27:109:5 | After { ... } |
+| Test.kt:112:1:116:1 | Entry | 0 | Test.kt:112:1:116:1 | Entry |
+| Test.kt:112:1:116:1 | Entry | 1 | Test.kt:112:32:116:1 | { ... } |
+| Test.kt:112:1:116:1 | Entry | 2 | Test.kt:113:5:115:5 | <Expr>; |
+| Test.kt:112:1:116:1 | Entry | 3 | Test.kt:113:5:115:5 | when ... |
+| Test.kt:112:1:116:1 | Entry | 4 | Test.kt:113:9:115:5 | ... -> ... |
+| Test.kt:112:1:116:1 | Entry | 5 | Test.kt:113:9:113:14 | ... && ... |
+| Test.kt:112:1:116:1 | Entry | 6 | Test.kt:113:9:113:9 | x |
+| Test.kt:113:5:115:5 | After when ... | 0 | Test.kt:113:5:115:5 | After when ... |
+| Test.kt:113:5:115:5 | After when ... | 1 | Test.kt:113:5:115:5 | After <Expr>; |
+| Test.kt:113:5:115:5 | After when ... | 2 | Test.kt:112:32:116:1 | After { ... } |
+| Test.kt:113:5:115:5 | After when ... | 3 | Test.kt:112:1:116:1 | Normal Exit |
+| Test.kt:113:5:115:5 | After when ... | 4 | Test.kt:112:1:116:1 | Exit |
+| Test.kt:113:9:113:9 | After x [false] | 0 | Test.kt:113:9:113:9 | After x [false] |
+| Test.kt:113:9:113:9 | After x [true] | 0 | Test.kt:113:9:113:9 | After x [true] |
+| Test.kt:113:9:113:9 | After x [true] | 1 | Test.kt:113:14:113:14 | y |
+| Test.kt:113:9:113:14 | After ... && ... [false] | 0 | Test.kt:113:9:113:14 | After ... && ... [false] |
+| Test.kt:113:14:113:14 | After y [false] | 0 | Test.kt:113:14:113:14 | After y [false] |
+| Test.kt:113:14:113:14 | After y [true] | 0 | Test.kt:113:14:113:14 | After y [true] |
+| Test.kt:113:14:113:14 | After y [true] | 1 | Test.kt:113:9:113:14 | After ... && ... [true] |
+| Test.kt:113:14:113:14 | After y [true] | 2 | Test.kt:113:17:115:5 | { ... } |
+| Test.kt:118:1:124:1 | Entry | 0 | Test.kt:118:1:124:1 | Entry |
+| Test.kt:118:1:124:1 | Entry | 1 | Test.kt:118:37:124:1 | { ... } |
+| Test.kt:118:1:124:1 | Entry | 2 | Test.kt:119:2:123:12 | <Expr>; |
+| Test.kt:118:1:124:1 | Entry | 3 | Test.kt:119:2:123:12 | when ... |
+| Test.kt:118:1:124:1 | Entry | 4 | Test.kt:120:3:123:10 | ... -> ... |
+| Test.kt:118:1:124:1 | Entry | 5 | Test.kt:120:3:123:3 | when ... |
+| Test.kt:118:1:124:1 | Entry | 6 | Test.kt:121:4:121:9 | ... -> ... |
+| Test.kt:118:1:124:1 | Entry | 7 | Test.kt:121:4:121:4 | x |
+| Test.kt:119:2:123:12 | After when ... | 0 | Test.kt:119:2:123:12 | After when ... |
+| Test.kt:119:2:123:12 | After when ... | 1 | Test.kt:119:2:123:12 | After <Expr>; |
+| Test.kt:119:2:123:12 | After when ... | 2 | Test.kt:118:37:124:1 | After { ... } |
+| Test.kt:119:2:123:12 | After when ... | 3 | Test.kt:118:1:124:1 | Normal Exit |
+| Test.kt:119:2:123:12 | After when ... | 4 | Test.kt:118:1:124:1 | Exit |
+| Test.kt:120:3:123:3 | After when ... [false] | 0 | Test.kt:120:3:123:3 | After when ... [false] |
+| Test.kt:120:3:123:3 | After when ... [true] | 0 | Test.kt:120:3:123:3 | After when ... [true] |
+| Test.kt:120:3:123:3 | After when ... [true] | 1 | Test.kt:123:8:123:10 | { ... } |
+| Test.kt:121:4:121:4 | After x [false] | 0 | Test.kt:121:4:121:4 | After x [false] |
+| Test.kt:121:4:121:4 | After x [false] | 1 | Test.kt:122:12:122:16 | ... -> ... |
+| Test.kt:121:4:121:4 | After x [false] | 2 | Test.kt:122:12:122:16 | true |
+| Test.kt:121:4:121:4 | After x [false] | 3 | Test.kt:122:12:122:16 | After true [true] |
+| Test.kt:121:4:121:4 | After x [false] | 4 | Test.kt:122:12:122:16 | <Expr>; |
+| Test.kt:121:4:121:4 | After x [false] | 5 | Test.kt:122:12:122:16 | false |
+| Test.kt:121:4:121:4 | After x [false] | 6 | Test.kt:122:12:122:16 | After <Expr>; |
+| Test.kt:121:4:121:4 | After x [true] | 0 | Test.kt:121:4:121:4 | After x [true] |
+| Test.kt:121:4:121:4 | After x [true] | 1 | Test.kt:121:9:121:9 | <Expr>; |
+| Test.kt:121:4:121:4 | After x [true] | 2 | Test.kt:121:9:121:9 | y |
+| Test.kt:121:4:121:4 | After x [true] | 3 | Test.kt:121:9:121:9 | After <Expr>; |
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStrictDominance.expected b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStrictDominance.expected
index c7e225ecc6f..a4a9b68d404 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStrictDominance.expected
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStrictDominance.expected
@@ -1,6 +1,3 @@
-| Test.kt:3:1:80:1 | { ... } | Test.kt:3:1:80:1 | Exit |
-| Test.kt:4:2:79:2 | Normal Exit | Test.kt:4:2:79:2 | Exit |
-| Test.kt:4:13:79:2 | { ... } | Test.kt:4:2:79:2 | Exit |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:4:2:79:2 | Normal Exit |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:11:14:14:3 | { ... } |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:14:10:16:3 | ... -> ... |
@@ -12,7 +9,6 @@
 | Test.kt:4:13:79:2 | { ... } | Test.kt:38:9:38:9 | x |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:38:16:41:3 | { ... } |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:18:3:18:7 | <Expr>; | Test.kt:4:2:79:2 | Exit |
 | Test.kt:18:3:18:7 | <Expr>; | Test.kt:4:2:79:2 | Normal Exit |
 | Test.kt:18:3:18:7 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
 | Test.kt:18:3:18:7 | <Expr>; | Test.kt:24:4:24:9 | ... -> ... |
@@ -31,16 +27,22 @@
 | Test.kt:35:3:35:8 | <Expr>; | Test.kt:43:3:43:8 | <Expr>; |
 | Test.kt:38:9:38:9 | x | Test.kt:38:16:41:3 | { ... } |
 | Test.kt:38:9:38:9 | x | Test.kt:43:3:43:8 | <Expr>; |
-| Test.kt:82:1:89:1 | Normal Exit | Test.kt:82:1:89:1 | Exit |
+| Test.kt:82:21:89:1 | { ... } | Test.kt:82:1:89:1 | Exceptional Exit |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:82:1:89:1 | Exit |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:82:1:89:1 | Normal Exit |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:84:3:84:18 | x |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:86:4:88:2 | catch (...) |
-| Test.kt:91:1:98:1 | Normal Exit | Test.kt:91:1:98:1 | Exit |
+| Test.kt:82:21:89:1 | { ... } | Test.kt:86:11:86:31 | e |
+| Test.kt:86:4:88:2 | catch (...) | Test.kt:82:1:89:1 | Exceptional Exit |
+| Test.kt:86:4:88:2 | catch (...) | Test.kt:86:11:86:31 | e |
+| Test.kt:91:22:98:1 | { ... } | Test.kt:91:1:98:1 | Exceptional Exit |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:91:1:98:1 | Exit |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:91:1:98:1 | Normal Exit |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:93:3:93:13 | x |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:95:4:97:2 | catch (...) |
+| Test.kt:91:22:98:1 | { ... } | Test.kt:95:11:95:33 | e |
+| Test.kt:95:4:97:2 | catch (...) | Test.kt:91:1:98:1 | Exceptional Exit |
+| Test.kt:95:4:97:2 | catch (...) | Test.kt:95:11:95:33 | e |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:100:1:110:1 | Exit |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:100:1:110:1 | Normal Exit |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:101:22:101:22 | y |
@@ -55,16 +57,11 @@
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:107:16:109:5 | ... -> ... |
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:107:27:109:5 | { ... } |
 | Test.kt:107:16:109:5 | ... -> ... | Test.kt:107:27:109:5 | { ... } |
-| Test.kt:112:1:116:1 | Normal Exit | Test.kt:112:1:116:1 | Exit |
-| Test.kt:112:32:116:1 | { ... } | Test.kt:112:1:116:1 | Exit |
 | Test.kt:112:32:116:1 | { ... } | Test.kt:112:1:116:1 | Normal Exit |
 | Test.kt:112:32:116:1 | { ... } | Test.kt:113:14:113:14 | y |
 | Test.kt:112:32:116:1 | { ... } | Test.kt:113:17:115:5 | { ... } |
 | Test.kt:113:14:113:14 | y | Test.kt:113:17:115:5 | { ... } |
-| Test.kt:118:1:124:1 | Normal Exit | Test.kt:118:1:124:1 | Exit |
-| Test.kt:118:37:124:1 | { ... } | Test.kt:118:1:124:1 | Exit |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:118:1:124:1 | Normal Exit |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:121:9:121:9 | <Expr>; |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:122:12:122:16 | ... -> ... |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:123:8:123:10 | { ... } |
-| Test.kt:121:9:121:9 | <Expr>; | Test.kt:123:8:123:10 | { ... } |
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStrictDominance.ql b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStrictDominance.ql
index de1e23b649c..72de0cc435d 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStrictDominance.ql
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbStrictDominance.ql
@@ -1,6 +1,7 @@
 import java
 import semmle.code.java.controlflow.Dominance
+import utils.test.BasicBlock
 
 from BasicBlock b, BasicBlock b2
 where b.strictlyDominates(b2)
-select b, b2
+select getFirstAstNode(b), getFirstAstNode(b2)
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbSuccessor.expected b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbSuccessor.expected
index 219779e73dc..060e3fcae70 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbSuccessor.expected
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbSuccessor.expected
@@ -1,16 +1,13 @@
-| Test.kt:3:1:80:1 | Exceptional Exit | Test.kt:3:1:80:1 | Exit |
-| Test.kt:3:1:80:1 | { ... } | Test.kt:3:1:80:1 | Exit |
-| Test.kt:4:2:79:2 | Exceptional Exit | Test.kt:4:2:79:2 | Exit |
-| Test.kt:4:2:79:2 | Normal Exit | Test.kt:4:2:79:2 | Exit |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:11:14:14:3 | { ... } |
 | Test.kt:4:13:79:2 | { ... } | Test.kt:14:10:16:3 | ... -> ... |
 | Test.kt:11:14:14:3 | { ... } | Test.kt:18:3:18:7 | <Expr>; |
 | Test.kt:14:10:16:3 | ... -> ... | Test.kt:18:3:18:7 | <Expr>; |
 | Test.kt:18:3:18:7 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
 | Test.kt:18:3:18:7 | <Expr>; | Test.kt:24:4:24:9 | ... -> ... |
+| Test.kt:22:4:22:9 | <Expr>; | Test.kt:30:7:30:12 | After ... (value equals) ... [false] |
 | Test.kt:22:4:22:9 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
 | Test.kt:24:4:24:9 | ... -> ... | Test.kt:4:2:79:2 | Normal Exit |
+| Test.kt:30:7:30:12 | After ... (value equals) ... [false] | Test.kt:35:3:35:8 | <Expr>; |
 | Test.kt:30:15:33:3 | { ... } | Test.kt:35:3:35:8 | <Expr>; |
 | Test.kt:35:3:35:8 | <Expr>; | Test.kt:38:9:38:9 | x |
 | Test.kt:38:9:38:9 | x | Test.kt:38:16:41:3 | { ... } |
@@ -22,37 +19,45 @@
 | Test.kt:82:21:89:1 | { ... } | Test.kt:84:3:84:18 | x |
 | Test.kt:82:21:89:1 | { ... } | Test.kt:86:4:88:2 | catch (...) |
 | Test.kt:84:3:84:18 | x | Test.kt:82:1:89:1 | Normal Exit |
-| Test.kt:86:4:88:2 | catch (...) | Test.kt:82:1:89:1 | Normal Exit |
+| Test.kt:86:4:88:2 | catch (...) | Test.kt:82:1:89:1 | Exceptional Exit |
+| Test.kt:86:4:88:2 | catch (...) | Test.kt:86:11:86:31 | e |
+| Test.kt:86:11:86:31 | e | Test.kt:82:1:89:1 | Normal Exit |
 | Test.kt:91:1:98:1 | Exceptional Exit | Test.kt:91:1:98:1 | Exit |
 | Test.kt:91:1:98:1 | Normal Exit | Test.kt:91:1:98:1 | Exit |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:93:3:93:13 | x |
 | Test.kt:91:22:98:1 | { ... } | Test.kt:95:4:97:2 | catch (...) |
 | Test.kt:93:3:93:13 | x | Test.kt:91:1:98:1 | Normal Exit |
-| Test.kt:95:4:97:2 | catch (...) | Test.kt:91:1:98:1 | Normal Exit |
+| Test.kt:95:4:97:2 | catch (...) | Test.kt:91:1:98:1 | Exceptional Exit |
+| Test.kt:95:4:97:2 | catch (...) | Test.kt:95:11:95:33 | e |
+| Test.kt:95:11:95:33 | e | Test.kt:91:1:98:1 | Normal Exit |
 | Test.kt:100:1:110:1 | Normal Exit | Test.kt:100:1:110:1 | Exit |
+| Test.kt:100:25:110:1 | { ... } | Test.kt:101:9:101:17 | After ... (value equals) ... [false] |
 | Test.kt:100:25:110:1 | { ... } | Test.kt:101:22:101:22 | y |
-| Test.kt:100:25:110:1 | { ... } | Test.kt:105:5:109:5 | <Expr>; |
+| Test.kt:101:9:101:17 | After ... (value equals) ... [false] | Test.kt:105:5:109:5 | <Expr>; |
+| Test.kt:101:22:101:22 | y | Test.kt:101:22:101:30 | After ... (value equals) ... [false] |
 | Test.kt:101:22:101:22 | y | Test.kt:101:33:103:5 | { ... } |
-| Test.kt:101:22:101:22 | y | Test.kt:105:5:109:5 | <Expr>; |
+| Test.kt:101:22:101:30 | After ... (value equals) ... [false] | Test.kt:105:5:109:5 | <Expr>; |
 | Test.kt:101:33:103:5 | { ... } | Test.kt:100:1:110:1 | Exit |
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:105:20:107:5 | { ... } |
 | Test.kt:105:5:109:5 | <Expr>; | Test.kt:107:16:109:5 | ... -> ... |
 | Test.kt:105:20:107:5 | { ... } | Test.kt:100:1:110:1 | Normal Exit |
-| Test.kt:107:16:109:5 | ... -> ... | Test.kt:100:1:110:1 | Normal Exit |
+| Test.kt:107:16:107:24 | After ... (value not-equals) ... [false] | Test.kt:100:1:110:1 | Normal Exit |
+| Test.kt:107:16:109:5 | ... -> ... | Test.kt:107:16:107:24 | After ... (value not-equals) ... [false] |
 | Test.kt:107:16:109:5 | ... -> ... | Test.kt:107:27:109:5 | { ... } |
 | Test.kt:107:27:109:5 | { ... } | Test.kt:100:1:110:1 | Normal Exit |
-| Test.kt:112:1:116:1 | Exceptional Exit | Test.kt:112:1:116:1 | Exit |
-| Test.kt:112:1:116:1 | Normal Exit | Test.kt:112:1:116:1 | Exit |
-| Test.kt:112:32:116:1 | { ... } | Test.kt:112:1:116:1 | Normal Exit |
+| Test.kt:112:32:116:1 | { ... } | Test.kt:113:9:113:9 | After x [false] |
 | Test.kt:112:32:116:1 | { ... } | Test.kt:113:14:113:14 | y |
-| Test.kt:113:14:113:14 | y | Test.kt:112:1:116:1 | Normal Exit |
+| Test.kt:113:9:113:9 | After x [false] | Test.kt:113:9:113:14 | After ... && ... [false] |
+| Test.kt:113:9:113:14 | After ... && ... [false] | Test.kt:112:1:116:1 | Normal Exit |
+| Test.kt:113:14:113:14 | After y [false] | Test.kt:113:9:113:14 | After ... && ... [false] |
+| Test.kt:113:14:113:14 | y | Test.kt:113:14:113:14 | After y [false] |
 | Test.kt:113:14:113:14 | y | Test.kt:113:17:115:5 | { ... } |
 | Test.kt:113:17:115:5 | { ... } | Test.kt:112:1:116:1 | Normal Exit |
-| Test.kt:118:1:124:1 | Exceptional Exit | Test.kt:118:1:124:1 | Exit |
-| Test.kt:118:1:124:1 | Normal Exit | Test.kt:118:1:124:1 | Exit |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:121:9:121:9 | <Expr>; |
 | Test.kt:118:37:124:1 | { ... } | Test.kt:122:12:122:16 | ... -> ... |
-| Test.kt:121:9:121:9 | <Expr>; | Test.kt:118:1:124:1 | Normal Exit |
+| Test.kt:120:3:123:3 | After when ... [false] | Test.kt:118:1:124:1 | Normal Exit |
+| Test.kt:121:9:121:9 | <Expr>; | Test.kt:120:3:123:3 | After when ... [false] |
 | Test.kt:121:9:121:9 | <Expr>; | Test.kt:123:8:123:10 | { ... } |
-| Test.kt:122:12:122:16 | ... -> ... | Test.kt:118:1:124:1 | Normal Exit |
+| Test.kt:122:12:122:16 | ... -> ... | Test.kt:120:3:123:3 | After when ... [false] |
+| Test.kt:122:12:122:16 | ... -> ... | Test.kt:123:8:123:10 | { ... } |
 | Test.kt:123:8:123:10 | { ... } | Test.kt:118:1:124:1 | Normal Exit |
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbSuccessor.ql b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbSuccessor.ql
index ae2d8a393b4..ae8dc5d188d 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/bbSuccessor.ql
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/bbSuccessor.ql
@@ -1,5 +1,6 @@
 import java
+import utils.test.BasicBlock
 
 from BasicBlock b, BasicBlock b2
 where b.getASuccessor() = b2
-select b, b2
+select getFirstAstNodeOrSynth(b), getFirstAstNodeOrSynth(b2)
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/basic/getASuccessor.expected b/java/ql/test-kotlin2/library-tests/controlflow/basic/getASuccessor.expected
index c4be613c5e9..d5483586e0b 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/getASuccessor.expected
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/getASuccessor.expected
@@ -1,12 +1,10 @@
 #select
-| Test.kt:3:1:80:1 | Exceptional Exit | Constructor | Test.kt:3:1:80:1 | Exit | Constructor |
-| Test.kt:3:1:80:1 | Exit | Constructor | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:3:1:80:1 | Entry | Constructor | Test.kt:3:1:80:1 | { ... } | BlockStmt |
 | Test.kt:3:1:80:1 | Normal Exit | Constructor | Test.kt:3:1:80:1 | Exit | Constructor |
 | Test.kt:3:1:80:1 | super(...) | SuperConstructorInvocationStmt | Test.kt:3:1:80:1 | { ... } | BlockStmt |
 | Test.kt:3:1:80:1 | { ... } | BlockStmt | Test.kt:3:1:80:1 | Normal Exit | Constructor |
 | Test.kt:3:1:80:1 | { ... } | BlockStmt | Test.kt:3:1:80:1 | super(...) | SuperConstructorInvocationStmt |
-| Test.kt:4:2:79:2 | Exceptional Exit | Method | Test.kt:4:2:79:2 | Exit | Method |
-| Test.kt:4:2:79:2 | Exit | Method | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:4:2:79:2 | Entry | Method | Test.kt:4:13:79:2 | { ... } | BlockStmt |
 | Test.kt:4:2:79:2 | Normal Exit | Method | Test.kt:4:2:79:2 | Exit | Method |
 | Test.kt:4:13:79:2 | { ... } | BlockStmt | Test.kt:5:3:5:16 | var ...; | LocalVariableDeclStmt |
 | Test.kt:5:3:5:16 | var ...; | LocalVariableDeclStmt | Test.kt:5:16:5:16 | 0 | IntegerLiteral |
@@ -30,19 +28,23 @@
 | Test.kt:11:11:11:11 | 0 | IntegerLiteral | Test.kt:11:7:11:11 | ... > ... | GTExpr |
 | Test.kt:11:14:14:3 | { ... } | BlockStmt | Test.kt:12:4:12:9 | <Expr>; | ExprStmt |
 | Test.kt:12:4:12:9 | ...=... | AssignExpr | Test.kt:13:4:13:9 | <Expr>; | ExprStmt |
-| Test.kt:12:4:12:9 | <Expr>; | ExprStmt | Test.kt:12:8:12:9 | 20 | LongLiteral |
+| Test.kt:12:4:12:9 | <Expr>; | ExprStmt | Test.kt:12:4:12:9 | y | VarAccess |
+| Test.kt:12:4:12:9 | y | VarAccess | Test.kt:12:8:12:9 | 20 | LongLiteral |
 | Test.kt:12:8:12:9 | 20 | LongLiteral | Test.kt:12:4:12:9 | ...=... | AssignExpr |
 | Test.kt:13:4:13:9 | ...=... | AssignExpr | Test.kt:18:3:18:7 | <Expr>; | ExprStmt |
-| Test.kt:13:4:13:9 | <Expr>; | ExprStmt | Test.kt:13:8:13:9 | 10 | IntegerLiteral |
+| Test.kt:13:4:13:9 | <Expr>; | ExprStmt | Test.kt:13:4:13:9 | z | VarAccess |
+| Test.kt:13:4:13:9 | z | VarAccess | Test.kt:13:8:13:9 | 10 | IntegerLiteral |
 | Test.kt:13:8:13:9 | 10 | IntegerLiteral | Test.kt:13:4:13:9 | ...=... | AssignExpr |
 | Test.kt:14:10:16:3 | ... -> ... | WhenBranch | Test.kt:14:10:16:3 | true | BooleanLiteral |
 | Test.kt:14:10:16:3 | true | BooleanLiteral | Test.kt:14:10:16:3 | { ... } | BlockStmt |
 | Test.kt:14:10:16:3 | { ... } | BlockStmt | Test.kt:15:4:15:9 | <Expr>; | ExprStmt |
 | Test.kt:15:4:15:9 | ...=... | AssignExpr | Test.kt:18:3:18:7 | <Expr>; | ExprStmt |
-| Test.kt:15:4:15:9 | <Expr>; | ExprStmt | Test.kt:15:8:15:9 | 30 | LongLiteral |
+| Test.kt:15:4:15:9 | <Expr>; | ExprStmt | Test.kt:15:4:15:9 | y | VarAccess |
+| Test.kt:15:4:15:9 | y | VarAccess | Test.kt:15:8:15:9 | 30 | LongLiteral |
 | Test.kt:15:8:15:9 | 30 | LongLiteral | Test.kt:15:4:15:9 | ...=... | AssignExpr |
 | Test.kt:18:3:18:7 | ...=... | AssignExpr | Test.kt:21:3:24:9 | <Expr>; | ExprStmt |
-| Test.kt:18:3:18:7 | <Expr>; | ExprStmt | Test.kt:18:7:18:7 | 0 | IntegerLiteral |
+| Test.kt:18:3:18:7 | <Expr>; | ExprStmt | Test.kt:18:3:18:7 | z | VarAccess |
+| Test.kt:18:3:18:7 | z | VarAccess | Test.kt:18:7:18:7 | 0 | IntegerLiteral |
 | Test.kt:18:7:18:7 | 0 | IntegerLiteral | Test.kt:18:3:18:7 | ...=... | AssignExpr |
 | Test.kt:21:3:24:9 | <Expr>; | ExprStmt | Test.kt:21:3:24:9 | when ... | WhenExpr |
 | Test.kt:21:3:24:9 | when ... | WhenExpr | Test.kt:21:6:22:9 | ... -> ... | WhenBranch |
@@ -52,14 +54,16 @@
 | Test.kt:21:6:22:9 | ... -> ... | WhenBranch | Test.kt:21:6:21:6 | x | VarAccess |
 | Test.kt:21:10:21:10 | 0 | IntegerLiteral | Test.kt:21:6:21:10 | ... < ... | LTExpr |
 | Test.kt:22:4:22:9 | ...=... | AssignExpr | Test.kt:27:3:27:8 | <Expr>; | ExprStmt |
-| Test.kt:22:4:22:9 | <Expr>; | ExprStmt | Test.kt:22:8:22:9 | 40 | LongLiteral |
+| Test.kt:22:4:22:9 | <Expr>; | ExprStmt | Test.kt:22:4:22:9 | y | VarAccess |
+| Test.kt:22:4:22:9 | y | VarAccess | Test.kt:22:8:22:9 | 40 | LongLiteral |
 | Test.kt:22:8:22:9 | 40 | LongLiteral | Test.kt:22:4:22:9 | ...=... | AssignExpr |
 | Test.kt:24:4:24:9 | ... -> ... | WhenBranch | Test.kt:24:4:24:9 | true | BooleanLiteral |
 | Test.kt:24:4:24:9 | return ... | ReturnStmt | Test.kt:4:2:79:2 | Normal Exit | Method |
 | Test.kt:24:4:24:9 | true | BooleanLiteral | Test.kt:24:10:24:10 | INSTANCE | VarAccess |
 | Test.kt:24:10:24:10 | INSTANCE | VarAccess | Test.kt:24:4:24:9 | return ... | ReturnStmt |
 | Test.kt:27:3:27:8 | ...=... | AssignExpr | Test.kt:30:3:33:3 | <Expr>; | ExprStmt |
-| Test.kt:27:3:27:8 | <Expr>; | ExprStmt | Test.kt:27:7:27:8 | 10 | IntegerLiteral |
+| Test.kt:27:3:27:8 | <Expr>; | ExprStmt | Test.kt:27:3:27:8 | z | VarAccess |
+| Test.kt:27:3:27:8 | z | VarAccess | Test.kt:27:7:27:8 | 10 | IntegerLiteral |
 | Test.kt:27:7:27:8 | 10 | IntegerLiteral | Test.kt:27:3:27:8 | ...=... | AssignExpr |
 | Test.kt:30:3:33:3 | <Expr>; | ExprStmt | Test.kt:30:3:33:3 | when ... | WhenExpr |
 | Test.kt:30:3:33:3 | when ... | WhenExpr | Test.kt:30:7:33:3 | ... -> ... | WhenBranch |
@@ -70,13 +74,16 @@
 | Test.kt:30:12:30:12 | 0 | IntegerLiteral | Test.kt:30:7:30:12 | ... (value equals) ... | ValueEQExpr |
 | Test.kt:30:15:33:3 | { ... } | BlockStmt | Test.kt:31:4:31:9 | <Expr>; | ExprStmt |
 | Test.kt:31:4:31:9 | ...=... | AssignExpr | Test.kt:32:4:32:9 | <Expr>; | ExprStmt |
-| Test.kt:31:4:31:9 | <Expr>; | ExprStmt | Test.kt:31:8:31:9 | 60 | LongLiteral |
+| Test.kt:31:4:31:9 | <Expr>; | ExprStmt | Test.kt:31:4:31:9 | y | VarAccess |
+| Test.kt:31:4:31:9 | y | VarAccess | Test.kt:31:8:31:9 | 60 | LongLiteral |
 | Test.kt:31:8:31:9 | 60 | LongLiteral | Test.kt:31:4:31:9 | ...=... | AssignExpr |
 | Test.kt:32:4:32:9 | ...=... | AssignExpr | Test.kt:35:3:35:8 | <Expr>; | ExprStmt |
-| Test.kt:32:4:32:9 | <Expr>; | ExprStmt | Test.kt:32:8:32:9 | 10 | IntegerLiteral |
+| Test.kt:32:4:32:9 | <Expr>; | ExprStmt | Test.kt:32:4:32:9 | z | VarAccess |
+| Test.kt:32:4:32:9 | z | VarAccess | Test.kt:32:8:32:9 | 10 | IntegerLiteral |
 | Test.kt:32:8:32:9 | 10 | IntegerLiteral | Test.kt:32:4:32:9 | ...=... | AssignExpr |
 | Test.kt:35:3:35:8 | ...=... | AssignExpr | Test.kt:38:3:41:3 | while (...) | WhileStmt |
-| Test.kt:35:3:35:8 | <Expr>; | ExprStmt | Test.kt:35:7:35:8 | 20 | IntegerLiteral |
+| Test.kt:35:3:35:8 | <Expr>; | ExprStmt | Test.kt:35:3:35:8 | z | VarAccess |
+| Test.kt:35:3:35:8 | z | VarAccess | Test.kt:35:7:35:8 | 20 | IntegerLiteral |
 | Test.kt:35:7:35:8 | 20 | IntegerLiteral | Test.kt:35:3:35:8 | ...=... | AssignExpr |
 | Test.kt:38:3:41:3 | while (...) | WhileStmt | Test.kt:38:9:38:9 | x | VarAccess |
 | Test.kt:38:9:38:9 | x | VarAccess | Test.kt:38:13:38:13 | 0 | IntegerLiteral |
@@ -85,34 +92,39 @@
 | Test.kt:38:13:38:13 | 0 | IntegerLiteral | Test.kt:38:9:38:13 | ... > ... | GTExpr |
 | Test.kt:38:16:41:3 | { ... } | BlockStmt | Test.kt:39:4:39:9 | <Expr>; | ExprStmt |
 | Test.kt:39:4:39:9 | ...=... | AssignExpr | Test.kt:40:4:40:6 | <Expr>; | ExprStmt |
-| Test.kt:39:4:39:9 | <Expr>; | ExprStmt | Test.kt:39:8:39:9 | 10 | LongLiteral |
+| Test.kt:39:4:39:9 | <Expr>; | ExprStmt | Test.kt:39:4:39:9 | y | VarAccess |
+| Test.kt:39:4:39:9 | y | VarAccess | Test.kt:39:8:39:9 | 10 | LongLiteral |
 | Test.kt:39:8:39:9 | 10 | LongLiteral | Test.kt:39:4:39:9 | ...=... | AssignExpr |
 | Test.kt:40:4:40:4 | x | VarAccess | Test.kt:40:4:40:6 | <unary> | LocalVariableDeclExpr |
 | Test.kt:40:4:40:6 | ...=... | AssignExpr | Test.kt:40:4:40:6 | <Expr>; | ExprStmt |
-| Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | <Stmt> | StmtExpr |
 | Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | <unary> | VarAccess |
-| Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | <unary> | VarAccess |
-| Test.kt:40:4:40:6 | <Stmt> | StmtExpr | Test.kt:40:4:40:6 | { ... } | BlockStmt |
+| Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | x | VarAccess |
+| Test.kt:40:4:40:6 | <Expr>; | ExprStmt | Test.kt:40:4:40:6 | { ... } | BlockStmt |
+| Test.kt:40:4:40:6 | <Stmt> | StmtExpr | Test.kt:40:4:40:6 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr |
 | Test.kt:40:4:40:6 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr | Test.kt:38:9:38:9 | x | VarAccess |
 | Test.kt:40:4:40:6 | <unary> | LocalVariableDeclExpr | Test.kt:40:4:40:6 | <Expr>; | ExprStmt |
-| Test.kt:40:4:40:6 | <unary> | VarAccess | Test.kt:40:4:40:6 | <implicit coercion to unit> | ImplicitCoercionToUnitExpr |
+| Test.kt:40:4:40:6 | <unary> | VarAccess | Test.kt:40:4:40:6 | <Stmt> | StmtExpr |
 | Test.kt:40:4:40:6 | <unary> | VarAccess | Test.kt:40:4:40:6 | dec(...) | MethodCall |
 | Test.kt:40:4:40:6 | dec(...) | MethodCall | Test.kt:40:4:40:6 | ...=... | AssignExpr |
 | Test.kt:40:4:40:6 | var ...; | LocalVariableDeclStmt | Test.kt:40:4:40:4 | x | VarAccess |
+| Test.kt:40:4:40:6 | x | VarAccess | Test.kt:40:4:40:6 | <unary> | VarAccess |
 | Test.kt:40:4:40:6 | { ... } | BlockStmt | Test.kt:40:4:40:6 | var ...; | LocalVariableDeclStmt |
 | Test.kt:43:3:43:8 | ...=... | AssignExpr | Test.kt:73:3:73:8 | <Expr>; | ExprStmt |
-| Test.kt:43:3:43:8 | <Expr>; | ExprStmt | Test.kt:43:7:43:8 | 30 | IntegerLiteral |
+| Test.kt:43:3:43:8 | <Expr>; | ExprStmt | Test.kt:43:3:43:8 | z | VarAccess |
+| Test.kt:43:3:43:8 | z | VarAccess | Test.kt:43:7:43:8 | 30 | IntegerLiteral |
 | Test.kt:43:7:43:8 | 30 | IntegerLiteral | Test.kt:43:3:43:8 | ...=... | AssignExpr |
 | Test.kt:73:3:73:8 | ...=... | AssignExpr | Test.kt:77:3:77:8 | <Expr>; | ExprStmt |
-| Test.kt:73:3:73:8 | <Expr>; | ExprStmt | Test.kt:73:7:73:8 | 50 | IntegerLiteral |
+| Test.kt:73:3:73:8 | <Expr>; | ExprStmt | Test.kt:73:3:73:8 | z | VarAccess |
+| Test.kt:73:3:73:8 | z | VarAccess | Test.kt:73:7:73:8 | 50 | IntegerLiteral |
 | Test.kt:73:7:73:8 | 50 | IntegerLiteral | Test.kt:73:3:73:8 | ...=... | AssignExpr |
 | Test.kt:77:3:77:8 | ...=... | AssignExpr | Test.kt:78:9:78:9 | INSTANCE | VarAccess |
-| Test.kt:77:3:77:8 | <Expr>; | ExprStmt | Test.kt:77:7:77:8 | 40 | IntegerLiteral |
+| Test.kt:77:3:77:8 | <Expr>; | ExprStmt | Test.kt:77:3:77:8 | w | VarAccess |
+| Test.kt:77:3:77:8 | w | VarAccess | Test.kt:77:7:77:8 | 40 | IntegerLiteral |
 | Test.kt:77:7:77:8 | 40 | IntegerLiteral | Test.kt:77:3:77:8 | ...=... | AssignExpr |
 | Test.kt:78:3:78:8 | return ... | ReturnStmt | Test.kt:4:2:79:2 | Normal Exit | Method |
 | Test.kt:78:9:78:9 | INSTANCE | VarAccess | Test.kt:78:3:78:8 | return ... | ReturnStmt |
+| Test.kt:82:1:89:1 | Entry | Method | Test.kt:82:21:89:1 | { ... } | BlockStmt |
 | Test.kt:82:1:89:1 | Exceptional Exit | Method | Test.kt:82:1:89:1 | Exit | Method |
-| Test.kt:82:1:89:1 | Exit | Method | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:82:1:89:1 | Normal Exit | Method | Test.kt:82:1:89:1 | Exit | Method |
 | Test.kt:82:21:89:1 | { ... } | BlockStmt | Test.kt:83:2:88:2 | try ... | TryStmt |
 | Test.kt:83:2:88:2 | try ... | TryStmt | Test.kt:83:6:86:2 | { ... } | BlockStmt |
@@ -124,13 +136,14 @@
 | Test.kt:84:11:84:18 | (...)... | CastExpr | Test.kt:86:4:88:2 | catch (...) | CatchClause |
 | Test.kt:85:3:85:10 | return ... | ReturnStmt | Test.kt:82:1:89:1 | Normal Exit | Method |
 | Test.kt:85:10:85:10 | 1 | IntegerLiteral | Test.kt:85:3:85:10 | return ... | ReturnStmt |
+| Test.kt:86:4:88:2 | catch (...) | CatchClause | Test.kt:82:1:89:1 | Exceptional Exit | Method |
 | Test.kt:86:4:88:2 | catch (...) | CatchClause | Test.kt:86:11:86:31 | e | LocalVariableDeclExpr |
 | Test.kt:86:11:86:31 | e | LocalVariableDeclExpr | Test.kt:86:34:88:2 | { ... } | BlockStmt |
 | Test.kt:86:34:88:2 | { ... } | BlockStmt | Test.kt:87:10:87:10 | 2 | IntegerLiteral |
 | Test.kt:87:3:87:10 | return ... | ReturnStmt | Test.kt:82:1:89:1 | Normal Exit | Method |
 | Test.kt:87:10:87:10 | 2 | IntegerLiteral | Test.kt:87:3:87:10 | return ... | ReturnStmt |
+| Test.kt:91:1:98:1 | Entry | Method | Test.kt:91:22:98:1 | { ... } | BlockStmt |
 | Test.kt:91:1:98:1 | Exceptional Exit | Method | Test.kt:91:1:98:1 | Exit | Method |
-| Test.kt:91:1:98:1 | Exit | Method | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:91:1:98:1 | Normal Exit | Method | Test.kt:91:1:98:1 | Exit | Method |
 | Test.kt:91:22:98:1 | { ... } | BlockStmt | Test.kt:92:2:97:2 | try ... | TryStmt |
 | Test.kt:92:2:97:2 | try ... | TryStmt | Test.kt:92:6:95:2 | { ... } | BlockStmt |
@@ -142,13 +155,14 @@
 | Test.kt:93:11:93:13 | ...!! | NotNullExpr | Test.kt:95:4:97:2 | catch (...) | CatchClause |
 | Test.kt:94:3:94:10 | return ... | ReturnStmt | Test.kt:91:1:98:1 | Normal Exit | Method |
 | Test.kt:94:10:94:10 | 1 | IntegerLiteral | Test.kt:94:3:94:10 | return ... | ReturnStmt |
+| Test.kt:95:4:97:2 | catch (...) | CatchClause | Test.kt:91:1:98:1 | Exceptional Exit | Method |
 | Test.kt:95:4:97:2 | catch (...) | CatchClause | Test.kt:95:11:95:33 | e | LocalVariableDeclExpr |
 | Test.kt:95:11:95:33 | e | LocalVariableDeclExpr | Test.kt:95:36:97:2 | { ... } | BlockStmt |
 | Test.kt:95:36:97:2 | { ... } | BlockStmt | Test.kt:96:10:96:10 | 2 | IntegerLiteral |
 | Test.kt:96:3:96:10 | return ... | ReturnStmt | Test.kt:91:1:98:1 | Normal Exit | Method |
 | Test.kt:96:10:96:10 | 2 | IntegerLiteral | Test.kt:96:3:96:10 | return ... | ReturnStmt |
+| Test.kt:100:1:110:1 | Entry | Method | Test.kt:100:25:110:1 | { ... } | BlockStmt |
 | Test.kt:100:1:110:1 | Exceptional Exit | Method | Test.kt:100:1:110:1 | Exit | Method |
-| Test.kt:100:1:110:1 | Exit | Method | file://:0:0:0:0 | <none> | <none> |
 | Test.kt:100:1:110:1 | Normal Exit | Method | Test.kt:100:1:110:1 | Exit | Method |
 | Test.kt:100:25:110:1 | { ... } | BlockStmt | Test.kt:101:5:103:5 | <Expr>; | ExprStmt |
 | Test.kt:101:5:103:5 | <Expr>; | ExprStmt | Test.kt:101:5:103:5 | when ... | WhenExpr |
@@ -186,8 +200,7 @@
 | Test.kt:108:9:108:29 | <Expr>; | ExprStmt | Test.kt:108:17:108:28 | "y not null" | StringLiteral |
 | Test.kt:108:9:108:29 | println(...) | MethodCall | Test.kt:100:1:110:1 | Normal Exit | Method |
 | Test.kt:108:17:108:28 | "y not null" | StringLiteral | Test.kt:108:9:108:29 | println(...) | MethodCall |
-| Test.kt:112:1:116:1 | Exceptional Exit | Method | Test.kt:112:1:116:1 | Exit | Method |
-| Test.kt:112:1:116:1 | Exit | Method | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:112:1:116:1 | Entry | Method | Test.kt:112:32:116:1 | { ... } | BlockStmt |
 | Test.kt:112:1:116:1 | Normal Exit | Method | Test.kt:112:1:116:1 | Exit | Method |
 | Test.kt:112:32:116:1 | { ... } | BlockStmt | Test.kt:113:5:115:5 | <Expr>; | ExprStmt |
 | Test.kt:113:5:115:5 | <Expr>; | ExprStmt | Test.kt:113:5:115:5 | when ... | WhenExpr |
@@ -199,8 +212,7 @@
 | Test.kt:113:14:113:14 | y | VarAccess | Test.kt:112:1:116:1 | Normal Exit | Method |
 | Test.kt:113:14:113:14 | y | VarAccess | Test.kt:113:17:115:5 | { ... } | BlockStmt |
 | Test.kt:113:17:115:5 | { ... } | BlockStmt | Test.kt:112:1:116:1 | Normal Exit | Method |
-| Test.kt:118:1:124:1 | Exceptional Exit | Method | Test.kt:118:1:124:1 | Exit | Method |
-| Test.kt:118:1:124:1 | Exit | Method | file://:0:0:0:0 | <none> | <none> |
+| Test.kt:118:1:124:1 | Entry | Method | Test.kt:118:37:124:1 | { ... } | BlockStmt |
 | Test.kt:118:1:124:1 | Normal Exit | Method | Test.kt:118:1:124:1 | Exit | Method |
 | Test.kt:118:37:124:1 | { ... } | BlockStmt | Test.kt:119:2:123:12 | <Expr>; | ExprStmt |
 | Test.kt:119:2:123:12 | <Expr>; | ExprStmt | Test.kt:119:2:123:12 | when ... | WhenExpr |
@@ -216,6 +228,7 @@
 | Test.kt:122:12:122:16 | ... -> ... | WhenBranch | Test.kt:122:12:122:16 | true | BooleanLiteral |
 | Test.kt:122:12:122:16 | <Expr>; | ExprStmt | Test.kt:122:12:122:16 | false | BooleanLiteral |
 | Test.kt:122:12:122:16 | false | BooleanLiteral | Test.kt:118:1:124:1 | Normal Exit | Method |
+| Test.kt:122:12:122:16 | false | BooleanLiteral | Test.kt:123:8:123:10 | { ... } | BlockStmt |
 | Test.kt:122:12:122:16 | true | BooleanLiteral | Test.kt:122:12:122:16 | <Expr>; | ExprStmt |
 | Test.kt:123:8:123:10 | { ... } | BlockStmt | Test.kt:118:1:124:1 | Normal Exit | Method |
 missingSuccessor
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/basic/getASuccessor.ql b/java/ql/test-kotlin2/library-tests/controlflow/basic/getASuccessor.ql
index 10a2568b060..9a334d18aae 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/getASuccessor.ql
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/getASuccessor.ql
@@ -1,54 +1,15 @@
 import java
+import utils.test.AstCfg
 
-newtype TMaybeControlFlowNode =
-  TControlFlowNode(ControlFlowNode c) or
-  TNoControlFlowNode()
-
-class MaybeControlFlowNode extends TMaybeControlFlowNode {
-  abstract string toString();
-
-  abstract Location getLocation();
-
-  abstract string getPrimaryQlClasses();
-}
-
-class YesMaybeControlFlowNode extends MaybeControlFlowNode {
-  ControlFlowNode c;
-
-  YesMaybeControlFlowNode() { this = TControlFlowNode(c) }
-
-  override string toString() { result = c.toString() }
-
-  override Location getLocation() { result = c.getLocation() }
-
-  override string getPrimaryQlClasses() { result = c.getAstNode().getPrimaryQlClasses() }
-}
-
-class NoMaybeControlFlowNode extends MaybeControlFlowNode {
-  NoMaybeControlFlowNode() { this = TNoControlFlowNode() }
-
-  override string toString() { result = "<none>" }
-
-  override Location getLocation() { result.toString() = "file://:0:0:0:0" }
-
-  override string getPrimaryQlClasses() { result = "<none>" }
-}
-
-MaybeControlFlowNode maybeSuccessor(ControlFlowNode n) {
-  if exists(n.getASuccessor())
-  then result = TControlFlowNode(n.getASuccessor())
-  else result = TNoControlFlowNode()
-}
-
-from ControlFlowNode n, MaybeControlFlowNode m
+from ControlFlowNode n, ControlFlowNode m
 where
-  m = maybeSuccessor(n) and
+  m = getAnAstSuccessor(n) and
   n.getLocation().getFile().(CompilationUnit).fromSource()
-select n, n.getAstNode().getPrimaryQlClasses(), m, m.getPrimaryQlClasses()
+select n, n.getAstNode().getPrimaryQlClasses(), m, m.getAstNode().getPrimaryQlClasses()
 
-query predicate missingSuccessor(Expr n) {
-  maybeSuccessor(n.getControlFlowNode()) instanceof NoMaybeControlFlowNode and
-  n.getFile().(CompilationUnit).fromSource() and
-  not n instanceof TypeAccess and
-  not n instanceof VarWrite
+query predicate missingSuccessor(Expr e) {
+  exists(ControlFlowNode n | n = e.getControlFlowNode() and not exists(n.getASuccessor())) and
+  e.getFile().(CompilationUnit).fromSource() and
+  not e instanceof TypeAccess and
+  not e instanceof VarWrite
 }
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/basic/strictDominance.expected b/java/ql/test-kotlin2/library-tests/controlflow/basic/strictDominance.expected
index 4fb56510ed5..27595e7017b 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/basic/strictDominance.expected
+++ b/java/ql/test-kotlin2/library-tests/controlflow/basic/strictDominance.expected
@@ -562,5 +562,4 @@
 | Test.kt:121:4:121:9 | ... -> ... | Test.kt:122:12:122:16 | ... -> ... |
 | Test.kt:121:4:121:9 | ... -> ... | Test.kt:122:12:122:16 | <Expr>; |
 | Test.kt:121:4:121:9 | ... -> ... | Test.kt:123:8:123:10 | { ... } |
-| Test.kt:121:9:121:9 | <Expr>; | Test.kt:123:8:123:10 | { ... } |
 | Test.kt:122:12:122:16 | ... -> ... | Test.kt:122:12:122:16 | <Expr>; |
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominanceWrong.ql b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominanceWrong.ql
index 4eadcddc61a..6deead2df73 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominanceWrong.ql
+++ b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominanceWrong.ql
@@ -17,5 +17,6 @@ predicate dominanceCounterExample(ControlFlowNode entry, ControlFlowNode dom, Co
 from Callable c, ControlFlowNode dom, ControlFlowNode node
 where
   strictlyDominates(dom, node) and
-  dominanceCounterExample(c.getBody().getControlFlowNode(), dom, node)
+  dominanceCounterExample(any(ControlFlow::EntryNode entry | entry.getEnclosingCallable() = c), dom,
+    node)
 select c, dom, node
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.expected b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.expected
index 75662bfacd4..6084c631b9d 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.expected
+++ b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.expected
@@ -1,157 +1,21 @@
-| Test.kt:2:43:79:2 | { ... } | Test.kt:3:9:3:18 | var ...; |
-| Test.kt:3:9:3:18 | var ...; | Test.kt:3:17:3:18 | px |
-| Test.kt:3:9:3:18 | x | Test.kt:4:9:4:18 | var ...; |
-| Test.kt:3:17:3:18 | px | Test.kt:3:9:3:18 | x |
-| Test.kt:4:9:4:18 | var ...; | Test.kt:4:17:4:18 | pw |
-| Test.kt:4:9:4:18 | w | Test.kt:5:9:5:18 | var ...; |
-| Test.kt:4:17:4:18 | pw | Test.kt:4:9:4:18 | w |
-| Test.kt:5:9:5:18 | var ...; | Test.kt:5:17:5:18 | pz |
-| Test.kt:5:9:5:18 | z | Test.kt:7:3:7:12 | var ...; |
-| Test.kt:5:17:5:18 | pz | Test.kt:5:9:5:18 | z |
-| Test.kt:7:3:7:12 | j | Test.kt:8:3:8:18 | var ...; |
-| Test.kt:7:3:7:12 | var ...; | Test.kt:7:3:7:12 | j |
-| Test.kt:8:3:8:18 | var ...; | Test.kt:8:17:8:18 | 50 |
-| Test.kt:8:3:8:18 | y | Test.kt:11:3:16:3 | <Expr>; |
-| Test.kt:8:17:8:18 | 50 | Test.kt:8:3:8:18 | y |
-| Test.kt:11:3:16:3 | <Expr>; | Test.kt:11:3:16:3 | when ... |
-| Test.kt:11:3:16:3 | when ... | Test.kt:11:7:14:3 | ... -> ... |
-| Test.kt:11:7:11:7 | x | Test.kt:11:11:11:11 | 0 |
-| Test.kt:11:7:11:11 | ... > ... | Test.kt:11:14:14:3 | { ... } |
-| Test.kt:11:7:11:11 | ... > ... | Test.kt:14:10:16:3 | ... -> ... |
-| Test.kt:11:7:11:11 | ... > ... | Test.kt:18:3:18:20 | <Expr>; |
-| Test.kt:11:7:14:3 | ... -> ... | Test.kt:11:7:11:7 | x |
-| Test.kt:11:11:11:11 | 0 | Test.kt:11:7:11:11 | ... > ... |
-| Test.kt:11:14:14:3 | { ... } | Test.kt:12:4:12:9 | <Expr>; |
-| Test.kt:12:4:12:9 | ...=... | Test.kt:13:4:13:9 | <Expr>; |
-| Test.kt:12:4:12:9 | <Expr>; | Test.kt:12:8:12:9 | 20 |
-| Test.kt:12:8:12:9 | 20 | Test.kt:12:4:12:9 | ...=... |
-| Test.kt:13:4:13:9 | <Expr>; | Test.kt:13:8:13:9 | 10 |
-| Test.kt:13:8:13:9 | 10 | Test.kt:13:4:13:9 | ...=... |
-| Test.kt:14:10:16:3 | ... -> ... | Test.kt:14:10:16:3 | true |
-| Test.kt:14:10:16:3 | true | Test.kt:14:10:16:3 | { ... } |
-| Test.kt:14:10:16:3 | { ... } | Test.kt:15:4:15:9 | <Expr>; |
-| Test.kt:15:4:15:9 | <Expr>; | Test.kt:15:8:15:9 | 30 |
-| Test.kt:15:8:15:9 | 30 | Test.kt:15:4:15:9 | ...=... |
-| Test.kt:18:3:18:20 | ...=... | Test.kt:21:3:24:11 | <Expr>; |
-| Test.kt:18:3:18:20 | <Expr>; | Test.kt:18:8:18:8 | x |
-| Test.kt:18:7:18:20 | (...)... | Test.kt:18:3:18:20 | ...=... |
-| Test.kt:18:8:18:8 | x | Test.kt:18:12:18:12 | y |
-| Test.kt:18:8:18:12 | ... + ... | Test.kt:18:7:18:20 | (...)... |
-| Test.kt:18:12:18:12 | y | Test.kt:18:8:18:12 | ... + ... |
-| Test.kt:21:3:24:11 | <Expr>; | Test.kt:21:3:24:11 | when ... |
-| Test.kt:21:3:24:11 | when ... | Test.kt:21:7:22:9 | ... -> ... |
-| Test.kt:21:7:21:7 | x | Test.kt:21:11:21:11 | 0 |
-| Test.kt:21:7:21:11 | ... < ... | Test.kt:2:2:79:2 | Normal Exit |
-| Test.kt:21:7:21:11 | ... < ... | Test.kt:22:4:22:9 | <Expr>; |
-| Test.kt:21:7:21:11 | ... < ... | Test.kt:24:4:24:11 | ... -> ... |
-| Test.kt:21:7:22:9 | ... -> ... | Test.kt:21:7:21:7 | x |
-| Test.kt:21:11:21:11 | 0 | Test.kt:21:7:21:11 | ... < ... |
-| Test.kt:22:4:22:9 | ...=... | Test.kt:27:3:27:8 | <Expr>; |
-| Test.kt:22:4:22:9 | <Expr>; | Test.kt:22:8:22:9 | 40 |
-| Test.kt:22:8:22:9 | 40 | Test.kt:22:4:22:9 | ...=... |
-| Test.kt:24:4:24:11 | ... -> ... | Test.kt:24:4:24:11 | true |
-| Test.kt:24:4:24:11 | true | Test.kt:24:11:24:11 | z |
-| Test.kt:24:11:24:11 | z | Test.kt:24:4:24:11 | return ... |
-| Test.kt:27:3:27:8 | ...=... | Test.kt:30:3:33:3 | <Expr>; |
-| Test.kt:27:3:27:8 | <Expr>; | Test.kt:27:7:27:8 | 10 |
-| Test.kt:27:7:27:8 | 10 | Test.kt:27:3:27:8 | ...=... |
-| Test.kt:30:3:33:3 | <Expr>; | Test.kt:30:3:33:3 | when ... |
-| Test.kt:30:3:33:3 | when ... | Test.kt:30:7:33:3 | ... -> ... |
-| Test.kt:30:7:30:7 | x | Test.kt:30:12:30:12 | 0 |
-| Test.kt:30:7:30:12 | ... (value equals) ... | Test.kt:30:15:33:3 | { ... } |
-| Test.kt:30:7:30:12 | ... (value equals) ... | Test.kt:35:3:35:8 | <Expr>; |
-| Test.kt:30:7:33:3 | ... -> ... | Test.kt:30:7:30:7 | x |
-| Test.kt:30:12:30:12 | 0 | Test.kt:30:7:30:12 | ... (value equals) ... |
-| Test.kt:30:15:33:3 | { ... } | Test.kt:31:4:31:9 | <Expr>; |
-| Test.kt:31:4:31:9 | ...=... | Test.kt:32:4:32:9 | <Expr>; |
-| Test.kt:31:4:31:9 | <Expr>; | Test.kt:31:8:31:9 | 60 |
-| Test.kt:31:8:31:9 | 60 | Test.kt:31:4:31:9 | ...=... |
-| Test.kt:32:4:32:9 | <Expr>; | Test.kt:32:8:32:9 | 10 |
-| Test.kt:32:8:32:9 | 10 | Test.kt:32:4:32:9 | ...=... |
-| Test.kt:35:3:35:8 | ...+=... | Test.kt:38:3:41:3 | while (...) |
-| Test.kt:35:3:35:8 | <Expr>; | Test.kt:35:3:35:8 | z |
-| Test.kt:35:3:35:8 | z | Test.kt:35:8:35:8 | x |
-| Test.kt:35:8:35:8 | x | Test.kt:35:3:35:8 | ...+=... |
-| Test.kt:38:3:41:3 | while (...) | Test.kt:38:10:38:10 | x |
-| Test.kt:38:10:38:10 | x | Test.kt:38:14:38:14 | 0 |
-| Test.kt:38:10:38:14 | ... > ... | Test.kt:38:17:41:3 | { ... } |
-| Test.kt:38:10:38:14 | ... > ... | Test.kt:43:3:43:15 | <Expr>; |
-| Test.kt:38:14:38:14 | 0 | Test.kt:38:10:38:14 | ... > ... |
-| Test.kt:38:17:41:3 | { ... } | Test.kt:39:4:39:9 | <Expr>; |
-| Test.kt:39:4:39:9 | ...=... | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:39:4:39:9 | <Expr>; | Test.kt:39:8:39:9 | 10 |
-| Test.kt:39:8:39:9 | 10 | Test.kt:39:4:39:9 | ...=... |
-| Test.kt:40:4:40:4 | x | Test.kt:40:4:40:6 | <unary> |
-| Test.kt:40:4:40:6 | ...=... | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | <Stmt> |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | <unary> |
-| Test.kt:40:4:40:6 | <Expr>; | Test.kt:40:4:40:6 | <unary> |
-| Test.kt:40:4:40:6 | <Stmt> | Test.kt:40:4:40:6 | { ... } |
-| Test.kt:40:4:40:6 | <unary> | Test.kt:40:4:40:6 | <Expr>; |
-| Test.kt:40:4:40:6 | <unary> | Test.kt:40:4:40:6 | <implicit coercion to unit> |
-| Test.kt:40:4:40:6 | <unary> | Test.kt:40:4:40:6 | dec(...) |
-| Test.kt:40:4:40:6 | dec(...) | Test.kt:40:4:40:6 | ...=... |
-| Test.kt:40:4:40:6 | var ...; | Test.kt:40:4:40:4 | x |
-| Test.kt:40:4:40:6 | { ... } | Test.kt:40:4:40:6 | var ...; |
-| Test.kt:43:3:43:15 | ...+=... | Test.kt:73:3:73:16 | <Expr>; |
-| Test.kt:43:3:43:15 | <Expr>; | Test.kt:43:3:43:15 | z |
-| Test.kt:43:3:43:15 | z | Test.kt:43:8:43:8 | y |
-| Test.kt:43:8:43:8 | y | Test.kt:43:8:43:15 | (...)... |
-| Test.kt:43:8:43:15 | (...)... | Test.kt:43:3:43:15 | ...+=... |
-| Test.kt:73:3:73:16 | ...+=... | Test.kt:77:3:77:8 | <Expr>; |
-| Test.kt:73:3:73:16 | <Expr>; | Test.kt:73:3:73:16 | z |
-| Test.kt:73:3:73:16 | z | Test.kt:73:8:73:8 | x |
-| Test.kt:73:8:73:8 | x | Test.kt:73:12:73:12 | y |
-| Test.kt:73:8:73:12 | ... + ... | Test.kt:73:16:73:16 | w |
-| Test.kt:73:8:73:16 | ... + ... | Test.kt:73:3:73:16 | ...+=... |
-| Test.kt:73:12:73:12 | <implicit cast> | Test.kt:73:8:73:12 | ... + ... |
-| Test.kt:73:12:73:12 | y | Test.kt:73:12:73:12 | <implicit cast> |
-| Test.kt:73:16:73:16 | w | Test.kt:73:8:73:16 | ... + ... |
-| Test.kt:77:3:77:8 | ...=... | Test.kt:78:10:78:10 | w |
-| Test.kt:77:3:77:8 | <Expr>; | Test.kt:77:7:77:8 | 40 |
-| Test.kt:77:7:77:8 | 40 | Test.kt:77:3:77:8 | ...=... |
-| Test.kt:78:10:78:10 | w | Test.kt:78:3:78:10 | return ... |
-| Test.kt:81:25:98:2 | { ... } | Test.kt:83:3:83:12 | var ...; |
-| Test.kt:83:3:83:12 | b | Test.kt:84:3:84:12 | var ...; |
-| Test.kt:83:3:83:12 | var ...; | Test.kt:83:3:83:12 | b |
-| Test.kt:84:3:84:12 | c | Test.kt:85:3:85:7 | <Expr>; |
-| Test.kt:84:3:84:12 | var ...; | Test.kt:84:3:84:12 | c |
-| Test.kt:85:3:85:7 | ...=... | Test.kt:86:3:96:3 | while (...) |
-| Test.kt:85:3:85:7 | <Expr>; | Test.kt:85:7:85:7 | 0 |
-| Test.kt:85:7:85:7 | 0 | Test.kt:85:3:85:7 | ...=... |
-| Test.kt:86:3:96:3 | while (...) | Test.kt:86:9:86:12 | true |
-| Test.kt:86:9:86:12 | true | Test.kt:86:15:96:3 | { ... } |
-| Test.kt:86:15:96:3 | { ... } | Test.kt:87:4:87:9 | <Expr>; |
-| Test.kt:87:4:87:9 | ...=... | Test.kt:88:4:91:4 | <Expr>; |
-| Test.kt:87:4:87:9 | <Expr>; | Test.kt:87:8:87:9 | 10 |
-| Test.kt:87:8:87:9 | 10 | Test.kt:87:4:87:9 | ...=... |
-| Test.kt:88:4:91:4 | <Expr>; | Test.kt:88:4:91:4 | when ... |
-| Test.kt:88:4:91:4 | when ... | Test.kt:88:8:91:4 | ... -> ... |
-| Test.kt:88:8:88:8 | a | Test.kt:88:12:88:14 | 100 |
-| Test.kt:88:8:88:14 | ... > ... | Test.kt:88:17:91:4 | { ... } |
-| Test.kt:88:8:88:14 | ... > ... | Test.kt:92:4:93:9 | <Expr>; |
-| Test.kt:88:8:91:4 | ... -> ... | Test.kt:88:8:88:8 | a |
-| Test.kt:88:12:88:14 | 100 | Test.kt:88:8:88:14 | ... > ... |
-| Test.kt:88:17:91:4 | { ... } | Test.kt:89:5:89:10 | <Expr>; |
-| Test.kt:89:5:89:10 | ...=... | Test.kt:90:5:90:9 | <Expr>; |
-| Test.kt:89:5:89:10 | <Expr>; | Test.kt:89:9:89:10 | 10 |
-| Test.kt:89:9:89:10 | 10 | Test.kt:89:5:89:10 | ...=... |
-| Test.kt:90:5:90:9 | <Expr>; | Test.kt:90:9:90:9 | c |
-| Test.kt:90:9:90:9 | c | Test.kt:90:5:90:9 | ...=... |
-| Test.kt:92:4:93:9 | <Expr>; | Test.kt:92:4:93:9 | when ... |
-| Test.kt:92:4:93:9 | when ... | Test.kt:92:8:93:9 | ... -> ... |
-| Test.kt:92:8:92:8 | a | Test.kt:92:13:92:14 | 10 |
-| Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:81:2:98:2 | Normal Exit |
-| Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:93:5:93:9 | break |
-| Test.kt:92:8:92:14 | ... (value equals) ... | Test.kt:94:4:95:12 | <Expr>; |
-| Test.kt:92:8:93:9 | ... -> ... | Test.kt:92:8:92:8 | a |
-| Test.kt:92:13:92:14 | 10 | Test.kt:92:8:92:14 | ... (value equals) ... |
-| Test.kt:93:5:93:9 | break | Test.kt:97:10:97:10 | b |
-| Test.kt:94:4:95:12 | <Expr>; | Test.kt:94:4:95:12 | when ... |
-| Test.kt:94:4:95:12 | when ... | Test.kt:94:8:95:12 | ... -> ... |
-| Test.kt:94:8:94:8 | a | Test.kt:94:13:94:14 | 20 |
-| Test.kt:94:8:94:14 | ... (value equals) ... | Test.kt:95:12:95:12 | c |
-| Test.kt:94:8:95:12 | ... -> ... | Test.kt:94:8:94:8 | a |
-| Test.kt:94:13:94:14 | 20 | Test.kt:94:8:94:14 | ... (value equals) ... |
-| Test.kt:95:12:95:12 | c | Test.kt:95:5:95:12 | return ... |
-| Test.kt:97:10:97:10 | b | Test.kt:97:3:97:10 | return ... |
+| Test.kt:2:43:79:2 | { ... } | Test.kt:11:14:14:3 | { ... } |
+| Test.kt:2:43:79:2 | { ... } | Test.kt:14:10:16:3 | ... -> ... |
+| Test.kt:2:43:79:2 | { ... } | Test.kt:18:3:18:20 | <Expr>; |
+| Test.kt:18:3:18:20 | <Expr>; | Test.kt:2:2:79:2 | Normal Exit |
+| Test.kt:18:3:18:20 | <Expr>; | Test.kt:22:4:22:9 | <Expr>; |
+| Test.kt:18:3:18:20 | <Expr>; | Test.kt:24:4:24:11 | ... -> ... |
+| Test.kt:22:4:22:9 | <Expr>; | Test.kt:30:7:30:12 | After ... (value equals) ... [false] |
+| Test.kt:22:4:22:9 | <Expr>; | Test.kt:30:15:33:3 | { ... } |
+| Test.kt:22:4:22:9 | <Expr>; | Test.kt:35:3:35:8 | <Expr>; |
+| Test.kt:35:3:35:8 | <Expr>; | Test.kt:38:10:38:10 | x |
+| Test.kt:38:10:38:10 | x | Test.kt:38:17:41:3 | { ... } |
+| Test.kt:38:10:38:10 | x | Test.kt:43:3:43:15 | <Expr>; |
+| Test.kt:81:25:98:2 | { ... } | Test.kt:86:9:86:12 | true |
+| Test.kt:86:9:86:12 | true | Test.kt:88:8:88:14 | After ... > ... [false] |
+| Test.kt:86:9:86:12 | true | Test.kt:88:17:91:4 | { ... } |
+| Test.kt:86:9:86:12 | true | Test.kt:92:4:93:9 | <Expr>; |
+| Test.kt:92:4:93:9 | <Expr>; | Test.kt:81:2:98:2 | Normal Exit |
+| Test.kt:92:4:93:9 | <Expr>; | Test.kt:93:5:93:9 | break |
+| Test.kt:92:4:93:9 | <Expr>; | Test.kt:94:4:95:12 | <Expr>; |
+| Test.kt:94:4:95:12 | <Expr>; | Test.kt:94:8:94:14 | After ... (value equals) ... [false] |
+| Test.kt:94:4:95:12 | <Expr>; | Test.kt:95:12:95:12 | c |
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.ql b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.ql
index 701640bf720..7fc18484feb 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.ql
+++ b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominator.ql
@@ -1,9 +1,9 @@
-import default
-import semmle.code.java.controlflow.Dominance
+import java
+import utils.test.BasicBlock
 
-from Method func, ControlFlowNode dominator, ControlFlowNode node
+from Method func, BasicBlock dominator, BasicBlock bb
 where
-  iDominates(dominator, node) and
-  dominator.getEnclosingStmt().getEnclosingCallable() = func and
+  dominator.immediatelyDominates(bb) and
+  dominator.getEnclosingCallable() = func and
   func.getDeclaringType().hasName("Test")
-select dominator, node
+select getFirstAstNodeOrSynth(dominator), getFirstAstNodeOrSynth(bb)
diff --git a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominatorUnique.ql b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominatorUnique.ql
index eaf75ab7bfa..54b0d186362 100644
--- a/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominatorUnique.ql
+++ b/java/ql/test-kotlin2/library-tests/controlflow/dominance/dominatorUnique.ql
@@ -7,5 +7,5 @@ where
   iDominates(dom1, node) and
   iDominates(dom2, node) and
   dom1 != dom2 and
-  func = node.getEnclosingStmt().getEnclosingCallable()
+  func = node.getEnclosingCallable()
 select func, node, dom1, dom2
diff --git a/java/ql/test-kotlin2/library-tests/exprs/binop.ql b/java/ql/test-kotlin2/library-tests/exprs/binop.ql
index d865d83fcf9..303eccba589 100644
--- a/java/ql/test-kotlin2/library-tests/exprs/binop.ql
+++ b/java/ql/test-kotlin2/library-tests/exprs/binop.ql
@@ -41,4 +41,5 @@ MaybeElement rhs(BinaryExpr e) {
 }
 
 from Expr e
+where not e instanceof Assignment
 select e, lhs(e), rhs(e)
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptThenMac.expected b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptThenMac.expected
index ba74f3dffce..af36477b917 100644
--- a/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptThenMac.expected
+++ b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptThenMac.expected
@@ -30,7 +30,7 @@ nodes
 | BadMacUse.java:152:42:152:51 | ciphertext | semmle.label | ciphertext |
 subpaths
 testFailures
-| BadMacUse.java:50:56:50:65 | // $Source | Missing result: Source |
-| BadMacUse.java:63:118:63:127 | // $Source | Missing result: Source |
+| BadMacUse.java:50:56:50:66 | // $ Source | Missing result: Source |
+| BadMacUse.java:63:118:63:128 | // $ Source | Missing result: Source |
 | BadMacUse.java:92:31:92:35 | bytes : byte[] | Unexpected result: Source |
-| BadMacUse.java:146:95:146:104 | // $Source | Missing result: Source |
+| BadMacUse.java:146:95:146:105 | // $ Source | Missing result: Source |
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptToMac.expected b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptToMac.expected
index f73f0f25e0a..6fcff81b7f6 100644
--- a/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptToMac.expected
+++ b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderDecryptToMac.expected
@@ -31,7 +31,7 @@ nodes
 | BadMacUse.java:124:42:124:51 | ciphertext | semmle.label | ciphertext |
 subpaths
 testFailures
-| BadMacUse.java:63:118:63:127 | // $Source | Missing result: Source |
+| BadMacUse.java:63:118:63:128 | // $ Source | Missing result: Source |
 | BadMacUse.java:92:16:92:36 | doFinal(...) : byte[] | Unexpected result: Source |
 | BadMacUse.java:124:42:124:51 | ciphertext | Unexpected result: Alert |
-| BadMacUse.java:146:95:146:104 | // $Source | Missing result: Source |
+| BadMacUse.java:146:95:146:105 | // $ Source | Missing result: Source |
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderMacOnEncryptPlaintext.expected b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderMacOnEncryptPlaintext.expected
index ea427361361..2daa6405cd0 100644
--- a/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderMacOnEncryptPlaintext.expected
+++ b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacOrderMacOnEncryptPlaintext.expected
@@ -45,7 +45,7 @@ nodes
 | BadMacUse.java:152:42:152:51 | ciphertext | semmle.label | ciphertext |
 subpaths
 testFailures
-| BadMacUse.java:50:56:50:65 | // $Source | Missing result: Source |
+| BadMacUse.java:50:56:50:66 | // $ Source | Missing result: Source |
 | BadMacUse.java:139:79:139:90 | input : byte[] | Unexpected result: Source |
-| BadMacUse.java:146:95:146:104 | // $Source | Missing result: Source |
+| BadMacUse.java:146:95:146:105 | // $ Source | Missing result: Source |
 | BadMacUse.java:152:42:152:51 | ciphertext | Unexpected result: Alert |
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacUse.java b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacUse.java
index 5c442d4bca7..4c1ae5b3621 100644
--- a/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacUse.java
+++ b/java/ql/test/experimental/query-tests/quantum/examples/BadMacUse/BadMacUse.java
@@ -47,20 +47,20 @@ class BadMacUse {
         SecretKey encryptionKey = new SecretKeySpec(encryptionKeyBytes, "AES");
         Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
         cipher.init(Cipher.DECRYPT_MODE, encryptionKey, new SecureRandom());
-        byte[] plaintext = cipher.doFinal(ciphertext); // $Source
+        byte[] plaintext = cipher.doFinal(ciphertext); // $ Source
 
         // Now verify MAC (too late)
         SecretKey macKey = new SecretKeySpec(macKeyBytes, "HmacSHA256");
         Mac mac = Mac.getInstance("HmacSHA256");
         mac.init(macKey);
-        byte[] computedMac = mac.doFinal(plaintext); // $Alert[java/quantum/examples/bad-mac-order-decrypt-to-mac] 
+        byte[] computedMac = mac.doFinal(plaintext); // $ Alert[java/quantum/examples/bad-mac-order-decrypt-to-mac]
 
         if (!MessageDigest.isEqual(receivedMac, computedMac)) {
             throw new SecurityException("MAC verification failed");
         }
     }
 
-    public void BadMacOnPlaintext(byte[] encryptionKeyBytes, byte[] macKeyBytes, byte[] plaintext) throws Exception {// $Source
+    public void BadMacOnPlaintext(byte[] encryptionKeyBytes, byte[] macKeyBytes, byte[] plaintext) throws Exception {// $ Source
         // Create keys directly from provided byte arrays
         SecretKey encryptionKey = new SecretKeySpec(encryptionKeyBytes, "AES");
         SecretKey macKey = new SecretKeySpec(macKeyBytes, "HmacSHA256");
@@ -73,7 +73,7 @@ class BadMacUse {
         // Encrypt the plaintext
         Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
         cipher.init(Cipher.ENCRYPT_MODE, encryptionKey, new SecureRandom());
-        byte[] ciphertext = cipher.doFinal(plaintext); // $Alert[java/quantum/examples/bad-mac-order-encrypt-plaintext-also-in-mac]
+        byte[] ciphertext = cipher.doFinal(plaintext); // $ Alert[java/quantum/examples/bad-mac-order-encrypt-plaintext-also-in-mac]
 
         // Concatenate ciphertext and MAC
         byte[] output = new byte[ciphertext.length + computedMac.length];
@@ -132,7 +132,7 @@ class BadMacUse {
 
 
     /**
-     * Correct inputs to a decrypt and MAC operation, but the ordering is unsafe. 
+     * Correct inputs to a decrypt and MAC operation, but the ordering is unsafe.
      * The function decrypts THEN computes the MAC on the plaintext.
      * It should have the MAC computed on the ciphertext first.
      */
@@ -143,13 +143,13 @@ class BadMacUse {
         byte[] receivedMac = Arrays.copyOfRange(input, input.length - macLength, input.length);
 
         // Decrypt first (unsafe)
-        byte[] plaintext = decryptUsingWrapper(ciphertext, encryptionKeyBytes, new byte[16]); // $Source
+        byte[] plaintext = decryptUsingWrapper(ciphertext, encryptionKeyBytes, new byte[16]); // $ Source
 
         // Now verify MAC (too late)
         SecretKey macKey = new SecretKeySpec(macKeyBytes, "HmacSHA256");
         Mac mac = Mac.getInstance("HmacSHA256");
         mac.init(macKey);
-        byte[] computedMac = mac.doFinal(ciphertext); // $Alert[java/quantum/examples/bad-mac-order-decrypt-then-mac], False positive for Plaintext reuse
+        byte[] computedMac = mac.doFinal(ciphertext); // $ Alert[java/quantum/examples/bad-mac-order-decrypt-then-mac], False positive for Plaintext reuse
 
         if (!MessageDigest.isEqual(receivedMac, computedMac)) {
             throw new SecurityException("MAC verification failed");
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/InsecureIVorNonceSource.java b/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/InsecureIVorNonceSource.java
index 549c56dbd98..f9474681d19 100644
--- a/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/InsecureIVorNonceSource.java
+++ b/java/ql/test/experimental/query-tests/quantum/examples/InsecureOrUnknownNonceSource/InsecureIVorNonceSource.java
@@ -11,33 +11,33 @@ public class InsecureIVorNonceSource {
 
     // BAD: AES-GCM with static IV from a byte array
     public byte[] encryptWithStaticIvByteArrayWithInitializer(byte[] key, byte[] plaintext) throws Exception {
-        byte[] iv = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5 }; // $Source
+        byte[] iv = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5 }; // $ Source
 
         GCMParameterSpec ivSpec = new GCMParameterSpec(128, iv);
         SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
 
         Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
-        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $Alert[java/quantum/examples/insecure-iv-or-nonce]
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $ Alert[java/quantum/examples/insecure-iv-or-nonce]
         cipher.update(plaintext);
         return cipher.doFinal();
     }
 
     // BAD: AES-GCM with static IV from zero-initialized byte array
     public byte[] encryptWithZeroStaticIvByteArray(byte[] key, byte[] plaintext) throws Exception {
-        byte[] iv = new byte[16]; 
+        byte[] iv = new byte[16];
 
         GCMParameterSpec ivSpec = new GCMParameterSpec(128, iv);
         SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
 
         Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
-        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $Alert[java/quantum/examples/unknown-iv-or-nonce-source]
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $ Alert[java/quantum/examples/unknown-iv-or-nonce-source]
         cipher.update(plaintext);
         return cipher.doFinal();
     }
 
     // BAD: AES-CBC with static IV from 1-initialized byte array
     public byte[] encryptWithStaticIvByteArray(byte[] key, byte[] plaintext) throws Exception {
-        byte[] iv = new byte[16]; 
+        byte[] iv = new byte[16];
         for (byte i = 0; i < iv.length; i++) {
             iv[i] = 1;
         }
@@ -46,7 +46,7 @@ public class InsecureIVorNonceSource {
         SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
 
         Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING");
-        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $Alert[java/quantum/examples/insecure-iv-or-nonce]
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $ Alert[java/quantum/examples/insecure-iv-or-nonce]
         cipher.update(plaintext);
         return cipher.doFinal();
     }
@@ -54,15 +54,15 @@ public class InsecureIVorNonceSource {
     // BAD: AES-GCM with static IV from a multidimensional byte array
     public byte[] encryptWithOneOfStaticIvs01(byte[] key, byte[] plaintext) throws Exception {
         byte[][] staticIvs = new byte[][] {
-            { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5 }, // $Source
-            { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 42 } // $Source
-        }; 
+            { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5 }, // $ Source
+            { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 42 } // $ Source
+        };
 
         GCMParameterSpec ivSpec = new GCMParameterSpec(128, staticIvs[1]);
         SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
 
         Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
-        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $Alert[java/quantum/examples/insecure-iv-or-nonce]
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $ Alert[java/quantum/examples/insecure-iv-or-nonce]
         cipher.update(plaintext);
         return cipher.doFinal();
     }
@@ -70,15 +70,15 @@ public class InsecureIVorNonceSource {
     // BAD: AES-GCM with static IV from a multidimensional byte array
     public byte[] encryptWithOneOfStaticIvs02(byte[] key, byte[] plaintext) throws Exception {
         byte[][] staticIvs = new byte[][] {
-            new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5 }, // $Source
-            new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 42 } // $Source
-        }; 
+            new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5 }, // $ Source
+            new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 42 } // $ Source
+        };
 
         GCMParameterSpec ivSpec = new GCMParameterSpec(128, staticIvs[1]);
         SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
 
         Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
-        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $Alert[java/quantum/examples/insecure-iv-or-nonce]
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $ Alert[java/quantum/examples/insecure-iv-or-nonce]
         cipher.update(plaintext);
         return cipher.doFinal();
     }
@@ -86,15 +86,15 @@ public class InsecureIVorNonceSource {
     // BAD: AES-GCM with static IV from a zero-initialized multidimensional byte array
     public byte[] encryptWithOneOfStaticZeroIvs(byte[] key, byte[] plaintext) throws Exception {
         byte[][] ivs = new byte[][] {
-            new byte[8], 
-            new byte[16] 
+            new byte[8],
+            new byte[16]
         };
 
         GCMParameterSpec ivSpec = new GCMParameterSpec(128, ivs[1]);
         SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
 
         Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
-        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $Alert[java/quantum/examples/unknown-iv-or-nonce-source]
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $ Alert[java/quantum/examples/unknown-iv-or-nonce-source]
         cipher.update(plaintext);
         return cipher.doFinal();
     }
@@ -166,8 +166,8 @@ public class InsecureIVorNonceSource {
         return cipher.doFinal();
     }
 
-    public byte[] generate(int size) throws Exception { 
-        if (size == 0) { 
+    public byte[] generate(int size) throws Exception {
+        if (size == 0) {
             return new byte[0];
         }
         byte[] randomBytes = new byte[size];
@@ -183,7 +183,7 @@ public class InsecureIVorNonceSource {
         SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
 
         Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING");
-        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); 
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec);
         cipher.update(plaintext);
         return cipher.doFinal();
     }
@@ -191,7 +191,7 @@ public class InsecureIVorNonceSource {
     public byte[] generateInsecureRandomBytes(int numBytes) {
         Random random = new Random();
         byte[] bytes = new byte[numBytes];
-        random.nextBytes(bytes); // $Source
+        random.nextBytes(bytes); // $ Source
         return bytes;
     }
 
@@ -203,7 +203,7 @@ public class InsecureIVorNonceSource {
         SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
 
         Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING");
-        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec);  // $Alert[java/quantum/examples/insecure-iv-or-nonce]]
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec);  // $ Alert[java/quantum/examples/insecure-iv-or-nonce]]
         cipher.update(plaintext);
         return cipher.doFinal();
     }
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownAsymmetricKeySize/InsufficientAsymmetricKeySize.java b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownAsymmetricKeySize/InsufficientAsymmetricKeySize.java
index c330bf82a05..196696b6d54 100644
--- a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownAsymmetricKeySize/InsufficientAsymmetricKeySize.java
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownAsymmetricKeySize/InsufficientAsymmetricKeySize.java
@@ -2,15 +2,15 @@ import java.security.*;
 public class InsufficientAsymmetricKeySize{
     public static void test() throws Exception{
         KeyPairGenerator keyPairGen1 = KeyPairGenerator.getInstance("RSA");
-        keyPairGen1.initialize(1024); // $Alert[java/quantum/examples/weak-asymmetric-key-gen-size]
+        keyPairGen1.initialize(1024); // $ Alert[java/quantum/examples/weak-asymmetric-key-gen-size]
         keyPairGen1.generateKeyPair();
 
         KeyPairGenerator keyPairGen2 = KeyPairGenerator.getInstance("DSA");
-        keyPairGen2.initialize(1024); // $Alert[java/quantum/examples/weak-asymmetric-key-gen-size]
+        keyPairGen2.initialize(1024); // $ Alert[java/quantum/examples/weak-asymmetric-key-gen-size]
         keyPairGen2.generateKeyPair();
 
         KeyPairGenerator keyPairGen3 = KeyPairGenerator.getInstance("DH");
-        keyPairGen3.initialize(1024); // $Alert[java/quantum/examples/weak-asymmetric-key-gen-size]
+        keyPairGen3.initialize(1024); // $ Alert[java/quantum/examples/weak-asymmetric-key-gen-size]
         keyPairGen3.generateKeyPair();
 
         KeyPairGenerator keyPairGen4 = KeyPairGenerator.getInstance("RSA");
@@ -25,4 +25,4 @@ public class InsufficientAsymmetricKeySize{
         keyPairGen6.initialize(2048); // GOOD
         keyPairGen6.generateKeyPair();
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownBlockMode/Test.java b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownBlockMode/Test.java
index 0c8b3b6691d..38095e476ac 100644
--- a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownBlockMode/Test.java
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownBlockMode/Test.java
@@ -10,25 +10,25 @@ public class Test {
         byte[] data = "SensitiveData".getBytes();
 
         // Insecure block mode: ECB
-        Cipher cipherECB = Cipher.getInstance("AES/ECB/PKCS5Padding"); // $Alert
+        Cipher cipherECB = Cipher.getInstance("AES/ECB/PKCS5Padding"); // $ Alert
         cipherECB.init(Cipher.ENCRYPT_MODE, key);
         byte[] ecbEncrypted = cipherECB.doFinal(data);
         System.out.println("ECB encrypted: " + bytesToHex(ecbEncrypted));
 
         // Insecure block mode: CFB
-        Cipher cipherCFB = Cipher.getInstance("AES/CFB/PKCS5Padding"); // $Alert
+        Cipher cipherCFB = Cipher.getInstance("AES/CFB/PKCS5Padding"); // $ Alert
         cipherCFB.init(Cipher.ENCRYPT_MODE, key, iv);
         byte[] cfbEncrypted = cipherCFB.doFinal(data);
         System.out.println("CFB encrypted: " + bytesToHex(cfbEncrypted));
 
         // Insecure block mode: OFB
-        Cipher cipherOFB = Cipher.getInstance("AES/OFB/PKCS5Padding"); // $Alert
+        Cipher cipherOFB = Cipher.getInstance("AES/OFB/PKCS5Padding"); // $ Alert
         cipherOFB.init(Cipher.ENCRYPT_MODE, key, iv);
         byte[] ofbEncrypted = cipherOFB.doFinal(data);
         System.out.println("OFB encrypted: " + bytesToHex(ofbEncrypted));
 
         // Insecure block mode: CTR
-        Cipher cipherCTR = Cipher.getInstance("AES/CTR/NoPadding"); // $Alert
+        Cipher cipherCTR = Cipher.getInstance("AES/CTR/NoPadding"); // $ Alert
         cipherCTR.init(Cipher.ENCRYPT_MODE, key, iv);
         byte[] ctrEncrypted = cipherCTR.doFinal(data);
         System.out.println("CTR encrypted: " + bytesToHex(ctrEncrypted));
@@ -54,4 +54,4 @@ public class Test {
             sb.append(String.format("%02x", b));
         return sb.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownHash/WeakHashing.java b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownHash/WeakHashing.java
index cc3b9a859d1..99d8ae4b4da 100644
--- a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownHash/WeakHashing.java
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownHash/WeakHashing.java
@@ -12,33 +12,33 @@ public class WeakHashing {
         props.load(new FileInputStream("example.properties"));
 
         // BAD: Using a weak hashing algorithm even with a secure default
-        MessageDigest bad = MessageDigest.getInstance(props.getProperty("hashAlg1")); // $Alert[java/quantum/examples/weak-hash]
+        MessageDigest bad = MessageDigest.getInstance(props.getProperty("hashAlg1")); // $ Alert[java/quantum/examples/weak-hash]
 
         // BAD: Using a weak hashing algorithm even with a secure default
-        MessageDigest bad2 = MessageDigest.getInstance(props.getProperty("hashAlg1", "SHA-256")); // $Alert[java/quantum/examples/weak-hash]
+        MessageDigest bad2 = MessageDigest.getInstance(props.getProperty("hashAlg1", "SHA-256")); // $ Alert[java/quantum/examples/weak-hash]
 
         // BAD: Using a strong hashing algorithm but with a weak default
-        MessageDigest bad3 = MessageDigest.getInstance(props.getProperty("hashAlg2", "MD5")); // $Alert[java/quantum/examples/weak-hash]
+        MessageDigest bad3 = MessageDigest.getInstance(props.getProperty("hashAlg2", "MD5")); // $ Alert[java/quantum/examples/weak-hash]
 
         // BAD: Using a weak hash
-        MessageDigest bad4 = MessageDigest.getInstance("SHA-1"); // $Alert[java/quantum/examples/weak-hash]
+        MessageDigest bad4 = MessageDigest.getInstance("SHA-1"); // $ Alert[java/quantum/examples/weak-hash]
 
         // BAD: Property does not exist and default (used value) is unknown
-        MessageDigest bad5 = MessageDigest.getInstance(props.getProperty("non-existent_property", "non-existent_default")); // $Alert[java/quantum/examples/unknown-hash]
+        MessageDigest bad5 = MessageDigest.getInstance(props.getProperty("non-existent_property", "non-existent_default")); // $ Alert[java/quantum/examples/unknown-hash]
 
         java.util.Properties props2 = new java.util.Properties();
 
         props2.load(new FileInputStream("unobserved-file.properties"));
 
-        // BAD: "hashAlg2" is not visible in the file loaded for props2, should be an unknown 
+        // BAD: "hashAlg2" is not visible in the file loaded for props2, should be an unknown
         // FALSE NEGATIVE for unknown hash
-        MessageDigest bad6 = MessageDigest.getInstance(props2.getProperty("hashAlg2", "SHA-256")); // $Alert[java/quantum/examples/unknown-hash]
+        MessageDigest bad6 = MessageDigest.getInstance(props2.getProperty("hashAlg2", "SHA-256")); // $ Alert[java/quantum/examples/unknown-hash]
 
         // GOOD: Using a strong hashing algorithm
         MessageDigest ok = MessageDigest.getInstance(props.getProperty("hashAlg2"));
 
         // BAD?: Property does not exist (considered unknown) and but default is secure
-        MessageDigest ok2 = MessageDigest.getInstance(props.getProperty("non-existent-property", "SHA-256")); // $Alert[java/quantum/examples/unknown-hash]
+        MessageDigest ok2 = MessageDigest.getInstance(props.getProperty("non-existent-property", "SHA-256")); // $ Alert[java/quantum/examples/unknown-hash]
 
         // GOOD: Using a strong hashing algorithm
         MessageDigest ok3 = MessageDigest.getInstance("SHA3-512");
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/Test.java b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/Test.java
index 13f6d03ec72..50bc113b900 100644
--- a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/Test.java
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/Test.java
@@ -28,8 +28,8 @@ public class Test {
      */
     public void pbkdf2LowIteration(String password) throws Exception {
         byte[] salt = generateSalt(16);
-        int iterationCount = 10; // $Source
-        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterationCount, 256); // $Alert[java/quantum/examples/weak-kdf-iteration-count]
+        int iterationCount = 10; // $ Source
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterationCount, 256); // $ Alert[java/quantum/examples/weak-kdf-iteration-count]
         SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
         byte[] key = factory.generateSecret(spec).getEncoded();
     }
@@ -40,9 +40,9 @@ public class Test {
      * SAST/CBOM: - Parent: PBKDF2. - Iteration count is only 10, which is far
      * below acceptable security standards. - Flagged as insecure.
      */
-    public void pbkdf2LowIteration(String password, int iterationCount) throws Exception { // $Source
+    public void pbkdf2LowIteration(String password, int iterationCount) throws Exception { // $ Source
         byte[] salt = generateSalt(16);
-        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterationCount, 256); // $Alert[java/quantum/examples/unknown-kdf-iteration-count]
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterationCount, 256); // $ Alert[java/quantum/examples/unknown-kdf-iteration-count]
         SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
         byte[] key = factory.generateSecret(spec).getEncoded();
     }
@@ -55,9 +55,9 @@ public class Test {
      */
     public void pbkdf2HighIteration(String password) throws Exception {
         byte[] salt = generateSalt(16);
-        int iterationCount = 1_000_000; 
-        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterationCount, 256); 
+        int iterationCount = 1_000_000;
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterationCount, 256);
         SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
         byte[] key = factory.generateSecret(spec).getEncoded();
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/UnknownKDFIterationCount.expected b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/UnknownKDFIterationCount.expected
index 472d7909049..192393ad028 100644
--- a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/UnknownKDFIterationCount.expected
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/UnknownKDFIterationCount.expected
@@ -1,5 +1,5 @@
 #select
 | Test.java:47:22:47:49 | KeyDerivation | Key derivation operation with unknown iteration: $@ | Test.java:43:53:43:70 | iterationCount | iterationCount |
 testFailures
-| Test.java:45:94:45:153 | // $Alert[java/quantum/examples/unknown-kdf-iteration-count] | Missing result: Alert[java/quantum/examples/unknown-kdf-iteration-count] |
+| Test.java:45:94:45:154 | // $ Alert[java/quantum/examples/unknown-kdf-iteration-count] | Missing result: Alert[java/quantum/examples/unknown-kdf-iteration-count] |
 | Test.java:47:22:47:49 | Key derivation operation with unknown iteration: $@ | Unexpected result: Alert |
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/WeakKDFIterationCount.expected b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/WeakKDFIterationCount.expected
index 3567afd0322..cd19c73a665 100644
--- a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/WeakKDFIterationCount.expected
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFIterationCount/WeakKDFIterationCount.expected
@@ -13,4 +13,4 @@ nodes
 | Test.java:59:72:59:85 | iterationCount | semmle.label | iterationCount |
 subpaths
 testFailures
-| Test.java:43:92:43:101 | // $Source | Missing result: Source |
+| Test.java:43:92:43:102 | // $ Source | Missing result: Source |
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFKeySize/Test.java b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFKeySize/Test.java
index 21619c8c574..014a0bfaf8f 100644
--- a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFKeySize/Test.java
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownKDFKeySize/Test.java
@@ -20,8 +20,8 @@ public class Test {
     public void pbkdf2WeakKeySize(String password) throws Exception {
         byte[] salt = generateSalt(16);
         int iterationCount = 100_000;
-        int keySize = 64; // $Source
-        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterationCount, keySize); // $Alert[java/quantum/examples/weak-kdf-key-size]
+        int keySize = 64; // $ Source
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, iterationCount, keySize); // $ Alert[java/quantum/examples/weak-kdf-key-size]
         SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
         byte[] key = factory.generateSecret(spec).getEncoded();
     }
@@ -39,4 +39,4 @@ public class Test {
         SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
         byte[] key = factory.generateSecret(spec).getEncoded();
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownSymmetricCipher/Test.java b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownSymmetricCipher/Test.java
index fde9f9a24d1..6c30dd2402d 100644
--- a/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownSymmetricCipher/Test.java
+++ b/java/ql/test/experimental/query-tests/quantum/examples/WeakOrUnknownSymmetricCipher/Test.java
@@ -10,51 +10,51 @@ public class Test {
         byte[] data = "Sensitive Data".getBytes();
 
         // BAD: DES (unsafe)
-        KeyGenerator desKeyGen = KeyGenerator.getInstance("DES"); // $Alert
+        KeyGenerator desKeyGen = KeyGenerator.getInstance("DES"); // $ Alert
         SecretKey desKey = desKeyGen.generateKey();
-        Cipher desCipher = Cipher.getInstance("DES"); // $Alert
+        Cipher desCipher = Cipher.getInstance("DES"); // $ Alert
         desCipher.init(Cipher.ENCRYPT_MODE, desKey);
         byte[] desEncrypted = desCipher.doFinal(data);
 
         // BAD: DESede (Triple DES, considered weak)
-        KeyGenerator desedeKeyGen = KeyGenerator.getInstance("DESede"); // $Alert
+        KeyGenerator desedeKeyGen = KeyGenerator.getInstance("DESede"); // $ Alert
         SecretKey desedeKey = desedeKeyGen.generateKey();
-        Cipher desedeCipher = Cipher.getInstance("DESede"); // $Alert
+        Cipher desedeCipher = Cipher.getInstance("DESede"); // $ Alert
         desedeCipher.init(Cipher.ENCRYPT_MODE, desedeKey);
         byte[] desedeEncrypted = desedeCipher.doFinal(data);
 
         // BAD: Blowfish (considered weak)
-        KeyGenerator blowfishKeyGen = KeyGenerator.getInstance("Blowfish"); // $Alert
+        KeyGenerator blowfishKeyGen = KeyGenerator.getInstance("Blowfish"); // $ Alert
         SecretKey blowfishKey = blowfishKeyGen.generateKey();
-        Cipher blowfishCipher = Cipher.getInstance("Blowfish"); // $Alert
+        Cipher blowfishCipher = Cipher.getInstance("Blowfish"); // $ Alert
         blowfishCipher.init(Cipher.ENCRYPT_MODE, blowfishKey);
         byte[] blowfishEncrypted = blowfishCipher.doFinal(data);
 
         // BAD: RC2 (unsafe)
-        KeyGenerator rc2KeyGen = KeyGenerator.getInstance("RC2"); // $Alert
+        KeyGenerator rc2KeyGen = KeyGenerator.getInstance("RC2"); // $ Alert
         SecretKey rc2Key = rc2KeyGen.generateKey();
-        Cipher rc2Cipher = Cipher.getInstance("RC2"); // $Alert
+        Cipher rc2Cipher = Cipher.getInstance("RC2"); // $ Alert
         rc2Cipher.init(Cipher.ENCRYPT_MODE, rc2Key);
         byte[] rc2Encrypted = rc2Cipher.doFinal(data);
 
         // BAD: RC4 (stream cipher, unsafe)
-        KeyGenerator rc4KeyGen = KeyGenerator.getInstance("RC4"); // $Alert
+        KeyGenerator rc4KeyGen = KeyGenerator.getInstance("RC4"); // $ Alert
         SecretKey rc4Key = rc4KeyGen.generateKey();
-        Cipher rc4Cipher = Cipher.getInstance("RC4"); // $Alert
+        Cipher rc4Cipher = Cipher.getInstance("RC4"); // $ Alert
         rc4Cipher.init(Cipher.ENCRYPT_MODE, rc4Key);
         byte[] rc4Encrypted = rc4Cipher.doFinal(data);
 
         // BAD: IDEA (considered weak)
-        KeyGenerator ideaKeyGen = KeyGenerator.getInstance("IDEA"); // $Alert
+        KeyGenerator ideaKeyGen = KeyGenerator.getInstance("IDEA"); // $ Alert
         SecretKey ideaKey = ideaKeyGen.generateKey();
-        Cipher ideaCipher = Cipher.getInstance("IDEA"); // $Alert
+        Cipher ideaCipher = Cipher.getInstance("IDEA"); // $ Alert
         ideaCipher.init(Cipher.ENCRYPT_MODE, ideaKey);
         byte[] ideaEncrypted = ideaCipher.doFinal(data);
 
         // BAD: Skipjack (unsafe)
-        KeyGenerator skipjackKeyGen = KeyGenerator.getInstance("Skipjack"); // $Alert
+        KeyGenerator skipjackKeyGen = KeyGenerator.getInstance("Skipjack"); // $ Alert
         SecretKey skipjackKey = skipjackKeyGen.generateKey();
-        Cipher skipjackCipher = Cipher.getInstance("Skipjack"); // $Alert
+        Cipher skipjackCipher = Cipher.getInstance("Skipjack"); // $ Alert
         skipjackCipher.init(Cipher.ENCRYPT_MODE, skipjackKey);
         byte[] skipjackEncrypted = skipjackCipher.doFinal(data);
 
@@ -78,4 +78,4 @@ public class Test {
         // GOOD: not a symmetric cipher (Sanity check)
         SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/ext/TestModels/Test.java b/java/ql/test/ext/TestModels/Test.java
index f54007ada9e..084c844957c 100644
--- a/java/ql/test/ext/TestModels/Test.java
+++ b/java/ql/test/ext/TestModels/Test.java
@@ -33,50 +33,50 @@ public class Test {
         // top 100 JDK APIs tests
         {
             Exception e1 = new RuntimeException((String)source());
-            sink((String)e1.getMessage()); // $hasValueFlow
+            sink((String)e1.getMessage()); // $ hasValueFlow
 
             Exception e2 = new RuntimeException((Throwable)source());
-            sink((Throwable)e2.getCause()); // $hasValueFlow
+            sink((Throwable)e2.getCause()); // $ hasValueFlow
 
             Exception e3 = new IllegalArgumentException((String)source());
-            sink((String)e3.getMessage()); // $hasValueFlow
+            sink((String)e3.getMessage()); // $ hasValueFlow
 
             Exception e4 = new IllegalStateException((String)source());
-            sink((String)e4.getMessage()); // $hasValueFlow
+            sink((String)e4.getMessage()); // $ hasValueFlow
 
             Exception e5 = new UnsupportedOperationException((String)source());
-            sink((String)e5.getMessage()); // $hasValueFlow
+            sink((String)e5.getMessage()); // $ hasValueFlow
 
             Throwable t = new Throwable((Throwable)source());
-            sink((Throwable)t.getCause()); // $hasValueFlow
+            sink((Throwable)t.getCause()); // $ hasValueFlow
 
             String s2 = (String)source();
             int i = 0;
-            sink(s2.charAt(i)); // $hasTaintFlow
+            sink(s2.charAt(i)); // $ hasTaintFlow
 
             ResultSet rs = (ResultSet)source();
-            sink(rs.getString("")); // $hasTaintFlow
+            sink(rs.getString("")); // $ hasTaintFlow
         }
 
         // top 200 JDK APIs tests
         {
             // java.io
             Exception e1 = new IOException((String)source());
-            sink((String)e1.getMessage()); // $hasValueFlow
+            sink((String)e1.getMessage()); // $ hasValueFlow
 
             File f = (File)source();
-            sink(f.getName()); // $hasTaintFlow
+            sink(f.getName()); // $ hasTaintFlow
 
             // java.lang
             Exception e2 = new Exception((String)source());
-            sink((String)e2.getMessage()); // $hasValueFlow
+            sink((String)e2.getMessage()); // $ hasValueFlow
 
             Exception e3 = new IndexOutOfBoundsException((String)source());
-            sink((String)e3.getMessage()); // $hasValueFlow
+            sink((String)e3.getMessage()); // $ hasValueFlow
 
             Exception e4 = new RuntimeException((String)source(), (Throwable)source());
-            sink((String)e4.getMessage());  // $hasValueFlow
-            sink((Throwable)e4.getCause()); // $hasValueFlow
+            sink((String)e4.getMessage());  // $ hasValueFlow
+            sink((Throwable)e4.getCause()); // $ hasValueFlow
 
             // java.sql
             Connection con = DriverManager.getConnection("");
@@ -86,14 +86,14 @@ public class Test {
 
             // java.util.concurrent.atomic
             AtomicReference ar = new AtomicReference(source());
-            sink(ar.get());  // $hasValueFlow
+            sink(ar.get());  // $ hasValueFlow
 
             // java.util
             StringJoiner sj1 = new StringJoiner(",");
-            sink(sj1.add((CharSequence)source())); // $hasTaintFlow
+            sink(sj1.add((CharSequence)source())); // $ hasTaintFlow
 
             StringJoiner sj2 = (StringJoiner)source();
-            sink(sj2.add("test")); // $hasValueFlow
+            sink(sj2.add("test")); // $ hasValueFlow
         }
 
         // top 300-500 JDK APIs tests
@@ -101,62 +101,62 @@ public class Test {
 
             // java.awt
             Container container = new Container();
-            sink(container.add((Component)source())); // $hasValueFlow
+            sink(container.add((Component)source())); // $ hasValueFlow
 
             // java.io
             File f1 = (File)source();
-            sink(f1.getParentFile()); // $hasTaintFlow
+            sink(f1.getParentFile()); // $ hasTaintFlow
 
             File f2 = (File)source();
-            sink(f2.getPath()); // $hasTaintFlow
+            sink(f2.getPath()); // $ hasTaintFlow
 
             StringWriter sw = (StringWriter)source();
-            sink(sw.toString()); // $hasTaintFlow
+            sink(sw.toString()); // $ hasTaintFlow
 
             Exception e = new UncheckedIOException((IOException)source());
-            sink((Throwable)e.getCause()); // $hasValueFlow
+            sink((Throwable)e.getCause()); // $ hasValueFlow
 
             // java.net
             URL url = (URL)source();
-            sink(url.toURI()); // $hasTaintFlow
+            sink(url.toURI()); // $ hasTaintFlow
 
             // java.nio.file
             Path p = (Path)source();
-            sink(p.getFileName()); // $hasTaintFlow
+            sink(p.getFileName()); // $ hasTaintFlow
 
             // java.util.concurrent.atomic
             AtomicReference ar = new AtomicReference();
             ar.set(source());
-            sink(ar.get()); // $hasValueFlow
+            sink(ar.get()); // $ hasValueFlow
 
             // java.util.concurrent
             // `ThreadPoolExecutor` implements the `java.util.concurrent.ExecutorService` interface
             ThreadPoolExecutor tpe = new ThreadPoolExecutor(0, 0, 0, null, null);
-            sink(tpe.submit((Runnable)source())); // $hasTaintFlow
+            sink(tpe.submit((Runnable)source())); // $ hasTaintFlow
 
             CompletionStage cs = (CompletionStage)source();
-            sink(cs.toCompletableFuture()); // $hasTaintFlow
+            sink(cs.toCompletableFuture()); // $ hasTaintFlow
 
             CompletableFuture cf1 = new CompletableFuture();
             cf1.complete(source());
-            sink(cf1.get()); // $hasValueFlow
-            sink(cf1.join()); // $hasValueFlow
+            sink(cf1.get()); // $ hasValueFlow
+            sink(cf1.join()); // $ hasValueFlow
 
             CompletableFuture cf2 = CompletableFuture.completedFuture(source());
-            sink(cf2.get()); // $hasValueFlow
-            sink(cf2.join()); // $hasValueFlow
+            sink(cf2.get()); // $ hasValueFlow
+            sink(cf2.join()); // $ hasValueFlow
 
             // java.util.logging
             Logger logger = Logger.getLogger((String)source());
-            sink(logger.getName()); // $hasValueFlow
+            sink(logger.getName()); // $ hasValueFlow
 
             // java.util.regex
             Pattern pattern = Pattern.compile((String)source());
-            sink(pattern); // $hasTaintFlow
+            sink(pattern); // $ hasTaintFlow
 
             // java.util
             EventObject eventObj = new EventObject(source());
-            sink(eventObj.getSource()); // $hasValueFlow
+            sink(eventObj.getSource()); // $ hasValueFlow
 
             // "java.util;ResourceBundle;true;getString;(String);;Argument[-1].MapValue;ReturnValue;value;manual"
             String out = null;
@@ -166,33 +166,33 @@ public class Test {
 
             // java.lang
             AssertionError assertErr = new AssertionError(source());
-            sink((String)assertErr.getMessage()); // $hasValueFlow
+            sink((String)assertErr.getMessage()); // $ hasValueFlow
 
-            sink(Test.class.cast(source())); // $hasValueFlow
+            sink(Test.class.cast(source())); // $ hasValueFlow
 
             Exception excep1 = new Exception((String)source(), (Throwable)source());
-            sink((String)excep1.getMessage());  // $hasValueFlow
-            sink((Throwable)excep1.getCause()); // $hasValueFlow
+            sink((String)excep1.getMessage());  // $ hasValueFlow
+            sink((Throwable)excep1.getCause()); // $ hasValueFlow
 
             Exception excep2 = new NullPointerException((String)source());
-            sink((String)excep2.getMessage());  // $hasValueFlow
+            sink((String)excep2.getMessage());  // $ hasValueFlow
 
             StringBuilder sb = (StringBuilder)source();
-            sink(sb.delete(0, 1)); // $hasValueFlow
+            sink(sb.delete(0, 1)); // $ hasValueFlow
 
             Thread thread1 = new Thread((Runnable)source());
-            sink(thread1); // $hasTaintFlow
+            sink(thread1); // $ hasTaintFlow
 
             Thread thread2 = new Thread((String)source());
-            sink(thread2.getName()); // $hasValueFlow
+            sink(thread2.getName()); // $ hasValueFlow
 
             ThreadLocal threadloc = new ThreadLocal();
             threadloc.set(source());
-            sink(threadloc.get()); // $hasValueFlow
+            sink(threadloc.get()); // $ hasValueFlow
 
             Throwable th = new Throwable((String)source());
-            sink((String)th.getLocalizedMessage()); // $hasValueFlow
-            sink(th.toString()); // $hasTaintFlow
+            sink((String)th.getLocalizedMessage()); // $ hasValueFlow
+            sink(th.toString()); // $ hasTaintFlow
         }
     }
 }
diff --git a/java/ql/test/library-tests/controlflow/basic/bbStmts.expected b/java/ql/test/library-tests/controlflow/basic/bbStmts.expected
index df336ce90a2..58b3e698771 100644
--- a/java/ql/test/library-tests/controlflow/basic/bbStmts.expected
+++ b/java/ql/test/library-tests/controlflow/basic/bbStmts.expected
@@ -1,140 +1,296 @@
-| Test.java:3:14:3:17 | Exceptional Exit | 0 | Test.java:3:14:3:17 | Exceptional Exit |
-| Test.java:3:14:3:17 | Exit | 0 | Test.java:3:14:3:17 | Exit |
-| Test.java:3:14:3:17 | { ... } | 0 | Test.java:3:14:3:17 | { ... } |
-| Test.java:3:14:3:17 | { ... } | 1 | Test.java:3:14:3:17 | super(...) |
-| Test.java:3:14:3:17 | { ... } | 2 | Test.java:3:14:3:17 | Normal Exit |
-| Test.java:4:14:4:17 | Exceptional Exit | 0 | Test.java:4:14:4:17 | Exceptional Exit |
-| Test.java:4:14:4:17 | Exit | 0 | Test.java:4:14:4:17 | Exit |
+| Test.java:3:14:3:17 | Entry | 0 | Test.java:3:14:3:17 | Entry |
+| Test.java:3:14:3:17 | Entry | 1 | Test.java:3:14:3:17 | { ... } |
+| Test.java:3:14:3:17 | Entry | 2 | Test.java:3:14:3:17 | Before super(...) |
+| Test.java:3:14:3:17 | Entry | 3 | Test.java:3:14:3:17 | super(...) |
+| Test.java:3:14:3:17 | Entry | 4 | Test.java:3:14:3:17 | After super(...) |
+| Test.java:3:14:3:17 | Entry | 5 | Test.java:3:14:3:17 | After { ... } |
+| Test.java:3:14:3:17 | Entry | 6 | Test.java:3:14:3:17 | Normal Exit |
+| Test.java:3:14:3:17 | Entry | 7 | Test.java:3:14:3:17 | Exit |
+| Test.java:4:14:4:17 | Entry | 0 | Test.java:4:14:4:17 | Entry |
+| Test.java:4:14:4:17 | Entry | 1 | Test.java:4:21:76:2 | { ... } |
+| Test.java:4:14:4:17 | Entry | 2 | Test.java:5:3:5:12 | var ...; |
+| Test.java:4:14:4:17 | Entry | 3 | Test.java:5:7:5:11 | Before x |
+| Test.java:4:14:4:17 | Entry | 4 | Test.java:5:11:5:11 | 0 |
+| Test.java:4:14:4:17 | Entry | 5 | Test.java:5:7:5:11 | x |
+| Test.java:4:14:4:17 | Entry | 6 | Test.java:5:7:5:11 | After x |
+| Test.java:4:14:4:17 | Entry | 7 | Test.java:5:3:5:12 | After var ...; |
+| Test.java:4:14:4:17 | Entry | 8 | Test.java:6:3:6:14 | var ...; |
+| Test.java:4:14:4:17 | Entry | 9 | Test.java:6:8:6:13 | Before y |
+| Test.java:4:14:4:17 | Entry | 10 | Test.java:6:12:6:13 | 50 |
+| Test.java:4:14:4:17 | Entry | 11 | Test.java:6:8:6:13 | y |
+| Test.java:4:14:4:17 | Entry | 12 | Test.java:6:8:6:13 | After y |
+| Test.java:4:14:4:17 | Entry | 13 | Test.java:6:3:6:14 | After var ...; |
+| Test.java:4:14:4:17 | Entry | 14 | Test.java:7:3:7:12 | var ...; |
+| Test.java:4:14:4:17 | Entry | 15 | Test.java:7:7:7:11 | Before z |
+| Test.java:4:14:4:17 | Entry | 16 | Test.java:7:11:7:11 | 0 |
+| Test.java:4:14:4:17 | Entry | 17 | Test.java:7:7:7:11 | z |
+| Test.java:4:14:4:17 | Entry | 18 | Test.java:7:7:7:11 | After z |
+| Test.java:4:14:4:17 | Entry | 19 | Test.java:7:3:7:12 | After var ...; |
+| Test.java:4:14:4:17 | Entry | 20 | Test.java:8:3:8:12 | var ...; |
+| Test.java:4:14:4:17 | Entry | 21 | Test.java:8:7:8:11 | Before w |
+| Test.java:4:14:4:17 | Entry | 22 | Test.java:8:11:8:11 | 0 |
+| Test.java:4:14:4:17 | Entry | 23 | Test.java:8:7:8:11 | w |
+| Test.java:4:14:4:17 | Entry | 24 | Test.java:8:7:8:11 | After w |
+| Test.java:4:14:4:17 | Entry | 25 | Test.java:8:3:8:12 | After var ...; |
+| Test.java:4:14:4:17 | Entry | 26 | Test.java:11:3:11:12 | if (...) |
+| Test.java:4:14:4:17 | Entry | 27 | Test.java:11:7:11:11 | Before ... > ... |
+| Test.java:4:14:4:17 | Entry | 28 | Test.java:11:7:11:7 | x |
+| Test.java:4:14:4:17 | Entry | 29 | Test.java:11:11:11:11 | 0 |
+| Test.java:4:14:4:17 | Entry | 30 | Test.java:11:7:11:11 | ... > ... |
 | Test.java:4:14:4:17 | Normal Exit | 0 | Test.java:4:14:4:17 | Normal Exit |
-| Test.java:4:21:76:2 | { ... } | 0 | Test.java:4:21:76:2 | { ... } |
-| Test.java:4:21:76:2 | { ... } | 1 | Test.java:5:3:5:12 | var ...; |
-| Test.java:4:21:76:2 | { ... } | 2 | Test.java:5:11:5:11 | 0 |
-| Test.java:4:21:76:2 | { ... } | 3 | Test.java:5:7:5:11 | x |
-| Test.java:4:21:76:2 | { ... } | 4 | Test.java:6:3:6:14 | var ...; |
-| Test.java:4:21:76:2 | { ... } | 5 | Test.java:6:12:6:13 | 50 |
-| Test.java:4:21:76:2 | { ... } | 6 | Test.java:6:8:6:13 | y |
-| Test.java:4:21:76:2 | { ... } | 7 | Test.java:7:3:7:12 | var ...; |
-| Test.java:4:21:76:2 | { ... } | 8 | Test.java:7:11:7:11 | 0 |
-| Test.java:4:21:76:2 | { ... } | 9 | Test.java:7:7:7:11 | z |
-| Test.java:4:21:76:2 | { ... } | 10 | Test.java:8:3:8:12 | var ...; |
-| Test.java:4:21:76:2 | { ... } | 11 | Test.java:8:11:8:11 | 0 |
-| Test.java:4:21:76:2 | { ... } | 12 | Test.java:8:7:8:11 | w |
-| Test.java:4:21:76:2 | { ... } | 13 | Test.java:11:3:11:12 | if (...) |
-| Test.java:4:21:76:2 | { ... } | 14 | Test.java:11:7:11:7 | x |
-| Test.java:4:21:76:2 | { ... } | 15 | Test.java:11:11:11:11 | 0 |
-| Test.java:4:21:76:2 | { ... } | 16 | Test.java:11:7:11:11 | ... > ... |
-| Test.java:11:14:14:3 | { ... } | 0 | Test.java:11:14:14:3 | { ... } |
-| Test.java:11:14:14:3 | { ... } | 1 | Test.java:12:4:12:10 | <Expr>; |
-| Test.java:11:14:14:3 | { ... } | 2 | Test.java:12:8:12:9 | 20 |
-| Test.java:11:14:14:3 | { ... } | 3 | Test.java:12:4:12:9 | ...=... |
-| Test.java:11:14:14:3 | { ... } | 4 | Test.java:13:4:13:10 | <Expr>; |
-| Test.java:11:14:14:3 | { ... } | 5 | Test.java:13:8:13:9 | 10 |
-| Test.java:11:14:14:3 | { ... } | 6 | Test.java:13:4:13:9 | ...=... |
-| Test.java:14:10:16:3 | { ... } | 0 | Test.java:14:10:16:3 | { ... } |
-| Test.java:14:10:16:3 | { ... } | 1 | Test.java:15:4:15:10 | <Expr>; |
-| Test.java:14:10:16:3 | { ... } | 2 | Test.java:15:8:15:9 | 30 |
-| Test.java:14:10:16:3 | { ... } | 3 | Test.java:15:4:15:9 | ...=... |
-| Test.java:18:3:18:8 | <Expr>; | 0 | Test.java:18:3:18:8 | <Expr>; |
-| Test.java:18:3:18:8 | <Expr>; | 1 | Test.java:18:7:18:7 | 0 |
-| Test.java:18:3:18:8 | <Expr>; | 2 | Test.java:18:3:18:7 | ...=... |
-| Test.java:18:3:18:8 | <Expr>; | 3 | Test.java:21:3:21:11 | if (...) |
-| Test.java:18:3:18:8 | <Expr>; | 4 | Test.java:21:6:21:6 | x |
-| Test.java:18:3:18:8 | <Expr>; | 5 | Test.java:21:10:21:10 | 0 |
-| Test.java:18:3:18:8 | <Expr>; | 6 | Test.java:21:6:21:10 | ... < ... |
-| Test.java:22:4:22:10 | <Expr>; | 0 | Test.java:22:4:22:10 | <Expr>; |
-| Test.java:22:4:22:10 | <Expr>; | 1 | Test.java:22:8:22:9 | 40 |
-| Test.java:22:4:22:10 | <Expr>; | 2 | Test.java:22:4:22:9 | ...=... |
-| Test.java:22:4:22:10 | <Expr>; | 3 | Test.java:27:3:27:9 | <Expr>; |
-| Test.java:22:4:22:10 | <Expr>; | 4 | Test.java:27:7:27:8 | 10 |
-| Test.java:22:4:22:10 | <Expr>; | 5 | Test.java:27:3:27:8 | ...=... |
-| Test.java:22:4:22:10 | <Expr>; | 6 | Test.java:30:3:30:13 | if (...) |
-| Test.java:22:4:22:10 | <Expr>; | 7 | Test.java:30:7:30:7 | x |
-| Test.java:22:4:22:10 | <Expr>; | 8 | Test.java:30:12:30:12 | 0 |
-| Test.java:22:4:22:10 | <Expr>; | 9 | Test.java:30:7:30:12 | ... == ... |
-| Test.java:24:4:24:10 | return ... | 0 | Test.java:24:4:24:10 | return ... |
-| Test.java:30:15:33:3 | { ... } | 0 | Test.java:30:15:33:3 | { ... } |
-| Test.java:30:15:33:3 | { ... } | 1 | Test.java:31:4:31:10 | <Expr>; |
-| Test.java:30:15:33:3 | { ... } | 2 | Test.java:31:8:31:9 | 60 |
-| Test.java:30:15:33:3 | { ... } | 3 | Test.java:31:4:31:9 | ...=... |
-| Test.java:30:15:33:3 | { ... } | 4 | Test.java:32:4:32:10 | <Expr>; |
-| Test.java:30:15:33:3 | { ... } | 5 | Test.java:32:8:32:9 | 10 |
-| Test.java:30:15:33:3 | { ... } | 6 | Test.java:32:4:32:9 | ...=... |
-| Test.java:35:3:35:9 | <Expr>; | 0 | Test.java:35:3:35:9 | <Expr>; |
-| Test.java:35:3:35:9 | <Expr>; | 1 | Test.java:35:7:35:8 | 20 |
-| Test.java:35:3:35:9 | <Expr>; | 2 | Test.java:35:3:35:8 | ...=... |
-| Test.java:35:3:35:9 | <Expr>; | 3 | Test.java:38:3:38:14 | while (...) |
-| Test.java:38:9:38:9 | x | 0 | Test.java:38:9:38:9 | x |
-| Test.java:38:9:38:9 | x | 1 | Test.java:38:13:38:13 | 0 |
-| Test.java:38:9:38:9 | x | 2 | Test.java:38:9:38:13 | ... > ... |
-| Test.java:38:16:41:3 | { ... } | 0 | Test.java:38:16:41:3 | { ... } |
-| Test.java:38:16:41:3 | { ... } | 1 | Test.java:39:4:39:10 | <Expr>; |
-| Test.java:38:16:41:3 | { ... } | 2 | Test.java:39:8:39:9 | 10 |
-| Test.java:38:16:41:3 | { ... } | 3 | Test.java:39:4:39:9 | ...=... |
-| Test.java:38:16:41:3 | { ... } | 4 | Test.java:40:4:40:7 | <Expr>; |
-| Test.java:38:16:41:3 | { ... } | 5 | Test.java:40:4:40:4 | x |
-| Test.java:38:16:41:3 | { ... } | 6 | Test.java:40:4:40:6 | ...-- |
-| Test.java:43:3:43:9 | <Expr>; | 0 | Test.java:43:3:43:9 | <Expr>; |
-| Test.java:43:3:43:9 | <Expr>; | 1 | Test.java:43:7:43:8 | 30 |
-| Test.java:43:3:43:9 | <Expr>; | 2 | Test.java:43:3:43:8 | ...=... |
-| Test.java:43:3:43:9 | <Expr>; | 3 | Test.java:46:3:46:29 | for (...;...;...) |
-| Test.java:43:3:43:9 | <Expr>; | 4 | Test.java:46:15:46:15 | 0 |
-| Test.java:43:3:43:9 | <Expr>; | 5 | Test.java:46:11:46:15 | j |
-| Test.java:46:18:46:18 | j | 0 | Test.java:46:18:46:18 | j |
-| Test.java:46:18:46:18 | j | 1 | Test.java:46:22:46:23 | 10 |
-| Test.java:46:18:46:18 | j | 2 | Test.java:46:18:46:23 | ... < ... |
-| Test.java:46:31:49:3 | { ... } | 0 | Test.java:46:31:49:3 | { ... } |
-| Test.java:46:31:49:3 | { ... } | 1 | Test.java:47:4:47:9 | <Expr>; |
-| Test.java:46:31:49:3 | { ... } | 2 | Test.java:47:8:47:8 | 0 |
-| Test.java:46:31:49:3 | { ... } | 3 | Test.java:47:4:47:8 | ...=... |
-| Test.java:46:31:49:3 | { ... } | 4 | Test.java:48:4:48:10 | <Expr>; |
-| Test.java:46:31:49:3 | { ... } | 5 | Test.java:48:8:48:9 | 10 |
-| Test.java:46:31:49:3 | { ... } | 6 | Test.java:48:4:48:9 | ...=... |
-| Test.java:46:31:49:3 | { ... } | 7 | Test.java:46:26:46:26 | j |
-| Test.java:46:31:49:3 | { ... } | 8 | Test.java:46:26:46:28 | ...++ |
-| Test.java:51:3:51:9 | <Expr>; | 0 | Test.java:51:3:51:9 | <Expr>; |
-| Test.java:51:3:51:9 | <Expr>; | 1 | Test.java:51:7:51:8 | 40 |
-| Test.java:51:3:51:9 | <Expr>; | 2 | Test.java:51:3:51:8 | ...=... |
-| Test.java:51:3:51:9 | <Expr>; | 3 | Test.java:54:3:54:29 | for (...;...;...) |
-| Test.java:51:3:51:9 | <Expr>; | 4 | Test.java:54:15:54:15 | 0 |
-| Test.java:51:3:51:9 | <Expr>; | 5 | Test.java:54:11:54:15 | j |
-| Test.java:54:18:54:18 | j | 0 | Test.java:54:18:54:18 | j |
-| Test.java:54:18:54:18 | j | 1 | Test.java:54:22:54:23 | 10 |
-| Test.java:54:18:54:18 | j | 2 | Test.java:54:18:54:23 | ... < ... |
-| Test.java:54:26:54:26 | j | 0 | Test.java:54:26:54:26 | j |
-| Test.java:54:26:54:26 | j | 1 | Test.java:54:26:54:28 | ...++ |
-| Test.java:54:31:68:3 | { ... } | 0 | Test.java:54:31:68:3 | { ... } |
-| Test.java:54:31:68:3 | { ... } | 1 | Test.java:55:4:55:10 | <Expr>; |
-| Test.java:54:31:68:3 | { ... } | 2 | Test.java:55:8:55:9 | 30 |
-| Test.java:54:31:68:3 | { ... } | 3 | Test.java:55:4:55:9 | ...=... |
-| Test.java:54:31:68:3 | { ... } | 4 | Test.java:56:4:56:12 | if (...) |
-| Test.java:54:31:68:3 | { ... } | 5 | Test.java:56:7:56:7 | z |
-| Test.java:54:31:68:3 | { ... } | 6 | Test.java:56:11:56:11 | 0 |
-| Test.java:54:31:68:3 | { ... } | 7 | Test.java:56:7:56:11 | ... > ... |
-| Test.java:57:5:57:13 | if (...) | 0 | Test.java:57:5:57:13 | if (...) |
-| Test.java:57:5:57:13 | if (...) | 1 | Test.java:57:8:57:8 | y |
-| Test.java:57:5:57:13 | if (...) | 2 | Test.java:57:12:57:12 | 0 |
-| Test.java:57:5:57:13 | if (...) | 3 | Test.java:57:8:57:12 | ... > ... |
-| Test.java:57:15:60:5 | { ... } | 0 | Test.java:57:15:60:5 | { ... } |
-| Test.java:57:15:60:5 | { ... } | 1 | Test.java:58:6:58:11 | <Expr>; |
-| Test.java:57:15:60:5 | { ... } | 2 | Test.java:58:10:58:10 | 0 |
-| Test.java:57:15:60:5 | { ... } | 3 | Test.java:58:6:58:10 | ...=... |
-| Test.java:57:15:60:5 | { ... } | 4 | Test.java:59:6:59:11 | break |
-| Test.java:60:12:62:5 | { ... } | 0 | Test.java:60:12:62:5 | { ... } |
-| Test.java:60:12:62:5 | { ... } | 1 | Test.java:61:6:61:12 | <Expr>; |
-| Test.java:60:12:62:5 | { ... } | 2 | Test.java:61:10:61:11 | 20 |
-| Test.java:60:12:62:5 | { ... } | 3 | Test.java:61:6:61:11 | ...=... |
-| Test.java:60:12:62:5 | { ... } | 4 | Test.java:67:4:67:9 | <Expr>; |
-| Test.java:60:12:62:5 | { ... } | 5 | Test.java:67:8:67:8 | 0 |
-| Test.java:60:12:62:5 | { ... } | 6 | Test.java:67:4:67:8 | ...=... |
-| Test.java:63:9:66:4 | { ... } | 0 | Test.java:63:9:66:4 | { ... } |
-| Test.java:63:9:66:4 | { ... } | 1 | Test.java:64:5:64:11 | <Expr>; |
-| Test.java:63:9:66:4 | { ... } | 2 | Test.java:64:9:64:10 | 10 |
-| Test.java:63:9:66:4 | { ... } | 3 | Test.java:64:5:64:10 | ...=... |
-| Test.java:63:9:66:4 | { ... } | 4 | Test.java:65:5:65:13 | continue |
-| Test.java:70:3:70:9 | <Expr>; | 0 | Test.java:70:3:70:9 | <Expr>; |
-| Test.java:70:3:70:9 | <Expr>; | 1 | Test.java:70:7:70:8 | 50 |
-| Test.java:70:3:70:9 | <Expr>; | 2 | Test.java:70:3:70:8 | ...=... |
-| Test.java:70:3:70:9 | <Expr>; | 3 | Test.java:74:3:74:9 | <Expr>; |
-| Test.java:70:3:70:9 | <Expr>; | 4 | Test.java:74:7:74:8 | 40 |
-| Test.java:70:3:70:9 | <Expr>; | 5 | Test.java:74:3:74:8 | ...=... |
-| Test.java:70:3:70:9 | <Expr>; | 6 | Test.java:75:3:75:9 | return ... |
+| Test.java:4:14:4:17 | Normal Exit | 1 | Test.java:4:14:4:17 | Exit |
+| Test.java:11:3:11:12 | After if (...) | 0 | Test.java:11:3:11:12 | After if (...) |
+| Test.java:11:3:11:12 | After if (...) | 1 | Test.java:18:3:18:8 | <Expr>; |
+| Test.java:11:3:11:12 | After if (...) | 2 | Test.java:18:3:18:7 | Before ...=... |
+| Test.java:11:3:11:12 | After if (...) | 3 | Test.java:18:3:18:3 | z |
+| Test.java:11:3:11:12 | After if (...) | 4 | Test.java:18:7:18:7 | 0 |
+| Test.java:11:3:11:12 | After if (...) | 5 | Test.java:18:3:18:7 | ...=... |
+| Test.java:11:3:11:12 | After if (...) | 6 | Test.java:18:3:18:7 | After ...=... |
+| Test.java:11:3:11:12 | After if (...) | 7 | Test.java:18:3:18:8 | After <Expr>; |
+| Test.java:11:3:11:12 | After if (...) | 8 | Test.java:21:3:21:11 | if (...) |
+| Test.java:11:3:11:12 | After if (...) | 9 | Test.java:21:6:21:10 | Before ... < ... |
+| Test.java:11:3:11:12 | After if (...) | 10 | Test.java:21:6:21:6 | x |
+| Test.java:11:3:11:12 | After if (...) | 11 | Test.java:21:10:21:10 | 0 |
+| Test.java:11:3:11:12 | After if (...) | 12 | Test.java:21:6:21:10 | ... < ... |
+| Test.java:11:7:11:11 | After ... > ... [false] | 0 | Test.java:11:7:11:11 | After ... > ... [false] |
+| Test.java:11:7:11:11 | After ... > ... [false] | 1 | Test.java:14:10:16:3 | { ... } |
+| Test.java:11:7:11:11 | After ... > ... [false] | 2 | Test.java:15:4:15:10 | <Expr>; |
+| Test.java:11:7:11:11 | After ... > ... [false] | 3 | Test.java:15:4:15:9 | Before ...=... |
+| Test.java:11:7:11:11 | After ... > ... [false] | 4 | Test.java:15:4:15:4 | y |
+| Test.java:11:7:11:11 | After ... > ... [false] | 5 | Test.java:15:8:15:9 | 30 |
+| Test.java:11:7:11:11 | After ... > ... [false] | 6 | Test.java:15:4:15:9 | ...=... |
+| Test.java:11:7:11:11 | After ... > ... [false] | 7 | Test.java:15:4:15:9 | After ...=... |
+| Test.java:11:7:11:11 | After ... > ... [false] | 8 | Test.java:15:4:15:10 | After <Expr>; |
+| Test.java:11:7:11:11 | After ... > ... [false] | 9 | Test.java:14:10:16:3 | After { ... } |
+| Test.java:11:7:11:11 | After ... > ... [true] | 0 | Test.java:11:7:11:11 | After ... > ... [true] |
+| Test.java:11:7:11:11 | After ... > ... [true] | 1 | Test.java:11:14:14:3 | { ... } |
+| Test.java:11:7:11:11 | After ... > ... [true] | 2 | Test.java:12:4:12:10 | <Expr>; |
+| Test.java:11:7:11:11 | After ... > ... [true] | 3 | Test.java:12:4:12:9 | Before ...=... |
+| Test.java:11:7:11:11 | After ... > ... [true] | 4 | Test.java:12:4:12:4 | y |
+| Test.java:11:7:11:11 | After ... > ... [true] | 5 | Test.java:12:8:12:9 | 20 |
+| Test.java:11:7:11:11 | After ... > ... [true] | 6 | Test.java:12:4:12:9 | ...=... |
+| Test.java:11:7:11:11 | After ... > ... [true] | 7 | Test.java:12:4:12:9 | After ...=... |
+| Test.java:11:7:11:11 | After ... > ... [true] | 8 | Test.java:12:4:12:10 | After <Expr>; |
+| Test.java:11:7:11:11 | After ... > ... [true] | 9 | Test.java:13:4:13:10 | <Expr>; |
+| Test.java:11:7:11:11 | After ... > ... [true] | 10 | Test.java:13:4:13:9 | Before ...=... |
+| Test.java:11:7:11:11 | After ... > ... [true] | 11 | Test.java:13:4:13:4 | z |
+| Test.java:11:7:11:11 | After ... > ... [true] | 12 | Test.java:13:8:13:9 | 10 |
+| Test.java:11:7:11:11 | After ... > ... [true] | 13 | Test.java:13:4:13:9 | ...=... |
+| Test.java:11:7:11:11 | After ... > ... [true] | 14 | Test.java:13:4:13:9 | After ...=... |
+| Test.java:11:7:11:11 | After ... > ... [true] | 15 | Test.java:13:4:13:10 | After <Expr>; |
+| Test.java:11:7:11:11 | After ... > ... [true] | 16 | Test.java:11:14:14:3 | After { ... } |
+| Test.java:21:6:21:10 | After ... < ... [false] | 0 | Test.java:21:6:21:10 | After ... < ... [false] |
+| Test.java:21:6:21:10 | After ... < ... [false] | 1 | Test.java:24:4:24:10 | Before return ... |
+| Test.java:21:6:21:10 | After ... < ... [false] | 2 | Test.java:24:4:24:10 | return ... |
+| Test.java:21:6:21:10 | After ... < ... [true] | 0 | Test.java:21:6:21:10 | After ... < ... [true] |
+| Test.java:21:6:21:10 | After ... < ... [true] | 1 | Test.java:22:4:22:10 | <Expr>; |
+| Test.java:21:6:21:10 | After ... < ... [true] | 2 | Test.java:22:4:22:9 | Before ...=... |
+| Test.java:21:6:21:10 | After ... < ... [true] | 3 | Test.java:22:4:22:4 | y |
+| Test.java:21:6:21:10 | After ... < ... [true] | 4 | Test.java:22:8:22:9 | 40 |
+| Test.java:21:6:21:10 | After ... < ... [true] | 5 | Test.java:22:4:22:9 | ...=... |
+| Test.java:21:6:21:10 | After ... < ... [true] | 6 | Test.java:22:4:22:9 | After ...=... |
+| Test.java:21:6:21:10 | After ... < ... [true] | 7 | Test.java:22:4:22:10 | After <Expr>; |
+| Test.java:21:6:21:10 | After ... < ... [true] | 8 | Test.java:21:3:21:11 | After if (...) |
+| Test.java:21:6:21:10 | After ... < ... [true] | 9 | Test.java:27:3:27:9 | <Expr>; |
+| Test.java:21:6:21:10 | After ... < ... [true] | 10 | Test.java:27:3:27:8 | Before ...=... |
+| Test.java:21:6:21:10 | After ... < ... [true] | 11 | Test.java:27:3:27:3 | z |
+| Test.java:21:6:21:10 | After ... < ... [true] | 12 | Test.java:27:7:27:8 | 10 |
+| Test.java:21:6:21:10 | After ... < ... [true] | 13 | Test.java:27:3:27:8 | ...=... |
+| Test.java:21:6:21:10 | After ... < ... [true] | 14 | Test.java:27:3:27:8 | After ...=... |
+| Test.java:21:6:21:10 | After ... < ... [true] | 15 | Test.java:27:3:27:9 | After <Expr>; |
+| Test.java:21:6:21:10 | After ... < ... [true] | 16 | Test.java:30:3:30:13 | if (...) |
+| Test.java:21:6:21:10 | After ... < ... [true] | 17 | Test.java:30:7:30:12 | Before ... == ... |
+| Test.java:21:6:21:10 | After ... < ... [true] | 18 | Test.java:30:7:30:7 | x |
+| Test.java:21:6:21:10 | After ... < ... [true] | 19 | Test.java:30:12:30:12 | 0 |
+| Test.java:21:6:21:10 | After ... < ... [true] | 20 | Test.java:30:7:30:12 | ... == ... |
+| Test.java:30:3:30:13 | After if (...) | 0 | Test.java:30:3:30:13 | After if (...) |
+| Test.java:30:3:30:13 | After if (...) | 1 | Test.java:35:3:35:9 | <Expr>; |
+| Test.java:30:3:30:13 | After if (...) | 2 | Test.java:35:3:35:8 | Before ...=... |
+| Test.java:30:3:30:13 | After if (...) | 3 | Test.java:35:3:35:3 | z |
+| Test.java:30:3:30:13 | After if (...) | 4 | Test.java:35:7:35:8 | 20 |
+| Test.java:30:3:30:13 | After if (...) | 5 | Test.java:35:3:35:8 | ...=... |
+| Test.java:30:3:30:13 | After if (...) | 6 | Test.java:35:3:35:8 | After ...=... |
+| Test.java:30:3:30:13 | After if (...) | 7 | Test.java:35:3:35:9 | After <Expr>; |
+| Test.java:30:3:30:13 | After if (...) | 8 | Test.java:38:3:38:14 | while (...) |
+| Test.java:30:7:30:12 | After ... == ... [false] | 0 | Test.java:30:7:30:12 | After ... == ... [false] |
+| Test.java:30:7:30:12 | After ... == ... [true] | 0 | Test.java:30:7:30:12 | After ... == ... [true] |
+| Test.java:30:7:30:12 | After ... == ... [true] | 1 | Test.java:30:15:33:3 | { ... } |
+| Test.java:30:7:30:12 | After ... == ... [true] | 2 | Test.java:31:4:31:10 | <Expr>; |
+| Test.java:30:7:30:12 | After ... == ... [true] | 3 | Test.java:31:4:31:9 | Before ...=... |
+| Test.java:30:7:30:12 | After ... == ... [true] | 4 | Test.java:31:4:31:4 | y |
+| Test.java:30:7:30:12 | After ... == ... [true] | 5 | Test.java:31:8:31:9 | 60 |
+| Test.java:30:7:30:12 | After ... == ... [true] | 6 | Test.java:31:4:31:9 | ...=... |
+| Test.java:30:7:30:12 | After ... == ... [true] | 7 | Test.java:31:4:31:9 | After ...=... |
+| Test.java:30:7:30:12 | After ... == ... [true] | 8 | Test.java:31:4:31:10 | After <Expr>; |
+| Test.java:30:7:30:12 | After ... == ... [true] | 9 | Test.java:32:4:32:10 | <Expr>; |
+| Test.java:30:7:30:12 | After ... == ... [true] | 10 | Test.java:32:4:32:9 | Before ...=... |
+| Test.java:30:7:30:12 | After ... == ... [true] | 11 | Test.java:32:4:32:4 | z |
+| Test.java:30:7:30:12 | After ... == ... [true] | 12 | Test.java:32:8:32:9 | 10 |
+| Test.java:30:7:30:12 | After ... == ... [true] | 13 | Test.java:32:4:32:9 | ...=... |
+| Test.java:30:7:30:12 | After ... == ... [true] | 14 | Test.java:32:4:32:9 | After ...=... |
+| Test.java:30:7:30:12 | After ... == ... [true] | 15 | Test.java:32:4:32:10 | After <Expr>; |
+| Test.java:30:7:30:12 | After ... == ... [true] | 16 | Test.java:30:15:33:3 | After { ... } |
+| Test.java:38:3:38:14 | [LoopHeader] while (...) | 0 | Test.java:38:3:38:14 | [LoopHeader] while (...) |
+| Test.java:38:3:38:14 | [LoopHeader] while (...) | 1 | Test.java:38:9:38:13 | Before ... > ... |
+| Test.java:38:3:38:14 | [LoopHeader] while (...) | 2 | Test.java:38:9:38:9 | x |
+| Test.java:38:3:38:14 | [LoopHeader] while (...) | 3 | Test.java:38:13:38:13 | 0 |
+| Test.java:38:3:38:14 | [LoopHeader] while (...) | 4 | Test.java:38:9:38:13 | ... > ... |
+| Test.java:38:9:38:13 | After ... > ... [false] | 0 | Test.java:38:9:38:13 | After ... > ... [false] |
+| Test.java:38:9:38:13 | After ... > ... [false] | 1 | Test.java:38:3:38:14 | After while (...) |
+| Test.java:38:9:38:13 | After ... > ... [false] | 2 | Test.java:43:3:43:9 | <Expr>; |
+| Test.java:38:9:38:13 | After ... > ... [false] | 3 | Test.java:43:3:43:8 | Before ...=... |
+| Test.java:38:9:38:13 | After ... > ... [false] | 4 | Test.java:43:3:43:3 | z |
+| Test.java:38:9:38:13 | After ... > ... [false] | 5 | Test.java:43:7:43:8 | 30 |
+| Test.java:38:9:38:13 | After ... > ... [false] | 6 | Test.java:43:3:43:8 | ...=... |
+| Test.java:38:9:38:13 | After ... > ... [false] | 7 | Test.java:43:3:43:8 | After ...=... |
+| Test.java:38:9:38:13 | After ... > ... [false] | 8 | Test.java:43:3:43:9 | After <Expr>; |
+| Test.java:38:9:38:13 | After ... > ... [false] | 9 | Test.java:46:3:46:29 | for (...;...;...) |
+| Test.java:38:9:38:13 | After ... > ... [false] | 10 | Test.java:46:11:46:15 | Before j |
+| Test.java:38:9:38:13 | After ... > ... [false] | 11 | Test.java:46:15:46:15 | 0 |
+| Test.java:38:9:38:13 | After ... > ... [false] | 12 | Test.java:46:11:46:15 | j |
+| Test.java:38:9:38:13 | After ... > ... [false] | 13 | Test.java:46:11:46:15 | After j |
+| Test.java:38:9:38:13 | After ... > ... [true] | 0 | Test.java:38:9:38:13 | After ... > ... [true] |
+| Test.java:38:9:38:13 | After ... > ... [true] | 1 | Test.java:38:16:41:3 | { ... } |
+| Test.java:38:9:38:13 | After ... > ... [true] | 2 | Test.java:39:4:39:10 | <Expr>; |
+| Test.java:38:9:38:13 | After ... > ... [true] | 3 | Test.java:39:4:39:9 | Before ...=... |
+| Test.java:38:9:38:13 | After ... > ... [true] | 4 | Test.java:39:4:39:4 | y |
+| Test.java:38:9:38:13 | After ... > ... [true] | 5 | Test.java:39:8:39:9 | 10 |
+| Test.java:38:9:38:13 | After ... > ... [true] | 6 | Test.java:39:4:39:9 | ...=... |
+| Test.java:38:9:38:13 | After ... > ... [true] | 7 | Test.java:39:4:39:9 | After ...=... |
+| Test.java:38:9:38:13 | After ... > ... [true] | 8 | Test.java:39:4:39:10 | After <Expr>; |
+| Test.java:38:9:38:13 | After ... > ... [true] | 9 | Test.java:40:4:40:7 | <Expr>; |
+| Test.java:38:9:38:13 | After ... > ... [true] | 10 | Test.java:40:4:40:6 | Before ...-- |
+| Test.java:38:9:38:13 | After ... > ... [true] | 11 | Test.java:40:4:40:4 | x |
+| Test.java:38:9:38:13 | After ... > ... [true] | 12 | Test.java:40:4:40:6 | ...-- |
+| Test.java:38:9:38:13 | After ... > ... [true] | 13 | Test.java:40:4:40:6 | After ...-- |
+| Test.java:38:9:38:13 | After ... > ... [true] | 14 | Test.java:40:4:40:7 | After <Expr>; |
+| Test.java:38:9:38:13 | After ... > ... [true] | 15 | Test.java:38:16:41:3 | After { ... } |
+| Test.java:46:18:46:23 | After ... < ... [false] | 0 | Test.java:46:18:46:23 | After ... < ... [false] |
+| Test.java:46:18:46:23 | After ... < ... [false] | 1 | Test.java:46:3:46:29 | After for (...;...;...) |
+| Test.java:46:18:46:23 | After ... < ... [false] | 2 | Test.java:51:3:51:9 | <Expr>; |
+| Test.java:46:18:46:23 | After ... < ... [false] | 3 | Test.java:51:3:51:8 | Before ...=... |
+| Test.java:46:18:46:23 | After ... < ... [false] | 4 | Test.java:51:3:51:3 | z |
+| Test.java:46:18:46:23 | After ... < ... [false] | 5 | Test.java:51:7:51:8 | 40 |
+| Test.java:46:18:46:23 | After ... < ... [false] | 6 | Test.java:51:3:51:8 | ...=... |
+| Test.java:46:18:46:23 | After ... < ... [false] | 7 | Test.java:51:3:51:8 | After ...=... |
+| Test.java:46:18:46:23 | After ... < ... [false] | 8 | Test.java:51:3:51:9 | After <Expr>; |
+| Test.java:46:18:46:23 | After ... < ... [false] | 9 | Test.java:54:3:54:29 | for (...;...;...) |
+| Test.java:46:18:46:23 | After ... < ... [false] | 10 | Test.java:54:11:54:15 | Before j |
+| Test.java:46:18:46:23 | After ... < ... [false] | 11 | Test.java:54:15:54:15 | 0 |
+| Test.java:46:18:46:23 | After ... < ... [false] | 12 | Test.java:54:11:54:15 | j |
+| Test.java:46:18:46:23 | After ... < ... [false] | 13 | Test.java:54:11:54:15 | After j |
+| Test.java:46:18:46:23 | After ... < ... [true] | 0 | Test.java:46:18:46:23 | After ... < ... [true] |
+| Test.java:46:18:46:23 | After ... < ... [true] | 1 | Test.java:46:31:49:3 | { ... } |
+| Test.java:46:18:46:23 | After ... < ... [true] | 2 | Test.java:47:4:47:9 | <Expr>; |
+| Test.java:46:18:46:23 | After ... < ... [true] | 3 | Test.java:47:4:47:8 | Before ...=... |
+| Test.java:46:18:46:23 | After ... < ... [true] | 4 | Test.java:47:4:47:4 | y |
+| Test.java:46:18:46:23 | After ... < ... [true] | 5 | Test.java:47:8:47:8 | 0 |
+| Test.java:46:18:46:23 | After ... < ... [true] | 6 | Test.java:47:4:47:8 | ...=... |
+| Test.java:46:18:46:23 | After ... < ... [true] | 7 | Test.java:47:4:47:8 | After ...=... |
+| Test.java:46:18:46:23 | After ... < ... [true] | 8 | Test.java:47:4:47:9 | After <Expr>; |
+| Test.java:46:18:46:23 | After ... < ... [true] | 9 | Test.java:48:4:48:10 | <Expr>; |
+| Test.java:46:18:46:23 | After ... < ... [true] | 10 | Test.java:48:4:48:9 | Before ...=... |
+| Test.java:46:18:46:23 | After ... < ... [true] | 11 | Test.java:48:4:48:4 | w |
+| Test.java:46:18:46:23 | After ... < ... [true] | 12 | Test.java:48:8:48:9 | 10 |
+| Test.java:46:18:46:23 | After ... < ... [true] | 13 | Test.java:48:4:48:9 | ...=... |
+| Test.java:46:18:46:23 | After ... < ... [true] | 14 | Test.java:48:4:48:9 | After ...=... |
+| Test.java:46:18:46:23 | After ... < ... [true] | 15 | Test.java:48:4:48:10 | After <Expr>; |
+| Test.java:46:18:46:23 | After ... < ... [true] | 16 | Test.java:46:31:49:3 | After { ... } |
+| Test.java:46:18:46:23 | After ... < ... [true] | 17 | Test.java:46:3:46:29 | [LoopHeader] for (...;...;...) |
+| Test.java:46:18:46:23 | After ... < ... [true] | 18 | Test.java:46:26:46:28 | Before ...++ |
+| Test.java:46:18:46:23 | After ... < ... [true] | 19 | Test.java:46:26:46:26 | j |
+| Test.java:46:18:46:23 | After ... < ... [true] | 20 | Test.java:46:26:46:28 | ...++ |
+| Test.java:46:18:46:23 | After ... < ... [true] | 21 | Test.java:46:26:46:28 | After ...++ |
+| Test.java:46:18:46:23 | Before ... < ... | 0 | Test.java:46:18:46:23 | Before ... < ... |
+| Test.java:46:18:46:23 | Before ... < ... | 1 | Test.java:46:18:46:18 | j |
+| Test.java:46:18:46:23 | Before ... < ... | 2 | Test.java:46:22:46:23 | 10 |
+| Test.java:46:18:46:23 | Before ... < ... | 3 | Test.java:46:18:46:23 | ... < ... |
+| Test.java:54:3:54:29 | After for (...;...;...) | 0 | Test.java:54:3:54:29 | After for (...;...;...) |
+| Test.java:54:3:54:29 | After for (...;...;...) | 1 | Test.java:70:3:70:9 | <Expr>; |
+| Test.java:54:3:54:29 | After for (...;...;...) | 2 | Test.java:70:3:70:8 | Before ...=... |
+| Test.java:54:3:54:29 | After for (...;...;...) | 3 | Test.java:70:3:70:3 | z |
+| Test.java:54:3:54:29 | After for (...;...;...) | 4 | Test.java:70:7:70:8 | 50 |
+| Test.java:54:3:54:29 | After for (...;...;...) | 5 | Test.java:70:3:70:8 | ...=... |
+| Test.java:54:3:54:29 | After for (...;...;...) | 6 | Test.java:70:3:70:8 | After ...=... |
+| Test.java:54:3:54:29 | After for (...;...;...) | 7 | Test.java:70:3:70:9 | After <Expr>; |
+| Test.java:54:3:54:29 | After for (...;...;...) | 8 | Test.java:74:3:74:9 | <Expr>; |
+| Test.java:54:3:54:29 | After for (...;...;...) | 9 | Test.java:74:3:74:8 | Before ...=... |
+| Test.java:54:3:54:29 | After for (...;...;...) | 10 | Test.java:74:3:74:3 | w |
+| Test.java:54:3:54:29 | After for (...;...;...) | 11 | Test.java:74:7:74:8 | 40 |
+| Test.java:54:3:54:29 | After for (...;...;...) | 12 | Test.java:74:3:74:8 | ...=... |
+| Test.java:54:3:54:29 | After for (...;...;...) | 13 | Test.java:74:3:74:8 | After ...=... |
+| Test.java:54:3:54:29 | After for (...;...;...) | 14 | Test.java:74:3:74:9 | After <Expr>; |
+| Test.java:54:3:54:29 | After for (...;...;...) | 15 | Test.java:75:3:75:9 | Before return ... |
+| Test.java:54:3:54:29 | After for (...;...;...) | 16 | Test.java:75:3:75:9 | return ... |
+| Test.java:54:3:54:29 | [LoopHeader] for (...;...;...) | 0 | Test.java:54:3:54:29 | [LoopHeader] for (...;...;...) |
+| Test.java:54:3:54:29 | [LoopHeader] for (...;...;...) | 1 | Test.java:54:26:54:28 | Before ...++ |
+| Test.java:54:3:54:29 | [LoopHeader] for (...;...;...) | 2 | Test.java:54:26:54:26 | j |
+| Test.java:54:3:54:29 | [LoopHeader] for (...;...;...) | 3 | Test.java:54:26:54:28 | ...++ |
+| Test.java:54:3:54:29 | [LoopHeader] for (...;...;...) | 4 | Test.java:54:26:54:28 | After ...++ |
+| Test.java:54:18:54:23 | After ... < ... [false] | 0 | Test.java:54:18:54:23 | After ... < ... [false] |
+| Test.java:54:18:54:23 | After ... < ... [true] | 0 | Test.java:54:18:54:23 | After ... < ... [true] |
+| Test.java:54:18:54:23 | After ... < ... [true] | 1 | Test.java:54:31:68:3 | { ... } |
+| Test.java:54:18:54:23 | After ... < ... [true] | 2 | Test.java:55:4:55:10 | <Expr>; |
+| Test.java:54:18:54:23 | After ... < ... [true] | 3 | Test.java:55:4:55:9 | Before ...=... |
+| Test.java:54:18:54:23 | After ... < ... [true] | 4 | Test.java:55:4:55:4 | y |
+| Test.java:54:18:54:23 | After ... < ... [true] | 5 | Test.java:55:8:55:9 | 30 |
+| Test.java:54:18:54:23 | After ... < ... [true] | 6 | Test.java:55:4:55:9 | ...=... |
+| Test.java:54:18:54:23 | After ... < ... [true] | 7 | Test.java:55:4:55:9 | After ...=... |
+| Test.java:54:18:54:23 | After ... < ... [true] | 8 | Test.java:55:4:55:10 | After <Expr>; |
+| Test.java:54:18:54:23 | After ... < ... [true] | 9 | Test.java:56:4:56:12 | if (...) |
+| Test.java:54:18:54:23 | After ... < ... [true] | 10 | Test.java:56:7:56:11 | Before ... > ... |
+| Test.java:54:18:54:23 | After ... < ... [true] | 11 | Test.java:56:7:56:7 | z |
+| Test.java:54:18:54:23 | After ... < ... [true] | 12 | Test.java:56:11:56:11 | 0 |
+| Test.java:54:18:54:23 | After ... < ... [true] | 13 | Test.java:56:7:56:11 | ... > ... |
+| Test.java:54:18:54:23 | Before ... < ... | 0 | Test.java:54:18:54:23 | Before ... < ... |
+| Test.java:54:18:54:23 | Before ... < ... | 1 | Test.java:54:18:54:18 | j |
+| Test.java:54:18:54:23 | Before ... < ... | 2 | Test.java:54:22:54:23 | 10 |
+| Test.java:54:18:54:23 | Before ... < ... | 3 | Test.java:54:18:54:23 | ... < ... |
+| Test.java:56:7:56:11 | After ... > ... [false] | 0 | Test.java:56:7:56:11 | After ... > ... [false] |
+| Test.java:56:7:56:11 | After ... > ... [false] | 1 | Test.java:63:9:66:4 | { ... } |
+| Test.java:56:7:56:11 | After ... > ... [false] | 2 | Test.java:64:5:64:11 | <Expr>; |
+| Test.java:56:7:56:11 | After ... > ... [false] | 3 | Test.java:64:5:64:10 | Before ...=... |
+| Test.java:56:7:56:11 | After ... > ... [false] | 4 | Test.java:64:5:64:5 | w |
+| Test.java:56:7:56:11 | After ... > ... [false] | 5 | Test.java:64:9:64:10 | 10 |
+| Test.java:56:7:56:11 | After ... > ... [false] | 6 | Test.java:64:5:64:10 | ...=... |
+| Test.java:56:7:56:11 | After ... > ... [false] | 7 | Test.java:64:5:64:10 | After ...=... |
+| Test.java:56:7:56:11 | After ... > ... [false] | 8 | Test.java:64:5:64:11 | After <Expr>; |
+| Test.java:56:7:56:11 | After ... > ... [false] | 9 | Test.java:65:5:65:13 | Before continue |
+| Test.java:56:7:56:11 | After ... > ... [false] | 10 | Test.java:65:5:65:13 | continue |
+| Test.java:56:7:56:11 | After ... > ... [true] | 0 | Test.java:56:7:56:11 | After ... > ... [true] |
+| Test.java:56:7:56:11 | After ... > ... [true] | 1 | Test.java:57:5:57:13 | if (...) |
+| Test.java:56:7:56:11 | After ... > ... [true] | 2 | Test.java:57:8:57:12 | Before ... > ... |
+| Test.java:56:7:56:11 | After ... > ... [true] | 3 | Test.java:57:8:57:8 | y |
+| Test.java:56:7:56:11 | After ... > ... [true] | 4 | Test.java:57:12:57:12 | 0 |
+| Test.java:56:7:56:11 | After ... > ... [true] | 5 | Test.java:57:8:57:12 | ... > ... |
+| Test.java:57:8:57:12 | After ... > ... [false] | 0 | Test.java:57:8:57:12 | After ... > ... [false] |
+| Test.java:57:8:57:12 | After ... > ... [false] | 1 | Test.java:60:12:62:5 | { ... } |
+| Test.java:57:8:57:12 | After ... > ... [false] | 2 | Test.java:61:6:61:12 | <Expr>; |
+| Test.java:57:8:57:12 | After ... > ... [false] | 3 | Test.java:61:6:61:11 | Before ...=... |
+| Test.java:57:8:57:12 | After ... > ... [false] | 4 | Test.java:61:6:61:6 | w |
+| Test.java:57:8:57:12 | After ... > ... [false] | 5 | Test.java:61:10:61:11 | 20 |
+| Test.java:57:8:57:12 | After ... > ... [false] | 6 | Test.java:61:6:61:11 | ...=... |
+| Test.java:57:8:57:12 | After ... > ... [false] | 7 | Test.java:61:6:61:11 | After ...=... |
+| Test.java:57:8:57:12 | After ... > ... [false] | 8 | Test.java:61:6:61:12 | After <Expr>; |
+| Test.java:57:8:57:12 | After ... > ... [false] | 9 | Test.java:60:12:62:5 | After { ... } |
+| Test.java:57:8:57:12 | After ... > ... [false] | 10 | Test.java:57:5:57:13 | After if (...) |
+| Test.java:57:8:57:12 | After ... > ... [false] | 11 | Test.java:56:4:56:12 | After if (...) |
+| Test.java:57:8:57:12 | After ... > ... [false] | 12 | Test.java:67:4:67:9 | <Expr>; |
+| Test.java:57:8:57:12 | After ... > ... [false] | 13 | Test.java:67:4:67:8 | Before ...=... |
+| Test.java:57:8:57:12 | After ... > ... [false] | 14 | Test.java:67:4:67:4 | x |
+| Test.java:57:8:57:12 | After ... > ... [false] | 15 | Test.java:67:8:67:8 | 0 |
+| Test.java:57:8:57:12 | After ... > ... [false] | 16 | Test.java:67:4:67:8 | ...=... |
+| Test.java:57:8:57:12 | After ... > ... [false] | 17 | Test.java:67:4:67:8 | After ...=... |
+| Test.java:57:8:57:12 | After ... > ... [false] | 18 | Test.java:67:4:67:9 | After <Expr>; |
+| Test.java:57:8:57:12 | After ... > ... [false] | 19 | Test.java:54:31:68:3 | After { ... } |
+| Test.java:57:8:57:12 | After ... > ... [true] | 0 | Test.java:57:8:57:12 | After ... > ... [true] |
+| Test.java:57:8:57:12 | After ... > ... [true] | 1 | Test.java:57:15:60:5 | { ... } |
+| Test.java:57:8:57:12 | After ... > ... [true] | 2 | Test.java:58:6:58:11 | <Expr>; |
+| Test.java:57:8:57:12 | After ... > ... [true] | 3 | Test.java:58:6:58:10 | Before ...=... |
+| Test.java:57:8:57:12 | After ... > ... [true] | 4 | Test.java:58:6:58:6 | w |
+| Test.java:57:8:57:12 | After ... > ... [true] | 5 | Test.java:58:10:58:10 | 0 |
+| Test.java:57:8:57:12 | After ... > ... [true] | 6 | Test.java:58:6:58:10 | ...=... |
+| Test.java:57:8:57:12 | After ... > ... [true] | 7 | Test.java:58:6:58:10 | After ...=... |
+| Test.java:57:8:57:12 | After ... > ... [true] | 8 | Test.java:58:6:58:11 | After <Expr>; |
+| Test.java:57:8:57:12 | After ... > ... [true] | 9 | Test.java:59:6:59:11 | Before break |
+| Test.java:57:8:57:12 | After ... > ... [true] | 10 | Test.java:59:6:59:11 | break |
diff --git a/java/ql/test/library-tests/controlflow/basic/bbStrictDominance.expected b/java/ql/test/library-tests/controlflow/basic/bbStrictDominance.expected
index be658fb2915..afa917bf12c 100644
--- a/java/ql/test/library-tests/controlflow/basic/bbStrictDominance.expected
+++ b/java/ql/test/library-tests/controlflow/basic/bbStrictDominance.expected
@@ -1,6 +1,3 @@
-| Test.java:3:14:3:17 | { ... } | Test.java:3:14:3:17 | Exit |
-| Test.java:4:14:4:17 | Normal Exit | Test.java:4:14:4:17 | Exit |
-| Test.java:4:21:76:2 | { ... } | Test.java:4:14:4:17 | Exit |
 | Test.java:4:21:76:2 | { ... } | Test.java:4:14:4:17 | Normal Exit |
 | Test.java:4:21:76:2 | { ... } | Test.java:11:14:14:3 | { ... } |
 | Test.java:4:21:76:2 | { ... } | Test.java:14:10:16:3 | { ... } |
@@ -23,7 +20,6 @@
 | Test.java:4:21:76:2 | { ... } | Test.java:60:12:62:5 | { ... } |
 | Test.java:4:21:76:2 | { ... } | Test.java:63:9:66:4 | { ... } |
 | Test.java:4:21:76:2 | { ... } | Test.java:70:3:70:9 | <Expr>; |
-| Test.java:18:3:18:8 | <Expr>; | Test.java:4:14:4:17 | Exit |
 | Test.java:18:3:18:8 | <Expr>; | Test.java:4:14:4:17 | Normal Exit |
 | Test.java:18:3:18:8 | <Expr>; | Test.java:22:4:22:10 | <Expr>; |
 | Test.java:18:3:18:8 | <Expr>; | Test.java:24:4:24:10 | return ... |
diff --git a/java/ql/test/library-tests/controlflow/basic/bbStrictDominance.ql b/java/ql/test/library-tests/controlflow/basic/bbStrictDominance.ql
index de1e23b649c..72de0cc435d 100644
--- a/java/ql/test/library-tests/controlflow/basic/bbStrictDominance.ql
+++ b/java/ql/test/library-tests/controlflow/basic/bbStrictDominance.ql
@@ -1,6 +1,7 @@
 import java
 import semmle.code.java.controlflow.Dominance
+import utils.test.BasicBlock
 
 from BasicBlock b, BasicBlock b2
 where b.strictlyDominates(b2)
-select b, b2
+select getFirstAstNode(b), getFirstAstNode(b2)
diff --git a/java/ql/test/library-tests/controlflow/basic/bbSuccessor.expected b/java/ql/test/library-tests/controlflow/basic/bbSuccessor.expected
index a6e5d8430c1..95799e5862b 100644
--- a/java/ql/test/library-tests/controlflow/basic/bbSuccessor.expected
+++ b/java/ql/test/library-tests/controlflow/basic/bbSuccessor.expected
@@ -1,16 +1,13 @@
-| Test.java:3:14:3:17 | Exceptional Exit | Test.java:3:14:3:17 | Exit |
-| Test.java:3:14:3:17 | { ... } | Test.java:3:14:3:17 | Exit |
-| Test.java:4:14:4:17 | Exceptional Exit | Test.java:4:14:4:17 | Exit |
-| Test.java:4:14:4:17 | Normal Exit | Test.java:4:14:4:17 | Exit |
 | Test.java:4:21:76:2 | { ... } | Test.java:11:14:14:3 | { ... } |
 | Test.java:4:21:76:2 | { ... } | Test.java:14:10:16:3 | { ... } |
 | Test.java:11:14:14:3 | { ... } | Test.java:18:3:18:8 | <Expr>; |
 | Test.java:14:10:16:3 | { ... } | Test.java:18:3:18:8 | <Expr>; |
 | Test.java:18:3:18:8 | <Expr>; | Test.java:22:4:22:10 | <Expr>; |
 | Test.java:18:3:18:8 | <Expr>; | Test.java:24:4:24:10 | return ... |
+| Test.java:22:4:22:10 | <Expr>; | Test.java:30:7:30:12 | After ... == ... [false] |
 | Test.java:22:4:22:10 | <Expr>; | Test.java:30:15:33:3 | { ... } |
-| Test.java:22:4:22:10 | <Expr>; | Test.java:35:3:35:9 | <Expr>; |
 | Test.java:24:4:24:10 | return ... | Test.java:4:14:4:17 | Normal Exit |
+| Test.java:30:7:30:12 | After ... == ... [false] | Test.java:35:3:35:9 | <Expr>; |
 | Test.java:30:15:33:3 | { ... } | Test.java:35:3:35:9 | <Expr>; |
 | Test.java:35:3:35:9 | <Expr>; | Test.java:38:9:38:9 | x |
 | Test.java:38:9:38:9 | x | Test.java:38:16:41:3 | { ... } |
@@ -21,8 +18,9 @@
 | Test.java:46:18:46:18 | j | Test.java:51:3:51:9 | <Expr>; |
 | Test.java:46:31:49:3 | { ... } | Test.java:46:18:46:18 | j |
 | Test.java:51:3:51:9 | <Expr>; | Test.java:54:18:54:18 | j |
+| Test.java:54:18:54:18 | j | Test.java:54:18:54:23 | After ... < ... [false] |
 | Test.java:54:18:54:18 | j | Test.java:54:31:68:3 | { ... } |
-| Test.java:54:18:54:18 | j | Test.java:70:3:70:9 | <Expr>; |
+| Test.java:54:18:54:23 | After ... < ... [false] | Test.java:70:3:70:9 | <Expr>; |
 | Test.java:54:26:54:26 | j | Test.java:54:18:54:18 | j |
 | Test.java:54:31:68:3 | { ... } | Test.java:57:5:57:13 | if (...) |
 | Test.java:54:31:68:3 | { ... } | Test.java:63:9:66:4 | { ... } |
diff --git a/java/ql/test/library-tests/controlflow/basic/bbSuccessor.ql b/java/ql/test/library-tests/controlflow/basic/bbSuccessor.ql
index ae2d8a393b4..ae8dc5d188d 100644
--- a/java/ql/test/library-tests/controlflow/basic/bbSuccessor.ql
+++ b/java/ql/test/library-tests/controlflow/basic/bbSuccessor.ql
@@ -1,5 +1,6 @@
 import java
+import utils.test.BasicBlock
 
 from BasicBlock b, BasicBlock b2
 where b.getASuccessor() = b2
-select b, b2
+select getFirstAstNodeOrSynth(b), getFirstAstNodeOrSynth(b2)
diff --git a/java/ql/test/library-tests/controlflow/dominance/dominanceWrong.ql b/java/ql/test/library-tests/controlflow/dominance/dominanceWrong.ql
index 4eadcddc61a..6deead2df73 100644
--- a/java/ql/test/library-tests/controlflow/dominance/dominanceWrong.ql
+++ b/java/ql/test/library-tests/controlflow/dominance/dominanceWrong.ql
@@ -17,5 +17,6 @@ predicate dominanceCounterExample(ControlFlowNode entry, ControlFlowNode dom, Co
 from Callable c, ControlFlowNode dom, ControlFlowNode node
 where
   strictlyDominates(dom, node) and
-  dominanceCounterExample(c.getBody().getControlFlowNode(), dom, node)
+  dominanceCounterExample(any(ControlFlow::EntryNode entry | entry.getEnclosingCallable() = c), dom,
+    node)
 select c, dom, node
diff --git a/java/ql/test/library-tests/controlflow/dominance/dominator.expected b/java/ql/test/library-tests/controlflow/dominance/dominator.expected
index 1e385c4fd62..9836d4eed50 100644
--- a/java/ql/test/library-tests/controlflow/dominance/dominator.expected
+++ b/java/ql/test/library-tests/controlflow/dominance/dominator.expected
@@ -1,176 +1,33 @@
-| Test.java:2:32:72:2 | { ... } | Test.java:3:3:3:8 | var ...; |
-| Test.java:3:3:3:8 | var ...; | Test.java:3:7:3:7 | j |
-| Test.java:3:7:3:7 | j | Test.java:4:3:4:14 | var ...; |
-| Test.java:4:3:4:14 | var ...; | Test.java:4:12:4:13 | 50 |
-| Test.java:4:8:4:13 | y | Test.java:7:3:7:12 | if (...) |
-| Test.java:4:12:4:13 | 50 | Test.java:4:8:4:13 | y |
-| Test.java:7:3:7:12 | if (...) | Test.java:7:7:7:7 | x |
-| Test.java:7:7:7:7 | x | Test.java:7:11:7:11 | 0 |
-| Test.java:7:7:7:11 | ... > ... | Test.java:7:14:10:3 | { ... } |
-| Test.java:7:7:7:11 | ... > ... | Test.java:10:10:12:3 | { ... } |
-| Test.java:7:7:7:11 | ... > ... | Test.java:14:3:14:20 | <Expr>; |
-| Test.java:7:11:7:11 | 0 | Test.java:7:7:7:11 | ... > ... |
-| Test.java:7:14:10:3 | { ... } | Test.java:8:4:8:10 | <Expr>; |
-| Test.java:8:4:8:9 | ...=... | Test.java:9:4:9:10 | <Expr>; |
-| Test.java:8:4:8:10 | <Expr>; | Test.java:8:8:8:9 | 20 |
-| Test.java:8:8:8:9 | 20 | Test.java:8:4:8:9 | ...=... |
-| Test.java:9:4:9:10 | <Expr>; | Test.java:9:8:9:9 | 10 |
-| Test.java:9:8:9:9 | 10 | Test.java:9:4:9:9 | ...=... |
-| Test.java:10:10:12:3 | { ... } | Test.java:11:4:11:10 | <Expr>; |
-| Test.java:11:4:11:10 | <Expr>; | Test.java:11:8:11:9 | 30 |
-| Test.java:11:8:11:9 | 30 | Test.java:11:4:11:9 | ...=... |
-| Test.java:14:3:14:19 | ...=... | Test.java:17:3:17:12 | if (...) |
-| Test.java:14:3:14:20 | <Expr>; | Test.java:14:14:14:14 | x |
-| Test.java:14:7:14:19 | (...)... | Test.java:14:3:14:19 | ...=... |
-| Test.java:14:14:14:14 | x | Test.java:14:18:14:18 | y |
-| Test.java:14:14:14:18 | ... + ... | Test.java:14:7:14:19 | (...)... |
-| Test.java:14:18:14:18 | y | Test.java:14:14:14:18 | ... + ... |
-| Test.java:17:3:17:12 | if (...) | Test.java:17:7:17:7 | x |
-| Test.java:17:7:17:7 | x | Test.java:17:11:17:11 | 0 |
-| Test.java:17:7:17:11 | ... < ... | Test.java:2:6:2:9 | Normal Exit |
-| Test.java:17:7:17:11 | ... < ... | Test.java:18:4:18:10 | <Expr>; |
-| Test.java:17:7:17:11 | ... < ... | Test.java:20:11:20:11 | z |
-| Test.java:17:11:17:11 | 0 | Test.java:17:7:17:11 | ... < ... |
-| Test.java:18:4:18:9 | ...=... | Test.java:23:3:23:9 | <Expr>; |
-| Test.java:18:4:18:10 | <Expr>; | Test.java:18:8:18:9 | 40 |
-| Test.java:18:8:18:9 | 40 | Test.java:18:4:18:9 | ...=... |
-| Test.java:20:11:20:11 | z | Test.java:20:4:20:12 | return ... |
-| Test.java:23:3:23:8 | ...=... | Test.java:26:3:26:13 | if (...) |
-| Test.java:23:3:23:9 | <Expr>; | Test.java:23:7:23:8 | 10 |
-| Test.java:23:7:23:8 | 10 | Test.java:23:3:23:8 | ...=... |
-| Test.java:26:3:26:13 | if (...) | Test.java:26:7:26:7 | x |
-| Test.java:26:7:26:7 | x | Test.java:26:12:26:12 | 0 |
-| Test.java:26:7:26:12 | ... == ... | Test.java:26:15:29:3 | { ... } |
-| Test.java:26:7:26:12 | ... == ... | Test.java:31:3:31:9 | <Expr>; |
-| Test.java:26:12:26:12 | 0 | Test.java:26:7:26:12 | ... == ... |
-| Test.java:26:15:29:3 | { ... } | Test.java:27:4:27:10 | <Expr>; |
-| Test.java:27:4:27:9 | ...=... | Test.java:28:4:28:10 | <Expr>; |
-| Test.java:27:4:27:10 | <Expr>; | Test.java:27:8:27:9 | 60 |
-| Test.java:27:8:27:9 | 60 | Test.java:27:4:27:9 | ...=... |
-| Test.java:28:4:28:10 | <Expr>; | Test.java:28:8:28:9 | 10 |
-| Test.java:28:8:28:9 | 10 | Test.java:28:4:28:9 | ...=... |
-| Test.java:31:3:31:3 | z | Test.java:31:8:31:8 | x |
-| Test.java:31:3:31:8 | ...+=... | Test.java:34:3:34:15 | while (...) |
-| Test.java:31:3:31:9 | <Expr>; | Test.java:31:3:31:3 | z |
-| Test.java:31:8:31:8 | x | Test.java:31:3:31:8 | ...+=... |
-| Test.java:34:3:34:15 | while (...) | Test.java:34:10:34:10 | x |
-| Test.java:34:10:34:10 | x | Test.java:34:14:34:14 | 0 |
-| Test.java:34:10:34:14 | ... > ... | Test.java:34:17:37:3 | { ... } |
-| Test.java:34:10:34:14 | ... > ... | Test.java:39:3:39:9 | <Expr>; |
-| Test.java:34:14:34:14 | 0 | Test.java:34:10:34:14 | ... > ... |
-| Test.java:34:17:37:3 | { ... } | Test.java:35:4:35:10 | <Expr>; |
-| Test.java:35:4:35:9 | ...=... | Test.java:36:4:36:7 | <Expr>; |
-| Test.java:35:4:35:10 | <Expr>; | Test.java:35:8:35:9 | 10 |
-| Test.java:35:8:35:9 | 10 | Test.java:35:4:35:9 | ...=... |
-| Test.java:36:4:36:4 | x | Test.java:36:4:36:6 | ...-- |
-| Test.java:36:4:36:7 | <Expr>; | Test.java:36:4:36:4 | x |
-| Test.java:39:3:39:3 | z | Test.java:39:8:39:8 | y |
-| Test.java:39:3:39:8 | ...+=... | Test.java:42:3:42:26 | for (...;...;...) |
-| Test.java:39:3:39:9 | <Expr>; | Test.java:39:3:39:3 | z |
-| Test.java:39:8:39:8 | y | Test.java:39:3:39:8 | ...+=... |
-| Test.java:42:3:42:26 | for (...;...;...) | Test.java:42:12:42:12 | 0 |
-| Test.java:42:8:42:12 | ...=... | Test.java:42:15:42:15 | j |
-| Test.java:42:12:42:12 | 0 | Test.java:42:8:42:12 | ...=... |
-| Test.java:42:15:42:15 | j | Test.java:42:19:42:20 | 10 |
-| Test.java:42:15:42:20 | ... < ... | Test.java:42:28:45:3 | { ... } |
-| Test.java:42:15:42:20 | ... < ... | Test.java:47:3:47:9 | <Expr>; |
-| Test.java:42:19:42:20 | 10 | Test.java:42:15:42:20 | ... < ... |
-| Test.java:42:23:42:23 | j | Test.java:42:23:42:25 | ...++ |
-| Test.java:42:28:45:3 | { ... } | Test.java:43:4:43:9 | <Expr>; |
-| Test.java:43:4:43:8 | ...=... | Test.java:44:4:44:10 | <Expr>; |
-| Test.java:43:4:43:9 | <Expr>; | Test.java:43:8:43:8 | 0 |
-| Test.java:43:8:43:8 | 0 | Test.java:43:4:43:8 | ...=... |
-| Test.java:44:4:44:9 | ...=... | Test.java:42:23:42:23 | j |
-| Test.java:44:4:44:10 | <Expr>; | Test.java:44:8:44:9 | 10 |
-| Test.java:44:8:44:9 | 10 | Test.java:44:4:44:9 | ...=... |
-| Test.java:47:3:47:3 | z | Test.java:47:8:47:8 | w |
-| Test.java:47:3:47:8 | ...+=... | Test.java:50:3:50:26 | for (...;...;...) |
-| Test.java:47:3:47:9 | <Expr>; | Test.java:47:3:47:3 | z |
-| Test.java:47:8:47:8 | w | Test.java:47:3:47:8 | ...+=... |
-| Test.java:50:3:50:26 | for (...;...;...) | Test.java:50:12:50:12 | 0 |
-| Test.java:50:8:50:12 | ...=... | Test.java:50:15:50:15 | j |
-| Test.java:50:12:50:12 | 0 | Test.java:50:8:50:12 | ...=... |
-| Test.java:50:15:50:15 | j | Test.java:50:19:50:20 | 10 |
-| Test.java:50:15:50:20 | ... < ... | Test.java:50:28:64:3 | { ... } |
-| Test.java:50:15:50:20 | ... < ... | Test.java:66:3:66:17 | <Expr>; |
-| Test.java:50:19:50:20 | 10 | Test.java:50:15:50:20 | ... < ... |
-| Test.java:50:23:50:23 | j | Test.java:50:23:50:25 | ...++ |
-| Test.java:50:28:64:3 | { ... } | Test.java:51:4:51:10 | <Expr>; |
-| Test.java:51:4:51:9 | ...=... | Test.java:52:4:52:13 | if (...) |
-| Test.java:51:4:51:10 | <Expr>; | Test.java:51:8:51:9 | 30 |
-| Test.java:51:8:51:9 | 30 | Test.java:51:4:51:9 | ...=... |
-| Test.java:52:4:52:13 | if (...) | Test.java:52:8:52:8 | z |
-| Test.java:52:8:52:8 | z | Test.java:52:12:52:12 | 0 |
-| Test.java:52:8:52:12 | ... > ... | Test.java:50:23:50:23 | j |
-| Test.java:52:8:52:12 | ... > ... | Test.java:53:5:53:14 | if (...) |
-| Test.java:52:8:52:12 | ... > ... | Test.java:59:9:62:4 | { ... } |
-| Test.java:52:12:52:12 | 0 | Test.java:52:8:52:12 | ... > ... |
-| Test.java:53:5:53:14 | if (...) | Test.java:53:9:53:9 | y |
-| Test.java:53:9:53:9 | y | Test.java:53:13:53:13 | 0 |
-| Test.java:53:9:53:13 | ... > ... | Test.java:53:16:56:5 | { ... } |
-| Test.java:53:9:53:13 | ... > ... | Test.java:56:12:58:5 | { ... } |
-| Test.java:53:13:53:13 | 0 | Test.java:53:9:53:13 | ... > ... |
-| Test.java:53:16:56:5 | { ... } | Test.java:54:6:54:11 | <Expr>; |
-| Test.java:54:6:54:10 | ...=... | Test.java:55:6:55:11 | break |
-| Test.java:54:6:54:11 | <Expr>; | Test.java:54:10:54:10 | 0 |
-| Test.java:54:10:54:10 | 0 | Test.java:54:6:54:10 | ...=... |
-| Test.java:56:12:58:5 | { ... } | Test.java:57:6:57:12 | <Expr>; |
-| Test.java:57:6:57:11 | ...=... | Test.java:63:4:63:9 | <Expr>; |
-| Test.java:57:6:57:12 | <Expr>; | Test.java:57:10:57:11 | 20 |
-| Test.java:57:10:57:11 | 20 | Test.java:57:6:57:11 | ...=... |
-| Test.java:59:9:62:4 | { ... } | Test.java:60:5:60:11 | <Expr>; |
-| Test.java:60:5:60:10 | ...=... | Test.java:61:5:61:13 | continue |
-| Test.java:60:5:60:11 | <Expr>; | Test.java:60:9:60:10 | 10 |
-| Test.java:60:9:60:10 | 10 | Test.java:60:5:60:10 | ...=... |
-| Test.java:63:4:63:9 | <Expr>; | Test.java:63:8:63:8 | 0 |
-| Test.java:63:8:63:8 | 0 | Test.java:63:4:63:8 | ...=... |
-| Test.java:66:3:66:3 | z | Test.java:66:8:66:8 | x |
-| Test.java:66:3:66:16 | ...+=... | Test.java:70:3:70:9 | <Expr>; |
-| Test.java:66:3:66:17 | <Expr>; | Test.java:66:3:66:3 | z |
-| Test.java:66:8:66:8 | x | Test.java:66:12:66:12 | y |
-| Test.java:66:8:66:12 | ... + ... | Test.java:66:16:66:16 | w |
-| Test.java:66:8:66:16 | ... + ... | Test.java:66:3:66:16 | ...+=... |
-| Test.java:66:12:66:12 | y | Test.java:66:8:66:12 | ... + ... |
-| Test.java:66:16:66:16 | w | Test.java:66:8:66:16 | ... + ... |
-| Test.java:70:3:70:8 | ...=... | Test.java:71:10:71:10 | w |
-| Test.java:70:3:70:9 | <Expr>; | Test.java:70:7:70:8 | 40 |
-| Test.java:70:7:70:8 | 40 | Test.java:70:3:70:8 | ...=... |
-| Test.java:71:10:71:10 | w | Test.java:71:3:71:11 | return ... |
-| Test.java:74:19:91:2 | { ... } | Test.java:76:3:76:8 | var ...; |
-| Test.java:76:3:76:8 | var ...; | Test.java:76:7:76:7 | b |
-| Test.java:76:7:76:7 | b | Test.java:77:3:77:8 | var ...; |
-| Test.java:77:3:77:8 | var ...; | Test.java:77:7:77:7 | c |
-| Test.java:77:7:77:7 | c | Test.java:78:3:78:8 | <Expr>; |
-| Test.java:78:3:78:7 | ...=... | Test.java:79:3:79:13 | while (...) |
-| Test.java:78:3:78:8 | <Expr>; | Test.java:78:7:78:7 | 0 |
-| Test.java:78:7:78:7 | 0 | Test.java:78:3:78:7 | ...=... |
-| Test.java:79:3:79:13 | while (...) | Test.java:79:9:79:12 | true |
-| Test.java:79:9:79:12 | true | Test.java:79:15:89:3 | { ... } |
-| Test.java:79:15:89:3 | { ... } | Test.java:80:4:80:10 | <Expr>; |
-| Test.java:80:4:80:9 | ...=... | Test.java:81:4:81:15 | if (...) |
-| Test.java:80:4:80:10 | <Expr>; | Test.java:80:8:80:9 | 10 |
-| Test.java:80:8:80:9 | 10 | Test.java:80:4:80:9 | ...=... |
-| Test.java:81:4:81:15 | if (...) | Test.java:81:8:81:8 | a |
-| Test.java:81:8:81:8 | a | Test.java:81:12:81:14 | 100 |
-| Test.java:81:8:81:14 | ... > ... | Test.java:81:17:84:4 | { ... } |
-| Test.java:81:8:81:14 | ... > ... | Test.java:85:4:85:15 | if (...) |
-| Test.java:81:12:81:14 | 100 | Test.java:81:8:81:14 | ... > ... |
-| Test.java:81:17:84:4 | { ... } | Test.java:82:5:82:11 | <Expr>; |
-| Test.java:82:5:82:10 | ...=... | Test.java:83:5:83:10 | <Expr>; |
-| Test.java:82:5:82:11 | <Expr>; | Test.java:82:9:82:10 | 10 |
-| Test.java:82:9:82:10 | 10 | Test.java:82:5:82:10 | ...=... |
-| Test.java:83:5:83:10 | <Expr>; | Test.java:83:9:83:9 | c |
-| Test.java:83:9:83:9 | c | Test.java:83:5:83:9 | ...=... |
-| Test.java:85:4:85:15 | if (...) | Test.java:85:8:85:8 | a |
-| Test.java:85:8:85:8 | a | Test.java:85:13:85:14 | 10 |
-| Test.java:85:8:85:14 | ... == ... | Test.java:74:6:74:10 | Normal Exit |
-| Test.java:85:8:85:14 | ... == ... | Test.java:86:5:86:10 | break |
-| Test.java:85:8:85:14 | ... == ... | Test.java:87:4:87:15 | if (...) |
-| Test.java:85:13:85:14 | 10 | Test.java:85:8:85:14 | ... == ... |
-| Test.java:86:5:86:10 | break | Test.java:90:10:90:10 | b |
-| Test.java:87:4:87:15 | if (...) | Test.java:87:8:87:8 | a |
-| Test.java:87:8:87:8 | a | Test.java:87:13:87:14 | 20 |
-| Test.java:87:8:87:14 | ... == ... | Test.java:88:12:88:12 | c |
-| Test.java:87:13:87:14 | 20 | Test.java:87:8:87:14 | ... == ... |
-| Test.java:88:12:88:12 | c | Test.java:88:5:88:13 | return ... |
-| Test.java:90:10:90:10 | b | Test.java:90:3:90:11 | return ... |
+| Test.java:2:32:72:2 | { ... } | Test.java:7:14:10:3 | { ... } |
+| Test.java:2:32:72:2 | { ... } | Test.java:10:10:12:3 | { ... } |
+| Test.java:2:32:72:2 | { ... } | Test.java:14:3:14:20 | <Expr>; |
+| Test.java:14:3:14:20 | <Expr>; | Test.java:2:6:2:9 | Normal Exit |
+| Test.java:14:3:14:20 | <Expr>; | Test.java:18:4:18:10 | <Expr>; |
+| Test.java:14:3:14:20 | <Expr>; | Test.java:20:11:20:11 | z |
+| Test.java:18:4:18:10 | <Expr>; | Test.java:26:7:26:12 | After ... == ... [false] |
+| Test.java:18:4:18:10 | <Expr>; | Test.java:26:15:29:3 | { ... } |
+| Test.java:18:4:18:10 | <Expr>; | Test.java:31:3:31:9 | <Expr>; |
+| Test.java:31:3:31:9 | <Expr>; | Test.java:34:10:34:10 | x |
+| Test.java:34:10:34:10 | x | Test.java:34:17:37:3 | { ... } |
+| Test.java:34:10:34:10 | x | Test.java:39:3:39:9 | <Expr>; |
+| Test.java:39:3:39:9 | <Expr>; | Test.java:42:15:42:15 | j |
+| Test.java:42:15:42:15 | j | Test.java:42:28:45:3 | { ... } |
+| Test.java:42:15:42:15 | j | Test.java:47:3:47:9 | <Expr>; |
+| Test.java:47:3:47:9 | <Expr>; | Test.java:50:15:50:15 | j |
+| Test.java:50:15:50:15 | j | Test.java:50:15:50:20 | After ... < ... [false] |
+| Test.java:50:15:50:15 | j | Test.java:50:28:64:3 | { ... } |
+| Test.java:50:15:50:15 | j | Test.java:66:3:66:17 | <Expr>; |
+| Test.java:50:28:64:3 | { ... } | Test.java:50:23:50:23 | j |
+| Test.java:50:28:64:3 | { ... } | Test.java:53:5:53:14 | if (...) |
+| Test.java:50:28:64:3 | { ... } | Test.java:59:9:62:4 | { ... } |
+| Test.java:53:5:53:14 | if (...) | Test.java:53:16:56:5 | { ... } |
+| Test.java:53:5:53:14 | if (...) | Test.java:56:12:58:5 | { ... } |
+| Test.java:74:19:91:2 | { ... } | Test.java:79:9:79:12 | true |
+| Test.java:79:9:79:12 | true | Test.java:81:8:81:14 | After ... > ... [false] |
+| Test.java:79:9:79:12 | true | Test.java:81:17:84:4 | { ... } |
+| Test.java:79:9:79:12 | true | Test.java:85:4:85:15 | if (...) |
+| Test.java:85:4:85:15 | if (...) | Test.java:74:6:74:10 | Normal Exit |
+| Test.java:85:4:85:15 | if (...) | Test.java:86:5:86:10 | break |
+| Test.java:85:4:85:15 | if (...) | Test.java:87:4:87:15 | if (...) |
+| Test.java:87:4:87:15 | if (...) | Test.java:87:8:87:14 | After ... == ... [false] |
+| Test.java:87:4:87:15 | if (...) | Test.java:88:12:88:12 | c |
diff --git a/java/ql/test/library-tests/controlflow/dominance/dominator.ql b/java/ql/test/library-tests/controlflow/dominance/dominator.ql
index 701640bf720..7fc18484feb 100644
--- a/java/ql/test/library-tests/controlflow/dominance/dominator.ql
+++ b/java/ql/test/library-tests/controlflow/dominance/dominator.ql
@@ -1,9 +1,9 @@
-import default
-import semmle.code.java.controlflow.Dominance
+import java
+import utils.test.BasicBlock
 
-from Method func, ControlFlowNode dominator, ControlFlowNode node
+from Method func, BasicBlock dominator, BasicBlock bb
 where
-  iDominates(dominator, node) and
-  dominator.getEnclosingStmt().getEnclosingCallable() = func and
+  dominator.immediatelyDominates(bb) and
+  dominator.getEnclosingCallable() = func and
   func.getDeclaringType().hasName("Test")
-select dominator, node
+select getFirstAstNodeOrSynth(dominator), getFirstAstNodeOrSynth(bb)
diff --git a/java/ql/test/library-tests/controlflow/dominance/dominatorUnique.ql b/java/ql/test/library-tests/controlflow/dominance/dominatorUnique.ql
index eaf75ab7bfa..54b0d186362 100644
--- a/java/ql/test/library-tests/controlflow/dominance/dominatorUnique.ql
+++ b/java/ql/test/library-tests/controlflow/dominance/dominatorUnique.ql
@@ -7,5 +7,5 @@ where
   iDominates(dom1, node) and
   iDominates(dom2, node) and
   dom1 != dom2 and
-  func = node.getEnclosingStmt().getEnclosingCallable()
+  func = node.getEnclosingCallable()
 select func, node, dom1, dom2
diff --git a/java/ql/test/library-tests/dataflow/capture/test.expected b/java/ql/test/library-tests/dataflow/capture/test.expected
index a744f468fbe..16ec39314eb 100644
--- a/java/ql/test/library-tests/dataflow/capture/test.expected
+++ b/java/ql/test/library-tests/dataflow/capture/test.expected
@@ -16,8 +16,8 @@
 | A.java:21:11:21:13 | "B" : String | A.java:14:11:14:20 | f2(...) : new A(...) { ... } [String s] |
 | A.java:21:11:21:13 | "B" : String | A.java:15:16:15:16 | a : new A(...) { ... } [String s] |
 | A.java:21:11:21:13 | "B" : String | A.java:15:16:15:22 | get(...) : String |
+| A.java:21:11:21:13 | "B" : String | A.java:20:5:20:15 | SSA phi(s) : String |
 | A.java:21:11:21:13 | "B" : String | A.java:21:7:21:13 | ...=... : String |
-| A.java:21:11:21:13 | "B" : String | A.java:25:5:25:26 | SSA phi(s) : String |
 | A.java:21:11:21:13 | "B" : String | A.java:28:11:38:5 | String s : String |
 | A.java:21:11:21:13 | "B" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [String s] |
 | A.java:21:11:21:13 | "B" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [String s] |
@@ -32,8 +32,8 @@
 | A.java:23:11:23:13 | "C" : String | A.java:14:11:14:20 | f2(...) : new A(...) { ... } [String s] |
 | A.java:23:11:23:13 | "C" : String | A.java:15:16:15:16 | a : new A(...) { ... } [String s] |
 | A.java:23:11:23:13 | "C" : String | A.java:15:16:15:22 | get(...) : String |
+| A.java:23:11:23:13 | "C" : String | A.java:20:5:20:15 | SSA phi(s) : String |
 | A.java:23:11:23:13 | "C" : String | A.java:23:7:23:13 | ...=... : String |
-| A.java:23:11:23:13 | "C" : String | A.java:25:5:25:26 | SSA phi(s) : String |
 | A.java:23:11:23:13 | "C" : String | A.java:28:11:38:5 | String s : String |
 | A.java:23:11:23:13 | "C" : String | A.java:28:11:38:5 | new (...) : new A(...) { ... } [String s] |
 | A.java:23:11:23:13 | "C" : String | A.java:30:14:30:16 | parameter this : new A(...) { ... } [String s] |
diff --git a/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.java b/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.java
index 52d26974373..80cf48de665 100644
--- a/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.java
+++ b/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.java
@@ -48,34 +48,34 @@ public class EntryPointTypesTest {
     private static void sink(String sink) {}
 
     public static void test(TestObject source) {
-        sink(source.field1); // $hasTaintFlow
-        sink(source.getField2()); // $hasTaintFlow
-        sink(source.getField3().field4); // $hasTaintFlow
-        sink(source.getField3().getField5()); // $hasTaintFlow
+        sink(source.field1); // $ hasTaintFlow
+        sink(source.getField2()); // $ hasTaintFlow
+        sink(source.getField3().field4); // $ hasTaintFlow
+        sink(source.getField3().getField5()); // $ hasTaintFlow
     }
 
     public static void testParameterized(
             ParameterizedTestObject<TestObject, AnotherTestObject> source) {
-        sink(source.field6); // $hasTaintFlow
-        sink(source.field7.field1); // $hasTaintFlow
-        sink(source.field7.getField2()); // $hasTaintFlow
-        sink(source.getField8().field4); // $hasTaintFlow
-        sink(source.getField8().getField5()); // $hasTaintFlow
+        sink(source.field6); // $ hasTaintFlow
+        sink(source.field7.field1); // $ hasTaintFlow
+        sink(source.field7.getField2()); // $ hasTaintFlow
+        sink(source.getField8().field4); // $ hasTaintFlow
+        sink(source.getField8().getField5()); // $ hasTaintFlow
     }
 
     public static void testSubtype(ParameterizedTestObject<?, ?> source) {
         ChildObject subtypeSource = (ChildObject) source;
-        sink(subtypeSource.field6); // $hasTaintFlow
-        sink(subtypeSource.field7.field1); // $hasTaintFlow
-        sink(subtypeSource.field7.getField2()); // $hasTaintFlow
-        sink((String) subtypeSource.getField8()); // $hasTaintFlow
-        sink((String) subtypeSource.field9); // $hasTaintFlow
+        sink(subtypeSource.field6); // $ hasTaintFlow
+        sink(subtypeSource.field7.field1); // $ hasTaintFlow
+        sink(subtypeSource.field7.getField2()); // $ hasTaintFlow
+        sink((String) subtypeSource.getField8()); // $ hasTaintFlow
+        sink((String) subtypeSource.field9); // $ hasTaintFlow
         // Ensure that we are not tainting every subclass of Object
         UnrelatedObject unrelated = (UnrelatedObject) subtypeSource.getField8();
         sink(unrelated.safeField); // Safe
     }
 
     public static void testArray(ArrayElemObject[] source) {
-        sink(source[0].field); // $hasTaintFlow
+        sink(source[0].field); // $ hasTaintFlow
     }
 }
diff --git a/java/ql/test/library-tests/dataflow/fluent-methods/Test.java b/java/ql/test/library-tests/dataflow/fluent-methods/Test.java
index d776d85a5f6..d47c566e13d 100644
--- a/java/ql/test/library-tests/dataflow/fluent-methods/Test.java
+++ b/java/ql/test/library-tests/dataflow/fluent-methods/Test.java
@@ -42,31 +42,31 @@ public class Test {
   public static void test1() {
     Test t = new Test();
     t.fluentNoop().fluentSet(source()).fluentNoop();
-    sink(t.get()); // $hasValueFlow
+    sink(t.get()); // $ hasValueFlow
   }
 
   public static void test2() {
     Test t = new Test();
     Test.identity(t).fluentNoop().fluentSet(source()).fluentNoop();
-    sink(t.get()); // $hasValueFlow
+    sink(t.get()); // $ hasValueFlow
   }
 
   public static void test3() {
     Test t = new Test();
     t.indirectlyFluentNoop().fluentSet(source()).fluentNoop();
-    sink(t.get()); // $hasValueFlow
+    sink(t.get()); // $ hasValueFlow
   }
 
   public static void testModel1() {
     Test t = new Test();
     t.indirectlyFluentNoop().modelledFluentMethod().fluentSet(source()).fluentNoop();
-    sink(t.get()); // $hasValueFlow
+    sink(t.get()); // $ hasValueFlow
   }
 
   public static void testModel2() {
     Test t = new Test();
     Test.modelledIdentity(t).indirectlyFluentNoop().modelledFluentMethod().fluentSet(source()).fluentNoop();
-    sink(t.get()); // $hasValueFlow
+    sink(t.get()); // $ hasValueFlow
   }
 
 }
diff --git a/java/ql/test/library-tests/dataflow/taint-jackson/Test.java b/java/ql/test/library-tests/dataflow/taint-jackson/Test.java
index d3f8766de70..96be33ae0b2 100644
--- a/java/ql/test/library-tests/dataflow/taint-jackson/Test.java
+++ b/java/ql/test/library-tests/dataflow/taint-jackson/Test.java
@@ -34,22 +34,22 @@ class Test {
 		ObjectMapper om = new ObjectMapper();
 		File file = new File("testFile");
 		om.writeValue(file, s);
-		sink(file); //$hasTaintFlow
+		sink(file); // $ hasTaintFlow
 		OutputStream out = new FileOutputStream(file);
 		om.writeValue(out, s);
-		sink(file); //$hasTaintFlow
+		sink(file); // $ hasTaintFlow
 		Writer writer = new StringWriter();
 		om.writeValue(writer, s);
-		sink(writer); //$hasTaintFlow
+		sink(writer); // $ hasTaintFlow
 		JsonGenerator generator = new JsonFactory().createGenerator(new StringWriter());
 		om.writeValue(generator, s);
-		sink(generator); //$hasTaintFlow
+		sink(generator); // $ hasTaintFlow
 		String t = om.writeValueAsString(s);
-		sink(t); //$hasTaintFlow
+		sink(t); // $ hasTaintFlow
 		byte[] bs = om.writeValueAsBytes(s);
 		String reconstructed = new String(bs, "utf-8");
-		sink(bs); //$hasTaintFlow
-		sink(reconstructed); //$hasTaintFlow
+		sink(bs); // $ hasTaintFlow
+		sink(reconstructed); // $ hasTaintFlow
 	}
 
 	public static void jacksonObjectWriter() throws Exception {
@@ -57,44 +57,44 @@ class Test {
 		ObjectWriter ow = new ObjectWriter();
 		File file = new File("testFile");
 		ow.writeValue(file, s);
-		sink(file); //$hasTaintFlow
+		sink(file); // $ hasTaintFlow
 		OutputStream out = new FileOutputStream(file);
 		ow.writeValue(out, s);
-		sink(out); //$hasTaintFlow
+		sink(out); // $ hasTaintFlow
 		Writer writer = new StringWriter();
 		ow.writeValue(writer, s);
-		sink(writer); //$hasTaintFlow
+		sink(writer); // $ hasTaintFlow
 		JsonGenerator generator = new JsonFactory().createGenerator(new StringWriter());
 		ow.writeValue(generator, s);
-		sink(generator); //$hasTaintFlow
+		sink(generator); // $ hasTaintFlow
 		String t = ow.writeValueAsString(s);
-		sink(t); //$hasTaintFlow
+		sink(t); // $ hasTaintFlow
 		byte[] bs = ow.writeValueAsBytes(s);
 		String reconstructed = new String(bs, "utf-8");
-		sink(bs); //$hasTaintFlow
-		sink(reconstructed); //$hasTaintFlow
+		sink(bs); // $ hasTaintFlow
+		sink(reconstructed); // $ hasTaintFlow
 	}
 
 	public static void jacksonObjectReader() throws java.io.IOException {
 		String s = taint();
 		ObjectMapper om = new ObjectMapper();
 		ObjectReader reader = om.readerFor(Potato.class);
-		sink(reader.readValue(s));  //$hasTaintFlow
-		sink(reader.readValue(s, Potato.class).name);  //$hasTaintFlow
-		sink(reader.readValue(s, Potato.class).getName());  //$hasTaintFlow
+		sink(reader.readValue(s));  // $ hasTaintFlow
+		sink(reader.readValue(s, Potato.class).name);  // $ hasTaintFlow
+		sink(reader.readValue(s, Potato.class).getName());  // $ hasTaintFlow
 	}
 
 	public static void jacksonObjectReaderIterable() throws java.io.IOException {
 		String s = taint();
 		ObjectMapper om = new ObjectMapper();
 		ObjectReader reader = om.readerFor(Potato.class);
-		sink(reader.readValues(s));  //$hasTaintFlow
+		sink(reader.readValues(s));  // $ hasTaintFlow
 		Iterator<Potato> pIterator = reader.readValues(s);
 		while(pIterator.hasNext()) {
 			Potato p = pIterator.next();
-			sink(p); //$hasTaintFlow
-			sink(p.name); //$hasTaintFlow
-			sink(p.getName()); //$hasTaintFlow
+			sink(p); // $ hasTaintFlow
+			sink(p.name); // $ hasTaintFlow
+			sink(p.getName()); // $ hasTaintFlow
 		}
 	}
 
@@ -104,9 +104,9 @@ class Test {
 		taintedParams.put("name", s);
 		ObjectMapper om = new ObjectMapper();
 		JsonNode jn = om.valueToTree(taintedParams);
-		sink(jn); //$hasTaintFlow
+		sink(jn); // $ hasTaintFlow
 		Potato p = om.convertValue(jn, Potato.class);
-		sink(p); //$hasTaintFlow
-		sink(p.getName()); //$hasTaintFlow
+		sink(p); // $ hasTaintFlow
+		sink(p.getName()); // $ hasTaintFlow
 	}
 }
diff --git a/java/ql/test/library-tests/dataflow/taintsources/A.java b/java/ql/test/library-tests/dataflow/taintsources/A.java
index f28834e5837..37051a328c4 100644
--- a/java/ql/test/library-tests/dataflow/taintsources/A.java
+++ b/java/ql/test/library-tests/dataflow/taintsources/A.java
@@ -18,40 +18,40 @@ public class A {
   private static void sink(Object o) {}
 
   public static void main(String[] args) {
-    sink(args); // $hasLocalValueFlow
-    sink(args[0]); // $hasLocalTaintFlow
+    sink(args); // $ hasLocalValueFlow
+    sink(args[0]); // $ hasLocalTaintFlow
   }
 
   public static void userInput() throws SQLException, IOException, MalformedURLException {
-    sink(System.getenv("test")); // $hasLocalValueFlow
+    sink(System.getenv("test")); // $ hasLocalValueFlow
     class TestServlet extends HttpServlet {
       @Override
       protected void doGet(HttpServletRequest req, HttpServletResponse resp)
           throws ServletException, IOException {
-        sink(req.getParameter("test")); // $hasRemoteValueFlow
-        sink(req.getHeader("test")); // $hasRemoteValueFlow
-        sink(req.getQueryString()); // $hasRemoteValueFlow
-        sink(req.getCookies()[0].getValue()); // $hasRemoteValueFlow
+        sink(req.getParameter("test")); // $ hasRemoteValueFlow
+        sink(req.getHeader("test")); // $ hasRemoteValueFlow
+        sink(req.getQueryString()); // $ hasRemoteValueFlow
+        sink(req.getCookies()[0].getValue()); // $ hasRemoteValueFlow
       }
     }
-    sink(new Properties().getProperty("test")); // $hasLocalValueFlow
-    sink(System.getProperty("test")); // $hasLocalValueFlow
+    sink(new Properties().getProperty("test")); // $ hasLocalValueFlow
+    sink(System.getProperty("test")); // $ hasLocalValueFlow
     new Object() {
       public void test(ResultSet rs) throws SQLException {
-        sink(rs.getString(0)); // $hasLocalValueFlow
+        sink(rs.getString(0)); // $ hasLocalValueFlow
       }
     };
-    sink(new URL("test").openConnection().getInputStream()); // $hasRemoteValueFlow
-    sink(new Socket("test", 1234).getInputStream()); // $hasRemoteValueFlow
-    sink(InetAddress.getByName("test").getHostName()); // $hasReverseDnsValueFlow
+    sink(new URL("test").openConnection().getInputStream()); // $ hasRemoteValueFlow
+    sink(new Socket("test", 1234).getInputStream()); // $ hasRemoteValueFlow
+    sink(InetAddress.getByName("test").getHostName()); // $ hasReverseDnsValueFlow
     sink(InetAddress.getLocalHost().getHostName());
     sink(InetAddress.getLoopbackAddress().getHostName());
-    sink(InetAddress.getByName("test").getCanonicalHostName()); // $hasReverseDnsValueFlow
+    sink(InetAddress.getByName("test").getCanonicalHostName()); // $ hasReverseDnsValueFlow
     sink(InetAddress.getLocalHost().getCanonicalHostName());
     sink(InetAddress.getLoopbackAddress().getCanonicalHostName());
 
-    sink(System.in); // $hasLocalValueFlow
-    sink(new FileInputStream("test")); // $hasLocalValueFlow
+    sink(System.in); // $ hasLocalValueFlow
+    sink(new FileInputStream("test")); // $ hasLocalValueFlow
   }
 
 }
diff --git a/java/ql/test/library-tests/dataflow/taintsources/AndroidExposedObject.java b/java/ql/test/library-tests/dataflow/taintsources/AndroidExposedObject.java
index 2460781e196..50d5a8a38ea 100644
--- a/java/ql/test/library-tests/dataflow/taintsources/AndroidExposedObject.java
+++ b/java/ql/test/library-tests/dataflow/taintsources/AndroidExposedObject.java
@@ -6,6 +6,6 @@ public class AndroidExposedObject {
 
     @JavascriptInterface
     public void test(String arg) {
-        sink(arg); // $hasRemoteValueFlow
+        sink(arg); // $ hasRemoteValueFlow
     }
 }
diff --git a/java/ql/test/library-tests/dataflow/taintsources/Hudson.java b/java/ql/test/library-tests/dataflow/taintsources/Hudson.java
index 2a180eeb5fb..b7586cbfc85 100644
--- a/java/ql/test/library-tests/dataflow/taintsources/Hudson.java
+++ b/java/ql/test/library-tests/dataflow/taintsources/Hudson.java
@@ -6,11 +6,11 @@ public class Hudson {
 
     public static void test() throws Exception {
         FilePath fp = null;
-        sink(FilePath.newInputStreamDenyingSymlinkAsNeeded(null, null, null)); // $hasLocalValueFlow
-        sink(FilePath.openInputStream(null, null)); // $hasLocalValueFlow
-        sink(fp.read()); // $hasLocalValueFlow
-        sink(fp.read(null)); // $hasLocalValueFlow
-        sink(fp.readFromOffset(-1)); // $hasLocalValueFlow
-        sink(fp.readToString()); // $hasLocalValueFlow
+        sink(FilePath.newInputStreamDenyingSymlinkAsNeeded(null, null, null)); // $ hasLocalValueFlow
+        sink(FilePath.openInputStream(null, null)); // $ hasLocalValueFlow
+        sink(fp.read()); // $ hasLocalValueFlow
+        sink(fp.read(null)); // $ hasLocalValueFlow
+        sink(fp.readFromOffset(-1)); // $ hasLocalValueFlow
+        sink(fp.readToString()); // $ hasLocalValueFlow
     }
 }
diff --git a/java/ql/test/library-tests/dataflow/taintsources/IntentSourcesActivity.java b/java/ql/test/library-tests/dataflow/taintsources/IntentSourcesActivity.java
index 3cd324a05db..99d701adca0 100644
--- a/java/ql/test/library-tests/dataflow/taintsources/IntentSourcesActivity.java
+++ b/java/ql/test/library-tests/dataflow/taintsources/IntentSourcesActivity.java
@@ -9,21 +9,21 @@ public class IntentSourcesActivity extends Activity {
 	public void test() throws java.io.IOException {
 
 		String trouble = this.getIntent().getStringExtra("key");
-		sink(trouble); // $hasRemoteTaintFlow
+		sink(trouble); // $ hasRemoteTaintFlow
 
 	}
 
 	public void test2() throws java.io.IOException {
 
 		String trouble = getIntent().getStringExtra("key");
-		sink(trouble); // $hasRemoteTaintFlow
+		sink(trouble); // $ hasRemoteTaintFlow
 
 	}
 
 	public void test3() throws java.io.IOException {
 
 		String trouble = getIntent().getExtras().getString("key");
-		sink(trouble); // $hasRemoteTaintFlow
+		sink(trouble); // $ hasRemoteTaintFlow
 
 	}
 }
@@ -34,7 +34,7 @@ class OtherClass {
 
 	public void test(IntentSourcesActivity is) throws java.io.IOException {
 		String trouble = is.getIntent().getStringExtra("key");
-		sink(trouble); // $hasRemoteTaintFlow
+		sink(trouble); // $ hasRemoteTaintFlow
 	}
 
 }
diff --git a/java/ql/test/library-tests/dataflow/taintsources/RmiFlowImpl.java b/java/ql/test/library-tests/dataflow/taintsources/RmiFlowImpl.java
index 9e814bf7201..bed290c08bc 100644
--- a/java/ql/test/library-tests/dataflow/taintsources/RmiFlowImpl.java
+++ b/java/ql/test/library-tests/dataflow/taintsources/RmiFlowImpl.java
@@ -6,7 +6,7 @@ public class RmiFlowImpl implements RmiFlow {
 
 	public String listDirectory(String path) throws java.io.IOException {
 		String command = "ls " + path;
-		sink(command); // $hasRemoteTaintFlow
+		sink(command); // $ hasRemoteTaintFlow
 		return "pretend there are some results here";
 	}
 
diff --git a/java/ql/test/library-tests/dataflow/taintsources/SpringMultiPart.java b/java/ql/test/library-tests/dataflow/taintsources/SpringMultiPart.java
index 33eeced2a4e..7e1846480ea 100644
--- a/java/ql/test/library-tests/dataflow/taintsources/SpringMultiPart.java
+++ b/java/ql/test/library-tests/dataflow/taintsources/SpringMultiPart.java
@@ -7,21 +7,21 @@ public class SpringMultiPart {
 	private static void sink(Object o) {}
 
 	public void test() throws Exception {
-		sink(file.getBytes()); // $hasRemoteValueFlow
+		sink(file.getBytes()); // $ hasRemoteValueFlow
 		sink(file.isEmpty()); // Safe
-		sink(file.getInputStream()); // $hasRemoteValueFlow
-		sink(file.getResource()); // $hasRemoteValueFlow
-		sink(file.getName()); // $hasRemoteValueFlow
-		sink(file.getContentType()); // $hasRemoteValueFlow
-		sink(file.getOriginalFilename()); // $hasRemoteValueFlow
+		sink(file.getInputStream()); // $ hasRemoteValueFlow
+		sink(file.getResource()); // $ hasRemoteValueFlow
+		sink(file.getName()); // $ hasRemoteValueFlow
+		sink(file.getContentType()); // $ hasRemoteValueFlow
+		sink(file.getOriginalFilename()); // $ hasRemoteValueFlow
 	}
 
 	public void test(MultipartRequest request) {
-		sink(request.getFile("name"));// $hasRemoteValueFlow
-		sink(request.getFileMap());// $hasRemoteValueFlow
-		sink(request.getFileNames());// $hasRemoteValueFlow
-		sink(request.getFiles("name"));// $hasRemoteValueFlow
-		sink(request.getMultiFileMap());// $hasRemoteValueFlow
-		sink(request.getMultipartContentType("name")); // $hasRemoteValueFlow
+		sink(request.getFile("name"));// $ hasRemoteValueFlow
+		sink(request.getFileMap());// $ hasRemoteValueFlow
+		sink(request.getFileNames());// $ hasRemoteValueFlow
+		sink(request.getFiles("name"));// $ hasRemoteValueFlow
+		sink(request.getMultiFileMap());// $ hasRemoteValueFlow
+		sink(request.getMultipartContentType("name")); // $ hasRemoteValueFlow
 	}
 }
diff --git a/java/ql/test/library-tests/dataflow/taintsources/SpringSavedRequest.java b/java/ql/test/library-tests/dataflow/taintsources/SpringSavedRequest.java
index e61e0cbb827..a14269fced0 100644
--- a/java/ql/test/library-tests/dataflow/taintsources/SpringSavedRequest.java
+++ b/java/ql/test/library-tests/dataflow/taintsources/SpringSavedRequest.java
@@ -7,22 +7,22 @@ public class SpringSavedRequest {
 	private static void sink(Object o) {}
 
 	public void test() {
-		sink(sr.getRedirectUrl()); // $hasRemoteValueFlow
-		sink(sr.getCookies()); // $hasRemoteValueFlow
-		sink(sr.getHeaderValues("name")); // $hasRemoteValueFlow
-		sink(sr.getHeaderNames()); // $hasRemoteValueFlow
-		sink(sr.getParameterValues("name")); // $hasRemoteValueFlow
-		sink(sr.getParameterMap()); // $hasRemoteValueFlow
+		sink(sr.getRedirectUrl()); // $ hasRemoteValueFlow
+		sink(sr.getCookies()); // $ hasRemoteValueFlow
+		sink(sr.getHeaderValues("name")); // $ hasRemoteValueFlow
+		sink(sr.getHeaderNames()); // $ hasRemoteValueFlow
+		sink(sr.getParameterValues("name")); // $ hasRemoteValueFlow
+		sink(sr.getParameterMap()); // $ hasRemoteValueFlow
 	}
 
 	SimpleSavedRequest ssr;
 
 	public void test2() {
-		sink(ssr.getRedirectUrl()); // $hasRemoteValueFlow
-		sink(ssr.getCookies()); // $hasRemoteValueFlow
-		sink(ssr.getHeaderValues("name")); // $hasRemoteValueFlow
-		sink(ssr.getHeaderNames()); // $hasRemoteValueFlow
-		sink(ssr.getParameterValues("name")); // $hasRemoteValueFlow
-		sink(ssr.getParameterMap()); // $hasRemoteValueFlow
+		sink(ssr.getRedirectUrl()); // $ hasRemoteValueFlow
+		sink(ssr.getCookies()); // $ hasRemoteValueFlow
+		sink(ssr.getHeaderValues("name")); // $ hasRemoteValueFlow
+		sink(ssr.getHeaderNames()); // $ hasRemoteValueFlow
+		sink(ssr.getParameterValues("name")); // $ hasRemoteValueFlow
+		sink(ssr.getParameterMap()); // $ hasRemoteValueFlow
 	}
 }
diff --git a/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.expected b/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.expected
deleted file mode 100644
index dba8b4acf98..00000000000
--- a/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.expected
+++ /dev/null
@@ -1,7 +0,0 @@
-| FlexibleConstructors.java:10:15:10:17 | msg | FlexibleConstructors.java:10:9:10:19 | super(...) | predecessor of explicit super() |
-| FlexibleConstructors.java:18:13:18:17 | ... < ... | FlexibleConstructors.java:19:9:19:16 | super(...) | predecessor of explicit super() |
-| FlexibleConstructors.java:38:17:38:48 | combined | FlexibleConstructors.java:39:13:39:20 | super(...) | predecessor of explicit super() |
-| FlexibleConstructors.java:52:9:52:40 | ...=... | FlexibleConstructors.java:53:9:53:16 | super(...) | predecessor of explicit super() |
-| FlexibleConstructors.java:65:15:65:18 | temp | FlexibleConstructors.java:65:9:65:20 | super(...) | predecessor of explicit super() |
-| FlexibleConstructors.java:77:9:77:24 | ...=... | FlexibleConstructors.java:78:9:78:16 | super(...) | predecessor of explicit super() |
-| FlexibleConstructors.java:91:13:91:41 | string | FlexibleConstructors.java:92:9:92:16 | super(...) | predecessor of explicit super() |
diff --git a/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.ql b/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.ql
deleted file mode 100644
index 2a291c5e82a..00000000000
--- a/java/ql/test/library-tests/flexible-constructors/SuperPredecessor.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-import java
-
-from ControlFlowNode pred, ControlFlowNode supNode, SuperConstructorInvocationStmt sc
-where
-  supNode.asStmt() = sc and
-  pred.getASuccessor() = supNode and
-  pred != supNode and
-  not pred.asStmt() instanceof BlockStmt and
-  exists(sc.getEnclosingCallable().getFile().getRelativePath()) and
-  sc.getLocation().getEndColumn() > sc.getLocation().getStartColumn()
-select pred, sc, "predecessor of explicit super()"
diff --git a/java/ql/test/library-tests/frameworks/android/intent/TestStartBroadcastReceiverToIntent.java b/java/ql/test/library-tests/frameworks/android/intent/TestStartBroadcastReceiverToIntent.java
index f317b3ed2e8..22be5f8534e 100644
--- a/java/ql/test/library-tests/frameworks/android/intent/TestStartBroadcastReceiverToIntent.java
+++ b/java/ql/test/library-tests/frameworks/android/intent/TestStartBroadcastReceiverToIntent.java
@@ -79,7 +79,7 @@ public class TestStartBroadcastReceiverToIntent {
         // test method that receives an Intent as a parameter
         @Override
         public void onReceive(Context context, Intent intent) {
-            sink(intent.getStringExtra("data")); // $  hasValueFlow=send hasValueFlow=send-as-user hasValueFlow=send-with-perm hasValueFlow=send-ordered hasValueFlow=send-ordered-as-user hasValueFlow=send-sticky hasValueFlow=send-sticky-as-user hasValueFlow=send-sticky-ordered hasValueFlow=send-sticky-ordered-as-user hasValueFlow=4-arg
+            sink(intent.getStringExtra("data")); // $ hasValueFlow=send hasValueFlow=send-as-user hasValueFlow=send-with-perm hasValueFlow=send-ordered hasValueFlow=send-ordered-as-user hasValueFlow=send-sticky hasValueFlow=send-sticky-as-user hasValueFlow=send-sticky-ordered hasValueFlow=send-sticky-ordered-as-user hasValueFlow=4-arg
         }
     }
 
diff --git a/java/ql/test/library-tests/frameworks/android/slice/TestSources.java b/java/ql/test/library-tests/frameworks/android/slice/TestSources.java
index 7f51442c8ea..f50f6fb09d7 100644
--- a/java/ql/test/library-tests/frameworks/android/slice/TestSources.java
+++ b/java/ql/test/library-tests/frameworks/android/slice/TestSources.java
@@ -18,14 +18,14 @@ public class TestSources extends SliceProvider {
     // "androidx.slice;SliceProvider;true;onBindSlice;;;Parameter[0];contentprovider;manual",
     @Override
     public Slice onBindSlice(Uri sliceUri) {
-        sink(sliceUri); // $hasValueFlow
+        sink(sliceUri); // $ hasValueFlow
         return null;
     }
 
     // "androidx.slice;SliceProvider;true;onCreatePermissionRequest;;;Parameter[0];contentprovider;manual",
     @Override
     public PendingIntent onCreatePermissionRequest(Uri sliceUri, String callingPackage) {
-        sink(sliceUri); // $hasValueFlow
+        sink(sliceUri); // $ hasValueFlow
         sink(callingPackage); // Safe
         return null;
     }
@@ -33,18 +33,18 @@ public class TestSources extends SliceProvider {
     // "androidx.slice;SliceProvider;true;onMapIntentToUri;;;Parameter[0];contentprovider;manual",
     @Override
     public Uri onMapIntentToUri(Intent intent) {
-        sink(intent); // $hasValueFlow
+        sink(intent); // $ hasValueFlow
         return null;
     }
 
     // "androidx.slice;SliceProvider;true;onSlicePinned;;;Parameter[0];contentprovider;manual",
     public void onSlicePinned(Uri sliceUri) {
-        sink(sliceUri); // $hasValueFlow
+        sink(sliceUri); // $ hasValueFlow
     }
 
     // "androidx.slice;SliceProvider;true;onSliceUnpinned;;;Parameter[0];contentprovider;manual"
     public void onSliceUnpinned(Uri sliceUri) {
-        sink(sliceUri); // $hasValueFlow
+        sink(sliceUri); // $ hasValueFlow
     }
 
     // Methods needed for compilation
diff --git a/java/ql/test/library-tests/frameworks/android/taint-database/FlowSteps.java b/java/ql/test/library-tests/frameworks/android/taint-database/FlowSteps.java
index edf290c4cef..5a204fc2c07 100644
--- a/java/ql/test/library-tests/frameworks/android/taint-database/FlowSteps.java
+++ b/java/ql/test/library-tests/frameworks/android/taint-database/FlowSteps.java
@@ -29,96 +29,96 @@ public class FlowSteps {
 	}
 
 	public static String appendSelectionArgs() {
-		String[] originalValues = {taint()}; // $taintReachesReturn
-		String[] newValues = {taint()}; // $taintReachesReturn
+		String[] originalValues = {taint()}; // $ taintReachesReturn
+		String[] newValues = {taint()}; // $ taintReachesReturn
 		return DatabaseUtils.appendSelectionArgs(originalValues, newValues)[0];
 	}
 
 	public static String concatenateWhere() {
-		String a = taint(); // $taintReachesReturn
-		String b = taint(); // $taintReachesReturn
+		String a = taint(); // $ taintReachesReturn
+		String b = taint(); // $ taintReachesReturn
 		return DatabaseUtils.concatenateWhere(a, b);
 	}
 
 	public static String buildQueryString(MySQLiteQueryBuilder target) {
 		target = taint();
-		boolean distinct = taint(); 
-		String tables = taint(); // $taintReachesReturn
-		String[] columns = {taint()}; // $taintReachesReturn
-		String where = taint(); // $taintReachesReturn
-		String groupBy = taint(); // $taintReachesReturn
-		String having = taint(); // $taintReachesReturn
-		String orderBy = taint(); // $taintReachesReturn
-		String limit = taint(); // $taintReachesReturn
+		boolean distinct = taint();
+		String tables = taint(); // $ taintReachesReturn
+		String[] columns = {taint()}; // $ taintReachesReturn
+		String where = taint(); // $ taintReachesReturn
+		String groupBy = taint(); // $ taintReachesReturn
+		String having = taint(); // $ taintReachesReturn
+		String orderBy = taint(); // $ taintReachesReturn
+		String limit = taint(); // $ taintReachesReturn
 		return SQLiteQueryBuilder.buildQueryString(distinct, tables, columns, where, groupBy, having, orderBy, limit);
 	}
 
 	public static String buildQuery(MySQLiteQueryBuilder target) {
-		target = taint(); // $taintReachesReturn
-		String[] projectionIn = {taint()}; // $taintReachesReturn
-		String selection = taint(); // $taintReachesReturn
-		String groupBy = taint(); // $taintReachesReturn
-		String having = taint(); // $taintReachesReturn
-		String sortOrder = taint(); // $taintReachesReturn
-		String limit = taint(); // $taintReachesReturn
+		target = taint(); // $ taintReachesReturn
+		String[] projectionIn = {taint()}; // $ taintReachesReturn
+		String selection = taint(); // $ taintReachesReturn
+		String groupBy = taint(); // $ taintReachesReturn
+		String having = taint(); // $ taintReachesReturn
+		String sortOrder = taint(); // $ taintReachesReturn
+		String limit = taint(); // $ taintReachesReturn
 		return target.buildQuery(projectionIn, selection, groupBy, having, sortOrder, limit);
 	}
 
 	public static String buildQuery2(MySQLiteQueryBuilder target) {
-		target = taint(); // $taintReachesReturn
-		String[] projectionIn = {taint()}; // $taintReachesReturn
-		String selection = taint(); // $taintReachesReturn
-		String[] selectionArgs = {taint()}; 
-		String groupBy = taint(); // $taintReachesReturn
-		String having = taint(); // $taintReachesReturn
-		String sortOrder = taint(); // $taintReachesReturn
-		String limit = taint(); // $taintReachesReturn
+		target = taint(); // $ taintReachesReturn
+		String[] projectionIn = {taint()}; // $ taintReachesReturn
+		String selection = taint(); // $ taintReachesReturn
+		String[] selectionArgs = {taint()};
+		String groupBy = taint(); // $ taintReachesReturn
+		String having = taint(); // $ taintReachesReturn
+		String sortOrder = taint(); // $ taintReachesReturn
+		String limit = taint(); // $ taintReachesReturn
 		return target.buildQuery(projectionIn, selection, selectionArgs, groupBy, having, sortOrder, limit);
 	}
 
 	public static String buildUnionQuery(MySQLiteQueryBuilder target) {
-		target = taint(); // $taintReachesReturn
-		String[] subQueries = {taint()}; // $taintReachesReturn
-		String sortOrder = taint(); // $taintReachesReturn
-		String limit = taint(); // $taintReachesReturn
+		target = taint(); // $ taintReachesReturn
+		String[] subQueries = {taint()}; // $ taintReachesReturn
+		String sortOrder = taint(); // $ taintReachesReturn
+		String limit = taint(); // $ taintReachesReturn
 		return target.buildUnionQuery(subQueries, sortOrder, limit);
 	}
 
 	public static String buildUnionSubQuery2(MySQLiteQueryBuilder target) {
-		target = taint(); // $taintReachesReturn
-		String typeDiscriminatorColumn = taint(); // $taintReachesReturn
-		String[] unionColumns = {taint()}; // $taintReachesReturn
+		target = taint(); // $ taintReachesReturn
+		String typeDiscriminatorColumn = taint(); // $ taintReachesReturn
+		String[] unionColumns = {taint()}; // $ taintReachesReturn
 		Set<String> columnsPresentInTable = new HashSet();
-		columnsPresentInTable.add(taint()); // $taintReachesReturn
+		columnsPresentInTable.add(taint()); // $ taintReachesReturn
 		int computedColumnsOffset = taint();
-		String typeDiscriminatorValue = taint(); // $taintReachesReturn
-		String selection = taint(); // $taintReachesReturn
+		String typeDiscriminatorValue = taint(); // $ taintReachesReturn
+		String selection = taint(); // $ taintReachesReturn
 		String[] selectionArgs = {taint()};
-		String groupBy = taint(); // $taintReachesReturn
-		String having = taint(); // $taintReachesReturn
+		String groupBy = taint(); // $ taintReachesReturn
+		String having = taint(); // $ taintReachesReturn
 		return target.buildUnionSubQuery(typeDiscriminatorColumn, unionColumns, columnsPresentInTable,
 				computedColumnsOffset, typeDiscriminatorValue, selection, selectionArgs, groupBy, having);
 	}
 
 	public static String buildUnionSubQuery3(MySQLiteQueryBuilder target) {
-		target = taint(); // $taintReachesReturn 
-		String typeDiscriminatorColumn = taint(); // $taintReachesReturn
-		String[] unionColumns = {taint()}; // $taintReachesReturn
+		target = taint(); // $ taintReachesReturn
+		String typeDiscriminatorColumn = taint(); // $ taintReachesReturn
+		String[] unionColumns = {taint()}; // $ taintReachesReturn
 		Set<String> columnsPresentInTable = new HashSet();
-		columnsPresentInTable.add(taint()); // $taintReachesReturn
+		columnsPresentInTable.add(taint()); // $ taintReachesReturn
 		int computedColumnsOffset = taint();
-		String typeDiscriminatorValue = taint(); // $taintReachesReturn
-		String selection = taint(); // $taintReachesReturn
-		String groupBy = taint(); // $taintReachesReturn
-		String having = taint(); // $taintReachesReturn
+		String typeDiscriminatorValue = taint(); // $ taintReachesReturn
+		String selection = taint(); // $ taintReachesReturn
+		String groupBy = taint(); // $ taintReachesReturn
+		String having = taint(); // $ taintReachesReturn
 		return target.buildUnionSubQuery(typeDiscriminatorColumn, unionColumns, columnsPresentInTable, computedColumnsOffset,
 				typeDiscriminatorValue, selection, groupBy, having);
 	}
 
 	public static Cursor query(MyContentResolver target) {
-		Uri uri = taint(); // $taintReachesReturn
+		Uri uri = taint(); // $ taintReachesReturn
 		String[] projection = {taint()};
-		String selection = taint(); // $taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		String sortOrder = taint();
 		CancellationSignal cancellationSignal = taint();
@@ -126,9 +126,9 @@ public class FlowSteps {
 	}
 
 	public static Cursor query(MyContentProvider target) {
-		Uri uri = taint(); // $taintReachesReturn
+		Uri uri = taint(); // $ taintReachesReturn
 		String[] projection = {taint()};
-		String selection = taint(); // $taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		String sortOrder = taint();
 		CancellationSignal cancellationSignal = taint();
@@ -136,57 +136,57 @@ public class FlowSteps {
 	}
 
 	public static Cursor query2(MyContentResolver target) {
-		Uri uri = taint(); // $taintReachesReturn
+		Uri uri = taint(); // $ taintReachesReturn
 		String[] projection = {taint()};
-		String selection = taint(); // $taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		String sortOrder = taint();
 		return target.query(uri, projection, selection, selectionArgs, sortOrder);
 	}
 
 	public static Cursor query2(MyContentProvider target) {
-		Uri uri = taint(); // $taintReachesReturn
+		Uri uri = taint(); // $ taintReachesReturn
 		String[] projection = {taint()};
-		String selection = taint(); // $taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		String sortOrder = taint();
 		return target.query(uri, projection, selection, selectionArgs, sortOrder);
 	}
 
 	public static StringBuilder appendColumns() {
-		StringBuilder s = taint(); // $taintReachesReturn
-		String[] columns = {taint()}; // $taintReachesReturn
+		StringBuilder s = taint(); // $ taintReachesReturn
+		String[] columns = {taint()}; // $ taintReachesReturn
 		SQLiteQueryBuilder.appendColumns(s, columns);
 		return s;
 	}
 
 	public static SQLiteQueryBuilder setProjectionMap(MySQLiteQueryBuilder target) {
-		target = taint(); // $taintReachesReturn
-		Map<String, String> columnMap = new HashMap(); 
-		String k = taint(); // $taintReachesReturn
-		String v = taint(); // $taintReachesReturn
+		target = taint(); // $ taintReachesReturn
+		Map<String, String> columnMap = new HashMap();
+		String k = taint(); // $ taintReachesReturn
+		String v = taint(); // $ taintReachesReturn
 		columnMap.put(k, v);
 		target.setProjectionMap(columnMap);
 		return target;
 	}
 
 	public static SQLiteQueryBuilder setTables(MySQLiteQueryBuilder target) {
-		target = taint(); // $taintReachesReturn
-		String inTables = taint(); // $taintReachesReturn
+		target = taint(); // $ taintReachesReturn
+		String inTables = taint(); // $ taintReachesReturn
 		target.setTables(inTables);
 		return target;
 	}
 
 	public static SQLiteQueryBuilder appendWhere(MySQLiteQueryBuilder target) {
-		target = taint(); // $taintReachesReturn
-		CharSequence inWhere = taint(); // $taintReachesReturn
+		target = taint(); // $ taintReachesReturn
+		CharSequence inWhere = taint(); // $ taintReachesReturn
 		target.appendWhere(inWhere);
 		return target;
 	}
 
 	public static SQLiteQueryBuilder appendWhereStandalone(MySQLiteQueryBuilder target) {
-		target = taint(); // $taintReachesReturn
-		CharSequence inWhere = taint(); // $taintReachesReturn
+		target = taint(); // $ taintReachesReturn
+		CharSequence inWhere = taint(); // $ taintReachesReturn
 		target.appendWhereStandalone(inWhere);
 		return target;
 	}
diff --git a/java/ql/test/library-tests/frameworks/android/taint-database/Sinks.java b/java/ql/test/library-tests/frameworks/android/taint-database/Sinks.java
index d236368e089..61775f41556 100644
--- a/java/ql/test/library-tests/frameworks/android/taint-database/Sinks.java
+++ b/java/ql/test/library-tests/frameworks/android/taint-database/Sinks.java
@@ -25,58 +25,58 @@ public class Sinks {
 	}
 
 	public static void compileStatement(SQLiteDatabase target) {
-		String sql = taint(); // $taintReachesSink
+		String sql = taint(); // $ taintReachesSink
 		target.compileStatement(sql);
 	}
 
 	public static void delete1(MySQLiteQueryBuilder target) {
-		target = taint(); // $taintReachesSink
+		target = taint(); // $ taintReachesSink
 		SQLiteDatabase db = taint();
-		String selection = taint(); // $taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		target.delete(db, selection, selectionArgs);
 	}
 
 	public static void delete(SQLiteDatabase target) {
-		String table = taint(); // $taintReachesSink
-		String whereClause = taint(); // $taintReachesSink
+		String table = taint(); // $ taintReachesSink
+		String whereClause = taint(); // $ taintReachesSink
 		String[] whereArgs = {taint()};
 		target.delete(table, whereClause, whereArgs);
 	}
 
 	public static void delete(MyContentResolver target) {
 		Uri uri = taint();
-		String selection = taint(); // $taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		target.delete(uri, selection, selectionArgs);
 	}
 
 	public static void delete(MyContentProvider target) {
 		Uri uri = taint();
-		String selection = taint(); // $taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		target.delete(uri, selection, selectionArgs);
 	}
 
 	public static void execPerConnectionSQL(SQLiteDatabase target) {
-		String sql = taint(); // $taintReachesSink
+		String sql = taint(); // $ taintReachesSink
 		Object[] bindArgs = {taint()};
 		target.execPerConnectionSQL(sql, bindArgs);
 	}
 
 	public static void execSQL(SQLiteDatabase target) {
-		String sql = taint(); // $taintReachesSink
+		String sql = taint(); // $ taintReachesSink
 		target.execSQL(sql);
 	}
 
 	public static void execSQL2(SQLiteDatabase target) {
-		String sql = taint(); // $taintReachesSink
+		String sql = taint(); // $ taintReachesSink
 		Object[] bindArgs = {taint()};
 		target.execSQL(sql, bindArgs);
 	}
 
 	public static void insert(MySQLiteQueryBuilder target) {
-		target = taint();  // $taintReachesSink
+		target = taint();  // $ taintReachesSink
 		SQLiteDatabase db = taint();
 		ContentValues values = taint();
 		target.insert(db, values);
@@ -84,90 +84,90 @@ public class Sinks {
 
 	public static void query(SQLiteDatabase target) {
 		boolean distinct = taint();
-		String table = taint(); // $taintReachesSink
-		String[] columns = {taint()}; // $taintReachesSink
-		String selection = taint(); // $taintReachesSink
+		String table = taint(); // $ taintReachesSink
+		String[] columns = {taint()}; // $ taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
-		String groupBy = taint(); // $taintReachesSink
-		String having = taint(); // $taintReachesSink
-		String orderBy = taint(); // $taintReachesSink
-		String limit = taint(); // $taintReachesSink
+		String groupBy = taint(); // $ taintReachesSink
+		String having = taint(); // $ taintReachesSink
+		String orderBy = taint(); // $ taintReachesSink
+		String limit = taint(); // $ taintReachesSink
 		target.query(distinct, table, columns, selection, selectionArgs, groupBy, having, orderBy, limit);
 	}
 
 	public static void query2(SQLiteDatabase target) {
 		boolean distinct = taint();
-		String table = taint(); // $taintReachesSink
-		String[] columns = {taint()}; // $taintReachesSink
-		String selection = taint(); // $taintReachesSink
+		String table = taint(); // $ taintReachesSink
+		String[] columns = {taint()}; // $ taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
-		String groupBy = taint(); // $taintReachesSink
-		String having = taint(); // $taintReachesSink
-		String orderBy = taint(); // $taintReachesSink
-		String limit = taint(); // $taintReachesSink
+		String groupBy = taint(); // $ taintReachesSink
+		String having = taint(); // $ taintReachesSink
+		String orderBy = taint(); // $ taintReachesSink
+		String limit = taint(); // $ taintReachesSink
 		CancellationSignal cancellationSignal = taint();
 		target.query(distinct, table, columns, selection, selectionArgs, groupBy, having, orderBy, limit,
 				cancellationSignal);
 	}
 
 	public static void query3(SQLiteDatabase target) {
-		String table = taint(); // $taintReachesSink
-		String[] columns = {taint()}; // $taintReachesSink
-		String selection = taint(); // $taintReachesSink
+		String table = taint(); // $ taintReachesSink
+		String[] columns = {taint()}; // $ taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
-		String groupBy = taint(); // $taintReachesSink
-		String having = taint(); // $taintReachesSink
-		String orderBy = taint(); // $taintReachesSink
+		String groupBy = taint(); // $ taintReachesSink
+		String having = taint(); // $ taintReachesSink
+		String orderBy = taint(); // $ taintReachesSink
 		target.query(table, columns, selection, selectionArgs, groupBy, having, orderBy);
 	}
 
 	public static void query4(SQLiteDatabase target) {
-		String table = taint(); // $taintReachesSink
-		String[] columns = {taint()}; // $taintReachesSink
-		String selection = taint(); // $taintReachesSink
+		String table = taint(); // $ taintReachesSink
+		String[] columns = {taint()}; // $ taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
-		String groupBy = taint(); // $taintReachesSink
-		String having = taint(); // $taintReachesSink
-		String orderBy = taint(); // $taintReachesSink
-		String limit = taint(); // $taintReachesSink
+		String groupBy = taint(); // $ taintReachesSink
+		String having = taint(); // $ taintReachesSink
+		String orderBy = taint(); // $ taintReachesSink
+		String limit = taint(); // $ taintReachesSink
 		target.query(table, columns, selection, selectionArgs, groupBy, having, orderBy, limit);
 	}
 
 	public static void query(MySQLiteQueryBuilder target) {
-		target = taint();  // $taintReachesSink
+		target = taint();  // $ taintReachesSink
 		SQLiteDatabase db = taint();
-		String[] projectionIn = {taint()}; // $taintReachesSink
-		String selection = taint(); // $taintReachesSink
+		String[] projectionIn = {taint()}; // $ taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
-		String groupBy = taint(); // $taintReachesSink
-		String having = taint(); // $taintReachesSink
-		String sortOrder = taint(); // $taintReachesSink
+		String groupBy = taint(); // $ taintReachesSink
+		String having = taint(); // $ taintReachesSink
+		String sortOrder = taint(); // $ taintReachesSink
 		target.query(db, projectionIn, selection, selectionArgs, groupBy, having, sortOrder);
 	}
 
 	public static void query2(MySQLiteQueryBuilder target) {
-		target = taint(); // $taintReachesSink
+		target = taint(); // $ taintReachesSink
 		SQLiteDatabase db = taint();
-		String[] projectionIn = {taint()}; // $taintReachesSink
-		String selection = taint(); // $taintReachesSink
+		String[] projectionIn = {taint()}; // $ taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
-		String groupBy = taint(); // $taintReachesSink
-		String having = taint(); // $taintReachesSink
-		String sortOrder = taint(); // $taintReachesSink
-		String limit = taint(); // $taintReachesSink
+		String groupBy = taint(); // $ taintReachesSink
+		String having = taint(); // $ taintReachesSink
+		String sortOrder = taint(); // $ taintReachesSink
+		String limit = taint(); // $ taintReachesSink
 		target.query(db, projectionIn, selection, selectionArgs, groupBy, having, sortOrder, limit);
 	}
 
 	public static void query3(MySQLiteQueryBuilder target) {
-		target = taint();  // $taintReachesSink
+		target = taint();  // $ taintReachesSink
 		SQLiteDatabase db = taint();
-		String[] projectionIn = {taint()}; // $taintReachesSink
-		String selection = taint(); // $taintReachesSink
+		String[] projectionIn = {taint()}; // $ taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
-		String groupBy = taint(); // $taintReachesSink
-		String having = taint(); // $taintReachesSink
-		String sortOrder = taint(); // $taintReachesSink
-		String limit = taint(); // $taintReachesSink
+		String groupBy = taint(); // $ taintReachesSink
+		String having = taint(); // $ taintReachesSink
+		String sortOrder = taint(); // $ taintReachesSink
+		String limit = taint(); // $ taintReachesSink
 		CancellationSignal cancellationSignal = taint();
 		target.query(db, projectionIn, selection, selectionArgs, groupBy, having, sortOrder, limit, cancellationSignal);
 	}
@@ -175,7 +175,7 @@ public class Sinks {
 	public static void query3(MyContentProvider target) {
 		Uri uri = taint();
 		String[] projection = {taint()};
-		String selection = taint(); // $taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		String sortOrder = taint();
 		target.query(uri, projection, selection, selectionArgs, sortOrder);
@@ -184,7 +184,7 @@ public class Sinks {
 	public static void query(MyContentProvider target) {
 		Uri uri = taint();
 		String[] projection = {taint()};
-		String selection = taint(); // $taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		String sortOrder = taint();
 		CancellationSignal cancellationSignal = taint();
@@ -194,7 +194,7 @@ public class Sinks {
 	public static void query3(MyContentResolver target) {
 		Uri uri = taint();
 		String[] projection = {taint()};
-		String selection = taint(); // $taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		String sortOrder = taint();
 		target.query(uri, projection, selection, selectionArgs, sortOrder);
@@ -203,7 +203,7 @@ public class Sinks {
 	public static void query(MyContentResolver target) {
 		Uri uri = taint();
 		String[] projection = {taint()};
-		String selection = taint(); // $taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		String sortOrder = taint();
 		CancellationSignal cancellationSignal = taint();
@@ -213,14 +213,14 @@ public class Sinks {
 	public static void queryWithFactory(SQLiteDatabase target) {
 		SQLiteDatabase.CursorFactory cursorFactory = taint();
 		boolean distinct = taint();
-		String table = taint(); // $taintReachesSink
-		String[] columns = {taint()}; // $taintReachesSink
-		String selection = taint(); // $taintReachesSink
+		String table = taint(); // $ taintReachesSink
+		String[] columns = {taint()}; // $ taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
-		String groupBy = taint(); // $taintReachesSink
-		String having = taint(); // $taintReachesSink
-		String orderBy = taint(); // $taintReachesSink
-		String limit = taint(); // $taintReachesSink
+		String groupBy = taint(); // $ taintReachesSink
+		String having = taint(); // $ taintReachesSink
+		String orderBy = taint(); // $ taintReachesSink
+		String limit = taint(); // $ taintReachesSink
 		target.queryWithFactory(cursorFactory, distinct, table, columns, selection, selectionArgs, groupBy, having,
 				orderBy, limit);
 	}
@@ -228,27 +228,27 @@ public class Sinks {
 	public static void queryWithFactory2(SQLiteDatabase target) {
 		SQLiteDatabase.CursorFactory cursorFactory = taint();
 		boolean distinct = taint();
-		String table = taint(); // $taintReachesSink
-		String[] columns = {taint()}; // $taintReachesSink
-		String selection = taint(); // $taintReachesSink
+		String table = taint(); // $ taintReachesSink
+		String[] columns = {taint()}; // $ taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
-		String groupBy = taint(); // $taintReachesSink
-		String having = taint(); // $taintReachesSink
-		String orderBy = taint(); // $taintReachesSink
-		String limit = taint(); // $taintReachesSink
+		String groupBy = taint(); // $ taintReachesSink
+		String having = taint(); // $ taintReachesSink
+		String orderBy = taint(); // $ taintReachesSink
+		String limit = taint(); // $ taintReachesSink
 		CancellationSignal cancellationSignal = taint();
 		target.queryWithFactory(cursorFactory, distinct, table, columns, selection, selectionArgs, groupBy, having,
 				orderBy, limit, cancellationSignal);
 	}
 
 	public static void rawQuery(SQLiteDatabase target) {
-		String sql = taint(); // $taintReachesSink
+		String sql = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		target.rawQuery(sql, selectionArgs);
 	}
 
 	public static void rawQuery2(SQLiteDatabase target) {
-		String sql = taint(); // $taintReachesSink
+		String sql = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		CancellationSignal cancellationSignal = taint();
 		target.rawQuery(sql, selectionArgs, cancellationSignal);
@@ -256,7 +256,7 @@ public class Sinks {
 
 	public static void rawQueryWithFactory(SQLiteDatabase target) {
 		SQLiteDatabase.CursorFactory cursorFactory = taint();
-		String sql = taint(); // $taintReachesSink
+		String sql = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		String editTable = taint();
 		target.rawQueryWithFactory(cursorFactory, sql, selectionArgs, editTable);
@@ -264,7 +264,7 @@ public class Sinks {
 
 	public static void rawQueryWithFactory2(SQLiteDatabase target) {
 		SQLiteDatabase.CursorFactory cursorFactory = taint();
-		String sql = taint(); // $taintReachesSink
+		String sql = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		String editTable = taint();
 		CancellationSignal cancellationSignal = taint();
@@ -272,18 +272,18 @@ public class Sinks {
 	}
 
 	public static void update(MySQLiteQueryBuilder target) {
-		target = taint(); // $taintReachesSink
+		target = taint(); // $ taintReachesSink
 		SQLiteDatabase db = taint();
 		ContentValues values = taint();
-		String selection = taint(); // $taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		target.update(db, values, selection, selectionArgs);
 	}
 
 	public static void update(SQLiteDatabase target) {
-		String table = taint(); // $taintReachesSink
+		String table = taint(); // $ taintReachesSink
 		ContentValues values = taint();
-		String whereClause = taint(); // $taintReachesSink
+		String whereClause = taint(); // $ taintReachesSink
 		String[] whereArgs = {taint()};
 		target.update(table, values, whereClause, whereArgs);
 	}
@@ -291,7 +291,7 @@ public class Sinks {
 	public static void update(MyContentResolver target) {
 		Uri uri = taint();
 		ContentValues values = taint();
-		String selection = taint(); // $taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		target.update(uri, values, selection, selectionArgs);
 	}
@@ -299,15 +299,15 @@ public class Sinks {
 	public static void update(MyContentProvider target) {
 		Uri uri = taint();
 		ContentValues values = taint();
-		String selection = taint(); // $taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		target.update(uri, values, selection, selectionArgs);
 	}
 
 	public static void updateWithOnConflict(SQLiteDatabase target) {
-		String table = taint(); // $taintReachesSink
+		String table = taint(); // $ taintReachesSink
 		ContentValues values = taint();
-		String whereClause = taint(); // $taintReachesSink
+		String whereClause = taint(); // $ taintReachesSink
 		String[] whereArgs = {taint()};
 		int conflictAlgorithm = taint();
 		target.updateWithOnConflict(table, values, whereClause, whereArgs, conflictAlgorithm);
@@ -315,15 +315,15 @@ public class Sinks {
 
 	public static void queryNumEntries() {
 		SQLiteDatabase db = taint();
-		String table = taint(); // $taintReachesSink
-		String selection = taint(); // $taintReachesSink
+		String table = taint(); // $ taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		DatabaseUtils.queryNumEntries(db, table, selection);
 	}
 
 	public static void queryNumEntries2() {
 		SQLiteDatabase db = taint();
-		String table = taint(); // $taintReachesSink
-		String selection = taint(); // $taintReachesSink
+		String table = taint(); // $ taintReachesSink
+		String selection = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		DatabaseUtils.queryNumEntries(db, table, selection, selectionArgs);
 	}
@@ -332,27 +332,27 @@ public class Sinks {
 		Context context = taint();
 		String dbName = taint();
 		int dbVersion = taint();
-		String sqlStatements = taint(); // $taintReachesSink
+		String sqlStatements = taint(); // $ taintReachesSink
 		DatabaseUtils.createDbFromSqlStatements(context, dbName, dbVersion, sqlStatements);
 	}
 
 	public static void blobFileDescriptorForQuery() {
 		SQLiteDatabase db = taint();
-		String query = taint(); // $taintReachesSink
+		String query = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		DatabaseUtils.blobFileDescriptorForQuery(db, query, selectionArgs);
 	}
 
 	public static void longForQuery() {
 		SQLiteDatabase db = taint();
-		String query = taint(); // $taintReachesSink
+		String query = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		DatabaseUtils.longForQuery(db, query, selectionArgs);
 	}
 
 	public static void stringForQuery() {
 		SQLiteDatabase db = taint();
-		String query = taint(); // $taintReachesSink
+		String query = taint(); // $ taintReachesSink
 		String[] selectionArgs = {taint()};
 		DatabaseUtils.stringForQuery(db, query, selectionArgs);
 	}
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/ArrayUtilsTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/ArrayUtilsTest.java
index c37d5844232..d54f3b2942e 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/ArrayUtilsTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/ArrayUtilsTest.java
@@ -20,56 +20,56 @@ class ArrayUtilsTest {
       String[] alreadyTainted = new String[] { taint() };
       String[] clean = new String[] { "Untainted" };
 
-      sink(ArrayUtils.add(clean, 0, taint())); // $hasTaintFlow
-      sink(ArrayUtils.add(alreadyTainted, 0, "clean")); // $hasTaintFlow
+      sink(ArrayUtils.add(clean, 0, taint())); // $ hasTaintFlow
+      sink(ArrayUtils.add(alreadyTainted, 0, "clean")); // $ hasTaintFlow
       sink(ArrayUtils.add(clean, IntSource.taint(), "clean")); // Index argument does not contribute taint
-      sink(ArrayUtils.add(clean, taint())); // $hasTaintFlow
-      sink(ArrayUtils.add(alreadyTainted, "clean")); // $hasTaintFlow
-      sink(ArrayUtils.addAll(clean, "clean", taint())); // $hasTaintFlow
-      sink(ArrayUtils.addAll(clean, taint(), "clean")); // $hasTaintFlow
-      sink(ArrayUtils.addAll(alreadyTainted, "clean", "also clean")); // $hasTaintFlow
-      sink(ArrayUtils.addFirst(clean, taint())); // $hasTaintFlow
-      sink(ArrayUtils.addFirst(alreadyTainted, "clean")); // $hasTaintFlow
-      sink(ArrayUtils.clone(alreadyTainted)); // $hasTaintFlow
-      sink(ArrayUtils.get(alreadyTainted, 0)); // $hasValueFlow
+      sink(ArrayUtils.add(clean, taint())); // $ hasTaintFlow
+      sink(ArrayUtils.add(alreadyTainted, "clean")); // $ hasTaintFlow
+      sink(ArrayUtils.addAll(clean, "clean", taint())); // $ hasTaintFlow
+      sink(ArrayUtils.addAll(clean, taint(), "clean")); // $ hasTaintFlow
+      sink(ArrayUtils.addAll(alreadyTainted, "clean", "also clean")); // $ hasTaintFlow
+      sink(ArrayUtils.addFirst(clean, taint())); // $ hasTaintFlow
+      sink(ArrayUtils.addFirst(alreadyTainted, "clean")); // $ hasTaintFlow
+      sink(ArrayUtils.clone(alreadyTainted)); // $ hasTaintFlow
+      sink(ArrayUtils.get(alreadyTainted, 0)); // $ hasValueFlow
       sink(ArrayUtils.get(clean, IntSource.taint())); // Index argument does not contribute taint
-      sink(ArrayUtils.get(alreadyTainted, 0, "default value")); // $hasValueFlow
+      sink(ArrayUtils.get(alreadyTainted, 0, "default value")); // $ hasValueFlow
       sink(ArrayUtils.get(clean, IntSource.taint(), "default value")); // Index argument does not contribute taint
-      sink(ArrayUtils.get(clean, 0, taint())); // $hasValueFlow
+      sink(ArrayUtils.get(clean, 0, taint())); // $ hasValueFlow
       sink(ArrayUtils.insert(IntSource.taint(), clean, "value1", "value2")); // Index argument does not contribute taint
-      sink(ArrayUtils.insert(0, alreadyTainted, "value1", "value2")); // $hasTaintFlow
-      sink(ArrayUtils.insert(0, clean, taint(), "value2")); // $hasTaintFlow
-      sink(ArrayUtils.insert(0, clean, "value1", taint())); // $hasTaintFlow
-      sink(ArrayUtils.nullToEmpty(alreadyTainted)); // $hasTaintFlow
-      sink(ArrayUtils.nullToEmpty(alreadyTainted, String[].class)); // $hasTaintFlow
-      sink(ArrayUtils.remove(alreadyTainted, 0)); // $hasTaintFlow
+      sink(ArrayUtils.insert(0, alreadyTainted, "value1", "value2")); // $ hasTaintFlow
+      sink(ArrayUtils.insert(0, clean, taint(), "value2")); // $ hasTaintFlow
+      sink(ArrayUtils.insert(0, clean, "value1", taint())); // $ hasTaintFlow
+      sink(ArrayUtils.nullToEmpty(alreadyTainted)); // $ hasTaintFlow
+      sink(ArrayUtils.nullToEmpty(alreadyTainted, String[].class)); // $ hasTaintFlow
+      sink(ArrayUtils.remove(alreadyTainted, 0)); // $ hasTaintFlow
       sink(ArrayUtils.remove(clean, IntSource.taint())); // Index argument does not contribute taint
-      sink(ArrayUtils.removeAll(alreadyTainted, 0, 1)); // $hasTaintFlow
+      sink(ArrayUtils.removeAll(alreadyTainted, 0, 1)); // $ hasTaintFlow
       sink(ArrayUtils.removeAll(clean, IntSource.taint(), 1)); // Index argument does not contribute taint
       sink(ArrayUtils.removeAll(clean, 0, IntSource.taint())); // Index argument does not contribute taint
       sink(ArrayUtils.removeAllOccurences(clean, taint())); // Removed argument does not contribute taint
-      sink(ArrayUtils.removeAllOccurences(alreadyTainted, "value to remove")); // $hasTaintFlow
+      sink(ArrayUtils.removeAllOccurences(alreadyTainted, "value to remove")); // $ hasTaintFlow
       sink(ArrayUtils.removeAllOccurrences(clean, taint())); // Removed argument does not contribute taint
-      sink(ArrayUtils.removeAllOccurrences(alreadyTainted, "value to remove")); // $hasTaintFlow
+      sink(ArrayUtils.removeAllOccurrences(alreadyTainted, "value to remove")); // $ hasTaintFlow
       sink(ArrayUtils.removeElement(clean, taint())); // Removed argument does not contribute taint
-      sink(ArrayUtils.removeElement(alreadyTainted, "value to remove")); // $hasTaintFlow
-      sink(ArrayUtils.removeElements(alreadyTainted, 0, 1)); // $hasTaintFlow
+      sink(ArrayUtils.removeElement(alreadyTainted, "value to remove")); // $ hasTaintFlow
+      sink(ArrayUtils.removeElements(alreadyTainted, 0, 1)); // $ hasTaintFlow
       sink(ArrayUtils.removeElements(clean, IntSource.taint(), 1)); // Index argument does not contribute taint
       sink(ArrayUtils.removeElements(clean, 0, IntSource.taint())); // Index argument does not contribute taint
-      sink(ArrayUtils.subarray(alreadyTainted, 0, 0)); // $hasTaintFlow
+      sink(ArrayUtils.subarray(alreadyTainted, 0, 0)); // $ hasTaintFlow
       sink(ArrayUtils.subarray(clean, IntSource.taint(), IntSource.taint())); // Index arguments do not contribute taint
-      sink(ArrayUtils.toArray("clean", taint())); // $hasTaintFlow
-      sink(ArrayUtils.toArray(taint(), "clean")); // $hasTaintFlow
-      sink(ArrayUtils.toMap(alreadyTainted).get("key")); // $hasTaintFlow
+      sink(ArrayUtils.toArray("clean", taint())); // $ hasTaintFlow
+      sink(ArrayUtils.toArray(taint(), "clean")); // $ hasTaintFlow
+      sink(ArrayUtils.toMap(alreadyTainted).get("key")); // $ hasTaintFlow
 
       // Check that none of the above had an effect on `clean`:
       sink(clean);
 
       int[] taintedInts = new int[] { IntSource.taint() };
       Integer[] taintedBoxedInts = ArrayUtils.toObject(taintedInts);
-      sink(taintedBoxedInts); // $hasTaintFlow
-      sink(ArrayUtils.toPrimitive(taintedBoxedInts)); // $hasTaintFlow
-      sink(ArrayUtils.toPrimitive(new Integer[] {}, IntSource.taint())); // $hasTaintFlow
+      sink(taintedBoxedInts); // $ hasTaintFlow
+      sink(ArrayUtils.toPrimitive(taintedBoxedInts)); // $ hasTaintFlow
+      sink(ArrayUtils.toPrimitive(new Integer[] {}, IntSource.taint())); // $ hasTaintFlow
 
     }
   }
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/MutableTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/MutableTest.java
index 76db0fee0e7..30332dcc5f7 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/MutableTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/MutableTest.java
@@ -17,14 +17,14 @@ class MutableTest {
       Mutable<String> taintSetAlias = taintSet;
       Mutable<String> taintClearedAlias = taintCleared;
 
-      sink(tainted.getValue()); // $hasValueFlow
-      sink(taintedAlias.getValue()); // $hasValueFlow
-      sink(taintSet.getValue()); // $hasValueFlow
-      sink(taintSetAlias.getValue()); // $hasValueFlow
+      sink(tainted.getValue()); // $ hasValueFlow
+      sink(taintedAlias.getValue()); // $ hasValueFlow
+      sink(taintSet.getValue()); // $ hasValueFlow
+      sink(taintSetAlias.getValue()); // $ hasValueFlow
       // These two cases don't work currently because synthetic fields are always weakly updated,
       // so no taint clearing takes place.
-      sink(taintCleared.getValue()); // $SPURIOUS: hasValueFlow
-      sink(taintClearedAlias.getValue()); // $SPURIOUS: hasValueFlow
+      sink(taintCleared.getValue()); // $ SPURIOUS: hasValueFlow
+      sink(taintClearedAlias.getValue()); // $ SPURIOUS: hasValueFlow
 
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/ObjectUtilsTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/ObjectUtilsTest.java
index 5b2eda3c30f..6239bfb271d 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/ObjectUtilsTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/ObjectUtilsTest.java
@@ -10,17 +10,17 @@ public class ObjectUtilsTest {
   void sink(Object o) {}
 
   void test() throws Exception {
-    sink(ObjectUtils.clone(taint())); // $hasValueFlow
-    sink(ObjectUtils.cloneIfPossible(taint())); // $hasValueFlow
-    sink(ObjectUtils.CONST(taint())); // $hasValueFlow
-    sink(ObjectUtils.CONST_SHORT(IntSource.taint())); // $hasValueFlow
-    sink(ObjectUtils.CONST_BYTE(IntSource.taint())); // $hasValueFlow
-    sink(ObjectUtils.defaultIfNull(taint(), null)); // $hasValueFlow
-    sink(ObjectUtils.defaultIfNull(null, taint())); // $hasValueFlow
+    sink(ObjectUtils.clone(taint())); // $ hasValueFlow
+    sink(ObjectUtils.cloneIfPossible(taint())); // $ hasValueFlow
+    sink(ObjectUtils.CONST(taint())); // $ hasValueFlow
+    sink(ObjectUtils.CONST_SHORT(IntSource.taint())); // $ hasValueFlow
+    sink(ObjectUtils.CONST_BYTE(IntSource.taint())); // $ hasValueFlow
+    sink(ObjectUtils.defaultIfNull(taint(), null)); // $ hasValueFlow
+    sink(ObjectUtils.defaultIfNull(null, taint())); // $ hasValueFlow
     sink(ObjectUtils.firstNonNull(taint(), null, null)); // $ hasValueFlow
     sink(ObjectUtils.firstNonNull(null, taint(), null)); // $ hasValueFlow
     sink(ObjectUtils.firstNonNull(null, null, taint())); // $ hasValueFlow
-    sink(ObjectUtils.getIfNull(taint(), null)); // $hasValueFlow
+    sink(ObjectUtils.getIfNull(taint(), null)); // $ hasValueFlow
     sink(ObjectUtils.max(taint(), null, null)); // $ hasValueFlow
     sink(ObjectUtils.max(null, taint(), null)); // $ hasValueFlow
     sink(ObjectUtils.max(null, null, taint())); // $ hasValueFlow
@@ -33,9 +33,9 @@ public class ObjectUtilsTest {
     sink(ObjectUtils.mode(taint(), null, null)); // $ hasValueFlow
     sink(ObjectUtils.mode(null, taint(), null)); // $ hasValueFlow
     sink(ObjectUtils.mode(null, null, taint())); // $ hasValueFlow
-    sink(ObjectUtils.requireNonEmpty(taint(), "message")); // $hasValueFlow
+    sink(ObjectUtils.requireNonEmpty(taint(), "message")); // $ hasValueFlow
     sink(ObjectUtils.requireNonEmpty("not null", taint())); // GOOD (message doesn't propagate to the return)
     sink(ObjectUtils.toString(taint(), "default string")); // GOOD (first argument is stringified)
-    sink(ObjectUtils.toString(null, taint())); // $hasValueFlow
+    sink(ObjectUtils.toString(null, taint())); // $ hasValueFlow
   }
 }
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/PairTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/PairTest.java
index 6db15beb181..a3a25326191 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/PairTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/PairTest.java
@@ -25,60 +25,60 @@ class PairTest {
       ImmutablePair<String, String> taintedRight4 = new ImmutablePair("clean-left", taint());
 
       // Check flow through ImmutablePairs:
-      sink(taintedLeft.getLeft()); // $hasValueFlow
+      sink(taintedLeft.getLeft()); // $ hasValueFlow
       sink(taintedLeft.getRight());
-      sink(taintedLeft.getKey()); // $hasValueFlow
+      sink(taintedLeft.getKey()); // $ hasValueFlow
       sink(taintedLeft.getValue());
-      sink(taintedLeft.left); // $hasValueFlow
+      sink(taintedLeft.left); // $ hasValueFlow
       sink(taintedLeft.right);
       sink(taintedRight.getLeft());
-      sink(taintedRight.getRight()); // $hasValueFlow
+      sink(taintedRight.getRight()); // $ hasValueFlow
       sink(taintedRight.getKey());
-      sink(taintedRight.getValue()); // $hasValueFlow
+      sink(taintedRight.getValue()); // $ hasValueFlow
       sink(taintedRight.left);
-      sink(taintedRight.right); // $hasValueFlow
-      sink(taintedLeft2.getLeft()); // $hasValueFlow
+      sink(taintedRight.right); // $ hasValueFlow
+      sink(taintedLeft2.getLeft()); // $ hasValueFlow
       sink(taintedLeft2.getRight());
-      sink(taintedLeft2.getKey()); // $hasValueFlow
+      sink(taintedLeft2.getKey()); // $ hasValueFlow
       sink(taintedLeft2.getValue());
-      sink(taintedLeft2.left); // $hasValueFlow
+      sink(taintedLeft2.left); // $ hasValueFlow
       sink(taintedLeft2.right);
       sink(taintedRight2.getLeft());
-      sink(taintedRight2.getRight()); // $hasValueFlow
+      sink(taintedRight2.getRight()); // $ hasValueFlow
       sink(taintedRight2.getKey());
-      sink(taintedRight2.getValue()); // $hasValueFlow
+      sink(taintedRight2.getValue()); // $ hasValueFlow
       sink(taintedRight2.left);
-      sink(taintedRight2.right); // $hasValueFlow
-      sink(taintedLeft3.getLeft()); // $hasValueFlow
+      sink(taintedRight2.right); // $ hasValueFlow
+      sink(taintedLeft3.getLeft()); // $ hasValueFlow
       sink(taintedLeft3.getRight());
-      sink(taintedLeft3.getKey()); // $hasValueFlow
+      sink(taintedLeft3.getKey()); // $ hasValueFlow
       sink(taintedLeft3.getValue());
       sink(taintedRight3.getLeft());
-      sink(taintedRight3.getRight()); // $hasValueFlow
+      sink(taintedRight3.getRight()); // $ hasValueFlow
       sink(taintedRight3.getKey());
-      sink(taintedRight3.getValue()); // $hasValueFlow
-      sink(taintedLeft4.getLeft()); // $hasValueFlow
+      sink(taintedRight3.getValue()); // $ hasValueFlow
+      sink(taintedLeft4.getLeft()); // $ hasValueFlow
       sink(taintedLeft4.getRight());
-      sink(taintedLeft4.getKey()); // $hasValueFlow
+      sink(taintedLeft4.getKey()); // $ hasValueFlow
       sink(taintedLeft4.getValue());
-      sink(taintedLeft4.left); // $hasValueFlow
+      sink(taintedLeft4.left); // $ hasValueFlow
       sink(taintedLeft4.right);
       sink(taintedRight4.getLeft());
-      sink(taintedRight4.getRight()); // $hasValueFlow
+      sink(taintedRight4.getRight()); // $ hasValueFlow
       sink(taintedRight4.getKey());
-      sink(taintedRight4.getValue()); // $hasValueFlow
+      sink(taintedRight4.getValue()); // $ hasValueFlow
       sink(taintedRight4.left);
-      sink(taintedRight4.right); // $hasValueFlow
+      sink(taintedRight4.right); // $ hasValueFlow
 
       // Check flow also works via an alias of type Pair:
-      sink(taintedLeft2_.getLeft()); // $hasValueFlow
+      sink(taintedLeft2_.getLeft()); // $ hasValueFlow
       sink(taintedLeft2_.getRight());
-      sink(taintedLeft2_.getKey()); // $hasValueFlow
+      sink(taintedLeft2_.getKey()); // $ hasValueFlow
       sink(taintedLeft2_.getValue());
       sink(taintedRight2_.getLeft());
-      sink(taintedRight2_.getRight()); // $hasValueFlow
+      sink(taintedRight2_.getRight()); // $ hasValueFlow
       sink(taintedRight2_.getKey());
-      sink(taintedRight2_.getValue()); // $hasValueFlow
+      sink(taintedRight2_.getValue()); // $ hasValueFlow
 
       // Check flow through MutablePairs:
       MutablePair<String, String> taintedLeftMutable = MutablePair.of(taint(), "clean-right");
@@ -92,59 +92,59 @@ class PairTest {
       MutablePair<String, String> taintedLeftMutableConstructed = new MutablePair(taint(), "clean-right");
       MutablePair<String, String> taintedRightMutableConstructed = new MutablePair("clean-left", taint());
 
-      sink(taintedLeftMutable.getLeft()); // $hasValueFlow
+      sink(taintedLeftMutable.getLeft()); // $ hasValueFlow
       sink(taintedLeftMutable.getRight());
-      sink(taintedLeftMutable.getKey()); // $hasValueFlow
+      sink(taintedLeftMutable.getKey()); // $ hasValueFlow
       sink(taintedLeftMutable.getValue());
-      sink(taintedLeftMutable.left); // $hasValueFlow
+      sink(taintedLeftMutable.left); // $ hasValueFlow
       sink(taintedLeftMutable.right);
       sink(taintedRightMutable.getLeft());
-      sink(taintedRightMutable.getRight()); // $hasValueFlow
+      sink(taintedRightMutable.getRight()); // $ hasValueFlow
       sink(taintedRightMutable.getKey());
-      sink(taintedRightMutable.getValue()); // $hasValueFlow
+      sink(taintedRightMutable.getValue()); // $ hasValueFlow
       sink(taintedRightMutable.left);
-      sink(taintedRightMutable.right); // $hasValueFlow
-      sink(setTaintLeft.getLeft()); // $hasValueFlow
+      sink(taintedRightMutable.right); // $ hasValueFlow
+      sink(setTaintLeft.getLeft()); // $ hasValueFlow
       sink(setTaintLeft.getRight());
-      sink(setTaintLeft.getKey()); // $hasValueFlow
+      sink(setTaintLeft.getKey()); // $ hasValueFlow
       sink(setTaintLeft.getValue());
-      sink(setTaintLeft.left); // $hasValueFlow
+      sink(setTaintLeft.left); // $ hasValueFlow
       sink(setTaintLeft.right);
       sink(setTaintRight.getLeft());
-      sink(setTaintRight.getRight()); // $hasValueFlow
+      sink(setTaintRight.getRight()); // $ hasValueFlow
       sink(setTaintRight.getKey());
-      sink(setTaintRight.getValue()); // $hasValueFlow
+      sink(setTaintRight.getValue()); // $ hasValueFlow
       sink(setTaintRight.left);
-      sink(setTaintRight.right); // $hasValueFlow
+      sink(setTaintRight.right); // $ hasValueFlow
       sink(setTaintValue.getLeft());
-      sink(setTaintValue.getRight()); // $hasValueFlow
+      sink(setTaintValue.getRight()); // $ hasValueFlow
       sink(setTaintValue.getKey());
-      sink(setTaintValue.getValue()); // $hasValueFlow
+      sink(setTaintValue.getValue()); // $ hasValueFlow
       sink(setTaintValue.left);
-      sink(setTaintValue.right); // $hasValueFlow
-      sink(taintedLeftMutableConstructed.getLeft()); // $hasValueFlow
+      sink(setTaintValue.right); // $ hasValueFlow
+      sink(taintedLeftMutableConstructed.getLeft()); // $ hasValueFlow
       sink(taintedLeftMutableConstructed.getRight());
-      sink(taintedLeftMutableConstructed.getKey()); // $hasValueFlow
+      sink(taintedLeftMutableConstructed.getKey()); // $ hasValueFlow
       sink(taintedLeftMutableConstructed.getValue());
-      sink(taintedLeftMutableConstructed.left); // $hasValueFlow
+      sink(taintedLeftMutableConstructed.left); // $ hasValueFlow
       sink(taintedLeftMutableConstructed.right);
       sink(taintedRightMutableConstructed.getLeft());
-      sink(taintedRightMutableConstructed.getRight()); // $hasValueFlow
+      sink(taintedRightMutableConstructed.getRight()); // $ hasValueFlow
       sink(taintedRightMutableConstructed.getKey());
-      sink(taintedRightMutableConstructed.getValue()); // $hasValueFlow
+      sink(taintedRightMutableConstructed.getValue()); // $ hasValueFlow
       sink(taintedRightMutableConstructed.left);
-      sink(taintedRightMutableConstructed.right); // $hasValueFlow
+      sink(taintedRightMutableConstructed.right); // $ hasValueFlow
 
       // Check flow also works via an alias of type Pair:
       Pair<String, String> taintedLeftMutableAlias = taintedLeftMutable;
       Pair<String, String> taintedRightMutableAlias = taintedRightMutable;
-      sink(taintedLeftMutableAlias.getLeft()); // $hasValueFlow
+      sink(taintedLeftMutableAlias.getLeft()); // $ hasValueFlow
       sink(taintedLeftMutableAlias.getRight());
-      sink(taintedLeftMutableAlias.getKey()); // $hasValueFlow
+      sink(taintedLeftMutableAlias.getKey()); // $ hasValueFlow
       sink(taintedLeftMutableAlias.getValue());
       sink(taintedRightMutableAlias.getLeft());
-      sink(taintedRightMutableAlias.getRight()); // $hasValueFlow
+      sink(taintedRightMutableAlias.getRight()); // $ hasValueFlow
       sink(taintedRightMutableAlias.getKey());
-      sink(taintedRightMutableAlias.getValue()); // $hasValueFlow
+      sink(taintedRightMutableAlias.getValue()); // $ hasValueFlow
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/RegExUtilsTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/RegExUtilsTest.java
index 59db473d886..7e99dd2813b 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/RegExUtilsTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/RegExUtilsTest.java
@@ -10,21 +10,21 @@ public class RegExUtilsTest {
     Pattern cleanPattern = Pattern.compile("clean");
     Pattern taintedPattern = Pattern.compile(taint());
 
-    sink(RegExUtils.removeAll(taint(), cleanPattern)); // $hasTaintFlow
-    sink(RegExUtils.removeAll(taint(), "clean")); // $hasTaintFlow
-    sink(RegExUtils.removeFirst(taint(), cleanPattern)); // $hasTaintFlow
-    sink(RegExUtils.removeFirst(taint(), "clean")); // $hasTaintFlow
-    sink(RegExUtils.removePattern(taint(), "clean")); // $hasTaintFlow
-    sink(RegExUtils.replaceAll(taint(), cleanPattern, "replacement")); // $hasTaintFlow
-    sink(RegExUtils.replaceAll(taint(), "clean", "replacement")); // $hasTaintFlow
-    sink(RegExUtils.replaceFirst(taint(), cleanPattern, "replacement")); // $hasTaintFlow
-    sink(RegExUtils.replaceFirst(taint(), "clean", "replacement")); // $hasTaintFlow
-    sink(RegExUtils.replacePattern(taint(), "clean", "replacement")); // $hasTaintFlow
-    sink(RegExUtils.replaceAll("original", cleanPattern, taint())); // $hasTaintFlow
-    sink(RegExUtils.replaceAll("original", "clean", taint())); // $hasTaintFlow
-    sink(RegExUtils.replaceFirst("original", cleanPattern, taint())); // $hasTaintFlow
-    sink(RegExUtils.replaceFirst("original", "clean", taint())); // $hasTaintFlow
-    sink(RegExUtils.replacePattern("original", "clean", taint())); // $hasTaintFlow
+    sink(RegExUtils.removeAll(taint(), cleanPattern)); // $ hasTaintFlow
+    sink(RegExUtils.removeAll(taint(), "clean")); // $ hasTaintFlow
+    sink(RegExUtils.removeFirst(taint(), cleanPattern)); // $ hasTaintFlow
+    sink(RegExUtils.removeFirst(taint(), "clean")); // $ hasTaintFlow
+    sink(RegExUtils.removePattern(taint(), "clean")); // $ hasTaintFlow
+    sink(RegExUtils.replaceAll(taint(), cleanPattern, "replacement")); // $ hasTaintFlow
+    sink(RegExUtils.replaceAll(taint(), "clean", "replacement")); // $ hasTaintFlow
+    sink(RegExUtils.replaceFirst(taint(), cleanPattern, "replacement")); // $ hasTaintFlow
+    sink(RegExUtils.replaceFirst(taint(), "clean", "replacement")); // $ hasTaintFlow
+    sink(RegExUtils.replacePattern(taint(), "clean", "replacement")); // $ hasTaintFlow
+    sink(RegExUtils.replaceAll("original", cleanPattern, taint())); // $ hasTaintFlow
+    sink(RegExUtils.replaceAll("original", "clean", taint())); // $ hasTaintFlow
+    sink(RegExUtils.replaceFirst("original", cleanPattern, taint())); // $ hasTaintFlow
+    sink(RegExUtils.replaceFirst("original", "clean", taint())); // $ hasTaintFlow
+    sink(RegExUtils.replacePattern("original", "clean", taint())); // $ hasTaintFlow
     // Subsequent calls don't propagate taint, as regex search patterns don't propagate to the return value.
     sink(RegExUtils.removeAll("original", taintedPattern));
     sink(RegExUtils.removeAll("original", taint()));
@@ -42,4 +42,4 @@ public class RegExUtilsTest {
     sink(RegExUtils.replaceFirst("original", taint(), "replacement"));
     sink(RegExUtils.replacePattern("original", taint(), "replacement"));
   }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrBuilderTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrBuilderTest.java
index fe197b4f264..e402638655d 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrBuilderTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrBuilderTest.java
@@ -14,134 +14,134 @@ class StrBuilderTest {
 
     void test() throws Exception {
 
-        StrBuilder cons1 = new StrBuilder(taint()); sink(cons1.toString()); // $hasTaintFlow
+        StrBuilder cons1 = new StrBuilder(taint()); sink(cons1.toString()); // $ hasTaintFlow
 
-        StrBuilder sb1 = new StrBuilder(); sb1.append(taint().toCharArray()); sink(sb1.toString()); // $hasTaintFlow
-        StrBuilder sb2 = new StrBuilder(); sb2.append(taint().toCharArray(), 0, 0); sink(sb2.toString()); // $hasTaintFlow
+        StrBuilder sb1 = new StrBuilder(); sb1.append(taint().toCharArray()); sink(sb1.toString()); // $ hasTaintFlow
+        StrBuilder sb2 = new StrBuilder(); sb2.append(taint().toCharArray(), 0, 0); sink(sb2.toString()); // $ hasTaintFlow
         StrBuilder sb3 = new StrBuilder(); sb3.append(CharBuffer.wrap(taint().toCharArray())); sink(sb3.toString()); // $ hasTaintFlow
         StrBuilder sb4 = new StrBuilder(); sb4.append(CharBuffer.wrap(taint().toCharArray()), 0, 0); sink(sb4.toString()); // $ hasTaintFlow
-        StrBuilder sb5 = new StrBuilder(); sb5.append((CharSequence)taint()); sink(sb5.toString()); // $hasTaintFlow
-        StrBuilder sb6 = new StrBuilder(); sb6.append((CharSequence)taint(), 0, 0); sink(sb6.toString()); // $hasTaintFlow
-        StrBuilder sb7 = new StrBuilder(); sb7.append((Object)taint()); sink(sb7.toString()); // $hasTaintFlow
+        StrBuilder sb5 = new StrBuilder(); sb5.append((CharSequence)taint()); sink(sb5.toString()); // $ hasTaintFlow
+        StrBuilder sb6 = new StrBuilder(); sb6.append((CharSequence)taint(), 0, 0); sink(sb6.toString()); // $ hasTaintFlow
+        StrBuilder sb7 = new StrBuilder(); sb7.append((Object)taint()); sink(sb7.toString()); // $ hasTaintFlow
         {
             StrBuilder auxsb = new StrBuilder(); auxsb.append(taint());
-            StrBuilder sb8 = new StrBuilder(); sb8.append(auxsb); sink(sb8.toString()); // $hasTaintFlow
+            StrBuilder sb8 = new StrBuilder(); sb8.append(auxsb); sink(sb8.toString()); // $ hasTaintFlow
         }
-        StrBuilder sb9 = new StrBuilder(); sb9.append(new StringBuffer(taint())); sink(sb9.toString()); // $hasTaintFlow
-        StrBuilder sb10 = new StrBuilder(); sb10.append(new StringBuffer(taint()), 0, 0); sink(sb10.toString()); // $hasTaintFlow
-        StrBuilder sb11 = new StrBuilder(); sb11.append(new StringBuilder(taint())); sink(sb11.toString()); // $hasTaintFlow
-        StrBuilder sb12 = new StrBuilder(); sb12.append(new StringBuilder(taint()), 0, 0); sink(sb12.toString()); // $hasTaintFlow
-        StrBuilder sb13 = new StrBuilder(); sb13.append(taint()); sink(sb13.toString()); // $hasTaintFlow
-        StrBuilder sb14 = new StrBuilder(); sb14.append(taint(), 0, 0); sink(sb14.toString()); // $hasTaintFlow
-        StrBuilder sb15 = new StrBuilder(); sb15.append(taint(), "format", "args"); sink(sb15.toString()); // $hasTaintFlow
-        StrBuilder sb16 = new StrBuilder(); sb16.append("Format string", taint(), "args"); sink(sb16.toString()); // $hasTaintFlow
+        StrBuilder sb9 = new StrBuilder(); sb9.append(new StringBuffer(taint())); sink(sb9.toString()); // $ hasTaintFlow
+        StrBuilder sb10 = new StrBuilder(); sb10.append(new StringBuffer(taint()), 0, 0); sink(sb10.toString()); // $ hasTaintFlow
+        StrBuilder sb11 = new StrBuilder(); sb11.append(new StringBuilder(taint())); sink(sb11.toString()); // $ hasTaintFlow
+        StrBuilder sb12 = new StrBuilder(); sb12.append(new StringBuilder(taint()), 0, 0); sink(sb12.toString()); // $ hasTaintFlow
+        StrBuilder sb13 = new StrBuilder(); sb13.append(taint()); sink(sb13.toString()); // $ hasTaintFlow
+        StrBuilder sb14 = new StrBuilder(); sb14.append(taint(), 0, 0); sink(sb14.toString()); // $ hasTaintFlow
+        StrBuilder sb15 = new StrBuilder(); sb15.append(taint(), "format", "args"); sink(sb15.toString()); // $ hasTaintFlow
+        StrBuilder sb16 = new StrBuilder(); sb16.append("Format string", taint(), "args"); sink(sb16.toString()); // $ hasTaintFlow
         {
             List<String> taintedList = new ArrayList<>();
             taintedList.add(taint());
-            StrBuilder sb17 = new StrBuilder(); sb17.appendAll(taintedList); sink(sb17.toString()); // $hasTaintFlow
-            StrBuilder sb18 = new StrBuilder(); sb18.appendAll(taintedList.iterator()); sink(sb18.toString()); // $hasTaintFlow
+            StrBuilder sb17 = new StrBuilder(); sb17.appendAll(taintedList); sink(sb17.toString()); // $ hasTaintFlow
+            StrBuilder sb18 = new StrBuilder(); sb18.appendAll(taintedList.iterator()); sink(sb18.toString()); // $ hasTaintFlow
         }
-        StrBuilder sb19 = new StrBuilder(); sb19.appendAll("clean", taint()); sink(sb19.toString()); // $hasTaintFlow
-        StrBuilder sb20 = new StrBuilder(); sb20.appendAll(taint(), "clean"); sink(sb20.toString()); // $hasTaintFlow
-        StrBuilder sb21 = new StrBuilder(); sb21.appendFixedWidthPadLeft(taint(), 0, ' '); sink(sb21.toString()); // $hasTaintFlow
-        StrBuilder sb22 = new StrBuilder(); sb22.appendFixedWidthPadRight(taint(), 0, ' '); sink(sb22.toString()); // $hasTaintFlow
-        StrBuilder sb23 = new StrBuilder(); sb23.appendln(taint().toCharArray()); sink(sb23.toString()); // $hasTaintFlow
-        StrBuilder sb24 = new StrBuilder(); sb24.appendln(taint().toCharArray(), 0, 0); sink(sb24.toString()); // $hasTaintFlow
-        StrBuilder sb25 = new StrBuilder(); sb25.appendln((Object)taint()); sink(sb25.toString()); // $hasTaintFlow
+        StrBuilder sb19 = new StrBuilder(); sb19.appendAll("clean", taint()); sink(sb19.toString()); // $ hasTaintFlow
+        StrBuilder sb20 = new StrBuilder(); sb20.appendAll(taint(), "clean"); sink(sb20.toString()); // $ hasTaintFlow
+        StrBuilder sb21 = new StrBuilder(); sb21.appendFixedWidthPadLeft(taint(), 0, ' '); sink(sb21.toString()); // $ hasTaintFlow
+        StrBuilder sb22 = new StrBuilder(); sb22.appendFixedWidthPadRight(taint(), 0, ' '); sink(sb22.toString()); // $ hasTaintFlow
+        StrBuilder sb23 = new StrBuilder(); sb23.appendln(taint().toCharArray()); sink(sb23.toString()); // $ hasTaintFlow
+        StrBuilder sb24 = new StrBuilder(); sb24.appendln(taint().toCharArray(), 0, 0); sink(sb24.toString()); // $ hasTaintFlow
+        StrBuilder sb25 = new StrBuilder(); sb25.appendln((Object)taint()); sink(sb25.toString()); // $ hasTaintFlow
         {
             StrBuilder auxsb = new StrBuilder(); auxsb.appendln(taint());
-            StrBuilder sb26 = new StrBuilder(); sb26.appendln(auxsb); sink(sb26.toString()); // $hasTaintFlow
+            StrBuilder sb26 = new StrBuilder(); sb26.appendln(auxsb); sink(sb26.toString()); // $ hasTaintFlow
         }
-        StrBuilder sb27 = new StrBuilder(); sb27.appendln(new StringBuffer(taint())); sink(sb27.toString()); // $hasTaintFlow
-        StrBuilder sb28 = new StrBuilder(); sb28.appendln(new StringBuffer(taint()), 0, 0); sink(sb28.toString()); // $hasTaintFlow
-        StrBuilder sb29 = new StrBuilder(); sb29.appendln(new StringBuilder(taint())); sink(sb29.toString()); // $hasTaintFlow
-        StrBuilder sb30 = new StrBuilder(); sb30.appendln(new StringBuilder(taint()), 0, 0); sink(sb30.toString()); // $hasTaintFlow
-        StrBuilder sb31 = new StrBuilder(); sb31.appendln(taint()); sink(sb31.toString()); // $hasTaintFlow
-        StrBuilder sb32 = new StrBuilder(); sb32.appendln(taint(), 0, 0); sink(sb32.toString()); // $hasTaintFlow
-        StrBuilder sb33 = new StrBuilder(); sb33.appendln(taint(), "format", "args"); sink(sb33.toString()); // $hasTaintFlow
-        StrBuilder sb34 = new StrBuilder(); sb34.appendln("Format string", taint(), "args"); sink(sb34.toString()); // $hasTaintFlow
-        StrBuilder sb35 = new StrBuilder(); sb35.appendSeparator(taint()); sink(sb35.toString()); // $hasTaintFlow
-        StrBuilder sb36 = new StrBuilder(); sb36.appendSeparator(taint(), 0); sink(sb36.toString()); // $hasTaintFlow
-        StrBuilder sb37 = new StrBuilder(); sb37.appendSeparator(taint(), "default"); sink(sb37.toString()); // $hasTaintFlow
-        StrBuilder sb38 = new StrBuilder(); sb38.appendSeparator("", taint()); sink(sb38.toString()); // $hasTaintFlow
+        StrBuilder sb27 = new StrBuilder(); sb27.appendln(new StringBuffer(taint())); sink(sb27.toString()); // $ hasTaintFlow
+        StrBuilder sb28 = new StrBuilder(); sb28.appendln(new StringBuffer(taint()), 0, 0); sink(sb28.toString()); // $ hasTaintFlow
+        StrBuilder sb29 = new StrBuilder(); sb29.appendln(new StringBuilder(taint())); sink(sb29.toString()); // $ hasTaintFlow
+        StrBuilder sb30 = new StrBuilder(); sb30.appendln(new StringBuilder(taint()), 0, 0); sink(sb30.toString()); // $ hasTaintFlow
+        StrBuilder sb31 = new StrBuilder(); sb31.appendln(taint()); sink(sb31.toString()); // $ hasTaintFlow
+        StrBuilder sb32 = new StrBuilder(); sb32.appendln(taint(), 0, 0); sink(sb32.toString()); // $ hasTaintFlow
+        StrBuilder sb33 = new StrBuilder(); sb33.appendln(taint(), "format", "args"); sink(sb33.toString()); // $ hasTaintFlow
+        StrBuilder sb34 = new StrBuilder(); sb34.appendln("Format string", taint(), "args"); sink(sb34.toString()); // $ hasTaintFlow
+        StrBuilder sb35 = new StrBuilder(); sb35.appendSeparator(taint()); sink(sb35.toString()); // $ hasTaintFlow
+        StrBuilder sb36 = new StrBuilder(); sb36.appendSeparator(taint(), 0); sink(sb36.toString()); // $ hasTaintFlow
+        StrBuilder sb37 = new StrBuilder(); sb37.appendSeparator(taint(), "default"); sink(sb37.toString()); // $ hasTaintFlow
+        StrBuilder sb38 = new StrBuilder(); sb38.appendSeparator("", taint()); sink(sb38.toString()); // $ hasTaintFlow
         {
             StrBuilder auxsb = new StrBuilder(); auxsb.appendln(taint());
-            StrBuilder sb39 = new StrBuilder(); auxsb.appendTo(sb39); sink(sb39.toString()); // $hasTaintFlow
+            StrBuilder sb39 = new StrBuilder(); auxsb.appendTo(sb39); sink(sb39.toString()); // $ hasTaintFlow
         }
         {
             List<String> taintedList = new ArrayList<>();
             taintedList.add(taint());
-            StrBuilder sb40 = new StrBuilder(); sb40.appendWithSeparators(taintedList, ", "); sink(sb40.toString()); // $hasTaintFlow
-            StrBuilder sb41 = new StrBuilder(); sb41.appendWithSeparators(taintedList.iterator(), ", "); sink(sb41.toString()); // $hasTaintFlow
+            StrBuilder sb40 = new StrBuilder(); sb40.appendWithSeparators(taintedList, ", "); sink(sb40.toString()); // $ hasTaintFlow
+            StrBuilder sb41 = new StrBuilder(); sb41.appendWithSeparators(taintedList.iterator(), ", "); sink(sb41.toString()); // $ hasTaintFlow
             List<String> untaintedList = new ArrayList<>();
-            StrBuilder sb42 = new StrBuilder(); sb42.appendWithSeparators(untaintedList, taint()); sink(sb42.toString()); // $hasTaintFlow
-            StrBuilder sb43 = new StrBuilder(); sb43.appendWithSeparators(untaintedList.iterator(), taint()); sink(sb43.toString()); // $hasTaintFlow
+            StrBuilder sb42 = new StrBuilder(); sb42.appendWithSeparators(untaintedList, taint()); sink(sb42.toString()); // $ hasTaintFlow
+            StrBuilder sb43 = new StrBuilder(); sb43.appendWithSeparators(untaintedList.iterator(), taint()); sink(sb43.toString()); // $ hasTaintFlow
             String[] taintedArray = new String[] { taint() };
             String[] untaintedArray = new String[] {};
-            StrBuilder sb44 = new StrBuilder(); sb44.appendWithSeparators(taintedArray, ", "); sink(sb44.toString()); // $hasTaintFlow
-            StrBuilder sb45 = new StrBuilder(); sb45.appendWithSeparators(untaintedArray, taint()); sink(sb45.toString()); // $hasTaintFlow
+            StrBuilder sb44 = new StrBuilder(); sb44.appendWithSeparators(taintedArray, ", "); sink(sb44.toString()); // $ hasTaintFlow
+            StrBuilder sb45 = new StrBuilder(); sb45.appendWithSeparators(untaintedArray, taint()); sink(sb45.toString()); // $ hasTaintFlow
         }
         {
             StrBuilder sb46 = new StrBuilder(); sb46.append(taint());
             char[] target = new char[100];
             sb46.asReader().read(target);
-            sink(target); // $hasTaintFlow
+            sink(target); // $ hasTaintFlow
         }
-        StrBuilder sb47 = new StrBuilder(); sb47.append(taint()); sink(sb47.asTokenizer().next()); // $hasTaintFlow
-        StrBuilder sb48 = new StrBuilder(); sb48.append(taint()); sink(sb48.build()); // $hasTaintFlow
-        StrBuilder sb49 = new StrBuilder(); sb49.append(taint()); sink(sb49.getChars(null)); // $hasTaintFlow
+        StrBuilder sb47 = new StrBuilder(); sb47.append(taint()); sink(sb47.asTokenizer().next()); // $ hasTaintFlow
+        StrBuilder sb48 = new StrBuilder(); sb48.append(taint()); sink(sb48.build()); // $ hasTaintFlow
+        StrBuilder sb49 = new StrBuilder(); sb49.append(taint()); sink(sb49.getChars(null)); // $ hasTaintFlow
         {
             StrBuilder sb50 = new StrBuilder(); sb50.append(taint());
             char[] target = new char[100];
             sb50.getChars(target);
-            sink(target); // $hasTaintFlow
+            sink(target); // $ hasTaintFlow
         }
         {
             StrBuilder sb51 = new StrBuilder(); sb51.append(taint());
             char[] target = new char[100];
             sb51.getChars(0, 0, target, 0);
-            sink(target); // $hasTaintFlow
+            sink(target); // $ hasTaintFlow
         }
-        StrBuilder sb52 = new StrBuilder(); sb52.insert(0, taint().toCharArray()); sink(sb52.toString()); // $hasTaintFlow
-        StrBuilder sb53 = new StrBuilder(); sb53.insert(0, taint().toCharArray(), 0, 0); sink(sb53.toString()); // $hasTaintFlow
-        StrBuilder sb54 = new StrBuilder(); sb54.insert(0, taint()); sink(sb54.toString()); // $hasTaintFlow
-        StrBuilder sb55 = new StrBuilder(); sb55.insert(0, (Object)taint()); sink(sb55.toString()); // $hasTaintFlow
-        StrBuilder sb56 = new StrBuilder(); sb56.append(taint()); sink(sb56.leftString(0)); // $hasTaintFlow
-        StrBuilder sb57 = new StrBuilder(); sb57.append(taint()); sink(sb57.midString(0, 0)); // $hasTaintFlow
+        StrBuilder sb52 = new StrBuilder(); sb52.insert(0, taint().toCharArray()); sink(sb52.toString()); // $ hasTaintFlow
+        StrBuilder sb53 = new StrBuilder(); sb53.insert(0, taint().toCharArray(), 0, 0); sink(sb53.toString()); // $ hasTaintFlow
+        StrBuilder sb54 = new StrBuilder(); sb54.insert(0, taint()); sink(sb54.toString()); // $ hasTaintFlow
+        StrBuilder sb55 = new StrBuilder(); sb55.insert(0, (Object)taint()); sink(sb55.toString()); // $ hasTaintFlow
+        StrBuilder sb56 = new StrBuilder(); sb56.append(taint()); sink(sb56.leftString(0)); // $ hasTaintFlow
+        StrBuilder sb57 = new StrBuilder(); sb57.append(taint()); sink(sb57.midString(0, 0)); // $ hasTaintFlow
         {
             StringReader reader = new StringReader(taint());
-            StrBuilder sb58 = new StrBuilder(); sb58.readFrom(reader); sink(sb58.toString()); // $hasTaintFlow
+            StrBuilder sb58 = new StrBuilder(); sb58.readFrom(reader); sink(sb58.toString()); // $ hasTaintFlow
         }
-        StrBuilder sb59 = new StrBuilder(); sb59.replace(0, 0, taint()); sink(sb59.toString()); // $hasTaintFlow
-        StrBuilder sb60 = new StrBuilder(); sb60.replace(null, taint(), 0, 0, 0); sink(sb60.toString()); // $hasTaintFlow
-        StrBuilder sb61 = new StrBuilder(); sb61.replaceAll((StrMatcher)null, taint()); sink(sb61.toString()); // $hasTaintFlow
-        StrBuilder sb62 = new StrBuilder(); sb62.replaceAll("search", taint()); sink(sb62.toString()); // $hasTaintFlow
+        StrBuilder sb59 = new StrBuilder(); sb59.replace(0, 0, taint()); sink(sb59.toString()); // $ hasTaintFlow
+        StrBuilder sb60 = new StrBuilder(); sb60.replace(null, taint(), 0, 0, 0); sink(sb60.toString()); // $ hasTaintFlow
+        StrBuilder sb61 = new StrBuilder(); sb61.replaceAll((StrMatcher)null, taint()); sink(sb61.toString()); // $ hasTaintFlow
+        StrBuilder sb62 = new StrBuilder(); sb62.replaceAll("search", taint()); sink(sb62.toString()); // $ hasTaintFlow
         StrBuilder sb63 = new StrBuilder(); sb63.replaceAll(taint(), "replace"); sink(sb63.toString()); // GOOD (search string doesn't convey taint)
-        StrBuilder sb64 = new StrBuilder(); sb64.replaceFirst((StrMatcher)null, taint()); sink(sb64.toString()); // $hasTaintFlow
-        StrBuilder sb65 = new StrBuilder(); sb65.replaceFirst("search", taint()); sink(sb65.toString()); // $hasTaintFlow
+        StrBuilder sb64 = new StrBuilder(); sb64.replaceFirst((StrMatcher)null, taint()); sink(sb64.toString()); // $ hasTaintFlow
+        StrBuilder sb65 = new StrBuilder(); sb65.replaceFirst("search", taint()); sink(sb65.toString()); // $ hasTaintFlow
         StrBuilder sb66 = new StrBuilder(); sb66.replaceFirst(taint(), "replace"); sink(sb66.toString()); // GOOD (search string doesn't convey taint)
-        StrBuilder sb67 = new StrBuilder(); sb67.append(taint()); sink(sb67.rightString(0)); // $hasTaintFlow
-        StrBuilder sb68 = new StrBuilder(); sb68.append(taint()); sink(sb68.subSequence(0, 0)); // $hasTaintFlow
-        StrBuilder sb69 = new StrBuilder(); sb69.append(taint()); sink(sb69.substring(0)); // $hasTaintFlow
-        StrBuilder sb70 = new StrBuilder(); sb70.append(taint()); sink(sb70.substring(0, 0)); // $hasTaintFlow
-        StrBuilder sb71 = new StrBuilder(); sb71.append(taint()); sink(sb71.toCharArray()); // $hasTaintFlow
-        StrBuilder sb72 = new StrBuilder(); sb72.append(taint()); sink(sb72.toCharArray(0, 0)); // $hasTaintFlow
-        StrBuilder sb73 = new StrBuilder(); sb73.append(taint()); sink(sb73.toStringBuffer()); // $hasTaintFlow
-        StrBuilder sb74 = new StrBuilder(); sb74.append(taint()); sink(sb74.toStringBuilder()); // $hasTaintFlow
+        StrBuilder sb67 = new StrBuilder(); sb67.append(taint()); sink(sb67.rightString(0)); // $ hasTaintFlow
+        StrBuilder sb68 = new StrBuilder(); sb68.append(taint()); sink(sb68.subSequence(0, 0)); // $ hasTaintFlow
+        StrBuilder sb69 = new StrBuilder(); sb69.append(taint()); sink(sb69.substring(0)); // $ hasTaintFlow
+        StrBuilder sb70 = new StrBuilder(); sb70.append(taint()); sink(sb70.substring(0, 0)); // $ hasTaintFlow
+        StrBuilder sb71 = new StrBuilder(); sb71.append(taint()); sink(sb71.toCharArray()); // $ hasTaintFlow
+        StrBuilder sb72 = new StrBuilder(); sb72.append(taint()); sink(sb72.toCharArray(0, 0)); // $ hasTaintFlow
+        StrBuilder sb73 = new StrBuilder(); sb73.append(taint()); sink(sb73.toStringBuffer()); // $ hasTaintFlow
+        StrBuilder sb74 = new StrBuilder(); sb74.append(taint()); sink(sb74.toStringBuilder()); // $ hasTaintFlow
 
         // Tests for fluent methods (those returning `this`):
 
         StrBuilder fluentTest = new StrBuilder();
-        sink(fluentTest.append("Harmless").append(taint()).append("Also harmless").toString()); // $hasTaintFlow
+        sink(fluentTest.append("Harmless").append(taint()).append("Also harmless").toString()); // $ hasTaintFlow
 
         StrBuilder fluentBackflowTest = new StrBuilder();
         fluentBackflowTest.append("Harmless").append(taint()).append("Also harmless");
-        sink(fluentBackflowTest.toString()); // $hasTaintFlow
+        sink(fluentBackflowTest.toString()); // $ hasTaintFlow
 
         // Test the case where the fluent method contributing taint is at the end of a statement:
         StrBuilder fluentBackflowTest2 = new StrBuilder();
         fluentBackflowTest2.append("Harmless").append(taint());
-        sink(fluentBackflowTest2.toString()); // $hasTaintFlow
+        sink(fluentBackflowTest2.toString()); // $ hasTaintFlow
 
         // Test all fluent methods are passing taint through to their result:
         StrBuilder fluentAllMethodsTest = new StrBuilder(taint());
@@ -171,7 +171,7 @@ class StrBuilderTest {
         .setLength(500)
         .setNewLineText("newline")
         .setNullText("NULL")
-        .trim()); // $hasTaintFlow
+        .trim()); // $ hasTaintFlow
 
         // Test all fluent methods are passing taint back to their qualifier:
         StrBuilder fluentAllMethodsTest2 = new StrBuilder();
@@ -203,7 +203,7 @@ class StrBuilderTest {
         .setNullText("NULL")
         .trim()
         .append(taint());
-        sink(fluentAllMethodsTest2); // $hasTaintFlow
+        sink(fluentAllMethodsTest2); // $ hasTaintFlow
     }
 
 }
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrBuilderTextTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrBuilderTextTest.java
index b3aa3ed9997..ddb56e8d2e6 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrBuilderTextTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrBuilderTextTest.java
@@ -14,134 +14,134 @@ class StrBuilderTextTest {
 
     void test() throws Exception {
 
-        StrBuilder cons1 = new StrBuilder(taint()); sink(cons1.toString()); // $hasTaintFlow
+        StrBuilder cons1 = new StrBuilder(taint()); sink(cons1.toString()); // $ hasTaintFlow
 
-        StrBuilder sb1 = new StrBuilder(); sb1.append(taint().toCharArray()); sink(sb1.toString()); // $hasTaintFlow
-        StrBuilder sb2 = new StrBuilder(); sb2.append(taint().toCharArray(), 0, 0); sink(sb2.toString()); // $hasTaintFlow
+        StrBuilder sb1 = new StrBuilder(); sb1.append(taint().toCharArray()); sink(sb1.toString()); // $ hasTaintFlow
+        StrBuilder sb2 = new StrBuilder(); sb2.append(taint().toCharArray(), 0, 0); sink(sb2.toString()); // $ hasTaintFlow
         StrBuilder sb3 = new StrBuilder(); sb3.append(CharBuffer.wrap(taint().toCharArray())); sink(sb3.toString()); // $ hasTaintFlow
         StrBuilder sb4 = new StrBuilder(); sb4.append(CharBuffer.wrap(taint().toCharArray()), 0, 0); sink(sb4.toString()); // $ hasTaintFlow
-        StrBuilder sb5 = new StrBuilder(); sb5.append((CharSequence)taint()); sink(sb5.toString()); // $hasTaintFlow
-        StrBuilder sb6 = new StrBuilder(); sb6.append((CharSequence)taint(), 0, 0); sink(sb6.toString()); // $hasTaintFlow
-        StrBuilder sb7 = new StrBuilder(); sb7.append((Object)taint()); sink(sb7.toString()); // $hasTaintFlow
+        StrBuilder sb5 = new StrBuilder(); sb5.append((CharSequence)taint()); sink(sb5.toString()); // $ hasTaintFlow
+        StrBuilder sb6 = new StrBuilder(); sb6.append((CharSequence)taint(), 0, 0); sink(sb6.toString()); // $ hasTaintFlow
+        StrBuilder sb7 = new StrBuilder(); sb7.append((Object)taint()); sink(sb7.toString()); // $ hasTaintFlow
         {
             StrBuilder auxsb = new StrBuilder(); auxsb.append(taint());
-            StrBuilder sb8 = new StrBuilder(); sb8.append(auxsb); sink(sb8.toString()); // $hasTaintFlow
+            StrBuilder sb8 = new StrBuilder(); sb8.append(auxsb); sink(sb8.toString()); // $ hasTaintFlow
         }
-        StrBuilder sb9 = new StrBuilder(); sb9.append(new StringBuffer(taint())); sink(sb9.toString()); // $hasTaintFlow
-        StrBuilder sb10 = new StrBuilder(); sb10.append(new StringBuffer(taint()), 0, 0); sink(sb10.toString()); // $hasTaintFlow
-        StrBuilder sb11 = new StrBuilder(); sb11.append(new StringBuilder(taint())); sink(sb11.toString()); // $hasTaintFlow
-        StrBuilder sb12 = new StrBuilder(); sb12.append(new StringBuilder(taint()), 0, 0); sink(sb12.toString()); // $hasTaintFlow
-        StrBuilder sb13 = new StrBuilder(); sb13.append(taint()); sink(sb13.toString()); // $hasTaintFlow
-        StrBuilder sb14 = new StrBuilder(); sb14.append(taint(), 0, 0); sink(sb14.toString()); // $hasTaintFlow
-        StrBuilder sb15 = new StrBuilder(); sb15.append(taint(), "format", "args"); sink(sb15.toString()); // $hasTaintFlow
-        StrBuilder sb16 = new StrBuilder(); sb16.append("Format string", taint(), "args"); sink(sb16.toString()); // $hasTaintFlow
+        StrBuilder sb9 = new StrBuilder(); sb9.append(new StringBuffer(taint())); sink(sb9.toString()); // $ hasTaintFlow
+        StrBuilder sb10 = new StrBuilder(); sb10.append(new StringBuffer(taint()), 0, 0); sink(sb10.toString()); // $ hasTaintFlow
+        StrBuilder sb11 = new StrBuilder(); sb11.append(new StringBuilder(taint())); sink(sb11.toString()); // $ hasTaintFlow
+        StrBuilder sb12 = new StrBuilder(); sb12.append(new StringBuilder(taint()), 0, 0); sink(sb12.toString()); // $ hasTaintFlow
+        StrBuilder sb13 = new StrBuilder(); sb13.append(taint()); sink(sb13.toString()); // $ hasTaintFlow
+        StrBuilder sb14 = new StrBuilder(); sb14.append(taint(), 0, 0); sink(sb14.toString()); // $ hasTaintFlow
+        StrBuilder sb15 = new StrBuilder(); sb15.append(taint(), "format", "args"); sink(sb15.toString()); // $ hasTaintFlow
+        StrBuilder sb16 = new StrBuilder(); sb16.append("Format string", taint(), "args"); sink(sb16.toString()); // $ hasTaintFlow
         {
             List<String> taintedList = new ArrayList<>();
             taintedList.add(taint());
-            StrBuilder sb17 = new StrBuilder(); sb17.appendAll(taintedList); sink(sb17.toString()); // $hasTaintFlow
-            StrBuilder sb18 = new StrBuilder(); sb18.appendAll(taintedList.iterator()); sink(sb18.toString()); // $hasTaintFlow
+            StrBuilder sb17 = new StrBuilder(); sb17.appendAll(taintedList); sink(sb17.toString()); // $ hasTaintFlow
+            StrBuilder sb18 = new StrBuilder(); sb18.appendAll(taintedList.iterator()); sink(sb18.toString()); // $ hasTaintFlow
         }
-        StrBuilder sb19 = new StrBuilder(); sb19.appendAll("clean", taint()); sink(sb19.toString()); // $hasTaintFlow
-        StrBuilder sb20 = new StrBuilder(); sb20.appendAll(taint(), "clean"); sink(sb20.toString()); // $hasTaintFlow
-        StrBuilder sb21 = new StrBuilder(); sb21.appendFixedWidthPadLeft(taint(), 0, ' '); sink(sb21.toString()); // $hasTaintFlow
-        StrBuilder sb22 = new StrBuilder(); sb22.appendFixedWidthPadRight(taint(), 0, ' '); sink(sb22.toString()); // $hasTaintFlow
-        StrBuilder sb23 = new StrBuilder(); sb23.appendln(taint().toCharArray()); sink(sb23.toString()); // $hasTaintFlow
-        StrBuilder sb24 = new StrBuilder(); sb24.appendln(taint().toCharArray(), 0, 0); sink(sb24.toString()); // $hasTaintFlow
-        StrBuilder sb25 = new StrBuilder(); sb25.appendln((Object)taint()); sink(sb25.toString()); // $hasTaintFlow
+        StrBuilder sb19 = new StrBuilder(); sb19.appendAll("clean", taint()); sink(sb19.toString()); // $ hasTaintFlow
+        StrBuilder sb20 = new StrBuilder(); sb20.appendAll(taint(), "clean"); sink(sb20.toString()); // $ hasTaintFlow
+        StrBuilder sb21 = new StrBuilder(); sb21.appendFixedWidthPadLeft(taint(), 0, ' '); sink(sb21.toString()); // $ hasTaintFlow
+        StrBuilder sb22 = new StrBuilder(); sb22.appendFixedWidthPadRight(taint(), 0, ' '); sink(sb22.toString()); // $ hasTaintFlow
+        StrBuilder sb23 = new StrBuilder(); sb23.appendln(taint().toCharArray()); sink(sb23.toString()); // $ hasTaintFlow
+        StrBuilder sb24 = new StrBuilder(); sb24.appendln(taint().toCharArray(), 0, 0); sink(sb24.toString()); // $ hasTaintFlow
+        StrBuilder sb25 = new StrBuilder(); sb25.appendln((Object)taint()); sink(sb25.toString()); // $ hasTaintFlow
         {
             StrBuilder auxsb = new StrBuilder(); auxsb.appendln(taint());
-            StrBuilder sb26 = new StrBuilder(); sb26.appendln(auxsb); sink(sb26.toString()); // $hasTaintFlow
+            StrBuilder sb26 = new StrBuilder(); sb26.appendln(auxsb); sink(sb26.toString()); // $ hasTaintFlow
         }
-        StrBuilder sb27 = new StrBuilder(); sb27.appendln(new StringBuffer(taint())); sink(sb27.toString()); // $hasTaintFlow
-        StrBuilder sb28 = new StrBuilder(); sb28.appendln(new StringBuffer(taint()), 0, 0); sink(sb28.toString()); // $hasTaintFlow
-        StrBuilder sb29 = new StrBuilder(); sb29.appendln(new StringBuilder(taint())); sink(sb29.toString()); // $hasTaintFlow
-        StrBuilder sb30 = new StrBuilder(); sb30.appendln(new StringBuilder(taint()), 0, 0); sink(sb30.toString()); // $hasTaintFlow
-        StrBuilder sb31 = new StrBuilder(); sb31.appendln(taint()); sink(sb31.toString()); // $hasTaintFlow
-        StrBuilder sb32 = new StrBuilder(); sb32.appendln(taint(), 0, 0); sink(sb32.toString()); // $hasTaintFlow
-        StrBuilder sb33 = new StrBuilder(); sb33.appendln(taint(), "format", "args"); sink(sb33.toString()); // $hasTaintFlow
-        StrBuilder sb34 = new StrBuilder(); sb34.appendln("Format string", taint(), "args"); sink(sb34.toString()); // $hasTaintFlow
-        StrBuilder sb35 = new StrBuilder(); sb35.appendSeparator(taint()); sink(sb35.toString()); // $hasTaintFlow
-        StrBuilder sb36 = new StrBuilder(); sb36.appendSeparator(taint(), 0); sink(sb36.toString()); // $hasTaintFlow
-        StrBuilder sb37 = new StrBuilder(); sb37.appendSeparator(taint(), "default"); sink(sb37.toString()); // $hasTaintFlow
-        StrBuilder sb38 = new StrBuilder(); sb38.appendSeparator("", taint()); sink(sb38.toString()); // $hasTaintFlow
+        StrBuilder sb27 = new StrBuilder(); sb27.appendln(new StringBuffer(taint())); sink(sb27.toString()); // $ hasTaintFlow
+        StrBuilder sb28 = new StrBuilder(); sb28.appendln(new StringBuffer(taint()), 0, 0); sink(sb28.toString()); // $ hasTaintFlow
+        StrBuilder sb29 = new StrBuilder(); sb29.appendln(new StringBuilder(taint())); sink(sb29.toString()); // $ hasTaintFlow
+        StrBuilder sb30 = new StrBuilder(); sb30.appendln(new StringBuilder(taint()), 0, 0); sink(sb30.toString()); // $ hasTaintFlow
+        StrBuilder sb31 = new StrBuilder(); sb31.appendln(taint()); sink(sb31.toString()); // $ hasTaintFlow
+        StrBuilder sb32 = new StrBuilder(); sb32.appendln(taint(), 0, 0); sink(sb32.toString()); // $ hasTaintFlow
+        StrBuilder sb33 = new StrBuilder(); sb33.appendln(taint(), "format", "args"); sink(sb33.toString()); // $ hasTaintFlow
+        StrBuilder sb34 = new StrBuilder(); sb34.appendln("Format string", taint(), "args"); sink(sb34.toString()); // $ hasTaintFlow
+        StrBuilder sb35 = new StrBuilder(); sb35.appendSeparator(taint()); sink(sb35.toString()); // $ hasTaintFlow
+        StrBuilder sb36 = new StrBuilder(); sb36.appendSeparator(taint(), 0); sink(sb36.toString()); // $ hasTaintFlow
+        StrBuilder sb37 = new StrBuilder(); sb37.appendSeparator(taint(), "default"); sink(sb37.toString()); // $ hasTaintFlow
+        StrBuilder sb38 = new StrBuilder(); sb38.appendSeparator("", taint()); sink(sb38.toString()); // $ hasTaintFlow
         {
             StrBuilder auxsb = new StrBuilder(); auxsb.appendln(taint());
-            StrBuilder sb39 = new StrBuilder(); auxsb.appendTo(sb39); sink(sb39.toString()); // $hasTaintFlow
+            StrBuilder sb39 = new StrBuilder(); auxsb.appendTo(sb39); sink(sb39.toString()); // $ hasTaintFlow
         }
         {
             List<String> taintedList = new ArrayList<>();
             taintedList.add(taint());
-            StrBuilder sb40 = new StrBuilder(); sb40.appendWithSeparators(taintedList, ", "); sink(sb40.toString()); // $hasTaintFlow
-            StrBuilder sb41 = new StrBuilder(); sb41.appendWithSeparators(taintedList.iterator(), ", "); sink(sb41.toString()); // $hasTaintFlow
+            StrBuilder sb40 = new StrBuilder(); sb40.appendWithSeparators(taintedList, ", "); sink(sb40.toString()); // $ hasTaintFlow
+            StrBuilder sb41 = new StrBuilder(); sb41.appendWithSeparators(taintedList.iterator(), ", "); sink(sb41.toString()); // $ hasTaintFlow
             List<String> untaintedList = new ArrayList<>();
-            StrBuilder sb42 = new StrBuilder(); sb42.appendWithSeparators(untaintedList, taint()); sink(sb42.toString()); // $hasTaintFlow
-            StrBuilder sb43 = new StrBuilder(); sb43.appendWithSeparators(untaintedList.iterator(), taint()); sink(sb43.toString()); // $hasTaintFlow
+            StrBuilder sb42 = new StrBuilder(); sb42.appendWithSeparators(untaintedList, taint()); sink(sb42.toString()); // $ hasTaintFlow
+            StrBuilder sb43 = new StrBuilder(); sb43.appendWithSeparators(untaintedList.iterator(), taint()); sink(sb43.toString()); // $ hasTaintFlow
             String[] taintedArray = new String[] { taint() };
             String[] untaintedArray = new String[] {};
-            StrBuilder sb44 = new StrBuilder(); sb44.appendWithSeparators(taintedArray, ", "); sink(sb44.toString()); // $hasTaintFlow
-            StrBuilder sb45 = new StrBuilder(); sb45.appendWithSeparators(untaintedArray, taint()); sink(sb45.toString()); // $hasTaintFlow
+            StrBuilder sb44 = new StrBuilder(); sb44.appendWithSeparators(taintedArray, ", "); sink(sb44.toString()); // $ hasTaintFlow
+            StrBuilder sb45 = new StrBuilder(); sb45.appendWithSeparators(untaintedArray, taint()); sink(sb45.toString()); // $ hasTaintFlow
         }
         {
             StrBuilder sb46 = new StrBuilder(); sb46.append(taint());
             char[] target = new char[100];
             sb46.asReader().read(target);
-            sink(target); // $hasTaintFlow
+            sink(target); // $ hasTaintFlow
         }
-        StrBuilder sb47 = new StrBuilder(); sb47.append(taint()); sink(sb47.asTokenizer().next()); // $hasTaintFlow
-        StrBuilder sb48 = new StrBuilder(); sb48.append(taint()); sink(sb48.build()); // $hasTaintFlow
-        StrBuilder sb49 = new StrBuilder(); sb49.append(taint()); sink(sb49.getChars(null)); // $hasTaintFlow
+        StrBuilder sb47 = new StrBuilder(); sb47.append(taint()); sink(sb47.asTokenizer().next()); // $ hasTaintFlow
+        StrBuilder sb48 = new StrBuilder(); sb48.append(taint()); sink(sb48.build()); // $ hasTaintFlow
+        StrBuilder sb49 = new StrBuilder(); sb49.append(taint()); sink(sb49.getChars(null)); // $ hasTaintFlow
         {
             StrBuilder sb50 = new StrBuilder(); sb50.append(taint());
             char[] target = new char[100];
             sb50.getChars(target);
-            sink(target); // $hasTaintFlow
+            sink(target); // $ hasTaintFlow
         }
         {
             StrBuilder sb51 = new StrBuilder(); sb51.append(taint());
             char[] target = new char[100];
             sb51.getChars(0, 0, target, 0);
-            sink(target); // $hasTaintFlow
+            sink(target); // $ hasTaintFlow
         }
-        StrBuilder sb52 = new StrBuilder(); sb52.insert(0, taint().toCharArray()); sink(sb52.toString()); // $hasTaintFlow
-        StrBuilder sb53 = new StrBuilder(); sb53.insert(0, taint().toCharArray(), 0, 0); sink(sb53.toString()); // $hasTaintFlow
-        StrBuilder sb54 = new StrBuilder(); sb54.insert(0, taint()); sink(sb54.toString()); // $hasTaintFlow
-        StrBuilder sb55 = new StrBuilder(); sb55.insert(0, (Object)taint()); sink(sb55.toString()); // $hasTaintFlow
-        StrBuilder sb56 = new StrBuilder(); sb56.append(taint()); sink(sb56.leftString(0)); // $hasTaintFlow
-        StrBuilder sb57 = new StrBuilder(); sb57.append(taint()); sink(sb57.midString(0, 0)); // $hasTaintFlow
+        StrBuilder sb52 = new StrBuilder(); sb52.insert(0, taint().toCharArray()); sink(sb52.toString()); // $ hasTaintFlow
+        StrBuilder sb53 = new StrBuilder(); sb53.insert(0, taint().toCharArray(), 0, 0); sink(sb53.toString()); // $ hasTaintFlow
+        StrBuilder sb54 = new StrBuilder(); sb54.insert(0, taint()); sink(sb54.toString()); // $ hasTaintFlow
+        StrBuilder sb55 = new StrBuilder(); sb55.insert(0, (Object)taint()); sink(sb55.toString()); // $ hasTaintFlow
+        StrBuilder sb56 = new StrBuilder(); sb56.append(taint()); sink(sb56.leftString(0)); // $ hasTaintFlow
+        StrBuilder sb57 = new StrBuilder(); sb57.append(taint()); sink(sb57.midString(0, 0)); // $ hasTaintFlow
         {
             StringReader reader = new StringReader(taint());
-            StrBuilder sb58 = new StrBuilder(); sb58.readFrom(reader); sink(sb58.toString()); // $hasTaintFlow
+            StrBuilder sb58 = new StrBuilder(); sb58.readFrom(reader); sink(sb58.toString()); // $ hasTaintFlow
         }
-        StrBuilder sb59 = new StrBuilder(); sb59.replace(0, 0, taint()); sink(sb59.toString()); // $hasTaintFlow
-        StrBuilder sb60 = new StrBuilder(); sb60.replace(null, taint(), 0, 0, 0); sink(sb60.toString()); // $hasTaintFlow
-        StrBuilder sb61 = new StrBuilder(); sb61.replaceAll((StrMatcher)null, taint()); sink(sb61.toString()); // $hasTaintFlow
-        StrBuilder sb62 = new StrBuilder(); sb62.replaceAll("search", taint()); sink(sb62.toString()); // $hasTaintFlow
+        StrBuilder sb59 = new StrBuilder(); sb59.replace(0, 0, taint()); sink(sb59.toString()); // $ hasTaintFlow
+        StrBuilder sb60 = new StrBuilder(); sb60.replace(null, taint(), 0, 0, 0); sink(sb60.toString()); // $ hasTaintFlow
+        StrBuilder sb61 = new StrBuilder(); sb61.replaceAll((StrMatcher)null, taint()); sink(sb61.toString()); // $ hasTaintFlow
+        StrBuilder sb62 = new StrBuilder(); sb62.replaceAll("search", taint()); sink(sb62.toString()); // $ hasTaintFlow
         StrBuilder sb63 = new StrBuilder(); sb63.replaceAll(taint(), "replace"); sink(sb63.toString()); // GOOD (search string doesn't convey taint)
-        StrBuilder sb64 = new StrBuilder(); sb64.replaceFirst((StrMatcher)null, taint()); sink(sb64.toString()); // $hasTaintFlow
-        StrBuilder sb65 = new StrBuilder(); sb65.replaceFirst("search", taint()); sink(sb65.toString()); // $hasTaintFlow
+        StrBuilder sb64 = new StrBuilder(); sb64.replaceFirst((StrMatcher)null, taint()); sink(sb64.toString()); // $ hasTaintFlow
+        StrBuilder sb65 = new StrBuilder(); sb65.replaceFirst("search", taint()); sink(sb65.toString()); // $ hasTaintFlow
         StrBuilder sb66 = new StrBuilder(); sb66.replaceFirst(taint(), "replace"); sink(sb66.toString()); // GOOD (search string doesn't convey taint)
-        StrBuilder sb67 = new StrBuilder(); sb67.append(taint()); sink(sb67.rightString(0)); // $hasTaintFlow
-        StrBuilder sb68 = new StrBuilder(); sb68.append(taint()); sink(sb68.subSequence(0, 0)); // $hasTaintFlow
-        StrBuilder sb69 = new StrBuilder(); sb69.append(taint()); sink(sb69.substring(0)); // $hasTaintFlow
-        StrBuilder sb70 = new StrBuilder(); sb70.append(taint()); sink(sb70.substring(0, 0)); // $hasTaintFlow
-        StrBuilder sb71 = new StrBuilder(); sb71.append(taint()); sink(sb71.toCharArray()); // $hasTaintFlow
-        StrBuilder sb72 = new StrBuilder(); sb72.append(taint()); sink(sb72.toCharArray(0, 0)); // $hasTaintFlow
-        StrBuilder sb73 = new StrBuilder(); sb73.append(taint()); sink(sb73.toStringBuffer()); // $hasTaintFlow
-        StrBuilder sb74 = new StrBuilder(); sb74.append(taint()); sink(sb74.toStringBuilder()); // $hasTaintFlow
+        StrBuilder sb67 = new StrBuilder(); sb67.append(taint()); sink(sb67.rightString(0)); // $ hasTaintFlow
+        StrBuilder sb68 = new StrBuilder(); sb68.append(taint()); sink(sb68.subSequence(0, 0)); // $ hasTaintFlow
+        StrBuilder sb69 = new StrBuilder(); sb69.append(taint()); sink(sb69.substring(0)); // $ hasTaintFlow
+        StrBuilder sb70 = new StrBuilder(); sb70.append(taint()); sink(sb70.substring(0, 0)); // $ hasTaintFlow
+        StrBuilder sb71 = new StrBuilder(); sb71.append(taint()); sink(sb71.toCharArray()); // $ hasTaintFlow
+        StrBuilder sb72 = new StrBuilder(); sb72.append(taint()); sink(sb72.toCharArray(0, 0)); // $ hasTaintFlow
+        StrBuilder sb73 = new StrBuilder(); sb73.append(taint()); sink(sb73.toStringBuffer()); // $ hasTaintFlow
+        StrBuilder sb74 = new StrBuilder(); sb74.append(taint()); sink(sb74.toStringBuilder()); // $ hasTaintFlow
 
         // Tests for fluent methods (those returning `this`):
 
         StrBuilder fluentTest = new StrBuilder();
-        sink(fluentTest.append("Harmless").append(taint()).append("Also harmless").toString()); // $hasTaintFlow
+        sink(fluentTest.append("Harmless").append(taint()).append("Also harmless").toString()); // $ hasTaintFlow
 
         StrBuilder fluentBackflowTest = new StrBuilder();
         fluentBackflowTest.append("Harmless").append(taint()).append("Also harmless");
-        sink(fluentBackflowTest.toString()); // $hasTaintFlow
+        sink(fluentBackflowTest.toString()); // $ hasTaintFlow
 
         // Test the case where the fluent method contributing taint is at the end of a statement:
         StrBuilder fluentBackflowTest2 = new StrBuilder();
         fluentBackflowTest2.append("Harmless").append(taint());
-        sink(fluentBackflowTest2.toString()); // $hasTaintFlow
+        sink(fluentBackflowTest2.toString()); // $ hasTaintFlow
 
         // Test all fluent methods are passing taint through to their result:
         StrBuilder fluentAllMethodsTest = new StrBuilder(taint());
@@ -171,7 +171,7 @@ class StrBuilderTextTest {
         .setLength(500)
         .setNewLineText("newline")
         .setNullText("NULL")
-        .trim()); // $hasTaintFlow
+        .trim()); // $ hasTaintFlow
 
         // Test all fluent methods are passing taint back to their qualifier:
         StrBuilder fluentAllMethodsTest2 = new StrBuilder();
@@ -203,7 +203,7 @@ class StrBuilderTextTest {
         .setNullText("NULL")
         .trim()
         .append(taint());
-        sink(fluentAllMethodsTest2); // $hasTaintFlow
+        sink(fluentAllMethodsTest2); // $ hasTaintFlow
     }
 
 }
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrLookupTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrLookupTest.java
index 64f53265bb6..38bcd0a85b5 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrLookupTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrLookupTest.java
@@ -11,7 +11,7 @@ class StrLookupTest {
       Map<String, String> map = new HashMap<String, String>();
       map.put("key", taint());
       StrLookup<String> lookup = StrLookup.mapLookup(map);
-      sink(lookup.lookup("key")); // $hasTaintFlow
+      sink(lookup.lookup("key")); // $ hasTaintFlow
     }
 
 }
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrSubstitutorTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrSubstitutorTest.java
index 5e40da1958d..c0ce5ca054e 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrSubstitutorTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrSubstitutorTest.java
@@ -17,66 +17,66 @@ class StrSubstitutorTest {
       StrLookup<String> taintedLookup = StrLookup.mapLookup(taintedMap);
 
       // Test constructors:
-      StrSubstitutor ss1 = new StrSubstitutor(); ss1.setVariableResolver(taintedLookup); sink(ss1.replace("input")); // $hasTaintFlow
-      StrSubstitutor ss2 = new StrSubstitutor(taintedMap); sink(ss2.replace("input")); // $hasTaintFlow
-      StrSubstitutor ss3 = new StrSubstitutor(taintedMap, "{", "}"); sink(ss3.replace("input")); // $hasTaintFlow
-      StrSubstitutor ss4 = new StrSubstitutor(taintedMap, "{", "}", ' '); sink(ss4.replace("input")); // $hasTaintFlow
-      StrSubstitutor ss5 = new StrSubstitutor(taintedMap, "{", "}", ' ', ","); sink(ss5.replace("input")); // $hasTaintFlow
-      StrSubstitutor ss6 = new StrSubstitutor(taintedLookup); sink(ss6.replace("input")); // $hasTaintFlow
-      StrSubstitutor ss7 = new StrSubstitutor(taintedLookup, "{", "}", ' '); sink(ss7.replace("input")); // $hasTaintFlow
-      StrSubstitutor ss8 = new StrSubstitutor(taintedLookup, "{", "}", ' ', ","); sink(ss8.replace("input")); // $hasTaintFlow
-      StrSubstitutor ss9 = new StrSubstitutor(taintedLookup, (StrMatcher)null, null, ' '); sink(ss9.replace("input")); // $hasTaintFlow
-      StrSubstitutor ss10 = new StrSubstitutor(taintedLookup, (StrMatcher)null, null, ' ', null); sink(ss10.replace("input")); // $hasTaintFlow
+      StrSubstitutor ss1 = new StrSubstitutor(); ss1.setVariableResolver(taintedLookup); sink(ss1.replace("input")); // $ hasTaintFlow
+      StrSubstitutor ss2 = new StrSubstitutor(taintedMap); sink(ss2.replace("input")); // $ hasTaintFlow
+      StrSubstitutor ss3 = new StrSubstitutor(taintedMap, "{", "}"); sink(ss3.replace("input")); // $ hasTaintFlow
+      StrSubstitutor ss4 = new StrSubstitutor(taintedMap, "{", "}", ' '); sink(ss4.replace("input")); // $ hasTaintFlow
+      StrSubstitutor ss5 = new StrSubstitutor(taintedMap, "{", "}", ' ', ","); sink(ss5.replace("input")); // $ hasTaintFlow
+      StrSubstitutor ss6 = new StrSubstitutor(taintedLookup); sink(ss6.replace("input")); // $ hasTaintFlow
+      StrSubstitutor ss7 = new StrSubstitutor(taintedLookup, "{", "}", ' '); sink(ss7.replace("input")); // $ hasTaintFlow
+      StrSubstitutor ss8 = new StrSubstitutor(taintedLookup, "{", "}", ' ', ","); sink(ss8.replace("input")); // $ hasTaintFlow
+      StrSubstitutor ss9 = new StrSubstitutor(taintedLookup, (StrMatcher)null, null, ' '); sink(ss9.replace("input")); // $ hasTaintFlow
+      StrSubstitutor ss10 = new StrSubstitutor(taintedLookup, (StrMatcher)null, null, ' ', null); sink(ss10.replace("input")); // $ hasTaintFlow
 
       // Test replace overloads (tainted substitution map):
       StrSubstitutor taintedSubst = ss2;
-      sink(taintedSubst.replace((Object)"input")); // $hasTaintFlow
-      sink(taintedSubst.replace("input")); // $hasTaintFlow
-      sink(taintedSubst.replace("input", 0, 0)); // $hasTaintFlow
-      sink(taintedSubst.replace("input".toCharArray())); // $hasTaintFlow
-      sink(taintedSubst.replace("input".toCharArray(), 0, 0)); // $hasTaintFlow
-      sink(taintedSubst.replace((CharSequence)"input")); // $hasTaintFlow
-      sink(taintedSubst.replace((CharSequence)"input", 0, 0)); // $hasTaintFlow
-      sink(taintedSubst.replace(new StrBuilder("input"))); // $hasTaintFlow
-      sink(taintedSubst.replace(new StrBuilder("input"), 0, 0)); // $hasTaintFlow
-      sink(taintedSubst.replace(new StringBuilder("input"))); // $hasTaintFlow
-      sink(taintedSubst.replace(new StringBuilder("input"), 0, 0)); // $hasTaintFlow
-      sink(taintedSubst.replace(new StringBuffer("input"))); // $hasTaintFlow
-      sink(taintedSubst.replace(new StringBuffer("input"), 0, 0)); // $hasTaintFlow
+      sink(taintedSubst.replace((Object)"input")); // $ hasTaintFlow
+      sink(taintedSubst.replace("input")); // $ hasTaintFlow
+      sink(taintedSubst.replace("input", 0, 0)); // $ hasTaintFlow
+      sink(taintedSubst.replace("input".toCharArray())); // $ hasTaintFlow
+      sink(taintedSubst.replace("input".toCharArray(), 0, 0)); // $ hasTaintFlow
+      sink(taintedSubst.replace((CharSequence)"input")); // $ hasTaintFlow
+      sink(taintedSubst.replace((CharSequence)"input", 0, 0)); // $ hasTaintFlow
+      sink(taintedSubst.replace(new StrBuilder("input"))); // $ hasTaintFlow
+      sink(taintedSubst.replace(new StrBuilder("input"), 0, 0)); // $ hasTaintFlow
+      sink(taintedSubst.replace(new StringBuilder("input"))); // $ hasTaintFlow
+      sink(taintedSubst.replace(new StringBuilder("input"), 0, 0)); // $ hasTaintFlow
+      sink(taintedSubst.replace(new StringBuffer("input"))); // $ hasTaintFlow
+      sink(taintedSubst.replace(new StringBuffer("input"), 0, 0)); // $ hasTaintFlow
 
       // Test replace overloads (tainted input):
       StrSubstitutor untaintedSubst = ss1;
-      sink(untaintedSubst.replace((Object)taint())); // $hasTaintFlow
-      sink(untaintedSubst.replace(taint())); // $hasTaintFlow
-      sink(untaintedSubst.replace(taint(), 0, 0)); // $hasTaintFlow
-      sink(untaintedSubst.replace(taint().toCharArray())); // $hasTaintFlow
-      sink(untaintedSubst.replace(taint().toCharArray(), 0, 0)); // $hasTaintFlow
-      sink(untaintedSubst.replace((CharSequence)taint())); // $hasTaintFlow
-      sink(untaintedSubst.replace((CharSequence)taint(), 0, 0)); // $hasTaintFlow
-      sink(untaintedSubst.replace(new StrBuilder(taint()))); // $hasTaintFlow
-      sink(untaintedSubst.replace(new StrBuilder(taint()), 0, 0)); // $hasTaintFlow
-      sink(untaintedSubst.replace(new StringBuilder(taint()))); // $hasTaintFlow
-      sink(untaintedSubst.replace(new StringBuilder(taint()), 0, 0)); // $hasTaintFlow
-      sink(untaintedSubst.replace(new StringBuffer(taint()))); // $hasTaintFlow
-      sink(untaintedSubst.replace(new StringBuffer(taint()), 0, 0)); // $hasTaintFlow
+      sink(untaintedSubst.replace((Object)taint())); // $ hasTaintFlow
+      sink(untaintedSubst.replace(taint())); // $ hasTaintFlow
+      sink(untaintedSubst.replace(taint(), 0, 0)); // $ hasTaintFlow
+      sink(untaintedSubst.replace(taint().toCharArray())); // $ hasTaintFlow
+      sink(untaintedSubst.replace(taint().toCharArray(), 0, 0)); // $ hasTaintFlow
+      sink(untaintedSubst.replace((CharSequence)taint())); // $ hasTaintFlow
+      sink(untaintedSubst.replace((CharSequence)taint(), 0, 0)); // $ hasTaintFlow
+      sink(untaintedSubst.replace(new StrBuilder(taint()))); // $ hasTaintFlow
+      sink(untaintedSubst.replace(new StrBuilder(taint()), 0, 0)); // $ hasTaintFlow
+      sink(untaintedSubst.replace(new StringBuilder(taint()))); // $ hasTaintFlow
+      sink(untaintedSubst.replace(new StringBuilder(taint()), 0, 0)); // $ hasTaintFlow
+      sink(untaintedSubst.replace(new StringBuffer(taint()))); // $ hasTaintFlow
+      sink(untaintedSubst.replace(new StringBuffer(taint()), 0, 0)); // $ hasTaintFlow
 
       // Test static replace methods:
-      sink(StrSubstitutor.replace(taint(), new HashMap<String, String>())); // $hasTaintFlow
-      sink(StrSubstitutor.replace(taint(), new HashMap<String, String>(), "{", "}")); // $hasTaintFlow
-      sink(StrSubstitutor.replace("input", taintedMap)); // $hasTaintFlow
-      sink(StrSubstitutor.replace("input", taintedMap, "{", "}")); // $hasTaintFlow
+      sink(StrSubstitutor.replace(taint(), new HashMap<String, String>())); // $ hasTaintFlow
+      sink(StrSubstitutor.replace(taint(), new HashMap<String, String>(), "{", "}")); // $ hasTaintFlow
+      sink(StrSubstitutor.replace("input", taintedMap)); // $ hasTaintFlow
+      sink(StrSubstitutor.replace("input", taintedMap, "{", "}")); // $ hasTaintFlow
       Properties taintedProps = new Properties();
       taintedProps.put("key", taint());
-      sink(StrSubstitutor.replace(taint(), new Properties())); // $hasTaintFlow
-      sink(StrSubstitutor.replace("input", taintedProps)); // $hasTaintFlow
+      sink(StrSubstitutor.replace(taint(), new Properties())); // $ hasTaintFlow
+      sink(StrSubstitutor.replace("input", taintedProps)); // $ hasTaintFlow
 
       // Test replaceIn methods:
-      StrBuilder strBuilder1 = new StrBuilder(); taintedSubst.replaceIn(strBuilder1); sink(strBuilder1.toString()); // $hasTaintFlow
-      StrBuilder strBuilder2 = new StrBuilder(); taintedSubst.replaceIn(strBuilder2, 0, 0); sink(strBuilder2.toString()); // $hasTaintFlow
-      StringBuilder stringBuilder1 = new StringBuilder(); taintedSubst.replaceIn(stringBuilder1); sink(stringBuilder1.toString()); // $hasTaintFlow
-      StringBuilder stringBuilder2 = new StringBuilder(); taintedSubst.replaceIn(stringBuilder2, 0, 0); sink(stringBuilder2.toString()); // $hasTaintFlow
-      StringBuffer stringBuffer1 = new StringBuffer(); taintedSubst.replaceIn(stringBuffer1); sink(stringBuffer1.toString()); // $hasTaintFlow
-      StringBuffer stringBuffer2 = new StringBuffer(); taintedSubst.replaceIn(stringBuffer2, 0, 0); sink(stringBuffer2.toString()); // $hasTaintFlow
+      StrBuilder strBuilder1 = new StrBuilder(); taintedSubst.replaceIn(strBuilder1); sink(strBuilder1.toString()); // $ hasTaintFlow
+      StrBuilder strBuilder2 = new StrBuilder(); taintedSubst.replaceIn(strBuilder2, 0, 0); sink(strBuilder2.toString()); // $ hasTaintFlow
+      StringBuilder stringBuilder1 = new StringBuilder(); taintedSubst.replaceIn(stringBuilder1); sink(stringBuilder1.toString()); // $ hasTaintFlow
+      StringBuilder stringBuilder2 = new StringBuilder(); taintedSubst.replaceIn(stringBuilder2, 0, 0); sink(stringBuilder2.toString()); // $ hasTaintFlow
+      StringBuffer stringBuffer1 = new StringBuffer(); taintedSubst.replaceIn(stringBuffer1); sink(stringBuffer1.toString()); // $ hasTaintFlow
+      StringBuffer stringBuffer2 = new StringBuffer(); taintedSubst.replaceIn(stringBuffer2, 0, 0); sink(stringBuffer2.toString()); // $ hasTaintFlow
     }
 
 }
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrTokenizerTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrTokenizerTest.java
index 2872a179c4a..517a52dca39 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrTokenizerTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrTokenizerTest.java
@@ -9,38 +9,38 @@ public class StrTokenizerTest {
   void test() throws Exception {
 
     // Test constructors:
-    sink((new StrTokenizer(taint().toCharArray())).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint().toCharArray(), ',')).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint().toCharArray(), ',', '"')).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint().toCharArray(), ",")).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint().toCharArray(), (StrMatcher)null)).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint().toCharArray(), (StrMatcher)null, (StrMatcher)null)).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint())).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint(), ',')).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint(), ',', '"')).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint(), ",")).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint(), (StrMatcher)null)).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint(), (StrMatcher)null, (StrMatcher)null)).toString()); // $hasTaintFlow
+    sink((new StrTokenizer(taint().toCharArray())).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint().toCharArray(), ',')).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint().toCharArray(), ',', '"')).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint().toCharArray(), ",")).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint().toCharArray(), (StrMatcher)null)).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint().toCharArray(), (StrMatcher)null, (StrMatcher)null)).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint())).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint(), ',')).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint(), ',', '"')).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint(), ",")).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint(), (StrMatcher)null)).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint(), (StrMatcher)null, (StrMatcher)null)).toString()); // $ hasTaintFlow
 
     // Test constructing static methods:
-    sink(StrTokenizer.getCSVInstance(taint().toCharArray()).toString()); // $hasTaintFlow
-    sink(StrTokenizer.getCSVInstance(taint()).toString()); // $hasTaintFlow
-    sink(StrTokenizer.getTSVInstance(taint().toCharArray()).toString()); // $hasTaintFlow
-    sink(StrTokenizer.getTSVInstance(taint()).toString()); // $hasTaintFlow
+    sink(StrTokenizer.getCSVInstance(taint().toCharArray()).toString()); // $ hasTaintFlow
+    sink(StrTokenizer.getCSVInstance(taint()).toString()); // $ hasTaintFlow
+    sink(StrTokenizer.getTSVInstance(taint().toCharArray()).toString()); // $ hasTaintFlow
+    sink(StrTokenizer.getTSVInstance(taint()).toString()); // $ hasTaintFlow
 
     // Test accessors:
-    sink((new StrTokenizer(taint())).clone()); // $hasTaintFlow
-    sink((new StrTokenizer(taint())).getContent()); // $hasTaintFlow
-    sink((new StrTokenizer(taint())).getTokenArray()); // $hasTaintFlow
-    sink((new StrTokenizer(taint())).getTokenList()); // $hasTaintFlow
-    sink((new StrTokenizer(taint())).next()); // $hasTaintFlow
-    sink((new StrTokenizer(taint())).nextToken()); // $hasTaintFlow
-    sink((new StrTokenizer(taint())).previous()); // $hasTaintFlow
-    sink((new StrTokenizer(taint())).previousToken()); // $hasTaintFlow
+    sink((new StrTokenizer(taint())).clone()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint())).getContent()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint())).getTokenArray()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint())).getTokenList()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint())).next()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint())).nextToken()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint())).previous()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint())).previousToken()); // $ hasTaintFlow
 
     // Test mutators:
-    sink((new StrTokenizer()).reset(taint().toCharArray()).toString()); // $hasTaintFlow
-    sink((new StrTokenizer()).reset(taint()).toString()); // $hasTaintFlow
+    sink((new StrTokenizer()).reset(taint().toCharArray()).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer()).reset(taint()).toString()); // $ hasTaintFlow
 
   }
 }
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrTokenizerTextTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrTokenizerTextTest.java
index 4758a7d4b9d..4ee6ebb5c1b 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrTokenizerTextTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StrTokenizerTextTest.java
@@ -9,38 +9,38 @@ public class StrTokenizerTextTest {
   void test() throws Exception {
 
     // Test constructors:
-    sink((new StrTokenizer(taint().toCharArray())).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint().toCharArray(), ',')).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint().toCharArray(), ',', '"')).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint().toCharArray(), ",")).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint().toCharArray(), (StrMatcher)null)).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint().toCharArray(), (StrMatcher)null, (StrMatcher)null)).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint())).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint(), ',')).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint(), ',', '"')).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint(), ",")).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint(), (StrMatcher)null)).toString()); // $hasTaintFlow
-    sink((new StrTokenizer(taint(), (StrMatcher)null, (StrMatcher)null)).toString()); // $hasTaintFlow
+    sink((new StrTokenizer(taint().toCharArray())).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint().toCharArray(), ',')).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint().toCharArray(), ',', '"')).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint().toCharArray(), ",")).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint().toCharArray(), (StrMatcher)null)).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint().toCharArray(), (StrMatcher)null, (StrMatcher)null)).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint())).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint(), ',')).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint(), ',', '"')).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint(), ",")).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint(), (StrMatcher)null)).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint(), (StrMatcher)null, (StrMatcher)null)).toString()); // $ hasTaintFlow
 
     // Test constructing static methods:
-    sink(StrTokenizer.getCSVInstance(taint().toCharArray()).toString()); // $hasTaintFlow
-    sink(StrTokenizer.getCSVInstance(taint()).toString()); // $hasTaintFlow
-    sink(StrTokenizer.getTSVInstance(taint().toCharArray()).toString()); // $hasTaintFlow
-    sink(StrTokenizer.getTSVInstance(taint()).toString()); // $hasTaintFlow
+    sink(StrTokenizer.getCSVInstance(taint().toCharArray()).toString()); // $ hasTaintFlow
+    sink(StrTokenizer.getCSVInstance(taint()).toString()); // $ hasTaintFlow
+    sink(StrTokenizer.getTSVInstance(taint().toCharArray()).toString()); // $ hasTaintFlow
+    sink(StrTokenizer.getTSVInstance(taint()).toString()); // $ hasTaintFlow
 
     // Test accessors:
-    sink((new StrTokenizer(taint())).clone()); // $hasTaintFlow
-    sink((new StrTokenizer(taint())).getContent()); // $hasTaintFlow
-    sink((new StrTokenizer(taint())).getTokenArray()); // $hasTaintFlow
-    sink((new StrTokenizer(taint())).getTokenList()); // $hasTaintFlow
-    sink((new StrTokenizer(taint())).next()); // $hasTaintFlow
-    sink((new StrTokenizer(taint())).nextToken()); // $hasTaintFlow
-    sink((new StrTokenizer(taint())).previous()); // $hasTaintFlow
-    sink((new StrTokenizer(taint())).previousToken()); // $hasTaintFlow
+    sink((new StrTokenizer(taint())).clone()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint())).getContent()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint())).getTokenArray()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint())).getTokenList()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint())).next()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint())).nextToken()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint())).previous()); // $ hasTaintFlow
+    sink((new StrTokenizer(taint())).previousToken()); // $ hasTaintFlow
 
     // Test mutators:
-    sink((new StrTokenizer()).reset(taint().toCharArray()).toString()); // $hasTaintFlow
-    sink((new StrTokenizer()).reset(taint()).toString()); // $hasTaintFlow
+    sink((new StrTokenizer()).reset(taint().toCharArray()).toString()); // $ hasTaintFlow
+    sink((new StrTokenizer()).reset(taint()).toString()); // $ hasTaintFlow
 
   }
 }
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StringEscapeUtilsTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StringEscapeUtilsTest.java
index eae03dd6e56..abcae1e8b84 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StringEscapeUtilsTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StringEscapeUtilsTest.java
@@ -6,6 +6,6 @@ public class StringEscapeUtilsTest {
   void sink(Object o) {}
 
   void test() throws Exception {
-    sink(StringEscapeUtils.escapeJson(taint())); // $hasTaintFlow
+    sink(StringEscapeUtils.escapeJson(taint())); // $ hasTaintFlow
   }
 }
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StringLookupTextTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StringLookupTextTest.java
index 4c346a4fedd..723d7e3de7c 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StringLookupTextTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StringLookupTextTest.java
@@ -12,7 +12,7 @@ class StringLookupTextTest {
       Map<String, String> map = new HashMap<String, String>();
       map.put("key", taint());
       StringLookup lookup = StringLookupFactory.INSTANCE.mapStringLookup(map);
-      sink(lookup.lookup("key")); // $hasTaintFlow
+      sink(lookup.lookup("key")); // $ hasTaintFlow
     }
 
 }
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StringSubstitutorTextTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StringSubstitutorTextTest.java
index ddf23e06c09..387b0630c4e 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StringSubstitutorTextTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StringSubstitutorTextTest.java
@@ -18,66 +18,66 @@ class StringSubstitutorTextTest {
       StringLookup taintedLookup = StringLookupFactory.INSTANCE.mapStringLookup(taintedMap);
 
       // Test constructors:
-      StringSubstitutor ss1 = new StringSubstitutor(); ss1.setVariableResolver(taintedLookup); sink(ss1.replace("input")); // $hasTaintFlow
-      StringSubstitutor ss2 = new StringSubstitutor(taintedMap); sink(ss2.replace("input")); // $hasTaintFlow
-      StringSubstitutor ss3 = new StringSubstitutor(taintedMap, "{", "}"); sink(ss3.replace("input")); // $hasTaintFlow
-      StringSubstitutor ss4 = new StringSubstitutor(taintedMap, "{", "}", ' '); sink(ss4.replace("input")); // $hasTaintFlow
-      StringSubstitutor ss5 = new StringSubstitutor(taintedMap, "{", "}", ' ', ","); sink(ss5.replace("input")); // $hasTaintFlow
-      StringSubstitutor ss6 = new StringSubstitutor(taintedLookup); sink(ss6.replace("input")); // $hasTaintFlow
-      StringSubstitutor ss7 = new StringSubstitutor(taintedLookup, "{", "}", ' '); sink(ss7.replace("input")); // $hasTaintFlow
-      StringSubstitutor ss8 = new StringSubstitutor(taintedLookup, "{", "}", ' ', ","); sink(ss8.replace("input")); // $hasTaintFlow
-      StringSubstitutor ss9 = new StringSubstitutor(taintedLookup, (StringMatcher)null, null, ' '); sink(ss9.replace("input")); // $hasTaintFlow
-      StringSubstitutor ss10 = new StringSubstitutor(taintedLookup, (StringMatcher)null, null, ' ', null); sink(ss10.replace("input")); // $hasTaintFlow
+      StringSubstitutor ss1 = new StringSubstitutor(); ss1.setVariableResolver(taintedLookup); sink(ss1.replace("input")); // $ hasTaintFlow
+      StringSubstitutor ss2 = new StringSubstitutor(taintedMap); sink(ss2.replace("input")); // $ hasTaintFlow
+      StringSubstitutor ss3 = new StringSubstitutor(taintedMap, "{", "}"); sink(ss3.replace("input")); // $ hasTaintFlow
+      StringSubstitutor ss4 = new StringSubstitutor(taintedMap, "{", "}", ' '); sink(ss4.replace("input")); // $ hasTaintFlow
+      StringSubstitutor ss5 = new StringSubstitutor(taintedMap, "{", "}", ' ', ","); sink(ss5.replace("input")); // $ hasTaintFlow
+      StringSubstitutor ss6 = new StringSubstitutor(taintedLookup); sink(ss6.replace("input")); // $ hasTaintFlow
+      StringSubstitutor ss7 = new StringSubstitutor(taintedLookup, "{", "}", ' '); sink(ss7.replace("input")); // $ hasTaintFlow
+      StringSubstitutor ss8 = new StringSubstitutor(taintedLookup, "{", "}", ' ', ","); sink(ss8.replace("input")); // $ hasTaintFlow
+      StringSubstitutor ss9 = new StringSubstitutor(taintedLookup, (StringMatcher)null, null, ' '); sink(ss9.replace("input")); // $ hasTaintFlow
+      StringSubstitutor ss10 = new StringSubstitutor(taintedLookup, (StringMatcher)null, null, ' ', null); sink(ss10.replace("input")); // $ hasTaintFlow
 
       // Test replace overloads (tainted substitution map):
       StringSubstitutor taintedSubst = ss2;
-      sink(taintedSubst.replace((Object)"input")); // $hasTaintFlow
-      sink(taintedSubst.replace("input")); // $hasTaintFlow
-      sink(taintedSubst.replace("input", 0, 0)); // $hasTaintFlow
-      sink(taintedSubst.replace("input".toCharArray())); // $hasTaintFlow
-      sink(taintedSubst.replace("input".toCharArray(), 0, 0)); // $hasTaintFlow
-      sink(taintedSubst.replace((CharSequence)"input")); // $hasTaintFlow
-      sink(taintedSubst.replace((CharSequence)"input", 0, 0)); // $hasTaintFlow
-      sink(taintedSubst.replace(new TextStringBuilder("input"))); // $hasTaintFlow
-      sink(taintedSubst.replace(new TextStringBuilder("input"), 0, 0)); // $hasTaintFlow
-      sink(taintedSubst.replace(new StringBuilder("input"))); // $hasTaintFlow
-      sink(taintedSubst.replace(new StringBuilder("input"), 0, 0)); // $hasTaintFlow
-      sink(taintedSubst.replace(new StringBuffer("input"))); // $hasTaintFlow
-      sink(taintedSubst.replace(new StringBuffer("input"), 0, 0)); // $hasTaintFlow
+      sink(taintedSubst.replace((Object)"input")); // $ hasTaintFlow
+      sink(taintedSubst.replace("input")); // $ hasTaintFlow
+      sink(taintedSubst.replace("input", 0, 0)); // $ hasTaintFlow
+      sink(taintedSubst.replace("input".toCharArray())); // $ hasTaintFlow
+      sink(taintedSubst.replace("input".toCharArray(), 0, 0)); // $ hasTaintFlow
+      sink(taintedSubst.replace((CharSequence)"input")); // $ hasTaintFlow
+      sink(taintedSubst.replace((CharSequence)"input", 0, 0)); // $ hasTaintFlow
+      sink(taintedSubst.replace(new TextStringBuilder("input"))); // $ hasTaintFlow
+      sink(taintedSubst.replace(new TextStringBuilder("input"), 0, 0)); // $ hasTaintFlow
+      sink(taintedSubst.replace(new StringBuilder("input"))); // $ hasTaintFlow
+      sink(taintedSubst.replace(new StringBuilder("input"), 0, 0)); // $ hasTaintFlow
+      sink(taintedSubst.replace(new StringBuffer("input"))); // $ hasTaintFlow
+      sink(taintedSubst.replace(new StringBuffer("input"), 0, 0)); // $ hasTaintFlow
 
       // Test replace overloads (tainted input):
       StringSubstitutor untaintedSubst = ss1;
-      sink(untaintedSubst.replace((Object)taint())); // $hasTaintFlow
-      sink(untaintedSubst.replace(taint())); // $hasTaintFlow
-      sink(untaintedSubst.replace(taint(), 0, 0)); // $hasTaintFlow
-      sink(untaintedSubst.replace(taint().toCharArray())); // $hasTaintFlow
-      sink(untaintedSubst.replace(taint().toCharArray(), 0, 0)); // $hasTaintFlow
-      sink(untaintedSubst.replace((CharSequence)taint())); // $hasTaintFlow
-      sink(untaintedSubst.replace((CharSequence)taint(), 0, 0)); // $hasTaintFlow
-      sink(untaintedSubst.replace(new TextStringBuilder(taint()))); // $hasTaintFlow
-      sink(untaintedSubst.replace(new TextStringBuilder(taint()), 0, 0)); // $hasTaintFlow
-      sink(untaintedSubst.replace(new StringBuilder(taint()))); // $hasTaintFlow
-      sink(untaintedSubst.replace(new StringBuilder(taint()), 0, 0)); // $hasTaintFlow
-      sink(untaintedSubst.replace(new StringBuffer(taint()))); // $hasTaintFlow
-      sink(untaintedSubst.replace(new StringBuffer(taint()), 0, 0)); // $hasTaintFlow
+      sink(untaintedSubst.replace((Object)taint())); // $ hasTaintFlow
+      sink(untaintedSubst.replace(taint())); // $ hasTaintFlow
+      sink(untaintedSubst.replace(taint(), 0, 0)); // $ hasTaintFlow
+      sink(untaintedSubst.replace(taint().toCharArray())); // $ hasTaintFlow
+      sink(untaintedSubst.replace(taint().toCharArray(), 0, 0)); // $ hasTaintFlow
+      sink(untaintedSubst.replace((CharSequence)taint())); // $ hasTaintFlow
+      sink(untaintedSubst.replace((CharSequence)taint(), 0, 0)); // $ hasTaintFlow
+      sink(untaintedSubst.replace(new TextStringBuilder(taint()))); // $ hasTaintFlow
+      sink(untaintedSubst.replace(new TextStringBuilder(taint()), 0, 0)); // $ hasTaintFlow
+      sink(untaintedSubst.replace(new StringBuilder(taint()))); // $ hasTaintFlow
+      sink(untaintedSubst.replace(new StringBuilder(taint()), 0, 0)); // $ hasTaintFlow
+      sink(untaintedSubst.replace(new StringBuffer(taint()))); // $ hasTaintFlow
+      sink(untaintedSubst.replace(new StringBuffer(taint()), 0, 0)); // $ hasTaintFlow
 
       // Test static replace methods:
-      sink(StringSubstitutor.replace(taint(), new HashMap<String, String>())); // $hasTaintFlow
-      sink(StringSubstitutor.replace(taint(), new HashMap<String, String>(), "{", "}")); // $hasTaintFlow
-      sink(StringSubstitutor.replace("input", taintedMap)); // $hasTaintFlow
-      sink(StringSubstitutor.replace("input", taintedMap, "{", "}")); // $hasTaintFlow
+      sink(StringSubstitutor.replace(taint(), new HashMap<String, String>())); // $ hasTaintFlow
+      sink(StringSubstitutor.replace(taint(), new HashMap<String, String>(), "{", "}")); // $ hasTaintFlow
+      sink(StringSubstitutor.replace("input", taintedMap)); // $ hasTaintFlow
+      sink(StringSubstitutor.replace("input", taintedMap, "{", "}")); // $ hasTaintFlow
       Properties taintedProps = new Properties();
       taintedProps.put("key", taint());
-      sink(StringSubstitutor.replace(taint(), new Properties())); // $hasTaintFlow
-      sink(StringSubstitutor.replace("input", taintedProps)); // $hasTaintFlow
+      sink(StringSubstitutor.replace(taint(), new Properties())); // $ hasTaintFlow
+      sink(StringSubstitutor.replace("input", taintedProps)); // $ hasTaintFlow
 
       // Test replaceIn methods:
-      TextStringBuilder strBuilder1 = new TextStringBuilder(); taintedSubst.replaceIn(strBuilder1); sink(strBuilder1.toString()); // $hasTaintFlow
-      TextStringBuilder strBuilder2 = new TextStringBuilder(); taintedSubst.replaceIn(strBuilder2, 0, 0); sink(strBuilder2.toString()); // $hasTaintFlow
-      StringBuilder stringBuilder1 = new StringBuilder(); taintedSubst.replaceIn(stringBuilder1); sink(stringBuilder1.toString()); // $hasTaintFlow
-      StringBuilder stringBuilder2 = new StringBuilder(); taintedSubst.replaceIn(stringBuilder2, 0, 0); sink(stringBuilder2.toString()); // $hasTaintFlow
-      StringBuffer stringBuffer1 = new StringBuffer(); taintedSubst.replaceIn(stringBuffer1); sink(stringBuffer1.toString()); // $hasTaintFlow
-      StringBuffer stringBuffer2 = new StringBuffer(); taintedSubst.replaceIn(stringBuffer2, 0, 0); sink(stringBuffer2.toString()); // $hasTaintFlow
+      TextStringBuilder strBuilder1 = new TextStringBuilder(); taintedSubst.replaceIn(strBuilder1); sink(strBuilder1.toString()); // $ hasTaintFlow
+      TextStringBuilder strBuilder2 = new TextStringBuilder(); taintedSubst.replaceIn(strBuilder2, 0, 0); sink(strBuilder2.toString()); // $ hasTaintFlow
+      StringBuilder stringBuilder1 = new StringBuilder(); taintedSubst.replaceIn(stringBuilder1); sink(stringBuilder1.toString()); // $ hasTaintFlow
+      StringBuilder stringBuilder2 = new StringBuilder(); taintedSubst.replaceIn(stringBuilder2, 0, 0); sink(stringBuilder2.toString()); // $ hasTaintFlow
+      StringBuffer stringBuffer1 = new StringBuffer(); taintedSubst.replaceIn(stringBuffer1); sink(stringBuffer1.toString()); // $ hasTaintFlow
+      StringBuffer stringBuffer2 = new StringBuffer(); taintedSubst.replaceIn(stringBuffer2, 0, 0); sink(stringBuffer2.toString()); // $ hasTaintFlow
     }
 
 }
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StringTokenizerTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StringTokenizerTest.java
index 330ee39acb9..5e93bc98391 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/StringTokenizerTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/StringTokenizerTest.java
@@ -9,38 +9,38 @@ public class StringTokenizerTest {
   void test() throws Exception {
 
     // Test constructors:
-    sink((new StringTokenizer(taint().toCharArray())).toString()); // $hasTaintFlow
-    sink((new StringTokenizer(taint().toCharArray(), ',')).toString()); // $hasTaintFlow
-    sink((new StringTokenizer(taint().toCharArray(), ',', '"')).toString()); // $hasTaintFlow
-    sink((new StringTokenizer(taint().toCharArray(), ",")).toString()); // $hasTaintFlow
-    sink((new StringTokenizer(taint().toCharArray(), (StringMatcher)null)).toString()); // $hasTaintFlow
-    sink((new StringTokenizer(taint().toCharArray(), (StringMatcher)null, (StringMatcher)null)).toString()); // $hasTaintFlow
-    sink((new StringTokenizer(taint())).toString()); // $hasTaintFlow
-    sink((new StringTokenizer(taint(), ',')).toString()); // $hasTaintFlow
-    sink((new StringTokenizer(taint(), ',', '"')).toString()); // $hasTaintFlow
-    sink((new StringTokenizer(taint(), ",")).toString()); // $hasTaintFlow
-    sink((new StringTokenizer(taint(), (StringMatcher)null)).toString()); // $hasTaintFlow
-    sink((new StringTokenizer(taint(), (StringMatcher)null, (StringMatcher)null)).toString()); // $hasTaintFlow
+    sink((new StringTokenizer(taint().toCharArray())).toString()); // $ hasTaintFlow
+    sink((new StringTokenizer(taint().toCharArray(), ',')).toString()); // $ hasTaintFlow
+    sink((new StringTokenizer(taint().toCharArray(), ',', '"')).toString()); // $ hasTaintFlow
+    sink((new StringTokenizer(taint().toCharArray(), ",")).toString()); // $ hasTaintFlow
+    sink((new StringTokenizer(taint().toCharArray(), (StringMatcher)null)).toString()); // $ hasTaintFlow
+    sink((new StringTokenizer(taint().toCharArray(), (StringMatcher)null, (StringMatcher)null)).toString()); // $ hasTaintFlow
+    sink((new StringTokenizer(taint())).toString()); // $ hasTaintFlow
+    sink((new StringTokenizer(taint(), ',')).toString()); // $ hasTaintFlow
+    sink((new StringTokenizer(taint(), ',', '"')).toString()); // $ hasTaintFlow
+    sink((new StringTokenizer(taint(), ",")).toString()); // $ hasTaintFlow
+    sink((new StringTokenizer(taint(), (StringMatcher)null)).toString()); // $ hasTaintFlow
+    sink((new StringTokenizer(taint(), (StringMatcher)null, (StringMatcher)null)).toString()); // $ hasTaintFlow
 
     // Test constructing static methods:
-    sink(StringTokenizer.getCSVInstance(taint().toCharArray()).toString()); // $hasTaintFlow
-    sink(StringTokenizer.getCSVInstance(taint()).toString()); // $hasTaintFlow
-    sink(StringTokenizer.getTSVInstance(taint().toCharArray()).toString()); // $hasTaintFlow
-    sink(StringTokenizer.getTSVInstance(taint()).toString()); // $hasTaintFlow
+    sink(StringTokenizer.getCSVInstance(taint().toCharArray()).toString()); // $ hasTaintFlow
+    sink(StringTokenizer.getCSVInstance(taint()).toString()); // $ hasTaintFlow
+    sink(StringTokenizer.getTSVInstance(taint().toCharArray()).toString()); // $ hasTaintFlow
+    sink(StringTokenizer.getTSVInstance(taint()).toString()); // $ hasTaintFlow
 
     // Test accessors:
-    sink((new StringTokenizer(taint())).clone()); // $hasTaintFlow
-    sink((new StringTokenizer(taint())).getContent()); // $hasTaintFlow
-    sink((new StringTokenizer(taint())).getTokenArray()); // $hasTaintFlow
-    sink((new StringTokenizer(taint())).getTokenList()); // $hasTaintFlow
-    sink((new StringTokenizer(taint())).next()); // $hasTaintFlow
-    sink((new StringTokenizer(taint())).nextToken()); // $hasTaintFlow
-    sink((new StringTokenizer(taint())).previous()); // $hasTaintFlow
-    sink((new StringTokenizer(taint())).previousToken()); // $hasTaintFlow
+    sink((new StringTokenizer(taint())).clone()); // $ hasTaintFlow
+    sink((new StringTokenizer(taint())).getContent()); // $ hasTaintFlow
+    sink((new StringTokenizer(taint())).getTokenArray()); // $ hasTaintFlow
+    sink((new StringTokenizer(taint())).getTokenList()); // $ hasTaintFlow
+    sink((new StringTokenizer(taint())).next()); // $ hasTaintFlow
+    sink((new StringTokenizer(taint())).nextToken()); // $ hasTaintFlow
+    sink((new StringTokenizer(taint())).previous()); // $ hasTaintFlow
+    sink((new StringTokenizer(taint())).previousToken()); // $ hasTaintFlow
 
     // Test mutators:
-    sink((new StringTokenizer()).reset(taint().toCharArray()).toString()); // $hasTaintFlow
-    sink((new StringTokenizer()).reset(taint()).toString()); // $hasTaintFlow
+    sink((new StringTokenizer()).reset(taint().toCharArray()).toString()); // $ hasTaintFlow
+    sink((new StringTokenizer()).reset(taint()).toString()); // $ hasTaintFlow
 
   }
 }
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/Test.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/Test.java
index 6cfa278a168..4ac4a13f6dc 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/Test.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/Test.java
@@ -12,57 +12,57 @@ class Test {
     void test() throws Exception {
 
         // All these calls should convey taint to `sink` except as noted.
-        sink(StringUtils.abbreviate(taint(), 0)); // $hasTaintFlow
-        sink(StringUtils.abbreviate(taint(), 0, 0)); // $hasTaintFlow
-        sink(StringUtils.abbreviate(taint(), "...", 0)); // $hasTaintFlow
-        sink(StringUtils.abbreviate("Untainted", taint(), 0)); // $hasTaintFlow
-        sink(StringUtils.abbreviate(taint(), "...", 0, 0)); // $hasTaintFlow
-        sink(StringUtils.abbreviate("Untainted", taint(), 0, 0)); // $hasTaintFlow
-        sink(StringUtils.abbreviateMiddle(taint(), "...", 0)); // $hasTaintFlow
-        sink(StringUtils.abbreviateMiddle("Untainted", taint(), 0)); // $hasTaintFlow
-        sink(StringUtils.appendIfMissing(taint(), "suffix", "candsuffix1", "candsuffix2")); // $hasTaintFlow
-        sink(StringUtils.appendIfMissing("prefix", taint(), "candsuffix1", "candsuffix2")); // $hasTaintFlow
+        sink(StringUtils.abbreviate(taint(), 0)); // $ hasTaintFlow
+        sink(StringUtils.abbreviate(taint(), 0, 0)); // $ hasTaintFlow
+        sink(StringUtils.abbreviate(taint(), "...", 0)); // $ hasTaintFlow
+        sink(StringUtils.abbreviate("Untainted", taint(), 0)); // $ hasTaintFlow
+        sink(StringUtils.abbreviate(taint(), "...", 0, 0)); // $ hasTaintFlow
+        sink(StringUtils.abbreviate("Untainted", taint(), 0, 0)); // $ hasTaintFlow
+        sink(StringUtils.abbreviateMiddle(taint(), "...", 0)); // $ hasTaintFlow
+        sink(StringUtils.abbreviateMiddle("Untainted", taint(), 0)); // $ hasTaintFlow
+        sink(StringUtils.appendIfMissing(taint(), "suffix", "candsuffix1", "candsuffix2")); // $ hasTaintFlow
+        sink(StringUtils.appendIfMissing("prefix", taint(), "candsuffix1", "candsuffix2")); // $ hasTaintFlow
         // (next 2 calls) GOOD: candidate suffixes do not flow to the return value.
         sink(StringUtils.appendIfMissing("prefix", "suffix", taint(), "candsuffix2"));
         sink(StringUtils.appendIfMissing("prefix", "suffix", "candsuffix1", taint()));
-        sink(StringUtils.appendIfMissingIgnoreCase(taint(), "suffix", "candsuffix1", "candsuffix2")); // $hasTaintFlow
-        sink(StringUtils.appendIfMissingIgnoreCase("prefix", taint(), "candsuffix1", "candsuffix2")); // $hasTaintFlow
+        sink(StringUtils.appendIfMissingIgnoreCase(taint(), "suffix", "candsuffix1", "candsuffix2")); // $ hasTaintFlow
+        sink(StringUtils.appendIfMissingIgnoreCase("prefix", taint(), "candsuffix1", "candsuffix2")); // $ hasTaintFlow
         // (next 2 calls) GOOD: candidate suffixes do not flow to the return value.
         sink(StringUtils.appendIfMissingIgnoreCase("prefix", "suffix", taint(), "candsuffix2"));
         sink(StringUtils.appendIfMissingIgnoreCase("prefix", "suffix", "candsuffix1", taint()));
-        sink(StringUtils.capitalize(taint())); // $hasTaintFlow
-        sink(StringUtils.center(taint(), 0)); // $hasTaintFlow
-        sink(StringUtils.center(taint(), 0, 'x')); // $hasTaintFlow
-        sink(StringUtils.center(taint(), 0, "padding string")); // $hasTaintFlow
-        sink(StringUtils.center("Center me", 0, taint())); // $hasTaintFlow
-        sink(StringUtils.chomp(taint())); // $hasTaintFlow
-        sink(StringUtils.chomp(taint(), "separator")); // $hasTaintFlow
+        sink(StringUtils.capitalize(taint())); // $ hasTaintFlow
+        sink(StringUtils.center(taint(), 0)); // $ hasTaintFlow
+        sink(StringUtils.center(taint(), 0, 'x')); // $ hasTaintFlow
+        sink(StringUtils.center(taint(), 0, "padding string")); // $ hasTaintFlow
+        sink(StringUtils.center("Center me", 0, taint())); // $ hasTaintFlow
+        sink(StringUtils.chomp(taint())); // $ hasTaintFlow
+        sink(StringUtils.chomp(taint(), "separator")); // $ hasTaintFlow
         // GOOD: separator does not flow to the return value.
         sink(StringUtils.chomp("Chomp me", taint()));
-        sink(StringUtils.chop(taint())); // $hasTaintFlow
-        sink(StringUtils.defaultIfBlank(taint(), "default")); // $hasTaintFlow
-        sink(StringUtils.defaultIfBlank("Perhaps blank", taint())); // $hasTaintFlow
-        sink(StringUtils.defaultIfEmpty(taint(), "default")); // $hasTaintFlow
-        sink(StringUtils.defaultIfEmpty("Perhaps empty", taint())); // $hasTaintFlow
-        sink(StringUtils.defaultString(taint())); // $hasTaintFlow
-        sink(StringUtils.defaultString(taint(), "default string")); // $hasTaintFlow
-        sink(StringUtils.defaultString("perhaps null", taint())); // $hasTaintFlow
-        sink(StringUtils.deleteWhitespace(taint())); // $hasTaintFlow
-        sink(StringUtils.difference(taint(), "rhs")); // $hasTaintFlow
-        sink(StringUtils.difference("lhs", taint())); // $hasTaintFlow
-        sink(StringUtils.firstNonBlank(taint(), "second string")); // $hasValueFlow
-        sink(StringUtils.firstNonBlank("first string", taint())); // $hasValueFlow
-        sink(StringUtils.firstNonEmpty(taint(), "second string")); // $hasValueFlow
-        sink(StringUtils.firstNonEmpty("first string", taint())); // $hasValueFlow
-        sink(StringUtils.getBytes(taint(), (Charset)null)); // $hasTaintFlow
-        sink(StringUtils.getBytes(taint(), "some charset")); // $hasTaintFlow
+        sink(StringUtils.chop(taint())); // $ hasTaintFlow
+        sink(StringUtils.defaultIfBlank(taint(), "default")); // $ hasTaintFlow
+        sink(StringUtils.defaultIfBlank("Perhaps blank", taint())); // $ hasTaintFlow
+        sink(StringUtils.defaultIfEmpty(taint(), "default")); // $ hasTaintFlow
+        sink(StringUtils.defaultIfEmpty("Perhaps empty", taint())); // $ hasTaintFlow
+        sink(StringUtils.defaultString(taint())); // $ hasTaintFlow
+        sink(StringUtils.defaultString(taint(), "default string")); // $ hasTaintFlow
+        sink(StringUtils.defaultString("perhaps null", taint())); // $ hasTaintFlow
+        sink(StringUtils.deleteWhitespace(taint())); // $ hasTaintFlow
+        sink(StringUtils.difference(taint(), "rhs")); // $ hasTaintFlow
+        sink(StringUtils.difference("lhs", taint())); // $ hasTaintFlow
+        sink(StringUtils.firstNonBlank(taint(), "second string")); // $ hasValueFlow
+        sink(StringUtils.firstNonBlank("first string", taint())); // $ hasValueFlow
+        sink(StringUtils.firstNonEmpty(taint(), "second string")); // $ hasValueFlow
+        sink(StringUtils.firstNonEmpty("first string", taint())); // $ hasValueFlow
+        sink(StringUtils.getBytes(taint(), (Charset)null)); // $ hasTaintFlow
+        sink(StringUtils.getBytes(taint(), "some charset")); // $ hasTaintFlow
         // GOOD: charset names are not a source of taint
         sink(StringUtils.getBytes("some string", taint()));
-        sink(StringUtils.getCommonPrefix(taint(), "second string")); // $hasTaintFlow
-        sink(StringUtils.getCommonPrefix("first string", taint())); // $hasTaintFlow
-        sink(StringUtils.getDigits(taint())); // $hasTaintFlow
-        sink(StringUtils.getIfBlank(taint(), () -> "default")); // $hasTaintFlow
-        sink(StringUtils.getIfEmpty(taint(), () -> "default")); // $hasTaintFlow
+        sink(StringUtils.getCommonPrefix(taint(), "second string")); // $ hasTaintFlow
+        sink(StringUtils.getCommonPrefix("first string", taint())); // $ hasTaintFlow
+        sink(StringUtils.getDigits(taint())); // $ hasTaintFlow
+        sink(StringUtils.getIfBlank(taint(), () -> "default")); // $ hasTaintFlow
+        sink(StringUtils.getIfEmpty(taint(), () -> "default")); // $ hasTaintFlow
         // BAD (but not detected yet): latent taint in lambdas
         sink(StringUtils.getIfBlank("maybe blank", () -> taint()));
         sink(StringUtils.getIfEmpty("maybe blank", () -> taint()));
@@ -70,70 +70,70 @@ class Test {
         // of tainted data.
         sink(StringUtils.join(StringUtils.getBytes(taint(), "UTF-8"), ' '));
         sink(StringUtils.join(StringUtils.getBytes(taint(), "UTF-8"), ' ', 0, 0));
-        sink(StringUtils.join(taint().toCharArray(), ' ')); // $hasTaintFlow
-        sink(StringUtils.join(taint().toCharArray(), ' ', 0, 0)); // $hasTaintFlow
+        sink(StringUtils.join(taint().toCharArray(), ' ')); // $ hasTaintFlow
+        sink(StringUtils.join(taint().toCharArray(), ' ', 0, 0)); // $ hasTaintFlow
         // Testing the Iterable<?> overloads of `join`
         List<String> taintedList = new ArrayList<>();
         taintedList.add(taint());
-        sink(StringUtils.join(taintedList, ' ')); // $hasTaintFlow
-        sink(StringUtils.join(taintedList, "sep")); // $hasTaintFlow
+        sink(StringUtils.join(taintedList, ' ')); // $ hasTaintFlow
+        sink(StringUtils.join(taintedList, "sep")); // $ hasTaintFlow
         List<String> untaintedList = new ArrayList<>();
-        sink(StringUtils.join(untaintedList, taint())); // $hasTaintFlow
+        sink(StringUtils.join(untaintedList, taint())); // $ hasTaintFlow
         // Testing the Iterator<?> overloads of `join`
-        sink(StringUtils.join(taintedList.iterator(), ' ')); // $hasTaintFlow
-        sink(StringUtils.join(taintedList.iterator(), "sep")); // $hasTaintFlow
-        sink(StringUtils.join(untaintedList.iterator(), taint())); // $hasTaintFlow
+        sink(StringUtils.join(taintedList.iterator(), ' ')); // $ hasTaintFlow
+        sink(StringUtils.join(taintedList.iterator(), "sep")); // $ hasTaintFlow
+        sink(StringUtils.join(untaintedList.iterator(), taint())); // $ hasTaintFlow
         // Testing the List<?> overloads of `join`, which have start/end indices
-        sink(StringUtils.join(taintedList, ' ', 0, 0)); // $hasTaintFlow
-        sink(StringUtils.join(taintedList, "sep", 0, 0)); // $hasTaintFlow
-        sink(StringUtils.join(untaintedList, taint(), 0, 0)); // $hasTaintFlow
+        sink(StringUtils.join(taintedList, ' ', 0, 0)); // $ hasTaintFlow
+        sink(StringUtils.join(taintedList, "sep", 0, 0)); // $ hasTaintFlow
+        sink(StringUtils.join(untaintedList, taint(), 0, 0)); // $ hasTaintFlow
         // Testing the Object[] overloads of `join`, which may have start/end indices
         Object[] taintedArray = new Object[] { taint() };
-        sink(StringUtils.join(taintedArray, ' ')); // $hasTaintFlow
-        sink(StringUtils.join(taintedArray, "sep")); // $hasTaintFlow
-        sink(StringUtils.join(taintedArray, ' ', 0, 0)); // $hasTaintFlow
-        sink(StringUtils.join(taintedArray, "sep", 0, 0)); // $hasTaintFlow
+        sink(StringUtils.join(taintedArray, ' ')); // $ hasTaintFlow
+        sink(StringUtils.join(taintedArray, "sep")); // $ hasTaintFlow
+        sink(StringUtils.join(taintedArray, ' ', 0, 0)); // $ hasTaintFlow
+        sink(StringUtils.join(taintedArray, "sep", 0, 0)); // $ hasTaintFlow
         Object[] untaintedArray = new Object[] { "safe" };
-        sink(StringUtils.join(untaintedArray, taint())); // $hasTaintFlow
-        sink(StringUtils.join(untaintedArray, taint(), 0, 0)); // $hasTaintFlow
+        sink(StringUtils.join(untaintedArray, taint())); // $ hasTaintFlow
+        sink(StringUtils.join(untaintedArray, taint(), 0, 0)); // $ hasTaintFlow
         // Testing the variadic overload of `join` and `joinWith`
-        sink(StringUtils.join(taint(), "other string")); // $hasTaintFlow
-        sink(StringUtils.join("other string before", taint())); // $hasTaintFlow
-        sink(StringUtils.joinWith("separator", taint(), "other string")); // $hasTaintFlow
-        sink(StringUtils.joinWith("separator", "other string before", taint())); // $hasTaintFlow
-        sink(StringUtils.joinWith(taint(), "other string before", "other string after")); // $hasTaintFlow
+        sink(StringUtils.join(taint(), "other string")); // $ hasTaintFlow
+        sink(StringUtils.join("other string before", taint())); // $ hasTaintFlow
+        sink(StringUtils.joinWith("separator", taint(), "other string")); // $ hasTaintFlow
+        sink(StringUtils.joinWith("separator", "other string before", taint())); // $ hasTaintFlow
+        sink(StringUtils.joinWith(taint(), "other string before", "other string after")); // $ hasTaintFlow
         // End of `join` tests
-        sink(StringUtils.left(taint(), 0)); // $hasTaintFlow
-        sink(StringUtils.leftPad(taint(), 0)); // $hasTaintFlow
-        sink(StringUtils.leftPad(taint(), 0, ' ')); // $hasTaintFlow
-        sink(StringUtils.leftPad(taint(), 0, "padding")); // $hasTaintFlow
-        sink(StringUtils.leftPad("to pad", 0, taint())); // $hasTaintFlow
-        sink(StringUtils.lowerCase(taint())); // $hasTaintFlow
-        sink(StringUtils.lowerCase(taint(), Locale.UK)); // $hasTaintFlow
-        sink(StringUtils.mid(taint(), 0, 0)); // $hasTaintFlow
-        sink(StringUtils.normalizeSpace(taint())); // $hasTaintFlow
-        sink(StringUtils.overlay(taint(), "overlay", 0, 0)); // $hasTaintFlow
-        sink(StringUtils.overlay("underlay", taint(), 0, 0)); // $hasTaintFlow
-        sink(StringUtils.prependIfMissing(taint(), "append prefix", "check prefix 1", "check prefix 2")); // $hasTaintFlow
-        sink(StringUtils.prependIfMissing("original string", taint(), "check prefix 1", "check prefix 2")); // $hasTaintFlow
+        sink(StringUtils.left(taint(), 0)); // $ hasTaintFlow
+        sink(StringUtils.leftPad(taint(), 0)); // $ hasTaintFlow
+        sink(StringUtils.leftPad(taint(), 0, ' ')); // $ hasTaintFlow
+        sink(StringUtils.leftPad(taint(), 0, "padding")); // $ hasTaintFlow
+        sink(StringUtils.leftPad("to pad", 0, taint())); // $ hasTaintFlow
+        sink(StringUtils.lowerCase(taint())); // $ hasTaintFlow
+        sink(StringUtils.lowerCase(taint(), Locale.UK)); // $ hasTaintFlow
+        sink(StringUtils.mid(taint(), 0, 0)); // $ hasTaintFlow
+        sink(StringUtils.normalizeSpace(taint())); // $ hasTaintFlow
+        sink(StringUtils.overlay(taint(), "overlay", 0, 0)); // $ hasTaintFlow
+        sink(StringUtils.overlay("underlay", taint(), 0, 0)); // $ hasTaintFlow
+        sink(StringUtils.prependIfMissing(taint(), "append prefix", "check prefix 1", "check prefix 2")); // $ hasTaintFlow
+        sink(StringUtils.prependIfMissing("original string", taint(), "check prefix 1", "check prefix 2")); // $ hasTaintFlow
         // (next 2 calls) GOOD: args 3+ are checked against but do not propagate to the return value
         sink(StringUtils.prependIfMissing("original string", "append prefix", taint(), "check prefix 2"));
         sink(StringUtils.prependIfMissing("original string", "append prefix", "check prefix 1", taint()));
-        sink(StringUtils.prependIfMissingIgnoreCase(taint(), "append prefix", "check prefix 1", "check prefix 2")); // $hasTaintFlow
-        sink(StringUtils.prependIfMissingIgnoreCase("original string", taint(), "check prefix 1", "check prefix 2")); // $hasTaintFlow
+        sink(StringUtils.prependIfMissingIgnoreCase(taint(), "append prefix", "check prefix 1", "check prefix 2")); // $ hasTaintFlow
+        sink(StringUtils.prependIfMissingIgnoreCase("original string", taint(), "check prefix 1", "check prefix 2")); // $ hasTaintFlow
         // (next 2 calls) GOOD: args 3+ are checked against but do not propagate to the return value
         sink(StringUtils.prependIfMissingIgnoreCase("original string", "append prefix", taint(), "check prefix 2"));
         sink(StringUtils.prependIfMissingIgnoreCase("original string", "append prefix", "check prefix 1", taint()));
-        sink(StringUtils.remove(taint(), ' ')); // $hasTaintFlow
-        sink(StringUtils.remove(taint(), "delete me")); // $hasTaintFlow
-        sink(StringUtils.removeAll(taint(), "delete me")); // $hasTaintFlow
-        sink(StringUtils.removeEnd(taint(), "delete me")); // $hasTaintFlow
-        sink(StringUtils.removeEndIgnoreCase(taint(), "delete me")); // $hasTaintFlow
-        sink(StringUtils.removeFirst(taint(), "delete me")); // $hasTaintFlow
-        sink(StringUtils.removeIgnoreCase(taint(), "delete me")); // $hasTaintFlow
-        sink(StringUtils.removePattern(taint(), "delete me")); // $hasTaintFlow
-        sink(StringUtils.removeStart(taint(), "delete me")); // $hasTaintFlow
-        sink(StringUtils.removeStartIgnoreCase(taint(), "delete me")); // $hasTaintFlow
+        sink(StringUtils.remove(taint(), ' ')); // $ hasTaintFlow
+        sink(StringUtils.remove(taint(), "delete me")); // $ hasTaintFlow
+        sink(StringUtils.removeAll(taint(), "delete me")); // $ hasTaintFlow
+        sink(StringUtils.removeEnd(taint(), "delete me")); // $ hasTaintFlow
+        sink(StringUtils.removeEndIgnoreCase(taint(), "delete me")); // $ hasTaintFlow
+        sink(StringUtils.removeFirst(taint(), "delete me")); // $ hasTaintFlow
+        sink(StringUtils.removeIgnoreCase(taint(), "delete me")); // $ hasTaintFlow
+        sink(StringUtils.removePattern(taint(), "delete me")); // $ hasTaintFlow
+        sink(StringUtils.removeStart(taint(), "delete me")); // $ hasTaintFlow
+        sink(StringUtils.removeStartIgnoreCase(taint(), "delete me")); // $ hasTaintFlow
         // GOOD (next 9 calls): the removed string doesn't propagate to the return value
         sink(StringUtils.remove("remove from", taint()));
         sink(StringUtils.removeAll("remove from", taint()));
@@ -144,32 +144,32 @@ class Test {
         sink(StringUtils.removePattern("remove from", taint()));
         sink(StringUtils.removeStart("remove from", taint()));
         sink(StringUtils.removeStartIgnoreCase("remove from", taint()));
-        sink(StringUtils.repeat(taint(), 1)); // $hasTaintFlow
-        sink(StringUtils.repeat(taint(), "separator", 1)); // $hasTaintFlow
-        sink(StringUtils.repeat("repeat me", taint(), 1)); // $hasTaintFlow
-        sink(StringUtils.replace(taint(), "search", "replacement")); // $hasTaintFlow
-        sink(StringUtils.replace("haystack", "search", taint())); // $hasTaintFlow
-        sink(StringUtils.replace(taint(), "search", "replacement", 0)); // $hasTaintFlow
-        sink(StringUtils.replace("haystack", "search", taint(), 0)); // $hasTaintFlow
-        sink(StringUtils.replaceAll(taint(), "search", "replacement")); // $hasTaintFlow
-        sink(StringUtils.replaceAll("haystack", "search", taint())); // $hasTaintFlow
-        sink(StringUtils.replaceChars(taint(), 'a', 'b')); // $hasTaintFlow
-        sink(StringUtils.replaceChars(taint(), "abc", "xyz")); // $hasTaintFlow
-        sink(StringUtils.replaceChars("haystack", "abc", taint())); // $hasTaintFlow
-        sink(StringUtils.replaceEach(taint(), new String[] { "search" }, new String[] { "replacement" })); // $hasTaintFlow
-        sink(StringUtils.replaceEach("haystack", new String[] { "search" }, new String[] { taint() })); // $hasTaintFlow
-        sink(StringUtils.replaceEachRepeatedly(taint(), new String[] { "search" }, new String[] { "replacement" })); // $hasTaintFlow
-        sink(StringUtils.replaceEachRepeatedly("haystack", new String[] { "search" }, new String[] { taint() })); // $hasTaintFlow
-        sink(StringUtils.replaceFirst(taint(), "search", "replacement")); // $hasTaintFlow
-        sink(StringUtils.replaceFirst("haystack", "search", taint())); // $hasTaintFlow
-        sink(StringUtils.replaceIgnoreCase(taint(), "search", "replacement")); // $hasTaintFlow
-        sink(StringUtils.replaceIgnoreCase("haystack", "search", taint())); // $hasTaintFlow
-        sink(StringUtils.replaceOnce(taint(), "search", "replacement")); // $hasTaintFlow
-        sink(StringUtils.replaceOnce("haystack", "search", taint())); // $hasTaintFlow
-        sink(StringUtils.replaceOnceIgnoreCase(taint(), "search", "replacement")); // $hasTaintFlow
-        sink(StringUtils.replaceOnceIgnoreCase("haystack", "search", taint())); // $hasTaintFlow
-        sink(StringUtils.replacePattern(taint(), "search", "replacement")); // $hasTaintFlow
-        sink(StringUtils.replacePattern("haystack", "search", taint())); // $hasTaintFlow
+        sink(StringUtils.repeat(taint(), 1)); // $ hasTaintFlow
+        sink(StringUtils.repeat(taint(), "separator", 1)); // $ hasTaintFlow
+        sink(StringUtils.repeat("repeat me", taint(), 1)); // $ hasTaintFlow
+        sink(StringUtils.replace(taint(), "search", "replacement")); // $ hasTaintFlow
+        sink(StringUtils.replace("haystack", "search", taint())); // $ hasTaintFlow
+        sink(StringUtils.replace(taint(), "search", "replacement", 0)); // $ hasTaintFlow
+        sink(StringUtils.replace("haystack", "search", taint(), 0)); // $ hasTaintFlow
+        sink(StringUtils.replaceAll(taint(), "search", "replacement")); // $ hasTaintFlow
+        sink(StringUtils.replaceAll("haystack", "search", taint())); // $ hasTaintFlow
+        sink(StringUtils.replaceChars(taint(), 'a', 'b')); // $ hasTaintFlow
+        sink(StringUtils.replaceChars(taint(), "abc", "xyz")); // $ hasTaintFlow
+        sink(StringUtils.replaceChars("haystack", "abc", taint())); // $ hasTaintFlow
+        sink(StringUtils.replaceEach(taint(), new String[] { "search" }, new String[] { "replacement" })); // $ hasTaintFlow
+        sink(StringUtils.replaceEach("haystack", new String[] { "search" }, new String[] { taint() })); // $ hasTaintFlow
+        sink(StringUtils.replaceEachRepeatedly(taint(), new String[] { "search" }, new String[] { "replacement" })); // $ hasTaintFlow
+        sink(StringUtils.replaceEachRepeatedly("haystack", new String[] { "search" }, new String[] { taint() })); // $ hasTaintFlow
+        sink(StringUtils.replaceFirst(taint(), "search", "replacement")); // $ hasTaintFlow
+        sink(StringUtils.replaceFirst("haystack", "search", taint())); // $ hasTaintFlow
+        sink(StringUtils.replaceIgnoreCase(taint(), "search", "replacement")); // $ hasTaintFlow
+        sink(StringUtils.replaceIgnoreCase("haystack", "search", taint())); // $ hasTaintFlow
+        sink(StringUtils.replaceOnce(taint(), "search", "replacement")); // $ hasTaintFlow
+        sink(StringUtils.replaceOnce("haystack", "search", taint())); // $ hasTaintFlow
+        sink(StringUtils.replaceOnceIgnoreCase(taint(), "search", "replacement")); // $ hasTaintFlow
+        sink(StringUtils.replaceOnceIgnoreCase("haystack", "search", taint())); // $ hasTaintFlow
+        sink(StringUtils.replacePattern(taint(), "search", "replacement")); // $ hasTaintFlow
+        sink(StringUtils.replacePattern("haystack", "search", taint())); // $ hasTaintFlow
         // GOOD (next 11 calls): searched string in replace methods does not flow to the return value.
         sink(StringUtils.replace("haystack", taint(), "replacement"));
         sink(StringUtils.replace("haystack", taint(), "replacement", 0));
@@ -182,28 +182,28 @@ class Test {
         sink(StringUtils.replaceOnce("haystack", taint(), "replacement"));
         sink(StringUtils.replaceOnceIgnoreCase("haystack", taint(), "replacement"));
         sink(StringUtils.replacePattern("haystack", taint(), "replacement"));
-        sink(StringUtils.reverse(taint())); // $hasTaintFlow
-        sink(StringUtils.reverseDelimited(taint(), ',')); // $hasTaintFlow
-        sink(StringUtils.right(taint(), 0)); // $hasTaintFlow
-        sink(StringUtils.rightPad(taint(), 0)); // $hasTaintFlow
-        sink(StringUtils.rightPad(taint(), 0, ' ')); // $hasTaintFlow
-        sink(StringUtils.rightPad(taint(), 0, "padding")); // $hasTaintFlow
-        sink(StringUtils.rightPad("to pad", 0, taint())); // $hasTaintFlow
-        sink(StringUtils.rotate(taint(), 0)); // $hasTaintFlow
-        sink(StringUtils.split(taint())); // $hasTaintFlow
-        sink(StringUtils.split(taint(), ' ')); // $hasTaintFlow
-        sink(StringUtils.split(taint(), " ,;")); // $hasTaintFlow
-        sink(StringUtils.split(taint(), " ,;", 0)); // $hasTaintFlow
-        sink(StringUtils.splitByCharacterType(taint())); // $hasTaintFlow
-        sink(StringUtils.splitByCharacterTypeCamelCase(taint())); // $hasTaintFlow
-        sink(StringUtils.splitByWholeSeparator(taint(), "separator")); // $hasTaintFlow
-        sink(StringUtils.splitByWholeSeparator(taint(), "separator", 0)); // $hasTaintFlow
-        sink(StringUtils.splitByWholeSeparatorPreserveAllTokens(taint(), "separator")); // $hasTaintFlow
-        sink(StringUtils.splitByWholeSeparatorPreserveAllTokens(taint(), "separator", 0)); // $hasTaintFlow
-        sink(StringUtils.splitPreserveAllTokens(taint())); // $hasTaintFlow
-        sink(StringUtils.splitPreserveAllTokens(taint(), ' ')); // $hasTaintFlow
-        sink(StringUtils.splitPreserveAllTokens(taint(), " ,;")); // $hasTaintFlow
-        sink(StringUtils.splitPreserveAllTokens(taint(), " ,;", 0)); // $hasTaintFlow
+        sink(StringUtils.reverse(taint())); // $ hasTaintFlow
+        sink(StringUtils.reverseDelimited(taint(), ',')); // $ hasTaintFlow
+        sink(StringUtils.right(taint(), 0)); // $ hasTaintFlow
+        sink(StringUtils.rightPad(taint(), 0)); // $ hasTaintFlow
+        sink(StringUtils.rightPad(taint(), 0, ' ')); // $ hasTaintFlow
+        sink(StringUtils.rightPad(taint(), 0, "padding")); // $ hasTaintFlow
+        sink(StringUtils.rightPad("to pad", 0, taint())); // $ hasTaintFlow
+        sink(StringUtils.rotate(taint(), 0)); // $ hasTaintFlow
+        sink(StringUtils.split(taint())); // $ hasTaintFlow
+        sink(StringUtils.split(taint(), ' ')); // $ hasTaintFlow
+        sink(StringUtils.split(taint(), " ,;")); // $ hasTaintFlow
+        sink(StringUtils.split(taint(), " ,;", 0)); // $ hasTaintFlow
+        sink(StringUtils.splitByCharacterType(taint())); // $ hasTaintFlow
+        sink(StringUtils.splitByCharacterTypeCamelCase(taint())); // $ hasTaintFlow
+        sink(StringUtils.splitByWholeSeparator(taint(), "separator")); // $ hasTaintFlow
+        sink(StringUtils.splitByWholeSeparator(taint(), "separator", 0)); // $ hasTaintFlow
+        sink(StringUtils.splitByWholeSeparatorPreserveAllTokens(taint(), "separator")); // $ hasTaintFlow
+        sink(StringUtils.splitByWholeSeparatorPreserveAllTokens(taint(), "separator", 0)); // $ hasTaintFlow
+        sink(StringUtils.splitPreserveAllTokens(taint())); // $ hasTaintFlow
+        sink(StringUtils.splitPreserveAllTokens(taint(), ' ')); // $ hasTaintFlow
+        sink(StringUtils.splitPreserveAllTokens(taint(), " ,;")); // $ hasTaintFlow
+        sink(StringUtils.splitPreserveAllTokens(taint(), " ,;", 0)); // $ hasTaintFlow
         // GOOD (next 8 calls): separators don't propagate to the return value
         sink(StringUtils.split("to split", taint()));
         sink(StringUtils.split("to split", taint(), 0));
@@ -213,30 +213,30 @@ class Test {
         sink(StringUtils.splitByWholeSeparatorPreserveAllTokens("to split", taint()));
         sink(StringUtils.splitByWholeSeparatorPreserveAllTokens("to split", taint(), 0));
         sink(StringUtils.splitPreserveAllTokens("to split", taint()));
-        sink(StringUtils.strip(taint())); // $hasTaintFlow
-        sink(StringUtils.strip(taint(), "charstoremove")); // $hasTaintFlow
-        sink(StringUtils.stripAccents(taint())); // $hasTaintFlow
-        sink(StringUtils.stripAll(new String[] { taint() }, "charstoremove")[0]); // $hasTaintFlow
-        sink(StringUtils.stripEnd(taint(), "charstoremove")); // $hasTaintFlow
-        sink(StringUtils.stripStart(taint(), "charstoremove")); // $hasTaintFlow
+        sink(StringUtils.strip(taint())); // $ hasTaintFlow
+        sink(StringUtils.strip(taint(), "charstoremove")); // $ hasTaintFlow
+        sink(StringUtils.stripAccents(taint())); // $ hasTaintFlow
+        sink(StringUtils.stripAll(new String[] { taint() }, "charstoremove")[0]); // $ hasTaintFlow
+        sink(StringUtils.stripEnd(taint(), "charstoremove")); // $ hasTaintFlow
+        sink(StringUtils.stripStart(taint(), "charstoremove")); // $ hasTaintFlow
         // GOOD (next 4 calls): stripped chars do not flow to the return value.
         sink(StringUtils.strip("original text", taint()));
         sink(StringUtils.stripAll(new String[] { "original text" }, taint())[0]);
         sink(StringUtils.stripEnd("original text", taint()));
         sink(StringUtils.stripStart("original text", taint()));
-        sink(StringUtils.stripToEmpty(taint())); // $hasTaintFlow
-        sink(StringUtils.stripToNull(taint())); // $hasTaintFlow
-        sink(StringUtils.substring(taint(), 0)); // $hasTaintFlow
-        sink(StringUtils.substring(taint(), 0, 0)); // $hasTaintFlow
-        sink(StringUtils.substringAfter(taint(), 0)); // $hasTaintFlow
-        sink(StringUtils.substringAfter(taint(), "separator")); // $hasTaintFlow
-        sink(StringUtils.substringAfterLast(taint(), 0)); // $hasTaintFlow
-        sink(StringUtils.substringAfterLast(taint(), "separator")); // $hasTaintFlow
-        sink(StringUtils.substringBefore(taint(), "separator")); // $hasTaintFlow
-        sink(StringUtils.substringBeforeLast(taint(), "separator")); // $hasTaintFlow
-        sink(StringUtils.substringBetween(taint(), "separator")); // $hasTaintFlow
-        sink(StringUtils.substringBetween(taint(), "start-tag", "end-tag")); // $hasTaintFlow
-        sink(StringUtils.substringsBetween(taint(), "start-tag", "end-tag")[0]); // $hasTaintFlow
+        sink(StringUtils.stripToEmpty(taint())); // $ hasTaintFlow
+        sink(StringUtils.stripToNull(taint())); // $ hasTaintFlow
+        sink(StringUtils.substring(taint(), 0)); // $ hasTaintFlow
+        sink(StringUtils.substring(taint(), 0, 0)); // $ hasTaintFlow
+        sink(StringUtils.substringAfter(taint(), 0)); // $ hasTaintFlow
+        sink(StringUtils.substringAfter(taint(), "separator")); // $ hasTaintFlow
+        sink(StringUtils.substringAfterLast(taint(), 0)); // $ hasTaintFlow
+        sink(StringUtils.substringAfterLast(taint(), "separator")); // $ hasTaintFlow
+        sink(StringUtils.substringBefore(taint(), "separator")); // $ hasTaintFlow
+        sink(StringUtils.substringBeforeLast(taint(), "separator")); // $ hasTaintFlow
+        sink(StringUtils.substringBetween(taint(), "separator")); // $ hasTaintFlow
+        sink(StringUtils.substringBetween(taint(), "start-tag", "end-tag")); // $ hasTaintFlow
+        sink(StringUtils.substringsBetween(taint(), "start-tag", "end-tag")[0]); // $ hasTaintFlow
         // GOOD (next 9 calls): separators and bounding tags do not flow to the return value.
         sink(StringUtils.substringAfter("original text", taint()));
         sink(StringUtils.substringAfterLast("original text", taint()));
@@ -247,31 +247,31 @@ class Test {
         sink(StringUtils.substringBetween("original text", "start-tag", taint()));
         sink(StringUtils.substringsBetween("original text", taint(), "end-tag")[0]);
         sink(StringUtils.substringsBetween("original text", "start-tag", taint())[0]);
-        sink(StringUtils.swapCase(taint())); // $hasTaintFlow
-        sink(StringUtils.toCodePoints(taint())); // $hasTaintFlow
-        sink(StringUtils.toEncodedString(StringUtils.getBytes(taint(), "charset"), null)); // $hasTaintFlow
-        sink(StringUtils.toRootLowerCase(taint())); // $hasTaintFlow
-        sink(StringUtils.toRootUpperCase(taint())); // $hasTaintFlow
-        sink(StringUtils.toString(StringUtils.getBytes(taint(), "charset"), "charset")); // $hasTaintFlow
-        sink(StringUtils.trim(taint())); // $hasTaintFlow
-        sink(StringUtils.trimToEmpty(taint())); // $hasTaintFlow
-        sink(StringUtils.trimToNull(taint())); // $hasTaintFlow
-        sink(StringUtils.truncate(taint(), 0)); // $hasTaintFlow
-        sink(StringUtils.truncate(taint(), 0, 0)); // $hasTaintFlow
-        sink(StringUtils.uncapitalize(taint())); // $hasTaintFlow
-        sink(StringUtils.unwrap(taint(), '"')); // $hasTaintFlow
-        sink(StringUtils.unwrap(taint(), "separator")); // $hasTaintFlow
+        sink(StringUtils.swapCase(taint())); // $ hasTaintFlow
+        sink(StringUtils.toCodePoints(taint())); // $ hasTaintFlow
+        sink(StringUtils.toEncodedString(StringUtils.getBytes(taint(), "charset"), null)); // $ hasTaintFlow
+        sink(StringUtils.toRootLowerCase(taint())); // $ hasTaintFlow
+        sink(StringUtils.toRootUpperCase(taint())); // $ hasTaintFlow
+        sink(StringUtils.toString(StringUtils.getBytes(taint(), "charset"), "charset")); // $ hasTaintFlow
+        sink(StringUtils.trim(taint())); // $ hasTaintFlow
+        sink(StringUtils.trimToEmpty(taint())); // $ hasTaintFlow
+        sink(StringUtils.trimToNull(taint())); // $ hasTaintFlow
+        sink(StringUtils.truncate(taint(), 0)); // $ hasTaintFlow
+        sink(StringUtils.truncate(taint(), 0, 0)); // $ hasTaintFlow
+        sink(StringUtils.uncapitalize(taint())); // $ hasTaintFlow
+        sink(StringUtils.unwrap(taint(), '"')); // $ hasTaintFlow
+        sink(StringUtils.unwrap(taint(), "separator")); // $ hasTaintFlow
         // GOOD: the wrapper string does not flow to the return value.
         sink(StringUtils.unwrap("original string", taint()));
-        sink(StringUtils.upperCase(taint())); // $hasTaintFlow
-        sink(StringUtils.upperCase(taint(), null)); // $hasTaintFlow
-        sink(StringUtils.valueOf(taint().toCharArray())); // $hasTaintFlow
-        sink(StringUtils.wrap(taint(), '"')); // $hasTaintFlow
-        sink(StringUtils.wrap(taint(), "wrapper token")); // $hasTaintFlow
-        sink(StringUtils.wrap("wrap me", taint())); // $hasTaintFlow
-        sink(StringUtils.wrapIfMissing(taint(), '"')); // $hasTaintFlow
-        sink(StringUtils.wrapIfMissing(taint(), "wrapper token")); // $hasTaintFlow
-        sink(StringUtils.wrapIfMissing("wrap me", taint())); // $hasTaintFlow
+        sink(StringUtils.upperCase(taint())); // $ hasTaintFlow
+        sink(StringUtils.upperCase(taint(), null)); // $ hasTaintFlow
+        sink(StringUtils.valueOf(taint().toCharArray())); // $ hasTaintFlow
+        sink(StringUtils.wrap(taint(), '"')); // $ hasTaintFlow
+        sink(StringUtils.wrap(taint(), "wrapper token")); // $ hasTaintFlow
+        sink(StringUtils.wrap("wrap me", taint())); // $ hasTaintFlow
+        sink(StringUtils.wrapIfMissing(taint(), '"')); // $ hasTaintFlow
+        sink(StringUtils.wrapIfMissing(taint(), "wrapper token")); // $ hasTaintFlow
+        sink(StringUtils.wrapIfMissing("wrap me", taint())); // $ hasTaintFlow
 
     }
 
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/TextStringBuilderTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/TextStringBuilderTest.java
index 5a7c66c7526..42a696a0c2c 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/TextStringBuilderTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/TextStringBuilderTest.java
@@ -14,135 +14,135 @@ class TextStringBuilderTest {
 
     void test() throws Exception {
 
-        TextStringBuilder cons1 = new TextStringBuilder(taint()); sink(cons1.toString()); // $hasTaintFlow
-        TextStringBuilder cons2 = new TextStringBuilder((CharSequence)taint()); sink(cons2.toString()); // $hasTaintFlow
+        TextStringBuilder cons1 = new TextStringBuilder(taint()); sink(cons1.toString()); // $ hasTaintFlow
+        TextStringBuilder cons2 = new TextStringBuilder((CharSequence)taint()); sink(cons2.toString()); // $ hasTaintFlow
 
-        TextStringBuilder sb1 = new TextStringBuilder(); sb1.append(taint().toCharArray()); sink(sb1.toString()); // $hasTaintFlow
-        TextStringBuilder sb2 = new TextStringBuilder(); sb2.append(taint().toCharArray(), 0, 0); sink(sb2.toString()); // $hasTaintFlow
+        TextStringBuilder sb1 = new TextStringBuilder(); sb1.append(taint().toCharArray()); sink(sb1.toString()); // $ hasTaintFlow
+        TextStringBuilder sb2 = new TextStringBuilder(); sb2.append(taint().toCharArray(), 0, 0); sink(sb2.toString()); // $ hasTaintFlow
         TextStringBuilder sb3 = new TextStringBuilder(); sb3.append(CharBuffer.wrap(taint().toCharArray())); sink(sb3.toString()); // $ hasTaintFlow
         TextStringBuilder sb4 = new TextStringBuilder(); sb4.append(CharBuffer.wrap(taint().toCharArray()), 0, 0); sink(sb4.toString()); // $ hasTaintFlow
-        TextStringBuilder sb5 = new TextStringBuilder(); sb5.append((CharSequence)taint()); sink(sb5.toString()); // $hasTaintFlow
-        TextStringBuilder sb6 = new TextStringBuilder(); sb6.append((CharSequence)taint(), 0, 0); sink(sb6.toString()); // $hasTaintFlow
-        TextStringBuilder sb7 = new TextStringBuilder(); sb7.append((Object)taint()); sink(sb7.toString()); // $hasTaintFlow
+        TextStringBuilder sb5 = new TextStringBuilder(); sb5.append((CharSequence)taint()); sink(sb5.toString()); // $ hasTaintFlow
+        TextStringBuilder sb6 = new TextStringBuilder(); sb6.append((CharSequence)taint(), 0, 0); sink(sb6.toString()); // $ hasTaintFlow
+        TextStringBuilder sb7 = new TextStringBuilder(); sb7.append((Object)taint()); sink(sb7.toString()); // $ hasTaintFlow
         {
             TextStringBuilder auxsb = new TextStringBuilder(); auxsb.append(taint());
-            TextStringBuilder sb8 = new TextStringBuilder(); sb8.append(auxsb); sink(sb8.toString()); // $hasTaintFlow
+            TextStringBuilder sb8 = new TextStringBuilder(); sb8.append(auxsb); sink(sb8.toString()); // $ hasTaintFlow
         }
-        TextStringBuilder sb9 = new TextStringBuilder(); sb9.append(new StringBuffer(taint())); sink(sb9.toString()); // $hasTaintFlow
-        TextStringBuilder sb10 = new TextStringBuilder(); sb10.append(new StringBuffer(taint()), 0, 0); sink(sb10.toString()); // $hasTaintFlow
-        TextStringBuilder sb11 = new TextStringBuilder(); sb11.append(new StringBuilder(taint())); sink(sb11.toString()); // $hasTaintFlow
-        TextStringBuilder sb12 = new TextStringBuilder(); sb12.append(new StringBuilder(taint()), 0, 0); sink(sb12.toString()); // $hasTaintFlow
-        TextStringBuilder sb13 = new TextStringBuilder(); sb13.append(taint()); sink(sb13.toString()); // $hasTaintFlow
-        TextStringBuilder sb14 = new TextStringBuilder(); sb14.append(taint(), 0, 0); sink(sb14.toString()); // $hasTaintFlow
-        TextStringBuilder sb15 = new TextStringBuilder(); sb15.append(taint(), "format", "args"); sink(sb15.toString()); // $hasTaintFlow
-        TextStringBuilder sb16 = new TextStringBuilder(); sb16.append("Format string", taint(), "args"); sink(sb16.toString()); // $hasTaintFlow
+        TextStringBuilder sb9 = new TextStringBuilder(); sb9.append(new StringBuffer(taint())); sink(sb9.toString()); // $ hasTaintFlow
+        TextStringBuilder sb10 = new TextStringBuilder(); sb10.append(new StringBuffer(taint()), 0, 0); sink(sb10.toString()); // $ hasTaintFlow
+        TextStringBuilder sb11 = new TextStringBuilder(); sb11.append(new StringBuilder(taint())); sink(sb11.toString()); // $ hasTaintFlow
+        TextStringBuilder sb12 = new TextStringBuilder(); sb12.append(new StringBuilder(taint()), 0, 0); sink(sb12.toString()); // $ hasTaintFlow
+        TextStringBuilder sb13 = new TextStringBuilder(); sb13.append(taint()); sink(sb13.toString()); // $ hasTaintFlow
+        TextStringBuilder sb14 = new TextStringBuilder(); sb14.append(taint(), 0, 0); sink(sb14.toString()); // $ hasTaintFlow
+        TextStringBuilder sb15 = new TextStringBuilder(); sb15.append(taint(), "format", "args"); sink(sb15.toString()); // $ hasTaintFlow
+        TextStringBuilder sb16 = new TextStringBuilder(); sb16.append("Format string", taint(), "args"); sink(sb16.toString()); // $ hasTaintFlow
         {
             List<String> taintedList = new ArrayList<>();
             taintedList.add(taint());
-            TextStringBuilder sb17 = new TextStringBuilder(); sb17.appendAll(taintedList); sink(sb17.toString()); // $hasTaintFlow
-            TextStringBuilder sb18 = new TextStringBuilder(); sb18.appendAll(taintedList.iterator()); sink(sb18.toString()); // $hasTaintFlow
+            TextStringBuilder sb17 = new TextStringBuilder(); sb17.appendAll(taintedList); sink(sb17.toString()); // $ hasTaintFlow
+            TextStringBuilder sb18 = new TextStringBuilder(); sb18.appendAll(taintedList.iterator()); sink(sb18.toString()); // $ hasTaintFlow
         }
-        TextStringBuilder sb19 = new TextStringBuilder(); sb19.appendAll("clean", taint()); sink(sb19.toString()); // $hasTaintFlow
-        TextStringBuilder sb20 = new TextStringBuilder(); sb20.appendAll(taint(), "clean"); sink(sb20.toString()); // $hasTaintFlow
-        TextStringBuilder sb21 = new TextStringBuilder(); sb21.appendFixedWidthPadLeft(taint(), 0, ' '); sink(sb21.toString()); // $hasTaintFlow
-        TextStringBuilder sb22 = new TextStringBuilder(); sb22.appendFixedWidthPadRight(taint(), 0, ' '); sink(sb22.toString()); // $hasTaintFlow
-        TextStringBuilder sb23 = new TextStringBuilder(); sb23.appendln(taint().toCharArray()); sink(sb23.toString()); // $hasTaintFlow
-        TextStringBuilder sb24 = new TextStringBuilder(); sb24.appendln(taint().toCharArray(), 0, 0); sink(sb24.toString()); // $hasTaintFlow
-        TextStringBuilder sb25 = new TextStringBuilder(); sb25.appendln((Object)taint()); sink(sb25.toString()); // $hasTaintFlow
+        TextStringBuilder sb19 = new TextStringBuilder(); sb19.appendAll("clean", taint()); sink(sb19.toString()); // $ hasTaintFlow
+        TextStringBuilder sb20 = new TextStringBuilder(); sb20.appendAll(taint(), "clean"); sink(sb20.toString()); // $ hasTaintFlow
+        TextStringBuilder sb21 = new TextStringBuilder(); sb21.appendFixedWidthPadLeft(taint(), 0, ' '); sink(sb21.toString()); // $ hasTaintFlow
+        TextStringBuilder sb22 = new TextStringBuilder(); sb22.appendFixedWidthPadRight(taint(), 0, ' '); sink(sb22.toString()); // $ hasTaintFlow
+        TextStringBuilder sb23 = new TextStringBuilder(); sb23.appendln(taint().toCharArray()); sink(sb23.toString()); // $ hasTaintFlow
+        TextStringBuilder sb24 = new TextStringBuilder(); sb24.appendln(taint().toCharArray(), 0, 0); sink(sb24.toString()); // $ hasTaintFlow
+        TextStringBuilder sb25 = new TextStringBuilder(); sb25.appendln((Object)taint()); sink(sb25.toString()); // $ hasTaintFlow
         {
             TextStringBuilder auxsb = new TextStringBuilder(); auxsb.appendln(taint());
-            TextStringBuilder sb26 = new TextStringBuilder(); sb26.appendln(auxsb); sink(sb26.toString()); // $hasTaintFlow
+            TextStringBuilder sb26 = new TextStringBuilder(); sb26.appendln(auxsb); sink(sb26.toString()); // $ hasTaintFlow
         }
-        TextStringBuilder sb27 = new TextStringBuilder(); sb27.appendln(new StringBuffer(taint())); sink(sb27.toString()); // $hasTaintFlow
-        TextStringBuilder sb28 = new TextStringBuilder(); sb28.appendln(new StringBuffer(taint()), 0, 0); sink(sb28.toString()); // $hasTaintFlow
-        TextStringBuilder sb29 = new TextStringBuilder(); sb29.appendln(new StringBuilder(taint())); sink(sb29.toString()); // $hasTaintFlow
-        TextStringBuilder sb30 = new TextStringBuilder(); sb30.appendln(new StringBuilder(taint()), 0, 0); sink(sb30.toString()); // $hasTaintFlow
-        TextStringBuilder sb31 = new TextStringBuilder(); sb31.appendln(taint()); sink(sb31.toString()); // $hasTaintFlow
-        TextStringBuilder sb32 = new TextStringBuilder(); sb32.appendln(taint(), 0, 0); sink(sb32.toString()); // $hasTaintFlow
-        TextStringBuilder sb33 = new TextStringBuilder(); sb33.appendln(taint(), "format", "args"); sink(sb33.toString()); // $hasTaintFlow
-        TextStringBuilder sb34 = new TextStringBuilder(); sb34.appendln("Format string", taint(), "args"); sink(sb34.toString()); // $hasTaintFlow
-        TextStringBuilder sb35 = new TextStringBuilder(); sb35.appendSeparator(taint()); sink(sb35.toString()); // $hasTaintFlow
-        TextStringBuilder sb36 = new TextStringBuilder(); sb36.appendSeparator(taint(), 0); sink(sb36.toString()); // $hasTaintFlow
-        TextStringBuilder sb37 = new TextStringBuilder(); sb37.appendSeparator(taint(), "default"); sink(sb37.toString()); // $hasTaintFlow
-        TextStringBuilder sb38 = new TextStringBuilder(); sb38.appendSeparator("", taint()); sink(sb38.toString()); // $hasTaintFlow
+        TextStringBuilder sb27 = new TextStringBuilder(); sb27.appendln(new StringBuffer(taint())); sink(sb27.toString()); // $ hasTaintFlow
+        TextStringBuilder sb28 = new TextStringBuilder(); sb28.appendln(new StringBuffer(taint()), 0, 0); sink(sb28.toString()); // $ hasTaintFlow
+        TextStringBuilder sb29 = new TextStringBuilder(); sb29.appendln(new StringBuilder(taint())); sink(sb29.toString()); // $ hasTaintFlow
+        TextStringBuilder sb30 = new TextStringBuilder(); sb30.appendln(new StringBuilder(taint()), 0, 0); sink(sb30.toString()); // $ hasTaintFlow
+        TextStringBuilder sb31 = new TextStringBuilder(); sb31.appendln(taint()); sink(sb31.toString()); // $ hasTaintFlow
+        TextStringBuilder sb32 = new TextStringBuilder(); sb32.appendln(taint(), 0, 0); sink(sb32.toString()); // $ hasTaintFlow
+        TextStringBuilder sb33 = new TextStringBuilder(); sb33.appendln(taint(), "format", "args"); sink(sb33.toString()); // $ hasTaintFlow
+        TextStringBuilder sb34 = new TextStringBuilder(); sb34.appendln("Format string", taint(), "args"); sink(sb34.toString()); // $ hasTaintFlow
+        TextStringBuilder sb35 = new TextStringBuilder(); sb35.appendSeparator(taint()); sink(sb35.toString()); // $ hasTaintFlow
+        TextStringBuilder sb36 = new TextStringBuilder(); sb36.appendSeparator(taint(), 0); sink(sb36.toString()); // $ hasTaintFlow
+        TextStringBuilder sb37 = new TextStringBuilder(); sb37.appendSeparator(taint(), "default"); sink(sb37.toString()); // $ hasTaintFlow
+        TextStringBuilder sb38 = new TextStringBuilder(); sb38.appendSeparator("", taint()); sink(sb38.toString()); // $ hasTaintFlow
         {
             TextStringBuilder auxsb = new TextStringBuilder(); auxsb.appendln(taint());
-            TextStringBuilder sb39 = new TextStringBuilder(); auxsb.appendTo(sb39); sink(sb39.toString()); // $hasTaintFlow
+            TextStringBuilder sb39 = new TextStringBuilder(); auxsb.appendTo(sb39); sink(sb39.toString()); // $ hasTaintFlow
         }
         {
             List<String> taintedList = new ArrayList<>();
             taintedList.add(taint());
-            TextStringBuilder sb40 = new TextStringBuilder(); sb40.appendWithSeparators(taintedList, ", "); sink(sb40.toString()); // $hasTaintFlow
-            TextStringBuilder sb41 = new TextStringBuilder(); sb41.appendWithSeparators(taintedList.iterator(), ", "); sink(sb41.toString()); // $hasTaintFlow
+            TextStringBuilder sb40 = new TextStringBuilder(); sb40.appendWithSeparators(taintedList, ", "); sink(sb40.toString()); // $ hasTaintFlow
+            TextStringBuilder sb41 = new TextStringBuilder(); sb41.appendWithSeparators(taintedList.iterator(), ", "); sink(sb41.toString()); // $ hasTaintFlow
             List<String> untaintedList = new ArrayList<>();
-            TextStringBuilder sb42 = new TextStringBuilder(); sb42.appendWithSeparators(untaintedList, taint()); sink(sb42.toString()); // $hasTaintFlow
-            TextStringBuilder sb43 = new TextStringBuilder(); sb43.appendWithSeparators(untaintedList.iterator(), taint()); sink(sb43.toString()); // $hasTaintFlow
+            TextStringBuilder sb42 = new TextStringBuilder(); sb42.appendWithSeparators(untaintedList, taint()); sink(sb42.toString()); // $ hasTaintFlow
+            TextStringBuilder sb43 = new TextStringBuilder(); sb43.appendWithSeparators(untaintedList.iterator(), taint()); sink(sb43.toString()); // $ hasTaintFlow
             String[] taintedArray = new String[] { taint() };
             String[] untaintedArray = new String[] {};
-            TextStringBuilder sb44 = new TextStringBuilder(); sb44.appendWithSeparators(taintedArray, ", "); sink(sb44.toString()); // $hasTaintFlow
-            TextStringBuilder sb45 = new TextStringBuilder(); sb45.appendWithSeparators(untaintedArray, taint()); sink(sb45.toString()); // $hasTaintFlow
+            TextStringBuilder sb44 = new TextStringBuilder(); sb44.appendWithSeparators(taintedArray, ", "); sink(sb44.toString()); // $ hasTaintFlow
+            TextStringBuilder sb45 = new TextStringBuilder(); sb45.appendWithSeparators(untaintedArray, taint()); sink(sb45.toString()); // $ hasTaintFlow
         }
         {
             TextStringBuilder sb46 = new TextStringBuilder(); sb46.append(taint());
             char[] target = new char[100];
             sb46.asReader().read(target);
-            sink(target); // $hasTaintFlow
+            sink(target); // $ hasTaintFlow
         }
-        TextStringBuilder sb47 = new TextStringBuilder(); sb47.append(taint()); sink(sb47.asTokenizer().next()); // $hasTaintFlow
-        TextStringBuilder sb48 = new TextStringBuilder(); sb48.append(taint()); sink(sb48.build()); // $hasTaintFlow
-        TextStringBuilder sb49 = new TextStringBuilder(); sb49.append(taint()); sink(sb49.getChars(null)); // $hasTaintFlow
+        TextStringBuilder sb47 = new TextStringBuilder(); sb47.append(taint()); sink(sb47.asTokenizer().next()); // $ hasTaintFlow
+        TextStringBuilder sb48 = new TextStringBuilder(); sb48.append(taint()); sink(sb48.build()); // $ hasTaintFlow
+        TextStringBuilder sb49 = new TextStringBuilder(); sb49.append(taint()); sink(sb49.getChars(null)); // $ hasTaintFlow
         {
             TextStringBuilder sb50 = new TextStringBuilder(); sb50.append(taint());
             char[] target = new char[100];
             sb50.getChars(target);
-            sink(target); // $hasTaintFlow
+            sink(target); // $ hasTaintFlow
         }
         {
             TextStringBuilder sb51 = new TextStringBuilder(); sb51.append(taint());
             char[] target = new char[100];
             sb51.getChars(0, 0, target, 0);
-            sink(target); // $hasTaintFlow
+            sink(target); // $ hasTaintFlow
         }
-        TextStringBuilder sb52 = new TextStringBuilder(); sb52.insert(0, taint().toCharArray()); sink(sb52.toString()); // $hasTaintFlow
-        TextStringBuilder sb53 = new TextStringBuilder(); sb53.insert(0, taint().toCharArray(), 0, 0); sink(sb53.toString()); // $hasTaintFlow
-        TextStringBuilder sb54 = new TextStringBuilder(); sb54.insert(0, taint()); sink(sb54.toString()); // $hasTaintFlow
-        TextStringBuilder sb55 = new TextStringBuilder(); sb55.insert(0, (Object)taint()); sink(sb55.toString()); // $hasTaintFlow
-        TextStringBuilder sb56 = new TextStringBuilder(); sb56.append(taint()); sink(sb56.leftString(0)); // $hasTaintFlow
-        TextStringBuilder sb57 = new TextStringBuilder(); sb57.append(taint()); sink(sb57.midString(0, 0)); // $hasTaintFlow
+        TextStringBuilder sb52 = new TextStringBuilder(); sb52.insert(0, taint().toCharArray()); sink(sb52.toString()); // $ hasTaintFlow
+        TextStringBuilder sb53 = new TextStringBuilder(); sb53.insert(0, taint().toCharArray(), 0, 0); sink(sb53.toString()); // $ hasTaintFlow
+        TextStringBuilder sb54 = new TextStringBuilder(); sb54.insert(0, taint()); sink(sb54.toString()); // $ hasTaintFlow
+        TextStringBuilder sb55 = new TextStringBuilder(); sb55.insert(0, (Object)taint()); sink(sb55.toString()); // $ hasTaintFlow
+        TextStringBuilder sb56 = new TextStringBuilder(); sb56.append(taint()); sink(sb56.leftString(0)); // $ hasTaintFlow
+        TextStringBuilder sb57 = new TextStringBuilder(); sb57.append(taint()); sink(sb57.midString(0, 0)); // $ hasTaintFlow
         {
             StringReader reader = new StringReader(taint());
-            TextStringBuilder sb58 = new TextStringBuilder(); sb58.readFrom(reader); sink(sb58.toString()); // $hasTaintFlow
+            TextStringBuilder sb58 = new TextStringBuilder(); sb58.readFrom(reader); sink(sb58.toString()); // $ hasTaintFlow
         }
-        TextStringBuilder sb59 = new TextStringBuilder(); sb59.replace(0, 0, taint()); sink(sb59.toString()); // $hasTaintFlow
-        TextStringBuilder sb60 = new TextStringBuilder(); sb60.replace(null, taint(), 0, 0, 0); sink(sb60.toString()); // $hasTaintFlow
-        TextStringBuilder sb61 = new TextStringBuilder(); sb61.replaceAll((StringMatcher)null, taint()); sink(sb61.toString()); // $hasTaintFlow
-        TextStringBuilder sb62 = new TextStringBuilder(); sb62.replaceAll("search", taint()); sink(sb62.toString()); // $hasTaintFlow
+        TextStringBuilder sb59 = new TextStringBuilder(); sb59.replace(0, 0, taint()); sink(sb59.toString()); // $ hasTaintFlow
+        TextStringBuilder sb60 = new TextStringBuilder(); sb60.replace(null, taint(), 0, 0, 0); sink(sb60.toString()); // $ hasTaintFlow
+        TextStringBuilder sb61 = new TextStringBuilder(); sb61.replaceAll((StringMatcher)null, taint()); sink(sb61.toString()); // $ hasTaintFlow
+        TextStringBuilder sb62 = new TextStringBuilder(); sb62.replaceAll("search", taint()); sink(sb62.toString()); // $ hasTaintFlow
         TextStringBuilder sb63 = new TextStringBuilder(); sb63.replaceAll(taint(), "replace"); sink(sb63.toString()); // GOOD (search string doesn't convey taint)
-        TextStringBuilder sb64 = new TextStringBuilder(); sb64.replaceFirst((StringMatcher)null, taint()); sink(sb64.toString()); // $hasTaintFlow
-        TextStringBuilder sb65 = new TextStringBuilder(); sb65.replaceFirst("search", taint()); sink(sb65.toString()); // $hasTaintFlow
+        TextStringBuilder sb64 = new TextStringBuilder(); sb64.replaceFirst((StringMatcher)null, taint()); sink(sb64.toString()); // $ hasTaintFlow
+        TextStringBuilder sb65 = new TextStringBuilder(); sb65.replaceFirst("search", taint()); sink(sb65.toString()); // $ hasTaintFlow
         TextStringBuilder sb66 = new TextStringBuilder(); sb66.replaceFirst(taint(), "replace"); sink(sb66.toString()); // GOOD (search string doesn't convey taint)
-        TextStringBuilder sb67 = new TextStringBuilder(); sb67.append(taint()); sink(sb67.rightString(0)); // $hasTaintFlow
-        TextStringBuilder sb68 = new TextStringBuilder(); sb68.append(taint()); sink(sb68.subSequence(0, 0)); // $hasTaintFlow
-        TextStringBuilder sb69 = new TextStringBuilder(); sb69.append(taint()); sink(sb69.substring(0)); // $hasTaintFlow
-        TextStringBuilder sb70 = new TextStringBuilder(); sb70.append(taint()); sink(sb70.substring(0, 0)); // $hasTaintFlow
-        TextStringBuilder sb71 = new TextStringBuilder(); sb71.append(taint()); sink(sb71.toCharArray()); // $hasTaintFlow
-        TextStringBuilder sb72 = new TextStringBuilder(); sb72.append(taint()); sink(sb72.toCharArray(0, 0)); // $hasTaintFlow
-        TextStringBuilder sb73 = new TextStringBuilder(); sb73.append(taint()); sink(sb73.toStringBuffer()); // $hasTaintFlow
-        TextStringBuilder sb74 = new TextStringBuilder(); sb74.append(taint()); sink(sb74.toStringBuilder()); // $hasTaintFlow
+        TextStringBuilder sb67 = new TextStringBuilder(); sb67.append(taint()); sink(sb67.rightString(0)); // $ hasTaintFlow
+        TextStringBuilder sb68 = new TextStringBuilder(); sb68.append(taint()); sink(sb68.subSequence(0, 0)); // $ hasTaintFlow
+        TextStringBuilder sb69 = new TextStringBuilder(); sb69.append(taint()); sink(sb69.substring(0)); // $ hasTaintFlow
+        TextStringBuilder sb70 = new TextStringBuilder(); sb70.append(taint()); sink(sb70.substring(0, 0)); // $ hasTaintFlow
+        TextStringBuilder sb71 = new TextStringBuilder(); sb71.append(taint()); sink(sb71.toCharArray()); // $ hasTaintFlow
+        TextStringBuilder sb72 = new TextStringBuilder(); sb72.append(taint()); sink(sb72.toCharArray(0, 0)); // $ hasTaintFlow
+        TextStringBuilder sb73 = new TextStringBuilder(); sb73.append(taint()); sink(sb73.toStringBuffer()); // $ hasTaintFlow
+        TextStringBuilder sb74 = new TextStringBuilder(); sb74.append(taint()); sink(sb74.toStringBuilder()); // $ hasTaintFlow
 
         // Tests for fluent methods (those returning `this`):
 
         TextStringBuilder fluentTest = new TextStringBuilder();
-        sink(fluentTest.append("Harmless").append(taint()).append("Also harmless").toString()); // $hasTaintFlow
+        sink(fluentTest.append("Harmless").append(taint()).append("Also harmless").toString()); // $ hasTaintFlow
 
         TextStringBuilder fluentBackflowTest = new TextStringBuilder();
         fluentBackflowTest.append("Harmless").append(taint()).append("Also harmless");
-        sink(fluentBackflowTest.toString()); // $hasTaintFlow
+        sink(fluentBackflowTest.toString()); // $ hasTaintFlow
 
         // Test the case where the fluent method contributing taint is at the end of a statement:
         TextStringBuilder fluentBackflowTest2 = new TextStringBuilder();
         fluentBackflowTest2.append("Harmless").append(taint());
-        sink(fluentBackflowTest2.toString()); // $hasTaintFlow
+        sink(fluentBackflowTest2.toString()); // $ hasTaintFlow
 
         // Test all fluent methods are passing taint through to their result:
         TextStringBuilder fluentAllMethodsTest = new TextStringBuilder(taint());
@@ -172,7 +172,7 @@ class TextStringBuilderTest {
         .setLength(500)
         .setNewLineText("newline")
         .setNullText("NULL")
-        .trim()); // $hasTaintFlow
+        .trim()); // $ hasTaintFlow
 
         // Test all fluent methods are passing taint back to their qualifier:
         TextStringBuilder fluentAllMethodsTest2 = new TextStringBuilder();
@@ -204,7 +204,7 @@ class TextStringBuilderTest {
         .setNullText("NULL")
         .trim()
         .append(taint());
-        sink(fluentAllMethodsTest2); // $hasTaintFlow
+        sink(fluentAllMethodsTest2); // $ hasTaintFlow
     }
 
 }
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/ToStringBuilderTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/ToStringBuilderTest.java
index ed2e4400dd7..59b9206fcc7 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/ToStringBuilderTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/ToStringBuilderTest.java
@@ -7,31 +7,31 @@ class ToStringBuilderTest {
 
     void test() throws Exception {
 
-        ToStringBuilder sb1 = new ToStringBuilder(null); sb1.append((Object)taint()); sink(sb1.toString()); // $hasTaintFlow
-        ToStringBuilder sb2 = new ToStringBuilder(null); sb2.append(new Object[] { taint() }); sink(sb2.toString()); // $hasTaintFlow
-        ToStringBuilder sb3 = new ToStringBuilder(null); sb3.append(taint(), true); sink(sb3.toString()); // $hasTaintFlow
-        ToStringBuilder sb4 = new ToStringBuilder(null); sb4.append("fieldname", taint()); sink(sb4.toString()); // $hasTaintFlow
-        ToStringBuilder sb5 = new ToStringBuilder(null); sb5.append("fieldname", new Object[] { taint() }); sink(sb5.toString()); // $hasTaintFlow
-        ToStringBuilder sb6 = new ToStringBuilder(null); sb6.append("fieldname", new Object[] { taint() }, true); sink(sb6.toString()); // $hasTaintFlow
+        ToStringBuilder sb1 = new ToStringBuilder(null); sb1.append((Object)taint()); sink(sb1.toString()); // $ hasTaintFlow
+        ToStringBuilder sb2 = new ToStringBuilder(null); sb2.append(new Object[] { taint() }); sink(sb2.toString()); // $ hasTaintFlow
+        ToStringBuilder sb3 = new ToStringBuilder(null); sb3.append(taint(), true); sink(sb3.toString()); // $ hasTaintFlow
+        ToStringBuilder sb4 = new ToStringBuilder(null); sb4.append("fieldname", taint()); sink(sb4.toString()); // $ hasTaintFlow
+        ToStringBuilder sb5 = new ToStringBuilder(null); sb5.append("fieldname", new Object[] { taint() }); sink(sb5.toString()); // $ hasTaintFlow
+        ToStringBuilder sb6 = new ToStringBuilder(null); sb6.append("fieldname", new Object[] { taint() }, true); sink(sb6.toString()); // $ hasTaintFlow
         // GOOD: this appends an Object using the Object.toString style, which does not expose fields or String content.
         ToStringBuilder sb7 = new ToStringBuilder(null); sb7.appendAsObjectToString(taint()); sink(sb7.toString());
-        ToStringBuilder sb8 = new ToStringBuilder(null); sb8.appendSuper(taint()); sink(sb8.toString()); // $hasTaintFlow
-        ToStringBuilder sb9 = new ToStringBuilder(null); sb9.appendToString(taint()); sink(sb9.toString()); // $hasTaintFlow
-        ToStringBuilder sb10 = new ToStringBuilder(null); sb10.append((Object)taint()); sink(sb10.build()); // $hasTaintFlow
-        ToStringBuilder sb11 = new ToStringBuilder(null); sb11.append((Object)taint()); sink(sb11.getStringBuffer().toString()); // $hasTaintFlow
+        ToStringBuilder sb8 = new ToStringBuilder(null); sb8.appendSuper(taint()); sink(sb8.toString()); // $ hasTaintFlow
+        ToStringBuilder sb9 = new ToStringBuilder(null); sb9.appendToString(taint()); sink(sb9.toString()); // $ hasTaintFlow
+        ToStringBuilder sb10 = new ToStringBuilder(null); sb10.append((Object)taint()); sink(sb10.build()); // $ hasTaintFlow
+        ToStringBuilder sb11 = new ToStringBuilder(null); sb11.append((Object)taint()); sink(sb11.getStringBuffer().toString()); // $ hasTaintFlow
 
         // Test fluent methods:
         ToStringBuilder fluentTest = new ToStringBuilder(null);
-        sink(fluentTest.append("Harmless").append(taint()).append("Also harmless").toString()); // $hasTaintFlow
+        sink(fluentTest.append("Harmless").append(taint()).append("Also harmless").toString()); // $ hasTaintFlow
 
         ToStringBuilder fluentBackflowTest = new ToStringBuilder(null);
         fluentBackflowTest.append("Harmless").append(taint()).append("Also harmless");
-        sink(fluentBackflowTest.toString()); // $hasTaintFlow
+        sink(fluentBackflowTest.toString()); // $ hasTaintFlow
 
         // Test the case where the fluent method contributing taint is at the end of a statement:
         ToStringBuilder fluentBackflowTest2 = new ToStringBuilder(null);
         fluentBackflowTest2.append("Harmless").append(taint());
-        sink(fluentBackflowTest2.toString()); // $hasTaintFlow
+        sink(fluentBackflowTest2.toString()); // $ hasTaintFlow
 
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/TripleTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/TripleTest.java
index b6f9c53cc7e..bc8c72ba221 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/TripleTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/TripleTest.java
@@ -18,69 +18,69 @@ class TripleTest {
       ImmutableTriple<String, String, String> taintedRight = ImmutableTriple.of("clean-left", "clean-middle", taint());
 
       // Check flow through ImmutableTriples:
-      sink(taintedLeft.getLeft()); // $hasValueFlow
+      sink(taintedLeft.getLeft()); // $ hasValueFlow
       sink(taintedLeft.getMiddle());
       sink(taintedLeft.getRight());
-      sink(taintedLeft.left); // $hasValueFlow
+      sink(taintedLeft.left); // $ hasValueFlow
       sink(taintedLeft.middle);
       sink(taintedLeft.right);
       sink(taintedMiddle.getLeft());
-      sink(taintedMiddle.getMiddle()); // $hasValueFlow
+      sink(taintedMiddle.getMiddle()); // $ hasValueFlow
       sink(taintedMiddle.getRight());
       sink(taintedMiddle.left);
-      sink(taintedMiddle.middle); // $hasValueFlow
+      sink(taintedMiddle.middle); // $ hasValueFlow
       sink(taintedMiddle.right);
       sink(taintedRight.getLeft());
       sink(taintedRight.getMiddle());
-      sink(taintedRight.getRight()); // $hasValueFlow
+      sink(taintedRight.getRight()); // $ hasValueFlow
       sink(taintedRight.left);
       sink(taintedRight.middle);
-      sink(taintedRight.right); // $hasValueFlow
+      sink(taintedRight.right); // $ hasValueFlow
 
       Triple<String, String, String> taintedLeft2 = taintedLeft;
       Triple<String, String, String> taintedMiddle2 = taintedMiddle;
       Triple<String, String, String> taintedRight2 = taintedRight;
 
       // Check flow also works via an alias of type Triple:
-      sink(taintedLeft2.getLeft()); // $hasValueFlow
+      sink(taintedLeft2.getLeft()); // $ hasValueFlow
       sink(taintedLeft2.getMiddle());
       sink(taintedLeft2.getRight());
       sink(taintedMiddle2.getLeft());
-      sink(taintedMiddle2.getMiddle()); // $hasValueFlow
+      sink(taintedMiddle2.getMiddle()); // $ hasValueFlow
       sink(taintedMiddle2.getRight());
       sink(taintedRight2.getLeft());
       sink(taintedRight2.getMiddle());
-      sink(taintedRight2.getRight()); // $hasValueFlow
+      sink(taintedRight2.getRight()); // $ hasValueFlow
 
       // Check flow via Triple.of:
       Triple<String, String, String> taintedLeft3 = Triple.of(taint(), "clean-middle", "clean-right");
       Triple<String, String, String> taintedMiddle3 = Triple.of("clean-left", taint(), "clean-right");
       Triple<String, String, String> taintedRight3 = Triple.of("clean-left", "clean-middle", taint());
 
-      sink(taintedLeft3.getLeft()); // $hasValueFlow
+      sink(taintedLeft3.getLeft()); // $ hasValueFlow
       sink(taintedLeft3.getMiddle());
       sink(taintedLeft3.getRight());
       sink(taintedMiddle3.getLeft());
-      sink(taintedMiddle3.getMiddle()); // $hasValueFlow
+      sink(taintedMiddle3.getMiddle()); // $ hasValueFlow
       sink(taintedMiddle3.getRight());
       sink(taintedRight3.getLeft());
       sink(taintedRight3.getMiddle());
-      sink(taintedRight3.getRight()); // $hasValueFlow
+      sink(taintedRight3.getRight()); // $ hasValueFlow
 
       // Check flow via constructor:
       ImmutableTriple<String, String, String> taintedLeft4 = new ImmutableTriple(taint(), "clean-middle", "clean-right");
       ImmutableTriple<String, String, String> taintedMiddle4 = new ImmutableTriple("clean-left", taint(), "clean-right");
       ImmutableTriple<String, String, String> taintedRight4 = new ImmutableTriple("clean-left", "clean-middle", taint());
 
-      sink(taintedLeft4.getLeft()); // $hasValueFlow
+      sink(taintedLeft4.getLeft()); // $ hasValueFlow
       sink(taintedLeft4.getMiddle());
       sink(taintedLeft4.getRight());
       sink(taintedMiddle4.getLeft());
-      sink(taintedMiddle4.getMiddle()); // $hasValueFlow
+      sink(taintedMiddle4.getMiddle()); // $ hasValueFlow
       sink(taintedMiddle4.getRight());
       sink(taintedRight4.getLeft());
       sink(taintedRight4.getMiddle());
-      sink(taintedRight4.getRight()); // $hasValueFlow
+      sink(taintedRight4.getRight()); // $ hasValueFlow
 
       MutableTriple<String, String, String> mutableTaintedLeft = MutableTriple.of(taint(), "clean-middle", "clean-right");
       MutableTriple<String, String, String> mutableTaintedMiddle = MutableTriple.of("clean-left", taint(), "clean-right");
@@ -96,60 +96,60 @@ class TripleTest {
       MutableTriple<String, String, String> mutableTaintedRightConstructed = new MutableTriple("clean-left", "clean-middle", taint());
 
       // Check flow through MutableTriples:
-      sink(mutableTaintedLeft.getLeft()); // $hasValueFlow
+      sink(mutableTaintedLeft.getLeft()); // $ hasValueFlow
       sink(mutableTaintedLeft.getMiddle());
       sink(mutableTaintedLeft.getRight());
-      sink(mutableTaintedLeft.left); // $hasValueFlow
+      sink(mutableTaintedLeft.left); // $ hasValueFlow
       sink(mutableTaintedLeft.middle);
       sink(mutableTaintedLeft.right);
       sink(mutableTaintedMiddle.getLeft());
-      sink(mutableTaintedMiddle.getMiddle()); // $hasValueFlow
+      sink(mutableTaintedMiddle.getMiddle()); // $ hasValueFlow
       sink(mutableTaintedMiddle.getRight());
       sink(mutableTaintedMiddle.left);
-      sink(mutableTaintedMiddle.middle); // $hasValueFlow
+      sink(mutableTaintedMiddle.middle); // $ hasValueFlow
       sink(mutableTaintedMiddle.right);
       sink(mutableTaintedRight.getLeft());
       sink(mutableTaintedRight.getMiddle());
-      sink(mutableTaintedRight.getRight()); // $hasValueFlow
+      sink(mutableTaintedRight.getRight()); // $ hasValueFlow
       sink(mutableTaintedRight.left);
       sink(mutableTaintedRight.middle);
-      sink(mutableTaintedRight.right); // $hasValueFlow
-      sink(setTaintedLeft.getLeft()); // $hasValueFlow
+      sink(mutableTaintedRight.right); // $ hasValueFlow
+      sink(setTaintedLeft.getLeft()); // $ hasValueFlow
       sink(setTaintedLeft.getMiddle());
       sink(setTaintedLeft.getRight());
-      sink(setTaintedLeft.left); // $hasValueFlow
+      sink(setTaintedLeft.left); // $ hasValueFlow
       sink(setTaintedLeft.middle);
       sink(setTaintedLeft.right);
       sink(setTaintedMiddle.getLeft());
-      sink(setTaintedMiddle.getMiddle()); // $hasValueFlow
+      sink(setTaintedMiddle.getMiddle()); // $ hasValueFlow
       sink(setTaintedMiddle.getRight());
       sink(setTaintedMiddle.left);
-      sink(setTaintedMiddle.middle); // $hasValueFlow
+      sink(setTaintedMiddle.middle); // $ hasValueFlow
       sink(setTaintedMiddle.right);
       sink(setTaintedRight.getLeft());
       sink(setTaintedRight.getMiddle());
-      sink(setTaintedRight.getRight()); // $hasValueFlow
+      sink(setTaintedRight.getRight()); // $ hasValueFlow
       sink(setTaintedRight.left);
       sink(setTaintedRight.middle);
-      sink(setTaintedRight.right); // $hasValueFlow
-      sink(mutableTaintedLeftConstructed.getLeft()); // $hasValueFlow
+      sink(setTaintedRight.right); // $ hasValueFlow
+      sink(mutableTaintedLeftConstructed.getLeft()); // $ hasValueFlow
       sink(mutableTaintedLeftConstructed.getMiddle());
       sink(mutableTaintedLeftConstructed.getRight());
-      sink(mutableTaintedLeftConstructed.left); // $hasValueFlow
+      sink(mutableTaintedLeftConstructed.left); // $ hasValueFlow
       sink(mutableTaintedLeftConstructed.middle);
       sink(mutableTaintedLeftConstructed.right);
       sink(mutableTaintedMiddleConstructed.getLeft());
-      sink(mutableTaintedMiddleConstructed.getMiddle()); // $hasValueFlow
+      sink(mutableTaintedMiddleConstructed.getMiddle()); // $ hasValueFlow
       sink(mutableTaintedMiddleConstructed.getRight());
       sink(mutableTaintedMiddleConstructed.left);
-      sink(mutableTaintedMiddleConstructed.middle); // $hasValueFlow
+      sink(mutableTaintedMiddleConstructed.middle); // $ hasValueFlow
       sink(mutableTaintedMiddleConstructed.right);
       sink(mutableTaintedRightConstructed.getLeft());
       sink(mutableTaintedRightConstructed.getMiddle());
-      sink(mutableTaintedRightConstructed.getRight()); // $hasValueFlow
+      sink(mutableTaintedRightConstructed.getRight()); // $ hasValueFlow
       sink(mutableTaintedRightConstructed.left);
       sink(mutableTaintedRightConstructed.middle);
-      sink(mutableTaintedRightConstructed.right); // $hasValueFlow
+      sink(mutableTaintedRightConstructed.right); // $ hasValueFlow
 
       Triple<String, String, String> mutableTaintedLeft2 = mutableTaintedLeft;
       Triple<String, String, String> mutableTaintedMiddle2 = mutableTaintedMiddle;
@@ -159,23 +159,23 @@ class TripleTest {
       Triple<String, String, String> setTaintedRight2 = setTaintedRight;
 
       // Check flow also works via an alias of type Triple:
-      sink(mutableTaintedLeft2.getLeft()); // $hasValueFlow
+      sink(mutableTaintedLeft2.getLeft()); // $ hasValueFlow
       sink(mutableTaintedLeft2.getMiddle());
       sink(mutableTaintedLeft2.getRight());
       sink(mutableTaintedMiddle2.getLeft());
-      sink(mutableTaintedMiddle2.getMiddle()); // $hasValueFlow
+      sink(mutableTaintedMiddle2.getMiddle()); // $ hasValueFlow
       sink(mutableTaintedMiddle2.getRight());
       sink(mutableTaintedRight2.getLeft());
       sink(mutableTaintedRight2.getMiddle());
-      sink(mutableTaintedRight2.getRight()); // $hasValueFlow
-      sink(setTaintedLeft2.getLeft()); // $hasValueFlow
+      sink(mutableTaintedRight2.getRight()); // $ hasValueFlow
+      sink(setTaintedLeft2.getLeft()); // $ hasValueFlow
       sink(setTaintedLeft2.getMiddle());
       sink(setTaintedLeft2.getRight());
       sink(setTaintedMiddle2.getLeft());
-      sink(setTaintedMiddle2.getMiddle()); // $hasValueFlow
+      sink(setTaintedMiddle2.getMiddle()); // $ hasValueFlow
       sink(setTaintedMiddle2.getRight());
       sink(setTaintedRight2.getLeft());
       sink(setTaintedRight2.getMiddle());
-      sink(setTaintedRight2.getRight()); // $hasValueFlow
+      sink(setTaintedRight2.getRight()); // $ hasValueFlow
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/WordUtilsTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/WordUtilsTest.java
index 5b64915ffb7..60edaf66992 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/WordUtilsTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/WordUtilsTest.java
@@ -6,20 +6,20 @@ public class WordUtilsTest {
   void sink(Object o) {}
 
   void test() throws Exception {
-    sink(WordUtils.capitalize(taint())); // $hasTaintFlow
-    sink(WordUtils.capitalize(taint(), ' ', ',')); // $hasTaintFlow
-    sink(WordUtils.capitalizeFully(taint())); // $hasTaintFlow
-    sink(WordUtils.capitalizeFully(taint(), ' ', ',')); // $hasTaintFlow
-    sink(WordUtils.initials(taint())); // $hasTaintFlow
-    sink(WordUtils.initials(taint(), ' ', ',')); // $hasTaintFlow
-    sink(WordUtils.swapCase(taint())); // $hasTaintFlow
-    sink(WordUtils.uncapitalize(taint())); // $hasTaintFlow
-    sink(WordUtils.uncapitalize(taint(), ' ', ',')); // $hasTaintFlow
-    sink(WordUtils.wrap(taint(), 0)); // $hasTaintFlow
-    sink(WordUtils.wrap(taint(), 0, "\n", false)); // $hasTaintFlow
-    sink(WordUtils.wrap("wrap me", 0, taint(), false)); // $hasTaintFlow
-    sink(WordUtils.wrap(taint(), 0, "\n", false, "\n")); // $hasTaintFlow
-    sink(WordUtils.wrap("wrap me", 0, taint(), false, "\n")); // $hasTaintFlow
+    sink(WordUtils.capitalize(taint())); // $ hasTaintFlow
+    sink(WordUtils.capitalize(taint(), ' ', ',')); // $ hasTaintFlow
+    sink(WordUtils.capitalizeFully(taint())); // $ hasTaintFlow
+    sink(WordUtils.capitalizeFully(taint(), ' ', ',')); // $ hasTaintFlow
+    sink(WordUtils.initials(taint())); // $ hasTaintFlow
+    sink(WordUtils.initials(taint(), ' ', ',')); // $ hasTaintFlow
+    sink(WordUtils.swapCase(taint())); // $ hasTaintFlow
+    sink(WordUtils.uncapitalize(taint())); // $ hasTaintFlow
+    sink(WordUtils.uncapitalize(taint(), ' ', ',')); // $ hasTaintFlow
+    sink(WordUtils.wrap(taint(), 0)); // $ hasTaintFlow
+    sink(WordUtils.wrap(taint(), 0, "\n", false)); // $ hasTaintFlow
+    sink(WordUtils.wrap("wrap me", 0, taint(), false)); // $ hasTaintFlow
+    sink(WordUtils.wrap(taint(), 0, "\n", false, "\n")); // $ hasTaintFlow
+    sink(WordUtils.wrap("wrap me", 0, taint(), false, "\n")); // $ hasTaintFlow
     // GOOD: the wrap-on line terminator does not propagate to the return value
     sink(WordUtils.wrap("wrap me", 0, "\n", false, taint()));
   }
diff --git a/java/ql/test/library-tests/frameworks/apache-commons-lang3/WordUtilsTextTest.java b/java/ql/test/library-tests/frameworks/apache-commons-lang3/WordUtilsTextTest.java
index 14318a08d56..ef0baa1ed92 100644
--- a/java/ql/test/library-tests/frameworks/apache-commons-lang3/WordUtilsTextTest.java
+++ b/java/ql/test/library-tests/frameworks/apache-commons-lang3/WordUtilsTextTest.java
@@ -6,22 +6,22 @@ public class WordUtilsTextTest {
   void sink(Object o) {}
 
   void test() throws Exception {
-    sink(WordUtils.abbreviate(taint(), 0, 0, "append me")); // $hasTaintFlow
-    sink(WordUtils.abbreviate("abbreviate me", 0, 0, taint())); // $hasTaintFlow
-    sink(WordUtils.capitalize(taint())); // $hasTaintFlow
-    sink(WordUtils.capitalize(taint(), ' ', ',')); // $hasTaintFlow
-    sink(WordUtils.capitalizeFully(taint())); // $hasTaintFlow
-    sink(WordUtils.capitalizeFully(taint(), ' ', ',')); // $hasTaintFlow
-    sink(WordUtils.initials(taint())); // $hasTaintFlow
-    sink(WordUtils.initials(taint(), ' ', ',')); // $hasTaintFlow
-    sink(WordUtils.swapCase(taint())); // $hasTaintFlow
-    sink(WordUtils.uncapitalize(taint())); // $hasTaintFlow
-    sink(WordUtils.uncapitalize(taint(), ' ', ',')); // $hasTaintFlow
-    sink(WordUtils.wrap(taint(), 0)); // $hasTaintFlow
-    sink(WordUtils.wrap(taint(), 0, "\n", false)); // $hasTaintFlow
-    sink(WordUtils.wrap("wrap me", 0, taint(), false)); // $hasTaintFlow
-    sink(WordUtils.wrap(taint(), 0, "\n", false, "\n")); // $hasTaintFlow
-    sink(WordUtils.wrap("wrap me", 0, taint(), false, "\n")); // $hasTaintFlow
+    sink(WordUtils.abbreviate(taint(), 0, 0, "append me")); // $ hasTaintFlow
+    sink(WordUtils.abbreviate("abbreviate me", 0, 0, taint())); // $ hasTaintFlow
+    sink(WordUtils.capitalize(taint())); // $ hasTaintFlow
+    sink(WordUtils.capitalize(taint(), ' ', ',')); // $ hasTaintFlow
+    sink(WordUtils.capitalizeFully(taint())); // $ hasTaintFlow
+    sink(WordUtils.capitalizeFully(taint(), ' ', ',')); // $ hasTaintFlow
+    sink(WordUtils.initials(taint())); // $ hasTaintFlow
+    sink(WordUtils.initials(taint(), ' ', ',')); // $ hasTaintFlow
+    sink(WordUtils.swapCase(taint())); // $ hasTaintFlow
+    sink(WordUtils.uncapitalize(taint())); // $ hasTaintFlow
+    sink(WordUtils.uncapitalize(taint(), ' ', ',')); // $ hasTaintFlow
+    sink(WordUtils.wrap(taint(), 0)); // $ hasTaintFlow
+    sink(WordUtils.wrap(taint(), 0, "\n", false)); // $ hasTaintFlow
+    sink(WordUtils.wrap("wrap me", 0, taint(), false)); // $ hasTaintFlow
+    sink(WordUtils.wrap(taint(), 0, "\n", false, "\n")); // $ hasTaintFlow
+    sink(WordUtils.wrap("wrap me", 0, taint(), false, "\n")); // $ hasTaintFlow
     // GOOD: the wrap-on line terminator does not propagate to the return value
     sink(WordUtils.wrap("wrap me", 0, "\n", false, taint()));
   }
diff --git a/java/ql/test/library-tests/frameworks/apache-http/A.java b/java/ql/test/library-tests/frameworks/apache-http/A.java
index e33bf391590..c9ac2bde3a2 100644
--- a/java/ql/test/library-tests/frameworks/apache-http/A.java
+++ b/java/ql/test/library-tests/frameworks/apache-http/A.java
@@ -12,54 +12,54 @@ class A {
 
     class Test1 implements HttpRequestHandler {
         public void handle(HttpRequest req, HttpResponse res, HttpContext ctx) throws IOException {
-            A.sink(req.getRequestLine()); //$hasTaintFlow
-            A.sink(req.getRequestLine().getUri()); //$hasTaintFlow
-            A.sink(req.getRequestLine().getMethod()); //$hasTaintFlow
-            A.sink(req.getAllHeaders()); //$hasTaintFlow
+            A.sink(req.getRequestLine()); // $ hasTaintFlow
+            A.sink(req.getRequestLine().getUri()); // $ hasTaintFlow
+            A.sink(req.getRequestLine().getMethod()); // $ hasTaintFlow
+            A.sink(req.getAllHeaders()); // $ hasTaintFlow
             HeaderIterator it = req.headerIterator();
-            A.sink(it.next()); //$hasTaintFlow
-            A.sink(it.nextHeader()); //$hasTaintFlow
+            A.sink(it.next()); // $ hasTaintFlow
+            A.sink(it.nextHeader()); // $ hasTaintFlow
             Header h = req.getHeaders("abc")[3];
-            A.sink(h.getName()); //$hasTaintFlow
-            A.sink(h.getValue()); //$hasTaintFlow
+            A.sink(h.getName()); // $ hasTaintFlow
+            A.sink(h.getValue()); // $ hasTaintFlow
             HeaderElement el = h.getElements()[0];
-            A.sink(el.getName()); //$hasTaintFlow
-            A.sink(el.getValue()); //$hasTaintFlow
-            A.sink(el.getParameters()); //$hasTaintFlow
-            A.sink(el.getParameterByName("abc").getValue()); //$hasTaintFlow
-            A.sink(el.getParameter(0).getName()); //$hasTaintFlow
+            A.sink(el.getName()); // $ hasTaintFlow
+            A.sink(el.getValue()); // $ hasTaintFlow
+            A.sink(el.getParameters()); // $ hasTaintFlow
+            A.sink(el.getParameterByName("abc").getValue()); // $ hasTaintFlow
+            A.sink(el.getParameter(0).getName()); // $ hasTaintFlow
             HttpEntity ent = ((HttpEntityEnclosingRequest)req).getEntity();
-            A.sink(ent.getContent()); //$hasTaintFlow
-            A.sink(ent.getContentEncoding()); //$hasTaintFlow
-            A.sink(ent.getContentType()); //$hasTaintFlow
-            A.sink(EntityUtils.toString(ent)); //$hasTaintFlow
-            A.sink(EntityUtils.toByteArray(ent)); //$hasTaintFlow
-            A.sink(EntityUtils.getContentCharSet(ent)); //$hasTaintFlow
-            A.sink(EntityUtils.getContentMimeType(ent)); //$hasTaintFlow
-            res.setEntity(new StringEntity("<a href='" + req.getRequestLine().getUri() + "'>a</a>")); //$hasTaintFlow
-            EntityUtils.updateEntity(res, new ByteArrayEntity(EntityUtils.toByteArray(ent))); //$hasTaintFlow
-            res.setHeader("Location", req.getRequestLine().getUri()); //$hasTaintFlow
-            res.setHeader(new BasicHeader("Location", req.getRequestLine().getUri())); //$hasTaintFlow
+            A.sink(ent.getContent()); // $ hasTaintFlow
+            A.sink(ent.getContentEncoding()); // $ hasTaintFlow
+            A.sink(ent.getContentType()); // $ hasTaintFlow
+            A.sink(EntityUtils.toString(ent)); // $ hasTaintFlow
+            A.sink(EntityUtils.toByteArray(ent)); // $ hasTaintFlow
+            A.sink(EntityUtils.getContentCharSet(ent)); // $ hasTaintFlow
+            A.sink(EntityUtils.getContentMimeType(ent)); // $ hasTaintFlow
+            res.setEntity(new StringEntity("<a href='" + req.getRequestLine().getUri() + "'>a</a>")); // $ hasTaintFlow
+            EntityUtils.updateEntity(res, new ByteArrayEntity(EntityUtils.toByteArray(ent))); // $ hasTaintFlow
+            res.setHeader("Location", req.getRequestLine().getUri()); // $ hasTaintFlow
+            res.setHeader(new BasicHeader("Location", req.getRequestLine().getUri())); // $ hasTaintFlow
         }
     }
 
     void test2() {
         ByteArrayBuffer bbuf = new ByteArrayBuffer(42);
         bbuf.append((byte[]) taint(), 0, 3);
-        sink(bbuf.buffer()); //$hasTaintFlow
-        sink(bbuf.toByteArray()); //$hasTaintFlow
+        sink(bbuf.buffer()); // $ hasTaintFlow
+        sink(bbuf.toByteArray()); // $ hasTaintFlow
 
         CharArrayBuffer cbuf = new CharArrayBuffer(42);
         cbuf.append(bbuf.toByteArray(), 0, 3);
-        sink(cbuf.toCharArray()); //$hasTaintFlow
-        sink(cbuf.toString()); //$hasTaintFlow
-        sink(cbuf.subSequence(0, 3)); //$hasTaintFlow
-        sink(cbuf.substring(0, 3)); //$hasTaintFlow
-        sink(cbuf.substringTrimmed(0, 3)); //$hasTaintFlow
+        sink(cbuf.toCharArray()); // $ hasTaintFlow
+        sink(cbuf.toString()); // $ hasTaintFlow
+        sink(cbuf.subSequence(0, 3)); // $ hasTaintFlow
+        sink(cbuf.substring(0, 3)); // $ hasTaintFlow
+        sink(cbuf.substringTrimmed(0, 3)); // $ hasTaintFlow
 
-        sink(Args.notNull(taint(), "x")); //$hasTaintFlow
-        sink(Args.notEmpty((String) taint(), "x")); //$hasTaintFlow
-        sink(Args.notBlank((String) taint(), "x")); //$hasTaintFlow
+        sink(Args.notNull(taint(), "x")); // $ hasTaintFlow
+        sink(Args.notEmpty((String) taint(), "x")); // $ hasTaintFlow
+        sink(Args.notBlank((String) taint(), "x")); // $ hasTaintFlow
         sink(Args.notNull("x", (String) taint())); // Good
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/library-tests/frameworks/apache-http/B.java b/java/ql/test/library-tests/frameworks/apache-http/B.java
index 493aaadd8e3..d1bca8462d3 100644
--- a/java/ql/test/library-tests/frameworks/apache-http/B.java
+++ b/java/ql/test/library-tests/frameworks/apache-http/B.java
@@ -14,63 +14,63 @@ class B {
 
     class Test1 implements HttpRequestHandler {
         public void handle(ClassicHttpRequest req, ClassicHttpResponse res, HttpContext ctx) throws IOException, ParseException {
-            B.sink(req.getAuthority().getHostName()); //$hasTaintFlow
-            B.sink(req.getAuthority().toString()); //$hasTaintFlow
-            B.sink(req.getMethod()); //$hasTaintFlow
-            B.sink(req.getPath()); //$hasTaintFlow
-            B.sink(req.getScheme()); 
-            B.sink(req.getRequestUri()); //$hasTaintFlow
+            B.sink(req.getAuthority().getHostName()); // $ hasTaintFlow
+            B.sink(req.getAuthority().toString()); // $ hasTaintFlow
+            B.sink(req.getMethod()); // $ hasTaintFlow
+            B.sink(req.getPath()); // $ hasTaintFlow
+            B.sink(req.getScheme());
+            B.sink(req.getRequestUri()); // $ hasTaintFlow
             RequestLine line = new RequestLine(req);
-            B.sink(line.getUri()); //$hasTaintFlow
-            B.sink(line.getMethod()); //$hasTaintFlow
-            B.sink(req.getHeaders()); //$hasTaintFlow
-            B.sink(req.headerIterator()); //$hasTaintFlow
+            B.sink(line.getUri()); // $ hasTaintFlow
+            B.sink(line.getMethod()); // $ hasTaintFlow
+            B.sink(req.getHeaders()); // $ hasTaintFlow
+            B.sink(req.headerIterator()); // $ hasTaintFlow
             Header h = req.getHeaders("abc")[3];
-            B.sink(h.getName()); //$hasTaintFlow
-            B.sink(h.getValue()); //$hasTaintFlow
-            B.sink(req.getFirstHeader("abc")); //$hasTaintFlow
-            B.sink(req.getLastHeader("abc")); //$hasTaintFlow
+            B.sink(h.getName()); // $ hasTaintFlow
+            B.sink(h.getValue()); // $ hasTaintFlow
+            B.sink(req.getFirstHeader("abc")); // $ hasTaintFlow
+            B.sink(req.getLastHeader("abc")); // $ hasTaintFlow
             HttpEntity ent = req.getEntity();
-            B.sink(ent.getContent()); //$hasTaintFlow
-            B.sink(ent.getContentEncoding()); //$hasTaintFlow
-            B.sink(ent.getContentType()); //$hasTaintFlow
-            B.sink(ent.getTrailerNames()); //$hasTaintFlow
-            B.sink(ent.getTrailers().get()); //$hasTaintFlow
-            B.sink(EntityUtils.toString(ent)); //$hasTaintFlow
-            B.sink(EntityUtils.toByteArray(ent)); //$hasTaintFlow
-            B.sink(EntityUtils.parse(ent)); //$hasTaintFlow
-            res.setEntity(new StringEntity("<a href='" + req.getRequestUri() + "'>a</a>")); //$hasTaintFlow
-            res.setEntity(new ByteArrayEntity(EntityUtils.toByteArray(ent), ContentType.TEXT_HTML)); //$hasTaintFlow
-            res.setEntity(HttpEntities.create("<a href='" + req.getRequestUri() + "'>a</a>")); //$hasTaintFlow
-            res.setHeader("Location", req.getRequestUri()); //$hasTaintFlow
-            res.setHeader(new BasicHeader("Location", req.getRequestUri())); //$hasTaintFlow
+            B.sink(ent.getContent()); // $ hasTaintFlow
+            B.sink(ent.getContentEncoding()); // $ hasTaintFlow
+            B.sink(ent.getContentType()); // $ hasTaintFlow
+            B.sink(ent.getTrailerNames()); // $ hasTaintFlow
+            B.sink(ent.getTrailers().get()); // $ hasTaintFlow
+            B.sink(EntityUtils.toString(ent)); // $ hasTaintFlow
+            B.sink(EntityUtils.toByteArray(ent)); // $ hasTaintFlow
+            B.sink(EntityUtils.parse(ent)); // $ hasTaintFlow
+            res.setEntity(new StringEntity("<a href='" + req.getRequestUri() + "'>a</a>")); // $ hasTaintFlow
+            res.setEntity(new ByteArrayEntity(EntityUtils.toByteArray(ent), ContentType.TEXT_HTML)); // $ hasTaintFlow
+            res.setEntity(HttpEntities.create("<a href='" + req.getRequestUri() + "'>a</a>")); // $ hasTaintFlow
+            res.setHeader("Location", req.getRequestUri()); // $ hasTaintFlow
+            res.setHeader(new BasicHeader("Location", req.getRequestUri())); // $ hasTaintFlow
         }
     }
 
     void test2() {
         ByteArrayBuffer bbuf = new ByteArrayBuffer(42);
-        bbuf.append((byte[]) taint(), 0, 3); 
-        sink(bbuf.array()); //$hasTaintFlow
-        sink(bbuf.toByteArray()); //$hasTaintFlow
-        sink(bbuf.toString()); 
+        bbuf.append((byte[]) taint(), 0, 3);
+        sink(bbuf.array()); // $ hasTaintFlow
+        sink(bbuf.toByteArray()); // $ hasTaintFlow
+        sink(bbuf.toString());
 
         CharArrayBuffer cbuf = new CharArrayBuffer(42);
-        cbuf.append(bbuf.toByteArray(), 0, 3); 
-        sink(cbuf.toCharArray()); //$hasTaintFlow
-        sink(cbuf.toString()); //$hasTaintFlow
-        sink(cbuf.subSequence(0, 3)); //$hasTaintFlow
-        sink(cbuf.substring(0, 3)); //$hasTaintFlow
-        sink(cbuf.substringTrimmed(0, 3)); //$hasTaintFlow
+        cbuf.append(bbuf.toByteArray(), 0, 3);
+        sink(cbuf.toCharArray()); // $ hasTaintFlow
+        sink(cbuf.toString()); // $ hasTaintFlow
+        sink(cbuf.subSequence(0, 3)); // $ hasTaintFlow
+        sink(cbuf.substring(0, 3)); // $ hasTaintFlow
+        sink(cbuf.substringTrimmed(0, 3)); // $ hasTaintFlow
 
-        sink(Args.notNull(taint(), "x")); //$hasTaintFlow
-        sink(Args.notEmpty((String) taint(), "x")); //$hasTaintFlow
-        sink(Args.notBlank((String) taint(), "x")); //$hasTaintFlow
-        sink(Args.notNull("x", (String) taint())); 
+        sink(Args.notNull(taint(), "x")); // $ hasTaintFlow
+        sink(Args.notEmpty((String) taint(), "x")); // $ hasTaintFlow
+        sink(Args.notBlank((String) taint(), "x")); // $ hasTaintFlow
+        sink(Args.notNull("x", (String) taint()));
     }
 
     class Test3 implements HttpServerRequestHandler {
         public void handle(ClassicHttpRequest req, HttpServerRequestHandler.ResponseTrigger restr, HttpContext ctx) throws HttpException, IOException {
-            B.sink(req.getEntity()); //$hasTaintFlow
+            B.sink(req.getEntity()); // $ hasTaintFlow
         }
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/library-tests/frameworks/guava/handwritten/TestBase.java b/java/ql/test/library-tests/frameworks/guava/handwritten/TestBase.java
index 963b971235f..e2e4150fdfe 100644
--- a/java/ql/test/library-tests/frameworks/guava/handwritten/TestBase.java
+++ b/java/ql/test/library-tests/frameworks/guava/handwritten/TestBase.java
@@ -13,13 +13,13 @@ class TestBase {
     void test1() {
         String x = taint();
 
-        sink(Strings.padStart(x, 10, ' ')); // $numTaintFlow=1
-        sink(Strings.padEnd(x, 10, ' ')); // $numTaintFlow=1
-        sink(Strings.repeat(x, 3)); // $numTaintFlow=1
-        sink(Strings.emptyToNull(Strings.nullToEmpty(x))); // $numValueFlow=1
-        sink(Strings.lenientFormat(x, 3)); // $numTaintFlow=1
-        sink(Strings.commonPrefix(x, "abc")); 
-        sink(Strings.commonSuffix(x, "cde")); 
+        sink(Strings.padStart(x, 10, ' ')); // $ numTaintFlow=1
+        sink(Strings.padEnd(x, 10, ' ')); // $ numTaintFlow=1
+        sink(Strings.repeat(x, 3)); // $ numTaintFlow=1
+        sink(Strings.emptyToNull(Strings.nullToEmpty(x))); // $ numValueFlow=1
+        sink(Strings.lenientFormat(x, 3)); // $ numTaintFlow=1
+        sink(Strings.commonPrefix(x, "abc"));
+        sink(Strings.commonSuffix(x, "cde"));
         sink(Strings.lenientFormat("%s = %s", x, 3)); // $ numTaintFlow=1
     }
 
@@ -28,10 +28,10 @@ class TestBase {
         Splitter s = Splitter.on(x).omitEmptyStrings();
 
         sink(s.split("x y z"));
-        sink(s.split(x)); // $numTaintFlow=1
-        sink(s.splitToList(x)); // $numTaintFlow=1
+        sink(s.split(x)); // $ numTaintFlow=1
+        sink(s.splitToList(x)); // $ numTaintFlow=1
         sink(s.withKeyValueSeparator("=").split("a=b"));
-        sink(s.withKeyValueSeparator("=").split(x)); // $numTaintFlow=1
+        sink(s.withKeyValueSeparator("=").split(x)); // $ numTaintFlow=1
     }
 
     void test3() {
@@ -42,68 +42,68 @@ class TestBase {
         StringBuilder sb = new StringBuilder();
         sink(safeJoiner.appendTo(sb, "a", "b", "c"));
         sink(sb.toString());
-        sink(taintedJoiner.appendTo(sb, "a", "b", "c")); // $numTaintFlow=1
-        sink(sb.toString()); // $numTaintFlow=1
-        sink(safeJoiner.appendTo(sb, "a", "b", "c")); // $numTaintFlow=1
-        sink(sb.toString()); // $numTaintFlow=1
+        sink(taintedJoiner.appendTo(sb, "a", "b", "c")); // $ numTaintFlow=1
+        sink(sb.toString()); // $ numTaintFlow=1
+        sink(safeJoiner.appendTo(sb, "a", "b", "c")); // $ numTaintFlow=1
+        sink(sb.toString()); // $ numTaintFlow=1
 
         sb = new StringBuilder();
-        sink(safeJoiner.appendTo(sb, x, x)); // $numTaintFlow=1
+        sink(safeJoiner.appendTo(sb, x, x)); // $ numTaintFlow=1
 
         Map<String, String> m = new HashMap<String, String>();
         m.put("k", "v");
         sink(safeJoiner.withKeyValueSeparator("=").join(m));
-        sink(safeJoiner.withKeyValueSeparator(x).join(m)); // $numTaintFlow=1
-        sink(taintedJoiner.useForNull("(null)").withKeyValueSeparator("=").join(m)); // $numTaintFlow=1
+        sink(safeJoiner.withKeyValueSeparator(x).join(m)); // $ numTaintFlow=1
+        sink(taintedJoiner.useForNull("(null)").withKeyValueSeparator("=").join(m)); // $ numTaintFlow=1
         m.put("k2", x);
-        sink(safeJoiner.withKeyValueSeparator("=").join(m)); // $numTaintFlow=1
+        sink(safeJoiner.withKeyValueSeparator("=").join(m)); // $ numTaintFlow=1
     }
 
     void test4() {
-        sink(Preconditions.checkNotNull(taint())); // $numValueFlow=1
-        sink(Verify.verifyNotNull(taint())); // $numValueFlow=1
+        sink(Preconditions.checkNotNull(taint())); // $ numValueFlow=1
+        sink(Verify.verifyNotNull(taint())); // $ numValueFlow=1
     }
 
     void test5() {
-        sink(Ascii.toLowerCase(taint())); // $numTaintFlow=1
-        sink(Ascii.toUpperCase(taint())); // $numTaintFlow=1
-        sink(Ascii.truncate(taint(), 3, "...")); // $numTaintFlow=1
-        sink(Ascii.truncate("abcabcabc", 3, taint())); // $numTaintFlow=1
-        sink(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, taint())); // $numTaintFlow=1
-        sink(CaseFormat.LOWER_HYPHEN.converterTo(CaseFormat.UPPER_CAMEL).convert(taint())); // $numTaintFlow=1
-        sink(CaseFormat.LOWER_UNDERSCORE.converterTo(CaseFormat.LOWER_HYPHEN).reverse().convert(taint())); // $numTaintFlow=1
+        sink(Ascii.toLowerCase(taint())); // $ numTaintFlow=1
+        sink(Ascii.toUpperCase(taint())); // $ numTaintFlow=1
+        sink(Ascii.truncate(taint(), 3, "...")); // $ numTaintFlow=1
+        sink(Ascii.truncate("abcabcabc", 3, taint())); // $ numTaintFlow=1
+        sink(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, taint())); // $ numTaintFlow=1
+        sink(CaseFormat.LOWER_HYPHEN.converterTo(CaseFormat.UPPER_CAMEL).convert(taint())); // $ numTaintFlow=1
+        sink(CaseFormat.LOWER_UNDERSCORE.converterTo(CaseFormat.LOWER_HYPHEN).reverse().convert(taint())); // $ numTaintFlow=1
     }
 
     void test6() {
-        sink(Suppliers.memoize(Suppliers.memoizeWithExpiration(Suppliers.synchronizedSupplier(Suppliers.ofInstance(taint())), 3, TimeUnit.HOURS)).get()); // $numTaintFlow=1
+        sink(Suppliers.memoize(Suppliers.memoizeWithExpiration(Suppliers.synchronizedSupplier(Suppliers.ofInstance(taint())), 3, TimeUnit.HOURS)).get()); // $ numTaintFlow=1
     }
 
     void test7() {
-        sink(MoreObjects.firstNonNull(taint(), taint())); // $numValueFlow=2
-        sink(MoreObjects.firstNonNull(null, taint())); // $numValueFlow=1
-        sink(MoreObjects.firstNonNull(taint(), null)); // $numValueFlow=1
-        sink(MoreObjects.toStringHelper(taint()).add("x", 3).omitNullValues().toString()); // $numTaintFlow=1
+        sink(MoreObjects.firstNonNull(taint(), taint())); // $ numValueFlow=2
+        sink(MoreObjects.firstNonNull(null, taint())); // $ numValueFlow=1
+        sink(MoreObjects.firstNonNull(taint(), null)); // $ numValueFlow=1
+        sink(MoreObjects.toStringHelper(taint()).add("x", 3).omitNullValues().toString()); // $ numTaintFlow=1
         sink(MoreObjects.toStringHelper((Object) taint()).toString());
-        sink(MoreObjects.toStringHelper("a").add("x", 3).add(taint(), 4).toString()); // $numTaintFlow=1
-        sink(MoreObjects.toStringHelper("a").add("x", taint()).toString()); // $numTaintFlow=1
-        sink(MoreObjects.toStringHelper("a").addValue(taint()).toString()); // $numTaintFlow=1
+        sink(MoreObjects.toStringHelper("a").add("x", 3).add(taint(), 4).toString()); // $ numTaintFlow=1
+        sink(MoreObjects.toStringHelper("a").add("x", taint()).toString()); // $ numTaintFlow=1
+        sink(MoreObjects.toStringHelper("a").addValue(taint()).toString()); // $ numTaintFlow=1
         MoreObjects.ToStringHelper h = MoreObjects.toStringHelper("a");
         h.add("x", 3).add(taint(), 4);
-        sink(h.add("z",5).toString()); // $numTaintFlow=1
+        sink(h.add("z",5).toString()); // $ numTaintFlow=1
     }
 
     void test8() {
         Optional<String> x = Optional.of(taint());
         sink(x); // no flow
-        sink(x.get()); // $numValueFlow=1
-        sink(x.or("hi")); // $numValueFlow=1
-        sink(x.orNull()); // $numValueFlow=1
-        sink(x.asSet().toArray()[0]); // $numValueFlow=1
-        sink(Optional.fromJavaUtil(x.toJavaUtil()).get()); // $numValueFlow=1
-        sink(Optional.fromJavaUtil(Optional.toJavaUtil(x)).get()); // $numValueFlow=1
-        sink(Optional.fromNullable(taint()).get()); // $numValueFlow=1
-        sink(Optional.absent().or(x).get()); // $numValueFlow=1
-        sink(Optional.absent().or(taint())); // $numValueFlow=1
-        sink(Optional.presentInstances(Set.of(x)).iterator().next()); // $numValueFlow=1
+        sink(x.get()); // $ numValueFlow=1
+        sink(x.or("hi")); // $ numValueFlow=1
+        sink(x.orNull()); // $ numValueFlow=1
+        sink(x.asSet().toArray()[0]); // $ numValueFlow=1
+        sink(Optional.fromJavaUtil(x.toJavaUtil()).get()); // $ numValueFlow=1
+        sink(Optional.fromJavaUtil(Optional.toJavaUtil(x)).get()); // $ numValueFlow=1
+        sink(Optional.fromNullable(taint()).get()); // $ numValueFlow=1
+        sink(Optional.absent().or(x).get()); // $ numValueFlow=1
+        sink(Optional.absent().or(taint())); // $ numValueFlow=1
+        sink(Optional.presentInstances(Set.of(x)).iterator().next()); // $ numValueFlow=1
     }
 }
diff --git a/java/ql/test/library-tests/frameworks/guava/handwritten/TestCollect.java b/java/ql/test/library-tests/frameworks/guava/handwritten/TestCollect.java
index 09dd28c19ba..f12dcb485d5 100644
--- a/java/ql/test/library-tests/frameworks/guava/handwritten/TestCollect.java
+++ b/java/ql/test/library-tests/frameworks/guava/handwritten/TestCollect.java
@@ -47,25 +47,25 @@ class TestCollect {
         String x = taint();
 
         ImmutableSet<String> xs = ImmutableSet.of(x, "y", "z");
-        sink(element(xs.asList())); // $numValueFlow=1
+        sink(element(xs.asList())); // $ numValueFlow=1
 
         ImmutableSet<String> ys = ImmutableSet.of("a", "b", "c");
 
-        sink(element(Sets.filter(Sets.union(xs, ys), y -> true))); // $numValueFlow=1
+        sink(element(Sets.filter(Sets.union(xs, ys), y -> true))); // $ numValueFlow=1
 
-        sink(element(Sets.newHashSet("a", "b", "c", "d", x))); // $numValueFlow=1
+        sink(element(Sets.newHashSet("a", "b", "c", "d", x))); // $ numValueFlow=1
     }
 
     void test2() {
-        sink(element(ImmutableList.of(taint(), taint(), taint(), taint(),taint(), taint(), taint(), taint(),taint(), taint(), taint(), taint(),taint(), taint(), taint(), taint()))); // $numValueFlow=16
-        sink(element(ImmutableSet.of(taint(), taint(), taint(), taint(),taint(), taint(), taint(), taint(),taint(), taint(), taint(), taint(),taint(), taint(), taint(), taint()))); // $numValueFlow=16
-        sink(mapKey(ImmutableMap.of(taint(), taint(), taint(), taint())));  // $numValueFlow=2
-        sink(mapValue(ImmutableMap.of(taint(), taint(), taint(), taint())));  // $numValueFlow=2
-        sink(multimapKey(ImmutableMultimap.of(taint(), taint(), taint(), taint())));  // $numValueFlow=2
-        sink(multimapValue(ImmutableMultimap.of(taint(), taint(), taint(), taint())));  // $numValueFlow=2
-        sink(tableRow(ImmutableTable.of(taint(), taint(), taint())));  // $numValueFlow=1
-        sink(tableColumn(ImmutableTable.of(taint(), taint(), taint())));  // $numValueFlow=1
-        sink(tableValue(ImmutableTable.of(taint(), taint(), taint())));  // $numValueFlow=1
+        sink(element(ImmutableList.of(taint(), taint(), taint(), taint(),taint(), taint(), taint(), taint(),taint(), taint(), taint(), taint(),taint(), taint(), taint(), taint()))); // $ numValueFlow=16
+        sink(element(ImmutableSet.of(taint(), taint(), taint(), taint(),taint(), taint(), taint(), taint(),taint(), taint(), taint(), taint(),taint(), taint(), taint(), taint()))); // $ numValueFlow=16
+        sink(mapKey(ImmutableMap.of(taint(), taint(), taint(), taint())));  // $ numValueFlow=2
+        sink(mapValue(ImmutableMap.of(taint(), taint(), taint(), taint())));  // $ numValueFlow=2
+        sink(multimapKey(ImmutableMultimap.of(taint(), taint(), taint(), taint())));  // $ numValueFlow=2
+        sink(multimapValue(ImmutableMultimap.of(taint(), taint(), taint(), taint())));  // $ numValueFlow=2
+        sink(tableRow(ImmutableTable.of(taint(), taint(), taint())));  // $ numValueFlow=1
+        sink(tableColumn(ImmutableTable.of(taint(), taint(), taint())));  // $ numValueFlow=1
+        sink(tableValue(ImmutableTable.of(taint(), taint(), taint())));  // $ numValueFlow=1
     }
 
     void test3() {
@@ -76,60 +76,60 @@ class TestCollect {
         b.add("a");
         sink(b);
         b.add(x);
-        sink(element(b.build())); // $numValueFlow=1
+        sink(element(b.build())); // $ numValueFlow=1
 
         b = ImmutableList.builder();
 
         b.add("a").add(x);
-        sink(element(b.build())); // $numValueFlow=1
+        sink(element(b.build())); // $ numValueFlow=1
 
-        sink(ImmutableList.builder().add("a").add(x).build().toArray()[0]); // $numValueFlow=1
+        sink(ImmutableList.builder().add("a").add(x).build().toArray()[0]); // $ numValueFlow=1
 
         ImmutableMap.Builder<String, String> b2 = ImmutableMap.builder();
         b2.put(x,"v");
-        sink(mapKey(b2.build())); // $numValueFlow=1
+        sink(mapKey(b2.build())); // $ numValueFlow=1
         b2.put("k",x);
-        sink(mapValue(b2.build())); // $numValueFlow=1
+        sink(mapValue(b2.build())); // $ numValueFlow=1
     }
 
     void test4(Table<String, String, String> t1, Table<String, String, String> t2, Table<String, String, String> t3) {
         String x = taint();
         t1.put(x, "c", "v");
-        sink(tableRow(t1)); // $numValueFlow=1
+        sink(tableRow(t1)); // $ numValueFlow=1
         t1.put("r", x, "v");
-        sink(tableColumn(t1)); // $numValueFlow=1
+        sink(tableColumn(t1)); // $ numValueFlow=1
         t1.put("r", "c", x);
-        sink(tableValue(t1)); // $numValueFlow=1
-        sink(mapKey(t1.row("r"))); // $numValueFlow=1
-        sink(mapValue(t1.row("r"))); // $numValueFlow=1
-        
+        sink(tableValue(t1)); // $ numValueFlow=1
+        sink(mapKey(t1.row("r"))); // $ numValueFlow=1
+        sink(mapValue(t1.row("r"))); // $ numValueFlow=1
+
         t2.putAll(t1);
         for (Table.Cell<String,String,String> c : t2.cellSet()) {
-            sink(c.getValue()); // $numValueFlow=1
+            sink(c.getValue()); // $ numValueFlow=1
         }
 
-        sink(t1.remove("r", "c")); // $numValueFlow=1
+        sink(t1.remove("r", "c")); // $ numValueFlow=1
 
         t3.row("r").put("c", x);
         sink(tableValue(t3));  // $ MISSING:numValueFlow=1 // depends on aliasing
     }
 
-    void test5(Multimap<String, String> m1, Multimap<String, String> m2, Multimap<String, String> m3, 
+    void test5(Multimap<String, String> m1, Multimap<String, String> m2, Multimap<String, String> m3,
            Multimap<String, String> m4, Multimap<String, String> m5){
         String x = taint();
         m1.put("k", x);
-        sink(multimapValue(m1)); // $numValueFlow=1
-        sink(element(m1.get("k"))); // $numValueFlow=1
+        sink(multimapValue(m1)); // $ numValueFlow=1
+        sink(element(m1.get("k"))); // $ numValueFlow=1
 
         m2.putAll("k", ImmutableList.of("a", x, "b"));
-        sink(multimapValue(m2)); // $numValueFlow=1
+        sink(multimapValue(m2)); // $ numValueFlow=1
 
         m3.putAll(m1);
-        sink(multimapValue(m3)); // $numValueFlow=1
+        sink(multimapValue(m3)); // $ numValueFlow=1
 
         m4.replaceValues("k", m1.replaceValues("k", ImmutableList.of("a")));
         for (Map.Entry<String, String> e : m4.entries()) {
-            sink(e.getValue()); // $numValueFlow=1
+            sink(e.getValue()); // $ numValueFlow=1
         }
 
         m5.asMap().get("k").add(x);
@@ -139,23 +139,23 @@ class TestCollect {
     void test6(Comparator<String> comp, SortedSet<String> sorS, SortedMap<String, String> sorM) {
         ImmutableSortedSet<String> s = ImmutableSortedSet.of(taint());
 
-        sink(element(s)); // $numValueFlow=1
-        sink(element(ImmutableSortedSet.copyOf(s))); // $numValueFlow=1
-        sink(element(ImmutableSortedSet.copyOf(comp, s))); // $numValueFlow=1
+        sink(element(s)); // $ numValueFlow=1
+        sink(element(ImmutableSortedSet.copyOf(s))); // $ numValueFlow=1
+        sink(element(ImmutableSortedSet.copyOf(comp, s))); // $ numValueFlow=1
 
         sorS.add(taint());
-        sink(element(ImmutableSortedSet.copyOfSorted(sorS))); // $numValueFlow=1
+        sink(element(ImmutableSortedSet.copyOfSorted(sorS))); // $ numValueFlow=1
 
-        sink(element(ImmutableList.sortedCopyOf(s))); // $numValueFlow=1
-        sink(element(ImmutableList.sortedCopyOf(comp, s))); // $numValueFlow=1
+        sink(element(ImmutableList.sortedCopyOf(s))); // $ numValueFlow=1
+        sink(element(ImmutableList.sortedCopyOf(comp, s))); // $ numValueFlow=1
 
         ImmutableSortedMap<String, String> m = ImmutableSortedMap.of("k", taint());
 
-        sink(mapValue(m)); // $numValueFlow=1
-        sink(mapValue(ImmutableSortedMap.copyOf(m))); // $numValueFlow=1
-        sink(mapValue(ImmutableSortedMap.copyOf(m, comp))); // $numValueFlow=1
+        sink(mapValue(m)); // $ numValueFlow=1
+        sink(mapValue(ImmutableSortedMap.copyOf(m))); // $ numValueFlow=1
+        sink(mapValue(ImmutableSortedMap.copyOf(m, comp))); // $ numValueFlow=1
 
         sorM.put("k", taint());
-        sink(mapValue(ImmutableSortedMap.copyOfSorted(sorM))); // $numValueFlow=1
+        sink(mapValue(ImmutableSortedMap.copyOfSorted(sorM))); // $ numValueFlow=1
     }
 }
diff --git a/java/ql/test/library-tests/frameworks/guava/handwritten/TestIO.java b/java/ql/test/library-tests/frameworks/guava/handwritten/TestIO.java
index 1135dd1c5b2..9eeb10d1fc9 100644
--- a/java/ql/test/library-tests/frameworks/guava/handwritten/TestIO.java
+++ b/java/ql/test/library-tests/frameworks/guava/handwritten/TestIO.java
@@ -28,43 +28,43 @@ class TestIO {
 
     void test1() {
         BaseEncoding enc = BaseEncoding.base64();
-        sink(enc.decode(staint())); // $numTaintFlow=1
-        sink(enc.encode(btaint())); // $numTaintFlow=1
-        sink(enc.encode(btaint(), 0, 42)); // $numTaintFlow=1
-        sink(enc.decodingStream(rtaint())); // $numTaintFlow=1
-        sink(enc.decodingSource(CharSource.wrap(staint()))); // $numTaintFlow=1
-        sink(enc.withSeparator(staint(), 10).omitPadding().lowerCase().decode("abc")); // $numTaintFlow=1
+        sink(enc.decode(staint())); // $ numTaintFlow=1
+        sink(enc.encode(btaint())); // $ numTaintFlow=1
+        sink(enc.encode(btaint(), 0, 42)); // $ numTaintFlow=1
+        sink(enc.decodingStream(rtaint())); // $ numTaintFlow=1
+        sink(enc.decodingSource(CharSource.wrap(staint()))); // $ numTaintFlow=1
+        sink(enc.withSeparator(staint(), 10).omitPadding().lowerCase().decode("abc")); // $ numTaintFlow=1
     }
 
     void test2() throws IOException {
         ByteSource b = ByteSource.wrap(btaint());
-        sink(b.openStream()); // $numTaintFlow=1
-        sink(b.openBufferedStream()); // $numTaintFlow=1
-        sink(b.asCharSource(null)); // $numTaintFlow=1
-        sink(b.slice(42,1337)); // $numTaintFlow=1
-        sink(b.read()); // $numTaintFlow=1
-        sink(ByteSource.concat(ByteSource.empty(), ByteSource.empty(), b)); // $numTaintFlow=1
-        sink(ByteSource.concat(ImmutableList.of(ByteSource.empty(), ByteSource.empty(), b))); // $numTaintFlow=1
+        sink(b.openStream()); // $ numTaintFlow=1
+        sink(b.openBufferedStream()); // $ numTaintFlow=1
+        sink(b.asCharSource(null)); // $ numTaintFlow=1
+        sink(b.slice(42,1337)); // $ numTaintFlow=1
+        sink(b.read()); // $ numTaintFlow=1
+        sink(ByteSource.concat(ByteSource.empty(), ByteSource.empty(), b)); // $ numTaintFlow=1
+        sink(ByteSource.concat(ImmutableList.of(ByteSource.empty(), ByteSource.empty(), b))); // $ numTaintFlow=1
         sink(b.read(new MyByteProcessor())); // $ MISSING:numTaintFlow=1
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         b.copyTo(out);
-        sink(out.toByteArray()); // $numTaintFlow=1
+        sink(out.toByteArray()); // $ numTaintFlow=1
 
         CharSource c = CharSource.wrap(staint());
-        sink(c.openStream()); // $numTaintFlow=1
-        sink(c.openBufferedStream()); // $numTaintFlow=1
-        sink(c.asByteSource(null)); // $numTaintFlow=1
-        sink(c.readFirstLine()); // $numTaintFlow=1
-        sink(c.readLines()); // $numTaintFlow=1
-        sink(c.read()); // $numTaintFlow=1
-        sink(c.lines()); // $numTaintFlow=1
-        sink(CharSource.concat(CharSource.empty(), CharSource.empty(), c)); // $numTaintFlow=1
-        sink(CharSource.concat(ImmutableList.of(CharSource.empty(), CharSource.empty(), c))); // $numTaintFlow=1
+        sink(c.openStream()); // $ numTaintFlow=1
+        sink(c.openBufferedStream()); // $ numTaintFlow=1
+        sink(c.asByteSource(null)); // $ numTaintFlow=1
+        sink(c.readFirstLine()); // $ numTaintFlow=1
+        sink(c.readLines()); // $ numTaintFlow=1
+        sink(c.read()); // $ numTaintFlow=1
+        sink(c.lines()); // $ numTaintFlow=1
+        sink(CharSource.concat(CharSource.empty(), CharSource.empty(), c)); // $ numTaintFlow=1
+        sink(CharSource.concat(ImmutableList.of(CharSource.empty(), CharSource.empty(), c))); // $ numTaintFlow=1
         sink(c.readLines(new MyLineProcessor())); // $ MISSING:numTaintFlow=1
         c.forEachLine(l -> sink(l)); // $ MISSING:numTaintFlow=1
         StringBuffer buf = new StringBuffer();
         c.copyTo(buf);
-        sink(buf); // $numTaintFlow=1
+        sink(buf); // $ numTaintFlow=1
     }
 
     class MyByteProcessor implements ByteProcessor<Object> {
@@ -83,59 +83,59 @@ class TestIO {
         {
             ByteArrayOutputStream out = new ByteArrayOutputStream();
             ByteStreams.copy(itaint(), out);
-            sink(out); // $numTaintFlow=1
+            sink(out); // $ numTaintFlow=1
         }
         {
             WritableByteChannel out = FileChannel.open(Paths.get("/tmp/xyz"));
             ByteStreams.copy(rbctaint(), out);
-            sink(out); // $numTaintFlow=1
+            sink(out); // $ numTaintFlow=1
         }
-        sink(ByteStreams.limit(itaint(), 1337)); // $numTaintFlow=1
-        sink(ByteStreams.newDataInput(btaint())); // $numTaintFlow=1
-        sink(ByteStreams.newDataInput(btaint(), 0)); // $numTaintFlow=1
-        sink(ByteStreams.newDataInput(btaint())); // $numTaintFlow=1
-        sink(ByteStreams.newDataInput(btaint()).readLine()); // $numTaintFlow=1
-        sink(ByteStreams.newDataInput(new ByteArrayInputStream(btaint()))); // $numTaintFlow=1
+        sink(ByteStreams.limit(itaint(), 1337)); // $ numTaintFlow=1
+        sink(ByteStreams.newDataInput(btaint())); // $ numTaintFlow=1
+        sink(ByteStreams.newDataInput(btaint(), 0)); // $ numTaintFlow=1
+        sink(ByteStreams.newDataInput(btaint())); // $ numTaintFlow=1
+        sink(ByteStreams.newDataInput(btaint()).readLine()); // $ numTaintFlow=1
+        sink(ByteStreams.newDataInput(new ByteArrayInputStream(btaint()))); // $ numTaintFlow=1
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         out.write(btaint());
-        sink(ByteStreams.newDataOutput(out)); // $numTaintFlow=1
+        sink(ByteStreams.newDataOutput(out)); // $ numTaintFlow=1
         byte[] b1 = null, b2 = null, b3 = null;
         ByteStreams.read(itaint(), b1, 0, 42);
-        sink(b1); // $numTaintFlow=1
+        sink(b1); // $ numTaintFlow=1
         ByteStreams.readFully(itaint(), b2);
-        sink(b2); // $numTaintFlow=1
+        sink(b2); // $ numTaintFlow=1
         ByteStreams.readFully(itaint(), b3, 0, 42);
-        sink(b3); // $numTaintFlow=1
+        sink(b3); // $ numTaintFlow=1
         sink(ByteStreams.readBytes(itaint(), new MyByteProcessor())); // $ MISSING:numTaintFlow=1
-        sink(ByteStreams.toByteArray(itaint())); // $numTaintFlow=1
+        sink(ByteStreams.toByteArray(itaint())); // $ numTaintFlow=1
         ByteArrayDataOutput out2 = ByteStreams.newDataOutput();
         out2.writeUTF(staint());
-        sink(out2.toByteArray()); // $numTaintFlow=1
+        sink(out2.toByteArray()); // $ numTaintFlow=1
 
         StringBuffer buf = new StringBuffer();
         CharStreams.copy(rtaint(), buf);
-        sink(buf); // $numTaintFlow=1
-        sink(CharStreams.readLines(rtaint())); // $numTaintFlow=1
+        sink(buf); // $ numTaintFlow=1
+        sink(CharStreams.readLines(rtaint())); // $ numTaintFlow=1
         sink(CharStreams.readLines(rtaint(), new MyLineProcessor())); // $ MISSING:numTaintFlow=1
-        sink(CharStreams.toString(rtaint())); // $numTaintFlow=1
+        sink(CharStreams.toString(rtaint())); // $ numTaintFlow=1
     }
 
     void test4() throws IOException {
-        sink(Closer.create().register((Closeable) taint())); // $numValueFlow=1
-        sink(new LineReader(rtaint()).readLine()); // $numTaintFlow=1
-        sink(Files.simplifyPath(staint())); // $numTaintFlow=1
-        sink(Files.getFileExtension(staint())); // $numTaintFlow=1
-        sink(Files.getNameWithoutExtension(staint())); // $numTaintFlow=1
-        sink(MoreFiles.getFileExtension(ptaint())); // $numTaintFlow=1
-        sink(MoreFiles.getNameWithoutExtension(ptaint())); // $numTaintFlow=1
+        sink(Closer.create().register((Closeable) taint())); // $ numValueFlow=1
+        sink(new LineReader(rtaint()).readLine()); // $ numTaintFlow=1
+        sink(Files.simplifyPath(staint())); // $ numTaintFlow=1
+        sink(Files.getFileExtension(staint())); // $ numTaintFlow=1
+        sink(Files.getNameWithoutExtension(staint())); // $ numTaintFlow=1
+        sink(MoreFiles.getFileExtension(ptaint())); // $ numTaintFlow=1
+        sink(MoreFiles.getNameWithoutExtension(ptaint())); // $ numTaintFlow=1
     }
 
     void test6() throws IOException {
-        sink(new CountingInputStream(itaint())); // $numTaintFlow=1
+        sink(new CountingInputStream(itaint())); // $ numTaintFlow=1
         byte[] buf = null;
-        new CountingInputStream(itaint()).read(buf, 0, 42); 
-        sink(buf); // $numTaintFlow=1
-        sink(new LittleEndianDataInputStream(itaint())); // $numTaintFlow=1
-        sink(new LittleEndianDataInputStream(itaint()).readUTF()); // $numTaintFlow=1
+        new CountingInputStream(itaint()).read(buf, 0, 42);
+        sink(buf); // $ numTaintFlow=1
+        sink(new LittleEndianDataInputStream(itaint())); // $ numTaintFlow=1
+        sink(new LittleEndianDataInputStream(itaint()).readUTF()); // $ numTaintFlow=1
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/library-tests/frameworks/javax-json/Test.java b/java/ql/test/library-tests/frameworks/javax-json/Test.java
index 979bfe9a568..8465dbd80b5 100644
--- a/java/ql/test/library-tests/frameworks/javax-json/Test.java
+++ b/java/ql/test/library-tests/frameworks/javax-json/Test.java
@@ -28,7 +28,7 @@ public class Test {
 			jakarta.json.JsonObject in = (jakarta.json.JsonObject)source();
 			jakarta.json.stream.JsonParserFactory instance = null;
 			out = instance.createParser(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json.stream;JsonParserFactory;false;createParser;;;Argument[0];ReturnValue;taint;manual"
@@ -36,7 +36,7 @@ public class Test {
 			jakarta.json.JsonArray in = (jakarta.json.JsonArray)source();
 			jakarta.json.stream.JsonParserFactory instance = null;
 			out = instance.createParser(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json.stream;JsonParserFactory;false;createParser;;;Argument[0];ReturnValue;taint;manual"
@@ -44,7 +44,7 @@ public class Test {
 			Reader in = (Reader)source();
 			jakarta.json.stream.JsonParserFactory instance = null;
 			out = instance.createParser(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json.stream;JsonParserFactory;false;createParser;;;Argument[0];ReturnValue;taint;manual"
@@ -52,7 +52,7 @@ public class Test {
 			InputStream in = (InputStream)source();
 			jakarta.json.stream.JsonParserFactory instance = null;
 			out = instance.createParser(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json.stream;JsonParserFactory;false;createParser;;;Argument[0];ReturnValue;taint;manual"
@@ -60,196 +60,196 @@ public class Test {
 			InputStream in = (InputStream)source();
 			jakarta.json.stream.JsonParserFactory instance = null;
 			out = instance.createParser(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createArrayBuilder;(Collection);;Element of Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			Collection in = (Collection)newWithElement(source());
 			out = jakarta.json.Json.createArrayBuilder(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createArrayBuilder;(JsonArray);;Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArray in = (jakarta.json.JsonArray)source();
 			out = jakarta.json.Json.createArrayBuilder(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createDiff;;;Argument[0..1];ReturnValue;taint;manual"
 			jakarta.json.JsonPatch out = null;
 			jakarta.json.JsonStructure in = (jakarta.json.JsonStructure)source();
 			out = jakarta.json.Json.createDiff(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createDiff;;;Argument[0..1];ReturnValue;taint;manual"
 			jakarta.json.JsonPatch out = null;
 			jakarta.json.JsonStructure in = (jakarta.json.JsonStructure)source();
 			out = jakarta.json.Json.createDiff(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createMergeDiff;;;Argument[0..1];ReturnValue;taint;manual"
 			jakarta.json.JsonMergePatch out = null;
 			jakarta.json.JsonValue in = (jakarta.json.JsonValue)source();
 			out = jakarta.json.Json.createMergeDiff(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createMergeDiff;;;Argument[0..1];ReturnValue;taint;manual"
 			jakarta.json.JsonMergePatch out = null;
 			jakarta.json.JsonValue in = (jakarta.json.JsonValue)source();
 			out = jakarta.json.Json.createMergeDiff(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createMergePatch;;;Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonMergePatch out = null;
 			jakarta.json.JsonValue in = (jakarta.json.JsonValue)source();
 			out = jakarta.json.Json.createMergePatch(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createObjectBuilder;(JsonObject);;Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			jakarta.json.JsonObject in = (jakarta.json.JsonObject)source();
 			out = jakarta.json.Json.createObjectBuilder(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createObjectBuilder;(Map);;MapKey of Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			Map in = (Map)newWithMapKey(source());
 			out = jakarta.json.Json.createObjectBuilder(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createObjectBuilder;(Map);;MapValue of Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			Map in = (Map)newWithMapValue(source());
 			out = jakarta.json.Json.createObjectBuilder(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createPatch;;;Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonPatch out = null;
 			jakarta.json.JsonArray in = (jakarta.json.JsonArray)source();
 			out = jakarta.json.Json.createPatch(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createPatchBuilder;;;Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonPatchBuilder out = null;
 			jakarta.json.JsonArray in = (jakarta.json.JsonArray)source();
 			out = jakarta.json.Json.createPatchBuilder(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createPointer;;;Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonPointer out = null;
 			String in = (String)source();
 			out = jakarta.json.Json.createPointer(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createReader;;;Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonReader out = null;
 			Reader in = (Reader)source();
 			out = jakarta.json.Json.createReader(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createReader;;;Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonReader out = null;
 			InputStream in = (InputStream)source();
 			out = jakarta.json.Json.createReader(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createValue;;;Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonString out = null;
 			String in = (String)source();
 			out = jakarta.json.Json.createValue(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createValue;;;Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonNumber out = null;
 			long in = (long)source();
 			out = jakarta.json.Json.createValue(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createValue;;;Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonNumber out = null;
 			int in = (int)source();
 			out = jakarta.json.Json.createValue(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createValue;;;Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonNumber out = null;
 			double in = (double)source();
 			out = jakarta.json.Json.createValue(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createValue;;;Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonNumber out = null;
 			BigInteger in = (BigInteger)source();
 			out = jakarta.json.Json.createValue(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createValue;;;Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonNumber out = null;
 			BigDecimal in = (BigDecimal)source();
 			out = jakarta.json.Json.createValue(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createWriter;;;Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonWriter out = null;
 			Writer in = (Writer)source();
 			out = jakarta.json.Json.createWriter(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;createWriter;;;Argument[0];ReturnValue;taint;manual"
 			jakarta.json.JsonWriter out = null;
 			OutputStream in = (OutputStream)source();
 			out = jakarta.json.Json.createWriter(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;decodePointer;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = jakarta.json.Json.decodePointer(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;Json;false;encodePointer;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = jakarta.json.Json.encodePointer(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArray;false;getBoolean;;;Argument[this];ReturnValue;taint;manual"
 			boolean out = false;
 			jakarta.json.JsonArray in = (jakarta.json.JsonArray)source();
 			out = in.getBoolean(0, false);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArray;false;getBoolean;;;Argument[this];ReturnValue;taint;manual"
 			boolean out = false;
 			jakarta.json.JsonArray in = (jakarta.json.JsonArray)source();
 			out = in.getBoolean(0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArray;false;getBoolean;;;Argument[1];ReturnValue;value;manual"
@@ -257,21 +257,21 @@ public class Test {
 			boolean in = (boolean)source();
 			jakarta.json.JsonArray instance = null;
 			out = instance.getBoolean(0, in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArray;false;getInt;;;Argument[this];ReturnValue;taint;manual"
 			int out = 0;
 			jakarta.json.JsonArray in = (jakarta.json.JsonArray)source();
 			out = in.getInt(0, 0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArray;false;getInt;;;Argument[this];ReturnValue;taint;manual"
 			int out = 0;
 			jakarta.json.JsonArray in = (jakarta.json.JsonArray)source();
 			out = in.getInt(0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArray;false;getInt;;;Argument[1];ReturnValue;value;manual"
@@ -279,49 +279,49 @@ public class Test {
 			int in = (int)source();
 			jakarta.json.JsonArray instance = null;
 			out = instance.getInt(0, in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArray;false;getJsonArray;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonArray out = null;
 			jakarta.json.JsonArray in = (jakarta.json.JsonArray)source();
 			out = in.getJsonArray(0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArray;false;getJsonNumber;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonNumber out = null;
 			jakarta.json.JsonArray in = (jakarta.json.JsonArray)source();
 			out = in.getJsonNumber(0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArray;false;getJsonObject;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonObject out = null;
 			jakarta.json.JsonArray in = (jakarta.json.JsonArray)source();
 			out = in.getJsonObject(0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArray;false;getJsonString;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonString out = null;
 			jakarta.json.JsonArray in = (jakarta.json.JsonArray)source();
 			out = in.getJsonString(0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArray;false;getString;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			jakarta.json.JsonArray in = (jakarta.json.JsonArray)source();
 			out = in.getString(0, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArray;false;getString;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			jakarta.json.JsonArray in = (jakarta.json.JsonArray)source();
 			out = in.getString(0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArray;false;getString;;;Argument[1];ReturnValue;value;manual"
@@ -329,497 +329,497 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonArray instance = null;
 			out = instance.getString(0, in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArray;false;getValuesAs;;;Argument[this];ReturnValue;taint;manual"
 			List out = null;
 			jakarta.json.JsonArray in = (jakarta.json.JsonArray)source();
 			out = in.getValuesAs((Function)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArray;false;getValuesAs;;;Argument[this];ReturnValue;taint;manual"
 			List out = null;
 			jakarta.json.JsonArray in = (jakarta.json.JsonArray)source();
 			out = in.getValuesAs((Class)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(BigDecimal);;Argument[0];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			BigDecimal in = (BigDecimal)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(BigInteger);;Argument[0];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			BigInteger in = (BigInteger)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(JsonArrayBuilder);;Argument[0];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(JsonObjectBuilder);;Argument[0];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(JsonValue);;Argument[0];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonValue in = (jakarta.json.JsonValue)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(String);;Argument[0];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			String in = (String)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(boolean);;Argument[0];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			boolean in = (boolean)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(double);;Argument[0];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			double in = (double)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(int);;Argument[0];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			int in = (int)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(int,BigDecimal);;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			BigDecimal in = (BigDecimal)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(int,BigInteger);;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			BigInteger in = (BigInteger)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(int,JsonArrayBuilder);;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(int,JsonObjectBuilder);;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(int,JsonValue);;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonValue in = (jakarta.json.JsonValue)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(int,String);;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			String in = (String)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(int,boolean);;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			boolean in = (boolean)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(int,double);;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			double in = (double)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(int,int);;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			int in = (int)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(int,long);;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			long in = (long)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;(long);;Argument[0];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			long in = (long)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add(false);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add(0L);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add(0.0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add(0, false);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add(0, 0L);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add(0, 0.0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add(0, 0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add(0, (jakarta.json.JsonValue)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add(0, (jakarta.json.JsonObjectBuilder)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add(0, (jakarta.json.JsonArrayBuilder)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add(0, (String)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add(0, (BigInteger)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add(0, (BigDecimal)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add(0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add((jakarta.json.JsonValue)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add((jakarta.json.JsonObjectBuilder)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add((jakarta.json.JsonArrayBuilder)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add((String)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add((BigInteger)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.add((BigDecimal)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;addAll;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.addAll(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;addAll;;;Argument[0];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out.addAll(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;addNull;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.addNull(0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;addNull;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.addNull();
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;build;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonArray out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.build();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;remove;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.remove(0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.set(0, false);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.set(0, 0L);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.set(0, 0.0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.set(0, 0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.set(0, (jakarta.json.JsonValue)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.set(0, (jakarta.json.JsonObjectBuilder)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.set(0, (jakarta.json.JsonArrayBuilder)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.set(0, (String)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.set(0, (BigInteger)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.set(0, (BigDecimal)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			long in = (long)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonValue in = (jakarta.json.JsonValue)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			int in = (int)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			double in = (double)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			boolean in = (boolean)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			String in = (String)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			BigInteger in = (BigInteger)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			BigDecimal in = (BigDecimal)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonArrayBuilder;false;setNull;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonArrayBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out = in.setNull(0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonMergePatch;false;apply;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonValue out = null;
 			jakarta.json.JsonMergePatch in = (jakarta.json.JsonMergePatch)source();
 			out = in.apply(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonMergePatch;false;apply;;;Argument[0];ReturnValue;taint;manual"
@@ -827,91 +827,91 @@ public class Test {
 			jakarta.json.JsonValue in = (jakarta.json.JsonValue)source();
 			jakarta.json.JsonMergePatch instance = null;
 			out = instance.apply(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonMergePatch;false;toJsonValue;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonValue out = null;
 			jakarta.json.JsonMergePatch in = (jakarta.json.JsonMergePatch)source();
 			out = in.toJsonValue();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonNumber;false;bigDecimalValue;;;Argument[this];ReturnValue;taint;manual"
 			BigDecimal out = null;
 			jakarta.json.JsonNumber in = (jakarta.json.JsonNumber)source();
 			out = in.bigDecimalValue();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonNumber;false;bigIntegerValue;;;Argument[this];ReturnValue;taint;manual"
 			BigInteger out = null;
 			jakarta.json.JsonNumber in = (jakarta.json.JsonNumber)source();
 			out = in.bigIntegerValue();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonNumber;false;bigIntegerValueExact;;;Argument[this];ReturnValue;taint;manual"
 			BigInteger out = null;
 			jakarta.json.JsonNumber in = (jakarta.json.JsonNumber)source();
 			out = in.bigIntegerValueExact();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonNumber;false;doubleValue;;;Argument[this];ReturnValue;taint;manual"
 			double out = 0.0;
 			jakarta.json.JsonNumber in = (jakarta.json.JsonNumber)source();
 			out = in.doubleValue();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonNumber;false;intValue;;;Argument[this];ReturnValue;taint;manual"
 			int out = 0;
 			jakarta.json.JsonNumber in = (jakarta.json.JsonNumber)source();
 			out = in.intValue();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonNumber;false;intValueExact;;;Argument[this];ReturnValue;taint;manual"
 			int out = 0;
 			jakarta.json.JsonNumber in = (jakarta.json.JsonNumber)source();
 			out = in.intValueExact();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonNumber;false;longValue;;;Argument[this];ReturnValue;taint;manual"
 			long out = 0L;
 			jakarta.json.JsonNumber in = (jakarta.json.JsonNumber)source();
 			out = in.longValue();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonNumber;false;longValueExact;;;Argument[this];ReturnValue;taint;manual"
 			long out = 0L;
 			jakarta.json.JsonNumber in = (jakarta.json.JsonNumber)source();
 			out = in.longValueExact();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonNumber;false;numberValue;;;Argument[this];ReturnValue;taint;manual"
 			Number out = null;
 			jakarta.json.JsonNumber in = (jakarta.json.JsonNumber)source();
 			out = in.numberValue();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObject;false;getBoolean;;;Argument[this];ReturnValue;taint;manual"
 			boolean out = false;
 			jakarta.json.JsonObject in = (jakarta.json.JsonObject)source();
 			out = in.getBoolean(null, false);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObject;false;getBoolean;;;Argument[this];ReturnValue;taint;manual"
 			boolean out = false;
 			jakarta.json.JsonObject in = (jakarta.json.JsonObject)source();
 			out = in.getBoolean(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObject;false;getBoolean;;;Argument[1];ReturnValue;value;manual"
@@ -919,21 +919,21 @@ public class Test {
 			boolean in = (boolean)source();
 			jakarta.json.JsonObject instance = null;
 			out = instance.getBoolean(null, in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonObject;false;getInt;;;Argument[this];ReturnValue;taint;manual"
 			int out = 0;
 			jakarta.json.JsonObject in = (jakarta.json.JsonObject)source();
 			out = in.getInt(null, 0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObject;false;getInt;;;Argument[this];ReturnValue;taint;manual"
 			int out = 0;
 			jakarta.json.JsonObject in = (jakarta.json.JsonObject)source();
 			out = in.getInt(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObject;false;getInt;;;Argument[1];ReturnValue;value;manual"
@@ -941,49 +941,49 @@ public class Test {
 			int in = (int)source();
 			jakarta.json.JsonObject instance = null;
 			out = instance.getInt(null, in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonObject;false;getJsonArray;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonArray out = null;
 			jakarta.json.JsonObject in = (jakarta.json.JsonObject)source();
 			out = in.getJsonArray(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObject;false;getJsonNumber;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonNumber out = null;
 			jakarta.json.JsonObject in = (jakarta.json.JsonObject)source();
 			out = in.getJsonNumber(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObject;false;getJsonObject;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonObject out = null;
 			jakarta.json.JsonObject in = (jakarta.json.JsonObject)source();
 			out = in.getJsonObject(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObject;false;getJsonString;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonString out = null;
 			jakarta.json.JsonObject in = (jakarta.json.JsonObject)source();
 			out = in.getJsonString(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObject;false;getString;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			jakarta.json.JsonObject in = (jakarta.json.JsonObject)source();
 			out = in.getString(null, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObject;false;getString;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			jakarta.json.JsonObject in = (jakarta.json.JsonObject)source();
 			out = in.getString(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObject;false;getString;;;Argument[1];ReturnValue;value;manual"
@@ -991,154 +991,154 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonObject instance = null;
 			out = instance.getString(null, in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			out = in.add((String)null, false);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			out = in.add((String)null, 0L);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			out = in.add((String)null, 0.0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			out = in.add((String)null, 0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			out = in.add((String)null, (jakarta.json.JsonValue)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			out = in.add((String)null, (jakarta.json.JsonObjectBuilder)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			out = in.add((String)null, (jakarta.json.JsonArrayBuilder)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			out = in.add((String)null, (String)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			out = in.add((String)null, (BigInteger)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			out = in.add((String)null, (BigDecimal)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			long in = (long)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			jakarta.json.JsonValue in = (jakarta.json.JsonValue)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			jakarta.json.JsonArrayBuilder in = (jakarta.json.JsonArrayBuilder)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			int in = (int)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			double in = (double)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			boolean in = (boolean)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			String in = (String)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			BigInteger in = (BigInteger)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			BigDecimal in = (BigDecimal)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;addAll;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			out = in.addAll(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;addAll;;;Argument[0];ReturnValue;value;manual"
@@ -1146,35 +1146,35 @@ public class Test {
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			jakarta.json.JsonObjectBuilder instance = null;
 			out = instance.addAll(in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;addNull;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			out = in.addNull(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;build;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonObject out = null;
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			out = in.build();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonObjectBuilder;false;remove;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonObjectBuilder out = null;
 			jakarta.json.JsonObjectBuilder in = (jakarta.json.JsonObjectBuilder)source();
 			out = in.remove(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonPatch;false;apply;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonStructure out = null;
 			jakarta.json.JsonPatch in = (jakarta.json.JsonPatch)source();
 			out = in.apply(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatch;false;apply;;;Argument[0];ReturnValue;taint;manual"
@@ -1182,42 +1182,42 @@ public class Test {
 			jakarta.json.JsonStructure in = (jakarta.json.JsonStructure)source();
 			jakarta.json.JsonPatch instance = null;
 			out = instance.apply(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatch;false;toJsonArray;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonArray out = null;
 			jakarta.json.JsonPatch in = (jakarta.json.JsonPatch)source();
 			out = in.toJsonArray();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonPatchBuilder out = null;
 			jakarta.json.JsonPatchBuilder in = (jakarta.json.JsonPatchBuilder)source();
 			out = in.add((String)null, false);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonPatchBuilder out = null;
 			jakarta.json.JsonPatchBuilder in = (jakarta.json.JsonPatchBuilder)source();
 			out = in.add((String)null, 0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonPatchBuilder out = null;
 			jakarta.json.JsonPatchBuilder in = (jakarta.json.JsonPatchBuilder)source();
 			out = in.add((String)null, (jakarta.json.JsonValue)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonPatchBuilder out = null;
 			jakarta.json.JsonPatchBuilder in = (jakarta.json.JsonPatchBuilder)source();
 			out = in.add((String)null, (String)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1225,7 +1225,7 @@ public class Test {
 			jakarta.json.JsonValue in = (jakarta.json.JsonValue)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1233,7 +1233,7 @@ public class Test {
 			int in = (int)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1241,7 +1241,7 @@ public class Test {
 			boolean in = (boolean)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1249,7 +1249,7 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.add(in, false);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1257,7 +1257,7 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.add(in, 0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1265,7 +1265,7 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.add(in, (jakarta.json.JsonValue)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1273,7 +1273,7 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.add(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1281,21 +1281,21 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;build;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonPatch out = null;
 			jakarta.json.JsonPatchBuilder in = (jakarta.json.JsonPatchBuilder)source();
 			out = in.build();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;copy;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonPatchBuilder out = null;
 			jakarta.json.JsonPatchBuilder in = (jakarta.json.JsonPatchBuilder)source();
 			out = in.copy(null, null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;copy;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1303,7 +1303,7 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.copy(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;copy;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1311,14 +1311,14 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.copy(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;move;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonPatchBuilder out = null;
 			jakarta.json.JsonPatchBuilder in = (jakarta.json.JsonPatchBuilder)source();
 			out = in.move(null, null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;move;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1326,7 +1326,7 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.move(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;move;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1334,14 +1334,14 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.move(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;remove;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonPatchBuilder out = null;
 			jakarta.json.JsonPatchBuilder in = (jakarta.json.JsonPatchBuilder)source();
 			out = in.remove(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;remove;;;Argument[0];ReturnValue;taint;manual"
@@ -1349,35 +1349,35 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.remove(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;replace;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonPatchBuilder out = null;
 			jakarta.json.JsonPatchBuilder in = (jakarta.json.JsonPatchBuilder)source();
 			out = in.replace((String)null, false);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;replace;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonPatchBuilder out = null;
 			jakarta.json.JsonPatchBuilder in = (jakarta.json.JsonPatchBuilder)source();
 			out = in.replace((String)null, 0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;replace;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonPatchBuilder out = null;
 			jakarta.json.JsonPatchBuilder in = (jakarta.json.JsonPatchBuilder)source();
 			out = in.replace((String)null, (jakarta.json.JsonValue)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;replace;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonPatchBuilder out = null;
 			jakarta.json.JsonPatchBuilder in = (jakarta.json.JsonPatchBuilder)source();
 			out = in.replace((String)null, (String)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1385,7 +1385,7 @@ public class Test {
 			jakarta.json.JsonValue in = (jakarta.json.JsonValue)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.replace((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1393,7 +1393,7 @@ public class Test {
 			int in = (int)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.replace((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1401,7 +1401,7 @@ public class Test {
 			boolean in = (boolean)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.replace((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1409,7 +1409,7 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.replace(in, false);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1417,7 +1417,7 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.replace(in, 0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1425,7 +1425,7 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.replace(in, (jakarta.json.JsonValue)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1433,7 +1433,7 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.replace(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1441,35 +1441,35 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.replace((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;test;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonPatchBuilder out = null;
 			jakarta.json.JsonPatchBuilder in = (jakarta.json.JsonPatchBuilder)source();
 			out = in.test((String)null, false);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;test;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonPatchBuilder out = null;
 			jakarta.json.JsonPatchBuilder in = (jakarta.json.JsonPatchBuilder)source();
 			out = in.test((String)null, 0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;test;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonPatchBuilder out = null;
 			jakarta.json.JsonPatchBuilder in = (jakarta.json.JsonPatchBuilder)source();
 			out = in.test((String)null, (jakarta.json.JsonValue)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;test;;;Argument[this];ReturnValue;value;manual"
 			jakarta.json.JsonPatchBuilder out = null;
 			jakarta.json.JsonPatchBuilder in = (jakarta.json.JsonPatchBuilder)source();
 			out = in.test((String)null, (String)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;test;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1477,7 +1477,7 @@ public class Test {
 			jakarta.json.JsonValue in = (jakarta.json.JsonValue)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.test((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;test;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1485,7 +1485,7 @@ public class Test {
 			int in = (int)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.test((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;test;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1493,7 +1493,7 @@ public class Test {
 			boolean in = (boolean)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.test((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;test;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1501,7 +1501,7 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.test(in, false);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;test;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1509,7 +1509,7 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.test(in, 0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;test;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1517,7 +1517,7 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.test(in, (jakarta.json.JsonValue)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;test;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1525,7 +1525,7 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.test(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPatchBuilder;false;test;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1533,14 +1533,14 @@ public class Test {
 			String in = (String)source();
 			jakarta.json.JsonPatchBuilder instance = null;
 			out = instance.test((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPointer;false;add;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonStructure out = null;
 			jakarta.json.JsonPointer in = (jakarta.json.JsonPointer)source();
 			out = in.add(null, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPointer;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1548,7 +1548,7 @@ public class Test {
 			jakarta.json.JsonValue in = (jakarta.json.JsonValue)source();
 			jakarta.json.JsonPointer instance = null;
 			out = instance.add(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPointer;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1556,7 +1556,7 @@ public class Test {
 			jakarta.json.JsonStructure in = (jakarta.json.JsonStructure)source();
 			jakarta.json.JsonPointer instance = null;
 			out = instance.add(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPointer;false;getValue;;;Argument[0];ReturnValue;taint;manual"
@@ -1564,7 +1564,7 @@ public class Test {
 			jakarta.json.JsonStructure in = (jakarta.json.JsonStructure)source();
 			jakarta.json.JsonPointer instance = null;
 			out = instance.getValue(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPointer;false;remove;;;Argument[0];ReturnValue;taint;manual"
@@ -1572,7 +1572,7 @@ public class Test {
 			jakarta.json.JsonStructure in = (jakarta.json.JsonStructure)source();
 			jakarta.json.JsonPointer instance = null;
 			out = instance.remove(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPointer;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1580,7 +1580,7 @@ public class Test {
 			jakarta.json.JsonValue in = (jakarta.json.JsonValue)source();
 			jakarta.json.JsonPointer instance = null;
 			out = instance.replace(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPointer;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -1588,42 +1588,42 @@ public class Test {
 			jakarta.json.JsonStructure in = (jakarta.json.JsonStructure)source();
 			jakarta.json.JsonPointer instance = null;
 			out = instance.replace(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonPointer;false;toString;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			jakarta.json.JsonPointer in = (jakarta.json.JsonPointer)source();
 			out = in.toString();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonReader;false;read;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonStructure out = null;
 			jakarta.json.JsonReader in = (jakarta.json.JsonReader)source();
 			out = in.read();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonReader;false;readArray;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonArray out = null;
 			jakarta.json.JsonReader in = (jakarta.json.JsonReader)source();
 			out = in.readArray();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonReader;false;readObject;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonObject out = null;
 			jakarta.json.JsonReader in = (jakarta.json.JsonReader)source();
 			out = in.readObject();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonReader;false;readValue;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonValue out = null;
 			jakarta.json.JsonReader in = (jakarta.json.JsonReader)source();
 			out = in.readValue();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonReaderFactory;false;createReader;;;Argument[0];ReturnValue;taint;manual"
@@ -1631,7 +1631,7 @@ public class Test {
 			Reader in = (Reader)source();
 			jakarta.json.JsonReaderFactory instance = null;
 			out = instance.createReader(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonReaderFactory;false;createReader;;;Argument[0];ReturnValue;taint;manual"
@@ -1639,7 +1639,7 @@ public class Test {
 			InputStream in = (InputStream)source();
 			jakarta.json.JsonReaderFactory instance = null;
 			out = instance.createReader(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonReaderFactory;false;createReader;;;Argument[0];ReturnValue;taint;manual"
@@ -1647,105 +1647,105 @@ public class Test {
 			InputStream in = (InputStream)source();
 			jakarta.json.JsonReaderFactory instance = null;
 			out = instance.createReader(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonString;false;getChars;;;Argument[this];ReturnValue;taint;manual"
 			CharSequence out = null;
 			jakarta.json.JsonString in = (jakarta.json.JsonString)source();
 			out = in.getChars();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonString;false;getString;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			jakarta.json.JsonString in = (jakarta.json.JsonString)source();
 			out = in.getString();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonStructure;true;getValue;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonValue out = null;
 			jakarta.json.JsonStructure in = (jakarta.json.JsonStructure)source();
 			out = in.getValue(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonValue;true;asJsonArray;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonArray out = null;
 			jakarta.json.JsonValue in = (jakarta.json.JsonValue)source();
 			out = in.asJsonArray();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonValue;true;asJsonObject;;;Argument[this];ReturnValue;taint;manual"
 			jakarta.json.JsonObject out = null;
 			jakarta.json.JsonValue in = (jakarta.json.JsonValue)source();
 			out = in.asJsonObject();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonValue;true;toString;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			jakarta.json.JsonValue in = (jakarta.json.JsonValue)source();
 			out = in.toString();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonValue;true;toString;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			jakarta.json.JsonNumber in = (jakarta.json.JsonNumber)source();
 			out = in.toString();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonWriter;false;write;;;Argument[0];Argument[this];taint;manual"
 			jakarta.json.JsonWriter out = null;
 			jakarta.json.JsonValue in = (jakarta.json.JsonValue)source();
 			out.write(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonWriter;false;write;;;Argument[0];Argument[this];taint;manual"
 			jakarta.json.JsonWriter out = null;
 			jakarta.json.JsonStructure in = (jakarta.json.JsonStructure)source();
 			out.write(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonWriter;false;writeArray;;;Argument[0];Argument[this];taint;manual"
 			jakarta.json.JsonWriter out = null;
 			jakarta.json.JsonArray in = (jakarta.json.JsonArray)source();
 			out.writeArray(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonWriter;false;writeObject;;;Argument[0];Argument[this];taint;manual"
 			jakarta.json.JsonWriter out = null;
 			jakarta.json.JsonObject in = (jakarta.json.JsonObject)source();
 			out.writeObject(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonWriterFactory;false;createWriter;;;Argument[this];Argument[0];taint;manual"
 			Writer out = null;
 			jakarta.json.JsonWriterFactory in = (jakarta.json.JsonWriterFactory)source();
 			in.createWriter(out);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonWriterFactory;false;createWriter;;;Argument[this];Argument[0];taint;manual"
 			OutputStream out = null;
 			jakarta.json.JsonWriterFactory in = (jakarta.json.JsonWriterFactory)source();
 			in.createWriter(out, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "jakarta.json;JsonWriterFactory;false;createWriter;;;Argument[this];Argument[0];taint;manual"
 			OutputStream out = null;
 			jakarta.json.JsonWriterFactory in = (jakarta.json.JsonWriterFactory)source();
 			in.createWriter(out);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json.stream;JsonParserFactory;false;createParser;;;Argument[0];ReturnValue;taint;manual"
@@ -1753,7 +1753,7 @@ public class Test {
 			javax.json.JsonObject in = (javax.json.JsonObject)source();
 			javax.json.stream.JsonParserFactory instance = null;
 			out = instance.createParser(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json.stream;JsonParserFactory;false;createParser;;;Argument[0];ReturnValue;taint;manual"
@@ -1761,7 +1761,7 @@ public class Test {
 			javax.json.JsonArray in = (javax.json.JsonArray)source();
 			javax.json.stream.JsonParserFactory instance = null;
 			out = instance.createParser(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json.stream;JsonParserFactory;false;createParser;;;Argument[0];ReturnValue;taint;manual"
@@ -1769,7 +1769,7 @@ public class Test {
 			Reader in = (Reader)source();
 			javax.json.stream.JsonParserFactory instance = null;
 			out = instance.createParser(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json.stream;JsonParserFactory;false;createParser;;;Argument[0];ReturnValue;taint;manual"
@@ -1777,7 +1777,7 @@ public class Test {
 			InputStream in = (InputStream)source();
 			javax.json.stream.JsonParserFactory instance = null;
 			out = instance.createParser(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json.stream;JsonParserFactory;false;createParser;;;Argument[0];ReturnValue;taint;manual"
@@ -1785,196 +1785,196 @@ public class Test {
 			InputStream in = (InputStream)source();
 			javax.json.stream.JsonParserFactory instance = null;
 			out = instance.createParser(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createArrayBuilder;(Collection);;Element of Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			Collection in = (Collection)newWithElement(source());
 			out = javax.json.Json.createArrayBuilder(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createArrayBuilder;(JsonArray);;Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArray in = (javax.json.JsonArray)source();
 			out = javax.json.Json.createArrayBuilder(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createDiff;;;Argument[0..1];ReturnValue;taint;manual"
 			javax.json.JsonPatch out = null;
 			javax.json.JsonStructure in = (javax.json.JsonStructure)source();
 			out = javax.json.Json.createDiff(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createDiff;;;Argument[0..1];ReturnValue;taint;manual"
 			javax.json.JsonPatch out = null;
 			javax.json.JsonStructure in = (javax.json.JsonStructure)source();
 			out = javax.json.Json.createDiff(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createMergeDiff;;;Argument[0..1];ReturnValue;taint;manual"
 			javax.json.JsonMergePatch out = null;
 			javax.json.JsonValue in = (javax.json.JsonValue)source();
 			out = javax.json.Json.createMergeDiff(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createMergeDiff;;;Argument[0..1];ReturnValue;taint;manual"
 			javax.json.JsonMergePatch out = null;
 			javax.json.JsonValue in = (javax.json.JsonValue)source();
 			out = javax.json.Json.createMergeDiff(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createMergePatch;;;Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonMergePatch out = null;
 			javax.json.JsonValue in = (javax.json.JsonValue)source();
 			out = javax.json.Json.createMergePatch(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createObjectBuilder;(JsonObject);;Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonObjectBuilder out = null;
 			javax.json.JsonObject in = (javax.json.JsonObject)source();
 			out = javax.json.Json.createObjectBuilder(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createObjectBuilder;(Map);;MapKey of Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonObjectBuilder out = null;
 			Map in = (Map)newWithMapKey(source());
 			out = javax.json.Json.createObjectBuilder(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createObjectBuilder;(Map);;MapValue of Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonObjectBuilder out = null;
 			Map in = (Map)newWithMapValue(source());
 			out = javax.json.Json.createObjectBuilder(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createPatch;;;Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonPatch out = null;
 			javax.json.JsonArray in = (javax.json.JsonArray)source();
 			out = javax.json.Json.createPatch(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createPatchBuilder;;;Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonPatchBuilder out = null;
 			javax.json.JsonArray in = (javax.json.JsonArray)source();
 			out = javax.json.Json.createPatchBuilder(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createPointer;;;Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonPointer out = null;
 			String in = (String)source();
 			out = javax.json.Json.createPointer(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createReader;;;Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonReader out = null;
 			Reader in = (Reader)source();
 			out = javax.json.Json.createReader(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createReader;;;Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonReader out = null;
 			InputStream in = (InputStream)source();
 			out = javax.json.Json.createReader(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createValue;;;Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonString out = null;
 			String in = (String)source();
 			out = javax.json.Json.createValue(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createValue;;;Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonNumber out = null;
 			long in = (long)source();
 			out = javax.json.Json.createValue(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createValue;;;Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonNumber out = null;
 			int in = (int)source();
 			out = javax.json.Json.createValue(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createValue;;;Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonNumber out = null;
 			double in = (double)source();
 			out = javax.json.Json.createValue(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createValue;;;Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonNumber out = null;
 			BigInteger in = (BigInteger)source();
 			out = javax.json.Json.createValue(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createValue;;;Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonNumber out = null;
 			BigDecimal in = (BigDecimal)source();
 			out = javax.json.Json.createValue(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createWriter;;;Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonWriter out = null;
 			Writer in = (Writer)source();
 			out = javax.json.Json.createWriter(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;createWriter;;;Argument[0];ReturnValue;taint;manual"
 			javax.json.JsonWriter out = null;
 			OutputStream in = (OutputStream)source();
 			out = javax.json.Json.createWriter(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;decodePointer;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = javax.json.Json.decodePointer(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;Json;false;encodePointer;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = javax.json.Json.encodePointer(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArray;false;getBoolean;;;Argument[this];ReturnValue;taint;manual"
 			boolean out = false;
 			javax.json.JsonArray in = (javax.json.JsonArray)source();
 			out = in.getBoolean(0, false);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArray;false;getBoolean;;;Argument[this];ReturnValue;taint;manual"
 			boolean out = false;
 			javax.json.JsonArray in = (javax.json.JsonArray)source();
 			out = in.getBoolean(0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArray;false;getBoolean;;;Argument[1];ReturnValue;value;manual"
@@ -1982,21 +1982,21 @@ public class Test {
 			boolean in = (boolean)source();
 			javax.json.JsonArray instance = null;
 			out = instance.getBoolean(0, in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArray;false;getInt;;;Argument[this];ReturnValue;taint;manual"
 			int out = 0;
 			javax.json.JsonArray in = (javax.json.JsonArray)source();
 			out = in.getInt(0, 0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArray;false;getInt;;;Argument[this];ReturnValue;taint;manual"
 			int out = 0;
 			javax.json.JsonArray in = (javax.json.JsonArray)source();
 			out = in.getInt(0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArray;false;getInt;;;Argument[1];ReturnValue;value;manual"
@@ -2004,49 +2004,49 @@ public class Test {
 			int in = (int)source();
 			javax.json.JsonArray instance = null;
 			out = instance.getInt(0, in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArray;false;getJsonArray;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonArray out = null;
 			javax.json.JsonArray in = (javax.json.JsonArray)source();
 			out = in.getJsonArray(0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArray;false;getJsonNumber;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonNumber out = null;
 			javax.json.JsonArray in = (javax.json.JsonArray)source();
 			out = in.getJsonNumber(0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArray;false;getJsonObject;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonObject out = null;
 			javax.json.JsonArray in = (javax.json.JsonArray)source();
 			out = in.getJsonObject(0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArray;false;getJsonString;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonString out = null;
 			javax.json.JsonArray in = (javax.json.JsonArray)source();
 			out = in.getJsonString(0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArray;false;getString;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			javax.json.JsonArray in = (javax.json.JsonArray)source();
 			out = in.getString(0, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArray;false;getString;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			javax.json.JsonArray in = (javax.json.JsonArray)source();
 			out = in.getString(0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArray;false;getString;;;Argument[1];ReturnValue;value;manual"
@@ -2054,497 +2054,497 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonArray instance = null;
 			out = instance.getString(0, in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArray;false;getValuesAs;;;Argument[this];ReturnValue;taint;manual"
 			List out = null;
 			javax.json.JsonArray in = (javax.json.JsonArray)source();
 			out = in.getValuesAs((Function)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArray;false;getValuesAs;;;Argument[this];ReturnValue;taint;manual"
 			List out = null;
 			javax.json.JsonArray in = (javax.json.JsonArray)source();
 			out = in.getValuesAs((Class)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(BigDecimal);;Argument[0];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			BigDecimal in = (BigDecimal)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(BigInteger);;Argument[0];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			BigInteger in = (BigInteger)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(JsonArrayBuilder);;Argument[0];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(JsonObjectBuilder);;Argument[0];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(JsonValue);;Argument[0];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonValue in = (javax.json.JsonValue)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(String);;Argument[0];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			String in = (String)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(boolean);;Argument[0];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			boolean in = (boolean)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(double);;Argument[0];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			double in = (double)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(int);;Argument[0];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			int in = (int)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(int,BigDecimal);;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			BigDecimal in = (BigDecimal)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(int,BigInteger);;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			BigInteger in = (BigInteger)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(int,JsonArrayBuilder);;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(int,JsonObjectBuilder);;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(int,JsonValue);;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonValue in = (javax.json.JsonValue)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(int,String);;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			String in = (String)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(int,boolean);;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			boolean in = (boolean)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(int,double);;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			double in = (double)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(int,int);;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			int in = (int)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(int,long);;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			long in = (long)source();
 			out.add(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;(long);;Argument[0];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			long in = (long)source();
 			out.add(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add(false);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add(0L);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add(0.0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add(0, false);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add(0, 0L);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add(0, 0.0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add(0, 0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add(0, (javax.json.JsonValue)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add(0, (javax.json.JsonObjectBuilder)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add(0, (javax.json.JsonArrayBuilder)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add(0, (String)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add(0, (BigInteger)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add(0, (BigDecimal)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add(0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add((javax.json.JsonValue)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add((javax.json.JsonObjectBuilder)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add((javax.json.JsonArrayBuilder)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add((String)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add((BigInteger)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.add((BigDecimal)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;addAll;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.addAll(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;addAll;;;Argument[0];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out.addAll(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;addNull;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.addNull(0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;addNull;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.addNull();
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;build;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonArray out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.build();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;remove;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.remove(0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.set(0, false);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.set(0, 0L);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.set(0, 0.0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.set(0, 0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.set(0, (javax.json.JsonValue)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.set(0, (javax.json.JsonObjectBuilder)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.set(0, (javax.json.JsonArrayBuilder)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.set(0, (String)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.set(0, (BigInteger)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.set(0, (BigDecimal)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			long in = (long)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonValue in = (javax.json.JsonValue)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			int in = (int)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			double in = (double)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			boolean in = (boolean)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			String in = (String)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			BigInteger in = (BigInteger)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;set;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonArrayBuilder out = null;
 			BigDecimal in = (BigDecimal)source();
 			out.set(0, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonArrayBuilder;false;setNull;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonArrayBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out = in.setNull(0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonMergePatch;false;apply;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonValue out = null;
 			javax.json.JsonMergePatch in = (javax.json.JsonMergePatch)source();
 			out = in.apply(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonMergePatch;false;apply;;;Argument[0];ReturnValue;taint;manual"
@@ -2552,91 +2552,91 @@ public class Test {
 			javax.json.JsonValue in = (javax.json.JsonValue)source();
 			javax.json.JsonMergePatch instance = null;
 			out = instance.apply(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonMergePatch;false;toJsonValue;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonValue out = null;
 			javax.json.JsonMergePatch in = (javax.json.JsonMergePatch)source();
 			out = in.toJsonValue();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonNumber;false;bigDecimalValue;;;Argument[this];ReturnValue;taint;manual"
 			BigDecimal out = null;
 			javax.json.JsonNumber in = (javax.json.JsonNumber)source();
 			out = in.bigDecimalValue();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonNumber;false;bigIntegerValue;;;Argument[this];ReturnValue;taint;manual"
 			BigInteger out = null;
 			javax.json.JsonNumber in = (javax.json.JsonNumber)source();
 			out = in.bigIntegerValue();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonNumber;false;bigIntegerValueExact;;;Argument[this];ReturnValue;taint;manual"
 			BigInteger out = null;
 			javax.json.JsonNumber in = (javax.json.JsonNumber)source();
 			out = in.bigIntegerValueExact();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonNumber;false;doubleValue;;;Argument[this];ReturnValue;taint;manual"
 			double out = 0.0;
 			javax.json.JsonNumber in = (javax.json.JsonNumber)source();
 			out = in.doubleValue();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonNumber;false;intValue;;;Argument[this];ReturnValue;taint;manual"
 			int out = 0;
 			javax.json.JsonNumber in = (javax.json.JsonNumber)source();
 			out = in.intValue();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonNumber;false;intValueExact;;;Argument[this];ReturnValue;taint;manual"
 			int out = 0;
 			javax.json.JsonNumber in = (javax.json.JsonNumber)source();
 			out = in.intValueExact();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonNumber;false;longValue;;;Argument[this];ReturnValue;taint;manual"
 			long out = 0L;
 			javax.json.JsonNumber in = (javax.json.JsonNumber)source();
 			out = in.longValue();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonNumber;false;longValueExact;;;Argument[this];ReturnValue;taint;manual"
 			long out = 0L;
 			javax.json.JsonNumber in = (javax.json.JsonNumber)source();
 			out = in.longValueExact();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonNumber;false;numberValue;;;Argument[this];ReturnValue;taint;manual"
 			Number out = null;
 			javax.json.JsonNumber in = (javax.json.JsonNumber)source();
 			out = in.numberValue();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObject;false;getBoolean;;;Argument[this];ReturnValue;taint;manual"
 			boolean out = false;
 			javax.json.JsonObject in = (javax.json.JsonObject)source();
 			out = in.getBoolean(null, false);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObject;false;getBoolean;;;Argument[this];ReturnValue;taint;manual"
 			boolean out = false;
 			javax.json.JsonObject in = (javax.json.JsonObject)source();
 			out = in.getBoolean(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObject;false;getBoolean;;;Argument[1];ReturnValue;value;manual"
@@ -2644,21 +2644,21 @@ public class Test {
 			boolean in = (boolean)source();
 			javax.json.JsonObject instance = null;
 			out = instance.getBoolean(null, in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonObject;false;getInt;;;Argument[this];ReturnValue;taint;manual"
 			int out = 0;
 			javax.json.JsonObject in = (javax.json.JsonObject)source();
 			out = in.getInt(null, 0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObject;false;getInt;;;Argument[this];ReturnValue;taint;manual"
 			int out = 0;
 			javax.json.JsonObject in = (javax.json.JsonObject)source();
 			out = in.getInt(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObject;false;getInt;;;Argument[1];ReturnValue;value;manual"
@@ -2666,49 +2666,49 @@ public class Test {
 			int in = (int)source();
 			javax.json.JsonObject instance = null;
 			out = instance.getInt(null, in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonObject;false;getJsonArray;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonArray out = null;
 			javax.json.JsonObject in = (javax.json.JsonObject)source();
 			out = in.getJsonArray(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObject;false;getJsonNumber;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonNumber out = null;
 			javax.json.JsonObject in = (javax.json.JsonObject)source();
 			out = in.getJsonNumber(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObject;false;getJsonObject;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonObject out = null;
 			javax.json.JsonObject in = (javax.json.JsonObject)source();
 			out = in.getJsonObject(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObject;false;getJsonString;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonString out = null;
 			javax.json.JsonObject in = (javax.json.JsonObject)source();
 			out = in.getJsonString(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObject;false;getString;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			javax.json.JsonObject in = (javax.json.JsonObject)source();
 			out = in.getString(null, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObject;false;getString;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			javax.json.JsonObject in = (javax.json.JsonObject)source();
 			out = in.getString(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObject;false;getString;;;Argument[1];ReturnValue;value;manual"
@@ -2716,154 +2716,154 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonObject instance = null;
 			out = instance.getString(null, in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonObjectBuilder out = null;
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			out = in.add((String)null, false);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonObjectBuilder out = null;
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			out = in.add((String)null, 0L);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonObjectBuilder out = null;
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			out = in.add((String)null, 0.0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonObjectBuilder out = null;
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			out = in.add((String)null, 0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonObjectBuilder out = null;
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			out = in.add((String)null, (javax.json.JsonValue)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonObjectBuilder out = null;
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			out = in.add((String)null, (javax.json.JsonObjectBuilder)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonObjectBuilder out = null;
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			out = in.add((String)null, (javax.json.JsonArrayBuilder)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonObjectBuilder out = null;
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			out = in.add((String)null, (String)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonObjectBuilder out = null;
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			out = in.add((String)null, (BigInteger)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonObjectBuilder out = null;
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			out = in.add((String)null, (BigDecimal)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonObjectBuilder out = null;
 			long in = (long)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonObjectBuilder out = null;
 			javax.json.JsonValue in = (javax.json.JsonValue)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonObjectBuilder out = null;
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonObjectBuilder out = null;
 			javax.json.JsonArrayBuilder in = (javax.json.JsonArrayBuilder)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonObjectBuilder out = null;
 			int in = (int)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonObjectBuilder out = null;
 			double in = (double)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonObjectBuilder out = null;
 			boolean in = (boolean)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonObjectBuilder out = null;
 			String in = (String)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonObjectBuilder out = null;
 			BigInteger in = (BigInteger)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;add;;;Argument[1];Argument[this];taint;manual"
 			javax.json.JsonObjectBuilder out = null;
 			BigDecimal in = (BigDecimal)source();
 			out.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;addAll;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonObjectBuilder out = null;
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			out = in.addAll(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;addAll;;;Argument[0];ReturnValue;value;manual"
@@ -2871,35 +2871,35 @@ public class Test {
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			javax.json.JsonObjectBuilder instance = null;
 			out = instance.addAll(in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;addNull;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonObjectBuilder out = null;
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			out = in.addNull(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;build;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonObject out = null;
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			out = in.build();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonObjectBuilder;false;remove;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonObjectBuilder out = null;
 			javax.json.JsonObjectBuilder in = (javax.json.JsonObjectBuilder)source();
 			out = in.remove(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonPatch;false;apply;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonStructure out = null;
 			javax.json.JsonPatch in = (javax.json.JsonPatch)source();
 			out = in.apply(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatch;false;apply;;;Argument[0];ReturnValue;taint;manual"
@@ -2907,42 +2907,42 @@ public class Test {
 			javax.json.JsonStructure in = (javax.json.JsonStructure)source();
 			javax.json.JsonPatch instance = null;
 			out = instance.apply(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatch;false;toJsonArray;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonArray out = null;
 			javax.json.JsonPatch in = (javax.json.JsonPatch)source();
 			out = in.toJsonArray();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonPatchBuilder out = null;
 			javax.json.JsonPatchBuilder in = (javax.json.JsonPatchBuilder)source();
 			out = in.add((String)null, false);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonPatchBuilder out = null;
 			javax.json.JsonPatchBuilder in = (javax.json.JsonPatchBuilder)source();
 			out = in.add((String)null, 0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonPatchBuilder out = null;
 			javax.json.JsonPatchBuilder in = (javax.json.JsonPatchBuilder)source();
 			out = in.add((String)null, (javax.json.JsonValue)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;add;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonPatchBuilder out = null;
 			javax.json.JsonPatchBuilder in = (javax.json.JsonPatchBuilder)source();
 			out = in.add((String)null, (String)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -2950,7 +2950,7 @@ public class Test {
 			javax.json.JsonValue in = (javax.json.JsonValue)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -2958,7 +2958,7 @@ public class Test {
 			int in = (int)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -2966,7 +2966,7 @@ public class Test {
 			boolean in = (boolean)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -2974,7 +2974,7 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.add(in, false);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -2982,7 +2982,7 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.add(in, 0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -2990,7 +2990,7 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.add(in, (javax.json.JsonValue)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -2998,7 +2998,7 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.add(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3006,21 +3006,21 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.add((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;build;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonPatch out = null;
 			javax.json.JsonPatchBuilder in = (javax.json.JsonPatchBuilder)source();
 			out = in.build();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;copy;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonPatchBuilder out = null;
 			javax.json.JsonPatchBuilder in = (javax.json.JsonPatchBuilder)source();
 			out = in.copy(null, null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;copy;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3028,7 +3028,7 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.copy(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;copy;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3036,14 +3036,14 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.copy(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;move;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonPatchBuilder out = null;
 			javax.json.JsonPatchBuilder in = (javax.json.JsonPatchBuilder)source();
 			out = in.move(null, null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;move;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3051,7 +3051,7 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.move(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;move;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3059,14 +3059,14 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.move(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;remove;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonPatchBuilder out = null;
 			javax.json.JsonPatchBuilder in = (javax.json.JsonPatchBuilder)source();
 			out = in.remove(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;remove;;;Argument[0];ReturnValue;taint;manual"
@@ -3074,35 +3074,35 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.remove(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;replace;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonPatchBuilder out = null;
 			javax.json.JsonPatchBuilder in = (javax.json.JsonPatchBuilder)source();
 			out = in.replace((String)null, false);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;replace;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonPatchBuilder out = null;
 			javax.json.JsonPatchBuilder in = (javax.json.JsonPatchBuilder)source();
 			out = in.replace((String)null, 0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;replace;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonPatchBuilder out = null;
 			javax.json.JsonPatchBuilder in = (javax.json.JsonPatchBuilder)source();
 			out = in.replace((String)null, (javax.json.JsonValue)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;replace;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonPatchBuilder out = null;
 			javax.json.JsonPatchBuilder in = (javax.json.JsonPatchBuilder)source();
 			out = in.replace((String)null, (String)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3110,7 +3110,7 @@ public class Test {
 			javax.json.JsonValue in = (javax.json.JsonValue)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.replace((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3118,7 +3118,7 @@ public class Test {
 			int in = (int)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.replace((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3126,7 +3126,7 @@ public class Test {
 			boolean in = (boolean)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.replace((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3134,7 +3134,7 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.replace(in, false);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3142,7 +3142,7 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.replace(in, 0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3150,7 +3150,7 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.replace(in, (javax.json.JsonValue)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3158,7 +3158,7 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.replace(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3166,35 +3166,35 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.replace((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;test;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonPatchBuilder out = null;
 			javax.json.JsonPatchBuilder in = (javax.json.JsonPatchBuilder)source();
 			out = in.test((String)null, false);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;test;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonPatchBuilder out = null;
 			javax.json.JsonPatchBuilder in = (javax.json.JsonPatchBuilder)source();
 			out = in.test((String)null, 0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;test;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonPatchBuilder out = null;
 			javax.json.JsonPatchBuilder in = (javax.json.JsonPatchBuilder)source();
 			out = in.test((String)null, (javax.json.JsonValue)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;test;;;Argument[this];ReturnValue;value;manual"
 			javax.json.JsonPatchBuilder out = null;
 			javax.json.JsonPatchBuilder in = (javax.json.JsonPatchBuilder)source();
 			out = in.test((String)null, (String)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;test;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3202,7 +3202,7 @@ public class Test {
 			javax.json.JsonValue in = (javax.json.JsonValue)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.test((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;test;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3210,7 +3210,7 @@ public class Test {
 			int in = (int)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.test((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;test;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3218,7 +3218,7 @@ public class Test {
 			boolean in = (boolean)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.test((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;test;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3226,7 +3226,7 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.test(in, false);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;test;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3234,7 +3234,7 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.test(in, 0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;test;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3242,7 +3242,7 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.test(in, (javax.json.JsonValue)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;test;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3250,7 +3250,7 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.test(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPatchBuilder;false;test;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3258,14 +3258,14 @@ public class Test {
 			String in = (String)source();
 			javax.json.JsonPatchBuilder instance = null;
 			out = instance.test((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPointer;false;add;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonStructure out = null;
 			javax.json.JsonPointer in = (javax.json.JsonPointer)source();
 			out = in.add(null, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPointer;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3273,7 +3273,7 @@ public class Test {
 			javax.json.JsonValue in = (javax.json.JsonValue)source();
 			javax.json.JsonPointer instance = null;
 			out = instance.add(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPointer;false;add;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3281,7 +3281,7 @@ public class Test {
 			javax.json.JsonStructure in = (javax.json.JsonStructure)source();
 			javax.json.JsonPointer instance = null;
 			out = instance.add(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPointer;false;getValue;;;Argument[0];ReturnValue;taint;manual"
@@ -3289,7 +3289,7 @@ public class Test {
 			javax.json.JsonStructure in = (javax.json.JsonStructure)source();
 			javax.json.JsonPointer instance = null;
 			out = instance.getValue(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPointer;false;remove;;;Argument[0];ReturnValue;taint;manual"
@@ -3297,7 +3297,7 @@ public class Test {
 			javax.json.JsonStructure in = (javax.json.JsonStructure)source();
 			javax.json.JsonPointer instance = null;
 			out = instance.remove(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPointer;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3305,7 +3305,7 @@ public class Test {
 			javax.json.JsonValue in = (javax.json.JsonValue)source();
 			javax.json.JsonPointer instance = null;
 			out = instance.replace(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonPointer;false;replace;;;Argument[0..1];ReturnValue;taint;manual"
@@ -3313,35 +3313,35 @@ public class Test {
 			javax.json.JsonStructure in = (javax.json.JsonStructure)source();
 			javax.json.JsonPointer instance = null;
 			out = instance.replace(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonReader;false;read;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonStructure out = null;
 			javax.json.JsonReader in = (javax.json.JsonReader)source();
 			out = in.read();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonReader;false;readArray;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonArray out = null;
 			javax.json.JsonReader in = (javax.json.JsonReader)source();
 			out = in.readArray();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonReader;false;readObject;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonObject out = null;
 			javax.json.JsonReader in = (javax.json.JsonReader)source();
 			out = in.readObject();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonReader;false;readValue;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonValue out = null;
 			javax.json.JsonReader in = (javax.json.JsonReader)source();
 			out = in.readValue();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonReaderFactory;false;createReader;;;Argument[0];ReturnValue;taint;manual"
@@ -3349,7 +3349,7 @@ public class Test {
 			Reader in = (Reader)source();
 			javax.json.JsonReaderFactory instance = null;
 			out = instance.createReader(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonReaderFactory;false;createReader;;;Argument[0];ReturnValue;taint;manual"
@@ -3357,7 +3357,7 @@ public class Test {
 			InputStream in = (InputStream)source();
 			javax.json.JsonReaderFactory instance = null;
 			out = instance.createReader(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonReaderFactory;false;createReader;;;Argument[0];ReturnValue;taint;manual"
@@ -3365,107 +3365,107 @@ public class Test {
 			InputStream in = (InputStream)source();
 			javax.json.JsonReaderFactory instance = null;
 			out = instance.createReader(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonString;false;getChars;;;Argument[this];ReturnValue;taint;manual"
 			CharSequence out = null;
 			javax.json.JsonString in = (javax.json.JsonString)source();
 			out = in.getChars();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonString;false;getString;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			javax.json.JsonString in = (javax.json.JsonString)source();
 			out = in.getString();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonStructure;true;getValue;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonValue out = null;
 			javax.json.JsonStructure in = (javax.json.JsonStructure)source();
 			out = in.getValue(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonValue;true;asJsonArray;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonArray out = null;
 			javax.json.JsonValue in = (javax.json.JsonValue)source();
 			out = in.asJsonArray();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonValue;true;asJsonObject;;;Argument[this];ReturnValue;taint;manual"
 			javax.json.JsonObject out = null;
 			javax.json.JsonValue in = (javax.json.JsonValue)source();
 			out = in.asJsonObject();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonValue;true;toString;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			javax.json.JsonValue in = (javax.json.JsonValue)source();
 			out = in.toString();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonValue;true;toString;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			javax.json.JsonNumber in = (javax.json.JsonNumber)source();
 			out = in.toString();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonWriter;false;write;;;Argument[0];Argument[this];taint;manual"
 			javax.json.JsonWriter out = null;
 			javax.json.JsonValue in = (javax.json.JsonValue)source();
 			out.write(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonWriter;false;write;;;Argument[0];Argument[this];taint;manual"
 			javax.json.JsonWriter out = null;
 			javax.json.JsonStructure in = (javax.json.JsonStructure)source();
 			out.write(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonWriter;false;writeArray;;;Argument[0];Argument[this];taint;manual"
 			javax.json.JsonWriter out = null;
 			javax.json.JsonArray in = (javax.json.JsonArray)source();
 			out.writeArray(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonWriter;false;writeObject;;;Argument[0];Argument[this];taint;manual"
 			javax.json.JsonWriter out = null;
 			javax.json.JsonObject in = (javax.json.JsonObject)source();
 			out.writeObject(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonWriterFactory;false;createWriter;;;Argument[this];Argument[0];taint;manual"
 			Writer out = null;
 			javax.json.JsonWriterFactory in = (javax.json.JsonWriterFactory)source();
 			in.createWriter(out);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonWriterFactory;false;createWriter;;;Argument[this];Argument[0];taint;manual"
 			OutputStream out = null;
 			javax.json.JsonWriterFactory in = (javax.json.JsonWriterFactory)source();
 			in.createWriter(out, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "javax.json;JsonWriterFactory;false;createWriter;;;Argument[this];Argument[0];taint;manual"
 			OutputStream out = null;
 			javax.json.JsonWriterFactory in = (javax.json.JsonWriterFactory)source();
 			in.createWriter(out);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/library-tests/frameworks/jms/MessageListenerImpl.java b/java/ql/test/library-tests/frameworks/jms/MessageListenerImpl.java
index 29591bfcd4b..256d564eefe 100644
--- a/java/ql/test/library-tests/frameworks/jms/MessageListenerImpl.java
+++ b/java/ql/test/library-tests/frameworks/jms/MessageListenerImpl.java
@@ -13,59 +13,59 @@ import javax.jms.TopicRequestor;
 public class MessageListenerImpl implements MessageListener {
 
     @Override
-    public void onMessage(Message message) { // $source
+    public void onMessage(Message message) { // $ source
         try {
             if (message instanceof TextMessage) {
                 TextMessage textMessage = (TextMessage) message;
                 String text = textMessage.getText();
-                sink(text); // $tainted
+                sink(text); // $ tainted
             } else if (message instanceof BytesMessage) {
                 BytesMessage bytesMessage = (BytesMessage) message;
                 byte[] data = new byte[1024];
                 bytesMessage.readBytes(data, 42);
-                sink(new String(data)); // $tainted
-                sink(bytesMessage.readUTF()); // $tainted
+                sink(new String(data)); // $ tainted
+                sink(bytesMessage.readUTF()); // $ tainted
             } else if (message instanceof MapMessage) {
                 MapMessage mapMessage = (MapMessage) message;
-                sink(mapMessage.getString("data")); // $tainted
-                sink(new String(mapMessage.getBytes("bytes"))); // $tainted
+                sink(mapMessage.getString("data")); // $ tainted
+                sink(new String(mapMessage.getBytes("bytes"))); // $ tainted
             } else if (message instanceof ObjectMessage) {
                 ObjectMessage objectMessage = (ObjectMessage) message;
-                sink((String) objectMessage.getObject()); // $tainted
+                sink((String) objectMessage.getObject()); // $ tainted
             } else if (message instanceof StreamMessage) {
                 StreamMessage streamMessage = (StreamMessage) message;
                 byte[] data = new byte[1024];
                 streamMessage.readBytes(data);
-                sink(new String(data)); // $tainted
-                sink(streamMessage.readString()); // $tainted
-                sink((String) streamMessage.readObject()); // $tainted
+                sink(new String(data)); // $ tainted
+                sink(streamMessage.readString()); // $ tainted
+                sink((String) streamMessage.readObject()); // $ tainted
             }
         } catch (Exception e) {
         }
     }
 
     public void readFromCounsumer(MessageConsumer consumer) throws Exception {
-        TextMessage message = (TextMessage) consumer.receive(5000); // $source
+        TextMessage message = (TextMessage) consumer.receive(5000); // $ source
         String text = message.getText();
-        sink(text); // $tainted
-        message = (TextMessage) consumer.receive(); // $source
+        sink(text); // $ tainted
+        message = (TextMessage) consumer.receive(); // $ source
         text = message.getText();
-        sink(text); // $tainted
-        message = (TextMessage) consumer.receiveNoWait(); // $source
+        sink(text); // $ tainted
+        message = (TextMessage) consumer.receiveNoWait(); // $ source
         text = message.getText();
-        sink(text); // $tainted
+        sink(text); // $ tainted
     }
 
     public void readFromQueueRequestor(QueueRequestor requestor, Message message) throws Exception {
-        TextMessage reply = (TextMessage) requestor.request(message); // $source
+        TextMessage reply = (TextMessage) requestor.request(message); // $ source
         String text = reply.getText();
-        sink(text); // $tainted
+        sink(text); // $ tainted
     }
 
     public void readFromTopicRequestor(TopicRequestor requestor, Message message) throws Exception {
-        TextMessage reply = (TextMessage) requestor.request(message); // $source
+        TextMessage reply = (TextMessage) requestor.request(message); // $ source
         String text = reply.getText();
-        sink(text); // $tainted
+        sink(text); // $ tainted
     }
 
     private void sink(String data) {
diff --git a/java/ql/test/library-tests/frameworks/lastaflute/Test.java b/java/ql/test/library-tests/frameworks/lastaflute/Test.java
index a10f4ebbdaa..d230da8c6e3 100644
--- a/java/ql/test/library-tests/frameworks/lastaflute/Test.java
+++ b/java/ql/test/library-tests/frameworks/lastaflute/Test.java
@@ -16,12 +16,10 @@ public class Test {
     public String index(TestForm form) throws IOException {
         MultipartFormFile file = form.file;
 
-        sink(file.getFileData()); // $hasTaintFlow
-        sink(file.getInputStream()); // $hasTaintFlow
+        sink(file.getFileData()); // $ hasTaintFlow
+        sink(file.getInputStream()); // $ hasTaintFlow
 
         return "index.jsp";
     }
 
 }
-
-    
diff --git a/java/ql/test/library-tests/frameworks/netty/manual/Test.java b/java/ql/test/library-tests/frameworks/netty/manual/Test.java
index 58150659712..090734e5251 100644
--- a/java/ql/test/library-tests/frameworks/netty/manual/Test.java
+++ b/java/ql/test/library-tests/frameworks/netty/manual/Test.java
@@ -12,7 +12,7 @@ class Test {
 
     class A extends ChannelInboundHandlerAdapter {
         public void channelRead(ChannelHandlerContext ctx, Object msg) {
-            sink(msg); // $hasTaintFlow
+            sink(msg); // $ hasTaintFlow
         }
     }
 
@@ -21,7 +21,7 @@ class Test {
             ByteBuf bb = (ByteBuf) msg;
             byte[] data = new byte[1024];
             bb.readBytes(data);
-            sink(data); // $hasTaintFlow
+            sink(data); // $ hasTaintFlow
         }
     }
 
@@ -73,4 +73,4 @@ class Test {
             sink(payload); // $ hasTaintFlow
         }
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/library-tests/frameworks/rabbitmq/Test.java b/java/ql/test/library-tests/frameworks/rabbitmq/Test.java
index 66a7fc8560a..b2aad6e84a6 100644
--- a/java/ql/test/library-tests/frameworks/rabbitmq/Test.java
+++ b/java/ql/test/library-tests/frameworks/rabbitmq/Test.java
@@ -11,20 +11,20 @@ public class Test {
 
             @Override
             public void handleDelivery(
-                    String consumerTag, Envelope envelope, AMQP.BasicProperties properties, 
-                    byte[] body) { // $source
+                    String consumerTag, Envelope envelope, AMQP.BasicProperties properties,
+                    byte[] body) { // $ source
 
-                sink(body); // $hasTaintFlow
+                sink(body); // $ hasTaintFlow
             }
         };
     }
 
     public void queueingConsumerTest(QueueingConsumer consumer) {
         while (true) {
-            QueueingConsumer.Delivery delivery = consumer.nextDelivery(); // $source
-            sink(delivery.getBody()); // $hasTaintFlow
-            delivery = consumer.nextDelivery(42); // $source
-            sink(delivery.getBody()); // $hasTaintFlow
+            QueueingConsumer.Delivery delivery = consumer.nextDelivery(); // $ source
+            sink(delivery.getBody()); // $ hasTaintFlow
+            delivery = consumer.nextDelivery(42); // $ source
+            sink(delivery.getBody()); // $ hasTaintFlow
         }
     }
 
diff --git a/java/ql/test/library-tests/frameworks/ratpack/resources/CollectionPassingTest.java b/java/ql/test/library-tests/frameworks/ratpack/resources/CollectionPassingTest.java
index eb0ca9cad92..667cf56aa3a 100644
--- a/java/ql/test/library-tests/frameworks/ratpack/resources/CollectionPassingTest.java
+++ b/java/ql/test/library-tests/frameworks/ratpack/resources/CollectionPassingTest.java
@@ -29,11 +29,11 @@ public class CollectionPassingTest {
                 Map<String, Object> pojoMap = new HashMap<>();
                 merge(form.asMultimap().asMap(), pojoMap);
                 // Then
-                sink(pojoMap.get("value")); //$hasTaintFlow
+                sink(pojoMap.get("value")); // $ hasTaintFlow
                 pojoMap.forEach((key, value) -> {
-                    sink(value); //$hasTaintFlow
+                    sink(value); // $ hasTaintFlow
                     List<Object> values = (List<Object>) value;
-                    sink(values.get(0)); //$hasTaintFlow
+                    sink(values.get(0)); // $ hasTaintFlow
                 });
             });
     }
@@ -46,11 +46,11 @@ public class CollectionPassingTest {
         // When
         merge(taintedMap, pojoMap);
         // Then
-        sink(pojoMap.get("value")); //$hasTaintFlow
+        sink(pojoMap.get("value")); // $ hasTaintFlow
         pojoMap.forEach((key, value) -> {
-            sink(value); //$hasTaintFlow
+            sink(value); // $ hasTaintFlow
             List<Object> values = (List<Object>) value;
-            sink(values.get(0)); //$hasTaintFlow
+            sink(values.get(0)); // $ hasTaintFlow
         });
     }
 
@@ -66,5 +66,5 @@ public class CollectionPassingTest {
     private static Object extractSingleValueIfPossible(Collection<String> values) {
         return values.size() == 1 ? values.iterator().next() : ImmutableList.copyOf(values);
     }
-    
+
 }
diff --git a/java/ql/test/library-tests/frameworks/ratpack/resources/IntegrationTest.java b/java/ql/test/library-tests/frameworks/ratpack/resources/IntegrationTest.java
index da87794eb56..85adece96c0 100644
--- a/java/ql/test/library-tests/frameworks/ratpack/resources/IntegrationTest.java
+++ b/java/ql/test/library-tests/frameworks/ratpack/resources/IntegrationTest.java
@@ -53,32 +53,32 @@ class IntegrationTest {
     void test1(Context ctx) {
         bindJson(ctx, Pojo.class)
             .then(pojo ->{
-                sink(pojo); //$hasTaintFlow
-                sink(pojo.value); //$hasTaintFlow
-                sink(pojo.getValue()); //$hasTaintFlow
+                sink(pojo); // $ hasTaintFlow
+                sink(pojo.value); // $ hasTaintFlow
+                sink(pojo.getValue()); // $ hasTaintFlow
             });
     }
 
     void test2(Context ctx) {
         bindForm(ctx, Pojo.class, defaults -> defaults.put("another", "potato"))
             .then(pojo ->{
-                sink(pojo); //$hasTaintFlow
-                sink(pojo.value); //$hasTaintFlow
-                sink(pojo.getValue()); //$hasTaintFlow
+                sink(pojo); // $ hasTaintFlow
+                sink(pojo.value); // $ hasTaintFlow
+                sink(pojo.getValue()); // $ hasTaintFlow
             });
     }
 
     void test3() {
         Object value = extractSingleValueIfPossible(ImmutableList.of("a", taint()));
-        sink(value); //$hasTaintFlow
+        sink(value); // $ hasTaintFlow
         List<Object> values = (List<Object>) value;
-        sink(values.get(1)); //$hasTaintFlow
+        sink(values.get(1)); // $ hasTaintFlow
         Map<String, Object> weirdMap = new HashMap<>();
         weirdMap.put("a", value);
         weirdMap.forEach((key, mapValue) -> {
-            sink(mapValue); //$hasTaintFlow
+            sink(mapValue); // $ hasTaintFlow
             List<Object> values2 = (List<Object>) mapValue;
-            sink(values2.get(0)); //$hasTaintFlow
+            sink(values2.get(0)); // $ hasTaintFlow
         });
     }
 
@@ -89,13 +89,13 @@ class IntegrationTest {
                 filterAndMerge(pojoForm, mergedParams, name -> false);
                 return mergedParams;
             }).then(pojoMap -> {
-                sink(pojoMap.keySet().iterator().next()); //$hasTaintFlow
-                sink(pojoMap.get("value")); //$hasTaintFlow
+                sink(pojoMap.keySet().iterator().next()); // $ hasTaintFlow
+                sink(pojoMap.get("value")); // $ hasTaintFlow
                 pojoMap.forEach((key, value) -> {
-                    sink(key); //$hasTaintFlow
-                    sink(value); //$hasTaintFlow
+                    sink(key); // $ hasTaintFlow
+                    sink(value); // $ hasTaintFlow
                     List<Object> values = (List<Object>) value;
-                    sink(values.get(0)); //$hasTaintFlow
+                    sink(values.get(0)); // $ hasTaintFlow
                 });
             });
     }
@@ -107,13 +107,13 @@ class IntegrationTest {
                 filterAndMerge_2(pojoForm, mergedParams, name -> false);
                 return mergedParams;
             }).then(pojoMap -> {
-                sink(pojoMap.keySet().iterator().next()); //$hasTaintFlow
-                sink(pojoMap.get("value")); //$hasTaintFlow
+                sink(pojoMap.keySet().iterator().next()); // $ hasTaintFlow
+                sink(pojoMap.get("value")); // $ hasTaintFlow
                 pojoMap.forEach((key, value) -> {
-                    sink(key); //$hasTaintFlow
-                    sink(value); //$hasTaintFlow
+                    sink(key); // $ hasTaintFlow
+                    sink(value); // $ hasTaintFlow
                     List<Object> values = (List<Object>) value;
-                    sink(values.get(0)); //$hasTaintFlow
+                    sink(values.get(0)); // $ hasTaintFlow
                 });
             });
     }
@@ -121,8 +121,8 @@ class IntegrationTest {
     void test6(Context ctx) {
         bindQuery(ctx, Pojo.class)
             .then(pojo -> {
-                sink(pojo.getValue()); //$hasTaintFlow
-                sink(pojo.getValues()); //$hasTaintFlow
+                sink(pojo.getValue()); // $ hasTaintFlow
+                sink(pojo.getValues()); // $ hasTaintFlow
             });
     }
 
diff --git a/java/ql/test/library-tests/frameworks/ratpack/resources/PairTest.java b/java/ql/test/library-tests/frameworks/ratpack/resources/PairTest.java
index efde2aaf921..6cee6068733 100644
--- a/java/ql/test/library-tests/frameworks/ratpack/resources/PairTest.java
+++ b/java/ql/test/library-tests/frameworks/ratpack/resources/PairTest.java
@@ -5,7 +5,7 @@ import ratpack.func.Pair;
 
 
 public class PairTest {
-    
+
     void sink(Object o) {}
 
     String taint() {
@@ -21,9 +21,9 @@ public class PairTest {
         sink(pair.right()); // no taint flow
         sink(pair.getRight()); // no taint flow
         Pair<String, String> updatedLeftPair = pair.left(taint());
-        sink(updatedLeftPair.left); //$hasTaintFlow
-        sink(updatedLeftPair.left()); //$hasTaintFlow
-        sink(updatedLeftPair.getLeft()); //$hasTaintFlow
+        sink(updatedLeftPair.left); // $ hasTaintFlow
+        sink(updatedLeftPair.left()); // $ hasTaintFlow
+        sink(updatedLeftPair.getLeft()); // $ hasTaintFlow
         sink(updatedLeftPair.right); // no taint flow
         sink(updatedLeftPair.right()); // no taint flow
         sink(updatedLeftPair.getRight()); // no taint flow
@@ -31,33 +31,33 @@ public class PairTest {
         sink(updatedRightPair.left); // no taint flow
         sink(updatedRightPair.left()); // no taint flow
         sink(updatedRightPair.getLeft()); // no taint flow
-        sink(updatedRightPair.right); //$hasTaintFlow
-        sink(updatedRightPair.right()); //$hasTaintFlow
-        sink(updatedRightPair.getRight()); //$hasTaintFlow
+        sink(updatedRightPair.right); // $ hasTaintFlow
+        sink(updatedRightPair.right()); // $ hasTaintFlow
+        sink(updatedRightPair.getRight()); // $ hasTaintFlow
         Pair<String, String> updatedBothPair = pair.left(taint()).right(taint());
-        sink(updatedBothPair.left); //$hasTaintFlow
-        sink(updatedBothPair.left()); //$hasTaintFlow
-        sink(updatedBothPair.getLeft()); //$hasTaintFlow
-        sink(updatedBothPair.right); //$hasTaintFlow
-        sink(updatedBothPair.right()); //$hasTaintFlow
-        sink(updatedBothPair.getRight()); //$hasTaintFlow
+        sink(updatedBothPair.left); // $ hasTaintFlow
+        sink(updatedBothPair.left()); // $ hasTaintFlow
+        sink(updatedBothPair.getLeft()); // $ hasTaintFlow
+        sink(updatedBothPair.right); // $ hasTaintFlow
+        sink(updatedBothPair.right()); // $ hasTaintFlow
+        sink(updatedBothPair.getRight()); // $ hasTaintFlow
     }
 
     void test2() {
         Pair<String, String> pair = Pair.of(taint(), taint());
-        sink(pair.left); //$hasTaintFlow
-        sink(pair.left()); //$hasTaintFlow
-        sink(pair.getLeft()); //$hasTaintFlow
-        sink(pair.right); //$hasTaintFlow
-        sink(pair.right()); //$hasTaintFlow
-        sink(pair.getRight()); //$hasTaintFlow
+        sink(pair.left); // $ hasTaintFlow
+        sink(pair.left()); // $ hasTaintFlow
+        sink(pair.getLeft()); // $ hasTaintFlow
+        sink(pair.right); // $ hasTaintFlow
+        sink(pair.right()); // $ hasTaintFlow
+        sink(pair.getRight()); // $ hasTaintFlow
         Pair<String, Pair<String, String>> pushedLeftPair = pair.pushLeft("safe");
         sink(pushedLeftPair.left()); // no taint flow
-        sink(pushedLeftPair.right().left()); //$hasTaintFlow
-        sink(pushedLeftPair.right().right()); //$hasTaintFlow
+        sink(pushedLeftPair.right().left()); // $ hasTaintFlow
+        sink(pushedLeftPair.right().right()); // $ hasTaintFlow
         Pair<Pair<String, String>, String> pushedRightPair = pair.pushRight("safe");
-        sink(pushedRightPair.left().left()); //$hasTaintFlow
-        sink(pushedRightPair.left().right()); //$hasTaintFlow
+        sink(pushedRightPair.left().left()); // $ hasTaintFlow
+        sink(pushedRightPair.left().right()); // $ hasTaintFlow
         sink(pushedRightPair.right()); // no taint flow
     }
 
@@ -70,39 +70,39 @@ public class PairTest {
         sink(pair.right()); // no taint flow
         sink(pair.getRight()); // no taint flow
         Pair<String, Pair<String, String>> pushedLeftPair = pair.pushLeft(taint());
-        sink(pushedLeftPair.left()); //$hasTaintFlow
+        sink(pushedLeftPair.left()); // $ hasTaintFlow
         sink(pushedLeftPair.right().left()); // no taint flow
         sink(pushedLeftPair.right().right()); // no taint flow
         Pair<Pair<String, String>, String> pushedRightPair = pair.pushRight(taint());
         sink(pushedRightPair.left().left()); // no taint flow
         sink(pushedRightPair.left().right()); // no taint flow
-        sink(pushedRightPair.right()); //$hasTaintFlow
+        sink(pushedRightPair.right()); // $ hasTaintFlow
     }
 
     void test4() {
         Pair<String, String> pair = Pair.of(taint(), taint());
-        sink(pair.left()); //$hasTaintFlow
-        sink(pair.right()); //$hasTaintFlow
+        sink(pair.left()); // $ hasTaintFlow
+        sink(pair.right()); // $ hasTaintFlow
         Pair<Pair<String, String>, String> nestLeftPair = pair.nestLeft("safe");
         sink(nestLeftPair.left().left()); // no taint flow
-        sink(nestLeftPair.left().right()); //$hasTaintFlow
-        sink(nestLeftPair.right()); //$hasTaintFlow
+        sink(nestLeftPair.left().right()); // $ hasTaintFlow
+        sink(nestLeftPair.right()); // $ hasTaintFlow
         Pair<String, Pair<String, String>> nestRightPair = pair.nestRight("safe");
-        sink(nestRightPair.left()); //$hasTaintFlow
+        sink(nestRightPair.left()); // $ hasTaintFlow
         sink(nestRightPair.right().left()); // no taint flow
-        sink(nestRightPair.right().right()); //$hasTaintFlow
+        sink(nestRightPair.right().right()); // $ hasTaintFlow
     }
 
     void test5() {
         Pair<String, String> pair = Pair.of(taint(), "safe");
-        sink(pair.left()); //$hasTaintFlow
+        sink(pair.left()); // $ hasTaintFlow
         sink(pair.right()); // no taint flow
         Pair<Pair<String, String>, String> nestLeftPair = pair.nestLeft("safe");
         sink(nestLeftPair.left().left()); // no taint flow
-        sink(nestLeftPair.left().right()); //$hasTaintFlow
+        sink(nestLeftPair.left().right()); // $ hasTaintFlow
         sink(nestLeftPair.right()); // no taint flow
         Pair<String, Pair<String, String>> nestRightPair = pair.nestRight("safe");
-        sink(nestRightPair.left()); //$hasTaintFlow
+        sink(nestRightPair.left()); // $ hasTaintFlow
         sink(nestRightPair.right().left()); // no taint flow
         sink(nestRightPair.right().right()); // no taint flow
     }
@@ -110,15 +110,15 @@ public class PairTest {
     void test6() {
         Pair<String, String> pair = Pair.of("safe", taint());
         sink(pair.left()); // no taint flow
-        sink(pair.right()); //$hasTaintFlow
+        sink(pair.right()); // $ hasTaintFlow
         Pair<Pair<String, String>, String> nestLeftPair = pair.nestLeft("safe");
         sink(nestLeftPair.left().left()); // no taint flow
         sink(nestLeftPair.left().right()); // no taint flow
-        sink(nestLeftPair.right()); //$hasTaintFlow
+        sink(nestLeftPair.right()); // $ hasTaintFlow
         Pair<String, Pair<String, String>> nestRightPair = pair.nestRight("safe");
         sink(nestRightPair.left()); // no taint flow
         sink(nestRightPair.right().left()); // no taint flow
-        sink(nestRightPair.right().right()); //$hasTaintFlow
+        sink(nestRightPair.right().right()); // $ hasTaintFlow
     }
 
     void test7() {
@@ -126,12 +126,12 @@ public class PairTest {
         sink(pair.left()); // no taint flow
         sink(pair.right()); // no taint flow
         Pair<Pair<String, String>, String> nestLeftPair = pair.nestLeft(taint());
-        sink(nestLeftPair.left().left()); // $hasTaintFlow
+        sink(nestLeftPair.left().left()); // $ hasTaintFlow
         sink(nestLeftPair.left().right()); // no taint flow
         sink(nestLeftPair.right()); // no taint flow
         Pair<String, Pair<String, String>> nestRightPair = pair.nestRight(taint());
         sink(nestRightPair.left()); // no taint flow
-        sink(nestRightPair.right().left()); // $hasTaintFlow
+        sink(nestRightPair.right().left()); // $ hasTaintFlow
         sink(nestRightPair.right().right()); // no taint flow
     }
 
@@ -141,7 +141,7 @@ public class PairTest {
             sink(left); // no taint flow
             return taint();
         });
-        sink(taintLeft.left()); //$hasTaintFlow
+        sink(taintLeft.left()); // $ hasTaintFlow
         sink(taintLeft.right()); // no taint flow
     }
 
@@ -152,43 +152,43 @@ public class PairTest {
             return taint();
         });
         sink(taintRight.left()); // no taint flow
-        sink(taintRight.right()); //$hasTaintFlow
+        sink(taintRight.right()); // $ hasTaintFlow
     }
 
     void test10() throws Exception {
         Pair<String, String> pair = Pair.of(taint(), taint());
         Pair<String, String> taintLeft = pair.mapLeft(left -> {
-            sink(left); //$hasTaintFlow
+            sink(left); // $ hasTaintFlow
             return "safe";
         });
         sink(taintLeft.left()); // no taint flow
-        sink(taintLeft.right()); //$hasTaintFlow
+        sink(taintLeft.right()); // $ hasTaintFlow
     }
 
     void test11() throws Exception {
         Pair<String, String> pair = Pair.of(taint(), taint());
         Pair<String, String> taintRight = pair.mapRight(right -> {
-            sink(right); //$hasTaintFlow
+            sink(right); // $ hasTaintFlow
             return "safe";
         });
-        sink(taintRight.left()); //$hasTaintFlow
+        sink(taintRight.left()); // $ hasTaintFlow
         sink(taintRight.right()); // no taint flow
     }
 
     void test12() throws Exception {
         Pair<String, String> pair = Pair.of(taint(), taint());
         String safe = pair.map(p -> {
-            sink(p.left()); //$hasTaintFlow
-            sink(p.right()); //$hasTaintFlow
+            sink(p.left()); // $ hasTaintFlow
+            sink(p.right()); // $ hasTaintFlow
             return "safe";
         });
         sink(safe); // no taint flow
         String unsafe = pair.map(p -> {
-            sink(p.left()); //$hasTaintFlow
-            sink(p.right()); //$hasTaintFlow
+            sink(p.left()); // $ hasTaintFlow
+            sink(p.right()); // $ hasTaintFlow
             return taint();
         });
-        sink(unsafe); //$hasTaintFlow
+        sink(unsafe); // $ hasTaintFlow
     }
 
     void test13() {
@@ -197,20 +197,20 @@ public class PairTest {
             .left(Promise.value("safe"))
             .then(pair -> {
                 sink(pair.left()); // no taint flow
-                sink(pair.right()); //$hasTaintFlow
+                sink(pair.right()); // $ hasTaintFlow
             });
         Promise
             .value(taint())
             .right(Promise.value("safe"))
             .then(pair -> {
-                sink(pair.left()); //$hasTaintFlow
+                sink(pair.left()); // $ hasTaintFlow
                 sink(pair.right()); // no taint flow
             });
         Promise
             .value("safe")
             .left(Promise.value(taint()))
             .then(pair -> {
-                sink(pair.left()); //$hasTaintFlow
+                sink(pair.left()); // $ hasTaintFlow
                 sink(pair.right()); // no taint flow
             });
         Promise
@@ -218,7 +218,7 @@ public class PairTest {
             .right(Promise.value(taint()))
             .then(pair -> {
                 sink(pair.left()); // no taint flow
-                sink(pair.right()); //$hasTaintFlow
+                sink(pair.right()); // $ hasTaintFlow
             });
     }
 
@@ -226,21 +226,21 @@ public class PairTest {
         Promise
             .value(taint())
             .left(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
                 return "safe";
             })
             .then(pair -> {
                 sink(pair.left()); // no taint flow
-                sink(pair.right()); //$hasTaintFlow
+                sink(pair.right()); // $ hasTaintFlow
             });
         Promise
             .value(taint())
             .right(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
                 return "safe";
             })
             .then(pair -> {
-                sink(pair.left()); //$hasTaintFlow
+                sink(pair.left()); // $ hasTaintFlow
                 sink(pair.right()); // no taint flow
             });
         Promise
@@ -250,7 +250,7 @@ public class PairTest {
                 return taint();
             })
             .then(pair -> {
-                sink(pair.left()); //$hasTaintFlow
+                sink(pair.left()); // $ hasTaintFlow
                 sink(pair.right()); // no taint flow
             });
         Promise
@@ -261,7 +261,7 @@ public class PairTest {
             })
             .then(pair -> {
                 sink(pair.left()); // no taint flow
-                sink(pair.right()); //$hasTaintFlow
+                sink(pair.right()); // $ hasTaintFlow
             });
     }
 
@@ -269,21 +269,21 @@ public class PairTest {
         Promise
             .value(taint())
             .flatLeft(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
                 return Promise.value("safe");
             })
             .then(pair -> {
                 sink(pair.left()); // no taint flow
-                sink(pair.right()); //$hasTaintFlow
+                sink(pair.right()); // $ hasTaintFlow
             });
         Promise
             .value(taint())
             .flatRight(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
                 return Promise.value("safe");
             })
             .then(pair -> {
-                sink(pair.left()); //$hasTaintFlow
+                sink(pair.left()); // $ hasTaintFlow
                 sink(pair.right()); // no taint flow
             });
         Promise
@@ -292,7 +292,7 @@ public class PairTest {
                 return Promise.value(taint());
             })
             .then(pair -> {
-                sink(pair.left()); //$hasTaintFlow
+                sink(pair.left()); // $ hasTaintFlow
                 sink(pair.right()); // no taint flow
             });
         Promise
@@ -302,7 +302,7 @@ public class PairTest {
             })
             .then(pair -> {
                 sink(pair.left()); // no taint flow
-                sink(pair.right()); //$hasTaintFlow
+                sink(pair.right()); // $ hasTaintFlow
             });
     }
 }
diff --git a/java/ql/test/library-tests/frameworks/ratpack/resources/Resource.java b/java/ql/test/library-tests/frameworks/ratpack/resources/Resource.java
index 695ad907d1f..19ec14fd236 100644
--- a/java/ql/test/library-tests/frameworks/ratpack/resources/Resource.java
+++ b/java/ql/test/library-tests/frameworks/ratpack/resources/Resource.java
@@ -19,59 +19,59 @@ class Resource {
     }
 
     void test1(Context ctx) {
-        sink(ctx.getRequest().getContentLength()); //$hasTaintFlow
-        sink(ctx.getRequest().getCookies()); //$hasTaintFlow
-        sink(ctx.getRequest().oneCookie("Magic-Cookie")); //$hasTaintFlow
-        sink(ctx.getRequest().getHeaders()); //$hasTaintFlow
-        sink(ctx.getRequest().getHeaders().get("questionable_header")); //$hasTaintFlow
-        sink(ctx.getRequest().getHeaders().getAll("questionable_header")); //$hasTaintFlow
-        sink(ctx.getRequest().getHeaders().getNames()); //$hasTaintFlow
-        sink(ctx.getRequest().getHeaders().asMultiValueMap()); //$hasTaintFlow
-        sink(ctx.getRequest().getHeaders().asMultiValueMap().get("questionable_header")); //$hasTaintFlow
-        sink(ctx.getRequest().getPath()); //$hasTaintFlow
-        sink(ctx.getRequest().getQuery()); //$hasTaintFlow
-        sink(ctx.getRequest().getQueryParams()); //$hasTaintFlow
-        sink(ctx.getRequest().getQueryParams().get("questionable_parameter")); //$hasTaintFlow
-        sink(ctx.getRequest().getRawUri()); //$hasTaintFlow
-        sink(ctx.getRequest().getUri()); //$hasTaintFlow
+        sink(ctx.getRequest().getContentLength()); // $ hasTaintFlow
+        sink(ctx.getRequest().getCookies()); // $ hasTaintFlow
+        sink(ctx.getRequest().oneCookie("Magic-Cookie")); // $ hasTaintFlow
+        sink(ctx.getRequest().getHeaders()); // $ hasTaintFlow
+        sink(ctx.getRequest().getHeaders().get("questionable_header")); // $ hasTaintFlow
+        sink(ctx.getRequest().getHeaders().getAll("questionable_header")); // $ hasTaintFlow
+        sink(ctx.getRequest().getHeaders().getNames()); // $ hasTaintFlow
+        sink(ctx.getRequest().getHeaders().asMultiValueMap()); // $ hasTaintFlow
+        sink(ctx.getRequest().getHeaders().asMultiValueMap().get("questionable_header")); // $ hasTaintFlow
+        sink(ctx.getRequest().getPath()); // $ hasTaintFlow
+        sink(ctx.getRequest().getQuery()); // $ hasTaintFlow
+        sink(ctx.getRequest().getQueryParams()); // $ hasTaintFlow
+        sink(ctx.getRequest().getQueryParams().get("questionable_parameter")); // $ hasTaintFlow
+        sink(ctx.getRequest().getRawUri()); // $ hasTaintFlow
+        sink(ctx.getRequest().getUri()); // $ hasTaintFlow
     }
 
     void test2(Context ctx, OutputStream os) {
         ctx.getRequest().getBody().then(td -> {
-            sink(td); //$hasTaintFlow
-            sink(td.getText()); //$hasTaintFlow
-            sink(td.getBuffer()); //$hasTaintFlow
-            sink(td.getBytes()); //$hasTaintFlow
-            sink(td.getContentType()); //$hasTaintFlow
-            sink(td.getInputStream()); //$hasTaintFlow
+            sink(td); // $ hasTaintFlow
+            sink(td.getText()); // $ hasTaintFlow
+            sink(td.getBuffer()); // $ hasTaintFlow
+            sink(td.getBytes()); // $ hasTaintFlow
+            sink(td.getContentType()); // $ hasTaintFlow
+            sink(td.getInputStream()); // $ hasTaintFlow
             sink(os);
             td.writeTo(os);
-            sink(os); //$hasTaintFlow
+            sink(os); // $ hasTaintFlow
             if (td instanceof UploadedFile) {
                 UploadedFile uf = (UploadedFile) td;
-                sink(uf.getFileName()); //$hasTaintFlow
+                sink(uf.getFileName()); // $ hasTaintFlow
             }
         });
     }
 
     void test3(Context ctx) {
         ctx.getRequest().getBody().map(TypedData::getText).then(s -> {
-            sink(s); //$hasTaintFlow
+            sink(s); // $ hasTaintFlow
         });
         ctx.getRequest().getBody().map(b -> {
-            sink(b); //$hasTaintFlow
-            sink(b.getText()); //$hasTaintFlow
+            sink(b); // $ hasTaintFlow
+            sink(b.getText()); // $ hasTaintFlow
             return b.getText();
         }).then(t -> {
-            sink(t); //$hasTaintFlow
+            sink(t); // $ hasTaintFlow
         });
-        ctx.getRequest().getBody().map(TypedData::getText).then(this::sink); //$hasTaintFlow
+        ctx.getRequest().getBody().map(TypedData::getText).then(this::sink); // $ hasTaintFlow
         ctx
             .getRequest()
             .getBody()
             .map(TypedData::getText)
-            .next(this::sink) //$hasTaintFlow
-            .then(this::sink); //$hasTaintFlow
+            .next(this::sink) // $ hasTaintFlow
+            .then(this::sink); // $ hasTaintFlow
     }
 
     void test4() {
@@ -79,11 +79,11 @@ class Resource {
         Promise.value(tainted);
         Promise
             .value(tainted)
-            .then(this::sink); //$hasTaintFlow
+            .then(this::sink); // $ hasTaintFlow
         Promise
             .value(tainted)
             .map(a -> a)
-            .then(this::sink); //$hasTaintFlow
+            .then(this::sink); // $ hasTaintFlow
     }
 
     void test5(Context ctx) {
@@ -92,22 +92,22 @@ class Resource {
             .getBody()
             .map(data -> {
                 Form form = ctx.parse(data, Form.form());
-                sink(form); //$hasTaintFlow
+                sink(form); // $ hasTaintFlow
                 return form;
             })
             .then(form -> {
-                sink(form.file("questionable_file")); //$hasTaintFlow
-                sink(form.file("questionable_file").getFileName()); //$hasTaintFlow
-                sink(form.files("questionable_files")); //$hasTaintFlow
-                sink(form.files()); //$hasTaintFlow
-                sink(form.get("questionable_parameter")); //$hasTaintFlow
-                sink(form.getAll().get("questionable_parameter").get(0)); //$hasTaintFlow
-                sink(form.getAll("questionable_parameter").get(0)); //$hasTaintFlow
-                sink(form.asMultimap().get("questionable_parameter")); //$hasTaintFlow
-                sink(form.asMultimap().asMap()); //$hasTaintFlow
+                sink(form.file("questionable_file")); // $ hasTaintFlow
+                sink(form.file("questionable_file").getFileName()); // $ hasTaintFlow
+                sink(form.files("questionable_files")); // $ hasTaintFlow
+                sink(form.files()); // $ hasTaintFlow
+                sink(form.get("questionable_parameter")); // $ hasTaintFlow
+                sink(form.getAll().get("questionable_parameter").get(0)); // $ hasTaintFlow
+                sink(form.getAll("questionable_parameter").get(0)); // $ hasTaintFlow
+                sink(form.asMultimap().get("questionable_parameter")); // $ hasTaintFlow
+                sink(form.asMultimap().asMap()); // $ hasTaintFlow
                 form.asMultimap().asMap().forEach((name, values) -> {
-                    sink(name); //$hasTaintFlow
-                    sink(values); //$hasTaintFlow
+                    sink(name); // $ hasTaintFlow
+                    sink(values); // $ hasTaintFlow
                 });
             });
     }
@@ -116,17 +116,17 @@ class Resource {
         ctx
             .parse(Parse.of(Form.class))
             .then(form -> {
-                sink(form); //$hasTaintFlow
+                sink(form); // $ hasTaintFlow
             });
         ctx
             .parse(Form.class)
             .then(form -> {
-                sink(form); //$hasTaintFlow
+                sink(form); // $ hasTaintFlow
             });
         ctx
             .parse(Form.class, "Some Object")
             .then(form -> {
-                sink(form); //$hasTaintFlow
+                sink(form); // $ hasTaintFlow
             });
     }
 
@@ -135,50 +135,50 @@ class Resource {
         Promise
             .flatten(() -> Promise.value(tainted))
             .next(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             })
             .onError(Action.noop())
             .next(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             })
             .cache()
             .next(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             })
             .fork()
             .next(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             })
             .route(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
                 return false;
             }, value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             })
             .next(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             })
             .cacheIf(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
                 return true;
             })
             .next(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             })
             .onError(RuntimeException.class, Action.noop())
             .next(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             })
             .map(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
                 return value;
             })
             .blockingMap(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
                 return value;
             })
             .then(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             });
     }
 
@@ -191,7 +191,7 @@ class Resource {
                 return "potato";
             })
             .then(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             });
         Promise
             .value("potato")
@@ -199,7 +199,7 @@ class Resource {
                 return taint();
             })
             .then(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             });
         Promise
             .value(tainted)
@@ -208,7 +208,7 @@ class Resource {
                 return Promise.value("potato");
             })
             .then(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             });
         Promise
             .value("potato")
@@ -216,7 +216,7 @@ class Resource {
                 return Promise.value(taint());
             })
             .then(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             });
     }
 
@@ -226,7 +226,7 @@ class Resource {
             .value(tainted)
             .map(Resource::identity)
             .then(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             });
         Promise
             .value("potato")
@@ -238,7 +238,7 @@ class Resource {
             .value(tainted)
             .flatMap(v -> Promise.value(v))
             .then(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             });
     }
 
@@ -252,7 +252,7 @@ class Resource {
             .value(tainted)
             .apply(Resource::promiseIdentity)
             .then(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             });
         Promise
             .value("potato")
@@ -261,7 +261,7 @@ class Resource {
                 sink(value); // no taints flow
             });
     }
-    
+
     public static Promise<String> promiseIdentity(Promise<String> input) {
         return input.map(i -> i);
     }
@@ -272,7 +272,7 @@ class Resource {
             .value(tainted)
             .map(a -> a)
             .then(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             });
         Promise
             .value("potato")
@@ -287,40 +287,40 @@ class Resource {
         Promise
             .sync(() -> tainted)
             .mapIf(v -> {
-                sink(v); //$hasTaintFlow
+                sink(v); // $ hasTaintFlow
                 return true;
             }, v -> {
-                sink(v); //$hasTaintFlow
+                sink(v); // $ hasTaintFlow
                 return v;
             })
             .then(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             });
         Promise
             .sync(() -> tainted)
             .mapIf(v -> {
-                sink(v); //$hasTaintFlow
+                sink(v); // $ hasTaintFlow
                 return true;
             }, vTrue -> {
-                sink(vTrue); //$hasTaintFlow
+                sink(vTrue); // $ hasTaintFlow
                 return vTrue;
             }, vFalse -> {
-                sink(vFalse); //$hasTaintFlow
+                sink(vFalse); // $ hasTaintFlow
                 return vFalse;
             })
             .then(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             });
         Promise
             .sync(() -> tainted)
             .mapIf(v -> {
-                sink(v); //$hasTaintFlow
+                sink(v); // $ hasTaintFlow
                 return true;
             }, vTrue -> {
-                sink(vTrue); //$hasTaintFlow
+                sink(vTrue); // $ hasTaintFlow
                 return "potato";
             }, vFalse -> {
-                sink(vFalse); //$hasTaintFlow
+                sink(vFalse); // $ hasTaintFlow
                 return "potato";
             })
             .then(value -> {
@@ -340,7 +340,7 @@ class Resource {
             .value("safe")
             .replace(Promise.value(tainted))
             .then(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             });
     }
 
@@ -349,10 +349,10 @@ class Resource {
         Promise
             .value(tainted)
             .blockingOp(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             })
             .then(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             });
     }
 
@@ -361,16 +361,16 @@ class Resource {
         Promise
             .value(tainted)
             .nextOp(value -> Operation.of(() -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             }))
             .nextOpIf(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
                 return true;
             }, value -> Operation.of(() -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             }))
             .then(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             });
     }
 
@@ -379,23 +379,23 @@ class Resource {
         Promise
             .value(tainted)
             .flatOp(value ->  Operation.of(() -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             }));
     }
 
     void test17() throws Exception {
         String tainted = taint();
         Result<String> result = Result.success(tainted);
-        sink(result.getValue()); //$hasTaintFlow
-        sink(result.getValueOrThrow()); //$hasTaintFlow
+        sink(result.getValue()); // $ hasTaintFlow
+        sink(result.getValueOrThrow()); // $ hasTaintFlow
         Promise
             .value(tainted)
             .wiretap(r -> {
-                sink(r.getValue()); //$hasTaintFlow
-                sink(r.getValueOrThrow()); //$hasTaintFlow
+                sink(r.getValue()); // $ hasTaintFlow
+                sink(r.getValueOrThrow()); // $ hasTaintFlow
             })
             .then(value -> {
-                sink(value); //$hasTaintFlow
+                sink(value); // $ hasTaintFlow
             });
     }
 
diff --git a/java/ql/test/library-tests/frameworks/spring/cache/Test.java b/java/ql/test/library-tests/frameworks/spring/cache/Test.java
index 1f2473d0004..92b24a7fc58 100644
--- a/java/ql/test/library-tests/frameworks/spring/cache/Test.java
+++ b/java/ql/test/library-tests/frameworks/spring/cache/Test.java
@@ -50,91 +50,91 @@ public class Test {
 			Cache.ValueRetrievalException out = null;
 			Object in = source();
 			out = new Cache.ValueRetrievalException(in, null, null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.cache;Cache$ValueRetrievalException;false;getKey;;;MapKey of Argument[this];ReturnValue;value;manual"
 			Object out = null;
 			Cache.ValueRetrievalException in = new Cache.ValueRetrievalException(source(), null, null);
 			out = in.getKey();
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.cache;Cache$ValueWrapper;true;get;;;MapValue of Argument[this];ReturnValue;value;manual"
 			Object out = null;
 			Cache.ValueWrapper in = new ValueWrapper(source());
 			out = in.get();
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.cache;Cache;true;get;(Object);;MapValue of Argument[this];MapValue of ReturnValue;value;manual"
 			Cache.ValueWrapper out = null;
 			Cache in = new DummyCache(null, source());
 			out = in.get(null);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.cache;Cache;true;get;(Object,Callable);;MapValue of Argument[this];ReturnValue;value;manual"
 			Object out = null;
 			Cache in = new DummyCache(null, source());
 			out = in.get(null, (Callable)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.cache;Cache;true;get;(Object,Class);;MapValue of Argument[this];ReturnValue;value;manual"
 			Object out = null;
 			Cache in = new DummyCache(null, source());
 			out = in.get(null, (Class)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.cache;Cache;true;getNativeCache;;;MapKey of Argument[this];MapKey of ReturnValue;value;manual"
 			Object out = null;
 			Cache in = new DummyCache(source(), null);
 			out = in.getNativeCache();
-			sink(getMapKey((Cache)out)); // $hasValueFlow
+			sink(getMapKey((Cache)out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.cache;Cache;true;getNativeCache;;;MapValue of Argument[this];MapValue of ReturnValue;value;manual"
 			Object out = null;
 			Cache in = new DummyCache(null, source());
 			out = in.getNativeCache();
-			sink(getMapValue((Cache)out)); // $hasValueFlow
+			sink(getMapValue((Cache)out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.cache;Cache;true;put;;;Argument[0];MapKey of Argument[this];value;manual"
 			Cache out = null;
 			Object in = source();
 			out.put(in, null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.cache;Cache;true;put;;;Argument[1];MapValue of Argument[this];value;manual"
 			Cache out = null;
 			Object in = source();
 			out.put(null, in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.cache;Cache;true;putIfAbsent;;;Argument[0];MapKey of Argument[this];value;manual"
 			Cache out = null;
 			Object in = source();
 			out.putIfAbsent(in, null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.cache;Cache;true;putIfAbsent;;;Argument[1];MapValue of Argument[this];value;manual"
 			Cache out = null;
 			Object in = source();
 			out.putIfAbsent(null, in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.cache;Cache;true;putIfAbsent;;;MapValue of Argument[this];MapValue of ReturnValue;value;manual"
 			Cache.ValueWrapper out = null;
 			Cache in = new DummyCache(null, source());
 			out = in.putIfAbsent(null, null);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 
 	}
diff --git a/java/ql/test/library-tests/frameworks/spring/context/Test.java b/java/ql/test/library-tests/frameworks/spring/context/Test.java
index 24680b98750..329af10f5a3 100644
--- a/java/ql/test/library-tests/frameworks/spring/context/Test.java
+++ b/java/ql/test/library-tests/frameworks/spring/context/Test.java
@@ -13,8 +13,8 @@ public class Test {
 	public void test() {
 		StaticMessageSource sms = new StaticMessageSource();
 		sms.addMessage(code, locale, "hello {0}");
-		sink(sms.getMessage(code, new String[]{ taint() }, locale)); // $hasTaintFlow
-		sink(sms.getMessage(code, new String[]{ taint() }, "", locale)); // $hasTaintFlow
-		sink(sms.getMessage(code, null, taint(), locale)); // $hasTaintFlow
+		sink(sms.getMessage(code, new String[]{ taint() }, locale)); // $ hasTaintFlow
+		sink(sms.getMessage(code, new String[]{ taint() }, "", locale)); // $ hasTaintFlow
+		sink(sms.getMessage(code, null, taint(), locale)); // $ hasTaintFlow
 	}
 }
diff --git a/java/ql/test/library-tests/frameworks/spring/controller/Test.java b/java/ql/test/library-tests/frameworks/spring/controller/Test.java
index ad4fbc89f44..f7af203e8ba 100644
--- a/java/ql/test/library-tests/frameworks/spring/controller/Test.java
+++ b/java/ql/test/library-tests/frameworks/spring/controller/Test.java
@@ -127,62 +127,62 @@ public class Test {
     static class ExplicitlyTaintedTest {
         @RequestMapping("/")
         public void get(InputStream src) { // $ RequestMappingURL="/"
-            sink(src); // $hasValueFlow
+            sink(src); // $ hasValueFlow
         }
 
         @RequestMapping("/")
         public void get(Reader src) { // $ RequestMappingURL="/"
-            sink(src); // $hasValueFlow
+            sink(src); // $ hasValueFlow
         }
 
         @RequestMapping("/")
         public void matrixVariable(@MatrixVariable Object src) { // $ RequestMappingURL="/"
-            sink(src); // $hasValueFlow
+            sink(src); // $ hasValueFlow
         }
 
         @RequestMapping("/")
         public void requestParam(@RequestParam Object src) { // $ RequestMappingURL="/"
-            sink(src); // $hasValueFlow
+            sink(src); // $ hasValueFlow
         }
 
         @RequestMapping("/")
         public void requestHeader(@RequestHeader Object src) { // $ RequestMappingURL="/"
-            sink(src); // $hasValueFlow
+            sink(src); // $ hasValueFlow
         }
 
         @RequestMapping("/")
         public void cookieValue(@CookieValue Object src) { // $ RequestMappingURL="/"
-            sink(src); // $hasValueFlow
+            sink(src); // $ hasValueFlow
         }
 
         @RequestMapping("/")
         public void requestPart(@RequestPart Object src) { // $ RequestMappingURL="/"
-            sink(src); // $hasValueFlow
+            sink(src); // $ hasValueFlow
         }
 
         @RequestMapping("/")
         public void pathVariable(@PathVariable Object src) { // $ RequestMappingURL="/"
-            sink(src); // $hasValueFlow
+            sink(src); // $ hasValueFlow
         }
 
         @RequestMapping("/")
         public void requestBody(@RequestBody Object src) { // $ RequestMappingURL="/"
-            sink(src); // $hasValueFlow
+            sink(src); // $ hasValueFlow
         }
 
         @RequestMapping("/")
         public void get(HttpEntity src) { // $ RequestMappingURL="/"
-            sink(src); // $hasValueFlow
+            sink(src); // $ hasValueFlow
         }
 
         @RequestMapping("/")
         public void requestAttribute(@RequestAttribute Object src) { // $ RequestMappingURL="/"
-            sink(src); // $hasValueFlow
+            sink(src); // $ hasValueFlow
         }
 
         @RequestMapping("/")
         public void sessionAttribute(@SessionAttribute Object src) { // $ RequestMappingURL="/"
-            sink(src); // $hasValueFlow
+            sink(src); // $ hasValueFlow
         }
     }
 
@@ -193,12 +193,12 @@ public class Test {
 
         @RequestMapping("/")
         public void get(String src) { // $ RequestMappingURL="/"
-            sink(src); // $hasValueFlow
+            sink(src); // $ hasValueFlow
         }
 
         @RequestMapping("/")
         public void get1(Pojo src) { // $ RequestMappingURL="/"
-            sink(src); // $hasValueFlow
+            sink(src); // $ hasValueFlow
         }
     }
 
diff --git a/java/ql/test/library-tests/frameworks/spring/data/Test.java b/java/ql/test/library-tests/frameworks/spring/data/Test.java
index e23fc652692..977fec5f983 100644
--- a/java/ql/test/library-tests/frameworks/spring/data/Test.java
+++ b/java/ql/test/library-tests/frameworks/spring/data/Test.java
@@ -14,6 +14,6 @@ public class Test {
   void testCrudRepository(CrudRepository<Struct, Integer> cr) {
     Struct s = new Struct(source());
     s = cr.save(s);
-    sink(s.field); //$hasValueFlow
+    sink(s.field); // $ hasValueFlow
   }
 }
diff --git a/java/ql/test/library-tests/frameworks/spring/http/TestHttp.java b/java/ql/test/library-tests/frameworks/spring/http/TestHttp.java
index d148a6be93a..e05d129c2e5 100644
--- a/java/ql/test/library-tests/frameworks/spring/http/TestHttp.java
+++ b/java/ql/test/library-tests/frameworks/spring/http/TestHttp.java
@@ -14,149 +14,149 @@ class TestHttp {
 
     void test1() {
         String x = taint();
-        sink(new HttpEntity(x)); // $hasTaintFlow
+        sink(new HttpEntity(x)); // $ hasTaintFlow
 
         MultiValueMap<String,String> m1 = new LinkedMultiValueMap();
-        sink(new HttpEntity(x, m1)); // $hasTaintFlow
+        sink(new HttpEntity(x, m1)); // $ hasTaintFlow
 
         m1.add("a", taint());
-        sink(new HttpEntity("a", m1)); // $hasTaintFlow
-        sink(new HttpEntity<String>(m1)); // $hasTaintFlow
+        sink(new HttpEntity("a", m1)); // $ hasTaintFlow
+        sink(new HttpEntity<String>(m1)); // $ hasTaintFlow
 
         MultiValueMap<String,String> m2 = new LinkedMultiValueMap();
         m2.add(taint(), "a");
-        sink(new HttpEntity<String>(m2)); // $hasTaintFlow
+        sink(new HttpEntity<String>(m2)); // $ hasTaintFlow
 
         HttpEntity<String> ent = taint();
-        sink(ent.getBody()); // $hasTaintFlow
-        sink(ent.getHeaders()); // $hasTaintFlow
+        sink(ent.getBody()); // $ hasTaintFlow
+        sink(ent.getHeaders()); // $ hasTaintFlow
 
         RequestEntity<String> req = taint();
-        sink(req.getUrl()); // $hasTaintFlow
+        sink(req.getUrl()); // $ hasTaintFlow
     }
 
     void test2() {
         String x = taint();
-        sink(ResponseEntity.ok(x)); // $hasTaintFlow
-        sink(ResponseEntity.of(Optional.of(x))); // $hasTaintFlow
+        sink(ResponseEntity.ok(x)); // $ hasTaintFlow
+        sink(ResponseEntity.of(Optional.of(x))); // $ hasTaintFlow
 
-        sink(ResponseEntity.status(200).contentLength(2048).body(x)); // $hasTaintFlow
-        sink(ResponseEntity.created(taint()).contentType(null).body("a")); // $hasTaintFlow
-        sink(ResponseEntity.status(200).header(x, "a", "b", "c").build()); // $hasTaintFlow
-        sink(ResponseEntity.status(200).header("h", "a", "b", x).build()); // $hasTaintFlow
+        sink(ResponseEntity.status(200).contentLength(2048).body(x)); // $ hasTaintFlow
+        sink(ResponseEntity.created(taint()).contentType(null).body("a")); // $ hasTaintFlow
+        sink(ResponseEntity.status(200).header(x, "a", "b", "c").build()); // $ hasTaintFlow
+        sink(ResponseEntity.status(200).header("h", "a", "b", x).build()); // $ hasTaintFlow
         HttpHeaders h = new HttpHeaders();
         h.add("h", taint());
-        sink(ResponseEntity.status(200).headers(h).allow().build()); // $hasTaintFlow
-        sink(ResponseEntity.status(200).eTag(x).allow().build()); // $hasTaintFlow
-        sink(ResponseEntity.status(200).location(taint()).lastModified(10000000).build()); // $hasTaintFlow
-        sink(ResponseEntity.status(200).varyBy(x).build()); 
+        sink(ResponseEntity.status(200).headers(h).allow().build()); // $ hasTaintFlow
+        sink(ResponseEntity.status(200).eTag(x).allow().build()); // $ hasTaintFlow
+        sink(ResponseEntity.status(200).location(taint()).lastModified(10000000).build()); // $ hasTaintFlow
+        sink(ResponseEntity.status(200).varyBy(x).build());
     }
 
     void test3() {
         String x = taint();
 
         MultiValueMap<String,String> m1 = new LinkedMultiValueMap();
-        sink(new ResponseEntity(x, HttpStatus.ACCEPTED)); // $hasTaintFlow
-        sink(new ResponseEntity(x, m1, HttpStatus.ACCEPTED)); // $hasTaintFlow
-        sink(new ResponseEntity(x, m1, 200)); // $hasTaintFlow
+        sink(new ResponseEntity(x, HttpStatus.ACCEPTED)); // $ hasTaintFlow
+        sink(new ResponseEntity(x, m1, HttpStatus.ACCEPTED)); // $ hasTaintFlow
+        sink(new ResponseEntity(x, m1, 200)); // $ hasTaintFlow
 
         m1.add("a", taint());
-        sink(new ResponseEntity("a", m1, HttpStatus.ACCEPTED)); // $hasTaintFlow
-        sink(new ResponseEntity<String>(m1, HttpStatus.ACCEPTED)); // $hasTaintFlow
-        sink(new ResponseEntity("a", m1, 200)); // $hasTaintFlow
+        sink(new ResponseEntity("a", m1, HttpStatus.ACCEPTED)); // $ hasTaintFlow
+        sink(new ResponseEntity<String>(m1, HttpStatus.ACCEPTED)); // $ hasTaintFlow
+        sink(new ResponseEntity("a", m1, 200)); // $ hasTaintFlow
 
         MultiValueMap<String,String> m2 = new LinkedMultiValueMap();
         m2.add(taint(), "a");
-        sink(new ResponseEntity("a", m2, HttpStatus.ACCEPTED)); // $hasTaintFlow
-        sink(new ResponseEntity<String>(m2, HttpStatus.ACCEPTED)); // $hasTaintFlow
-        sink(new ResponseEntity("a", m2, 200)); // $hasTaintFlow
+        sink(new ResponseEntity("a", m2, HttpStatus.ACCEPTED)); // $ hasTaintFlow
+        sink(new ResponseEntity<String>(m2, HttpStatus.ACCEPTED)); // $ hasTaintFlow
+        sink(new ResponseEntity("a", m2, 200)); // $ hasTaintFlow
 
         ResponseEntity<String> ent = taint();
-        sink(ent.getBody()); // $hasTaintFlow
-        sink(ent.getHeaders()); // $hasTaintFlow
+        sink(ent.getBody()); // $ hasTaintFlow
+        sink(ent.getHeaders()); // $ hasTaintFlow
     }
 
     void test4() {
         MultiValueMap<String,String> m1 = new LinkedMultiValueMap();
         m1.add("a", taint());
-        sink(new HttpHeaders(m1)); // $hasTaintFlow
+        sink(new HttpHeaders(m1)); // $ hasTaintFlow
 
         MultiValueMap<String,String> m2 = new LinkedMultiValueMap();
         m2.add(taint(), "a");
-        sink(new HttpHeaders(m2)); // $hasTaintFlow
+        sink(new HttpHeaders(m2)); // $ hasTaintFlow
 
         HttpHeaders h1 = new HttpHeaders();
-        h1.add(taint(), "a"); 
-        sink(h1); // $hasTaintFlow
+        h1.add(taint(), "a");
+        sink(h1); // $ hasTaintFlow
 
         HttpHeaders h2 = new HttpHeaders();
-        h2.add("a", taint()); 
-        sink(h2); // $hasTaintFlow
+        h2.add("a", taint());
+        sink(h2); // $ hasTaintFlow
 
         HttpHeaders h3 = new HttpHeaders();
-        h3.addAll(m1); 
-        sink(h3); // $hasTaintFlow
+        h3.addAll(m1);
+        sink(h3); // $ hasTaintFlow
 
         HttpHeaders h4 = new HttpHeaders();
-        h4.addAll(m2); 
-        sink(h4); // $hasTaintFlow
+        h4.addAll(m2);
+        sink(h4); // $ hasTaintFlow
 
         HttpHeaders h5 = new HttpHeaders();
-        h5.addAll(taint(), List.of()); 
-        sink(h5); // $hasTaintFlow
+        h5.addAll(taint(), List.of());
+        sink(h5); // $ hasTaintFlow
 
         HttpHeaders h6 = new HttpHeaders();
-        h6.addAll("a", List.of(taint())); 
-        sink(h6); // $hasTaintFlow
+        h6.addAll("a", List.of(taint()));
+        sink(h6); // $ hasTaintFlow
 
-        sink(HttpHeaders.formatHeaders(m1)); // $hasTaintFlow
-        sink(HttpHeaders.formatHeaders(m2)); // $hasTaintFlow
+        sink(HttpHeaders.formatHeaders(m1)); // $ hasTaintFlow
+        sink(HttpHeaders.formatHeaders(m2)); // $ hasTaintFlow
 
-        sink(HttpHeaders.encodeBasicAuth(taint(), "a", null)); // $hasTaintFlow
-        sink(HttpHeaders.encodeBasicAuth("a", taint(), null)); // $hasTaintFlow
+        sink(HttpHeaders.encodeBasicAuth(taint(), "a", null)); // $ hasTaintFlow
+        sink(HttpHeaders.encodeBasicAuth("a", taint(), null)); // $ hasTaintFlow
     }
 
     void test5() {
         HttpHeaders h = taint();
-        
-        sink(h.get(null).get(0)); // $hasTaintFlow
+
+        sink(h.get(null).get(0)); // $ hasTaintFlow
         sink(h.getAccept().get(0));
         sink(h.getAcceptCharset().get(0));
         sink(h.getAcceptLanguage().get(0));
         sink(h.getAcceptLanguageAsLocales().get(0));
         sink(h.getAccessControlAllowCredentials());
-        sink(h.getAccessControlAllowHeaders().get(0)); // $hasTaintFlow
+        sink(h.getAccessControlAllowHeaders().get(0)); // $ hasTaintFlow
         sink(h.getAccessControlAllowMethods().get(0));
-        sink(h.getAccessControlAllowOrigin()); // $hasTaintFlow
-        sink(h.getAccessControlExposeHeaders().get(0)); // $hasTaintFlow
+        sink(h.getAccessControlAllowOrigin()); // $ hasTaintFlow
+        sink(h.getAccessControlExposeHeaders().get(0)); // $ hasTaintFlow
         sink(h.getAccessControlMaxAge());
-        sink(h.getAccessControlRequestHeaders().get(0)); // $hasTaintFlow
-        sink(h.getAccessControlRequestMethod()); 
+        sink(h.getAccessControlRequestHeaders().get(0)); // $ hasTaintFlow
+        sink(h.getAccessControlRequestMethod());
         sink(h.getAllow().toArray()[0]);
-        sink(h.getCacheControl()); // $hasTaintFlow
-        sink(h.getConnection().get(0)); // $hasTaintFlow
+        sink(h.getCacheControl()); // $ hasTaintFlow
+        sink(h.getConnection().get(0)); // $ hasTaintFlow
         sink(h.getContentDisposition());
         sink(h.getContentLanguage());
         sink(h.getContentLength());
         sink(h.getContentType());
         sink(h.getDate());
-        sink(h.getETag()); // $hasTaintFlow
+        sink(h.getETag()); // $ hasTaintFlow
         sink(h.getExpires());
-        sink(h.getFirst("a")); // $hasTaintFlow
-        sink(h.getFirstDate("a")); 
-        sink(h.getFirstZonedDateTime("a")); 
-        sink(h.getHost()); // $hasTaintFlow
-        sink(h.getIfMatch().get(0)); // $hasTaintFlow
-        sink(h.getIfModifiedSince()); 
-        sink(h.getIfNoneMatch().get(0)); // $hasTaintFlow
-        sink(h.getIfUnmodifiedSince()); 
-        sink(h.getLastModified()); 
-        sink(h.getLocation()); // $hasTaintFlow
-        sink(h.getOrEmpty("a").get(0)); // $hasTaintFlow
-        sink(h.getOrigin()); // $hasTaintFlow
-        sink(h.getPragma()); // $hasTaintFlow
-        sink(h.getUpgrade()); // $hasTaintFlow
-        sink(h.getValuesAsList("a").get(0)); // $hasTaintFlow
-        sink(h.getVary().get(0)); // $hasTaintFlow
+        sink(h.getFirst("a")); // $ hasTaintFlow
+        sink(h.getFirstDate("a"));
+        sink(h.getFirstZonedDateTime("a"));
+        sink(h.getHost()); // $ hasTaintFlow
+        sink(h.getIfMatch().get(0)); // $ hasTaintFlow
+        sink(h.getIfModifiedSince());
+        sink(h.getIfNoneMatch().get(0)); // $ hasTaintFlow
+        sink(h.getIfUnmodifiedSince());
+        sink(h.getLastModified());
+        sink(h.getLocation()); // $ hasTaintFlow
+        sink(h.getOrEmpty("a").get(0)); // $ hasTaintFlow
+        sink(h.getOrigin()); // $ hasTaintFlow
+        sink(h.getPragma()); // $ hasTaintFlow
+        sink(h.getUpgrade()); // $ hasTaintFlow
+        sink(h.getValuesAsList("a").get(0)); // $ hasTaintFlow
+        sink(h.getVary().get(0)); // $ hasTaintFlow
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/library-tests/frameworks/spring/ui/Test.java b/java/ql/test/library-tests/frameworks/spring/ui/Test.java
index 9512cf391aa..e0112529be0 100644
--- a/java/ql/test/library-tests/frameworks/spring/ui/Test.java
+++ b/java/ql/test/library-tests/frameworks/spring/ui/Test.java
@@ -28,35 +28,35 @@ public class Test {
 			ConcurrentModel out = null;
 			Object in = source();
 			out = new ConcurrentModel(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ConcurrentModel;false;ConcurrentModel;(String,Object);;Argument[0];MapKey of Argument[this];value;manual"
 			ConcurrentModel out = null;
 			String in = (String)source();
 			out = new ConcurrentModel(in, null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ConcurrentModel;false;ConcurrentModel;(String,Object);;Argument[1];MapValue of Argument[this];value;manual"
 			ConcurrentModel out = null;
 			Object in = source();
 			out = new ConcurrentModel(null, in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAllAttributes;(Collection);;Element of Argument[0];MapValue of Argument[this];value;manual"
 			Model out = null;
 			Collection in = List.of(source());
 			out.addAllAttributes(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAllAttributes;(Collection);;Element of Argument[0];MapValue of Argument[this];value;manual"
 			ConcurrentModel out = null;
 			Collection in = List.of(source());
 			out.addAllAttributes(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAllAttributes;(Collection);;Element of Argument[0];MapValue of ReturnValue;value;manual"
@@ -64,7 +64,7 @@ public class Test {
 			Collection in = List.of(source());
 			Model instance = null;
 			out = instance.addAllAttributes(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAllAttributes;(Collection);;Element of Argument[0];MapValue of ReturnValue;value;manual"
@@ -72,21 +72,21 @@ public class Test {
 			Collection in = List.of(source());
 			ConcurrentModel instance = null;
 			out = instance.addAllAttributes(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAllAttributes;(Map);;MapKey of Argument[0];MapKey of Argument[this];value;manual"
 			Model out = null;
 			Map in = Map.of(source(), null);
 			out.addAllAttributes(in);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAllAttributes;(Map);;MapKey of Argument[0];MapKey of Argument[this];value;manual"
 			ConcurrentModel out = null;
 			Map in = Map.of(source(), null);
 			out.addAllAttributes(in);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAllAttributes;(Map);;MapKey of Argument[0];MapKey of ReturnValue;value;manual"
@@ -94,7 +94,7 @@ public class Test {
 			Map in = Map.of(source(), null);
 			Model instance = null;
 			out = instance.addAllAttributes(in);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAllAttributes;(Map);;MapKey of Argument[0];MapKey of ReturnValue;value;manual"
@@ -102,21 +102,21 @@ public class Test {
 			Map in = Map.of(source(), null);
 			ConcurrentModel instance = null;
 			out = instance.addAllAttributes(in);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAllAttributes;(Map);;MapValue of Argument[0];MapValue of Argument[this];value;manual"
 			Model out = null;
 			Map in = Map.of(null, source());
 			out.addAllAttributes(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAllAttributes;(Map);;MapValue of Argument[0];MapValue of Argument[this];value;manual"
 			ConcurrentModel out = null;
 			Map in = Map.of(null, source());
 			out.addAllAttributes(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAllAttributes;(Map);;MapValue of Argument[0];MapValue of ReturnValue;value;manual"
@@ -124,7 +124,7 @@ public class Test {
 			Map in = Map.of(null, source());
 			Model instance = null;
 			out = instance.addAllAttributes(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAllAttributes;(Map);;MapValue of Argument[0];MapValue of ReturnValue;value;manual"
@@ -132,49 +132,49 @@ public class Test {
 			Map in = Map.of(null, source());
 			ConcurrentModel instance = null;
 			out = instance.addAllAttributes(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAllAttributes;;;Argument[this];ReturnValue;value;manual"
 			Model out = null;
 			Model in = (Model)source();
 			out = in.addAllAttributes((Map)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAllAttributes;;;Argument[this];ReturnValue;value;manual"
 			Model out = null;
 			Model in = (Model)source();
 			out = in.addAllAttributes((Collection)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAllAttributes;;;Argument[this];ReturnValue;value;manual"
 			ConcurrentModel out = null;
 			ConcurrentModel in = (ConcurrentModel)source();
 			out = in.addAllAttributes((Map)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAllAttributes;;;Argument[this];ReturnValue;value;manual"
 			ConcurrentModel out = null;
 			ConcurrentModel in = (ConcurrentModel)source();
 			out = in.addAllAttributes((Collection)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAttribute;(Object);;Argument[0];MapValue of Argument[this];value;manual"
 			Model out = null;
 			Object in = source();
 			out.addAttribute(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAttribute;(Object);;Argument[0];MapValue of Argument[this];value;manual"
 			ConcurrentModel out = null;
 			Object in = source();
 			out.addAttribute(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAttribute;(Object);;Argument[0];MapValue of ReturnValue;value;manual"
@@ -182,7 +182,7 @@ public class Test {
 			Object in = source();
 			Model instance = null;
 			out = instance.addAttribute(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAttribute;(Object);;Argument[0];MapValue of ReturnValue;value;manual"
@@ -190,21 +190,21 @@ public class Test {
 			Object in = source();
 			ConcurrentModel instance = null;
 			out = instance.addAttribute(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAttribute;(String,Object);;Argument[0];MapKey of Argument[this];value;manual"
 			Model out = null;
 			String in = (String)source();
 			out.addAttribute(in, null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAttribute;(String,Object);;Argument[0];MapKey of Argument[this];value;manual"
 			ConcurrentModel out = null;
 			String in = (String)source();
 			out.addAttribute(in, null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAttribute;(String,Object);;Argument[0];MapKey of ReturnValue;value;manual"
@@ -212,7 +212,7 @@ public class Test {
 			String in = (String)source();
 			Model instance = null;
 			out = instance.addAttribute(in, null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAttribute;(String,Object);;Argument[0];MapKey of ReturnValue;value;manual"
@@ -220,21 +220,21 @@ public class Test {
 			String in = (String)source();
 			ConcurrentModel instance = null;
 			out = instance.addAttribute(in, null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAttribute;(String,Object);;Argument[1];MapValue of Argument[this];value;manual"
 			Model out = null;
 			Object in = source();
 			out.addAttribute(null, in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAttribute;(String,Object);;Argument[1];MapValue of Argument[this];value;manual"
 			ConcurrentModel out = null;
 			Object in = source();
 			out.addAttribute(null, in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAttribute;(String,Object);;Argument[1];MapValue of ReturnValue;value;manual"
@@ -242,7 +242,7 @@ public class Test {
 			Object in = source();
 			Model instance = null;
 			out = instance.addAttribute(null, in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAttribute;(String,Object);;Argument[1];MapValue of ReturnValue;value;manual"
@@ -250,175 +250,175 @@ public class Test {
 			Object in = source();
 			ConcurrentModel instance = null;
 			out = instance.addAttribute(null, in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAttribute;;;Argument[this];ReturnValue;value;manual"
 			Model out = null;
 			Model in = (Model)source();
 			out = in.addAttribute(null, null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAttribute;;;Argument[this];ReturnValue;value;manual"
 			Model out = null;
 			Model in = (Model)source();
 			out = in.addAttribute(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAttribute;;;Argument[this];ReturnValue;value;manual"
 			ConcurrentModel out = null;
 			ConcurrentModel in = (ConcurrentModel)source();
 			out = in.addAttribute(null, null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;addAttribute;;;Argument[this];ReturnValue;value;manual"
 			ConcurrentModel out = null;
 			ConcurrentModel in = (ConcurrentModel)source();
 			out = in.addAttribute(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;asMap;;;MapKey of Argument[this];MapKey of ReturnValue;value;manual"
 			Map out = null;
 			Model in = new ConcurrentModel((String)source(), null);
 			out = in.asMap();
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;asMap;;;MapKey of Argument[this];MapKey of ReturnValue;value;manual"
 			Map out = null;
 			ConcurrentModel in = new ConcurrentModel((String)source(), null);
 			out = in.asMap();
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;asMap;;;MapValue of Argument[this];MapValue of ReturnValue;value;manual"
 			Map out = null;
 			Model in = (Model)Map.of(null, source());
 			out = in.asMap();
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;asMap;;;MapValue of Argument[this];MapValue of ReturnValue;value;manual"
 			Map out = null;
 			ConcurrentModel in = new ConcurrentModel(null, source());
 			out = in.asMap();
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;getAttribute;;;MapValue of Argument[this];ReturnValue;value;manual"
 			Object out = null;
 			Model in = (Model)Map.of(null, source());
 			out = in.getAttribute(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;getAttribute;;;MapValue of Argument[this];ReturnValue;value;manual"
 			Object out = null;
 			ConcurrentModel in = new ConcurrentModel(null, source());
 			out = in.getAttribute(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;mergeAttributes;;;Argument[this];ReturnValue;value;manual"
 			Model out = null;
 			Model in = (Model)source();
 			out = in.mergeAttributes(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;mergeAttributes;;;Argument[this];ReturnValue;value;manual"
 			ConcurrentModel out = null;
 			ConcurrentModel in = (ConcurrentModel)source();
 			out = in.mergeAttributes(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;mergeAttributes;;;MapKey of Argument[this];MapKey of ReturnValue;value;manual"
 			Model out = null;
 			Model in = new ConcurrentModel((String)source(), null);
 			out = in.mergeAttributes(null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;mergeAttributes;;;MapKey of Argument[this];MapKey of ReturnValue;value;manual"
 			ConcurrentModel out = null;
 			ConcurrentModel in = new ConcurrentModel((String)source(), null);
 			out = in.mergeAttributes(null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;mergeAttributes;;;MapKey of Argument[0];MapKey of Argument[this];value;manual"
 			Model out = null;
 			Map in = Map.of(source(), null);
 			out.mergeAttributes(in);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;mergeAttributes;;;MapKey of Argument[0];MapKey of Argument[this];value;manual"
 			ConcurrentModel out = null;
 			Map in = Map.of(source(), null);
 			out.mergeAttributes(in);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;mergeAttributes;;;MapValue of Argument[this];MapValue of ReturnValue;value;manual"
 			Model out = null;
 			Model in = (Model)Map.of(null, source());
 			out = in.mergeAttributes(null);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;mergeAttributes;;;MapValue of Argument[this];MapValue of ReturnValue;value;manual"
 			ConcurrentModel out = null;
 			ConcurrentModel in = new ConcurrentModel(null, source());
 			out = in.mergeAttributes(null);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;mergeAttributes;;;MapValue of Argument[0];MapValue of Argument[this];value;manual"
 			Model out = null;
 			Map in = Map.of(null, source());
 			out.mergeAttributes(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;Model;true;mergeAttributes;;;MapValue of Argument[0];MapValue of Argument[this];value;manual"
 			ConcurrentModel out = null;
 			Map in = Map.of(null, source());
 			out.mergeAttributes(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;ModelMap;(Object);;Argument[0];MapValue of Argument[this];value;manual"
 			ModelMap out = null;
 			Object in = source();
 			out = new ModelMap(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;ModelMap;(String,Object);;Argument[0];MapKey of Argument[this];value;manual"
 			ModelMap out = null;
 			String in = (String)source();
 			out = new ModelMap(in, null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;ModelMap;(String,Object);;Argument[1];MapValue of Argument[this];value;manual"
 			ModelMap out = null;
 			Object in = source();
 			out = new ModelMap(null, in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;addAllAttributes;(Collection);;Element of Argument[0];MapValue of Argument[this];value;manual"
 			ModelMap out = null;
 			Collection in = List.of(source());
 			out.addAllAttributes(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;addAllAttributes;(Collection);;Element of Argument[0];MapValue of ReturnValue;value;manual"
@@ -426,14 +426,14 @@ public class Test {
 			Collection in = List.of(source());
 			ModelMap instance = null;
 			out = instance.addAllAttributes(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;addAllAttributes;(Map);;MapKey of Argument[0];MapKey of Argument[this];value;manual"
 			ModelMap out = null;
 			Map in = Map.of(source(), null);
 			out.addAllAttributes(in);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;addAllAttributes;(Map);;MapKey of Argument[0];MapKey of ReturnValue;value;manual"
@@ -441,14 +441,14 @@ public class Test {
 			Map in = Map.of(source(), null);
 			ModelMap instance = null;
 			out = instance.addAllAttributes(in);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;addAllAttributes;(Map);;MapValue of Argument[0];MapValue of Argument[this];value;manual"
 			ModelMap out = null;
 			Map in = Map.of(null, source());
 			out.addAllAttributes(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;addAllAttributes;(Map);;MapValue of Argument[0];MapValue of ReturnValue;value;manual"
@@ -456,28 +456,28 @@ public class Test {
 			Map in = Map.of(null, source());
 			ModelMap instance = null;
 			out = instance.addAllAttributes(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;addAllAttributes;;;Argument[this];ReturnValue;value;manual"
 			ModelMap out = null;
 			ModelMap in = (ModelMap)source();
 			out = in.addAllAttributes((Map)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;addAllAttributes;;;Argument[this];ReturnValue;value;manual"
 			ModelMap out = null;
 			ModelMap in = (ModelMap)source();
 			out = in.addAllAttributes((Collection)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;addAttribute;(Object);;Argument[0];MapValue of Argument[this];value;manual"
 			ModelMap out = null;
 			Object in = source();
 			out.addAttribute(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;addAttribute;(Object);;Argument[0];MapValue of ReturnValue;value;manual"
@@ -485,14 +485,14 @@ public class Test {
 			Object in = source();
 			ModelMap instance = null;
 			out = instance.addAttribute(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;addAttribute;(String,Object);;Argument[0];MapKey of Argument[this];value;manual"
 			ModelMap out = null;
 			String in = (String)source();
 			out.addAttribute(in, null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;addAttribute;(String,Object);;Argument[0];MapKey of ReturnValue;value;manual"
@@ -500,14 +500,14 @@ public class Test {
 			String in = (String)source();
 			ModelMap instance = null;
 			out = instance.addAttribute(in, null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;addAttribute;(String,Object);;Argument[1];MapValue of Argument[this];value;manual"
 			ModelMap out = null;
 			Object in = source();
 			out.addAttribute(null, in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;addAttribute;(String,Object);;Argument[1];MapValue of ReturnValue;value;manual"
@@ -515,63 +515,63 @@ public class Test {
 			Object in = source();
 			ModelMap instance = null;
 			out = instance.addAttribute(null, in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;addAttribute;;;Argument[this];ReturnValue;value;manual"
 			ModelMap out = null;
 			ModelMap in = (ModelMap)source();
 			out = in.addAttribute(null, null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;addAttribute;;;Argument[this];ReturnValue;value;manual"
 			ModelMap out = null;
 			ModelMap in = (ModelMap)source();
 			out = in.addAttribute(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;getAttribute;;;MapValue of Argument[this];ReturnValue;value;manual"
 			Object out = null;
 			ModelMap in = new ModelMap(null, source());
 			out = in.getAttribute(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;mergeAttributes;;;Argument[this];ReturnValue;value;manual"
 			ModelMap out = null;
 			ModelMap in = (ModelMap)source();
 			out = in.mergeAttributes(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;mergeAttributes;;;MapKey of Argument[this];MapKey of ReturnValue;value;manual"
 			ModelMap out = null;
 			ModelMap in = new ModelMap((String)source(), null);
 			out = in.mergeAttributes(null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;mergeAttributes;;;MapKey of Argument[0];MapKey of Argument[this];value;manual"
 			ModelMap out = null;
 			Map in = Map.of(source(), null);
 			out.mergeAttributes(in);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;mergeAttributes;;;MapValue of Argument[this];MapValue of ReturnValue;value;manual"
 			ModelMap out = null;
 			ModelMap in = new ModelMap(null, source());
 			out = in.mergeAttributes(null);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.ui;ModelMap;false;mergeAttributes;;;MapValue of Argument[0];MapValue of Argument[this];value;manual"
 			ModelMap out = null;
 			Map in = Map.of(null, source());
 			out.mergeAttributes(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 
 	}
diff --git a/java/ql/test/library-tests/frameworks/spring/util/Test.java b/java/ql/test/library-tests/frameworks/spring/util/Test.java
index ac59cd33f3e..9153021e2e5 100644
--- a/java/ql/test/library-tests/frameworks/spring/util/Test.java
+++ b/java/ql/test/library-tests/frameworks/spring/util/Test.java
@@ -65,21 +65,21 @@ public class Test {
 				Map<String, String> out = new HashMap<>();
 				String in = (String)source();
 				this.doMatch("somePattern", in, true, out);
-				sink(out.get("someKey")); // $hasTaintFlow
+				sink(out.get("someKey")); // $ hasTaintFlow
 			}
 			{
 				// "org.springframework.util;AntPathMatcher;false;tokenizePath;;;Argument[0];ArrayValue of ReturnValue;taint;manual",
 				String[] out = null;
 				String in = (String)source();
 				out = this.tokenizePath(in);
-				sink(out[0]); // $hasTaintFlow
+				sink(out[0]); // $ hasTaintFlow
 			}
 			{
 				// "org.springframework.util;AntPathMatcher;false;tokenizePattern;;;Argument[0];ArrayValue of ReturnValue;taint;manual",
 				String[] out = null;
 				String in = (String)source();
 				out = this.tokenizePattern(in);
-				sink(out[0]); // $hasTaintFlow
+				sink(out[0]); // $ hasTaintFlow
 			}
 		}
 
@@ -93,7 +93,7 @@ public class Test {
 			String in = (String)source();
 			AntPathMatcher instance = null;
 			out = instance.combine(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;AntPathMatcher;false;combine;;;Argument[0..1];ReturnValue;taint;manual"
@@ -101,7 +101,7 @@ public class Test {
 			String in = (String)source();
 			AntPathMatcher instance = null;
 			out = instance.combine(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;AntPathMatcher;false;extractPathWithinPattern;;;Argument[1];ReturnValue;taint;manual"
@@ -109,7 +109,7 @@ public class Test {
 			String in = (String)source();
 			AntPathMatcher instance = null;
 			out = instance.extractPathWithinPattern(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;AntPathMatcher;false;extractUriTemplateVariables;;;Argument[1];MapValue of ReturnValue;taint;manual"
@@ -117,182 +117,182 @@ public class Test {
 			String in = (String)source();
 			AntPathMatcher instance = null;
 			out = instance.extractUriTemplateVariables(null, in);
-			sink(getMapValue(out)); // $hasTaintFlow
+			sink(getMapValue(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;AutoPopulatingList;false;AutoPopulatingList;(java.util.List,java.lang.Class);;Element of Argument[0];Element of Argument[this];value;manual"
 			AutoPopulatingList out = null;
 			List in = List.of(source());
 			out = new AutoPopulatingList(in, (Class)null);
-			sink(getElement(out)); // $hasValueFlow
+			sink(getElement(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;AutoPopulatingList;false;AutoPopulatingList;(java.util.List,org.springframework.util.AutoPopulatingList.ElementFactory);;Element of Argument[0];Element of Argument[this];value;manual"
 			AutoPopulatingList out = null;
 			List in = List.of(source());
 			out = new AutoPopulatingList(in, (AutoPopulatingList.ElementFactory)null);
-			sink(getElement(out)); // $hasValueFlow
+			sink(getElement(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;Base64Utils;false;decode;;;Argument[0];ReturnValue;taint;manual"
 			byte[] out = null;
 			byte[] in = (byte[])source();
 			out = Base64Utils.decode(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;Base64Utils;false;decodeFromString;;;Argument[0];ReturnValue;taint;manual"
 			byte[] out = null;
 			String in = (String)source();
 			out = Base64Utils.decodeFromString(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;Base64Utils;false;decodeFromUrlSafeString;;;Argument[0];ReturnValue;taint;manual"
 			byte[] out = null;
 			String in = (String)source();
 			out = Base64Utils.decodeFromUrlSafeString(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;Base64Utils;false;decodeUrlSafe;;;Argument[0];ReturnValue;taint;manual"
 			byte[] out = null;
 			byte[] in = (byte[])source();
 			out = Base64Utils.decodeUrlSafe(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;Base64Utils;false;encode;;;Argument[0];ReturnValue;taint;manual"
 			byte[] out = null;
 			byte[] in = (byte[])source();
 			out = Base64Utils.encode(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;Base64Utils;false;encodeToString;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			byte[] in = (byte[])source();
 			out = Base64Utils.encodeToString(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;Base64Utils;false;encodeToUrlSafeString;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			byte[] in = (byte[])source();
 			out = Base64Utils.encodeToUrlSafeString(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;Base64Utils;false;encodeUrlSafe;;;Argument[0];ReturnValue;taint;manual"
 			byte[] out = null;
 			byte[] in = (byte[])source();
 			out = Base64Utils.encodeUrlSafe(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;CollectionUtils;false;arrayToList;;;ArrayElement of Argument[0];Element of ReturnValue;value;manual"
 			List out = null;
 			Object[] in = newWithArrayElement(source());
 			out = CollectionUtils.arrayToList(in);
-			sink(getElement(out)); // $hasValueFlow
+			sink(getElement(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;CollectionUtils;false;findFirstMatch;;;Element of Argument[0];ReturnValue;value;manual"
 			Object out = null;
 			Collection in = List.of(source());
 			out = CollectionUtils.findFirstMatch(in, null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;CollectionUtils;false;findValueOfType;;;Element of Argument[0];ReturnValue;value;manual"
 			Object out = null;
 			Collection in = List.of(source());
 			out = CollectionUtils.findValueOfType(in, (Class<?>[])null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;CollectionUtils;false;findValueOfType;;;Element of Argument[0];ReturnValue;value;manual"
 			Object out = null;
 			Collection in = List.of(source());
 			out = CollectionUtils.findValueOfType(in, (Class)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;CollectionUtils;false;firstElement;;;Element of Argument[0];ReturnValue;value;manual"
 			Object out = null;
 			Set in = Set.of(source());
 			out = CollectionUtils.firstElement(in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;CollectionUtils;false;firstElement;;;Element of Argument[0];ReturnValue;value;manual"
 			Object out = null;
 			List in = List.of(source());
 			out = CollectionUtils.firstElement(in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;CollectionUtils;false;lastElement;;;Element of Argument[0];ReturnValue;value;manual"
 			Object out = null;
 			Set in = Set.of(source());
 			out = CollectionUtils.lastElement(in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;CollectionUtils;false;lastElement;;;Element of Argument[0];ReturnValue;value;manual"
 			Object out = null;
 			List in = List.of(source());
 			out = CollectionUtils.lastElement(in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;CollectionUtils;false;mergeArrayIntoCollection;;;ArrayElement of Argument[0];Element of Argument[1];value;manual"
 			Collection out = null;
 			Object[] in = newWithArrayElement(source());
 			CollectionUtils.mergeArrayIntoCollection(in, out);
-			sink(getElement(out)); // $hasValueFlow
+			sink(getElement(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;CollectionUtils;false;mergePropertiesIntoMap;;;MapKey of Argument[0];MapKey of Argument[1];value;manual"
 			Map out = null;
 			Properties in = newPropertiesWithMapKey(source());
 			CollectionUtils.mergePropertiesIntoMap(in, out);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;CollectionUtils;false;mergePropertiesIntoMap;;;MapValue of Argument[0];MapValue of Argument[1];value;manual"
 			Map out = null;
 			Properties in = newPropertiesWithMapValue(source());
 			CollectionUtils.mergePropertiesIntoMap(in, out);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;CollectionUtils;false;toIterator;;;Element of Argument[0];Element of ReturnValue;value;manual"
 			Iterator out = null;
 			Enumeration in = Collections.enumeration(List.of(source()));
 			out = CollectionUtils.toIterator(in);
-			sink(getElement(out)); // $hasValueFlow
+			sink(getElement(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;CollectionUtils;false;toMultiValueMap;;;Element of MapValue of Argument[0];Element of MapValue of ReturnValue;value;manual"
 			MultiValueMap<Object, Object> out = null;
 			Map in = Map.of(null, List.of(source()));
 			out = CollectionUtils.toMultiValueMap(in);
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;CollectionUtils;false;toMultiValueMap;;;MapKey of Argument[0];MapKey of ReturnValue;value;manual"
 			MultiValueMap<Object, Object> out = null;
 			Map in = Map.of(source(), null);
 			out = CollectionUtils.toMultiValueMap(in);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;CollectionUtils;false;unmodifiableMultiValueMap;;;MapKey of Argument[0];MapKey of ReturnValue;value;manual"
 			MultiValueMap<Object, Object> out = null;
 			MultiValueMap in = new LinkedMultiValueMap(Map.of(source(), null));
 			out = CollectionUtils.unmodifiableMultiValueMap(in);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;CollectionUtils;false;unmodifiableMultiValueMap;;;MapValue of Argument[0];MapValue of ReturnValue;value;manual"
@@ -300,14 +300,14 @@ public class Test {
 			MultiValueMap in = new LinkedMultiValueMap();
 			in.put(null, source());
 			out = CollectionUtils.unmodifiableMultiValueMap(in);
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;CompositeIterator;false;add;;;Element of Argument[0];Element of Argument[this];value;manual"
 			CompositeIterator out = null;
 			Iterator in = List.of(source()).iterator();
 			out.add(in);
-			sink(getElement(out)); // $hasValueFlow
+			sink(getElement(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;CompositeIterator;false;next;;;Element of Argument[this];ReturnValue;value;manual"
@@ -315,112 +315,112 @@ public class Test {
 			CompositeIterator in = new CompositeIterator();
 			in.add(List.of(source()).iterator());
 			out = in.next();
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;FastByteArrayOutputStream;false;getInputStream;;;Argument[this];ReturnValue;taint;manual"
 			InputStream out = null;
 			FastByteArrayOutputStream in = (FastByteArrayOutputStream)source();
 			out = in.getInputStream();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;FastByteArrayOutputStream;false;toByteArray;;;Argument[this];ReturnValue;taint;manual"
 			byte[] out = null;
 			FastByteArrayOutputStream in = (FastByteArrayOutputStream)source();
 			out = in.toByteArray();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;FastByteArrayOutputStream;false;write;;;Argument[0];Argument[this];taint;manual"
 			FastByteArrayOutputStream out = null;
 			int in = (int)source();
 			out.write(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;FastByteArrayOutputStream;false;write;;;Argument[0];Argument[this];taint;manual"
 			FastByteArrayOutputStream out = null;
 			byte[] in = (byte[])source();
 			out.write(in, 0, 0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;FastByteArrayOutputStream;false;writeTo;;;Argument[this];Argument[0];taint;manual"
 			OutputStream out = null;
 			FastByteArrayOutputStream in = (FastByteArrayOutputStream)source();
 			in.writeTo(out);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;FileCopyUtils;false;copy;;;Argument[0];Argument[1];taint;manual"
 			Writer out = null;
 			String in = (String)source();
 			FileCopyUtils.copy(in, out);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;FileCopyUtils;false;copy;;;Argument[0];Argument[1];taint;manual"
 			Writer out = null;
 			Reader in = (Reader)source();
 			FileCopyUtils.copy(in, out);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;FileCopyUtils;false;copy;;;Argument[0];Argument[1];taint;manual"
 			OutputStream out = null;
 			byte[] in = (byte[])source();
 			FileCopyUtils.copy(in, out);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;FileCopyUtils;false;copy;;;Argument[0];Argument[1];taint;manual"
 			OutputStream out = null;
 			InputStream in = (InputStream)source();
 			FileCopyUtils.copy(in, out);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;FileCopyUtils;false;copyToByteArray;;;Argument[0];ReturnValue;taint;manual"
 			byte[] out = null;
 			InputStream in = (InputStream)source();
 			out = FileCopyUtils.copyToByteArray(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;FileCopyUtils;false;copyToByteArray;;;Argument[0];ReturnValue;taint;manual"
 			byte[] out = null;
 			File in = (File)source();
 			out = FileCopyUtils.copyToByteArray(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;FileCopyUtils;false;copyToString;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			Reader in = (Reader)source();
 			out = FileCopyUtils.copyToString(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;FileSystemUtils;false;copyRecursively;(java.io.File,java.io.File);;Argument[0];Argument[1];taint;manual"
 			File out = null;
 			File in = (File)source();
 			FileSystemUtils.copyRecursively(in, out);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;LinkedMultiValueMap;false;LinkedMultiValueMap;(java.util.Map);;Element of MapValue of Argument[0];Element of MapValue of Argument[this];value;manual"
 			LinkedMultiValueMap<Object, Object> out = null;
 			Map in = Map.of(null, List.of(source()));
 			out = new LinkedMultiValueMap(in);
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;LinkedMultiValueMap;false;LinkedMultiValueMap;(java.util.Map);;MapKey of Argument[0];MapKey of Argument[this];value;manual"
 			LinkedMultiValueMap<Object, Object> out = null;
 			Map in = Map.of(source(), null);
 			out = new LinkedMultiValueMap(in);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;LinkedMultiValueMap;false;deepCopy;;;MapKey of Argument[this];MapValue of ReturnValue;value;manual"
@@ -428,7 +428,7 @@ public class Test {
 			LinkedMultiValueMap in = new LinkedMultiValueMap<Object, Object>();
 			in.set(source(), null);
 			out = in.deepCopy();
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;LinkedMultiValueMap;false;deepCopy;;;MapValue of Argument[this];MapValue of ReturnValue;value;manual"
@@ -436,98 +436,98 @@ public class Test {
 			LinkedMultiValueMap in = new LinkedMultiValueMap<Object, Object>();
 			in.set(null, source());
 			out = in.deepCopy();
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;add;;;Argument[0];MapKey of Argument[this];value;manual"
 			MultiValueMapAdapter<Object, Object> out = null;
 			Object in = source();
 			out.add(in, null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;add;;;Argument[0];MapKey of Argument[this];value;manual"
 			MultiValueMap<Object, Object> out = null;
 			Object in = source();
 			out.add(in, null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;add;;;Argument[0];MapKey of Argument[this];value;manual"
 			MultiValueMap<Object, Object> out = null;
 			Object in = source();
 			out.add(in, (Object)null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;add;;;Argument[1];Element of MapValue of Argument[this];value;manual"
 			MultiValueMapAdapter<Object, Object> out = null;
 			Object in = source();
 			out.add(null, in);
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;add;;;Argument[1];Element of MapValue of Argument[this];value;manual"
 			MultiValueMap<Object, Object> out = null;
 			Object in = source();
 			out.add(null, in);
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;add;;;Argument[1];Element of MapValue of Argument[this];value;manual"
 			MultiValueMap<Object, Object> out = null;
 			Object in = source();
 			out.add((Object)null, in);
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addAll;(java.lang.Object,java.util.List);;Element of Argument[1];Element of MapValue of Argument[this];value;manual"
 			MultiValueMapAdapter<Object, Object> out = null;
 			List in = List.of(source());
 			out.addAll(null, in);
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addAll;(java.lang.Object,java.util.List);;Element of Argument[1];Element of MapValue of Argument[this];value;manual"
 			MultiValueMap<Object, Object> out = null;
 			List in = List.of(source());
 			out.addAll(null, in);
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addAll;(java.lang.Object,java.util.List);;Element of Argument[1];Element of MapValue of Argument[this];value;manual"
 			MultiValueMap<Object, Object> out = null;
 			List in = List.of(source());
 			out.addAll((Object)null, in);
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addAll;(org.springframework.util.MultiValueMap);;Element of MapValue of Argument[0];Element of MapValue of Argument[this];value;manual"
 			MultiValueMapAdapter<Object, Object> out = null;
 			MultiValueMap in = (MultiValueMap)Map.of(null, List.of(source()));
 			out.addAll(in);
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addAll;(org.springframework.util.MultiValueMap);;Element of MapValue of Argument[0];Element of MapValue of Argument[this];value;manual"
 			MultiValueMap<Object, Object> out = null;
 			MultiValueMap in = (MultiValueMap)Map.of(null, List.of(source()));
 			out.addAll(in);
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addAll;;;Argument[0];MapKey of Argument[this];value;manual"
 			MultiValueMapAdapter<Object, Object> out = null;
 			Object in = source();
 			out.addAll(in, null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addAll;;;Argument[0];MapKey of Argument[this];value;manual"
 			MultiValueMap<Object, Object> out = null;
 			Object in = source();
 			out.addAll(in, (List)null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addAll;;;Argument[0];MapKey of Argument[this];value;manual"
@@ -535,7 +535,7 @@ public class Test {
 			MultiValueMap<Object, Object> mvm = null;
 			mvm.set(source(), "someValue");
 			out.addAll(mvm);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addAll;;;Argument[0];MapKey of Argument[this];value;manual"
@@ -543,175 +543,175 @@ public class Test {
 			MultiValueMap<Object, Object> mvm = null;
 			mvm.set(source(), "someValue");
 			out.addAll(mvm);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addIfAbsent;;;Argument[0];MapKey of Argument[this];value;manual"
 			MultiValueMap<Object, Object> out = null;
 			Object in = source();
 			out.addIfAbsent(in, null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addIfAbsent;;;Argument[0];MapKey of Argument[this];value;manual"
 			MultiValueMap<Object, Object> out = null;
 			Object in = source();
 			out.addIfAbsent(in, (Object)null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addIfAbsent;;;Argument[1];Element of MapValue of Argument[this];value;manual"
 			MultiValueMap<Object, Object> out = null;
 			Object in = source();
 			out.addIfAbsent(null, in);
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;addIfAbsent;;;Argument[1];Element of MapValue of Argument[this];value;manual"
 			MultiValueMap<Object, Object> out = null;
 			Object in = source();
 			out.addIfAbsent((Object)null, in);
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;getFirst;;;Element of MapValue of Argument[this];ReturnValue;value;manual"
 			Object out = null;
 			MultiValueMapAdapter in = new MultiValueMapAdapter(Map.of(null, List.of(source())));
 			out = in.getFirst(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;getFirst;;;Element of MapValue of Argument[this];ReturnValue;value;manual"
 			Object out = null;
 			MultiValueMap in = (MultiValueMap)Map.of(null, List.of(source()));
 			out = in.getFirst(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;getFirst;;;Element of MapValue of Argument[this];ReturnValue;value;manual"
 			Object out = null;
 			MultiValueMap in = (MultiValueMap)Map.of(null, List.of(source()));
 			out = in.getFirst((Object)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;set;;;Argument[0];MapKey of Argument[this];value;manual"
 			MultiValueMapAdapter<Object, Object> out = null;
 			Object in = source();
 			out.set(in, null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;set;;;Argument[0];MapKey of Argument[this];value;manual"
 			MultiValueMap<Object, Object> out = null;
 			Object in = source();
 			out.set(in, null);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;set;;;Argument[1];Element of MapValue of Argument[this];value;manual"
 			MultiValueMapAdapter<Object, Object> out = null;
 			Object in = source();
 			out.set(null, in);
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;set;;;Argument[1];Element of MapValue of Argument[this];value;manual"
 			MultiValueMap<Object, Object> out = null;
 			Object in = source();
 			out.set(null, in);
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;set;;;Argument[1];Element of MapValue of Argument[this];value;manual"
 			MultiValueMap<Object, Object> out = null;
 			Object in = source();
 			out.set((Object)null, in);
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;setAll;;;MapKey of Argument[0];MapKey of Argument[this];value;manual"
 			MultiValueMapAdapter<Object, Object> out = null;
 			Map in = Map.of(source(), null);
 			out.setAll(in);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;setAll;;;MapKey of Argument[0];MapKey of Argument[this];value;manual"
 			MultiValueMap<Object, Object> out = null;
 			Map in = Map.of(source(), null);
 			out.setAll(in);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;setAll;;;MapValue of Argument[0];Element of MapValue of Argument[this];value;manual"
 			MultiValueMapAdapter<Object, Object> out = null;
 			Map in = Map.of(null, source());
 			out.setAll(in);
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;setAll;;;MapValue of Argument[0];Element of MapValue of Argument[this];value;manual"
 			MultiValueMap<Object, Object> out = null;
 			Map in = Map.of(null, source());
 			out.setAll(in);
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;toSingleValueMap;;;Element of MapValue of Argument[this];MapValue of ReturnValue;value;manual"
 			Map out = null;
 			MultiValueMapAdapter in = new MultiValueMapAdapter(Map.of(null, List.of(source())));
 			out = in.toSingleValueMap();
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;toSingleValueMap;;;Element of MapValue of Argument[this];MapValue of ReturnValue;value;manual"
 			Map out = null;
 			MultiValueMap in = (MultiValueMap)Map.of(null, List.of(source()));
 			out = in.toSingleValueMap();
-			sink(getMapValue(out)); // $hasValueFlow
+			sink(getMapValue(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;toSingleValueMap;;;MapKey of Argument[this];MapKey of ReturnValue;value;manual"
 			Map out = null;
 			MultiValueMapAdapter in = new MultiValueMapAdapter(Map.of(source(), null));
 			out = in.toSingleValueMap();
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMap;true;toSingleValueMap;;;MapKey of Argument[this];MapKey of ReturnValue;value;manual"
 			Map out = null;
 			MultiValueMap in = new MultiValueMapAdapter(Map.of(source(), null));
 			out = in.toSingleValueMap();
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMapAdapter;false;MultiValueMapAdapter;;;Element of MapValue of Argument[0];Element of MapValue of Argument[this];value;manual"
 			MultiValueMapAdapter<Object, Object> out = null;
 			Map in = Map.of(null, List.of(source()));
 			out = new MultiValueMapAdapter(in);
-			sink(getElement(getMapValue(out))); // $hasValueFlow
+			sink(getElement(getMapValue(out))); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;MultiValueMapAdapter;false;MultiValueMapAdapter;;;MapKey of Argument[0];MapKey of Argument[this];value;manual"
 			MultiValueMapAdapter<Object, Object> out = null;
 			Map in = Map.of(source(), null);
 			out = new MultiValueMapAdapter(in);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;ObjectUtils;false;toObjectArray;;;ArrayElement of Argument[0];ArrayElement of ReturnValue;value;manual"
 			Object[] out = null;
 			Object[] in = newWithArrayElement(source());
 			out = ObjectUtils.toObjectArray(in);
-			sink(getArrayElement(out)); // $hasValueFlow
+			sink(getArrayElement(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;ObjectUtils;false;unwrapOptional;;;Element of Argument[0];ReturnValue;value;manual"
 			Object out = null;
 			Object in = Optional.of(source());
 			out = ObjectUtils.unwrapOptional(in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;PropertiesPersister;true;load;;;Argument[1];Argument[0];taint;manual"
@@ -719,7 +719,7 @@ public class Test {
 			Reader in = (Reader)source();
 			PropertiesPersister instance = null;
 			instance.load(out, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;PropertiesPersister;true;load;;;Argument[1];Argument[0];taint;manual"
@@ -727,7 +727,7 @@ public class Test {
 			InputStream in = (InputStream)source();
 			PropertiesPersister instance = null;
 			instance.load(out, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;PropertiesPersister;true;loadFromXml;;;Argument[1];Argument[0];taint;manual"
@@ -735,7 +735,7 @@ public class Test {
 			InputStream in = (InputStream)source();
 			PropertiesPersister instance = null;
 			instance.loadFromXml(out, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;PropertiesPersister;true;store;;;Argument[0];Argument[1];taint;manual"
@@ -743,7 +743,7 @@ public class Test {
 			Properties in = (Properties)source();
 			PropertiesPersister instance = null;
 			instance.store(in, out, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;PropertiesPersister;true;store;;;Argument[0];Argument[1];taint;manual"
@@ -751,7 +751,7 @@ public class Test {
 			Properties in = (Properties)source();
 			PropertiesPersister instance = null;
 			instance.store(in, out, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;PropertiesPersister;true;store;;;Argument[2];Argument[1];taint;manual"
@@ -759,7 +759,7 @@ public class Test {
 			String in = (String)source();
 			PropertiesPersister instance = null;
 			instance.store((Properties)null, out, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;PropertiesPersister;true;store;;;Argument[2];Argument[1];taint;manual"
@@ -767,7 +767,7 @@ public class Test {
 			String in = (String)source();
 			PropertiesPersister instance = null;
 			instance.store((Properties)null, out, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;PropertiesPersister;true;storeToXml;;;Argument[0];Argument[1];taint;manual"
@@ -775,7 +775,7 @@ public class Test {
 			Properties in = (Properties)source();
 			PropertiesPersister instance = null;
 			instance.storeToXml(in, out, null, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;PropertiesPersister;true;storeToXml;;;Argument[0];Argument[1];taint;manual"
@@ -783,7 +783,7 @@ public class Test {
 			Properties in = (Properties)source();
 			PropertiesPersister instance = null;
 			instance.storeToXml(in, out, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;PropertiesPersister;true;storeToXml;;;Argument[2];Argument[1];taint;manual"
@@ -791,7 +791,7 @@ public class Test {
 			String in = (String)source();
 			PropertiesPersister instance = null;
 			instance.storeToXml(null, out, in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;PropertiesPersister;true;storeToXml;;;Argument[2];Argument[1];taint;manual"
@@ -799,35 +799,35 @@ public class Test {
 			String in = (String)source();
 			PropertiesPersister instance = null;
 			instance.storeToXml(null, out, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;PropertyPlaceholderHelper;false;PropertyPlaceholderHelper;;;Argument[0..1];Argument[this];taint;manual"
 			PropertyPlaceholderHelper out = null;
 			String in = (String)source();
 			out = new PropertyPlaceholderHelper(null, in, null, false);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;PropertyPlaceholderHelper;false;PropertyPlaceholderHelper;;;Argument[0..1];Argument[this];taint;manual"
 			PropertyPlaceholderHelper out = null;
 			String in = (String)source();
 			out = new PropertyPlaceholderHelper(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;PropertyPlaceholderHelper;false;PropertyPlaceholderHelper;;;Argument[0..1];Argument[this];taint;manual"
 			PropertyPlaceholderHelper out = null;
 			String in = (String)source();
 			out = new PropertyPlaceholderHelper(in, null, null, false);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;PropertyPlaceholderHelper;false;PropertyPlaceholderHelper;;;Argument[0..1];Argument[this];taint;manual"
 			PropertyPlaceholderHelper out = null;
 			String in = (String)source();
 			out = new PropertyPlaceholderHelper(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;PropertyPlaceholderHelper;false;replacePlaceholders;;;Argument[0];ReturnValue;taint;manual"
@@ -835,7 +835,7 @@ public class Test {
 			String in = (String)source();
 			PropertyPlaceholderHelper instance = null;
 			out = instance.replacePlaceholders(in, (PropertyPlaceholderHelper.PlaceholderResolver)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;PropertyPlaceholderHelper;false;replacePlaceholders;;;Argument[0];ReturnValue;taint;manual"
@@ -843,77 +843,77 @@ public class Test {
 			String in = (String)source();
 			PropertyPlaceholderHelper instance = null;
 			out = instance.replacePlaceholders(in, (Properties)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;ResourceUtils;false;extractArchiveURL;;;Argument[0];ReturnValue;taint;manual"
 			URL out = null;
 			URL in = (URL)source();
 			out = ResourceUtils.extractArchiveURL(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;ResourceUtils;false;extractJarFileURL;;;Argument[0];ReturnValue;taint;manual"
 			URL out = null;
 			URL in = (URL)source();
 			out = ResourceUtils.extractJarFileURL(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;ResourceUtils;false;getFile;;;Argument[0];ReturnValue;taint;manual"
 			File out = null;
 			URL in = (URL)source();
 			out = ResourceUtils.getFile(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;ResourceUtils;false;getFile;;;Argument[0];ReturnValue;taint;manual"
 			File out = null;
 			URL in = (URL)source();
 			out = ResourceUtils.getFile(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;ResourceUtils;false;getFile;;;Argument[0];ReturnValue;taint;manual"
 			File out = null;
 			URI in = (URI)source();
 			out = ResourceUtils.getFile(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;ResourceUtils;false;getFile;;;Argument[0];ReturnValue;taint;manual"
 			File out = null;
 			URI in = (URI)source();
 			out = ResourceUtils.getFile(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;ResourceUtils;false;getFile;;;Argument[0];ReturnValue;taint;manual"
 			File out = null;
 			String in = (String)source();
 			out = ResourceUtils.getFile(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;ResourceUtils;false;getURL;;;Argument[0];ReturnValue;taint;manual"
 			URL out = null;
 			String in = (String)source();
 			out = ResourceUtils.getURL(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;ResourceUtils;false;toURI;;;Argument[0];ReturnValue;taint;manual"
 			URI out = null;
 			URL in = (URL)source();
 			out = ResourceUtils.toURI(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;ResourceUtils;false;toURI;;;Argument[0];ReturnValue;taint;manual"
 			URI out = null;
 			String in = (String)source();
 			out = ResourceUtils.toURI(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;RouteMatcher;true;combine;;;Argument[0..1];ReturnValue;taint;manual"
@@ -921,7 +921,7 @@ public class Test {
 			String in = (String)source();
 			RouteMatcher instance = null;
 			out = instance.combine(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;RouteMatcher;true;combine;;;Argument[0..1];ReturnValue;taint;manual"
@@ -929,7 +929,7 @@ public class Test {
 			String in = (String)source();
 			RouteMatcher instance = null;
 			out = instance.combine(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;RouteMatcher;true;matchAndExtract;;;Argument[0];MapKey of ReturnValue;taint;manual"
@@ -937,7 +937,7 @@ public class Test {
 			String in = (String)source();
 			RouteMatcher instance = null;
 			out = instance.matchAndExtract(in, null);
-			sink(getMapKey(out)); // $hasTaintFlow
+			sink(getMapKey(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;RouteMatcher;true;matchAndExtract;;;Argument[1];MapValue of ReturnValue;taint;manual"
@@ -945,7 +945,7 @@ public class Test {
 			RouteMatcher.Route in = (RouteMatcher.Route)source();
 			RouteMatcher instance = null;
 			out = instance.matchAndExtract(null, in);
-			sink(getMapValue(out)); // $hasTaintFlow
+			sink(getMapValue(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;RouteMatcher;true;parseRoute;;;Argument[0];ReturnValue;taint;manual"
@@ -953,448 +953,448 @@ public class Test {
 			String in = (String)source();
 			RouteMatcher instance = null;
 			out = instance.parseRoute(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;SerializationUtils;false;deserialize;;;Argument[0];ReturnValue;taint;manual"
 			Object out = null;
 			byte[] in = (byte[])source();
 			out = SerializationUtils.deserialize(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;SerializationUtils;false;serialize;;;Argument[0];ReturnValue;taint;manual"
 			byte[] out = null;
 			Object in = source();
 			out = SerializationUtils.serialize(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StreamUtils;false;copy;(byte[],java.io.OutputStream);;Argument[0];Argument[1];taint;manual"
 			OutputStream out = null;
 			byte[] in = (byte[])source();
 			StreamUtils.copy(in, out);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StreamUtils;false;copy;(java.io.InputStream,java.io.OutputStream);;Argument[0];Argument[1];taint;manual"
 			OutputStream out = null;
 			InputStream in = (InputStream)source();
 			StreamUtils.copy(in, out);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StreamUtils;false;copy;(java.lang.String,java.nio.charset.Charset,java.io.OutputStream);;Argument[0];Argument[2];taint;manual"
 			OutputStream out = null;
 			String in = (String)source();
 			StreamUtils.copy(in, null, out);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StreamUtils;false;copyRange;;;Argument[0];Argument[1];taint;manual"
 			OutputStream out = null;
 			InputStream in = (InputStream)source();
 			StreamUtils.copyRange(in, out, 0L, 0L);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StreamUtils;false;copyToByteArray;;;Argument[0];ReturnValue;taint;manual"
 			byte[] out = null;
 			InputStream in = (InputStream)source();
 			out = StreamUtils.copyToByteArray(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StreamUtils;false;copyToString;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			InputStream in = (InputStream)source();
 			out = StreamUtils.copyToString(in, (Charset)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StreamUtils;false;copyToString;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			ByteArrayOutputStream in = (ByteArrayOutputStream)source();
 			out = StreamUtils.copyToString(in, (Charset)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;addStringToArray;;;Argument[1];ArrayElement of ReturnValue;value;manual"
 			String[] out = null;
 			String in = (String)source();
 			out = StringUtils.addStringToArray(null, in);
-			sink(getArrayElement(out)); // $hasValueFlow
+			sink(getArrayElement(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;addStringToArray;;;ArrayElement of Argument[0];ArrayElement of ReturnValue;value;manual"
 			String[] out = null;
 			String[] in = (String[])newWithArrayElement(source());
 			out = StringUtils.addStringToArray(in, null);
-			sink(getArrayElement(out)); // $hasValueFlow
+			sink(getArrayElement(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;applyRelativePath;;;Argument[0..1];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.applyRelativePath(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;applyRelativePath;;;Argument[0..1];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.applyRelativePath(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;arrayToCommaDelimitedString;;;ArrayElement of Argument[0];ReturnValue;taint;manual",
 			String out = null;
 			Object[] in = { source() };
 			out = StringUtils.arrayToCommaDelimitedString(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;arrayToDelimitedString;;;Argument[1];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.arrayToDelimitedString(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;arrayToDelimitedString;;;ArrayElement of Argument[0];ReturnValue;taint;manual",
 			String out = null;
 			Object[] in = { source() };
 			out = StringUtils.arrayToDelimitedString(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;capitalize;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.capitalize(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;cleanPath;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.cleanPath(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;collectionToCommaDelimitedString;;;Element of Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			Collection in = List.of(source());
 			out = StringUtils.collectionToCommaDelimitedString(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;collectionToDelimitedString;;;Argument[1..3];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.collectionToDelimitedString(null, null, null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;collectionToDelimitedString;;;Argument[1..3];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.collectionToDelimitedString(null, null, in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;collectionToDelimitedString;;;Argument[1..3];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.collectionToDelimitedString(null, in, null, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;collectionToDelimitedString;;;Argument[1..3];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.collectionToDelimitedString(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;collectionToDelimitedString;;;Element of Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			Collection in = List.of(source());
 			out = StringUtils.collectionToDelimitedString(in, null, null, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;collectionToDelimitedString;;;Element of Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			Collection in = List.of(source());
 			out = StringUtils.collectionToDelimitedString(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;commaDelimitedListToSet;;;Argument[0];Element of ReturnValue;taint;manual"
 			Set out = null;
 			String in = (String)source();
 			out = StringUtils.commaDelimitedListToSet(in);
-			sink(getElement(out)); // $hasTaintFlow
+			sink(getElement(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;commaDelimitedListToStringArray;;;Argument[0];ArrayElement of ReturnValue;taint;manual"
 			String[] out = null;
 			String in = (String)source();
 			out = StringUtils.commaDelimitedListToStringArray(in);
-			sink(getArrayElement(out)); // $hasTaintFlow
+			sink(getArrayElement(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;concatenateStringArrays;;;ArrayElement of Argument[0..1];ArrayElement of ReturnValue;taint;manual"
 			String[] out = null;
 			String[] in = { (String)source() };
 			out = StringUtils.concatenateStringArrays(null, in);
-			sink(getArrayElement(out)); // $hasTaintFlow
+			sink(getArrayElement(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;concatenateStringArrays;;;ArrayElement of Argument[0..1];ArrayElement of ReturnValue;taint;manual"
 			String[] out = null;
 			String[] in = { (String)source() };
 			out = StringUtils.concatenateStringArrays(in, null);
-			sink(getArrayElement(out)); // $hasTaintFlow
+			sink(getArrayElement(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;delete;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.delete(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;deleteAny;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.deleteAny(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;delimitedListToStringArray;;;Argument[0];ReturnValue;taint;manual"
 			String[] out = null;
 			String in = (String)source();
 			out = StringUtils.delimitedListToStringArray(in, null, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;delimitedListToStringArray;;;Argument[0];ReturnValue;taint;manual"
 			String[] out = null;
 			String in = (String)source();
 			out = StringUtils.delimitedListToStringArray(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;getFilename;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.getFilename(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;getFilenameExtension;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.getFilenameExtension(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;mergeStringArrays;;;ArrayElement of Argument[0..1];ArrayElement of ReturnValue;value;manual"
 			String[] out = null;
 			String[] in = { (String)source() };
 			out = StringUtils.mergeStringArrays(null, in);
-			sink(getArrayElement(out)); // $hasValueFlow
+			sink(getArrayElement(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;mergeStringArrays;;;ArrayElement of Argument[0..1];ArrayElement of ReturnValue;value;manual"
 			String[] out = null;
 			String[] in = { (String)source() };
 			out = StringUtils.mergeStringArrays(in, null);
-			sink(getArrayElement(out)); // $hasValueFlow
+			sink(getArrayElement(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;quote;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.quote(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;quoteIfString;;;Argument[0];ReturnValue;taint;manual"
 			Object out = null;
 			Object in = source();
 			out = StringUtils.quoteIfString(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;removeDuplicateStrings;;;ArrayElement of Argument[0];ArrayElement of ReturnValue;value;manual"
 			String[] out = null;
 			String[] in = { (String)source() };
 			out = StringUtils.removeDuplicateStrings(in);
-			sink(getArrayElement(out)); // $hasValueFlow
+			sink(getArrayElement(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;replace;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.replace(in, null, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;replace;;;Argument[2];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.replace(null, null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;sortStringArray;;;ArrayElement of Argument[0];ArrayElement of ReturnValue;value;manual"
 			String[] out = null;
 			String[] in = { (String)source() };
 			out = StringUtils.sortStringArray(in);
-			sink(getArrayElement(out)); // $hasValueFlow
+			sink(getArrayElement(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;split;;;Argument[0];ArrayElement of ReturnValue;taint;manual"
 			String[] out = null;
 			String in = (String)source();
 			out = StringUtils.split(in, null);
-			sink(getArrayElement(out)); // $hasTaintFlow
+			sink(getArrayElement(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;splitArrayElementsIntoProperties;;;ArrayElement of Argument[0];MapKey of ReturnValue;taint;manual",
 			Properties out = null;
 			String[] in = { (String)source() };
 			out = StringUtils.splitArrayElementsIntoProperties(in, null, null);
-			sink(getMapKey(out)); // $hasTaintFlow
+			sink(getMapKey(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;splitArrayElementsIntoProperties;;;ArrayElement of Argument[0];MapValue of ReturnValue;taint;manual",
 			Properties out = null;
 			String[] in = { (String)source() };
 			out = StringUtils.splitArrayElementsIntoProperties(in, null, null);
-			sink(getMapValue(out)); // $hasTaintFlow
+			sink(getMapValue(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;splitArrayElementsIntoProperties;;;Argument[0];ReturnValue;taint;manual"
 			Properties out = null;
 			String[] in = (String[])source();
 			out = StringUtils.splitArrayElementsIntoProperties(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;stripFilenameExtension;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.stripFilenameExtension(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;toStringArray;;;Element of Argument[0];ArrayElement of ReturnValue;value;manual",
 			String[] out = null;
 			Enumeration in = Collections.enumeration(List.of(source()));;
 			out = StringUtils.toStringArray(in);
-			sink(getArrayElement(out)); // $hasValueFlow
+			sink(getArrayElement(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;toStringArray;;;Element of Argument[0];ArrayElement of ReturnValue;value;manual",
 			String[] out = null;
 			Collection in = List.of(source());
 			out = StringUtils.toStringArray(in);
-			sink(getArrayElement(out)); // $hasValueFlow
+			sink(getArrayElement(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;tokenizeToStringArray;;;Argument[0];ArrayElement of ReturnValue;taint;manual"
 			String[] out = null;
 			String in = (String)source();
 			out = StringUtils.tokenizeToStringArray(in, null, false, false);
-			sink(getArrayElement(out)); // $hasTaintFlow
+			sink(getArrayElement(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;tokenizeToStringArray;;;Argument[0];ArrayElement of ReturnValue;taint;manual"
 			String[] out = null;
 			String in = (String)source();
 			out = StringUtils.tokenizeToStringArray(in, null);
-			sink(getArrayElement(out)); // $hasTaintFlow
+			sink(getArrayElement(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;trimAllWhitespace;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.trimAllWhitespace(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;trimArrayElements;;;ArrayElement of Argument[0];ArrayElement of ReturnValue;taint;manual"
 			String[] out = null;
 			String[] in = { (String)source() };
 			out = StringUtils.trimArrayElements(in);
-			sink(getArrayElement(out)); // $hasTaintFlow
+			sink(getArrayElement(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;trimLeadingCharacter;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.trimLeadingCharacter(in, 'a');
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;trimLeadingWhitespace;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.trimLeadingWhitespace(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;trimTrailingCharacter;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.trimTrailingCharacter(in, 'a');
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;trimTrailingWhitespace;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.trimTrailingWhitespace(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;trimWhitespace;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.trimWhitespace(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;uncapitalize;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.uncapitalize(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;unqualify;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.unqualify(in, 'a');
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;unqualify;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.unqualify(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringUtils;false;uriDecode;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = StringUtils.uriDecode(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;StringValueResolver;false;resolveStringValue;;;Argument[0];ReturnValue;taint;manual"
@@ -1402,21 +1402,21 @@ public class Test {
 			String in = (String)source();
 			StringValueResolver instance = null;
 			out = instance.resolveStringValue(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;SystemPropertyUtils;false;resolvePlaceholders;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = SystemPropertyUtils.resolvePlaceholders(in, false);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.util;SystemPropertyUtils;false;resolvePlaceholders;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = SystemPropertyUtils.resolvePlaceholders(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 
 	}
diff --git a/java/ql/test/library-tests/frameworks/spring/validation/Test.java b/java/ql/test/library-tests/frameworks/spring/validation/Test.java
index 4f8aac5a335..d081b860297 100644
--- a/java/ql/test/library-tests/frameworks/spring/validation/Test.java
+++ b/java/ql/test/library-tests/frameworks/spring/validation/Test.java
@@ -11,68 +11,68 @@ class ValidationErrorsTest {
   void test() {
     Errors es0 = errors();
     es0.addAllErrors(sourceErrs());
-    sink(es0); // $hasTaintFlow
+    sink(es0); // $ hasTaintFlow
 
-    sink(sourceErrs().getAllErrors()); // $hasTaintFlow
+    sink(sourceErrs().getAllErrors()); // $ hasTaintFlow
 
-    sink(sourceErrs().getFieldError()); // $hasTaintFlow
-    sink(sourceErrs().getFieldError("field")); // $hasTaintFlow
+    sink(sourceErrs().getFieldError()); // $ hasTaintFlow
+    sink(sourceErrs().getFieldError("field")); // $ hasTaintFlow
 
-    sink(sourceErrs().getGlobalError()); // $hasTaintFlow
-    sink(sourceErrs().getGlobalErrors()); // $hasTaintFlow
+    sink(sourceErrs().getGlobalError()); // $ hasTaintFlow
+    sink(sourceErrs().getGlobalErrors()); // $ hasTaintFlow
 
     Errors es1 = errors();
     es1.reject((String)source());
-    sink(es1); // $hasTaintFlow
+    sink(es1); // $ hasTaintFlow
 
     Errors es2 = errors();
     es2.reject((String)source(), null, "");
-    sink(es2); // $hasTaintFlow
+    sink(es2); // $ hasTaintFlow
 
     Errors es3 = errors();
     es3.reject((String)source(), null, "");
-    sink(es3); // $hasTaintFlow
+    sink(es3); // $ hasTaintFlow
 
     {
       Errors es4 = errors();
       Object[] in = { (String)source() };
       es4.reject("", in, "");
-      sink(in); // $hasTaintFlow
+      sink(in); // $ hasTaintFlow
     }
 
     {
       Errors es5 = errors();
       es5.reject("", null, (String)source());
-      sink(es5); // $hasTaintFlow
+      sink(es5); // $ hasTaintFlow
     }
 
     Errors es6 = errors();
     es6.reject((String)source(), "");
-    sink(es6); // $hasTaintFlow
+    sink(es6); // $ hasTaintFlow
 
     Errors es7 = errors();
     es7.reject("", (String)source());
-    sink(es7); // $hasTaintFlow
+    sink(es7); // $ hasTaintFlow
 
     Errors es8 = errors();
     es8.rejectValue("", (String)source(), null, "");
-    sink(es8); // $hasTaintFlow
+    sink(es8); // $ hasTaintFlow
 
     Errors es9 = errors();
     Object[] in = {source()};
     es9.rejectValue("", "", in, "");
-    sink(es9); // $hasTaintFlow
+    sink(es9); // $ hasTaintFlow
 
     Errors es10 = errors();
     es10.rejectValue("", "", null, (String)source());
-    sink(es10); // $hasTaintFlow
+    sink(es10); // $ hasTaintFlow
 
     Errors es11 = errors();
     es11.rejectValue("", (String)source(), "");
-    sink(es11); // $hasTaintFlow
+    sink(es11); // $ hasTaintFlow
 
     Errors es12 = errors();
     es12.rejectValue("", "", (String)source());
-    sink(es12); // $hasTaintFlow
+    sink(es12); // $ hasTaintFlow
   }
 }
diff --git a/java/ql/test/library-tests/frameworks/spring/webmultipart/Test.java b/java/ql/test/library-tests/frameworks/spring/webmultipart/Test.java
index 5d7387c20e0..62129a6d434 100644
--- a/java/ql/test/library-tests/frameworks/spring/webmultipart/Test.java
+++ b/java/ql/test/library-tests/frameworks/spring/webmultipart/Test.java
@@ -30,84 +30,84 @@ public class Test {
 			byte[] out = null;
 			MultipartFile in = (MultipartFile)source();
 			out = in.getBytes();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.multipart;MultipartFile;true;getInputStream;;;Argument[this];ReturnValue;taint;manual"
 			InputStream out = null;
 			MultipartFile in = (MultipartFile)source();
 			out = in.getInputStream();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.multipart;MultipartFile;true;getName;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			MultipartFile in = (MultipartFile)source();
 			out = in.getName();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.multipart;MultipartFile;true;getOriginalFilename;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			MultipartFile in = (MultipartFile)source();
 			out = in.getOriginalFilename();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.multipart;MultipartFile;true;getResource;;;Argument[this];ReturnValue;taint;manual"
 			Resource out = null;
 			MultipartFile in = (MultipartFile)source();
 			out = in.getResource();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.multipart;MultipartHttpServletRequest;true;getMultipartHeaders;;;Argument[this];ReturnValue;taint;manual"
 			HttpHeaders out = null;
 			MultipartHttpServletRequest in = (MultipartHttpServletRequest)source();
 			out = in.getMultipartHeaders(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.multipart;MultipartHttpServletRequest;true;getRequestHeaders;;;Argument[this];ReturnValue;taint;manual"
 			HttpHeaders out = null;
 			MultipartHttpServletRequest in = (MultipartHttpServletRequest)source();
 			out = in.getRequestHeaders();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.multipart;MultipartRequest;true;getFile;;;Argument[this];ReturnValue;taint;manual"
 			MultipartFile out = null;
 			MultipartRequest in = (MultipartRequest)source();
 			out = in.getFile(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.multipart;MultipartRequest;true;getFileMap;;;Argument[this];MapValue of ReturnValue;taint;manual"
 			Map out = null;
 			MultipartRequest in = (MultipartRequest)source();
 			out = in.getFileMap();
-			sink(getMapValue(out)); // $hasTaintFlow
+			sink(getMapValue(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.multipart;MultipartRequest;true;getFileNames;;;Argument[this];Element of ReturnValue;taint;manual"
 			Iterator out = null;
 			MultipartRequest in = (MultipartRequest)source();
 			out = in.getFileNames();
-			sink(getElement(out)); // $hasTaintFlow
+			sink(getElement(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.multipart;MultipartRequest;true;getFiles;;;Argument[this];Element of ReturnValue;taint;manual"
 			List out = null;
 			MultipartRequest in = (MultipartRequest)source();
 			out = in.getFiles(null);
-			sink(getElement(out)); // $hasTaintFlow
+			sink(getElement(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.multipart;MultipartRequest;true;getMultiFileMap;;;Argument[this];MapValue of ReturnValue;taint;manual"
 			MultiValueMap out = null;
 			MultipartRequest in = (MultipartRequest)source();
 			out = in.getMultiFileMap();
-			sink(getMapValue(out)); // $hasTaintFlow
+			sink(getMapValue(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.multipart;MultipartResolver;true;resolveMultipart;;;Argument[0];ReturnValue;taint;manual"
@@ -115,7 +115,7 @@ public class Test {
 			HttpServletRequest in = (HttpServletRequest)source();
 			MultipartResolver instance = null;
 			out = instance.resolveMultipart(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 
 	}
diff --git a/java/ql/test/library-tests/frameworks/spring/websocket/Test.java b/java/ql/test/library-tests/frameworks/spring/websocket/Test.java
index ceaab98344e..4c16529db46 100644
--- a/java/ql/test/library-tests/frameworks/spring/websocket/Test.java
+++ b/java/ql/test/library-tests/frameworks/spring/websocket/Test.java
@@ -14,51 +14,51 @@ public class Test  {
     public class A extends TextWebSocketHandler {
         @Override
         public void handleMessage(WebSocketSession s, WebSocketMessage<?> m) {
-            sink(s); // $hasTaintFlow
-            sink(s.getAcceptedProtocol()); // $hasTaintFlow
-            sink(s.getHandshakeHeaders()); // $hasTaintFlow
-            sink(s.getPrincipal()); // $hasTaintFlow
-            sink(s.getUri()); // $hasTaintFlow
+            sink(s); // $ hasTaintFlow
+            sink(s.getAcceptedProtocol()); // $ hasTaintFlow
+            sink(s.getHandshakeHeaders()); // $ hasTaintFlow
+            sink(s.getPrincipal()); // $ hasTaintFlow
+            sink(s.getUri()); // $ hasTaintFlow
 
-            sink(m); // $hasTaintFlow
-            sink(m.getPayload()); // $hasTaintFlow
+            sink(m); // $ hasTaintFlow
+            sink(m.getPayload()); // $ hasTaintFlow
 
         }
 
-        @Override 
+        @Override
         protected void handleTextMessage(WebSocketSession s, TextMessage m) {
-            sink(s);  // $hasTaintFlow
-            sink(m);  // $hasTaintFlow
-            sink(m.asBytes()); // $hasTaintFlow
+            sink(s);  // $ hasTaintFlow
+            sink(m);  // $ hasTaintFlow
+            sink(m.asBytes()); // $ hasTaintFlow
         }
 
-        @Override 
+        @Override
         protected void handleBinaryMessage(WebSocketSession s, BinaryMessage m) {
-            sink(s); // $hasTaintFlow
-            sink(m); // $hasTaintFlow
+            sink(s); // $ hasTaintFlow
+            sink(m); // $ hasTaintFlow
         }
 
         @Override
         protected void handlePongMessage(WebSocketSession s, PongMessage m) {
-            sink(s); // $hasTaintFlow
-            sink(m); // $hasTaintFlow
+            sink(s); // $ hasTaintFlow
+            sink(m); // $ hasTaintFlow
         }
 
         @Override
         public void afterConnectionEstablished(WebSocketSession s) {
-            sink(s); // $hasTaintFlow
+            sink(s); // $ hasTaintFlow
         }
 
-        @Override 
+        @Override
         public void afterConnectionClosed(WebSocketSession s, CloseStatus c) {
-            sink(s); // $hasTaintFlow
+            sink(s); // $ hasTaintFlow
         }
 
-        @Override 
-        public void handleTransportError(WebSocketSession s, Throwable exc) { 
-            sink(s);  // $hasTaintFlow
+        @Override
+        public void handleTransportError(WebSocketSession s, Throwable exc) {
+            sink(s);  // $ hasTaintFlow
         }
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/library-tests/frameworks/spring/webutil/Test.java b/java/ql/test/library-tests/frameworks/spring/webutil/Test.java
index 11ab7a48d87..3f79f17a388 100644
--- a/java/ql/test/library-tests/frameworks/spring/webutil/Test.java
+++ b/java/ql/test/library-tests/frameworks/spring/webutil/Test.java
@@ -63,84 +63,84 @@ public class Test {
 			String out = null;
 			AbstractUriTemplateHandler in = (AbstractUriTemplateHandler)source();
 			out = in.getBaseUrl();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;AbstractUriTemplateHandler;true;setBaseUrl;;;Argument[0];Argument[this];taint;manual"
 			AbstractUriTemplateHandler out = null;
 			String in = (String)source();
 			out.setBaseUrl(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;AbstractUriTemplateHandler;true;setDefaultUriVariables;;;Argument[0];Argument[this];taint;manual"
 			AbstractUriTemplateHandler out = null;
 			Map in = (Map)source();
 			out.setDefaultUriVariables(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;ContentCachingRequestWrapper;false;ContentCachingRequestWrapper;;;Argument[0];Argument[this];taint;manual"
 			ContentCachingRequestWrapper out = null;
 			HttpServletRequest in = (HttpServletRequest)source();
 			out = new ContentCachingRequestWrapper(in, 0);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;ContentCachingRequestWrapper;false;ContentCachingRequestWrapper;;;Argument[0];Argument[this];taint;manual"
 			ContentCachingRequestWrapper out = null;
 			HttpServletRequest in = (HttpServletRequest)source();
 			out = new ContentCachingRequestWrapper(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;ContentCachingRequestWrapper;false;getContentAsByteArray;;;Argument[this];ReturnValue;taint;manual"
 			byte[] out = null;
 			ContentCachingRequestWrapper in = (ContentCachingRequestWrapper)source();
 			out = in.getContentAsByteArray();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;ContentCachingResponseWrapper;false;ContentCachingResponseWrapper;;;Argument[0];Argument[this];taint;manual"
 			ContentCachingResponseWrapper out = null;
 			HttpServletResponse in = (HttpServletResponse)source();
 			out = new ContentCachingResponseWrapper(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;ContentCachingResponseWrapper;false;getContentAsByteArray;;;Argument[this];ReturnValue;taint;manual"
 			byte[] out = null;
 			ContentCachingResponseWrapper in = (ContentCachingResponseWrapper)source();
 			out = in.getContentAsByteArray();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;ContentCachingResponseWrapper;false;getContentInputStream;;;Argument[this];ReturnValue;taint;manual"
 			InputStream out = null;
 			ContentCachingResponseWrapper in = (ContentCachingResponseWrapper)source();
 			out = in.getContentInputStream();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;DefaultUriBuilderFactory;false;DefaultUriBuilderFactory;;;Argument[0];Argument[this];taint;manual"
 			DefaultUriBuilderFactory out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = new DefaultUriBuilderFactory(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;DefaultUriBuilderFactory;false;DefaultUriBuilderFactory;;;Argument[0];Argument[this];taint;manual"
 			DefaultUriBuilderFactory out = null;
 			String in = (String)source();
 			out = new DefaultUriBuilderFactory(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;DefaultUriBuilderFactory;false;builder;;;Argument[this];ReturnValue;taint;manual"
 			UriBuilder out = null;
 			DefaultUriBuilderFactory in = (DefaultUriBuilderFactory)source();
 			out = in.builder();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;DefaultUriBuilderFactory;false;expand;(String,Map);;MapValue of Argument[1];ReturnValue;taint;manual"
@@ -148,7 +148,7 @@ public class Test {
 			Map in = newMapWithValue(source());
 			DefaultUriBuilderFactory instance = null;
 			out = instance.expand((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;DefaultUriBuilderFactory;false;expand;(String,Object[]);;ArrayElement of Argument[1];ReturnValue;taint;manual"
@@ -156,7 +156,7 @@ public class Test {
 			Object[] in = new Object[]{source()};
 			DefaultUriBuilderFactory instance = null;
 			out = instance.expand((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;DefaultUriBuilderFactory;false;expand;;;Argument[0];ReturnValue;taint;manual"
@@ -164,7 +164,7 @@ public class Test {
 			String in = (String)source();
 			DefaultUriBuilderFactory instance = null;
 			out = instance.expand(in, (Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;DefaultUriBuilderFactory;false;expand;;;Argument[0];ReturnValue;taint;manual"
@@ -172,28 +172,28 @@ public class Test {
 			String in = (String)source();
 			DefaultUriBuilderFactory instance = null;
 			out = instance.expand(in, (Map)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;DefaultUriBuilderFactory;false;expand;;;Argument[this];ReturnValue;taint;manual"
 			URI out = null;
 			DefaultUriBuilderFactory in = (DefaultUriBuilderFactory)source();
 			out = in.expand((String)null, (Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;DefaultUriBuilderFactory;false;expand;;;Argument[this];ReturnValue;taint;manual"
 			URI out = null;
 			DefaultUriBuilderFactory in = (DefaultUriBuilderFactory)source();
 			out = in.expand((String)null, (Map)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;DefaultUriBuilderFactory;false;getDefaultUriVariables;;;Argument[this];MapValue of ReturnValue;taint;manual"
 			Map out = null;
 			DefaultUriBuilderFactory in = (DefaultUriBuilderFactory)source();
 			out = in.getDefaultUriVariables();
-			sink(getMapValue(out)); // $hasTaintFlow
+			sink(getMapValue(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;DefaultUriBuilderFactory;false;setDefaultUriVariables;;;MapValue of Argument[0];Argument[this];taint;manual"
@@ -207,84 +207,84 @@ public class Test {
 			UriBuilder out = null;
 			DefaultUriBuilderFactory in = (DefaultUriBuilderFactory)source();
 			out = in.uriString(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;HtmlUtils;false;htmlUnescape;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = HtmlUtils.htmlUnescape(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;ServletContextPropertyUtils;false;resolvePlaceholders;;;Argument[0..1];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = ServletContextPropertyUtils.resolvePlaceholders(in, null, false);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;ServletContextPropertyUtils;false;resolvePlaceholders;;;Argument[0..1];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = ServletContextPropertyUtils.resolvePlaceholders(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;ServletContextPropertyUtils;false;resolvePlaceholders;;;Argument[0..1];ReturnValue;taint;manual"
 			String out = null;
 			ServletContext in = (ServletContext)source();
 			out = ServletContextPropertyUtils.resolvePlaceholders(null, in, false);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;ServletContextPropertyUtils;false;resolvePlaceholders;;;Argument[0..1];ReturnValue;taint;manual"
 			String out = null;
 			ServletContext in = (ServletContext)source();
 			out = ServletContextPropertyUtils.resolvePlaceholders(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;ServletRequestPathUtils;false;getCachedPath;;;Argument[0];ReturnValue;taint;manual"
 			Object out = null;
 			ServletRequest in = (ServletRequest)source();
 			out = ServletRequestPathUtils.getCachedPath(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;ServletRequestPathUtils;false;getCachedPathValue;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			ServletRequest in = (ServletRequest)source();
 			out = ServletRequestPathUtils.getCachedPathValue(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;ServletRequestPathUtils;false;getParsedRequestPath;;;Argument[0];ReturnValue;taint;manual"
 			RequestPath out = null;
 			ServletRequest in = (ServletRequest)source();
 			out = ServletRequestPathUtils.getParsedRequestPath(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;ServletRequestPathUtils;false;parseAndCache;;;Argument[0];ReturnValue;taint;manual"
 			RequestPath out = null;
 			HttpServletRequest in = (HttpServletRequest)source();
 			out = ServletRequestPathUtils.parseAndCache(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;ServletRequestPathUtils;false;setParsedRequestPath;;;Argument[0];Argument[1];taint;manual"
 			ServletRequest out = null;
 			RequestPath in = (RequestPath)source();
 			ServletRequestPathUtils.setParsedRequestPath(in, out);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;build;(Map);;MapValue of Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			Map in = newMapWithValue(source());
 			out.build(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;build;(Map);;MapValue of Argument[0];ReturnValue;taint;manual"
@@ -292,63 +292,63 @@ public class Test {
 			Map in = newMapWithValue(source());
 			UriBuilder instance = null;
 			out = instance.build(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;build;;;Argument[this];ReturnValue;taint;manual"
 			URI out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.build(false);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;build;;;Argument[this];ReturnValue;taint;manual"
 			URI out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.build();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;build;;;Argument[this];ReturnValue;taint;manual"
 			URI out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.build((Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;build;;;Argument[this];ReturnValue;taint;manual"
 			URI out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.build((Map)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;fragment;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.fragment(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;fragment;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.fragment(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;fragment;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.fragment(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;fragment;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.fragment(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;fragment;;;Argument[0];ReturnValue;taint;manual"
@@ -356,7 +356,7 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.fragment(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;fragment;;;Argument[0];ReturnValue;taint;manual"
@@ -364,21 +364,21 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.fragment(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;host;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.host(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;host;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.host(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;host;;;Argument[0];ReturnValue;taint;manual"
@@ -386,7 +386,7 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.host(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;host;;;Argument[0];ReturnValue;taint;manual"
@@ -394,35 +394,35 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.host(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;path;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.path(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;path;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.path(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;path;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.path(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;path;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.path(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;path;;;Argument[0];ReturnValue;taint;manual"
@@ -430,7 +430,7 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.path(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;path;;;Argument[0];ReturnValue;taint;manual"
@@ -438,35 +438,35 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.path(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;pathSegment;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.pathSegment((String[])null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;pathSegment;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.pathSegment((String[])null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;pathSegment;;;ArrayElement of Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String[] in = new String[]{(String)source()};
 			out.pathSegment((String[])in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;pathSegment;;;ArrayElement of Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String[] in = new String[]{(String)source()};
 			out.pathSegment((String[])in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;pathSegment;;;ArrayElement of Argument[0];ReturnValue;taint;manual"
@@ -474,7 +474,7 @@ public class Test {
 			String[] in = new String[]{(String)source()};
 			UriBuilder instance = null;
 			out = instance.pathSegment((String[])in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;pathSegment;;;ArrayElement of Argument[0];ReturnValue;taint;manual"
@@ -482,21 +482,21 @@ public class Test {
 			String[] in = new String[]{(String)source()};
 			UriBuilder instance = null;
 			out = instance.pathSegment((String[])in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;port;(java.lang.String);;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.port(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;port;(java.lang.String);;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.port(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;port;(java.lang.String);;Argument[0];ReturnValue;taint;manual"
@@ -504,7 +504,7 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.port(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;port;(java.lang.String);;Argument[0];ReturnValue;taint;manual"
@@ -512,63 +512,63 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.port(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;port;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.port(0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;port;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.port((String)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;port;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.port(0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;port;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.port((String)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;query;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.query(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;query;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.query(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;query;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.query(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;query;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.query(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;query;;;Argument[0];ReturnValue;taint;manual"
@@ -576,7 +576,7 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.query(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;query;;;Argument[0];ReturnValue;taint;manual"
@@ -584,21 +584,21 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.query(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;(String,Collection);;Element of Argument[1];Argument[this];taint;manual"
 			UriBuilder out = null;
 			Collection in = List.of(source());
 			out.queryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;(String,Collection);;Element of Argument[1];Argument[this];taint;manual"
 			UriBuilder out = null;
 			Collection in = List.of(source());
 			out.queryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;(String,Collection);;Element of Argument[1];ReturnValue;taint;manual"
@@ -606,7 +606,7 @@ public class Test {
 			Collection in = List.of(source());
 			UriBuilder instance = null;
 			out = instance.queryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;(String,Collection);;Element of Argument[1];ReturnValue;taint;manual"
@@ -614,21 +614,21 @@ public class Test {
 			Collection in = List.of(source());
 			UriBuilder instance = null;
 			out = instance.queryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;(String,Object[]);;ArrayElement of Argument[1];Argument[this];taint;manual"
 			UriBuilder out = null;
 			Object[] in = new Object[]{source()};
 			out.queryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;(String,Object[]);;ArrayElement of Argument[1];Argument[this];taint;manual"
 			UriBuilder out = null;
 			Object[] in = new Object[]{source()};
 			out.queryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;(String,Object[]);;ArrayElement of Argument[1];ReturnValue;taint;manual"
@@ -636,7 +636,7 @@ public class Test {
 			Object[] in = new Object[]{source()};
 			UriBuilder instance = null;
 			out = instance.queryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;(String,Object[]);;ArrayElement of Argument[1];ReturnValue;taint;manual"
@@ -644,63 +644,63 @@ public class Test {
 			Object[] in = new Object[]{source()};
 			UriBuilder instance = null;
 			out = instance.queryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.queryParam((String)null, (Object[])null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.queryParam((String)null, (Collection)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.queryParam((String)null, (Object[])null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.queryParam((String)null, (Collection)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.queryParam(in, (Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.queryParam(in, (Collection)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.queryParam(in, (Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.queryParam(in, (Collection)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;;;Argument[0];ReturnValue;taint;manual"
@@ -708,7 +708,7 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.queryParam(in, (Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;;;Argument[0];ReturnValue;taint;manual"
@@ -716,7 +716,7 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.queryParam(in, (Collection)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;;;Argument[0];ReturnValue;taint;manual"
@@ -724,7 +724,7 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.queryParam(in, (Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParam;;;Argument[0];ReturnValue;taint;manual"
@@ -732,35 +732,35 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.queryParam(in, (Collection)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParamIfPresent;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.queryParamIfPresent(null, null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParamIfPresent;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.queryParamIfPresent(null, null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParamIfPresent;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.queryParamIfPresent(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParamIfPresent;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.queryParamIfPresent(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParamIfPresent;;;Argument[0];ReturnValue;taint;manual"
@@ -768,7 +768,7 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.queryParamIfPresent(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParamIfPresent;;;Argument[0];ReturnValue;taint;manual"
@@ -776,21 +776,21 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.queryParamIfPresent(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParamIfPresent;;;Element of Argument[1];Argument[this];taint;manual"
 			UriBuilder out = null;
 			Optional in = Optional.of(source());
 			out.queryParamIfPresent(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParamIfPresent;;;Element of Argument[1];Argument[this];taint;manual"
 			UriBuilder out = null;
 			Optional in = Optional.of(source());
 			out.queryParamIfPresent(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParamIfPresent;;;Element of Argument[1];ReturnValue;taint;manual"
@@ -798,7 +798,7 @@ public class Test {
 			Optional in = Optional.of(source());
 			UriBuilder instance = null;
 			out = instance.queryParamIfPresent(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParamIfPresent;;;Element of Argument[1];ReturnValue;taint;manual"
@@ -806,35 +806,35 @@ public class Test {
 			Optional in = Optional.of(source());
 			UriBuilder instance = null;
 			out = instance.queryParamIfPresent(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParams;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.queryParams(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParams;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.queryParams(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParams;;;MapKey of Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			MultiValueMap in = newMultiValueMapWithKey(source());
 			out.queryParams(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParams;;;MapKey of Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			MultiValueMap in = newMultiValueMapWithKey(source());
 			out.queryParams(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParams;;;MapKey of Argument[0];ReturnValue;taint;manual"
@@ -842,7 +842,7 @@ public class Test {
 			MultiValueMap in = newMultiValueMapWithKey(source());
 			UriBuilder instance = null;
 			out = instance.queryParams(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParams;;;MapKey of Argument[0];ReturnValue;taint;manual"
@@ -850,21 +850,21 @@ public class Test {
 			MultiValueMap in = newMultiValueMapWithKey(source());
 			UriBuilder instance = null;
 			out = instance.queryParams(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParams;;;Element of MapValue of Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			MultiValueMap in = newMultiValueMapWithValue(source());
 			out.queryParams(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParams;;;Element of MapValue of Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			MultiValueMap in = newMultiValueMapWithValue(source());
 			out.queryParams(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParams;;;Element of MapValue of Argument[0];ReturnValue;taint;manual"
@@ -872,7 +872,7 @@ public class Test {
 			MultiValueMap in = newMultiValueMapWithValue(source());
 			UriBuilder instance = null;
 			out = instance.queryParams(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;queryParams;;;Element of MapValue of Argument[0];ReturnValue;taint;manual"
@@ -880,35 +880,35 @@ public class Test {
 			MultiValueMap in = newMultiValueMapWithValue(source());
 			UriBuilder instance = null;
 			out = instance.queryParams(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replacePath;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.replacePath(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replacePath;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.replacePath(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replacePath;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.replacePath(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replacePath;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.replacePath(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replacePath;;;Argument[0];ReturnValue;taint;manual"
@@ -916,7 +916,7 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.replacePath(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replacePath;;;Argument[0];ReturnValue;taint;manual"
@@ -924,35 +924,35 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.replacePath(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQuery;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.replaceQuery(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQuery;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.replaceQuery(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQuery;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.replaceQuery(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQuery;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.replaceQuery(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQuery;;;Argument[0];ReturnValue;taint;manual"
@@ -960,7 +960,7 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.replaceQuery(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQuery;;;Argument[0];ReturnValue;taint;manual"
@@ -968,21 +968,21 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.replaceQuery(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;(String,Collection);;Element of Argument[1];Argument[this];taint;manual"
 			UriBuilder out = null;
 			Collection in = List.of(source());
 			out.replaceQueryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;(String,Collection);;Element of Argument[1];Argument[this];taint;manual"
 			UriBuilder out = null;
 			Collection in = List.of(source());
 			out.replaceQueryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;(String,Collection);;Element of Argument[1];ReturnValue;taint;manual"
@@ -990,7 +990,7 @@ public class Test {
 			Collection in = List.of(source());
 			UriBuilder instance = null;
 			out = instance.replaceQueryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;(String,Collection);;Element of Argument[1];ReturnValue;taint;manual"
@@ -998,21 +998,21 @@ public class Test {
 			Collection in = List.of(source());
 			UriBuilder instance = null;
 			out = instance.replaceQueryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;(String,Object[]);;ArrayElement of Argument[1];Argument[this];taint;manual"
 			UriBuilder out = null;
 			Object[] in = new Object[]{source()};
 			out.replaceQueryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;(String,Object[]);;ArrayElement of Argument[1];Argument[this];taint;manual"
 			UriBuilder out = null;
 			Object[] in = new Object[]{source()};
 			out.replaceQueryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;(String,Object[]);;ArrayElement of Argument[1];ReturnValue;taint;manual"
@@ -1020,7 +1020,7 @@ public class Test {
 			Object[] in = new Object[]{source()};
 			UriBuilder instance = null;
 			out = instance.replaceQueryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;(String,Object[]);;ArrayElement of Argument[1];ReturnValue;taint;manual"
@@ -1028,63 +1028,63 @@ public class Test {
 			Object[] in = new Object[]{source()};
 			UriBuilder instance = null;
 			out = instance.replaceQueryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.replaceQueryParam((String)null, (Object[])null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.replaceQueryParam((String)null, (Collection)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.replaceQueryParam((String)null, (Object[])null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.replaceQueryParam((String)null, (Collection)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.replaceQueryParam(in, (Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.replaceQueryParam(in, (Collection)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.replaceQueryParam(in, (Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.replaceQueryParam(in, (Collection)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;;;Argument[0];ReturnValue;taint;manual"
@@ -1092,7 +1092,7 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.replaceQueryParam(in, (Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;;;Argument[0];ReturnValue;taint;manual"
@@ -1100,7 +1100,7 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.replaceQueryParam(in, (Collection)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;;;Argument[0];ReturnValue;taint;manual"
@@ -1108,7 +1108,7 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.replaceQueryParam(in, (Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParam;;;Argument[0];ReturnValue;taint;manual"
@@ -1116,21 +1116,21 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.replaceQueryParam(in, (Collection)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParams;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.replaceQueryParams(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParams;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.replaceQueryParams(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParams;;;MapKey of Argument[0];ReturnValue;taint;manual"
@@ -1138,7 +1138,7 @@ public class Test {
 			MultiValueMap in = newMultiValueMapWithKey(source());
 			UriBuilder instance = null;
 			out = instance.replaceQueryParams(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParams;;;MapKey of Argument[0];ReturnValue;taint;manual"
@@ -1146,7 +1146,7 @@ public class Test {
 			MultiValueMap in = newMultiValueMapWithKey(source());
 			UriBuilder instance = null;
 			out = instance.replaceQueryParams(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParams;;;Element of MapValue of Argument[0];ReturnValue;taint;manual"
@@ -1154,7 +1154,7 @@ public class Test {
 			MultiValueMap in = newMultiValueMapWithValue(source());
 			UriBuilder instance = null;
 			out = instance.replaceQueryParams(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;replaceQueryParams;;;Element of MapValue of Argument[0];ReturnValue;taint;manual"
@@ -1162,35 +1162,35 @@ public class Test {
 			MultiValueMap in = newMultiValueMapWithValue(source());
 			UriBuilder instance = null;
 			out = instance.replaceQueryParams(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;scheme;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.scheme(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;scheme;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.scheme(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;scheme;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.scheme(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;scheme;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.scheme(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;scheme;;;Argument[0];ReturnValue;taint;manual"
@@ -1198,7 +1198,7 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.scheme(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;scheme;;;Argument[0];ReturnValue;taint;manual"
@@ -1206,35 +1206,35 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.scheme(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;userInfo;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.userInfo(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;userInfo;;;Argument[this];ReturnValue;value;manual"
 			UriBuilder out = null;
 			UriBuilder in = (UriBuilder)source();
 			out = in.userInfo(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;userInfo;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.userInfo(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;userInfo;;;Argument[0];Argument[this];taint;manual"
 			UriBuilder out = null;
 			String in = (String)source();
 			out.userInfo(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;userInfo;;;Argument[0];ReturnValue;taint;manual"
@@ -1242,7 +1242,7 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.userInfo(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilder;true;userInfo;;;Argument[0];ReturnValue;taint;manual"
@@ -1250,28 +1250,28 @@ public class Test {
 			String in = (String)source();
 			UriBuilder instance = null;
 			out = instance.userInfo(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilderFactory;true;builder;;;Argument[this];ReturnValue;taint;manual"
 			UriBuilder out = null;
 			UriBuilderFactory in = (UriBuilderFactory)source();
 			out = in.builder();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilderFactory;true;builder;;;Argument[this];ReturnValue;taint;manual"
 			UriBuilder out = null;
 			DefaultUriBuilderFactory in = (DefaultUriBuilderFactory)source();
 			out = in.builder();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilderFactory;true;uriString;;;Argument[this];ReturnValue;taint;manual"
 			UriBuilder out = null;
 			UriBuilderFactory in = (UriBuilderFactory)source();
 			out = in.uriString(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilderFactory;true;uriString;;;Argument[0];ReturnValue;taint;manual"
@@ -1279,7 +1279,7 @@ public class Test {
 			String in = (String)source();
 			UriBuilderFactory instance = null;
 			out = instance.uriString(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilderFactory;true;uriString;;;Argument[0];ReturnValue;taint;manual"
@@ -1287,49 +1287,49 @@ public class Test {
 			String in = (String)source();
 			DefaultUriBuilderFactory instance = null;
 			out = instance.uriString(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriBuilderFactory;true;uriString;;;Argument[this];ReturnValue;taint;manual"
 			UriBuilder out = null;
 			DefaultUriBuilderFactory in = (DefaultUriBuilderFactory)source();
 			out = in.uriString(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponents$UriTemplateVariables;true;getValue;;;MapValue of Argument[this];ReturnValue;value;manual"
 			Object out = null;
 			UriComponents.UriTemplateVariables in = new StubUriTemplateVariables(Map.of(null, source()));
 			out = in.getValue(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		// {
 		// 	// "org.springframework.web.util;UriComponents;false;UriComponents;;;Argument[0..1];Argument[this];taint;manual"
 		// 	UriComponents out = null;
 		// 	String in = (String)source();
 		// 	out = new UriComponents(null, in);
-		// 	sink(out); // $hasTaintFlow
+		// 	sink(out); // $ hasTaintFlow
 		// }
 		// {
 		// 	// "org.springframework.web.util;UriComponents;false;UriComponents;;;Argument[0..1];Argument[this];taint;manual"
 		// 	UriComponents out = null;
 		// 	String in = (String)source();
 		// 	out = new UriComponents(in, null);
-		// 	sink(out); // $hasTaintFlow
+		// 	sink(out); // $ hasTaintFlow
 		// }
 		{
 			// "org.springframework.web.util;UriComponents;false;encode;;;Argument[this];ReturnValue;taint;manual"
 			UriComponents out = null;
 			UriComponents in = (UriComponents)source();
 			out = in.encode(null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponents;false;encode;;;Argument[this];ReturnValue;taint;manual"
 			UriComponents out = null;
 			UriComponents in = (UriComponents)source();
 			out = in.encode();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponents;false;expand;(Map);;MapValue of Argument[0];ReturnValue;taint;manual"
@@ -1337,7 +1337,7 @@ public class Test {
 			Map in = newMapWithValue(source());
 			UriComponents instance = null;
 			out = instance.expand(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponents;false;expand;(Object[]);;ArrayElement of Argument[0];ReturnValue;taint;manual"
@@ -1345,7 +1345,7 @@ public class Test {
 			Object[] in = new Object[]{source()};
 			UriComponents instance = null;
 			out = instance.expand(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponents;false;expand;(UriTemplateVariables);;MapValue of Argument[0];ReturnValue;taint;manual"
@@ -1353,91 +1353,91 @@ public class Test {
 			UriComponents.UriTemplateVariables in = new StubUriTemplateVariables(Map.of(null, source()));
 			UriComponents instance = null;
 			out = instance.expand(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponents;false;getFragment;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			UriComponents in = (UriComponents)source();
 			out = in.getFragment();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponents;false;getHost;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			UriComponents in = (UriComponents)source();
 			out = in.getHost();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponents;false;getPath;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			UriComponents in = (UriComponents)source();
 			out = in.getPath();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponents;false;getPathSegments;;;Argument[this];ReturnValue;taint;manual"
 			List out = null;
 			UriComponents in = (UriComponents)source();
 			out = in.getPathSegments();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponents;false;getQuery;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			UriComponents in = (UriComponents)source();
 			out = in.getQuery();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponents;false;getQueryParams;;;Argument[this];Element of MapValue of ReturnValue;taint;manual"
 			MultiValueMap out = null;
 			UriComponents in = (UriComponents)source();
 			out = in.getQueryParams();
-			sink(getElement((List)getMapValue(out))); // $hasTaintFlow
+			sink(getElement((List)getMapValue(out))); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponents;false;getQueryParams;;;Argument[this];MapKey of ReturnValue;taint;manual"
 			MultiValueMap out = null;
 			UriComponents in = (UriComponents)source();
 			out = in.getQueryParams();
-			sink(getMapKey(out)); // $hasTaintFlow
+			sink(getMapKey(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponents;false;getScheme;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			UriComponents in = (UriComponents)source();
 			out = in.getScheme();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponents;false;getSchemeSpecificPart;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			UriComponents in = (UriComponents)source();
 			out = in.getSchemeSpecificPart();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponents;false;getUserInfo;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			UriComponents in = (UriComponents)source();
 			out = in.getUserInfo();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponents;false;toUri;;;Argument[this];ReturnValue;taint;manual"
 			URI out = null;
 			UriComponents in = (UriComponents)source();
 			out = in.toUri();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponents;false;toUriString;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			UriComponents in = (UriComponents)source();
 			out = in.toUriString();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;build;(Map);;MapValue of Argument[0];ReturnValue;taint;manual"
@@ -1445,7 +1445,7 @@ public class Test {
 			Map in = newMapWithValue(source());
 			UriComponentsBuilder instance = null;
 			out = instance.build(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;build;(Object[]);;ArrayElement of Argument[0];ReturnValue;taint;manual"
@@ -1453,35 +1453,35 @@ public class Test {
 			Object[] in = new Object[]{source()};
 			UriComponentsBuilder instance = null;
 			out = instance.build(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;build;;;Argument[this];ReturnValue;taint;manual"
 			UriComponents out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.build(false);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;build;;;Argument[this];ReturnValue;taint;manual"
 			UriComponents out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.build();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;build;;;Argument[this];ReturnValue;taint;manual"
 			URI out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.build((Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;build;;;Argument[this];ReturnValue;taint;manual"
 			URI out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.build((Map)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;buildAndExpand;(Map);;MapValue of Argument[0];ReturnValue;taint;manual"
@@ -1489,7 +1489,7 @@ public class Test {
 			Map in = newMapWithValue(source());
 			UriComponentsBuilder instance = null;
 			out = instance.buildAndExpand(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;buildAndExpand;(Object[]);;ArrayElement of Argument[0];ReturnValue;taint;manual"
@@ -1497,35 +1497,35 @@ public class Test {
 			Object[] in = new Object[]{source()};
 			UriComponentsBuilder instance = null;
 			out = instance.buildAndExpand(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;cloneBuilder;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.cloneBuilder();
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;encode;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.encode(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;encode;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.encode();
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;fragment;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.fragment(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;fragment;;;Argument[0];ReturnValue;taint;manual"
@@ -1533,56 +1533,56 @@ public class Test {
 			String in = (String)source();
 			UriComponentsBuilder instance = null;
 			out = instance.fragment(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;fromHttpRequest;;;Argument[0];ReturnValue;taint;manual"
 			UriComponentsBuilder out = null;
 			HttpRequest in = (HttpRequest)source();
 			out = UriComponentsBuilder.fromHttpRequest(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;fromHttpUrl;;;Argument[0];ReturnValue;taint;manual"
 			UriComponentsBuilder out = null;
 			String in = (String)source();
 			out = UriComponentsBuilder.fromHttpUrl(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;fromOriginHeader;;;Argument[0];ReturnValue;taint;manual"
 			UriComponentsBuilder out = null;
 			String in = (String)source();
 			out = UriComponentsBuilder.fromOriginHeader(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;fromPath;;;Argument[0];ReturnValue;taint;manual"
 			UriComponentsBuilder out = null;
 			String in = (String)source();
 			out = UriComponentsBuilder.fromPath(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;fromUri;;;Argument[0];ReturnValue;taint;manual"
 			UriComponentsBuilder out = null;
 			URI in = (URI)source();
 			out = UriComponentsBuilder.fromUri(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;fromUriString;;;Argument[0];ReturnValue;taint;manual"
 			UriComponentsBuilder out = null;
 			String in = (String)source();
 			out = UriComponentsBuilder.fromUriString(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;host;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.host(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;host;;;Argument[0];ReturnValue;taint;manual"
@@ -1590,28 +1590,28 @@ public class Test {
 			String in = (String)source();
 			UriComponentsBuilder instance = null;
 			out = instance.host(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;parseForwardedFor;;;Argument[0..1];ReturnValue;taint;manual"
 			InetSocketAddress out = null;
 			InetSocketAddress in = (InetSocketAddress)source();
 			out = UriComponentsBuilder.parseForwardedFor(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;parseForwardedFor;;;Argument[0..1];ReturnValue;taint;manual"
 			InetSocketAddress out = null;
 			HttpRequest in = (HttpRequest)source();
 			out = UriComponentsBuilder.parseForwardedFor(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;path;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.path(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;path;;;Argument[0];ReturnValue;taint;manual"
@@ -1619,14 +1619,14 @@ public class Test {
 			String in = (String)source();
 			UriComponentsBuilder instance = null;
 			out = instance.path(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;pathSegment;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.pathSegment((String[])null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;pathSegment;;;ArrayElement of Argument[0];ReturnValue;taint;manual"
@@ -1634,7 +1634,7 @@ public class Test {
 			String[] in = new String[]{(String)source()};
 			UriComponentsBuilder instance = null;
 			out = instance.pathSegment(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;port;(String);;Argument[0];ReturnValue;taint;manual"
@@ -1642,28 +1642,28 @@ public class Test {
 			String in = (String)source();
 			UriComponentsBuilder instance = null;
 			out = instance.port(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;port;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.port(0);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;port;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.port((String)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;query;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.query(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;query;;;Argument[0];ReturnValue;taint;manual"
@@ -1671,7 +1671,7 @@ public class Test {
 			String in = (String)source();
 			UriComponentsBuilder instance = null;
 			out = instance.query(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;queryParam;(String,Collection);;Element of Argument[1];ReturnValue;taint;manual"
@@ -1679,7 +1679,7 @@ public class Test {
 			Collection in = List.of(source());
 			UriComponentsBuilder instance = null;
 			out = instance.queryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;queryParam;(String,Object[]);;ArrayElement of Argument[1];ReturnValue;taint;manual"
@@ -1687,21 +1687,21 @@ public class Test {
 			Object[] in = new Object[]{source()};
 			UriComponentsBuilder instance = null;
 			out = instance.queryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;queryParam;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.queryParam((String)null, (Object[])null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;queryParam;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.queryParam((String)null, (Collection)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;queryParam;;;Argument[0];ReturnValue;taint;manual"
@@ -1709,7 +1709,7 @@ public class Test {
 			String in = (String)source();
 			UriComponentsBuilder instance = null;
 			out = instance.queryParam(in, (Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;queryParam;;;Argument[0];ReturnValue;taint;manual"
@@ -1717,14 +1717,14 @@ public class Test {
 			String in = (String)source();
 			UriComponentsBuilder instance = null;
 			out = instance.queryParam(in, (Collection)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;queryParamIfPresent;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.queryParamIfPresent(null, null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;queryParamIfPresent;;;Argument[0];ReturnValue;taint;manual"
@@ -1732,7 +1732,7 @@ public class Test {
 			String in = (String)source();
 			UriComponentsBuilder instance = null;
 			out = instance.queryParamIfPresent(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;queryParamIfPresent;;;Element of Argument[1];ReturnValue;taint;manual"
@@ -1740,14 +1740,14 @@ public class Test {
 			Optional in = Optional.of(source());
 			UriComponentsBuilder instance = null;
 			out = instance.queryParamIfPresent(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;queryParams;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.queryParams(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;queryParams;;;MapKey of Argument[0];ReturnValue;taint;manual"
@@ -1755,7 +1755,7 @@ public class Test {
 			MultiValueMap in = newMultiValueMapWithKey(source());
 			UriComponentsBuilder instance = null;
 			out = instance.queryParams(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;queryParams;;;Element of MapValue of Argument[0];ReturnValue;taint;manual"
@@ -1763,14 +1763,14 @@ public class Test {
 			MultiValueMap in = newMultiValueMapWithValue(source());
 			UriComponentsBuilder instance = null;
 			out = instance.queryParams(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;replacePath;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.replacePath(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;replacePath;;;Argument[0];ReturnValue;taint;manual"
@@ -1778,14 +1778,14 @@ public class Test {
 			String in = (String)source();
 			UriComponentsBuilder instance = null;
 			out = instance.replacePath(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;replaceQuery;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.replaceQuery(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;replaceQuery;;;Argument[0];ReturnValue;taint;manual"
@@ -1793,7 +1793,7 @@ public class Test {
 			String in = (String)source();
 			UriComponentsBuilder instance = null;
 			out = instance.replaceQuery(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;replaceQueryParam;(String,Collection);;Element of Argument[1];ReturnValue;taint;manual"
@@ -1801,7 +1801,7 @@ public class Test {
 			Collection in = List.of(source());
 			UriComponentsBuilder instance = null;
 			out = instance.replaceQueryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;replaceQueryParam;(String,Object[]);;ArrayElement of Argument[1];ReturnValue;taint;manual"
@@ -1809,21 +1809,21 @@ public class Test {
 			Object[] in = new Object[]{source()};
 			UriComponentsBuilder instance = null;
 			out = instance.replaceQueryParam((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;replaceQueryParam;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.replaceQueryParam((String)null, (Object[])null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;replaceQueryParam;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.replaceQueryParam((String)null, (Collection)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;replaceQueryParam;;;Argument[0];ReturnValue;taint;manual"
@@ -1831,7 +1831,7 @@ public class Test {
 			String in = (String)source();
 			UriComponentsBuilder instance = null;
 			out = instance.replaceQueryParam(in, (Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;replaceQueryParam;;;Argument[0];ReturnValue;taint;manual"
@@ -1839,14 +1839,14 @@ public class Test {
 			String in = (String)source();
 			UriComponentsBuilder instance = null;
 			out = instance.replaceQueryParam(in, (Collection)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;replaceQueryParams;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.replaceQueryParams(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;replaceQueryParams;;;MapKey of Argument[0];ReturnValue;taint;manual"
@@ -1854,7 +1854,7 @@ public class Test {
 			MultiValueMap in = newMultiValueMapWithKey(source());
 			UriComponentsBuilder instance = null;
 			out = instance.replaceQueryParams(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;replaceQueryParams;;;Element of MapValue of Argument[0];ReturnValue;taint;manual"
@@ -1862,14 +1862,14 @@ public class Test {
 			MultiValueMap in = newMultiValueMapWithValue(source());
 			UriComponentsBuilder instance = null;
 			out = instance.replaceQueryParams(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;scheme;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.scheme(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;scheme;;;Argument[0];ReturnValue;taint;manual"
@@ -1877,14 +1877,14 @@ public class Test {
 			String in = (String)source();
 			UriComponentsBuilder instance = null;
 			out = instance.scheme(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;schemeSpecificPart;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.schemeSpecificPart(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;schemeSpecificPart;;;Argument[0];ReturnValue;taint;manual"
@@ -1892,21 +1892,21 @@ public class Test {
 			String in = (String)source();
 			UriComponentsBuilder instance = null;
 			out = instance.schemeSpecificPart(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;toUriString;;;Argument[this];ReturnValue;taint;manual"
 			String out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.toUriString();
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;uri;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.uri(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;uri;;;Argument[0];ReturnValue;taint;manual"
@@ -1914,14 +1914,14 @@ public class Test {
 			URI in = (URI)source();
 			UriComponentsBuilder instance = null;
 			out = instance.uri(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;uriComponents;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.uriComponents(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;uriComponents;;;Argument[0];ReturnValue;taint;manual"
@@ -1929,14 +1929,14 @@ public class Test {
 			UriComponents in = (UriComponents)source();
 			UriComponentsBuilder instance = null;
 			out = instance.uriComponents(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;uriVariables;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.uriVariables(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;uriVariables;;;MapValue of Argument[0];ReturnValue;taint;manual"
@@ -1944,14 +1944,14 @@ public class Test {
 			Map in = newMapWithValue(source());
 			UriComponentsBuilder instance = null;
 			out = instance.uriVariables(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;userInfo;;;Argument[this];ReturnValue;value;manual"
 			UriComponentsBuilder out = null;
 			UriComponentsBuilder in = (UriComponentsBuilder)source();
 			out = in.userInfo(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UriComponentsBuilder;false;userInfo;;;Argument[0];ReturnValue;taint;manual"
@@ -1959,7 +1959,7 @@ public class Test {
 			String in = (String)source();
 			UriComponentsBuilder instance = null;
 			out = instance.userInfo(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplate;false;expand;(Map);;MapValue of Argument[0];ReturnValue;taint;manual"
@@ -1967,7 +1967,7 @@ public class Test {
 			Map in = newMapWithValue(source());
 			UriTemplate instance = null;
 			out = instance.expand(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplate;false;expand;(Object[]);;ArrayElement of Argument[0];ReturnValue;taint;manual"
@@ -1975,14 +1975,14 @@ public class Test {
 			Object[] in = new Object[]{source()};
 			UriTemplate instance = null;
 			out = instance.expand(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplate;false;getVariableNames;;;Argument[this];Element of ReturnValue;taint;manual"
 			List out = null;
 			UriTemplate in = (UriTemplate)source();
 			out = in.getVariableNames();
-			sink(getElement(out)); // $hasTaintFlow
+			sink(getElement(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplate;false;match;;;Argument[0];MapValue of ReturnValue;taint;manual"
@@ -1990,7 +1990,7 @@ public class Test {
 			String in = (String)source();
 			UriTemplate instance = null;
 			out = instance.match(in);
-			sink(getMapValue(out)); // $hasTaintFlow
+			sink(getMapValue(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplateHandler;true;expand;(String,Map);;MapValue of Argument[1];ReturnValue;taint;manual"
@@ -1998,7 +1998,7 @@ public class Test {
 			Map in = newMapWithValue(source());
 			UriTemplateHandler instance = null;
 			out = instance.expand((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplateHandler;true;expand;(String,Map);;MapValue of Argument[1];ReturnValue;taint;manual"
@@ -2006,7 +2006,7 @@ public class Test {
 			Map in = newMapWithValue(source());
 			DefaultUriBuilderFactory instance = null;
 			out = instance.expand((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplateHandler;true;expand;(String,Map);;MapValue of Argument[1];ReturnValue;taint;manual"
@@ -2014,7 +2014,7 @@ public class Test {
 			Map in = newMapWithValue(source());
 			AbstractUriTemplateHandler instance = null;
 			out = instance.expand((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplateHandler;true;expand;(String,Object[]);;ArrayElement of Argument[1];ReturnValue;taint;manual"
@@ -2022,7 +2022,7 @@ public class Test {
 			Object[] in = new Object[]{source()};
 			UriTemplateHandler instance = null;
 			out = instance.expand((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplateHandler;true;expand;(String,Object[]);;ArrayElement of Argument[1];ReturnValue;taint;manual"
@@ -2030,7 +2030,7 @@ public class Test {
 			Object[] in = new Object[]{source()};
 			DefaultUriBuilderFactory instance = null;
 			out = instance.expand((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplateHandler;true;expand;(String,Object[]);;ArrayElement of Argument[1];ReturnValue;taint;manual"
@@ -2038,21 +2038,21 @@ public class Test {
 			Object[] in = new Object[]{source()};
 			AbstractUriTemplateHandler instance = null;
 			out = instance.expand((String)null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[this];ReturnValue;taint;manual"
 			URI out = null;
 			UriTemplateHandler in = (UriTemplateHandler)source();
 			out = in.expand((String)null, (Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[this];ReturnValue;taint;manual"
 			URI out = null;
 			UriTemplateHandler in = (UriTemplateHandler)source();
 			out = in.expand((String)null, (Map)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[0];ReturnValue;taint;manual"
@@ -2060,7 +2060,7 @@ public class Test {
 			String in = (String)source();
 			UriTemplateHandler instance = null;
 			out = instance.expand(in, (Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[0];ReturnValue;taint;manual"
@@ -2068,7 +2068,7 @@ public class Test {
 			String in = (String)source();
 			UriTemplateHandler instance = null;
 			out = instance.expand(in, (Map)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[0];ReturnValue;taint;manual"
@@ -2076,7 +2076,7 @@ public class Test {
 			String in = (String)source();
 			DefaultUriBuilderFactory instance = null;
 			out = instance.expand(in, (Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[0];ReturnValue;taint;manual"
@@ -2084,7 +2084,7 @@ public class Test {
 			String in = (String)source();
 			DefaultUriBuilderFactory instance = null;
 			out = instance.expand(in, (Map)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[0];ReturnValue;taint;manual"
@@ -2092,7 +2092,7 @@ public class Test {
 			String in = (String)source();
 			AbstractUriTemplateHandler instance = null;
 			out = instance.expand(in, (Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[0];ReturnValue;taint;manual"
@@ -2100,245 +2100,245 @@ public class Test {
 			String in = (String)source();
 			AbstractUriTemplateHandler instance = null;
 			out = instance.expand(in, (Map)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[this];ReturnValue;taint;manual"
 			URI out = null;
 			DefaultUriBuilderFactory in = (DefaultUriBuilderFactory)source();
 			out = in.expand((String)null, (Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[this];ReturnValue;taint;manual"
 			URI out = null;
 			DefaultUriBuilderFactory in = (DefaultUriBuilderFactory)source();
 			out = in.expand((String)null, (Map)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[this];ReturnValue;taint;manual"
 			URI out = null;
 			AbstractUriTemplateHandler in = (AbstractUriTemplateHandler)source();
 			out = in.expand((String)null, (Object[])null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriTemplateHandler;true;expand;;;Argument[this];ReturnValue;taint;manual"
 			URI out = null;
 			AbstractUriTemplateHandler in = (AbstractUriTemplateHandler)source();
 			out = in.expand((String)null, (Map)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;decode;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.decode(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;decode;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.decode(in, (Charset)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encode;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encode(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encode;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encode(in, (Charset)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeAuthority;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodeAuthority(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeAuthority;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodeAuthority(in, (Charset)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeFragment;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodeFragment(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeFragment;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodeFragment(in, (Charset)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeHost;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodeHost(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeHost;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodeHost(in, (Charset)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodePath;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodePath(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodePath;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodePath(in, (Charset)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodePathSegment;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodePathSegment(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodePathSegment;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodePathSegment(in, (Charset)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodePort;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodePort(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodePort;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodePort(in, (Charset)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeQuery;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodeQuery(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeQuery;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodeQuery(in, (Charset)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeQueryParam;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodeQueryParam(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeQueryParam;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodeQueryParam(in, (Charset)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeQueryParams;;;MapKey of Argument[0];MapKey of ReturnValue;taint;manual"
 			MultiValueMap out = null;
 			MultiValueMap in = newMultiValueMapWithKey(source());
 			out = UriUtils.encodeQueryParams(in);
-			sink(getMapKey(out)); // $hasTaintFlow
+			sink(getMapKey(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeQueryParams;;;MapValue of Argument[0];MapValue of ReturnValue;taint;manual"
 			MultiValueMap out = null;
 			MultiValueMap in = newMultiValueMapWithValue(source());
 			out = UriUtils.encodeQueryParams(in);
-			sink(getMapValue(out)); // $hasTaintFlow
+			sink(getMapValue(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeScheme;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodeScheme(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeScheme;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodeScheme(in, (Charset)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeUriVariables;(Map);;MapKey of Argument[0];MapKey of ReturnValue;taint;manual"
 			Map out = null;
 			Map in = newMapWithKey(source());
 			out = UriUtils.encodeUriVariables(in);
-			sink(getMapKey(out)); // $hasTaintFlow
+			sink(getMapKey(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeUriVariables;(Map);;MapValue of Argument[0];MapValue of ReturnValue;taint;manual"
 			Map out = null;
 			Map in = newMapWithValue(source());
 			out = UriUtils.encodeUriVariables(in);
-			sink(getMapValue(out)); // $hasTaintFlow
+			sink(getMapValue(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeUriVariables;(Object[]);;ArrayElement of Argument[0];ArrayElement of ReturnValue;taint;manual"
 			Object[] out = null;
 			Object[] in = new Object[]{source()};
 			out = UriUtils.encodeUriVariables(in);
-			sink(out[0]); // $hasTaintFlow
+			sink(out[0]); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeUserInfo;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodeUserInfo(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;encodeUserInfo;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.encodeUserInfo(in, (Charset)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UriUtils;false;extractFileExtension;;;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = UriUtils.extractFileExtension(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UrlPathHelper;false;decodeMatrixVariables;;;MapKey of Argument[1];MapKey of ReturnValue;value;manual"
@@ -2346,7 +2346,7 @@ public class Test {
 			MultiValueMap in = newMultiValueMapWithKey(source());
 			UrlPathHelper instance = null;
 			out = instance.decodeMatrixVariables(null, in);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UrlPathHelper;false;decodeMatrixVariables;;;MapValue of Argument[1];MapValue of ReturnValue;taint;manual"
@@ -2354,7 +2354,7 @@ public class Test {
 			MultiValueMap in = newMultiValueMapWithValue(source());
 			UrlPathHelper instance = null;
 			out = instance.decodeMatrixVariables(null, in);
-			sink(getMapValue(out)); // $hasTaintFlow
+			sink(getMapValue(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UrlPathHelper;false;decodePathVariables;;;MapKey of Argument[1];MapKey of ReturnValue;value;manual"
@@ -2362,7 +2362,7 @@ public class Test {
 			Map in = newMapWithKey(source());
 			UrlPathHelper instance = null;
 			out = instance.decodePathVariables(null, in);
-			sink(getMapKey(out)); // $hasValueFlow
+			sink(getMapKey(out)); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;UrlPathHelper;false;decodePathVariables;;;MapValue of Argument[1];MapValue of ReturnValue;taint;manual"
@@ -2370,7 +2370,7 @@ public class Test {
 			Map in = newMapWithValue(source());
 			UrlPathHelper instance = null;
 			out = instance.decodePathVariables(null, in);
-			sink(getMapValue(out)); // $hasTaintFlow
+			sink(getMapValue(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UrlPathHelper;false;decodeRequestString;;;Argument[1];ReturnValue;taint;manual"
@@ -2378,7 +2378,7 @@ public class Test {
 			String in = (String)source();
 			UrlPathHelper instance = null;
 			out = instance.decodeRequestString(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UrlPathHelper;false;getContextPath;;;Argument[0];ReturnValue;taint;manual"
@@ -2386,7 +2386,7 @@ public class Test {
 			HttpServletRequest in = (HttpServletRequest)source();
 			UrlPathHelper instance = null;
 			out = instance.getContextPath(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UrlPathHelper;false;getOriginatingContextPath;;;Argument[0];ReturnValue;taint;manual"
@@ -2394,7 +2394,7 @@ public class Test {
 			HttpServletRequest in = (HttpServletRequest)source();
 			UrlPathHelper instance = null;
 			out = instance.getOriginatingContextPath(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;UrlPathHelper;false;removeSemicolonContent;;;Argument[0];ReturnValue;taint;manual"
@@ -2402,98 +2402,98 @@ public class Test {
 			String in = (String)source();
 			UrlPathHelper instance = null;
 			out = instance.removeSemicolonContent(in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;WebUtils;false;findParameterValue;(Map,String);;MapValue of Argument[0];ReturnValue;value;manual"
 			String out = null;
 			Map in = newMapWithValue(source());
 			out = WebUtils.findParameterValue(in, (String)null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "org.springframework.web.util;WebUtils;false;findParameterValue;(ServletRequest,String);;Argument[0];ReturnValue;taint;manual"
 			String out = null;
 			ServletRequest in = (ServletRequest)source();
 			out = WebUtils.findParameterValue(in, (String)null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;WebUtils;false;getCookie;;;Argument[0];ReturnValue;taint;manual"
 			Cookie out = null;
 			HttpServletRequest in = (HttpServletRequest)source();
 			out = WebUtils.getCookie(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;WebUtils;false;getNativeRequest;;;Argument[0];ReturnValue;taint;manual"
 			Object out = null;
 			ServletRequest in = (ServletRequest)source();
 			out = WebUtils.getNativeRequest(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;WebUtils;false;getNativeResponse;;;Argument[0];ReturnValue;taint;manual"
 			Object out = null;
 			ServletResponse in = (ServletResponse)source();
 			out = WebUtils.getNativeResponse(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;WebUtils;false;getParametersStartingWith;;;Argument[0];MapKey of ReturnValue;taint;manual"
 			Map out = null;
 			ServletRequest in = (ServletRequest)source();
 			out = WebUtils.getParametersStartingWith(in, null);
-			sink(getMapKey(out)); // $hasTaintFlow
+			sink(getMapKey(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;WebUtils;false;getParametersStartingWith;;;Argument[0];MapValue of ReturnValue;taint;manual"
 			Map out = null;
 			ServletRequest in = (ServletRequest)source();
 			out = WebUtils.getParametersStartingWith(in, null);
-			sink(getMapValue(out)); // $hasTaintFlow
+			sink(getMapValue(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;WebUtils;false;getRealPath;;;Argument[0..1];ReturnValue;taint;manual"
 			String out = null;
 			String in = (String)source();
 			out = WebUtils.getRealPath(null, in);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;WebUtils;false;getRealPath;;;Argument[0..1];ReturnValue;taint;manual"
 			String out = null;
 			ServletContext in = (ServletContext)source();
 			out = WebUtils.getRealPath(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;WebUtils;false;getRequiredSessionAttribute;;;Argument[0];ReturnValue;taint;manual"
 			Object out = null;
 			HttpServletRequest in = (HttpServletRequest)source();
 			out = WebUtils.getRequiredSessionAttribute(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;WebUtils;false;getSessionAttribute;;;Argument[0];ReturnValue;taint;manual"
 			Object out = null;
 			HttpServletRequest in = (HttpServletRequest)source();
 			out = WebUtils.getSessionAttribute(in, null);
-			sink(out); // $hasTaintFlow
+			sink(out); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;WebUtils;false;parseMatrixVariables;;;Argument[0];MapKey of ReturnValue;taint;manual"
 			MultiValueMap out = null;
 			String in = (String)source();
 			out = WebUtils.parseMatrixVariables(in);
-			sink(getMapKey(out)); // $hasTaintFlow
+			sink(getMapKey(out)); // $ hasTaintFlow
 		}
 		{
 			// "org.springframework.web.util;WebUtils;false;parseMatrixVariables;;;Argument[0];MapValue of ReturnValue;taint;manual"
 			MultiValueMap out = null;
 			String in = (String)source();
 			out = WebUtils.parseMatrixVariables(in);
-			sink(getMapValue(out)); // $hasTaintFlow
+			sink(getMapValue(out)); // $ hasTaintFlow
 		}
     {
       // "org.springframework.web.util;HtmlUtils;false;htmlEscape;;;Argument[0];ReturnValue;taint;manual"
diff --git a/java/ql/test/library-tests/guards/Guards.java b/java/ql/test/library-tests/guards/Guards.java
index 689795038c6..35e3b7c09a9 100644
--- a/java/ql/test/library-tests/guards/Guards.java
+++ b/java/ql/test/library-tests/guards/Guards.java
@@ -39,10 +39,10 @@ public class Guards {
         chk(); // $ guarded='s:match "bar"' guarded='s:bar'
         break;
       case "foo":
-        chk(); // $ guarded='s:match "foo"' guarded='s:foo' guarded=g(3):false
+        chk(); // $ guarded='s:non-match "bar"' guarded='s:not bar' guarded='s:match "foo"' guarded='s:foo' guarded=g(3):false
         break;
       default:
-        chk(); // $ guarded='s:non-match "bar"' guarded='s:non-match "foo"' guarded='s:not bar' guarded='s:not foo' guarded='s:match default' guarded=g(3):false
+        chk(); // $ guarded='s:non-match "bar"' guarded='s:non-match "foo"' guarded='s:not bar' guarded='s:not foo' guarded=g(3):false
         break;
     }
 
@@ -92,10 +92,10 @@ public class Guards {
         chk(); // $ guarded='x:match E1' guarded='x:E1' guarded=g(1):true guarded=g(2):false guarded=g(Alt2):false guarded=g(3):false
         break;
       case E2:
-        chk(); // $ guarded='x:match E2' guarded='x:E2' guarded=g(3):false
+        chk(); // $ guarded='x:non-match E1' guarded='x:not E1' guarded='x:match E2' guarded='x:E2' guarded=g(3):false
         break;
       case E3:
-        chk(); // $ guarded='x:match E3' guarded='x:E3' guarded=g(3):true
+        chk(); // $ guarded='x:non-match E1' guarded='x:non-match E2' guarded='x:not E1' guarded='x:not E2' guarded='x:match E3' guarded='x:E3' guarded=g(3):true
         break;
     }
     Object o = g(4) ? new Object() : null;
@@ -198,7 +198,7 @@ public class Guards {
         chk(); // $ guarded='testEnumWrapper(...):SUCCESS' guarded='testEnumWrapper(...):match SUCCESS' guarded=g(1):true
         break;
       case FAILURE:
-        chk(); // $ guarded='testEnumWrapper(...):FAILURE' guarded='testEnumWrapper(...):match FAILURE' guarded=g(1):false
+        chk(); // $ guarded='testEnumWrapper(...):not SUCCESS' guarded='testEnumWrapper(...):non-match SUCCESS' guarded='testEnumWrapper(...):FAILURE' guarded='testEnumWrapper(...):match FAILURE' guarded=g(1):false
         break;
     }
   }
diff --git a/java/ql/test/library-tests/guards/GuardsInline.expected b/java/ql/test/library-tests/guards/GuardsInline.expected
index b0bd3b04c62..9d5ea1992c6 100644
--- a/java/ql/test/library-tests/guards/GuardsInline.expected
+++ b/java/ql/test/library-tests/guards/GuardsInline.expected
@@ -18,8 +18,9 @@
 | Guards.java:39:9:39:13 | chk(...) | 's:match "bar"' |
 | Guards.java:42:9:42:13 | chk(...) | 's:foo' |
 | Guards.java:42:9:42:13 | chk(...) | 's:match "foo"' |
+| Guards.java:42:9:42:13 | chk(...) | 's:non-match "bar"' |
+| Guards.java:42:9:42:13 | chk(...) | 's:not bar' |
 | Guards.java:42:9:42:13 | chk(...) | g(3):false |
-| Guards.java:45:9:45:13 | chk(...) | 's:match default' |
 | Guards.java:45:9:45:13 | chk(...) | 's:non-match "bar"' |
 | Guards.java:45:9:45:13 | chk(...) | 's:non-match "foo"' |
 | Guards.java:45:9:45:13 | chk(...) | 's:not bar' |
@@ -61,9 +62,15 @@
 | Guards.java:92:9:92:13 | chk(...) | g(Alt2):false |
 | Guards.java:95:9:95:13 | chk(...) | 'x:E2' |
 | Guards.java:95:9:95:13 | chk(...) | 'x:match E2' |
+| Guards.java:95:9:95:13 | chk(...) | 'x:non-match E1' |
+| Guards.java:95:9:95:13 | chk(...) | 'x:not E1' |
 | Guards.java:95:9:95:13 | chk(...) | g(3):false |
 | Guards.java:98:9:98:13 | chk(...) | 'x:E3' |
 | Guards.java:98:9:98:13 | chk(...) | 'x:match E3' |
+| Guards.java:98:9:98:13 | chk(...) | 'x:non-match E1' |
+| Guards.java:98:9:98:13 | chk(...) | 'x:non-match E2' |
+| Guards.java:98:9:98:13 | chk(...) | 'x:not E1' |
+| Guards.java:98:9:98:13 | chk(...) | 'x:not E2' |
 | Guards.java:98:9:98:13 | chk(...) | g(3):true |
 | Guards.java:103:7:103:11 | chk(...) | '...?...:...:null' |
 | Guards.java:103:7:103:11 | chk(...) | 'o == null:true' |
@@ -113,6 +120,8 @@
 | Guards.java:198:9:198:13 | chk(...) | g(1):true |
 | Guards.java:201:9:201:13 | chk(...) | 'testEnumWrapper(...):FAILURE' |
 | Guards.java:201:9:201:13 | chk(...) | 'testEnumWrapper(...):match FAILURE' |
+| Guards.java:201:9:201:13 | chk(...) | 'testEnumWrapper(...):non-match SUCCESS' |
+| Guards.java:201:9:201:13 | chk(...) | 'testEnumWrapper(...):not SUCCESS' |
 | Guards.java:201:9:201:13 | chk(...) | g(1):false |
 | Guards.java:213:5:213:9 | chk(...) | 'ensureNotNull(...):no exception' |
 | Guards.java:213:5:213:9 | chk(...) | 's:not null' |
diff --git a/java/ql/test/library-tests/guards/GuardsInline.ql b/java/ql/test/library-tests/guards/GuardsInline.ql
index 1b854659d87..9f29af6de60 100644
--- a/java/ql/test/library-tests/guards/GuardsInline.ql
+++ b/java/ql/test/library-tests/guards/GuardsInline.ql
@@ -11,7 +11,9 @@ string ppGuard(Guard g, Boolean branch) {
   or
   exists(BinaryExpr bin |
     bin = g and
-    result = "'" + bin.getLeftOperand() + bin.getOp() + bin.getRightOperand() + ":" + branch + "'"
+    result =
+      "'" + bin.getLeftOperand() + " " + bin.getOp() + " " + bin.getRightOperand() + ":" + branch +
+        "'"
   )
   or
   exists(SwitchCase cc, Expr s, string match, string value |
diff --git a/java/ql/test/library-tests/guards/guards.ql b/java/ql/test/library-tests/guards/guards.ql
index e2d80a4e738..21a23534ed6 100644
--- a/java/ql/test/library-tests/guards/guards.ql
+++ b/java/ql/test/library-tests/guards/guards.ql
@@ -1,8 +1,9 @@
 import java
 import semmle.code.java.controlflow.Guards
+import utils.test.BasicBlock
 
 from ConditionBlock cb, boolean testIsTrue, BasicBlock controlled
 where
   cb.controls(controlled, testIsTrue) and
   cb.getEnclosingCallable().getDeclaringType().hasName("Test")
-select cb.getCondition(), testIsTrue, controlled
+select cb.getCondition(), testIsTrue, getFirstAstNode(controlled)
diff --git a/java/ql/test/library-tests/guards/guardslogic.expected b/java/ql/test/library-tests/guards/guardslogic.expected
index 6bf536d3ce1..f186c385b8c 100644
--- a/java/ql/test/library-tests/guards/guardslogic.expected
+++ b/java/ql/test/library-tests/guards/guardslogic.expected
@@ -19,13 +19,15 @@
 | Logic.java:17:11:17:15 | ... > ... | false | Logic.java:15:29:15:29 | i |
 | Logic.java:17:11:17:15 | ... > ... | true | Logic.java:17:18:17:23 | break |
 | Logic.java:19:9:19:12 | g(...) | false | Logic.java:24:7:24:17 | case ... |
+| Logic.java:19:9:19:12 | g(...) | false | Logic.java:24:12:24:16 | "foo" |
 | Logic.java:19:9:19:12 | g(...) | false | Logic.java:26:7:26:14 | default |
 | Logic.java:19:9:19:12 | g(...) | true | Logic.java:20:7:20:16 | <Expr>; |
+| Logic.java:22:7:22:17 | case ... | false | Logic.java:24:7:24:17 | case ... |
+| Logic.java:22:7:22:17 | case ... | false | Logic.java:24:12:24:16 | "foo" |
 | Logic.java:22:7:22:17 | case ... | false | Logic.java:26:7:26:14 | default |
-| Logic.java:22:7:22:17 | case ... | true | Logic.java:22:7:22:17 | case ... |
+| Logic.java:22:7:22:17 | case ... | true | Logic.java:22:12:22:16 | "bar" |
 | Logic.java:24:7:24:17 | case ... | false | Logic.java:26:7:26:14 | default |
-| Logic.java:24:7:24:17 | case ... | true | Logic.java:24:7:24:17 | case ... |
-| Logic.java:26:7:26:14 | default | true | Logic.java:26:7:26:14 | default |
+| Logic.java:24:7:24:17 | case ... | true | Logic.java:24:12:24:16 | "foo" |
 | Logic.java:29:16:29:19 | g(...) | false | Logic.java:29:30:29:30 | s |
 | Logic.java:29:16:29:19 | g(...) | false | Logic.java:30:30:31:5 | { ... } |
 | Logic.java:29:16:29:19 | g(...) | true | Logic.java:29:23:29:26 | null |
diff --git a/java/ql/test/library-tests/guards/guardslogic.ql b/java/ql/test/library-tests/guards/guardslogic.ql
index f2ce9fdaa36..e68be505ff7 100644
--- a/java/ql/test/library-tests/guards/guardslogic.ql
+++ b/java/ql/test/library-tests/guards/guardslogic.ql
@@ -1,9 +1,10 @@
 import java
 import semmle.code.java.controlflow.Guards
+import utils.test.BasicBlock
 
 from Guard g, BasicBlock bb, GuardValue gv
 where
   g.valueControls(bb, gv) and
   g.getEnclosingCallable().getDeclaringType().hasName("Logic") and
   (exists(gv.asBooleanValue()) or gv.isThrowsException() or gv.getDualValue().isThrowsException())
-select g, gv, bb
+select g, gv, getFirstAstNode(bb)
diff --git a/java/ql/test/library-tests/guards/guardspreconditions.ql b/java/ql/test/library-tests/guards/guardspreconditions.ql
index 77e4a4e48c0..849ee6087bf 100644
--- a/java/ql/test/library-tests/guards/guardspreconditions.ql
+++ b/java/ql/test/library-tests/guards/guardspreconditions.ql
@@ -1,9 +1,10 @@
 import java
 import semmle.code.java.controlflow.Guards
+import utils.test.BasicBlock
 
 from Guard g, BasicBlock bb, GuardValue gv
 where
   g.valueControls(bb, gv) and
   g.getEnclosingCallable().getDeclaringType().hasName("Preconditions") and
   (gv.isThrowsException() or gv.getDualValue().isThrowsException())
-select g, gv, bb
+select g, gv, getFirstAstNode(bb)
diff --git a/java/ql/test/library-tests/guards12/guard.expected b/java/ql/test/library-tests/guards12/guard.expected
index fade9fd4e8f..e12bf8c6edb 100644
--- a/java/ql/test/library-tests/guards12/guard.expected
+++ b/java/ql/test/library-tests/guards12/guard.expected
@@ -1,55 +1,80 @@
 hasBranchEdge
-| Test.java:4:7:4:22 | case ... | Test.java:2:39:36:3 | { ... } | Test.java:4:7:4:22 | case ... | true |
-| Test.java:5:7:5:17 | case ... | Test.java:2:39:36:3 | { ... } | Test.java:5:7:5:17 | case ... | true |
-| Test.java:6:7:6:17 | case ... | Test.java:2:39:36:3 | { ... } | Test.java:6:7:6:17 | case ... | true |
-| Test.java:7:7:7:16 | default | Test.java:2:39:36:3 | { ... } | Test.java:7:7:7:16 | default | true |
-| Test.java:10:7:10:22 | case ... | Test.java:3:9:3:21 | x | Test.java:10:7:10:22 | case ... | true |
-| Test.java:11:7:11:17 | case ... | Test.java:3:9:3:21 | x | Test.java:11:7:11:17 | case ... | true |
-| Test.java:12:7:12:17 | case ... | Test.java:3:9:3:21 | x | Test.java:12:7:12:17 | case ... | true |
-| Test.java:13:7:13:16 | default | Test.java:3:9:3:21 | x | Test.java:13:7:13:16 | default | true |
+| Test.java:4:7:4:22 | case ... | Test.java:2:39:36:3 | { ... } | Test.java:4:7:4:22 | After case ... [match] | true |
+| Test.java:4:7:4:22 | case ... | Test.java:2:39:36:3 | { ... } | Test.java:5:7:5:17 | case ... | false |
+| Test.java:5:7:5:17 | case ... | Test.java:5:7:5:17 | case ... | Test.java:5:12:5:14 | "c" | true |
+| Test.java:5:7:5:17 | case ... | Test.java:5:7:5:17 | case ... | Test.java:6:7:6:17 | case ... | false |
+| Test.java:6:7:6:17 | case ... | Test.java:6:7:6:17 | case ... | Test.java:6:12:6:14 | "d" | true |
+| Test.java:6:7:6:17 | case ... | Test.java:6:7:6:17 | case ... | Test.java:7:7:7:16 | default | false |
+| Test.java:10:7:10:22 | case ... | Test.java:3:9:3:21 | x | Test.java:10:7:10:22 | After case ... [match] | true |
+| Test.java:10:7:10:22 | case ... | Test.java:3:9:3:21 | x | Test.java:11:7:11:17 | case ... | false |
+| Test.java:11:7:11:17 | case ... | Test.java:11:7:11:17 | case ... | Test.java:11:12:11:14 | "c" | true |
+| Test.java:11:7:11:17 | case ... | Test.java:11:7:11:17 | case ... | Test.java:12:7:12:17 | case ... | false |
+| Test.java:12:7:12:17 | case ... | Test.java:12:7:12:17 | case ... | Test.java:12:12:12:14 | "d" | true |
+| Test.java:12:7:12:17 | case ... | Test.java:12:7:12:17 | case ... | Test.java:13:7:13:16 | default | false |
+| Test.java:17:7:17:36 | case <Pattern> | Test.java:15:5:15:25 | var ...; | Test.java:17:7:17:36 | After case <Pattern> [no-match] | false |
 | Test.java:17:7:17:36 | case <Pattern> | Test.java:15:5:15:25 | var ...; | Test.java:17:19:17:19 | <anonymous local variable> | true |
-| Test.java:17:7:17:36 | case <Pattern> | Test.java:15:5:15:25 | var ...; | Test.java:18:7:18:17 | case ... | false |
-| Test.java:17:7:17:36 | case <Pattern> | Test.java:15:5:15:25 | var ...; | Test.java:19:7:19:16 | default | false |
+| Test.java:17:26:17:33 | ... == ... | Test.java:17:19:17:19 | <anonymous local variable> | Test.java:17:26:17:33 | After ... == ... [false] | false |
 | Test.java:17:26:17:33 | ... == ... | Test.java:17:19:17:19 | <anonymous local variable> | Test.java:17:38:17:40 | { ... } | true |
-| Test.java:17:26:17:33 | ... == ... | Test.java:17:19:17:19 | <anonymous local variable> | Test.java:18:7:18:17 | case ... | false |
-| Test.java:17:26:17:33 | ... == ... | Test.java:17:19:17:19 | <anonymous local variable> | Test.java:19:7:19:16 | default | false |
-| Test.java:18:7:18:17 | case ... | Test.java:15:5:15:25 | var ...; | Test.java:18:7:18:17 | case ... | true |
-| Test.java:18:7:18:17 | case ... | Test.java:17:19:17:19 | <anonymous local variable> | Test.java:18:7:18:17 | case ... | true |
-| Test.java:19:7:19:16 | default | Test.java:15:5:15:25 | var ...; | Test.java:19:7:19:16 | default | true |
-| Test.java:19:7:19:16 | default | Test.java:17:19:17:19 | <anonymous local variable> | Test.java:19:7:19:16 | default | true |
+| Test.java:18:7:18:17 | case ... | Test.java:18:7:18:17 | case ... | Test.java:18:12:18:14 | "e" | true |
+| Test.java:18:7:18:17 | case ... | Test.java:18:7:18:17 | case ... | Test.java:19:7:19:16 | default | false |
 | Test.java:21:13:21:19 | unknown | Test.java:21:5:21:42 | switch (...) | Test.java:21:23:21:23 | s | true |
 | Test.java:21:13:21:19 | unknown | Test.java:21:5:21:42 | switch (...) | Test.java:21:27:21:27 | s | false |
-| Test.java:22:7:22:17 | case ... | Test.java:21:23:21:23 | s | Test.java:22:7:22:17 | case ... | true |
-| Test.java:22:7:22:17 | case ... | Test.java:21:27:21:27 | s | Test.java:22:7:22:17 | case ... | true |
+| Test.java:22:7:22:17 | case ... | Test.java:22:7:22:17 | case ... | Test.java:22:12:22:14 | "f" | true |
+| Test.java:22:7:22:17 | case ... | Test.java:22:7:22:17 | case ... | Test.java:23:7:23:37 | case <Pattern> | false |
+| Test.java:23:7:23:37 | case <Pattern> | Test.java:23:7:23:37 | case <Pattern> | Test.java:23:7:23:37 | After case <Pattern> [no-match] | false |
 | Test.java:23:7:23:37 | case <Pattern> | Test.java:23:7:23:37 | case <Pattern> | Test.java:23:19:23:20 | s2 | true |
-| Test.java:23:7:23:37 | case <Pattern> | Test.java:23:7:23:37 | case <Pattern> | Test.java:24:7:24:17 | case ... | false |
-| Test.java:23:7:23:37 | case <Pattern> | Test.java:23:7:23:37 | case <Pattern> | Test.java:25:7:25:16 | default | false |
+| Test.java:23:27:23:34 | ... == ... | Test.java:23:19:23:20 | s2 | Test.java:23:27:23:34 | After ... == ... [false] | false |
 | Test.java:23:27:23:34 | ... == ... | Test.java:23:19:23:20 | s2 | Test.java:23:39:23:41 | { ... } | true |
-| Test.java:23:27:23:34 | ... == ... | Test.java:23:19:23:20 | s2 | Test.java:24:7:24:17 | case ... | false |
-| Test.java:23:27:23:34 | ... == ... | Test.java:23:19:23:20 | s2 | Test.java:25:7:25:16 | default | false |
-| Test.java:24:7:24:17 | case ... | Test.java:23:7:23:37 | case <Pattern> | Test.java:24:7:24:17 | case ... | true |
-| Test.java:24:7:24:17 | case ... | Test.java:23:19:23:20 | s2 | Test.java:24:7:24:17 | case ... | true |
-| Test.java:25:7:25:16 | default | Test.java:23:7:23:37 | case <Pattern> | Test.java:25:7:25:16 | default | true |
-| Test.java:25:7:25:16 | default | Test.java:23:19:23:20 | s2 | Test.java:25:7:25:16 | default | true |
-| Test.java:28:7:28:15 | case ... | Test.java:27:5:27:14 | switch (...) | Test.java:28:7:28:15 | case ... | true |
+| Test.java:24:7:24:17 | case ... | Test.java:24:7:24:17 | case ... | Test.java:24:12:24:14 | "g" | true |
+| Test.java:24:7:24:17 | case ... | Test.java:24:7:24:17 | case ... | Test.java:25:7:25:16 | default | false |
+| Test.java:28:7:28:15 | case ... | Test.java:27:5:27:14 | switch (...) | Test.java:28:12:28:14 | "h" | true |
+| Test.java:28:7:28:15 | case ... | Test.java:27:5:27:14 | switch (...) | Test.java:29:7:29:34 | case <Pattern> | false |
+| Test.java:29:7:29:34 | case <Pattern> | Test.java:29:7:29:34 | case <Pattern> | Test.java:29:7:29:34 | After case <Pattern> [no-match] | false |
 | Test.java:29:7:29:34 | case <Pattern> | Test.java:29:7:29:34 | case <Pattern> | Test.java:29:19:29:19 | <anonymous local variable> | true |
-| Test.java:29:7:29:34 | case <Pattern> | Test.java:29:7:29:34 | case <Pattern> | Test.java:30:7:30:15 | case ... | false |
-| Test.java:29:7:29:34 | case <Pattern> | Test.java:29:7:29:34 | case <Pattern> | Test.java:33:7:33:14 | default | false |
-| Test.java:29:26:29:33 | ... == ... | Test.java:29:19:29:19 | <anonymous local variable> | Test.java:30:7:30:15 | case ... | false |
-| Test.java:29:26:29:33 | ... == ... | Test.java:29:19:29:19 | <anonymous local variable> | Test.java:30:7:30:15 | case ... | true |
-| Test.java:29:26:29:33 | ... == ... | Test.java:29:19:29:19 | <anonymous local variable> | Test.java:33:7:33:14 | default | false |
-| Test.java:30:7:30:15 | case ... | Test.java:29:7:29:34 | case <Pattern> | Test.java:30:7:30:15 | case ... | true |
-| Test.java:33:7:33:14 | default | Test.java:29:7:29:34 | case <Pattern> | Test.java:33:7:33:14 | default | true |
-| Test.java:33:7:33:14 | default | Test.java:29:19:29:19 | <anonymous local variable> | Test.java:33:7:33:14 | default | true |
+| Test.java:29:26:29:33 | ... == ... | Test.java:29:19:29:19 | <anonymous local variable> | Test.java:29:26:29:33 | After ... == ... [false] | false |
+| Test.java:29:26:29:33 | ... == ... | Test.java:29:19:29:19 | <anonymous local variable> | Test.java:29:26:29:33 | After ... == ... [true] | true |
+| Test.java:30:7:30:15 | case ... | Test.java:30:7:30:15 | case ... | Test.java:30:12:30:14 | "i" | true |
+| Test.java:30:7:30:15 | case ... | Test.java:30:7:30:15 | case ... | Test.java:33:7:33:14 | default | false |
 #select
+| Test.java:5:7:5:17 | case ... | Test.java:3:20:3:20 | s | Test.java:5:12:5:14 | "c" | true | false | Test.java:6:7:6:17 | case ... |
+| Test.java:5:7:5:17 | case ... | Test.java:3:20:3:20 | s | Test.java:5:12:5:14 | "c" | true | false | Test.java:6:12:6:14 | "d" |
 | Test.java:5:7:5:17 | case ... | Test.java:3:20:3:20 | s | Test.java:5:12:5:14 | "c" | true | false | Test.java:7:7:7:16 | default |
-| Test.java:5:7:5:17 | case ... | Test.java:3:20:3:20 | s | Test.java:5:12:5:14 | "c" | true | true | Test.java:5:7:5:17 | case ... |
+| Test.java:5:7:5:17 | case ... | Test.java:3:20:3:20 | s | Test.java:5:12:5:14 | "c" | true | true | Test.java:5:12:5:14 | "c" |
 | Test.java:6:7:6:17 | case ... | Test.java:3:20:3:20 | s | Test.java:6:12:6:14 | "d" | true | false | Test.java:7:7:7:16 | default |
-| Test.java:6:7:6:17 | case ... | Test.java:3:20:3:20 | s | Test.java:6:12:6:14 | "d" | true | true | Test.java:6:7:6:17 | case ... |
+| Test.java:6:7:6:17 | case ... | Test.java:3:20:3:20 | s | Test.java:6:12:6:14 | "d" | true | true | Test.java:6:12:6:14 | "d" |
+| Test.java:11:7:11:17 | case ... | Test.java:9:13:9:13 | s | Test.java:11:12:11:14 | "c" | true | false | Test.java:12:7:12:17 | case ... |
+| Test.java:11:7:11:17 | case ... | Test.java:9:13:9:13 | s | Test.java:11:12:11:14 | "c" | true | false | Test.java:12:12:12:14 | "d" |
 | Test.java:11:7:11:17 | case ... | Test.java:9:13:9:13 | s | Test.java:11:12:11:14 | "c" | true | false | Test.java:13:7:13:16 | default |
-| Test.java:11:7:11:17 | case ... | Test.java:9:13:9:13 | s | Test.java:11:12:11:14 | "c" | true | true | Test.java:11:7:11:17 | case ... |
+| Test.java:11:7:11:17 | case ... | Test.java:9:13:9:13 | s | Test.java:11:12:11:14 | "c" | true | true | Test.java:11:12:11:14 | "c" |
 | Test.java:12:7:12:17 | case ... | Test.java:9:13:9:13 | s | Test.java:12:12:12:14 | "d" | true | false | Test.java:13:7:13:16 | default |
-| Test.java:12:7:12:17 | case ... | Test.java:9:13:9:13 | s | Test.java:12:12:12:14 | "d" | true | true | Test.java:12:7:12:17 | case ... |
+| Test.java:12:7:12:17 | case ... | Test.java:9:13:9:13 | s | Test.java:12:12:12:14 | "d" | true | true | Test.java:12:12:12:14 | "d" |
+| Test.java:17:26:17:33 | ... == ... | Test.java:17:26:17:28 | len | Test.java:17:33:17:33 | 4 | true | false | Test.java:17:26:17:33 | After ... == ... [false] |
 | Test.java:17:26:17:33 | ... == ... | Test.java:17:26:17:28 | len | Test.java:17:33:17:33 | 4 | true | true | Test.java:17:38:17:40 | { ... } |
+| Test.java:18:7:18:17 | case ... | Test.java:16:13:16:13 | s | Test.java:18:12:18:14 | "e" | true | false | Test.java:19:7:19:16 | default |
+| Test.java:18:7:18:17 | case ... | Test.java:16:13:16:13 | s | Test.java:18:12:18:14 | "e" | true | true | Test.java:18:12:18:14 | "e" |
+| Test.java:22:7:22:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | true | false | Test.java:23:7:23:37 | After case <Pattern> [no-match] |
+| Test.java:22:7:22:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | true | false | Test.java:23:7:23:37 | case <Pattern> |
+| Test.java:22:7:22:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | true | false | Test.java:23:19:23:20 | s2 |
+| Test.java:22:7:22:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | true | false | Test.java:23:27:23:34 | After ... == ... [false] |
+| Test.java:22:7:22:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | true | false | Test.java:23:39:23:41 | { ... } |
+| Test.java:22:7:22:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | true | false | Test.java:24:7:24:17 | case ... |
+| Test.java:22:7:22:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | true | false | Test.java:24:12:24:14 | "g" |
+| Test.java:22:7:22:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | true | false | Test.java:25:7:25:16 | default |
+| Test.java:22:7:22:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:22:12:22:14 | "f" | true | true | Test.java:22:12:22:14 | "f" |
+| Test.java:23:27:23:34 | ... == ... | Test.java:23:27:23:29 | len | Test.java:23:34:23:34 | 4 | true | false | Test.java:23:27:23:34 | After ... == ... [false] |
 | Test.java:23:27:23:34 | ... == ... | Test.java:23:27:23:29 | len | Test.java:23:34:23:34 | 4 | true | true | Test.java:23:39:23:41 | { ... } |
-| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | true | Test.java:28:7:28:15 | case ... |
+| Test.java:24:7:24:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:24:12:24:14 | "g" | true | false | Test.java:25:7:25:16 | default |
+| Test.java:24:7:24:17 | case ... | Test.java:21:13:21:41 | ...?...:... | Test.java:24:12:24:14 | "g" | true | true | Test.java:24:12:24:14 | "g" |
+| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | false | Test.java:29:7:29:34 | After case <Pattern> [no-match] |
+| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | false | Test.java:29:7:29:34 | case <Pattern> |
+| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | false | Test.java:29:19:29:19 | <anonymous local variable> |
+| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | false | Test.java:29:26:29:33 | After ... == ... [false] |
+| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | false | Test.java:29:26:29:33 | After ... == ... [true] |
+| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | false | Test.java:30:7:30:15 | case ... |
+| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | false | Test.java:30:12:30:14 | "i" |
+| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | false | Test.java:33:7:33:14 | default |
+| Test.java:28:7:28:15 | case ... | Test.java:27:13:27:13 | s | Test.java:28:12:28:14 | "h" | true | true | Test.java:28:12:28:14 | "h" |
+| Test.java:29:26:29:33 | ... == ... | Test.java:29:26:29:28 | len | Test.java:29:33:29:33 | 4 | true | false | Test.java:29:26:29:33 | After ... == ... [false] |
+| Test.java:29:26:29:33 | ... == ... | Test.java:29:26:29:28 | len | Test.java:29:33:29:33 | 4 | true | true | Test.java:29:26:29:33 | After ... == ... [true] |
+| Test.java:30:7:30:15 | case ... | Test.java:27:13:27:13 | s | Test.java:30:12:30:14 | "i" | true | false | Test.java:33:7:33:14 | default |
+| Test.java:30:7:30:15 | case ... | Test.java:27:13:27:13 | s | Test.java:30:12:30:14 | "i" | true | true | Test.java:30:12:30:14 | "i" |
diff --git a/java/ql/test/library-tests/guards12/guard.ql b/java/ql/test/library-tests/guards12/guard.ql
index d53dfdbc713..39f9fdbe939 100644
--- a/java/ql/test/library-tests/guards12/guard.ql
+++ b/java/ql/test/library-tests/guards12/guard.ql
@@ -1,8 +1,15 @@
 import java
 import semmle.code.java.controlflow.Guards
+import utils.test.BasicBlock
 
-query predicate hasBranchEdge(Guard g, BasicBlock bb1, BasicBlock bb2, GuardValue branch) {
-  g.hasValueBranchEdge(bb1, bb2, branch)
+query predicate hasBranchEdge(
+  Guard g, ControlFlowNode bb1ref, ControlFlowNode bb2ref, GuardValue branch
+) {
+  exists(BasicBlock bb1, BasicBlock bb2 |
+    getFirstAstNodeOrSynth(bb1) = bb1ref and
+    getFirstAstNodeOrSynth(bb2) = bb2ref and
+    g.hasValueBranchEdge(bb1, bb2, branch)
+  )
 }
 
 from Guard g, BasicBlock bb, boolean branch, Expr e1, Expr e2, boolean pol
@@ -10,4 +17,4 @@ where
   g.controls(bb, branch) and
   g.isEquality(e1, e2, pol) and
   not e1 instanceof Literal
-select g, e1, e2, pol, branch, bb
+select g, e1, e2, pol, branch, getFirstAstNodeOrSynth(bb)
diff --git a/java/ql/test/library-tests/java7/MultiCatch/MultiCatchControlFlow.expected b/java/ql/test/library-tests/java7/MultiCatch/MultiCatchControlFlow.expected
index d389eb658f5..54bd6b9388f 100644
--- a/java/ql/test/library-tests/java7/MultiCatch/MultiCatchControlFlow.expected
+++ b/java/ql/test/library-tests/java7/MultiCatch/MultiCatchControlFlow.expected
@@ -1,5 +1,9 @@
+| MultiCatch.java:6:14:6:23 | Entry | MultiCatch.java:6:14:6:23 | { ... } |
+| MultiCatch.java:6:14:6:23 | Normal Exit | MultiCatch.java:6:14:6:23 | Exit |
 | MultiCatch.java:6:14:6:23 | super(...) | MultiCatch.java:6:14:6:23 | Normal Exit |
 | MultiCatch.java:6:14:6:23 | { ... } | MultiCatch.java:6:14:6:23 | super(...) |
+| MultiCatch.java:7:14:7:23 | Entry | MultiCatch.java:8:2:20:2 | { ... } |
+| MultiCatch.java:7:14:7:23 | Exceptional Exit | MultiCatch.java:7:14:7:23 | Exit |
 | MultiCatch.java:8:2:20:2 | { ... } | MultiCatch.java:9:3:19:3 | try ... |
 | MultiCatch.java:9:3:19:3 | try ... | MultiCatch.java:10:3:15:3 | { ... } |
 | MultiCatch.java:10:3:15:3 | { ... } | MultiCatch.java:11:4:11:8 | if (...) |
@@ -10,6 +14,7 @@
 | MultiCatch.java:12:11:12:27 | new IOException(...) | MultiCatch.java:12:5:12:28 | throw ... |
 | MultiCatch.java:14:5:14:29 | throw ... | MultiCatch.java:15:5:15:37 | catch (...) |
 | MultiCatch.java:14:11:14:28 | new SQLException(...) | MultiCatch.java:14:5:14:29 | throw ... |
+| MultiCatch.java:15:5:15:37 | catch (...) | MultiCatch.java:7:14:7:23 | Exceptional Exit |
 | MultiCatch.java:15:5:15:37 | catch (...) | MultiCatch.java:15:36:15:36 | e |
 | MultiCatch.java:15:36:15:36 | e | MultiCatch.java:16:3:19:3 | { ... } |
 | MultiCatch.java:16:3:19:3 | { ... } | MultiCatch.java:17:4:17:23 | <Expr>; |
@@ -18,6 +23,9 @@
 | MultiCatch.java:17:4:17:23 | <Expr>; | MultiCatch.java:17:4:17:4 | e |
 | MultiCatch.java:18:4:18:11 | throw ... | MultiCatch.java:7:14:7:23 | Exceptional Exit |
 | MultiCatch.java:18:10:18:10 | e | MultiCatch.java:18:4:18:11 | throw ... |
+| MultiCatch.java:22:14:22:24 | Entry | MultiCatch.java:23:2:33:2 | { ... } |
+| MultiCatch.java:22:14:22:24 | Exceptional Exit | MultiCatch.java:22:14:22:24 | Exit |
+| MultiCatch.java:22:14:22:24 | Normal Exit | MultiCatch.java:22:14:22:24 | Exit |
 | MultiCatch.java:23:2:33:2 | { ... } | MultiCatch.java:24:3:32:4 | try ... |
 | MultiCatch.java:24:3:32:4 | try ... | MultiCatch.java:25:3:31:3 | { ... } |
 | MultiCatch.java:25:3:31:3 | { ... } | MultiCatch.java:26:4:26:8 | if (...) |
@@ -31,12 +39,14 @@
 | MultiCatch.java:28:12:28:12 | c | MultiCatch.java:30:10:30:24 | new Exception(...) |
 | MultiCatch.java:29:5:29:29 | throw ... | MultiCatch.java:31:5:31:37 | catch (...) |
 | MultiCatch.java:29:11:29:28 | new SQLException(...) | MultiCatch.java:29:5:29:29 | throw ... |
-| MultiCatch.java:30:4:30:25 | throw ... | MultiCatch.java:22:14:22:24 | Exceptional Exit |
 | MultiCatch.java:30:4:30:25 | throw ... | MultiCatch.java:31:5:31:37 | catch (...) |
 | MultiCatch.java:30:10:30:24 | new Exception(...) | MultiCatch.java:30:4:30:25 | throw ... |
+| MultiCatch.java:31:5:31:37 | catch (...) | MultiCatch.java:22:14:22:24 | Exceptional Exit |
 | MultiCatch.java:31:5:31:37 | catch (...) | MultiCatch.java:31:36:31:36 | e |
 | MultiCatch.java:31:36:31:36 | e | MultiCatch.java:32:3:32:4 | { ... } |
 | MultiCatch.java:32:3:32:4 | { ... } | MultiCatch.java:22:14:22:24 | Normal Exit |
+| MultiCatch.java:35:14:35:26 | Entry | MultiCatch.java:36:2:42:2 | { ... } |
+| MultiCatch.java:35:14:35:26 | Normal Exit | MultiCatch.java:35:14:35:26 | Exit |
 | MultiCatch.java:36:2:42:2 | { ... } | MultiCatch.java:37:3:41:4 | try ... |
 | MultiCatch.java:37:3:41:4 | try ... | MultiCatch.java:38:3:40:3 | { ... } |
 | MultiCatch.java:38:3:40:3 | { ... } | MultiCatch.java:39:10:39:26 | new IOException(...) |
diff --git a/java/ql/test/library-tests/java7/MultiCatch/MultiCatchControlFlow.ql b/java/ql/test/library-tests/java7/MultiCatch/MultiCatchControlFlow.ql
index d9263e16088..1f589cc4608 100644
--- a/java/ql/test/library-tests/java7/MultiCatch/MultiCatchControlFlow.ql
+++ b/java/ql/test/library-tests/java7/MultiCatch/MultiCatchControlFlow.ql
@@ -1,5 +1,6 @@
 import default
+import utils.test.AstCfg
 
 from ControlFlowNode n
-where n.getEnclosingStmt().getCompilationUnit().fromSource()
-select n, n.getASuccessor()
+where n.getEnclosingCallable().getCompilationUnit().fromSource()
+select n, getAnAstSuccessor(n)
diff --git a/java/ql/test/library-tests/optional/FunctionalTest.java b/java/ql/test/library-tests/optional/FunctionalTest.java
index 334ec000451..576056a0053 100644
--- a/java/ql/test/library-tests/optional/FunctionalTest.java
+++ b/java/ql/test/library-tests/optional/FunctionalTest.java
@@ -11,48 +11,48 @@ public class FunctionalTest {
     void test() {
         Optional<String> o = Optional.of(source());
         o.ifPresent(v -> {
-            sink(v); // $hasValueFlow
+            sink(v); // $ hasValueFlow
         });
         o.ifPresentOrElse(v -> {
-            sink(v); // $hasValueFlow
+            sink(v); // $ hasValueFlow
         }, () -> {
             // no-op
         });
         o.map(v -> {
-            sink(v); // $hasValueFlow
+            sink(v); // $ hasValueFlow
             return v;
         }).ifPresent(v -> {
-            sink(v); // $hasValueFlow
+            sink(v); // $ hasValueFlow
         });
         o.flatMap(v -> {
-            sink(v); // $hasValueFlow
+            sink(v); // $ hasValueFlow
             return Optional.of(v);
         }).ifPresent(v -> {
-            sink(v); // $hasValueFlow
+            sink(v); // $ hasValueFlow
         });
         o.flatMap(v -> {
-            sink(v); // $hasValueFlow
+            sink(v); // $ hasValueFlow
             return Optional.of("safe");
         }).ifPresent(v -> {
             sink(v); // no value flow
         });
         o.filter(v -> {
-            sink(v); // $hasValueFlow
+            sink(v); // $ hasValueFlow
             return true;
         }).ifPresent(v -> {
-            sink(v); // $hasValueFlow
+            sink(v); // $ hasValueFlow
         });
         Optional.of("safe").map(v -> {
             sink(v); // no value flow
             return v;
         }).or(() -> o).ifPresent(v -> {
-            sink(v); // $hasValueFlow
+            sink(v); // $ hasValueFlow
         });
         Optional<String> safe = Optional.of("safe");
         o.or(() -> safe).ifPresent(v -> {
-            sink(v); // $hasValueFlow
+            sink(v); // $ hasValueFlow
         });
         String value = safe.orElseGet(() -> source());
-        sink(value); // $hasValueFlow
+        sink(value); // $ hasValueFlow
     }
 }
diff --git a/java/ql/test/library-tests/optional/Test.java b/java/ql/test/library-tests/optional/Test.java
index 5d956c74d45..d50b8b7abf3 100644
--- a/java/ql/test/library-tests/optional/Test.java
+++ b/java/ql/test/library-tests/optional/Test.java
@@ -19,35 +19,35 @@ public class Test {
 			Optional<Object> out = null;
 			Optional<Object> in = newWithElement(source());
 			out = in.filter(null);
-			sink(getElement(out)); // $hasValueFlow
+			sink(getElement(out)); // $ hasValueFlow
 		}
 		{
 			// "java.util;Optional;false;get;;;Element of Argument[this];ReturnValue;value;manual"
 			Object out = null;
 			Optional<Object> in = newWithElement(source());
 			out = in.get();
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "java.util;Optional;false;of;;;Argument[0];Element of ReturnValue;value;manual"
 			Optional<Object> out = null;
 			Object in = (Object)source();
 			out = Optional.of(in);
-			sink(getElement(out)); // $hasValueFlow
+			sink(getElement(out)); // $ hasValueFlow
 		}
 		{
 			// "java.util;Optional;false;ofNullable;;;Argument[0];Element of ReturnValue;value;manual"
 			Optional<Object> out = null;
 			Object in = (Object)source();
 			out = Optional.ofNullable(in);
-			sink(getElement(out)); // $hasValueFlow
+			sink(getElement(out)); // $ hasValueFlow
 		}
 		{
 			// "java.util;Optional;false;or;;;Element of Argument[this];Element of ReturnValue;value;manual"
 			Optional<Object> out = null;
 			Optional<Object> in = newWithElement(source());
 			out = in.or(null);
-			sink(getElement(out)); // $hasValueFlow
+			sink(getElement(out)); // $ hasValueFlow
 		}
 		{
 			// "java.util;Optional;false;orElse;;;Argument[0];ReturnValue;value;manual"
@@ -55,44 +55,44 @@ public class Test {
 			Object in = (Object)source();
 			Optional<Object> instance = null;
 			out = instance.orElse(in);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "java.util;Optional;false;orElse;;;Element of Argument[this];ReturnValue;value;manual"
 			Object out = null;
 			Optional<Object> in = newWithElement(source());
 			out = in.orElse(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "java.util;Optional;false;orElseGet;;;Element of Argument[this];ReturnValue;value;manual"
 			Object out = null;
 			Optional<Object> in = newWithElement(source());
 			out = in.orElseGet(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "java.util;Optional;false;orElseThrow;;;Element of Argument[this];ReturnValue;value;manual"
 			Object out = null;
 			Optional<Object> in = newWithElement(source());
 			out = in.orElseThrow(null);
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "java.util;Optional;false;orElseThrow;;;Element of Argument[this];ReturnValue;value;manual"
 			Object out = null;
 			Optional<Object> in = newWithElement(source());
 			out = in.orElseThrow();
-			sink(out); // $hasValueFlow
+			sink(out); // $ hasValueFlow
 		}
 		{
 			// "java.util;Optional;false;stream;;;Element of Argument[this];Element of ReturnValue;value;manual"
 			Stream<Object> out = null;
 			Optional<Object> in = newWithElement(source());
 			out = in.stream();
-			sink(getStreamElement(out)); // $hasValueFlow
+			sink(getStreamElement(out)); // $ hasValueFlow
 		}
 
 	}
 
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/library-tests/pattern-instanceof/cfg.expected b/java/ql/test/library-tests/pattern-instanceof/cfg.expected
index 5ef73c8ac78..92f64965223 100644
--- a/java/ql/test/library-tests/pattern-instanceof/cfg.expected
+++ b/java/ql/test/library-tests/pattern-instanceof/cfg.expected
@@ -1,8 +1,8 @@
-| Test.java:1:14:1:17 | Exceptional Exit | Test.java:1:14:1:17 | Exit |
+| Test.java:1:14:1:17 | Entry | Test.java:1:14:1:17 | { ... } |
 | Test.java:1:14:1:17 | Normal Exit | Test.java:1:14:1:17 | Exit |
 | Test.java:1:14:1:17 | super(...) | Test.java:1:14:1:17 | Normal Exit |
 | Test.java:1:14:1:17 | { ... } | Test.java:1:14:1:17 | super(...) |
-| Test.java:3:22:3:25 | Exceptional Exit | Test.java:3:22:3:25 | Exit |
+| Test.java:3:22:3:25 | Entry | Test.java:3:40:20:3 | { ... } |
 | Test.java:3:22:3:25 | Normal Exit | Test.java:3:22:3:25 | Exit |
 | Test.java:3:40:20:3 | { ... } | Test.java:5:5:5:34 | var ...; |
 | Test.java:5:5:5:34 | var ...; | Test.java:5:26:5:33 | source(...) |
@@ -50,35 +50,39 @@
 | Test.java:17:7:17:26 | sink(...) | Test.java:3:22:3:25 | Normal Exit |
 | Test.java:17:7:17:27 | <Expr>; | Test.java:17:12:17:25 | alsoNotTainted |
 | Test.java:17:12:17:25 | alsoNotTainted | Test.java:17:7:17:26 | sink(...) |
-| Test.java:22:24:22:29 | Exceptional Exit | Test.java:22:24:22:29 | Exit |
+| Test.java:22:24:22:29 | Entry | Test.java:22:33:22:53 | { ... } |
 | Test.java:22:24:22:29 | Normal Exit | Test.java:22:24:22:29 | Exit |
 | Test.java:22:33:22:53 | { ... } | Test.java:22:42:22:50 | "tainted" |
 | Test.java:22:35:22:51 | return ... | Test.java:22:24:22:29 | Normal Exit |
 | Test.java:22:42:22:50 | "tainted" | Test.java:22:35:22:51 | return ... |
-| Test.java:23:22:23:25 | Exceptional Exit | Test.java:23:22:23:25 | Exit |
+| Test.java:23:22:23:25 | Entry | Test.java:23:40:23:42 | { ... } |
 | Test.java:23:22:23:25 | Normal Exit | Test.java:23:22:23:25 | Exit |
 | Test.java:23:40:23:42 | { ... } | Test.java:23:22:23:25 | Normal Exit |
 | Test.java:27:8:27:12 | ...=... | Test.java:27:8:27:12 | <Expr>; |
 | Test.java:27:8:27:12 | ...=... | Test.java:27:8:27:12 | Normal Exit |
 | Test.java:27:8:27:12 | <Expr>; | Test.java:27:8:27:12 | this |
 | Test.java:27:8:27:12 | <Expr>; | Test.java:27:8:27:12 | this |
-| Test.java:27:8:27:12 | Exceptional Exit | Test.java:27:8:27:12 | Exit |
+| Test.java:27:8:27:12 | Entry | Test.java:27:8:27:12 | { ... } |
 | Test.java:27:8:27:12 | Normal Exit | Test.java:27:8:27:12 | Exit |
 | Test.java:27:8:27:12 | i | Test.java:27:8:27:12 | ...=... |
 | Test.java:27:8:27:12 | otherField | Test.java:27:8:27:12 | ...=... |
 | Test.java:27:8:27:12 | super(...) | Test.java:27:8:27:12 | <Expr>; |
-| Test.java:27:8:27:12 | this | Test.java:27:8:27:12 | i |
-| Test.java:27:8:27:12 | this | Test.java:27:8:27:12 | otherField |
+| Test.java:27:8:27:12 | this | Test.java:27:8:27:12 | this.i |
+| Test.java:27:8:27:12 | this | Test.java:27:8:27:12 | this.otherField |
+| Test.java:27:8:27:12 | this.i | Test.java:27:8:27:12 | i |
+| Test.java:27:8:27:12 | this.otherField | Test.java:27:8:27:12 | otherField |
 | Test.java:27:8:27:12 | { ... } | Test.java:27:8:27:12 | super(...) |
 | Test.java:28:8:28:12 | ...=... | Test.java:28:8:28:12 | <Expr>; |
 | Test.java:28:8:28:12 | ...=... | Test.java:28:8:28:12 | Normal Exit |
 | Test.java:28:8:28:12 | <Expr>; | Test.java:28:8:28:12 | this |
 | Test.java:28:8:28:12 | <Expr>; | Test.java:28:8:28:12 | this |
-| Test.java:28:8:28:12 | Exceptional Exit | Test.java:28:8:28:12 | Exit |
+| Test.java:28:8:28:12 | Entry | Test.java:28:8:28:12 | { ... } |
 | Test.java:28:8:28:12 | Normal Exit | Test.java:28:8:28:12 | Exit |
 | Test.java:28:8:28:12 | nonTaintedField | Test.java:28:8:28:12 | ...=... |
 | Test.java:28:8:28:12 | super(...) | Test.java:28:8:28:12 | <Expr>; |
 | Test.java:28:8:28:12 | taintedField | Test.java:28:8:28:12 | ...=... |
-| Test.java:28:8:28:12 | this | Test.java:28:8:28:12 | nonTaintedField |
-| Test.java:28:8:28:12 | this | Test.java:28:8:28:12 | taintedField |
+| Test.java:28:8:28:12 | this | Test.java:28:8:28:12 | this.nonTaintedField |
+| Test.java:28:8:28:12 | this | Test.java:28:8:28:12 | this.taintedField |
+| Test.java:28:8:28:12 | this.nonTaintedField | Test.java:28:8:28:12 | nonTaintedField |
+| Test.java:28:8:28:12 | this.taintedField | Test.java:28:8:28:12 | taintedField |
 | Test.java:28:8:28:12 | { ... } | Test.java:28:8:28:12 | super(...) |
diff --git a/java/ql/test/library-tests/pattern-instanceof/cfg.ql b/java/ql/test/library-tests/pattern-instanceof/cfg.ql
index db2cc49bc0b..7f87f2d61f5 100644
--- a/java/ql/test/library-tests/pattern-instanceof/cfg.ql
+++ b/java/ql/test/library-tests/pattern-instanceof/cfg.ql
@@ -1,5 +1,6 @@
 import java
+import utils.test.AstCfg
 
 from ControlFlowNode cn
 where cn.getLocation().getFile().getBaseName() = "Test.java"
-select cn, cn.getASuccessor()
+select cn, getAnAstSuccessor(cn)
diff --git a/java/ql/test/library-tests/pattern-switch/cfg/test.expected b/java/ql/test/library-tests/pattern-switch/cfg/test.expected
index f9058bd8f4c..d398c5f6ecd 100644
--- a/java/ql/test/library-tests/pattern-switch/cfg/test.expected
+++ b/java/ql/test/library-tests/pattern-switch/cfg/test.expected
@@ -1,32 +1,35 @@
-| Exhaustive.java:1:14:1:23 | Exceptional Exit | Exhaustive.java:1:14:1:23 | Exit |
+| Exhaustive.java:1:14:1:23 | Entry | Exhaustive.java:1:14:1:23 | { ... } |
 | Exhaustive.java:1:14:1:23 | Normal Exit | Exhaustive.java:1:14:1:23 | Exit |
 | Exhaustive.java:1:14:1:23 | super(...) | Exhaustive.java:1:14:1:23 | Normal Exit |
 | Exhaustive.java:1:14:1:23 | { ... } | Exhaustive.java:1:14:1:23 | super(...) |
-| Exhaustive.java:3:8:3:8 | Exceptional Exit | Exhaustive.java:3:8:3:8 | Exit |
-| Exhaustive.java:3:8:3:8 | Exceptional Exit | Exhaustive.java:3:8:3:8 | Exit |
+| Exhaustive.java:3:8:3:8 | Entry | Exhaustive.java:3:8:3:8 | { ... } |
+| Exhaustive.java:3:8:3:8 | Entry | Exhaustive.java:3:8:3:8 | { ... } |
 | Exhaustive.java:3:8:3:8 | Normal Exit | Exhaustive.java:3:8:3:8 | Exit |
 | Exhaustive.java:3:8:3:8 | Normal Exit | Exhaustive.java:3:8:3:8 | Exit |
 | Exhaustive.java:3:8:3:8 | super(...) | Exhaustive.java:3:8:3:8 | Normal Exit |
 | Exhaustive.java:3:8:3:8 | { ... } | Exhaustive.java:3:8:3:8 | super(...) |
 | Exhaustive.java:3:8:3:8 | { ... } | Exhaustive.java:3:12:3:12 | <Expr>; |
 | Exhaustive.java:3:12:3:12 | ...=... | Exhaustive.java:3:15:3:15 | <Expr>; |
-| Exhaustive.java:3:12:3:12 | <Expr>; | Exhaustive.java:3:12:3:12 | new E(...) |
+| Exhaustive.java:3:12:3:12 | <Expr>; | Exhaustive.java:3:12:3:12 | A |
+| Exhaustive.java:3:12:3:12 | A | Exhaustive.java:3:12:3:12 | new E(...) |
 | Exhaustive.java:3:12:3:12 | new E(...) | Exhaustive.java:3:12:3:12 | ...=... |
 | Exhaustive.java:3:15:3:15 | ...=... | Exhaustive.java:3:18:3:18 | <Expr>; |
-| Exhaustive.java:3:15:3:15 | <Expr>; | Exhaustive.java:3:15:3:15 | new E(...) |
+| Exhaustive.java:3:15:3:15 | <Expr>; | Exhaustive.java:3:15:3:15 | B |
+| Exhaustive.java:3:15:3:15 | B | Exhaustive.java:3:15:3:15 | new E(...) |
 | Exhaustive.java:3:15:3:15 | new E(...) | Exhaustive.java:3:15:3:15 | ...=... |
 | Exhaustive.java:3:18:3:18 | ...=... | Exhaustive.java:3:8:3:8 | Normal Exit |
-| Exhaustive.java:3:18:3:18 | <Expr>; | Exhaustive.java:3:18:3:18 | new E(...) |
+| Exhaustive.java:3:18:3:18 | <Expr>; | Exhaustive.java:3:18:3:18 | C |
+| Exhaustive.java:3:18:3:18 | C | Exhaustive.java:3:18:3:18 | new E(...) |
 | Exhaustive.java:3:18:3:18 | new E(...) | Exhaustive.java:3:18:3:18 | ...=... |
-| Exhaustive.java:5:15:5:15 | Exceptional Exit | Exhaustive.java:5:15:5:15 | Exit |
+| Exhaustive.java:5:15:5:15 | Entry | Exhaustive.java:5:15:5:15 | { ... } |
 | Exhaustive.java:5:15:5:15 | Normal Exit | Exhaustive.java:5:15:5:15 | Exit |
 | Exhaustive.java:5:15:5:15 | super(...) | Exhaustive.java:5:15:5:15 | Normal Exit |
 | Exhaustive.java:5:15:5:15 | { ... } | Exhaustive.java:5:15:5:15 | super(...) |
-| Exhaustive.java:6:15:6:15 | Exceptional Exit | Exhaustive.java:6:15:6:15 | Exit |
+| Exhaustive.java:6:15:6:15 | Entry | Exhaustive.java:6:15:6:15 | { ... } |
 | Exhaustive.java:6:15:6:15 | Normal Exit | Exhaustive.java:6:15:6:15 | Exit |
 | Exhaustive.java:6:15:6:15 | super(...) | Exhaustive.java:6:15:6:15 | Normal Exit |
 | Exhaustive.java:6:15:6:15 | { ... } | Exhaustive.java:6:15:6:15 | super(...) |
-| Exhaustive.java:8:22:8:25 | Exceptional Exit | Exhaustive.java:8:22:8:25 | Exit |
+| Exhaustive.java:8:22:8:25 | Entry | Exhaustive.java:8:47:35:3 | { ... } |
 | Exhaustive.java:8:22:8:25 | Normal Exit | Exhaustive.java:8:22:8:25 | Exit |
 | Exhaustive.java:8:47:35:3 | { ... } | Exhaustive.java:11:5:11:14 | switch (...) |
 | Exhaustive.java:11:5:11:14 | switch (...) | Exhaustive.java:11:13:11:13 | o |
@@ -40,14 +43,17 @@
 | Exhaustive.java:13:25:13:27 | { ... } | Exhaustive.java:18:5:18:14 | switch (...) |
 | Exhaustive.java:18:5:18:14 | switch (...) | Exhaustive.java:18:13:18:13 | e |
 | Exhaustive.java:18:13:18:13 | e | Exhaustive.java:19:7:19:15 | case ... |
-| Exhaustive.java:18:13:18:13 | e | Exhaustive.java:20:7:20:15 | case ... |
-| Exhaustive.java:18:13:18:13 | e | Exhaustive.java:21:7:21:15 | case ... |
-| Exhaustive.java:18:13:18:13 | e | Exhaustive.java:24:5:24:14 | switch (...) |
-| Exhaustive.java:19:7:19:15 | case ... | Exhaustive.java:19:17:19:19 | { ... } |
+| Exhaustive.java:19:7:19:15 | case ... | Exhaustive.java:19:12:19:12 | A |
+| Exhaustive.java:19:7:19:15 | case ... | Exhaustive.java:20:7:20:15 | case ... |
+| Exhaustive.java:19:12:19:12 | A | Exhaustive.java:19:17:19:19 | { ... } |
 | Exhaustive.java:19:17:19:19 | { ... } | Exhaustive.java:24:5:24:14 | switch (...) |
-| Exhaustive.java:20:7:20:15 | case ... | Exhaustive.java:20:17:20:19 | { ... } |
+| Exhaustive.java:20:7:20:15 | case ... | Exhaustive.java:20:12:20:12 | B |
+| Exhaustive.java:20:7:20:15 | case ... | Exhaustive.java:21:7:21:15 | case ... |
+| Exhaustive.java:20:12:20:12 | B | Exhaustive.java:20:17:20:19 | { ... } |
 | Exhaustive.java:20:17:20:19 | { ... } | Exhaustive.java:24:5:24:14 | switch (...) |
-| Exhaustive.java:21:7:21:15 | case ... | Exhaustive.java:21:17:21:19 | { ... } |
+| Exhaustive.java:21:7:21:15 | case ... | Exhaustive.java:21:12:21:12 | C |
+| Exhaustive.java:21:7:21:15 | case ... | Exhaustive.java:24:5:24:14 | switch (...) |
+| Exhaustive.java:21:12:21:12 | C | Exhaustive.java:21:17:21:19 | { ... } |
 | Exhaustive.java:21:17:21:19 | { ... } | Exhaustive.java:24:5:24:14 | switch (...) |
 | Exhaustive.java:24:5:24:14 | switch (...) | Exhaustive.java:24:13:24:13 | i |
 | Exhaustive.java:24:13:24:13 | i | Exhaustive.java:25:7:25:17 | case <Pattern> |
@@ -65,11 +71,11 @@
 | Exhaustive.java:31:14:31:14 | <anonymous local variable> | Exhaustive.java:8:22:8:25 | Normal Exit |
 | Exhaustive.java:32:7:32:15 | case <Pattern> | Exhaustive.java:32:14:32:14 | <anonymous local variable> |
 | Exhaustive.java:32:14:32:14 | <anonymous local variable> | Exhaustive.java:8:22:8:25 | Normal Exit |
-| Test.java:1:14:1:17 | Exceptional Exit | Test.java:1:14:1:17 | Exit |
+| Test.java:1:14:1:17 | Entry | Test.java:1:14:1:17 | { ... } |
 | Test.java:1:14:1:17 | Normal Exit | Test.java:1:14:1:17 | Exit |
 | Test.java:1:14:1:17 | super(...) | Test.java:1:14:1:17 | Normal Exit |
 | Test.java:1:14:1:17 | { ... } | Test.java:1:14:1:17 | super(...) |
-| Test.java:3:22:3:25 | Exceptional Exit | Test.java:3:22:3:25 | Exit |
+| Test.java:3:22:3:25 | Entry | Test.java:3:41:134:3 | { ... } |
 | Test.java:3:22:3:25 | Normal Exit | Test.java:3:22:3:25 | Exit |
 | Test.java:3:41:134:3 | { ... } | Test.java:5:6:5:19 | switch (...) |
 | Test.java:5:6:5:19 | switch (...) | Test.java:5:14:5:18 | thing |
@@ -79,14 +85,12 @@
 | Test.java:6:20:6:20 | s | Test.java:6:25:6:34 | System.out |
 | Test.java:6:25:6:34 | System.out | Test.java:6:44:6:44 | s |
 | Test.java:6:25:6:45 | println(...) | Test.java:11:6:11:19 | switch (...) |
-| Test.java:6:25:6:46 | <Expr>; | Test.java:6:25:6:34 | System.out |
 | Test.java:6:44:6:44 | s | Test.java:6:25:6:45 | println(...) |
 | Test.java:7:8:7:24 | case <Pattern> | Test.java:7:21:7:21 | i |
 | Test.java:7:8:7:24 | case <Pattern> | Test.java:8:8:8:17 | default |
 | Test.java:7:21:7:21 | i | Test.java:7:26:7:35 | System.out |
 | Test.java:7:26:7:35 | System.out | Test.java:7:45:7:58 | "An integer: " |
 | Test.java:7:26:7:63 | println(...) | Test.java:11:6:11:19 | switch (...) |
-| Test.java:7:26:7:64 | <Expr>; | Test.java:7:26:7:35 | System.out |
 | Test.java:7:45:7:58 | "An integer: " | Test.java:7:62:7:62 | i |
 | Test.java:7:45:7:62 | ... + ... | Test.java:7:26:7:63 | println(...) |
 | Test.java:7:62:7:62 | i | Test.java:7:45:7:62 | ... + ... |
@@ -136,19 +140,19 @@
 | Test.java:28:34:28:38 | thing | Test.java:29:8:29:21 | case <Pattern> |
 | Test.java:29:8:29:21 | case <Pattern> | Test.java:29:20:29:20 | s |
 | Test.java:29:8:29:21 | case <Pattern> | Test.java:31:8:31:22 | case <Pattern> |
-| Test.java:29:20:29:20 | s | Test.java:30:10:30:17 | yield ... |
-| Test.java:30:10:30:17 | yield ... | Test.java:30:16:30:16 | s |
-| Test.java:30:16:30:16 | s | Test.java:28:10:28:39 | thingAsString2 |
+| Test.java:29:20:29:20 | s | Test.java:30:16:30:16 | s |
+| Test.java:30:10:30:17 | yield ... | Test.java:28:10:28:39 | thingAsString2 |
+| Test.java:30:16:30:16 | s | Test.java:30:10:30:17 | yield ... |
 | Test.java:31:8:31:22 | case <Pattern> | Test.java:31:21:31:21 | i |
 | Test.java:31:8:31:22 | case <Pattern> | Test.java:33:8:33:15 | default |
-| Test.java:31:21:31:21 | i | Test.java:32:10:32:34 | yield ... |
-| Test.java:32:10:32:34 | yield ... | Test.java:32:16:32:29 | "An integer: " |
+| Test.java:31:21:31:21 | i | Test.java:32:16:32:29 | "An integer: " |
+| Test.java:32:10:32:34 | yield ... | Test.java:28:10:28:39 | thingAsString2 |
 | Test.java:32:16:32:29 | "An integer: " | Test.java:32:33:32:33 | i |
-| Test.java:32:16:32:33 | ... + ... | Test.java:28:10:28:39 | thingAsString2 |
+| Test.java:32:16:32:33 | ... + ... | Test.java:32:10:32:34 | yield ... |
 | Test.java:32:33:32:33 | i | Test.java:32:16:32:33 | ... + ... |
-| Test.java:33:8:33:15 | default | Test.java:34:10:34:32 | yield ... |
-| Test.java:34:10:34:32 | yield ... | Test.java:34:16:34:31 | "Something else" |
-| Test.java:34:16:34:31 | "Something else" | Test.java:28:10:28:39 | thingAsString2 |
+| Test.java:33:8:33:15 | default | Test.java:34:16:34:31 | "Something else" |
+| Test.java:34:10:34:32 | yield ... | Test.java:28:10:28:39 | thingAsString2 |
+| Test.java:34:16:34:31 | "Something else" | Test.java:34:10:34:32 | yield ... |
 | Test.java:37:6:37:18 | switch (...) | Test.java:37:13:37:17 | thing |
 | Test.java:37:13:37:17 | thing | Test.java:38:8:38:42 | case <Pattern> |
 | Test.java:38:8:38:42 | case <Pattern> | Test.java:38:20:38:20 | s |
@@ -195,7 +199,6 @@
 | Test.java:50:41:50:41 | 3 | Test.java:50:27:50:41 | ... == ... |
 | Test.java:50:46:50:55 | System.out | Test.java:50:65:50:74 | "Length 3" |
 | Test.java:50:46:50:75 | println(...) | Test.java:55:6:55:26 | switch (...) |
-| Test.java:50:46:50:76 | <Expr>; | Test.java:50:46:50:55 | System.out |
 | Test.java:50:65:50:74 | "Length 3" | Test.java:50:46:50:75 | println(...) |
 | Test.java:51:8:51:44 | case <Pattern> | Test.java:51:20:51:20 | s |
 | Test.java:51:8:51:44 | case <Pattern> | Test.java:52:8:52:17 | default |
@@ -207,22 +210,22 @@
 | Test.java:51:41:51:41 | 5 | Test.java:51:27:51:41 | ... == ... |
 | Test.java:51:46:51:55 | System.out | Test.java:51:65:51:74 | "Length 5" |
 | Test.java:51:46:51:75 | println(...) | Test.java:55:6:55:26 | switch (...) |
-| Test.java:51:46:51:76 | <Expr>; | Test.java:51:46:51:55 | System.out |
 | Test.java:51:65:51:74 | "Length 5" | Test.java:51:46:51:75 | println(...) |
 | Test.java:52:8:52:17 | default | Test.java:52:19:52:21 | { ... } |
 | Test.java:52:19:52:21 | { ... } | Test.java:55:6:55:26 | switch (...) |
 | Test.java:55:6:55:26 | switch (...) | Test.java:55:21:55:25 | thing |
 | Test.java:55:13:55:25 | (...)... | Test.java:56:8:56:21 | case ... |
-| Test.java:55:13:55:25 | (...)... | Test.java:58:8:58:21 | case ... |
-| Test.java:55:13:55:25 | (...)... | Test.java:61:8:61:42 | case <Pattern> |
-| Test.java:55:13:55:25 | (...)... | Test.java:69:8:69:26 | case null, default |
 | Test.java:55:21:55:25 | thing | Test.java:55:13:55:25 | (...)... |
-| Test.java:56:8:56:21 | case ... | Test.java:57:10:57:44 | <Expr>; |
+| Test.java:56:8:56:21 | case ... | Test.java:56:13:56:20 | "Const1" |
+| Test.java:56:8:56:21 | case ... | Test.java:58:8:58:21 | case ... |
+| Test.java:56:13:56:20 | "Const1" | Test.java:57:10:57:44 | <Expr>; |
 | Test.java:57:10:57:19 | System.out | Test.java:57:29:57:42 | "It's Const1!" |
-| Test.java:57:10:57:43 | println(...) | Test.java:58:8:58:21 | case ... |
+| Test.java:57:10:57:43 | println(...) | Test.java:59:10:59:54 | <Expr>; |
 | Test.java:57:10:57:44 | <Expr>; | Test.java:57:10:57:19 | System.out |
 | Test.java:57:29:57:42 | "It's Const1!" | Test.java:57:10:57:43 | println(...) |
-| Test.java:58:8:58:21 | case ... | Test.java:59:10:59:54 | <Expr>; |
+| Test.java:58:8:58:21 | case ... | Test.java:58:13:58:20 | "Const2" |
+| Test.java:58:8:58:21 | case ... | Test.java:61:8:61:42 | case <Pattern> |
+| Test.java:58:13:58:20 | "Const2" | Test.java:59:10:59:54 | <Expr>; |
 | Test.java:59:10:59:19 | System.out | Test.java:59:29:59:52 | "It's Const1 or Const2!" |
 | Test.java:59:10:59:53 | println(...) | Test.java:60:10:60:15 | break |
 | Test.java:59:10:59:54 | <Expr>; | Test.java:59:10:59:19 | System.out |
@@ -230,27 +233,27 @@
 | Test.java:60:10:60:15 | break | Test.java:73:6:73:18 | switch (...) |
 | Test.java:61:8:61:42 | case <Pattern> | Test.java:61:20:61:20 | s |
 | Test.java:61:8:61:42 | case <Pattern> | Test.java:63:8:63:21 | case ... |
-| Test.java:61:8:61:42 | case <Pattern> | Test.java:66:8:66:22 | case ... |
-| Test.java:61:8:61:42 | case <Pattern> | Test.java:69:8:69:26 | case null, default |
 | Test.java:61:20:61:20 | s | Test.java:61:27:61:27 | s |
 | Test.java:61:27:61:27 | s | Test.java:61:27:61:36 | length(...) |
 | Test.java:61:27:61:36 | length(...) | Test.java:61:41:61:41 | 6 |
 | Test.java:61:27:61:41 | ... <= ... | Test.java:62:10:62:83 | <Expr>; |
 | Test.java:61:27:61:41 | ... <= ... | Test.java:63:8:63:21 | case ... |
-| Test.java:61:27:61:41 | ... <= ... | Test.java:66:8:66:22 | case ... |
-| Test.java:61:27:61:41 | ... <= ... | Test.java:69:8:69:26 | case null, default |
 | Test.java:61:41:61:41 | 6 | Test.java:61:27:61:41 | ... <= ... |
 | Test.java:62:10:62:19 | System.out | Test.java:62:29:62:81 | "It's <= 6 chars long, and neither Const1 nor Const2" |
-| Test.java:62:10:62:82 | println(...) | Test.java:63:8:63:21 | case ... |
+| Test.java:62:10:62:82 | println(...) | Test.java:64:10:64:96 | <Expr>; |
 | Test.java:62:10:62:83 | <Expr>; | Test.java:62:10:62:19 | System.out |
 | Test.java:62:29:62:81 | "It's <= 6 chars long, and neither Const1 nor Const2" | Test.java:62:10:62:82 | println(...) |
-| Test.java:63:8:63:21 | case ... | Test.java:64:10:64:96 | <Expr>; |
+| Test.java:63:8:63:21 | case ... | Test.java:63:13:63:20 | "Const3" |
+| Test.java:63:8:63:21 | case ... | Test.java:66:8:66:22 | case ... |
+| Test.java:63:13:63:20 | "Const3" | Test.java:64:10:64:96 | <Expr>; |
 | Test.java:64:10:64:19 | System.out | Test.java:64:29:64:94 | "It's (<= 6 chars long, and neither Const1 nor Const2), or Const3" |
 | Test.java:64:10:64:95 | println(...) | Test.java:65:10:65:15 | break |
 | Test.java:64:10:64:96 | <Expr>; | Test.java:64:10:64:19 | System.out |
 | Test.java:64:29:64:94 | "It's (<= 6 chars long, and neither Const1 nor Const2), or Const3" | Test.java:64:10:64:95 | println(...) |
 | Test.java:65:10:65:15 | break | Test.java:73:6:73:18 | switch (...) |
-| Test.java:66:8:66:22 | case ... | Test.java:67:10:67:44 | <Expr>; |
+| Test.java:66:8:66:22 | case ... | Test.java:66:13:66:21 | "Const30" |
+| Test.java:66:8:66:22 | case ... | Test.java:69:8:69:26 | case null, default |
+| Test.java:66:13:66:21 | "Const30" | Test.java:67:10:67:44 | <Expr>; |
 | Test.java:67:10:67:19 | System.out | Test.java:67:29:67:42 | "It's Const30" |
 | Test.java:67:10:67:43 | println(...) | Test.java:68:10:68:15 | break |
 | Test.java:67:10:67:44 | <Expr>; | Test.java:67:10:67:19 | System.out |
@@ -263,16 +266,17 @@
 | Test.java:70:29:70:58 | "It's null, or something else" | Test.java:70:10:70:59 | println(...) |
 | Test.java:73:6:73:18 | switch (...) | Test.java:73:13:73:17 | thing |
 | Test.java:73:13:73:17 | thing | Test.java:74:8:74:21 | case <Pattern> |
-| Test.java:73:13:73:17 | thing | Test.java:77:8:77:17 | case ... |
 | Test.java:74:8:74:21 | case <Pattern> | Test.java:74:20:74:20 | s |
-| Test.java:74:8:74:21 | case <Pattern> | Test.java:80:8:80:22 | case <Pattern> |
+| Test.java:74:8:74:21 | case <Pattern> | Test.java:77:8:77:17 | case ... |
 | Test.java:74:20:74:20 | s | Test.java:75:10:75:31 | <Expr>; |
 | Test.java:75:10:75:19 | System.out | Test.java:75:29:75:29 | s |
 | Test.java:75:10:75:30 | println(...) | Test.java:76:10:76:15 | break |
 | Test.java:75:10:75:31 | <Expr>; | Test.java:75:10:75:19 | System.out |
 | Test.java:75:29:75:29 | s | Test.java:75:10:75:30 | println(...) |
 | Test.java:76:10:76:15 | break | Test.java:87:6:87:18 | switch (...) |
-| Test.java:77:8:77:17 | case ... | Test.java:78:10:78:41 | <Expr>; |
+| Test.java:77:8:77:17 | case ... | Test.java:77:13:77:16 | null |
+| Test.java:77:8:77:17 | case ... | Test.java:80:8:80:22 | case <Pattern> |
+| Test.java:77:13:77:16 | null | Test.java:78:10:78:41 | <Expr>; |
 | Test.java:78:10:78:19 | System.out | Test.java:78:29:78:39 | "It's null" |
 | Test.java:78:10:78:40 | println(...) | Test.java:79:10:79:15 | break |
 | Test.java:78:10:78:41 | <Expr>; | Test.java:78:10:78:19 | System.out |
@@ -347,7 +351,7 @@
 | Test.java:110:26:110:30 | thing | Test.java:111:8:111:20 | case <Pattern> |
 | Test.java:111:8:111:20 | case <Pattern> | Test.java:111:15:111:15 | <anonymous local variable> |
 | Test.java:111:8:111:20 | case <Pattern> | Test.java:112:8:112:77 | case <Pattern> |
-| Test.java:111:13:111:19 | B(...) | Test.java:114:10:114:17 | yield ... |
+| Test.java:111:13:111:19 | B(...) | Test.java:114:16:114:16 | 1 |
 | Test.java:111:15:111:15 | <anonymous local variable> | Test.java:111:18:111:18 | <anonymous local variable> |
 | Test.java:111:18:111:18 | <anonymous local variable> | Test.java:111:13:111:19 | B(...) |
 | Test.java:112:8:112:77 | case <Pattern> | Test.java:112:21:112:21 | <anonymous local variable> |
@@ -362,32 +366,34 @@
 | Test.java:112:47:112:51 | thing | Test.java:112:47:112:62 | toString(...) |
 | Test.java:112:47:112:62 | toString(...) | Test.java:112:71:112:75 | "abc" |
 | Test.java:112:47:112:76 | equals(...) | Test.java:113:8:113:20 | case <Pattern> |
-| Test.java:112:47:112:76 | equals(...) | Test.java:114:10:114:17 | yield ... |
+| Test.java:112:47:112:76 | equals(...) | Test.java:114:16:114:16 | 1 |
 | Test.java:112:71:112:75 | "abc" | Test.java:112:47:112:76 | equals(...) |
 | Test.java:113:8:113:20 | case <Pattern> | Test.java:113:19:113:19 | <anonymous local variable> |
 | Test.java:113:8:113:20 | case <Pattern> | Test.java:115:8:115:15 | default |
-| Test.java:113:19:113:19 | <anonymous local variable> | Test.java:114:10:114:17 | yield ... |
-| Test.java:114:10:114:17 | yield ... | Test.java:114:16:114:16 | 1 |
-| Test.java:114:16:114:16 | 1 | Test.java:110:10:110:31 | result |
-| Test.java:115:8:115:15 | default | Test.java:116:10:116:17 | yield ... |
-| Test.java:116:10:116:17 | yield ... | Test.java:116:16:116:16 | 2 |
-| Test.java:116:16:116:16 | 2 | Test.java:110:10:110:31 | result |
+| Test.java:113:19:113:19 | <anonymous local variable> | Test.java:114:16:114:16 | 1 |
+| Test.java:114:10:114:17 | yield ... | Test.java:110:10:110:31 | result |
+| Test.java:114:16:114:16 | 1 | Test.java:114:10:114:17 | yield ... |
+| Test.java:115:8:115:15 | default | Test.java:116:16:116:16 | 2 |
+| Test.java:116:10:116:17 | yield ... | Test.java:110:10:110:31 | result |
+| Test.java:116:16:116:16 | 2 | Test.java:116:10:116:17 | yield ... |
 | Test.java:119:6:119:27 | switch (...) | Test.java:119:22:119:26 | thing |
 | Test.java:119:14:119:26 | (...)... | Test.java:120:8:120:16 | case ... |
-| Test.java:119:14:119:26 | (...)... | Test.java:121:8:121:56 | case <Pattern> |
 | Test.java:119:22:119:26 | thing | Test.java:119:14:119:26 | (...)... |
-| Test.java:120:8:120:16 | case ... | Test.java:122:8:122:16 | case ... |
+| Test.java:120:8:120:16 | case ... | Test.java:120:13:120:15 | "a" |
+| Test.java:120:8:120:16 | case ... | Test.java:121:8:121:56 | case <Pattern> |
+| Test.java:120:13:120:15 | "a" | Test.java:123:10:123:15 | break |
 | Test.java:121:8:121:56 | case <Pattern> | Test.java:121:20:121:20 | <anonymous local variable> |
 | Test.java:121:8:121:56 | case <Pattern> | Test.java:122:8:122:16 | case ... |
-| Test.java:121:8:121:56 | case <Pattern> | Test.java:124:8:124:15 | default |
 | Test.java:121:20:121:20 | <anonymous local variable> | Test.java:121:36:121:40 | thing |
 | Test.java:121:27:121:50 | length(...) | Test.java:121:55:121:55 | 5 |
 | Test.java:121:27:121:55 | ... == ... | Test.java:122:8:122:16 | case ... |
-| Test.java:121:27:121:55 | ... == ... | Test.java:124:8:124:15 | default |
+| Test.java:121:27:121:55 | ... == ... | Test.java:123:10:123:15 | break |
 | Test.java:121:28:121:40 | (...)... | Test.java:121:27:121:50 | length(...) |
 | Test.java:121:36:121:40 | thing | Test.java:121:28:121:40 | (...)... |
 | Test.java:121:55:121:55 | 5 | Test.java:121:27:121:55 | ... == ... |
-| Test.java:122:8:122:16 | case ... | Test.java:123:10:123:15 | break |
+| Test.java:122:8:122:16 | case ... | Test.java:122:13:122:15 | "b" |
+| Test.java:122:8:122:16 | case ... | Test.java:124:8:124:15 | default |
+| Test.java:122:13:122:15 | "b" | Test.java:123:10:123:15 | break |
 | Test.java:123:10:123:15 | break | Test.java:129:6:129:18 | switch (...) |
 | Test.java:124:8:124:15 | default | Test.java:125:10:125:15 | break |
 | Test.java:125:10:125:15 | break | Test.java:129:6:129:18 | switch (...) |
@@ -395,29 +401,33 @@
 | Test.java:129:13:129:17 | thing | Test.java:130:8:130:21 | case <Pattern> |
 | Test.java:130:8:130:21 | case <Pattern> | Test.java:130:20:130:20 | <anonymous local variable> |
 | Test.java:130:8:130:21 | case <Pattern> | Test.java:131:8:131:15 | default |
-| Test.java:130:20:130:20 | <anonymous local variable> | Test.java:131:8:131:15 | default |
+| Test.java:130:20:130:20 | <anonymous local variable> | Test.java:3:22:3:25 | Normal Exit |
 | Test.java:131:8:131:15 | default | Test.java:3:22:3:25 | Normal Exit |
 | Test.java:138:8:138:8 | ...=... | Test.java:138:8:138:8 | <Expr>; |
 | Test.java:138:8:138:8 | ...=... | Test.java:138:8:138:8 | Normal Exit |
 | Test.java:138:8:138:8 | <Expr>; | Test.java:138:8:138:8 | this |
 | Test.java:138:8:138:8 | <Expr>; | Test.java:138:8:138:8 | this |
-| Test.java:138:8:138:8 | Exceptional Exit | Test.java:138:8:138:8 | Exit |
+| Test.java:138:8:138:8 | Entry | Test.java:138:8:138:8 | { ... } |
 | Test.java:138:8:138:8 | Normal Exit | Test.java:138:8:138:8 | Exit |
 | Test.java:138:8:138:8 | b | Test.java:138:8:138:8 | ...=... |
 | Test.java:138:8:138:8 | field3 | Test.java:138:8:138:8 | ...=... |
 | Test.java:138:8:138:8 | super(...) | Test.java:138:8:138:8 | <Expr>; |
-| Test.java:138:8:138:8 | this | Test.java:138:8:138:8 | b |
-| Test.java:138:8:138:8 | this | Test.java:138:8:138:8 | field3 |
+| Test.java:138:8:138:8 | this | Test.java:138:8:138:8 | this.b |
+| Test.java:138:8:138:8 | this | Test.java:138:8:138:8 | this.field3 |
+| Test.java:138:8:138:8 | this.b | Test.java:138:8:138:8 | b |
+| Test.java:138:8:138:8 | this.field3 | Test.java:138:8:138:8 | field3 |
 | Test.java:138:8:138:8 | { ... } | Test.java:138:8:138:8 | super(...) |
 | Test.java:139:8:139:8 | ...=... | Test.java:139:8:139:8 | <Expr>; |
 | Test.java:139:8:139:8 | ...=... | Test.java:139:8:139:8 | Normal Exit |
 | Test.java:139:8:139:8 | <Expr>; | Test.java:139:8:139:8 | this |
 | Test.java:139:8:139:8 | <Expr>; | Test.java:139:8:139:8 | this |
-| Test.java:139:8:139:8 | Exceptional Exit | Test.java:139:8:139:8 | Exit |
+| Test.java:139:8:139:8 | Entry | Test.java:139:8:139:8 | { ... } |
 | Test.java:139:8:139:8 | Normal Exit | Test.java:139:8:139:8 | Exit |
 | Test.java:139:8:139:8 | field1 | Test.java:139:8:139:8 | ...=... |
 | Test.java:139:8:139:8 | field2 | Test.java:139:8:139:8 | ...=... |
 | Test.java:139:8:139:8 | super(...) | Test.java:139:8:139:8 | <Expr>; |
-| Test.java:139:8:139:8 | this | Test.java:139:8:139:8 | field1 |
-| Test.java:139:8:139:8 | this | Test.java:139:8:139:8 | field2 |
+| Test.java:139:8:139:8 | this | Test.java:139:8:139:8 | this.field1 |
+| Test.java:139:8:139:8 | this | Test.java:139:8:139:8 | this.field2 |
+| Test.java:139:8:139:8 | this.field1 | Test.java:139:8:139:8 | field1 |
+| Test.java:139:8:139:8 | this.field2 | Test.java:139:8:139:8 | field2 |
 | Test.java:139:8:139:8 | { ... } | Test.java:139:8:139:8 | super(...) |
diff --git a/java/ql/test/library-tests/pattern-switch/cfg/test.ql b/java/ql/test/library-tests/pattern-switch/cfg/test.ql
index 7e0a85af822..f858ec60eeb 100644
--- a/java/ql/test/library-tests/pattern-switch/cfg/test.ql
+++ b/java/ql/test/library-tests/pattern-switch/cfg/test.ql
@@ -1,5 +1,6 @@
 import java
+import utils.test.AstCfg
 
 from ControlFlowNode cn
 where cn.getLocation().getFile().getBaseName() = ["Test.java", "Exhaustive.java"]
-select cn, cn.getASuccessor()
+select cn, getAnAstSuccessor(cn)
diff --git a/java/ql/test/library-tests/ssa/captures.expected b/java/ql/test/library-tests/ssa/captures.expected
index 3d8b8e13602..e3ccd98ce16 100644
--- a/java/ql/test/library-tests/ssa/captures.expected
+++ b/java/ql/test/library-tests/ssa/captures.expected
@@ -1,9 +1,9 @@
-| Nested.java:8:29:8:57 | SSA capture def(next(..).p1) | Nested.java:4:34:10:3 | SSA param(p1) |
-| Nested.java:8:29:8:57 | SSA capture def(next(..).x1) | Nested.java:5:9:5:14 | SSA def(x1) |
+| Nested.java:8:22:8:25 | SSA capture def(next(..).p1) | Nested.java:4:21:4:24 | SSA param(p1) |
+| Nested.java:8:22:8:25 | SSA capture def(next(..).x1) | Nested.java:5:9:5:14 | SSA def(x1) |
 | Nested.java:16:22:16:34 | SSA capture def(getInt(..).obj) | Nested.java:15:12:15:29 | SSA def(obj) |
-| Nested.java:19:27:22:7 | SSA capture def(getInt(..).hash) | Nested.java:16:15:16:34 | SSA def(hash) |
-| Nested.java:19:27:22:7 | SSA capture def(getInt(..).x2) | Nested.java:17:9:17:15 | SSA def(x2) |
+| Nested.java:19:18:19:23 | SSA capture def(getInt(..).hash) | Nested.java:16:15:16:34 | SSA def(hash) |
+| Nested.java:19:18:19:23 | SSA capture def(getInt(..).x2) | Nested.java:17:9:17:15 | SSA def(x2) |
 | Nested.java:20:27:20:39 | SSA capture def(getInt(..).obj) | Nested.java:15:12:15:29 | SSA def(obj) |
-| Nested.java:30:23:30:36 | SSA capture def(getInt(..).obj2) | Nested.java:30:5:30:37 | SSA phi(obj2) |
-| Nested.java:37:20:37:25 | SSA capture def(getInt(..).x3) | Nested.java:36:7:36:12 | SSA def(x3) |
-| Nested.java:40:20:40:25 | SSA capture def(getInt(..).x3) | Nested.java:39:7:39:12 | SSA def(x3) |
+| Nested.java:30:23:30:36 | SSA capture def(getInt(..).obj2) | Nested.java:25:5:25:24 | SSA phi(obj2) |
+| Nested.java:37:14:37:25 | SSA capture def(getInt(..).x3) | Nested.java:36:7:36:12 | SSA def(x3) |
+| Nested.java:40:14:40:25 | SSA capture def(getInt(..).x3) | Nested.java:39:7:39:12 | SSA def(x3) |
diff --git a/java/ql/test/library-tests/ssa/firstUse.expected b/java/ql/test/library-tests/ssa/firstUse.expected
index 6494791be34..a9257337738 100644
--- a/java/ql/test/library-tests/ssa/firstUse.expected
+++ b/java/ql/test/library-tests/ssa/firstUse.expected
@@ -1,11 +1,11 @@
-| Fields.java:12:19:21:3 | SSA entry def(this.xs) | Fields.java:13:15:13:16 | xs |
+| Fields.java:12:15:12:15 | SSA entry def(this.xs) | Fields.java:13:15:13:16 | xs |
 | Fields.java:14:5:14:9 | SSA call def(this.xs) | Fields.java:15:9:15:10 | xs |
 | Fields.java:15:5:15:10 | SSA def(x) | Fields.java:16:9:16:9 | x |
+| Fields.java:16:5:16:17 | SSA phi(this.xs) | Fields.java:18:9:18:15 | this.xs |
 | Fields.java:17:7:17:11 | SSA call def(this.xs) | Fields.java:18:9:18:15 | this.xs |
-| Fields.java:18:5:18:16 | SSA phi(this.xs) | Fields.java:18:9:18:15 | this.xs |
 | Fields.java:19:5:19:19 | SSA def(this.xs) | Fields.java:20:9:20:10 | xs |
-| Fields.java:23:19:49:3 | SSA entry def(Fields.stat) | Fields.java:27:15:27:18 | stat |
-| Fields.java:23:19:49:3 | SSA entry def(this.xs) | Fields.java:26:15:26:16 | xs |
+| Fields.java:23:15:23:15 | SSA entry def(Fields.stat) | Fields.java:27:15:27:18 | stat |
+| Fields.java:23:15:23:15 | SSA entry def(this.xs) | Fields.java:26:15:26:16 | xs |
 | Fields.java:24:12:24:27 | SSA def(f) | Fields.java:25:15:25:15 | f |
 | Fields.java:24:12:24:27 | SSA qualifier def(f.xs) | Fields.java:25:15:25:18 | f.xs |
 | Fields.java:24:16:24:27 | SSA call def(Fields.stat) | Fields.java:27:15:27:18 | stat |
@@ -18,52 +18,52 @@
 | Fields.java:36:5:36:19 | SSA def(this.xs) | Fields.java:38:9:38:10 | xs |
 | Fields.java:39:5:39:21 | SSA def(f.xs) | Fields.java:40:9:40:12 | f.xs |
 | Fields.java:41:5:41:10 | SSA def(z) | Fields.java:42:9:42:9 | z |
+| Fields.java:42:5:42:17 | SSA phi(Fields.stat) | Fields.java:48:9:48:12 | stat |
+| Fields.java:42:5:42:17 | SSA phi(f) | Fields.java:44:9:44:9 | f |
+| Fields.java:42:5:42:17 | SSA phi(f.xs) | Fields.java:44:9:44:12 | f.xs |
 | Fields.java:43:7:43:22 | SSA def(f) | Fields.java:44:9:44:9 | f |
 | Fields.java:43:7:43:22 | SSA qualifier def(f.xs) | Fields.java:44:9:44:12 | f.xs |
 | Fields.java:43:11:43:22 | SSA call def(Fields.stat) | Fields.java:48:9:48:12 | stat |
-| Fields.java:44:5:44:13 | SSA phi(Fields.stat) | Fields.java:48:9:48:12 | stat |
-| Fields.java:44:5:44:13 | SSA phi(f) | Fields.java:44:9:44:9 | f |
-| Fields.java:44:5:44:13 | SSA phi(f.xs) | Fields.java:44:9:44:12 | f.xs |
 | Fields.java:45:5:45:16 | SSA call def(Fields.stat) | Fields.java:48:9:48:12 | stat |
-| Nested.java:8:29:8:57 | SSA capture def(next(..).p1) | Nested.java:8:38:8:39 | p1 |
-| Nested.java:8:29:8:57 | SSA capture def(next(..).x1) | Nested.java:8:43:8:44 | x1 |
+| Nested.java:8:22:8:25 | SSA capture def(next(..).p1) | Nested.java:8:38:8:39 | p1 |
+| Nested.java:8:22:8:25 | SSA capture def(next(..).x1) | Nested.java:8:43:8:44 | x1 |
 | Nested.java:16:22:16:34 | SSA capture def(getInt(..).obj) | Nested.java:16:22:16:24 | obj |
 | Nested.java:18:15:23:5 | SSA def(h2) | Nested.java:25:9:25:10 | h2 |
-| Nested.java:19:27:22:7 | SSA capture def(getInt(..).hash) | Nested.java:21:21:21:24 | hash |
-| Nested.java:19:27:22:7 | SSA capture def(getInt(..).x2) | Nested.java:21:16:21:17 | x2 |
+| Nested.java:19:18:19:23 | SSA capture def(getInt(..).hash) | Nested.java:21:21:21:24 | hash |
+| Nested.java:19:18:19:23 | SSA capture def(getInt(..).x2) | Nested.java:21:16:21:17 | x2 |
 | Nested.java:20:19:20:39 | SSA def(hnest) | Nested.java:21:37:21:41 | hnest |
 | Nested.java:20:27:20:39 | SSA capture def(getInt(..).obj) | Nested.java:20:27:20:29 | obj |
 | Nested.java:30:23:30:36 | SSA capture def(getInt(..).obj2) | Nested.java:30:23:30:26 | obj2 |
-| Nested.java:33:29:42:3 | SSA param(p3) | Nested.java:35:9:35:10 | p3 |
-| Nested.java:37:20:37:25 | SSA capture def(getInt(..).x3) | Nested.java:37:20:37:21 | x3 |
-| Nested.java:40:20:40:25 | SSA capture def(getInt(..).x3) | Nested.java:40:20:40:21 | x3 |
-| Test.java:4:19:32:2 | SSA param(param) | Test.java:9:7:9:11 | param |
+| Nested.java:33:13:33:19 | SSA param(p3) | Nested.java:35:9:35:10 | p3 |
+| Nested.java:37:14:37:25 | SSA capture def(getInt(..).x3) | Nested.java:37:20:37:21 | x3 |
+| Nested.java:40:14:40:25 | SSA capture def(getInt(..).x3) | Nested.java:40:20:40:21 | x3 |
+| Test.java:4:6:4:6 | SSA param(param) | Test.java:9:7:9:11 | param |
 | Test.java:6:7:6:11 | SSA def(x) | Test.java:10:4:10:4 | x |
 | Test.java:6:7:6:11 | SSA def(x) | Test.java:20:10:20:10 | x |
+| Test.java:9:3:9:16 | SSA phi(x) | Test.java:20:10:20:10 | x |
+| Test.java:9:3:9:16 | SSA phi(y) | Test.java:20:14:20:14 | y |
 | Test.java:10:4:10:6 | SSA def(x) | Test.java:11:10:11:10 | x |
 | Test.java:11:4:11:10 | SSA def(y) | Test.java:20:14:20:14 | y |
 | Test.java:11:8:11:10 | SSA def(x) | Test.java:20:10:20:10 | x |
 | Test.java:14:4:14:8 | SSA def(y) | Test.java:15:4:15:4 | y |
 | Test.java:15:4:15:9 | SSA def(y) | Test.java:20:14:20:14 | y |
-| Test.java:19:3:19:3 | SSA phi(x) | Test.java:20:10:20:10 | x |
-| Test.java:19:3:19:3 | SSA phi(y) | Test.java:20:14:20:14 | y |
-| Test.java:20:10:20:10 | SSA phi(param) | Test.java:21:8:21:12 | param |
-| Test.java:20:10:20:10 | SSA phi(y) | Test.java:20:14:20:14 | y |
+| Test.java:20:3:20:15 | SSA phi(param) | Test.java:21:8:21:12 | param |
+| Test.java:20:3:20:15 | SSA phi(y) | Test.java:20:14:20:14 | y |
 | Test.java:21:8:21:14 | SSA def(param) | Test.java:21:8:21:12 | param |
 | Test.java:24:4:24:9 | SSA def(y) | Test.java:20:14:20:14 | y |
 | Test.java:27:12:27:16 | SSA def(i) | Test.java:27:19:27:19 | i |
-| Test.java:27:19:27:19 | SSA phi(i) | Test.java:27:19:27:19 | i |
-| Test.java:27:19:27:19 | SSA phi(x) | Test.java:28:4:28:4 | x |
-| Test.java:27:19:27:19 | SSA phi(x) | Test.java:31:10:31:10 | x |
+| Test.java:27:19:27:22 | SSA phi(i) | Test.java:27:19:27:19 | i |
+| Test.java:27:19:27:22 | SSA phi(x) | Test.java:28:4:28:4 | x |
+| Test.java:27:19:27:22 | SSA phi(x) | Test.java:31:10:31:10 | x |
 | Test.java:27:25:27:27 | SSA def(i) | Test.java:27:19:27:19 | i |
 | Test.java:28:4:28:9 | SSA def(x) | Test.java:28:4:28:4 | x |
 | Test.java:28:4:28:9 | SSA def(x) | Test.java:31:10:31:10 | x |
-| TestInstanceOfPattern.java:3:24:9:2 | SSA param(obj) | TestInstanceOfPattern.java:4:7:4:9 | obj |
+| TestInstanceOfPattern.java:3:7:3:10 | SSA param(obj) | TestInstanceOfPattern.java:4:7:4:9 | obj |
 | TestInstanceOfPattern.java:4:29:4:29 | SSA def(s) | TestInstanceOfPattern.java:5:8:5:8 | s |
-| TestInstanceOfPattern.java:10:25:16:2 | SSA param(obj) | TestInstanceOfPattern.java:11:9:11:11 | obj |
+| TestInstanceOfPattern.java:10:7:10:11 | SSA param(obj) | TestInstanceOfPattern.java:11:9:11:11 | obj |
 | TestInstanceOfPattern.java:11:31:11:31 | SSA def(s) | TestInstanceOfPattern.java:14:8:14:8 | s |
-| TestInstanceOfPattern.java:17:25:23:2 | SSA param(obj) | TestInstanceOfPattern.java:18:7:18:9 | obj |
+| TestInstanceOfPattern.java:17:7:17:11 | SSA param(obj) | TestInstanceOfPattern.java:18:7:18:9 | obj |
 | TestInstanceOfPattern.java:18:29:18:29 | SSA def(s) | TestInstanceOfPattern.java:18:34:18:34 | s |
-| TestInstanceOfPattern.java:24:25:30:2 | SSA entry def(this.s) | TestInstanceOfPattern.java:25:34:25:34 | s |
-| TestInstanceOfPattern.java:24:25:30:2 | SSA entry def(this.s) | TestInstanceOfPattern.java:26:8:26:8 | s |
-| TestInstanceOfPattern.java:24:25:30:2 | SSA param(obj) | TestInstanceOfPattern.java:25:7:25:9 | obj |
+| TestInstanceOfPattern.java:24:7:24:11 | SSA entry def(this.s) | TestInstanceOfPattern.java:25:34:25:34 | s |
+| TestInstanceOfPattern.java:24:7:24:11 | SSA entry def(this.s) | TestInstanceOfPattern.java:26:8:26:8 | s |
+| TestInstanceOfPattern.java:24:7:24:11 | SSA param(obj) | TestInstanceOfPattern.java:25:7:25:9 | obj |
diff --git a/java/ql/test/library-tests/ssa/ssaDef.expected b/java/ql/test/library-tests/ssa/ssaDef.expected
index a10b9d327b2..2deba0dcebb 100644
--- a/java/ql/test/library-tests/ssa/ssaDef.expected
+++ b/java/ql/test/library-tests/ssa/ssaDef.expected
@@ -1,75 +1,75 @@
 | Fields.java:13:5:13:17 | x | Fields.java:15:5:15:10 | ...=... | SSA def(x) |
-| Fields.java:13:15:13:16 | this.xs | Fields.java:12:19:21:3 | { ... } | SSA entry def(this.xs) |
+| Fields.java:13:15:13:16 | this.xs | Fields.java:12:15:12:15 | Entry | SSA entry def(this.xs) |
 | Fields.java:13:15:13:16 | this.xs | Fields.java:14:5:14:9 | upd(...) | SSA call def(this.xs) |
+| Fields.java:13:15:13:16 | this.xs | Fields.java:16:5:16:17 | After if (...) | SSA phi(this.xs) |
 | Fields.java:13:15:13:16 | this.xs | Fields.java:17:7:17:11 | upd(...) | SSA call def(this.xs) |
-| Fields.java:13:15:13:16 | this.xs | Fields.java:18:5:18:16 | <Expr>; | SSA phi(this.xs) |
 | Fields.java:13:15:13:16 | this.xs | Fields.java:19:5:19:19 | ...=... | SSA def(this.xs) |
 | Fields.java:24:5:24:28 | f | Fields.java:24:12:24:27 | f | SSA def(f) |
+| Fields.java:24:5:24:28 | f | Fields.java:42:5:42:17 | After if (...) | SSA phi(f) |
 | Fields.java:24:5:24:28 | f | Fields.java:43:7:43:22 | ...=... | SSA def(f) |
-| Fields.java:24:5:24:28 | f | Fields.java:44:5:44:13 | <Expr>; | SSA phi(f) |
 | Fields.java:25:15:25:18 | f.xs | Fields.java:24:12:24:27 | f | SSA qualifier def(f.xs) |
 | Fields.java:25:15:25:18 | f.xs | Fields.java:28:5:28:12 | f(...) | SSA call def(f.xs) |
 | Fields.java:25:15:25:18 | f.xs | Fields.java:32:5:32:9 | f(...) | SSA call def(f.xs) |
 | Fields.java:25:15:25:18 | f.xs | Fields.java:39:5:39:21 | ...=... | SSA def(f.xs) |
+| Fields.java:25:15:25:18 | f.xs | Fields.java:42:5:42:17 | After if (...) | SSA phi(f.xs) |
 | Fields.java:25:15:25:18 | f.xs | Fields.java:43:7:43:22 | ...=... | SSA qualifier def(f.xs) |
-| Fields.java:25:15:25:18 | f.xs | Fields.java:44:5:44:13 | <Expr>; | SSA phi(f.xs) |
 | Fields.java:26:5:26:17 | z | Fields.java:41:5:41:10 | ...=... | SSA def(z) |
-| Fields.java:26:15:26:16 | this.xs | Fields.java:23:19:49:3 | { ... } | SSA entry def(this.xs) |
+| Fields.java:26:15:26:16 | this.xs | Fields.java:23:15:23:15 | Entry | SSA entry def(this.xs) |
 | Fields.java:26:15:26:16 | this.xs | Fields.java:28:5:28:12 | f(...) | SSA call def(this.xs) |
 | Fields.java:26:15:26:16 | this.xs | Fields.java:32:5:32:9 | f(...) | SSA call def(this.xs) |
 | Fields.java:26:15:26:16 | this.xs | Fields.java:36:5:36:19 | ...=... | SSA def(this.xs) |
-| Fields.java:27:15:27:18 | Fields.stat | Fields.java:23:19:49:3 | { ... } | SSA entry def(Fields.stat) |
+| Fields.java:27:15:27:18 | Fields.stat | Fields.java:23:15:23:15 | Entry | SSA entry def(Fields.stat) |
 | Fields.java:27:15:27:18 | Fields.stat | Fields.java:24:16:24:27 | new Fields(...) | SSA call def(Fields.stat) |
 | Fields.java:27:15:27:18 | Fields.stat | Fields.java:28:5:28:12 | f(...) | SSA call def(Fields.stat) |
 | Fields.java:27:15:27:18 | Fields.stat | Fields.java:32:5:32:9 | f(...) | SSA call def(Fields.stat) |
+| Fields.java:27:15:27:18 | Fields.stat | Fields.java:42:5:42:17 | After if (...) | SSA phi(Fields.stat) |
 | Fields.java:27:15:27:18 | Fields.stat | Fields.java:43:11:43:22 | new Fields(...) | SSA call def(Fields.stat) |
-| Fields.java:27:15:27:18 | Fields.stat | Fields.java:44:5:44:13 | <Expr>; | SSA phi(Fields.stat) |
 | Fields.java:27:15:27:18 | Fields.stat | Fields.java:45:5:45:16 | new Fields(...) | SSA call def(Fields.stat) |
-| Nested.java:4:26:4:31 | next(..).p1 | Nested.java:8:29:8:57 | { ... } | SSA capture def(next(..).p1) |
-| Nested.java:4:26:4:31 | p1 | Nested.java:4:34:10:3 | { ... } | SSA param(p1) |
-| Nested.java:5:5:5:15 | next(..).x1 | Nested.java:8:29:8:57 | { ... } | SSA capture def(next(..).x1) |
+| Nested.java:4:26:4:31 | next(..).p1 | Nested.java:8:22:8:25 | Entry | SSA capture def(next(..).p1) |
+| Nested.java:4:26:4:31 | p1 | Nested.java:4:21:4:24 | Entry | SSA param(p1) |
+| Nested.java:5:5:5:15 | next(..).x1 | Nested.java:8:22:8:25 | Entry | SSA capture def(next(..).x1) |
 | Nested.java:5:5:5:15 | x1 | Nested.java:5:9:5:14 | x1 | SSA def(x1) |
-| Nested.java:15:5:15:30 | getInt(..).obj | Nested.java:16:22:16:34 | { ... } | SSA capture def(getInt(..).obj) |
-| Nested.java:15:5:15:30 | getInt(..).obj | Nested.java:20:27:20:39 | { ... } | SSA capture def(getInt(..).obj) |
+| Nested.java:15:5:15:30 | getInt(..).obj | Nested.java:16:22:16:34 | Entry | SSA capture def(getInt(..).obj) |
+| Nested.java:15:5:15:30 | getInt(..).obj | Nested.java:20:27:20:39 | Entry | SSA capture def(getInt(..).obj) |
 | Nested.java:15:5:15:30 | obj | Nested.java:15:12:15:29 | obj | SSA def(obj) |
-| Nested.java:16:5:16:35 | getInt(..).hash | Nested.java:19:27:22:7 | { ... } | SSA capture def(getInt(..).hash) |
+| Nested.java:16:5:16:35 | getInt(..).hash | Nested.java:19:18:19:23 | Entry | SSA capture def(getInt(..).hash) |
 | Nested.java:16:5:16:35 | hash | Nested.java:16:15:16:34 | hash | SSA def(hash) |
-| Nested.java:17:5:17:16 | getInt(..).x2 | Nested.java:19:27:22:7 | { ... } | SSA capture def(getInt(..).x2) |
+| Nested.java:17:5:17:16 | getInt(..).x2 | Nested.java:19:18:19:23 | Entry | SSA capture def(getInt(..).x2) |
 | Nested.java:17:5:17:16 | x2 | Nested.java:17:9:17:15 | x2 | SSA def(x2) |
 | Nested.java:18:5:23:6 | h2 | Nested.java:18:15:23:5 | h2 | SSA def(h2) |
 | Nested.java:20:9:20:40 | hnest | Nested.java:20:19:20:39 | hnest | SSA def(hnest) |
-| Nested.java:24:5:24:31 | getInt(..).obj2 | Nested.java:30:23:30:36 | { ... } | SSA capture def(getInt(..).obj2) |
+| Nested.java:24:5:24:31 | getInt(..).obj2 | Nested.java:30:23:30:36 | Entry | SSA capture def(getInt(..).obj2) |
+| Nested.java:24:5:24:31 | obj2 | Nested.java:25:5:25:24 | After if (...) | SSA phi(obj2) |
 | Nested.java:24:5:24:31 | obj2 | Nested.java:26:7:26:25 | ...=... | SSA def(obj2) |
 | Nested.java:24:5:24:31 | obj2 | Nested.java:28:7:28:25 | ...=... | SSA def(obj2) |
-| Nested.java:24:5:24:31 | obj2 | Nested.java:30:5:30:37 | var ...; | SSA phi(obj2) |
-| Nested.java:33:21:33:26 | p3 | Nested.java:33:29:42:3 | { ... } | SSA param(p3) |
-| Nested.java:34:5:34:11 | getInt(..).x3 | Nested.java:37:20:37:25 | { ... } | SSA capture def(getInt(..).x3) |
-| Nested.java:34:5:34:11 | getInt(..).x3 | Nested.java:40:20:40:25 | { ... } | SSA capture def(getInt(..).x3) |
+| Nested.java:33:21:33:26 | p3 | Nested.java:33:13:33:19 | Entry | SSA param(p3) |
+| Nested.java:34:5:34:11 | getInt(..).x3 | Nested.java:37:14:37:25 | Entry | SSA capture def(getInt(..).x3) |
+| Nested.java:34:5:34:11 | getInt(..).x3 | Nested.java:40:14:40:25 | Entry | SSA capture def(getInt(..).x3) |
 | Nested.java:34:5:34:11 | x3 | Nested.java:36:7:36:12 | ...=... | SSA def(x3) |
 | Nested.java:34:5:34:11 | x3 | Nested.java:39:7:39:12 | ...=... | SSA def(x3) |
-| Test.java:4:8:4:16 | param | Test.java:4:19:32:2 | { ... } | SSA param(param) |
-| Test.java:4:8:4:16 | param | Test.java:20:10:20:10 | x | SSA phi(param) |
+| Test.java:4:8:4:16 | param | Test.java:4:6:4:6 | Entry | SSA param(param) |
+| Test.java:4:8:4:16 | param | Test.java:20:3:20:15 | [LoopHeader] while (...) | SSA phi(param) |
 | Test.java:4:8:4:16 | param | Test.java:21:8:21:14 | ...++ | SSA def(param) |
 | Test.java:6:3:6:12 | x | Test.java:6:7:6:11 | x | SSA def(x) |
+| Test.java:6:3:6:12 | x | Test.java:9:3:9:16 | After if (...) | SSA phi(x) |
 | Test.java:6:3:6:12 | x | Test.java:10:4:10:6 | ...++ | SSA def(x) |
 | Test.java:6:3:6:12 | x | Test.java:11:8:11:10 | ++... | SSA def(x) |
-| Test.java:6:3:6:12 | x | Test.java:19:3:19:3 | ; | SSA phi(x) |
-| Test.java:6:3:6:12 | x | Test.java:27:19:27:19 | i | SSA phi(x) |
+| Test.java:6:3:6:12 | x | Test.java:27:19:27:22 | Before ... < ... | SSA phi(x) |
 | Test.java:6:3:6:12 | x | Test.java:28:4:28:9 | ...+=... | SSA def(x) |
+| Test.java:7:3:7:8 | y | Test.java:9:3:9:16 | After if (...) | SSA phi(y) |
 | Test.java:7:3:7:8 | y | Test.java:11:4:11:10 | ...=... | SSA def(y) |
 | Test.java:7:3:7:8 | y | Test.java:14:4:14:8 | ...=... | SSA def(y) |
 | Test.java:7:3:7:8 | y | Test.java:15:4:15:9 | ...+=... | SSA def(y) |
-| Test.java:7:3:7:8 | y | Test.java:19:3:19:3 | ; | SSA phi(y) |
-| Test.java:7:3:7:8 | y | Test.java:20:10:20:10 | x | SSA phi(y) |
+| Test.java:7:3:7:8 | y | Test.java:20:3:20:15 | [LoopHeader] while (...) | SSA phi(y) |
 | Test.java:7:3:7:8 | y | Test.java:24:4:24:9 | ...-=... | SSA def(y) |
 | Test.java:27:8:27:16 | i | Test.java:27:12:27:16 | i | SSA def(i) |
-| Test.java:27:8:27:16 | i | Test.java:27:19:27:19 | i | SSA phi(i) |
+| Test.java:27:8:27:16 | i | Test.java:27:19:27:22 | Before ... < ... | SSA phi(i) |
 | Test.java:27:8:27:16 | i | Test.java:27:25:27:27 | ...++ | SSA def(i) |
-| TestInstanceOfPattern.java:3:12:3:21 | obj | TestInstanceOfPattern.java:3:24:9:2 | { ... } | SSA param(obj) |
+| TestInstanceOfPattern.java:3:12:3:21 | obj | TestInstanceOfPattern.java:3:7:3:10 | Entry | SSA param(obj) |
 | TestInstanceOfPattern.java:4:22:4:29 | s | TestInstanceOfPattern.java:4:29:4:29 | s | SSA def(s) |
-| TestInstanceOfPattern.java:10:13:10:22 | obj | TestInstanceOfPattern.java:10:25:16:2 | { ... } | SSA param(obj) |
+| TestInstanceOfPattern.java:10:13:10:22 | obj | TestInstanceOfPattern.java:10:7:10:11 | Entry | SSA param(obj) |
 | TestInstanceOfPattern.java:11:24:11:31 | s | TestInstanceOfPattern.java:11:31:11:31 | s | SSA def(s) |
-| TestInstanceOfPattern.java:17:13:17:22 | obj | TestInstanceOfPattern.java:17:25:23:2 | { ... } | SSA param(obj) |
+| TestInstanceOfPattern.java:17:13:17:22 | obj | TestInstanceOfPattern.java:17:7:17:11 | Entry | SSA param(obj) |
 | TestInstanceOfPattern.java:18:22:18:29 | s | TestInstanceOfPattern.java:18:29:18:29 | s | SSA def(s) |
-| TestInstanceOfPattern.java:24:13:24:22 | obj | TestInstanceOfPattern.java:24:25:30:2 | { ... } | SSA param(obj) |
-| TestInstanceOfPattern.java:25:34:25:34 | this.s | TestInstanceOfPattern.java:24:25:30:2 | { ... } | SSA entry def(this.s) |
+| TestInstanceOfPattern.java:24:13:24:22 | obj | TestInstanceOfPattern.java:24:7:24:11 | Entry | SSA param(obj) |
+| TestInstanceOfPattern.java:25:34:25:34 | this.s | TestInstanceOfPattern.java:24:7:24:11 | Entry | SSA entry def(this.s) |
diff --git a/java/ql/test/library-tests/ssa/ssaPhi.expected b/java/ql/test/library-tests/ssa/ssaPhi.expected
index b002ee81b3e..afdf8bde2bd 100644
--- a/java/ql/test/library-tests/ssa/ssaPhi.expected
+++ b/java/ql/test/library-tests/ssa/ssaPhi.expected
@@ -1,22 +1,22 @@
-| Fields.java:13:15:13:16 | this.xs | Fields.java:18:5:18:16 | <Expr>; | Fields.java:14:5:14:9 | upd(...) |
-| Fields.java:13:15:13:16 | this.xs | Fields.java:18:5:18:16 | <Expr>; | Fields.java:17:7:17:11 | upd(...) |
-| Fields.java:24:5:24:28 | f | Fields.java:44:5:44:13 | <Expr>; | Fields.java:24:12:24:27 | f |
-| Fields.java:24:5:24:28 | f | Fields.java:44:5:44:13 | <Expr>; | Fields.java:43:7:43:22 | ...=... |
-| Fields.java:25:15:25:18 | f.xs | Fields.java:44:5:44:13 | <Expr>; | Fields.java:39:5:39:21 | ...=... |
-| Fields.java:25:15:25:18 | f.xs | Fields.java:44:5:44:13 | <Expr>; | Fields.java:43:7:43:22 | ...=... |
-| Fields.java:27:15:27:18 | Fields.stat | Fields.java:44:5:44:13 | <Expr>; | Fields.java:32:5:32:9 | f(...) |
-| Fields.java:27:15:27:18 | Fields.stat | Fields.java:44:5:44:13 | <Expr>; | Fields.java:43:11:43:22 | new Fields(...) |
-| Nested.java:24:5:24:31 | obj2 | Nested.java:30:5:30:37 | var ...; | Nested.java:26:7:26:25 | ...=... |
-| Nested.java:24:5:24:31 | obj2 | Nested.java:30:5:30:37 | var ...; | Nested.java:28:7:28:25 | ...=... |
-| Test.java:4:8:4:16 | param | Test.java:20:10:20:10 | x | Test.java:4:19:32:2 | { ... } |
-| Test.java:4:8:4:16 | param | Test.java:20:10:20:10 | x | Test.java:21:8:21:14 | ...++ |
-| Test.java:6:3:6:12 | x | Test.java:19:3:19:3 | ; | Test.java:6:7:6:11 | x |
-| Test.java:6:3:6:12 | x | Test.java:19:3:19:3 | ; | Test.java:11:8:11:10 | ++... |
-| Test.java:6:3:6:12 | x | Test.java:27:19:27:19 | i | Test.java:19:3:19:3 | ; |
-| Test.java:6:3:6:12 | x | Test.java:27:19:27:19 | i | Test.java:28:4:28:9 | ...+=... |
-| Test.java:7:3:7:8 | y | Test.java:19:3:19:3 | ; | Test.java:11:4:11:10 | ...=... |
-| Test.java:7:3:7:8 | y | Test.java:19:3:19:3 | ; | Test.java:15:4:15:9 | ...+=... |
-| Test.java:7:3:7:8 | y | Test.java:20:10:20:10 | x | Test.java:19:3:19:3 | ; |
-| Test.java:7:3:7:8 | y | Test.java:20:10:20:10 | x | Test.java:24:4:24:9 | ...-=... |
-| Test.java:27:8:27:16 | i | Test.java:27:19:27:19 | i | Test.java:27:12:27:16 | i |
-| Test.java:27:8:27:16 | i | Test.java:27:19:27:19 | i | Test.java:27:25:27:27 | ...++ |
+| Fields.java:13:15:13:16 | this.xs | Fields.java:16:5:16:17 | After if (...) | Fields.java:14:5:14:9 | upd(...) |
+| Fields.java:13:15:13:16 | this.xs | Fields.java:16:5:16:17 | After if (...) | Fields.java:17:7:17:11 | upd(...) |
+| Fields.java:24:5:24:28 | f | Fields.java:42:5:42:17 | After if (...) | Fields.java:24:12:24:27 | f |
+| Fields.java:24:5:24:28 | f | Fields.java:42:5:42:17 | After if (...) | Fields.java:43:7:43:22 | ...=... |
+| Fields.java:25:15:25:18 | f.xs | Fields.java:42:5:42:17 | After if (...) | Fields.java:39:5:39:21 | ...=... |
+| Fields.java:25:15:25:18 | f.xs | Fields.java:42:5:42:17 | After if (...) | Fields.java:43:7:43:22 | ...=... |
+| Fields.java:27:15:27:18 | Fields.stat | Fields.java:42:5:42:17 | After if (...) | Fields.java:32:5:32:9 | f(...) |
+| Fields.java:27:15:27:18 | Fields.stat | Fields.java:42:5:42:17 | After if (...) | Fields.java:43:11:43:22 | new Fields(...) |
+| Nested.java:24:5:24:31 | obj2 | Nested.java:25:5:25:24 | After if (...) | Nested.java:26:7:26:25 | ...=... |
+| Nested.java:24:5:24:31 | obj2 | Nested.java:25:5:25:24 | After if (...) | Nested.java:28:7:28:25 | ...=... |
+| Test.java:4:8:4:16 | param | Test.java:20:3:20:15 | [LoopHeader] while (...) | Test.java:4:6:4:6 | Entry |
+| Test.java:4:8:4:16 | param | Test.java:20:3:20:15 | [LoopHeader] while (...) | Test.java:21:8:21:14 | ...++ |
+| Test.java:6:3:6:12 | x | Test.java:9:3:9:16 | After if (...) | Test.java:6:7:6:11 | x |
+| Test.java:6:3:6:12 | x | Test.java:9:3:9:16 | After if (...) | Test.java:11:8:11:10 | ++... |
+| Test.java:6:3:6:12 | x | Test.java:27:19:27:22 | Before ... < ... | Test.java:9:3:9:16 | After if (...) |
+| Test.java:6:3:6:12 | x | Test.java:27:19:27:22 | Before ... < ... | Test.java:28:4:28:9 | ...+=... |
+| Test.java:7:3:7:8 | y | Test.java:9:3:9:16 | After if (...) | Test.java:11:4:11:10 | ...=... |
+| Test.java:7:3:7:8 | y | Test.java:9:3:9:16 | After if (...) | Test.java:15:4:15:9 | ...+=... |
+| Test.java:7:3:7:8 | y | Test.java:20:3:20:15 | [LoopHeader] while (...) | Test.java:9:3:9:16 | After if (...) |
+| Test.java:7:3:7:8 | y | Test.java:20:3:20:15 | [LoopHeader] while (...) | Test.java:24:4:24:9 | ...-=... |
+| Test.java:27:8:27:16 | i | Test.java:27:19:27:22 | Before ... < ... | Test.java:27:12:27:16 | i |
+| Test.java:27:8:27:16 | i | Test.java:27:19:27:22 | Before ... < ... | Test.java:27:25:27:27 | ...++ |
diff --git a/java/ql/test/library-tests/ssa/ssaUse.expected b/java/ql/test/library-tests/ssa/ssaUse.expected
index 8525f62a883..b1e309591e3 100644
--- a/java/ql/test/library-tests/ssa/ssaUse.expected
+++ b/java/ql/test/library-tests/ssa/ssaUse.expected
@@ -1,7 +1,7 @@
 | Fields.java:13:5:13:17 | x | Fields.java:15:5:15:10 | ...=... | SSA def(x) | Fields.java:16:9:16:9 | x |
-| Fields.java:13:15:13:16 | this.xs | Fields.java:12:19:21:3 | { ... } | SSA entry def(this.xs) | Fields.java:13:15:13:16 | xs |
+| Fields.java:13:15:13:16 | this.xs | Fields.java:12:15:12:15 | Entry | SSA entry def(this.xs) | Fields.java:13:15:13:16 | xs |
 | Fields.java:13:15:13:16 | this.xs | Fields.java:14:5:14:9 | upd(...) | SSA call def(this.xs) | Fields.java:15:9:15:10 | xs |
-| Fields.java:13:15:13:16 | this.xs | Fields.java:18:5:18:16 | <Expr>; | SSA phi(this.xs) | Fields.java:18:9:18:15 | this.xs |
+| Fields.java:13:15:13:16 | this.xs | Fields.java:16:5:16:17 | After if (...) | SSA phi(this.xs) | Fields.java:18:9:18:15 | this.xs |
 | Fields.java:13:15:13:16 | this.xs | Fields.java:19:5:19:19 | ...=... | SSA def(this.xs) | Fields.java:20:9:20:10 | xs |
 | Fields.java:24:5:24:28 | f | Fields.java:24:12:24:27 | f | SSA def(f) | Fields.java:25:15:25:15 | f |
 | Fields.java:24:5:24:28 | f | Fields.java:24:12:24:27 | f | SSA def(f) | Fields.java:29:9:29:9 | f |
@@ -10,17 +10,17 @@
 | Fields.java:24:5:24:28 | f | Fields.java:24:12:24:27 | f | SSA def(f) | Fields.java:37:9:37:9 | f |
 | Fields.java:24:5:24:28 | f | Fields.java:24:12:24:27 | f | SSA def(f) | Fields.java:39:5:39:5 | f |
 | Fields.java:24:5:24:28 | f | Fields.java:24:12:24:27 | f | SSA def(f) | Fields.java:40:9:40:9 | f |
-| Fields.java:24:5:24:28 | f | Fields.java:44:5:44:13 | <Expr>; | SSA phi(f) | Fields.java:44:9:44:9 | f |
-| Fields.java:24:5:24:28 | f | Fields.java:44:5:44:13 | <Expr>; | SSA phi(f) | Fields.java:46:9:46:9 | f |
+| Fields.java:24:5:24:28 | f | Fields.java:42:5:42:17 | After if (...) | SSA phi(f) | Fields.java:44:9:44:9 | f |
+| Fields.java:24:5:24:28 | f | Fields.java:42:5:42:17 | After if (...) | SSA phi(f) | Fields.java:46:9:46:9 | f |
 | Fields.java:25:15:25:18 | f.xs | Fields.java:24:12:24:27 | f | SSA qualifier def(f.xs) | Fields.java:25:15:25:18 | f.xs |
 | Fields.java:25:15:25:18 | f.xs | Fields.java:28:5:28:12 | f(...) | SSA call def(f.xs) | Fields.java:29:9:29:12 | f.xs |
 | Fields.java:25:15:25:18 | f.xs | Fields.java:32:5:32:9 | f(...) | SSA call def(f.xs) | Fields.java:33:9:33:12 | f.xs |
 | Fields.java:25:15:25:18 | f.xs | Fields.java:32:5:32:9 | f(...) | SSA call def(f.xs) | Fields.java:37:9:37:12 | f.xs |
 | Fields.java:25:15:25:18 | f.xs | Fields.java:39:5:39:21 | ...=... | SSA def(f.xs) | Fields.java:40:9:40:12 | f.xs |
-| Fields.java:25:15:25:18 | f.xs | Fields.java:44:5:44:13 | <Expr>; | SSA phi(f.xs) | Fields.java:44:9:44:12 | f.xs |
-| Fields.java:25:15:25:18 | f.xs | Fields.java:44:5:44:13 | <Expr>; | SSA phi(f.xs) | Fields.java:46:9:46:12 | f.xs |
+| Fields.java:25:15:25:18 | f.xs | Fields.java:42:5:42:17 | After if (...) | SSA phi(f.xs) | Fields.java:44:9:44:12 | f.xs |
+| Fields.java:25:15:25:18 | f.xs | Fields.java:42:5:42:17 | After if (...) | SSA phi(f.xs) | Fields.java:46:9:46:12 | f.xs |
 | Fields.java:26:5:26:17 | z | Fields.java:41:5:41:10 | ...=... | SSA def(z) | Fields.java:42:9:42:9 | z |
-| Fields.java:26:15:26:16 | this.xs | Fields.java:23:19:49:3 | { ... } | SSA entry def(this.xs) | Fields.java:26:15:26:16 | xs |
+| Fields.java:26:15:26:16 | this.xs | Fields.java:23:15:23:15 | Entry | SSA entry def(this.xs) | Fields.java:26:15:26:16 | xs |
 | Fields.java:26:15:26:16 | this.xs | Fields.java:28:5:28:12 | f(...) | SSA call def(this.xs) | Fields.java:30:9:30:10 | xs |
 | Fields.java:26:15:26:16 | this.xs | Fields.java:32:5:32:9 | f(...) | SSA call def(this.xs) | Fields.java:34:9:34:10 | xs |
 | Fields.java:26:15:26:16 | this.xs | Fields.java:36:5:36:19 | ...=... | SSA def(this.xs) | Fields.java:38:9:38:10 | xs |
@@ -30,42 +30,42 @@
 | Fields.java:27:15:27:18 | Fields.stat | Fields.java:28:5:28:12 | f(...) | SSA call def(Fields.stat) | Fields.java:31:9:31:12 | stat |
 | Fields.java:27:15:27:18 | Fields.stat | Fields.java:32:5:32:9 | f(...) | SSA call def(Fields.stat) | Fields.java:35:9:35:12 | stat |
 | Fields.java:27:15:27:18 | Fields.stat | Fields.java:45:5:45:16 | new Fields(...) | SSA call def(Fields.stat) | Fields.java:48:9:48:12 | stat |
-| Nested.java:4:26:4:31 | next(..).p1 | Nested.java:8:29:8:57 | { ... } | SSA capture def(next(..).p1) | Nested.java:8:38:8:39 | p1 |
-| Nested.java:5:5:5:15 | next(..).x1 | Nested.java:8:29:8:57 | { ... } | SSA capture def(next(..).x1) | Nested.java:8:43:8:44 | x1 |
-| Nested.java:5:5:5:15 | next(..).x1 | Nested.java:8:29:8:57 | { ... } | SSA capture def(next(..).x1) | Nested.java:8:48:8:49 | x1 |
-| Nested.java:5:5:5:15 | next(..).x1 | Nested.java:8:29:8:57 | { ... } | SSA capture def(next(..).x1) | Nested.java:8:53:8:54 | x1 |
-| Nested.java:15:5:15:30 | getInt(..).obj | Nested.java:16:22:16:34 | { ... } | SSA capture def(getInt(..).obj) | Nested.java:16:22:16:24 | obj |
-| Nested.java:15:5:15:30 | getInt(..).obj | Nested.java:20:27:20:39 | { ... } | SSA capture def(getInt(..).obj) | Nested.java:20:27:20:29 | obj |
-| Nested.java:16:5:16:35 | getInt(..).hash | Nested.java:19:27:22:7 | { ... } | SSA capture def(getInt(..).hash) | Nested.java:21:21:21:24 | hash |
-| Nested.java:17:5:17:16 | getInt(..).x2 | Nested.java:19:27:22:7 | { ... } | SSA capture def(getInt(..).x2) | Nested.java:21:16:21:17 | x2 |
+| Nested.java:4:26:4:31 | next(..).p1 | Nested.java:8:22:8:25 | Entry | SSA capture def(next(..).p1) | Nested.java:8:38:8:39 | p1 |
+| Nested.java:5:5:5:15 | next(..).x1 | Nested.java:8:22:8:25 | Entry | SSA capture def(next(..).x1) | Nested.java:8:43:8:44 | x1 |
+| Nested.java:5:5:5:15 | next(..).x1 | Nested.java:8:22:8:25 | Entry | SSA capture def(next(..).x1) | Nested.java:8:48:8:49 | x1 |
+| Nested.java:5:5:5:15 | next(..).x1 | Nested.java:8:22:8:25 | Entry | SSA capture def(next(..).x1) | Nested.java:8:53:8:54 | x1 |
+| Nested.java:15:5:15:30 | getInt(..).obj | Nested.java:16:22:16:34 | Entry | SSA capture def(getInt(..).obj) | Nested.java:16:22:16:24 | obj |
+| Nested.java:15:5:15:30 | getInt(..).obj | Nested.java:20:27:20:39 | Entry | SSA capture def(getInt(..).obj) | Nested.java:20:27:20:29 | obj |
+| Nested.java:16:5:16:35 | getInt(..).hash | Nested.java:19:18:19:23 | Entry | SSA capture def(getInt(..).hash) | Nested.java:21:21:21:24 | hash |
+| Nested.java:17:5:17:16 | getInt(..).x2 | Nested.java:19:18:19:23 | Entry | SSA capture def(getInt(..).x2) | Nested.java:21:16:21:17 | x2 |
 | Nested.java:18:5:23:6 | h2 | Nested.java:18:15:23:5 | h2 | SSA def(h2) | Nested.java:25:9:25:10 | h2 |
 | Nested.java:20:9:20:40 | hnest | Nested.java:20:19:20:39 | hnest | SSA def(hnest) | Nested.java:21:37:21:41 | hnest |
-| Nested.java:24:5:24:31 | getInt(..).obj2 | Nested.java:30:23:30:36 | { ... } | SSA capture def(getInt(..).obj2) | Nested.java:30:23:30:26 | obj2 |
-| Nested.java:33:21:33:26 | p3 | Nested.java:33:29:42:3 | { ... } | SSA param(p3) | Nested.java:35:9:35:10 | p3 |
-| Nested.java:34:5:34:11 | getInt(..).x3 | Nested.java:37:20:37:25 | { ... } | SSA capture def(getInt(..).x3) | Nested.java:37:20:37:21 | x3 |
-| Nested.java:34:5:34:11 | getInt(..).x3 | Nested.java:40:20:40:25 | { ... } | SSA capture def(getInt(..).x3) | Nested.java:40:20:40:21 | x3 |
-| Test.java:4:8:4:16 | param | Test.java:4:19:32:2 | { ... } | SSA param(param) | Test.java:9:7:9:11 | param |
-| Test.java:4:8:4:16 | param | Test.java:20:10:20:10 | x | SSA phi(param) | Test.java:21:8:21:12 | param |
+| Nested.java:24:5:24:31 | getInt(..).obj2 | Nested.java:30:23:30:36 | Entry | SSA capture def(getInt(..).obj2) | Nested.java:30:23:30:26 | obj2 |
+| Nested.java:33:21:33:26 | p3 | Nested.java:33:13:33:19 | Entry | SSA param(p3) | Nested.java:35:9:35:10 | p3 |
+| Nested.java:34:5:34:11 | getInt(..).x3 | Nested.java:37:14:37:25 | Entry | SSA capture def(getInt(..).x3) | Nested.java:37:20:37:21 | x3 |
+| Nested.java:34:5:34:11 | getInt(..).x3 | Nested.java:40:14:40:25 | Entry | SSA capture def(getInt(..).x3) | Nested.java:40:20:40:21 | x3 |
+| Test.java:4:8:4:16 | param | Test.java:4:6:4:6 | Entry | SSA param(param) | Test.java:9:7:9:11 | param |
+| Test.java:4:8:4:16 | param | Test.java:20:3:20:15 | [LoopHeader] while (...) | SSA phi(param) | Test.java:21:8:21:12 | param |
 | Test.java:6:3:6:12 | x | Test.java:6:7:6:11 | x | SSA def(x) | Test.java:10:4:10:4 | x |
+| Test.java:6:3:6:12 | x | Test.java:9:3:9:16 | After if (...) | SSA phi(x) | Test.java:20:10:20:10 | x |
 | Test.java:6:3:6:12 | x | Test.java:10:4:10:6 | ...++ | SSA def(x) | Test.java:11:10:11:10 | x |
-| Test.java:6:3:6:12 | x | Test.java:19:3:19:3 | ; | SSA phi(x) | Test.java:20:10:20:10 | x |
-| Test.java:6:3:6:12 | x | Test.java:27:19:27:19 | i | SSA phi(x) | Test.java:28:4:28:4 | x |
-| Test.java:6:3:6:12 | x | Test.java:27:19:27:19 | i | SSA phi(x) | Test.java:31:10:31:10 | x |
+| Test.java:6:3:6:12 | x | Test.java:27:19:27:22 | Before ... < ... | SSA phi(x) | Test.java:28:4:28:4 | x |
+| Test.java:6:3:6:12 | x | Test.java:27:19:27:22 | Before ... < ... | SSA phi(x) | Test.java:31:10:31:10 | x |
 | Test.java:7:3:7:8 | y | Test.java:14:4:14:8 | ...=... | SSA def(y) | Test.java:15:4:15:4 | y |
-| Test.java:7:3:7:8 | y | Test.java:20:10:20:10 | x | SSA phi(y) | Test.java:20:14:20:14 | y |
-| Test.java:7:3:7:8 | y | Test.java:20:10:20:10 | x | SSA phi(y) | Test.java:24:4:24:4 | y |
-| Test.java:7:3:7:8 | y | Test.java:20:10:20:10 | x | SSA phi(y) | Test.java:31:14:31:14 | y |
-| Test.java:27:8:27:16 | i | Test.java:27:19:27:19 | i | SSA phi(i) | Test.java:27:19:27:19 | i |
-| Test.java:27:8:27:16 | i | Test.java:27:19:27:19 | i | SSA phi(i) | Test.java:27:25:27:25 | i |
-| Test.java:27:8:27:16 | i | Test.java:27:19:27:19 | i | SSA phi(i) | Test.java:28:9:28:9 | i |
-| TestInstanceOfPattern.java:3:12:3:21 | obj | TestInstanceOfPattern.java:3:24:9:2 | { ... } | SSA param(obj) | TestInstanceOfPattern.java:4:7:4:9 | obj |
+| Test.java:7:3:7:8 | y | Test.java:20:3:20:15 | [LoopHeader] while (...) | SSA phi(y) | Test.java:20:14:20:14 | y |
+| Test.java:7:3:7:8 | y | Test.java:20:3:20:15 | [LoopHeader] while (...) | SSA phi(y) | Test.java:24:4:24:4 | y |
+| Test.java:7:3:7:8 | y | Test.java:20:3:20:15 | [LoopHeader] while (...) | SSA phi(y) | Test.java:31:14:31:14 | y |
+| Test.java:27:8:27:16 | i | Test.java:27:19:27:22 | Before ... < ... | SSA phi(i) | Test.java:27:19:27:19 | i |
+| Test.java:27:8:27:16 | i | Test.java:27:19:27:22 | Before ... < ... | SSA phi(i) | Test.java:27:25:27:25 | i |
+| Test.java:27:8:27:16 | i | Test.java:27:19:27:22 | Before ... < ... | SSA phi(i) | Test.java:28:9:28:9 | i |
+| TestInstanceOfPattern.java:3:12:3:21 | obj | TestInstanceOfPattern.java:3:7:3:10 | Entry | SSA param(obj) | TestInstanceOfPattern.java:4:7:4:9 | obj |
 | TestInstanceOfPattern.java:4:22:4:29 | s | TestInstanceOfPattern.java:4:29:4:29 | s | SSA def(s) | TestInstanceOfPattern.java:5:8:5:8 | s |
-| TestInstanceOfPattern.java:10:13:10:22 | obj | TestInstanceOfPattern.java:10:25:16:2 | { ... } | SSA param(obj) | TestInstanceOfPattern.java:11:9:11:11 | obj |
+| TestInstanceOfPattern.java:10:13:10:22 | obj | TestInstanceOfPattern.java:10:7:10:11 | Entry | SSA param(obj) | TestInstanceOfPattern.java:11:9:11:11 | obj |
 | TestInstanceOfPattern.java:11:24:11:31 | s | TestInstanceOfPattern.java:11:31:11:31 | s | SSA def(s) | TestInstanceOfPattern.java:14:8:14:8 | s |
-| TestInstanceOfPattern.java:17:13:17:22 | obj | TestInstanceOfPattern.java:17:25:23:2 | { ... } | SSA param(obj) | TestInstanceOfPattern.java:18:7:18:9 | obj |
+| TestInstanceOfPattern.java:17:13:17:22 | obj | TestInstanceOfPattern.java:17:7:17:11 | Entry | SSA param(obj) | TestInstanceOfPattern.java:18:7:18:9 | obj |
 | TestInstanceOfPattern.java:18:22:18:29 | s | TestInstanceOfPattern.java:18:29:18:29 | s | SSA def(s) | TestInstanceOfPattern.java:18:34:18:34 | s |
 | TestInstanceOfPattern.java:18:22:18:29 | s | TestInstanceOfPattern.java:18:29:18:29 | s | SSA def(s) | TestInstanceOfPattern.java:19:8:19:8 | s |
-| TestInstanceOfPattern.java:24:13:24:22 | obj | TestInstanceOfPattern.java:24:25:30:2 | { ... } | SSA param(obj) | TestInstanceOfPattern.java:25:7:25:9 | obj |
-| TestInstanceOfPattern.java:25:34:25:34 | this.s | TestInstanceOfPattern.java:24:25:30:2 | { ... } | SSA entry def(this.s) | TestInstanceOfPattern.java:25:34:25:34 | s |
-| TestInstanceOfPattern.java:25:34:25:34 | this.s | TestInstanceOfPattern.java:24:25:30:2 | { ... } | SSA entry def(this.s) | TestInstanceOfPattern.java:26:8:26:8 | s |
-| TestInstanceOfPattern.java:25:34:25:34 | this.s | TestInstanceOfPattern.java:24:25:30:2 | { ... } | SSA entry def(this.s) | TestInstanceOfPattern.java:28:8:28:8 | s |
+| TestInstanceOfPattern.java:24:13:24:22 | obj | TestInstanceOfPattern.java:24:7:24:11 | Entry | SSA param(obj) | TestInstanceOfPattern.java:25:7:25:9 | obj |
+| TestInstanceOfPattern.java:25:34:25:34 | this.s | TestInstanceOfPattern.java:24:7:24:11 | Entry | SSA entry def(this.s) | TestInstanceOfPattern.java:25:34:25:34 | s |
+| TestInstanceOfPattern.java:25:34:25:34 | this.s | TestInstanceOfPattern.java:24:7:24:11 | Entry | SSA entry def(this.s) | TestInstanceOfPattern.java:26:8:26:8 | s |
+| TestInstanceOfPattern.java:25:34:25:34 | this.s | TestInstanceOfPattern.java:24:7:24:11 | Entry | SSA entry def(this.s) | TestInstanceOfPattern.java:28:8:28:8 | s |
diff --git a/java/ql/test/library-tests/successors/CloseReaderTest/FalseSuccessors.ql b/java/ql/test/library-tests/successors/CloseReaderTest/FalseSuccessors.ql
deleted file mode 100644
index aee4021bee6..00000000000
--- a/java/ql/test/library-tests/successors/CloseReaderTest/FalseSuccessors.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import java
-
-from ConditionNode c
-select c, c.getAFalseSuccessor()
diff --git a/java/ql/test/library-tests/successors/CloseReaderTest/TestSucc.expected b/java/ql/test/library-tests/successors/CloseReaderTest/TestSucc.expected
index fc529feba13..6889eb8da32 100644
--- a/java/ql/test/library-tests/successors/CloseReaderTest/TestSucc.expected
+++ b/java/ql/test/library-tests/successors/CloseReaderTest/TestSucc.expected
@@ -1,7 +1,8 @@
-| CloseReaderTest.java:8:14:8:28 | Exceptional Exit | CloseReaderTest.java:8:14:8:28 | Exit |
+| CloseReaderTest.java:8:14:8:28 | Entry | CloseReaderTest.java:8:14:8:28 | { ... } |
 | CloseReaderTest.java:8:14:8:28 | Normal Exit | CloseReaderTest.java:8:14:8:28 | Exit |
 | CloseReaderTest.java:8:14:8:28 | super(...) | CloseReaderTest.java:8:14:8:28 | Normal Exit |
 | CloseReaderTest.java:8:14:8:28 | { ... } | CloseReaderTest.java:8:14:8:28 | super(...) |
+| CloseReaderTest.java:9:23:9:34 | Entry | CloseReaderTest.java:10:2:24:2 | { ... } |
 | CloseReaderTest.java:9:23:9:34 | Exceptional Exit | CloseReaderTest.java:9:23:9:34 | Exit |
 | CloseReaderTest.java:9:23:9:34 | Normal Exit | CloseReaderTest.java:9:23:9:34 | Exit |
 | CloseReaderTest.java:10:2:24:2 | { ... } | CloseReaderTest.java:12:3:13:42 | <Expr>; |
@@ -27,6 +28,7 @@
 | CloseReaderTest.java:19:11:19:15 | stdin | CloseReaderTest.java:19:11:19:26 | readLine(...) |
 | CloseReaderTest.java:19:11:19:26 | readLine(...) | CloseReaderTest.java:19:4:19:27 | return ... |
 | CloseReaderTest.java:19:11:19:26 | readLine(...) | CloseReaderTest.java:20:5:20:26 | catch (...) |
+| CloseReaderTest.java:20:5:20:26 | catch (...) | CloseReaderTest.java:9:23:9:34 | Exceptional Exit |
 | CloseReaderTest.java:20:5:20:26 | catch (...) | CloseReaderTest.java:20:24:20:25 | ex |
 | CloseReaderTest.java:20:24:20:25 | ex | CloseReaderTest.java:21:3:23:3 | { ... } |
 | CloseReaderTest.java:21:3:23:3 | { ... } | CloseReaderTest.java:22:11:22:14 | null |
diff --git a/java/ql/test/library-tests/successors/CloseReaderTest/TestSucc.ql b/java/ql/test/library-tests/successors/CloseReaderTest/TestSucc.ql
index 6fca436fbfd..68c50a85c58 100644
--- a/java/ql/test/library-tests/successors/CloseReaderTest/TestSucc.ql
+++ b/java/ql/test/library-tests/successors/CloseReaderTest/TestSucc.ql
@@ -1,8 +1,9 @@
 import java
+import utils.test.AstCfg
 
 from ControlFlowNode n, ControlFlowNode succ
 where
-  succ = n.getASuccessor() and
+  succ = getAnAstSuccessor(n) and
   n.getLocation().getFile().getExtension() = "java" and
   not n.getLocation().getFile().getStem() = "PopulateRuntimeException"
 select n, succ
diff --git a/java/ql/test/library-tests/successors/LoopVarReadTest/FalseSuccessors.expected b/java/ql/test/library-tests/successors/LoopVarReadTest/FalseSuccessors.expected
deleted file mode 100644
index 9d836931bed..00000000000
--- a/java/ql/test/library-tests/successors/LoopVarReadTest/FalseSuccessors.expected
+++ /dev/null
@@ -1 +0,0 @@
-| LoopVarReadTest.java:7:19:7:24 | ... < ... | LoopVarReadTest.java:12:3:12:13 | var ...; |
diff --git a/java/ql/test/library-tests/successors/LoopVarReadTest/FalseSuccessors.ql b/java/ql/test/library-tests/successors/LoopVarReadTest/FalseSuccessors.ql
deleted file mode 100644
index aee4021bee6..00000000000
--- a/java/ql/test/library-tests/successors/LoopVarReadTest/FalseSuccessors.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import java
-
-from ConditionNode c
-select c, c.getAFalseSuccessor()
diff --git a/java/ql/test/library-tests/successors/LoopVarReadTest/TestSucc.expected b/java/ql/test/library-tests/successors/LoopVarReadTest/TestSucc.expected
index 3566cc8753f..61b12a6f5d7 100644
--- a/java/ql/test/library-tests/successors/LoopVarReadTest/TestSucc.expected
+++ b/java/ql/test/library-tests/successors/LoopVarReadTest/TestSucc.expected
@@ -1,8 +1,8 @@
-| LoopVarReadTest.java:3:14:3:28 | Exceptional Exit | LoopVarReadTest.java:3:14:3:28 | Exit |
+| LoopVarReadTest.java:3:14:3:28 | Entry | LoopVarReadTest.java:3:14:3:28 | { ... } |
 | LoopVarReadTest.java:3:14:3:28 | Normal Exit | LoopVarReadTest.java:3:14:3:28 | Exit |
 | LoopVarReadTest.java:3:14:3:28 | super(...) | LoopVarReadTest.java:3:14:3:28 | Normal Exit |
 | LoopVarReadTest.java:3:14:3:28 | { ... } | LoopVarReadTest.java:3:14:3:28 | super(...) |
-| LoopVarReadTest.java:4:21:4:28 | Exceptional Exit | LoopVarReadTest.java:4:21:4:28 | Exit |
+| LoopVarReadTest.java:4:21:4:28 | Entry | LoopVarReadTest.java:5:2:15:2 | { ... } |
 | LoopVarReadTest.java:4:21:4:28 | Normal Exit | LoopVarReadTest.java:4:21:4:28 | Exit |
 | LoopVarReadTest.java:5:2:15:2 | { ... } | LoopVarReadTest.java:6:3:6:12 | var ...; |
 | LoopVarReadTest.java:6:3:6:12 | var ...; | LoopVarReadTest.java:6:11:6:11 | 2 |
diff --git a/java/ql/test/library-tests/successors/LoopVarReadTest/TestSucc.ql b/java/ql/test/library-tests/successors/LoopVarReadTest/TestSucc.ql
index 6fca436fbfd..68c50a85c58 100644
--- a/java/ql/test/library-tests/successors/LoopVarReadTest/TestSucc.ql
+++ b/java/ql/test/library-tests/successors/LoopVarReadTest/TestSucc.ql
@@ -1,8 +1,9 @@
 import java
+import utils.test.AstCfg
 
 from ControlFlowNode n, ControlFlowNode succ
 where
-  succ = n.getASuccessor() and
+  succ = getAnAstSuccessor(n) and
   n.getLocation().getFile().getExtension() = "java" and
   not n.getLocation().getFile().getStem() = "PopulateRuntimeException"
 select n, succ
diff --git a/java/ql/test/library-tests/successors/SaveFileTest/FalseSuccessors.expected b/java/ql/test/library-tests/successors/SaveFileTest/FalseSuccessors.expected
deleted file mode 100644
index 8f3e2d0dd3e..00000000000
--- a/java/ql/test/library-tests/successors/SaveFileTest/FalseSuccessors.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| SaveFileTest.java:18:7:18:26 | startsWith(...) | SaveFileTest.java:24:3:24:33 | var ...; |
-| SaveFileTest.java:34:11:34:54 | ... != ... | SaveFileTest.java:39:4:40:41 | <Expr>; |
diff --git a/java/ql/test/library-tests/successors/SaveFileTest/FalseSuccessors.ql b/java/ql/test/library-tests/successors/SaveFileTest/FalseSuccessors.ql
deleted file mode 100644
index aee4021bee6..00000000000
--- a/java/ql/test/library-tests/successors/SaveFileTest/FalseSuccessors.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import java
-
-from ConditionNode c
-select c, c.getAFalseSuccessor()
diff --git a/java/ql/test/library-tests/successors/SaveFileTest/TestSucc.expected b/java/ql/test/library-tests/successors/SaveFileTest/TestSucc.expected
index 640e731147f..19943a7ab1a 100644
--- a/java/ql/test/library-tests/successors/SaveFileTest/TestSucc.expected
+++ b/java/ql/test/library-tests/successors/SaveFileTest/TestSucc.expected
@@ -1,7 +1,8 @@
-| SaveFileTest.java:11:14:11:25 | Exceptional Exit | SaveFileTest.java:11:14:11:25 | Exit |
+| SaveFileTest.java:11:14:11:25 | Entry | SaveFileTest.java:11:14:11:25 | { ... } |
 | SaveFileTest.java:11:14:11:25 | Normal Exit | SaveFileTest.java:11:14:11:25 | Exit |
 | SaveFileTest.java:11:14:11:25 | super(...) | SaveFileTest.java:11:14:11:25 | Normal Exit |
 | SaveFileTest.java:11:14:11:25 | { ... } | SaveFileTest.java:11:14:11:25 | super(...) |
+| SaveFileTest.java:12:14:12:21 | Entry | SaveFileTest.java:15:2:55:2 | { ... } |
 | SaveFileTest.java:12:14:12:21 | Exceptional Exit | SaveFileTest.java:12:14:12:21 | Exit |
 | SaveFileTest.java:12:14:12:21 | Normal Exit | SaveFileTest.java:12:14:12:21 | Exit |
 | SaveFileTest.java:15:2:55:2 | { ... } | SaveFileTest.java:17:3:17:25 | var ...; |
@@ -14,8 +15,9 @@
 | SaveFileTest.java:18:7:18:26 | startsWith(...) | SaveFileTest.java:24:3:24:33 | var ...; |
 | SaveFileTest.java:18:23:18:25 | "/" | SaveFileTest.java:18:7:18:26 | startsWith(...) |
 | SaveFileTest.java:19:3:21:3 | { ... } | SaveFileTest.java:20:4:20:32 | <Expr>; |
+| SaveFileTest.java:20:4:20:11 | savePath | SaveFileTest.java:20:15:20:18 | path |
 | SaveFileTest.java:20:4:20:31 | ...=... | SaveFileTest.java:24:3:24:33 | var ...; |
-| SaveFileTest.java:20:4:20:32 | <Expr>; | SaveFileTest.java:20:15:20:18 | path |
+| SaveFileTest.java:20:4:20:32 | <Expr>; | SaveFileTest.java:20:4:20:11 | savePath |
 | SaveFileTest.java:20:15:20:18 | path | SaveFileTest.java:20:30:20:30 | 1 |
 | SaveFileTest.java:20:15:20:31 | substring(...) | SaveFileTest.java:20:4:20:31 | ...=... |
 | SaveFileTest.java:20:30:20:30 | 1 | SaveFileTest.java:20:15:20:31 | substring(...) |
@@ -44,20 +46,20 @@
 | SaveFileTest.java:30:22:30:25 | null | SaveFileTest.java:30:16:30:25 | bos |
 | SaveFileTest.java:31:3:53:3 | try ... | SaveFileTest.java:32:3:41:3 | { ... } |
 | SaveFileTest.java:32:3:41:3 | { ... } | SaveFileTest.java:33:4:33:40 | <Expr>; |
+| SaveFileTest.java:33:4:33:6 | bos | SaveFileTest.java:33:31:33:38 | saveFile |
 | SaveFileTest.java:33:4:33:39 | ...=... | SaveFileTest.java:34:4:34:55 | while (...) |
-| SaveFileTest.java:33:4:33:40 | <Expr>; | SaveFileTest.java:33:31:33:38 | saveFile |
+| SaveFileTest.java:33:4:33:40 | <Expr>; | SaveFileTest.java:33:4:33:6 | bos |
 | SaveFileTest.java:33:10:33:39 | new FileOutputStream(...) | SaveFileTest.java:33:4:33:39 | ...=... |
 | SaveFileTest.java:33:10:33:39 | new FileOutputStream(...) | SaveFileTest.java:41:5:41:23 | catch (...) |
-| SaveFileTest.java:33:10:33:39 | new FileOutputStream(...) | SaveFileTest.java:45:3:53:3 | { ... } |
 | SaveFileTest.java:33:31:33:38 | saveFile | SaveFileTest.java:33:10:33:39 | new FileOutputStream(...) |
-| SaveFileTest.java:34:4:34:55 | while (...) | SaveFileTest.java:34:24:34:25 | is |
+| SaveFileTest.java:34:4:34:55 | while (...) | SaveFileTest.java:34:12:34:20 | bytesRead |
 | SaveFileTest.java:34:11:34:54 | ... != ... | SaveFileTest.java:35:4:37:4 | { ... } |
 | SaveFileTest.java:34:11:34:54 | ... != ... | SaveFileTest.java:39:4:40:41 | <Expr>; |
+| SaveFileTest.java:34:12:34:20 | bytesRead | SaveFileTest.java:34:24:34:25 | is |
 | SaveFileTest.java:34:12:34:47 | ...=... | SaveFileTest.java:34:54:34:54 | 1 |
 | SaveFileTest.java:34:24:34:25 | is | SaveFileTest.java:34:32:34:37 | buffer |
 | SaveFileTest.java:34:24:34:47 | read(...) | SaveFileTest.java:34:12:34:47 | ...=... |
 | SaveFileTest.java:34:24:34:47 | read(...) | SaveFileTest.java:41:5:41:23 | catch (...) |
-| SaveFileTest.java:34:24:34:47 | read(...) | SaveFileTest.java:45:3:53:3 | { ... } |
 | SaveFileTest.java:34:32:34:37 | buffer | SaveFileTest.java:34:40:34:40 | 0 |
 | SaveFileTest.java:34:40:34:40 | 0 | SaveFileTest.java:34:43:34:46 | 8192 |
 | SaveFileTest.java:34:43:34:46 | 8192 | SaveFileTest.java:34:24:34:47 | read(...) |
@@ -65,9 +67,8 @@
 | SaveFileTest.java:34:54:34:54 | 1 | SaveFileTest.java:34:53:34:54 | -... |
 | SaveFileTest.java:35:4:37:4 | { ... } | SaveFileTest.java:36:5:36:36 | <Expr>; |
 | SaveFileTest.java:36:5:36:7 | bos | SaveFileTest.java:36:15:36:20 | buffer |
-| SaveFileTest.java:36:5:36:35 | write(...) | SaveFileTest.java:34:24:34:25 | is |
+| SaveFileTest.java:36:5:36:35 | write(...) | SaveFileTest.java:34:12:34:20 | bytesRead |
 | SaveFileTest.java:36:5:36:35 | write(...) | SaveFileTest.java:41:5:41:23 | catch (...) |
-| SaveFileTest.java:36:5:36:35 | write(...) | SaveFileTest.java:45:3:53:3 | { ... } |
 | SaveFileTest.java:36:5:36:36 | <Expr>; | SaveFileTest.java:36:5:36:7 | bos |
 | SaveFileTest.java:36:15:36:20 | buffer | SaveFileTest.java:36:23:36:23 | 0 |
 | SaveFileTest.java:36:23:36:23 | 0 | SaveFileTest.java:36:26:36:34 | bytesRead |
@@ -82,7 +83,6 @@
 | SaveFileTest.java:40:8:40:15 | saveFile | SaveFileTest.java:40:8:40:33 | getAbsolutePath(...) |
 | SaveFileTest.java:40:8:40:33 | getAbsolutePath(...) | SaveFileTest.java:39:23:40:33 | ... + ... |
 | SaveFileTest.java:40:8:40:33 | getAbsolutePath(...) | SaveFileTest.java:41:5:41:23 | catch (...) |
-| SaveFileTest.java:40:8:40:33 | getAbsolutePath(...) | SaveFileTest.java:45:3:53:3 | { ... } |
 | SaveFileTest.java:40:37:40:39 | "]" | SaveFileTest.java:39:23:40:39 | ... + ... |
 | SaveFileTest.java:41:5:41:23 | catch (...) | SaveFileTest.java:41:22:41:22 | e |
 | SaveFileTest.java:41:22:41:22 | e | SaveFileTest.java:42:3:44:3 | { ... } |
diff --git a/java/ql/test/library-tests/successors/SaveFileTest/TestSucc.ql b/java/ql/test/library-tests/successors/SaveFileTest/TestSucc.ql
index 6fca436fbfd..68c50a85c58 100644
--- a/java/ql/test/library-tests/successors/SaveFileTest/TestSucc.ql
+++ b/java/ql/test/library-tests/successors/SaveFileTest/TestSucc.ql
@@ -1,8 +1,9 @@
 import java
+import utils.test.AstCfg
 
 from ControlFlowNode n, ControlFlowNode succ
 where
-  succ = n.getASuccessor() and
+  succ = getAnAstSuccessor(n) and
   n.getLocation().getFile().getExtension() = "java" and
   not n.getLocation().getFile().getStem() = "PopulateRuntimeException"
 select n, succ
diff --git a/java/ql/test/library-tests/successors/SchackTest/FalseSuccessors.expected b/java/ql/test/library-tests/successors/SchackTest/FalseSuccessors.expected
deleted file mode 100644
index 3f3f897cda8..00000000000
--- a/java/ql/test/library-tests/successors/SchackTest/FalseSuccessors.expected
+++ /dev/null
@@ -1,6 +0,0 @@
-| SchackTest.java:8:9:8:12 | ... == ... | SchackTest.java:10:5:10:13 | if (...) |
-| SchackTest.java:10:9:10:12 | ... == ... | SchackTest.java:12:14:15:4 | { ... } |
-| SchackTest.java:13:9:13:13 | bar(...) | SchackTest.java:16:4:16:41 | <Expr>; |
-| SchackTest.java:13:9:13:13 | bar(...) | SchackTest.java:17:5:17:17 | catch (...) |
-| SchackTest.java:13:9:13:13 | bar(...) | SchackTest.java:21:13:23:3 | { ... } |
-| SchackTest.java:27:7:27:24 | ... > ... | SchackTest.java:29:10:29:22 | random(...) |
diff --git a/java/ql/test/library-tests/successors/SchackTest/FalseSuccessors.ql b/java/ql/test/library-tests/successors/SchackTest/FalseSuccessors.ql
deleted file mode 100644
index aee4021bee6..00000000000
--- a/java/ql/test/library-tests/successors/SchackTest/FalseSuccessors.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import java
-
-from ConditionNode c
-select c, c.getAFalseSuccessor()
diff --git a/java/ql/test/library-tests/successors/SchackTest/TestSucc.expected b/java/ql/test/library-tests/successors/SchackTest/TestSucc.expected
index a23f6a2bc54..19fef193edb 100644
--- a/java/ql/test/library-tests/successors/SchackTest/TestSucc.expected
+++ b/java/ql/test/library-tests/successors/SchackTest/TestSucc.expected
@@ -1,15 +1,16 @@
-| SchackTest.java:1:14:1:23 | Exceptional Exit | SchackTest.java:1:14:1:23 | Exit |
+| SchackTest.java:1:14:1:23 | Entry | SchackTest.java:1:14:1:23 | { ... } |
 | SchackTest.java:1:14:1:23 | Normal Exit | SchackTest.java:1:14:1:23 | Exit |
 | SchackTest.java:1:14:1:23 | super(...) | SchackTest.java:1:14:1:23 | Normal Exit |
 | SchackTest.java:1:14:1:23 | { ... } | SchackTest.java:1:14:1:23 | super(...) |
-| SchackTest.java:2:8:2:10 | Exceptional Exit | SchackTest.java:2:8:2:10 | Exit |
+| SchackTest.java:2:8:2:10 | Entry | SchackTest.java:2:8:2:10 | { ... } |
 | SchackTest.java:2:8:2:10 | Normal Exit | SchackTest.java:2:8:2:10 | Exit |
 | SchackTest.java:2:8:2:10 | super(...) | SchackTest.java:2:8:2:10 | Normal Exit |
 | SchackTest.java:2:8:2:10 | { ... } | SchackTest.java:2:8:2:10 | super(...) |
-| SchackTest.java:3:8:3:10 | Exceptional Exit | SchackTest.java:3:8:3:10 | Exit |
+| SchackTest.java:3:8:3:10 | Entry | SchackTest.java:3:8:3:10 | { ... } |
 | SchackTest.java:3:8:3:10 | Normal Exit | SchackTest.java:3:8:3:10 | Exit |
 | SchackTest.java:3:8:3:10 | super(...) | SchackTest.java:3:8:3:10 | Normal Exit |
 | SchackTest.java:3:8:3:10 | { ... } | SchackTest.java:3:8:3:10 | super(...) |
+| SchackTest.java:5:7:5:9 | Entry | SchackTest.java:5:18:24:2 | { ... } |
 | SchackTest.java:5:7:5:9 | Exceptional Exit | SchackTest.java:5:7:5:9 | Exit |
 | SchackTest.java:5:7:5:9 | Normal Exit | SchackTest.java:5:7:5:9 | Exit |
 | SchackTest.java:5:18:24:2 | { ... } | SchackTest.java:6:3:23:3 | try ... |
@@ -36,7 +37,6 @@
 | SchackTest.java:13:9:13:13 | bar(...) | SchackTest.java:14:6:14:42 | <Expr>; |
 | SchackTest.java:13:9:13:13 | bar(...) | SchackTest.java:16:4:16:41 | <Expr>; |
 | SchackTest.java:13:9:13:13 | bar(...) | SchackTest.java:17:5:17:17 | catch (...) |
-| SchackTest.java:13:9:13:13 | bar(...) | SchackTest.java:19:5:19:17 | catch (...) |
 | SchackTest.java:13:9:13:13 | bar(...) | SchackTest.java:21:13:23:3 | { ... } |
 | SchackTest.java:14:6:14:15 | System.out | SchackTest.java:14:25:14:40 | "true successor" |
 | SchackTest.java:14:6:14:41 | println(...) | SchackTest.java:16:4:16:41 | <Expr>; |
@@ -45,10 +45,12 @@
 | SchackTest.java:14:6:14:42 | <Expr>; | SchackTest.java:14:6:14:15 | System.out |
 | SchackTest.java:14:25:14:40 | "true successor" | SchackTest.java:14:6:14:41 | println(...) |
 | SchackTest.java:16:4:16:13 | System.out | SchackTest.java:16:23:16:39 | "false successor" |
+| SchackTest.java:16:4:16:40 | println(...) | SchackTest.java:17:5:17:17 | catch (...) |
 | SchackTest.java:16:4:16:40 | println(...) | SchackTest.java:21:13:23:3 | { ... } |
 | SchackTest.java:16:4:16:41 | <Expr>; | SchackTest.java:16:4:16:13 | System.out |
 | SchackTest.java:16:23:16:39 | "false successor" | SchackTest.java:16:4:16:40 | println(...) |
 | SchackTest.java:17:5:17:17 | catch (...) | SchackTest.java:17:16:17:16 | e |
+| SchackTest.java:17:5:17:17 | catch (...) | SchackTest.java:19:5:19:17 | catch (...) |
 | SchackTest.java:17:16:17:16 | e | SchackTest.java:17:19:19:3 | { ... } |
 | SchackTest.java:17:19:19:3 | { ... } | SchackTest.java:18:4:18:41 | <Expr>; |
 | SchackTest.java:18:4:18:13 | System.out | SchackTest.java:18:23:18:39 | "false successor" |
@@ -56,6 +58,7 @@
 | SchackTest.java:18:4:18:41 | <Expr>; | SchackTest.java:18:4:18:13 | System.out |
 | SchackTest.java:18:23:18:39 | "false successor" | SchackTest.java:18:4:18:40 | println(...) |
 | SchackTest.java:19:5:19:17 | catch (...) | SchackTest.java:19:16:19:16 | e |
+| SchackTest.java:19:5:19:17 | catch (...) | SchackTest.java:21:13:23:3 | { ... } |
 | SchackTest.java:19:16:19:16 | e | SchackTest.java:19:19:21:3 | { ... } |
 | SchackTest.java:19:19:21:3 | { ... } | SchackTest.java:20:4:20:74 | <Expr>; |
 | SchackTest.java:20:4:20:13 | System.out | SchackTest.java:20:23:20:72 | "successor (but neither true nor false successor)" |
@@ -68,6 +71,7 @@
 | SchackTest.java:22:4:22:40 | println(...) | SchackTest.java:5:7:5:9 | Normal Exit |
 | SchackTest.java:22:4:22:41 | <Expr>; | SchackTest.java:22:4:22:13 | System.out |
 | SchackTest.java:22:23:22:39 | "false successor" | SchackTest.java:22:4:22:40 | println(...) |
+| SchackTest.java:26:18:26:20 | Entry | SchackTest.java:26:35:30:2 | { ... } |
 | SchackTest.java:26:18:26:20 | Exceptional Exit | SchackTest.java:26:18:26:20 | Exit |
 | SchackTest.java:26:18:26:20 | Normal Exit | SchackTest.java:26:18:26:20 | Exit |
 | SchackTest.java:26:35:30:2 | { ... } | SchackTest.java:27:3:27:25 | if (...) |
diff --git a/java/ql/test/library-tests/successors/SchackTest/TestSucc.ql b/java/ql/test/library-tests/successors/SchackTest/TestSucc.ql
index 6fca436fbfd..68c50a85c58 100644
--- a/java/ql/test/library-tests/successors/SchackTest/TestSucc.ql
+++ b/java/ql/test/library-tests/successors/SchackTest/TestSucc.ql
@@ -1,8 +1,9 @@
 import java
+import utils.test.AstCfg
 
 from ControlFlowNode n, ControlFlowNode succ
 where
-  succ = n.getASuccessor() and
+  succ = getAnAstSuccessor(n) and
   n.getLocation().getFile().getExtension() = "java" and
   not n.getLocation().getFile().getStem() = "PopulateRuntimeException"
 select n, succ
diff --git a/java/ql/test/library-tests/successors/TestBreak/FalseSuccessors.expected b/java/ql/test/library-tests/successors/TestBreak/FalseSuccessors.expected
deleted file mode 100644
index 6d5fbfbded6..00000000000
--- a/java/ql/test/library-tests/successors/TestBreak/FalseSuccessors.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-| TestBreak.java:12:9:12:14 | ... == ... | TestBreak.java:16:5:27:5 | { ... } |
-| TestBreak.java:19:11:19:16 | ... == ... | TestBreak.java:23:7:25:7 | { ... } |
-| TestBreak.java:32:8:32:13 | ... == ... | TestBreak.java:36:4:46:4 | { ... } |
-| TestBreak.java:39:10:39:15 | ... == ... | TestBreak.java:43:6:43:15 | <Expr>; |
-| TestBreak.java:44:14:44:19 | ... == ... | TestBreak.java:45:5:45:11 | <Expr>; |
diff --git a/java/ql/test/library-tests/successors/TestBreak/FalseSuccessors.ql b/java/ql/test/library-tests/successors/TestBreak/FalseSuccessors.ql
deleted file mode 100644
index aee4021bee6..00000000000
--- a/java/ql/test/library-tests/successors/TestBreak/FalseSuccessors.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import java
-
-from ConditionNode c
-select c, c.getAFalseSuccessor()
diff --git a/java/ql/test/library-tests/successors/TestBreak/TestSucc.expected b/java/ql/test/library-tests/successors/TestBreak/TestSucc.expected
index 3fc266a0928..ad033101fd6 100644
--- a/java/ql/test/library-tests/successors/TestBreak/TestSucc.expected
+++ b/java/ql/test/library-tests/successors/TestBreak/TestSucc.expected
@@ -1,8 +1,8 @@
-| TestBreak.java:3:14:3:22 | Exceptional Exit | TestBreak.java:3:14:3:22 | Exit |
+| TestBreak.java:3:14:3:22 | Entry | TestBreak.java:3:14:3:22 | { ... } |
 | TestBreak.java:3:14:3:22 | Normal Exit | TestBreak.java:3:14:3:22 | Exit |
 | TestBreak.java:3:14:3:22 | super(...) | TestBreak.java:3:14:3:22 | Normal Exit |
 | TestBreak.java:3:14:3:22 | { ... } | TestBreak.java:3:14:3:22 | super(...) |
-| TestBreak.java:4:14:4:14 | Exceptional Exit | TestBreak.java:4:14:4:14 | Exit |
+| TestBreak.java:4:14:4:14 | Entry | TestBreak.java:5:2:85:2 | { ... } |
 | TestBreak.java:4:14:4:14 | Normal Exit | TestBreak.java:4:14:4:14 | Exit |
 | TestBreak.java:5:2:85:2 | { ... } | TestBreak.java:7:3:8:11 | <Label>: ... |
 | TestBreak.java:7:3:8:11 | <Label>: ... | TestBreak.java:8:4:8:11 | for (...;...;...) |
@@ -11,8 +11,9 @@
 | TestBreak.java:10:5:10:14 | var ...; | TestBreak.java:10:13:10:13 | 1 |
 | TestBreak.java:10:9:10:13 | x | TestBreak.java:11:5:11:14 | <Expr>; |
 | TestBreak.java:10:13:10:13 | 1 | TestBreak.java:10:9:10:13 | x |
+| TestBreak.java:11:5:11:5 | x | TestBreak.java:11:9:11:9 | x |
 | TestBreak.java:11:5:11:13 | ...=... | TestBreak.java:12:5:12:15 | if (...) |
-| TestBreak.java:11:5:11:14 | <Expr>; | TestBreak.java:11:9:11:9 | x |
+| TestBreak.java:11:5:11:14 | <Expr>; | TestBreak.java:11:5:11:5 | x |
 | TestBreak.java:11:9:11:9 | x | TestBreak.java:11:13:11:13 | 1 |
 | TestBreak.java:11:9:11:13 | ... + ... | TestBreak.java:11:5:11:13 | ...=... |
 | TestBreak.java:11:13:11:13 | 1 | TestBreak.java:11:9:11:13 | ... + ... |
@@ -62,8 +63,9 @@
 | TestBreak.java:39:15:39:15 | 2 | TestBreak.java:39:10:39:15 | ... == ... |
 | TestBreak.java:40:6:42:6 | { ... } | TestBreak.java:41:7:41:12 | break |
 | TestBreak.java:41:7:41:12 | break | TestBreak.java:45:5:45:11 | <Expr>; |
+| TestBreak.java:43:6:43:6 | y | TestBreak.java:43:10:43:10 | y |
 | TestBreak.java:43:6:43:14 | ...=... | TestBreak.java:44:14:44:14 | y |
-| TestBreak.java:43:6:43:15 | <Expr>; | TestBreak.java:43:10:43:10 | y |
+| TestBreak.java:43:6:43:15 | <Expr>; | TestBreak.java:43:6:43:6 | y |
 | TestBreak.java:43:10:43:10 | y | TestBreak.java:43:14:43:14 | 2 |
 | TestBreak.java:43:10:43:14 | ... + ... | TestBreak.java:43:6:43:14 | ...=... |
 | TestBreak.java:43:14:43:14 | 2 | TestBreak.java:43:10:43:14 | ... + ... |
@@ -71,89 +73,111 @@
 | TestBreak.java:44:14:44:19 | ... == ... | TestBreak.java:38:5:44:5 | { ... } |
 | TestBreak.java:44:14:44:19 | ... == ... | TestBreak.java:45:5:45:11 | <Expr>; |
 | TestBreak.java:44:19:44:19 | 1 | TestBreak.java:44:14:44:19 | ... == ... |
+| TestBreak.java:45:5:45:5 | y | TestBreak.java:45:9:45:10 | 12 |
 | TestBreak.java:45:5:45:10 | ...=... | TestBreak.java:30:10:30:13 | true |
-| TestBreak.java:45:5:45:11 | <Expr>; | TestBreak.java:45:9:45:10 | 12 |
+| TestBreak.java:45:5:45:11 | <Expr>; | TestBreak.java:45:5:45:5 | y |
 | TestBreak.java:45:9:45:10 | 12 | TestBreak.java:45:5:45:10 | ...=... |
+| TestBreak.java:48:3:48:3 | y | TestBreak.java:48:7:48:8 | 13 |
 | TestBreak.java:48:3:48:8 | ...=... | TestBreak.java:51:3:51:12 | var ...; |
-| TestBreak.java:48:3:48:9 | <Expr>; | TestBreak.java:48:7:48:8 | 13 |
+| TestBreak.java:48:3:48:9 | <Expr>; | TestBreak.java:48:3:48:3 | y |
 | TestBreak.java:48:7:48:8 | 13 | TestBreak.java:48:3:48:8 | ...=... |
 | TestBreak.java:51:3:51:12 | var ...; | TestBreak.java:51:10:51:11 | 12 |
 | TestBreak.java:51:7:51:11 | x | TestBreak.java:52:3:52:12 | switch (...) |
 | TestBreak.java:51:10:51:11 | 12 | TestBreak.java:51:7:51:11 | x |
 | TestBreak.java:52:3:52:12 | switch (...) | TestBreak.java:52:11:52:11 | x |
 | TestBreak.java:52:11:52:11 | x | TestBreak.java:54:3:54:9 | case ... |
-| TestBreak.java:52:11:52:11 | x | TestBreak.java:57:3:57:9 | case ... |
-| TestBreak.java:52:11:52:11 | x | TestBreak.java:61:3:61:9 | case ... |
-| TestBreak.java:52:11:52:11 | x | TestBreak.java:62:3:62:9 | case ... |
-| TestBreak.java:52:11:52:11 | x | TestBreak.java:66:3:66:9 | case ... |
-| TestBreak.java:52:11:52:11 | x | TestBreak.java:67:3:67:9 | case ... |
-| TestBreak.java:52:11:52:11 | x | TestBreak.java:70:3:70:10 | default |
-| TestBreak.java:54:3:54:9 | case ... | TestBreak.java:55:4:55:13 | <Expr>; |
+| TestBreak.java:54:3:54:9 | case ... | TestBreak.java:54:8:54:8 | 1 |
+| TestBreak.java:54:3:54:9 | case ... | TestBreak.java:57:3:57:9 | case ... |
+| TestBreak.java:54:8:54:8 | 1 | TestBreak.java:55:4:55:13 | <Expr>; |
+| TestBreak.java:55:4:55:4 | x | TestBreak.java:55:8:55:8 | x |
 | TestBreak.java:55:4:55:12 | ...=... | TestBreak.java:56:4:56:13 | <Expr>; |
-| TestBreak.java:55:4:55:13 | <Expr>; | TestBreak.java:55:8:55:8 | x |
+| TestBreak.java:55:4:55:13 | <Expr>; | TestBreak.java:55:4:55:4 | x |
 | TestBreak.java:55:8:55:8 | x | TestBreak.java:55:12:55:12 | 1 |
 | TestBreak.java:55:8:55:12 | ... + ... | TestBreak.java:55:4:55:12 | ...=... |
 | TestBreak.java:55:12:55:12 | 1 | TestBreak.java:55:8:55:12 | ... + ... |
-| TestBreak.java:56:4:56:12 | ...=... | TestBreak.java:57:3:57:9 | case ... |
-| TestBreak.java:56:4:56:13 | <Expr>; | TestBreak.java:56:8:56:8 | y |
+| TestBreak.java:56:4:56:4 | y | TestBreak.java:56:8:56:8 | y |
+| TestBreak.java:56:4:56:12 | ...=... | TestBreak.java:58:4:58:13 | <Expr>; |
+| TestBreak.java:56:4:56:13 | <Expr>; | TestBreak.java:56:4:56:4 | y |
 | TestBreak.java:56:8:56:8 | y | TestBreak.java:56:12:56:12 | 1 |
 | TestBreak.java:56:8:56:12 | ... + ... | TestBreak.java:56:4:56:12 | ...=... |
 | TestBreak.java:56:12:56:12 | 1 | TestBreak.java:56:8:56:12 | ... + ... |
-| TestBreak.java:57:3:57:9 | case ... | TestBreak.java:58:4:58:13 | <Expr>; |
+| TestBreak.java:57:3:57:9 | case ... | TestBreak.java:57:8:57:8 | 2 |
+| TestBreak.java:57:3:57:9 | case ... | TestBreak.java:61:3:61:9 | case ... |
+| TestBreak.java:57:8:57:8 | 2 | TestBreak.java:58:4:58:13 | <Expr>; |
+| TestBreak.java:58:4:58:4 | x | TestBreak.java:58:8:58:8 | x |
 | TestBreak.java:58:4:58:12 | ...=... | TestBreak.java:59:4:59:13 | <Expr>; |
-| TestBreak.java:58:4:58:13 | <Expr>; | TestBreak.java:58:8:58:8 | x |
+| TestBreak.java:58:4:58:13 | <Expr>; | TestBreak.java:58:4:58:4 | x |
 | TestBreak.java:58:8:58:8 | x | TestBreak.java:58:12:58:12 | 2 |
 | TestBreak.java:58:8:58:12 | ... + ... | TestBreak.java:58:4:58:12 | ...=... |
 | TestBreak.java:58:12:58:12 | 2 | TestBreak.java:58:8:58:12 | ... + ... |
+| TestBreak.java:59:4:59:4 | y | TestBreak.java:59:8:59:8 | y |
 | TestBreak.java:59:4:59:12 | ...=... | TestBreak.java:60:4:60:9 | break |
-| TestBreak.java:59:4:59:13 | <Expr>; | TestBreak.java:59:8:59:8 | y |
+| TestBreak.java:59:4:59:13 | <Expr>; | TestBreak.java:59:4:59:4 | y |
 | TestBreak.java:59:8:59:8 | y | TestBreak.java:59:12:59:12 | 2 |
 | TestBreak.java:59:8:59:12 | ... + ... | TestBreak.java:59:4:59:12 | ...=... |
 | TestBreak.java:59:12:59:12 | 2 | TestBreak.java:59:8:59:12 | ... + ... |
 | TestBreak.java:60:4:60:9 | break | TestBreak.java:76:3:76:11 | switch (...) |
+| TestBreak.java:61:3:61:9 | case ... | TestBreak.java:61:8:61:8 | 3 |
 | TestBreak.java:61:3:61:9 | case ... | TestBreak.java:62:3:62:9 | case ... |
-| TestBreak.java:62:3:62:9 | case ... | TestBreak.java:63:4:63:13 | <Expr>; |
+| TestBreak.java:61:8:61:8 | 3 | TestBreak.java:63:4:63:13 | <Expr>; |
+| TestBreak.java:62:3:62:9 | case ... | TestBreak.java:62:8:62:8 | 4 |
+| TestBreak.java:62:3:62:9 | case ... | TestBreak.java:66:3:66:9 | case ... |
+| TestBreak.java:62:8:62:8 | 4 | TestBreak.java:63:4:63:13 | <Expr>; |
+| TestBreak.java:63:4:63:4 | x | TestBreak.java:63:8:63:8 | x |
 | TestBreak.java:63:4:63:12 | ...=... | TestBreak.java:64:4:64:13 | <Expr>; |
-| TestBreak.java:63:4:63:13 | <Expr>; | TestBreak.java:63:8:63:8 | x |
+| TestBreak.java:63:4:63:13 | <Expr>; | TestBreak.java:63:4:63:4 | x |
 | TestBreak.java:63:8:63:8 | x | TestBreak.java:63:12:63:12 | 3 |
 | TestBreak.java:63:8:63:12 | ... + ... | TestBreak.java:63:4:63:12 | ...=... |
 | TestBreak.java:63:12:63:12 | 3 | TestBreak.java:63:8:63:12 | ... + ... |
+| TestBreak.java:64:4:64:4 | y | TestBreak.java:64:8:64:8 | y |
 | TestBreak.java:64:4:64:12 | ...=... | TestBreak.java:65:4:65:9 | break |
-| TestBreak.java:64:4:64:13 | <Expr>; | TestBreak.java:64:8:64:8 | y |
+| TestBreak.java:64:4:64:13 | <Expr>; | TestBreak.java:64:4:64:4 | y |
 | TestBreak.java:64:8:64:8 | y | TestBreak.java:64:12:64:12 | 4 |
 | TestBreak.java:64:8:64:12 | ... + ... | TestBreak.java:64:4:64:12 | ...=... |
 | TestBreak.java:64:12:64:12 | 4 | TestBreak.java:64:8:64:12 | ... + ... |
 | TestBreak.java:65:4:65:9 | break | TestBreak.java:76:3:76:11 | switch (...) |
+| TestBreak.java:66:3:66:9 | case ... | TestBreak.java:66:8:66:8 | 5 |
 | TestBreak.java:66:3:66:9 | case ... | TestBreak.java:67:3:67:9 | case ... |
-| TestBreak.java:67:3:67:9 | case ... | TestBreak.java:68:4:68:13 | <Expr>; |
+| TestBreak.java:66:8:66:8 | 5 | TestBreak.java:68:4:68:13 | <Expr>; |
+| TestBreak.java:67:3:67:9 | case ... | TestBreak.java:67:8:67:8 | 6 |
+| TestBreak.java:67:3:67:9 | case ... | TestBreak.java:70:3:70:10 | default |
+| TestBreak.java:67:8:67:8 | 6 | TestBreak.java:68:4:68:13 | <Expr>; |
+| TestBreak.java:68:4:68:4 | x | TestBreak.java:68:8:68:8 | x |
 | TestBreak.java:68:4:68:12 | ...=... | TestBreak.java:69:4:69:13 | <Expr>; |
-| TestBreak.java:68:4:68:13 | <Expr>; | TestBreak.java:68:8:68:8 | x |
+| TestBreak.java:68:4:68:13 | <Expr>; | TestBreak.java:68:4:68:4 | x |
 | TestBreak.java:68:8:68:8 | x | TestBreak.java:68:12:68:12 | 5 |
 | TestBreak.java:68:8:68:12 | ... + ... | TestBreak.java:68:4:68:12 | ...=... |
 | TestBreak.java:68:12:68:12 | 5 | TestBreak.java:68:8:68:12 | ... + ... |
-| TestBreak.java:69:4:69:12 | ...=... | TestBreak.java:70:3:70:10 | default |
-| TestBreak.java:69:4:69:13 | <Expr>; | TestBreak.java:69:8:69:8 | y |
+| TestBreak.java:69:4:69:4 | y | TestBreak.java:69:8:69:8 | y |
+| TestBreak.java:69:4:69:12 | ...=... | TestBreak.java:71:4:71:9 | <Expr>; |
+| TestBreak.java:69:4:69:13 | <Expr>; | TestBreak.java:69:4:69:4 | y |
 | TestBreak.java:69:8:69:8 | y | TestBreak.java:69:12:69:12 | 6 |
 | TestBreak.java:69:8:69:12 | ... + ... | TestBreak.java:69:4:69:12 | ...=... |
 | TestBreak.java:69:12:69:12 | 6 | TestBreak.java:69:8:69:12 | ... + ... |
 | TestBreak.java:70:3:70:10 | default | TestBreak.java:71:4:71:9 | <Expr>; |
+| TestBreak.java:71:4:71:4 | x | TestBreak.java:71:8:71:8 | y |
 | TestBreak.java:71:4:71:8 | ...=... | TestBreak.java:72:4:72:9 | <Expr>; |
-| TestBreak.java:71:4:71:9 | <Expr>; | TestBreak.java:71:8:71:8 | y |
+| TestBreak.java:71:4:71:9 | <Expr>; | TestBreak.java:71:4:71:4 | x |
 | TestBreak.java:71:8:71:8 | y | TestBreak.java:71:4:71:8 | ...=... |
+| TestBreak.java:72:4:72:4 | y | TestBreak.java:72:8:72:8 | x |
 | TestBreak.java:72:4:72:8 | ...=... | TestBreak.java:76:3:76:11 | switch (...) |
-| TestBreak.java:72:4:72:9 | <Expr>; | TestBreak.java:72:8:72:8 | x |
+| TestBreak.java:72:4:72:9 | <Expr>; | TestBreak.java:72:4:72:4 | y |
 | TestBreak.java:72:8:72:8 | x | TestBreak.java:72:4:72:8 | ...=... |
 | TestBreak.java:76:3:76:11 | switch (...) | TestBreak.java:76:10:76:10 | x |
-| TestBreak.java:76:10:76:10 | x | TestBreak.java:4:14:4:14 | Normal Exit |
 | TestBreak.java:76:10:76:10 | x | TestBreak.java:78:3:78:9 | case ... |
-| TestBreak.java:76:10:76:10 | x | TestBreak.java:81:3:81:9 | case ... |
-| TestBreak.java:78:3:78:9 | case ... | TestBreak.java:79:4:79:9 | <Expr>; |
+| TestBreak.java:78:3:78:9 | case ... | TestBreak.java:78:8:78:8 | 1 |
+| TestBreak.java:78:3:78:9 | case ... | TestBreak.java:81:3:81:9 | case ... |
+| TestBreak.java:78:8:78:8 | 1 | TestBreak.java:79:4:79:9 | <Expr>; |
+| TestBreak.java:79:4:79:4 | x | TestBreak.java:79:8:79:8 | 1 |
 | TestBreak.java:79:4:79:8 | ...=... | TestBreak.java:80:4:80:9 | break |
-| TestBreak.java:79:4:79:9 | <Expr>; | TestBreak.java:79:8:79:8 | 1 |
+| TestBreak.java:79:4:79:9 | <Expr>; | TestBreak.java:79:4:79:4 | x |
 | TestBreak.java:79:8:79:8 | 1 | TestBreak.java:79:4:79:8 | ...=... |
 | TestBreak.java:80:4:80:9 | break | TestBreak.java:4:14:4:14 | Normal Exit |
-| TestBreak.java:81:3:81:9 | case ... | TestBreak.java:82:4:82:9 | <Expr>; |
+| TestBreak.java:81:3:81:9 | case ... | TestBreak.java:4:14:4:14 | Normal Exit |
+| TestBreak.java:81:3:81:9 | case ... | TestBreak.java:81:8:81:8 | 2 |
+| TestBreak.java:81:8:81:8 | 2 | TestBreak.java:82:4:82:9 | <Expr>; |
+| TestBreak.java:82:4:82:4 | x | TestBreak.java:82:8:82:8 | 2 |
 | TestBreak.java:82:4:82:8 | ...=... | TestBreak.java:83:4:83:9 | break |
-| TestBreak.java:82:4:82:9 | <Expr>; | TestBreak.java:82:8:82:8 | 2 |
+| TestBreak.java:82:4:82:9 | <Expr>; | TestBreak.java:82:4:82:4 | x |
 | TestBreak.java:82:8:82:8 | 2 | TestBreak.java:82:4:82:8 | ...=... |
 | TestBreak.java:83:4:83:9 | break | TestBreak.java:4:14:4:14 | Normal Exit |
diff --git a/java/ql/test/library-tests/successors/TestBreak/TestSucc.ql b/java/ql/test/library-tests/successors/TestBreak/TestSucc.ql
index 6fca436fbfd..68c50a85c58 100644
--- a/java/ql/test/library-tests/successors/TestBreak/TestSucc.ql
+++ b/java/ql/test/library-tests/successors/TestBreak/TestSucc.ql
@@ -1,8 +1,9 @@
 import java
+import utils.test.AstCfg
 
 from ControlFlowNode n, ControlFlowNode succ
 where
-  succ = n.getASuccessor() and
+  succ = getAnAstSuccessor(n) and
   n.getLocation().getFile().getExtension() = "java" and
   not n.getLocation().getFile().getStem() = "PopulateRuntimeException"
 select n, succ
diff --git a/java/ql/test/library-tests/successors/TestContinue/FalseSuccessors.expected b/java/ql/test/library-tests/successors/TestContinue/FalseSuccessors.expected
deleted file mode 100644
index ce0fd732685..00000000000
--- a/java/ql/test/library-tests/successors/TestContinue/FalseSuccessors.expected
+++ /dev/null
@@ -1,10 +0,0 @@
-| TestContinue.java:8:20:8:25 | ... < ... | TestContinue.java:30:3:30:13 | var ...; |
-| TestContinue.java:12:9:12:14 | ... == ... | TestContinue.java:16:5:28:5 | { ... } |
-| TestContinue.java:19:11:19:16 | ... == ... | TestContinue.java:22:14:22:24 | if (...) |
-| TestContinue.java:22:18:22:23 | ... == ... | TestContinue.java:26:7:26:13 | <Expr>; |
-| TestContinue.java:31:10:31:16 | ... != ... | TestContinue.java:50:3:50:9 | <Expr>; |
-| TestContinue.java:33:8:33:13 | ... == ... | TestContinue.java:37:4:47:4 | { ... } |
-| TestContinue.java:40:10:40:15 | ... == ... | TestContinue.java:44:6:44:15 | <Expr>; |
-| TestContinue.java:45:14:45:19 | ... == ... | TestContinue.java:46:5:46:11 | <Expr>; |
-| TestContinue.java:51:10:51:16 | ... != ... | TestContinue.java:4:14:4:14 | Normal Exit |
-| TestContinue.java:53:8:53:13 | ... != ... | TestContinue.java:56:5:56:10 | break |
diff --git a/java/ql/test/library-tests/successors/TestContinue/FalseSuccessors.ql b/java/ql/test/library-tests/successors/TestContinue/FalseSuccessors.ql
deleted file mode 100644
index aee4021bee6..00000000000
--- a/java/ql/test/library-tests/successors/TestContinue/FalseSuccessors.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import java
-
-from ConditionNode c
-select c, c.getAFalseSuccessor()
diff --git a/java/ql/test/library-tests/successors/TestContinue/TestSucc.expected b/java/ql/test/library-tests/successors/TestContinue/TestSucc.expected
index 3a1dd2ca66e..a86d8a942f1 100644
--- a/java/ql/test/library-tests/successors/TestContinue/TestSucc.expected
+++ b/java/ql/test/library-tests/successors/TestContinue/TestSucc.expected
@@ -1,8 +1,8 @@
-| TestContinue.java:3:14:3:25 | Exceptional Exit | TestContinue.java:3:14:3:25 | Exit |
+| TestContinue.java:3:14:3:25 | Entry | TestContinue.java:3:14:3:25 | { ... } |
 | TestContinue.java:3:14:3:25 | Normal Exit | TestContinue.java:3:14:3:25 | Exit |
 | TestContinue.java:3:14:3:25 | super(...) | TestContinue.java:3:14:3:25 | Normal Exit |
 | TestContinue.java:3:14:3:25 | { ... } | TestContinue.java:3:14:3:25 | super(...) |
-| TestContinue.java:4:14:4:14 | Exceptional Exit | TestContinue.java:4:14:4:14 | Exit |
+| TestContinue.java:4:14:4:14 | Entry | TestContinue.java:5:2:58:2 | { ... } |
 | TestContinue.java:4:14:4:14 | Normal Exit | TestContinue.java:4:14:4:14 | Exit |
 | TestContinue.java:5:2:58:2 | { ... } | TestContinue.java:7:3:8:27 | <Label>: ... |
 | TestContinue.java:7:3:8:27 | <Label>: ... | TestContinue.java:8:4:8:27 | for (...;...;...) |
@@ -17,8 +17,9 @@
 | TestContinue.java:10:5:10:14 | var ...; | TestContinue.java:10:13:10:13 | 1 |
 | TestContinue.java:10:9:10:13 | x | TestContinue.java:11:5:11:14 | <Expr>; |
 | TestContinue.java:10:13:10:13 | 1 | TestContinue.java:10:9:10:13 | x |
+| TestContinue.java:11:5:11:5 | x | TestContinue.java:11:9:11:9 | x |
 | TestContinue.java:11:5:11:13 | ...=... | TestContinue.java:12:5:12:15 | if (...) |
-| TestContinue.java:11:5:11:14 | <Expr>; | TestContinue.java:11:9:11:9 | x |
+| TestContinue.java:11:5:11:14 | <Expr>; | TestContinue.java:11:5:11:5 | x |
 | TestContinue.java:11:9:11:9 | x | TestContinue.java:11:13:11:13 | 1 |
 | TestContinue.java:11:9:11:13 | ... + ... | TestContinue.java:11:5:11:13 | ...=... |
 | TestContinue.java:11:13:11:13 | 1 | TestContinue.java:11:9:11:13 | ... + ... |
@@ -51,9 +52,10 @@
 | TestContinue.java:22:23:22:23 | 2 | TestContinue.java:22:18:22:23 | ... == ... |
 | TestContinue.java:23:7:25:7 | { ... } | TestContinue.java:24:8:24:18 | continue |
 | TestContinue.java:24:8:24:18 | continue | TestContinue.java:8:20:8:20 | p |
+| TestContinue.java:26:7:26:7 | q | TestContinue.java:26:11:26:12 | 12 |
 | TestContinue.java:26:7:26:12 | ...=... | TestContinue.java:8:20:8:20 | p |
 | TestContinue.java:26:7:26:12 | ...=... | TestContinue.java:17:15:17:15 | q |
-| TestContinue.java:26:7:26:13 | <Expr>; | TestContinue.java:26:11:26:12 | 12 |
+| TestContinue.java:26:7:26:13 | <Expr>; | TestContinue.java:26:7:26:7 | q |
 | TestContinue.java:26:11:26:12 | 12 | TestContinue.java:26:7:26:12 | ...=... |
 | TestContinue.java:30:3:30:13 | var ...; | TestContinue.java:30:11:30:12 | 12 |
 | TestContinue.java:30:7:30:12 | y | TestContinue.java:31:3:31:17 | while (...) |
@@ -81,8 +83,9 @@
 | TestContinue.java:40:15:40:15 | 2 | TestContinue.java:40:10:40:15 | ... == ... |
 | TestContinue.java:41:6:43:6 | { ... } | TestContinue.java:42:7:42:15 | continue |
 | TestContinue.java:42:7:42:15 | continue | TestContinue.java:45:14:45:14 | y |
+| TestContinue.java:44:6:44:6 | y | TestContinue.java:44:10:44:10 | y |
 | TestContinue.java:44:6:44:14 | ...=... | TestContinue.java:45:14:45:14 | y |
-| TestContinue.java:44:6:44:15 | <Expr>; | TestContinue.java:44:10:44:10 | y |
+| TestContinue.java:44:6:44:15 | <Expr>; | TestContinue.java:44:6:44:6 | y |
 | TestContinue.java:44:10:44:10 | y | TestContinue.java:44:14:44:14 | 2 |
 | TestContinue.java:44:10:44:14 | ... + ... | TestContinue.java:44:6:44:14 | ...=... |
 | TestContinue.java:44:14:44:14 | 2 | TestContinue.java:44:10:44:14 | ... + ... |
@@ -90,14 +93,17 @@
 | TestContinue.java:45:14:45:19 | ... == ... | TestContinue.java:39:5:45:5 | { ... } |
 | TestContinue.java:45:14:45:19 | ... == ... | TestContinue.java:46:5:46:11 | <Expr>; |
 | TestContinue.java:45:19:45:19 | 1 | TestContinue.java:45:14:45:19 | ... == ... |
+| TestContinue.java:46:5:46:5 | y | TestContinue.java:46:9:46:10 | 12 |
 | TestContinue.java:46:5:46:10 | ...=... | TestContinue.java:48:4:48:10 | <Expr>; |
-| TestContinue.java:46:5:46:11 | <Expr>; | TestContinue.java:46:9:46:10 | 12 |
+| TestContinue.java:46:5:46:11 | <Expr>; | TestContinue.java:46:5:46:5 | y |
 | TestContinue.java:46:9:46:10 | 12 | TestContinue.java:46:5:46:10 | ...=... |
+| TestContinue.java:48:4:48:4 | y | TestContinue.java:48:8:48:9 | 15 |
 | TestContinue.java:48:4:48:9 | ...=... | TestContinue.java:31:10:31:10 | y |
-| TestContinue.java:48:4:48:10 | <Expr>; | TestContinue.java:48:8:48:9 | 15 |
+| TestContinue.java:48:4:48:10 | <Expr>; | TestContinue.java:48:4:48:4 | y |
 | TestContinue.java:48:8:48:9 | 15 | TestContinue.java:48:4:48:9 | ...=... |
+| TestContinue.java:50:3:50:3 | y | TestContinue.java:50:7:50:8 | 13 |
 | TestContinue.java:50:3:50:8 | ...=... | TestContinue.java:51:3:51:17 | while (...) |
-| TestContinue.java:50:3:50:9 | <Expr>; | TestContinue.java:50:7:50:8 | 13 |
+| TestContinue.java:50:3:50:9 | <Expr>; | TestContinue.java:50:3:50:3 | y |
 | TestContinue.java:50:7:50:8 | 13 | TestContinue.java:50:3:50:8 | ...=... |
 | TestContinue.java:51:3:51:17 | while (...) | TestContinue.java:51:10:51:10 | y |
 | TestContinue.java:51:10:51:10 | y | TestContinue.java:51:15:51:16 | 12 |
diff --git a/java/ql/test/library-tests/successors/TestContinue/TestSucc.ql b/java/ql/test/library-tests/successors/TestContinue/TestSucc.ql
index 6fca436fbfd..68c50a85c58 100644
--- a/java/ql/test/library-tests/successors/TestContinue/TestSucc.ql
+++ b/java/ql/test/library-tests/successors/TestContinue/TestSucc.ql
@@ -1,8 +1,9 @@
 import java
+import utils.test.AstCfg
 
 from ControlFlowNode n, ControlFlowNode succ
 where
-  succ = n.getASuccessor() and
+  succ = getAnAstSuccessor(n) and
   n.getLocation().getFile().getExtension() = "java" and
   not n.getLocation().getFile().getStem() = "PopulateRuntimeException"
 select n, succ
diff --git a/java/ql/test/library-tests/successors/TestDeclarations/FalseSuccessors.expected b/java/ql/test/library-tests/successors/TestDeclarations/FalseSuccessors.expected
deleted file mode 100644
index c7e0cec8183..00000000000
--- a/java/ql/test/library-tests/successors/TestDeclarations/FalseSuccessors.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| TestDeclarations.java:10:8:10:14 | ... > ... | TestDeclarations.java:15:4:15:15 | if (...) |
-| TestDeclarations.java:15:8:15:14 | ... == ... | TestDeclarations.java:17:4:17:15 | if (...) |
-| TestDeclarations.java:17:8:17:14 | ... == ... | TestDeclarations.java:7:9:7:12 | true |
diff --git a/java/ql/test/library-tests/successors/TestDeclarations/FalseSuccessors.ql b/java/ql/test/library-tests/successors/TestDeclarations/FalseSuccessors.ql
deleted file mode 100644
index aee4021bee6..00000000000
--- a/java/ql/test/library-tests/successors/TestDeclarations/FalseSuccessors.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import java
-
-from ConditionNode c
-select c, c.getAFalseSuccessor()
diff --git a/java/ql/test/library-tests/successors/TestDeclarations/TestSucc.expected b/java/ql/test/library-tests/successors/TestDeclarations/TestSucc.expected
index fa96ae567dc..cd4a21ce387 100644
--- a/java/ql/test/library-tests/successors/TestDeclarations/TestSucc.expected
+++ b/java/ql/test/library-tests/successors/TestDeclarations/TestSucc.expected
@@ -1,24 +1,27 @@
-| TestDeclarations.java:1:7:1:22 | Exceptional Exit | TestDeclarations.java:1:7:1:22 | Exit |
+| TestDeclarations.java:1:7:1:22 | Entry | TestDeclarations.java:1:7:1:22 | { ... } |
 | TestDeclarations.java:1:7:1:22 | Normal Exit | TestDeclarations.java:1:7:1:22 | Exit |
 | TestDeclarations.java:1:7:1:22 | super(...) | TestDeclarations.java:1:7:1:22 | Normal Exit |
 | TestDeclarations.java:1:7:1:22 | { ... } | TestDeclarations.java:1:7:1:22 | super(...) |
-| TestDeclarations.java:2:6:2:21 | Exceptional Exit | TestDeclarations.java:2:6:2:21 | Exit |
+| TestDeclarations.java:2:6:2:21 | Entry | TestDeclarations.java:2:30:24:2 | { ... } |
 | TestDeclarations.java:2:6:2:21 | Normal Exit | TestDeclarations.java:2:6:2:21 | Exit |
 | TestDeclarations.java:2:30:24:2 | { ... } | TestDeclarations.java:4:3:4:11 | var ...; |
 | TestDeclarations.java:4:3:4:11 | var ...; | TestDeclarations.java:4:7:4:7 | b |
 | TestDeclarations.java:4:7:4:7 | b | TestDeclarations.java:4:10:4:10 | c |
 | TestDeclarations.java:4:10:4:10 | c | TestDeclarations.java:5:3:5:8 | <Expr>; |
+| TestDeclarations.java:5:3:5:3 | b | TestDeclarations.java:5:7:5:7 | 0 |
 | TestDeclarations.java:5:3:5:7 | ...=... | TestDeclarations.java:6:3:6:8 | <Expr>; |
-| TestDeclarations.java:5:3:5:8 | <Expr>; | TestDeclarations.java:5:7:5:7 | 0 |
+| TestDeclarations.java:5:3:5:8 | <Expr>; | TestDeclarations.java:5:3:5:3 | b |
 | TestDeclarations.java:5:7:5:7 | 0 | TestDeclarations.java:5:3:5:7 | ...=... |
+| TestDeclarations.java:6:3:6:3 | c | TestDeclarations.java:6:7:6:7 | 0 |
 | TestDeclarations.java:6:3:6:7 | ...=... | TestDeclarations.java:7:3:7:13 | while (...) |
-| TestDeclarations.java:6:3:6:8 | <Expr>; | TestDeclarations.java:6:7:6:7 | 0 |
+| TestDeclarations.java:6:3:6:8 | <Expr>; | TestDeclarations.java:6:3:6:3 | c |
 | TestDeclarations.java:6:7:6:7 | 0 | TestDeclarations.java:6:3:6:7 | ...=... |
 | TestDeclarations.java:7:3:7:13 | while (...) | TestDeclarations.java:7:9:7:12 | true |
 | TestDeclarations.java:7:9:7:12 | true | TestDeclarations.java:8:3:19:3 | { ... } |
 | TestDeclarations.java:8:3:19:3 | { ... } | TestDeclarations.java:9:4:9:10 | <Expr>; |
+| TestDeclarations.java:9:4:9:4 | b | TestDeclarations.java:9:8:9:9 | 10 |
 | TestDeclarations.java:9:4:9:9 | ...=... | TestDeclarations.java:10:4:10:15 | if (...) |
-| TestDeclarations.java:9:4:9:10 | <Expr>; | TestDeclarations.java:9:8:9:9 | 10 |
+| TestDeclarations.java:9:4:9:10 | <Expr>; | TestDeclarations.java:9:4:9:4 | b |
 | TestDeclarations.java:9:8:9:9 | 10 | TestDeclarations.java:9:4:9:9 | ...=... |
 | TestDeclarations.java:10:4:10:15 | if (...) | TestDeclarations.java:10:8:10:8 | a |
 | TestDeclarations.java:10:8:10:8 | a | TestDeclarations.java:10:12:10:14 | 100 |
@@ -26,11 +29,13 @@
 | TestDeclarations.java:10:8:10:14 | ... > ... | TestDeclarations.java:15:4:15:15 | if (...) |
 | TestDeclarations.java:10:12:10:14 | 100 | TestDeclarations.java:10:8:10:14 | ... > ... |
 | TestDeclarations.java:11:4:14:4 | { ... } | TestDeclarations.java:12:5:12:11 | <Expr>; |
+| TestDeclarations.java:12:5:12:5 | c | TestDeclarations.java:12:9:12:10 | 10 |
 | TestDeclarations.java:12:5:12:10 | ...=... | TestDeclarations.java:13:5:13:10 | <Expr>; |
-| TestDeclarations.java:12:5:12:11 | <Expr>; | TestDeclarations.java:12:9:12:10 | 10 |
+| TestDeclarations.java:12:5:12:11 | <Expr>; | TestDeclarations.java:12:5:12:5 | c |
 | TestDeclarations.java:12:9:12:10 | 10 | TestDeclarations.java:12:5:12:10 | ...=... |
+| TestDeclarations.java:13:5:13:5 | b | TestDeclarations.java:13:9:13:9 | c |
 | TestDeclarations.java:13:5:13:9 | ...=... | TestDeclarations.java:15:4:15:15 | if (...) |
-| TestDeclarations.java:13:5:13:10 | <Expr>; | TestDeclarations.java:13:9:13:9 | c |
+| TestDeclarations.java:13:5:13:10 | <Expr>; | TestDeclarations.java:13:5:13:5 | b |
 | TestDeclarations.java:13:9:13:9 | c | TestDeclarations.java:13:5:13:9 | ...=... |
 | TestDeclarations.java:15:4:15:15 | if (...) | TestDeclarations.java:15:8:15:8 | a |
 | TestDeclarations.java:15:8:15:8 | a | TestDeclarations.java:15:13:15:14 | 10 |
@@ -48,11 +53,13 @@
 | TestDeclarations.java:20:3:20:10 | var ...; | TestDeclarations.java:20:7:20:7 | x |
 | TestDeclarations.java:20:7:20:7 | x | TestDeclarations.java:20:9:20:9 | y |
 | TestDeclarations.java:20:9:20:9 | y | TestDeclarations.java:21:3:21:8 | <Expr>; |
+| TestDeclarations.java:21:3:21:3 | x | TestDeclarations.java:21:7:21:7 | 3 |
 | TestDeclarations.java:21:3:21:7 | ...=... | TestDeclarations.java:22:3:22:8 | <Expr>; |
-| TestDeclarations.java:21:3:21:8 | <Expr>; | TestDeclarations.java:21:7:21:7 | 3 |
+| TestDeclarations.java:21:3:21:8 | <Expr>; | TestDeclarations.java:21:3:21:3 | x |
 | TestDeclarations.java:21:7:21:7 | 3 | TestDeclarations.java:21:3:21:7 | ...=... |
+| TestDeclarations.java:22:3:22:3 | y | TestDeclarations.java:22:7:22:7 | 4 |
 | TestDeclarations.java:22:3:22:7 | ...=... | TestDeclarations.java:23:10:23:10 | b |
-| TestDeclarations.java:22:3:22:8 | <Expr>; | TestDeclarations.java:22:7:22:7 | 4 |
+| TestDeclarations.java:22:3:22:8 | <Expr>; | TestDeclarations.java:22:3:22:3 | y |
 | TestDeclarations.java:22:7:22:7 | 4 | TestDeclarations.java:22:3:22:7 | ...=... |
 | TestDeclarations.java:23:3:23:11 | return ... | TestDeclarations.java:2:6:2:21 | Normal Exit |
 | TestDeclarations.java:23:10:23:10 | b | TestDeclarations.java:23:3:23:11 | return ... |
diff --git a/java/ql/test/library-tests/successors/TestDeclarations/TestSucc.ql b/java/ql/test/library-tests/successors/TestDeclarations/TestSucc.ql
index 6fca436fbfd..68c50a85c58 100644
--- a/java/ql/test/library-tests/successors/TestDeclarations/TestSucc.ql
+++ b/java/ql/test/library-tests/successors/TestDeclarations/TestSucc.ql
@@ -1,8 +1,9 @@
 import java
+import utils.test.AstCfg
 
 from ControlFlowNode n, ControlFlowNode succ
 where
-  succ = n.getASuccessor() and
+  succ = getAnAstSuccessor(n) and
   n.getLocation().getFile().getExtension() = "java" and
   not n.getLocation().getFile().getStem() = "PopulateRuntimeException"
 select n, succ
diff --git a/java/ql/test/library-tests/successors/TestFinally/FalseSuccessors.expected b/java/ql/test/library-tests/successors/TestFinally/FalseSuccessors.expected
deleted file mode 100644
index 03596ec8969..00000000000
--- a/java/ql/test/library-tests/successors/TestFinally/FalseSuccessors.expected
+++ /dev/null
@@ -1,15 +0,0 @@
-| TestFinally.java:12:9:12:14 | ... == ... | TestFinally.java:16:5:39:5 | try ... |
-| TestFinally.java:19:10:19:15 | ... == ... | TestFinally.java:23:6:23:32 | <Expr>; |
-| TestFinally.java:27:10:27:15 | ... == ... | TestFinally.java:32:5:39:5 | { ... } |
-| TestFinally.java:34:10:34:15 | ... == ... | TestFinally.java:38:6:38:36 | <Expr>; |
-| TestFinally.java:47:10:47:15 | ... == ... | TestFinally.java:51:6:51:32 | <Expr>; |
-| TestFinally.java:55:10:55:15 | ... == ... | TestFinally.java:60:5:67:5 | { ... } |
-| TestFinally.java:62:10:62:15 | ... == ... | TestFinally.java:66:6:66:36 | <Expr>; |
-| TestFinally.java:68:9:68:14 | ... == ... | TestFinally.java:73:4:80:4 | { ... } |
-| TestFinally.java:75:9:75:14 | ... == ... | TestFinally.java:79:5:79:35 | <Expr>; |
-| TestFinally.java:91:9:91:14 | ... == ... | TestFinally.java:95:5:95:31 | <Expr>; |
-| TestFinally.java:99:9:99:14 | ... == ... | TestFinally.java:104:4:111:4 | { ... } |
-| TestFinally.java:106:9:106:14 | ... == ... | TestFinally.java:110:5:110:35 | <Expr>; |
-| TestFinally.java:126:8:126:13 | ... == ... | TestFinally.java:130:4:130:30 | <Expr>; |
-| TestFinally.java:134:8:134:13 | ... == ... | TestFinally.java:139:3:146:3 | { ... } |
-| TestFinally.java:141:8:141:13 | ... == ... | TestFinally.java:145:4:145:34 | <Expr>; |
diff --git a/java/ql/test/library-tests/successors/TestFinally/FalseSuccessors.ql b/java/ql/test/library-tests/successors/TestFinally/FalseSuccessors.ql
deleted file mode 100644
index aee4021bee6..00000000000
--- a/java/ql/test/library-tests/successors/TestFinally/FalseSuccessors.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import java
-
-from ConditionNode c
-select c, c.getAFalseSuccessor()
diff --git a/java/ql/test/library-tests/successors/TestFinally/TestSucc.expected b/java/ql/test/library-tests/successors/TestFinally/TestSucc.expected
index 7728f021a2f..d1eb7cdee32 100644
--- a/java/ql/test/library-tests/successors/TestFinally/TestSucc.expected
+++ b/java/ql/test/library-tests/successors/TestFinally/TestSucc.expected
@@ -1,8 +1,8 @@
-| TestFinally.java:3:14:3:24 | Exceptional Exit | TestFinally.java:3:14:3:24 | Exit |
+| TestFinally.java:3:14:3:24 | Entry | TestFinally.java:3:14:3:24 | { ... } |
 | TestFinally.java:3:14:3:24 | Normal Exit | TestFinally.java:3:14:3:24 | Exit |
 | TestFinally.java:3:14:3:24 | super(...) | TestFinally.java:3:14:3:24 | Normal Exit |
 | TestFinally.java:3:14:3:24 | { ... } | TestFinally.java:3:14:3:24 | super(...) |
-| TestFinally.java:4:14:4:14 | Exceptional Exit | TestFinally.java:4:14:4:14 | Exit |
+| TestFinally.java:4:14:4:14 | Entry | TestFinally.java:5:2:149:2 | { ... } |
 | TestFinally.java:4:14:4:14 | Normal Exit | TestFinally.java:4:14:4:14 | Exit |
 | TestFinally.java:5:2:149:2 | { ... } | TestFinally.java:6:3:6:13 | var ...; |
 | TestFinally.java:6:3:6:13 | var ...; | TestFinally.java:6:11:6:12 | 12 |
@@ -15,7 +15,6 @@
 | TestFinally.java:11:5:11:14 | System.out | TestFinally.java:11:24:11:29 | "Try1" |
 | TestFinally.java:11:5:11:30 | println(...) | TestFinally.java:12:5:12:15 | if (...) |
 | TestFinally.java:11:5:11:30 | println(...) | TestFinally.java:41:6:41:25 | catch (...) |
-| TestFinally.java:11:5:11:30 | println(...) | TestFinally.java:73:4:80:4 | { ... } |
 | TestFinally.java:11:5:11:31 | <Expr>; | TestFinally.java:11:5:11:14 | System.out |
 | TestFinally.java:11:24:11:29 | "Try1" | TestFinally.java:11:5:11:30 | println(...) |
 | TestFinally.java:12:5:12:15 | if (...) | TestFinally.java:12:9:12:9 | z |
@@ -30,7 +29,6 @@
 | TestFinally.java:18:6:18:15 | System.out | TestFinally.java:18:25:18:30 | "Try1" |
 | TestFinally.java:18:6:18:31 | println(...) | TestFinally.java:19:6:19:16 | if (...) |
 | TestFinally.java:18:6:18:31 | println(...) | TestFinally.java:24:7:24:26 | catch (...) |
-| TestFinally.java:18:6:18:31 | println(...) | TestFinally.java:32:5:39:5 | { ... } |
 | TestFinally.java:18:6:18:32 | <Expr>; | TestFinally.java:18:6:18:15 | System.out |
 | TestFinally.java:18:25:18:30 | "Try1" | TestFinally.java:18:6:18:31 | println(...) |
 | TestFinally.java:19:6:19:16 | if (...) | TestFinally.java:19:10:19:10 | z |
@@ -64,7 +62,6 @@
 | TestFinally.java:33:6:33:15 | System.out | TestFinally.java:33:25:33:33 | "Finally" |
 | TestFinally.java:33:6:33:34 | println(...) | TestFinally.java:34:6:34:16 | if (...) |
 | TestFinally.java:33:6:33:34 | println(...) | TestFinally.java:41:6:41:25 | catch (...) |
-| TestFinally.java:33:6:33:34 | println(...) | TestFinally.java:73:4:80:4 | { ... } |
 | TestFinally.java:33:6:33:35 | <Expr>; | TestFinally.java:33:6:33:15 | System.out |
 | TestFinally.java:33:25:33:33 | "Finally" | TestFinally.java:33:6:33:34 | println(...) |
 | TestFinally.java:34:6:34:16 | if (...) | TestFinally.java:34:10:34:10 | z |
@@ -98,7 +95,6 @@
 | TestFinally.java:46:6:46:15 | System.out | TestFinally.java:46:25:46:30 | "Try1" |
 | TestFinally.java:46:6:46:31 | println(...) | TestFinally.java:47:6:47:16 | if (...) |
 | TestFinally.java:46:6:46:31 | println(...) | TestFinally.java:52:7:52:27 | catch (...) |
-| TestFinally.java:46:6:46:31 | println(...) | TestFinally.java:60:5:67:5 | { ... } |
 | TestFinally.java:46:6:46:32 | <Expr>; | TestFinally.java:46:6:46:15 | System.out |
 | TestFinally.java:46:25:46:30 | "Try1" | TestFinally.java:46:6:46:31 | println(...) |
 | TestFinally.java:47:6:47:16 | if (...) | TestFinally.java:47:10:47:10 | z |
@@ -157,7 +153,6 @@
 | TestFinally.java:74:5:74:14 | System.out | TestFinally.java:74:24:74:32 | "Finally" |
 | TestFinally.java:74:5:74:33 | println(...) | TestFinally.java:75:5:75:15 | if (...) |
 | TestFinally.java:74:5:74:33 | println(...) | TestFinally.java:86:5:86:23 | catch (...) |
-| TestFinally.java:74:5:74:33 | println(...) | TestFinally.java:116:3:120:3 | { ... } |
 | TestFinally.java:74:5:74:34 | <Expr>; | TestFinally.java:74:5:74:14 | System.out |
 | TestFinally.java:74:24:74:32 | "Finally" | TestFinally.java:74:5:74:33 | println(...) |
 | TestFinally.java:75:5:75:15 | if (...) | TestFinally.java:75:9:75:9 | z |
@@ -176,7 +171,6 @@
 | TestFinally.java:81:4:81:13 | System.out | TestFinally.java:81:23:81:27 | "Foo" |
 | TestFinally.java:81:4:81:28 | println(...) | TestFinally.java:82:4:82:18 | var ...; |
 | TestFinally.java:81:4:81:28 | println(...) | TestFinally.java:86:5:86:23 | catch (...) |
-| TestFinally.java:81:4:81:28 | println(...) | TestFinally.java:116:3:120:3 | { ... } |
 | TestFinally.java:81:4:81:29 | <Expr>; | TestFinally.java:81:4:81:13 | System.out |
 | TestFinally.java:81:23:81:27 | "Foo" | TestFinally.java:81:4:81:28 | println(...) |
 | TestFinally.java:82:4:82:18 | var ...; | TestFinally.java:82:12:82:13 | 12 |
@@ -187,11 +181,11 @@
 | TestFinally.java:83:4:83:13 | System.out | TestFinally.java:83:23:83:27 | "Bar" |
 | TestFinally.java:83:4:83:28 | println(...) | TestFinally.java:84:4:84:13 | <Expr>; |
 | TestFinally.java:83:4:83:28 | println(...) | TestFinally.java:86:5:86:23 | catch (...) |
-| TestFinally.java:83:4:83:28 | println(...) | TestFinally.java:116:3:120:3 | { ... } |
 | TestFinally.java:83:4:83:29 | <Expr>; | TestFinally.java:83:4:83:13 | System.out |
 | TestFinally.java:83:23:83:27 | "Bar" | TestFinally.java:83:4:83:28 | println(...) |
+| TestFinally.java:84:4:84:4 | y | TestFinally.java:84:8:84:8 | y |
 | TestFinally.java:84:4:84:12 | ...=... | TestFinally.java:85:4:85:10 | return ... |
-| TestFinally.java:84:4:84:13 | <Expr>; | TestFinally.java:84:8:84:8 | y |
+| TestFinally.java:84:4:84:13 | <Expr>; | TestFinally.java:84:4:84:4 | y |
 | TestFinally.java:84:8:84:8 | y | TestFinally.java:84:12:84:12 | 1 |
 | TestFinally.java:84:8:84:12 | ... + ... | TestFinally.java:84:4:84:12 | ...=... |
 | TestFinally.java:84:12:84:12 | 1 | TestFinally.java:84:8:84:12 | ... + ... |
@@ -204,7 +198,6 @@
 | TestFinally.java:90:5:90:14 | System.out | TestFinally.java:90:24:90:29 | "Try1" |
 | TestFinally.java:90:5:90:30 | println(...) | TestFinally.java:91:5:91:15 | if (...) |
 | TestFinally.java:90:5:90:30 | println(...) | TestFinally.java:96:6:96:25 | catch (...) |
-| TestFinally.java:90:5:90:30 | println(...) | TestFinally.java:104:4:111:4 | { ... } |
 | TestFinally.java:90:5:90:31 | <Expr>; | TestFinally.java:90:5:90:14 | System.out |
 | TestFinally.java:90:24:90:29 | "Try1" | TestFinally.java:90:5:90:30 | println(...) |
 | TestFinally.java:91:5:91:15 | if (...) | TestFinally.java:91:9:91:9 | z |
@@ -259,8 +252,9 @@
 | TestFinally.java:113:23:113:31 | "Error: " | TestFinally.java:113:35:113:35 | e |
 | TestFinally.java:113:23:113:35 | ... + ... | TestFinally.java:113:4:113:36 | println(...) |
 | TestFinally.java:113:35:113:35 | e | TestFinally.java:113:23:113:35 | ... + ... |
+| TestFinally.java:114:4:114:4 | x | TestFinally.java:114:8:114:8 | x |
 | TestFinally.java:114:4:114:12 | ...=... | TestFinally.java:116:3:120:3 | { ... } |
-| TestFinally.java:114:4:114:13 | <Expr>; | TestFinally.java:114:8:114:8 | x |
+| TestFinally.java:114:4:114:13 | <Expr>; | TestFinally.java:114:4:114:4 | x |
 | TestFinally.java:114:8:114:8 | x | TestFinally.java:114:12:114:12 | 1 |
 | TestFinally.java:114:8:114:12 | ... + ... | TestFinally.java:114:4:114:12 | ...=... |
 | TestFinally.java:114:12:114:12 | 1 | TestFinally.java:114:8:114:12 | ... + ... |
@@ -272,15 +266,16 @@
 | TestFinally.java:118:4:118:32 | println(...) | TestFinally.java:119:4:119:13 | <Expr>; |
 | TestFinally.java:118:4:118:33 | <Expr>; | TestFinally.java:118:4:118:13 | System.out |
 | TestFinally.java:118:23:118:31 | "Finally" | TestFinally.java:118:4:118:32 | println(...) |
-| TestFinally.java:119:4:119:12 | ...=... | TestFinally.java:4:14:4:14 | Exceptional Exit |
+| TestFinally.java:119:4:119:4 | y | TestFinally.java:119:8:119:8 | y |
 | TestFinally.java:119:4:119:12 | ...=... | TestFinally.java:4:14:4:14 | Normal Exit |
 | TestFinally.java:119:4:119:12 | ...=... | TestFinally.java:121:3:121:12 | <Expr>; |
-| TestFinally.java:119:4:119:13 | <Expr>; | TestFinally.java:119:8:119:8 | y |
+| TestFinally.java:119:4:119:13 | <Expr>; | TestFinally.java:119:4:119:4 | y |
 | TestFinally.java:119:8:119:8 | y | TestFinally.java:119:12:119:12 | 1 |
 | TestFinally.java:119:8:119:12 | ... + ... | TestFinally.java:119:4:119:12 | ...=... |
 | TestFinally.java:119:12:119:12 | 1 | TestFinally.java:119:8:119:12 | ... + ... |
+| TestFinally.java:121:3:121:3 | z | TestFinally.java:121:7:121:7 | z |
 | TestFinally.java:121:3:121:11 | ...=... | TestFinally.java:123:3:146:3 | try ... |
-| TestFinally.java:121:3:121:12 | <Expr>; | TestFinally.java:121:7:121:7 | z |
+| TestFinally.java:121:3:121:12 | <Expr>; | TestFinally.java:121:3:121:3 | z |
 | TestFinally.java:121:7:121:7 | z | TestFinally.java:121:11:121:11 | 1 |
 | TestFinally.java:121:7:121:11 | ... + ... | TestFinally.java:121:3:121:11 | ...=... |
 | TestFinally.java:121:11:121:11 | 1 | TestFinally.java:121:7:121:11 | ... + ... |
@@ -289,7 +284,6 @@
 | TestFinally.java:125:4:125:13 | System.out | TestFinally.java:125:23:125:28 | "Try1" |
 | TestFinally.java:125:4:125:29 | println(...) | TestFinally.java:126:4:126:14 | if (...) |
 | TestFinally.java:125:4:125:29 | println(...) | TestFinally.java:131:5:131:24 | catch (...) |
-| TestFinally.java:125:4:125:29 | println(...) | TestFinally.java:139:3:146:3 | { ... } |
 | TestFinally.java:125:4:125:30 | <Expr>; | TestFinally.java:125:4:125:13 | System.out |
 | TestFinally.java:125:23:125:28 | "Try1" | TestFinally.java:125:4:125:29 | println(...) |
 | TestFinally.java:126:4:126:14 | if (...) | TestFinally.java:126:8:126:8 | z |
@@ -331,13 +325,13 @@
 | TestFinally.java:142:4:144:4 | { ... } | TestFinally.java:143:5:143:11 | return ... |
 | TestFinally.java:143:5:143:11 | return ... | TestFinally.java:4:14:4:14 | Normal Exit |
 | TestFinally.java:145:4:145:13 | System.out | TestFinally.java:145:23:145:32 | "Finally2" |
-| TestFinally.java:145:4:145:33 | println(...) | TestFinally.java:4:14:4:14 | Exceptional Exit |
 | TestFinally.java:145:4:145:33 | println(...) | TestFinally.java:4:14:4:14 | Normal Exit |
 | TestFinally.java:145:4:145:33 | println(...) | TestFinally.java:148:3:148:12 | <Expr>; |
 | TestFinally.java:145:4:145:34 | <Expr>; | TestFinally.java:145:4:145:13 | System.out |
 | TestFinally.java:145:23:145:32 | "Finally2" | TestFinally.java:145:4:145:33 | println(...) |
+| TestFinally.java:148:3:148:3 | z | TestFinally.java:148:7:148:7 | z |
 | TestFinally.java:148:3:148:11 | ...=... | TestFinally.java:4:14:4:14 | Normal Exit |
-| TestFinally.java:148:3:148:12 | <Expr>; | TestFinally.java:148:7:148:7 | z |
+| TestFinally.java:148:3:148:12 | <Expr>; | TestFinally.java:148:3:148:3 | z |
 | TestFinally.java:148:7:148:7 | z | TestFinally.java:148:11:148:11 | 2 |
 | TestFinally.java:148:7:148:11 | ... + ... | TestFinally.java:148:3:148:11 | ...=... |
 | TestFinally.java:148:11:148:11 | 2 | TestFinally.java:148:7:148:11 | ... + ... |
diff --git a/java/ql/test/library-tests/successors/TestFinally/TestSucc.ql b/java/ql/test/library-tests/successors/TestFinally/TestSucc.ql
index 6fca436fbfd..68c50a85c58 100644
--- a/java/ql/test/library-tests/successors/TestFinally/TestSucc.ql
+++ b/java/ql/test/library-tests/successors/TestFinally/TestSucc.ql
@@ -1,8 +1,9 @@
 import java
+import utils.test.AstCfg
 
 from ControlFlowNode n, ControlFlowNode succ
 where
-  succ = n.getASuccessor() and
+  succ = getAnAstSuccessor(n) and
   n.getLocation().getFile().getExtension() = "java" and
   not n.getLocation().getFile().getStem() = "PopulateRuntimeException"
 select n, succ
diff --git a/java/ql/test/library-tests/successors/TestFinallyBreakContinue/FalseSuccessors.expected b/java/ql/test/library-tests/successors/TestFinallyBreakContinue/FalseSuccessors.expected
deleted file mode 100644
index 1de80850858..00000000000
--- a/java/ql/test/library-tests/successors/TestFinallyBreakContinue/FalseSuccessors.expected
+++ /dev/null
@@ -1,6 +0,0 @@
-| TestFinallyBreakContinue.java:12:9:12:14 | ... == ... | TestFinallyBreakContinue.java:16:5:18:5 | { ... } |
-| TestFinallyBreakContinue.java:21:9:21:14 | ... == ... | TestFinallyBreakContinue.java:25:5:27:5 | { ... } |
-| TestFinallyBreakContinue.java:40:10:40:15 | ... == ... | TestFinallyBreakContinue.java:44:6:46:6 | { ... } |
-| TestFinallyBreakContinue.java:49:10:49:15 | ... == ... | TestFinallyBreakContinue.java:53:6:55:6 | { ... } |
-| TestFinallyBreakContinue.java:78:11:78:16 | ... == ... | TestFinallyBreakContinue.java:82:7:84:7 | { ... } |
-| TestFinallyBreakContinue.java:87:11:87:16 | ... == ... | TestFinallyBreakContinue.java:91:7:93:7 | { ... } |
diff --git a/java/ql/test/library-tests/successors/TestFinallyBreakContinue/FalseSuccessors.ql b/java/ql/test/library-tests/successors/TestFinallyBreakContinue/FalseSuccessors.ql
deleted file mode 100644
index aee4021bee6..00000000000
--- a/java/ql/test/library-tests/successors/TestFinallyBreakContinue/FalseSuccessors.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import java
-
-from ConditionNode c
-select c, c.getAFalseSuccessor()
diff --git a/java/ql/test/library-tests/successors/TestFinallyBreakContinue/TestSucc.expected b/java/ql/test/library-tests/successors/TestFinallyBreakContinue/TestSucc.expected
index c8b608b0550..ed2034ad052 100644
--- a/java/ql/test/library-tests/successors/TestFinallyBreakContinue/TestSucc.expected
+++ b/java/ql/test/library-tests/successors/TestFinallyBreakContinue/TestSucc.expected
@@ -1,8 +1,8 @@
-| TestFinallyBreakContinue.java:3:14:3:37 | Exceptional Exit | TestFinallyBreakContinue.java:3:14:3:37 | Exit |
+| TestFinallyBreakContinue.java:3:14:3:37 | Entry | TestFinallyBreakContinue.java:3:14:3:37 | { ... } |
 | TestFinallyBreakContinue.java:3:14:3:37 | Normal Exit | TestFinallyBreakContinue.java:3:14:3:37 | Exit |
 | TestFinallyBreakContinue.java:3:14:3:37 | super(...) | TestFinallyBreakContinue.java:3:14:3:37 | Normal Exit |
 | TestFinallyBreakContinue.java:3:14:3:37 | { ... } | TestFinallyBreakContinue.java:3:14:3:37 | super(...) |
-| TestFinallyBreakContinue.java:4:14:4:14 | Exceptional Exit | TestFinallyBreakContinue.java:4:14:4:14 | Exit |
+| TestFinallyBreakContinue.java:4:14:4:14 | Entry | TestFinallyBreakContinue.java:5:2:107:2 | { ... } |
 | TestFinallyBreakContinue.java:4:14:4:14 | Normal Exit | TestFinallyBreakContinue.java:4:14:4:14 | Exit |
 | TestFinallyBreakContinue.java:5:2:107:2 | { ... } | TestFinallyBreakContinue.java:6:3:6:12 | var ...; |
 | TestFinallyBreakContinue.java:6:3:6:12 | var ...; | TestFinallyBreakContinue.java:6:11:6:11 | 1 |
@@ -22,18 +22,6 @@
 | TestFinallyBreakContinue.java:14:6:14:11 | break | TestFinallyBreakContinue.java:29:4:31:4 | { ... } |
 | TestFinallyBreakContinue.java:16:5:18:5 | { ... } | TestFinallyBreakContinue.java:17:6:17:14 | continue |
 | TestFinallyBreakContinue.java:17:6:17:14 | continue | TestFinallyBreakContinue.java:29:4:31:4 | { ... } |
-| TestFinallyBreakContinue.java:19:6:19:24 | catch (...) | TestFinallyBreakContinue.java:19:23:19:23 | e |
-| TestFinallyBreakContinue.java:19:23:19:23 | e | TestFinallyBreakContinue.java:20:4:28:4 | { ... } |
-| TestFinallyBreakContinue.java:20:4:28:4 | { ... } | TestFinallyBreakContinue.java:21:5:21:15 | if (...) |
-| TestFinallyBreakContinue.java:21:5:21:15 | if (...) | TestFinallyBreakContinue.java:21:9:21:9 | x |
-| TestFinallyBreakContinue.java:21:9:21:9 | x | TestFinallyBreakContinue.java:21:14:21:14 | 1 |
-| TestFinallyBreakContinue.java:21:9:21:14 | ... == ... | TestFinallyBreakContinue.java:22:5:24:5 | { ... } |
-| TestFinallyBreakContinue.java:21:9:21:14 | ... == ... | TestFinallyBreakContinue.java:25:5:27:5 | { ... } |
-| TestFinallyBreakContinue.java:21:14:21:14 | 1 | TestFinallyBreakContinue.java:21:9:21:14 | ... == ... |
-| TestFinallyBreakContinue.java:22:5:24:5 | { ... } | TestFinallyBreakContinue.java:23:6:23:11 | break |
-| TestFinallyBreakContinue.java:23:6:23:11 | break | TestFinallyBreakContinue.java:29:4:31:4 | { ... } |
-| TestFinallyBreakContinue.java:25:5:27:5 | { ... } | TestFinallyBreakContinue.java:26:6:26:14 | continue |
-| TestFinallyBreakContinue.java:26:6:26:14 | continue | TestFinallyBreakContinue.java:29:4:31:4 | { ... } |
 | TestFinallyBreakContinue.java:29:4:31:4 | { ... } | TestFinallyBreakContinue.java:30:5:30:34 | <Expr>; |
 | TestFinallyBreakContinue.java:30:5:30:14 | System.out | TestFinallyBreakContinue.java:30:24:30:32 | "finally" |
 | TestFinallyBreakContinue.java:30:5:30:33 | println(...) | TestFinallyBreakContinue.java:9:3:32:3 | { ... } |
@@ -56,18 +44,6 @@
 | TestFinallyBreakContinue.java:42:7:42:12 | break | TestFinallyBreakContinue.java:57:5:59:5 | { ... } |
 | TestFinallyBreakContinue.java:44:6:46:6 | { ... } | TestFinallyBreakContinue.java:45:7:45:15 | continue |
 | TestFinallyBreakContinue.java:45:7:45:15 | continue | TestFinallyBreakContinue.java:57:5:59:5 | { ... } |
-| TestFinallyBreakContinue.java:47:7:47:25 | catch (...) | TestFinallyBreakContinue.java:47:24:47:24 | e |
-| TestFinallyBreakContinue.java:47:24:47:24 | e | TestFinallyBreakContinue.java:48:5:56:5 | { ... } |
-| TestFinallyBreakContinue.java:48:5:56:5 | { ... } | TestFinallyBreakContinue.java:49:6:49:16 | if (...) |
-| TestFinallyBreakContinue.java:49:6:49:16 | if (...) | TestFinallyBreakContinue.java:49:10:49:10 | x |
-| TestFinallyBreakContinue.java:49:10:49:10 | x | TestFinallyBreakContinue.java:49:15:49:15 | 1 |
-| TestFinallyBreakContinue.java:49:10:49:15 | ... == ... | TestFinallyBreakContinue.java:50:6:52:6 | { ... } |
-| TestFinallyBreakContinue.java:49:10:49:15 | ... == ... | TestFinallyBreakContinue.java:53:6:55:6 | { ... } |
-| TestFinallyBreakContinue.java:49:15:49:15 | 1 | TestFinallyBreakContinue.java:49:10:49:15 | ... == ... |
-| TestFinallyBreakContinue.java:50:6:52:6 | { ... } | TestFinallyBreakContinue.java:51:7:51:12 | break |
-| TestFinallyBreakContinue.java:51:7:51:12 | break | TestFinallyBreakContinue.java:57:5:59:5 | { ... } |
-| TestFinallyBreakContinue.java:53:6:55:6 | { ... } | TestFinallyBreakContinue.java:54:7:54:15 | continue |
-| TestFinallyBreakContinue.java:54:7:54:15 | continue | TestFinallyBreakContinue.java:57:5:59:5 | { ... } |
 | TestFinallyBreakContinue.java:57:5:59:5 | { ... } | TestFinallyBreakContinue.java:58:6:58:35 | <Expr>; |
 | TestFinallyBreakContinue.java:58:6:58:15 | System.out | TestFinallyBreakContinue.java:58:25:58:33 | "finally" |
 | TestFinallyBreakContinue.java:58:6:58:34 | println(...) | TestFinallyBreakContinue.java:60:6:60:24 | catch (...) |
@@ -83,7 +59,6 @@
 | TestFinallyBreakContinue.java:62:24:62:34 | "Exception" | TestFinallyBreakContinue.java:62:5:62:35 | println(...) |
 | TestFinallyBreakContinue.java:64:4:66:4 | { ... } | TestFinallyBreakContinue.java:65:5:65:34 | <Expr>; |
 | TestFinallyBreakContinue.java:65:5:65:14 | System.out | TestFinallyBreakContinue.java:65:24:65:32 | "finally" |
-| TestFinallyBreakContinue.java:65:5:65:33 | println(...) | TestFinallyBreakContinue.java:4:14:4:14 | Exceptional Exit |
 | TestFinallyBreakContinue.java:65:5:65:33 | println(...) | TestFinallyBreakContinue.java:34:10:34:13 | true |
 | TestFinallyBreakContinue.java:65:5:65:33 | println(...) | TestFinallyBreakContinue.java:69:3:106:17 | <Label>: ... |
 | TestFinallyBreakContinue.java:65:5:65:34 | <Expr>; | TestFinallyBreakContinue.java:65:5:65:14 | System.out |
@@ -110,18 +85,6 @@
 | TestFinallyBreakContinue.java:80:8:80:13 | break | TestFinallyBreakContinue.java:95:6:97:6 | { ... } |
 | TestFinallyBreakContinue.java:82:7:84:7 | { ... } | TestFinallyBreakContinue.java:83:8:83:16 | continue |
 | TestFinallyBreakContinue.java:83:8:83:16 | continue | TestFinallyBreakContinue.java:95:6:97:6 | { ... } |
-| TestFinallyBreakContinue.java:85:8:85:26 | catch (...) | TestFinallyBreakContinue.java:85:25:85:25 | e |
-| TestFinallyBreakContinue.java:85:25:85:25 | e | TestFinallyBreakContinue.java:86:6:94:6 | { ... } |
-| TestFinallyBreakContinue.java:86:6:94:6 | { ... } | TestFinallyBreakContinue.java:87:7:87:17 | if (...) |
-| TestFinallyBreakContinue.java:87:7:87:17 | if (...) | TestFinallyBreakContinue.java:87:11:87:11 | x |
-| TestFinallyBreakContinue.java:87:11:87:11 | x | TestFinallyBreakContinue.java:87:16:87:16 | 1 |
-| TestFinallyBreakContinue.java:87:11:87:16 | ... == ... | TestFinallyBreakContinue.java:88:7:90:7 | { ... } |
-| TestFinallyBreakContinue.java:87:11:87:16 | ... == ... | TestFinallyBreakContinue.java:91:7:93:7 | { ... } |
-| TestFinallyBreakContinue.java:87:16:87:16 | 1 | TestFinallyBreakContinue.java:87:11:87:16 | ... == ... |
-| TestFinallyBreakContinue.java:88:7:90:7 | { ... } | TestFinallyBreakContinue.java:89:8:89:15 | break |
-| TestFinallyBreakContinue.java:89:8:89:15 | break | TestFinallyBreakContinue.java:95:6:97:6 | { ... } |
-| TestFinallyBreakContinue.java:91:7:93:7 | { ... } | TestFinallyBreakContinue.java:92:8:92:18 | continue |
-| TestFinallyBreakContinue.java:92:8:92:18 | continue | TestFinallyBreakContinue.java:95:6:97:6 | { ... } |
 | TestFinallyBreakContinue.java:95:6:97:6 | { ... } | TestFinallyBreakContinue.java:96:7:96:36 | <Expr>; |
 | TestFinallyBreakContinue.java:96:7:96:16 | System.out | TestFinallyBreakContinue.java:96:26:96:34 | "finally" |
 | TestFinallyBreakContinue.java:96:7:96:35 | println(...) | TestFinallyBreakContinue.java:74:14:74:14 | i |
@@ -138,7 +101,6 @@
 | TestFinallyBreakContinue.java:101:24:101:34 | "Exception" | TestFinallyBreakContinue.java:101:5:101:35 | println(...) |
 | TestFinallyBreakContinue.java:103:4:105:4 | { ... } | TestFinallyBreakContinue.java:104:5:104:34 | <Expr>; |
 | TestFinallyBreakContinue.java:104:5:104:14 | System.out | TestFinallyBreakContinue.java:104:24:104:32 | "finally" |
-| TestFinallyBreakContinue.java:104:5:104:33 | println(...) | TestFinallyBreakContinue.java:4:14:4:14 | Exceptional Exit |
 | TestFinallyBreakContinue.java:104:5:104:33 | println(...) | TestFinallyBreakContinue.java:4:14:4:14 | Normal Exit |
 | TestFinallyBreakContinue.java:104:5:104:33 | println(...) | TestFinallyBreakContinue.java:106:12:106:15 | true |
 | TestFinallyBreakContinue.java:104:5:104:34 | <Expr>; | TestFinallyBreakContinue.java:104:5:104:14 | System.out |
diff --git a/java/ql/test/library-tests/successors/TestFinallyBreakContinue/TestSucc.ql b/java/ql/test/library-tests/successors/TestFinallyBreakContinue/TestSucc.ql
index 6fca436fbfd..68c50a85c58 100644
--- a/java/ql/test/library-tests/successors/TestFinallyBreakContinue/TestSucc.ql
+++ b/java/ql/test/library-tests/successors/TestFinallyBreakContinue/TestSucc.ql
@@ -1,8 +1,9 @@
 import java
+import utils.test.AstCfg
 
 from ControlFlowNode n, ControlFlowNode succ
 where
-  succ = n.getASuccessor() and
+  succ = getAnAstSuccessor(n) and
   n.getLocation().getFile().getExtension() = "java" and
   not n.getLocation().getFile().getStem() = "PopulateRuntimeException"
 select n, succ
diff --git a/java/ql/test/library-tests/successors/TestLoopBranch/FalseSuccessors.expected b/java/ql/test/library-tests/successors/TestLoopBranch/FalseSuccessors.expected
deleted file mode 100644
index 97278336764..00000000000
--- a/java/ql/test/library-tests/successors/TestLoopBranch/FalseSuccessors.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-| TestLoopBranch.java:17:12:17:17 | ... == ... | TestLoopBranch.java:19:3:22:3 | { ... } |
-| TestLoopBranch.java:24:10:24:15 | ... == ... | TestLoopBranch.java:31:3:31:30 | for (...;...;...) |
-| TestLoopBranch.java:31:19:31:24 | ... < ... | TestLoopBranch.java:37:3:37:3 | ; |
-| TestLoopBranch.java:46:7:46:13 | ... == ... | TestLoopBranch.java:51:3:51:14 | if (...) |
-| TestLoopBranch.java:51:7:51:13 | ... == ... | TestLoopBranch.java:56:3:60:3 | { ... } |
diff --git a/java/ql/test/library-tests/successors/TestLoopBranch/FalseSuccessors.ql b/java/ql/test/library-tests/successors/TestLoopBranch/FalseSuccessors.ql
deleted file mode 100644
index aee4021bee6..00000000000
--- a/java/ql/test/library-tests/successors/TestLoopBranch/FalseSuccessors.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import java
-
-from ConditionNode c
-select c, c.getAFalseSuccessor()
diff --git a/java/ql/test/library-tests/successors/TestLoopBranch/TestSucc.expected b/java/ql/test/library-tests/successors/TestLoopBranch/TestSucc.expected
index ba64f22a05b..a6b5849eef6 100644
--- a/java/ql/test/library-tests/successors/TestLoopBranch/TestSucc.expected
+++ b/java/ql/test/library-tests/successors/TestLoopBranch/TestSucc.expected
@@ -1,13 +1,15 @@
-| TestLoopBranch.java:3:14:3:27 | Exceptional Exit | TestLoopBranch.java:3:14:3:27 | Exit |
+| TestLoopBranch.java:3:14:3:27 | Entry | TestLoopBranch.java:3:14:3:27 | { ... } |
 | TestLoopBranch.java:3:14:3:27 | Normal Exit | TestLoopBranch.java:3:14:3:27 | Exit |
 | TestLoopBranch.java:3:14:3:27 | { ... } | TestLoopBranch.java:4:2:4:13 | <Expr>; |
 | TestLoopBranch.java:4:2:4:13 | ...=... | TestLoopBranch.java:5:2:5:13 | <Expr>; |
-| TestLoopBranch.java:4:2:4:13 | <Expr>; | TestLoopBranch.java:4:11:4:12 | 12 |
+| TestLoopBranch.java:4:2:4:13 | <Expr>; | TestLoopBranch.java:4:2:4:13 | xx |
+| TestLoopBranch.java:4:2:4:13 | xx | TestLoopBranch.java:4:11:4:12 | 12 |
 | TestLoopBranch.java:4:11:4:12 | 12 | TestLoopBranch.java:4:2:4:13 | ...=... |
 | TestLoopBranch.java:5:2:5:13 | ...=... | TestLoopBranch.java:3:14:3:27 | Normal Exit |
-| TestLoopBranch.java:5:2:5:13 | <Expr>; | TestLoopBranch.java:5:11:5:12 | 13 |
+| TestLoopBranch.java:5:2:5:13 | <Expr>; | TestLoopBranch.java:5:2:5:13 | yy |
+| TestLoopBranch.java:5:2:5:13 | yy | TestLoopBranch.java:5:11:5:12 | 13 |
 | TestLoopBranch.java:5:11:5:12 | 13 | TestLoopBranch.java:5:2:5:13 | ...=... |
-| TestLoopBranch.java:7:14:7:14 | Exceptional Exit | TestLoopBranch.java:7:14:7:14 | Exit |
+| TestLoopBranch.java:7:14:7:14 | Entry | TestLoopBranch.java:8:2:107:2 | { ... } |
 | TestLoopBranch.java:7:14:7:14 | Normal Exit | TestLoopBranch.java:7:14:7:14 | Exit |
 | TestLoopBranch.java:8:2:107:2 | { ... } | TestLoopBranch.java:9:3:9:12 | var ...; |
 | TestLoopBranch.java:9:3:9:12 | var ...; | TestLoopBranch.java:9:11:9:11 | 1 |
@@ -57,8 +59,9 @@
 | TestLoopBranch.java:27:4:27:31 | println(...) | TestLoopBranch.java:28:4:28:13 | <Expr>; |
 | TestLoopBranch.java:27:4:27:32 | <Expr>; | TestLoopBranch.java:27:4:27:13 | System.out |
 | TestLoopBranch.java:27:23:27:30 | "shodan" | TestLoopBranch.java:27:4:27:31 | println(...) |
+| TestLoopBranch.java:28:4:28:4 | x | TestLoopBranch.java:28:8:28:8 | x |
 | TestLoopBranch.java:28:4:28:12 | ...=... | TestLoopBranch.java:24:10:24:10 | x |
-| TestLoopBranch.java:28:4:28:13 | <Expr>; | TestLoopBranch.java:28:8:28:8 | x |
+| TestLoopBranch.java:28:4:28:13 | <Expr>; | TestLoopBranch.java:28:4:28:4 | x |
 | TestLoopBranch.java:28:8:28:8 | x | TestLoopBranch.java:28:12:28:12 | 1 |
 | TestLoopBranch.java:28:8:28:12 | ... + ... | TestLoopBranch.java:28:4:28:12 | ...=... |
 | TestLoopBranch.java:28:12:28:12 | 1 | TestLoopBranch.java:28:8:28:12 | ... + ... |
@@ -76,8 +79,9 @@
 | TestLoopBranch.java:33:4:33:32 | println(...) | TestLoopBranch.java:34:4:34:13 | <Expr>; |
 | TestLoopBranch.java:33:4:33:33 | <Expr>; | TestLoopBranch.java:33:4:33:13 | System.out |
 | TestLoopBranch.java:33:23:33:31 | "rapture" | TestLoopBranch.java:33:4:33:32 | println(...) |
+| TestLoopBranch.java:34:4:34:4 | y | TestLoopBranch.java:34:8:34:8 | x |
 | TestLoopBranch.java:34:4:34:12 | ...=... | TestLoopBranch.java:31:27:31:27 | i |
-| TestLoopBranch.java:34:4:34:13 | <Expr>; | TestLoopBranch.java:34:8:34:8 | x |
+| TestLoopBranch.java:34:4:34:13 | <Expr>; | TestLoopBranch.java:34:4:34:4 | y |
 | TestLoopBranch.java:34:8:34:8 | x | TestLoopBranch.java:34:12:34:12 | 2 |
 | TestLoopBranch.java:34:8:34:12 | ... - ... | TestLoopBranch.java:34:4:34:12 | ...=... |
 | TestLoopBranch.java:34:12:34:12 | 2 | TestLoopBranch.java:34:8:34:12 | ... - ... |
@@ -95,9 +99,10 @@
 | TestLoopBranch.java:42:23:42:31 | "Zero : " | TestLoopBranch.java:42:35:42:35 | j |
 | TestLoopBranch.java:42:23:42:35 | ... + ... | TestLoopBranch.java:42:4:42:36 | println(...) |
 | TestLoopBranch.java:42:35:42:35 | j | TestLoopBranch.java:42:23:42:35 | ... + ... |
+| TestLoopBranch.java:43:4:43:4 | j | TestLoopBranch.java:43:8:43:8 | j |
 | TestLoopBranch.java:43:4:43:12 | ...=... | TestLoopBranch.java:40:12:40:12 | j |
 | TestLoopBranch.java:43:4:43:12 | ...=... | TestLoopBranch.java:46:3:46:14 | if (...) |
-| TestLoopBranch.java:43:4:43:13 | <Expr>; | TestLoopBranch.java:43:8:43:8 | j |
+| TestLoopBranch.java:43:4:43:13 | <Expr>; | TestLoopBranch.java:43:4:43:4 | j |
 | TestLoopBranch.java:43:8:43:8 | j | TestLoopBranch.java:43:12:43:12 | x |
 | TestLoopBranch.java:43:8:43:12 | ... + ... | TestLoopBranch.java:43:4:43:12 | ...=... |
 | TestLoopBranch.java:43:12:43:12 | x | TestLoopBranch.java:43:8:43:12 | ... + ... |
@@ -122,8 +127,9 @@
 | TestLoopBranch.java:53:4:53:28 | println(...) | TestLoopBranch.java:54:4:54:13 | <Expr>; |
 | TestLoopBranch.java:53:4:53:29 | <Expr>; | TestLoopBranch.java:53:4:53:13 | System.out |
 | TestLoopBranch.java:53:23:53:27 | "rat" | TestLoopBranch.java:53:4:53:28 | println(...) |
+| TestLoopBranch.java:54:4:54:4 | x | TestLoopBranch.java:54:8:54:8 | 6 |
 | TestLoopBranch.java:54:4:54:12 | ...=... | TestLoopBranch.java:62:3:62:12 | switch (...) |
-| TestLoopBranch.java:54:4:54:13 | <Expr>; | TestLoopBranch.java:54:8:54:8 | 6 |
+| TestLoopBranch.java:54:4:54:13 | <Expr>; | TestLoopBranch.java:54:4:54:4 | x |
 | TestLoopBranch.java:54:8:54:8 | 6 | TestLoopBranch.java:54:12:54:12 | 9 |
 | TestLoopBranch.java:54:8:54:12 | ... * ... | TestLoopBranch.java:54:4:54:12 | ...=... |
 | TestLoopBranch.java:54:12:54:12 | 9 | TestLoopBranch.java:54:8:54:12 | ... * ... |
@@ -132,97 +138,118 @@
 | TestLoopBranch.java:57:4:57:28 | println(...) | TestLoopBranch.java:58:4:58:13 | <Expr>; |
 | TestLoopBranch.java:57:4:57:29 | <Expr>; | TestLoopBranch.java:57:4:57:13 | System.out |
 | TestLoopBranch.java:57:23:57:27 | "arr" | TestLoopBranch.java:57:4:57:28 | println(...) |
+| TestLoopBranch.java:58:4:58:4 | x | TestLoopBranch.java:58:8:58:8 | y |
 | TestLoopBranch.java:58:4:58:12 | ...=... | TestLoopBranch.java:59:4:59:10 | return ... |
-| TestLoopBranch.java:58:4:58:13 | <Expr>; | TestLoopBranch.java:58:8:58:8 | y |
+| TestLoopBranch.java:58:4:58:13 | <Expr>; | TestLoopBranch.java:58:4:58:4 | x |
 | TestLoopBranch.java:58:8:58:8 | y | TestLoopBranch.java:58:12:58:12 | x |
 | TestLoopBranch.java:58:8:58:12 | ... * ... | TestLoopBranch.java:58:4:58:12 | ...=... |
 | TestLoopBranch.java:58:12:58:12 | x | TestLoopBranch.java:58:8:58:12 | ... * ... |
 | TestLoopBranch.java:59:4:59:10 | return ... | TestLoopBranch.java:7:14:7:14 | Normal Exit |
 | TestLoopBranch.java:62:3:62:12 | switch (...) | TestLoopBranch.java:62:11:62:11 | x |
 | TestLoopBranch.java:62:11:62:11 | x | TestLoopBranch.java:64:3:64:9 | case ... |
-| TestLoopBranch.java:62:11:62:11 | x | TestLoopBranch.java:67:3:67:9 | case ... |
-| TestLoopBranch.java:62:11:62:11 | x | TestLoopBranch.java:71:3:71:9 | case ... |
-| TestLoopBranch.java:62:11:62:11 | x | TestLoopBranch.java:72:3:72:9 | case ... |
-| TestLoopBranch.java:62:11:62:11 | x | TestLoopBranch.java:76:3:76:9 | case ... |
-| TestLoopBranch.java:62:11:62:11 | x | TestLoopBranch.java:77:3:77:9 | case ... |
-| TestLoopBranch.java:62:11:62:11 | x | TestLoopBranch.java:80:3:80:10 | default |
-| TestLoopBranch.java:64:3:64:9 | case ... | TestLoopBranch.java:65:4:65:13 | <Expr>; |
+| TestLoopBranch.java:64:3:64:9 | case ... | TestLoopBranch.java:64:8:64:8 | 1 |
+| TestLoopBranch.java:64:3:64:9 | case ... | TestLoopBranch.java:67:3:67:9 | case ... |
+| TestLoopBranch.java:64:8:64:8 | 1 | TestLoopBranch.java:65:4:65:13 | <Expr>; |
+| TestLoopBranch.java:65:4:65:4 | x | TestLoopBranch.java:65:8:65:8 | x |
 | TestLoopBranch.java:65:4:65:12 | ...=... | TestLoopBranch.java:66:4:66:13 | <Expr>; |
-| TestLoopBranch.java:65:4:65:13 | <Expr>; | TestLoopBranch.java:65:8:65:8 | x |
+| TestLoopBranch.java:65:4:65:13 | <Expr>; | TestLoopBranch.java:65:4:65:4 | x |
 | TestLoopBranch.java:65:8:65:8 | x | TestLoopBranch.java:65:12:65:12 | 1 |
 | TestLoopBranch.java:65:8:65:12 | ... + ... | TestLoopBranch.java:65:4:65:12 | ...=... |
 | TestLoopBranch.java:65:12:65:12 | 1 | TestLoopBranch.java:65:8:65:12 | ... + ... |
-| TestLoopBranch.java:66:4:66:12 | ...=... | TestLoopBranch.java:67:3:67:9 | case ... |
-| TestLoopBranch.java:66:4:66:13 | <Expr>; | TestLoopBranch.java:66:8:66:8 | y |
+| TestLoopBranch.java:66:4:66:4 | y | TestLoopBranch.java:66:8:66:8 | y |
+| TestLoopBranch.java:66:4:66:12 | ...=... | TestLoopBranch.java:68:4:68:13 | <Expr>; |
+| TestLoopBranch.java:66:4:66:13 | <Expr>; | TestLoopBranch.java:66:4:66:4 | y |
 | TestLoopBranch.java:66:8:66:8 | y | TestLoopBranch.java:66:12:66:12 | 1 |
 | TestLoopBranch.java:66:8:66:12 | ... + ... | TestLoopBranch.java:66:4:66:12 | ...=... |
 | TestLoopBranch.java:66:12:66:12 | 1 | TestLoopBranch.java:66:8:66:12 | ... + ... |
-| TestLoopBranch.java:67:3:67:9 | case ... | TestLoopBranch.java:68:4:68:13 | <Expr>; |
+| TestLoopBranch.java:67:3:67:9 | case ... | TestLoopBranch.java:67:8:67:8 | 2 |
+| TestLoopBranch.java:67:3:67:9 | case ... | TestLoopBranch.java:71:3:71:9 | case ... |
+| TestLoopBranch.java:67:8:67:8 | 2 | TestLoopBranch.java:68:4:68:13 | <Expr>; |
+| TestLoopBranch.java:68:4:68:4 | x | TestLoopBranch.java:68:8:68:8 | x |
 | TestLoopBranch.java:68:4:68:12 | ...=... | TestLoopBranch.java:69:4:69:13 | <Expr>; |
-| TestLoopBranch.java:68:4:68:13 | <Expr>; | TestLoopBranch.java:68:8:68:8 | x |
+| TestLoopBranch.java:68:4:68:13 | <Expr>; | TestLoopBranch.java:68:4:68:4 | x |
 | TestLoopBranch.java:68:8:68:8 | x | TestLoopBranch.java:68:12:68:12 | 2 |
 | TestLoopBranch.java:68:8:68:12 | ... + ... | TestLoopBranch.java:68:4:68:12 | ...=... |
 | TestLoopBranch.java:68:12:68:12 | 2 | TestLoopBranch.java:68:8:68:12 | ... + ... |
+| TestLoopBranch.java:69:4:69:4 | y | TestLoopBranch.java:69:8:69:8 | y |
 | TestLoopBranch.java:69:4:69:12 | ...=... | TestLoopBranch.java:70:4:70:9 | break |
-| TestLoopBranch.java:69:4:69:13 | <Expr>; | TestLoopBranch.java:69:8:69:8 | y |
+| TestLoopBranch.java:69:4:69:13 | <Expr>; | TestLoopBranch.java:69:4:69:4 | y |
 | TestLoopBranch.java:69:8:69:8 | y | TestLoopBranch.java:69:12:69:12 | 2 |
 | TestLoopBranch.java:69:8:69:12 | ... + ... | TestLoopBranch.java:69:4:69:12 | ...=... |
 | TestLoopBranch.java:69:12:69:12 | 2 | TestLoopBranch.java:69:8:69:12 | ... + ... |
 | TestLoopBranch.java:70:4:70:9 | break | TestLoopBranch.java:86:3:86:11 | switch (...) |
+| TestLoopBranch.java:71:3:71:9 | case ... | TestLoopBranch.java:71:8:71:8 | 3 |
 | TestLoopBranch.java:71:3:71:9 | case ... | TestLoopBranch.java:72:3:72:9 | case ... |
-| TestLoopBranch.java:72:3:72:9 | case ... | TestLoopBranch.java:73:4:73:13 | <Expr>; |
+| TestLoopBranch.java:71:8:71:8 | 3 | TestLoopBranch.java:73:4:73:13 | <Expr>; |
+| TestLoopBranch.java:72:3:72:9 | case ... | TestLoopBranch.java:72:8:72:8 | 4 |
+| TestLoopBranch.java:72:3:72:9 | case ... | TestLoopBranch.java:76:3:76:9 | case ... |
+| TestLoopBranch.java:72:8:72:8 | 4 | TestLoopBranch.java:73:4:73:13 | <Expr>; |
+| TestLoopBranch.java:73:4:73:4 | x | TestLoopBranch.java:73:8:73:8 | x |
 | TestLoopBranch.java:73:4:73:12 | ...=... | TestLoopBranch.java:74:4:74:13 | <Expr>; |
-| TestLoopBranch.java:73:4:73:13 | <Expr>; | TestLoopBranch.java:73:8:73:8 | x |
+| TestLoopBranch.java:73:4:73:13 | <Expr>; | TestLoopBranch.java:73:4:73:4 | x |
 | TestLoopBranch.java:73:8:73:8 | x | TestLoopBranch.java:73:12:73:12 | 3 |
 | TestLoopBranch.java:73:8:73:12 | ... + ... | TestLoopBranch.java:73:4:73:12 | ...=... |
 | TestLoopBranch.java:73:12:73:12 | 3 | TestLoopBranch.java:73:8:73:12 | ... + ... |
+| TestLoopBranch.java:74:4:74:4 | y | TestLoopBranch.java:74:8:74:8 | y |
 | TestLoopBranch.java:74:4:74:12 | ...=... | TestLoopBranch.java:75:4:75:9 | break |
-| TestLoopBranch.java:74:4:74:13 | <Expr>; | TestLoopBranch.java:74:8:74:8 | y |
+| TestLoopBranch.java:74:4:74:13 | <Expr>; | TestLoopBranch.java:74:4:74:4 | y |
 | TestLoopBranch.java:74:8:74:8 | y | TestLoopBranch.java:74:12:74:12 | 4 |
 | TestLoopBranch.java:74:8:74:12 | ... + ... | TestLoopBranch.java:74:4:74:12 | ...=... |
 | TestLoopBranch.java:74:12:74:12 | 4 | TestLoopBranch.java:74:8:74:12 | ... + ... |
 | TestLoopBranch.java:75:4:75:9 | break | TestLoopBranch.java:86:3:86:11 | switch (...) |
+| TestLoopBranch.java:76:3:76:9 | case ... | TestLoopBranch.java:76:8:76:8 | 5 |
 | TestLoopBranch.java:76:3:76:9 | case ... | TestLoopBranch.java:77:3:77:9 | case ... |
-| TestLoopBranch.java:77:3:77:9 | case ... | TestLoopBranch.java:78:4:78:13 | <Expr>; |
+| TestLoopBranch.java:76:8:76:8 | 5 | TestLoopBranch.java:78:4:78:13 | <Expr>; |
+| TestLoopBranch.java:77:3:77:9 | case ... | TestLoopBranch.java:77:8:77:8 | 6 |
+| TestLoopBranch.java:77:3:77:9 | case ... | TestLoopBranch.java:80:3:80:10 | default |
+| TestLoopBranch.java:77:8:77:8 | 6 | TestLoopBranch.java:78:4:78:13 | <Expr>; |
+| TestLoopBranch.java:78:4:78:4 | x | TestLoopBranch.java:78:8:78:8 | x |
 | TestLoopBranch.java:78:4:78:12 | ...=... | TestLoopBranch.java:79:4:79:13 | <Expr>; |
-| TestLoopBranch.java:78:4:78:13 | <Expr>; | TestLoopBranch.java:78:8:78:8 | x |
+| TestLoopBranch.java:78:4:78:13 | <Expr>; | TestLoopBranch.java:78:4:78:4 | x |
 | TestLoopBranch.java:78:8:78:8 | x | TestLoopBranch.java:78:12:78:12 | 5 |
 | TestLoopBranch.java:78:8:78:12 | ... + ... | TestLoopBranch.java:78:4:78:12 | ...=... |
 | TestLoopBranch.java:78:12:78:12 | 5 | TestLoopBranch.java:78:8:78:12 | ... + ... |
-| TestLoopBranch.java:79:4:79:12 | ...=... | TestLoopBranch.java:80:3:80:10 | default |
-| TestLoopBranch.java:79:4:79:13 | <Expr>; | TestLoopBranch.java:79:8:79:8 | y |
+| TestLoopBranch.java:79:4:79:4 | y | TestLoopBranch.java:79:8:79:8 | y |
+| TestLoopBranch.java:79:4:79:12 | ...=... | TestLoopBranch.java:81:4:81:9 | <Expr>; |
+| TestLoopBranch.java:79:4:79:13 | <Expr>; | TestLoopBranch.java:79:4:79:4 | y |
 | TestLoopBranch.java:79:8:79:8 | y | TestLoopBranch.java:79:12:79:12 | 6 |
 | TestLoopBranch.java:79:8:79:12 | ... + ... | TestLoopBranch.java:79:4:79:12 | ...=... |
 | TestLoopBranch.java:79:12:79:12 | 6 | TestLoopBranch.java:79:8:79:12 | ... + ... |
 | TestLoopBranch.java:80:3:80:10 | default | TestLoopBranch.java:81:4:81:9 | <Expr>; |
+| TestLoopBranch.java:81:4:81:4 | x | TestLoopBranch.java:81:8:81:8 | y |
 | TestLoopBranch.java:81:4:81:8 | ...=... | TestLoopBranch.java:82:4:82:9 | <Expr>; |
-| TestLoopBranch.java:81:4:81:9 | <Expr>; | TestLoopBranch.java:81:8:81:8 | y |
+| TestLoopBranch.java:81:4:81:9 | <Expr>; | TestLoopBranch.java:81:4:81:4 | x |
 | TestLoopBranch.java:81:8:81:8 | y | TestLoopBranch.java:81:4:81:8 | ...=... |
+| TestLoopBranch.java:82:4:82:4 | y | TestLoopBranch.java:82:8:82:8 | x |
 | TestLoopBranch.java:82:4:82:8 | ...=... | TestLoopBranch.java:86:3:86:11 | switch (...) |
-| TestLoopBranch.java:82:4:82:9 | <Expr>; | TestLoopBranch.java:82:8:82:8 | x |
+| TestLoopBranch.java:82:4:82:9 | <Expr>; | TestLoopBranch.java:82:4:82:4 | y |
 | TestLoopBranch.java:82:8:82:8 | x | TestLoopBranch.java:82:4:82:8 | ...=... |
 | TestLoopBranch.java:86:3:86:11 | switch (...) | TestLoopBranch.java:86:10:86:10 | x |
 | TestLoopBranch.java:86:10:86:10 | x | TestLoopBranch.java:88:3:88:9 | case ... |
-| TestLoopBranch.java:86:10:86:10 | x | TestLoopBranch.java:91:3:91:9 | case ... |
-| TestLoopBranch.java:86:10:86:10 | x | TestLoopBranch.java:96:3:102:4 | var ...; |
-| TestLoopBranch.java:88:3:88:9 | case ... | TestLoopBranch.java:89:4:89:9 | <Expr>; |
+| TestLoopBranch.java:88:3:88:9 | case ... | TestLoopBranch.java:88:8:88:8 | 1 |
+| TestLoopBranch.java:88:3:88:9 | case ... | TestLoopBranch.java:91:3:91:9 | case ... |
+| TestLoopBranch.java:88:8:88:8 | 1 | TestLoopBranch.java:89:4:89:9 | <Expr>; |
+| TestLoopBranch.java:89:4:89:4 | x | TestLoopBranch.java:89:8:89:8 | 1 |
 | TestLoopBranch.java:89:4:89:8 | ...=... | TestLoopBranch.java:90:4:90:9 | break |
-| TestLoopBranch.java:89:4:89:9 | <Expr>; | TestLoopBranch.java:89:8:89:8 | 1 |
+| TestLoopBranch.java:89:4:89:9 | <Expr>; | TestLoopBranch.java:89:4:89:4 | x |
 | TestLoopBranch.java:89:8:89:8 | 1 | TestLoopBranch.java:89:4:89:8 | ...=... |
 | TestLoopBranch.java:90:4:90:9 | break | TestLoopBranch.java:96:3:102:4 | var ...; |
-| TestLoopBranch.java:91:3:91:9 | case ... | TestLoopBranch.java:92:4:92:9 | <Expr>; |
+| TestLoopBranch.java:91:3:91:9 | case ... | TestLoopBranch.java:91:8:91:8 | 2 |
+| TestLoopBranch.java:91:3:91:9 | case ... | TestLoopBranch.java:96:3:102:4 | var ...; |
+| TestLoopBranch.java:91:8:91:8 | 2 | TestLoopBranch.java:92:4:92:9 | <Expr>; |
+| TestLoopBranch.java:92:4:92:4 | x | TestLoopBranch.java:92:8:92:8 | 2 |
 | TestLoopBranch.java:92:4:92:8 | ...=... | TestLoopBranch.java:93:4:93:9 | break |
-| TestLoopBranch.java:92:4:92:9 | <Expr>; | TestLoopBranch.java:92:8:92:8 | 2 |
+| TestLoopBranch.java:92:4:92:9 | <Expr>; | TestLoopBranch.java:92:4:92:4 | x |
 | TestLoopBranch.java:92:8:92:8 | 2 | TestLoopBranch.java:92:4:92:8 | ...=... |
 | TestLoopBranch.java:93:4:93:9 | break | TestLoopBranch.java:96:3:102:4 | var ...; |
 | TestLoopBranch.java:96:3:102:4 | var ...; | TestLoopBranch.java:96:26:102:3 | new (...) |
 | TestLoopBranch.java:96:22:102:3 | b | TestLoopBranch.java:103:3:103:21 | <Expr>; |
 | TestLoopBranch.java:96:26:102:3 | new (...) | TestLoopBranch.java:96:22:102:3 | b |
-| TestLoopBranch.java:96:30:96:47 | Exceptional Exit | TestLoopBranch.java:96:30:96:47 | Exit |
+| TestLoopBranch.java:96:30:96:47 | Entry | TestLoopBranch.java:96:30:96:47 | { ... } |
 | TestLoopBranch.java:96:30:96:47 | Normal Exit | TestLoopBranch.java:96:30:96:47 | Exit |
 | TestLoopBranch.java:96:30:96:47 | super(...) | TestLoopBranch.java:96:30:96:47 | Normal Exit |
 | TestLoopBranch.java:96:30:96:47 | { ... } | TestLoopBranch.java:96:30:96:47 | super(...) |
-| TestLoopBranch.java:98:15:98:23 | Exceptional Exit | TestLoopBranch.java:98:15:98:23 | Exit |
+| TestLoopBranch.java:98:15:98:23 | Entry | TestLoopBranch.java:99:4:101:4 | { ... } |
 | TestLoopBranch.java:98:15:98:23 | Normal Exit | TestLoopBranch.java:98:15:98:23 | Exit |
 | TestLoopBranch.java:99:4:101:4 | { ... } | TestLoopBranch.java:100:12:100:12 | 0 |
 | TestLoopBranch.java:100:5:100:13 | return ... | TestLoopBranch.java:98:15:98:23 | Normal Exit |
@@ -231,33 +258,38 @@
 | TestLoopBranch.java:103:3:103:20 | compareTo(...) | TestLoopBranch.java:105:3:105:12 | <Expr>; |
 | TestLoopBranch.java:103:3:103:21 | <Expr>; | TestLoopBranch.java:103:3:103:3 | b |
 | TestLoopBranch.java:103:15:103:19 | "Foo" | TestLoopBranch.java:103:3:103:20 | compareTo(...) |
+| TestLoopBranch.java:105:3:105:3 | x | TestLoopBranch.java:105:7:105:7 | x |
 | TestLoopBranch.java:105:3:105:11 | ...=... | TestLoopBranch.java:106:3:106:9 | return ... |
-| TestLoopBranch.java:105:3:105:12 | <Expr>; | TestLoopBranch.java:105:7:105:7 | x |
+| TestLoopBranch.java:105:3:105:12 | <Expr>; | TestLoopBranch.java:105:3:105:3 | x |
 | TestLoopBranch.java:105:7:105:7 | x | TestLoopBranch.java:105:11:105:11 | y |
 | TestLoopBranch.java:105:7:105:11 | ... + ... | TestLoopBranch.java:105:3:105:11 | ...=... |
 | TestLoopBranch.java:105:11:105:11 | y | TestLoopBranch.java:105:7:105:11 | ... + ... |
 | TestLoopBranch.java:106:3:106:9 | return ... | TestLoopBranch.java:7:14:7:14 | Normal Exit |
 | TestLoopBranch.java:109:9:109:22 | <Expr>; | TestLoopBranch.java:109:9:109:22 | <obinit>(...) |
 | TestLoopBranch.java:109:9:109:22 | <obinit>(...) | TestLoopBranch.java:111:3:111:10 | <Expr>; |
-| TestLoopBranch.java:109:9:109:22 | Exceptional Exit | TestLoopBranch.java:109:9:109:22 | Exit |
+| TestLoopBranch.java:109:9:109:22 | Entry | TestLoopBranch.java:110:2:113:2 | { ... } |
 | TestLoopBranch.java:109:9:109:22 | Normal Exit | TestLoopBranch.java:109:9:109:22 | Exit |
 | TestLoopBranch.java:109:9:109:22 | super(...) | TestLoopBranch.java:109:9:109:22 | <Expr>; |
 | TestLoopBranch.java:110:2:113:2 | { ... } | TestLoopBranch.java:109:9:109:22 | super(...) |
+| TestLoopBranch.java:111:3:111:4 | xx | TestLoopBranch.java:111:8:111:9 | 33 |
 | TestLoopBranch.java:111:3:111:9 | ...=... | TestLoopBranch.java:112:3:112:10 | <Expr>; |
-| TestLoopBranch.java:111:3:111:10 | <Expr>; | TestLoopBranch.java:111:8:111:9 | 33 |
+| TestLoopBranch.java:111:3:111:10 | <Expr>; | TestLoopBranch.java:111:3:111:4 | xx |
 | TestLoopBranch.java:111:8:111:9 | 33 | TestLoopBranch.java:111:3:111:9 | ...=... |
+| TestLoopBranch.java:112:3:112:4 | yy | TestLoopBranch.java:112:8:112:9 | 44 |
 | TestLoopBranch.java:112:3:112:9 | ...=... | TestLoopBranch.java:109:9:109:22 | Normal Exit |
-| TestLoopBranch.java:112:3:112:10 | <Expr>; | TestLoopBranch.java:112:8:112:9 | 44 |
+| TestLoopBranch.java:112:3:112:10 | <Expr>; | TestLoopBranch.java:112:3:112:4 | yy |
 | TestLoopBranch.java:112:8:112:9 | 44 | TestLoopBranch.java:112:3:112:9 | ...=... |
 | TestLoopBranch.java:115:9:115:22 | <Expr>; | TestLoopBranch.java:115:9:115:22 | <obinit>(...) |
 | TestLoopBranch.java:115:9:115:22 | <obinit>(...) | TestLoopBranch.java:117:3:117:9 | <Expr>; |
-| TestLoopBranch.java:115:9:115:22 | Exceptional Exit | TestLoopBranch.java:115:9:115:22 | Exit |
+| TestLoopBranch.java:115:9:115:22 | Entry | TestLoopBranch.java:116:2:119:2 | { ... } |
 | TestLoopBranch.java:115:9:115:22 | Normal Exit | TestLoopBranch.java:115:9:115:22 | Exit |
 | TestLoopBranch.java:115:9:115:22 | super(...) | TestLoopBranch.java:115:9:115:22 | <Expr>; |
 | TestLoopBranch.java:116:2:119:2 | { ... } | TestLoopBranch.java:115:9:115:22 | super(...) |
+| TestLoopBranch.java:117:3:117:4 | xx | TestLoopBranch.java:117:8:117:8 | i |
 | TestLoopBranch.java:117:3:117:8 | ...=... | TestLoopBranch.java:118:3:118:9 | <Expr>; |
-| TestLoopBranch.java:117:3:117:9 | <Expr>; | TestLoopBranch.java:117:8:117:8 | i |
+| TestLoopBranch.java:117:3:117:9 | <Expr>; | TestLoopBranch.java:117:3:117:4 | xx |
 | TestLoopBranch.java:117:8:117:8 | i | TestLoopBranch.java:117:3:117:8 | ...=... |
+| TestLoopBranch.java:118:3:118:4 | yy | TestLoopBranch.java:118:8:118:8 | i |
 | TestLoopBranch.java:118:3:118:8 | ...=... | TestLoopBranch.java:115:9:115:22 | Normal Exit |
-| TestLoopBranch.java:118:3:118:9 | <Expr>; | TestLoopBranch.java:118:8:118:8 | i |
+| TestLoopBranch.java:118:3:118:9 | <Expr>; | TestLoopBranch.java:118:3:118:4 | yy |
 | TestLoopBranch.java:118:8:118:8 | i | TestLoopBranch.java:118:3:118:8 | ...=... |
diff --git a/java/ql/test/library-tests/successors/TestLoopBranch/TestSucc.ql b/java/ql/test/library-tests/successors/TestLoopBranch/TestSucc.ql
index 6fca436fbfd..68c50a85c58 100644
--- a/java/ql/test/library-tests/successors/TestLoopBranch/TestSucc.ql
+++ b/java/ql/test/library-tests/successors/TestLoopBranch/TestSucc.ql
@@ -1,8 +1,9 @@
 import java
+import utils.test.AstCfg
 
 from ControlFlowNode n, ControlFlowNode succ
 where
-  succ = n.getASuccessor() and
+  succ = getAnAstSuccessor(n) and
   n.getLocation().getFile().getExtension() = "java" and
   not n.getLocation().getFile().getStem() = "PopulateRuntimeException"
 select n, succ
diff --git a/java/ql/test/library-tests/successors/TestThrow/FalseSuccessors.expected b/java/ql/test/library-tests/successors/TestThrow/FalseSuccessors.expected
deleted file mode 100644
index 8164f4c6b5e..00000000000
--- a/java/ql/test/library-tests/successors/TestThrow/FalseSuccessors.expected
+++ /dev/null
@@ -1,12 +0,0 @@
-| TestThrow.java:33:8:33:13 | ... == ... | TestThrow.java:36:11:36:21 | if (...) |
-| TestThrow.java:36:15:36:20 | ... == ... | TestThrow.java:39:11:39:21 | if (...) |
-| TestThrow.java:39:15:39:20 | ... == ... | TestThrow.java:43:4:45:4 | { ... } |
-| TestThrow.java:58:8:58:13 | ... == ... | TestThrow.java:62:9:62:19 | if (...) |
-| TestThrow.java:62:13:62:18 | ... == ... | TestThrow.java:66:4:68:4 | { ... } |
-| TestThrow.java:78:8:78:13 | ... == ... | TestThrow.java:81:3:83:3 | { ... } |
-| TestThrow.java:89:9:89:14 | ... == ... | TestThrow.java:92:12:92:22 | if (...) |
-| TestThrow.java:92:16:92:21 | ... == ... | TestThrow.java:96:5:98:5 | { ... } |
-| TestThrow.java:108:9:108:14 | ... == ... | TestThrow.java:111:12:111:22 | if (...) |
-| TestThrow.java:111:16:111:21 | ... == ... | TestThrow.java:114:12:114:22 | if (...) |
-| TestThrow.java:114:16:114:21 | ... == ... | TestThrow.java:124:3:126:3 | { ... } |
-| TestThrow.java:128:7:128:12 | ... == ... | TestThrow.java:133:3:133:9 | <Expr>; |
diff --git a/java/ql/test/library-tests/successors/TestThrow/FalseSuccessors.ql b/java/ql/test/library-tests/successors/TestThrow/FalseSuccessors.ql
deleted file mode 100644
index aee4021bee6..00000000000
--- a/java/ql/test/library-tests/successors/TestThrow/FalseSuccessors.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import java
-
-from ConditionNode c
-select c, c.getAFalseSuccessor()
diff --git a/java/ql/test/library-tests/successors/TestThrow/TestSucc.expected b/java/ql/test/library-tests/successors/TestThrow/TestSucc.expected
index fb44327f465..3ed406a0a71 100644
--- a/java/ql/test/library-tests/successors/TestThrow/TestSucc.expected
+++ b/java/ql/test/library-tests/successors/TestThrow/TestSucc.expected
@@ -1,10 +1,11 @@
-| TestThrow.java:7:10:7:18 | Exceptional Exit | TestThrow.java:7:10:7:18 | Exit |
+| TestThrow.java:7:10:7:18 | Entry | TestThrow.java:8:2:9:2 | { ... } |
 | TestThrow.java:7:10:7:18 | Normal Exit | TestThrow.java:7:10:7:18 | Exit |
 | TestThrow.java:7:10:7:18 | super(...) | TestThrow.java:7:10:7:18 | Normal Exit |
 | TestThrow.java:8:2:9:2 | { ... } | TestThrow.java:7:10:7:18 | super(...) |
-| TestThrow.java:11:15:11:21 | Exceptional Exit | TestThrow.java:11:15:11:21 | Exit |
+| TestThrow.java:11:15:11:21 | Entry | TestThrow.java:12:2:13:2 | { ... } |
 | TestThrow.java:11:15:11:21 | Normal Exit | TestThrow.java:11:15:11:21 | Exit |
 | TestThrow.java:12:2:13:2 | { ... } | TestThrow.java:11:15:11:21 | Normal Exit |
+| TestThrow.java:15:14:15:14 | Entry | TestThrow.java:16:2:134:2 | { ... } |
 | TestThrow.java:15:14:15:14 | Exceptional Exit | TestThrow.java:15:14:15:14 | Exit |
 | TestThrow.java:15:14:15:14 | Normal Exit | TestThrow.java:15:14:15:14 | Exit |
 | TestThrow.java:16:2:134:2 | { ... } | TestThrow.java:17:3:17:12 | var ...; |
@@ -17,19 +18,23 @@
 | TestThrow.java:20:10:20:31 | new RuntimeException(...) | TestThrow.java:20:4:20:32 | throw ... |
 | TestThrow.java:20:10:20:31 | new RuntimeException(...) | TestThrow.java:21:5:21:30 | catch (...) |
 | TestThrow.java:21:5:21:30 | catch (...) | TestThrow.java:21:29:21:29 | e |
+| TestThrow.java:21:5:21:30 | catch (...) | TestThrow.java:24:5:24:23 | catch (...) |
 | TestThrow.java:21:29:21:29 | e | TestThrow.java:22:3:24:3 | { ... } |
 | TestThrow.java:22:3:24:3 | { ... } | TestThrow.java:23:4:23:9 | <Expr>; |
+| TestThrow.java:23:4:23:4 | z | TestThrow.java:23:8:23:8 | 1 |
 | TestThrow.java:23:4:23:8 | ...=... | TestThrow.java:29:3:29:9 | <Expr>; |
-| TestThrow.java:23:4:23:9 | <Expr>; | TestThrow.java:23:8:23:8 | 1 |
+| TestThrow.java:23:4:23:9 | <Expr>; | TestThrow.java:23:4:23:4 | z |
 | TestThrow.java:23:8:23:8 | 1 | TestThrow.java:23:4:23:8 | ...=... |
 | TestThrow.java:24:5:24:23 | catch (...) | TestThrow.java:24:22:24:22 | e |
 | TestThrow.java:24:22:24:22 | e | TestThrow.java:25:3:27:3 | { ... } |
 | TestThrow.java:25:3:27:3 | { ... } | TestThrow.java:26:4:26:9 | <Expr>; |
+| TestThrow.java:26:4:26:4 | z | TestThrow.java:26:8:26:8 | 2 |
 | TestThrow.java:26:4:26:8 | ...=... | TestThrow.java:29:3:29:9 | <Expr>; |
-| TestThrow.java:26:4:26:9 | <Expr>; | TestThrow.java:26:8:26:8 | 2 |
+| TestThrow.java:26:4:26:9 | <Expr>; | TestThrow.java:26:4:26:4 | z |
 | TestThrow.java:26:8:26:8 | 2 | TestThrow.java:26:4:26:8 | ...=... |
+| TestThrow.java:29:3:29:3 | z | TestThrow.java:29:8:29:8 | 1 |
 | TestThrow.java:29:3:29:8 | ...=... | TestThrow.java:31:3:52:3 | try ... |
-| TestThrow.java:29:3:29:9 | <Expr>; | TestThrow.java:29:8:29:8 | 1 |
+| TestThrow.java:29:3:29:9 | <Expr>; | TestThrow.java:29:3:29:3 | z |
 | TestThrow.java:29:7:29:8 | -... | TestThrow.java:29:3:29:8 | ...=... |
 | TestThrow.java:29:8:29:8 | 1 | TestThrow.java:29:7:29:8 | -... |
 | TestThrow.java:31:3:52:3 | try ... | TestThrow.java:32:3:46:3 | { ... } |
@@ -43,7 +48,6 @@
 | TestThrow.java:35:5:35:33 | throw ... | TestThrow.java:46:5:46:30 | catch (...) |
 | TestThrow.java:35:11:35:32 | new RuntimeException(...) | TestThrow.java:35:5:35:33 | throw ... |
 | TestThrow.java:35:11:35:32 | new RuntimeException(...) | TestThrow.java:46:5:46:30 | catch (...) |
-| TestThrow.java:35:11:35:32 | new RuntimeException(...) | TestThrow.java:50:3:52:3 | { ... } |
 | TestThrow.java:36:11:36:21 | if (...) | TestThrow.java:36:15:36:15 | z |
 | TestThrow.java:36:15:36:15 | z | TestThrow.java:36:20:36:20 | 2 |
 | TestThrow.java:36:15:36:20 | ... == ... | TestThrow.java:37:4:39:4 | { ... } |
@@ -51,10 +55,8 @@
 | TestThrow.java:36:20:36:20 | 2 | TestThrow.java:36:15:36:20 | ... == ... |
 | TestThrow.java:37:4:39:4 | { ... } | TestThrow.java:38:11:38:25 | new Exception(...) |
 | TestThrow.java:38:5:38:26 | throw ... | TestThrow.java:46:5:46:30 | catch (...) |
-| TestThrow.java:38:5:38:26 | throw ... | TestThrow.java:50:3:52:3 | { ... } |
 | TestThrow.java:38:11:38:25 | new Exception(...) | TestThrow.java:38:5:38:26 | throw ... |
 | TestThrow.java:38:11:38:25 | new Exception(...) | TestThrow.java:46:5:46:30 | catch (...) |
-| TestThrow.java:38:11:38:25 | new Exception(...) | TestThrow.java:50:3:52:3 | { ... } |
 | TestThrow.java:39:11:39:21 | if (...) | TestThrow.java:39:15:39:15 | z |
 | TestThrow.java:39:15:39:15 | z | TestThrow.java:39:20:39:20 | 3 |
 | TestThrow.java:39:15:39:20 | ... == ... | TestThrow.java:40:4:42:4 | { ... } |
@@ -69,18 +71,22 @@
 | TestThrow.java:44:5:44:13 | thrower(...) | TestThrow.java:50:3:52:3 | { ... } |
 | TestThrow.java:44:5:44:14 | <Expr>; | TestThrow.java:44:5:44:13 | thrower(...) |
 | TestThrow.java:46:5:46:30 | catch (...) | TestThrow.java:46:29:46:29 | e |
+| TestThrow.java:46:5:46:30 | catch (...) | TestThrow.java:50:3:52:3 | { ... } |
 | TestThrow.java:46:29:46:29 | e | TestThrow.java:47:3:49:3 | { ... } |
 | TestThrow.java:47:3:49:3 | { ... } | TestThrow.java:48:4:48:9 | <Expr>; |
+| TestThrow.java:48:4:48:4 | z | TestThrow.java:48:8:48:8 | 1 |
 | TestThrow.java:48:4:48:8 | ...=... | TestThrow.java:50:3:52:3 | { ... } |
-| TestThrow.java:48:4:48:9 | <Expr>; | TestThrow.java:48:8:48:8 | 1 |
+| TestThrow.java:48:4:48:9 | <Expr>; | TestThrow.java:48:4:48:4 | z |
 | TestThrow.java:48:8:48:8 | 1 | TestThrow.java:48:4:48:8 | ...=... |
 | TestThrow.java:50:3:52:3 | { ... } | TestThrow.java:51:4:51:9 | <Expr>; |
+| TestThrow.java:51:4:51:4 | z | TestThrow.java:51:8:51:8 | 2 |
 | TestThrow.java:51:4:51:8 | ...=... | TestThrow.java:15:14:15:14 | Exceptional Exit |
 | TestThrow.java:51:4:51:8 | ...=... | TestThrow.java:54:3:54:9 | <Expr>; |
-| TestThrow.java:51:4:51:9 | <Expr>; | TestThrow.java:51:8:51:8 | 2 |
+| TestThrow.java:51:4:51:9 | <Expr>; | TestThrow.java:51:4:51:4 | z |
 | TestThrow.java:51:8:51:8 | 2 | TestThrow.java:51:4:51:8 | ...=... |
+| TestThrow.java:54:3:54:3 | z | TestThrow.java:54:8:54:8 | 1 |
 | TestThrow.java:54:3:54:8 | ...=... | TestThrow.java:56:3:72:3 | try ... |
-| TestThrow.java:54:3:54:9 | <Expr>; | TestThrow.java:54:8:54:8 | 1 |
+| TestThrow.java:54:3:54:9 | <Expr>; | TestThrow.java:54:3:54:3 | z |
 | TestThrow.java:54:7:54:8 | -... | TestThrow.java:54:3:54:8 | ...=... |
 | TestThrow.java:54:8:54:8 | 1 | TestThrow.java:54:7:54:8 | -... |
 | TestThrow.java:56:3:72:3 | try ... | TestThrow.java:57:3:69:3 | { ... } |
@@ -91,7 +97,6 @@
 | TestThrow.java:58:8:58:13 | ... == ... | TestThrow.java:62:9:62:19 | if (...) |
 | TestThrow.java:58:13:58:13 | 1 | TestThrow.java:58:8:58:13 | ... == ... |
 | TestThrow.java:59:4:61:4 | { ... } | TestThrow.java:60:11:60:25 | new Exception(...) |
-| TestThrow.java:60:5:60:26 | throw ... | TestThrow.java:15:14:15:14 | Exceptional Exit |
 | TestThrow.java:60:5:60:26 | throw ... | TestThrow.java:69:5:69:30 | catch (...) |
 | TestThrow.java:60:11:60:25 | new Exception(...) | TestThrow.java:60:5:60:26 | throw ... |
 | TestThrow.java:60:11:60:25 | new Exception(...) | TestThrow.java:69:5:69:30 | catch (...) |
@@ -101,7 +106,6 @@
 | TestThrow.java:62:13:62:18 | ... == ... | TestThrow.java:66:4:68:4 | { ... } |
 | TestThrow.java:62:18:62:18 | 2 | TestThrow.java:62:13:62:18 | ... == ... |
 | TestThrow.java:63:4:65:4 | { ... } | TestThrow.java:64:5:64:20 | <Expr>; |
-| TestThrow.java:64:5:64:19 | new TestThrow(...) | TestThrow.java:15:14:15:14 | Exceptional Exit |
 | TestThrow.java:64:5:64:19 | new TestThrow(...) | TestThrow.java:69:5:69:30 | catch (...) |
 | TestThrow.java:64:5:64:19 | new TestThrow(...) | TestThrow.java:74:3:74:9 | <Expr>; |
 | TestThrow.java:64:5:64:20 | <Expr>; | TestThrow.java:64:5:64:19 | new TestThrow(...) |
@@ -109,14 +113,17 @@
 | TestThrow.java:67:5:67:13 | thrower(...) | TestThrow.java:69:5:69:30 | catch (...) |
 | TestThrow.java:67:5:67:13 | thrower(...) | TestThrow.java:74:3:74:9 | <Expr>; |
 | TestThrow.java:67:5:67:14 | <Expr>; | TestThrow.java:67:5:67:13 | thrower(...) |
+| TestThrow.java:69:5:69:30 | catch (...) | TestThrow.java:15:14:15:14 | Exceptional Exit |
 | TestThrow.java:69:5:69:30 | catch (...) | TestThrow.java:69:29:69:29 | e |
 | TestThrow.java:69:29:69:29 | e | TestThrow.java:70:3:72:3 | { ... } |
 | TestThrow.java:70:3:72:3 | { ... } | TestThrow.java:71:4:71:9 | <Expr>; |
+| TestThrow.java:71:4:71:4 | z | TestThrow.java:71:8:71:8 | 1 |
 | TestThrow.java:71:4:71:8 | ...=... | TestThrow.java:74:3:74:9 | <Expr>; |
-| TestThrow.java:71:4:71:9 | <Expr>; | TestThrow.java:71:8:71:8 | 1 |
+| TestThrow.java:71:4:71:9 | <Expr>; | TestThrow.java:71:4:71:4 | z |
 | TestThrow.java:71:8:71:8 | 1 | TestThrow.java:71:4:71:8 | ...=... |
+| TestThrow.java:74:3:74:3 | z | TestThrow.java:74:8:74:8 | 1 |
 | TestThrow.java:74:3:74:8 | ...=... | TestThrow.java:76:3:83:3 | try ... |
-| TestThrow.java:74:3:74:9 | <Expr>; | TestThrow.java:74:8:74:8 | 1 |
+| TestThrow.java:74:3:74:9 | <Expr>; | TestThrow.java:74:3:74:3 | z |
 | TestThrow.java:74:7:74:8 | -... | TestThrow.java:74:3:74:8 | ...=... |
 | TestThrow.java:74:8:74:8 | 1 | TestThrow.java:74:7:74:8 | -... |
 | TestThrow.java:76:3:83:3 | try ... | TestThrow.java:77:3:80:3 | { ... } |
@@ -130,9 +137,10 @@
 | TestThrow.java:79:11:79:25 | new Exception(...) | TestThrow.java:79:5:79:26 | throw ... |
 | TestThrow.java:79:11:79:25 | new Exception(...) | TestThrow.java:81:3:83:3 | { ... } |
 | TestThrow.java:81:3:83:3 | { ... } | TestThrow.java:82:4:82:9 | <Expr>; |
+| TestThrow.java:82:4:82:4 | z | TestThrow.java:82:8:82:8 | 1 |
 | TestThrow.java:82:4:82:8 | ...=... | TestThrow.java:15:14:15:14 | Exceptional Exit |
 | TestThrow.java:82:4:82:8 | ...=... | TestThrow.java:85:3:126:3 | try ... |
-| TestThrow.java:82:4:82:9 | <Expr>; | TestThrow.java:82:8:82:8 | 1 |
+| TestThrow.java:82:4:82:9 | <Expr>; | TestThrow.java:82:4:82:4 | z |
 | TestThrow.java:82:8:82:8 | 1 | TestThrow.java:82:4:82:8 | ...=... |
 | TestThrow.java:85:3:126:3 | try ... | TestThrow.java:86:3:119:3 | { ... } |
 | TestThrow.java:86:3:119:3 | { ... } | TestThrow.java:87:4:102:4 | try ... |
@@ -145,11 +153,8 @@
 | TestThrow.java:89:14:89:14 | 1 | TestThrow.java:89:9:89:14 | ... == ... |
 | TestThrow.java:90:5:92:5 | { ... } | TestThrow.java:91:12:91:26 | new Exception(...) |
 | TestThrow.java:91:6:91:27 | throw ... | TestThrow.java:99:6:99:31 | catch (...) |
-| TestThrow.java:91:6:91:27 | throw ... | TestThrow.java:119:5:119:25 | catch (...) |
-| TestThrow.java:91:6:91:27 | throw ... | TestThrow.java:124:3:126:3 | { ... } |
 | TestThrow.java:91:12:91:26 | new Exception(...) | TestThrow.java:91:6:91:27 | throw ... |
 | TestThrow.java:91:12:91:26 | new Exception(...) | TestThrow.java:99:6:99:31 | catch (...) |
-| TestThrow.java:91:12:91:26 | new Exception(...) | TestThrow.java:124:3:126:3 | { ... } |
 | TestThrow.java:92:12:92:22 | if (...) | TestThrow.java:92:16:92:16 | z |
 | TestThrow.java:92:16:92:16 | z | TestThrow.java:92:21:92:21 | 2 |
 | TestThrow.java:92:16:92:21 | ... == ... | TestThrow.java:93:5:95:5 | { ... } |
@@ -159,24 +164,25 @@
 | TestThrow.java:94:6:94:34 | throw ... | TestThrow.java:99:6:99:31 | catch (...) |
 | TestThrow.java:94:12:94:33 | new RuntimeException(...) | TestThrow.java:94:6:94:34 | throw ... |
 | TestThrow.java:94:12:94:33 | new RuntimeException(...) | TestThrow.java:99:6:99:31 | catch (...) |
-| TestThrow.java:94:12:94:33 | new RuntimeException(...) | TestThrow.java:124:3:126:3 | { ... } |
 | TestThrow.java:96:5:98:5 | { ... } | TestThrow.java:97:28:97:36 | "Foo bar" |
-| TestThrow.java:97:6:97:44 | throw ... | TestThrow.java:119:5:119:25 | catch (...) |
+| TestThrow.java:97:6:97:44 | throw ... | TestThrow.java:99:6:99:31 | catch (...) |
 | TestThrow.java:97:12:97:43 | new IOException(...) | TestThrow.java:97:6:97:44 | throw ... |
 | TestThrow.java:97:12:97:43 | new IOException(...) | TestThrow.java:99:6:99:31 | catch (...) |
-| TestThrow.java:97:12:97:43 | new IOException(...) | TestThrow.java:124:3:126:3 | { ... } |
 | TestThrow.java:97:28:97:36 | "Foo bar" | TestThrow.java:97:39:97:42 | null |
 | TestThrow.java:97:39:97:42 | null | TestThrow.java:97:12:97:43 | new IOException(...) |
 | TestThrow.java:99:6:99:31 | catch (...) | TestThrow.java:99:30:99:30 | e |
+| TestThrow.java:99:6:99:31 | catch (...) | TestThrow.java:119:5:119:25 | catch (...) |
 | TestThrow.java:99:30:99:30 | e | TestThrow.java:100:4:102:4 | { ... } |
 | TestThrow.java:100:4:102:4 | { ... } | TestThrow.java:101:5:101:10 | <Expr>; |
+| TestThrow.java:101:5:101:5 | z | TestThrow.java:101:9:101:9 | 1 |
 | TestThrow.java:101:5:101:9 | ...=... | TestThrow.java:103:4:118:4 | try ... |
-| TestThrow.java:101:5:101:10 | <Expr>; | TestThrow.java:101:9:101:9 | 1 |
+| TestThrow.java:101:5:101:10 | <Expr>; | TestThrow.java:101:5:101:5 | z |
 | TestThrow.java:101:9:101:9 | 1 | TestThrow.java:101:5:101:9 | ...=... |
 | TestThrow.java:103:4:118:4 | try ... | TestThrow.java:104:4:106:4 | { ... } |
 | TestThrow.java:104:4:106:4 | { ... } | TestThrow.java:105:5:105:11 | <Expr>; |
+| TestThrow.java:105:5:105:5 | z | TestThrow.java:105:10:105:10 | 2 |
 | TestThrow.java:105:5:105:10 | ...=... | TestThrow.java:107:4:118:4 | { ... } |
-| TestThrow.java:105:5:105:11 | <Expr>; | TestThrow.java:105:10:105:10 | 2 |
+| TestThrow.java:105:5:105:11 | <Expr>; | TestThrow.java:105:5:105:5 | z |
 | TestThrow.java:105:9:105:10 | -... | TestThrow.java:105:5:105:10 | ...=... |
 | TestThrow.java:105:10:105:10 | 2 | TestThrow.java:105:9:105:10 | -... |
 | TestThrow.java:107:4:118:4 | { ... } | TestThrow.java:108:5:108:15 | if (...) |
@@ -187,18 +193,17 @@
 | TestThrow.java:108:14:108:14 | 1 | TestThrow.java:108:9:108:14 | ... == ... |
 | TestThrow.java:109:5:111:5 | { ... } | TestThrow.java:110:12:110:26 | new Exception(...) |
 | TestThrow.java:110:6:110:27 | throw ... | TestThrow.java:119:5:119:25 | catch (...) |
-| TestThrow.java:110:6:110:27 | throw ... | TestThrow.java:124:3:126:3 | { ... } |
 | TestThrow.java:110:12:110:26 | new Exception(...) | TestThrow.java:110:6:110:27 | throw ... |
-| TestThrow.java:110:12:110:26 | new Exception(...) | TestThrow.java:124:3:126:3 | { ... } |
+| TestThrow.java:110:12:110:26 | new Exception(...) | TestThrow.java:119:5:119:25 | catch (...) |
 | TestThrow.java:111:12:111:22 | if (...) | TestThrow.java:111:16:111:16 | z |
 | TestThrow.java:111:16:111:16 | z | TestThrow.java:111:21:111:21 | 2 |
 | TestThrow.java:111:16:111:21 | ... == ... | TestThrow.java:112:5:114:5 | { ... } |
 | TestThrow.java:111:16:111:21 | ... == ... | TestThrow.java:114:12:114:22 | if (...) |
 | TestThrow.java:111:21:111:21 | 2 | TestThrow.java:111:16:111:21 | ... == ... |
 | TestThrow.java:112:5:114:5 | { ... } | TestThrow.java:113:12:113:33 | new RuntimeException(...) |
-| TestThrow.java:113:6:113:34 | throw ... | TestThrow.java:124:3:126:3 | { ... } |
+| TestThrow.java:113:6:113:34 | throw ... | TestThrow.java:119:5:119:25 | catch (...) |
 | TestThrow.java:113:12:113:33 | new RuntimeException(...) | TestThrow.java:113:6:113:34 | throw ... |
-| TestThrow.java:113:12:113:33 | new RuntimeException(...) | TestThrow.java:124:3:126:3 | { ... } |
+| TestThrow.java:113:12:113:33 | new RuntimeException(...) | TestThrow.java:119:5:119:25 | catch (...) |
 | TestThrow.java:114:12:114:22 | if (...) | TestThrow.java:114:16:114:16 | z |
 | TestThrow.java:114:16:114:16 | z | TestThrow.java:114:21:114:21 | 3 |
 | TestThrow.java:114:16:114:21 | ... == ... | TestThrow.java:115:5:117:5 | { ... } |
@@ -207,19 +212,22 @@
 | TestThrow.java:115:5:117:5 | { ... } | TestThrow.java:116:28:116:36 | "Foo bar" |
 | TestThrow.java:116:6:116:44 | throw ... | TestThrow.java:119:5:119:25 | catch (...) |
 | TestThrow.java:116:12:116:43 | new IOException(...) | TestThrow.java:116:6:116:44 | throw ... |
-| TestThrow.java:116:12:116:43 | new IOException(...) | TestThrow.java:124:3:126:3 | { ... } |
+| TestThrow.java:116:12:116:43 | new IOException(...) | TestThrow.java:119:5:119:25 | catch (...) |
 | TestThrow.java:116:28:116:36 | "Foo bar" | TestThrow.java:116:39:116:42 | null |
 | TestThrow.java:116:39:116:42 | null | TestThrow.java:116:12:116:43 | new IOException(...) |
 | TestThrow.java:119:5:119:25 | catch (...) | TestThrow.java:119:24:119:24 | e |
+| TestThrow.java:119:5:119:25 | catch (...) | TestThrow.java:124:3:126:3 | { ... } |
 | TestThrow.java:119:24:119:24 | e | TestThrow.java:120:3:122:3 | { ... } |
 | TestThrow.java:120:3:122:3 | { ... } | TestThrow.java:121:4:121:9 | <Expr>; |
+| TestThrow.java:121:4:121:4 | z | TestThrow.java:121:8:121:8 | 2 |
 | TestThrow.java:121:4:121:8 | ...=... | TestThrow.java:124:3:126:3 | { ... } |
-| TestThrow.java:121:4:121:9 | <Expr>; | TestThrow.java:121:8:121:8 | 2 |
+| TestThrow.java:121:4:121:9 | <Expr>; | TestThrow.java:121:4:121:4 | z |
 | TestThrow.java:121:8:121:8 | 2 | TestThrow.java:121:4:121:8 | ...=... |
 | TestThrow.java:124:3:126:3 | { ... } | TestThrow.java:125:4:125:9 | <Expr>; |
+| TestThrow.java:125:4:125:4 | z | TestThrow.java:125:8:125:8 | 3 |
 | TestThrow.java:125:4:125:8 | ...=... | TestThrow.java:15:14:15:14 | Exceptional Exit |
 | TestThrow.java:125:4:125:8 | ...=... | TestThrow.java:128:3:128:13 | if (...) |
-| TestThrow.java:125:4:125:9 | <Expr>; | TestThrow.java:125:8:125:8 | 3 |
+| TestThrow.java:125:4:125:9 | <Expr>; | TestThrow.java:125:4:125:4 | z |
 | TestThrow.java:125:8:125:8 | 3 | TestThrow.java:125:4:125:8 | ...=... |
 | TestThrow.java:128:3:128:13 | if (...) | TestThrow.java:128:7:128:7 | z |
 | TestThrow.java:128:7:128:7 | z | TestThrow.java:128:12:128:12 | 1 |
@@ -229,7 +237,8 @@
 | TestThrow.java:129:3:131:3 | { ... } | TestThrow.java:130:10:130:24 | new Exception(...) |
 | TestThrow.java:130:4:130:25 | throw ... | TestThrow.java:15:14:15:14 | Exceptional Exit |
 | TestThrow.java:130:10:130:24 | new Exception(...) | TestThrow.java:130:4:130:25 | throw ... |
+| TestThrow.java:133:3:133:3 | z | TestThrow.java:133:8:133:8 | 1 |
 | TestThrow.java:133:3:133:8 | ...=... | TestThrow.java:15:14:15:14 | Normal Exit |
-| TestThrow.java:133:3:133:9 | <Expr>; | TestThrow.java:133:8:133:8 | 1 |
+| TestThrow.java:133:3:133:9 | <Expr>; | TestThrow.java:133:3:133:3 | z |
 | TestThrow.java:133:7:133:8 | -... | TestThrow.java:133:3:133:8 | ...=... |
 | TestThrow.java:133:8:133:8 | 1 | TestThrow.java:133:7:133:8 | -... |
diff --git a/java/ql/test/library-tests/successors/TestThrow/TestSucc.ql b/java/ql/test/library-tests/successors/TestThrow/TestSucc.ql
index 6fca436fbfd..68c50a85c58 100644
--- a/java/ql/test/library-tests/successors/TestThrow/TestSucc.ql
+++ b/java/ql/test/library-tests/successors/TestThrow/TestSucc.ql
@@ -1,8 +1,9 @@
 import java
+import utils.test.AstCfg
 
 from ControlFlowNode n, ControlFlowNode succ
 where
-  succ = n.getASuccessor() and
+  succ = getAnAstSuccessor(n) and
   n.getLocation().getFile().getExtension() = "java" and
   not n.getLocation().getFile().getStem() = "PopulateRuntimeException"
 select n, succ
diff --git a/java/ql/test/library-tests/successors/TestThrow2/FalseSuccessors.ql b/java/ql/test/library-tests/successors/TestThrow2/FalseSuccessors.ql
deleted file mode 100644
index aee4021bee6..00000000000
--- a/java/ql/test/library-tests/successors/TestThrow2/FalseSuccessors.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import java
-
-from ConditionNode c
-select c, c.getAFalseSuccessor()
diff --git a/java/ql/test/library-tests/successors/TestThrow2/TestSucc.expected b/java/ql/test/library-tests/successors/TestThrow2/TestSucc.expected
index e133a6550c1..d746aab29c6 100644
--- a/java/ql/test/library-tests/successors/TestThrow2/TestSucc.expected
+++ b/java/ql/test/library-tests/successors/TestThrow2/TestSucc.expected
@@ -1,7 +1,7 @@
 | TestThrow2.java:3:7:3:16 | <Expr>; | TestThrow2.java:3:7:3:16 | <obinit>(...) |
 | TestThrow2.java:3:7:3:16 | <obinit>(...) | TestThrow2.java:3:7:3:16 | Normal Exit |
-| TestThrow2.java:3:7:3:16 | Exceptional Exit | TestThrow2.java:3:7:3:16 | Exit |
-| TestThrow2.java:3:7:3:16 | Exceptional Exit | TestThrow2.java:3:7:3:16 | Exit |
+| TestThrow2.java:3:7:3:16 | Entry | TestThrow2.java:3:7:3:16 | { ... } |
+| TestThrow2.java:3:7:3:16 | Entry | TestThrow2.java:3:7:3:16 | { ... } |
 | TestThrow2.java:3:7:3:16 | Normal Exit | TestThrow2.java:3:7:3:16 | Exit |
 | TestThrow2.java:3:7:3:16 | Normal Exit | TestThrow2.java:3:7:3:16 | Exit |
 | TestThrow2.java:3:7:3:16 | super(...) | TestThrow2.java:3:7:3:16 | <Expr>; |
diff --git a/java/ql/test/library-tests/successors/TestThrow2/TestSucc.ql b/java/ql/test/library-tests/successors/TestThrow2/TestSucc.ql
index 6fca436fbfd..68c50a85c58 100644
--- a/java/ql/test/library-tests/successors/TestThrow2/TestSucc.ql
+++ b/java/ql/test/library-tests/successors/TestThrow2/TestSucc.ql
@@ -1,8 +1,9 @@
 import java
+import utils.test.AstCfg
 
 from ControlFlowNode n, ControlFlowNode succ
 where
-  succ = n.getASuccessor() and
+  succ = getAnAstSuccessor(n) and
   n.getLocation().getFile().getExtension() = "java" and
   not n.getLocation().getFile().getStem() = "PopulateRuntimeException"
 select n, succ
diff --git a/java/ql/test/library-tests/successors/TestTryCatch/FalseSuccessors.expected b/java/ql/test/library-tests/successors/TestTryCatch/FalseSuccessors.expected
deleted file mode 100644
index 139e00728a7..00000000000
--- a/java/ql/test/library-tests/successors/TestTryCatch/FalseSuccessors.expected
+++ /dev/null
@@ -1 +0,0 @@
-| TestTryCatch.java:27:19:27:24 | ... < ... | TestTryCatch.java:42:3:42:12 | <Expr>; |
diff --git a/java/ql/test/library-tests/successors/TestTryCatch/FalseSuccessors.ql b/java/ql/test/library-tests/successors/TestTryCatch/FalseSuccessors.ql
deleted file mode 100644
index aee4021bee6..00000000000
--- a/java/ql/test/library-tests/successors/TestTryCatch/FalseSuccessors.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import java
-
-from ConditionNode c
-select c, c.getAFalseSuccessor()
diff --git a/java/ql/test/library-tests/successors/TestTryCatch/TestSucc.expected b/java/ql/test/library-tests/successors/TestTryCatch/TestSucc.expected
index 6158e55dc24..7769fd9d5b3 100644
--- a/java/ql/test/library-tests/successors/TestTryCatch/TestSucc.expected
+++ b/java/ql/test/library-tests/successors/TestTryCatch/TestSucc.expected
@@ -1,7 +1,8 @@
-| TestTryCatch.java:3:14:3:25 | Exceptional Exit | TestTryCatch.java:3:14:3:25 | Exit |
+| TestTryCatch.java:3:14:3:25 | Entry | TestTryCatch.java:3:14:3:25 | { ... } |
 | TestTryCatch.java:3:14:3:25 | Normal Exit | TestTryCatch.java:3:14:3:25 | Exit |
 | TestTryCatch.java:3:14:3:25 | super(...) | TestTryCatch.java:3:14:3:25 | Normal Exit |
 | TestTryCatch.java:3:14:3:25 | { ... } | TestTryCatch.java:3:14:3:25 | super(...) |
+| TestTryCatch.java:4:14:4:14 | Entry | TestTryCatch.java:5:2:43:2 | { ... } |
 | TestTryCatch.java:4:14:4:14 | Exceptional Exit | TestTryCatch.java:4:14:4:14 | Exit |
 | TestTryCatch.java:4:14:4:14 | Normal Exit | TestTryCatch.java:4:14:4:14 | Exit |
 | TestTryCatch.java:5:2:43:2 | { ... } | TestTryCatch.java:6:3:23:3 | try ... |
@@ -10,7 +11,6 @@
 | TestTryCatch.java:8:4:8:13 | System.out | TestTryCatch.java:8:23:8:27 | "Foo" |
 | TestTryCatch.java:8:4:8:28 | println(...) | TestTryCatch.java:9:4:9:18 | var ...; |
 | TestTryCatch.java:8:4:8:28 | println(...) | TestTryCatch.java:12:5:12:23 | catch (...) |
-| TestTryCatch.java:8:4:8:28 | println(...) | TestTryCatch.java:19:3:23:3 | { ... } |
 | TestTryCatch.java:8:4:8:29 | <Expr>; | TestTryCatch.java:8:4:8:13 | System.out |
 | TestTryCatch.java:8:23:8:27 | "Foo" | TestTryCatch.java:8:4:8:28 | println(...) |
 | TestTryCatch.java:9:4:9:18 | var ...; | TestTryCatch.java:9:12:9:13 | 12 |
@@ -21,11 +21,11 @@
 | TestTryCatch.java:10:4:10:13 | System.out | TestTryCatch.java:10:23:10:27 | "Bar" |
 | TestTryCatch.java:10:4:10:28 | println(...) | TestTryCatch.java:11:4:11:13 | <Expr>; |
 | TestTryCatch.java:10:4:10:28 | println(...) | TestTryCatch.java:12:5:12:23 | catch (...) |
-| TestTryCatch.java:10:4:10:28 | println(...) | TestTryCatch.java:19:3:23:3 | { ... } |
 | TestTryCatch.java:10:4:10:29 | <Expr>; | TestTryCatch.java:10:4:10:13 | System.out |
 | TestTryCatch.java:10:23:10:27 | "Bar" | TestTryCatch.java:10:4:10:28 | println(...) |
+| TestTryCatch.java:11:4:11:4 | y | TestTryCatch.java:11:8:11:8 | y |
 | TestTryCatch.java:11:4:11:12 | ...=... | TestTryCatch.java:19:3:23:3 | { ... } |
-| TestTryCatch.java:11:4:11:13 | <Expr>; | TestTryCatch.java:11:8:11:8 | y |
+| TestTryCatch.java:11:4:11:13 | <Expr>; | TestTryCatch.java:11:4:11:4 | y |
 | TestTryCatch.java:11:8:11:8 | y | TestTryCatch.java:11:12:11:12 | 1 |
 | TestTryCatch.java:11:8:11:12 | ... + ... | TestTryCatch.java:11:4:11:12 | ...=... |
 | TestTryCatch.java:11:12:11:12 | 1 | TestTryCatch.java:11:8:11:12 | ... + ... |
@@ -41,8 +41,9 @@
 | TestTryCatch.java:15:23:15:31 | "Error: " | TestTryCatch.java:15:35:15:35 | e |
 | TestTryCatch.java:15:23:15:35 | ... + ... | TestTryCatch.java:15:4:15:36 | println(...) |
 | TestTryCatch.java:15:35:15:35 | e | TestTryCatch.java:15:23:15:35 | ... + ... |
+| TestTryCatch.java:16:4:16:4 | x | TestTryCatch.java:16:8:16:8 | x |
 | TestTryCatch.java:16:4:16:12 | ...=... | TestTryCatch.java:17:4:17:10 | return ... |
-| TestTryCatch.java:16:4:16:13 | <Expr>; | TestTryCatch.java:16:8:16:8 | x |
+| TestTryCatch.java:16:4:16:13 | <Expr>; | TestTryCatch.java:16:4:16:4 | x |
 | TestTryCatch.java:16:8:16:8 | x | TestTryCatch.java:16:12:16:12 | 1 |
 | TestTryCatch.java:16:8:16:12 | ... + ... | TestTryCatch.java:16:4:16:12 | ...=... |
 | TestTryCatch.java:16:12:16:12 | 1 | TestTryCatch.java:16:8:16:12 | ... + ... |
@@ -55,18 +56,19 @@
 | TestTryCatch.java:21:4:21:32 | println(...) | TestTryCatch.java:22:4:22:13 | <Expr>; |
 | TestTryCatch.java:21:4:21:33 | <Expr>; | TestTryCatch.java:21:4:21:13 | System.out |
 | TestTryCatch.java:21:23:21:31 | "Finally" | TestTryCatch.java:21:4:21:32 | println(...) |
-| TestTryCatch.java:22:4:22:12 | ...=... | TestTryCatch.java:4:14:4:14 | Exceptional Exit |
+| TestTryCatch.java:22:4:22:4 | y | TestTryCatch.java:22:8:22:8 | y |
 | TestTryCatch.java:22:4:22:12 | ...=... | TestTryCatch.java:4:14:4:14 | Normal Exit |
 | TestTryCatch.java:22:4:22:12 | ...=... | TestTryCatch.java:24:3:24:13 | var ...; |
-| TestTryCatch.java:22:4:22:13 | <Expr>; | TestTryCatch.java:22:8:22:8 | y |
+| TestTryCatch.java:22:4:22:13 | <Expr>; | TestTryCatch.java:22:4:22:4 | y |
 | TestTryCatch.java:22:8:22:8 | y | TestTryCatch.java:22:12:22:12 | 1 |
 | TestTryCatch.java:22:8:22:12 | ... + ... | TestTryCatch.java:22:4:22:12 | ...=... |
 | TestTryCatch.java:22:12:22:12 | 1 | TestTryCatch.java:22:8:22:12 | ... + ... |
 | TestTryCatch.java:24:3:24:13 | var ...; | TestTryCatch.java:24:11:24:12 | 12 |
 | TestTryCatch.java:24:7:24:12 | z | TestTryCatch.java:25:3:25:12 | <Expr>; |
 | TestTryCatch.java:24:11:24:12 | 12 | TestTryCatch.java:24:7:24:12 | z |
+| TestTryCatch.java:25:3:25:3 | z | TestTryCatch.java:25:7:25:7 | z |
 | TestTryCatch.java:25:3:25:11 | ...=... | TestTryCatch.java:27:3:27:30 | for (...;...;...) |
-| TestTryCatch.java:25:3:25:12 | <Expr>; | TestTryCatch.java:25:7:25:7 | z |
+| TestTryCatch.java:25:3:25:12 | <Expr>; | TestTryCatch.java:25:3:25:3 | z |
 | TestTryCatch.java:25:7:25:7 | z | TestTryCatch.java:25:11:25:11 | 1 |
 | TestTryCatch.java:25:7:25:11 | ... + ... | TestTryCatch.java:25:3:25:11 | ...=... |
 | TestTryCatch.java:25:11:25:11 | 1 | TestTryCatch.java:25:7:25:11 | ... + ... |
@@ -97,11 +99,13 @@
 | TestTryCatch.java:33:5:33:29 | println(...) | TestTryCatch.java:35:6:35:31 | catch (...) |
 | TestTryCatch.java:33:5:33:30 | <Expr>; | TestTryCatch.java:33:5:33:14 | System.out |
 | TestTryCatch.java:33:24:33:28 | "Bar" | TestTryCatch.java:33:5:33:29 | println(...) |
+| TestTryCatch.java:34:5:34:5 | y | TestTryCatch.java:34:9:34:9 | y |
 | TestTryCatch.java:34:5:34:13 | ...=... | TestTryCatch.java:27:27:27:27 | q |
-| TestTryCatch.java:34:5:34:14 | <Expr>; | TestTryCatch.java:34:9:34:9 | y |
+| TestTryCatch.java:34:5:34:14 | <Expr>; | TestTryCatch.java:34:5:34:5 | y |
 | TestTryCatch.java:34:9:34:9 | y | TestTryCatch.java:34:13:34:13 | 1 |
 | TestTryCatch.java:34:9:34:13 | ... + ... | TestTryCatch.java:34:5:34:13 | ...=... |
 | TestTryCatch.java:34:13:34:13 | 1 | TestTryCatch.java:34:9:34:13 | ... + ... |
+| TestTryCatch.java:35:6:35:31 | catch (...) | TestTryCatch.java:4:14:4:14 | Exceptional Exit |
 | TestTryCatch.java:35:6:35:31 | catch (...) | TestTryCatch.java:35:30:35:30 | e |
 | TestTryCatch.java:35:30:35:30 | e | TestTryCatch.java:36:4:40:4 | { ... } |
 | TestTryCatch.java:36:4:40:4 | { ... } | TestTryCatch.java:37:5:37:14 | var ...; |
@@ -114,13 +118,15 @@
 | TestTryCatch.java:38:24:38:32 | "Error: " | TestTryCatch.java:38:36:38:36 | e |
 | TestTryCatch.java:38:24:38:36 | ... + ... | TestTryCatch.java:38:5:38:37 | println(...) |
 | TestTryCatch.java:38:36:38:36 | e | TestTryCatch.java:38:24:38:36 | ... + ... |
+| TestTryCatch.java:39:5:39:5 | x | TestTryCatch.java:39:9:39:9 | x |
 | TestTryCatch.java:39:5:39:13 | ...=... | TestTryCatch.java:27:27:27:27 | q |
-| TestTryCatch.java:39:5:39:14 | <Expr>; | TestTryCatch.java:39:9:39:9 | x |
+| TestTryCatch.java:39:5:39:14 | <Expr>; | TestTryCatch.java:39:5:39:5 | x |
 | TestTryCatch.java:39:9:39:9 | x | TestTryCatch.java:39:13:39:13 | 1 |
 | TestTryCatch.java:39:9:39:13 | ... + ... | TestTryCatch.java:39:5:39:13 | ...=... |
 | TestTryCatch.java:39:13:39:13 | 1 | TestTryCatch.java:39:9:39:13 | ... + ... |
+| TestTryCatch.java:42:3:42:3 | z | TestTryCatch.java:42:7:42:7 | z |
 | TestTryCatch.java:42:3:42:11 | ...=... | TestTryCatch.java:4:14:4:14 | Normal Exit |
-| TestTryCatch.java:42:3:42:12 | <Expr>; | TestTryCatch.java:42:7:42:7 | z |
+| TestTryCatch.java:42:3:42:12 | <Expr>; | TestTryCatch.java:42:3:42:3 | z |
 | TestTryCatch.java:42:7:42:7 | z | TestTryCatch.java:42:11:42:11 | 2 |
 | TestTryCatch.java:42:7:42:11 | ... + ... | TestTryCatch.java:42:3:42:11 | ...=... |
 | TestTryCatch.java:42:11:42:11 | 2 | TestTryCatch.java:42:7:42:11 | ... + ... |
diff --git a/java/ql/test/library-tests/successors/TestTryCatch/TestSucc.ql b/java/ql/test/library-tests/successors/TestTryCatch/TestSucc.ql
index 6fca436fbfd..68c50a85c58 100644
--- a/java/ql/test/library-tests/successors/TestTryCatch/TestSucc.ql
+++ b/java/ql/test/library-tests/successors/TestTryCatch/TestSucc.ql
@@ -1,8 +1,9 @@
 import java
+import utils.test.AstCfg
 
 from ControlFlowNode n, ControlFlowNode succ
 where
-  succ = n.getASuccessor() and
+  succ = getAnAstSuccessor(n) and
   n.getLocation().getFile().getExtension() = "java" and
   not n.getLocation().getFile().getStem() = "PopulateRuntimeException"
 select n, succ
diff --git a/java/ql/test/library-tests/successors/TestTryWithResources/FalseSuccessors.expected b/java/ql/test/library-tests/successors/TestTryWithResources/FalseSuccessors.expected
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/java/ql/test/library-tests/successors/TestTryWithResources/FalseSuccessors.ql b/java/ql/test/library-tests/successors/TestTryWithResources/FalseSuccessors.ql
deleted file mode 100644
index aee4021bee6..00000000000
--- a/java/ql/test/library-tests/successors/TestTryWithResources/FalseSuccessors.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import java
-
-from ConditionNode c
-select c, c.getAFalseSuccessor()
diff --git a/java/ql/test/library-tests/successors/TestTryWithResources/TestSucc.expected b/java/ql/test/library-tests/successors/TestTryWithResources/TestSucc.expected
index 09a31ac70bd..e9dabd746f1 100644
--- a/java/ql/test/library-tests/successors/TestTryWithResources/TestSucc.expected
+++ b/java/ql/test/library-tests/successors/TestTryWithResources/TestSucc.expected
@@ -1,7 +1,8 @@
-| TestTryWithResources.java:6:14:6:33 | Exceptional Exit | TestTryWithResources.java:6:14:6:33 | Exit |
+| TestTryWithResources.java:6:14:6:33 | Entry | TestTryWithResources.java:6:14:6:33 | { ... } |
 | TestTryWithResources.java:6:14:6:33 | Normal Exit | TestTryWithResources.java:6:14:6:33 | Exit |
 | TestTryWithResources.java:6:14:6:33 | super(...) | TestTryWithResources.java:6:14:6:33 | Normal Exit |
 | TestTryWithResources.java:6:14:6:33 | { ... } | TestTryWithResources.java:6:14:6:33 | super(...) |
+| TestTryWithResources.java:7:21:7:24 | Entry | TestTryWithResources.java:7:60:16:2 | { ... } |
 | TestTryWithResources.java:7:21:7:24 | Exceptional Exit | TestTryWithResources.java:7:21:7:24 | Exit |
 | TestTryWithResources.java:7:21:7:24 | Normal Exit | TestTryWithResources.java:7:21:7:24 | Exit |
 | TestTryWithResources.java:7:60:16:2 | { ... } | TestTryWithResources.java:8:3:15:3 | try ... |
@@ -10,7 +11,6 @@
 | TestTryWithResources.java:8:24:8:57 | fis | TestTryWithResources.java:9:4:9:55 | var ...; |
 | TestTryWithResources.java:8:30:8:57 | new FileInputStream(...) | TestTryWithResources.java:8:24:8:57 | fis |
 | TestTryWithResources.java:8:30:8:57 | new FileInputStream(...) | TestTryWithResources.java:11:5:11:35 | catch (...) |
-| TestTryWithResources.java:8:30:8:57 | new FileInputStream(...) | TestTryWithResources.java:13:13:15:3 | { ... } |
 | TestTryWithResources.java:8:50:8:53 | args | TestTryWithResources.java:8:55:8:55 | 0 |
 | TestTryWithResources.java:8:50:8:56 | ...[...] | TestTryWithResources.java:8:30:8:57 | new FileInputStream(...) |
 | TestTryWithResources.java:8:55:8:55 | 0 | TestTryWithResources.java:8:50:8:56 | ...[...] |
@@ -18,16 +18,17 @@
 | TestTryWithResources.java:9:21:9:55 | fos | TestTryWithResources.java:9:58:11:3 | { ... } |
 | TestTryWithResources.java:9:27:9:55 | new FileOutputStream(...) | TestTryWithResources.java:9:21:9:55 | fos |
 | TestTryWithResources.java:9:27:9:55 | new FileOutputStream(...) | TestTryWithResources.java:11:5:11:35 | catch (...) |
-| TestTryWithResources.java:9:27:9:55 | new FileOutputStream(...) | TestTryWithResources.java:13:13:15:3 | { ... } |
 | TestTryWithResources.java:9:48:9:51 | args | TestTryWithResources.java:9:53:9:53 | 1 |
 | TestTryWithResources.java:9:48:9:54 | ...[...] | TestTryWithResources.java:9:27:9:55 | new FileOutputStream(...) |
 | TestTryWithResources.java:9:53:9:53 | 1 | TestTryWithResources.java:9:48:9:54 | ...[...] |
 | TestTryWithResources.java:9:58:11:3 | { ... } | TestTryWithResources.java:10:4:10:32 | <Expr>; |
 | TestTryWithResources.java:10:4:10:13 | System.out | TestTryWithResources.java:10:23:10:30 | "worked" |
+| TestTryWithResources.java:10:4:10:31 | println(...) | TestTryWithResources.java:11:5:11:35 | catch (...) |
 | TestTryWithResources.java:10:4:10:31 | println(...) | TestTryWithResources.java:13:13:15:3 | { ... } |
 | TestTryWithResources.java:10:4:10:32 | <Expr>; | TestTryWithResources.java:10:4:10:13 | System.out |
 | TestTryWithResources.java:10:23:10:30 | "worked" | TestTryWithResources.java:10:4:10:31 | println(...) |
 | TestTryWithResources.java:11:5:11:35 | catch (...) | TestTryWithResources.java:11:34:11:34 | e |
+| TestTryWithResources.java:11:5:11:35 | catch (...) | TestTryWithResources.java:13:13:15:3 | { ... } |
 | TestTryWithResources.java:11:34:11:34 | e | TestTryWithResources.java:11:37:13:3 | { ... } |
 | TestTryWithResources.java:11:37:13:3 | { ... } | TestTryWithResources.java:12:4:12:40 | <Expr>; |
 | TestTryWithResources.java:12:4:12:13 | System.out | TestTryWithResources.java:12:23:12:38 | "file not found" |
diff --git a/java/ql/test/library-tests/successors/TestTryWithResources/TestSucc.ql b/java/ql/test/library-tests/successors/TestTryWithResources/TestSucc.ql
index 6fca436fbfd..68c50a85c58 100644
--- a/java/ql/test/library-tests/successors/TestTryWithResources/TestSucc.ql
+++ b/java/ql/test/library-tests/successors/TestTryWithResources/TestSucc.ql
@@ -1,8 +1,9 @@
 import java
+import utils.test.AstCfg
 
 from ControlFlowNode n, ControlFlowNode succ
 where
-  succ = n.getASuccessor() and
+  succ = getAnAstSuccessor(n) and
   n.getLocation().getFile().getExtension() = "java" and
   not n.getLocation().getFile().getStem() = "PopulateRuntimeException"
 select n, succ
diff --git a/java/ql/test/library-tests/switch-default-impossible-dispatch/Test.java b/java/ql/test/library-tests/switch-default-impossible-dispatch/Test.java
index 9e0a0443131..7c00a71021e 100644
--- a/java/ql/test/library-tests/switch-default-impossible-dispatch/Test.java
+++ b/java/ql/test/library-tests/switch-default-impossible-dispatch/Test.java
@@ -25,7 +25,7 @@ public class Test {
 
     switch(i) {
       case C1 c1 -> { }
-      case null, default -> i.take(source()); // Can't call C1.take (but we don't currently notice)
+      case null, default -> i.take(source()); // Can't call C1.take
     }
 
     switch(i) {
@@ -55,7 +55,7 @@ public class Test {
 
     switch(i) {
       case C1 c1: break;
-      case null: default: i.take(source()); // Can't call C1.take (but we don't currently notice)
+      case null: default: i.take(source()); // Can't call C1.take
     }
 
     switch(i) {
diff --git a/java/ql/test/library-tests/switch-default-impossible-dispatch/test.expected b/java/ql/test/library-tests/switch-default-impossible-dispatch/test.expected
index 14329ea1089..f95dc4ee946 100644
--- a/java/ql/test/library-tests/switch-default-impossible-dispatch/test.expected
+++ b/java/ql/test/library-tests/switch-default-impossible-dispatch/test.expected
@@ -5,7 +5,6 @@
 | Test.java:23:25:23:32 | source(...) | Test.java:8:65:8:65 | x |
 | Test.java:23:25:23:32 | source(...) | Test.java:9:74:9:74 | x |
 | Test.java:23:25:23:32 | source(...) | Test.java:10:82:10:82 | x |
-| Test.java:28:36:28:43 | source(...) | Test.java:7:65:7:65 | x |
 | Test.java:28:36:28:43 | source(...) | Test.java:8:65:8:65 | x |
 | Test.java:28:36:28:43 | source(...) | Test.java:9:74:9:74 | x |
 | Test.java:28:36:28:43 | source(...) | Test.java:10:82:10:82 | x |
@@ -26,7 +25,6 @@
 | Test.java:53:25:53:32 | source(...) | Test.java:8:65:8:65 | x |
 | Test.java:53:25:53:32 | source(...) | Test.java:9:74:9:74 | x |
 | Test.java:53:25:53:32 | source(...) | Test.java:10:82:10:82 | x |
-| Test.java:58:34:58:41 | source(...) | Test.java:7:65:7:65 | x |
 | Test.java:58:34:58:41 | source(...) | Test.java:8:65:8:65 | x |
 | Test.java:58:34:58:41 | source(...) | Test.java:9:74:9:74 | x |
 | Test.java:58:34:58:41 | source(...) | Test.java:10:82:10:82 | x |
diff --git a/java/ql/test/query-tests/Escaping/Escaping.java b/java/ql/test/query-tests/Escaping/Escaping.java
index 9d3b568369a..9896177103d 100644
--- a/java/ql/test/query-tests/Escaping/Escaping.java
+++ b/java/ql/test/query-tests/Escaping/Escaping.java
@@ -1,12 +1,12 @@
 @ThreadSafe
 public class Escaping {
-  int x;  //$ Alert
-  public int y = 0;  //$ Alert
+  int x;  // $ Alert
+  public int y = 0;  // $ Alert
   private int z = 3;
   final int w = 0;
   public final int u = 4;
   private final long a = 5;
-  protected long b = 0;  //$ Alert
+  protected long b = 0;  // $ Alert
   protected final long c = 0L;
   volatile long d = 3;
   protected volatile long e = 3L;
@@ -14,4 +14,4 @@ public class Escaping {
   public void methodLocal() {
     int i;
   }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/query-tests/Nullness/B.java b/java/ql/test/query-tests/Nullness/B.java
index 1234b53d59b..5759df2d236 100644
--- a/java/ql/test/query-tests/Nullness/B.java
+++ b/java/ql/test/query-tests/Nullness/B.java
@@ -534,7 +534,7 @@ public class B {
       s1.hashCode(); // OK
       s2.hashCode(); // NPE
     }
-    s1.hashCode(); // NPE - false negative, Java CFG lacks proper edge label
+    s1.hashCode(); // NPE
   }
 
   public void lenCheck(int[] xs, int n, int t) {
@@ -557,4 +557,23 @@ public class B {
     if (n > 100) s.hashCode(); // OK
     if (n == 42) s.hashCode(); // OK
   }
+
+  public void testFinally2(int[] xs) {
+    String s = null;
+    int i = 0;
+    while (true) {
+      try {
+        int x = xs[i++];
+        if (x == 0) {
+          s = "foo";
+          break;
+        } else if (x == 1) {
+          continue;
+        }
+      } finally {
+      }
+    }
+    s.hashCode(); // Spurious NPE - false positive
+    // CFG reachability does not distinguish abrupt successors
+  }
 }
diff --git a/java/ql/test/query-tests/Nullness/NullMaybe.expected b/java/ql/test/query-tests/Nullness/NullMaybe.expected
index 89209bd3a71..a9a3dd4913c 100644
--- a/java/ql/test/query-tests/Nullness/NullMaybe.expected
+++ b/java/ql/test/query-tests/Nullness/NullMaybe.expected
@@ -26,6 +26,8 @@
 | 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 |
 | B.java:535:7:535:8 | s2 | Variable $@ may be null at this access because of $@ assignment. | B.java:523:5:523:21 | String s2 | s2 | B.java:523:12:523:20 | s2 | this |
+| B.java:537:5:537:6 | s1 | Variable $@ may be null at this access because of $@ assignment. | B.java:522:5:522:21 | String s1 | s1 | B.java:522:12:522:20 | s1 | this |
+| B.java:576:5:576:5 | s | Variable $@ may be null at this access because of $@ assignment. | B.java:562:5:562:20 | String s | s | B.java:562:12:562:19 | s | 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/SafePublication/SafePublication.java b/java/ql/test/query-tests/SafePublication/SafePublication.java
index 9c1d031987b..c92a816de80 100644
--- a/java/ql/test/query-tests/SafePublication/SafePublication.java
+++ b/java/ql/test/query-tests/SafePublication/SafePublication.java
@@ -2,19 +2,19 @@
 public class SafePublication {
     int x;
     int y = 0;
-    int z = 3;   //$ Alert
-    int w;       //$ Alert
-    int u;       //$ Alert
+    int z = 3;   // $ Alert
+    int w;       // $ Alert
+    int u;       // $ Alert
     long a;
     long b = 0;
     long c = 0L;
-    long d = 3;  //$ Alert
-    long e = 3L; //$ Alert
+    long d = 3;  // $ Alert
+    long e = 3L; // $ Alert
 
-    int[] arr = new int[3]; //$ Alert
+    int[] arr = new int[3]; // $ Alert
     float f = 0.0f;
     double dd = 00.0d;
-    char cc = 'a';  //$ Alert
+    char cc = 'a';  // $ Alert
     char ok = '\u0000';
 
  public SafePublication(int a) {
@@ -26,4 +26,4 @@ public class SafePublication {
   public void methodLocal() {
     int i;
   }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/query-tests/StringComparison/StringComparison.expected b/java/ql/test/query-tests/StringComparison/StringComparison.expected
index 566244cc8f0..485fc58ed8a 100644
--- a/java/ql/test/query-tests/StringComparison/StringComparison.expected
+++ b/java/ql/test/query-tests/StringComparison/StringComparison.expected
@@ -1,3 +1,3 @@
-| StringComparison.java:23:6:23:19 | ... == ... | String values compared with  == . |
-| StringComparison.java:26:6:26:16 | ... == ... | String values compared with  == . |
-| StringComparison.java:29:6:29:20 | ... == ... | String values compared with  == . |
\ No newline at end of file
+| StringComparison.java:23:6:23:19 | ... == ... | String values compared with ==. |
+| StringComparison.java:26:6:26:16 | ... == ... | String values compared with ==. |
+| StringComparison.java:29:6:29:20 | ... == ... | String values compared with ==. |
diff --git a/java/ql/test/query-tests/ThreadSafe/examples/Test3Super.java b/java/ql/test/query-tests/ThreadSafe/examples/Test3Super.java
index 5a48e20bc05..66327937801 100644
--- a/java/ql/test/query-tests/ThreadSafe/examples/Test3Super.java
+++ b/java/ql/test/query-tests/ThreadSafe/examples/Test3Super.java
@@ -8,10 +8,10 @@ public class Test3Super extends Test2 {  // We might want an alert here for the
   }
 
   public void y() {
-    super.x = 0;  //$ MISSING: Alert
+    super.x = 0;  // $ MISSING: Alert
   }
 
   public void yLst() {
-    super.lst.add("Hello!");  //$ MISSING: Alert
+    super.lst.add("Hello!");  // $ MISSING: Alert
   }
 }
diff --git a/java/ql/test/query-tests/UselessComparisonTest/UselessComparisonTest.expected b/java/ql/test/query-tests/UselessComparisonTest/UselessComparisonTest.expected
index 3737786aeb6..d0520384671 100644
--- a/java/ql/test/query-tests/UselessComparisonTest/UselessComparisonTest.expected
+++ b/java/ql/test/query-tests/UselessComparisonTest/UselessComparisonTest.expected
@@ -10,7 +10,6 @@
 | A.java:55:9:55:14 | ... <= ... | Test is always false, because of $@. | A.java:48:16:48:21 | ... > ... | this condition |
 | A.java:58:11:58:15 | ... < ... | Test is always false, because of $@. | A.java:57:12:57:20 | ... > ... | this condition |
 | A.java:60:9:60:15 | ... != ... | Test is always false, because of $@. | A.java:57:12:57:20 | ... > ... | this condition |
-| A.java:60:9:60:15 | ... != ... | Test is always false, because of $@. | A.java:58:11:58:15 | ... < ... | this condition |
 | A.java:65:11:65:16 | ... != ... | Test is always false, because of $@. | A.java:64:19:64:23 | ... > ... | this condition |
 | A.java:76:11:76:16 | ... >= ... | Test is always false, because of $@. | A.java:74:13:74:18 | ... >= ... | this condition |
 | A.java:84:21:84:30 | ... < ... | Test is always false, because of $@. | A.java:80:12:80:21 | ... > ... | this condition |
diff --git a/java/ql/test/query-tests/security/CWE-078/TaintedEnvironment.java b/java/ql/test/query-tests/security/CWE-078/TaintedEnvironment.java
index df4812eed2c..cb3ecb3b050 100644
--- a/java/ql/test/query-tests/security/CWE-078/TaintedEnvironment.java
+++ b/java/ql/test/query-tests/security/CWE-078/TaintedEnvironment.java
@@ -11,24 +11,24 @@ public class TaintedEnvironment {
         String s = (String) source();
         ProcessBuilder pb = new ProcessBuilder();
 
-        pb.environment().put("foo", s); // $hasTaintFlow
+        pb.environment().put("foo", s); // $ hasTaintFlow
 
-        pb.environment().put(s, "foo"); // $hasTaintFlow
+        pb.environment().put(s, "foo"); // $ hasTaintFlow
 
         Map<String, String> extra = Map.of("USER", s);
 
-        pb.environment().putAll(extra); // $hasTaintFlow
+        pb.environment().putAll(extra); // $ hasTaintFlow
 
-        pb.environment().putIfAbsent("foo", s); // $hasTaintFlow
-        pb.environment().putIfAbsent(s, "foo"); // $hasTaintFlow
+        pb.environment().putIfAbsent("foo", s); // $ hasTaintFlow
+        pb.environment().putIfAbsent(s, "foo"); // $ hasTaintFlow
 
-        pb.environment().replace("foo", s); // $hasTaintFlow
-        pb.environment().replace(s, "foo"); // $hasTaintFlow
-        pb.environment().replace("foo", "bar", s); // $hasTaintFlow
+        pb.environment().replace("foo", s); // $ hasTaintFlow
+        pb.environment().replace(s, "foo"); // $ hasTaintFlow
+        pb.environment().replace("foo", "bar", s); // $ hasTaintFlow
 
         Map<String, String> env = pb.environment();
 
-        env.put("foo", s); // $hasTaintFlow
+        env.put("foo", s); // $ hasTaintFlow
 
         pb.start();
     }
@@ -36,6 +36,6 @@ public class TaintedEnvironment {
     public void exec() throws java.io.IOException {
         String kv = (String) source();
 
-        Runtime.getRuntime().exec(new String[] { "ls" }, new String[] { kv }); // $hasTaintFlow
+        Runtime.getRuntime().exec(new String[] { "ls" }, new String[] { kv }); // $ hasTaintFlow
     }
 }
diff --git a/java/ql/test/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.java b/java/ql/test/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.java
index 91f8f3ad4ce..0d06462549e 100644
--- a/java/ql/test/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.java
+++ b/java/ql/test/query-tests/security/CWE-1004/SensitiveCookieNotHttpOnly.java
@@ -21,14 +21,14 @@ class SensitiveCookieNotHttpOnly {
 
     // BAD - Tests adding a sensitive cookie without the `HttpOnly` flag set.
     public void addCookie2(String jwt_token, String userId, HttpServletRequest request, HttpServletResponse response) {
-        String tokenCookieStr = "jwt_token"; // $Source
+        String tokenCookieStr = "jwt_token"; // $ Source
         Cookie jwtCookie = new Cookie(tokenCookieStr, jwt_token);
         Cookie userIdCookie = new Cookie("user_id", userId);
         jwtCookie.setPath("/");
         userIdCookie.setPath("/");
         jwtCookie.setMaxAge(3600*24*7);
         userIdCookie.setMaxAge(3600*24*7);
-        response.addCookie(jwtCookie); // $Alert
+        response.addCookie(jwtCookie); // $ Alert
         response.addCookie(userIdCookie);
     }
 
@@ -39,9 +39,9 @@ class SensitiveCookieNotHttpOnly {
 
     // BAD - Tests set a sensitive cookie header without the `HttpOnly` flag set.
     public void addCookie4(String authId, HttpServletRequest request, HttpServletResponse response) {
-        response.addHeader("Set-Cookie", "token=" +authId + ";Secure"); // $Alert
+        response.addHeader("Set-Cookie", "token=" +authId + ";Secure"); // $ Alert
     }
-    
+
     // GOOD - Tests set a sensitive cookie header using the class `javax.ws.rs.core.Cookie` with the `HttpOnly` flag set through string concatenation.
     public void addCookie5(String accessKey, HttpServletRequest request, HttpServletResponse response) {
         response.setHeader("Set-Cookie", new NewCookie("session-access-key", accessKey, "/", null, null, 0, true) + ";HttpOnly");
@@ -49,7 +49,7 @@ class SensitiveCookieNotHttpOnly {
 
     // BAD - Tests set a sensitive cookie header using the class `javax.ws.rs.core.Cookie` without the `HttpOnly` flag set.
     public void addCookie6(String accessKey, HttpServletRequest request, HttpServletResponse response) {
-        response.setHeader("Set-Cookie", new NewCookie("session-access-key", accessKey, "/", null, null, 0, true).toString()); // $Alert
+        response.setHeader("Set-Cookie", new NewCookie("session-access-key", accessKey, "/", null, null, 0, true).toString()); // $ Alert
     }
 
     // GOOD - Tests set a sensitive cookie header using the class `javax.ws.rs.core.Cookie` with the `HttpOnly` flag set through the constructor.
@@ -60,15 +60,15 @@ class SensitiveCookieNotHttpOnly {
 
     // BAD - Tests set a sensitive cookie header using the class `javax.ws.rs.core.Cookie` without the `HttpOnly` flag set.
     public void addCookie8(String accessKey, HttpServletRequest request, HttpServletResponse response) {
-        NewCookie accessKeyCookie = new NewCookie("session-access-key", accessKey, "/", null, 0, null, 86400, true);  // $Source
+        NewCookie accessKeyCookie = new NewCookie("session-access-key", accessKey, "/", null, 0, null, 86400, true);  // $ Source
         String keyStr = accessKeyCookie.toString();
-        response.setHeader("Set-Cookie", keyStr); // $Alert
+        response.setHeader("Set-Cookie", keyStr); // $ Alert
     }
 
     // BAD - Tests set a sensitive cookie header using a variable without the `HttpOnly` flag set.
     public void addCookie9(String authId, HttpServletRequest request, HttpServletResponse response) {
-        String secString = "token=" +authId + ";Secure";  // $Source
-        response.addHeader("Set-Cookie", secString); // $Alert
+        String secString = "token=" +authId + ";Secure";  // $ Source
+        response.addHeader("Set-Cookie", secString); // $ Alert
     }
 
     // GOOD - Tests set a sensitive cookie header with the `HttpOnly` flag set using `String.format(...)`.
@@ -85,7 +85,7 @@ class SensitiveCookieNotHttpOnly {
     }
 
     public Cookie createAuthenticationCookie(HttpServletRequest request, String jwt) {
-        String PRESTO_UI_COOKIE = "Presto-UI-Token"; // $Source
+        String PRESTO_UI_COOKIE = "Presto-UI-Token"; // $ Source
         Cookie cookie = new Cookie(PRESTO_UI_COOKIE, jwt);
         cookie.setPath("/ui");
         return cookie;
@@ -108,7 +108,7 @@ class SensitiveCookieNotHttpOnly {
     // BAD - Tests set a sensitive cookie header without the `HttpOnly` flag set using a wrapper method.
     public void addCookie12(HttpServletRequest request, HttpServletResponse response, String jwt) {
         Cookie cookie = createAuthenticationCookie(request, jwt);
-        response.addCookie(cookie); // $Alert
+        response.addCookie(cookie); // $ Alert
     }
 
     // GOOD - Tests remove a sensitive cookie header without the `HttpOnly` flag set using a wrapper method.
@@ -141,14 +141,14 @@ class SensitiveCookieNotHttpOnly {
     // This example is missed because the `cookie.setHttpOnly` call in `createCookie` is thought to maybe set the HTTP-only flag, and the `cookie`
     // object flows to this `addCookie` call.
     public void addCookie15(HttpServletRequest request, HttpServletResponse response, String refreshToken) {
-        response.addCookie(createCookie("refresh_token", refreshToken, false)); // $MISSING:Alert
+        response.addCookie(createCookie("refresh_token", refreshToken, false)); // $ MISSING:Alert
     }
 
     // GOOD - CSRF token doesn't need to have the `HttpOnly` flag set.
     public void addCsrfCookie(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         // Spring put the CSRF token in session attribute "_csrf"
         CsrfToken csrfToken = (CsrfToken) request.getAttribute("_csrf");
-    
+
         // Send the cookie only if the token has changed
         String actualToken = request.getHeader("X-CSRF-TOKEN");
         if (actualToken == null || !actualToken.equals(csrfToken.getToken())) {
diff --git a/java/ql/test/query-tests/security/CWE-1204/StaticInitializationVector.java b/java/ql/test/query-tests/security/CWE-1204/StaticInitializationVector.java
index 4da986c4a3d..b7b25906645 100644
--- a/java/ql/test/query-tests/security/CWE-1204/StaticInitializationVector.java
+++ b/java/ql/test/query-tests/security/CWE-1204/StaticInitializationVector.java
@@ -10,33 +10,33 @@ public class StaticInitializationVector {
 
     // BAD: AES-GCM with static IV from a byte array
     public byte[] encryptWithStaticIvByteArrayWithInitializer(byte[] key, byte[] plaintext) throws Exception {
-        byte[] iv = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5 }; // $Source
+        byte[] iv = new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5 }; // $ Source
 
         GCMParameterSpec ivSpec = new GCMParameterSpec(128, iv);
         SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
 
         Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
-        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $Alert
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $ Alert
         cipher.update(plaintext);
         return cipher.doFinal();
     }
 
     // BAD: AES-GCM with static IV from zero-initialized byte array
     public byte[] encryptWithZeroStaticIvByteArray(byte[] key, byte[] plaintext) throws Exception {
-        byte[] iv = new byte[16]; // $Source
+        byte[] iv = new byte[16]; // $ Source
 
         GCMParameterSpec ivSpec = new GCMParameterSpec(128, iv);
         SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
 
         Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
-        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $Alert
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $ Alert
         cipher.update(plaintext);
         return cipher.doFinal();
     }
 
     // BAD: AES-CBC with static IV from zero-initialized byte array
     public byte[] encryptWithStaticIvByteArray(byte[] key, byte[] plaintext) throws Exception {
-        byte[] iv = new byte[16]; // $Source
+        byte[] iv = new byte[16]; // $ Source
         for (byte i = 0; i < iv.length; i++) {
             iv[i] = 1;
         }
@@ -45,7 +45,7 @@ public class StaticInitializationVector {
         SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
 
         Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING");
-        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $Alert
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $ Alert
         cipher.update(plaintext);
         return cipher.doFinal();
     }
@@ -55,13 +55,13 @@ public class StaticInitializationVector {
         byte[][] staticIvs = new byte[][] {
             { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5 },
             { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 42 }
-        }; // $Source
+        }; // $ Source
 
         GCMParameterSpec ivSpec = new GCMParameterSpec(128, staticIvs[1]);
         SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
 
         Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
-        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $Alert
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $ Alert
         cipher.update(plaintext);
         return cipher.doFinal();
     }
@@ -71,13 +71,13 @@ public class StaticInitializationVector {
         byte[][] staticIvs = new byte[][] {
             new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5 },
             new byte[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 42 }
-        }; // $Source
+        }; // $ Source
 
         GCMParameterSpec ivSpec = new GCMParameterSpec(128, staticIvs[1]);
         SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
 
         Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
-        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $Alert
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $ Alert
         cipher.update(plaintext);
         return cipher.doFinal();
     }
@@ -85,15 +85,15 @@ public class StaticInitializationVector {
     // BAD: AES-GCM with static IV from a multidimensional byte array
     public byte[] encryptWithOneOfStaticZeroIvs(byte[] key, byte[] plaintext) throws Exception {
         byte[][] ivs = new byte[][] {
-            new byte[8], // $Source
-            new byte[16] // $Source
+            new byte[8], // $ Source
+            new byte[16] // $ Source
         };
 
         GCMParameterSpec ivSpec = new GCMParameterSpec(128, ivs[1]);
         SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
 
         Cipher cipher = Cipher.getInstance("AES/GCM/PKCS5PADDING");
-        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $Alert
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); // $ Alert
         cipher.update(plaintext);
         return cipher.doFinal();
     }
@@ -165,8 +165,8 @@ public class StaticInitializationVector {
         return cipher.doFinal();
     }
 
-    public byte[] generate(int size) throws Exception { 
-        if (size == 0) { 
+    public byte[] generate(int size) throws Exception {
+        if (size == 0) {
             return new byte[0];
         }
         byte[] randomBytes = new byte[size];
@@ -182,7 +182,7 @@ public class StaticInitializationVector {
         SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
 
         Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING");
-        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec); 
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, ivSpec);
         cipher.update(plaintext);
         return cipher.doFinal();
     }
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveNotification/Test.java b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveNotification/Test.java
index e5300f671e7..d6f55ad2ea5 100644
--- a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveNotification/Test.java
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveNotification/Test.java
@@ -8,122 +8,122 @@ import android.widget.RemoteViews;
 class Test extends Activity {
     void test(String password) {
         Notification.Builder builder = new Notification.Builder(this, "");
-        builder.setContentText(password); // $sensitive-notification
-        builder.setContentTitle(password); // $sensitive-notification
-        builder.setContentInfo(password); // $sensitive-notification
+        builder.setContentText(password); // $ sensitive-notification
+        builder.setContentTitle(password); // $ sensitive-notification
+        builder.setContentInfo(password); // $ sensitive-notification
 
         Intent intent = new Intent();
         intent.putExtra("a", password);
 
-        builder.addExtras(intent.getExtras()); // $sensitive-notification
-        builder.setCategory(password); // $sensitive-notification
-        builder.setChannelId(password); // $sensitive-notification
-        builder.setGroup(password); // $sensitive-notification
-        builder.setExtras(intent.getExtras()); // $sensitive-notification
-        builder.setGroup(password); // $sensitive-notification
-        builder.setSortKey(password); // $sensitive-notification
-        builder.setSettingsText(password); // $sensitive-notification
-        builder.setRemoteInputHistory(new CharSequence[] { password }); // $sensitive-notification
-        builder.setTicker(password); // $sensitive-notification
-        builder.setTicker(password, null); // $sensitive-notification
+        builder.addExtras(intent.getExtras()); // $ sensitive-notification
+        builder.setCategory(password); // $ sensitive-notification
+        builder.setChannelId(password); // $ sensitive-notification
+        builder.setGroup(password); // $ sensitive-notification
+        builder.setExtras(intent.getExtras()); // $ sensitive-notification
+        builder.setGroup(password); // $ sensitive-notification
+        builder.setSortKey(password); // $ sensitive-notification
+        builder.setSettingsText(password); // $ sensitive-notification
+        builder.setRemoteInputHistory(new CharSequence[] { password }); // $ sensitive-notification
+        builder.setTicker(password); // $ sensitive-notification
+        builder.setTicker(password, null); // $ sensitive-notification
 
         builder.setStyle(new Notification.BigPictureStyle()
-            .setContentDescription(password) // $sensitive-notification
-            .setSummaryText(password) // $sensitive-notification
-            .setBigContentTitle(password)); // $sensitive-notification
+            .setContentDescription(password) // $ sensitive-notification
+            .setSummaryText(password) // $ sensitive-notification
+            .setBigContentTitle(password)); // $ sensitive-notification
         builder.setStyle(new Notification.BigTextStyle()
-            .bigText(password) // $sensitive-notification
-            .setSummaryText(password) // $sensitive-notification
-            .setBigContentTitle(password)); // $sensitive-notification
+            .bigText(password) // $ sensitive-notification
+            .setSummaryText(password) // $ sensitive-notification
+            .setBigContentTitle(password)); // $ sensitive-notification
         builder.setStyle(new Notification.InboxStyle()
-            .addLine(password) // $sensitive-notification
-            .setBigContentTitle(password) // $sensitive-notification
-            .setSummaryText(password)); // $sensitive-notification
+            .addLine(password) // $ sensitive-notification
+            .setBigContentTitle(password) // $ sensitive-notification
+            .setSummaryText(password)); // $ sensitive-notification
         builder.setStyle(new Notification.MediaStyle()
-            .setRemotePlaybackInfo(password, 0, null)); // $sensitive-notification
-        builder.setStyle( 
-                new Notification.MessagingStyle(password) // $sensitive-notification
-                    .setConversationTitle(password) // $sensitive-notification
-                    .addMessage(password, 0, "") // $sensitive-notification
-                    .addMessage(password, 0, (android.app.Person)null) // $sensitive-notification
-                    .addMessage("", 0, password) // $sensitive-notification
-                    .addMessage(new Notification.MessagingStyle.Message(password, 0, "")) // $sensitive-notification
-                    .addMessage(new Notification.MessagingStyle.Message(password, 0, (android.app.Person)null)) // $sensitive-notification
-                    .addMessage(new Notification.MessagingStyle.Message("", 0, password)) // $sensitive-notification
+            .setRemotePlaybackInfo(password, 0, null)); // $ sensitive-notification
+        builder.setStyle(
+                new Notification.MessagingStyle(password) // $ sensitive-notification
+                    .setConversationTitle(password) // $ sensitive-notification
+                    .addMessage(password, 0, "") // $ sensitive-notification
+                    .addMessage(password, 0, (android.app.Person)null) // $ sensitive-notification
+                    .addMessage("", 0, password) // $ sensitive-notification
+                    .addMessage(new Notification.MessagingStyle.Message(password, 0, "")) // $ sensitive-notification
+                    .addMessage(new Notification.MessagingStyle.Message(password, 0, (android.app.Person)null)) // $ sensitive-notification
+                    .addMessage(new Notification.MessagingStyle.Message("", 0, password)) // $ sensitive-notification
                 );
 
-        builder.addAction(0, password, null); // $sensitive-notification
-        builder.addAction(new Notification.Action(0, password, null)); // $sensitive-notification
-        builder.addAction(new Notification.Action.Builder(0, password, null) // $sensitive-notification
-            .addExtras(intent.getExtras()) // $sensitive-notification
+        builder.addAction(0, password, null); // $ sensitive-notification
+        builder.addAction(new Notification.Action(0, password, null)); // $ sensitive-notification
+        builder.addAction(new Notification.Action.Builder(0, password, null) // $ sensitive-notification
+            .addExtras(intent.getExtras()) // $ sensitive-notification
             .build());
-        builder.addAction(new Notification.Action.Builder(null, password, null).build()); // $sensitive-notification
+        builder.addAction(new Notification.Action.Builder(null, password, null).build()); // $ sensitive-notification
 
-        builder.setStyle(Notification.CallStyle.forScreeningCall(null, null, null) 
-            .setVerificationText(password)); // $sensitive-notification
+        builder.setStyle(Notification.CallStyle.forScreeningCall(null, null, null)
+            .setVerificationText(password)); // $ sensitive-notification
     }
 
     void test2(RemoteViews passwordView) {
         Notification.Builder builder = new Notification.Builder(this, "");
-        builder.setContent(passwordView); // $sensitive-notification
-        builder.setCustomBigContentView(passwordView); // $sensitive-notification
-        builder.setCustomContentView(passwordView); // $sensitive-notification
-        builder.setCustomHeadsUpContentView(passwordView); // $sensitive-notification
-        builder.setTicker("", passwordView); // $sensitive-notification
+        builder.setContent(passwordView); // $ sensitive-notification
+        builder.setCustomBigContentView(passwordView); // $ sensitive-notification
+        builder.setCustomContentView(passwordView); // $ sensitive-notification
+        builder.setCustomHeadsUpContentView(passwordView); // $ sensitive-notification
+        builder.setTicker("", passwordView); // $ sensitive-notification
     }
 
     void test3(String password) {
         NotificationCompat.Builder builder = new NotificationCompat.Builder(this, "");
-        builder.setContentText(password); // $sensitive-notification
-        builder.setContentTitle(password); // $sensitive-notification
-        builder.setContentInfo(password); // $sensitive-notification
+        builder.setContentText(password); // $ sensitive-notification
+        builder.setContentTitle(password); // $ sensitive-notification
+        builder.setContentInfo(password); // $ sensitive-notification
 
         Intent intent = new Intent();
         intent.putExtra("a", password);
 
-        builder.addExtras(intent.getExtras()); // $sensitive-notification
-        builder.setCategory(password); // $sensitive-notification
-        builder.setChannelId(password); // $sensitive-notification
-        builder.setGroup(password); // $sensitive-notification
-        builder.setExtras(intent.getExtras()); // $sensitive-notification
-        builder.setGroup(password); // $sensitive-notification
-        builder.setSortKey(password); // $sensitive-notification
-        builder.setSettingsText(password); // $sensitive-notification
-        builder.setRemoteInputHistory(new CharSequence[] { password }); // $sensitive-notification
-        builder.setTicker(password); // $sensitive-notification
-        builder.setTicker(password, null); // $sensitive-notification
+        builder.addExtras(intent.getExtras()); // $ sensitive-notification
+        builder.setCategory(password); // $ sensitive-notification
+        builder.setChannelId(password); // $ sensitive-notification
+        builder.setGroup(password); // $ sensitive-notification
+        builder.setExtras(intent.getExtras()); // $ sensitive-notification
+        builder.setGroup(password); // $ sensitive-notification
+        builder.setSortKey(password); // $ sensitive-notification
+        builder.setSettingsText(password); // $ sensitive-notification
+        builder.setRemoteInputHistory(new CharSequence[] { password }); // $ sensitive-notification
+        builder.setTicker(password); // $ sensitive-notification
+        builder.setTicker(password, null); // $ sensitive-notification
 
         builder.setStyle(new NotificationCompat.BigPictureStyle()
-            .setContentDescription(password) // $sensitive-notification
-            .setSummaryText(password) // $sensitive-notification
-            .setBigContentTitle(password)); // $sensitive-notification
+            .setContentDescription(password) // $ sensitive-notification
+            .setSummaryText(password) // $ sensitive-notification
+            .setBigContentTitle(password)); // $ sensitive-notification
         builder.setStyle(new NotificationCompat.BigTextStyle()
-            .bigText(password) // $sensitive-notification
-            .setSummaryText(password) // $sensitive-notification
-            .setBigContentTitle(password)); // $sensitive-notification
+            .bigText(password) // $ sensitive-notification
+            .setSummaryText(password) // $ sensitive-notification
+            .setBigContentTitle(password)); // $ sensitive-notification
         builder.setStyle(new NotificationCompat.InboxStyle()
-            .addLine(password) // $sensitive-notification
-            .setBigContentTitle(password) // $sensitive-notification
-            .setSummaryText(password)); // $sensitive-notification
-        builder.setStyle( 
-                new NotificationCompat.MessagingStyle(password) // $sensitive-notification
-                    .setConversationTitle(password) // $sensitive-notification
-                    .addMessage(password, 0, "") // $sensitive-notification
-                    .addMessage(password, 0, (androidx.core.app.Person)null) // $sensitive-notification
-                    .addMessage("", 0, password) // $sensitive-notification
-                    .addMessage(new NotificationCompat.MessagingStyle.Message(password, 0, "")) // $sensitive-notification
-                    .addMessage(new NotificationCompat.MessagingStyle.Message(password, 0, (androidx.core.app.Person)null)) // $sensitive-notification
-                    .addMessage(new NotificationCompat.MessagingStyle.Message("", 0, password)) // $sensitive-notification
+            .addLine(password) // $ sensitive-notification
+            .setBigContentTitle(password) // $ sensitive-notification
+            .setSummaryText(password)); // $ sensitive-notification
+        builder.setStyle(
+                new NotificationCompat.MessagingStyle(password) // $ sensitive-notification
+                    .setConversationTitle(password) // $ sensitive-notification
+                    .addMessage(password, 0, "") // $ sensitive-notification
+                    .addMessage(password, 0, (androidx.core.app.Person)null) // $ sensitive-notification
+                    .addMessage("", 0, password) // $ sensitive-notification
+                    .addMessage(new NotificationCompat.MessagingStyle.Message(password, 0, "")) // $ sensitive-notification
+                    .addMessage(new NotificationCompat.MessagingStyle.Message(password, 0, (androidx.core.app.Person)null)) // $ sensitive-notification
+                    .addMessage(new NotificationCompat.MessagingStyle.Message("", 0, password)) // $ sensitive-notification
                 );
 
-        builder.addAction(0, password, null); // $sensitive-notification
-        builder.addAction(new NotificationCompat.Action(0, password, null)); // $sensitive-notification
-        builder.addAction(new NotificationCompat.Action.Builder(0, password, null) // $sensitive-notification
-            .addExtras(intent.getExtras()) // $sensitive-notification
+        builder.addAction(0, password, null); // $ sensitive-notification
+        builder.addAction(new NotificationCompat.Action(0, password, null)); // $ sensitive-notification
+        builder.addAction(new NotificationCompat.Action.Builder(0, password, null) // $ sensitive-notification
+            .addExtras(intent.getExtras()) // $ sensitive-notification
             .build());
-        builder.addAction(new NotificationCompat.Action.Builder(null, password, null).build()); // $sensitive-notification
+        builder.addAction(new NotificationCompat.Action.Builder(null, password, null).build()); // $ sensitive-notification
 
         builder.setStyle(NotificationCompat.CallStyle.forScreeningCall(null, null, null)
-            .setVerificationText(password)); // $sensitive-notification
+            .setVerificationText(password)); // $ sensitive-notification
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveTextView/Test.java b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveTextView/Test.java
index 9b6ab9da35b..a4c491c6378 100644
--- a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveTextView/Test.java
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveTextView/Test.java
@@ -11,11 +11,11 @@ class Test extends Activity {
     void test(String password) {
         EditText test1 = findViewById(R.id.test1);
         // BAD: Exposing sensitive data to text view
-        test1.setText(password); // $sensitive-text
-        test1.setHint(password); // $sensitive-text
-        test1.append(password); // $sensitive-text
+        test1.setText(password); // $ sensitive-text
+        test1.setHint(password); // $ sensitive-text
+        test1.append(password); // $ sensitive-text
         // GOOD: resource constant is not sensitive info
-        test1.setText(R.string.password_prompt); 
+        test1.setText(R.string.password_prompt);
 
         // GOOD: Visibility is dynamically set
         TextView test2 = findViewById(R.id.test2);
@@ -47,7 +47,7 @@ class Test extends Activity {
 
         // BAD: Input type set to textVisiblePassword in XML, which is not hidden
         EditText test9 = findViewById(R.id.test9);
-        test9.setText(password); // $sensitive-text
+        test9.setText(password); // $ sensitive-text
 
         // GOOD: Visibility set to invisible in XML
         EditText test10 = findViewById(R.id.test10);
@@ -74,4 +74,4 @@ class Test extends Activity {
         // GOOD: Input type set to textPassword in XML
         test14.setText(password);
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test1/Test.java b/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test1/Test.java
index 87e973ab774..a7a124ef33d 100644
--- a/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test1/Test.java
+++ b/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test1/Test.java
@@ -6,9 +6,9 @@ import javax.crypto.KeyGenerator;
 class Test {
     void test() {
         KeyGenParameterSpec.Builder builder = new KeyGenParameterSpec.Builder("MySecretKey", KeyProperties.PURPOSE_ENCRYPT | KeyProperties.PURPOSE_DECRYPT);
-        builder.setUserAuthenticationRequired(false); // $insecure-key
-        builder.setInvalidatedByBiometricEnrollment(false); // $insecure-key
-        builder.setUserAuthenticationValidityDurationSeconds(30); // $insecure-key
+        builder.setUserAuthenticationRequired(false); // $ insecure-key
+        builder.setInvalidatedByBiometricEnrollment(false); // $ insecure-key
+        builder.setUserAuthenticationValidityDurationSeconds(30); // $ insecure-key
     }
 
     private void generateSecretKey() throws Exception {
@@ -36,4 +36,4 @@ class Callback extends BiometricPrompt.AuthenticationCallback {
     public void onAuthenticationSucceeded(BiometricPrompt.AuthenticationResult result) {
         useKey(result.getCryptoObject());
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/Test.java b/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/Test.java
index e4317efd615..a930ec9721c 100644
--- a/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/Test.java
+++ b/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/Test.java
@@ -16,15 +16,15 @@ class TestA {
     // BAD: result is not used
     class Test2 extends BiometricPrompt.AuthenticationCallback {
         @Override
-        public void onAuthenticationSucceeded(BiometricPrompt.AuthenticationResult result) { // $insecure-auth
-            
+        public void onAuthenticationSucceeded(BiometricPrompt.AuthenticationResult result) { // $ insecure-auth
+
         }
     }
 
     // BAD: result is only used in a super call
     class Test3 extends BiometricPrompt.AuthenticationCallback {
         @Override
-        public void onAuthenticationSucceeded(BiometricPrompt.AuthenticationResult result) { // $insecure-auth
+        public void onAuthenticationSucceeded(BiometricPrompt.AuthenticationResult result) { // $ insecure-auth
             super.onAuthenticationSucceeded(result);
         }
     }
@@ -62,15 +62,15 @@ class TestB {
     // BAD: result is not used
     class Test2 extends FingerprintManager.AuthenticationCallback {
         @Override
-        public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) { // $insecure-auth
-            
+        public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) { // $ insecure-auth
+
         }
     }
 
     // BAD: result is only used in a super call
     class Test3 extends FingerprintManager.AuthenticationCallback {
         @Override
-        public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) { // $insecure-auth
+        public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) { // $ insecure-auth
             super.onAuthenticationSucceeded(result);
         }
     }
@@ -91,4 +91,4 @@ class TestB {
             super.onAuthenticationSucceeded(result);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/Test2.java b/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/Test2.java
index 10308a2f2d3..c73eab93b0f 100644
--- a/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/Test2.java
+++ b/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/Test2.java
@@ -15,15 +15,15 @@ class TestC {
     // BAD: result is not used
     class Test2 extends BiometricPrompt.AuthenticationCallback {
         @Override
-        public void onAuthenticationSucceeded(BiometricPrompt.AuthenticationResult result) { // $insecure-auth
-            
+        public void onAuthenticationSucceeded(BiometricPrompt.AuthenticationResult result) { // $ insecure-auth
+
         }
     }
 
     // BAD: result is only used in a super call
     class Test3 extends BiometricPrompt.AuthenticationCallback {
         @Override
-        public void onAuthenticationSucceeded(BiometricPrompt.AuthenticationResult result) { // $insecure-auth
+        public void onAuthenticationSucceeded(BiometricPrompt.AuthenticationResult result) { // $ insecure-auth
             super.onAuthenticationSucceeded(result);
         }
     }
@@ -44,4 +44,4 @@ class TestC {
             super.onAuthenticationSucceeded(result);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test1/Test.java b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test1/Test.java
index ac40be7fb39..e122259b54c 100644
--- a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test1/Test.java
+++ b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test1/Test.java
@@ -7,7 +7,7 @@ class Test {
     }
 
     URLConnection test2() throws Exception {
-        return new URL("https://bad.example.com").openConnection(); // $hasUntrustedResult
+        return new URL("https://bad.example.com").openConnection(); // $ hasUntrustedResult
     }
 
     URLConnection test3() throws Exception {
diff --git a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test2/Test.java b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test2/Test.java
index 05d58137b9a..bc273ebdcba 100644
--- a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test2/Test.java
+++ b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test2/Test.java
@@ -3,7 +3,7 @@ import java.net.URLConnection;
 
 class Test {
     URLConnection test2() throws Exception {
-        return new URL("https://example.com").openConnection(); // $hasNoTrustedResult
+        return new URL("https://example.com").openConnection(); // $ hasNoTrustedResult
     }
 
     URLConnection test3() throws Exception {
diff --git a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test3/Test.java b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test3/Test.java
index 22f8d68919e..0599359006f 100644
--- a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test3/Test.java
+++ b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test3/Test.java
@@ -11,7 +11,7 @@ class Test {
                 new OkHttpClient.Builder().certificatePinner(certificatePinner).build();
 
         client.newCall(new Request.Builder().url("https://good.example.com").build()).execute();
-        client.newCall(new Request.Builder().url("https://bad.example.com").build()).execute(); // $hasUntrustedResult
+        client.newCall(new Request.Builder().url("https://bad.example.com").build()).execute(); // $ hasUntrustedResult
         client.newCall(new Request.Builder().url("classpath:example/directory/test.class").build())
                 .execute();
         client.newCall(new Request.Builder().url("file:///example/file").build()).execute();
diff --git a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test4/Test.java b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test4/Test.java
index b3c6ef44786..11b0e9d0f34 100644
--- a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test4/Test.java
+++ b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test4/Test.java
@@ -28,6 +28,6 @@ class Test {
 
     void test2() throws Exception {
         URL url = new URL("http://www.example.com/");
-        HttpsURLConnection urlConnection = (HttpsURLConnection) url.openConnection(); // $hasNoTrustedResult
+        HttpsURLConnection urlConnection = (HttpsURLConnection) url.openConnection(); // $ hasNoTrustedResult
     }
 }
diff --git a/java/ql/test/query-tests/security/CWE-295/ImproperWebVeiwCertificateValidation/Test.java b/java/ql/test/query-tests/security/CWE-295/ImproperWebVeiwCertificateValidation/Test.java
index 180989590f0..c44628a022e 100644
--- a/java/ql/test/query-tests/security/CWE-295/ImproperWebVeiwCertificateValidation/Test.java
+++ b/java/ql/test/query-tests/security/CWE-295/ImproperWebVeiwCertificateValidation/Test.java
@@ -9,8 +9,8 @@ import android.app.Activity;
 
 class Test {
     class A extends WebViewClient {
-        public void onReceivedSslError (WebView view, SslErrorHandler handler, SslError error) { // $hasResult
-            handler.proceed(); 
+        public void onReceivedSslError (WebView view, SslErrorHandler handler, SslError error) { // $ hasResult
+            handler.proceed();
         }
     }
 
@@ -28,7 +28,7 @@ class Test {
             else {
                 handler.cancel();
             }
-        } 
+        }
     }
 
     class C extends WebViewClient {
@@ -51,4 +51,4 @@ class Test {
                         }).show();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/query-tests/security/CWE-297/InsecureJakartaMailTest.java b/java/ql/test/query-tests/security/CWE-297/InsecureJakartaMailTest.java
index 2dd5cab08ec..33715721c51 100644
--- a/java/ql/test/query-tests/security/CWE-297/InsecureJakartaMailTest.java
+++ b/java/ql/test/query-tests/security/CWE-297/InsecureJakartaMailTest.java
@@ -19,7 +19,7 @@ class InsecureJakartaMailTest {
 		if (null != authenticator) {
 			properties.put("mail.smtp.auth", "true");
 		}
-		final Session session = Session.getInstance(properties, authenticator); // $hasInsecureJavaMail
+		final Session session = Session.getInstance(properties, authenticator); // $ hasInsecureJavaMail
 	}
 
 	public void testSecureJavaMail() {
diff --git a/java/ql/test/query-tests/security/CWE-297/InsecureJavaMailTest.java b/java/ql/test/query-tests/security/CWE-297/InsecureJavaMailTest.java
index a9880c20339..508ffcbabd0 100644
--- a/java/ql/test/query-tests/security/CWE-297/InsecureJavaMailTest.java
+++ b/java/ql/test/query-tests/security/CWE-297/InsecureJavaMailTest.java
@@ -19,7 +19,7 @@ class InsecureJavaMailTest {
 		if (null != authenticator) {
 			properties.put("mail.smtp.auth", "true");
 		}
-		final Session session = Session.getInstance(properties, authenticator); // $hasInsecureJavaMail
+		final Session session = Session.getInstance(properties, authenticator); // $ hasInsecureJavaMail
 	}
 
 	public void testSecureJavaMail() {
diff --git a/java/ql/test/query-tests/security/CWE-297/InsecureSimpleEmailTest.java b/java/ql/test/query-tests/security/CWE-297/InsecureSimpleEmailTest.java
index 5940dbbd457..e8b1137f402 100644
--- a/java/ql/test/query-tests/security/CWE-297/InsecureSimpleEmailTest.java
+++ b/java/ql/test/query-tests/security/CWE-297/InsecureSimpleEmailTest.java
@@ -10,7 +10,7 @@ public class InsecureSimpleEmailTest {
             email.setHostName("config.hostName");
             email.setSmtpPort(25);
             email.setAuthenticator(new DefaultAuthenticator("config.username", "config.password"));
-            email.setSSLOnConnect(true); // $hasInsecureJavaMail
+            email.setSSLOnConnect(true); // $ hasInsecureJavaMail
             email.setFrom("fromAddress");
             email.setSubject("subject");
             email.setMsg("body");
@@ -23,7 +23,7 @@ public class InsecureSimpleEmailTest {
             email.setHostName("config.hostName");
             email.setSmtpPort(25);
             email.setAuthenticator(new DefaultAuthenticator("config.username", "config.password"));
-            email.setStartTLSRequired(true); // $hasInsecureJavaMail
+            email.setStartTLSRequired(true); // $ hasInsecureJavaMail
             email.setFrom("fromAddress");
             email.setSubject("subject");
             email.setMsg("body");
diff --git a/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageSharedPrefsTest.java b/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageSharedPrefsTest.java
index 66991adfa64..ee21012a4e3 100644
--- a/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageSharedPrefsTest.java
+++ b/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageSharedPrefsTest.java
@@ -100,13 +100,13 @@ public class CleartextStorageSharedPrefsTest extends Activity {
 		SharedPreferences sharedPrefs =
 				context.getSharedPreferences("user_prefs", Context.MODE_PRIVATE);
 		sharedPrefs.edit().putString("name", name).apply(); // Safe
-		sharedPrefs.edit().putString("password", password).apply(); // $hasCleartextStorageSharedPrefs
+		sharedPrefs.edit().putString("password", password).apply(); // $ hasCleartextStorageSharedPrefs
 	}
 
 	public void testSetSharedPrefs7(Context context, EditText name, EditText password) {
 		SharedPreferences sharedPrefs =
 				context.getSharedPreferences("user_prefs", Context.MODE_PRIVATE);
 		sharedPrefs.edit().putString("name", name.getText().toString()).apply(); // Safe
-		sharedPrefs.edit().putString("password", password.getText().toString()).apply(); // $hasCleartextStorageSharedPrefs
+		sharedPrefs.edit().putString("password", password.getText().toString()).apply(); // $ hasCleartextStorageSharedPrefs
 	}
 }
diff --git a/java/ql/test/query-tests/security/CWE-524/res/layout/Test.xml b/java/ql/test/query-tests/security/CWE-524/res/layout/Test.xml
index 3446d530794..83f6631b042 100644
--- a/java/ql/test/query-tests/security/CWE-524/res/layout/Test.xml
+++ b/java/ql/test/query-tests/security/CWE-524/res/layout/Test.xml
@@ -6,30 +6,30 @@
 
     <EditText
         android:id="@+id/test1_password"
-        android:inputType="text"/> <!-- $hasResult -->
+        android:inputType="text"/> <!-- $ hasResult -->
 
     <EditText
         android:id="@+id/test2_safe"
-        android:inputType="text"/> 
+        android:inputType="text"/>
 
     <EditText
         android:id="@+id/test3_password"
-        android:inputType="textNoSuggestions"/>  
+        android:inputType="textNoSuggestions"/>
 
     <EditText
         android:id="@+id/test4_password"
-        android:inputType="textPassword"/> 
+        android:inputType="textPassword"/>
 
     <EditText
         android:id="@+id/test5_bank_account_name"
-        android:inputType="textMultiLine"/> <!-- $hasResult -->
+        android:inputType="textMultiLine"/> <!-- $ hasResult -->
 
     <EditText
-        android:id="@+id/test6_password"/> <!-- $hasResult -->
+        android:id="@+id/test6_password"/> <!-- $ hasResult -->
 
     <EditText
-        android:id="@+id/test7_password"/>  
+        android:id="@+id/test7_password"/>
 
     <EditText
-        android:id="@+id/test8_password"/>  
-</LinearLayout>
\ No newline at end of file
+        android:id="@+id/test8_password"/>
+</LinearLayout>
diff --git a/java/ql/test/query-tests/security/CWE-749/UnsafeActivity1.java b/java/ql/test/query-tests/security/CWE-749/UnsafeActivity1.java
index a7092839219..1bf878161d6 100644
--- a/java/ql/test/query-tests/security/CWE-749/UnsafeActivity1.java
+++ b/java/ql/test/query-tests/security/CWE-749/UnsafeActivity1.java
@@ -31,6 +31,6 @@ public class UnsafeActivity1 extends Activity {
 		});
 
 		String thisUrl = getIntent().getExtras().getString("url");
-		wv.loadUrl(thisUrl); // $hasUnsafeAndroidAccess
+		wv.loadUrl(thisUrl); // $ hasUnsafeAndroidAccess
 	}
 }
diff --git a/java/ql/test/query-tests/security/CWE-749/UnsafeActivity2.java b/java/ql/test/query-tests/security/CWE-749/UnsafeActivity2.java
index 5a70ba3d50b..348da29777a 100644
--- a/java/ql/test/query-tests/security/CWE-749/UnsafeActivity2.java
+++ b/java/ql/test/query-tests/security/CWE-749/UnsafeActivity2.java
@@ -31,6 +31,6 @@ public class UnsafeActivity2 extends Activity {
 		});
 
 		String thisUrl = getIntent().getExtras().getString("url");
-		wv.loadUrl(thisUrl); // $hasUnsafeAndroidAccess
+		wv.loadUrl(thisUrl); // $ hasUnsafeAndroidAccess
 	}
 }
diff --git a/java/ql/test/query-tests/security/CWE-749/UnsafeActivity3.java b/java/ql/test/query-tests/security/CWE-749/UnsafeActivity3.java
index f7f88087d8f..19edc04a356 100644
--- a/java/ql/test/query-tests/security/CWE-749/UnsafeActivity3.java
+++ b/java/ql/test/query-tests/security/CWE-749/UnsafeActivity3.java
@@ -31,6 +31,6 @@ public class UnsafeActivity3 extends Activity {
 		});
 
 		String thisUrl = getIntent().getExtras().getString("url");
-		wv.loadUrl(thisUrl); // $hasUnsafeAndroidAccess
+		wv.loadUrl(thisUrl); // $ hasUnsafeAndroidAccess
 	}
 }
diff --git a/java/ql/test/query-tests/security/CWE-749/UnsafeAndroidAccess.java b/java/ql/test/query-tests/security/CWE-749/UnsafeAndroidAccess.java
index 95dbc326d3d..0d444adf425 100644
--- a/java/ql/test/query-tests/security/CWE-749/UnsafeAndroidAccess.java
+++ b/java/ql/test/query-tests/security/CWE-749/UnsafeAndroidAccess.java
@@ -31,7 +31,7 @@ public class UnsafeAndroidAccess extends Activity {
 		});
 
 		String thisUrl = getIntent().getExtras().getString("url");
-		wv.loadUrl(thisUrl); // $hasUnsafeAndroidAccess
+		wv.loadUrl(thisUrl); // $ hasUnsafeAndroidAccess
 	}
 
 	// Test onCreate with both JavaScript and cross-origin resource access enabled while taking
@@ -55,7 +55,7 @@ public class UnsafeAndroidAccess extends Activity {
 		});
 
 		String thisUrl = getIntent().getStringExtra("url");
-		wv.loadUrl(thisUrl); // $hasUnsafeAndroidAccess
+		wv.loadUrl(thisUrl); // $ hasUnsafeAndroidAccess
 	}
 
 	// Test onCreate with both JavaScript and cross-origin resource access disabled by default while
@@ -99,7 +99,7 @@ public class UnsafeAndroidAccess extends Activity {
 		});
 
 		String thisUrl = getIntent().getStringExtra("url");
-		wv.loadUrl(thisUrl); // $hasUnsafeAndroidAccess
+		wv.loadUrl(thisUrl); // $ hasUnsafeAndroidAccess
 	}
 
 	// Test onCreate with both JavaScript and cross-origin resource access enabled while not taking
diff --git a/java/ql/test/query-tests/security/CWE-749/UnsafeAndroidBroadcastReceiver.java b/java/ql/test/query-tests/security/CWE-749/UnsafeAndroidBroadcastReceiver.java
index c25a042ea89..f87f842fd69 100644
--- a/java/ql/test/query-tests/security/CWE-749/UnsafeAndroidBroadcastReceiver.java
+++ b/java/ql/test/query-tests/security/CWE-749/UnsafeAndroidBroadcastReceiver.java
@@ -30,6 +30,6 @@ public class UnsafeAndroidBroadcastReceiver extends BroadcastReceiver {
 			}
 		});
 
-		wv.loadUrl(thisUrl); // $hasUnsafeAndroidAccess
+		wv.loadUrl(thisUrl); // $ hasUnsafeAndroidAccess
 	}
 }
diff --git a/java/ql/test/query-tests/security/CWE-918/RequestForgery.expected b/java/ql/test/query-tests/security/CWE-918/RequestForgery.expected
index a0bbc205a39..a84c752b02d 100644
--- a/java/ql/test/query-tests/security/CWE-918/RequestForgery.expected
+++ b/java/ql/test/query-tests/security/CWE-918/RequestForgery.expected
@@ -404,14 +404,14 @@ edges
 | ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | ApacheHttpSSRF.java:58:43:58:45 | uri | provenance | Sink:MaD:226 |
 | ApacheHttpSSRF.java:28:31:28:34 | sink : String | ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | provenance | Config |
 | ApacheHttpSSRF.java:28:31:28:34 | sink : String | ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | provenance | MaD:285 |
-| ApacheHttpSSRF.java:42:62:42:64 | uri : URI | ApacheHttpSSRF.java:42:62:42:75 | toString(...) : String | provenance | MaD:286 |
-| ApacheHttpSSRF.java:42:62:42:75 | toString(...) : String | ApacheHttpSSRF.java:42:34:42:82 | new BasicRequestLine(...) | provenance | MaD:295 Sink:MaD:231 |
-| ApacheHttpSSRF.java:43:41:43:43 | uri : URI | ApacheHttpSSRF.java:43:41:43:54 | toString(...) | provenance | MaD:286 Sink:MaD:232 |
-| ApacheHttpSSRF.java:44:41:44:43 | uri : URI | ApacheHttpSSRF.java:44:41:44:54 | toString(...) | provenance | MaD:286 Sink:MaD:233 |
-| ApacheHttpSSRF.java:46:77:46:79 | uri : URI | ApacheHttpSSRF.java:46:77:46:90 | toString(...) : String | provenance | MaD:286 |
-| ApacheHttpSSRF.java:46:77:46:90 | toString(...) : String | ApacheHttpSSRF.java:46:49:46:97 | new BasicRequestLine(...) | provenance | MaD:295 Sink:MaD:228 |
-| ApacheHttpSSRF.java:47:56:47:58 | uri : URI | ApacheHttpSSRF.java:47:56:47:69 | toString(...) | provenance | MaD:286 Sink:MaD:229 |
-| ApacheHttpSSRF.java:48:56:48:58 | uri : URI | ApacheHttpSSRF.java:48:56:48:69 | toString(...) | provenance | MaD:286 Sink:MaD:230 |
+| ApacheHttpSSRF.java:42:62:42:64 | uri : URI | ApacheHttpSSRF.java:42:62:42:75 | toString(...) : String | provenance | MaD:287 |
+| ApacheHttpSSRF.java:42:62:42:75 | toString(...) : String | ApacheHttpSSRF.java:42:34:42:82 | new BasicRequestLine(...) | provenance | MaD:296 Sink:MaD:231 |
+| ApacheHttpSSRF.java:43:41:43:43 | uri : URI | ApacheHttpSSRF.java:43:41:43:54 | toString(...) | provenance | MaD:287 Sink:MaD:232 |
+| ApacheHttpSSRF.java:44:41:44:43 | uri : URI | ApacheHttpSSRF.java:44:41:44:54 | toString(...) | provenance | MaD:287 Sink:MaD:233 |
+| ApacheHttpSSRF.java:46:77:46:79 | uri : URI | ApacheHttpSSRF.java:46:77:46:90 | toString(...) : String | provenance | MaD:287 |
+| ApacheHttpSSRF.java:46:77:46:90 | toString(...) : String | ApacheHttpSSRF.java:46:49:46:97 | new BasicRequestLine(...) | provenance | MaD:296 Sink:MaD:228 |
+| ApacheHttpSSRF.java:47:56:47:58 | uri : URI | ApacheHttpSSRF.java:47:56:47:69 | toString(...) | provenance | MaD:287 Sink:MaD:229 |
+| ApacheHttpSSRF.java:48:56:48:58 | uri : URI | ApacheHttpSSRF.java:48:56:48:69 | toString(...) | provenance | MaD:287 Sink:MaD:230 |
 | ApacheHttpSSRFVersion5.java:41:30:41:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:42:31:42:37 | uriSink : String | provenance | Src:MaD:277  |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:49:54:49:56 | uri : URI | provenance |  |
 | ApacheHttpSSRFVersion5.java:42:23:42:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:50:54:50:56 | uri | provenance | Sink:MaD:40 |
@@ -503,37 +503,37 @@ edges
 | ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:132:36:132:39 | host | provenance | Sink:MaD:100 |
 | ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:136:38:136:41 | host | provenance | Sink:MaD:103 |
 | ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:162:52:162:55 | host | provenance | Sink:MaD:204 |
-| ApacheHttpSSRFVersion5.java:45:42:45:49 | hostSink : String | ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | provenance | MaD:294 |
-| ApacheHttpSSRFVersion5.java:49:54:49:56 | uri : URI | ApacheHttpSSRFVersion5.java:49:54:49:67 | toString(...) | provenance | MaD:286 Sink:MaD:39 |
-| ApacheHttpSSRFVersion5.java:51:48:51:50 | uri : URI | ApacheHttpSSRFVersion5.java:51:48:51:61 | toString(...) | provenance | MaD:286 Sink:MaD:41 |
-| ApacheHttpSSRFVersion5.java:55:38:55:40 | uri : URI | ApacheHttpSSRFVersion5.java:55:38:55:51 | toString(...) | provenance | MaD:286 Sink:MaD:44 |
-| ApacheHttpSSRFVersion5.java:59:35:59:37 | uri : URI | ApacheHttpSSRFVersion5.java:59:35:59:48 | toString(...) | provenance | MaD:286 Sink:MaD:47 |
-| ApacheHttpSSRFVersion5.java:63:36:63:38 | uri : URI | ApacheHttpSSRFVersion5.java:63:36:63:49 | toString(...) | provenance | MaD:286 Sink:MaD:50 |
-| ApacheHttpSSRFVersion5.java:67:39:67:41 | uri : URI | ApacheHttpSSRFVersion5.java:67:39:67:52 | toString(...) | provenance | MaD:286 Sink:MaD:53 |
-| ApacheHttpSSRFVersion5.java:71:37:71:39 | uri : URI | ApacheHttpSSRFVersion5.java:71:37:71:50 | toString(...) | provenance | MaD:286 Sink:MaD:56 |
-| ApacheHttpSSRFVersion5.java:75:36:75:38 | uri : URI | ApacheHttpSSRFVersion5.java:75:36:75:49 | toString(...) | provenance | MaD:286 Sink:MaD:59 |
-| ApacheHttpSSRFVersion5.java:79:35:79:37 | uri : URI | ApacheHttpSSRFVersion5.java:79:35:79:48 | toString(...) | provenance | MaD:286 Sink:MaD:62 |
-| ApacheHttpSSRFVersion5.java:83:37:83:39 | uri : URI | ApacheHttpSSRFVersion5.java:83:37:83:50 | toString(...) | provenance | MaD:286 Sink:MaD:65 |
-| ApacheHttpSSRFVersion5.java:98:48:98:50 | uri : URI | ApacheHttpSSRFVersion5.java:98:48:98:61 | toString(...) | provenance | MaD:286 Sink:MaD:75 |
-| ApacheHttpSSRFVersion5.java:103:55:103:57 | uri : URI | ApacheHttpSSRFVersion5.java:103:55:103:68 | toString(...) | provenance | MaD:286 Sink:MaD:78 |
-| ApacheHttpSSRFVersion5.java:105:49:105:51 | uri : URI | ApacheHttpSSRFVersion5.java:105:49:105:62 | toString(...) | provenance | MaD:286 Sink:MaD:80 |
-| ApacheHttpSSRFVersion5.java:109:39:109:41 | uri : URI | ApacheHttpSSRFVersion5.java:109:39:109:52 | toString(...) | provenance | MaD:286 Sink:MaD:83 |
-| ApacheHttpSSRFVersion5.java:113:36:113:38 | uri : URI | ApacheHttpSSRFVersion5.java:113:36:113:49 | toString(...) | provenance | MaD:286 Sink:MaD:86 |
-| ApacheHttpSSRFVersion5.java:117:37:117:39 | uri : URI | ApacheHttpSSRFVersion5.java:117:37:117:50 | toString(...) | provenance | MaD:286 Sink:MaD:89 |
-| ApacheHttpSSRFVersion5.java:121:40:121:42 | uri : URI | ApacheHttpSSRFVersion5.java:121:40:121:53 | toString(...) | provenance | MaD:286 Sink:MaD:92 |
-| ApacheHttpSSRFVersion5.java:125:38:125:40 | uri : URI | ApacheHttpSSRFVersion5.java:125:38:125:51 | toString(...) | provenance | MaD:286 Sink:MaD:95 |
-| ApacheHttpSSRFVersion5.java:129:37:129:39 | uri : URI | ApacheHttpSSRFVersion5.java:129:37:129:50 | toString(...) | provenance | MaD:286 Sink:MaD:98 |
-| ApacheHttpSSRFVersion5.java:133:36:133:38 | uri : URI | ApacheHttpSSRFVersion5.java:133:36:133:49 | toString(...) | provenance | MaD:286 Sink:MaD:101 |
-| ApacheHttpSSRFVersion5.java:137:38:137:40 | uri : URI | ApacheHttpSSRFVersion5.java:137:38:137:51 | toString(...) | provenance | MaD:286 Sink:MaD:104 |
-| ApacheHttpSSRFVersion5.java:141:41:141:43 | uri : URI | ApacheHttpSSRFVersion5.java:141:41:141:54 | toString(...) | provenance | MaD:286 Sink:MaD:106 |
-| ApacheHttpSSRFVersion5.java:144:38:144:40 | uri : URI | ApacheHttpSSRFVersion5.java:144:38:144:51 | toString(...) | provenance | MaD:286 Sink:MaD:108 |
-| ApacheHttpSSRFVersion5.java:147:39:147:41 | uri : URI | ApacheHttpSSRFVersion5.java:147:39:147:52 | toString(...) | provenance | MaD:286 Sink:MaD:110 |
-| ApacheHttpSSRFVersion5.java:150:42:150:44 | uri : URI | ApacheHttpSSRFVersion5.java:150:42:150:55 | toString(...) | provenance | MaD:286 Sink:MaD:112 |
-| ApacheHttpSSRFVersion5.java:153:40:153:42 | uri : URI | ApacheHttpSSRFVersion5.java:153:40:153:53 | toString(...) | provenance | MaD:286 Sink:MaD:114 |
-| ApacheHttpSSRFVersion5.java:156:39:156:41 | uri : URI | ApacheHttpSSRFVersion5.java:156:39:156:52 | toString(...) | provenance | MaD:286 Sink:MaD:116 |
-| ApacheHttpSSRFVersion5.java:159:38:159:40 | uri : URI | ApacheHttpSSRFVersion5.java:159:38:159:51 | toString(...) | provenance | MaD:286 Sink:MaD:118 |
-| ApacheHttpSSRFVersion5.java:164:47:164:49 | uri : URI | ApacheHttpSSRFVersion5.java:164:47:164:60 | toString(...) | provenance | MaD:286 Sink:MaD:205 |
-| ApacheHttpSSRFVersion5.java:167:40:167:42 | uri : URI | ApacheHttpSSRFVersion5.java:167:40:167:53 | toString(...) | provenance | MaD:286 Sink:MaD:120 |
+| ApacheHttpSSRFVersion5.java:45:42:45:49 | hostSink : String | ApacheHttpSSRFVersion5.java:45:29:45:50 | new HttpHost(...) : HttpHost | provenance | MaD:295 |
+| ApacheHttpSSRFVersion5.java:49:54:49:56 | uri : URI | ApacheHttpSSRFVersion5.java:49:54:49:67 | toString(...) | provenance | MaD:287 Sink:MaD:39 |
+| ApacheHttpSSRFVersion5.java:51:48:51:50 | uri : URI | ApacheHttpSSRFVersion5.java:51:48:51:61 | toString(...) | provenance | MaD:287 Sink:MaD:41 |
+| ApacheHttpSSRFVersion5.java:55:38:55:40 | uri : URI | ApacheHttpSSRFVersion5.java:55:38:55:51 | toString(...) | provenance | MaD:287 Sink:MaD:44 |
+| ApacheHttpSSRFVersion5.java:59:35:59:37 | uri : URI | ApacheHttpSSRFVersion5.java:59:35:59:48 | toString(...) | provenance | MaD:287 Sink:MaD:47 |
+| ApacheHttpSSRFVersion5.java:63:36:63:38 | uri : URI | ApacheHttpSSRFVersion5.java:63:36:63:49 | toString(...) | provenance | MaD:287 Sink:MaD:50 |
+| ApacheHttpSSRFVersion5.java:67:39:67:41 | uri : URI | ApacheHttpSSRFVersion5.java:67:39:67:52 | toString(...) | provenance | MaD:287 Sink:MaD:53 |
+| ApacheHttpSSRFVersion5.java:71:37:71:39 | uri : URI | ApacheHttpSSRFVersion5.java:71:37:71:50 | toString(...) | provenance | MaD:287 Sink:MaD:56 |
+| ApacheHttpSSRFVersion5.java:75:36:75:38 | uri : URI | ApacheHttpSSRFVersion5.java:75:36:75:49 | toString(...) | provenance | MaD:287 Sink:MaD:59 |
+| ApacheHttpSSRFVersion5.java:79:35:79:37 | uri : URI | ApacheHttpSSRFVersion5.java:79:35:79:48 | toString(...) | provenance | MaD:287 Sink:MaD:62 |
+| ApacheHttpSSRFVersion5.java:83:37:83:39 | uri : URI | ApacheHttpSSRFVersion5.java:83:37:83:50 | toString(...) | provenance | MaD:287 Sink:MaD:65 |
+| ApacheHttpSSRFVersion5.java:98:48:98:50 | uri : URI | ApacheHttpSSRFVersion5.java:98:48:98:61 | toString(...) | provenance | MaD:287 Sink:MaD:75 |
+| ApacheHttpSSRFVersion5.java:103:55:103:57 | uri : URI | ApacheHttpSSRFVersion5.java:103:55:103:68 | toString(...) | provenance | MaD:287 Sink:MaD:78 |
+| ApacheHttpSSRFVersion5.java:105:49:105:51 | uri : URI | ApacheHttpSSRFVersion5.java:105:49:105:62 | toString(...) | provenance | MaD:287 Sink:MaD:80 |
+| ApacheHttpSSRFVersion5.java:109:39:109:41 | uri : URI | ApacheHttpSSRFVersion5.java:109:39:109:52 | toString(...) | provenance | MaD:287 Sink:MaD:83 |
+| ApacheHttpSSRFVersion5.java:113:36:113:38 | uri : URI | ApacheHttpSSRFVersion5.java:113:36:113:49 | toString(...) | provenance | MaD:287 Sink:MaD:86 |
+| ApacheHttpSSRFVersion5.java:117:37:117:39 | uri : URI | ApacheHttpSSRFVersion5.java:117:37:117:50 | toString(...) | provenance | MaD:287 Sink:MaD:89 |
+| ApacheHttpSSRFVersion5.java:121:40:121:42 | uri : URI | ApacheHttpSSRFVersion5.java:121:40:121:53 | toString(...) | provenance | MaD:287 Sink:MaD:92 |
+| ApacheHttpSSRFVersion5.java:125:38:125:40 | uri : URI | ApacheHttpSSRFVersion5.java:125:38:125:51 | toString(...) | provenance | MaD:287 Sink:MaD:95 |
+| ApacheHttpSSRFVersion5.java:129:37:129:39 | uri : URI | ApacheHttpSSRFVersion5.java:129:37:129:50 | toString(...) | provenance | MaD:287 Sink:MaD:98 |
+| ApacheHttpSSRFVersion5.java:133:36:133:38 | uri : URI | ApacheHttpSSRFVersion5.java:133:36:133:49 | toString(...) | provenance | MaD:287 Sink:MaD:101 |
+| ApacheHttpSSRFVersion5.java:137:38:137:40 | uri : URI | ApacheHttpSSRFVersion5.java:137:38:137:51 | toString(...) | provenance | MaD:287 Sink:MaD:104 |
+| ApacheHttpSSRFVersion5.java:141:41:141:43 | uri : URI | ApacheHttpSSRFVersion5.java:141:41:141:54 | toString(...) | provenance | MaD:287 Sink:MaD:106 |
+| ApacheHttpSSRFVersion5.java:144:38:144:40 | uri : URI | ApacheHttpSSRFVersion5.java:144:38:144:51 | toString(...) | provenance | MaD:287 Sink:MaD:108 |
+| ApacheHttpSSRFVersion5.java:147:39:147:41 | uri : URI | ApacheHttpSSRFVersion5.java:147:39:147:52 | toString(...) | provenance | MaD:287 Sink:MaD:110 |
+| ApacheHttpSSRFVersion5.java:150:42:150:44 | uri : URI | ApacheHttpSSRFVersion5.java:150:42:150:55 | toString(...) | provenance | MaD:287 Sink:MaD:112 |
+| ApacheHttpSSRFVersion5.java:153:40:153:42 | uri : URI | ApacheHttpSSRFVersion5.java:153:40:153:53 | toString(...) | provenance | MaD:287 Sink:MaD:114 |
+| ApacheHttpSSRFVersion5.java:156:39:156:41 | uri : URI | ApacheHttpSSRFVersion5.java:156:39:156:52 | toString(...) | provenance | MaD:287 Sink:MaD:116 |
+| ApacheHttpSSRFVersion5.java:159:38:159:40 | uri : URI | ApacheHttpSSRFVersion5.java:159:38:159:51 | toString(...) | provenance | MaD:287 Sink:MaD:118 |
+| ApacheHttpSSRFVersion5.java:164:47:164:49 | uri : URI | ApacheHttpSSRFVersion5.java:164:47:164:60 | toString(...) | provenance | MaD:287 Sink:MaD:205 |
+| ApacheHttpSSRFVersion5.java:167:40:167:42 | uri : URI | ApacheHttpSSRFVersion5.java:167:40:167:53 | toString(...) | provenance | MaD:287 Sink:MaD:120 |
 | ApacheHttpSSRFVersion5.java:180:30:180:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:181:31:181:37 | uriSink : String | provenance | Src:MaD:277  |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:184:56:184:58 | uri : URI | provenance |  |
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:185:56:185:58 | uri | provenance | Sink:MaD:123 |
@@ -574,24 +574,24 @@ edges
 | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:239:46:239:48 | uri | provenance | Sink:MaD:158 |
 | ApacheHttpSSRFVersion5.java:181:31:181:37 | uriSink : String | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | provenance | Config |
 | ApacheHttpSSRFVersion5.java:181:31:181:37 | uriSink : String | ApacheHttpSSRFVersion5.java:181:23:181:38 | new URI(...) : URI | provenance | MaD:285 |
-| ApacheHttpSSRFVersion5.java:184:56:184:58 | uri : URI | ApacheHttpSSRFVersion5.java:184:56:184:69 | toString(...) | provenance | MaD:286 Sink:MaD:122 |
-| ApacheHttpSSRFVersion5.java:186:50:186:52 | uri : URI | ApacheHttpSSRFVersion5.java:186:50:186:63 | toString(...) | provenance | MaD:286 Sink:MaD:124 |
-| ApacheHttpSSRFVersion5.java:189:40:189:42 | uri : URI | ApacheHttpSSRFVersion5.java:189:40:189:53 | toString(...) | provenance | MaD:286 Sink:MaD:126 |
-| ApacheHttpSSRFVersion5.java:192:37:192:39 | uri : URI | ApacheHttpSSRFVersion5.java:192:37:192:50 | toString(...) | provenance | MaD:286 Sink:MaD:128 |
-| ApacheHttpSSRFVersion5.java:195:38:195:40 | uri : URI | ApacheHttpSSRFVersion5.java:195:38:195:51 | toString(...) | provenance | MaD:286 Sink:MaD:130 |
-| ApacheHttpSSRFVersion5.java:198:41:198:43 | uri : URI | ApacheHttpSSRFVersion5.java:198:41:198:54 | toString(...) | provenance | MaD:286 Sink:MaD:132 |
-| ApacheHttpSSRFVersion5.java:201:39:201:41 | uri : URI | ApacheHttpSSRFVersion5.java:201:39:201:52 | toString(...) | provenance | MaD:286 Sink:MaD:134 |
-| ApacheHttpSSRFVersion5.java:204:38:204:40 | uri : URI | ApacheHttpSSRFVersion5.java:204:38:204:51 | toString(...) | provenance | MaD:286 Sink:MaD:136 |
-| ApacheHttpSSRFVersion5.java:207:37:207:39 | uri : URI | ApacheHttpSSRFVersion5.java:207:37:207:50 | toString(...) | provenance | MaD:286 Sink:MaD:138 |
-| ApacheHttpSSRFVersion5.java:210:39:210:41 | uri : URI | ApacheHttpSSRFVersion5.java:210:39:210:52 | toString(...) | provenance | MaD:286 Sink:MaD:140 |
-| ApacheHttpSSRFVersion5.java:214:28:214:30 | uri : URI | ApacheHttpSSRFVersion5.java:214:28:214:41 | toString(...) | provenance | MaD:286 Sink:MaD:142 |
-| ApacheHttpSSRFVersion5.java:217:25:217:27 | uri : URI | ApacheHttpSSRFVersion5.java:217:25:217:38 | toString(...) | provenance | MaD:286 Sink:MaD:144 |
-| ApacheHttpSSRFVersion5.java:220:26:220:28 | uri : URI | ApacheHttpSSRFVersion5.java:220:26:220:39 | toString(...) | provenance | MaD:286 Sink:MaD:146 |
-| ApacheHttpSSRFVersion5.java:223:29:223:31 | uri : URI | ApacheHttpSSRFVersion5.java:223:29:223:42 | toString(...) | provenance | MaD:286 Sink:MaD:148 |
-| ApacheHttpSSRFVersion5.java:226:27:226:29 | uri : URI | ApacheHttpSSRFVersion5.java:226:27:226:40 | toString(...) | provenance | MaD:286 Sink:MaD:150 |
-| ApacheHttpSSRFVersion5.java:229:26:229:28 | uri : URI | ApacheHttpSSRFVersion5.java:229:26:229:39 | toString(...) | provenance | MaD:286 Sink:MaD:152 |
-| ApacheHttpSSRFVersion5.java:232:25:232:27 | uri : URI | ApacheHttpSSRFVersion5.java:232:25:232:38 | toString(...) | provenance | MaD:286 Sink:MaD:154 |
-| ApacheHttpSSRFVersion5.java:235:27:235:29 | uri : URI | ApacheHttpSSRFVersion5.java:235:27:235:40 | toString(...) | provenance | MaD:286 Sink:MaD:156 |
+| ApacheHttpSSRFVersion5.java:184:56:184:58 | uri : URI | ApacheHttpSSRFVersion5.java:184:56:184:69 | toString(...) | provenance | MaD:287 Sink:MaD:122 |
+| ApacheHttpSSRFVersion5.java:186:50:186:52 | uri : URI | ApacheHttpSSRFVersion5.java:186:50:186:63 | toString(...) | provenance | MaD:287 Sink:MaD:124 |
+| ApacheHttpSSRFVersion5.java:189:40:189:42 | uri : URI | ApacheHttpSSRFVersion5.java:189:40:189:53 | toString(...) | provenance | MaD:287 Sink:MaD:126 |
+| ApacheHttpSSRFVersion5.java:192:37:192:39 | uri : URI | ApacheHttpSSRFVersion5.java:192:37:192:50 | toString(...) | provenance | MaD:287 Sink:MaD:128 |
+| ApacheHttpSSRFVersion5.java:195:38:195:40 | uri : URI | ApacheHttpSSRFVersion5.java:195:38:195:51 | toString(...) | provenance | MaD:287 Sink:MaD:130 |
+| ApacheHttpSSRFVersion5.java:198:41:198:43 | uri : URI | ApacheHttpSSRFVersion5.java:198:41:198:54 | toString(...) | provenance | MaD:287 Sink:MaD:132 |
+| ApacheHttpSSRFVersion5.java:201:39:201:41 | uri : URI | ApacheHttpSSRFVersion5.java:201:39:201:52 | toString(...) | provenance | MaD:287 Sink:MaD:134 |
+| ApacheHttpSSRFVersion5.java:204:38:204:40 | uri : URI | ApacheHttpSSRFVersion5.java:204:38:204:51 | toString(...) | provenance | MaD:287 Sink:MaD:136 |
+| ApacheHttpSSRFVersion5.java:207:37:207:39 | uri : URI | ApacheHttpSSRFVersion5.java:207:37:207:50 | toString(...) | provenance | MaD:287 Sink:MaD:138 |
+| ApacheHttpSSRFVersion5.java:210:39:210:41 | uri : URI | ApacheHttpSSRFVersion5.java:210:39:210:52 | toString(...) | provenance | MaD:287 Sink:MaD:140 |
+| ApacheHttpSSRFVersion5.java:214:28:214:30 | uri : URI | ApacheHttpSSRFVersion5.java:214:28:214:41 | toString(...) | provenance | MaD:287 Sink:MaD:142 |
+| ApacheHttpSSRFVersion5.java:217:25:217:27 | uri : URI | ApacheHttpSSRFVersion5.java:217:25:217:38 | toString(...) | provenance | MaD:287 Sink:MaD:144 |
+| ApacheHttpSSRFVersion5.java:220:26:220:28 | uri : URI | ApacheHttpSSRFVersion5.java:220:26:220:39 | toString(...) | provenance | MaD:287 Sink:MaD:146 |
+| ApacheHttpSSRFVersion5.java:223:29:223:31 | uri : URI | ApacheHttpSSRFVersion5.java:223:29:223:42 | toString(...) | provenance | MaD:287 Sink:MaD:148 |
+| ApacheHttpSSRFVersion5.java:226:27:226:29 | uri : URI | ApacheHttpSSRFVersion5.java:226:27:226:40 | toString(...) | provenance | MaD:287 Sink:MaD:150 |
+| ApacheHttpSSRFVersion5.java:229:26:229:28 | uri : URI | ApacheHttpSSRFVersion5.java:229:26:229:39 | toString(...) | provenance | MaD:287 Sink:MaD:152 |
+| ApacheHttpSSRFVersion5.java:232:25:232:27 | uri : URI | ApacheHttpSSRFVersion5.java:232:25:232:38 | toString(...) | provenance | MaD:287 Sink:MaD:154 |
+| ApacheHttpSSRFVersion5.java:235:27:235:29 | uri : URI | ApacheHttpSSRFVersion5.java:235:27:235:40 | toString(...) | provenance | MaD:287 Sink:MaD:156 |
 | ApacheHttpSSRFVersion5.java:251:30:251:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:252:31:252:37 | uriSink : String | provenance | Src:MaD:277  |
 | ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:255:44:255:46 | uri | provenance | Sink:MaD:159 |
 | ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:256:38:256:40 | uri : URI | provenance |  |
@@ -614,15 +614,15 @@ edges
 | ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:281:27:281:29 | uri | provenance | Sink:MaD:177 |
 | ApacheHttpSSRFVersion5.java:252:31:252:37 | uriSink : String | ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | provenance | Config |
 | ApacheHttpSSRFVersion5.java:252:31:252:37 | uriSink : String | ApacheHttpSSRFVersion5.java:252:23:252:38 | new URI(...) : URI | provenance | MaD:285 |
-| ApacheHttpSSRFVersion5.java:256:38:256:40 | uri : URI | ApacheHttpSSRFVersion5.java:256:38:256:51 | toString(...) | provenance | MaD:286 Sink:MaD:160 |
-| ApacheHttpSSRFVersion5.java:259:28:259:30 | uri : URI | ApacheHttpSSRFVersion5.java:259:28:259:41 | toString(...) | provenance | MaD:286 Sink:MaD:162 |
-| ApacheHttpSSRFVersion5.java:262:25:262:27 | uri : URI | ApacheHttpSSRFVersion5.java:262:25:262:38 | toString(...) | provenance | MaD:286 Sink:MaD:164 |
-| ApacheHttpSSRFVersion5.java:265:26:265:28 | uri : URI | ApacheHttpSSRFVersion5.java:265:26:265:39 | toString(...) | provenance | MaD:286 Sink:MaD:166 |
-| ApacheHttpSSRFVersion5.java:268:29:268:31 | uri : URI | ApacheHttpSSRFVersion5.java:268:29:268:42 | toString(...) | provenance | MaD:286 Sink:MaD:168 |
-| ApacheHttpSSRFVersion5.java:271:27:271:29 | uri : URI | ApacheHttpSSRFVersion5.java:271:27:271:40 | toString(...) | provenance | MaD:286 Sink:MaD:170 |
-| ApacheHttpSSRFVersion5.java:274:26:274:28 | uri : URI | ApacheHttpSSRFVersion5.java:274:26:274:39 | toString(...) | provenance | MaD:286 Sink:MaD:172 |
-| ApacheHttpSSRFVersion5.java:277:25:277:27 | uri : URI | ApacheHttpSSRFVersion5.java:277:25:277:38 | toString(...) | provenance | MaD:286 Sink:MaD:174 |
-| ApacheHttpSSRFVersion5.java:280:27:280:29 | uri : URI | ApacheHttpSSRFVersion5.java:280:27:280:40 | toString(...) | provenance | MaD:286 Sink:MaD:176 |
+| ApacheHttpSSRFVersion5.java:256:38:256:40 | uri : URI | ApacheHttpSSRFVersion5.java:256:38:256:51 | toString(...) | provenance | MaD:287 Sink:MaD:160 |
+| ApacheHttpSSRFVersion5.java:259:28:259:30 | uri : URI | ApacheHttpSSRFVersion5.java:259:28:259:41 | toString(...) | provenance | MaD:287 Sink:MaD:162 |
+| ApacheHttpSSRFVersion5.java:262:25:262:27 | uri : URI | ApacheHttpSSRFVersion5.java:262:25:262:38 | toString(...) | provenance | MaD:287 Sink:MaD:164 |
+| ApacheHttpSSRFVersion5.java:265:26:265:28 | uri : URI | ApacheHttpSSRFVersion5.java:265:26:265:39 | toString(...) | provenance | MaD:287 Sink:MaD:166 |
+| ApacheHttpSSRFVersion5.java:268:29:268:31 | uri : URI | ApacheHttpSSRFVersion5.java:268:29:268:42 | toString(...) | provenance | MaD:287 Sink:MaD:168 |
+| ApacheHttpSSRFVersion5.java:271:27:271:29 | uri : URI | ApacheHttpSSRFVersion5.java:271:27:271:40 | toString(...) | provenance | MaD:287 Sink:MaD:170 |
+| ApacheHttpSSRFVersion5.java:274:26:274:28 | uri : URI | ApacheHttpSSRFVersion5.java:274:26:274:39 | toString(...) | provenance | MaD:287 Sink:MaD:172 |
+| ApacheHttpSSRFVersion5.java:277:25:277:27 | uri : URI | ApacheHttpSSRFVersion5.java:277:25:277:38 | toString(...) | provenance | MaD:287 Sink:MaD:174 |
+| ApacheHttpSSRFVersion5.java:280:27:280:29 | uri : URI | ApacheHttpSSRFVersion5.java:280:27:280:40 | toString(...) | provenance | MaD:287 Sink:MaD:176 |
 | ApacheHttpSSRFVersion5.java:295:30:295:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:296:31:296:37 | uriSink : String | provenance | Src:MaD:277  |
 | ApacheHttpSSRFVersion5.java:296:23:296:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:308:60:308:62 | uri : URI | provenance |  |
 | ApacheHttpSSRFVersion5.java:296:23:296:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:309:60:309:62 | uri | provenance | Sink:MaD:209 |
@@ -633,9 +633,9 @@ edges
 | ApacheHttpSSRFVersion5.java:298:31:298:58 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:299:42:299:49 | hostSink : String | provenance | Src:MaD:277  |
 | ApacheHttpSSRFVersion5.java:299:29:299:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:303:34:303:37 | host | provenance | Sink:MaD:178 |
 | ApacheHttpSSRFVersion5.java:299:29:299:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:304:34:304:37 | host | provenance | Sink:MaD:179 |
-| ApacheHttpSSRFVersion5.java:299:42:299:49 | hostSink : String | ApacheHttpSSRFVersion5.java:299:29:299:50 | new HttpHost(...) : HttpHost | provenance | MaD:294 |
-| ApacheHttpSSRFVersion5.java:308:60:308:62 | uri : URI | ApacheHttpSSRFVersion5.java:308:60:308:73 | toString(...) | provenance | MaD:286 Sink:MaD:208 |
-| ApacheHttpSSRFVersion5.java:313:53:313:55 | uri : URI | ApacheHttpSSRFVersion5.java:313:53:313:66 | toString(...) | provenance | MaD:286 Sink:MaD:208 |
+| ApacheHttpSSRFVersion5.java:299:42:299:49 | hostSink : String | ApacheHttpSSRFVersion5.java:299:29:299:50 | new HttpHost(...) : HttpHost | provenance | MaD:295 |
+| ApacheHttpSSRFVersion5.java:308:60:308:62 | uri : URI | ApacheHttpSSRFVersion5.java:308:60:308:73 | toString(...) | provenance | MaD:287 Sink:MaD:208 |
+| ApacheHttpSSRFVersion5.java:313:53:313:55 | uri : URI | ApacheHttpSSRFVersion5.java:313:53:313:66 | toString(...) | provenance | MaD:287 Sink:MaD:208 |
 | ApacheHttpSSRFVersion5.java:326:30:326:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:327:31:327:37 | uriSink : String | provenance | Src:MaD:277  |
 | ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:333:42:333:44 | uri : URI | provenance |  |
 | ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:334:42:334:44 | uri | provenance | Sink:MaD:181 |
@@ -659,16 +659,16 @@ edges
 | ApacheHttpSSRFVersion5.java:327:31:327:37 | uriSink : String | ApacheHttpSSRFVersion5.java:327:23:327:38 | new URI(...) : URI | provenance | MaD:285 |
 | ApacheHttpSSRFVersion5.java:329:31:329:58 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:330:42:330:49 | hostSink : String | provenance | Src:MaD:277  |
 | ApacheHttpSSRFVersion5.java:330:29:330:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:354:53:354:56 | host | provenance | Sink:MaD:204 |
-| ApacheHttpSSRFVersion5.java:330:42:330:49 | hostSink : String | ApacheHttpSSRFVersion5.java:330:29:330:50 | new HttpHost(...) : HttpHost | provenance | MaD:294 |
-| ApacheHttpSSRFVersion5.java:333:42:333:44 | uri : URI | ApacheHttpSSRFVersion5.java:333:42:333:55 | toString(...) | provenance | MaD:286 Sink:MaD:180 |
-| ApacheHttpSSRFVersion5.java:336:39:336:41 | uri : URI | ApacheHttpSSRFVersion5.java:336:39:336:52 | toString(...) | provenance | MaD:286 Sink:MaD:182 |
-| ApacheHttpSSRFVersion5.java:339:40:339:42 | uri : URI | ApacheHttpSSRFVersion5.java:339:40:339:53 | toString(...) | provenance | MaD:286 Sink:MaD:184 |
-| ApacheHttpSSRFVersion5.java:342:43:342:45 | uri : URI | ApacheHttpSSRFVersion5.java:342:43:342:56 | toString(...) | provenance | MaD:286 Sink:MaD:186 |
-| ApacheHttpSSRFVersion5.java:345:41:345:43 | uri : URI | ApacheHttpSSRFVersion5.java:345:41:345:54 | toString(...) | provenance | MaD:286 Sink:MaD:188 |
-| ApacheHttpSSRFVersion5.java:348:40:348:42 | uri : URI | ApacheHttpSSRFVersion5.java:348:40:348:53 | toString(...) | provenance | MaD:286 Sink:MaD:190 |
-| ApacheHttpSSRFVersion5.java:351:39:351:41 | uri : URI | ApacheHttpSSRFVersion5.java:351:39:351:52 | toString(...) | provenance | MaD:286 Sink:MaD:192 |
-| ApacheHttpSSRFVersion5.java:356:48:356:50 | uri : URI | ApacheHttpSSRFVersion5.java:356:48:356:61 | toString(...) | provenance | MaD:286 Sink:MaD:205 |
-| ApacheHttpSSRFVersion5.java:359:41:359:43 | uri : URI | ApacheHttpSSRFVersion5.java:359:41:359:54 | toString(...) | provenance | MaD:286 Sink:MaD:194 |
+| ApacheHttpSSRFVersion5.java:330:42:330:49 | hostSink : String | ApacheHttpSSRFVersion5.java:330:29:330:50 | new HttpHost(...) : HttpHost | provenance | MaD:295 |
+| ApacheHttpSSRFVersion5.java:333:42:333:44 | uri : URI | ApacheHttpSSRFVersion5.java:333:42:333:55 | toString(...) | provenance | MaD:287 Sink:MaD:180 |
+| ApacheHttpSSRFVersion5.java:336:39:336:41 | uri : URI | ApacheHttpSSRFVersion5.java:336:39:336:52 | toString(...) | provenance | MaD:287 Sink:MaD:182 |
+| ApacheHttpSSRFVersion5.java:339:40:339:42 | uri : URI | ApacheHttpSSRFVersion5.java:339:40:339:53 | toString(...) | provenance | MaD:287 Sink:MaD:184 |
+| ApacheHttpSSRFVersion5.java:342:43:342:45 | uri : URI | ApacheHttpSSRFVersion5.java:342:43:342:56 | toString(...) | provenance | MaD:287 Sink:MaD:186 |
+| ApacheHttpSSRFVersion5.java:345:41:345:43 | uri : URI | ApacheHttpSSRFVersion5.java:345:41:345:54 | toString(...) | provenance | MaD:287 Sink:MaD:188 |
+| ApacheHttpSSRFVersion5.java:348:40:348:42 | uri : URI | ApacheHttpSSRFVersion5.java:348:40:348:53 | toString(...) | provenance | MaD:287 Sink:MaD:190 |
+| ApacheHttpSSRFVersion5.java:351:39:351:41 | uri : URI | ApacheHttpSSRFVersion5.java:351:39:351:52 | toString(...) | provenance | MaD:287 Sink:MaD:192 |
+| ApacheHttpSSRFVersion5.java:356:48:356:50 | uri : URI | ApacheHttpSSRFVersion5.java:356:48:356:61 | toString(...) | provenance | MaD:287 Sink:MaD:205 |
+| ApacheHttpSSRFVersion5.java:359:41:359:43 | uri : URI | ApacheHttpSSRFVersion5.java:359:41:359:54 | toString(...) | provenance | MaD:287 Sink:MaD:194 |
 | ApacheHttpSSRFVersion5.java:372:30:372:56 | getParameter(...) : String | ApacheHttpSSRFVersion5.java:373:31:373:37 | uriSink : String | provenance | Src:MaD:277  |
 | ApacheHttpSSRFVersion5.java:373:23:373:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:380:57:380:59 | uri | provenance | Sink:MaD:197 |
 | ApacheHttpSSRFVersion5.java:373:23:373:38 | new URI(...) : URI | ApacheHttpSSRFVersion5.java:382:51:382:53 | uri | provenance | Sink:MaD:199 |
@@ -683,7 +683,7 @@ edges
 | ApacheHttpSSRFVersion5.java:376:29:376:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:381:51:381:54 | host | provenance | Sink:MaD:198 |
 | ApacheHttpSSRFVersion5.java:376:29:376:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:385:50:385:53 | host | provenance | Sink:MaD:200 |
 | ApacheHttpSSRFVersion5.java:376:29:376:50 | new HttpHost(...) : HttpHost | ApacheHttpSSRFVersion5.java:387:44:387:47 | host | provenance | Sink:MaD:202 |
-| ApacheHttpSSRFVersion5.java:376:42:376:49 | hostSink : String | ApacheHttpSSRFVersion5.java:376:29:376:50 | new HttpHost(...) : HttpHost | provenance | MaD:294 |
+| ApacheHttpSSRFVersion5.java:376:42:376:49 | hostSink : String | ApacheHttpSSRFVersion5.java:376:29:376:50 | new HttpHost(...) : HttpHost | provenance | MaD:295 |
 | JakartaWsSSRF.java:14:22:14:48 | getParameter(...) : String | JakartaWsSSRF.java:15:23:15:25 | url | provenance | Src:MaD:277 Sink:MaD:3 |
 | JavaNetHttpSSRF.java:25:27:25:53 | getParameter(...) : String | JavaNetHttpSSRF.java:26:31:26:34 | sink : String | provenance | Src:MaD:277  |
 | JavaNetHttpSSRF.java:26:23:26:35 | new URI(...) : URI | JavaNetHttpSSRF.java:39:59:39:61 | uri | provenance | Sink:MaD:6 |
@@ -692,12 +692,13 @@ edges
 | JavaNetHttpSSRF.java:26:31:26:34 | sink : String | JavaNetHttpSSRF.java:27:40:27:43 | sink : String | provenance |  |
 | JavaNetHttpSSRF.java:27:24:27:57 | new URI(...) : URI | JavaNetHttpSSRF.java:38:65:38:68 | uri2 | provenance | Sink:MaD:5 |
 | JavaNetHttpSSRF.java:27:40:27:43 | sink : String | JavaNetHttpSSRF.java:27:24:27:57 | new URI(...) : URI | provenance | Config |
+| JavaNetHttpSSRF.java:27:40:27:43 | sink : String | JavaNetHttpSSRF.java:27:24:27:57 | new URI(...) : URI | provenance | MaD:286 |
 | JavaNetHttpSSRF.java:27:40:27:43 | sink : String | JavaNetHttpSSRF.java:28:32:28:35 | sink : String | provenance |  |
 | JavaNetHttpSSRF.java:28:24:28:36 | new URL(...) : URL | JavaNetHttpSSRF.java:30:32:30:35 | url1 | provenance | Sink:MaD:9 |
 | JavaNetHttpSSRF.java:28:24:28:36 | new URL(...) : URL | JavaNetHttpSSRF.java:33:32:33:35 | url1 | provenance | Sink:MaD:9 |
 | JavaNetHttpSSRF.java:28:24:28:36 | new URL(...) : URL | JavaNetHttpSSRF.java:34:30:34:33 | url1 | provenance | Sink:MaD:10 |
 | JavaNetHttpSSRF.java:28:32:28:35 | sink : String | JavaNetHttpSSRF.java:28:24:28:36 | new URL(...) : URL | provenance | Config |
-| JavaNetHttpSSRF.java:28:32:28:35 | sink : String | JavaNetHttpSSRF.java:28:24:28:36 | new URL(...) : URL | provenance | MaD:288 |
+| JavaNetHttpSSRF.java:28:32:28:35 | sink : String | JavaNetHttpSSRF.java:28:24:28:36 | new URL(...) : URL | provenance | MaD:289 |
 | JaxWsSSRF.java:14:22:14:48 | getParameter(...) : String | JaxWsSSRF.java:15:23:15:25 | url | provenance | Src:MaD:277 Sink:MaD:23 |
 | JdbcUrlSSRF.java:21:26:21:56 | getParameter(...) : String | JdbcUrlSSRF.java:26:28:26:34 | jdbcUrl | provenance | Src:MaD:277 Sink:MaD:17 |
 | JdbcUrlSSRF.java:21:26:21:56 | getParameter(...) : String | JdbcUrlSSRF.java:28:41:28:47 | jdbcUrl | provenance | Src:MaD:277 Sink:MaD:18 |
@@ -710,7 +711,7 @@ edges
 | JdbcUrlSSRF.java:52:9:52:13 | props : Properties | JdbcUrlSSRF.java:54:49:54:53 | props | provenance | Sink:MaD:1 |
 | JdbcUrlSSRF.java:52:9:52:13 | props [post update] : Properties [<map.value>] : String | JdbcUrlSSRF.java:54:49:54:53 | props | provenance | Sink:MaD:1 |
 | JdbcUrlSSRF.java:52:38:52:44 | jdbcUrl : String | JdbcUrlSSRF.java:52:9:52:13 | props : Properties | provenance | Config |
-| JdbcUrlSSRF.java:52:38:52:44 | jdbcUrl : String | JdbcUrlSSRF.java:52:9:52:13 | props [post update] : Properties [<map.value>] : String | provenance | MaD:293 |
+| JdbcUrlSSRF.java:52:38:52:44 | jdbcUrl : String | JdbcUrlSSRF.java:52:9:52:13 | props [post update] : Properties [<map.value>] : String | provenance | MaD:294 |
 | JdbcUrlSSRF.java:60:26:60:56 | getParameter(...) : String | JdbcUrlSSRF.java:65:27:65:33 | jdbcUrl | provenance | Src:MaD:277 Sink:MaD:257 |
 | JdbcUrlSSRF.java:60:26:60:56 | getParameter(...) : String | JdbcUrlSSRF.java:67:75:67:81 | jdbcUrl | provenance | Src:MaD:277 Sink:MaD:258 |
 | JdbcUrlSSRF.java:60:26:60:56 | getParameter(...) : String | JdbcUrlSSRF.java:70:75:70:81 | jdbcUrl | provenance | Src:MaD:277 Sink:MaD:260 |
@@ -842,11 +843,11 @@ edges
 | SanitizationTests.java:177:62:177:112 | getFromList(...) : String | SanitizationTests.java:177:54:177:113 | new URI(...) | provenance | MaD:285 Sink:MaD:6 |
 | SanitizationTests.java:177:62:177:112 | getFromList(...) : String | SanitizationTests.java:177:54:177:113 | new URI(...) : URI | provenance | Config |
 | SanitizationTests.java:177:62:177:112 | getFromList(...) : String | SanitizationTests.java:177:54:177:113 | new URI(...) : URI | provenance | MaD:285 |
-| SanitizationTests.java:177:74:177:111 | of(...) : List [<element>] : String | SanitizationTests.java:177:62:177:112 | getFromList(...) : String | provenance | MaD:290 |
+| SanitizationTests.java:177:74:177:111 | of(...) : List [<element>] : String | SanitizationTests.java:177:62:177:112 | getFromList(...) : String | provenance | MaD:291 |
 | SanitizationTests.java:177:74:177:111 | of(...) : List [<element>] : String | SanitizationTests.java:199:31:199:112 | list : List [<element>] : String | provenance |  |
-| SanitizationTests.java:177:82:177:110 | getParameter(...) : String | SanitizationTests.java:177:74:177:111 | of(...) : List [<element>] : String | provenance | Src:MaD:277 MaD:289 |
+| SanitizationTests.java:177:82:177:110 | getParameter(...) : String | SanitizationTests.java:177:74:177:111 | of(...) : List [<element>] : String | provenance | Src:MaD:277 MaD:290 |
 | SanitizationTests.java:199:31:199:112 | list : List [<element>] : String | SanitizationTests.java:200:16:200:19 | list : List [<element>] : String | provenance |  |
-| SanitizationTests.java:200:16:200:19 | list : List [<element>] : String | SanitizationTests.java:200:16:200:26 | get(...) : String | provenance | MaD:290 |
+| SanitizationTests.java:200:16:200:19 | list : List [<element>] : String | SanitizationTests.java:200:16:200:26 | get(...) : String | provenance | MaD:291 |
 | SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:32:39:32:59 | ... + ... | provenance | Src:MaD:277 Sink:MaD:264 |
 | SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:33:69:33:82 | fooResourceUrl | provenance | Src:MaD:277  |
 | SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:34:73:34:86 | fooResourceUrl | provenance | Src:MaD:277  |
@@ -878,16 +879,16 @@ edges
 | SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:82:107:82:120 | fooResourceUrl : String | provenance | Src:MaD:277  |
 | SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:84:129:84:142 | fooResourceUrl : String | provenance | Src:MaD:277  |
 | SpringSSRF.java:28:33:28:60 | getParameter(...) : String | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | provenance | Src:MaD:277  |
-| SpringSSRF.java:38:83:38:96 | fooResourceUrl : String | SpringSSRF.java:38:69:38:97 | of(...) | provenance | MaD:291 |
-| SpringSSRF.java:40:105:40:118 | fooResourceUrl : String | SpringSSRF.java:40:69:40:119 | of(...) | provenance | MaD:292 |
-| SpringSSRF.java:49:105:49:118 | fooResourceUrl : String | SpringSSRF.java:49:91:49:119 | of(...) | provenance | MaD:291 |
-| SpringSSRF.java:51:127:51:140 | fooResourceUrl : String | SpringSSRF.java:51:91:51:141 | of(...) | provenance | MaD:292 |
-| SpringSSRF.java:60:93:60:106 | fooResourceUrl : String | SpringSSRF.java:60:79:60:107 | of(...) | provenance | MaD:291 |
-| SpringSSRF.java:62:115:62:128 | fooResourceUrl : String | SpringSSRF.java:62:79:62:129 | of(...) | provenance | MaD:292 |
-| SpringSSRF.java:71:83:71:96 | fooResourceUrl : String | SpringSSRF.java:71:69:71:97 | of(...) | provenance | MaD:291 |
-| SpringSSRF.java:73:105:73:118 | fooResourceUrl : String | SpringSSRF.java:73:69:73:119 | of(...) | provenance | MaD:292 |
-| SpringSSRF.java:82:107:82:120 | fooResourceUrl : String | SpringSSRF.java:82:93:82:121 | of(...) | provenance | MaD:291 |
-| SpringSSRF.java:84:129:84:142 | fooResourceUrl : String | SpringSSRF.java:84:93:84:143 | of(...) | provenance | MaD:292 |
+| SpringSSRF.java:38:83:38:96 | fooResourceUrl : String | SpringSSRF.java:38:69:38:97 | of(...) | provenance | MaD:292 |
+| SpringSSRF.java:40:105:40:118 | fooResourceUrl : String | SpringSSRF.java:40:69:40:119 | of(...) | provenance | MaD:293 |
+| SpringSSRF.java:49:105:49:118 | fooResourceUrl : String | SpringSSRF.java:49:91:49:119 | of(...) | provenance | MaD:292 |
+| SpringSSRF.java:51:127:51:140 | fooResourceUrl : String | SpringSSRF.java:51:91:51:141 | of(...) | provenance | MaD:293 |
+| SpringSSRF.java:60:93:60:106 | fooResourceUrl : String | SpringSSRF.java:60:79:60:107 | of(...) | provenance | MaD:292 |
+| SpringSSRF.java:62:115:62:128 | fooResourceUrl : String | SpringSSRF.java:62:79:62:129 | of(...) | provenance | MaD:293 |
+| SpringSSRF.java:71:83:71:96 | fooResourceUrl : String | SpringSSRF.java:71:69:71:97 | of(...) | provenance | MaD:292 |
+| SpringSSRF.java:73:105:73:118 | fooResourceUrl : String | SpringSSRF.java:73:69:73:119 | of(...) | provenance | MaD:293 |
+| SpringSSRF.java:82:107:82:120 | fooResourceUrl : String | SpringSSRF.java:82:93:82:121 | of(...) | provenance | MaD:292 |
+| SpringSSRF.java:84:129:84:142 | fooResourceUrl : String | SpringSSRF.java:84:93:84:143 | of(...) | provenance | MaD:293 |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:87:40:87:62 | new URI(...) | provenance | Config Sink:MaD:269 |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:87:40:87:62 | new URI(...) | provenance | MaD:285 Sink:MaD:269 |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:88:92:88:105 | fooResourceUrl | provenance |  |
@@ -932,20 +933,20 @@ edges
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:159:72:159:85 | fooResourceUrl : String | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:161:94:161:107 | fooResourceUrl : String | provenance |  |
 | SpringSSRF.java:87:48:87:61 | fooResourceUrl : String | SpringSSRF.java:166:35:166:48 | fooResourceUrl : String | provenance |  |
-| SpringSSRF.java:93:106:93:119 | fooResourceUrl : String | SpringSSRF.java:93:92:93:120 | of(...) | provenance | MaD:291 |
-| SpringSSRF.java:95:128:95:141 | fooResourceUrl : String | SpringSSRF.java:95:92:95:142 | of(...) | provenance | MaD:292 |
-| SpringSSRF.java:104:94:104:107 | fooResourceUrl : String | SpringSSRF.java:104:80:104:108 | of(...) | provenance | MaD:291 |
-| SpringSSRF.java:106:116:106:129 | fooResourceUrl : String | SpringSSRF.java:106:80:106:130 | of(...) | provenance | MaD:292 |
-| SpringSSRF.java:115:106:115:119 | fooResourceUrl : String | SpringSSRF.java:115:92:115:120 | of(...) | provenance | MaD:291 |
-| SpringSSRF.java:117:128:117:141 | fooResourceUrl : String | SpringSSRF.java:117:92:117:142 | of(...) | provenance | MaD:292 |
-| SpringSSRF.java:126:82:126:95 | fooResourceUrl : String | SpringSSRF.java:126:68:126:96 | of(...) | provenance | MaD:291 |
-| SpringSSRF.java:128:104:128:117 | fooResourceUrl : String | SpringSSRF.java:128:68:128:118 | of(...) | provenance | MaD:292 |
-| SpringSSRF.java:137:63:137:76 | fooResourceUrl : String | SpringSSRF.java:137:49:137:77 | of(...) | provenance | MaD:291 |
-| SpringSSRF.java:139:85:139:98 | fooResourceUrl : String | SpringSSRF.java:139:49:139:99 | of(...) | provenance | MaD:292 |
-| SpringSSRF.java:148:71:148:84 | fooResourceUrl : String | SpringSSRF.java:148:57:148:85 | of(...) | provenance | MaD:291 |
-| SpringSSRF.java:150:93:150:106 | fooResourceUrl : String | SpringSSRF.java:150:57:150:107 | of(...) | provenance | MaD:292 |
-| SpringSSRF.java:159:72:159:85 | fooResourceUrl : String | SpringSSRF.java:159:58:159:86 | of(...) | provenance | MaD:291 |
-| SpringSSRF.java:161:94:161:107 | fooResourceUrl : String | SpringSSRF.java:161:58:161:108 | of(...) | provenance | MaD:292 |
+| SpringSSRF.java:93:106:93:119 | fooResourceUrl : String | SpringSSRF.java:93:92:93:120 | of(...) | provenance | MaD:292 |
+| SpringSSRF.java:95:128:95:141 | fooResourceUrl : String | SpringSSRF.java:95:92:95:142 | of(...) | provenance | MaD:293 |
+| SpringSSRF.java:104:94:104:107 | fooResourceUrl : String | SpringSSRF.java:104:80:104:108 | of(...) | provenance | MaD:292 |
+| SpringSSRF.java:106:116:106:129 | fooResourceUrl : String | SpringSSRF.java:106:80:106:130 | of(...) | provenance | MaD:293 |
+| SpringSSRF.java:115:106:115:119 | fooResourceUrl : String | SpringSSRF.java:115:92:115:120 | of(...) | provenance | MaD:292 |
+| SpringSSRF.java:117:128:117:141 | fooResourceUrl : String | SpringSSRF.java:117:92:117:142 | of(...) | provenance | MaD:293 |
+| SpringSSRF.java:126:82:126:95 | fooResourceUrl : String | SpringSSRF.java:126:68:126:96 | of(...) | provenance | MaD:292 |
+| SpringSSRF.java:128:104:128:117 | fooResourceUrl : String | SpringSSRF.java:128:68:128:118 | of(...) | provenance | MaD:293 |
+| SpringSSRF.java:137:63:137:76 | fooResourceUrl : String | SpringSSRF.java:137:49:137:77 | of(...) | provenance | MaD:292 |
+| SpringSSRF.java:139:85:139:98 | fooResourceUrl : String | SpringSSRF.java:139:49:139:99 | of(...) | provenance | MaD:293 |
+| SpringSSRF.java:148:71:148:84 | fooResourceUrl : String | SpringSSRF.java:148:57:148:85 | of(...) | provenance | MaD:292 |
+| SpringSSRF.java:150:93:150:106 | fooResourceUrl : String | SpringSSRF.java:150:57:150:107 | of(...) | provenance | MaD:293 |
+| SpringSSRF.java:159:72:159:85 | fooResourceUrl : String | SpringSSRF.java:159:58:159:86 | of(...) | provenance | MaD:292 |
+| SpringSSRF.java:161:94:161:107 | fooResourceUrl : String | SpringSSRF.java:161:58:161:108 | of(...) | provenance | MaD:293 |
 | SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:168:44:168:46 | uri | provenance | Sink:MaD:255 |
 | SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:170:35:170:37 | uri | provenance | Sink:MaD:250 |
 | SpringSSRF.java:166:27:166:49 | new URI(...) : URI | SpringSSRF.java:171:35:171:37 | uri | provenance | Sink:MaD:256 |
@@ -971,7 +972,7 @@ edges
 | URLClassLoaderSSRF.java:17:31:17:33 | url : String | URLClassLoaderSSRF.java:17:23:17:34 | new URI(...) : URI | provenance | MaD:285 |
 | URLClassLoaderSSRF.java:18:64:18:85 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:18:64:18:85 | new URL[] | provenance | Sink:MaD:13 |
 | URLClassLoaderSSRF.java:18:64:18:85 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:18:64:18:85 | new URL[] | provenance | Sink:MaD:13 |
-| URLClassLoaderSSRF.java:18:74:18:76 | uri : URI | URLClassLoaderSSRF.java:18:74:18:84 | toURL(...) : URL | provenance | MaD:287 |
+| URLClassLoaderSSRF.java:18:74:18:76 | uri : URI | URLClassLoaderSSRF.java:18:74:18:84 | toURL(...) : URL | provenance | MaD:288 |
 | URLClassLoaderSSRF.java:18:74:18:84 | toURL(...) : URL | URLClassLoaderSSRF.java:18:64:18:85 | {...} : URL[] [[]] : URL | provenance |  |
 | URLClassLoaderSSRF.java:28:26:28:52 | getParameter(...) : String | URLClassLoaderSSRF.java:29:31:29:33 | url : String | provenance | Src:MaD:277  |
 | URLClassLoaderSSRF.java:29:23:29:34 | new URI(...) : URI | URLClassLoaderSSRF.java:30:74:30:76 | uri : URI | provenance |  |
@@ -979,7 +980,7 @@ edges
 | URLClassLoaderSSRF.java:29:31:29:33 | url : String | URLClassLoaderSSRF.java:29:23:29:34 | new URI(...) : URI | provenance | MaD:285 |
 | URLClassLoaderSSRF.java:30:64:30:85 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:30:64:30:85 | new URL[] | provenance | Sink:MaD:14 |
 | URLClassLoaderSSRF.java:30:64:30:85 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:30:64:30:85 | new URL[] | provenance | Sink:MaD:14 |
-| URLClassLoaderSSRF.java:30:74:30:76 | uri : URI | URLClassLoaderSSRF.java:30:74:30:84 | toURL(...) : URL | provenance | MaD:287 |
+| URLClassLoaderSSRF.java:30:74:30:76 | uri : URI | URLClassLoaderSSRF.java:30:74:30:84 | toURL(...) : URL | provenance | MaD:288 |
 | URLClassLoaderSSRF.java:30:74:30:84 | toURL(...) : URL | URLClassLoaderSSRF.java:30:64:30:85 | {...} : URL[] [[]] : URL | provenance |  |
 | URLClassLoaderSSRF.java:40:26:40:52 | getParameter(...) : String | URLClassLoaderSSRF.java:41:31:41:33 | url : String | provenance | Src:MaD:277  |
 | URLClassLoaderSSRF.java:41:23:41:34 | new URI(...) : URI | URLClassLoaderSSRF.java:44:74:44:76 | uri : URI | provenance |  |
@@ -987,14 +988,14 @@ edges
 | URLClassLoaderSSRF.java:41:31:41:33 | url : String | URLClassLoaderSSRF.java:41:23:41:34 | new URI(...) : URI | provenance | MaD:285 |
 | URLClassLoaderSSRF.java:44:64:44:85 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:44:64:44:85 | new URL[] | provenance | Sink:MaD:15 |
 | URLClassLoaderSSRF.java:44:64:44:85 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:44:64:44:85 | new URL[] | provenance | Sink:MaD:15 |
-| URLClassLoaderSSRF.java:44:74:44:76 | uri : URI | URLClassLoaderSSRF.java:44:74:44:84 | toURL(...) : URL | provenance | MaD:287 |
+| URLClassLoaderSSRF.java:44:74:44:76 | uri : URI | URLClassLoaderSSRF.java:44:74:44:84 | toURL(...) : URL | provenance | MaD:288 |
 | URLClassLoaderSSRF.java:44:74:44:84 | toURL(...) : URL | URLClassLoaderSSRF.java:44:64:44:85 | {...} : URL[] [[]] : URL | provenance |  |
 | URLClassLoaderSSRF.java:54:26:54:52 | getParameter(...) : String | URLClassLoaderSSRF.java:55:31:55:33 | url : String | provenance | Src:MaD:277  |
 | URLClassLoaderSSRF.java:55:23:55:34 | new URI(...) : URI | URLClassLoaderSSRF.java:56:82:56:84 | uri : URI | provenance |  |
 | URLClassLoaderSSRF.java:55:31:55:33 | url : String | URLClassLoaderSSRF.java:55:23:55:34 | new URI(...) : URI | provenance | Config |
 | URLClassLoaderSSRF.java:55:31:55:33 | url : String | URLClassLoaderSSRF.java:55:23:55:34 | new URI(...) : URI | provenance | MaD:285 |
 | URLClassLoaderSSRF.java:56:72:56:93 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:56:72:56:93 | new URL[] | provenance | Sink:MaD:16 |
-| URLClassLoaderSSRF.java:56:82:56:84 | uri : URI | URLClassLoaderSSRF.java:56:82:56:92 | toURL(...) : URL | provenance | MaD:287 |
+| URLClassLoaderSSRF.java:56:82:56:84 | uri : URI | URLClassLoaderSSRF.java:56:82:56:92 | toURL(...) : URL | provenance | MaD:288 |
 | URLClassLoaderSSRF.java:56:82:56:92 | toURL(...) : URL | URLClassLoaderSSRF.java:56:72:56:93 | {...} : URL[] [[]] : URL | provenance |  |
 | URLClassLoaderSSRF.java:66:26:66:52 | getParameter(...) : String | URLClassLoaderSSRF.java:67:31:67:33 | url : String | provenance | Src:MaD:277  |
 | URLClassLoaderSSRF.java:67:23:67:34 | new URI(...) : URI | URLClassLoaderSSRF.java:70:31:70:33 | uri : URI | provenance |  |
@@ -1002,7 +1003,7 @@ edges
 | URLClassLoaderSSRF.java:67:31:67:33 | url : String | URLClassLoaderSSRF.java:67:23:67:34 | new URI(...) : URI | provenance | MaD:285 |
 | URLClassLoaderSSRF.java:70:21:70:42 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:70:21:70:42 | new URL[] | provenance | Sink:MaD:11 |
 | URLClassLoaderSSRF.java:70:21:70:42 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:70:21:70:42 | new URL[] | provenance | Sink:MaD:11 |
-| URLClassLoaderSSRF.java:70:31:70:33 | uri : URI | URLClassLoaderSSRF.java:70:31:70:41 | toURL(...) : URL | provenance | MaD:287 |
+| URLClassLoaderSSRF.java:70:31:70:33 | uri : URI | URLClassLoaderSSRF.java:70:31:70:41 | toURL(...) : URL | provenance | MaD:288 |
 | URLClassLoaderSSRF.java:70:31:70:41 | toURL(...) : URL | URLClassLoaderSSRF.java:70:21:70:42 | {...} : URL[] [[]] : URL | provenance |  |
 | URLClassLoaderSSRF.java:83:26:83:52 | getParameter(...) : String | URLClassLoaderSSRF.java:84:31:84:33 | url : String | provenance | Src:MaD:277  |
 | URLClassLoaderSSRF.java:84:23:84:34 | new URI(...) : URI | URLClassLoaderSSRF.java:89:31:89:33 | uri : URI | provenance |  |
@@ -1010,7 +1011,7 @@ edges
 | URLClassLoaderSSRF.java:84:31:84:33 | url : String | URLClassLoaderSSRF.java:84:23:84:34 | new URI(...) : URI | provenance | MaD:285 |
 | URLClassLoaderSSRF.java:89:21:89:42 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:89:21:89:42 | new URL[] | provenance | Sink:MaD:12 |
 | URLClassLoaderSSRF.java:89:21:89:42 | {...} : URL[] [[]] : URL | URLClassLoaderSSRF.java:89:21:89:42 | new URL[] | provenance | Sink:MaD:12 |
-| URLClassLoaderSSRF.java:89:31:89:33 | uri : URI | URLClassLoaderSSRF.java:89:31:89:41 | toURL(...) : URL | provenance | MaD:287 |
+| URLClassLoaderSSRF.java:89:31:89:33 | uri : URI | URLClassLoaderSSRF.java:89:31:89:41 | toURL(...) : URL | provenance | MaD:288 |
 | URLClassLoaderSSRF.java:89:31:89:41 | toURL(...) : URL | URLClassLoaderSSRF.java:89:21:89:42 | {...} : URL[] [[]] : URL | provenance |  |
 | mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:31:40:31:47 | source(...) : String | provenance | Src:MaD:277  |
 | mad/Test.java:26:16:26:41 | getParameter(...) : String | mad/Test.java:36:16:36:23 | source(...) : String | provenance | Src:MaD:277  |
@@ -1363,16 +1364,17 @@ models
 | 283 | Summary: java.net.http; HttpRequest$Builder; true; build; (); ; Argument[this]; ReturnValue; taint; df-generated |
 | 284 | Summary: java.net.http; HttpRequest; true; newBuilder; (URI); ; Argument[0]; ReturnValue; taint; df-generated |
 | 285 | Summary: java.net; URI; false; URI; (String); ; Argument[0]; Argument[this]; taint; manual |
-| 286 | Summary: java.net; URI; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
-| 287 | Summary: java.net; URI; false; toURL; ; ; Argument[this]; ReturnValue; taint; manual |
-| 288 | Summary: java.net; URL; false; URL; (String); ; Argument[0]; Argument[this]; taint; manual |
-| 289 | Summary: java.util; List; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
-| 290 | Summary: java.util; List; true; get; (int); ; Argument[this].Element; ReturnValue; value; manual |
-| 291 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
-| 292 | Summary: java.util; Map; false; of; ; ; Argument[3]; ReturnValue.MapValue; value; manual |
-| 293 | Summary: java.util; Properties; true; setProperty; (String,String); ; Argument[1]; Argument[this].MapValue; value; manual |
-| 294 | Summary: org.apache.hc.core5.http; HttpHost; true; HttpHost; (String); ; Argument[0]; Argument[this]; taint; hq-manual |
-| 295 | Summary: org.apache.http.message; BasicRequestLine; false; BasicRequestLine; ; ; Argument[1]; Argument[this]; taint; manual |
+| 286 | Summary: java.net; URI; false; URI; (String,String,String); ; Argument[1]; Argument[this]; taint; ai-manual |
+| 287 | Summary: java.net; URI; false; toString; ; ; Argument[this]; ReturnValue; taint; manual |
+| 288 | Summary: java.net; URI; false; toURL; ; ; Argument[this]; ReturnValue; taint; manual |
+| 289 | Summary: java.net; URL; false; URL; (String); ; Argument[0]; Argument[this]; taint; manual |
+| 290 | Summary: java.util; List; false; of; (Object); ; Argument[0]; ReturnValue.Element; value; manual |
+| 291 | Summary: java.util; List; true; get; (int); ; Argument[this].Element; ReturnValue; value; manual |
+| 292 | Summary: java.util; Map; false; of; ; ; Argument[1]; ReturnValue.MapValue; value; manual |
+| 293 | Summary: java.util; Map; false; of; ; ; Argument[3]; ReturnValue.MapValue; value; manual |
+| 294 | Summary: java.util; Properties; true; setProperty; (String,String); ; Argument[1]; Argument[this].MapValue; value; manual |
+| 295 | Summary: org.apache.hc.core5.http; HttpHost; true; HttpHost; (String); ; Argument[0]; Argument[this]; taint; hq-manual |
+| 296 | Summary: org.apache.http.message; BasicRequestLine; false; BasicRequestLine; ; ; Argument[1]; Argument[this]; taint; manual |
 nodes
 | ApacheHttpSSRF.java:27:27:27:53 | getParameter(...) : String | semmle.label | getParameter(...) : String |
 | ApacheHttpSSRF.java:28:23:28:35 | new URI(...) : URI | semmle.label | new URI(...) : URI |
diff --git a/java/ql/test/query-tests/security/CWE-927/SensitiveResultReceiver.java b/java/ql/test/query-tests/security/CWE-927/SensitiveResultReceiver.java
index eb673b635c1..24764f7a149 100644
--- a/java/ql/test/query-tests/security/CWE-927/SensitiveResultReceiver.java
+++ b/java/ql/test/query-tests/security/CWE-927/SensitiveResultReceiver.java
@@ -10,6 +10,6 @@ class SensitiveResultReceiver {
         ResultReceiver rec = intent.getParcelableExtra("hi");
         Bundle b = new Bundle();
         b.putCharSequence("pass", password);
-        rec.send(0, b); // $hasSensitiveResultReceiver
+        rec.send(0, b); // $ hasSensitiveResultReceiver
     }
-}
\ No newline at end of file
+}
diff --git a/javascript/downgrades/26a123164be893893e2aa0374d820785decf55af/old.dbscheme b/javascript/downgrades/26a123164be893893e2aa0374d820785decf55af/old.dbscheme
new file mode 100644
index 00000000000..26a123164be
--- /dev/null
+++ b/javascript/downgrades/26a123164be893893e2aa0374d820785decf55af/old.dbscheme
@@ -0,0 +1,1217 @@
+/*** 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 | @this_expr;
+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);
+has_defer_keyword (int id: @import_declaration 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 -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
diff --git a/javascript/downgrades/26a123164be893893e2aa0374d820785decf55af/semmlecode.javascript.dbscheme b/javascript/downgrades/26a123164be893893e2aa0374d820785decf55af/semmlecode.javascript.dbscheme
new file mode 100644
index 00000000000..578367e82a2
--- /dev/null
+++ b/javascript/downgrades/26a123164be893893e2aa0374d820785decf55af/semmlecode.javascript.dbscheme
@@ -0,0 +1,1217 @@
+/*** 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);
+has_defer_keyword (int id: @import_declaration 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 -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
diff --git a/javascript/downgrades/26a123164be893893e2aa0374d820785decf55af/upgrade.properties b/javascript/downgrades/26a123164be893893e2aa0374d820785decf55af/upgrade.properties
new file mode 100644
index 00000000000..a083a5559da
--- /dev/null
+++ b/javascript/downgrades/26a123164be893893e2aa0374d820785decf55af/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add variable bindings for 'this'
+compatibility: partial
diff --git a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
index a2f006e3239..b4739b061fb 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/ASTExtractor.java
@@ -819,6 +819,7 @@ public class ASTExtractor {
       // add all declared global (or module-scoped) names, both non-lexical and lexical
       scopeManager.addNames(scopeManager.collectDeclaredNames(nd, isStrict, false, DeclKind.none));
       scopeManager.addNames(scopeManager.collectDeclaredNames(nd, isStrict, true, DeclKind.none));
+      scopeManager.addVariables("this");
 
       visitAll(nd.getBody(), toplevelLabel);
 
@@ -1070,6 +1071,9 @@ public class ASTExtractor {
 
       scopeManager.enterScope((Node) nd);
       scopeManager.addNames(locals);
+      if (!(nd instanceof ArrowFunctionExpression)) {
+        scopeManager.addVariables("this");
+      }
 
       // The name of a function expression binds to its own scope.
       if (nd.getId() != null && nd instanceof AFunctionExpression) {
@@ -1541,8 +1545,9 @@ public class ASTExtractor {
       if (!isClassExpression) {
         visit(ac.getId(), key, 0, IdContext.VAR_AND_TYPE_DECL);
       }
+      scopeManager.enterScope(scopeNode);
+      scopeManager.addVariables("this"); // 'this' in static field initialiers refers to the class
       if (ac.hasId() || ac.hasTypeParameters()) {
-        scopeManager.enterScope(scopeNode);
         if (isClassExpression && ac.hasId()) {
           scopeManager.addVariables(ac.getId().getName());
           scopeManager.addTypeName(ac.getId().getName());
@@ -1565,9 +1570,7 @@ public class ASTExtractor {
         addDefaultConstructor(ac);
       }
       visit(ac.getBody(), key, 2);
-      if (ac.hasId() || ac.hasTypeParameters()) {
-        scopeManager.leaveScope();
-      }
+      scopeManager.leaveScope();
       emitNodeSymbol(ac, key);
       return key;
     }
@@ -1893,6 +1896,15 @@ public class ASTExtractor {
       return visit((ThisExpression) nd, c);
     }
 
+    @Override
+    public Label visit(ThisExpression nd, Context c) {
+      Label key = super.visit(nd, c);
+      if (c.idcontext == IdContext.VAR_BIND || c.idcontext == IdContext.VAR_IN_TYPE_BIND) {
+        addVariableBinding("bind", key, "this");
+      }
+      return key;
+    }
+
     @Override
     public Label visit(JSXMemberExpression nd, Context c) {
       Label key = super.visit(nd, c);
diff --git a/javascript/extractor/src/com/semmle/js/extractor/FileExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/FileExtractor.java
index 9cf5c3b295c..70d6677855d 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/FileExtractor.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/FileExtractor.java
@@ -28,13 +28,13 @@ import com.semmle.util.trap.TrapWriter.Label;
  */
 public class FileExtractor {
   /**
-   * Pattern to use on the shebang line of a script to identify whether it is a Node.js script.
+   * Pattern to use on the shebang line of a script to identify whether it is a JavaScript script.
    *
-   * <p>There are many different ways of invoking the Node.js interpreter (directly, through {@code
+   * <p>There are many different ways of invoking a JavaScript interpreter (directly, through {@code
    * env}, with or without flags, with or without modified environment, etc.), so we simply look for
-   * the word {@code "node"} or {@code "nodejs"}.
+   * the word {@code "node"}, {@code "nodejs"}, {@code "bun"}, or {@code "tsx"}.
    */
-  private static final Pattern NODE_INVOCATION = Pattern.compile("\\bnode(js)?\\b");
+  private static final Pattern JS_INVOCATION = Pattern.compile("\\b(node(js)?|bun|tsx)\\b");
 
   /** A pattern that matches strings starting with `{ "...":`, suggesting JSON data. */
   public static final Pattern JSON_OBJECT_START =
@@ -157,7 +157,7 @@ public class FileExtractor {
             // do a cheap check first
             if (firstLine != null && firstLine.startsWith("#!")) {
               // now do the slightly more expensive one
-              return NODE_INVOCATION.matcher(firstLine).find();
+              return JS_INVOCATION.matcher(firstLine).find();
             }
           } catch (IOException e) {
             Exceptions.ignore(e, "We simply skip this file.");
@@ -302,7 +302,7 @@ public class FileExtractor {
         int lengthOfText = endOfLine - startOfText;
         String text = new String(bytes, startOfText, lengthOfText, StandardCharsets.UTF_8);
         // Check if the shebang is a recognized JavaScript intepreter.
-        return !NODE_INVOCATION.matcher(text).find();
+        return !JS_INVOCATION.matcher(text).find();
       }
 
       @Override
diff --git a/javascript/extractor/tests/cfg/output/trap/classexpr1.js.trap b/javascript/extractor/tests/cfg/output/trap/classexpr1.js.trap
index 36170d46ce6..284da7fca62 100644
--- a/javascript/extractor/tests/cfg/output/trap/classexpr1.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/classexpr1.js.trap
@@ -47,74 +47,84 @@ locations_default(#20015,#10000,1,11,1,10)
 hasLocation(#20014,#20015)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20016=*
-stmts(#20016,2,#20001,0,"!class {};")
-hasLocation(#20016,#20003)
-stmt_containers(#20016,#20001)
+#20016=@"var;{this};{#20000}"
+variables(#20016,"this",#20000)
 #20017=*
-exprs(#20017,18,#20016,0,"!class {}")
-#20018=@"loc,{#10000},1,1,1,9"
-locations_default(#20018,#10000,1,1,1,9)
-hasLocation(#20017,#20018)
-enclosing_stmt(#20017,#20016)
-expr_containers(#20017,#20001)
-#20019=*
-exprs(#20019,80,#20017,0,"class {}")
-#20020=@"loc,{#10000},1,2,1,9"
-locations_default(#20020,#10000,1,2,1,9)
-hasLocation(#20019,#20020)
-enclosing_stmt(#20019,#20016)
-expr_containers(#20019,#20001)
-#20021=*
-properties(#20021,#20019,2,0,"constructor() {}")
-#20022=@"loc,{#10000},1,8,1,7"
-locations_default(#20022,#10000,1,8,1,7)
-hasLocation(#20021,#20022)
-#20023=*
-exprs(#20023,0,#20021,0,"constructor")
-hasLocation(#20023,#20022)
-enclosing_stmt(#20023,#20016)
-expr_containers(#20023,#20001)
-literals("constructor","constructor",#20023)
+stmts(#20017,2,#20001,0,"!class {};")
+hasLocation(#20017,#20003)
+stmt_containers(#20017,#20001)
+#20018=*
+exprs(#20018,18,#20017,0,"!class {}")
+#20019=@"loc,{#10000},1,1,1,9"
+locations_default(#20019,#10000,1,1,1,9)
+hasLocation(#20018,#20019)
+enclosing_stmt(#20018,#20017)
+expr_containers(#20018,#20001)
+#20020=*
+exprs(#20020,80,#20018,0,"class {}")
+#20021=@"loc,{#10000},1,2,1,9"
+locations_default(#20021,#10000,1,2,1,9)
+hasLocation(#20020,#20021)
+enclosing_stmt(#20020,#20017)
+expr_containers(#20020,#20001)
+#20022=*
+scopes(#20022,8)
+scopenodes(#20020,#20022)
+scopenesting(#20022,#20000)
+#20023=@"var;{this};{#20022}"
+variables(#20023,"this",#20022)
 #20024=*
-exprs(#20024,9,#20021,1,"() {}")
-hasLocation(#20024,#20022)
-enclosing_stmt(#20024,#20016)
-expr_containers(#20024,#20001)
-#20025=*
-scopes(#20025,1)
-scopenodes(#20024,#20025)
-scopenesting(#20025,#20000)
-#20026=@"var;{arguments};{#20025}"
-variables(#20026,"arguments",#20025)
-is_arguments_object(#20026)
+properties(#20024,#20020,2,0,"constructor() {}")
+#20025=@"loc,{#10000},1,8,1,7"
+locations_default(#20025,#10000,1,8,1,7)
+hasLocation(#20024,#20025)
+#20026=*
+exprs(#20026,0,#20024,0,"constructor")
+hasLocation(#20026,#20025)
+enclosing_stmt(#20026,#20017)
+expr_containers(#20026,#20001)
+literals("constructor","constructor",#20026)
 #20027=*
-stmts(#20027,1,#20024,-2,"{}")
-hasLocation(#20027,#20022)
-stmt_containers(#20027,#20024)
-is_method(#20021)
+exprs(#20027,9,#20024,1,"() {}")
+hasLocation(#20027,#20025)
+enclosing_stmt(#20027,#20017)
+expr_containers(#20027,#20001)
 #20028=*
-entry_cfg_node(#20028,#20001)
-#20029=@"loc,{#10000},1,1,1,0"
-locations_default(#20029,#10000,1,1,1,0)
-hasLocation(#20028,#20029)
-#20030=*
-exit_cfg_node(#20030,#20001)
-hasLocation(#20030,#20015)
-successor(#20016,#20023)
-successor(#20024,#20021)
+scopes(#20028,1)
+scopenodes(#20027,#20028)
+scopenesting(#20028,#20022)
+#20029=@"var;{this};{#20028}"
+variables(#20029,"this",#20028)
+#20030=@"var;{arguments};{#20028}"
+variables(#20030,"arguments",#20028)
+is_arguments_object(#20030)
 #20031=*
-entry_cfg_node(#20031,#20024)
-hasLocation(#20031,#20022)
+stmts(#20031,1,#20027,-2,"{}")
+hasLocation(#20031,#20025)
+stmt_containers(#20031,#20027)
+is_method(#20024)
 #20032=*
-exit_cfg_node(#20032,#20024)
-hasLocation(#20032,#20022)
-successor(#20027,#20032)
-successor(#20031,#20027)
-successor(#20023,#20024)
-successor(#20021,#20019)
-successor(#20019,#20017)
-successor(#20017,#20030)
-successor(#20028,#20016)
+entry_cfg_node(#20032,#20001)
+#20033=@"loc,{#10000},1,1,1,0"
+locations_default(#20033,#10000,1,1,1,0)
+hasLocation(#20032,#20033)
+#20034=*
+exit_cfg_node(#20034,#20001)
+hasLocation(#20034,#20015)
+successor(#20017,#20026)
+successor(#20027,#20024)
+#20035=*
+entry_cfg_node(#20035,#20027)
+hasLocation(#20035,#20025)
+#20036=*
+exit_cfg_node(#20036,#20027)
+hasLocation(#20036,#20025)
+successor(#20031,#20036)
+successor(#20035,#20031)
+successor(#20026,#20027)
+successor(#20024,#20020)
+successor(#20020,#20018)
+successor(#20018,#20034)
+successor(#20032,#20017)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/cfg/output/trap/classexpr2.js.trap b/javascript/extractor/tests/cfg/output/trap/classexpr2.js.trap
index 7dcf1ca7625..21293800f5c 100644
--- a/javascript/extractor/tests/cfg/output/trap/classexpr2.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/classexpr2.js.trap
@@ -52,91 +52,97 @@ locations_default(#20017,#10000,1,13,1,12)
 hasLocation(#20016,#20017)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20018=*
-stmts(#20018,2,#20001,0,"!class A {};")
-hasLocation(#20018,#20003)
-stmt_containers(#20018,#20001)
+#20018=@"var;{this};{#20000}"
+variables(#20018,"this",#20000)
 #20019=*
-exprs(#20019,18,#20018,0,"!class A {}")
-#20020=@"loc,{#10000},1,1,1,11"
-locations_default(#20020,#10000,1,1,1,11)
-hasLocation(#20019,#20020)
-enclosing_stmt(#20019,#20018)
-expr_containers(#20019,#20001)
-#20021=*
-exprs(#20021,80,#20019,0,"class A {}")
-#20022=@"loc,{#10000},1,2,1,11"
-locations_default(#20022,#10000,1,2,1,11)
-hasLocation(#20021,#20022)
-enclosing_stmt(#20021,#20018)
-expr_containers(#20021,#20001)
-#20023=*
-scopes(#20023,8)
-scopenodes(#20021,#20023)
-scopenesting(#20023,#20000)
-#20024=@"var;{A};{#20023}"
-variables(#20024,"A",#20023)
-#20025=@"local_type_name;{A};{#20023}"
-local_type_names(#20025,"A",#20023)
-#20026=*
-exprs(#20026,78,#20021,0,"A")
-hasLocation(#20026,#20009)
-enclosing_stmt(#20026,#20018)
-expr_containers(#20026,#20001)
-literals("A","A",#20026)
-decl(#20026,#20024)
-typedecl(#20026,#20025)
-#20027=*
-properties(#20027,#20021,2,0,"constructor() {}")
-#20028=@"loc,{#10000},1,10,1,9"
-locations_default(#20028,#10000,1,10,1,9)
-hasLocation(#20027,#20028)
+stmts(#20019,2,#20001,0,"!class A {};")
+hasLocation(#20019,#20003)
+stmt_containers(#20019,#20001)
+#20020=*
+exprs(#20020,18,#20019,0,"!class A {}")
+#20021=@"loc,{#10000},1,1,1,11"
+locations_default(#20021,#10000,1,1,1,11)
+hasLocation(#20020,#20021)
+enclosing_stmt(#20020,#20019)
+expr_containers(#20020,#20001)
+#20022=*
+exprs(#20022,80,#20020,0,"class A {}")
+#20023=@"loc,{#10000},1,2,1,11"
+locations_default(#20023,#10000,1,2,1,11)
+hasLocation(#20022,#20023)
+enclosing_stmt(#20022,#20019)
+expr_containers(#20022,#20001)
+#20024=*
+scopes(#20024,8)
+scopenodes(#20022,#20024)
+scopenesting(#20024,#20000)
+#20025=@"var;{this};{#20024}"
+variables(#20025,"this",#20024)
+#20026=@"var;{A};{#20024}"
+variables(#20026,"A",#20024)
+#20027=@"local_type_name;{A};{#20024}"
+local_type_names(#20027,"A",#20024)
+#20028=*
+exprs(#20028,78,#20022,0,"A")
+hasLocation(#20028,#20009)
+enclosing_stmt(#20028,#20019)
+expr_containers(#20028,#20001)
+literals("A","A",#20028)
+decl(#20028,#20026)
+typedecl(#20028,#20027)
 #20029=*
-exprs(#20029,0,#20027,0,"constructor")
-hasLocation(#20029,#20028)
-enclosing_stmt(#20029,#20018)
-expr_containers(#20029,#20001)
-literals("constructor","constructor",#20029)
-#20030=*
-exprs(#20030,9,#20027,1,"() {}")
-hasLocation(#20030,#20028)
-enclosing_stmt(#20030,#20018)
-expr_containers(#20030,#20001)
+properties(#20029,#20022,2,0,"constructor() {}")
+#20030=@"loc,{#10000},1,10,1,9"
+locations_default(#20030,#10000,1,10,1,9)
+hasLocation(#20029,#20030)
 #20031=*
-scopes(#20031,1)
-scopenodes(#20030,#20031)
-scopenesting(#20031,#20023)
-#20032=@"var;{arguments};{#20031}"
-variables(#20032,"arguments",#20031)
-is_arguments_object(#20032)
+exprs(#20031,0,#20029,0,"constructor")
+hasLocation(#20031,#20030)
+enclosing_stmt(#20031,#20019)
+expr_containers(#20031,#20001)
+literals("constructor","constructor",#20031)
+#20032=*
+exprs(#20032,9,#20029,1,"() {}")
+hasLocation(#20032,#20030)
+enclosing_stmt(#20032,#20019)
+expr_containers(#20032,#20001)
 #20033=*
-stmts(#20033,1,#20030,-2,"{}")
-hasLocation(#20033,#20028)
-stmt_containers(#20033,#20030)
-is_method(#20027)
-#20034=*
-entry_cfg_node(#20034,#20001)
-#20035=@"loc,{#10000},1,1,1,0"
-locations_default(#20035,#10000,1,1,1,0)
-hasLocation(#20034,#20035)
+scopes(#20033,1)
+scopenodes(#20032,#20033)
+scopenesting(#20033,#20024)
+#20034=@"var;{this};{#20033}"
+variables(#20034,"this",#20033)
+#20035=@"var;{arguments};{#20033}"
+variables(#20035,"arguments",#20033)
+is_arguments_object(#20035)
 #20036=*
-exit_cfg_node(#20036,#20001)
-hasLocation(#20036,#20017)
-successor(#20018,#20026)
-successor(#20030,#20027)
+stmts(#20036,1,#20032,-2,"{}")
+hasLocation(#20036,#20030)
+stmt_containers(#20036,#20032)
+is_method(#20029)
 #20037=*
-entry_cfg_node(#20037,#20030)
-hasLocation(#20037,#20028)
-#20038=*
-exit_cfg_node(#20038,#20030)
-hasLocation(#20038,#20028)
-successor(#20033,#20038)
-successor(#20037,#20033)
-successor(#20029,#20030)
-successor(#20027,#20021)
-successor(#20026,#20029)
-successor(#20021,#20019)
-successor(#20019,#20036)
-successor(#20034,#20018)
+entry_cfg_node(#20037,#20001)
+#20038=@"loc,{#10000},1,1,1,0"
+locations_default(#20038,#10000,1,1,1,0)
+hasLocation(#20037,#20038)
+#20039=*
+exit_cfg_node(#20039,#20001)
+hasLocation(#20039,#20017)
+successor(#20019,#20028)
+successor(#20032,#20029)
+#20040=*
+entry_cfg_node(#20040,#20032)
+hasLocation(#20040,#20030)
+#20041=*
+exit_cfg_node(#20041,#20032)
+hasLocation(#20041,#20030)
+successor(#20036,#20041)
+successor(#20040,#20036)
+successor(#20031,#20032)
+successor(#20029,#20022)
+successor(#20028,#20031)
+successor(#20022,#20020)
+successor(#20020,#20039)
+successor(#20037,#20019)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap b/javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap
index 097b06b4183..d9343332595 100644
--- a/javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/classexpr3.js.trap
@@ -57,125 +57,135 @@ locations_default(#20019,#10000,1,21,1,20)
 hasLocation(#20018,#20019)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20020=*
-stmts(#20020,2,#20001,0,"!class extends B {};")
-hasLocation(#20020,#20003)
-stmt_containers(#20020,#20001)
+#20020=@"var;{this};{#20000}"
+variables(#20020,"this",#20000)
 #20021=*
-exprs(#20021,18,#20020,0,"!class extends B {}")
-#20022=@"loc,{#10000},1,1,1,19"
-locations_default(#20022,#10000,1,1,1,19)
-hasLocation(#20021,#20022)
-enclosing_stmt(#20021,#20020)
-expr_containers(#20021,#20001)
-#20023=*
-exprs(#20023,80,#20021,0,"class extends B {}")
-#20024=@"loc,{#10000},1,2,1,19"
-locations_default(#20024,#10000,1,2,1,19)
-hasLocation(#20023,#20024)
-enclosing_stmt(#20023,#20020)
-expr_containers(#20023,#20001)
-#20025=*
-exprs(#20025,79,#20023,1,"B")
-hasLocation(#20025,#20011)
-enclosing_stmt(#20025,#20020)
-expr_containers(#20025,#20001)
-literals("B","B",#20025)
-#20026=@"var;{B};{#20000}"
-variables(#20026,"B",#20000)
-bind(#20025,#20026)
-#20027=*
-properties(#20027,#20023,2,0,"constru ... rgs); }")
-#20028=@"loc,{#10000},1,18,1,17"
-locations_default(#20028,#10000,1,18,1,17)
-hasLocation(#20027,#20028)
-#20029=*
-exprs(#20029,0,#20027,0,"constructor")
-hasLocation(#20029,#20028)
-enclosing_stmt(#20029,#20020)
-expr_containers(#20029,#20001)
-literals("constructor","constructor",#20029)
+stmts(#20021,2,#20001,0,"!class extends B {};")
+hasLocation(#20021,#20003)
+stmt_containers(#20021,#20001)
+#20022=*
+exprs(#20022,18,#20021,0,"!class extends B {}")
+#20023=@"loc,{#10000},1,1,1,19"
+locations_default(#20023,#10000,1,1,1,19)
+hasLocation(#20022,#20023)
+enclosing_stmt(#20022,#20021)
+expr_containers(#20022,#20001)
+#20024=*
+exprs(#20024,80,#20022,0,"class extends B {}")
+#20025=@"loc,{#10000},1,2,1,19"
+locations_default(#20025,#10000,1,2,1,19)
+hasLocation(#20024,#20025)
+enclosing_stmt(#20024,#20021)
+expr_containers(#20024,#20001)
+#20026=*
+scopes(#20026,8)
+scopenodes(#20024,#20026)
+scopenesting(#20026,#20000)
+#20027=@"var;{this};{#20026}"
+variables(#20027,"this",#20026)
+#20028=*
+exprs(#20028,79,#20024,1,"B")
+hasLocation(#20028,#20011)
+enclosing_stmt(#20028,#20021)
+expr_containers(#20028,#20001)
+literals("B","B",#20028)
+#20029=@"var;{B};{#20000}"
+variables(#20029,"B",#20000)
+bind(#20028,#20029)
 #20030=*
-exprs(#20030,9,#20027,1,"(...arg ... rgs); }")
-hasLocation(#20030,#20028)
-enclosing_stmt(#20030,#20020)
-expr_containers(#20030,#20001)
-#20031=*
-scopes(#20031,1)
-scopenodes(#20030,#20031)
-scopenesting(#20031,#20000)
-#20032=@"var;{args};{#20031}"
-variables(#20032,"args",#20031)
+properties(#20030,#20024,2,0,"constru ... rgs); }")
+#20031=@"loc,{#10000},1,18,1,17"
+locations_default(#20031,#10000,1,18,1,17)
+hasLocation(#20030,#20031)
+#20032=*
+exprs(#20032,0,#20030,0,"constructor")
+hasLocation(#20032,#20031)
+enclosing_stmt(#20032,#20021)
+expr_containers(#20032,#20001)
+literals("constructor","constructor",#20032)
 #20033=*
-exprs(#20033,78,#20030,0,"args")
-hasLocation(#20033,#20028)
-expr_containers(#20033,#20030)
-literals("args","args",#20033)
-decl(#20033,#20032)
-#20034=@"var;{arguments};{#20031}"
-variables(#20034,"arguments",#20031)
-is_arguments_object(#20034)
-has_rest_parameter(#20030)
-#20035=*
-stmts(#20035,1,#20030,-2,"{ super(...args); }")
-hasLocation(#20035,#20028)
-stmt_containers(#20035,#20030)
-#20036=*
-stmts(#20036,2,#20035,0,"super(...args);")
-hasLocation(#20036,#20028)
-stmt_containers(#20036,#20030)
+exprs(#20033,9,#20030,1,"(...arg ... rgs); }")
+hasLocation(#20033,#20031)
+enclosing_stmt(#20033,#20021)
+expr_containers(#20033,#20001)
+#20034=*
+scopes(#20034,1)
+scopenodes(#20033,#20034)
+scopenesting(#20034,#20026)
+#20035=@"var;{this};{#20034}"
+variables(#20035,"this",#20034)
+#20036=@"var;{args};{#20034}"
+variables(#20036,"args",#20034)
 #20037=*
-exprs(#20037,13,#20036,0,"super(...args)")
-hasLocation(#20037,#20028)
-enclosing_stmt(#20037,#20036)
-expr_containers(#20037,#20030)
-#20038=*
-exprs(#20038,81,#20037,-1,"super")
-hasLocation(#20038,#20028)
-enclosing_stmt(#20038,#20036)
-expr_containers(#20038,#20030)
+exprs(#20037,78,#20033,0,"args")
+hasLocation(#20037,#20031)
+expr_containers(#20037,#20033)
+literals("args","args",#20037)
+decl(#20037,#20036)
+#20038=@"var;{arguments};{#20034}"
+variables(#20038,"arguments",#20034)
+is_arguments_object(#20038)
+has_rest_parameter(#20033)
 #20039=*
-exprs(#20039,66,#20037,0,"...args")
-hasLocation(#20039,#20028)
-enclosing_stmt(#20039,#20036)
-expr_containers(#20039,#20030)
+stmts(#20039,1,#20033,-2,"{ super(...args); }")
+hasLocation(#20039,#20031)
+stmt_containers(#20039,#20033)
 #20040=*
-exprs(#20040,79,#20039,0,"args")
-hasLocation(#20040,#20028)
-enclosing_stmt(#20040,#20036)
-expr_containers(#20040,#20030)
-literals("args","args",#20040)
-bind(#20040,#20032)
-is_method(#20027)
+stmts(#20040,2,#20039,0,"super(...args);")
+hasLocation(#20040,#20031)
+stmt_containers(#20040,#20033)
 #20041=*
-entry_cfg_node(#20041,#20001)
-#20042=@"loc,{#10000},1,1,1,0"
-locations_default(#20042,#10000,1,1,1,0)
-hasLocation(#20041,#20042)
+exprs(#20041,13,#20040,0,"super(...args)")
+hasLocation(#20041,#20031)
+enclosing_stmt(#20041,#20040)
+expr_containers(#20041,#20033)
+#20042=*
+exprs(#20042,81,#20041,-1,"super")
+hasLocation(#20042,#20031)
+enclosing_stmt(#20042,#20040)
+expr_containers(#20042,#20033)
 #20043=*
-exit_cfg_node(#20043,#20001)
-hasLocation(#20043,#20019)
-successor(#20020,#20025)
-successor(#20030,#20027)
+exprs(#20043,66,#20041,0,"...args")
+hasLocation(#20043,#20031)
+enclosing_stmt(#20043,#20040)
+expr_containers(#20043,#20033)
 #20044=*
-entry_cfg_node(#20044,#20030)
-hasLocation(#20044,#20028)
+exprs(#20044,79,#20043,0,"args")
+hasLocation(#20044,#20031)
+enclosing_stmt(#20044,#20040)
+expr_containers(#20044,#20033)
+literals("args","args",#20044)
+bind(#20044,#20036)
+is_method(#20030)
 #20045=*
-exit_cfg_node(#20045,#20030)
-hasLocation(#20045,#20028)
-successor(#20036,#20038)
-successor(#20040,#20039)
-successor(#20039,#20037)
-successor(#20038,#20040)
-successor(#20037,#20045)
-successor(#20035,#20036)
-successor(#20033,#20035)
-successor(#20044,#20033)
-successor(#20029,#20030)
-successor(#20027,#20023)
-successor(#20025,#20029)
-successor(#20023,#20021)
-successor(#20021,#20043)
-successor(#20041,#20020)
+entry_cfg_node(#20045,#20001)
+#20046=@"loc,{#10000},1,1,1,0"
+locations_default(#20046,#10000,1,1,1,0)
+hasLocation(#20045,#20046)
+#20047=*
+exit_cfg_node(#20047,#20001)
+hasLocation(#20047,#20019)
+successor(#20021,#20028)
+successor(#20033,#20030)
+#20048=*
+entry_cfg_node(#20048,#20033)
+hasLocation(#20048,#20031)
+#20049=*
+exit_cfg_node(#20049,#20033)
+hasLocation(#20049,#20031)
+successor(#20040,#20042)
+successor(#20044,#20043)
+successor(#20043,#20041)
+successor(#20042,#20044)
+successor(#20041,#20049)
+successor(#20039,#20040)
+successor(#20037,#20039)
+successor(#20048,#20037)
+successor(#20032,#20033)
+successor(#20030,#20024)
+successor(#20028,#20032)
+successor(#20024,#20022)
+successor(#20022,#20047)
+successor(#20045,#20021)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap b/javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap
index 932c91d875c..9b8c75d3e5e 100644
--- a/javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/classexpr4.js.trap
@@ -62,142 +62,148 @@ locations_default(#20021,#10000,1,23,1,22)
 hasLocation(#20020,#20021)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20022=*
-stmts(#20022,2,#20001,0,"!class  ... s B {};")
-hasLocation(#20022,#20003)
-stmt_containers(#20022,#20001)
+#20022=@"var;{this};{#20000}"
+variables(#20022,"this",#20000)
 #20023=*
-exprs(#20023,18,#20022,0,"!class  ... ds B {}")
-#20024=@"loc,{#10000},1,1,1,21"
-locations_default(#20024,#10000,1,1,1,21)
-hasLocation(#20023,#20024)
-enclosing_stmt(#20023,#20022)
-expr_containers(#20023,#20001)
-#20025=*
-exprs(#20025,80,#20023,0,"class A extends B {}")
-#20026=@"loc,{#10000},1,2,1,21"
-locations_default(#20026,#10000,1,2,1,21)
-hasLocation(#20025,#20026)
-enclosing_stmt(#20025,#20022)
-expr_containers(#20025,#20001)
-#20027=*
-scopes(#20027,8)
-scopenodes(#20025,#20027)
-scopenesting(#20027,#20000)
-#20028=@"var;{A};{#20027}"
-variables(#20028,"A",#20027)
-#20029=@"local_type_name;{A};{#20027}"
-local_type_names(#20029,"A",#20027)
-#20030=*
-exprs(#20030,78,#20025,0,"A")
-hasLocation(#20030,#20009)
-enclosing_stmt(#20030,#20022)
-expr_containers(#20030,#20001)
-literals("A","A",#20030)
-decl(#20030,#20028)
-typedecl(#20030,#20029)
-#20031=*
-exprs(#20031,79,#20025,1,"B")
-hasLocation(#20031,#20013)
-enclosing_stmt(#20031,#20022)
-expr_containers(#20031,#20001)
-literals("B","B",#20031)
-#20032=@"var;{B};{#20000}"
-variables(#20032,"B",#20000)
-bind(#20031,#20032)
+stmts(#20023,2,#20001,0,"!class  ... s B {};")
+hasLocation(#20023,#20003)
+stmt_containers(#20023,#20001)
+#20024=*
+exprs(#20024,18,#20023,0,"!class  ... ds B {}")
+#20025=@"loc,{#10000},1,1,1,21"
+locations_default(#20025,#10000,1,1,1,21)
+hasLocation(#20024,#20025)
+enclosing_stmt(#20024,#20023)
+expr_containers(#20024,#20001)
+#20026=*
+exprs(#20026,80,#20024,0,"class A extends B {}")
+#20027=@"loc,{#10000},1,2,1,21"
+locations_default(#20027,#10000,1,2,1,21)
+hasLocation(#20026,#20027)
+enclosing_stmt(#20026,#20023)
+expr_containers(#20026,#20001)
+#20028=*
+scopes(#20028,8)
+scopenodes(#20026,#20028)
+scopenesting(#20028,#20000)
+#20029=@"var;{this};{#20028}"
+variables(#20029,"this",#20028)
+#20030=@"var;{A};{#20028}"
+variables(#20030,"A",#20028)
+#20031=@"local_type_name;{A};{#20028}"
+local_type_names(#20031,"A",#20028)
+#20032=*
+exprs(#20032,78,#20026,0,"A")
+hasLocation(#20032,#20009)
+enclosing_stmt(#20032,#20023)
+expr_containers(#20032,#20001)
+literals("A","A",#20032)
+decl(#20032,#20030)
+typedecl(#20032,#20031)
 #20033=*
-properties(#20033,#20025,2,0,"constru ... rgs); }")
-#20034=@"loc,{#10000},1,20,1,19"
-locations_default(#20034,#10000,1,20,1,19)
-hasLocation(#20033,#20034)
+exprs(#20033,79,#20026,1,"B")
+hasLocation(#20033,#20013)
+enclosing_stmt(#20033,#20023)
+expr_containers(#20033,#20001)
+literals("B","B",#20033)
+#20034=@"var;{B};{#20000}"
+variables(#20034,"B",#20000)
+bind(#20033,#20034)
 #20035=*
-exprs(#20035,0,#20033,0,"constructor")
-hasLocation(#20035,#20034)
-enclosing_stmt(#20035,#20022)
-expr_containers(#20035,#20001)
-literals("constructor","constructor",#20035)
-#20036=*
-exprs(#20036,9,#20033,1,"(...arg ... rgs); }")
-hasLocation(#20036,#20034)
-enclosing_stmt(#20036,#20022)
-expr_containers(#20036,#20001)
+properties(#20035,#20026,2,0,"constru ... rgs); }")
+#20036=@"loc,{#10000},1,20,1,19"
+locations_default(#20036,#10000,1,20,1,19)
+hasLocation(#20035,#20036)
 #20037=*
-scopes(#20037,1)
-scopenodes(#20036,#20037)
-scopenesting(#20037,#20027)
-#20038=@"var;{args};{#20037}"
-variables(#20038,"args",#20037)
+exprs(#20037,0,#20035,0,"constructor")
+hasLocation(#20037,#20036)
+enclosing_stmt(#20037,#20023)
+expr_containers(#20037,#20001)
+literals("constructor","constructor",#20037)
+#20038=*
+exprs(#20038,9,#20035,1,"(...arg ... rgs); }")
+hasLocation(#20038,#20036)
+enclosing_stmt(#20038,#20023)
+expr_containers(#20038,#20001)
 #20039=*
-exprs(#20039,78,#20036,0,"args")
-hasLocation(#20039,#20034)
-expr_containers(#20039,#20036)
-literals("args","args",#20039)
-decl(#20039,#20038)
-#20040=@"var;{arguments};{#20037}"
-variables(#20040,"arguments",#20037)
-is_arguments_object(#20040)
-has_rest_parameter(#20036)
-#20041=*
-stmts(#20041,1,#20036,-2,"{ super(...args); }")
-hasLocation(#20041,#20034)
-stmt_containers(#20041,#20036)
+scopes(#20039,1)
+scopenodes(#20038,#20039)
+scopenesting(#20039,#20028)
+#20040=@"var;{this};{#20039}"
+variables(#20040,"this",#20039)
+#20041=@"var;{args};{#20039}"
+variables(#20041,"args",#20039)
 #20042=*
-stmts(#20042,2,#20041,0,"super(...args);")
-hasLocation(#20042,#20034)
-stmt_containers(#20042,#20036)
-#20043=*
-exprs(#20043,13,#20042,0,"super(...args)")
-hasLocation(#20043,#20034)
-enclosing_stmt(#20043,#20042)
-expr_containers(#20043,#20036)
+exprs(#20042,78,#20038,0,"args")
+hasLocation(#20042,#20036)
+expr_containers(#20042,#20038)
+literals("args","args",#20042)
+decl(#20042,#20041)
+#20043=@"var;{arguments};{#20039}"
+variables(#20043,"arguments",#20039)
+is_arguments_object(#20043)
+has_rest_parameter(#20038)
 #20044=*
-exprs(#20044,81,#20043,-1,"super")
-hasLocation(#20044,#20034)
-enclosing_stmt(#20044,#20042)
-expr_containers(#20044,#20036)
+stmts(#20044,1,#20038,-2,"{ super(...args); }")
+hasLocation(#20044,#20036)
+stmt_containers(#20044,#20038)
 #20045=*
-exprs(#20045,66,#20043,0,"...args")
-hasLocation(#20045,#20034)
-enclosing_stmt(#20045,#20042)
-expr_containers(#20045,#20036)
+stmts(#20045,2,#20044,0,"super(...args);")
+hasLocation(#20045,#20036)
+stmt_containers(#20045,#20038)
 #20046=*
-exprs(#20046,79,#20045,0,"args")
-hasLocation(#20046,#20034)
-enclosing_stmt(#20046,#20042)
-expr_containers(#20046,#20036)
-literals("args","args",#20046)
-bind(#20046,#20038)
-is_method(#20033)
+exprs(#20046,13,#20045,0,"super(...args)")
+hasLocation(#20046,#20036)
+enclosing_stmt(#20046,#20045)
+expr_containers(#20046,#20038)
 #20047=*
-entry_cfg_node(#20047,#20001)
-#20048=@"loc,{#10000},1,1,1,0"
-locations_default(#20048,#10000,1,1,1,0)
-hasLocation(#20047,#20048)
+exprs(#20047,81,#20046,-1,"super")
+hasLocation(#20047,#20036)
+enclosing_stmt(#20047,#20045)
+expr_containers(#20047,#20038)
+#20048=*
+exprs(#20048,66,#20046,0,"...args")
+hasLocation(#20048,#20036)
+enclosing_stmt(#20048,#20045)
+expr_containers(#20048,#20038)
 #20049=*
-exit_cfg_node(#20049,#20001)
-hasLocation(#20049,#20021)
-successor(#20022,#20030)
-successor(#20036,#20033)
+exprs(#20049,79,#20048,0,"args")
+hasLocation(#20049,#20036)
+enclosing_stmt(#20049,#20045)
+expr_containers(#20049,#20038)
+literals("args","args",#20049)
+bind(#20049,#20041)
+is_method(#20035)
 #20050=*
-entry_cfg_node(#20050,#20036)
-hasLocation(#20050,#20034)
-#20051=*
-exit_cfg_node(#20051,#20036)
-hasLocation(#20051,#20034)
+entry_cfg_node(#20050,#20001)
+#20051=@"loc,{#10000},1,1,1,0"
+locations_default(#20051,#10000,1,1,1,0)
+hasLocation(#20050,#20051)
+#20052=*
+exit_cfg_node(#20052,#20001)
+hasLocation(#20052,#20021)
+successor(#20023,#20032)
+successor(#20038,#20035)
+#20053=*
+entry_cfg_node(#20053,#20038)
+hasLocation(#20053,#20036)
+#20054=*
+exit_cfg_node(#20054,#20038)
+hasLocation(#20054,#20036)
+successor(#20045,#20047)
+successor(#20049,#20048)
+successor(#20048,#20046)
+successor(#20047,#20049)
+successor(#20046,#20054)
+successor(#20044,#20045)
 successor(#20042,#20044)
-successor(#20046,#20045)
-successor(#20045,#20043)
-successor(#20044,#20046)
-successor(#20043,#20051)
-successor(#20041,#20042)
-successor(#20039,#20041)
-successor(#20050,#20039)
-successor(#20035,#20036)
-successor(#20033,#20025)
-successor(#20031,#20035)
-successor(#20030,#20031)
-successor(#20025,#20023)
-successor(#20023,#20049)
-successor(#20047,#20022)
+successor(#20053,#20042)
+successor(#20037,#20038)
+successor(#20035,#20026)
+successor(#20033,#20037)
+successor(#20032,#20033)
+successor(#20026,#20024)
+successor(#20024,#20052)
+successor(#20050,#20023)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/cfg/output/trap/fields.js.trap b/javascript/extractor/tests/cfg/output/trap/fields.js.trap
index 896fdccf2cd..e499cc34874 100644
--- a/javascript/extractor/tests/cfg/output/trap/fields.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/fields.js.trap
@@ -384,361 +384,375 @@ variables(#20136,"B",#20000)
 local_type_names(#20137,"A",#20000)
 #20138=@"local_type_name;{B};{#20000}"
 local_type_names(#20138,"B",#20000)
-#20139=*
-stmts(#20139,26,#20001,0,"class A ... () {}\n}")
-#20140=@"loc,{#10000},1,1,9,1"
-locations_default(#20140,#10000,1,1,9,1)
-hasLocation(#20139,#20140)
-stmt_containers(#20139,#20001)
-#20141=*
-exprs(#20141,78,#20139,0,"A")
-hasLocation(#20141,#20041)
-enclosing_stmt(#20141,#20139)
-expr_containers(#20141,#20001)
-literals("A","A",#20141)
-decl(#20141,#20135)
-typedecl(#20141,#20137)
+#20139=@"var;{this};{#20000}"
+variables(#20139,"this",#20000)
+#20140=*
+stmts(#20140,26,#20001,0,"class A ... () {}\n}")
+#20141=@"loc,{#10000},1,1,9,1"
+locations_default(#20141,#10000,1,1,9,1)
+hasLocation(#20140,#20141)
+stmt_containers(#20140,#20001)
 #20142=*
-scopes(#20142,10)
-scopenodes(#20139,#20142)
-scopenesting(#20142,#20000)
+exprs(#20142,78,#20140,0,"A")
+hasLocation(#20142,#20041)
+enclosing_stmt(#20142,#20140)
+expr_containers(#20142,#20001)
+literals("A","A",#20142)
+decl(#20142,#20135)
+typedecl(#20142,#20137)
 #20143=*
-properties(#20143,#20139,2,0,"constru ... or;\n  }")
-#20144=@"loc,{#10000},2,3,4,3"
-locations_default(#20144,#10000,2,3,4,3)
-hasLocation(#20143,#20144)
+scopes(#20143,10)
+scopenodes(#20140,#20143)
+scopenesting(#20143,#20000)
+#20144=@"var;{this};{#20143}"
+variables(#20144,"this",#20143)
 #20145=*
-exprs(#20145,0,#20143,0,"constructor")
-hasLocation(#20145,#20045)
-enclosing_stmt(#20145,#20139)
-expr_containers(#20145,#20001)
-literals("constructor","constructor",#20145)
-#20146=*
-exprs(#20146,9,#20143,1,"() {\n    ctor;\n  }")
-#20147=@"loc,{#10000},2,14,4,3"
-locations_default(#20147,#10000,2,14,4,3)
-hasLocation(#20146,#20147)
-enclosing_stmt(#20146,#20139)
-expr_containers(#20146,#20001)
+properties(#20145,#20140,2,0,"constru ... or;\n  }")
+#20146=@"loc,{#10000},2,3,4,3"
+locations_default(#20146,#10000,2,3,4,3)
+hasLocation(#20145,#20146)
+#20147=*
+exprs(#20147,0,#20145,0,"constructor")
+hasLocation(#20147,#20045)
+enclosing_stmt(#20147,#20140)
+expr_containers(#20147,#20001)
+literals("constructor","constructor",#20147)
 #20148=*
-scopes(#20148,1)
-scopenodes(#20146,#20148)
-scopenesting(#20148,#20142)
-#20149=@"var;{arguments};{#20148}"
-variables(#20149,"arguments",#20148)
-is_arguments_object(#20149)
+exprs(#20148,9,#20145,1,"() {\n    ctor;\n  }")
+#20149=@"loc,{#10000},2,14,4,3"
+locations_default(#20149,#10000,2,14,4,3)
+hasLocation(#20148,#20149)
+enclosing_stmt(#20148,#20140)
+expr_containers(#20148,#20001)
 #20150=*
-stmts(#20150,1,#20146,-2,"{\n    ctor;\n  }")
-#20151=@"loc,{#10000},2,17,4,3"
-locations_default(#20151,#10000,2,17,4,3)
-hasLocation(#20150,#20151)
-stmt_containers(#20150,#20146)
-#20152=*
-stmts(#20152,2,#20150,0,"ctor;")
-#20153=@"loc,{#10000},3,5,3,9"
-locations_default(#20153,#10000,3,5,3,9)
-hasLocation(#20152,#20153)
-stmt_containers(#20152,#20146)
-#20154=*
-exprs(#20154,79,#20152,0,"ctor")
-hasLocation(#20154,#20053)
-enclosing_stmt(#20154,#20152)
-expr_containers(#20154,#20146)
-literals("ctor","ctor",#20154)
-#20155=@"var;{ctor};{#20000}"
-variables(#20155,"ctor",#20000)
-bind(#20154,#20155)
-is_method(#20143)
-#20156=*
-properties(#20156,#20139,3,8,"x;")
-#20157=@"loc,{#10000},5,3,5,4"
-locations_default(#20157,#10000,5,3,5,4)
-hasLocation(#20156,#20157)
-#20158=*
-exprs(#20158,0,#20156,0,"x")
-hasLocation(#20158,#20059)
-expr_containers(#20158,#20146)
-literals("x","x",#20158)
+scopes(#20150,1)
+scopenodes(#20148,#20150)
+scopenesting(#20150,#20143)
+#20151=@"var;{this};{#20150}"
+variables(#20151,"this",#20150)
+#20152=@"var;{arguments};{#20150}"
+variables(#20152,"arguments",#20150)
+is_arguments_object(#20152)
+#20153=*
+stmts(#20153,1,#20148,-2,"{\n    ctor;\n  }")
+#20154=@"loc,{#10000},2,17,4,3"
+locations_default(#20154,#10000,2,17,4,3)
+hasLocation(#20153,#20154)
+stmt_containers(#20153,#20148)
+#20155=*
+stmts(#20155,2,#20153,0,"ctor;")
+#20156=@"loc,{#10000},3,5,3,9"
+locations_default(#20156,#10000,3,5,3,9)
+hasLocation(#20155,#20156)
+stmt_containers(#20155,#20148)
+#20157=*
+exprs(#20157,79,#20155,0,"ctor")
+hasLocation(#20157,#20053)
+enclosing_stmt(#20157,#20155)
+expr_containers(#20157,#20148)
+literals("ctor","ctor",#20157)
+#20158=@"var;{ctor};{#20000}"
+variables(#20158,"ctor",#20000)
+bind(#20157,#20158)
+is_method(#20145)
 #20159=*
-properties(#20159,#20139,4,8,"static y;")
-#20160=@"loc,{#10000},6,3,6,11"
-locations_default(#20160,#10000,6,3,6,11)
+properties(#20159,#20140,3,8,"x;")
+#20160=@"loc,{#10000},5,3,5,4"
+locations_default(#20160,#10000,5,3,5,4)
 hasLocation(#20159,#20160)
 #20161=*
-exprs(#20161,0,#20159,0,"y")
-hasLocation(#20161,#20065)
-enclosing_stmt(#20161,#20139)
-expr_containers(#20161,#20001)
-literals("y","y",#20161)
-is_static(#20159)
+exprs(#20161,0,#20159,0,"x")
+hasLocation(#20161,#20059)
+expr_containers(#20161,#20148)
+literals("x","x",#20161)
 #20162=*
-properties(#20162,#20139,5,0,"f() {}")
-#20163=@"loc,{#10000},7,3,7,8"
-locations_default(#20163,#10000,7,3,7,8)
+properties(#20162,#20140,4,8,"static y;")
+#20163=@"loc,{#10000},6,3,6,11"
+locations_default(#20163,#10000,6,3,6,11)
 hasLocation(#20162,#20163)
 #20164=*
-exprs(#20164,0,#20162,0,"f")
-hasLocation(#20164,#20069)
-enclosing_stmt(#20164,#20139)
+exprs(#20164,0,#20162,0,"y")
+hasLocation(#20164,#20065)
+enclosing_stmt(#20164,#20140)
 expr_containers(#20164,#20001)
-literals("f","f",#20164)
+literals("y","y",#20164)
+is_static(#20162)
 #20165=*
-exprs(#20165,9,#20162,1,"() {}")
-#20166=@"loc,{#10000},7,4,7,8"
-locations_default(#20166,#10000,7,4,7,8)
+properties(#20165,#20140,5,0,"f() {}")
+#20166=@"loc,{#10000},7,3,7,8"
+locations_default(#20166,#10000,7,3,7,8)
 hasLocation(#20165,#20166)
-enclosing_stmt(#20165,#20139)
-expr_containers(#20165,#20001)
 #20167=*
-scopes(#20167,1)
-scopenodes(#20165,#20167)
-scopenesting(#20167,#20142)
-#20168=@"var;{arguments};{#20167}"
-variables(#20168,"arguments",#20167)
-is_arguments_object(#20168)
-#20169=*
-stmts(#20169,1,#20165,-2,"{}")
-#20170=@"loc,{#10000},7,7,7,8"
-locations_default(#20170,#10000,7,7,7,8)
-hasLocation(#20169,#20170)
-stmt_containers(#20169,#20165)
-is_method(#20162)
-#20171=*
-properties(#20171,#20139,6,0,"static g() {}")
-#20172=@"loc,{#10000},8,3,8,15"
-locations_default(#20172,#10000,8,3,8,15)
-hasLocation(#20171,#20172)
+exprs(#20167,0,#20165,0,"f")
+hasLocation(#20167,#20069)
+enclosing_stmt(#20167,#20140)
+expr_containers(#20167,#20001)
+literals("f","f",#20167)
+#20168=*
+exprs(#20168,9,#20165,1,"() {}")
+#20169=@"loc,{#10000},7,4,7,8"
+locations_default(#20169,#10000,7,4,7,8)
+hasLocation(#20168,#20169)
+enclosing_stmt(#20168,#20140)
+expr_containers(#20168,#20001)
+#20170=*
+scopes(#20170,1)
+scopenodes(#20168,#20170)
+scopenesting(#20170,#20143)
+#20171=@"var;{this};{#20170}"
+variables(#20171,"this",#20170)
+#20172=@"var;{arguments};{#20170}"
+variables(#20172,"arguments",#20170)
+is_arguments_object(#20172)
 #20173=*
-exprs(#20173,0,#20171,0,"g")
-hasLocation(#20173,#20081)
-enclosing_stmt(#20173,#20139)
-expr_containers(#20173,#20001)
-literals("g","g",#20173)
-#20174=*
-exprs(#20174,9,#20171,1,"() {}")
-#20175=@"loc,{#10000},8,11,8,15"
-locations_default(#20175,#10000,8,11,8,15)
-hasLocation(#20174,#20175)
-enclosing_stmt(#20174,#20139)
-expr_containers(#20174,#20001)
-#20176=*
-scopes(#20176,1)
-scopenodes(#20174,#20176)
-scopenesting(#20176,#20142)
-#20177=@"var;{arguments};{#20176}"
-variables(#20177,"arguments",#20176)
-is_arguments_object(#20177)
+stmts(#20173,1,#20168,-2,"{}")
+#20174=@"loc,{#10000},7,7,7,8"
+locations_default(#20174,#10000,7,7,7,8)
+hasLocation(#20173,#20174)
+stmt_containers(#20173,#20168)
+is_method(#20165)
+#20175=*
+properties(#20175,#20140,6,0,"static g() {}")
+#20176=@"loc,{#10000},8,3,8,15"
+locations_default(#20176,#10000,8,3,8,15)
+hasLocation(#20175,#20176)
+#20177=*
+exprs(#20177,0,#20175,0,"g")
+hasLocation(#20177,#20081)
+enclosing_stmt(#20177,#20140)
+expr_containers(#20177,#20001)
+literals("g","g",#20177)
 #20178=*
-stmts(#20178,1,#20174,-2,"{}")
-#20179=@"loc,{#10000},8,14,8,15"
-locations_default(#20179,#10000,8,14,8,15)
+exprs(#20178,9,#20175,1,"() {}")
+#20179=@"loc,{#10000},8,11,8,15"
+locations_default(#20179,#10000,8,11,8,15)
 hasLocation(#20178,#20179)
-stmt_containers(#20178,#20174)
-is_method(#20171)
-is_static(#20171)
+enclosing_stmt(#20178,#20140)
+expr_containers(#20178,#20001)
 #20180=*
-stmts(#20180,26,#20001,1,"class B ... \n  z;\n}")
-#20181=@"loc,{#10000},11,1,18,1"
-locations_default(#20181,#10000,11,1,18,1)
-hasLocation(#20180,#20181)
-stmt_containers(#20180,#20001)
-#20182=*
-exprs(#20182,78,#20180,0,"B")
-hasLocation(#20182,#20094)
-enclosing_stmt(#20182,#20180)
-expr_containers(#20182,#20001)
-literals("B","B",#20182)
-decl(#20182,#20136)
-typedecl(#20182,#20138)
+scopes(#20180,1)
+scopenodes(#20178,#20180)
+scopenesting(#20180,#20143)
+#20181=@"var;{this};{#20180}"
+variables(#20181,"this",#20180)
+#20182=@"var;{arguments};{#20180}"
+variables(#20182,"arguments",#20180)
+is_arguments_object(#20182)
 #20183=*
-scopes(#20183,10)
-scopenodes(#20180,#20183)
-scopenesting(#20183,#20000)
-#20184=*
-exprs(#20184,79,#20180,1,"A")
-hasLocation(#20184,#20098)
-enclosing_stmt(#20184,#20180)
-expr_containers(#20184,#20001)
-literals("A","A",#20184)
-bind(#20184,#20135)
+stmts(#20183,1,#20178,-2,"{}")
+#20184=@"loc,{#10000},8,14,8,15"
+locations_default(#20184,#10000,8,14,8,15)
+hasLocation(#20183,#20184)
+stmt_containers(#20183,#20178)
+is_method(#20175)
+is_static(#20175)
 #20185=*
-properties(#20185,#20180,2,0,"constru ... er;\n  }")
-#20186=@"loc,{#10000},12,3,16,3"
-locations_default(#20186,#10000,12,3,16,3)
+stmts(#20185,26,#20001,1,"class B ... \n  z;\n}")
+#20186=@"loc,{#10000},11,1,18,1"
+locations_default(#20186,#10000,11,1,18,1)
 hasLocation(#20185,#20186)
+stmt_containers(#20185,#20001)
 #20187=*
-exprs(#20187,0,#20185,0,"constructor")
-hasLocation(#20187,#20102)
-enclosing_stmt(#20187,#20180)
+exprs(#20187,78,#20185,0,"B")
+hasLocation(#20187,#20094)
+enclosing_stmt(#20187,#20185)
 expr_containers(#20187,#20001)
-literals("constructor","constructor",#20187)
+literals("B","B",#20187)
+decl(#20187,#20136)
+typedecl(#20187,#20138)
 #20188=*
-exprs(#20188,9,#20185,1,"() {\n   ... er;\n  }")
-#20189=@"loc,{#10000},12,14,16,3"
-locations_default(#20189,#10000,12,14,16,3)
-hasLocation(#20188,#20189)
-enclosing_stmt(#20188,#20180)
-expr_containers(#20188,#20001)
+scopes(#20188,10)
+scopenodes(#20185,#20188)
+scopenesting(#20188,#20000)
+#20189=@"var;{this};{#20188}"
+variables(#20189,"this",#20188)
 #20190=*
-scopes(#20190,1)
-scopenodes(#20188,#20190)
-scopenesting(#20190,#20183)
-#20191=@"var;{arguments};{#20190}"
-variables(#20191,"arguments",#20190)
-is_arguments_object(#20191)
-#20192=*
-stmts(#20192,1,#20188,-2,"{\n    b ... er;\n  }")
-#20193=@"loc,{#10000},12,17,16,3"
-locations_default(#20193,#10000,12,17,16,3)
-hasLocation(#20192,#20193)
-stmt_containers(#20192,#20188)
+exprs(#20190,79,#20185,1,"A")
+hasLocation(#20190,#20098)
+enclosing_stmt(#20190,#20185)
+expr_containers(#20190,#20001)
+literals("A","A",#20190)
+bind(#20190,#20135)
+#20191=*
+properties(#20191,#20185,2,0,"constru ... er;\n  }")
+#20192=@"loc,{#10000},12,3,16,3"
+locations_default(#20192,#10000,12,3,16,3)
+hasLocation(#20191,#20192)
+#20193=*
+exprs(#20193,0,#20191,0,"constructor")
+hasLocation(#20193,#20102)
+enclosing_stmt(#20193,#20185)
+expr_containers(#20193,#20001)
+literals("constructor","constructor",#20193)
 #20194=*
-stmts(#20194,2,#20192,0,"before;")
-#20195=@"loc,{#10000},13,5,13,11"
-locations_default(#20195,#10000,13,5,13,11)
+exprs(#20194,9,#20191,1,"() {\n   ... er;\n  }")
+#20195=@"loc,{#10000},12,14,16,3"
+locations_default(#20195,#10000,12,14,16,3)
 hasLocation(#20194,#20195)
-stmt_containers(#20194,#20188)
+enclosing_stmt(#20194,#20185)
+expr_containers(#20194,#20001)
 #20196=*
-exprs(#20196,79,#20194,0,"before")
-hasLocation(#20196,#20110)
-enclosing_stmt(#20196,#20194)
-expr_containers(#20196,#20188)
-literals("before","before",#20196)
-#20197=@"var;{before};{#20000}"
-variables(#20197,"before",#20000)
-bind(#20196,#20197)
-#20198=*
-stmts(#20198,2,#20192,1,"super();")
-#20199=@"loc,{#10000},14,5,14,12"
-locations_default(#20199,#10000,14,5,14,12)
-hasLocation(#20198,#20199)
-stmt_containers(#20198,#20188)
-#20200=*
-exprs(#20200,13,#20198,0,"super()")
-#20201=@"loc,{#10000},14,5,14,11"
-locations_default(#20201,#10000,14,5,14,11)
-hasLocation(#20200,#20201)
-enclosing_stmt(#20200,#20198)
-expr_containers(#20200,#20188)
-#20202=*
-exprs(#20202,81,#20200,-1,"super")
-hasLocation(#20202,#20114)
-enclosing_stmt(#20202,#20198)
-expr_containers(#20202,#20188)
+scopes(#20196,1)
+scopenodes(#20194,#20196)
+scopenesting(#20196,#20188)
+#20197=@"var;{this};{#20196}"
+variables(#20197,"this",#20196)
+#20198=@"var;{arguments};{#20196}"
+variables(#20198,"arguments",#20196)
+is_arguments_object(#20198)
+#20199=*
+stmts(#20199,1,#20194,-2,"{\n    b ... er;\n  }")
+#20200=@"loc,{#10000},12,17,16,3"
+locations_default(#20200,#10000,12,17,16,3)
+hasLocation(#20199,#20200)
+stmt_containers(#20199,#20194)
+#20201=*
+stmts(#20201,2,#20199,0,"before;")
+#20202=@"loc,{#10000},13,5,13,11"
+locations_default(#20202,#10000,13,5,13,11)
+hasLocation(#20201,#20202)
+stmt_containers(#20201,#20194)
 #20203=*
-stmts(#20203,2,#20192,2,"after;")
-#20204=@"loc,{#10000},15,5,15,10"
-locations_default(#20204,#10000,15,5,15,10)
-hasLocation(#20203,#20204)
-stmt_containers(#20203,#20188)
+exprs(#20203,79,#20201,0,"before")
+hasLocation(#20203,#20110)
+enclosing_stmt(#20203,#20201)
+expr_containers(#20203,#20194)
+literals("before","before",#20203)
+#20204=@"var;{before};{#20000}"
+variables(#20204,"before",#20000)
+bind(#20203,#20204)
 #20205=*
-exprs(#20205,79,#20203,0,"after")
-hasLocation(#20205,#20122)
-enclosing_stmt(#20205,#20203)
-expr_containers(#20205,#20188)
-literals("after","after",#20205)
-#20206=@"var;{after};{#20000}"
-variables(#20206,"after",#20000)
-bind(#20205,#20206)
-is_method(#20185)
+stmts(#20205,2,#20199,1,"super();")
+#20206=@"loc,{#10000},14,5,14,12"
+locations_default(#20206,#10000,14,5,14,12)
+hasLocation(#20205,#20206)
+stmt_containers(#20205,#20194)
 #20207=*
-properties(#20207,#20180,3,8,"z;")
-#20208=@"loc,{#10000},17,3,17,4"
-locations_default(#20208,#10000,17,3,17,4)
+exprs(#20207,13,#20205,0,"super()")
+#20208=@"loc,{#10000},14,5,14,11"
+locations_default(#20208,#10000,14,5,14,11)
 hasLocation(#20207,#20208)
+enclosing_stmt(#20207,#20205)
+expr_containers(#20207,#20194)
 #20209=*
-exprs(#20209,0,#20207,0,"z")
-hasLocation(#20209,#20128)
-expr_containers(#20209,#20188)
-literals("z","z",#20209)
+exprs(#20209,81,#20207,-1,"super")
+hasLocation(#20209,#20114)
+enclosing_stmt(#20209,#20205)
+expr_containers(#20209,#20194)
 #20210=*
-entry_cfg_node(#20210,#20001)
-#20211=@"loc,{#10000},1,1,1,0"
-locations_default(#20211,#10000,1,1,1,0)
+stmts(#20210,2,#20199,2,"after;")
+#20211=@"loc,{#10000},15,5,15,10"
+locations_default(#20211,#10000,15,5,15,10)
 hasLocation(#20210,#20211)
+stmt_containers(#20210,#20194)
 #20212=*
-exit_cfg_node(#20212,#20001)
-hasLocation(#20212,#20133)
-successor(#20209,#20207)
-successor(#20188,#20185)
-#20213=*
-entry_cfg_node(#20213,#20188)
-#20214=@"loc,{#10000},12,14,12,13"
-locations_default(#20214,#10000,12,14,12,13)
-hasLocation(#20213,#20214)
-#20215=*
-exit_cfg_node(#20215,#20188)
-#20216=@"loc,{#10000},16,4,16,3"
-locations_default(#20216,#10000,16,4,16,3)
-hasLocation(#20215,#20216)
-successor(#20203,#20205)
-successor(#20205,#20215)
-successor(#20198,#20202)
-successor(#20202,#20200)
-successor(#20207,#20203)
-successor(#20200,#20209)
-successor(#20194,#20196)
-successor(#20196,#20198)
-successor(#20192,#20194)
-successor(#20213,#20192)
-successor(#20187,#20188)
-successor(#20185,#20180)
-successor(#20184,#20187)
-successor(#20182,#20184)
-successor(#20180,#20212)
-successor(#20158,#20156)
-successor(#20174,#20171)
+exprs(#20212,79,#20210,0,"after")
+hasLocation(#20212,#20122)
+enclosing_stmt(#20212,#20210)
+expr_containers(#20212,#20194)
+literals("after","after",#20212)
+#20213=@"var;{after};{#20000}"
+variables(#20213,"after",#20000)
+bind(#20212,#20213)
+is_method(#20191)
+#20214=*
+properties(#20214,#20185,3,8,"z;")
+#20215=@"loc,{#10000},17,3,17,4"
+locations_default(#20215,#10000,17,3,17,4)
+hasLocation(#20214,#20215)
+#20216=*
+exprs(#20216,0,#20214,0,"z")
+hasLocation(#20216,#20128)
+expr_containers(#20216,#20194)
+literals("z","z",#20216)
 #20217=*
-entry_cfg_node(#20217,#20174)
-#20218=@"loc,{#10000},8,11,8,10"
-locations_default(#20218,#10000,8,11,8,10)
+entry_cfg_node(#20217,#20001)
+#20218=@"loc,{#10000},1,1,1,0"
+locations_default(#20218,#10000,1,1,1,0)
 hasLocation(#20217,#20218)
 #20219=*
-exit_cfg_node(#20219,#20174)
-#20220=@"loc,{#10000},8,16,8,15"
-locations_default(#20220,#10000,8,16,8,15)
-hasLocation(#20219,#20220)
-successor(#20178,#20219)
-successor(#20217,#20178)
-successor(#20173,#20174)
-successor(#20171,#20139)
-successor(#20165,#20162)
-#20221=*
-entry_cfg_node(#20221,#20165)
-#20222=@"loc,{#10000},7,4,7,3"
-locations_default(#20222,#10000,7,4,7,3)
-hasLocation(#20221,#20222)
-#20223=*
-exit_cfg_node(#20223,#20165)
-#20224=@"loc,{#10000},7,9,7,8"
-locations_default(#20224,#10000,7,9,7,8)
-hasLocation(#20223,#20224)
-successor(#20169,#20223)
-successor(#20221,#20169)
-successor(#20164,#20165)
-successor(#20162,#20173)
-successor(#20146,#20143)
-#20225=*
-entry_cfg_node(#20225,#20146)
-#20226=@"loc,{#10000},2,14,2,13"
-locations_default(#20226,#10000,2,14,2,13)
-hasLocation(#20225,#20226)
-successor(#20156,#20150)
-#20227=*
-exit_cfg_node(#20227,#20146)
-#20228=@"loc,{#10000},4,4,4,3"
-locations_default(#20228,#10000,4,4,4,3)
-hasLocation(#20227,#20228)
-successor(#20152,#20154)
-successor(#20154,#20227)
-successor(#20150,#20152)
-successor(#20225,#20158)
-successor(#20145,#20146)
-successor(#20143,#20164)
-successor(#20141,#20145)
+exit_cfg_node(#20219,#20001)
+hasLocation(#20219,#20133)
+successor(#20216,#20214)
+successor(#20194,#20191)
+#20220=*
+entry_cfg_node(#20220,#20194)
+#20221=@"loc,{#10000},12,14,12,13"
+locations_default(#20221,#10000,12,14,12,13)
+hasLocation(#20220,#20221)
+#20222=*
+exit_cfg_node(#20222,#20194)
+#20223=@"loc,{#10000},16,4,16,3"
+locations_default(#20223,#10000,16,4,16,3)
+hasLocation(#20222,#20223)
+successor(#20210,#20212)
+successor(#20212,#20222)
+successor(#20205,#20209)
+successor(#20209,#20207)
+successor(#20214,#20210)
+successor(#20207,#20216)
+successor(#20201,#20203)
+successor(#20203,#20205)
+successor(#20199,#20201)
+successor(#20220,#20199)
+successor(#20193,#20194)
+successor(#20191,#20185)
+successor(#20190,#20193)
+successor(#20187,#20190)
+successor(#20185,#20219)
 successor(#20161,#20159)
-successor(#20159,#20182)
-successor(#20139,#20161)
-successor(#20210,#20141)
+successor(#20178,#20175)
+#20224=*
+entry_cfg_node(#20224,#20178)
+#20225=@"loc,{#10000},8,11,8,10"
+locations_default(#20225,#10000,8,11,8,10)
+hasLocation(#20224,#20225)
+#20226=*
+exit_cfg_node(#20226,#20178)
+#20227=@"loc,{#10000},8,16,8,15"
+locations_default(#20227,#10000,8,16,8,15)
+hasLocation(#20226,#20227)
+successor(#20183,#20226)
+successor(#20224,#20183)
+successor(#20177,#20178)
+successor(#20175,#20140)
+successor(#20168,#20165)
+#20228=*
+entry_cfg_node(#20228,#20168)
+#20229=@"loc,{#10000},7,4,7,3"
+locations_default(#20229,#10000,7,4,7,3)
+hasLocation(#20228,#20229)
+#20230=*
+exit_cfg_node(#20230,#20168)
+#20231=@"loc,{#10000},7,9,7,8"
+locations_default(#20231,#10000,7,9,7,8)
+hasLocation(#20230,#20231)
+successor(#20173,#20230)
+successor(#20228,#20173)
+successor(#20167,#20168)
+successor(#20165,#20177)
+successor(#20148,#20145)
+#20232=*
+entry_cfg_node(#20232,#20148)
+#20233=@"loc,{#10000},2,14,2,13"
+locations_default(#20233,#10000,2,14,2,13)
+hasLocation(#20232,#20233)
+successor(#20159,#20153)
+#20234=*
+exit_cfg_node(#20234,#20148)
+#20235=@"loc,{#10000},4,4,4,3"
+locations_default(#20235,#10000,4,4,4,3)
+hasLocation(#20234,#20235)
+successor(#20155,#20157)
+successor(#20157,#20234)
+successor(#20153,#20155)
+successor(#20232,#20161)
+successor(#20147,#20148)
+successor(#20145,#20167)
+successor(#20142,#20147)
+successor(#20164,#20162)
+successor(#20162,#20187)
+successor(#20140,#20164)
+successor(#20217,#20142)
 numlines(#10000,18,17,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/cfg/output/trap/seq.js.trap b/javascript/extractor/tests/cfg/output/trap/seq.js.trap
index e9aee318c82..9218d785c5b 100644
--- a/javascript/extractor/tests/cfg/output/trap/seq.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/seq.js.trap
@@ -87,110 +87,112 @@ locations_default(#20031,#10000,1,16,1,15)
 hasLocation(#20030,#20031)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20032=*
-stmts(#20032,3,#20001,0,"if(x,1+2,y||z);")
-hasLocation(#20032,#20003)
-stmt_containers(#20032,#20001)
+#20032=@"var;{this};{#20000}"
+variables(#20032,"this",#20000)
 #20033=*
-exprs(#20033,10,#20032,0,"x,1+2,y||z")
-#20034=@"loc,{#10000},1,4,1,13"
-locations_default(#20034,#10000,1,4,1,13)
-hasLocation(#20033,#20034)
-enclosing_stmt(#20033,#20032)
-expr_containers(#20033,#20001)
-#20035=*
-exprs(#20035,79,#20033,0,"x")
-hasLocation(#20035,#20009)
-enclosing_stmt(#20035,#20032)
-expr_containers(#20035,#20001)
-literals("x","x",#20035)
-#20036=@"var;{x};{#20000}"
-variables(#20036,"x",#20000)
-bind(#20035,#20036)
-#20037=*
-exprs(#20037,34,#20033,1,"1+2")
-#20038=@"loc,{#10000},1,6,1,8"
-locations_default(#20038,#10000,1,6,1,8)
-hasLocation(#20037,#20038)
-enclosing_stmt(#20037,#20032)
-expr_containers(#20037,#20001)
-#20039=*
-exprs(#20039,3,#20037,0,"1")
-hasLocation(#20039,#20013)
-enclosing_stmt(#20039,#20032)
-expr_containers(#20039,#20001)
-literals("1","1",#20039)
+stmts(#20033,3,#20001,0,"if(x,1+2,y||z);")
+hasLocation(#20033,#20003)
+stmt_containers(#20033,#20001)
+#20034=*
+exprs(#20034,10,#20033,0,"x,1+2,y||z")
+#20035=@"loc,{#10000},1,4,1,13"
+locations_default(#20035,#10000,1,4,1,13)
+hasLocation(#20034,#20035)
+enclosing_stmt(#20034,#20033)
+expr_containers(#20034,#20001)
+#20036=*
+exprs(#20036,79,#20034,0,"x")
+hasLocation(#20036,#20009)
+enclosing_stmt(#20036,#20033)
+expr_containers(#20036,#20001)
+literals("x","x",#20036)
+#20037=@"var;{x};{#20000}"
+variables(#20037,"x",#20000)
+bind(#20036,#20037)
+#20038=*
+exprs(#20038,34,#20034,1,"1+2")
+#20039=@"loc,{#10000},1,6,1,8"
+locations_default(#20039,#10000,1,6,1,8)
+hasLocation(#20038,#20039)
+enclosing_stmt(#20038,#20033)
+expr_containers(#20038,#20001)
 #20040=*
-exprs(#20040,3,#20037,1,"2")
-hasLocation(#20040,#20017)
-enclosing_stmt(#20040,#20032)
+exprs(#20040,3,#20038,0,"1")
+hasLocation(#20040,#20013)
+enclosing_stmt(#20040,#20033)
 expr_containers(#20040,#20001)
-literals("2","2",#20040)
+literals("1","1",#20040)
 #20041=*
-exprs(#20041,45,#20033,2,"y||z")
-#20042=@"loc,{#10000},1,10,1,13"
-locations_default(#20042,#10000,1,10,1,13)
-hasLocation(#20041,#20042)
-enclosing_stmt(#20041,#20032)
+exprs(#20041,3,#20038,1,"2")
+hasLocation(#20041,#20017)
+enclosing_stmt(#20041,#20033)
 expr_containers(#20041,#20001)
-#20043=*
-exprs(#20043,79,#20041,0,"y")
-hasLocation(#20043,#20021)
-enclosing_stmt(#20043,#20032)
-expr_containers(#20043,#20001)
-literals("y","y",#20043)
-#20044=@"var;{y};{#20000}"
-variables(#20044,"y",#20000)
-bind(#20043,#20044)
-#20045=*
-exprs(#20045,79,#20041,1,"z")
-hasLocation(#20045,#20025)
-enclosing_stmt(#20045,#20032)
-expr_containers(#20045,#20001)
-literals("z","z",#20045)
-#20046=@"var;{z};{#20000}"
-variables(#20046,"z",#20000)
-bind(#20045,#20046)
-#20047=*
-stmts(#20047,0,#20032,1,";")
-hasLocation(#20047,#20029)
-stmt_containers(#20047,#20001)
+literals("2","2",#20041)
+#20042=*
+exprs(#20042,45,#20034,2,"y||z")
+#20043=@"loc,{#10000},1,10,1,13"
+locations_default(#20043,#10000,1,10,1,13)
+hasLocation(#20042,#20043)
+enclosing_stmt(#20042,#20033)
+expr_containers(#20042,#20001)
+#20044=*
+exprs(#20044,79,#20042,0,"y")
+hasLocation(#20044,#20021)
+enclosing_stmt(#20044,#20033)
+expr_containers(#20044,#20001)
+literals("y","y",#20044)
+#20045=@"var;{y};{#20000}"
+variables(#20045,"y",#20000)
+bind(#20044,#20045)
+#20046=*
+exprs(#20046,79,#20042,1,"z")
+hasLocation(#20046,#20025)
+enclosing_stmt(#20046,#20033)
+expr_containers(#20046,#20001)
+literals("z","z",#20046)
+#20047=@"var;{z};{#20000}"
+variables(#20047,"z",#20000)
+bind(#20046,#20047)
 #20048=*
-entry_cfg_node(#20048,#20001)
-#20049=@"loc,{#10000},1,1,1,0"
-locations_default(#20049,#10000,1,1,1,0)
-hasLocation(#20048,#20049)
-#20050=*
-exit_cfg_node(#20050,#20001)
-hasLocation(#20050,#20031)
-successor(#20032,#20033)
-successor(#20033,#20035)
-successor(#20041,#20043)
+stmts(#20048,0,#20033,1,";")
+hasLocation(#20048,#20029)
+stmt_containers(#20048,#20001)
+#20049=*
+entry_cfg_node(#20049,#20001)
+#20050=@"loc,{#10000},1,1,1,0"
+locations_default(#20050,#10000,1,1,1,0)
+hasLocation(#20049,#20050)
 #20051=*
-guard_node(#20051,1,#20043)
-hasLocation(#20051,#20021)
-successor(#20051,#20047)
+exit_cfg_node(#20051,#20001)
+hasLocation(#20051,#20031)
+successor(#20033,#20034)
+successor(#20034,#20036)
+successor(#20042,#20044)
 #20052=*
-guard_node(#20052,0,#20043)
+guard_node(#20052,1,#20044)
 hasLocation(#20052,#20021)
-successor(#20052,#20045)
-successor(#20043,#20051)
-successor(#20043,#20052)
+successor(#20052,#20048)
 #20053=*
-guard_node(#20053,1,#20045)
-hasLocation(#20053,#20025)
-successor(#20053,#20047)
+guard_node(#20053,0,#20044)
+hasLocation(#20053,#20021)
+successor(#20053,#20046)
+successor(#20044,#20052)
+successor(#20044,#20053)
 #20054=*
-guard_node(#20054,0,#20045)
+guard_node(#20054,1,#20046)
 hasLocation(#20054,#20025)
-successor(#20054,#20050)
-successor(#20045,#20053)
-successor(#20045,#20054)
-successor(#20040,#20037)
-successor(#20039,#20040)
-successor(#20037,#20041)
-successor(#20035,#20039)
-successor(#20047,#20050)
-successor(#20048,#20032)
+successor(#20054,#20048)
+#20055=*
+guard_node(#20055,0,#20046)
+hasLocation(#20055,#20025)
+successor(#20055,#20051)
+successor(#20046,#20054)
+successor(#20046,#20055)
+successor(#20041,#20038)
+successor(#20040,#20041)
+successor(#20038,#20042)
+successor(#20036,#20040)
+successor(#20048,#20051)
+successor(#20049,#20033)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/cfg/output/trap/short-circuit.js.trap b/javascript/extractor/tests/cfg/output/trap/short-circuit.js.trap
index 63e56bb5c49..ec19edc9c6d 100644
--- a/javascript/extractor/tests/cfg/output/trap/short-circuit.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/short-circuit.js.trap
@@ -90,152 +90,154 @@ toplevels(#20001,0)
 #20032=@"loc,{#10000},1,1,2,12"
 locations_default(#20032,#10000,1,1,2,12)
 hasLocation(#20001,#20032)
-#20033=*
-stmts(#20033,2,#20001,0,"a && b && c;")
-hasLocation(#20033,#20003)
-stmt_containers(#20033,#20001)
+#20033=@"var;{this};{#20000}"
+variables(#20033,"this",#20000)
 #20034=*
-exprs(#20034,44,#20033,0,"a && b && c")
-#20035=@"loc,{#10000},1,1,1,11"
-locations_default(#20035,#10000,1,1,1,11)
-hasLocation(#20034,#20035)
-enclosing_stmt(#20034,#20033)
-expr_containers(#20034,#20001)
-#20036=*
-exprs(#20036,44,#20034,0,"a && b")
-#20037=@"loc,{#10000},1,1,1,6"
-locations_default(#20037,#10000,1,1,1,6)
-hasLocation(#20036,#20037)
-enclosing_stmt(#20036,#20033)
-expr_containers(#20036,#20001)
-#20038=*
-exprs(#20038,79,#20036,0,"a")
-hasLocation(#20038,#20007)
-enclosing_stmt(#20038,#20033)
-expr_containers(#20038,#20001)
-literals("a","a",#20038)
-#20039=@"var;{a};{#20000}"
-variables(#20039,"a",#20000)
-bind(#20038,#20039)
-#20040=*
-exprs(#20040,79,#20036,1,"b")
-hasLocation(#20040,#20011)
-enclosing_stmt(#20040,#20033)
-expr_containers(#20040,#20001)
-literals("b","b",#20040)
-#20041=@"var;{b};{#20000}"
-variables(#20041,"b",#20000)
-bind(#20040,#20041)
-#20042=*
-exprs(#20042,79,#20034,1,"c")
-hasLocation(#20042,#20015)
-enclosing_stmt(#20042,#20033)
-expr_containers(#20042,#20001)
-literals("c","c",#20042)
-#20043=@"var;{c};{#20000}"
-variables(#20043,"c",#20000)
-bind(#20042,#20043)
-#20044=*
-stmts(#20044,2,#20001,1,"x || y || z;")
-hasLocation(#20044,#20005)
-stmt_containers(#20044,#20001)
+stmts(#20034,2,#20001,0,"a && b && c;")
+hasLocation(#20034,#20003)
+stmt_containers(#20034,#20001)
+#20035=*
+exprs(#20035,44,#20034,0,"a && b && c")
+#20036=@"loc,{#10000},1,1,1,11"
+locations_default(#20036,#10000,1,1,1,11)
+hasLocation(#20035,#20036)
+enclosing_stmt(#20035,#20034)
+expr_containers(#20035,#20001)
+#20037=*
+exprs(#20037,44,#20035,0,"a && b")
+#20038=@"loc,{#10000},1,1,1,6"
+locations_default(#20038,#10000,1,1,1,6)
+hasLocation(#20037,#20038)
+enclosing_stmt(#20037,#20034)
+expr_containers(#20037,#20001)
+#20039=*
+exprs(#20039,79,#20037,0,"a")
+hasLocation(#20039,#20007)
+enclosing_stmt(#20039,#20034)
+expr_containers(#20039,#20001)
+literals("a","a",#20039)
+#20040=@"var;{a};{#20000}"
+variables(#20040,"a",#20000)
+bind(#20039,#20040)
+#20041=*
+exprs(#20041,79,#20037,1,"b")
+hasLocation(#20041,#20011)
+enclosing_stmt(#20041,#20034)
+expr_containers(#20041,#20001)
+literals("b","b",#20041)
+#20042=@"var;{b};{#20000}"
+variables(#20042,"b",#20000)
+bind(#20041,#20042)
+#20043=*
+exprs(#20043,79,#20035,1,"c")
+hasLocation(#20043,#20015)
+enclosing_stmt(#20043,#20034)
+expr_containers(#20043,#20001)
+literals("c","c",#20043)
+#20044=@"var;{c};{#20000}"
+variables(#20044,"c",#20000)
+bind(#20043,#20044)
 #20045=*
-exprs(#20045,45,#20044,0,"x || y || z")
-#20046=@"loc,{#10000},2,1,2,11"
-locations_default(#20046,#10000,2,1,2,11)
-hasLocation(#20045,#20046)
-enclosing_stmt(#20045,#20044)
-expr_containers(#20045,#20001)
-#20047=*
-exprs(#20047,45,#20045,0,"x || y")
-#20048=@"loc,{#10000},2,1,2,6"
-locations_default(#20048,#10000,2,1,2,6)
-hasLocation(#20047,#20048)
-enclosing_stmt(#20047,#20044)
-expr_containers(#20047,#20001)
-#20049=*
-exprs(#20049,79,#20047,0,"x")
-hasLocation(#20049,#20019)
-enclosing_stmt(#20049,#20044)
-expr_containers(#20049,#20001)
-literals("x","x",#20049)
-#20050=@"var;{x};{#20000}"
-variables(#20050,"x",#20000)
-bind(#20049,#20050)
-#20051=*
-exprs(#20051,79,#20047,1,"y")
-hasLocation(#20051,#20023)
-enclosing_stmt(#20051,#20044)
-expr_containers(#20051,#20001)
-literals("y","y",#20051)
-#20052=@"var;{y};{#20000}"
-variables(#20052,"y",#20000)
-bind(#20051,#20052)
-#20053=*
-exprs(#20053,79,#20045,1,"z")
-hasLocation(#20053,#20027)
-enclosing_stmt(#20053,#20044)
-expr_containers(#20053,#20001)
-literals("z","z",#20053)
-#20054=@"var;{z};{#20000}"
-variables(#20054,"z",#20000)
-bind(#20053,#20054)
-#20055=*
-entry_cfg_node(#20055,#20001)
-#20056=@"loc,{#10000},1,1,1,0"
-locations_default(#20056,#10000,1,1,1,0)
-hasLocation(#20055,#20056)
-#20057=*
-exit_cfg_node(#20057,#20001)
-hasLocation(#20057,#20031)
-successor(#20044,#20045)
-successor(#20045,#20047)
-successor(#20047,#20049)
+stmts(#20045,2,#20001,1,"x || y || z;")
+hasLocation(#20045,#20005)
+stmt_containers(#20045,#20001)
+#20046=*
+exprs(#20046,45,#20045,0,"x || y || z")
+#20047=@"loc,{#10000},2,1,2,11"
+locations_default(#20047,#10000,2,1,2,11)
+hasLocation(#20046,#20047)
+enclosing_stmt(#20046,#20045)
+expr_containers(#20046,#20001)
+#20048=*
+exprs(#20048,45,#20046,0,"x || y")
+#20049=@"loc,{#10000},2,1,2,6"
+locations_default(#20049,#10000,2,1,2,6)
+hasLocation(#20048,#20049)
+enclosing_stmt(#20048,#20045)
+expr_containers(#20048,#20001)
+#20050=*
+exprs(#20050,79,#20048,0,"x")
+hasLocation(#20050,#20019)
+enclosing_stmt(#20050,#20045)
+expr_containers(#20050,#20001)
+literals("x","x",#20050)
+#20051=@"var;{x};{#20000}"
+variables(#20051,"x",#20000)
+bind(#20050,#20051)
+#20052=*
+exprs(#20052,79,#20048,1,"y")
+hasLocation(#20052,#20023)
+enclosing_stmt(#20052,#20045)
+expr_containers(#20052,#20001)
+literals("y","y",#20052)
+#20053=@"var;{y};{#20000}"
+variables(#20053,"y",#20000)
+bind(#20052,#20053)
+#20054=*
+exprs(#20054,79,#20046,1,"z")
+hasLocation(#20054,#20027)
+enclosing_stmt(#20054,#20045)
+expr_containers(#20054,#20001)
+literals("z","z",#20054)
+#20055=@"var;{z};{#20000}"
+variables(#20055,"z",#20000)
+bind(#20054,#20055)
+#20056=*
+entry_cfg_node(#20056,#20001)
+#20057=@"loc,{#10000},1,1,1,0"
+locations_default(#20057,#10000,1,1,1,0)
+hasLocation(#20056,#20057)
 #20058=*
-guard_node(#20058,1,#20049)
-hasLocation(#20058,#20019)
-successor(#20058,#20057)
+exit_cfg_node(#20058,#20001)
+hasLocation(#20058,#20031)
+successor(#20045,#20046)
+successor(#20046,#20048)
+successor(#20048,#20050)
 #20059=*
-guard_node(#20059,0,#20049)
+guard_node(#20059,1,#20050)
 hasLocation(#20059,#20019)
-successor(#20059,#20051)
-successor(#20049,#20058)
-successor(#20049,#20059)
+successor(#20059,#20058)
 #20060=*
-guard_node(#20060,1,#20051)
-hasLocation(#20060,#20023)
-successor(#20060,#20057)
+guard_node(#20060,0,#20050)
+hasLocation(#20060,#20019)
+successor(#20060,#20052)
+successor(#20050,#20059)
+successor(#20050,#20060)
 #20061=*
-guard_node(#20061,0,#20051)
+guard_node(#20061,1,#20052)
 hasLocation(#20061,#20023)
-successor(#20061,#20053)
-successor(#20051,#20060)
-successor(#20051,#20061)
-successor(#20053,#20057)
-successor(#20033,#20034)
-successor(#20034,#20036)
-successor(#20036,#20038)
+successor(#20061,#20058)
 #20062=*
-guard_node(#20062,1,#20038)
-hasLocation(#20062,#20007)
-successor(#20062,#20040)
+guard_node(#20062,0,#20052)
+hasLocation(#20062,#20023)
+successor(#20062,#20054)
+successor(#20052,#20061)
+successor(#20052,#20062)
+successor(#20054,#20058)
+successor(#20034,#20035)
+successor(#20035,#20037)
+successor(#20037,#20039)
 #20063=*
-guard_node(#20063,0,#20038)
+guard_node(#20063,1,#20039)
 hasLocation(#20063,#20007)
-successor(#20063,#20044)
-successor(#20038,#20062)
-successor(#20038,#20063)
+successor(#20063,#20041)
 #20064=*
-guard_node(#20064,1,#20040)
-hasLocation(#20064,#20011)
-successor(#20064,#20042)
+guard_node(#20064,0,#20039)
+hasLocation(#20064,#20007)
+successor(#20064,#20045)
+successor(#20039,#20063)
+successor(#20039,#20064)
 #20065=*
-guard_node(#20065,0,#20040)
+guard_node(#20065,1,#20041)
 hasLocation(#20065,#20011)
-successor(#20065,#20044)
-successor(#20040,#20064)
-successor(#20040,#20065)
-successor(#20042,#20044)
-successor(#20055,#20033)
+successor(#20065,#20043)
+#20066=*
+guard_node(#20066,0,#20041)
+hasLocation(#20066,#20011)
+successor(#20066,#20045)
+successor(#20041,#20065)
+successor(#20041,#20066)
+successor(#20043,#20045)
+successor(#20056,#20034)
 numlines(#10000,2,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/cfg/output/trap/ternary.js.trap b/javascript/extractor/tests/cfg/output/trap/ternary.js.trap
index 57230ac39cd..572ddd8cfa8 100644
--- a/javascript/extractor/tests/cfg/output/trap/ternary.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/ternary.js.trap
@@ -82,137 +82,139 @@ locations_default(#20029,#10000,1,23,1,22)
 hasLocation(#20028,#20029)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20030=*
-stmts(#20030,2,#20001,0,"(a ? b  ... ) || e;")
-hasLocation(#20030,#20003)
-stmt_containers(#20030,#20001)
+#20030=@"var;{this};{#20000}"
+variables(#20030,"this",#20000)
 #20031=*
-exprs(#20031,45,#20030,0,"(a ? b  ... d) || e")
-#20032=@"loc,{#10000},1,1,1,21"
-locations_default(#20032,#10000,1,1,1,21)
-hasLocation(#20031,#20032)
-enclosing_stmt(#20031,#20030)
-expr_containers(#20031,#20001)
-#20033=*
-exprs(#20033,63,#20031,0,"(a ? b || c : d)")
-#20034=@"loc,{#10000},1,1,1,16"
-locations_default(#20034,#10000,1,1,1,16)
-hasLocation(#20033,#20034)
-enclosing_stmt(#20033,#20030)
-expr_containers(#20033,#20001)
-#20035=*
-exprs(#20035,11,#20033,0,"a ? b || c : d")
-#20036=@"loc,{#10000},1,2,1,15"
-locations_default(#20036,#10000,1,2,1,15)
-hasLocation(#20035,#20036)
-enclosing_stmt(#20035,#20030)
-expr_containers(#20035,#20001)
-#20037=*
-exprs(#20037,79,#20035,0,"a")
-hasLocation(#20037,#20007)
-enclosing_stmt(#20037,#20030)
-expr_containers(#20037,#20001)
-literals("a","a",#20037)
-#20038=@"var;{a};{#20000}"
-variables(#20038,"a",#20000)
-bind(#20037,#20038)
-#20039=*
-exprs(#20039,45,#20035,1,"b || c")
-#20040=@"loc,{#10000},1,6,1,11"
-locations_default(#20040,#10000,1,6,1,11)
-hasLocation(#20039,#20040)
-enclosing_stmt(#20039,#20030)
-expr_containers(#20039,#20001)
-#20041=*
-exprs(#20041,79,#20039,0,"b")
-hasLocation(#20041,#20011)
-enclosing_stmt(#20041,#20030)
-expr_containers(#20041,#20001)
-literals("b","b",#20041)
-#20042=@"var;{b};{#20000}"
-variables(#20042,"b",#20000)
-bind(#20041,#20042)
-#20043=*
-exprs(#20043,79,#20039,1,"c")
-hasLocation(#20043,#20015)
-enclosing_stmt(#20043,#20030)
-expr_containers(#20043,#20001)
-literals("c","c",#20043)
-#20044=@"var;{c};{#20000}"
-variables(#20044,"c",#20000)
-bind(#20043,#20044)
-#20045=*
-exprs(#20045,79,#20035,2,"d")
-hasLocation(#20045,#20019)
-enclosing_stmt(#20045,#20030)
-expr_containers(#20045,#20001)
-literals("d","d",#20045)
-#20046=@"var;{d};{#20000}"
-variables(#20046,"d",#20000)
-bind(#20045,#20046)
-#20047=*
-exprs(#20047,79,#20031,1,"e")
-hasLocation(#20047,#20025)
-enclosing_stmt(#20047,#20030)
-expr_containers(#20047,#20001)
-literals("e","e",#20047)
-#20048=@"var;{e};{#20000}"
-variables(#20048,"e",#20000)
-bind(#20047,#20048)
-#20049=*
-entry_cfg_node(#20049,#20001)
-#20050=@"loc,{#10000},1,1,1,0"
-locations_default(#20050,#10000,1,1,1,0)
-hasLocation(#20049,#20050)
-#20051=*
-exit_cfg_node(#20051,#20001)
-hasLocation(#20051,#20029)
-successor(#20030,#20031)
-successor(#20031,#20033)
-successor(#20033,#20035)
-successor(#20035,#20037)
+stmts(#20031,2,#20001,0,"(a ? b  ... ) || e;")
+hasLocation(#20031,#20003)
+stmt_containers(#20031,#20001)
+#20032=*
+exprs(#20032,45,#20031,0,"(a ? b  ... d) || e")
+#20033=@"loc,{#10000},1,1,1,21"
+locations_default(#20033,#10000,1,1,1,21)
+hasLocation(#20032,#20033)
+enclosing_stmt(#20032,#20031)
+expr_containers(#20032,#20001)
+#20034=*
+exprs(#20034,63,#20032,0,"(a ? b || c : d)")
+#20035=@"loc,{#10000},1,1,1,16"
+locations_default(#20035,#10000,1,1,1,16)
+hasLocation(#20034,#20035)
+enclosing_stmt(#20034,#20031)
+expr_containers(#20034,#20001)
+#20036=*
+exprs(#20036,11,#20034,0,"a ? b || c : d")
+#20037=@"loc,{#10000},1,2,1,15"
+locations_default(#20037,#10000,1,2,1,15)
+hasLocation(#20036,#20037)
+enclosing_stmt(#20036,#20031)
+expr_containers(#20036,#20001)
+#20038=*
+exprs(#20038,79,#20036,0,"a")
+hasLocation(#20038,#20007)
+enclosing_stmt(#20038,#20031)
+expr_containers(#20038,#20001)
+literals("a","a",#20038)
+#20039=@"var;{a};{#20000}"
+variables(#20039,"a",#20000)
+bind(#20038,#20039)
+#20040=*
+exprs(#20040,45,#20036,1,"b || c")
+#20041=@"loc,{#10000},1,6,1,11"
+locations_default(#20041,#10000,1,6,1,11)
+hasLocation(#20040,#20041)
+enclosing_stmt(#20040,#20031)
+expr_containers(#20040,#20001)
+#20042=*
+exprs(#20042,79,#20040,0,"b")
+hasLocation(#20042,#20011)
+enclosing_stmt(#20042,#20031)
+expr_containers(#20042,#20001)
+literals("b","b",#20042)
+#20043=@"var;{b};{#20000}"
+variables(#20043,"b",#20000)
+bind(#20042,#20043)
+#20044=*
+exprs(#20044,79,#20040,1,"c")
+hasLocation(#20044,#20015)
+enclosing_stmt(#20044,#20031)
+expr_containers(#20044,#20001)
+literals("c","c",#20044)
+#20045=@"var;{c};{#20000}"
+variables(#20045,"c",#20000)
+bind(#20044,#20045)
+#20046=*
+exprs(#20046,79,#20036,2,"d")
+hasLocation(#20046,#20019)
+enclosing_stmt(#20046,#20031)
+expr_containers(#20046,#20001)
+literals("d","d",#20046)
+#20047=@"var;{d};{#20000}"
+variables(#20047,"d",#20000)
+bind(#20046,#20047)
+#20048=*
+exprs(#20048,79,#20032,1,"e")
+hasLocation(#20048,#20025)
+enclosing_stmt(#20048,#20031)
+expr_containers(#20048,#20001)
+literals("e","e",#20048)
+#20049=@"var;{e};{#20000}"
+variables(#20049,"e",#20000)
+bind(#20048,#20049)
+#20050=*
+entry_cfg_node(#20050,#20001)
+#20051=@"loc,{#10000},1,1,1,0"
+locations_default(#20051,#10000,1,1,1,0)
+hasLocation(#20050,#20051)
 #20052=*
-guard_node(#20052,1,#20037)
-hasLocation(#20052,#20007)
-successor(#20052,#20039)
+exit_cfg_node(#20052,#20001)
+hasLocation(#20052,#20029)
+successor(#20031,#20032)
+successor(#20032,#20034)
+successor(#20034,#20036)
+successor(#20036,#20038)
 #20053=*
-guard_node(#20053,0,#20037)
+guard_node(#20053,1,#20038)
 hasLocation(#20053,#20007)
-successor(#20053,#20045)
-successor(#20037,#20052)
-successor(#20037,#20053)
-successor(#20039,#20041)
+successor(#20053,#20040)
 #20054=*
-guard_node(#20054,1,#20041)
-hasLocation(#20054,#20011)
-successor(#20054,#20051)
+guard_node(#20054,0,#20038)
+hasLocation(#20054,#20007)
+successor(#20054,#20046)
+successor(#20038,#20053)
+successor(#20038,#20054)
+successor(#20040,#20042)
 #20055=*
-guard_node(#20055,0,#20041)
+guard_node(#20055,1,#20042)
 hasLocation(#20055,#20011)
-successor(#20055,#20043)
-successor(#20041,#20054)
-successor(#20041,#20055)
+successor(#20055,#20052)
 #20056=*
-guard_node(#20056,1,#20043)
-hasLocation(#20056,#20015)
-successor(#20056,#20051)
+guard_node(#20056,0,#20042)
+hasLocation(#20056,#20011)
+successor(#20056,#20044)
+successor(#20042,#20055)
+successor(#20042,#20056)
 #20057=*
-guard_node(#20057,0,#20043)
+guard_node(#20057,1,#20044)
 hasLocation(#20057,#20015)
-successor(#20057,#20047)
-successor(#20043,#20056)
-successor(#20043,#20057)
+successor(#20057,#20052)
 #20058=*
-guard_node(#20058,1,#20045)
-hasLocation(#20058,#20019)
-successor(#20058,#20051)
+guard_node(#20058,0,#20044)
+hasLocation(#20058,#20015)
+successor(#20058,#20048)
+successor(#20044,#20057)
+successor(#20044,#20058)
 #20059=*
-guard_node(#20059,0,#20045)
+guard_node(#20059,1,#20046)
 hasLocation(#20059,#20019)
-successor(#20059,#20047)
-successor(#20045,#20058)
-successor(#20045,#20059)
-successor(#20047,#20051)
-successor(#20049,#20030)
+successor(#20059,#20052)
+#20060=*
+guard_node(#20060,0,#20046)
+hasLocation(#20060,#20019)
+successor(#20060,#20048)
+successor(#20046,#20059)
+successor(#20046,#20060)
+successor(#20048,#20052)
+successor(#20050,#20031)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/cfg/output/trap/tst.js.trap b/javascript/extractor/tests/cfg/output/trap/tst.js.trap
index 1cb55a0238a..195204b85d0 100644
--- a/javascript/extractor/tests/cfg/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/cfg/output/trap/tst.js.trap
@@ -863,685 +863,691 @@ hasLocation(#20001,#20319)
 variables(#20320,"outer",#20000)
 #20321=@"var;{f};{#20000}"
 variables(#20321,"f",#20000)
-#20322=*
-stmts(#20322,17,#20001,0,"functio ...     }\n}")
-#20323=@"loc,{#10000},1,1,10,1"
-locations_default(#20323,#10000,1,1,10,1)
-hasLocation(#20322,#20323)
-stmt_containers(#20322,#20001)
-#20324=*
-exprs(#20324,78,#20322,-1,"outer")
-hasLocation(#20324,#20077)
-expr_containers(#20324,#20322)
-literals("outer","outer",#20324)
-decl(#20324,#20320)
+#20322=@"var;{this};{#20000}"
+variables(#20322,"this",#20000)
+#20323=*
+stmts(#20323,17,#20001,0,"functio ...     }\n}")
+#20324=@"loc,{#10000},1,1,10,1"
+locations_default(#20324,#10000,1,1,10,1)
+hasLocation(#20323,#20324)
+stmt_containers(#20323,#20001)
 #20325=*
-scopes(#20325,1)
-scopenodes(#20322,#20325)
-scopenesting(#20325,#20000)
-#20326=@"var;{i};{#20325}"
-variables(#20326,"i",#20325)
-#20327=@"var;{arguments};{#20325}"
-variables(#20327,"arguments",#20325)
-is_arguments_object(#20327)
-#20328=*
-stmts(#20328,1,#20322,-2,"{\n    v ...     }\n}")
-#20329=@"loc,{#10000},2,1,10,1"
-locations_default(#20329,#10000,2,1,10,1)
-hasLocation(#20328,#20329)
-stmt_containers(#20328,#20322)
+exprs(#20325,78,#20323,-1,"outer")
+hasLocation(#20325,#20077)
+expr_containers(#20325,#20323)
+literals("outer","outer",#20325)
+decl(#20325,#20320)
+#20326=*
+scopes(#20326,1)
+scopenodes(#20323,#20326)
+scopenesting(#20326,#20000)
+#20327=@"var;{i};{#20326}"
+variables(#20327,"i",#20326)
+#20328=@"var;{this};{#20326}"
+variables(#20328,"this",#20326)
+#20329=@"var;{arguments};{#20326}"
+variables(#20329,"arguments",#20326)
+is_arguments_object(#20329)
 #20330=*
-stmts(#20330,18,#20328,0,"var i = 0;")
-#20331=@"loc,{#10000},3,5,3,14"
-locations_default(#20331,#10000,3,5,3,14)
+stmts(#20330,1,#20323,-2,"{\n    v ...     }\n}")
+#20331=@"loc,{#10000},2,1,10,1"
+locations_default(#20331,#10000,2,1,10,1)
 hasLocation(#20330,#20331)
-stmt_containers(#20330,#20322)
+stmt_containers(#20330,#20323)
 #20332=*
-exprs(#20332,64,#20330,0,"i = 0")
-#20333=@"loc,{#10000},3,9,3,13"
-locations_default(#20333,#10000,3,9,3,13)
+stmts(#20332,18,#20330,0,"var i = 0;")
+#20333=@"loc,{#10000},3,5,3,14"
+locations_default(#20333,#10000,3,5,3,14)
 hasLocation(#20332,#20333)
-enclosing_stmt(#20332,#20330)
-expr_containers(#20332,#20322)
+stmt_containers(#20332,#20323)
 #20334=*
-exprs(#20334,78,#20332,0,"i")
-hasLocation(#20334,#20086)
-enclosing_stmt(#20334,#20330)
-expr_containers(#20334,#20322)
-literals("i","i",#20334)
-decl(#20334,#20326)
-#20335=*
-exprs(#20335,3,#20332,1,"0")
-hasLocation(#20335,#20090)
-enclosing_stmt(#20335,#20330)
-expr_containers(#20335,#20322)
-literals("0","0",#20335)
+exprs(#20334,64,#20332,0,"i = 0")
+#20335=@"loc,{#10000},3,9,3,13"
+locations_default(#20335,#10000,3,9,3,13)
+hasLocation(#20334,#20335)
+enclosing_stmt(#20334,#20332)
+expr_containers(#20334,#20323)
 #20336=*
-stmts(#20336,18,#20328,1,"var i = 1;")
-#20337=@"loc,{#10000},4,5,4,14"
-locations_default(#20337,#10000,4,5,4,14)
-hasLocation(#20336,#20337)
-stmt_containers(#20336,#20322)
+exprs(#20336,78,#20334,0,"i")
+hasLocation(#20336,#20086)
+enclosing_stmt(#20336,#20332)
+expr_containers(#20336,#20323)
+literals("i","i",#20336)
+decl(#20336,#20327)
+#20337=*
+exprs(#20337,3,#20334,1,"0")
+hasLocation(#20337,#20090)
+enclosing_stmt(#20337,#20332)
+expr_containers(#20337,#20323)
+literals("0","0",#20337)
 #20338=*
-exprs(#20338,64,#20336,0,"i = 1")
-#20339=@"loc,{#10000},4,9,4,13"
-locations_default(#20339,#10000,4,9,4,13)
+stmts(#20338,18,#20330,1,"var i = 1;")
+#20339=@"loc,{#10000},4,5,4,14"
+locations_default(#20339,#10000,4,5,4,14)
 hasLocation(#20338,#20339)
-enclosing_stmt(#20338,#20336)
-expr_containers(#20338,#20322)
+stmt_containers(#20338,#20323)
 #20340=*
-exprs(#20340,78,#20338,0,"i")
-hasLocation(#20340,#20096)
-enclosing_stmt(#20340,#20336)
-expr_containers(#20340,#20322)
-literals("i","i",#20340)
-decl(#20340,#20326)
-#20341=*
-exprs(#20341,3,#20338,1,"1")
-hasLocation(#20341,#20100)
-enclosing_stmt(#20341,#20336)
-expr_containers(#20341,#20322)
-literals("1","1",#20341)
+exprs(#20340,64,#20338,0,"i = 1")
+#20341=@"loc,{#10000},4,9,4,13"
+locations_default(#20341,#10000,4,9,4,13)
+hasLocation(#20340,#20341)
+enclosing_stmt(#20340,#20338)
+expr_containers(#20340,#20323)
 #20342=*
-stmts(#20342,14,#20328,2,"for ( i ...  ++i );")
-#20343=@"loc,{#10000},5,5,5,33"
-locations_default(#20343,#10000,5,5,5,33)
-hasLocation(#20342,#20343)
-stmt_containers(#20342,#20322)
+exprs(#20342,78,#20340,0,"i")
+hasLocation(#20342,#20096)
+enclosing_stmt(#20342,#20338)
+expr_containers(#20342,#20323)
+literals("i","i",#20342)
+decl(#20342,#20327)
+#20343=*
+exprs(#20343,3,#20340,1,"1")
+hasLocation(#20343,#20100)
+enclosing_stmt(#20343,#20338)
+expr_containers(#20343,#20323)
+literals("1","1",#20343)
 #20344=*
-exprs(#20344,27,#20342,1,"i < 32")
-#20345=@"loc,{#10000},5,19,5,24"
-locations_default(#20345,#10000,5,19,5,24)
+stmts(#20344,14,#20330,2,"for ( i ...  ++i );")
+#20345=@"loc,{#10000},5,5,5,33"
+locations_default(#20345,#10000,5,5,5,33)
 hasLocation(#20344,#20345)
-enclosing_stmt(#20344,#20342)
-expr_containers(#20344,#20322)
+stmt_containers(#20344,#20323)
 #20346=*
-exprs(#20346,79,#20344,0,"i")
-hasLocation(#20346,#20116)
-enclosing_stmt(#20346,#20342)
-expr_containers(#20346,#20322)
-literals("i","i",#20346)
-bind(#20346,#20326)
-#20347=*
-exprs(#20347,3,#20344,1,"32")
-hasLocation(#20347,#20120)
-enclosing_stmt(#20347,#20342)
-expr_containers(#20347,#20322)
-literals("32","32",#20347)
+exprs(#20346,27,#20344,1,"i < 32")
+#20347=@"loc,{#10000},5,19,5,24"
+locations_default(#20347,#10000,5,19,5,24)
+hasLocation(#20346,#20347)
+enclosing_stmt(#20346,#20344)
+expr_containers(#20346,#20323)
 #20348=*
-exprs(#20348,59,#20342,2,"++i")
-#20349=@"loc,{#10000},5,28,5,30"
-locations_default(#20349,#10000,5,28,5,30)
-hasLocation(#20348,#20349)
-enclosing_stmt(#20348,#20342)
-expr_containers(#20348,#20322)
+exprs(#20348,79,#20346,0,"i")
+hasLocation(#20348,#20116)
+enclosing_stmt(#20348,#20344)
+expr_containers(#20348,#20323)
+literals("i","i",#20348)
+bind(#20348,#20327)
+#20349=*
+exprs(#20349,3,#20346,1,"32")
+hasLocation(#20349,#20120)
+enclosing_stmt(#20349,#20344)
+expr_containers(#20349,#20323)
+literals("32","32",#20349)
 #20350=*
-exprs(#20350,79,#20348,0,"i")
-hasLocation(#20350,#20126)
-enclosing_stmt(#20350,#20342)
-expr_containers(#20350,#20322)
-literals("i","i",#20350)
-bind(#20350,#20326)
-#20351=*
-exprs(#20351,47,#20342,0,"i = 0")
-#20352=@"loc,{#10000},5,11,5,15"
-locations_default(#20352,#10000,5,11,5,15)
-hasLocation(#20351,#20352)
-enclosing_stmt(#20351,#20342)
-expr_containers(#20351,#20322)
+exprs(#20350,59,#20344,2,"++i")
+#20351=@"loc,{#10000},5,28,5,30"
+locations_default(#20351,#10000,5,28,5,30)
+hasLocation(#20350,#20351)
+enclosing_stmt(#20350,#20344)
+expr_containers(#20350,#20323)
+#20352=*
+exprs(#20352,79,#20350,0,"i")
+hasLocation(#20352,#20126)
+enclosing_stmt(#20352,#20344)
+expr_containers(#20352,#20323)
+literals("i","i",#20352)
+bind(#20352,#20327)
 #20353=*
-exprs(#20353,79,#20351,0,"i")
-hasLocation(#20353,#20108)
-enclosing_stmt(#20353,#20342)
-expr_containers(#20353,#20322)
-literals("i","i",#20353)
-bind(#20353,#20326)
-#20354=*
-exprs(#20354,3,#20351,1,"0")
-hasLocation(#20354,#20112)
-enclosing_stmt(#20354,#20342)
-expr_containers(#20354,#20322)
-literals("0","0",#20354)
+exprs(#20353,47,#20344,0,"i = 0")
+#20354=@"loc,{#10000},5,11,5,15"
+locations_default(#20354,#10000,5,11,5,15)
+hasLocation(#20353,#20354)
+enclosing_stmt(#20353,#20344)
+expr_containers(#20353,#20323)
 #20355=*
-stmts(#20355,0,#20342,3,";")
-hasLocation(#20355,#20130)
-stmt_containers(#20355,#20322)
+exprs(#20355,79,#20353,0,"i")
+hasLocation(#20355,#20108)
+enclosing_stmt(#20355,#20344)
+expr_containers(#20355,#20323)
+literals("i","i",#20355)
+bind(#20355,#20327)
 #20356=*
-stmts(#20356,8,#20328,3,"switch  ... ;\n    }")
-#20357=@"loc,{#10000},6,5,9,5"
-locations_default(#20357,#10000,6,5,9,5)
-hasLocation(#20356,#20357)
-stmt_containers(#20356,#20322)
+exprs(#20356,3,#20353,1,"0")
+hasLocation(#20356,#20112)
+enclosing_stmt(#20356,#20344)
+expr_containers(#20356,#20323)
+literals("0","0",#20356)
+#20357=*
+stmts(#20357,0,#20344,3,";")
+hasLocation(#20357,#20130)
+stmt_containers(#20357,#20323)
 #20358=*
-exprs(#20358,79,#20356,-1,"i")
-hasLocation(#20358,#20136)
-enclosing_stmt(#20358,#20356)
-expr_containers(#20358,#20322)
-literals("i","i",#20358)
-bind(#20358,#20326)
-#20359=*
-stmts(#20359,19,#20356,0,"case 32 ... n true;")
-#20360=@"loc,{#10000},7,5,8,20"
-locations_default(#20360,#10000,7,5,8,20)
-hasLocation(#20359,#20360)
-stmt_containers(#20359,#20322)
+stmts(#20358,8,#20330,3,"switch  ... ;\n    }")
+#20359=@"loc,{#10000},6,5,9,5"
+locations_default(#20359,#10000,6,5,9,5)
+hasLocation(#20358,#20359)
+stmt_containers(#20358,#20323)
+#20360=*
+exprs(#20360,79,#20358,-1,"i")
+hasLocation(#20360,#20136)
+enclosing_stmt(#20360,#20358)
+expr_containers(#20360,#20323)
+literals("i","i",#20360)
+bind(#20360,#20327)
 #20361=*
-exprs(#20361,3,#20359,-1,"32")
-hasLocation(#20361,#20144)
-enclosing_stmt(#20361,#20359)
-expr_containers(#20361,#20322)
-literals("32","32",#20361)
-#20362=*
-stmts(#20362,9,#20359,0,"return true;")
-#20363=@"loc,{#10000},8,9,8,20"
-locations_default(#20363,#10000,8,9,8,20)
-hasLocation(#20362,#20363)
-stmt_containers(#20362,#20322)
+stmts(#20361,19,#20358,0,"case 32 ... n true;")
+#20362=@"loc,{#10000},7,5,8,20"
+locations_default(#20362,#10000,7,5,8,20)
+hasLocation(#20361,#20362)
+stmt_containers(#20361,#20323)
+#20363=*
+exprs(#20363,3,#20361,-1,"32")
+hasLocation(#20363,#20144)
+enclosing_stmt(#20363,#20361)
+expr_containers(#20363,#20323)
+literals("32","32",#20363)
 #20364=*
-exprs(#20364,2,#20362,0,"true")
-hasLocation(#20364,#20150)
-enclosing_stmt(#20364,#20362)
-expr_containers(#20364,#20322)
-literals("true","true",#20364)
-#20365=*
-stmts(#20365,14,#20001,1,"for (;a ... ntinue;")
-#20366=@"loc,{#10000},12,1,13,13"
-locations_default(#20366,#10000,12,1,13,13)
-hasLocation(#20365,#20366)
-stmt_containers(#20365,#20001)
+stmts(#20364,9,#20361,0,"return true;")
+#20365=@"loc,{#10000},8,9,8,20"
+locations_default(#20365,#10000,8,9,8,20)
+hasLocation(#20364,#20365)
+stmt_containers(#20364,#20323)
+#20366=*
+exprs(#20366,2,#20364,0,"true")
+hasLocation(#20366,#20150)
+enclosing_stmt(#20366,#20364)
+expr_containers(#20366,#20323)
+literals("true","true",#20366)
 #20367=*
-exprs(#20367,79,#20365,1,"a")
-hasLocation(#20367,#20163)
-enclosing_stmt(#20367,#20365)
-expr_containers(#20367,#20001)
-literals("a","a",#20367)
-#20368=@"var;{a};{#20000}"
-variables(#20368,"a",#20000)
-bind(#20367,#20368)
+stmts(#20367,14,#20001,1,"for (;a ... ntinue;")
+#20368=@"loc,{#10000},12,1,13,13"
+locations_default(#20368,#10000,12,1,13,13)
+hasLocation(#20367,#20368)
+stmt_containers(#20367,#20001)
 #20369=*
-stmts(#20369,6,#20365,3,"continue;")
-#20370=@"loc,{#10000},13,5,13,13"
-locations_default(#20370,#10000,13,5,13,13)
-hasLocation(#20369,#20370)
-stmt_containers(#20369,#20001)
-jump_targets(#20369,#20365)
+exprs(#20369,79,#20367,1,"a")
+hasLocation(#20369,#20163)
+enclosing_stmt(#20369,#20367)
+expr_containers(#20369,#20001)
+literals("a","a",#20369)
+#20370=@"var;{a};{#20000}"
+variables(#20370,"a",#20000)
+bind(#20369,#20370)
 #20371=*
-stmts(#20371,17,#20001,2,"functio ...  (p);\n}")
-#20372=@"loc,{#10000},15,1,18,1"
-locations_default(#20372,#10000,15,1,18,1)
+stmts(#20371,6,#20367,3,"continue;")
+#20372=@"loc,{#10000},13,5,13,13"
+locations_default(#20372,#10000,13,5,13,13)
 hasLocation(#20371,#20372)
 stmt_containers(#20371,#20001)
+jump_targets(#20371,#20367)
 #20373=*
-exprs(#20373,78,#20371,-1,"f")
-hasLocation(#20373,#20175)
-expr_containers(#20373,#20371)
-literals("f","f",#20373)
-decl(#20373,#20321)
-#20374=*
-scopes(#20374,1)
-scopenodes(#20371,#20374)
-scopenesting(#20374,#20000)
-#20375=@"var;{p};{#20374}"
-variables(#20375,"p",#20374)
-#20376=@"var;{o};{#20374}"
-variables(#20376,"o",#20374)
-#20377=*
-exprs(#20377,78,#20371,0,"o")
-hasLocation(#20377,#20179)
-expr_containers(#20377,#20371)
-literals("o","o",#20377)
-decl(#20377,#20376)
-#20378=@"var;{arguments};{#20374}"
-variables(#20378,"arguments",#20374)
-is_arguments_object(#20378)
-#20379=*
-stmts(#20379,1,#20371,-2,"{\n    f ...  (p);\n}")
-#20380=@"loc,{#10000},15,15,18,1"
-locations_default(#20380,#10000,15,15,18,1)
-hasLocation(#20379,#20380)
-stmt_containers(#20379,#20371)
-#20381=*
-stmts(#20381,15,#20379,0,"for (va ... if (p);")
-#20382=@"loc,{#10000},16,5,17,15"
-locations_default(#20382,#10000,16,5,17,15)
-hasLocation(#20381,#20382)
-stmt_containers(#20381,#20371)
-#20383=*
-exprs(#20383,79,#20381,1,"o")
-hasLocation(#20383,#20195)
-enclosing_stmt(#20383,#20381)
-expr_containers(#20383,#20371)
-literals("o","o",#20383)
-bind(#20383,#20376)
+stmts(#20373,17,#20001,2,"functio ...  (p);\n}")
+#20374=@"loc,{#10000},15,1,18,1"
+locations_default(#20374,#10000,15,1,18,1)
+hasLocation(#20373,#20374)
+stmt_containers(#20373,#20001)
+#20375=*
+exprs(#20375,78,#20373,-1,"f")
+hasLocation(#20375,#20175)
+expr_containers(#20375,#20373)
+literals("f","f",#20375)
+decl(#20375,#20321)
+#20376=*
+scopes(#20376,1)
+scopenodes(#20373,#20376)
+scopenesting(#20376,#20000)
+#20377=@"var;{p};{#20376}"
+variables(#20377,"p",#20376)
+#20378=@"var;{this};{#20376}"
+variables(#20378,"this",#20376)
+#20379=@"var;{o};{#20376}"
+variables(#20379,"o",#20376)
+#20380=*
+exprs(#20380,78,#20373,0,"o")
+hasLocation(#20380,#20179)
+expr_containers(#20380,#20373)
+literals("o","o",#20380)
+decl(#20380,#20379)
+#20381=@"var;{arguments};{#20376}"
+variables(#20381,"arguments",#20376)
+is_arguments_object(#20381)
+#20382=*
+stmts(#20382,1,#20373,-2,"{\n    f ...  (p);\n}")
+#20383=@"loc,{#10000},15,15,18,1"
+locations_default(#20383,#10000,15,15,18,1)
+hasLocation(#20382,#20383)
+stmt_containers(#20382,#20373)
 #20384=*
-stmts(#20384,18,#20381,0,"var p")
-#20385=@"loc,{#10000},16,10,16,14"
-locations_default(#20385,#10000,16,10,16,14)
+stmts(#20384,15,#20382,0,"for (va ... if (p);")
+#20385=@"loc,{#10000},16,5,17,15"
+locations_default(#20385,#10000,16,5,17,15)
 hasLocation(#20384,#20385)
-stmt_containers(#20384,#20371)
+stmt_containers(#20384,#20373)
 #20386=*
-exprs(#20386,64,#20384,0,"p")
-hasLocation(#20386,#20191)
+exprs(#20386,79,#20384,1,"o")
+hasLocation(#20386,#20195)
 enclosing_stmt(#20386,#20384)
-expr_containers(#20386,#20371)
+expr_containers(#20386,#20373)
+literals("o","o",#20386)
+bind(#20386,#20379)
 #20387=*
-exprs(#20387,78,#20386,0,"p")
-hasLocation(#20387,#20191)
-enclosing_stmt(#20387,#20384)
-expr_containers(#20387,#20371)
-literals("p","p",#20387)
-decl(#20387,#20375)
-#20388=*
-stmts(#20388,3,#20381,2,"if (p);")
-#20389=@"loc,{#10000},17,9,17,15"
-locations_default(#20389,#10000,17,9,17,15)
-hasLocation(#20388,#20389)
-stmt_containers(#20388,#20371)
+stmts(#20387,18,#20384,0,"var p")
+#20388=@"loc,{#10000},16,10,16,14"
+locations_default(#20388,#10000,16,10,16,14)
+hasLocation(#20387,#20388)
+stmt_containers(#20387,#20373)
+#20389=*
+exprs(#20389,64,#20387,0,"p")
+hasLocation(#20389,#20191)
+enclosing_stmt(#20389,#20387)
+expr_containers(#20389,#20373)
 #20390=*
-exprs(#20390,79,#20388,0,"p")
-hasLocation(#20390,#20203)
-enclosing_stmt(#20390,#20388)
-expr_containers(#20390,#20371)
+exprs(#20390,78,#20389,0,"p")
+hasLocation(#20390,#20191)
+enclosing_stmt(#20390,#20387)
+expr_containers(#20390,#20373)
 literals("p","p",#20390)
-bind(#20390,#20375)
+decl(#20390,#20377)
 #20391=*
-stmts(#20391,0,#20388,1,";")
-hasLocation(#20391,#20207)
-stmt_containers(#20391,#20371)
-#20392=*
-stmts(#20392,11,#20001,3,"try  {\n ... lly {\n}")
-#20393=@"loc,{#10000},20,1,24,1"
-locations_default(#20393,#10000,20,1,24,1)
-hasLocation(#20392,#20393)
-stmt_containers(#20392,#20001)
+stmts(#20391,3,#20384,2,"if (p);")
+#20392=@"loc,{#10000},17,9,17,15"
+locations_default(#20392,#10000,17,9,17,15)
+hasLocation(#20391,#20392)
+stmt_containers(#20391,#20373)
+#20393=*
+exprs(#20393,79,#20391,0,"p")
+hasLocation(#20393,#20203)
+enclosing_stmt(#20393,#20391)
+expr_containers(#20393,#20373)
+literals("p","p",#20393)
+bind(#20393,#20377)
 #20394=*
-stmts(#20394,1,#20392,0,"{\n}")
-#20395=@"loc,{#10000},20,6,21,1"
-locations_default(#20395,#10000,20,6,21,1)
-hasLocation(#20394,#20395)
-stmt_containers(#20394,#20001)
-#20396=*
-stmts(#20396,20,#20392,1,"catch ( ... .m();\n}")
-#20397=@"loc,{#10000},21,3,23,1"
-locations_default(#20397,#10000,21,3,23,1)
-hasLocation(#20396,#20397)
-stmt_containers(#20396,#20001)
-#20398=*
-scopes(#20398,2)
-scopenodes(#20396,#20398)
-scopenesting(#20398,#20000)
-#20399=@"var;{e};{#20398}"
-variables(#20399,"e",#20398)
-#20400=*
-exprs(#20400,78,#20396,0,"e")
-hasLocation(#20400,#20220)
-enclosing_stmt(#20400,#20396)
-expr_containers(#20400,#20001)
-literals("e","e",#20400)
-decl(#20400,#20399)
+stmts(#20394,0,#20391,1,";")
+hasLocation(#20394,#20207)
+stmt_containers(#20394,#20373)
+#20395=*
+stmts(#20395,11,#20001,3,"try  {\n ... lly {\n}")
+#20396=@"loc,{#10000},20,1,24,1"
+locations_default(#20396,#10000,20,1,24,1)
+hasLocation(#20395,#20396)
+stmt_containers(#20395,#20001)
+#20397=*
+stmts(#20397,1,#20395,0,"{\n}")
+#20398=@"loc,{#10000},20,6,21,1"
+locations_default(#20398,#10000,20,6,21,1)
+hasLocation(#20397,#20398)
+stmt_containers(#20397,#20001)
+#20399=*
+stmts(#20399,20,#20395,1,"catch ( ... .m();\n}")
+#20400=@"loc,{#10000},21,3,23,1"
+locations_default(#20400,#10000,21,3,23,1)
+hasLocation(#20399,#20400)
+stmt_containers(#20399,#20001)
 #20401=*
-stmts(#20401,1,#20396,1,"{\n    o.m();\n}")
-#20402=@"loc,{#10000},21,13,23,1"
-locations_default(#20402,#10000,21,13,23,1)
-hasLocation(#20401,#20402)
-stmt_containers(#20401,#20001)
+scopes(#20401,2)
+scopenodes(#20399,#20401)
+scopenesting(#20401,#20000)
+#20402=@"var;{e};{#20401}"
+variables(#20402,"e",#20401)
 #20403=*
-stmts(#20403,2,#20401,0,"o.m();")
-#20404=@"loc,{#10000},22,5,22,10"
-locations_default(#20404,#10000,22,5,22,10)
-hasLocation(#20403,#20404)
-stmt_containers(#20403,#20001)
-#20405=*
-exprs(#20405,13,#20403,0,"o.m()")
-#20406=@"loc,{#10000},22,5,22,9"
-locations_default(#20406,#10000,22,5,22,9)
-hasLocation(#20405,#20406)
-enclosing_stmt(#20405,#20403)
-expr_containers(#20405,#20001)
-#20407=*
-exprs(#20407,14,#20405,-1,"o.m")
-#20408=@"loc,{#10000},22,5,22,7"
-locations_default(#20408,#10000,22,5,22,7)
-hasLocation(#20407,#20408)
-enclosing_stmt(#20407,#20403)
-expr_containers(#20407,#20001)
-#20409=*
-exprs(#20409,79,#20407,0,"o")
-hasLocation(#20409,#20226)
-enclosing_stmt(#20409,#20403)
-expr_containers(#20409,#20001)
-literals("o","o",#20409)
-#20410=@"var;{o};{#20000}"
-variables(#20410,"o",#20000)
-bind(#20409,#20410)
-#20411=*
-exprs(#20411,0,#20407,1,"m")
-hasLocation(#20411,#20230)
-enclosing_stmt(#20411,#20403)
-expr_containers(#20411,#20001)
-literals("m","m",#20411)
+exprs(#20403,78,#20399,0,"e")
+hasLocation(#20403,#20220)
+enclosing_stmt(#20403,#20399)
+expr_containers(#20403,#20001)
+literals("e","e",#20403)
+decl(#20403,#20402)
+#20404=*
+stmts(#20404,1,#20399,1,"{\n    o.m();\n}")
+#20405=@"loc,{#10000},21,13,23,1"
+locations_default(#20405,#10000,21,13,23,1)
+hasLocation(#20404,#20405)
+stmt_containers(#20404,#20001)
+#20406=*
+stmts(#20406,2,#20404,0,"o.m();")
+#20407=@"loc,{#10000},22,5,22,10"
+locations_default(#20407,#10000,22,5,22,10)
+hasLocation(#20406,#20407)
+stmt_containers(#20406,#20001)
+#20408=*
+exprs(#20408,13,#20406,0,"o.m()")
+#20409=@"loc,{#10000},22,5,22,9"
+locations_default(#20409,#10000,22,5,22,9)
+hasLocation(#20408,#20409)
+enclosing_stmt(#20408,#20406)
+expr_containers(#20408,#20001)
+#20410=*
+exprs(#20410,14,#20408,-1,"o.m")
+#20411=@"loc,{#10000},22,5,22,7"
+locations_default(#20411,#10000,22,5,22,7)
+hasLocation(#20410,#20411)
+enclosing_stmt(#20410,#20406)
+expr_containers(#20410,#20001)
 #20412=*
-stmts(#20412,1,#20392,-1,"{\n}")
-#20413=@"loc,{#10000},23,11,24,1"
-locations_default(#20413,#10000,23,11,24,1)
-hasLocation(#20412,#20413)
-stmt_containers(#20412,#20001)
+exprs(#20412,79,#20410,0,"o")
+hasLocation(#20412,#20226)
+enclosing_stmt(#20412,#20406)
+expr_containers(#20412,#20001)
+literals("o","o",#20412)
+#20413=@"var;{o};{#20000}"
+variables(#20413,"o",#20000)
+bind(#20412,#20413)
 #20414=*
-stmts(#20414,11,#20001,4,"try {\n  ... h(_) {}")
-#20415=@"loc,{#10000},26,1,28,13"
-locations_default(#20415,#10000,26,1,28,13)
-hasLocation(#20414,#20415)
-stmt_containers(#20414,#20001)
-#20416=*
-stmts(#20416,1,#20414,0,"{\n    f ... ers);\n}")
-#20417=@"loc,{#10000},26,5,28,1"
-locations_default(#20417,#10000,26,5,28,1)
-hasLocation(#20416,#20417)
-stmt_containers(#20416,#20001)
-#20418=*
-stmts(#20418,15,#20416,0,"for (i in headers);")
-#20419=@"loc,{#10000},27,5,27,23"
-locations_default(#20419,#10000,27,5,27,23)
-hasLocation(#20418,#20419)
-stmt_containers(#20418,#20001)
-#20420=*
-exprs(#20420,79,#20418,1,"headers")
-hasLocation(#20420,#20257)
-enclosing_stmt(#20420,#20418)
-expr_containers(#20420,#20001)
-literals("headers","headers",#20420)
-#20421=@"var;{headers};{#20000}"
-variables(#20421,"headers",#20000)
-bind(#20420,#20421)
-#20422=*
-exprs(#20422,79,#20418,0,"i")
-hasLocation(#20422,#20253)
-enclosing_stmt(#20422,#20418)
-expr_containers(#20422,#20001)
-literals("i","i",#20422)
-#20423=@"var;{i};{#20000}"
-variables(#20423,"i",#20000)
-bind(#20422,#20423)
-#20424=*
-stmts(#20424,0,#20418,2,";")
-hasLocation(#20424,#20261)
-stmt_containers(#20424,#20001)
+exprs(#20414,0,#20410,1,"m")
+hasLocation(#20414,#20230)
+enclosing_stmt(#20414,#20406)
+expr_containers(#20414,#20001)
+literals("m","m",#20414)
+#20415=*
+stmts(#20415,1,#20395,-1,"{\n}")
+#20416=@"loc,{#10000},23,11,24,1"
+locations_default(#20416,#10000,23,11,24,1)
+hasLocation(#20415,#20416)
+stmt_containers(#20415,#20001)
+#20417=*
+stmts(#20417,11,#20001,4,"try {\n  ... h(_) {}")
+#20418=@"loc,{#10000},26,1,28,13"
+locations_default(#20418,#10000,26,1,28,13)
+hasLocation(#20417,#20418)
+stmt_containers(#20417,#20001)
+#20419=*
+stmts(#20419,1,#20417,0,"{\n    f ... ers);\n}")
+#20420=@"loc,{#10000},26,5,28,1"
+locations_default(#20420,#10000,26,5,28,1)
+hasLocation(#20419,#20420)
+stmt_containers(#20419,#20001)
+#20421=*
+stmts(#20421,15,#20419,0,"for (i in headers);")
+#20422=@"loc,{#10000},27,5,27,23"
+locations_default(#20422,#10000,27,5,27,23)
+hasLocation(#20421,#20422)
+stmt_containers(#20421,#20001)
+#20423=*
+exprs(#20423,79,#20421,1,"headers")
+hasLocation(#20423,#20257)
+enclosing_stmt(#20423,#20421)
+expr_containers(#20423,#20001)
+literals("headers","headers",#20423)
+#20424=@"var;{headers};{#20000}"
+variables(#20424,"headers",#20000)
+bind(#20423,#20424)
 #20425=*
-stmts(#20425,20,#20414,1,"catch(_) {}")
-#20426=@"loc,{#10000},28,3,28,13"
-locations_default(#20426,#10000,28,3,28,13)
-hasLocation(#20425,#20426)
-stmt_containers(#20425,#20001)
+exprs(#20425,79,#20421,0,"i")
+hasLocation(#20425,#20253)
+enclosing_stmt(#20425,#20421)
+expr_containers(#20425,#20001)
+literals("i","i",#20425)
+#20426=@"var;{i};{#20000}"
+variables(#20426,"i",#20000)
+bind(#20425,#20426)
 #20427=*
-scopes(#20427,2)
-scopenodes(#20425,#20427)
-scopenesting(#20427,#20000)
-#20428=@"var;{_};{#20427}"
-variables(#20428,"_",#20427)
-#20429=*
-exprs(#20429,78,#20425,0,"_")
-hasLocation(#20429,#20269)
-enclosing_stmt(#20429,#20425)
-expr_containers(#20429,#20001)
-literals("_","_",#20429)
-decl(#20429,#20428)
+stmts(#20427,0,#20421,2,";")
+hasLocation(#20427,#20261)
+stmt_containers(#20427,#20001)
+#20428=*
+stmts(#20428,20,#20417,1,"catch(_) {}")
+#20429=@"loc,{#10000},28,3,28,13"
+locations_default(#20429,#10000,28,3,28,13)
+hasLocation(#20428,#20429)
+stmt_containers(#20428,#20001)
 #20430=*
-stmts(#20430,1,#20425,1,"{}")
-#20431=@"loc,{#10000},28,12,28,13"
-locations_default(#20431,#10000,28,12,28,13)
-hasLocation(#20430,#20431)
-stmt_containers(#20430,#20001)
+scopes(#20430,2)
+scopenodes(#20428,#20430)
+scopenesting(#20430,#20000)
+#20431=@"var;{_};{#20430}"
+variables(#20431,"_",#20430)
 #20432=*
-stmts(#20432,11,#20001,5,"try {\n} ...  f();\n}")
-#20433=@"loc,{#10000},30,1,33,1"
-locations_default(#20433,#10000,30,1,33,1)
-hasLocation(#20432,#20433)
-stmt_containers(#20432,#20001)
-#20434=*
-stmts(#20434,1,#20432,0,"{\n}")
-#20435=@"loc,{#10000},30,5,31,1"
-locations_default(#20435,#10000,30,5,31,1)
-hasLocation(#20434,#20435)
-stmt_containers(#20434,#20001)
-#20436=*
-stmts(#20436,1,#20432,-1,"{\n    f();\n}")
-#20437=@"loc,{#10000},31,11,33,1"
-locations_default(#20437,#10000,31,11,33,1)
-hasLocation(#20436,#20437)
-stmt_containers(#20436,#20001)
-#20438=*
-stmts(#20438,2,#20436,0,"f();")
-#20439=@"loc,{#10000},32,5,32,8"
-locations_default(#20439,#10000,32,5,32,8)
-hasLocation(#20438,#20439)
-stmt_containers(#20438,#20001)
-#20440=*
-exprs(#20440,13,#20438,0,"f()")
-#20441=@"loc,{#10000},32,5,32,7"
-locations_default(#20441,#10000,32,5,32,7)
-hasLocation(#20440,#20441)
-enclosing_stmt(#20440,#20438)
-expr_containers(#20440,#20001)
-#20442=*
-exprs(#20442,79,#20440,-1,"f")
-hasLocation(#20442,#20287)
-enclosing_stmt(#20442,#20438)
-expr_containers(#20442,#20001)
-literals("f","f",#20442)
-bind(#20442,#20321)
+exprs(#20432,78,#20428,0,"_")
+hasLocation(#20432,#20269)
+enclosing_stmt(#20432,#20428)
+expr_containers(#20432,#20001)
+literals("_","_",#20432)
+decl(#20432,#20431)
+#20433=*
+stmts(#20433,1,#20428,1,"{}")
+#20434=@"loc,{#10000},28,12,28,13"
+locations_default(#20434,#10000,28,12,28,13)
+hasLocation(#20433,#20434)
+stmt_containers(#20433,#20001)
+#20435=*
+stmts(#20435,11,#20001,5,"try {\n} ...  f();\n}")
+#20436=@"loc,{#10000},30,1,33,1"
+locations_default(#20436,#10000,30,1,33,1)
+hasLocation(#20435,#20436)
+stmt_containers(#20435,#20001)
+#20437=*
+stmts(#20437,1,#20435,0,"{\n}")
+#20438=@"loc,{#10000},30,5,31,1"
+locations_default(#20438,#10000,30,5,31,1)
+hasLocation(#20437,#20438)
+stmt_containers(#20437,#20001)
+#20439=*
+stmts(#20439,1,#20435,-1,"{\n    f();\n}")
+#20440=@"loc,{#10000},31,11,33,1"
+locations_default(#20440,#10000,31,11,33,1)
+hasLocation(#20439,#20440)
+stmt_containers(#20439,#20001)
+#20441=*
+stmts(#20441,2,#20439,0,"f();")
+#20442=@"loc,{#10000},32,5,32,8"
+locations_default(#20442,#10000,32,5,32,8)
+hasLocation(#20441,#20442)
+stmt_containers(#20441,#20001)
 #20443=*
-stmts(#20443,3,#20001,6,"if (!(x || y))\n  z;")
-#20444=@"loc,{#10000},35,1,36,4"
-locations_default(#20444,#10000,35,1,36,4)
+exprs(#20443,13,#20441,0,"f()")
+#20444=@"loc,{#10000},32,5,32,7"
+locations_default(#20444,#10000,32,5,32,7)
 hasLocation(#20443,#20444)
-stmt_containers(#20443,#20001)
+enclosing_stmt(#20443,#20441)
+expr_containers(#20443,#20001)
 #20445=*
-exprs(#20445,18,#20443,0,"!(x || y)")
-#20446=@"loc,{#10000},35,5,35,13"
-locations_default(#20446,#10000,35,5,35,13)
-hasLocation(#20445,#20446)
-enclosing_stmt(#20445,#20443)
+exprs(#20445,79,#20443,-1,"f")
+hasLocation(#20445,#20287)
+enclosing_stmt(#20445,#20441)
 expr_containers(#20445,#20001)
-#20447=*
-exprs(#20447,63,#20445,0,"(x || y)")
-#20448=@"loc,{#10000},35,6,35,13"
-locations_default(#20448,#10000,35,6,35,13)
-hasLocation(#20447,#20448)
-enclosing_stmt(#20447,#20443)
-expr_containers(#20447,#20001)
-#20449=*
-exprs(#20449,45,#20447,0,"x || y")
-#20450=@"loc,{#10000},35,7,35,12"
-locations_default(#20450,#10000,35,7,35,12)
-hasLocation(#20449,#20450)
-enclosing_stmt(#20449,#20443)
-expr_containers(#20449,#20001)
-#20451=*
-exprs(#20451,79,#20449,0,"x")
-hasLocation(#20451,#20304)
-enclosing_stmt(#20451,#20443)
-expr_containers(#20451,#20001)
-literals("x","x",#20451)
-#20452=@"var;{x};{#20000}"
-variables(#20452,"x",#20000)
-bind(#20451,#20452)
-#20453=*
-exprs(#20453,79,#20449,1,"y")
-hasLocation(#20453,#20308)
-enclosing_stmt(#20453,#20443)
-expr_containers(#20453,#20001)
-literals("y","y",#20453)
-#20454=@"var;{y};{#20000}"
-variables(#20454,"y",#20000)
-bind(#20453,#20454)
-#20455=*
-stmts(#20455,2,#20443,1,"z;")
-#20456=@"loc,{#10000},36,3,36,4"
-locations_default(#20456,#10000,36,3,36,4)
-hasLocation(#20455,#20456)
-stmt_containers(#20455,#20001)
-#20457=*
-exprs(#20457,79,#20455,0,"z")
-hasLocation(#20457,#20314)
-enclosing_stmt(#20457,#20455)
-expr_containers(#20457,#20001)
-literals("z","z",#20457)
-#20458=@"var;{z};{#20000}"
-variables(#20458,"z",#20000)
-bind(#20457,#20458)
-#20459=*
-entry_cfg_node(#20459,#20001)
-#20460=@"loc,{#10000},1,1,1,0"
-locations_default(#20460,#10000,1,1,1,0)
-hasLocation(#20459,#20460)
-#20461=*
-exit_cfg_node(#20461,#20001)
-hasLocation(#20461,#20318)
-successor(#20443,#20447)
-successor(#20447,#20449)
-successor(#20449,#20451)
+literals("f","f",#20445)
+bind(#20445,#20321)
+#20446=*
+stmts(#20446,3,#20001,6,"if (!(x || y))\n  z;")
+#20447=@"loc,{#10000},35,1,36,4"
+locations_default(#20447,#10000,35,1,36,4)
+hasLocation(#20446,#20447)
+stmt_containers(#20446,#20001)
+#20448=*
+exprs(#20448,18,#20446,0,"!(x || y)")
+#20449=@"loc,{#10000},35,5,35,13"
+locations_default(#20449,#10000,35,5,35,13)
+hasLocation(#20448,#20449)
+enclosing_stmt(#20448,#20446)
+expr_containers(#20448,#20001)
+#20450=*
+exprs(#20450,63,#20448,0,"(x || y)")
+#20451=@"loc,{#10000},35,6,35,13"
+locations_default(#20451,#10000,35,6,35,13)
+hasLocation(#20450,#20451)
+enclosing_stmt(#20450,#20446)
+expr_containers(#20450,#20001)
+#20452=*
+exprs(#20452,45,#20450,0,"x || y")
+#20453=@"loc,{#10000},35,7,35,12"
+locations_default(#20453,#10000,35,7,35,12)
+hasLocation(#20452,#20453)
+enclosing_stmt(#20452,#20446)
+expr_containers(#20452,#20001)
+#20454=*
+exprs(#20454,79,#20452,0,"x")
+hasLocation(#20454,#20304)
+enclosing_stmt(#20454,#20446)
+expr_containers(#20454,#20001)
+literals("x","x",#20454)
+#20455=@"var;{x};{#20000}"
+variables(#20455,"x",#20000)
+bind(#20454,#20455)
+#20456=*
+exprs(#20456,79,#20452,1,"y")
+hasLocation(#20456,#20308)
+enclosing_stmt(#20456,#20446)
+expr_containers(#20456,#20001)
+literals("y","y",#20456)
+#20457=@"var;{y};{#20000}"
+variables(#20457,"y",#20000)
+bind(#20456,#20457)
+#20458=*
+stmts(#20458,2,#20446,1,"z;")
+#20459=@"loc,{#10000},36,3,36,4"
+locations_default(#20459,#10000,36,3,36,4)
+hasLocation(#20458,#20459)
+stmt_containers(#20458,#20001)
+#20460=*
+exprs(#20460,79,#20458,0,"z")
+hasLocation(#20460,#20314)
+enclosing_stmt(#20460,#20458)
+expr_containers(#20460,#20001)
+literals("z","z",#20460)
+#20461=@"var;{z};{#20000}"
+variables(#20461,"z",#20000)
+bind(#20460,#20461)
 #20462=*
-guard_node(#20462,1,#20451)
-hasLocation(#20462,#20304)
-successor(#20462,#20445)
-#20463=*
-guard_node(#20463,0,#20451)
-hasLocation(#20463,#20304)
-successor(#20463,#20453)
-successor(#20451,#20462)
-successor(#20451,#20463)
-successor(#20453,#20445)
+entry_cfg_node(#20462,#20001)
+#20463=@"loc,{#10000},1,1,1,0"
+locations_default(#20463,#10000,1,1,1,0)
+hasLocation(#20462,#20463)
 #20464=*
-guard_node(#20464,0,#20453)
-hasLocation(#20464,#20308)
-successor(#20464,#20455)
+exit_cfg_node(#20464,#20001)
+hasLocation(#20464,#20318)
+successor(#20446,#20450)
+successor(#20450,#20452)
+successor(#20452,#20454)
 #20465=*
-guard_node(#20465,0,#20451)
+guard_node(#20465,1,#20454)
 hasLocation(#20465,#20304)
-successor(#20465,#20464)
-successor(#20445,#20465)
-successor(#20445,#20461)
-successor(#20455,#20457)
-successor(#20457,#20461)
-successor(#20432,#20434)
-successor(#20434,#20436)
-successor(#20438,#20442)
-successor(#20442,#20440)
-successor(#20440,#20443)
-successor(#20436,#20438)
-successor(#20414,#20416)
-successor(#20420,#20418)
-successor(#20418,#20422)
-successor(#20418,#20432)
-successor(#20424,#20418)
-successor(#20422,#20424)
-successor(#20416,#20420)
-successor(#20425,#20429)
-successor(#20430,#20432)
-successor(#20429,#20430)
-successor(#20392,#20394)
-successor(#20394,#20412)
-successor(#20396,#20400)
-successor(#20403,#20409)
-successor(#20411,#20407)
-successor(#20409,#20411)
-successor(#20407,#20412)
-successor(#20407,#20405)
-successor(#20405,#20412)
-successor(#20401,#20403)
-successor(#20400,#20401)
-successor(#20412,#20414)
-successor(#20371,#20392)
+successor(#20465,#20448)
 #20466=*
-entry_cfg_node(#20466,#20371)
-#20467=@"loc,{#10000},15,1,15,0"
-locations_default(#20467,#10000,15,1,15,0)
-hasLocation(#20466,#20467)
+guard_node(#20466,0,#20454)
+hasLocation(#20466,#20304)
+successor(#20466,#20456)
+successor(#20454,#20465)
+successor(#20454,#20466)
+successor(#20456,#20448)
+#20467=*
+guard_node(#20467,0,#20456)
+hasLocation(#20467,#20308)
+successor(#20467,#20458)
 #20468=*
-exit_cfg_node(#20468,#20371)
-#20469=@"loc,{#10000},18,2,18,1"
-locations_default(#20469,#10000,18,2,18,1)
-hasLocation(#20468,#20469)
-successor(#20383,#20381)
-successor(#20381,#20384)
-successor(#20381,#20468)
-successor(#20388,#20390)
-#20470=*
-guard_node(#20470,1,#20390)
-hasLocation(#20470,#20203)
-successor(#20470,#20391)
+guard_node(#20468,0,#20454)
+hasLocation(#20468,#20304)
+successor(#20468,#20467)
+successor(#20448,#20468)
+successor(#20448,#20464)
+successor(#20458,#20460)
+successor(#20460,#20464)
+successor(#20435,#20437)
+successor(#20437,#20439)
+successor(#20441,#20445)
+successor(#20445,#20443)
+successor(#20443,#20446)
+successor(#20439,#20441)
+successor(#20417,#20419)
+successor(#20423,#20421)
+successor(#20421,#20425)
+successor(#20421,#20435)
+successor(#20427,#20421)
+successor(#20425,#20427)
+successor(#20419,#20423)
+successor(#20428,#20432)
+successor(#20433,#20435)
+successor(#20432,#20433)
+successor(#20395,#20397)
+successor(#20397,#20415)
+successor(#20399,#20403)
+successor(#20406,#20412)
+successor(#20414,#20410)
+successor(#20412,#20414)
+successor(#20410,#20415)
+successor(#20410,#20408)
+successor(#20408,#20415)
+successor(#20404,#20406)
+successor(#20403,#20404)
+successor(#20415,#20417)
+successor(#20373,#20395)
+#20469=*
+entry_cfg_node(#20469,#20373)
+#20470=@"loc,{#10000},15,1,15,0"
+locations_default(#20470,#10000,15,1,15,0)
+hasLocation(#20469,#20470)
 #20471=*
-guard_node(#20471,0,#20390)
-hasLocation(#20471,#20203)
-successor(#20471,#20381)
-successor(#20390,#20470)
-successor(#20390,#20471)
-successor(#20391,#20381)
+exit_cfg_node(#20471,#20373)
+#20472=@"loc,{#10000},18,2,18,1"
+locations_default(#20472,#10000,18,2,18,1)
+hasLocation(#20471,#20472)
+successor(#20386,#20384)
 successor(#20384,#20387)
-successor(#20387,#20386)
-successor(#20386,#20388)
-successor(#20379,#20383)
-successor(#20377,#20379)
-successor(#20466,#20377)
-successor(#20365,#20367)
-#20472=*
-guard_node(#20472,1,#20367)
-hasLocation(#20472,#20163)
-successor(#20472,#20369)
+successor(#20384,#20471)
+successor(#20391,#20393)
 #20473=*
-guard_node(#20473,0,#20367)
-hasLocation(#20473,#20163)
-successor(#20473,#20371)
-successor(#20367,#20472)
-successor(#20367,#20473)
-successor(#20369,#20367)
-successor(#20322,#20365)
+guard_node(#20473,1,#20393)
+hasLocation(#20473,#20203)
+successor(#20473,#20394)
 #20474=*
-entry_cfg_node(#20474,#20322)
-hasLocation(#20474,#20460)
+guard_node(#20474,0,#20393)
+hasLocation(#20474,#20203)
+successor(#20474,#20384)
+successor(#20393,#20473)
+successor(#20393,#20474)
+successor(#20394,#20384)
+successor(#20387,#20390)
+successor(#20390,#20389)
+successor(#20389,#20391)
+successor(#20382,#20386)
+successor(#20380,#20382)
+successor(#20469,#20380)
+successor(#20367,#20369)
 #20475=*
-exit_cfg_node(#20475,#20322)
-#20476=@"loc,{#10000},10,2,10,1"
-locations_default(#20476,#10000,10,2,10,1)
-hasLocation(#20475,#20476)
-successor(#20356,#20358)
-successor(#20358,#20359)
-successor(#20359,#20361)
-successor(#20361,#20364)
-successor(#20361,#20475)
-successor(#20364,#20362)
-successor(#20362,#20475)
-successor(#20342,#20353)
-successor(#20354,#20351)
-successor(#20353,#20354)
-successor(#20351,#20346)
-successor(#20347,#20344)
-successor(#20346,#20347)
+guard_node(#20475,1,#20369)
+hasLocation(#20475,#20163)
+successor(#20475,#20371)
+#20476=*
+guard_node(#20476,0,#20369)
+hasLocation(#20476,#20163)
+successor(#20476,#20373)
+successor(#20369,#20475)
+successor(#20369,#20476)
+successor(#20371,#20369)
+successor(#20323,#20367)
 #20477=*
-guard_node(#20477,1,#20344)
-hasLocation(#20477,#20345)
-successor(#20477,#20355)
+entry_cfg_node(#20477,#20323)
+hasLocation(#20477,#20463)
 #20478=*
-guard_node(#20478,0,#20344)
-hasLocation(#20478,#20345)
-successor(#20478,#20356)
-successor(#20344,#20477)
-successor(#20344,#20478)
+exit_cfg_node(#20478,#20323)
+#20479=@"loc,{#10000},10,2,10,1"
+locations_default(#20479,#10000,10,2,10,1)
+hasLocation(#20478,#20479)
+successor(#20358,#20360)
+successor(#20360,#20361)
+successor(#20361,#20363)
+successor(#20363,#20366)
+successor(#20363,#20478)
+successor(#20366,#20364)
+successor(#20364,#20478)
+successor(#20344,#20355)
+successor(#20356,#20353)
+successor(#20355,#20356)
+successor(#20353,#20348)
+successor(#20349,#20346)
+successor(#20348,#20349)
+#20480=*
+guard_node(#20480,1,#20346)
+hasLocation(#20480,#20347)
+successor(#20480,#20357)
+#20481=*
+guard_node(#20481,0,#20346)
+hasLocation(#20481,#20347)
+successor(#20481,#20358)
+successor(#20346,#20480)
+successor(#20346,#20481)
+successor(#20352,#20350)
 successor(#20350,#20348)
-successor(#20348,#20346)
-successor(#20355,#20350)
-successor(#20336,#20340)
-successor(#20341,#20338)
-successor(#20340,#20341)
+successor(#20357,#20352)
 successor(#20338,#20342)
-successor(#20330,#20334)
-successor(#20335,#20332)
-successor(#20334,#20335)
+successor(#20343,#20340)
+successor(#20342,#20343)
+successor(#20340,#20344)
 successor(#20332,#20336)
-successor(#20328,#20330)
-successor(#20474,#20328)
-successor(#20373,#20322)
-successor(#20324,#20373)
-successor(#20459,#20324)
+successor(#20337,#20334)
+successor(#20336,#20337)
+successor(#20334,#20338)
+successor(#20330,#20332)
+successor(#20477,#20330)
+successor(#20375,#20323)
+successor(#20325,#20375)
+successor(#20462,#20325)
 numlines(#10000,36,30,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/closure/output/trap/googDotDeclareModuleId.js.trap b/javascript/extractor/tests/closure/output/trap/googDotDeclareModuleId.js.trap
index 09719bdae19..c1b539f8355 100644
--- a/javascript/extractor/tests/closure/output/trap/googDotDeclareModuleId.js.trap
+++ b/javascript/extractor/tests/closure/output/trap/googDotDeclareModuleId.js.trap
@@ -110,100 +110,102 @@ is_module(#20001)
 is_es2015_module(#20001)
 #20038=@"var;{x};{#20037}"
 variables(#20038,"x",#20037)
-#20039=*
-stmts(#20039,2,#20001,0,"goog.de ... test');")
-hasLocation(#20039,#20003)
-stmt_containers(#20039,#20001)
+#20039=@"var;{this};{#20037}"
+variables(#20039,"this",#20037)
 #20040=*
-exprs(#20040,13,#20039,0,"goog.de ... 'test')")
-#20041=@"loc,{#10000},1,1,1,28"
-locations_default(#20041,#10000,1,1,1,28)
-hasLocation(#20040,#20041)
-enclosing_stmt(#20040,#20039)
-expr_containers(#20040,#20001)
-#20042=*
-exprs(#20042,14,#20040,-1,"goog.declareModuleId")
-#20043=@"loc,{#10000},1,1,1,20"
-locations_default(#20043,#10000,1,1,1,20)
-hasLocation(#20042,#20043)
-enclosing_stmt(#20042,#20039)
-expr_containers(#20042,#20001)
-#20044=*
-exprs(#20044,79,#20042,0,"goog")
-hasLocation(#20044,#20009)
-enclosing_stmt(#20044,#20039)
-expr_containers(#20044,#20001)
-literals("goog","goog",#20044)
-#20045=@"var;{goog};{#20000}"
-variables(#20045,"goog",#20000)
-bind(#20044,#20045)
-#20046=*
-exprs(#20046,0,#20042,1,"declareModuleId")
-hasLocation(#20046,#20013)
-enclosing_stmt(#20046,#20039)
-expr_containers(#20046,#20001)
-literals("declareModuleId","declareModuleId",#20046)
+stmts(#20040,2,#20001,0,"goog.de ... test');")
+hasLocation(#20040,#20003)
+stmt_containers(#20040,#20001)
+#20041=*
+exprs(#20041,13,#20040,0,"goog.de ... 'test')")
+#20042=@"loc,{#10000},1,1,1,28"
+locations_default(#20042,#10000,1,1,1,28)
+hasLocation(#20041,#20042)
+enclosing_stmt(#20041,#20040)
+expr_containers(#20041,#20001)
+#20043=*
+exprs(#20043,14,#20041,-1,"goog.declareModuleId")
+#20044=@"loc,{#10000},1,1,1,20"
+locations_default(#20044,#10000,1,1,1,20)
+hasLocation(#20043,#20044)
+enclosing_stmt(#20043,#20040)
+expr_containers(#20043,#20001)
+#20045=*
+exprs(#20045,79,#20043,0,"goog")
+hasLocation(#20045,#20009)
+enclosing_stmt(#20045,#20040)
+expr_containers(#20045,#20001)
+literals("goog","goog",#20045)
+#20046=@"var;{goog};{#20000}"
+variables(#20046,"goog",#20000)
+bind(#20045,#20046)
 #20047=*
-exprs(#20047,4,#20040,0,"'test'")
-hasLocation(#20047,#20017)
-enclosing_stmt(#20047,#20039)
+exprs(#20047,0,#20043,1,"declareModuleId")
+hasLocation(#20047,#20013)
+enclosing_stmt(#20047,#20040)
 expr_containers(#20047,#20001)
-literals("test","'test'",#20047)
+literals("declareModuleId","declareModuleId",#20047)
 #20048=*
-regexpterm(#20048,14,#20047,0,"test")
-#20049=@"loc,{#10000},1,23,1,26"
-locations_default(#20049,#10000,1,23,1,26)
-hasLocation(#20048,#20049)
-regexp_const_value(#20048,"test")
-#20050=*
-stmts(#20050,30,#20001,1,"export let x = 5;")
-hasLocation(#20050,#20007)
-stmt_containers(#20050,#20001)
+exprs(#20048,4,#20041,0,"'test'")
+hasLocation(#20048,#20017)
+enclosing_stmt(#20048,#20040)
+expr_containers(#20048,#20001)
+literals("test","'test'",#20048)
+#20049=*
+regexpterm(#20049,14,#20048,0,"test")
+#20050=@"loc,{#10000},1,23,1,26"
+locations_default(#20050,#10000,1,23,1,26)
+hasLocation(#20049,#20050)
+regexp_const_value(#20049,"test")
 #20051=*
-stmts(#20051,23,#20050,-1,"let x = 5;")
-#20052=@"loc,{#10000},3,8,3,17"
-locations_default(#20052,#10000,3,8,3,17)
-hasLocation(#20051,#20052)
+stmts(#20051,30,#20001,1,"export let x = 5;")
+hasLocation(#20051,#20007)
 stmt_containers(#20051,#20001)
-#20053=*
-exprs(#20053,64,#20051,0,"x = 5")
-#20054=@"loc,{#10000},3,12,3,16"
-locations_default(#20054,#10000,3,12,3,16)
-hasLocation(#20053,#20054)
-enclosing_stmt(#20053,#20051)
-expr_containers(#20053,#20001)
-#20055=*
-exprs(#20055,78,#20053,0,"x")
-hasLocation(#20055,#20027)
-enclosing_stmt(#20055,#20051)
-expr_containers(#20055,#20001)
-literals("x","x",#20055)
-decl(#20055,#20038)
+#20052=*
+stmts(#20052,23,#20051,-1,"let x = 5;")
+#20053=@"loc,{#10000},3,8,3,17"
+locations_default(#20053,#10000,3,8,3,17)
+hasLocation(#20052,#20053)
+stmt_containers(#20052,#20001)
+#20054=*
+exprs(#20054,64,#20052,0,"x = 5")
+#20055=@"loc,{#10000},3,12,3,16"
+locations_default(#20055,#10000,3,12,3,16)
+hasLocation(#20054,#20055)
+enclosing_stmt(#20054,#20052)
+expr_containers(#20054,#20001)
 #20056=*
-exprs(#20056,3,#20053,1,"5")
-hasLocation(#20056,#20031)
-enclosing_stmt(#20056,#20051)
+exprs(#20056,78,#20054,0,"x")
+hasLocation(#20056,#20027)
+enclosing_stmt(#20056,#20052)
 expr_containers(#20056,#20001)
-literals("5","5",#20056)
+literals("x","x",#20056)
+decl(#20056,#20038)
 #20057=*
-entry_cfg_node(#20057,#20001)
-#20058=@"loc,{#10000},1,1,1,0"
-locations_default(#20058,#10000,1,1,1,0)
-hasLocation(#20057,#20058)
-#20059=*
-exit_cfg_node(#20059,#20001)
-hasLocation(#20059,#20035)
-successor(#20050,#20051)
-successor(#20051,#20055)
-successor(#20056,#20053)
-successor(#20055,#20056)
-successor(#20053,#20059)
-successor(#20039,#20044)
-successor(#20047,#20040)
-successor(#20046,#20042)
-successor(#20044,#20046)
-successor(#20042,#20047)
-successor(#20040,#20050)
-successor(#20057,#20039)
+exprs(#20057,3,#20054,1,"5")
+hasLocation(#20057,#20031)
+enclosing_stmt(#20057,#20052)
+expr_containers(#20057,#20001)
+literals("5","5",#20057)
+#20058=*
+entry_cfg_node(#20058,#20001)
+#20059=@"loc,{#10000},1,1,1,0"
+locations_default(#20059,#10000,1,1,1,0)
+hasLocation(#20058,#20059)
+#20060=*
+exit_cfg_node(#20060,#20001)
+hasLocation(#20060,#20035)
+successor(#20051,#20052)
+successor(#20052,#20056)
+successor(#20057,#20054)
+successor(#20056,#20057)
+successor(#20054,#20060)
+successor(#20040,#20045)
+successor(#20048,#20041)
+successor(#20047,#20043)
+successor(#20045,#20047)
+successor(#20043,#20048)
+successor(#20041,#20051)
+successor(#20058,#20040)
 numlines(#10000,3,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/closure/output/trap/googDotModule.js.trap b/javascript/extractor/tests/closure/output/trap/googDotModule.js.trap
index c38628f6a37..5c0a4d6022e 100644
--- a/javascript/extractor/tests/closure/output/trap/googDotModule.js.trap
+++ b/javascript/extractor/tests/closure/output/trap/googDotModule.js.trap
@@ -147,143 +147,145 @@ is_module(#20001)
 is_closure_module(#20001)
 #20053=@"var;{x};{#20051}"
 variables(#20053,"x",#20051)
-#20054=*
-stmts(#20054,2,#20001,0,"goog.module('test');")
-hasLocation(#20054,#20003)
-stmt_containers(#20054,#20001)
+#20054=@"var;{this};{#20051}"
+variables(#20054,"this",#20051)
 #20055=*
-exprs(#20055,13,#20054,0,"goog.module('test')")
-#20056=@"loc,{#10000},1,1,1,19"
-locations_default(#20056,#10000,1,1,1,19)
-hasLocation(#20055,#20056)
-enclosing_stmt(#20055,#20054)
-expr_containers(#20055,#20001)
-#20057=*
-exprs(#20057,14,#20055,-1,"goog.module")
-#20058=@"loc,{#10000},1,1,1,11"
-locations_default(#20058,#10000,1,1,1,11)
-hasLocation(#20057,#20058)
-enclosing_stmt(#20057,#20054)
-expr_containers(#20057,#20001)
-#20059=*
-exprs(#20059,79,#20057,0,"goog")
-hasLocation(#20059,#20009)
-enclosing_stmt(#20059,#20054)
-expr_containers(#20059,#20001)
-literals("goog","goog",#20059)
-#20060=@"var;{goog};{#20000}"
-variables(#20060,"goog",#20000)
-bind(#20059,#20060)
-#20061=*
-exprs(#20061,0,#20057,1,"module")
-hasLocation(#20061,#20013)
-enclosing_stmt(#20061,#20054)
-expr_containers(#20061,#20001)
-literals("module","module",#20061)
+stmts(#20055,2,#20001,0,"goog.module('test');")
+hasLocation(#20055,#20003)
+stmt_containers(#20055,#20001)
+#20056=*
+exprs(#20056,13,#20055,0,"goog.module('test')")
+#20057=@"loc,{#10000},1,1,1,19"
+locations_default(#20057,#10000,1,1,1,19)
+hasLocation(#20056,#20057)
+enclosing_stmt(#20056,#20055)
+expr_containers(#20056,#20001)
+#20058=*
+exprs(#20058,14,#20056,-1,"goog.module")
+#20059=@"loc,{#10000},1,1,1,11"
+locations_default(#20059,#10000,1,1,1,11)
+hasLocation(#20058,#20059)
+enclosing_stmt(#20058,#20055)
+expr_containers(#20058,#20001)
+#20060=*
+exprs(#20060,79,#20058,0,"goog")
+hasLocation(#20060,#20009)
+enclosing_stmt(#20060,#20055)
+expr_containers(#20060,#20001)
+literals("goog","goog",#20060)
+#20061=@"var;{goog};{#20000}"
+variables(#20061,"goog",#20000)
+bind(#20060,#20061)
 #20062=*
-exprs(#20062,4,#20055,0,"'test'")
-hasLocation(#20062,#20017)
-enclosing_stmt(#20062,#20054)
+exprs(#20062,0,#20058,1,"module")
+hasLocation(#20062,#20013)
+enclosing_stmt(#20062,#20055)
 expr_containers(#20062,#20001)
-literals("test","'test'",#20062)
+literals("module","module",#20062)
 #20063=*
-regexpterm(#20063,14,#20062,0,"test")
-#20064=@"loc,{#10000},1,14,1,17"
-locations_default(#20064,#10000,1,14,1,17)
-hasLocation(#20063,#20064)
-regexp_const_value(#20063,"test")
-#20065=*
-stmts(#20065,18,#20001,1,"var x = 5;")
-hasLocation(#20065,#20005)
-stmt_containers(#20065,#20001)
+exprs(#20063,4,#20056,0,"'test'")
+hasLocation(#20063,#20017)
+enclosing_stmt(#20063,#20055)
+expr_containers(#20063,#20001)
+literals("test","'test'",#20063)
+#20064=*
+regexpterm(#20064,14,#20063,0,"test")
+#20065=@"loc,{#10000},1,14,1,17"
+locations_default(#20065,#10000,1,14,1,17)
+hasLocation(#20064,#20065)
+regexp_const_value(#20064,"test")
 #20066=*
-exprs(#20066,64,#20065,0,"x = 5")
-#20067=@"loc,{#10000},2,5,2,9"
-locations_default(#20067,#10000,2,5,2,9)
-hasLocation(#20066,#20067)
-enclosing_stmt(#20066,#20065)
-expr_containers(#20066,#20001)
-#20068=*
-exprs(#20068,78,#20066,0,"x")
-hasLocation(#20068,#20025)
-enclosing_stmt(#20068,#20065)
-expr_containers(#20068,#20001)
-literals("x","x",#20068)
-decl(#20068,#20053)
+stmts(#20066,18,#20001,1,"var x = 5;")
+hasLocation(#20066,#20005)
+stmt_containers(#20066,#20001)
+#20067=*
+exprs(#20067,64,#20066,0,"x = 5")
+#20068=@"loc,{#10000},2,5,2,9"
+locations_default(#20068,#10000,2,5,2,9)
+hasLocation(#20067,#20068)
+enclosing_stmt(#20067,#20066)
+expr_containers(#20067,#20001)
 #20069=*
-exprs(#20069,3,#20066,1,"5")
-hasLocation(#20069,#20029)
-enclosing_stmt(#20069,#20065)
+exprs(#20069,78,#20067,0,"x")
+hasLocation(#20069,#20025)
+enclosing_stmt(#20069,#20066)
 expr_containers(#20069,#20001)
-literals("5","5",#20069)
+literals("x","x",#20069)
+decl(#20069,#20053)
 #20070=*
-stmts(#20070,2,#20001,2,"exports = { x: x };")
-hasLocation(#20070,#20007)
-stmt_containers(#20070,#20001)
+exprs(#20070,3,#20067,1,"5")
+hasLocation(#20070,#20029)
+enclosing_stmt(#20070,#20066)
+expr_containers(#20070,#20001)
+literals("5","5",#20070)
 #20071=*
-exprs(#20071,47,#20070,0,"exports = { x: x }")
-#20072=@"loc,{#10000},3,1,3,18"
-locations_default(#20072,#10000,3,1,3,18)
-hasLocation(#20071,#20072)
-enclosing_stmt(#20071,#20070)
-expr_containers(#20071,#20001)
-#20073=*
-exprs(#20073,79,#20071,0,"exports")
-hasLocation(#20073,#20033)
-enclosing_stmt(#20073,#20070)
-expr_containers(#20073,#20001)
-literals("exports","exports",#20073)
-bind(#20073,#20052)
+stmts(#20071,2,#20001,2,"exports = { x: x };")
+hasLocation(#20071,#20007)
+stmt_containers(#20071,#20001)
+#20072=*
+exprs(#20072,47,#20071,0,"exports = { x: x }")
+#20073=@"loc,{#10000},3,1,3,18"
+locations_default(#20073,#10000,3,1,3,18)
+hasLocation(#20072,#20073)
+enclosing_stmt(#20072,#20071)
+expr_containers(#20072,#20001)
 #20074=*
-exprs(#20074,8,#20071,1,"{ x: x }")
-#20075=@"loc,{#10000},3,11,3,18"
-locations_default(#20075,#10000,3,11,3,18)
-hasLocation(#20074,#20075)
-enclosing_stmt(#20074,#20070)
+exprs(#20074,79,#20072,0,"exports")
+hasLocation(#20074,#20033)
+enclosing_stmt(#20074,#20071)
 expr_containers(#20074,#20001)
-#20076=*
-properties(#20076,#20074,0,0,"x: x")
-#20077=@"loc,{#10000},3,13,3,16"
-locations_default(#20077,#10000,3,13,3,16)
-hasLocation(#20076,#20077)
-#20078=*
-exprs(#20078,0,#20076,0,"x")
-hasLocation(#20078,#20039)
-enclosing_stmt(#20078,#20070)
-expr_containers(#20078,#20001)
-literals("x","x",#20078)
+literals("exports","exports",#20074)
+bind(#20074,#20052)
+#20075=*
+exprs(#20075,8,#20072,1,"{ x: x }")
+#20076=@"loc,{#10000},3,11,3,18"
+locations_default(#20076,#10000,3,11,3,18)
+hasLocation(#20075,#20076)
+enclosing_stmt(#20075,#20071)
+expr_containers(#20075,#20001)
+#20077=*
+properties(#20077,#20075,0,0,"x: x")
+#20078=@"loc,{#10000},3,13,3,16"
+locations_default(#20078,#10000,3,13,3,16)
+hasLocation(#20077,#20078)
 #20079=*
-exprs(#20079,79,#20076,1,"x")
-hasLocation(#20079,#20043)
-enclosing_stmt(#20079,#20070)
+exprs(#20079,0,#20077,0,"x")
+hasLocation(#20079,#20039)
+enclosing_stmt(#20079,#20071)
 expr_containers(#20079,#20001)
 literals("x","x",#20079)
-bind(#20079,#20053)
 #20080=*
-entry_cfg_node(#20080,#20001)
-#20081=@"loc,{#10000},1,1,1,0"
-locations_default(#20081,#10000,1,1,1,0)
-hasLocation(#20080,#20081)
-#20082=*
-exit_cfg_node(#20082,#20001)
-hasLocation(#20082,#20049)
-successor(#20070,#20073)
-successor(#20074,#20078)
-successor(#20079,#20076)
-successor(#20078,#20079)
-successor(#20076,#20071)
-successor(#20073,#20074)
-successor(#20071,#20082)
-successor(#20065,#20068)
-successor(#20069,#20066)
-successor(#20068,#20069)
-successor(#20066,#20070)
-successor(#20054,#20059)
-successor(#20062,#20055)
-successor(#20061,#20057)
-successor(#20059,#20061)
-successor(#20057,#20062)
-successor(#20055,#20065)
-successor(#20080,#20054)
+exprs(#20080,79,#20077,1,"x")
+hasLocation(#20080,#20043)
+enclosing_stmt(#20080,#20071)
+expr_containers(#20080,#20001)
+literals("x","x",#20080)
+bind(#20080,#20053)
+#20081=*
+entry_cfg_node(#20081,#20001)
+#20082=@"loc,{#10000},1,1,1,0"
+locations_default(#20082,#10000,1,1,1,0)
+hasLocation(#20081,#20082)
+#20083=*
+exit_cfg_node(#20083,#20001)
+hasLocation(#20083,#20049)
+successor(#20071,#20074)
+successor(#20075,#20079)
+successor(#20080,#20077)
+successor(#20079,#20080)
+successor(#20077,#20072)
+successor(#20074,#20075)
+successor(#20072,#20083)
+successor(#20066,#20069)
+successor(#20070,#20067)
+successor(#20069,#20070)
+successor(#20067,#20071)
+successor(#20055,#20060)
+successor(#20063,#20056)
+successor(#20062,#20058)
+successor(#20060,#20062)
+successor(#20058,#20063)
+successor(#20056,#20066)
+successor(#20081,#20055)
 numlines(#10000,3,3,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/closure/output/trap/googDotProvide.js.trap b/javascript/extractor/tests/closure/output/trap/googDotProvide.js.trap
index 99979f50c2c..b6cbd9d596b 100644
--- a/javascript/extractor/tests/closure/output/trap/googDotProvide.js.trap
+++ b/javascript/extractor/tests/closure/output/trap/googDotProvide.js.trap
@@ -102,126 +102,128 @@ toplevels(#20001,0)
 #20036=@"loc,{#10000},1,1,4,0"
 locations_default(#20036,#10000,1,1,4,0)
 hasLocation(#20001,#20036)
-#20037=*
-stmts(#20037,2,#20001,0,"goog.pr ... st.x');")
-hasLocation(#20037,#20003)
-stmt_containers(#20037,#20001)
+#20037=@"var;{this};{#20000}"
+variables(#20037,"this",#20000)
 #20038=*
-exprs(#20038,13,#20037,0,"goog.pr ... est.x')")
-#20039=@"loc,{#10000},1,1,1,22"
-locations_default(#20039,#10000,1,1,1,22)
-hasLocation(#20038,#20039)
-enclosing_stmt(#20038,#20037)
-expr_containers(#20038,#20001)
-#20040=*
-exprs(#20040,14,#20038,-1,"goog.provide")
-#20041=@"loc,{#10000},1,1,1,12"
-locations_default(#20041,#10000,1,1,1,12)
-hasLocation(#20040,#20041)
-enclosing_stmt(#20040,#20037)
-expr_containers(#20040,#20001)
-#20042=*
-exprs(#20042,79,#20040,0,"goog")
-hasLocation(#20042,#20009)
-enclosing_stmt(#20042,#20037)
-expr_containers(#20042,#20001)
-literals("goog","goog",#20042)
-#20043=@"var;{goog};{#20000}"
-variables(#20043,"goog",#20000)
-bind(#20042,#20043)
-#20044=*
-exprs(#20044,0,#20040,1,"provide")
-hasLocation(#20044,#20013)
-enclosing_stmt(#20044,#20037)
-expr_containers(#20044,#20001)
-literals("provide","provide",#20044)
+stmts(#20038,2,#20001,0,"goog.pr ... st.x');")
+hasLocation(#20038,#20003)
+stmt_containers(#20038,#20001)
+#20039=*
+exprs(#20039,13,#20038,0,"goog.pr ... est.x')")
+#20040=@"loc,{#10000},1,1,1,22"
+locations_default(#20040,#10000,1,1,1,22)
+hasLocation(#20039,#20040)
+enclosing_stmt(#20039,#20038)
+expr_containers(#20039,#20001)
+#20041=*
+exprs(#20041,14,#20039,-1,"goog.provide")
+#20042=@"loc,{#10000},1,1,1,12"
+locations_default(#20042,#10000,1,1,1,12)
+hasLocation(#20041,#20042)
+enclosing_stmt(#20041,#20038)
+expr_containers(#20041,#20001)
+#20043=*
+exprs(#20043,79,#20041,0,"goog")
+hasLocation(#20043,#20009)
+enclosing_stmt(#20043,#20038)
+expr_containers(#20043,#20001)
+literals("goog","goog",#20043)
+#20044=@"var;{goog};{#20000}"
+variables(#20044,"goog",#20000)
+bind(#20043,#20044)
 #20045=*
-exprs(#20045,4,#20038,0,"'test.x'")
-hasLocation(#20045,#20017)
-enclosing_stmt(#20045,#20037)
+exprs(#20045,0,#20041,1,"provide")
+hasLocation(#20045,#20013)
+enclosing_stmt(#20045,#20038)
 expr_containers(#20045,#20001)
-literals("test.x","'test.x'",#20045)
+literals("provide","provide",#20045)
 #20046=*
-regexpterm(#20046,1,#20045,0,"test.x")
-#20047=@"loc,{#10000},1,15,1,20"
-locations_default(#20047,#10000,1,15,1,20)
-hasLocation(#20046,#20047)
-#20048=*
-regexpterm(#20048,14,#20046,0,"test")
-#20049=@"loc,{#10000},1,15,1,18"
-locations_default(#20049,#10000,1,15,1,18)
-hasLocation(#20048,#20049)
-regexp_const_value(#20048,"test")
-#20050=*
-regexpterm(#20050,12,#20046,1,".")
-#20051=@"loc,{#10000},1,19,1,19"
-locations_default(#20051,#10000,1,19,1,19)
-hasLocation(#20050,#20051)
-#20052=*
-regexpterm(#20052,14,#20046,2,"x")
-#20053=@"loc,{#10000},1,20,1,20"
-locations_default(#20053,#10000,1,20,1,20)
-hasLocation(#20052,#20053)
-regexp_const_value(#20052,"x")
-#20054=*
-stmts(#20054,2,#20001,1,"test.x = 5;")
-hasLocation(#20054,#20007)
-stmt_containers(#20054,#20001)
+exprs(#20046,4,#20039,0,"'test.x'")
+hasLocation(#20046,#20017)
+enclosing_stmt(#20046,#20038)
+expr_containers(#20046,#20001)
+literals("test.x","'test.x'",#20046)
+#20047=*
+regexpterm(#20047,1,#20046,0,"test.x")
+#20048=@"loc,{#10000},1,15,1,20"
+locations_default(#20048,#10000,1,15,1,20)
+hasLocation(#20047,#20048)
+#20049=*
+regexpterm(#20049,14,#20047,0,"test")
+#20050=@"loc,{#10000},1,15,1,18"
+locations_default(#20050,#10000,1,15,1,18)
+hasLocation(#20049,#20050)
+regexp_const_value(#20049,"test")
+#20051=*
+regexpterm(#20051,12,#20047,1,".")
+#20052=@"loc,{#10000},1,19,1,19"
+locations_default(#20052,#10000,1,19,1,19)
+hasLocation(#20051,#20052)
+#20053=*
+regexpterm(#20053,14,#20047,2,"x")
+#20054=@"loc,{#10000},1,20,1,20"
+locations_default(#20054,#10000,1,20,1,20)
+hasLocation(#20053,#20054)
+regexp_const_value(#20053,"x")
 #20055=*
-exprs(#20055,47,#20054,0,"test.x = 5")
-#20056=@"loc,{#10000},3,1,3,10"
-locations_default(#20056,#10000,3,1,3,10)
-hasLocation(#20055,#20056)
-enclosing_stmt(#20055,#20054)
-expr_containers(#20055,#20001)
-#20057=*
-exprs(#20057,14,#20055,0,"test.x")
-#20058=@"loc,{#10000},3,1,3,6"
-locations_default(#20058,#10000,3,1,3,6)
-hasLocation(#20057,#20058)
-enclosing_stmt(#20057,#20054)
-expr_containers(#20057,#20001)
-#20059=*
-exprs(#20059,79,#20057,0,"test")
-hasLocation(#20059,#20023)
-enclosing_stmt(#20059,#20054)
-expr_containers(#20059,#20001)
-literals("test","test",#20059)
-#20060=@"var;{test};{#20000}"
-variables(#20060,"test",#20000)
-bind(#20059,#20060)
-#20061=*
-exprs(#20061,0,#20057,1,"x")
-hasLocation(#20061,#20027)
-enclosing_stmt(#20061,#20054)
-expr_containers(#20061,#20001)
-literals("x","x",#20061)
+stmts(#20055,2,#20001,1,"test.x = 5;")
+hasLocation(#20055,#20007)
+stmt_containers(#20055,#20001)
+#20056=*
+exprs(#20056,47,#20055,0,"test.x = 5")
+#20057=@"loc,{#10000},3,1,3,10"
+locations_default(#20057,#10000,3,1,3,10)
+hasLocation(#20056,#20057)
+enclosing_stmt(#20056,#20055)
+expr_containers(#20056,#20001)
+#20058=*
+exprs(#20058,14,#20056,0,"test.x")
+#20059=@"loc,{#10000},3,1,3,6"
+locations_default(#20059,#10000,3,1,3,6)
+hasLocation(#20058,#20059)
+enclosing_stmt(#20058,#20055)
+expr_containers(#20058,#20001)
+#20060=*
+exprs(#20060,79,#20058,0,"test")
+hasLocation(#20060,#20023)
+enclosing_stmt(#20060,#20055)
+expr_containers(#20060,#20001)
+literals("test","test",#20060)
+#20061=@"var;{test};{#20000}"
+variables(#20061,"test",#20000)
+bind(#20060,#20061)
 #20062=*
-exprs(#20062,3,#20055,1,"5")
-hasLocation(#20062,#20031)
-enclosing_stmt(#20062,#20054)
+exprs(#20062,0,#20058,1,"x")
+hasLocation(#20062,#20027)
+enclosing_stmt(#20062,#20055)
 expr_containers(#20062,#20001)
-literals("5","5",#20062)
+literals("x","x",#20062)
 #20063=*
-entry_cfg_node(#20063,#20001)
-#20064=@"loc,{#10000},1,1,1,0"
-locations_default(#20064,#10000,1,1,1,0)
-hasLocation(#20063,#20064)
-#20065=*
-exit_cfg_node(#20065,#20001)
-hasLocation(#20065,#20035)
-successor(#20054,#20059)
-successor(#20062,#20055)
-successor(#20061,#20057)
-successor(#20059,#20061)
-successor(#20057,#20062)
-successor(#20055,#20065)
-successor(#20037,#20042)
-successor(#20045,#20038)
-successor(#20044,#20040)
-successor(#20042,#20044)
-successor(#20040,#20045)
-successor(#20038,#20054)
-successor(#20063,#20037)
+exprs(#20063,3,#20056,1,"5")
+hasLocation(#20063,#20031)
+enclosing_stmt(#20063,#20055)
+expr_containers(#20063,#20001)
+literals("5","5",#20063)
+#20064=*
+entry_cfg_node(#20064,#20001)
+#20065=@"loc,{#10000},1,1,1,0"
+locations_default(#20065,#10000,1,1,1,0)
+hasLocation(#20064,#20065)
+#20066=*
+exit_cfg_node(#20066,#20001)
+hasLocation(#20066,#20035)
+successor(#20055,#20060)
+successor(#20063,#20056)
+successor(#20062,#20058)
+successor(#20060,#20062)
+successor(#20058,#20063)
+successor(#20056,#20066)
+successor(#20038,#20043)
+successor(#20046,#20039)
+successor(#20045,#20041)
+successor(#20043,#20045)
+successor(#20041,#20046)
+successor(#20039,#20055)
+successor(#20064,#20038)
 numlines(#10000,3,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/comments/output/trap/comments.js.trap b/javascript/extractor/tests/comments/output/trap/comments.js.trap
index 79a199f90ec..38979b61d03 100644
--- a/javascript/extractor/tests/comments/output/trap/comments.js.trap
+++ b/javascript/extractor/tests/comments/output/trap/comments.js.trap
@@ -71,14 +71,16 @@ toplevels(#20001,0)
 #20020=@"loc,{#10000},1,1,5,24"
 locations_default(#20020,#10000,1,1,5,24)
 hasLocation(#20001,#20020)
-#20021=*
-entry_cfg_node(#20021,#20001)
-#20022=@"loc,{#10000},1,1,1,0"
-locations_default(#20022,#10000,1,1,1,0)
-hasLocation(#20021,#20022)
-#20023=*
-exit_cfg_node(#20023,#20001)
-hasLocation(#20023,#20018)
-successor(#20021,#20023)
+#20021=@"var;{this};{#20000}"
+variables(#20021,"this",#20000)
+#20022=*
+entry_cfg_node(#20022,#20001)
+#20023=@"loc,{#10000},1,1,1,0"
+locations_default(#20023,#10000,1,1,1,0)
+hasLocation(#20022,#20023)
+#20024=*
+exit_cfg_node(#20024,#20001)
+hasLocation(#20024,#20018)
+successor(#20022,#20024)
 numlines(#10000,5,0,5)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/comments/output/trap/empty_comment.js.trap b/javascript/extractor/tests/comments/output/trap/empty_comment.js.trap
index 51e9652b166..d15ef44b98e 100644
--- a/javascript/extractor/tests/comments/output/trap/empty_comment.js.trap
+++ b/javascript/extractor/tests/comments/output/trap/empty_comment.js.trap
@@ -29,14 +29,16 @@ toplevels(#20001,0)
 #20007=@"loc,{#10000},1,1,2,0"
 locations_default(#20007,#10000,1,1,2,0)
 hasLocation(#20001,#20007)
-#20008=*
-entry_cfg_node(#20008,#20001)
-#20009=@"loc,{#10000},1,1,1,0"
-locations_default(#20009,#10000,1,1,1,0)
-hasLocation(#20008,#20009)
-#20010=*
-exit_cfg_node(#20010,#20001)
-hasLocation(#20010,#20006)
-successor(#20008,#20010)
+#20008=@"var;{this};{#20000}"
+variables(#20008,"this",#20000)
+#20009=*
+entry_cfg_node(#20009,#20001)
+#20010=@"loc,{#10000},1,1,1,0"
+locations_default(#20010,#10000,1,1,1,0)
+hasLocation(#20009,#20010)
+#20011=*
+exit_cfg_node(#20011,#20001)
+hasLocation(#20011,#20006)
+successor(#20009,#20011)
 numlines(#10000,1,0,1)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/comments/output/trap/jsdoc.js.trap b/javascript/extractor/tests/comments/output/trap/jsdoc.js.trap
index 910c567993f..fbd9234b8cc 100644
--- a/javascript/extractor/tests/comments/output/trap/jsdoc.js.trap
+++ b/javascript/extractor/tests/comments/output/trap/jsdoc.js.trap
@@ -673,14 +673,16 @@ toplevels(#20001,0)
 #20214=@"loc,{#10000},1,1,43,0"
 locations_default(#20214,#10000,1,1,43,0)
 hasLocation(#20001,#20214)
-#20215=*
-entry_cfg_node(#20215,#20001)
-#20216=@"loc,{#10000},1,1,1,0"
-locations_default(#20216,#10000,1,1,1,0)
-hasLocation(#20215,#20216)
-#20217=*
-exit_cfg_node(#20217,#20001)
-hasLocation(#20217,#20105)
-successor(#20215,#20217)
+#20215=@"var;{this};{#20000}"
+variables(#20215,"this",#20000)
+#20216=*
+entry_cfg_node(#20216,#20001)
+#20217=@"loc,{#10000},1,1,1,0"
+locations_default(#20217,#10000,1,1,1,0)
+hasLocation(#20216,#20217)
+#20218=*
+exit_cfg_node(#20218,#20001)
+hasLocation(#20218,#20105)
+successor(#20216,#20218)
 numlines(#10000,42,0,37)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/default-encoding/output/trap/latin1.js.trap b/javascript/extractor/tests/default-encoding/output/trap/latin1.js.trap
index 1b2c513def0..1785f3fbac6 100644
--- a/javascript/extractor/tests/default-encoding/output/trap/latin1.js.trap
+++ b/javascript/extractor/tests/default-encoding/output/trap/latin1.js.trap
@@ -72,67 +72,71 @@ locations_default(#20024,#10000,1,1,2,0)
 hasLocation(#20001,#20024)
 #20025=@"var;{f};{#20000}"
 variables(#20025,"f",#20000)
-#20026=*
-stmts(#20026,17,#20001,0,"function f(\u00e4, \u00f6) {}")
-hasLocation(#20026,#20003)
-stmt_containers(#20026,#20001)
+#20026=@"var;{this};{#20000}"
+variables(#20026,"this",#20000)
 #20027=*
-exprs(#20027,78,#20026,-1,"f")
-hasLocation(#20027,#20007)
-expr_containers(#20027,#20026)
-literals("f","f",#20027)
-decl(#20027,#20025)
+stmts(#20027,17,#20001,0,"function f(\u00e4, \u00f6) {}")
+hasLocation(#20027,#20003)
+stmt_containers(#20027,#20001)
 #20028=*
-scopes(#20028,1)
-scopenodes(#20026,#20028)
-scopenesting(#20028,#20000)
-#20029=@"var;{ä};{#20028}"
-variables(#20029,"ä",#20028)
-#20030=*
-exprs(#20030,78,#20026,0,"\u00e4")
-hasLocation(#20030,#20011)
-expr_containers(#20030,#20026)
-literals("ä","ä",#20030)
-decl(#20030,#20029)
-#20031=@"var;{ö};{#20028}"
-variables(#20031,"ö",#20028)
+exprs(#20028,78,#20027,-1,"f")
+hasLocation(#20028,#20007)
+expr_containers(#20028,#20027)
+literals("f","f",#20028)
+decl(#20028,#20025)
+#20029=*
+scopes(#20029,1)
+scopenodes(#20027,#20029)
+scopenesting(#20029,#20000)
+#20030=@"var;{this};{#20029}"
+variables(#20030,"this",#20029)
+#20031=@"var;{ä};{#20029}"
+variables(#20031,"ä",#20029)
 #20032=*
-exprs(#20032,78,#20026,1,"\u00f6")
-hasLocation(#20032,#20015)
-expr_containers(#20032,#20026)
-literals("ö","ö",#20032)
+exprs(#20032,78,#20027,0,"\u00e4")
+hasLocation(#20032,#20011)
+expr_containers(#20032,#20027)
+literals("ä","ä",#20032)
 decl(#20032,#20031)
-#20033=@"var;{arguments};{#20028}"
-variables(#20033,"arguments",#20028)
-is_arguments_object(#20033)
+#20033=@"var;{ö};{#20029}"
+variables(#20033,"ö",#20029)
 #20034=*
-stmts(#20034,1,#20026,-2,"{}")
-#20035=@"loc,{#10000},1,18,1,19"
-locations_default(#20035,#10000,1,18,1,19)
-hasLocation(#20034,#20035)
-stmt_containers(#20034,#20026)
+exprs(#20034,78,#20027,1,"\u00f6")
+hasLocation(#20034,#20015)
+expr_containers(#20034,#20027)
+literals("ö","ö",#20034)
+decl(#20034,#20033)
+#20035=@"var;{arguments};{#20029}"
+variables(#20035,"arguments",#20029)
+is_arguments_object(#20035)
 #20036=*
-entry_cfg_node(#20036,#20001)
-#20037=@"loc,{#10000},1,1,1,0"
-locations_default(#20037,#10000,1,1,1,0)
+stmts(#20036,1,#20027,-2,"{}")
+#20037=@"loc,{#10000},1,18,1,19"
+locations_default(#20037,#10000,1,18,1,19)
 hasLocation(#20036,#20037)
+stmt_containers(#20036,#20027)
 #20038=*
-exit_cfg_node(#20038,#20001)
-hasLocation(#20038,#20023)
-successor(#20026,#20038)
-#20039=*
-entry_cfg_node(#20039,#20026)
-hasLocation(#20039,#20037)
+entry_cfg_node(#20038,#20001)
+#20039=@"loc,{#10000},1,1,1,0"
+locations_default(#20039,#10000,1,1,1,0)
+hasLocation(#20038,#20039)
 #20040=*
-exit_cfg_node(#20040,#20026)
-#20041=@"loc,{#10000},1,20,1,19"
-locations_default(#20041,#10000,1,20,1,19)
-hasLocation(#20040,#20041)
-successor(#20034,#20040)
+exit_cfg_node(#20040,#20001)
+hasLocation(#20040,#20023)
+successor(#20027,#20040)
+#20041=*
+entry_cfg_node(#20041,#20027)
+hasLocation(#20041,#20039)
+#20042=*
+exit_cfg_node(#20042,#20027)
+#20043=@"loc,{#10000},1,20,1,19"
+locations_default(#20043,#10000,1,20,1,19)
+hasLocation(#20042,#20043)
+successor(#20036,#20042)
+successor(#20034,#20036)
 successor(#20032,#20034)
-successor(#20030,#20032)
-successor(#20039,#20030)
-successor(#20027,#20026)
-successor(#20036,#20027)
+successor(#20041,#20032)
+successor(#20028,#20027)
+successor(#20038,#20028)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/e4x/output/trap/regress.js.trap b/javascript/extractor/tests/e4x/output/trap/regress.js.trap
index 1f14daae973..dba489321b2 100644
--- a/javascript/extractor/tests/e4x/output/trap/regress.js.trap
+++ b/javascript/extractor/tests/e4x/output/trap/regress.js.trap
@@ -50,54 +50,56 @@ toplevels(#20001,0)
 #20016=@"loc,{#10000},1,1,2,0"
 locations_default(#20016,#10000,1,1,2,0)
 hasLocation(#20001,#20016)
-#20017=*
-stmts(#20017,2,#20001,0,"[ x in y ]")
-hasLocation(#20017,#20003)
-stmt_containers(#20017,#20001)
+#20017=@"var;{this};{#20000}"
+variables(#20017,"this",#20000)
 #20018=*
-exprs(#20018,7,#20017,0,"[ x in y ]")
+stmts(#20018,2,#20001,0,"[ x in y ]")
 hasLocation(#20018,#20003)
-enclosing_stmt(#20018,#20017)
-expr_containers(#20018,#20001)
+stmt_containers(#20018,#20001)
 #20019=*
-exprs(#20019,42,#20018,0,"x in y")
-#20020=@"loc,{#10000},1,3,1,8"
-locations_default(#20020,#10000,1,3,1,8)
-hasLocation(#20019,#20020)
-enclosing_stmt(#20019,#20017)
+exprs(#20019,7,#20018,0,"[ x in y ]")
+hasLocation(#20019,#20003)
+enclosing_stmt(#20019,#20018)
 expr_containers(#20019,#20001)
-#20021=*
-exprs(#20021,79,#20019,0,"x")
-hasLocation(#20021,#20007)
-enclosing_stmt(#20021,#20017)
-expr_containers(#20021,#20001)
-literals("x","x",#20021)
-#20022=@"var;{x};{#20000}"
-variables(#20022,"x",#20000)
-bind(#20021,#20022)
-#20023=*
-exprs(#20023,79,#20019,1,"y")
-hasLocation(#20023,#20011)
-enclosing_stmt(#20023,#20017)
-expr_containers(#20023,#20001)
-literals("y","y",#20023)
-#20024=@"var;{y};{#20000}"
-variables(#20024,"y",#20000)
-bind(#20023,#20024)
-array_size(#20018,1)
-#20025=*
-entry_cfg_node(#20025,#20001)
-#20026=@"loc,{#10000},1,1,1,0"
-locations_default(#20026,#10000,1,1,1,0)
-hasLocation(#20025,#20026)
-#20027=*
-exit_cfg_node(#20027,#20001)
-hasLocation(#20027,#20015)
-successor(#20017,#20018)
-successor(#20018,#20021)
-successor(#20023,#20019)
-successor(#20021,#20023)
-successor(#20019,#20027)
-successor(#20025,#20017)
+#20020=*
+exprs(#20020,42,#20019,0,"x in y")
+#20021=@"loc,{#10000},1,3,1,8"
+locations_default(#20021,#10000,1,3,1,8)
+hasLocation(#20020,#20021)
+enclosing_stmt(#20020,#20018)
+expr_containers(#20020,#20001)
+#20022=*
+exprs(#20022,79,#20020,0,"x")
+hasLocation(#20022,#20007)
+enclosing_stmt(#20022,#20018)
+expr_containers(#20022,#20001)
+literals("x","x",#20022)
+#20023=@"var;{x};{#20000}"
+variables(#20023,"x",#20000)
+bind(#20022,#20023)
+#20024=*
+exprs(#20024,79,#20020,1,"y")
+hasLocation(#20024,#20011)
+enclosing_stmt(#20024,#20018)
+expr_containers(#20024,#20001)
+literals("y","y",#20024)
+#20025=@"var;{y};{#20000}"
+variables(#20025,"y",#20000)
+bind(#20024,#20025)
+array_size(#20019,1)
+#20026=*
+entry_cfg_node(#20026,#20001)
+#20027=@"loc,{#10000},1,1,1,0"
+locations_default(#20027,#10000,1,1,1,0)
+hasLocation(#20026,#20027)
+#20028=*
+exit_cfg_node(#20028,#20001)
+hasLocation(#20028,#20015)
+successor(#20018,#20019)
+successor(#20019,#20022)
+successor(#20024,#20020)
+successor(#20022,#20024)
+successor(#20020,#20028)
+successor(#20026,#20018)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/e4x/output/trap/tst.js.trap b/javascript/extractor/tests/e4x/output/trap/tst.js.trap
index a9636dd5fa4..b7bfb4dc5e5 100644
--- a/javascript/extractor/tests/e4x/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/e4x/output/trap/tst.js.trap
@@ -490,507 +490,509 @@ locations_default(#20184,#10000,1,1,14,0)
 hasLocation(#20001,#20184)
 #20185=@"var;{e};{#20000}"
 variables(#20185,"e",#20000)
-#20186=*
-stmts(#20186,2,#20001,0,"items.@id;")
-hasLocation(#20186,#20003)
-stmt_containers(#20186,#20001)
+#20186=@"var;{this};{#20000}"
+variables(#20186,"this",#20000)
 #20187=*
-exprs(#20187,14,#20186,0,"items.@id")
-#20188=@"loc,{#10000},1,1,1,9"
-locations_default(#20188,#10000,1,1,1,9)
-hasLocation(#20187,#20188)
-enclosing_stmt(#20187,#20186)
-expr_containers(#20187,#20001)
-#20189=*
-exprs(#20189,79,#20187,0,"items")
-hasLocation(#20189,#20029)
-enclosing_stmt(#20189,#20186)
-expr_containers(#20189,#20001)
-literals("items","items",#20189)
-#20190=@"var;{items};{#20000}"
-variables(#20190,"items",#20000)
-bind(#20189,#20190)
-#20191=*
-exprs(#20191,109,#20187,1,"@id")
-#20192=@"loc,{#10000},1,7,1,9"
-locations_default(#20192,#10000,1,7,1,9)
-hasLocation(#20191,#20192)
-enclosing_stmt(#20191,#20186)
-expr_containers(#20191,#20001)
-#20193=*
-exprs(#20193,0,#20191,0,"id")
-hasLocation(#20193,#20035)
-enclosing_stmt(#20193,#20186)
-expr_containers(#20193,#20001)
-literals("id","id",#20193)
+stmts(#20187,2,#20001,0,"items.@id;")
+hasLocation(#20187,#20003)
+stmt_containers(#20187,#20001)
+#20188=*
+exprs(#20188,14,#20187,0,"items.@id")
+#20189=@"loc,{#10000},1,1,1,9"
+locations_default(#20189,#10000,1,1,1,9)
+hasLocation(#20188,#20189)
+enclosing_stmt(#20188,#20187)
+expr_containers(#20188,#20001)
+#20190=*
+exprs(#20190,79,#20188,0,"items")
+hasLocation(#20190,#20029)
+enclosing_stmt(#20190,#20187)
+expr_containers(#20190,#20001)
+literals("items","items",#20190)
+#20191=@"var;{items};{#20000}"
+variables(#20191,"items",#20000)
+bind(#20190,#20191)
+#20192=*
+exprs(#20192,109,#20188,1,"@id")
+#20193=@"loc,{#10000},1,7,1,9"
+locations_default(#20193,#10000,1,7,1,9)
+hasLocation(#20192,#20193)
+enclosing_stmt(#20192,#20187)
+expr_containers(#20192,#20001)
 #20194=*
-stmts(#20194,2,#20001,1,"items.*[1];")
-hasLocation(#20194,#20005)
-stmt_containers(#20194,#20001)
+exprs(#20194,0,#20192,0,"id")
+hasLocation(#20194,#20035)
+enclosing_stmt(#20194,#20187)
+expr_containers(#20194,#20001)
+literals("id","id",#20194)
 #20195=*
-exprs(#20195,15,#20194,0,"items.*[1]")
-#20196=@"loc,{#10000},2,1,2,10"
-locations_default(#20196,#10000,2,1,2,10)
-hasLocation(#20195,#20196)
-enclosing_stmt(#20195,#20194)
-expr_containers(#20195,#20001)
-#20197=*
-exprs(#20197,14,#20195,0,"items.*")
-#20198=@"loc,{#10000},2,1,2,7"
-locations_default(#20198,#10000,2,1,2,7)
-hasLocation(#20197,#20198)
-enclosing_stmt(#20197,#20194)
-expr_containers(#20197,#20001)
-#20199=*
-exprs(#20199,79,#20197,0,"items")
-hasLocation(#20199,#20039)
-enclosing_stmt(#20199,#20194)
-expr_containers(#20199,#20001)
-literals("items","items",#20199)
-bind(#20199,#20190)
+stmts(#20195,2,#20001,1,"items.*[1];")
+hasLocation(#20195,#20005)
+stmt_containers(#20195,#20001)
+#20196=*
+exprs(#20196,15,#20195,0,"items.*[1]")
+#20197=@"loc,{#10000},2,1,2,10"
+locations_default(#20197,#10000,2,1,2,10)
+hasLocation(#20196,#20197)
+enclosing_stmt(#20196,#20195)
+expr_containers(#20196,#20001)
+#20198=*
+exprs(#20198,14,#20196,0,"items.*")
+#20199=@"loc,{#10000},2,1,2,7"
+locations_default(#20199,#10000,2,1,2,7)
+hasLocation(#20198,#20199)
+enclosing_stmt(#20198,#20195)
+expr_containers(#20198,#20001)
 #20200=*
-exprs(#20200,108,#20197,1,"*")
-hasLocation(#20200,#20043)
-enclosing_stmt(#20200,#20194)
+exprs(#20200,79,#20198,0,"items")
+hasLocation(#20200,#20039)
+enclosing_stmt(#20200,#20195)
 expr_containers(#20200,#20001)
+literals("items","items",#20200)
+bind(#20200,#20191)
 #20201=*
-exprs(#20201,3,#20195,1,"1")
-hasLocation(#20201,#20047)
-enclosing_stmt(#20201,#20194)
+exprs(#20201,108,#20198,1,"*")
+hasLocation(#20201,#20043)
+enclosing_stmt(#20201,#20195)
 expr_containers(#20201,#20001)
-literals("1","1",#20201)
 #20202=*
-stmts(#20202,2,#20001,2,"order.@*;")
-hasLocation(#20202,#20007)
-stmt_containers(#20202,#20001)
+exprs(#20202,3,#20196,1,"1")
+hasLocation(#20202,#20047)
+enclosing_stmt(#20202,#20195)
+expr_containers(#20202,#20001)
+literals("1","1",#20202)
 #20203=*
-exprs(#20203,14,#20202,0,"order.@*")
-#20204=@"loc,{#10000},3,1,3,8"
-locations_default(#20204,#10000,3,1,3,8)
-hasLocation(#20203,#20204)
-enclosing_stmt(#20203,#20202)
-expr_containers(#20203,#20001)
-#20205=*
-exprs(#20205,79,#20203,0,"order")
-hasLocation(#20205,#20053)
-enclosing_stmt(#20205,#20202)
-expr_containers(#20205,#20001)
-literals("order","order",#20205)
-#20206=@"var;{order};{#20000}"
-variables(#20206,"order",#20000)
-bind(#20205,#20206)
-#20207=*
-exprs(#20207,109,#20203,1,"@*")
-#20208=@"loc,{#10000},3,7,3,8"
-locations_default(#20208,#10000,3,7,3,8)
-hasLocation(#20207,#20208)
-enclosing_stmt(#20207,#20202)
-expr_containers(#20207,#20001)
-#20209=*
-exprs(#20209,108,#20207,0,"*")
-hasLocation(#20209,#20059)
-enclosing_stmt(#20209,#20202)
-expr_containers(#20209,#20001)
+stmts(#20203,2,#20001,2,"order.@*;")
+hasLocation(#20203,#20007)
+stmt_containers(#20203,#20001)
+#20204=*
+exprs(#20204,14,#20203,0,"order.@*")
+#20205=@"loc,{#10000},3,1,3,8"
+locations_default(#20205,#10000,3,1,3,8)
+hasLocation(#20204,#20205)
+enclosing_stmt(#20204,#20203)
+expr_containers(#20204,#20001)
+#20206=*
+exprs(#20206,79,#20204,0,"order")
+hasLocation(#20206,#20053)
+enclosing_stmt(#20206,#20203)
+expr_containers(#20206,#20001)
+literals("order","order",#20206)
+#20207=@"var;{order};{#20000}"
+variables(#20207,"order",#20000)
+bind(#20206,#20207)
+#20208=*
+exprs(#20208,109,#20204,1,"@*")
+#20209=@"loc,{#10000},3,7,3,8"
+locations_default(#20209,#10000,3,7,3,8)
+hasLocation(#20208,#20209)
+enclosing_stmt(#20208,#20203)
+expr_containers(#20208,#20001)
 #20210=*
-stmts(#20210,2,#20001,3,"e..empl ...  == 1);")
-hasLocation(#20210,#20009)
-stmt_containers(#20210,#20001)
+exprs(#20210,108,#20208,0,"*")
+hasLocation(#20210,#20059)
+enclosing_stmt(#20210,#20203)
+expr_containers(#20210,#20001)
 #20211=*
-exprs(#20211,111,#20210,0,"e..empl ... d == 1)")
-#20212=@"loc,{#10000},4,1,4,34"
-locations_default(#20212,#10000,4,1,4,34)
-hasLocation(#20211,#20212)
-enclosing_stmt(#20211,#20210)
-expr_containers(#20211,#20001)
-#20213=*
-exprs(#20213,114,#20211,0,"e..employee")
-#20214=@"loc,{#10000},4,1,4,11"
-locations_default(#20214,#10000,4,1,4,11)
-hasLocation(#20213,#20214)
-enclosing_stmt(#20213,#20210)
-expr_containers(#20213,#20001)
-#20215=*
-exprs(#20215,79,#20213,0,"e")
-hasLocation(#20215,#20063)
-enclosing_stmt(#20215,#20210)
-expr_containers(#20215,#20001)
-literals("e","e",#20215)
-bind(#20215,#20185)
+stmts(#20211,2,#20001,3,"e..empl ...  == 1);")
+hasLocation(#20211,#20009)
+stmt_containers(#20211,#20001)
+#20212=*
+exprs(#20212,111,#20211,0,"e..empl ... d == 1)")
+#20213=@"loc,{#10000},4,1,4,34"
+locations_default(#20213,#10000,4,1,4,34)
+hasLocation(#20212,#20213)
+enclosing_stmt(#20212,#20211)
+expr_containers(#20212,#20001)
+#20214=*
+exprs(#20214,114,#20212,0,"e..employee")
+#20215=@"loc,{#10000},4,1,4,11"
+locations_default(#20215,#10000,4,1,4,11)
+hasLocation(#20214,#20215)
+enclosing_stmt(#20214,#20211)
+expr_containers(#20214,#20001)
 #20216=*
-exprs(#20216,0,#20213,1,"employee")
-hasLocation(#20216,#20067)
-enclosing_stmt(#20216,#20210)
+exprs(#20216,79,#20214,0,"e")
+hasLocation(#20216,#20063)
+enclosing_stmt(#20216,#20211)
 expr_containers(#20216,#20001)
-literals("employee","employee",#20216)
+literals("e","e",#20216)
+bind(#20216,#20185)
 #20217=*
-exprs(#20217,45,#20211,1,"@id == 0 || @id == 1")
-#20218=@"loc,{#10000},4,14,4,33"
-locations_default(#20218,#10000,4,14,4,33)
-hasLocation(#20217,#20218)
-enclosing_stmt(#20217,#20210)
+exprs(#20217,0,#20214,1,"employee")
+hasLocation(#20217,#20067)
+enclosing_stmt(#20217,#20211)
 expr_containers(#20217,#20001)
-#20219=*
-exprs(#20219,23,#20217,0,"@id == 0")
-#20220=@"loc,{#10000},4,14,4,21"
-locations_default(#20220,#10000,4,14,4,21)
-hasLocation(#20219,#20220)
-enclosing_stmt(#20219,#20210)
-expr_containers(#20219,#20001)
-#20221=*
-exprs(#20221,109,#20219,0,"@id")
-#20222=@"loc,{#10000},4,14,4,16"
-locations_default(#20222,#10000,4,14,4,16)
-hasLocation(#20221,#20222)
-enclosing_stmt(#20221,#20210)
-expr_containers(#20221,#20001)
-#20223=*
-exprs(#20223,0,#20221,0,"id")
-hasLocation(#20223,#20075)
-enclosing_stmt(#20223,#20210)
-expr_containers(#20223,#20001)
-literals("id","id",#20223)
+literals("employee","employee",#20217)
+#20218=*
+exprs(#20218,45,#20212,1,"@id == 0 || @id == 1")
+#20219=@"loc,{#10000},4,14,4,33"
+locations_default(#20219,#10000,4,14,4,33)
+hasLocation(#20218,#20219)
+enclosing_stmt(#20218,#20211)
+expr_containers(#20218,#20001)
+#20220=*
+exprs(#20220,23,#20218,0,"@id == 0")
+#20221=@"loc,{#10000},4,14,4,21"
+locations_default(#20221,#10000,4,14,4,21)
+hasLocation(#20220,#20221)
+enclosing_stmt(#20220,#20211)
+expr_containers(#20220,#20001)
+#20222=*
+exprs(#20222,109,#20220,0,"@id")
+#20223=@"loc,{#10000},4,14,4,16"
+locations_default(#20223,#10000,4,14,4,16)
+hasLocation(#20222,#20223)
+enclosing_stmt(#20222,#20211)
+expr_containers(#20222,#20001)
 #20224=*
-exprs(#20224,3,#20219,1,"0")
-hasLocation(#20224,#20079)
-enclosing_stmt(#20224,#20210)
+exprs(#20224,0,#20222,0,"id")
+hasLocation(#20224,#20075)
+enclosing_stmt(#20224,#20211)
 expr_containers(#20224,#20001)
-literals("0","0",#20224)
+literals("id","id",#20224)
 #20225=*
-exprs(#20225,23,#20217,1,"@id == 1")
-#20226=@"loc,{#10000},4,26,4,33"
-locations_default(#20226,#10000,4,26,4,33)
-hasLocation(#20225,#20226)
-enclosing_stmt(#20225,#20210)
+exprs(#20225,3,#20220,1,"0")
+hasLocation(#20225,#20079)
+enclosing_stmt(#20225,#20211)
 expr_containers(#20225,#20001)
-#20227=*
-exprs(#20227,109,#20225,0,"@id")
-#20228=@"loc,{#10000},4,26,4,28"
-locations_default(#20228,#10000,4,26,4,28)
-hasLocation(#20227,#20228)
-enclosing_stmt(#20227,#20210)
-expr_containers(#20227,#20001)
-#20229=*
-exprs(#20229,0,#20227,0,"id")
-hasLocation(#20229,#20085)
-enclosing_stmt(#20229,#20210)
-expr_containers(#20229,#20001)
-literals("id","id",#20229)
+literals("0","0",#20225)
+#20226=*
+exprs(#20226,23,#20218,1,"@id == 1")
+#20227=@"loc,{#10000},4,26,4,33"
+locations_default(#20227,#10000,4,26,4,33)
+hasLocation(#20226,#20227)
+enclosing_stmt(#20226,#20211)
+expr_containers(#20226,#20001)
+#20228=*
+exprs(#20228,109,#20226,0,"@id")
+#20229=@"loc,{#10000},4,26,4,28"
+locations_default(#20229,#10000,4,26,4,28)
+hasLocation(#20228,#20229)
+enclosing_stmt(#20228,#20211)
+expr_containers(#20228,#20001)
 #20230=*
-exprs(#20230,3,#20225,1,"1")
-hasLocation(#20230,#20089)
-enclosing_stmt(#20230,#20210)
+exprs(#20230,0,#20228,0,"id")
+hasLocation(#20230,#20085)
+enclosing_stmt(#20230,#20211)
 expr_containers(#20230,#20001)
-literals("1","1",#20230)
+literals("id","id",#20230)
 #20231=*
-stmts(#20231,2,#20001,4,"message ... gStyle;")
-hasLocation(#20231,#20011)
-stmt_containers(#20231,#20001)
+exprs(#20231,3,#20226,1,"1")
+hasLocation(#20231,#20089)
+enclosing_stmt(#20231,#20211)
+expr_containers(#20231,#20001)
+literals("1","1",#20231)
 #20232=*
-exprs(#20232,97,#20231,0,"message ... ngStyle")
-#20233=@"loc,{#10000},5,1,5,28"
-locations_default(#20233,#10000,5,1,5,28)
-hasLocation(#20232,#20233)
-enclosing_stmt(#20232,#20231)
-expr_containers(#20232,#20001)
-#20234=*
-exprs(#20234,14,#20232,0,"message.@soap")
-#20235=@"loc,{#10000},5,1,5,13"
-locations_default(#20235,#10000,5,1,5,13)
-hasLocation(#20234,#20235)
-enclosing_stmt(#20234,#20231)
-expr_containers(#20234,#20001)
-#20236=*
-exprs(#20236,79,#20234,0,"message")
-hasLocation(#20236,#20095)
-enclosing_stmt(#20236,#20231)
-expr_containers(#20236,#20001)
-literals("message","message",#20236)
-#20237=@"var;{message};{#20000}"
-variables(#20237,"message",#20000)
-bind(#20236,#20237)
-#20238=*
-exprs(#20238,109,#20234,1,"@soap")
-#20239=@"loc,{#10000},5,9,5,13"
-locations_default(#20239,#10000,5,9,5,13)
-hasLocation(#20238,#20239)
-enclosing_stmt(#20238,#20231)
-expr_containers(#20238,#20001)
-#20240=*
-exprs(#20240,0,#20238,0,"soap")
-hasLocation(#20240,#20101)
-enclosing_stmt(#20240,#20231)
-expr_containers(#20240,#20001)
-literals("soap","soap",#20240)
+stmts(#20232,2,#20001,4,"message ... gStyle;")
+hasLocation(#20232,#20011)
+stmt_containers(#20232,#20001)
+#20233=*
+exprs(#20233,97,#20232,0,"message ... ngStyle")
+#20234=@"loc,{#10000},5,1,5,28"
+locations_default(#20234,#10000,5,1,5,28)
+hasLocation(#20233,#20234)
+enclosing_stmt(#20233,#20232)
+expr_containers(#20233,#20001)
+#20235=*
+exprs(#20235,14,#20233,0,"message.@soap")
+#20236=@"loc,{#10000},5,1,5,13"
+locations_default(#20236,#10000,5,1,5,13)
+hasLocation(#20235,#20236)
+enclosing_stmt(#20235,#20232)
+expr_containers(#20235,#20001)
+#20237=*
+exprs(#20237,79,#20235,0,"message")
+hasLocation(#20237,#20095)
+enclosing_stmt(#20237,#20232)
+expr_containers(#20237,#20001)
+literals("message","message",#20237)
+#20238=@"var;{message};{#20000}"
+variables(#20238,"message",#20000)
+bind(#20237,#20238)
+#20239=*
+exprs(#20239,109,#20235,1,"@soap")
+#20240=@"loc,{#10000},5,9,5,13"
+locations_default(#20240,#10000,5,9,5,13)
+hasLocation(#20239,#20240)
+enclosing_stmt(#20239,#20232)
+expr_containers(#20239,#20001)
 #20241=*
-exprs(#20241,79,#20232,1,"encodingStyle")
-hasLocation(#20241,#20105)
-enclosing_stmt(#20241,#20231)
+exprs(#20241,0,#20239,0,"soap")
+hasLocation(#20241,#20101)
+enclosing_stmt(#20241,#20232)
 expr_containers(#20241,#20001)
-literals("encodingStyle","encodingStyle",#20241)
-#20242=@"var;{encodingStyle};{#20000}"
-variables(#20242,"encodingStyle",#20000)
-bind(#20241,#20242)
-#20243=*
-stmts(#20243,2,#20001,5,"message.soap::Body;")
-hasLocation(#20243,#20013)
-stmt_containers(#20243,#20001)
+literals("soap","soap",#20241)
+#20242=*
+exprs(#20242,79,#20233,1,"encodingStyle")
+hasLocation(#20242,#20105)
+enclosing_stmt(#20242,#20232)
+expr_containers(#20242,#20001)
+literals("encodingStyle","encodingStyle",#20242)
+#20243=@"var;{encodingStyle};{#20000}"
+variables(#20243,"encodingStyle",#20000)
+bind(#20242,#20243)
 #20244=*
-exprs(#20244,97,#20243,0,"message.soap::Body")
-#20245=@"loc,{#10000},6,1,6,18"
-locations_default(#20245,#10000,6,1,6,18)
-hasLocation(#20244,#20245)
-enclosing_stmt(#20244,#20243)
-expr_containers(#20244,#20001)
-#20246=*
-exprs(#20246,14,#20244,0,"message.soap")
-#20247=@"loc,{#10000},6,1,6,12"
-locations_default(#20247,#10000,6,1,6,12)
-hasLocation(#20246,#20247)
-enclosing_stmt(#20246,#20243)
-expr_containers(#20246,#20001)
-#20248=*
-exprs(#20248,79,#20246,0,"message")
-hasLocation(#20248,#20109)
-enclosing_stmt(#20248,#20243)
-expr_containers(#20248,#20001)
-literals("message","message",#20248)
-bind(#20248,#20237)
+stmts(#20244,2,#20001,5,"message.soap::Body;")
+hasLocation(#20244,#20013)
+stmt_containers(#20244,#20001)
+#20245=*
+exprs(#20245,97,#20244,0,"message.soap::Body")
+#20246=@"loc,{#10000},6,1,6,18"
+locations_default(#20246,#10000,6,1,6,18)
+hasLocation(#20245,#20246)
+enclosing_stmt(#20245,#20244)
+expr_containers(#20245,#20001)
+#20247=*
+exprs(#20247,14,#20245,0,"message.soap")
+#20248=@"loc,{#10000},6,1,6,12"
+locations_default(#20248,#10000,6,1,6,12)
+hasLocation(#20247,#20248)
+enclosing_stmt(#20247,#20244)
+expr_containers(#20247,#20001)
 #20249=*
-exprs(#20249,0,#20246,1,"soap")
-hasLocation(#20249,#20113)
-enclosing_stmt(#20249,#20243)
+exprs(#20249,79,#20247,0,"message")
+hasLocation(#20249,#20109)
+enclosing_stmt(#20249,#20244)
 expr_containers(#20249,#20001)
-literals("soap","soap",#20249)
+literals("message","message",#20249)
+bind(#20249,#20238)
 #20250=*
-exprs(#20250,79,#20244,1,"Body")
-hasLocation(#20250,#20117)
-enclosing_stmt(#20250,#20243)
+exprs(#20250,0,#20247,1,"soap")
+hasLocation(#20250,#20113)
+enclosing_stmt(#20250,#20244)
 expr_containers(#20250,#20001)
-literals("Body","Body",#20250)
-#20251=@"var;{Body};{#20000}"
-variables(#20251,"Body",#20000)
-bind(#20250,#20251)
-#20252=*
-stmts(#20252,2,#20001,6,"items.@[f()];")
-hasLocation(#20252,#20015)
-stmt_containers(#20252,#20001)
+literals("soap","soap",#20250)
+#20251=*
+exprs(#20251,79,#20245,1,"Body")
+hasLocation(#20251,#20117)
+enclosing_stmt(#20251,#20244)
+expr_containers(#20251,#20001)
+literals("Body","Body",#20251)
+#20252=@"var;{Body};{#20000}"
+variables(#20252,"Body",#20000)
+bind(#20251,#20252)
 #20253=*
-exprs(#20253,14,#20252,0,"items.@[f()]")
-#20254=@"loc,{#10000},7,1,7,12"
-locations_default(#20254,#10000,7,1,7,12)
-hasLocation(#20253,#20254)
-enclosing_stmt(#20253,#20252)
-expr_containers(#20253,#20001)
-#20255=*
-exprs(#20255,79,#20253,0,"items")
-hasLocation(#20255,#20121)
-enclosing_stmt(#20255,#20252)
-expr_containers(#20255,#20001)
-literals("items","items",#20255)
-bind(#20255,#20190)
+stmts(#20253,2,#20001,6,"items.@[f()];")
+hasLocation(#20253,#20015)
+stmt_containers(#20253,#20001)
+#20254=*
+exprs(#20254,14,#20253,0,"items.@[f()]")
+#20255=@"loc,{#10000},7,1,7,12"
+locations_default(#20255,#10000,7,1,7,12)
+hasLocation(#20254,#20255)
+enclosing_stmt(#20254,#20253)
+expr_containers(#20254,#20001)
 #20256=*
-exprs(#20256,110,#20253,1,"@[f()]")
-#20257=@"loc,{#10000},7,7,7,12"
-locations_default(#20257,#10000,7,7,7,12)
-hasLocation(#20256,#20257)
-enclosing_stmt(#20256,#20252)
+exprs(#20256,79,#20254,0,"items")
+hasLocation(#20256,#20121)
+enclosing_stmt(#20256,#20253)
 expr_containers(#20256,#20001)
-#20258=*
-exprs(#20258,13,#20256,0,"f()")
-#20259=@"loc,{#10000},7,9,7,11"
-locations_default(#20259,#10000,7,9,7,11)
-hasLocation(#20258,#20259)
-enclosing_stmt(#20258,#20252)
-expr_containers(#20258,#20001)
-#20260=*
-exprs(#20260,79,#20258,-1,"f")
-hasLocation(#20260,#20129)
-enclosing_stmt(#20260,#20252)
-expr_containers(#20260,#20001)
-literals("f","f",#20260)
-#20261=@"var;{f};{#20000}"
-variables(#20261,"f",#20000)
-bind(#20260,#20261)
-#20262=*
-stmts(#20262,2,#20001,7,"message.soap::[g()];")
-hasLocation(#20262,#20017)
-stmt_containers(#20262,#20001)
+literals("items","items",#20256)
+bind(#20256,#20191)
+#20257=*
+exprs(#20257,110,#20254,1,"@[f()]")
+#20258=@"loc,{#10000},7,7,7,12"
+locations_default(#20258,#10000,7,7,7,12)
+hasLocation(#20257,#20258)
+enclosing_stmt(#20257,#20253)
+expr_containers(#20257,#20001)
+#20259=*
+exprs(#20259,13,#20257,0,"f()")
+#20260=@"loc,{#10000},7,9,7,11"
+locations_default(#20260,#10000,7,9,7,11)
+hasLocation(#20259,#20260)
+enclosing_stmt(#20259,#20253)
+expr_containers(#20259,#20001)
+#20261=*
+exprs(#20261,79,#20259,-1,"f")
+hasLocation(#20261,#20129)
+enclosing_stmt(#20261,#20253)
+expr_containers(#20261,#20001)
+literals("f","f",#20261)
+#20262=@"var;{f};{#20000}"
+variables(#20262,"f",#20000)
+bind(#20261,#20262)
 #20263=*
-exprs(#20263,97,#20262,0,"message.soap::[g()]")
-#20264=@"loc,{#10000},8,1,8,19"
-locations_default(#20264,#10000,8,1,8,19)
-hasLocation(#20263,#20264)
-enclosing_stmt(#20263,#20262)
-expr_containers(#20263,#20001)
-#20265=*
-exprs(#20265,14,#20263,0,"message.soap")
-#20266=@"loc,{#10000},8,1,8,12"
-locations_default(#20266,#10000,8,1,8,12)
-hasLocation(#20265,#20266)
-enclosing_stmt(#20265,#20262)
-expr_containers(#20265,#20001)
-#20267=*
-exprs(#20267,79,#20265,0,"message")
-hasLocation(#20267,#20139)
-enclosing_stmt(#20267,#20262)
-expr_containers(#20267,#20001)
-literals("message","message",#20267)
-bind(#20267,#20237)
+stmts(#20263,2,#20001,7,"message.soap::[g()];")
+hasLocation(#20263,#20017)
+stmt_containers(#20263,#20001)
+#20264=*
+exprs(#20264,97,#20263,0,"message.soap::[g()]")
+#20265=@"loc,{#10000},8,1,8,19"
+locations_default(#20265,#10000,8,1,8,19)
+hasLocation(#20264,#20265)
+enclosing_stmt(#20264,#20263)
+expr_containers(#20264,#20001)
+#20266=*
+exprs(#20266,14,#20264,0,"message.soap")
+#20267=@"loc,{#10000},8,1,8,12"
+locations_default(#20267,#10000,8,1,8,12)
+hasLocation(#20266,#20267)
+enclosing_stmt(#20266,#20263)
+expr_containers(#20266,#20001)
 #20268=*
-exprs(#20268,0,#20265,1,"soap")
-hasLocation(#20268,#20143)
-enclosing_stmt(#20268,#20262)
+exprs(#20268,79,#20266,0,"message")
+hasLocation(#20268,#20139)
+enclosing_stmt(#20268,#20263)
 expr_containers(#20268,#20001)
-literals("soap","soap",#20268)
+literals("message","message",#20268)
+bind(#20268,#20238)
 #20269=*
-exprs(#20269,7,#20263,1,"[g()]")
-#20270=@"loc,{#10000},8,15,8,19"
-locations_default(#20270,#10000,8,15,8,19)
-hasLocation(#20269,#20270)
-enclosing_stmt(#20269,#20262)
+exprs(#20269,0,#20266,1,"soap")
+hasLocation(#20269,#20143)
+enclosing_stmt(#20269,#20263)
 expr_containers(#20269,#20001)
-#20271=*
-exprs(#20271,13,#20269,0,"g()")
-#20272=@"loc,{#10000},8,16,8,18"
-locations_default(#20272,#10000,8,16,8,18)
-hasLocation(#20271,#20272)
-enclosing_stmt(#20271,#20262)
-expr_containers(#20271,#20001)
-#20273=*
-exprs(#20273,79,#20271,-1,"g")
-hasLocation(#20273,#20149)
-enclosing_stmt(#20273,#20262)
-expr_containers(#20273,#20001)
-literals("g","g",#20273)
-#20274=@"var;{g};{#20000}"
-variables(#20274,"g",#20000)
-bind(#20273,#20274)
-array_size(#20269,1)
-#20275=*
-stmts(#20275,18,#20001,8,"var e = ... </elt>;")
-#20276=@"loc,{#10000},10,1,13,9"
-locations_default(#20276,#10000,10,1,13,9)
-hasLocation(#20275,#20276)
-stmt_containers(#20275,#20001)
-#20277=*
-exprs(#20277,64,#20275,0,"e = <?x ...  </elt>")
-#20278=@"loc,{#10000},10,5,13,8"
-locations_default(#20278,#10000,10,5,13,8)
-hasLocation(#20277,#20278)
-enclosing_stmt(#20277,#20275)
-expr_containers(#20277,#20001)
-#20279=*
-exprs(#20279,78,#20277,0,"e")
-hasLocation(#20279,#20161)
-enclosing_stmt(#20279,#20275)
-expr_containers(#20279,#20001)
-literals("e","e",#20279)
-decl(#20279,#20185)
+literals("soap","soap",#20269)
+#20270=*
+exprs(#20270,7,#20264,1,"[g()]")
+#20271=@"loc,{#10000},8,15,8,19"
+locations_default(#20271,#10000,8,15,8,19)
+hasLocation(#20270,#20271)
+enclosing_stmt(#20270,#20263)
+expr_containers(#20270,#20001)
+#20272=*
+exprs(#20272,13,#20270,0,"g()")
+#20273=@"loc,{#10000},8,16,8,18"
+locations_default(#20273,#10000,8,16,8,18)
+hasLocation(#20272,#20273)
+enclosing_stmt(#20272,#20263)
+expr_containers(#20272,#20001)
+#20274=*
+exprs(#20274,79,#20272,-1,"g")
+hasLocation(#20274,#20149)
+enclosing_stmt(#20274,#20263)
+expr_containers(#20274,#20001)
+literals("g","g",#20274)
+#20275=@"var;{g};{#20000}"
+variables(#20275,"g",#20000)
+bind(#20274,#20275)
+array_size(#20270,1)
+#20276=*
+stmts(#20276,18,#20001,8,"var e = ... </elt>;")
+#20277=@"loc,{#10000},10,1,13,9"
+locations_default(#20277,#10000,10,1,13,9)
+hasLocation(#20276,#20277)
+stmt_containers(#20276,#20001)
+#20278=*
+exprs(#20278,64,#20276,0,"e = <?x ...  </elt>")
+#20279=@"loc,{#10000},10,5,13,8"
+locations_default(#20279,#10000,10,5,13,8)
+hasLocation(#20278,#20279)
+enclosing_stmt(#20278,#20276)
+expr_containers(#20278,#20001)
 #20280=*
-exprs(#20280,89,#20277,1,"<?xml v ...  </elt>")
-#20281=@"loc,{#10000},10,9,13,8"
-locations_default(#20281,#10000,10,9,13,8)
-hasLocation(#20280,#20281)
-enclosing_stmt(#20280,#20275)
+exprs(#20280,78,#20278,0,"e")
+hasLocation(#20280,#20161)
+enclosing_stmt(#20280,#20276)
 expr_containers(#20280,#20001)
-#20282=*
-exprs(#20282,0,#20280,-1,"elt")
-hasLocation(#20282,#20167)
-enclosing_stmt(#20282,#20275)
-expr_containers(#20282,#20001)
-literals("elt","elt",#20282)
+literals("e","e",#20280)
+decl(#20280,#20185)
+#20281=*
+exprs(#20281,89,#20278,1,"<?xml v ...  </elt>")
+#20282=@"loc,{#10000},10,9,13,8"
+locations_default(#20282,#10000,10,9,13,8)
+hasLocation(#20281,#20282)
+enclosing_stmt(#20281,#20276)
+expr_containers(#20281,#20001)
 #20283=*
-exprs(#20283,4,#20280,-2,"\n  <!-- ...  ]]>\n  ")
-hasLocation(#20283,#20171)
-enclosing_stmt(#20283,#20275)
+exprs(#20283,0,#20281,-1,"elt")
+hasLocation(#20283,#20167)
+enclosing_stmt(#20283,#20276)
 expr_containers(#20283,#20001)
+literals("elt","elt",#20283)
+#20284=*
+exprs(#20284,4,#20281,-2,"\n  <!-- ...  ]]>\n  ")
+hasLocation(#20284,#20171)
+enclosing_stmt(#20284,#20276)
+expr_containers(#20284,#20001)
 literals("
   
    some <cdata> 
   ","
   <!-- comment -->
   <![CDATA[ some <cdata> ]]>
-  ",#20283)
-#20284=*
-entry_cfg_node(#20284,#20001)
-#20285=@"loc,{#10000},1,1,1,0"
-locations_default(#20285,#10000,1,1,1,0)
-hasLocation(#20284,#20285)
-#20286=*
-exit_cfg_node(#20286,#20001)
-hasLocation(#20286,#20183)
-successor(#20275,#20279)
-successor(#20283,#20280)
-successor(#20282,#20283)
-successor(#20280,#20277)
-successor(#20279,#20282)
-successor(#20277,#20286)
-successor(#20262,#20267)
-successor(#20269,#20273)
-successor(#20273,#20271)
-successor(#20271,#20263)
-successor(#20268,#20265)
-successor(#20267,#20268)
-successor(#20265,#20269)
-successor(#20263,#20275)
-successor(#20252,#20255)
-successor(#20260,#20258)
-successor(#20258,#20256)
-successor(#20256,#20253)
-successor(#20255,#20260)
-successor(#20253,#20262)
-successor(#20243,#20248)
-successor(#20250,#20244)
-successor(#20249,#20246)
-successor(#20248,#20249)
-successor(#20246,#20250)
-successor(#20244,#20252)
-successor(#20231,#20236)
-successor(#20241,#20232)
-successor(#20240,#20238)
-successor(#20238,#20234)
-successor(#20236,#20240)
-successor(#20234,#20241)
-successor(#20232,#20243)
-successor(#20210,#20215)
-successor(#20217,#20223)
-successor(#20224,#20219)
-successor(#20223,#20221)
-successor(#20221,#20224)
+  ",#20284)
+#20285=*
+entry_cfg_node(#20285,#20001)
+#20286=@"loc,{#10000},1,1,1,0"
+locations_default(#20286,#10000,1,1,1,0)
+hasLocation(#20285,#20286)
 #20287=*
-guard_node(#20287,1,#20219)
-hasLocation(#20287,#20220)
-successor(#20287,#20211)
+exit_cfg_node(#20287,#20001)
+hasLocation(#20287,#20183)
+successor(#20276,#20280)
+successor(#20284,#20281)
+successor(#20283,#20284)
+successor(#20281,#20278)
+successor(#20280,#20283)
+successor(#20278,#20287)
+successor(#20263,#20268)
+successor(#20270,#20274)
+successor(#20274,#20272)
+successor(#20272,#20264)
+successor(#20269,#20266)
+successor(#20268,#20269)
+successor(#20266,#20270)
+successor(#20264,#20276)
+successor(#20253,#20256)
+successor(#20261,#20259)
+successor(#20259,#20257)
+successor(#20257,#20254)
+successor(#20256,#20261)
+successor(#20254,#20263)
+successor(#20244,#20249)
+successor(#20251,#20245)
+successor(#20250,#20247)
+successor(#20249,#20250)
+successor(#20247,#20251)
+successor(#20245,#20253)
+successor(#20232,#20237)
+successor(#20242,#20233)
+successor(#20241,#20239)
+successor(#20239,#20235)
+successor(#20237,#20241)
+successor(#20235,#20242)
+successor(#20233,#20244)
+successor(#20211,#20216)
+successor(#20218,#20224)
+successor(#20225,#20220)
+successor(#20224,#20222)
+successor(#20222,#20225)
 #20288=*
-guard_node(#20288,0,#20219)
-hasLocation(#20288,#20220)
-successor(#20288,#20229)
-successor(#20219,#20287)
-successor(#20219,#20288)
-successor(#20230,#20225)
-successor(#20229,#20227)
-successor(#20227,#20230)
-successor(#20225,#20211)
-successor(#20216,#20213)
-successor(#20215,#20216)
-successor(#20213,#20217)
-successor(#20211,#20231)
-successor(#20202,#20205)
-successor(#20209,#20207)
-successor(#20207,#20203)
-successor(#20205,#20209)
-successor(#20203,#20210)
-successor(#20194,#20199)
-successor(#20201,#20195)
-successor(#20200,#20197)
-successor(#20199,#20200)
-successor(#20197,#20201)
-successor(#20195,#20202)
-successor(#20186,#20189)
-successor(#20193,#20191)
-successor(#20191,#20187)
-successor(#20189,#20193)
-successor(#20187,#20194)
-successor(#20284,#20186)
+guard_node(#20288,1,#20220)
+hasLocation(#20288,#20221)
+successor(#20288,#20212)
+#20289=*
+guard_node(#20289,0,#20220)
+hasLocation(#20289,#20221)
+successor(#20289,#20230)
+successor(#20220,#20288)
+successor(#20220,#20289)
+successor(#20231,#20226)
+successor(#20230,#20228)
+successor(#20228,#20231)
+successor(#20226,#20212)
+successor(#20217,#20214)
+successor(#20216,#20217)
+successor(#20214,#20218)
+successor(#20212,#20232)
+successor(#20203,#20206)
+successor(#20210,#20208)
+successor(#20208,#20204)
+successor(#20206,#20210)
+successor(#20204,#20211)
+successor(#20195,#20200)
+successor(#20202,#20196)
+successor(#20201,#20198)
+successor(#20200,#20201)
+successor(#20198,#20202)
+successor(#20196,#20203)
+successor(#20187,#20190)
+successor(#20194,#20192)
+successor(#20192,#20188)
+successor(#20190,#20194)
+successor(#20188,#20195)
+successor(#20285,#20187)
 numlines(#10000,13,12,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/encoding/output/trap/surrogates.js.trap b/javascript/extractor/tests/encoding/output/trap/surrogates.js.trap
index 1e83bf1920e..b2e619a2829 100644
--- a/javascript/extractor/tests/encoding/output/trap/surrogates.js.trap
+++ b/javascript/extractor/tests/encoding/output/trap/surrogates.js.trap
@@ -209,233 +209,235 @@ toplevels(#20001,0)
 #20073=@"loc,{#10000},1,1,14,0"
 locations_default(#20073,#10000,1,1,14,0)
 hasLocation(#20001,#20073)
-#20074=*
-stmts(#20074,2,#20001,0,"'\ud800';")
-hasLocation(#20074,#20010)
-stmt_containers(#20074,#20001)
+#20074=@"var;{this};{#20000}"
+variables(#20074,"this",#20000)
 #20075=*
-exprs(#20075,4,#20074,0,"'\ud800'")
-hasLocation(#20075,#20032)
-enclosing_stmt(#20075,#20074)
-expr_containers(#20075,#20001)
-literals("?","'\ud800'",#20075)
+stmts(#20075,2,#20001,0,"'\ud800';")
+hasLocation(#20075,#20010)
+stmt_containers(#20075,#20001)
 #20076=*
-regexpterm(#20076,14,#20075,0,"?")
-#20077=@"loc,{#10000},2,2,2,7"
-locations_default(#20077,#10000,2,2,2,7)
-hasLocation(#20076,#20077)
-regexp_const_value(#20076,"?")
-#20078=*
-stmts(#20078,2,#20001,1,"'foo\ud800';")
-hasLocation(#20078,#20012)
-stmt_containers(#20078,#20001)
+exprs(#20076,4,#20075,0,"'\ud800'")
+hasLocation(#20076,#20032)
+enclosing_stmt(#20076,#20075)
+expr_containers(#20076,#20001)
+literals("?","'\ud800'",#20076)
+#20077=*
+regexpterm(#20077,14,#20076,0,"?")
+#20078=@"loc,{#10000},2,2,2,7"
+locations_default(#20078,#10000,2,2,2,7)
+hasLocation(#20077,#20078)
+regexp_const_value(#20077,"?")
 #20079=*
-exprs(#20079,4,#20078,0,"'foo\ud800'")
-hasLocation(#20079,#20036)
-enclosing_stmt(#20079,#20078)
-expr_containers(#20079,#20001)
-literals("foo?","'foo\ud800'",#20079)
+stmts(#20079,2,#20001,1,"'foo\ud800';")
+hasLocation(#20079,#20012)
+stmt_containers(#20079,#20001)
 #20080=*
-regexpterm(#20080,14,#20079,0,"foo?")
-#20081=@"loc,{#10000},3,2,3,10"
-locations_default(#20081,#10000,3,2,3,10)
-hasLocation(#20080,#20081)
-regexp_const_value(#20080,"foo?")
-#20082=*
-stmts(#20082,2,#20001,2,"'\ud800bar';")
-hasLocation(#20082,#20014)
-stmt_containers(#20082,#20001)
+exprs(#20080,4,#20079,0,"'foo\ud800'")
+hasLocation(#20080,#20036)
+enclosing_stmt(#20080,#20079)
+expr_containers(#20080,#20001)
+literals("foo?","'foo\ud800'",#20080)
+#20081=*
+regexpterm(#20081,14,#20080,0,"foo?")
+#20082=@"loc,{#10000},3,2,3,10"
+locations_default(#20082,#10000,3,2,3,10)
+hasLocation(#20081,#20082)
+regexp_const_value(#20081,"foo?")
 #20083=*
-exprs(#20083,4,#20082,0,"'\ud800bar'")
-hasLocation(#20083,#20040)
-enclosing_stmt(#20083,#20082)
-expr_containers(#20083,#20001)
-literals("?bar","'\ud800bar'",#20083)
+stmts(#20083,2,#20001,2,"'\ud800bar';")
+hasLocation(#20083,#20014)
+stmt_containers(#20083,#20001)
 #20084=*
-regexpterm(#20084,14,#20083,0,"?bar")
-#20085=@"loc,{#10000},4,2,4,10"
-locations_default(#20085,#10000,4,2,4,10)
-hasLocation(#20084,#20085)
-regexp_const_value(#20084,"?bar")
-#20086=*
-stmts(#20086,2,#20001,3,"'foo\ud800bar';")
-hasLocation(#20086,#20016)
-stmt_containers(#20086,#20001)
+exprs(#20084,4,#20083,0,"'\ud800bar'")
+hasLocation(#20084,#20040)
+enclosing_stmt(#20084,#20083)
+expr_containers(#20084,#20001)
+literals("?bar","'\ud800bar'",#20084)
+#20085=*
+regexpterm(#20085,14,#20084,0,"?bar")
+#20086=@"loc,{#10000},4,2,4,10"
+locations_default(#20086,#10000,4,2,4,10)
+hasLocation(#20085,#20086)
+regexp_const_value(#20085,"?bar")
 #20087=*
-exprs(#20087,4,#20086,0,"'foo\ud800bar'")
-hasLocation(#20087,#20044)
-enclosing_stmt(#20087,#20086)
-expr_containers(#20087,#20001)
-literals("foo?bar","'foo\ud800bar'",#20087)
+stmts(#20087,2,#20001,3,"'foo\ud800bar';")
+hasLocation(#20087,#20016)
+stmt_containers(#20087,#20001)
 #20088=*
-regexpterm(#20088,14,#20087,0,"foo?bar")
-#20089=@"loc,{#10000},5,2,5,13"
-locations_default(#20089,#10000,5,2,5,13)
-hasLocation(#20088,#20089)
-regexp_const_value(#20088,"foo?bar")
-#20090=*
-stmts(#20090,2,#20001,4,"/\uD800/;")
-hasLocation(#20090,#20018)
-stmt_containers(#20090,#20001)
+exprs(#20088,4,#20087,0,"'foo\ud800bar'")
+hasLocation(#20088,#20044)
+enclosing_stmt(#20088,#20087)
+expr_containers(#20088,#20001)
+literals("foo?bar","'foo\ud800bar'",#20088)
+#20089=*
+regexpterm(#20089,14,#20088,0,"foo?bar")
+#20090=@"loc,{#10000},5,2,5,13"
+locations_default(#20090,#10000,5,2,5,13)
+hasLocation(#20089,#20090)
+regexp_const_value(#20089,"foo?bar")
 #20091=*
-exprs(#20091,5,#20090,0,"/\uD800/")
-hasLocation(#20091,#20048)
-enclosing_stmt(#20091,#20090)
-expr_containers(#20091,#20001)
-literals("/\uD800/","/\uD800/",#20091)
+stmts(#20091,2,#20001,4,"/\uD800/;")
+hasLocation(#20091,#20018)
+stmt_containers(#20091,#20001)
 #20092=*
-regexpterm(#20092,16,#20091,0,"\uD800")
-#20093=@"loc,{#10000},6,2,6,7"
-locations_default(#20093,#10000,6,2,6,7)
-hasLocation(#20092,#20093)
-regexp_const_value(#20092,"?")
-#20094=*
-stmts(#20094,2,#20001,5,"/foo\ud800/;")
-hasLocation(#20094,#20020)
-stmt_containers(#20094,#20001)
+exprs(#20092,5,#20091,0,"/\uD800/")
+hasLocation(#20092,#20048)
+enclosing_stmt(#20092,#20091)
+expr_containers(#20092,#20001)
+literals("/\uD800/","/\uD800/",#20092)
+#20093=*
+regexpterm(#20093,16,#20092,0,"\uD800")
+#20094=@"loc,{#10000},6,2,6,7"
+locations_default(#20094,#10000,6,2,6,7)
+hasLocation(#20093,#20094)
+regexp_const_value(#20093,"?")
 #20095=*
-exprs(#20095,5,#20094,0,"/foo\ud800/")
-hasLocation(#20095,#20052)
-enclosing_stmt(#20095,#20094)
-expr_containers(#20095,#20001)
-literals("/foo\ud800/","/foo\ud800/",#20095)
+stmts(#20095,2,#20001,5,"/foo\ud800/;")
+hasLocation(#20095,#20020)
+stmt_containers(#20095,#20001)
 #20096=*
-regexpterm(#20096,1,#20095,0,"foo\ud800")
-#20097=@"loc,{#10000},7,2,7,10"
-locations_default(#20097,#10000,7,2,7,10)
-hasLocation(#20096,#20097)
-#20098=*
-regexpterm(#20098,14,#20096,0,"foo")
-#20099=@"loc,{#10000},7,2,7,4"
-locations_default(#20099,#10000,7,2,7,4)
-hasLocation(#20098,#20099)
-regexp_const_value(#20098,"foo")
-#20100=*
-regexpterm(#20100,16,#20096,1,"\ud800")
-#20101=@"loc,{#10000},7,5,7,10"
-locations_default(#20101,#10000,7,5,7,10)
-hasLocation(#20100,#20101)
-regexp_const_value(#20100,"?")
-#20102=*
-stmts(#20102,2,#20001,6,"/\ud800bar/;")
-hasLocation(#20102,#20022)
-stmt_containers(#20102,#20001)
+exprs(#20096,5,#20095,0,"/foo\ud800/")
+hasLocation(#20096,#20052)
+enclosing_stmt(#20096,#20095)
+expr_containers(#20096,#20001)
+literals("/foo\ud800/","/foo\ud800/",#20096)
+#20097=*
+regexpterm(#20097,1,#20096,0,"foo\ud800")
+#20098=@"loc,{#10000},7,2,7,10"
+locations_default(#20098,#10000,7,2,7,10)
+hasLocation(#20097,#20098)
+#20099=*
+regexpterm(#20099,14,#20097,0,"foo")
+#20100=@"loc,{#10000},7,2,7,4"
+locations_default(#20100,#10000,7,2,7,4)
+hasLocation(#20099,#20100)
+regexp_const_value(#20099,"foo")
+#20101=*
+regexpterm(#20101,16,#20097,1,"\ud800")
+#20102=@"loc,{#10000},7,5,7,10"
+locations_default(#20102,#10000,7,5,7,10)
+hasLocation(#20101,#20102)
+regexp_const_value(#20101,"?")
 #20103=*
-exprs(#20103,5,#20102,0,"/\ud800bar/")
-hasLocation(#20103,#20056)
-enclosing_stmt(#20103,#20102)
-expr_containers(#20103,#20001)
-literals("/\ud800bar/","/\ud800bar/",#20103)
+stmts(#20103,2,#20001,6,"/\ud800bar/;")
+hasLocation(#20103,#20022)
+stmt_containers(#20103,#20001)
 #20104=*
-regexpterm(#20104,1,#20103,0,"\ud800bar")
-#20105=@"loc,{#10000},8,2,8,10"
-locations_default(#20105,#10000,8,2,8,10)
-hasLocation(#20104,#20105)
-#20106=*
-regexpterm(#20106,16,#20104,0,"\ud800")
-#20107=@"loc,{#10000},8,2,8,7"
-locations_default(#20107,#10000,8,2,8,7)
-hasLocation(#20106,#20107)
-regexp_const_value(#20106,"?")
-#20108=*
-regexpterm(#20108,14,#20104,1,"bar")
-#20109=@"loc,{#10000},8,8,8,10"
-locations_default(#20109,#10000,8,8,8,10)
-hasLocation(#20108,#20109)
-regexp_const_value(#20108,"bar")
-#20110=*
-stmts(#20110,2,#20001,7,"/foo\ud800bar/;")
-hasLocation(#20110,#20024)
-stmt_containers(#20110,#20001)
+exprs(#20104,5,#20103,0,"/\ud800bar/")
+hasLocation(#20104,#20056)
+enclosing_stmt(#20104,#20103)
+expr_containers(#20104,#20001)
+literals("/\ud800bar/","/\ud800bar/",#20104)
+#20105=*
+regexpterm(#20105,1,#20104,0,"\ud800bar")
+#20106=@"loc,{#10000},8,2,8,10"
+locations_default(#20106,#10000,8,2,8,10)
+hasLocation(#20105,#20106)
+#20107=*
+regexpterm(#20107,16,#20105,0,"\ud800")
+#20108=@"loc,{#10000},8,2,8,7"
+locations_default(#20108,#10000,8,2,8,7)
+hasLocation(#20107,#20108)
+regexp_const_value(#20107,"?")
+#20109=*
+regexpterm(#20109,14,#20105,1,"bar")
+#20110=@"loc,{#10000},8,8,8,10"
+locations_default(#20110,#10000,8,8,8,10)
+hasLocation(#20109,#20110)
+regexp_const_value(#20109,"bar")
 #20111=*
-exprs(#20111,5,#20110,0,"/foo\ud800bar/")
-hasLocation(#20111,#20060)
-enclosing_stmt(#20111,#20110)
-expr_containers(#20111,#20001)
-literals("/foo\ud800bar/","/foo\ud800bar/",#20111)
+stmts(#20111,2,#20001,7,"/foo\ud800bar/;")
+hasLocation(#20111,#20024)
+stmt_containers(#20111,#20001)
 #20112=*
-regexpterm(#20112,1,#20111,0,"foo\ud800bar")
-#20113=@"loc,{#10000},9,2,9,13"
-locations_default(#20113,#10000,9,2,9,13)
-hasLocation(#20112,#20113)
-#20114=*
-regexpterm(#20114,14,#20112,0,"foo")
-#20115=@"loc,{#10000},9,2,9,4"
-locations_default(#20115,#10000,9,2,9,4)
-hasLocation(#20114,#20115)
-regexp_const_value(#20114,"foo")
-#20116=*
-regexpterm(#20116,16,#20112,1,"\ud800")
-#20117=@"loc,{#10000},9,5,9,10"
-locations_default(#20117,#10000,9,5,9,10)
-hasLocation(#20116,#20117)
-regexp_const_value(#20116,"?")
-#20118=*
-regexpterm(#20118,14,#20112,2,"bar")
-#20119=@"loc,{#10000},9,11,9,13"
-locations_default(#20119,#10000,9,11,9,13)
-hasLocation(#20118,#20119)
-regexp_const_value(#20118,"bar")
-#20120=*
-stmts(#20120,2,#20001,8,"'\udc00\ud800';")
-hasLocation(#20120,#20027)
-stmt_containers(#20120,#20001)
+exprs(#20112,5,#20111,0,"/foo\ud800bar/")
+hasLocation(#20112,#20060)
+enclosing_stmt(#20112,#20111)
+expr_containers(#20112,#20001)
+literals("/foo\ud800bar/","/foo\ud800bar/",#20112)
+#20113=*
+regexpterm(#20113,1,#20112,0,"foo\ud800bar")
+#20114=@"loc,{#10000},9,2,9,13"
+locations_default(#20114,#10000,9,2,9,13)
+hasLocation(#20113,#20114)
+#20115=*
+regexpterm(#20115,14,#20113,0,"foo")
+#20116=@"loc,{#10000},9,2,9,4"
+locations_default(#20116,#10000,9,2,9,4)
+hasLocation(#20115,#20116)
+regexp_const_value(#20115,"foo")
+#20117=*
+regexpterm(#20117,16,#20113,1,"\ud800")
+#20118=@"loc,{#10000},9,5,9,10"
+locations_default(#20118,#10000,9,5,9,10)
+hasLocation(#20117,#20118)
+regexp_const_value(#20117,"?")
+#20119=*
+regexpterm(#20119,14,#20113,2,"bar")
+#20120=@"loc,{#10000},9,11,9,13"
+locations_default(#20120,#10000,9,11,9,13)
+hasLocation(#20119,#20120)
+regexp_const_value(#20119,"bar")
 #20121=*
-exprs(#20121,4,#20120,0,"'\udc00\ud800'")
-hasLocation(#20121,#20064)
-enclosing_stmt(#20121,#20120)
-expr_containers(#20121,#20001)
-literals("??","'\udc00\ud800'",#20121)
+stmts(#20121,2,#20001,8,"'\udc00\ud800';")
+hasLocation(#20121,#20027)
+stmt_containers(#20121,#20001)
 #20122=*
-regexpterm(#20122,14,#20121,0,"??")
-#20123=@"loc,{#10000},11,2,11,13"
-locations_default(#20123,#10000,11,2,11,13)
-hasLocation(#20122,#20123)
-regexp_const_value(#20122,"??")
-#20124=*
-stmts(#20124,2,#20001,9,"'\uD834\uDF06';")
-hasLocation(#20124,#20030)
-stmt_containers(#20124,#20001)
+exprs(#20122,4,#20121,0,"'\udc00\ud800'")
+hasLocation(#20122,#20064)
+enclosing_stmt(#20122,#20121)
+expr_containers(#20122,#20001)
+literals("??","'\udc00\ud800'",#20122)
+#20123=*
+regexpterm(#20123,14,#20122,0,"??")
+#20124=@"loc,{#10000},11,2,11,13"
+locations_default(#20124,#10000,11,2,11,13)
+hasLocation(#20123,#20124)
+regexp_const_value(#20123,"??")
 #20125=*
-exprs(#20125,4,#20124,0,"'\uD834\uDF06'")
-hasLocation(#20125,#20068)
-enclosing_stmt(#20125,#20124)
-expr_containers(#20125,#20001)
-literals("𝌆","'\uD834\uDF06'",#20125)
+stmts(#20125,2,#20001,9,"'\uD834\uDF06';")
+hasLocation(#20125,#20030)
+stmt_containers(#20125,#20001)
 #20126=*
-regexpterm(#20126,14,#20125,0,"𝌆")
-#20127=@"loc,{#10000},13,2,13,13"
-locations_default(#20127,#10000,13,2,13,13)
-hasLocation(#20126,#20127)
-regexp_const_value(#20126,"𝌆")
-#20128=*
-entry_cfg_node(#20128,#20001)
-#20129=@"loc,{#10000},1,1,1,0"
-locations_default(#20129,#10000,1,1,1,0)
-hasLocation(#20128,#20129)
-#20130=*
-exit_cfg_node(#20130,#20001)
-hasLocation(#20130,#20072)
-successor(#20124,#20125)
-successor(#20125,#20130)
-successor(#20120,#20121)
-successor(#20121,#20124)
-successor(#20110,#20111)
-successor(#20111,#20120)
-successor(#20102,#20103)
-successor(#20103,#20110)
-successor(#20094,#20095)
-successor(#20095,#20102)
-successor(#20090,#20091)
-successor(#20091,#20094)
-successor(#20086,#20087)
-successor(#20087,#20090)
-successor(#20082,#20083)
-successor(#20083,#20086)
-successor(#20078,#20079)
-successor(#20079,#20082)
-successor(#20074,#20075)
-successor(#20075,#20078)
-successor(#20128,#20074)
+exprs(#20126,4,#20125,0,"'\uD834\uDF06'")
+hasLocation(#20126,#20068)
+enclosing_stmt(#20126,#20125)
+expr_containers(#20126,#20001)
+literals("𝌆","'\uD834\uDF06'",#20126)
+#20127=*
+regexpterm(#20127,14,#20126,0,"𝌆")
+#20128=@"loc,{#10000},13,2,13,13"
+locations_default(#20128,#10000,13,2,13,13)
+hasLocation(#20127,#20128)
+regexp_const_value(#20127,"𝌆")
+#20129=*
+entry_cfg_node(#20129,#20001)
+#20130=@"loc,{#10000},1,1,1,0"
+locations_default(#20130,#10000,1,1,1,0)
+hasLocation(#20129,#20130)
+#20131=*
+exit_cfg_node(#20131,#20001)
+hasLocation(#20131,#20072)
+successor(#20125,#20126)
+successor(#20126,#20131)
+successor(#20121,#20122)
+successor(#20122,#20125)
+successor(#20111,#20112)
+successor(#20112,#20121)
+successor(#20103,#20104)
+successor(#20104,#20111)
+successor(#20095,#20096)
+successor(#20096,#20103)
+successor(#20091,#20092)
+successor(#20092,#20095)
+successor(#20087,#20088)
+successor(#20088,#20091)
+successor(#20083,#20084)
+successor(#20084,#20087)
+successor(#20079,#20080)
+successor(#20080,#20083)
+successor(#20075,#20076)
+successor(#20076,#20079)
+successor(#20129,#20075)
 numlines(#10000,13,10,3)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/encoding/output/trap/unicode.js.trap b/javascript/extractor/tests/encoding/output/trap/unicode.js.trap
index e30e1de8143..5b7a899292f 100644
--- a/javascript/extractor/tests/encoding/output/trap/unicode.js.trap
+++ b/javascript/extractor/tests/encoding/output/trap/unicode.js.trap
@@ -25,32 +25,34 @@ locations_default(#20006,#10000,1,9,1,8)
 hasLocation(#20005,#20006)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20007=*
-stmts(#20007,2,#20001,0,"""Semml\u00e9""")
-hasLocation(#20007,#20003)
-stmt_containers(#20007,#20001)
+#20007=@"var;{this};{#20000}"
+variables(#20007,"this",#20000)
 #20008=*
-exprs(#20008,4,#20007,0,"""Semml\u00e9""")
+stmts(#20008,2,#20001,0,"""Semml\u00e9""")
 hasLocation(#20008,#20003)
-enclosing_stmt(#20008,#20007)
-expr_containers(#20008,#20001)
-literals("Semmlé","""Semmlé""",#20008)
+stmt_containers(#20008,#20001)
 #20009=*
-regexpterm(#20009,14,#20008,0,"Semmlé")
-#20010=@"loc,{#10000},1,2,1,7"
-locations_default(#20010,#10000,1,2,1,7)
-hasLocation(#20009,#20010)
-regexp_const_value(#20009,"Semmlé")
-#20011=*
-entry_cfg_node(#20011,#20001)
-#20012=@"loc,{#10000},1,1,1,0"
-locations_default(#20012,#10000,1,1,1,0)
-hasLocation(#20011,#20012)
-#20013=*
-exit_cfg_node(#20013,#20001)
-hasLocation(#20013,#20006)
-successor(#20007,#20008)
-successor(#20008,#20013)
-successor(#20011,#20007)
+exprs(#20009,4,#20008,0,"""Semml\u00e9""")
+hasLocation(#20009,#20003)
+enclosing_stmt(#20009,#20008)
+expr_containers(#20009,#20001)
+literals("Semmlé","""Semmlé""",#20009)
+#20010=*
+regexpterm(#20010,14,#20009,0,"Semmlé")
+#20011=@"loc,{#10000},1,2,1,7"
+locations_default(#20011,#10000,1,2,1,7)
+hasLocation(#20010,#20011)
+regexp_const_value(#20010,"Semmlé")
+#20012=*
+entry_cfg_node(#20012,#20001)
+#20013=@"loc,{#10000},1,1,1,0"
+locations_default(#20013,#10000,1,1,1,0)
+hasLocation(#20012,#20013)
+#20014=*
+exit_cfg_node(#20014,#20001)
+hasLocation(#20014,#20006)
+successor(#20008,#20009)
+successor(#20009,#20014)
+successor(#20012,#20008)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/errors/output/trap/empty.js.trap b/javascript/extractor/tests/errors/output/trap/empty.js.trap
index c686cd023f4..4c1e2f4c67e 100644
--- a/javascript/extractor/tests/errors/output/trap/empty.js.trap
+++ b/javascript/extractor/tests/errors/output/trap/empty.js.trap
@@ -17,12 +17,14 @@ locations_default(#20003,#10000,1,1,1,0)
 hasLocation(#20002,#20003)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20004=*
-entry_cfg_node(#20004,#20001)
-hasLocation(#20004,#20003)
+#20004=@"var;{this};{#20000}"
+variables(#20004,"this",#20000)
 #20005=*
-exit_cfg_node(#20005,#20001)
+entry_cfg_node(#20005,#20001)
 hasLocation(#20005,#20003)
-successor(#20004,#20005)
+#20006=*
+exit_cfg_node(#20006,#20001)
+hasLocation(#20006,#20003)
+successor(#20005,#20006)
 numlines(#10000,0,0,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/errors/output/trap/invalid-assignment-pattern.js.trap b/javascript/extractor/tests/errors/output/trap/invalid-assignment-pattern.js.trap
index 108c822691b..bb694ccaa39 100644
--- a/javascript/extractor/tests/errors/output/trap/invalid-assignment-pattern.js.trap
+++ b/javascript/extractor/tests/errors/output/trap/invalid-assignment-pattern.js.trap
@@ -60,58 +60,60 @@ toplevels(#20001,0)
 #20020=@"loc,{#10000},1,1,2,0"
 locations_default(#20020,#10000,1,1,2,0)
 hasLocation(#20001,#20020)
-#20021=*
-stmts(#20021,2,#20001,0,"(x = 0) = y")
-hasLocation(#20021,#20003)
-stmt_containers(#20021,#20001)
+#20021=@"var;{this};{#20000}"
+variables(#20021,"this",#20000)
 #20022=*
-exprs(#20022,47,#20021,0,"(x = 0) = y")
+stmts(#20022,2,#20001,0,"(x = 0) = y")
 hasLocation(#20022,#20003)
-enclosing_stmt(#20022,#20021)
-expr_containers(#20022,#20001)
+stmt_containers(#20022,#20001)
 #20023=*
-exprs(#20023,63,#20022,0,"(x = 0)")
-#20024=@"loc,{#10000},1,1,1,7"
-locations_default(#20024,#10000,1,1,1,7)
-hasLocation(#20023,#20024)
-enclosing_stmt(#20023,#20021)
+exprs(#20023,47,#20022,0,"(x = 0) = y")
+hasLocation(#20023,#20003)
+enclosing_stmt(#20023,#20022)
 expr_containers(#20023,#20001)
-#20025=*
-exprs(#20025,79,#20023,0,"x")
-hasLocation(#20025,#20007)
-enclosing_stmt(#20025,#20021)
-expr_containers(#20025,#20001)
+#20024=*
+exprs(#20024,63,#20023,0,"(x = 0)")
+#20025=@"loc,{#10000},1,1,1,7"
+locations_default(#20025,#10000,1,1,1,7)
+hasLocation(#20024,#20025)
+enclosing_stmt(#20024,#20022)
+expr_containers(#20024,#20001)
 #20026=*
-exprs(#20026,79,#20022,1,"y")
-hasLocation(#20026,#20017)
-enclosing_stmt(#20026,#20021)
+exprs(#20026,79,#20024,0,"x")
+hasLocation(#20026,#20007)
+enclosing_stmt(#20026,#20022)
 expr_containers(#20026,#20001)
-literals("y","y",#20026)
-#20027=@"var;{y};{#20000}"
-variables(#20027,"y",#20000)
-bind(#20026,#20027)
-#20028=*
-entry_cfg_node(#20028,#20001)
-#20029=@"loc,{#10000},1,1,1,0"
-locations_default(#20029,#10000,1,1,1,0)
-hasLocation(#20028,#20029)
-#20030=*
-exit_cfg_node(#20030,#20001)
-hasLocation(#20030,#20019)
-successor(#20021,#20023)
-successor(#20026,#20022)
-successor(#20023,#20025)
-successor(#20025,#20026)
-successor(#20022,#20030)
-successor(#20028,#20021)
+#20027=*
+exprs(#20027,79,#20023,1,"y")
+hasLocation(#20027,#20017)
+enclosing_stmt(#20027,#20022)
+expr_containers(#20027,#20001)
+literals("y","y",#20027)
+#20028=@"var;{y};{#20000}"
+variables(#20028,"y",#20000)
+bind(#20027,#20028)
+#20029=*
+entry_cfg_node(#20029,#20001)
+#20030=@"loc,{#10000},1,1,1,0"
+locations_default(#20030,#10000,1,1,1,0)
+hasLocation(#20029,#20030)
 #20031=*
-js_parse_errors(#20031,#20001,"Error: Unexpected assignment pattern.","(x = 0) = y
-")
-hasLocation(#20031,#20007)
+exit_cfg_node(#20031,#20001)
+hasLocation(#20031,#20019)
+successor(#20022,#20024)
+successor(#20027,#20023)
+successor(#20024,#20026)
+successor(#20026,#20027)
+successor(#20023,#20031)
+successor(#20029,#20022)
 #20032=*
-lines(#20032,#20001,"(x = 0) = y","
+js_parse_errors(#20032,#20001,"Error: Unexpected assignment pattern.","(x = 0) = y
 ")
-hasLocation(#20032,#20003)
+hasLocation(#20032,#20007)
+#20033=*
+lines(#20033,#20001,"(x = 0) = y","
+")
+hasLocation(#20033,#20003)
 numlines(#20001,1,0,0)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/errors/output/trap/kwident.js.trap b/javascript/extractor/tests/errors/output/trap/kwident.js.trap
index 10b0e9ec392..2c47cf391c5 100644
--- a/javascript/extractor/tests/errors/output/trap/kwident.js.trap
+++ b/javascript/extractor/tests/errors/output/trap/kwident.js.trap
@@ -52,53 +52,55 @@ locations_default(#20016,#10000,1,1,2,0)
 hasLocation(#20001,#20016)
 #20017=@"var;{class};{#20000}"
 variables(#20017,"class",#20000)
-#20018=*
-stmts(#20018,18,#20001,0,"var class = 23;")
-hasLocation(#20018,#20003)
-stmt_containers(#20018,#20001)
+#20018=@"var;{this};{#20000}"
+variables(#20018,"this",#20000)
 #20019=*
-exprs(#20019,64,#20018,0,"class = 23")
-#20020=@"loc,{#10000},1,5,1,14"
-locations_default(#20020,#10000,1,5,1,14)
-hasLocation(#20019,#20020)
-enclosing_stmt(#20019,#20018)
-expr_containers(#20019,#20001)
-#20021=*
-exprs(#20021,78,#20019,0,"class")
-hasLocation(#20021,#20007)
-enclosing_stmt(#20021,#20018)
-expr_containers(#20021,#20001)
-literals("class","class",#20021)
-decl(#20021,#20017)
+stmts(#20019,18,#20001,0,"var class = 23;")
+hasLocation(#20019,#20003)
+stmt_containers(#20019,#20001)
+#20020=*
+exprs(#20020,64,#20019,0,"class = 23")
+#20021=@"loc,{#10000},1,5,1,14"
+locations_default(#20021,#10000,1,5,1,14)
+hasLocation(#20020,#20021)
+enclosing_stmt(#20020,#20019)
+expr_containers(#20020,#20001)
 #20022=*
-exprs(#20022,3,#20019,1,"23")
-hasLocation(#20022,#20011)
-enclosing_stmt(#20022,#20018)
+exprs(#20022,78,#20020,0,"class")
+hasLocation(#20022,#20007)
+enclosing_stmt(#20022,#20019)
 expr_containers(#20022,#20001)
-literals("23","23",#20022)
+literals("class","class",#20022)
+decl(#20022,#20017)
 #20023=*
-entry_cfg_node(#20023,#20001)
-#20024=@"loc,{#10000},1,1,1,0"
-locations_default(#20024,#10000,1,1,1,0)
-hasLocation(#20023,#20024)
-#20025=*
-exit_cfg_node(#20025,#20001)
-hasLocation(#20025,#20015)
-successor(#20018,#20021)
-successor(#20022,#20019)
-successor(#20021,#20022)
-successor(#20019,#20025)
-successor(#20023,#20018)
+exprs(#20023,3,#20020,1,"23")
+hasLocation(#20023,#20011)
+enclosing_stmt(#20023,#20019)
+expr_containers(#20023,#20001)
+literals("23","23",#20023)
+#20024=*
+entry_cfg_node(#20024,#20001)
+#20025=@"loc,{#10000},1,1,1,0"
+locations_default(#20025,#10000,1,1,1,0)
+hasLocation(#20024,#20025)
 #20026=*
-js_parse_errors(#20026,#20001,"Error: Cannot use keyword 'class' as an identifier.","var class = 23;
+exit_cfg_node(#20026,#20001)
+hasLocation(#20026,#20015)
+successor(#20019,#20022)
+successor(#20023,#20020)
+successor(#20022,#20023)
+successor(#20020,#20026)
+successor(#20024,#20019)
+#20027=*
+js_parse_errors(#20027,#20001,"Error: Cannot use keyword 'class' as an identifier.","var class = 23;
 ")
-#20027=@"loc,{#10000},1,5,1,5"
-locations_default(#20027,#10000,1,5,1,5)
-hasLocation(#20026,#20027)
-#20028=*
-lines(#20028,#20001,"var class = 23;","
+#20028=@"loc,{#10000},1,5,1,5"
+locations_default(#20028,#10000,1,5,1,5)
+hasLocation(#20027,#20028)
+#20029=*
+lines(#20029,#20001,"var class = 23;","
 ")
-hasLocation(#20028,#20003)
+hasLocation(#20029,#20003)
 numlines(#20001,1,0,0)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/array_pattern_with_default.js.trap b/javascript/extractor/tests/es2015/output/trap/array_pattern_with_default.js.trap
index 2351f1fa347..6ac6726eb91 100644
--- a/javascript/extractor/tests/es2015/output/trap/array_pattern_with_default.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/array_pattern_with_default.js.trap
@@ -67,62 +67,64 @@ locations_default(#20023,#10000,1,13,1,12)
 hasLocation(#20022,#20023)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20024=*
-stmts(#20024,2,#20001,0,"[x=42] = [];")
-hasLocation(#20024,#20003)
-stmt_containers(#20024,#20001)
+#20024=@"var;{this};{#20000}"
+variables(#20024,"this",#20000)
 #20025=*
-exprs(#20025,47,#20024,0,"[x=42] = []")
-#20026=@"loc,{#10000},1,1,1,11"
-locations_default(#20026,#10000,1,1,1,11)
-hasLocation(#20025,#20026)
-enclosing_stmt(#20025,#20024)
-expr_containers(#20025,#20001)
-#20027=*
-exprs(#20027,67,#20025,0,"[x=42]")
-#20028=@"loc,{#10000},1,1,1,6"
-locations_default(#20028,#10000,1,1,1,6)
-hasLocation(#20027,#20028)
-enclosing_stmt(#20027,#20024)
-expr_containers(#20027,#20001)
-#20029=*
-exprs(#20029,79,#20027,0,"x")
-hasLocation(#20029,#20007)
-enclosing_stmt(#20029,#20024)
-expr_containers(#20029,#20001)
-literals("x","x",#20029)
-#20030=@"var;{x};{#20000}"
-variables(#20030,"x",#20000)
-bind(#20029,#20030)
-#20031=*
-exprs(#20031,3,#20027,-2,"42")
-hasLocation(#20031,#20011)
-enclosing_stmt(#20031,#20024)
-expr_containers(#20031,#20001)
-literals("42","42",#20031)
-array_size(#20027,1)
+stmts(#20025,2,#20001,0,"[x=42] = [];")
+hasLocation(#20025,#20003)
+stmt_containers(#20025,#20001)
+#20026=*
+exprs(#20026,47,#20025,0,"[x=42] = []")
+#20027=@"loc,{#10000},1,1,1,11"
+locations_default(#20027,#10000,1,1,1,11)
+hasLocation(#20026,#20027)
+enclosing_stmt(#20026,#20025)
+expr_containers(#20026,#20001)
+#20028=*
+exprs(#20028,67,#20026,0,"[x=42]")
+#20029=@"loc,{#10000},1,1,1,6"
+locations_default(#20029,#10000,1,1,1,6)
+hasLocation(#20028,#20029)
+enclosing_stmt(#20028,#20025)
+expr_containers(#20028,#20001)
+#20030=*
+exprs(#20030,79,#20028,0,"x")
+hasLocation(#20030,#20007)
+enclosing_stmt(#20030,#20025)
+expr_containers(#20030,#20001)
+literals("x","x",#20030)
+#20031=@"var;{x};{#20000}"
+variables(#20031,"x",#20000)
+bind(#20030,#20031)
 #20032=*
-exprs(#20032,7,#20025,1,"[]")
-#20033=@"loc,{#10000},1,10,1,11"
-locations_default(#20033,#10000,1,10,1,11)
-hasLocation(#20032,#20033)
-enclosing_stmt(#20032,#20024)
+exprs(#20032,3,#20028,-2,"42")
+hasLocation(#20032,#20011)
+enclosing_stmt(#20032,#20025)
 expr_containers(#20032,#20001)
-array_size(#20032,0)
-#20034=*
-entry_cfg_node(#20034,#20001)
-#20035=@"loc,{#10000},1,1,1,0"
-locations_default(#20035,#10000,1,1,1,0)
-hasLocation(#20034,#20035)
-#20036=*
-exit_cfg_node(#20036,#20001)
-hasLocation(#20036,#20023)
-successor(#20024,#20032)
-successor(#20027,#20031)
-successor(#20029,#20025)
-successor(#20031,#20029)
-successor(#20032,#20027)
-successor(#20025,#20036)
-successor(#20034,#20024)
+literals("42","42",#20032)
+array_size(#20028,1)
+#20033=*
+exprs(#20033,7,#20026,1,"[]")
+#20034=@"loc,{#10000},1,10,1,11"
+locations_default(#20034,#10000,1,10,1,11)
+hasLocation(#20033,#20034)
+enclosing_stmt(#20033,#20025)
+expr_containers(#20033,#20001)
+array_size(#20033,0)
+#20035=*
+entry_cfg_node(#20035,#20001)
+#20036=@"loc,{#10000},1,1,1,0"
+locations_default(#20036,#10000,1,1,1,0)
+hasLocation(#20035,#20036)
+#20037=*
+exit_cfg_node(#20037,#20001)
+hasLocation(#20037,#20023)
+successor(#20025,#20033)
+successor(#20028,#20032)
+successor(#20030,#20026)
+successor(#20032,#20030)
+successor(#20033,#20028)
+successor(#20026,#20037)
+successor(#20035,#20025)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/array_pattern_with_rest.js.trap b/javascript/extractor/tests/es2015/output/trap/array_pattern_with_rest.js.trap
index 9e5cd43ed62..b2c2e594e45 100644
--- a/javascript/extractor/tests/es2015/output/trap/array_pattern_with_rest.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/array_pattern_with_rest.js.trap
@@ -139,113 +139,117 @@ locations_default(#20049,#10000,1,1,4,1)
 hasLocation(#20001,#20049)
 #20050=@"var;{cdr};{#20000}"
 variables(#20050,"cdr",#20000)
-#20051=*
-stmts(#20051,17,#20001,0,"functio ... n ys;\n}")
-hasLocation(#20051,#20049)
-stmt_containers(#20051,#20001)
+#20051=@"var;{this};{#20000}"
+variables(#20051,"this",#20000)
 #20052=*
-exprs(#20052,78,#20051,-1,"cdr")
-hasLocation(#20052,#20013)
-expr_containers(#20052,#20051)
-literals("cdr","cdr",#20052)
-decl(#20052,#20050)
+stmts(#20052,17,#20001,0,"functio ... n ys;\n}")
+hasLocation(#20052,#20049)
+stmt_containers(#20052,#20001)
 #20053=*
-scopes(#20053,1)
-scopenodes(#20051,#20053)
-scopenesting(#20053,#20000)
-#20054=@"var;{ys};{#20053}"
-variables(#20054,"ys",#20053)
-#20055=@"var;{o};{#20053}"
-variables(#20055,"o",#20053)
-#20056=*
-exprs(#20056,78,#20051,0,"o")
-hasLocation(#20056,#20017)
-expr_containers(#20056,#20051)
-literals("o","o",#20056)
-decl(#20056,#20055)
-#20057=@"var;{arguments};{#20053}"
-variables(#20057,"arguments",#20053)
-is_arguments_object(#20057)
+exprs(#20053,78,#20052,-1,"cdr")
+hasLocation(#20053,#20013)
+expr_containers(#20053,#20052)
+literals("cdr","cdr",#20053)
+decl(#20053,#20050)
+#20054=*
+scopes(#20054,1)
+scopenodes(#20052,#20054)
+scopenesting(#20054,#20000)
+#20055=@"var;{ys};{#20054}"
+variables(#20055,"ys",#20054)
+#20056=@"var;{this};{#20054}"
+variables(#20056,"this",#20054)
+#20057=@"var;{o};{#20054}"
+variables(#20057,"o",#20054)
 #20058=*
-stmts(#20058,1,#20051,-2,"{\n  var ... n ys;\n}")
-#20059=@"loc,{#10000},1,17,4,1"
-locations_default(#20059,#10000,1,17,4,1)
-hasLocation(#20058,#20059)
-stmt_containers(#20058,#20051)
+exprs(#20058,78,#20052,0,"o")
+hasLocation(#20058,#20017)
+expr_containers(#20058,#20052)
+literals("o","o",#20058)
+decl(#20058,#20057)
+#20059=@"var;{arguments};{#20054}"
+variables(#20059,"arguments",#20054)
+is_arguments_object(#20059)
 #20060=*
-stmts(#20060,18,#20058,0,"var [, ...ys] = o;")
-#20061=@"loc,{#10000},2,3,2,20"
-locations_default(#20061,#10000,2,3,2,20)
+stmts(#20060,1,#20052,-2,"{\n  var ... n ys;\n}")
+#20061=@"loc,{#10000},1,17,4,1"
+locations_default(#20061,#10000,1,17,4,1)
 hasLocation(#20060,#20061)
-stmt_containers(#20060,#20051)
+stmt_containers(#20060,#20052)
 #20062=*
-exprs(#20062,64,#20060,0,"[, ...ys] = o")
-#20063=@"loc,{#10000},2,7,2,19"
-locations_default(#20063,#10000,2,7,2,19)
+stmts(#20062,18,#20060,0,"var [, ...ys] = o;")
+#20063=@"loc,{#10000},2,3,2,20"
+locations_default(#20063,#10000,2,3,2,20)
 hasLocation(#20062,#20063)
-enclosing_stmt(#20062,#20060)
-expr_containers(#20062,#20051)
+stmt_containers(#20062,#20052)
 #20064=*
-exprs(#20064,67,#20062,0,"[, ...ys]")
-#20065=@"loc,{#10000},2,7,2,15"
-locations_default(#20065,#10000,2,7,2,15)
+exprs(#20064,64,#20062,0,"[, ...ys] = o")
+#20065=@"loc,{#10000},2,7,2,19"
+locations_default(#20065,#10000,2,7,2,19)
 hasLocation(#20064,#20065)
-enclosing_stmt(#20064,#20060)
-expr_containers(#20064,#20051)
+enclosing_stmt(#20064,#20062)
+expr_containers(#20064,#20052)
 #20066=*
-exprs(#20066,78,#20064,-1,"ys")
-hasLocation(#20066,#20031)
-enclosing_stmt(#20066,#20060)
-expr_containers(#20066,#20051)
-literals("ys","ys",#20066)
-decl(#20066,#20054)
-array_size(#20064,1)
-#20067=*
-exprs(#20067,79,#20062,1,"o")
-hasLocation(#20067,#20037)
-enclosing_stmt(#20067,#20060)
-expr_containers(#20067,#20051)
-literals("o","o",#20067)
-bind(#20067,#20055)
+exprs(#20066,67,#20064,0,"[, ...ys]")
+#20067=@"loc,{#10000},2,7,2,15"
+locations_default(#20067,#10000,2,7,2,15)
+hasLocation(#20066,#20067)
+enclosing_stmt(#20066,#20062)
+expr_containers(#20066,#20052)
 #20068=*
-stmts(#20068,9,#20058,1,"return ys;")
-#20069=@"loc,{#10000},3,3,3,12"
-locations_default(#20069,#10000,3,3,3,12)
-hasLocation(#20068,#20069)
-stmt_containers(#20068,#20051)
+exprs(#20068,78,#20066,-1,"ys")
+hasLocation(#20068,#20031)
+enclosing_stmt(#20068,#20062)
+expr_containers(#20068,#20052)
+literals("ys","ys",#20068)
+decl(#20068,#20055)
+array_size(#20066,1)
+#20069=*
+exprs(#20069,79,#20064,1,"o")
+hasLocation(#20069,#20037)
+enclosing_stmt(#20069,#20062)
+expr_containers(#20069,#20052)
+literals("o","o",#20069)
+bind(#20069,#20057)
 #20070=*
-exprs(#20070,79,#20068,0,"ys")
-hasLocation(#20070,#20043)
-enclosing_stmt(#20070,#20068)
-expr_containers(#20070,#20051)
-literals("ys","ys",#20070)
-bind(#20070,#20054)
-#20071=*
-entry_cfg_node(#20071,#20001)
-#20072=@"loc,{#10000},1,1,1,0"
-locations_default(#20072,#10000,1,1,1,0)
-hasLocation(#20071,#20072)
+stmts(#20070,9,#20060,1,"return ys;")
+#20071=@"loc,{#10000},3,3,3,12"
+locations_default(#20071,#10000,3,3,3,12)
+hasLocation(#20070,#20071)
+stmt_containers(#20070,#20052)
+#20072=*
+exprs(#20072,79,#20070,0,"ys")
+hasLocation(#20072,#20043)
+enclosing_stmt(#20072,#20070)
+expr_containers(#20072,#20052)
+literals("ys","ys",#20072)
+bind(#20072,#20055)
 #20073=*
-exit_cfg_node(#20073,#20001)
-hasLocation(#20073,#20048)
-successor(#20051,#20073)
-#20074=*
-entry_cfg_node(#20074,#20051)
-hasLocation(#20074,#20072)
+entry_cfg_node(#20073,#20001)
+#20074=@"loc,{#10000},1,1,1,0"
+locations_default(#20074,#10000,1,1,1,0)
+hasLocation(#20073,#20074)
 #20075=*
-exit_cfg_node(#20075,#20051)
+exit_cfg_node(#20075,#20001)
 hasLocation(#20075,#20048)
-successor(#20070,#20068)
-successor(#20068,#20075)
-successor(#20060,#20067)
-successor(#20064,#20066)
-successor(#20066,#20062)
-successor(#20067,#20064)
-successor(#20062,#20070)
+successor(#20052,#20075)
+#20076=*
+entry_cfg_node(#20076,#20052)
+hasLocation(#20076,#20074)
+#20077=*
+exit_cfg_node(#20077,#20052)
+hasLocation(#20077,#20048)
+successor(#20072,#20070)
+successor(#20070,#20077)
+successor(#20062,#20069)
+successor(#20066,#20068)
+successor(#20068,#20064)
+successor(#20069,#20066)
+successor(#20064,#20072)
+successor(#20060,#20062)
 successor(#20058,#20060)
-successor(#20056,#20058)
-successor(#20074,#20056)
-successor(#20052,#20051)
-successor(#20071,#20052)
+successor(#20076,#20058)
+successor(#20053,#20052)
+successor(#20073,#20053)
 numlines(#10000,4,4,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/arrowfn.js.trap b/javascript/extractor/tests/es2015/output/trap/arrowfn.js.trap
index 1092dc9c31f..35591391909 100644
--- a/javascript/extractor/tests/es2015/output/trap/arrowfn.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/arrowfn.js.trap
@@ -256,309 +256,311 @@ toplevels(#20001,0)
 #20098=@"loc,{#10000},1,1,3,48"
 locations_default(#20098,#10000,1,1,3,48)
 hasLocation(#20001,#20098)
-#20099=*
-stmts(#20099,2,#20001,0,"[""a"", "" ... ength);")
-hasLocation(#20099,#20003)
-stmt_containers(#20099,#20001)
+#20099=@"var;{this};{#20000}"
+variables(#20099,"this",#20000)
 #20100=*
-exprs(#20100,13,#20099,0,"[""a"", "" ... length)")
-#20101=@"loc,{#10000},1,1,1,37"
-locations_default(#20101,#10000,1,1,1,37)
-hasLocation(#20100,#20101)
-enclosing_stmt(#20100,#20099)
-expr_containers(#20100,#20001)
-#20102=*
-exprs(#20102,14,#20100,-1,"[""a"", "" ... c""].map")
-#20103=@"loc,{#10000},1,1,1,22"
-locations_default(#20103,#10000,1,1,1,22)
-hasLocation(#20102,#20103)
-enclosing_stmt(#20102,#20099)
-expr_containers(#20102,#20001)
-#20104=*
-exprs(#20104,7,#20102,0,"[""a"", ""ab"", ""abc""]")
-#20105=@"loc,{#10000},1,1,1,18"
-locations_default(#20105,#10000,1,1,1,18)
-hasLocation(#20104,#20105)
-enclosing_stmt(#20104,#20099)
-expr_containers(#20104,#20001)
-#20106=*
-exprs(#20106,4,#20104,0,"""a""")
-hasLocation(#20106,#20011)
-enclosing_stmt(#20106,#20099)
-expr_containers(#20106,#20001)
-literals("a","""a""",#20106)
+stmts(#20100,2,#20001,0,"[""a"", "" ... ength);")
+hasLocation(#20100,#20003)
+stmt_containers(#20100,#20001)
+#20101=*
+exprs(#20101,13,#20100,0,"[""a"", "" ... length)")
+#20102=@"loc,{#10000},1,1,1,37"
+locations_default(#20102,#10000,1,1,1,37)
+hasLocation(#20101,#20102)
+enclosing_stmt(#20101,#20100)
+expr_containers(#20101,#20001)
+#20103=*
+exprs(#20103,14,#20101,-1,"[""a"", "" ... c""].map")
+#20104=@"loc,{#10000},1,1,1,22"
+locations_default(#20104,#10000,1,1,1,22)
+hasLocation(#20103,#20104)
+enclosing_stmt(#20103,#20100)
+expr_containers(#20103,#20001)
+#20105=*
+exprs(#20105,7,#20103,0,"[""a"", ""ab"", ""abc""]")
+#20106=@"loc,{#10000},1,1,1,18"
+locations_default(#20106,#10000,1,1,1,18)
+hasLocation(#20105,#20106)
+enclosing_stmt(#20105,#20100)
+expr_containers(#20105,#20001)
 #20107=*
-regexpterm(#20107,14,#20106,0,"a")
-#20108=@"loc,{#10000},1,3,1,3"
-locations_default(#20108,#10000,1,3,1,3)
-hasLocation(#20107,#20108)
-regexp_const_value(#20107,"a")
-#20109=*
-exprs(#20109,4,#20104,1,"""ab""")
-hasLocation(#20109,#20015)
-enclosing_stmt(#20109,#20099)
-expr_containers(#20109,#20001)
-literals("ab","""ab""",#20109)
+exprs(#20107,4,#20105,0,"""a""")
+hasLocation(#20107,#20011)
+enclosing_stmt(#20107,#20100)
+expr_containers(#20107,#20001)
+literals("a","""a""",#20107)
+#20108=*
+regexpterm(#20108,14,#20107,0,"a")
+#20109=@"loc,{#10000},1,3,1,3"
+locations_default(#20109,#10000,1,3,1,3)
+hasLocation(#20108,#20109)
+regexp_const_value(#20108,"a")
 #20110=*
-regexpterm(#20110,14,#20109,0,"ab")
-#20111=@"loc,{#10000},1,8,1,9"
-locations_default(#20111,#10000,1,8,1,9)
-hasLocation(#20110,#20111)
-regexp_const_value(#20110,"ab")
-#20112=*
-exprs(#20112,4,#20104,2,"""abc""")
-hasLocation(#20112,#20019)
-enclosing_stmt(#20112,#20099)
-expr_containers(#20112,#20001)
-literals("abc","""abc""",#20112)
+exprs(#20110,4,#20105,1,"""ab""")
+hasLocation(#20110,#20015)
+enclosing_stmt(#20110,#20100)
+expr_containers(#20110,#20001)
+literals("ab","""ab""",#20110)
+#20111=*
+regexpterm(#20111,14,#20110,0,"ab")
+#20112=@"loc,{#10000},1,8,1,9"
+locations_default(#20112,#10000,1,8,1,9)
+hasLocation(#20111,#20112)
+regexp_const_value(#20111,"ab")
 #20113=*
-regexpterm(#20113,14,#20112,0,"abc")
-#20114=@"loc,{#10000},1,14,1,16"
-locations_default(#20114,#10000,1,14,1,16)
-hasLocation(#20113,#20114)
-regexp_const_value(#20113,"abc")
-array_size(#20104,3)
-#20115=*
-exprs(#20115,0,#20102,1,"map")
-hasLocation(#20115,#20025)
-enclosing_stmt(#20115,#20099)
-expr_containers(#20115,#20001)
-literals("map","map",#20115)
+exprs(#20113,4,#20105,2,"""abc""")
+hasLocation(#20113,#20019)
+enclosing_stmt(#20113,#20100)
+expr_containers(#20113,#20001)
+literals("abc","""abc""",#20113)
+#20114=*
+regexpterm(#20114,14,#20113,0,"abc")
+#20115=@"loc,{#10000},1,14,1,16"
+locations_default(#20115,#10000,1,14,1,16)
+hasLocation(#20114,#20115)
+regexp_const_value(#20114,"abc")
+array_size(#20105,3)
 #20116=*
-exprs(#20116,65,#20100,0,"s => s.length")
-#20117=@"loc,{#10000},1,24,1,36"
-locations_default(#20117,#10000,1,24,1,36)
-hasLocation(#20116,#20117)
-enclosing_stmt(#20116,#20099)
+exprs(#20116,0,#20103,1,"map")
+hasLocation(#20116,#20025)
+enclosing_stmt(#20116,#20100)
 expr_containers(#20116,#20001)
-#20118=*
-scopes(#20118,1)
-scopenodes(#20116,#20118)
-scopenesting(#20118,#20000)
-#20119=@"var;{s};{#20118}"
-variables(#20119,"s",#20118)
-#20120=*
-exprs(#20120,78,#20116,0,"s")
-hasLocation(#20120,#20029)
-expr_containers(#20120,#20116)
-literals("s","s",#20120)
-decl(#20120,#20119)
+literals("map","map",#20116)
+#20117=*
+exprs(#20117,65,#20101,0,"s => s.length")
+#20118=@"loc,{#10000},1,24,1,36"
+locations_default(#20118,#10000,1,24,1,36)
+hasLocation(#20117,#20118)
+enclosing_stmt(#20117,#20100)
+expr_containers(#20117,#20001)
+#20119=*
+scopes(#20119,1)
+scopenodes(#20117,#20119)
+scopenesting(#20119,#20000)
+#20120=@"var;{s};{#20119}"
+variables(#20120,"s",#20119)
 #20121=*
-exprs(#20121,14,#20116,-2,"s.length")
-#20122=@"loc,{#10000},1,29,1,36"
-locations_default(#20122,#10000,1,29,1,36)
-hasLocation(#20121,#20122)
-expr_containers(#20121,#20116)
-#20123=*
-exprs(#20123,79,#20121,0,"s")
-hasLocation(#20123,#20033)
-expr_containers(#20123,#20116)
-literals("s","s",#20123)
-bind(#20123,#20119)
+exprs(#20121,78,#20117,0,"s")
+hasLocation(#20121,#20029)
+expr_containers(#20121,#20117)
+literals("s","s",#20121)
+decl(#20121,#20120)
+#20122=*
+exprs(#20122,14,#20117,-2,"s.length")
+#20123=@"loc,{#10000},1,29,1,36"
+locations_default(#20123,#10000,1,29,1,36)
+hasLocation(#20122,#20123)
+expr_containers(#20122,#20117)
 #20124=*
-exprs(#20124,0,#20121,1,"length")
-hasLocation(#20124,#20037)
-expr_containers(#20124,#20116)
-literals("length","length",#20124)
+exprs(#20124,79,#20122,0,"s")
+hasLocation(#20124,#20033)
+expr_containers(#20124,#20117)
+literals("s","s",#20124)
+bind(#20124,#20120)
 #20125=*
-stmts(#20125,2,#20001,1,"setInte ...  1000);")
-hasLocation(#20125,#20005)
-stmt_containers(#20125,#20001)
+exprs(#20125,0,#20122,1,"length")
+hasLocation(#20125,#20037)
+expr_containers(#20125,#20117)
+literals("length","length",#20125)
 #20126=*
-exprs(#20126,13,#20125,0,"setInte ... , 1000)")
-#20127=@"loc,{#10000},2,1,2,30"
-locations_default(#20127,#10000,2,1,2,30)
-hasLocation(#20126,#20127)
-enclosing_stmt(#20126,#20125)
-expr_containers(#20126,#20001)
-#20128=*
-exprs(#20128,79,#20126,-1,"setInterval")
-hasLocation(#20128,#20043)
-enclosing_stmt(#20128,#20125)
-expr_containers(#20128,#20001)
-literals("setInterval","setInterval",#20128)
-#20129=@"var;{setInterval};{#20000}"
-variables(#20129,"setInterval",#20000)
-bind(#20128,#20129)
-#20130=*
-exprs(#20130,65,#20126,0,"() => ++cnt")
-#20131=@"loc,{#10000},2,13,2,23"
-locations_default(#20131,#10000,2,13,2,23)
-hasLocation(#20130,#20131)
-enclosing_stmt(#20130,#20125)
-expr_containers(#20130,#20001)
-#20132=*
-scopes(#20132,1)
-scopenodes(#20130,#20132)
-scopenesting(#20132,#20000)
+stmts(#20126,2,#20001,1,"setInte ...  1000);")
+hasLocation(#20126,#20005)
+stmt_containers(#20126,#20001)
+#20127=*
+exprs(#20127,13,#20126,0,"setInte ... , 1000)")
+#20128=@"loc,{#10000},2,1,2,30"
+locations_default(#20128,#10000,2,1,2,30)
+hasLocation(#20127,#20128)
+enclosing_stmt(#20127,#20126)
+expr_containers(#20127,#20001)
+#20129=*
+exprs(#20129,79,#20127,-1,"setInterval")
+hasLocation(#20129,#20043)
+enclosing_stmt(#20129,#20126)
+expr_containers(#20129,#20001)
+literals("setInterval","setInterval",#20129)
+#20130=@"var;{setInterval};{#20000}"
+variables(#20130,"setInterval",#20000)
+bind(#20129,#20130)
+#20131=*
+exprs(#20131,65,#20127,0,"() => ++cnt")
+#20132=@"loc,{#10000},2,13,2,23"
+locations_default(#20132,#10000,2,13,2,23)
+hasLocation(#20131,#20132)
+enclosing_stmt(#20131,#20126)
+expr_containers(#20131,#20001)
 #20133=*
-exprs(#20133,59,#20130,-2,"++cnt")
-#20134=@"loc,{#10000},2,19,2,23"
-locations_default(#20134,#10000,2,19,2,23)
-hasLocation(#20133,#20134)
-expr_containers(#20133,#20130)
-#20135=*
-exprs(#20135,79,#20133,0,"cnt")
-hasLocation(#20135,#20055)
-expr_containers(#20135,#20130)
-literals("cnt","cnt",#20135)
-#20136=@"var;{cnt};{#20000}"
-variables(#20136,"cnt",#20000)
-bind(#20135,#20136)
-#20137=*
-exprs(#20137,3,#20126,1,"1000")
-hasLocation(#20137,#20059)
-enclosing_stmt(#20137,#20125)
-expr_containers(#20137,#20001)
-literals("1000","1000",#20137)
+scopes(#20133,1)
+scopenodes(#20131,#20133)
+scopenesting(#20133,#20000)
+#20134=*
+exprs(#20134,59,#20131,-2,"++cnt")
+#20135=@"loc,{#10000},2,19,2,23"
+locations_default(#20135,#10000,2,19,2,23)
+hasLocation(#20134,#20135)
+expr_containers(#20134,#20131)
+#20136=*
+exprs(#20136,79,#20134,0,"cnt")
+hasLocation(#20136,#20055)
+expr_containers(#20136,#20131)
+literals("cnt","cnt",#20136)
+#20137=@"var;{cnt};{#20000}"
+variables(#20137,"cnt",#20000)
+bind(#20136,#20137)
 #20138=*
-stmts(#20138,2,#20001,2,"setTime ... 60000);")
-hasLocation(#20138,#20007)
-stmt_containers(#20138,#20001)
+exprs(#20138,3,#20127,1,"1000")
+hasLocation(#20138,#20059)
+enclosing_stmt(#20138,#20126)
+expr_containers(#20138,#20001)
+literals("1000","1000",#20138)
 #20139=*
-exprs(#20139,13,#20138,0,"setTime ...  60000)")
-#20140=@"loc,{#10000},3,1,3,47"
-locations_default(#20140,#10000,3,1,3,47)
-hasLocation(#20139,#20140)
-enclosing_stmt(#20139,#20138)
-expr_containers(#20139,#20001)
-#20141=*
-exprs(#20141,79,#20139,-1,"setTimeout")
-hasLocation(#20141,#20065)
-enclosing_stmt(#20141,#20138)
-expr_containers(#20141,#20001)
-literals("setTimeout","setTimeout",#20141)
-#20142=@"var;{setTimeout};{#20000}"
-variables(#20142,"setTimeout",#20000)
-bind(#20141,#20142)
-#20143=*
-exprs(#20143,65,#20139,0,"() => { ... p!""); }")
-#20144=@"loc,{#10000},3,12,3,39"
-locations_default(#20144,#10000,3,12,3,39)
-hasLocation(#20143,#20144)
-enclosing_stmt(#20143,#20138)
-expr_containers(#20143,#20001)
-#20145=*
-scopes(#20145,1)
-scopenodes(#20143,#20145)
-scopenesting(#20145,#20000)
+stmts(#20139,2,#20001,2,"setTime ... 60000);")
+hasLocation(#20139,#20007)
+stmt_containers(#20139,#20001)
+#20140=*
+exprs(#20140,13,#20139,0,"setTime ...  60000)")
+#20141=@"loc,{#10000},3,1,3,47"
+locations_default(#20141,#10000,3,1,3,47)
+hasLocation(#20140,#20141)
+enclosing_stmt(#20140,#20139)
+expr_containers(#20140,#20001)
+#20142=*
+exprs(#20142,79,#20140,-1,"setTimeout")
+hasLocation(#20142,#20065)
+enclosing_stmt(#20142,#20139)
+expr_containers(#20142,#20001)
+literals("setTimeout","setTimeout",#20142)
+#20143=@"var;{setTimeout};{#20000}"
+variables(#20143,"setTimeout",#20000)
+bind(#20142,#20143)
+#20144=*
+exprs(#20144,65,#20140,0,"() => { ... p!""); }")
+#20145=@"loc,{#10000},3,12,3,39"
+locations_default(#20145,#10000,3,12,3,39)
+hasLocation(#20144,#20145)
+enclosing_stmt(#20144,#20139)
+expr_containers(#20144,#20001)
 #20146=*
-stmts(#20146,1,#20143,-2,"{ alert ... p!""); }")
-#20147=@"loc,{#10000},3,18,3,39"
-locations_default(#20147,#10000,3,18,3,39)
-hasLocation(#20146,#20147)
-stmt_containers(#20146,#20143)
-#20148=*
-stmts(#20148,2,#20146,0,"alert(""Wake up!"");")
-#20149=@"loc,{#10000},3,20,3,37"
-locations_default(#20149,#10000,3,20,3,37)
-hasLocation(#20148,#20149)
-stmt_containers(#20148,#20143)
-#20150=*
-exprs(#20150,13,#20148,0,"alert(""Wake up!"")")
-#20151=@"loc,{#10000},3,20,3,36"
-locations_default(#20151,#10000,3,20,3,36)
-hasLocation(#20150,#20151)
-enclosing_stmt(#20150,#20148)
-expr_containers(#20150,#20143)
-#20152=*
-exprs(#20152,79,#20150,-1,"alert")
-hasLocation(#20152,#20077)
-enclosing_stmt(#20152,#20148)
-expr_containers(#20152,#20143)
-literals("alert","alert",#20152)
-#20153=@"var;{alert};{#20000}"
-variables(#20153,"alert",#20000)
-bind(#20152,#20153)
-#20154=*
-exprs(#20154,4,#20150,0,"""Wake up!""")
-hasLocation(#20154,#20081)
-enclosing_stmt(#20154,#20148)
-expr_containers(#20154,#20143)
-literals("Wake up!","""Wake up!""",#20154)
+scopes(#20146,1)
+scopenodes(#20144,#20146)
+scopenesting(#20146,#20000)
+#20147=*
+stmts(#20147,1,#20144,-2,"{ alert ... p!""); }")
+#20148=@"loc,{#10000},3,18,3,39"
+locations_default(#20148,#10000,3,18,3,39)
+hasLocation(#20147,#20148)
+stmt_containers(#20147,#20144)
+#20149=*
+stmts(#20149,2,#20147,0,"alert(""Wake up!"");")
+#20150=@"loc,{#10000},3,20,3,37"
+locations_default(#20150,#10000,3,20,3,37)
+hasLocation(#20149,#20150)
+stmt_containers(#20149,#20144)
+#20151=*
+exprs(#20151,13,#20149,0,"alert(""Wake up!"")")
+#20152=@"loc,{#10000},3,20,3,36"
+locations_default(#20152,#10000,3,20,3,36)
+hasLocation(#20151,#20152)
+enclosing_stmt(#20151,#20149)
+expr_containers(#20151,#20144)
+#20153=*
+exprs(#20153,79,#20151,-1,"alert")
+hasLocation(#20153,#20077)
+enclosing_stmt(#20153,#20149)
+expr_containers(#20153,#20144)
+literals("alert","alert",#20153)
+#20154=@"var;{alert};{#20000}"
+variables(#20154,"alert",#20000)
+bind(#20153,#20154)
 #20155=*
-regexpterm(#20155,14,#20154,0,"Wake up!")
-#20156=@"loc,{#10000},3,27,3,34"
-locations_default(#20156,#10000,3,27,3,34)
-hasLocation(#20155,#20156)
-regexp_const_value(#20155,"Wake up!")
-#20157=*
-exprs(#20157,3,#20139,1,"60000")
-hasLocation(#20157,#20091)
-enclosing_stmt(#20157,#20138)
-expr_containers(#20157,#20001)
-literals("60000","60000",#20157)
+exprs(#20155,4,#20151,0,"""Wake up!""")
+hasLocation(#20155,#20081)
+enclosing_stmt(#20155,#20149)
+expr_containers(#20155,#20144)
+literals("Wake up!","""Wake up!""",#20155)
+#20156=*
+regexpterm(#20156,14,#20155,0,"Wake up!")
+#20157=@"loc,{#10000},3,27,3,34"
+locations_default(#20157,#10000,3,27,3,34)
+hasLocation(#20156,#20157)
+regexp_const_value(#20156,"Wake up!")
 #20158=*
-entry_cfg_node(#20158,#20001)
-#20159=@"loc,{#10000},1,1,1,0"
-locations_default(#20159,#10000,1,1,1,0)
-hasLocation(#20158,#20159)
-#20160=*
-exit_cfg_node(#20160,#20001)
-hasLocation(#20160,#20097)
-successor(#20138,#20141)
-successor(#20157,#20139)
-successor(#20143,#20157)
+exprs(#20158,3,#20140,1,"60000")
+hasLocation(#20158,#20091)
+enclosing_stmt(#20158,#20139)
+expr_containers(#20158,#20001)
+literals("60000","60000",#20158)
+#20159=*
+entry_cfg_node(#20159,#20001)
+#20160=@"loc,{#10000},1,1,1,0"
+locations_default(#20160,#10000,1,1,1,0)
+hasLocation(#20159,#20160)
 #20161=*
-entry_cfg_node(#20161,#20143)
-#20162=@"loc,{#10000},3,12,3,11"
-locations_default(#20162,#10000,3,12,3,11)
-hasLocation(#20161,#20162)
-#20163=*
-exit_cfg_node(#20163,#20143)
-#20164=@"loc,{#10000},3,40,3,39"
-locations_default(#20164,#10000,3,40,3,39)
-hasLocation(#20163,#20164)
-successor(#20148,#20152)
-successor(#20154,#20150)
-successor(#20152,#20154)
-successor(#20150,#20163)
-successor(#20146,#20148)
-successor(#20161,#20146)
-successor(#20141,#20143)
-successor(#20139,#20160)
-successor(#20125,#20128)
-successor(#20137,#20126)
-successor(#20130,#20137)
-#20165=*
-entry_cfg_node(#20165,#20130)
-#20166=@"loc,{#10000},2,13,2,12"
-locations_default(#20166,#10000,2,13,2,12)
-hasLocation(#20165,#20166)
-#20167=*
-exit_cfg_node(#20167,#20130)
-#20168=@"loc,{#10000},2,24,2,23"
-locations_default(#20168,#10000,2,24,2,23)
-hasLocation(#20167,#20168)
-successor(#20135,#20133)
-successor(#20133,#20167)
-successor(#20165,#20135)
-successor(#20128,#20130)
-successor(#20126,#20138)
-successor(#20099,#20104)
-successor(#20116,#20100)
-#20169=*
-entry_cfg_node(#20169,#20116)
-#20170=@"loc,{#10000},1,24,1,23"
-locations_default(#20170,#10000,1,24,1,23)
-hasLocation(#20169,#20170)
-#20171=*
-exit_cfg_node(#20171,#20116)
-#20172=@"loc,{#10000},1,37,1,36"
-locations_default(#20172,#10000,1,37,1,36)
-hasLocation(#20171,#20172)
-successor(#20124,#20121)
-successor(#20123,#20124)
-successor(#20121,#20171)
-successor(#20120,#20123)
-successor(#20169,#20120)
-successor(#20115,#20102)
-successor(#20104,#20106)
-successor(#20112,#20115)
-successor(#20109,#20112)
-successor(#20106,#20109)
-successor(#20102,#20116)
-successor(#20100,#20125)
-successor(#20158,#20099)
+exit_cfg_node(#20161,#20001)
+hasLocation(#20161,#20097)
+successor(#20139,#20142)
+successor(#20158,#20140)
+successor(#20144,#20158)
+#20162=*
+entry_cfg_node(#20162,#20144)
+#20163=@"loc,{#10000},3,12,3,11"
+locations_default(#20163,#10000,3,12,3,11)
+hasLocation(#20162,#20163)
+#20164=*
+exit_cfg_node(#20164,#20144)
+#20165=@"loc,{#10000},3,40,3,39"
+locations_default(#20165,#10000,3,40,3,39)
+hasLocation(#20164,#20165)
+successor(#20149,#20153)
+successor(#20155,#20151)
+successor(#20153,#20155)
+successor(#20151,#20164)
+successor(#20147,#20149)
+successor(#20162,#20147)
+successor(#20142,#20144)
+successor(#20140,#20161)
+successor(#20126,#20129)
+successor(#20138,#20127)
+successor(#20131,#20138)
+#20166=*
+entry_cfg_node(#20166,#20131)
+#20167=@"loc,{#10000},2,13,2,12"
+locations_default(#20167,#10000,2,13,2,12)
+hasLocation(#20166,#20167)
+#20168=*
+exit_cfg_node(#20168,#20131)
+#20169=@"loc,{#10000},2,24,2,23"
+locations_default(#20169,#10000,2,24,2,23)
+hasLocation(#20168,#20169)
+successor(#20136,#20134)
+successor(#20134,#20168)
+successor(#20166,#20136)
+successor(#20129,#20131)
+successor(#20127,#20139)
+successor(#20100,#20105)
+successor(#20117,#20101)
+#20170=*
+entry_cfg_node(#20170,#20117)
+#20171=@"loc,{#10000},1,24,1,23"
+locations_default(#20171,#10000,1,24,1,23)
+hasLocation(#20170,#20171)
+#20172=*
+exit_cfg_node(#20172,#20117)
+#20173=@"loc,{#10000},1,37,1,36"
+locations_default(#20173,#10000,1,37,1,36)
+hasLocation(#20172,#20173)
+successor(#20125,#20122)
+successor(#20124,#20125)
+successor(#20122,#20172)
+successor(#20121,#20124)
+successor(#20170,#20121)
+successor(#20116,#20103)
+successor(#20105,#20107)
+successor(#20113,#20116)
+successor(#20110,#20113)
+successor(#20107,#20110)
+successor(#20103,#20117)
+successor(#20101,#20126)
+successor(#20159,#20100)
 numlines(#10000,3,3,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/class_accessors.js.trap b/javascript/extractor/tests/es2015/output/trap/class_accessors.js.trap
index 278bb0c1d8a..84f8cf0b2f1 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_accessors.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_accessors.js.trap
@@ -219,254 +219,266 @@ hasLocation(#20001,#20077)
 variables(#20078,"A",#20000)
 #20079=@"local_type_name;{A};{#20000}"
 local_type_names(#20079,"A",#20000)
-#20080=*
-stmts(#20080,26,#20001,0,"class A ... ;\n  }\n}")
-hasLocation(#20080,#20077)
-stmt_containers(#20080,#20001)
+#20080=@"var;{this};{#20000}"
+variables(#20080,"this",#20000)
 #20081=*
-exprs(#20081,78,#20080,0,"A")
-hasLocation(#20081,#20021)
-enclosing_stmt(#20081,#20080)
-expr_containers(#20081,#20001)
-literals("A","A",#20081)
-decl(#20081,#20078)
-typedecl(#20081,#20079)
+stmts(#20081,26,#20001,0,"class A ... ;\n  }\n}")
+hasLocation(#20081,#20077)
+stmt_containers(#20081,#20001)
 #20082=*
-scopes(#20082,10)
-scopenodes(#20080,#20082)
-scopenesting(#20082,#20000)
+exprs(#20082,78,#20081,0,"A")
+hasLocation(#20082,#20021)
+enclosing_stmt(#20082,#20081)
+expr_containers(#20082,#20001)
+literals("A","A",#20082)
+decl(#20082,#20078)
+typedecl(#20082,#20079)
 #20083=*
-properties(#20083,#20080,2,1,"get x() ... _x;\n  }")
-#20084=@"loc,{#10000},2,3,4,3"
-locations_default(#20084,#10000,2,3,4,3)
-hasLocation(#20083,#20084)
+scopes(#20083,10)
+scopenodes(#20081,#20083)
+scopenesting(#20083,#20000)
+#20084=@"var;{this};{#20083}"
+variables(#20084,"this",#20083)
 #20085=*
-exprs(#20085,0,#20083,0,"x")
-hasLocation(#20085,#20027)
-enclosing_stmt(#20085,#20080)
-expr_containers(#20085,#20001)
-literals("x","x",#20085)
-#20086=*
-exprs(#20086,9,#20083,1,"() {\n   ... _x;\n  }")
-#20087=@"loc,{#10000},2,8,4,3"
-locations_default(#20087,#10000,2,8,4,3)
-hasLocation(#20086,#20087)
-enclosing_stmt(#20086,#20080)
-expr_containers(#20086,#20001)
+properties(#20085,#20081,2,1,"get x() ... _x;\n  }")
+#20086=@"loc,{#10000},2,3,4,3"
+locations_default(#20086,#10000,2,3,4,3)
+hasLocation(#20085,#20086)
+#20087=*
+exprs(#20087,0,#20085,0,"x")
+hasLocation(#20087,#20027)
+enclosing_stmt(#20087,#20081)
+expr_containers(#20087,#20001)
+literals("x","x",#20087)
 #20088=*
-scopes(#20088,1)
-scopenodes(#20086,#20088)
-scopenesting(#20088,#20082)
-#20089=@"var;{arguments};{#20088}"
-variables(#20089,"arguments",#20088)
-is_arguments_object(#20089)
+exprs(#20088,9,#20085,1,"() {\n   ... _x;\n  }")
+#20089=@"loc,{#10000},2,8,4,3"
+locations_default(#20089,#10000,2,8,4,3)
+hasLocation(#20088,#20089)
+enclosing_stmt(#20088,#20081)
+expr_containers(#20088,#20001)
 #20090=*
-stmts(#20090,1,#20086,-2,"{\n    r ... _x;\n  }")
-#20091=@"loc,{#10000},2,11,4,3"
-locations_default(#20091,#10000,2,11,4,3)
-hasLocation(#20090,#20091)
-stmt_containers(#20090,#20086)
-#20092=*
-stmts(#20092,9,#20090,0,"return this._x;")
-#20093=@"loc,{#10000},3,5,3,19"
-locations_default(#20093,#10000,3,5,3,19)
-hasLocation(#20092,#20093)
-stmt_containers(#20092,#20086)
-#20094=*
-exprs(#20094,14,#20092,0,"this._x")
-#20095=@"loc,{#10000},3,12,3,18"
-locations_default(#20095,#10000,3,12,3,18)
-hasLocation(#20094,#20095)
-enclosing_stmt(#20094,#20092)
-expr_containers(#20094,#20086)
-#20096=*
-exprs(#20096,6,#20094,0,"this")
-hasLocation(#20096,#20037)
-enclosing_stmt(#20096,#20092)
-expr_containers(#20096,#20086)
+scopes(#20090,1)
+scopenodes(#20088,#20090)
+scopenesting(#20090,#20083)
+#20091=@"var;{this};{#20090}"
+variables(#20091,"this",#20090)
+#20092=@"var;{arguments};{#20090}"
+variables(#20092,"arguments",#20090)
+is_arguments_object(#20092)
+#20093=*
+stmts(#20093,1,#20088,-2,"{\n    r ... _x;\n  }")
+#20094=@"loc,{#10000},2,11,4,3"
+locations_default(#20094,#10000,2,11,4,3)
+hasLocation(#20093,#20094)
+stmt_containers(#20093,#20088)
+#20095=*
+stmts(#20095,9,#20093,0,"return this._x;")
+#20096=@"loc,{#10000},3,5,3,19"
+locations_default(#20096,#10000,3,5,3,19)
+hasLocation(#20095,#20096)
+stmt_containers(#20095,#20088)
 #20097=*
-exprs(#20097,0,#20094,1,"_x")
-hasLocation(#20097,#20041)
-enclosing_stmt(#20097,#20092)
-expr_containers(#20097,#20086)
-literals("_x","_x",#20097)
-is_method(#20083)
-#20098=*
-properties(#20098,#20080,3,2,"set x(v ... +v;\n  }")
-#20099=@"loc,{#10000},5,3,7,3"
-locations_default(#20099,#10000,5,3,7,3)
-hasLocation(#20098,#20099)
+exprs(#20097,14,#20095,0,"this._x")
+#20098=@"loc,{#10000},3,12,3,18"
+locations_default(#20098,#10000,3,12,3,18)
+hasLocation(#20097,#20098)
+enclosing_stmt(#20097,#20095)
+expr_containers(#20097,#20088)
+#20099=*
+exprs(#20099,6,#20097,0,"this")
+hasLocation(#20099,#20037)
+enclosing_stmt(#20099,#20095)
+expr_containers(#20099,#20088)
+bind(#20099,#20091)
 #20100=*
-exprs(#20100,0,#20098,0,"x")
-hasLocation(#20100,#20049)
-enclosing_stmt(#20100,#20080)
-expr_containers(#20100,#20001)
-literals("x","x",#20100)
+exprs(#20100,0,#20097,1,"_x")
+hasLocation(#20100,#20041)
+enclosing_stmt(#20100,#20095)
+expr_containers(#20100,#20088)
+literals("_x","_x",#20100)
+is_method(#20085)
 #20101=*
-exprs(#20101,9,#20098,1,"(v) {\n  ... +v;\n  }")
-#20102=@"loc,{#10000},5,8,7,3"
-locations_default(#20102,#10000,5,8,7,3)
+properties(#20101,#20081,3,2,"set x(v ... +v;\n  }")
+#20102=@"loc,{#10000},5,3,7,3"
+locations_default(#20102,#10000,5,3,7,3)
 hasLocation(#20101,#20102)
-enclosing_stmt(#20101,#20080)
-expr_containers(#20101,#20001)
 #20103=*
-scopes(#20103,1)
-scopenodes(#20101,#20103)
-scopenesting(#20103,#20082)
-#20104=@"var;{v};{#20103}"
-variables(#20104,"v",#20103)
-#20105=*
-exprs(#20105,78,#20101,0,"v")
-hasLocation(#20105,#20053)
-expr_containers(#20105,#20101)
-literals("v","v",#20105)
-decl(#20105,#20104)
-#20106=@"var;{arguments};{#20103}"
-variables(#20106,"arguments",#20103)
-is_arguments_object(#20106)
-#20107=*
-stmts(#20107,1,#20101,-2,"{\n    t ... +v;\n  }")
-#20108=@"loc,{#10000},5,12,7,3"
-locations_default(#20108,#10000,5,12,7,3)
-hasLocation(#20107,#20108)
-stmt_containers(#20107,#20101)
+exprs(#20103,0,#20101,0,"x")
+hasLocation(#20103,#20049)
+enclosing_stmt(#20103,#20081)
+expr_containers(#20103,#20001)
+literals("x","x",#20103)
+#20104=*
+exprs(#20104,9,#20101,1,"(v) {\n  ... +v;\n  }")
+#20105=@"loc,{#10000},5,8,7,3"
+locations_default(#20105,#10000,5,8,7,3)
+hasLocation(#20104,#20105)
+enclosing_stmt(#20104,#20081)
+expr_containers(#20104,#20001)
+#20106=*
+scopes(#20106,1)
+scopenodes(#20104,#20106)
+scopenesting(#20106,#20083)
+#20107=@"var;{this};{#20106}"
+variables(#20107,"this",#20106)
+#20108=@"var;{v};{#20106}"
+variables(#20108,"v",#20106)
 #20109=*
-stmts(#20109,2,#20107,0,"this._x = +v;")
-#20110=@"loc,{#10000},6,5,6,17"
-locations_default(#20110,#10000,6,5,6,17)
-hasLocation(#20109,#20110)
-stmt_containers(#20109,#20101)
+exprs(#20109,78,#20104,0,"v")
+hasLocation(#20109,#20053)
+expr_containers(#20109,#20104)
+literals("v","v",#20109)
+decl(#20109,#20108)
+#20110=@"var;{arguments};{#20106}"
+variables(#20110,"arguments",#20106)
+is_arguments_object(#20110)
 #20111=*
-exprs(#20111,47,#20109,0,"this._x = +v")
-#20112=@"loc,{#10000},6,5,6,16"
-locations_default(#20112,#10000,6,5,6,16)
+stmts(#20111,1,#20104,-2,"{\n    t ... +v;\n  }")
+#20112=@"loc,{#10000},5,12,7,3"
+locations_default(#20112,#10000,5,12,7,3)
 hasLocation(#20111,#20112)
-enclosing_stmt(#20111,#20109)
-expr_containers(#20111,#20101)
+stmt_containers(#20111,#20104)
 #20113=*
-exprs(#20113,14,#20111,0,"this._x")
-#20114=@"loc,{#10000},6,5,6,11"
-locations_default(#20114,#10000,6,5,6,11)
+stmts(#20113,2,#20111,0,"this._x = +v;")
+#20114=@"loc,{#10000},6,5,6,17"
+locations_default(#20114,#10000,6,5,6,17)
 hasLocation(#20113,#20114)
-enclosing_stmt(#20113,#20109)
-expr_containers(#20113,#20101)
+stmt_containers(#20113,#20104)
 #20115=*
-exprs(#20115,6,#20113,0,"this")
-hasLocation(#20115,#20059)
-enclosing_stmt(#20115,#20109)
-expr_containers(#20115,#20101)
-#20116=*
-exprs(#20116,0,#20113,1,"_x")
-hasLocation(#20116,#20063)
-enclosing_stmt(#20116,#20109)
-expr_containers(#20116,#20101)
-literals("_x","_x",#20116)
+exprs(#20115,47,#20113,0,"this._x = +v")
+#20116=@"loc,{#10000},6,5,6,16"
+locations_default(#20116,#10000,6,5,6,16)
+hasLocation(#20115,#20116)
+enclosing_stmt(#20115,#20113)
+expr_containers(#20115,#20104)
 #20117=*
-exprs(#20117,17,#20111,1,"+v")
-#20118=@"loc,{#10000},6,15,6,16"
-locations_default(#20118,#10000,6,15,6,16)
+exprs(#20117,14,#20115,0,"this._x")
+#20118=@"loc,{#10000},6,5,6,11"
+locations_default(#20118,#10000,6,5,6,11)
 hasLocation(#20117,#20118)
-enclosing_stmt(#20117,#20109)
-expr_containers(#20117,#20101)
+enclosing_stmt(#20117,#20113)
+expr_containers(#20117,#20104)
 #20119=*
-exprs(#20119,79,#20117,0,"v")
-hasLocation(#20119,#20069)
-enclosing_stmt(#20119,#20109)
-expr_containers(#20119,#20101)
-literals("v","v",#20119)
-bind(#20119,#20104)
-is_method(#20098)
+exprs(#20119,6,#20117,0,"this")
+hasLocation(#20119,#20059)
+enclosing_stmt(#20119,#20113)
+expr_containers(#20119,#20104)
+bind(#20119,#20107)
 #20120=*
-properties(#20120,#20080,4,0,"constructor() {}")
-#20121=@"loc,{#10000},1,9,1,8"
-locations_default(#20121,#10000,1,9,1,8)
-hasLocation(#20120,#20121)
-#20122=*
-exprs(#20122,0,#20120,0,"constructor")
-hasLocation(#20122,#20121)
-enclosing_stmt(#20122,#20080)
-expr_containers(#20122,#20001)
-literals("constructor","constructor",#20122)
+exprs(#20120,0,#20117,1,"_x")
+hasLocation(#20120,#20063)
+enclosing_stmt(#20120,#20113)
+expr_containers(#20120,#20104)
+literals("_x","_x",#20120)
+#20121=*
+exprs(#20121,17,#20115,1,"+v")
+#20122=@"loc,{#10000},6,15,6,16"
+locations_default(#20122,#10000,6,15,6,16)
+hasLocation(#20121,#20122)
+enclosing_stmt(#20121,#20113)
+expr_containers(#20121,#20104)
 #20123=*
-exprs(#20123,9,#20120,1,"() {}")
-hasLocation(#20123,#20121)
-enclosing_stmt(#20123,#20080)
-expr_containers(#20123,#20001)
+exprs(#20123,79,#20121,0,"v")
+hasLocation(#20123,#20069)
+enclosing_stmt(#20123,#20113)
+expr_containers(#20123,#20104)
+literals("v","v",#20123)
+bind(#20123,#20108)
+is_method(#20101)
 #20124=*
-scopes(#20124,1)
-scopenodes(#20123,#20124)
-scopenesting(#20124,#20082)
-#20125=@"var;{arguments};{#20124}"
-variables(#20125,"arguments",#20124)
-is_arguments_object(#20125)
+properties(#20124,#20081,4,0,"constructor() {}")
+#20125=@"loc,{#10000},1,9,1,8"
+locations_default(#20125,#10000,1,9,1,8)
+hasLocation(#20124,#20125)
 #20126=*
-stmts(#20126,1,#20123,-2,"{}")
-hasLocation(#20126,#20121)
-stmt_containers(#20126,#20123)
-is_method(#20120)
+exprs(#20126,0,#20124,0,"constructor")
+hasLocation(#20126,#20125)
+enclosing_stmt(#20126,#20081)
+expr_containers(#20126,#20001)
+literals("constructor","constructor",#20126)
 #20127=*
-entry_cfg_node(#20127,#20001)
-#20128=@"loc,{#10000},1,1,1,0"
-locations_default(#20128,#10000,1,1,1,0)
-hasLocation(#20127,#20128)
-#20129=*
-exit_cfg_node(#20129,#20001)
-hasLocation(#20129,#20076)
-successor(#20123,#20120)
-#20130=*
-entry_cfg_node(#20130,#20123)
-hasLocation(#20130,#20121)
+exprs(#20127,9,#20124,1,"() {}")
+hasLocation(#20127,#20125)
+enclosing_stmt(#20127,#20081)
+expr_containers(#20127,#20001)
+#20128=*
+scopes(#20128,1)
+scopenodes(#20127,#20128)
+scopenesting(#20128,#20083)
+#20129=@"var;{this};{#20128}"
+variables(#20129,"this",#20128)
+#20130=@"var;{arguments};{#20128}"
+variables(#20130,"arguments",#20128)
+is_arguments_object(#20130)
 #20131=*
-exit_cfg_node(#20131,#20123)
-hasLocation(#20131,#20121)
-successor(#20126,#20131)
-successor(#20130,#20126)
-successor(#20122,#20123)
-successor(#20120,#20080)
-successor(#20101,#20098)
+stmts(#20131,1,#20127,-2,"{}")
+hasLocation(#20131,#20125)
+stmt_containers(#20131,#20127)
+is_method(#20124)
 #20132=*
-entry_cfg_node(#20132,#20101)
-#20133=@"loc,{#10000},5,8,5,7"
-locations_default(#20133,#10000,5,8,5,7)
+entry_cfg_node(#20132,#20001)
+#20133=@"loc,{#10000},1,1,1,0"
+locations_default(#20133,#10000,1,1,1,0)
 hasLocation(#20132,#20133)
 #20134=*
-exit_cfg_node(#20134,#20101)
-#20135=@"loc,{#10000},7,4,7,3"
-locations_default(#20135,#10000,7,4,7,3)
-hasLocation(#20134,#20135)
-successor(#20109,#20115)
-successor(#20119,#20117)
-successor(#20117,#20111)
-successor(#20116,#20113)
-successor(#20115,#20116)
-successor(#20113,#20119)
-successor(#20111,#20134)
-successor(#20107,#20109)
-successor(#20105,#20107)
-successor(#20132,#20105)
-successor(#20100,#20101)
-successor(#20098,#20122)
-successor(#20086,#20083)
+exit_cfg_node(#20134,#20001)
+hasLocation(#20134,#20076)
+successor(#20127,#20124)
+#20135=*
+entry_cfg_node(#20135,#20127)
+hasLocation(#20135,#20125)
 #20136=*
-entry_cfg_node(#20136,#20086)
-#20137=@"loc,{#10000},2,8,2,7"
-locations_default(#20137,#10000,2,8,2,7)
-hasLocation(#20136,#20137)
-#20138=*
-exit_cfg_node(#20138,#20086)
-#20139=@"loc,{#10000},4,4,4,3"
-locations_default(#20139,#10000,4,4,4,3)
-hasLocation(#20138,#20139)
-successor(#20097,#20094)
-successor(#20096,#20097)
-successor(#20094,#20092)
-successor(#20092,#20138)
-successor(#20090,#20096)
-successor(#20136,#20090)
-successor(#20085,#20086)
-successor(#20083,#20100)
-successor(#20081,#20085)
-successor(#20080,#20129)
-successor(#20127,#20081)
+exit_cfg_node(#20136,#20127)
+hasLocation(#20136,#20125)
+successor(#20131,#20136)
+successor(#20135,#20131)
+successor(#20126,#20127)
+successor(#20124,#20081)
+successor(#20104,#20101)
+#20137=*
+entry_cfg_node(#20137,#20104)
+#20138=@"loc,{#10000},5,8,5,7"
+locations_default(#20138,#10000,5,8,5,7)
+hasLocation(#20137,#20138)
+#20139=*
+exit_cfg_node(#20139,#20104)
+#20140=@"loc,{#10000},7,4,7,3"
+locations_default(#20140,#10000,7,4,7,3)
+hasLocation(#20139,#20140)
+successor(#20113,#20119)
+successor(#20123,#20121)
+successor(#20121,#20115)
+successor(#20120,#20117)
+successor(#20119,#20120)
+successor(#20117,#20123)
+successor(#20115,#20139)
+successor(#20111,#20113)
+successor(#20109,#20111)
+successor(#20137,#20109)
+successor(#20103,#20104)
+successor(#20101,#20126)
+successor(#20088,#20085)
+#20141=*
+entry_cfg_node(#20141,#20088)
+#20142=@"loc,{#10000},2,8,2,7"
+locations_default(#20142,#10000,2,8,2,7)
+hasLocation(#20141,#20142)
+#20143=*
+exit_cfg_node(#20143,#20088)
+#20144=@"loc,{#10000},4,4,4,3"
+locations_default(#20144,#10000,4,4,4,3)
+hasLocation(#20143,#20144)
+successor(#20100,#20097)
+successor(#20099,#20100)
+successor(#20097,#20095)
+successor(#20095,#20143)
+successor(#20093,#20099)
+successor(#20141,#20093)
+successor(#20087,#20088)
+successor(#20085,#20103)
+successor(#20082,#20087)
+successor(#20081,#20134)
+successor(#20132,#20082)
 numlines(#10000,8,8,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/class_ctor.js.trap b/javascript/extractor/tests/es2015/output/trap/class_ctor.js.trap
index c7d5fb31502..86950475290 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_ctor.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_ctor.js.trap
@@ -133,132 +133,139 @@ hasLocation(#20001,#20045)
 variables(#20046,"A",#20000)
 #20047=@"local_type_name;{A};{#20000}"
 local_type_names(#20047,"A",#20000)
-#20048=*
-stmts(#20048,26,#20001,0,"class A ... ;\n  }\n}")
-hasLocation(#20048,#20045)
-stmt_containers(#20048,#20001)
+#20048=@"var;{this};{#20000}"
+variables(#20048,"this",#20000)
 #20049=*
-exprs(#20049,78,#20048,0,"A")
-hasLocation(#20049,#20015)
-enclosing_stmt(#20049,#20048)
-expr_containers(#20049,#20001)
-literals("A","A",#20049)
-decl(#20049,#20046)
-typedecl(#20049,#20047)
+stmts(#20049,26,#20001,0,"class A ... ;\n  }\n}")
+hasLocation(#20049,#20045)
+stmt_containers(#20049,#20001)
 #20050=*
-scopes(#20050,10)
-scopenodes(#20048,#20050)
-scopenesting(#20050,#20000)
+exprs(#20050,78,#20049,0,"A")
+hasLocation(#20050,#20015)
+enclosing_stmt(#20050,#20049)
+expr_containers(#20050,#20001)
+literals("A","A",#20050)
+decl(#20050,#20046)
+typedecl(#20050,#20047)
 #20051=*
-properties(#20051,#20048,2,0,"constru ...  x;\n  }")
-#20052=@"loc,{#10000},2,3,4,3"
-locations_default(#20052,#10000,2,3,4,3)
-hasLocation(#20051,#20052)
+scopes(#20051,10)
+scopenodes(#20049,#20051)
+scopenesting(#20051,#20000)
+#20052=@"var;{this};{#20051}"
+variables(#20052,"this",#20051)
 #20053=*
-exprs(#20053,0,#20051,0,"constructor")
-hasLocation(#20053,#20019)
-enclosing_stmt(#20053,#20048)
-expr_containers(#20053,#20001)
-literals("constructor","constructor",#20053)
-#20054=*
-exprs(#20054,9,#20051,1,"(x) {\n  ...  x;\n  }")
-#20055=@"loc,{#10000},2,14,4,3"
-locations_default(#20055,#10000,2,14,4,3)
-hasLocation(#20054,#20055)
-enclosing_stmt(#20054,#20048)
-expr_containers(#20054,#20001)
+properties(#20053,#20049,2,0,"constru ...  x;\n  }")
+#20054=@"loc,{#10000},2,3,4,3"
+locations_default(#20054,#10000,2,3,4,3)
+hasLocation(#20053,#20054)
+#20055=*
+exprs(#20055,0,#20053,0,"constructor")
+hasLocation(#20055,#20019)
+enclosing_stmt(#20055,#20049)
+expr_containers(#20055,#20001)
+literals("constructor","constructor",#20055)
 #20056=*
-scopes(#20056,1)
-scopenodes(#20054,#20056)
-scopenesting(#20056,#20050)
-#20057=@"var;{x};{#20056}"
-variables(#20057,"x",#20056)
+exprs(#20056,9,#20053,1,"(x) {\n  ...  x;\n  }")
+#20057=@"loc,{#10000},2,14,4,3"
+locations_default(#20057,#10000,2,14,4,3)
+hasLocation(#20056,#20057)
+enclosing_stmt(#20056,#20049)
+expr_containers(#20056,#20001)
 #20058=*
-exprs(#20058,78,#20054,0,"x")
-hasLocation(#20058,#20023)
-expr_containers(#20058,#20054)
-literals("x","x",#20058)
-decl(#20058,#20057)
-#20059=@"var;{arguments};{#20056}"
-variables(#20059,"arguments",#20056)
-is_arguments_object(#20059)
-#20060=*
-stmts(#20060,1,#20054,-2,"{\n    t ...  x;\n  }")
-#20061=@"loc,{#10000},2,18,4,3"
-locations_default(#20061,#10000,2,18,4,3)
-hasLocation(#20060,#20061)
-stmt_containers(#20060,#20054)
-#20062=*
-stmts(#20062,2,#20060,0,"this.x = x;")
-#20063=@"loc,{#10000},3,5,3,15"
-locations_default(#20063,#10000,3,5,3,15)
-hasLocation(#20062,#20063)
-stmt_containers(#20062,#20054)
-#20064=*
-exprs(#20064,47,#20062,0,"this.x = x")
-#20065=@"loc,{#10000},3,5,3,14"
-locations_default(#20065,#10000,3,5,3,14)
-hasLocation(#20064,#20065)
-enclosing_stmt(#20064,#20062)
-expr_containers(#20064,#20054)
-#20066=*
-exprs(#20066,14,#20064,0,"this.x")
-#20067=@"loc,{#10000},3,5,3,10"
-locations_default(#20067,#10000,3,5,3,10)
-hasLocation(#20066,#20067)
-enclosing_stmt(#20066,#20062)
-expr_containers(#20066,#20054)
-#20068=*
-exprs(#20068,6,#20066,0,"this")
-hasLocation(#20068,#20029)
-enclosing_stmt(#20068,#20062)
-expr_containers(#20068,#20054)
+scopes(#20058,1)
+scopenodes(#20056,#20058)
+scopenesting(#20058,#20051)
+#20059=@"var;{this};{#20058}"
+variables(#20059,"this",#20058)
+#20060=@"var;{x};{#20058}"
+variables(#20060,"x",#20058)
+#20061=*
+exprs(#20061,78,#20056,0,"x")
+hasLocation(#20061,#20023)
+expr_containers(#20061,#20056)
+literals("x","x",#20061)
+decl(#20061,#20060)
+#20062=@"var;{arguments};{#20058}"
+variables(#20062,"arguments",#20058)
+is_arguments_object(#20062)
+#20063=*
+stmts(#20063,1,#20056,-2,"{\n    t ...  x;\n  }")
+#20064=@"loc,{#10000},2,18,4,3"
+locations_default(#20064,#10000,2,18,4,3)
+hasLocation(#20063,#20064)
+stmt_containers(#20063,#20056)
+#20065=*
+stmts(#20065,2,#20063,0,"this.x = x;")
+#20066=@"loc,{#10000},3,5,3,15"
+locations_default(#20066,#10000,3,5,3,15)
+hasLocation(#20065,#20066)
+stmt_containers(#20065,#20056)
+#20067=*
+exprs(#20067,47,#20065,0,"this.x = x")
+#20068=@"loc,{#10000},3,5,3,14"
+locations_default(#20068,#10000,3,5,3,14)
+hasLocation(#20067,#20068)
+enclosing_stmt(#20067,#20065)
+expr_containers(#20067,#20056)
 #20069=*
-exprs(#20069,0,#20066,1,"x")
-hasLocation(#20069,#20033)
-enclosing_stmt(#20069,#20062)
-expr_containers(#20069,#20054)
-literals("x","x",#20069)
-#20070=*
-exprs(#20070,79,#20064,1,"x")
-hasLocation(#20070,#20037)
-enclosing_stmt(#20070,#20062)
-expr_containers(#20070,#20054)
-literals("x","x",#20070)
-bind(#20070,#20057)
-is_method(#20051)
+exprs(#20069,14,#20067,0,"this.x")
+#20070=@"loc,{#10000},3,5,3,10"
+locations_default(#20070,#10000,3,5,3,10)
+hasLocation(#20069,#20070)
+enclosing_stmt(#20069,#20065)
+expr_containers(#20069,#20056)
 #20071=*
-entry_cfg_node(#20071,#20001)
-#20072=@"loc,{#10000},1,1,1,0"
-locations_default(#20072,#10000,1,1,1,0)
-hasLocation(#20071,#20072)
+exprs(#20071,6,#20069,0,"this")
+hasLocation(#20071,#20029)
+enclosing_stmt(#20071,#20065)
+expr_containers(#20071,#20056)
+bind(#20071,#20059)
+#20072=*
+exprs(#20072,0,#20069,1,"x")
+hasLocation(#20072,#20033)
+enclosing_stmt(#20072,#20065)
+expr_containers(#20072,#20056)
+literals("x","x",#20072)
 #20073=*
-exit_cfg_node(#20073,#20001)
-hasLocation(#20073,#20044)
-successor(#20054,#20051)
+exprs(#20073,79,#20067,1,"x")
+hasLocation(#20073,#20037)
+enclosing_stmt(#20073,#20065)
+expr_containers(#20073,#20056)
+literals("x","x",#20073)
+bind(#20073,#20060)
+is_method(#20053)
 #20074=*
-entry_cfg_node(#20074,#20054)
-#20075=@"loc,{#10000},2,14,2,13"
-locations_default(#20075,#10000,2,14,2,13)
+entry_cfg_node(#20074,#20001)
+#20075=@"loc,{#10000},1,1,1,0"
+locations_default(#20075,#10000,1,1,1,0)
 hasLocation(#20074,#20075)
 #20076=*
-exit_cfg_node(#20076,#20054)
-#20077=@"loc,{#10000},4,4,4,3"
-locations_default(#20077,#10000,4,4,4,3)
-hasLocation(#20076,#20077)
-successor(#20062,#20068)
-successor(#20070,#20064)
-successor(#20069,#20066)
-successor(#20068,#20069)
-successor(#20066,#20070)
-successor(#20064,#20076)
-successor(#20060,#20062)
-successor(#20058,#20060)
-successor(#20074,#20058)
-successor(#20053,#20054)
-successor(#20051,#20048)
-successor(#20049,#20053)
-successor(#20048,#20073)
-successor(#20071,#20049)
+exit_cfg_node(#20076,#20001)
+hasLocation(#20076,#20044)
+successor(#20056,#20053)
+#20077=*
+entry_cfg_node(#20077,#20056)
+#20078=@"loc,{#10000},2,14,2,13"
+locations_default(#20078,#10000,2,14,2,13)
+hasLocation(#20077,#20078)
+#20079=*
+exit_cfg_node(#20079,#20056)
+#20080=@"loc,{#10000},4,4,4,3"
+locations_default(#20080,#10000,4,4,4,3)
+hasLocation(#20079,#20080)
+successor(#20065,#20071)
+successor(#20073,#20067)
+successor(#20072,#20069)
+successor(#20071,#20072)
+successor(#20069,#20073)
+successor(#20067,#20079)
+successor(#20063,#20065)
+successor(#20061,#20063)
+successor(#20077,#20061)
+successor(#20055,#20056)
+successor(#20053,#20049)
+successor(#20050,#20055)
+successor(#20049,#20076)
+successor(#20074,#20050)
 numlines(#10000,5,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/class_extends.js.trap b/javascript/extractor/tests/es2015/output/trap/class_extends.js.trap
index ed10bdf317f..b84b522dea9 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_extends.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_extends.js.trap
@@ -56,122 +56,128 @@ hasLocation(#20001,#20003)
 variables(#20018,"Point",#20000)
 #20019=@"local_type_name;{Point};{#20000}"
 local_type_names(#20019,"Point",#20000)
-#20020=*
-stmts(#20020,26,#20001,0,"class P ... ject {}")
-hasLocation(#20020,#20003)
-stmt_containers(#20020,#20001)
+#20020=@"var;{this};{#20000}"
+variables(#20020,"this",#20000)
 #20021=*
-exprs(#20021,78,#20020,0,"Point")
-hasLocation(#20021,#20007)
-enclosing_stmt(#20021,#20020)
-expr_containers(#20021,#20001)
-literals("Point","Point",#20021)
-decl(#20021,#20018)
-typedecl(#20021,#20019)
+stmts(#20021,26,#20001,0,"class P ... ject {}")
+hasLocation(#20021,#20003)
+stmt_containers(#20021,#20001)
 #20022=*
-scopes(#20022,10)
-scopenodes(#20020,#20022)
-scopenesting(#20022,#20000)
+exprs(#20022,78,#20021,0,"Point")
+hasLocation(#20022,#20007)
+enclosing_stmt(#20022,#20021)
+expr_containers(#20022,#20001)
+literals("Point","Point",#20022)
+decl(#20022,#20018)
+typedecl(#20022,#20019)
 #20023=*
-exprs(#20023,79,#20020,1,"Object")
-hasLocation(#20023,#20011)
-enclosing_stmt(#20023,#20020)
-expr_containers(#20023,#20001)
-literals("Object","Object",#20023)
-#20024=@"var;{Object};{#20000}"
-variables(#20024,"Object",#20000)
-bind(#20023,#20024)
+scopes(#20023,10)
+scopenodes(#20021,#20023)
+scopenesting(#20023,#20000)
+#20024=@"var;{this};{#20023}"
+variables(#20024,"this",#20023)
 #20025=*
-properties(#20025,#20020,2,0,"constru ... rgs); }")
-#20026=@"loc,{#10000},1,28,1,27"
-locations_default(#20026,#10000,1,28,1,27)
-hasLocation(#20025,#20026)
+exprs(#20025,79,#20021,1,"Object")
+hasLocation(#20025,#20011)
+enclosing_stmt(#20025,#20021)
+expr_containers(#20025,#20001)
+literals("Object","Object",#20025)
+#20026=@"var;{Object};{#20000}"
+variables(#20026,"Object",#20000)
+bind(#20025,#20026)
 #20027=*
-exprs(#20027,0,#20025,0,"constructor")
-hasLocation(#20027,#20026)
-enclosing_stmt(#20027,#20020)
-expr_containers(#20027,#20001)
-literals("constructor","constructor",#20027)
-#20028=*
-exprs(#20028,9,#20025,1,"(...arg ... rgs); }")
-hasLocation(#20028,#20026)
-enclosing_stmt(#20028,#20020)
-expr_containers(#20028,#20001)
+properties(#20027,#20021,2,0,"constru ... rgs); }")
+#20028=@"loc,{#10000},1,28,1,27"
+locations_default(#20028,#10000,1,28,1,27)
+hasLocation(#20027,#20028)
 #20029=*
-scopes(#20029,1)
-scopenodes(#20028,#20029)
-scopenesting(#20029,#20022)
-#20030=@"var;{args};{#20029}"
-variables(#20030,"args",#20029)
+exprs(#20029,0,#20027,0,"constructor")
+hasLocation(#20029,#20028)
+enclosing_stmt(#20029,#20021)
+expr_containers(#20029,#20001)
+literals("constructor","constructor",#20029)
+#20030=*
+exprs(#20030,9,#20027,1,"(...arg ... rgs); }")
+hasLocation(#20030,#20028)
+enclosing_stmt(#20030,#20021)
+expr_containers(#20030,#20001)
 #20031=*
-exprs(#20031,78,#20028,0,"args")
-hasLocation(#20031,#20026)
-expr_containers(#20031,#20028)
-literals("args","args",#20031)
-decl(#20031,#20030)
-#20032=@"var;{arguments};{#20029}"
-variables(#20032,"arguments",#20029)
-is_arguments_object(#20032)
-has_rest_parameter(#20028)
-#20033=*
-stmts(#20033,1,#20028,-2,"{ super(...args); }")
-hasLocation(#20033,#20026)
-stmt_containers(#20033,#20028)
+scopes(#20031,1)
+scopenodes(#20030,#20031)
+scopenesting(#20031,#20023)
+#20032=@"var;{this};{#20031}"
+variables(#20032,"this",#20031)
+#20033=@"var;{args};{#20031}"
+variables(#20033,"args",#20031)
 #20034=*
-stmts(#20034,2,#20033,0,"super(...args);")
-hasLocation(#20034,#20026)
-stmt_containers(#20034,#20028)
-#20035=*
-exprs(#20035,13,#20034,0,"super(...args)")
-hasLocation(#20035,#20026)
-enclosing_stmt(#20035,#20034)
-expr_containers(#20035,#20028)
+exprs(#20034,78,#20030,0,"args")
+hasLocation(#20034,#20028)
+expr_containers(#20034,#20030)
+literals("args","args",#20034)
+decl(#20034,#20033)
+#20035=@"var;{arguments};{#20031}"
+variables(#20035,"arguments",#20031)
+is_arguments_object(#20035)
+has_rest_parameter(#20030)
 #20036=*
-exprs(#20036,81,#20035,-1,"super")
-hasLocation(#20036,#20026)
-enclosing_stmt(#20036,#20034)
-expr_containers(#20036,#20028)
+stmts(#20036,1,#20030,-2,"{ super(...args); }")
+hasLocation(#20036,#20028)
+stmt_containers(#20036,#20030)
 #20037=*
-exprs(#20037,66,#20035,0,"...args")
-hasLocation(#20037,#20026)
-enclosing_stmt(#20037,#20034)
-expr_containers(#20037,#20028)
+stmts(#20037,2,#20036,0,"super(...args);")
+hasLocation(#20037,#20028)
+stmt_containers(#20037,#20030)
 #20038=*
-exprs(#20038,79,#20037,0,"args")
-hasLocation(#20038,#20026)
-enclosing_stmt(#20038,#20034)
-expr_containers(#20038,#20028)
-literals("args","args",#20038)
-bind(#20038,#20030)
-is_method(#20025)
+exprs(#20038,13,#20037,0,"super(...args)")
+hasLocation(#20038,#20028)
+enclosing_stmt(#20038,#20037)
+expr_containers(#20038,#20030)
 #20039=*
-entry_cfg_node(#20039,#20001)
-#20040=@"loc,{#10000},1,1,1,0"
-locations_default(#20040,#10000,1,1,1,0)
-hasLocation(#20039,#20040)
+exprs(#20039,81,#20038,-1,"super")
+hasLocation(#20039,#20028)
+enclosing_stmt(#20039,#20037)
+expr_containers(#20039,#20030)
+#20040=*
+exprs(#20040,66,#20038,0,"...args")
+hasLocation(#20040,#20028)
+enclosing_stmt(#20040,#20037)
+expr_containers(#20040,#20030)
 #20041=*
-exit_cfg_node(#20041,#20001)
-hasLocation(#20041,#20017)
-successor(#20028,#20025)
+exprs(#20041,79,#20040,0,"args")
+hasLocation(#20041,#20028)
+enclosing_stmt(#20041,#20037)
+expr_containers(#20041,#20030)
+literals("args","args",#20041)
+bind(#20041,#20033)
+is_method(#20027)
 #20042=*
-entry_cfg_node(#20042,#20028)
-hasLocation(#20042,#20026)
-#20043=*
-exit_cfg_node(#20043,#20028)
-hasLocation(#20043,#20026)
+entry_cfg_node(#20042,#20001)
+#20043=@"loc,{#10000},1,1,1,0"
+locations_default(#20043,#10000,1,1,1,0)
+hasLocation(#20042,#20043)
+#20044=*
+exit_cfg_node(#20044,#20001)
+hasLocation(#20044,#20017)
+successor(#20030,#20027)
+#20045=*
+entry_cfg_node(#20045,#20030)
+hasLocation(#20045,#20028)
+#20046=*
+exit_cfg_node(#20046,#20030)
+hasLocation(#20046,#20028)
+successor(#20037,#20039)
+successor(#20041,#20040)
+successor(#20040,#20038)
+successor(#20039,#20041)
+successor(#20038,#20046)
+successor(#20036,#20037)
 successor(#20034,#20036)
-successor(#20038,#20037)
-successor(#20037,#20035)
-successor(#20036,#20038)
-successor(#20035,#20043)
-successor(#20033,#20034)
-successor(#20031,#20033)
-successor(#20042,#20031)
-successor(#20027,#20028)
-successor(#20025,#20020)
-successor(#20023,#20027)
-successor(#20021,#20023)
-successor(#20020,#20041)
-successor(#20039,#20021)
+successor(#20045,#20034)
+successor(#20029,#20030)
+successor(#20027,#20021)
+successor(#20025,#20029)
+successor(#20022,#20025)
+successor(#20021,#20044)
+successor(#20042,#20022)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap b/javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap
index f61c4206ea3..a88a7106bb1 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_extends2.js.trap
@@ -106,190 +106,196 @@ hasLocation(#20001,#20003)
 variables(#20038,"Point",#20000)
 #20039=@"local_type_name;{Point};{#20000}"
 local_type_names(#20039,"Point",#20000)
-#20040=*
-stmts(#20040,26,#20001,0,"class P ... ray) {}")
-hasLocation(#20040,#20003)
-stmt_containers(#20040,#20001)
+#20040=@"var;{this};{#20000}"
+variables(#20040,"this",#20000)
 #20041=*
-exprs(#20041,78,#20040,0,"Point")
-hasLocation(#20041,#20007)
-enclosing_stmt(#20041,#20040)
-expr_containers(#20041,#20001)
-literals("Point","Point",#20041)
-decl(#20041,#20038)
-typedecl(#20041,#20039)
+stmts(#20041,26,#20001,0,"class P ... ray) {}")
+hasLocation(#20041,#20003)
+stmt_containers(#20041,#20001)
 #20042=*
-scopes(#20042,10)
-scopenodes(#20040,#20042)
-scopenesting(#20042,#20000)
+exprs(#20042,78,#20041,0,"Point")
+hasLocation(#20042,#20007)
+enclosing_stmt(#20042,#20041)
+expr_containers(#20042,#20001)
+literals("Point","Point",#20042)
+decl(#20042,#20038)
+typedecl(#20042,#20039)
 #20043=*
-exprs(#20043,63,#20040,1,"(Math.r ...  Array)")
-#20044=@"loc,{#10000},1,21,1,52"
-locations_default(#20044,#10000,1,21,1,52)
-hasLocation(#20043,#20044)
-enclosing_stmt(#20043,#20040)
-expr_containers(#20043,#20001)
+scopes(#20043,10)
+scopenodes(#20041,#20043)
+scopenesting(#20043,#20000)
+#20044=@"var;{this};{#20043}"
+variables(#20044,"this",#20043)
 #20045=*
-exprs(#20045,11,#20043,0,"Math.ra ... : Array")
-#20046=@"loc,{#10000},1,22,1,51"
-locations_default(#20046,#10000,1,22,1,51)
+exprs(#20045,63,#20041,1,"(Math.r ...  Array)")
+#20046=@"loc,{#10000},1,21,1,52"
+locations_default(#20046,#10000,1,21,1,52)
 hasLocation(#20045,#20046)
-enclosing_stmt(#20045,#20040)
+enclosing_stmt(#20045,#20041)
 expr_containers(#20045,#20001)
 #20047=*
-exprs(#20047,13,#20045,0,"Math.random()")
-#20048=@"loc,{#10000},1,22,1,34"
-locations_default(#20048,#10000,1,22,1,34)
+exprs(#20047,11,#20045,0,"Math.ra ... : Array")
+#20048=@"loc,{#10000},1,22,1,51"
+locations_default(#20048,#10000,1,22,1,51)
 hasLocation(#20047,#20048)
-enclosing_stmt(#20047,#20040)
+enclosing_stmt(#20047,#20041)
 expr_containers(#20047,#20001)
 #20049=*
-exprs(#20049,14,#20047,-1,"Math.random")
-#20050=@"loc,{#10000},1,22,1,32"
-locations_default(#20050,#10000,1,22,1,32)
+exprs(#20049,13,#20047,0,"Math.random()")
+#20050=@"loc,{#10000},1,22,1,34"
+locations_default(#20050,#10000,1,22,1,34)
 hasLocation(#20049,#20050)
-enclosing_stmt(#20049,#20040)
+enclosing_stmt(#20049,#20041)
 expr_containers(#20049,#20001)
 #20051=*
-exprs(#20051,79,#20049,0,"Math")
-hasLocation(#20051,#20013)
-enclosing_stmt(#20051,#20040)
+exprs(#20051,14,#20049,-1,"Math.random")
+#20052=@"loc,{#10000},1,22,1,32"
+locations_default(#20052,#10000,1,22,1,32)
+hasLocation(#20051,#20052)
+enclosing_stmt(#20051,#20041)
 expr_containers(#20051,#20001)
-literals("Math","Math",#20051)
-#20052=@"var;{Math};{#20000}"
-variables(#20052,"Math",#20000)
-bind(#20051,#20052)
 #20053=*
-exprs(#20053,0,#20049,1,"random")
-hasLocation(#20053,#20017)
-enclosing_stmt(#20053,#20040)
+exprs(#20053,79,#20051,0,"Math")
+hasLocation(#20053,#20013)
+enclosing_stmt(#20053,#20041)
 expr_containers(#20053,#20001)
-literals("random","random",#20053)
-#20054=*
-exprs(#20054,79,#20045,1,"Object")
-hasLocation(#20054,#20025)
-enclosing_stmt(#20054,#20040)
-expr_containers(#20054,#20001)
-literals("Object","Object",#20054)
-#20055=@"var;{Object};{#20000}"
-variables(#20055,"Object",#20000)
-bind(#20054,#20055)
+literals("Math","Math",#20053)
+#20054=@"var;{Math};{#20000}"
+variables(#20054,"Math",#20000)
+bind(#20053,#20054)
+#20055=*
+exprs(#20055,0,#20051,1,"random")
+hasLocation(#20055,#20017)
+enclosing_stmt(#20055,#20041)
+expr_containers(#20055,#20001)
+literals("random","random",#20055)
 #20056=*
-exprs(#20056,79,#20045,2,"Array")
-hasLocation(#20056,#20029)
-enclosing_stmt(#20056,#20040)
+exprs(#20056,79,#20047,1,"Object")
+hasLocation(#20056,#20025)
+enclosing_stmt(#20056,#20041)
 expr_containers(#20056,#20001)
-literals("Array","Array",#20056)
-#20057=@"var;{Array};{#20000}"
-variables(#20057,"Array",#20000)
+literals("Object","Object",#20056)
+#20057=@"var;{Object};{#20000}"
+variables(#20057,"Object",#20000)
 bind(#20056,#20057)
 #20058=*
-properties(#20058,#20040,2,0,"constru ... rgs); }")
-#20059=@"loc,{#10000},1,54,1,53"
-locations_default(#20059,#10000,1,54,1,53)
-hasLocation(#20058,#20059)
+exprs(#20058,79,#20047,2,"Array")
+hasLocation(#20058,#20029)
+enclosing_stmt(#20058,#20041)
+expr_containers(#20058,#20001)
+literals("Array","Array",#20058)
+#20059=@"var;{Array};{#20000}"
+variables(#20059,"Array",#20000)
+bind(#20058,#20059)
 #20060=*
-exprs(#20060,0,#20058,0,"constructor")
-hasLocation(#20060,#20059)
-enclosing_stmt(#20060,#20040)
-expr_containers(#20060,#20001)
-literals("constructor","constructor",#20060)
-#20061=*
-exprs(#20061,9,#20058,1,"(...arg ... rgs); }")
-hasLocation(#20061,#20059)
-enclosing_stmt(#20061,#20040)
-expr_containers(#20061,#20001)
+properties(#20060,#20041,2,0,"constru ... rgs); }")
+#20061=@"loc,{#10000},1,54,1,53"
+locations_default(#20061,#10000,1,54,1,53)
+hasLocation(#20060,#20061)
 #20062=*
-scopes(#20062,1)
-scopenodes(#20061,#20062)
-scopenesting(#20062,#20042)
-#20063=@"var;{args};{#20062}"
-variables(#20063,"args",#20062)
+exprs(#20062,0,#20060,0,"constructor")
+hasLocation(#20062,#20061)
+enclosing_stmt(#20062,#20041)
+expr_containers(#20062,#20001)
+literals("constructor","constructor",#20062)
+#20063=*
+exprs(#20063,9,#20060,1,"(...arg ... rgs); }")
+hasLocation(#20063,#20061)
+enclosing_stmt(#20063,#20041)
+expr_containers(#20063,#20001)
 #20064=*
-exprs(#20064,78,#20061,0,"args")
-hasLocation(#20064,#20059)
-expr_containers(#20064,#20061)
-literals("args","args",#20064)
-decl(#20064,#20063)
-#20065=@"var;{arguments};{#20062}"
-variables(#20065,"arguments",#20062)
-is_arguments_object(#20065)
-has_rest_parameter(#20061)
-#20066=*
-stmts(#20066,1,#20061,-2,"{ super(...args); }")
-hasLocation(#20066,#20059)
-stmt_containers(#20066,#20061)
+scopes(#20064,1)
+scopenodes(#20063,#20064)
+scopenesting(#20064,#20043)
+#20065=@"var;{this};{#20064}"
+variables(#20065,"this",#20064)
+#20066=@"var;{args};{#20064}"
+variables(#20066,"args",#20064)
 #20067=*
-stmts(#20067,2,#20066,0,"super(...args);")
-hasLocation(#20067,#20059)
-stmt_containers(#20067,#20061)
-#20068=*
-exprs(#20068,13,#20067,0,"super(...args)")
-hasLocation(#20068,#20059)
-enclosing_stmt(#20068,#20067)
-expr_containers(#20068,#20061)
+exprs(#20067,78,#20063,0,"args")
+hasLocation(#20067,#20061)
+expr_containers(#20067,#20063)
+literals("args","args",#20067)
+decl(#20067,#20066)
+#20068=@"var;{arguments};{#20064}"
+variables(#20068,"arguments",#20064)
+is_arguments_object(#20068)
+has_rest_parameter(#20063)
 #20069=*
-exprs(#20069,81,#20068,-1,"super")
-hasLocation(#20069,#20059)
-enclosing_stmt(#20069,#20067)
-expr_containers(#20069,#20061)
+stmts(#20069,1,#20063,-2,"{ super(...args); }")
+hasLocation(#20069,#20061)
+stmt_containers(#20069,#20063)
 #20070=*
-exprs(#20070,66,#20068,0,"...args")
-hasLocation(#20070,#20059)
-enclosing_stmt(#20070,#20067)
-expr_containers(#20070,#20061)
+stmts(#20070,2,#20069,0,"super(...args);")
+hasLocation(#20070,#20061)
+stmt_containers(#20070,#20063)
 #20071=*
-exprs(#20071,79,#20070,0,"args")
-hasLocation(#20071,#20059)
-enclosing_stmt(#20071,#20067)
-expr_containers(#20071,#20061)
-literals("args","args",#20071)
-bind(#20071,#20063)
-is_method(#20058)
+exprs(#20071,13,#20070,0,"super(...args)")
+hasLocation(#20071,#20061)
+enclosing_stmt(#20071,#20070)
+expr_containers(#20071,#20063)
 #20072=*
-entry_cfg_node(#20072,#20001)
-#20073=@"loc,{#10000},1,1,1,0"
-locations_default(#20073,#10000,1,1,1,0)
-hasLocation(#20072,#20073)
+exprs(#20072,81,#20071,-1,"super")
+hasLocation(#20072,#20061)
+enclosing_stmt(#20072,#20070)
+expr_containers(#20072,#20063)
+#20073=*
+exprs(#20073,66,#20071,0,"...args")
+hasLocation(#20073,#20061)
+enclosing_stmt(#20073,#20070)
+expr_containers(#20073,#20063)
 #20074=*
-exit_cfg_node(#20074,#20001)
-hasLocation(#20074,#20037)
-successor(#20061,#20058)
+exprs(#20074,79,#20073,0,"args")
+hasLocation(#20074,#20061)
+enclosing_stmt(#20074,#20070)
+expr_containers(#20074,#20063)
+literals("args","args",#20074)
+bind(#20074,#20066)
+is_method(#20060)
 #20075=*
-entry_cfg_node(#20075,#20061)
-hasLocation(#20075,#20059)
-#20076=*
-exit_cfg_node(#20076,#20061)
-hasLocation(#20076,#20059)
-successor(#20067,#20069)
-successor(#20071,#20070)
-successor(#20070,#20068)
-successor(#20069,#20071)
-successor(#20068,#20076)
-successor(#20066,#20067)
-successor(#20064,#20066)
-successor(#20075,#20064)
-successor(#20060,#20061)
-successor(#20058,#20040)
-successor(#20043,#20045)
-successor(#20045,#20051)
-successor(#20053,#20049)
-successor(#20051,#20053)
-successor(#20049,#20047)
+entry_cfg_node(#20075,#20001)
+#20076=@"loc,{#10000},1,1,1,0"
+locations_default(#20076,#10000,1,1,1,0)
+hasLocation(#20075,#20076)
 #20077=*
-guard_node(#20077,1,#20047)
-hasLocation(#20077,#20048)
-successor(#20077,#20054)
+exit_cfg_node(#20077,#20001)
+hasLocation(#20077,#20037)
+successor(#20063,#20060)
 #20078=*
-guard_node(#20078,0,#20047)
-hasLocation(#20078,#20048)
-successor(#20078,#20056)
-successor(#20047,#20077)
-successor(#20047,#20078)
-successor(#20054,#20060)
-successor(#20056,#20060)
-successor(#20041,#20043)
-successor(#20040,#20074)
-successor(#20072,#20041)
+entry_cfg_node(#20078,#20063)
+hasLocation(#20078,#20061)
+#20079=*
+exit_cfg_node(#20079,#20063)
+hasLocation(#20079,#20061)
+successor(#20070,#20072)
+successor(#20074,#20073)
+successor(#20073,#20071)
+successor(#20072,#20074)
+successor(#20071,#20079)
+successor(#20069,#20070)
+successor(#20067,#20069)
+successor(#20078,#20067)
+successor(#20062,#20063)
+successor(#20060,#20041)
+successor(#20045,#20047)
+successor(#20047,#20053)
+successor(#20055,#20051)
+successor(#20053,#20055)
+successor(#20051,#20049)
+#20080=*
+guard_node(#20080,1,#20049)
+hasLocation(#20080,#20050)
+successor(#20080,#20056)
+#20081=*
+guard_node(#20081,0,#20049)
+hasLocation(#20081,#20050)
+successor(#20081,#20058)
+successor(#20049,#20080)
+successor(#20049,#20081)
+successor(#20056,#20062)
+successor(#20058,#20062)
+successor(#20042,#20045)
+successor(#20041,#20077)
+successor(#20075,#20042)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/class_method.js.trap b/javascript/extractor/tests/es2015/output/trap/class_method.js.trap
index 18aec740ece..b036feda23d 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_method.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_method.js.trap
@@ -123,146 +123,155 @@ hasLocation(#20001,#20041)
 variables(#20042,"A",#20000)
 #20043=@"local_type_name;{A};{#20000}"
 local_type_names(#20043,"A",#20000)
-#20044=*
-stmts(#20044,26,#20001,0,"class A ... ;\n  }\n}")
-hasLocation(#20044,#20041)
-stmt_containers(#20044,#20001)
+#20044=@"var;{this};{#20000}"
+variables(#20044,"this",#20000)
 #20045=*
-exprs(#20045,78,#20044,0,"A")
-hasLocation(#20045,#20015)
-enclosing_stmt(#20045,#20044)
-expr_containers(#20045,#20001)
-literals("A","A",#20045)
-decl(#20045,#20042)
-typedecl(#20045,#20043)
+stmts(#20045,26,#20001,0,"class A ... ;\n  }\n}")
+hasLocation(#20045,#20041)
+stmt_containers(#20045,#20001)
 #20046=*
-scopes(#20046,10)
-scopenodes(#20044,#20046)
-scopenesting(#20046,#20000)
+exprs(#20046,78,#20045,0,"A")
+hasLocation(#20046,#20015)
+enclosing_stmt(#20046,#20045)
+expr_containers(#20046,#20001)
+literals("A","A",#20046)
+decl(#20046,#20042)
+typedecl(#20046,#20043)
 #20047=*
-properties(#20047,#20044,2,0,"getX()  ... .x;\n  }")
-#20048=@"loc,{#10000},2,3,4,3"
-locations_default(#20048,#10000,2,3,4,3)
-hasLocation(#20047,#20048)
+scopes(#20047,10)
+scopenodes(#20045,#20047)
+scopenesting(#20047,#20000)
+#20048=@"var;{this};{#20047}"
+variables(#20048,"this",#20047)
 #20049=*
-exprs(#20049,0,#20047,0,"getX")
-hasLocation(#20049,#20019)
-enclosing_stmt(#20049,#20044)
-expr_containers(#20049,#20001)
-literals("getX","getX",#20049)
-#20050=*
-exprs(#20050,9,#20047,1,"() {\n   ... .x;\n  }")
-#20051=@"loc,{#10000},2,7,4,3"
-locations_default(#20051,#10000,2,7,4,3)
-hasLocation(#20050,#20051)
-enclosing_stmt(#20050,#20044)
-expr_containers(#20050,#20001)
+properties(#20049,#20045,2,0,"getX()  ... .x;\n  }")
+#20050=@"loc,{#10000},2,3,4,3"
+locations_default(#20050,#10000,2,3,4,3)
+hasLocation(#20049,#20050)
+#20051=*
+exprs(#20051,0,#20049,0,"getX")
+hasLocation(#20051,#20019)
+enclosing_stmt(#20051,#20045)
+expr_containers(#20051,#20001)
+literals("getX","getX",#20051)
 #20052=*
-scopes(#20052,1)
-scopenodes(#20050,#20052)
-scopenesting(#20052,#20046)
-#20053=@"var;{arguments};{#20052}"
-variables(#20053,"arguments",#20052)
-is_arguments_object(#20053)
+exprs(#20052,9,#20049,1,"() {\n   ... .x;\n  }")
+#20053=@"loc,{#10000},2,7,4,3"
+locations_default(#20053,#10000,2,7,4,3)
+hasLocation(#20052,#20053)
+enclosing_stmt(#20052,#20045)
+expr_containers(#20052,#20001)
 #20054=*
-stmts(#20054,1,#20050,-2,"{\n    r ... .x;\n  }")
-#20055=@"loc,{#10000},2,10,4,3"
-locations_default(#20055,#10000,2,10,4,3)
-hasLocation(#20054,#20055)
-stmt_containers(#20054,#20050)
-#20056=*
-stmts(#20056,9,#20054,0,"return this.x;")
-#20057=@"loc,{#10000},3,5,3,18"
-locations_default(#20057,#10000,3,5,3,18)
-hasLocation(#20056,#20057)
-stmt_containers(#20056,#20050)
-#20058=*
-exprs(#20058,14,#20056,0,"this.x")
-#20059=@"loc,{#10000},3,12,3,17"
-locations_default(#20059,#10000,3,12,3,17)
-hasLocation(#20058,#20059)
-enclosing_stmt(#20058,#20056)
-expr_containers(#20058,#20050)
-#20060=*
-exprs(#20060,6,#20058,0,"this")
-hasLocation(#20060,#20029)
-enclosing_stmt(#20060,#20056)
-expr_containers(#20060,#20050)
+scopes(#20054,1)
+scopenodes(#20052,#20054)
+scopenesting(#20054,#20047)
+#20055=@"var;{this};{#20054}"
+variables(#20055,"this",#20054)
+#20056=@"var;{arguments};{#20054}"
+variables(#20056,"arguments",#20054)
+is_arguments_object(#20056)
+#20057=*
+stmts(#20057,1,#20052,-2,"{\n    r ... .x;\n  }")
+#20058=@"loc,{#10000},2,10,4,3"
+locations_default(#20058,#10000,2,10,4,3)
+hasLocation(#20057,#20058)
+stmt_containers(#20057,#20052)
+#20059=*
+stmts(#20059,9,#20057,0,"return this.x;")
+#20060=@"loc,{#10000},3,5,3,18"
+locations_default(#20060,#10000,3,5,3,18)
+hasLocation(#20059,#20060)
+stmt_containers(#20059,#20052)
 #20061=*
-exprs(#20061,0,#20058,1,"x")
-hasLocation(#20061,#20033)
-enclosing_stmt(#20061,#20056)
-expr_containers(#20061,#20050)
-literals("x","x",#20061)
-is_method(#20047)
-#20062=*
-properties(#20062,#20044,3,0,"constructor() {}")
-#20063=@"loc,{#10000},1,9,1,8"
-locations_default(#20063,#10000,1,9,1,8)
-hasLocation(#20062,#20063)
+exprs(#20061,14,#20059,0,"this.x")
+#20062=@"loc,{#10000},3,12,3,17"
+locations_default(#20062,#10000,3,12,3,17)
+hasLocation(#20061,#20062)
+enclosing_stmt(#20061,#20059)
+expr_containers(#20061,#20052)
+#20063=*
+exprs(#20063,6,#20061,0,"this")
+hasLocation(#20063,#20029)
+enclosing_stmt(#20063,#20059)
+expr_containers(#20063,#20052)
+bind(#20063,#20055)
 #20064=*
-exprs(#20064,0,#20062,0,"constructor")
-hasLocation(#20064,#20063)
-enclosing_stmt(#20064,#20044)
-expr_containers(#20064,#20001)
-literals("constructor","constructor",#20064)
+exprs(#20064,0,#20061,1,"x")
+hasLocation(#20064,#20033)
+enclosing_stmt(#20064,#20059)
+expr_containers(#20064,#20052)
+literals("x","x",#20064)
+is_method(#20049)
 #20065=*
-exprs(#20065,9,#20062,1,"() {}")
-hasLocation(#20065,#20063)
-enclosing_stmt(#20065,#20044)
-expr_containers(#20065,#20001)
-#20066=*
-scopes(#20066,1)
-scopenodes(#20065,#20066)
-scopenesting(#20066,#20046)
-#20067=@"var;{arguments};{#20066}"
-variables(#20067,"arguments",#20066)
-is_arguments_object(#20067)
+properties(#20065,#20045,3,0,"constructor() {}")
+#20066=@"loc,{#10000},1,9,1,8"
+locations_default(#20066,#10000,1,9,1,8)
+hasLocation(#20065,#20066)
+#20067=*
+exprs(#20067,0,#20065,0,"constructor")
+hasLocation(#20067,#20066)
+enclosing_stmt(#20067,#20045)
+expr_containers(#20067,#20001)
+literals("constructor","constructor",#20067)
 #20068=*
-stmts(#20068,1,#20065,-2,"{}")
-hasLocation(#20068,#20063)
-stmt_containers(#20068,#20065)
-is_method(#20062)
+exprs(#20068,9,#20065,1,"() {}")
+hasLocation(#20068,#20066)
+enclosing_stmt(#20068,#20045)
+expr_containers(#20068,#20001)
 #20069=*
-entry_cfg_node(#20069,#20001)
-#20070=@"loc,{#10000},1,1,1,0"
-locations_default(#20070,#10000,1,1,1,0)
-hasLocation(#20069,#20070)
-#20071=*
-exit_cfg_node(#20071,#20001)
-hasLocation(#20071,#20040)
-successor(#20065,#20062)
+scopes(#20069,1)
+scopenodes(#20068,#20069)
+scopenesting(#20069,#20047)
+#20070=@"var;{this};{#20069}"
+variables(#20070,"this",#20069)
+#20071=@"var;{arguments};{#20069}"
+variables(#20071,"arguments",#20069)
+is_arguments_object(#20071)
 #20072=*
-entry_cfg_node(#20072,#20065)
-hasLocation(#20072,#20063)
+stmts(#20072,1,#20068,-2,"{}")
+hasLocation(#20072,#20066)
+stmt_containers(#20072,#20068)
+is_method(#20065)
 #20073=*
-exit_cfg_node(#20073,#20065)
-hasLocation(#20073,#20063)
-successor(#20068,#20073)
-successor(#20072,#20068)
-successor(#20064,#20065)
-successor(#20062,#20044)
-successor(#20050,#20047)
-#20074=*
-entry_cfg_node(#20074,#20050)
-#20075=@"loc,{#10000},2,7,2,6"
-locations_default(#20075,#10000,2,7,2,6)
-hasLocation(#20074,#20075)
+entry_cfg_node(#20073,#20001)
+#20074=@"loc,{#10000},1,1,1,0"
+locations_default(#20074,#10000,1,1,1,0)
+hasLocation(#20073,#20074)
+#20075=*
+exit_cfg_node(#20075,#20001)
+hasLocation(#20075,#20040)
+successor(#20068,#20065)
 #20076=*
-exit_cfg_node(#20076,#20050)
-#20077=@"loc,{#10000},4,4,4,3"
-locations_default(#20077,#10000,4,4,4,3)
-hasLocation(#20076,#20077)
-successor(#20061,#20058)
-successor(#20060,#20061)
-successor(#20058,#20056)
-successor(#20056,#20076)
-successor(#20054,#20060)
-successor(#20074,#20054)
-successor(#20049,#20050)
-successor(#20047,#20064)
-successor(#20045,#20049)
-successor(#20044,#20071)
-successor(#20069,#20045)
+entry_cfg_node(#20076,#20068)
+hasLocation(#20076,#20066)
+#20077=*
+exit_cfg_node(#20077,#20068)
+hasLocation(#20077,#20066)
+successor(#20072,#20077)
+successor(#20076,#20072)
+successor(#20067,#20068)
+successor(#20065,#20045)
+successor(#20052,#20049)
+#20078=*
+entry_cfg_node(#20078,#20052)
+#20079=@"loc,{#10000},2,7,2,6"
+locations_default(#20079,#10000,2,7,2,6)
+hasLocation(#20078,#20079)
+#20080=*
+exit_cfg_node(#20080,#20052)
+#20081=@"loc,{#10000},4,4,4,3"
+locations_default(#20081,#10000,4,4,4,3)
+hasLocation(#20080,#20081)
+successor(#20064,#20061)
+successor(#20063,#20064)
+successor(#20061,#20059)
+successor(#20059,#20080)
+successor(#20057,#20063)
+successor(#20078,#20057)
+successor(#20051,#20052)
+successor(#20049,#20067)
+successor(#20046,#20051)
+successor(#20045,#20075)
+successor(#20073,#20046)
 numlines(#10000,5,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/class_static.js.trap b/javascript/extractor/tests/es2015/output/trap/class_static.js.trap
index 0be88f28c4d..32a81939215 100644
--- a/javascript/extractor/tests/es2015/output/trap/class_static.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/class_static.js.trap
@@ -118,139 +118,147 @@ hasLocation(#20001,#20039)
 variables(#20040,"A",#20000)
 #20041=@"local_type_name;{A};{#20000}"
 local_type_names(#20041,"A",#20000)
-#20042=*
-stmts(#20042,26,#20001,0,"class A ... ;\n  }\n}")
-hasLocation(#20042,#20039)
-stmt_containers(#20042,#20001)
+#20042=@"var;{this};{#20000}"
+variables(#20042,"this",#20000)
 #20043=*
-exprs(#20043,78,#20042,0,"A")
-hasLocation(#20043,#20015)
-enclosing_stmt(#20043,#20042)
-expr_containers(#20043,#20001)
-literals("A","A",#20043)
-decl(#20043,#20040)
-typedecl(#20043,#20041)
+stmts(#20043,26,#20001,0,"class A ... ;\n  }\n}")
+hasLocation(#20043,#20039)
+stmt_containers(#20043,#20001)
 #20044=*
-scopes(#20044,10)
-scopenodes(#20042,#20044)
-scopenesting(#20044,#20000)
+exprs(#20044,78,#20043,0,"A")
+hasLocation(#20044,#20015)
+enclosing_stmt(#20044,#20043)
+expr_containers(#20044,#20001)
+literals("A","A",#20044)
+decl(#20044,#20040)
+typedecl(#20044,#20041)
 #20045=*
-properties(#20045,#20042,2,0,"static  ... A"";\n  }")
-#20046=@"loc,{#10000},2,3,4,3"
-locations_default(#20046,#10000,2,3,4,3)
-hasLocation(#20045,#20046)
+scopes(#20045,10)
+scopenodes(#20043,#20045)
+scopenesting(#20045,#20000)
+#20046=@"var;{this};{#20045}"
+variables(#20046,"this",#20045)
 #20047=*
-exprs(#20047,0,#20045,0,"className")
-hasLocation(#20047,#20021)
-enclosing_stmt(#20047,#20042)
-expr_containers(#20047,#20001)
-literals("className","className",#20047)
-#20048=*
-exprs(#20048,9,#20045,1,"() {\n   ... A"";\n  }")
-#20049=@"loc,{#10000},2,19,4,3"
-locations_default(#20049,#10000,2,19,4,3)
-hasLocation(#20048,#20049)
-enclosing_stmt(#20048,#20042)
-expr_containers(#20048,#20001)
+properties(#20047,#20043,2,0,"static  ... A"";\n  }")
+#20048=@"loc,{#10000},2,3,4,3"
+locations_default(#20048,#10000,2,3,4,3)
+hasLocation(#20047,#20048)
+#20049=*
+exprs(#20049,0,#20047,0,"className")
+hasLocation(#20049,#20021)
+enclosing_stmt(#20049,#20043)
+expr_containers(#20049,#20001)
+literals("className","className",#20049)
 #20050=*
-scopes(#20050,1)
-scopenodes(#20048,#20050)
-scopenesting(#20050,#20044)
-#20051=@"var;{arguments};{#20050}"
-variables(#20051,"arguments",#20050)
-is_arguments_object(#20051)
+exprs(#20050,9,#20047,1,"() {\n   ... A"";\n  }")
+#20051=@"loc,{#10000},2,19,4,3"
+locations_default(#20051,#10000,2,19,4,3)
+hasLocation(#20050,#20051)
+enclosing_stmt(#20050,#20043)
+expr_containers(#20050,#20001)
 #20052=*
-stmts(#20052,1,#20048,-2,"{\n    r ... A"";\n  }")
-#20053=@"loc,{#10000},2,22,4,3"
-locations_default(#20053,#10000,2,22,4,3)
-hasLocation(#20052,#20053)
-stmt_containers(#20052,#20048)
-#20054=*
-stmts(#20054,9,#20052,0,"return ""A"";")
-#20055=@"loc,{#10000},3,5,3,15"
-locations_default(#20055,#10000,3,5,3,15)
-hasLocation(#20054,#20055)
-stmt_containers(#20054,#20048)
-#20056=*
-exprs(#20056,4,#20054,0,"""A""")
-hasLocation(#20056,#20031)
-enclosing_stmt(#20056,#20054)
-expr_containers(#20056,#20048)
-literals("A","""A""",#20056)
+scopes(#20052,1)
+scopenodes(#20050,#20052)
+scopenesting(#20052,#20045)
+#20053=@"var;{this};{#20052}"
+variables(#20053,"this",#20052)
+#20054=@"var;{arguments};{#20052}"
+variables(#20054,"arguments",#20052)
+is_arguments_object(#20054)
+#20055=*
+stmts(#20055,1,#20050,-2,"{\n    r ... A"";\n  }")
+#20056=@"loc,{#10000},2,22,4,3"
+locations_default(#20056,#10000,2,22,4,3)
+hasLocation(#20055,#20056)
+stmt_containers(#20055,#20050)
 #20057=*
-regexpterm(#20057,14,#20056,0,"A")
-#20058=@"loc,{#10000},3,13,3,13"
-locations_default(#20058,#10000,3,13,3,13)
+stmts(#20057,9,#20055,0,"return ""A"";")
+#20058=@"loc,{#10000},3,5,3,15"
+locations_default(#20058,#10000,3,5,3,15)
 hasLocation(#20057,#20058)
-regexp_const_value(#20057,"A")
-is_method(#20045)
-is_static(#20045)
+stmt_containers(#20057,#20050)
 #20059=*
-properties(#20059,#20042,3,0,"constructor() {}")
-#20060=@"loc,{#10000},1,9,1,8"
-locations_default(#20060,#10000,1,9,1,8)
-hasLocation(#20059,#20060)
-#20061=*
-exprs(#20061,0,#20059,0,"constructor")
-hasLocation(#20061,#20060)
-enclosing_stmt(#20061,#20042)
-expr_containers(#20061,#20001)
-literals("constructor","constructor",#20061)
+exprs(#20059,4,#20057,0,"""A""")
+hasLocation(#20059,#20031)
+enclosing_stmt(#20059,#20057)
+expr_containers(#20059,#20050)
+literals("A","""A""",#20059)
+#20060=*
+regexpterm(#20060,14,#20059,0,"A")
+#20061=@"loc,{#10000},3,13,3,13"
+locations_default(#20061,#10000,3,13,3,13)
+hasLocation(#20060,#20061)
+regexp_const_value(#20060,"A")
+is_method(#20047)
+is_static(#20047)
 #20062=*
-exprs(#20062,9,#20059,1,"() {}")
-hasLocation(#20062,#20060)
-enclosing_stmt(#20062,#20042)
-expr_containers(#20062,#20001)
-#20063=*
-scopes(#20063,1)
-scopenodes(#20062,#20063)
-scopenesting(#20063,#20044)
-#20064=@"var;{arguments};{#20063}"
-variables(#20064,"arguments",#20063)
-is_arguments_object(#20064)
+properties(#20062,#20043,3,0,"constructor() {}")
+#20063=@"loc,{#10000},1,9,1,8"
+locations_default(#20063,#10000,1,9,1,8)
+hasLocation(#20062,#20063)
+#20064=*
+exprs(#20064,0,#20062,0,"constructor")
+hasLocation(#20064,#20063)
+enclosing_stmt(#20064,#20043)
+expr_containers(#20064,#20001)
+literals("constructor","constructor",#20064)
 #20065=*
-stmts(#20065,1,#20062,-2,"{}")
-hasLocation(#20065,#20060)
-stmt_containers(#20065,#20062)
-is_method(#20059)
+exprs(#20065,9,#20062,1,"() {}")
+hasLocation(#20065,#20063)
+enclosing_stmt(#20065,#20043)
+expr_containers(#20065,#20001)
 #20066=*
-entry_cfg_node(#20066,#20001)
-#20067=@"loc,{#10000},1,1,1,0"
-locations_default(#20067,#10000,1,1,1,0)
-hasLocation(#20066,#20067)
-#20068=*
-exit_cfg_node(#20068,#20001)
-hasLocation(#20068,#20038)
-successor(#20062,#20059)
+scopes(#20066,1)
+scopenodes(#20065,#20066)
+scopenesting(#20066,#20045)
+#20067=@"var;{this};{#20066}"
+variables(#20067,"this",#20066)
+#20068=@"var;{arguments};{#20066}"
+variables(#20068,"arguments",#20066)
+is_arguments_object(#20068)
 #20069=*
-entry_cfg_node(#20069,#20062)
-hasLocation(#20069,#20060)
+stmts(#20069,1,#20065,-2,"{}")
+hasLocation(#20069,#20063)
+stmt_containers(#20069,#20065)
+is_method(#20062)
 #20070=*
-exit_cfg_node(#20070,#20062)
-hasLocation(#20070,#20060)
-successor(#20065,#20070)
-successor(#20069,#20065)
-successor(#20061,#20062)
-successor(#20059,#20042)
-successor(#20048,#20045)
-#20071=*
-entry_cfg_node(#20071,#20048)
-#20072=@"loc,{#10000},2,19,2,18"
-locations_default(#20072,#10000,2,19,2,18)
-hasLocation(#20071,#20072)
+entry_cfg_node(#20070,#20001)
+#20071=@"loc,{#10000},1,1,1,0"
+locations_default(#20071,#10000,1,1,1,0)
+hasLocation(#20070,#20071)
+#20072=*
+exit_cfg_node(#20072,#20001)
+hasLocation(#20072,#20038)
+successor(#20065,#20062)
 #20073=*
-exit_cfg_node(#20073,#20048)
-#20074=@"loc,{#10000},4,4,4,3"
-locations_default(#20074,#10000,4,4,4,3)
-hasLocation(#20073,#20074)
-successor(#20056,#20054)
-successor(#20054,#20073)
-successor(#20052,#20056)
-successor(#20071,#20052)
-successor(#20047,#20048)
-successor(#20045,#20061)
-successor(#20043,#20047)
-successor(#20042,#20068)
-successor(#20066,#20043)
+entry_cfg_node(#20073,#20065)
+hasLocation(#20073,#20063)
+#20074=*
+exit_cfg_node(#20074,#20065)
+hasLocation(#20074,#20063)
+successor(#20069,#20074)
+successor(#20073,#20069)
+successor(#20064,#20065)
+successor(#20062,#20043)
+successor(#20050,#20047)
+#20075=*
+entry_cfg_node(#20075,#20050)
+#20076=@"loc,{#10000},2,19,2,18"
+locations_default(#20076,#10000,2,19,2,18)
+hasLocation(#20075,#20076)
+#20077=*
+exit_cfg_node(#20077,#20050)
+#20078=@"loc,{#10000},4,4,4,3"
+locations_default(#20078,#10000,4,4,4,3)
+hasLocation(#20077,#20078)
+successor(#20059,#20057)
+successor(#20057,#20077)
+successor(#20055,#20059)
+successor(#20075,#20055)
+successor(#20049,#20050)
+successor(#20047,#20064)
+successor(#20044,#20049)
+successor(#20043,#20072)
+successor(#20070,#20044)
 numlines(#10000,5,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/classdecl.js.trap b/javascript/extractor/tests/es2015/output/trap/classdecl.js.trap
index e5a40dab400..0906909eb09 100644
--- a/javascript/extractor/tests/es2015/output/trap/classdecl.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/classdecl.js.trap
@@ -46,71 +46,77 @@ hasLocation(#20001,#20003)
 variables(#20014,"Point",#20000)
 #20015=@"local_type_name;{Point};{#20000}"
 local_type_names(#20015,"Point",#20000)
-#20016=*
-stmts(#20016,26,#20001,0,"class Point {}")
-hasLocation(#20016,#20003)
-stmt_containers(#20016,#20001)
+#20016=@"var;{this};{#20000}"
+variables(#20016,"this",#20000)
 #20017=*
-exprs(#20017,78,#20016,0,"Point")
-hasLocation(#20017,#20007)
-enclosing_stmt(#20017,#20016)
-expr_containers(#20017,#20001)
-literals("Point","Point",#20017)
-decl(#20017,#20014)
-typedecl(#20017,#20015)
+stmts(#20017,26,#20001,0,"class Point {}")
+hasLocation(#20017,#20003)
+stmt_containers(#20017,#20001)
 #20018=*
-scopes(#20018,10)
-scopenodes(#20016,#20018)
-scopenesting(#20018,#20000)
+exprs(#20018,78,#20017,0,"Point")
+hasLocation(#20018,#20007)
+enclosing_stmt(#20018,#20017)
+expr_containers(#20018,#20001)
+literals("Point","Point",#20018)
+decl(#20018,#20014)
+typedecl(#20018,#20015)
 #20019=*
-properties(#20019,#20016,2,0,"constructor() {}")
-#20020=@"loc,{#10000},1,13,1,12"
-locations_default(#20020,#10000,1,13,1,12)
-hasLocation(#20019,#20020)
+scopes(#20019,10)
+scopenodes(#20017,#20019)
+scopenesting(#20019,#20000)
+#20020=@"var;{this};{#20019}"
+variables(#20020,"this",#20019)
 #20021=*
-exprs(#20021,0,#20019,0,"constructor")
-hasLocation(#20021,#20020)
-enclosing_stmt(#20021,#20016)
-expr_containers(#20021,#20001)
-literals("constructor","constructor",#20021)
-#20022=*
-exprs(#20022,9,#20019,1,"() {}")
-hasLocation(#20022,#20020)
-enclosing_stmt(#20022,#20016)
-expr_containers(#20022,#20001)
+properties(#20021,#20017,2,0,"constructor() {}")
+#20022=@"loc,{#10000},1,13,1,12"
+locations_default(#20022,#10000,1,13,1,12)
+hasLocation(#20021,#20022)
 #20023=*
-scopes(#20023,1)
-scopenodes(#20022,#20023)
-scopenesting(#20023,#20018)
-#20024=@"var;{arguments};{#20023}"
-variables(#20024,"arguments",#20023)
-is_arguments_object(#20024)
+exprs(#20023,0,#20021,0,"constructor")
+hasLocation(#20023,#20022)
+enclosing_stmt(#20023,#20017)
+expr_containers(#20023,#20001)
+literals("constructor","constructor",#20023)
+#20024=*
+exprs(#20024,9,#20021,1,"() {}")
+hasLocation(#20024,#20022)
+enclosing_stmt(#20024,#20017)
+expr_containers(#20024,#20001)
 #20025=*
-stmts(#20025,1,#20022,-2,"{}")
-hasLocation(#20025,#20020)
-stmt_containers(#20025,#20022)
-is_method(#20019)
-#20026=*
-entry_cfg_node(#20026,#20001)
-#20027=@"loc,{#10000},1,1,1,0"
-locations_default(#20027,#10000,1,1,1,0)
-hasLocation(#20026,#20027)
+scopes(#20025,1)
+scopenodes(#20024,#20025)
+scopenesting(#20025,#20019)
+#20026=@"var;{this};{#20025}"
+variables(#20026,"this",#20025)
+#20027=@"var;{arguments};{#20025}"
+variables(#20027,"arguments",#20025)
+is_arguments_object(#20027)
 #20028=*
-exit_cfg_node(#20028,#20001)
-hasLocation(#20028,#20013)
-successor(#20022,#20019)
+stmts(#20028,1,#20024,-2,"{}")
+hasLocation(#20028,#20022)
+stmt_containers(#20028,#20024)
+is_method(#20021)
 #20029=*
-entry_cfg_node(#20029,#20022)
-hasLocation(#20029,#20020)
-#20030=*
-exit_cfg_node(#20030,#20022)
-hasLocation(#20030,#20020)
-successor(#20025,#20030)
-successor(#20029,#20025)
-successor(#20021,#20022)
-successor(#20019,#20016)
-successor(#20017,#20021)
-successor(#20016,#20028)
-successor(#20026,#20017)
+entry_cfg_node(#20029,#20001)
+#20030=@"loc,{#10000},1,1,1,0"
+locations_default(#20030,#10000,1,1,1,0)
+hasLocation(#20029,#20030)
+#20031=*
+exit_cfg_node(#20031,#20001)
+hasLocation(#20031,#20013)
+successor(#20024,#20021)
+#20032=*
+entry_cfg_node(#20032,#20024)
+hasLocation(#20032,#20022)
+#20033=*
+exit_cfg_node(#20033,#20024)
+hasLocation(#20033,#20022)
+successor(#20028,#20033)
+successor(#20032,#20028)
+successor(#20023,#20024)
+successor(#20021,#20017)
+successor(#20018,#20023)
+successor(#20017,#20031)
+successor(#20029,#20018)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/classexpr.js.trap b/javascript/extractor/tests/es2015/output/trap/classexpr.js.trap
index ad02e4ce6e3..2f89081d2c1 100644
--- a/javascript/extractor/tests/es2015/output/trap/classexpr.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/classexpr.js.trap
@@ -52,89 +52,95 @@ locations_default(#20017,#10000,1,17,1,16)
 hasLocation(#20016,#20017)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20018=*
-stmts(#20018,2,#20001,0,"(class Point {})")
-hasLocation(#20018,#20003)
-stmt_containers(#20018,#20001)
+#20018=@"var;{this};{#20000}"
+variables(#20018,"this",#20000)
 #20019=*
-exprs(#20019,63,#20018,0,"(class Point {})")
+stmts(#20019,2,#20001,0,"(class Point {})")
 hasLocation(#20019,#20003)
-enclosing_stmt(#20019,#20018)
-expr_containers(#20019,#20001)
+stmt_containers(#20019,#20001)
 #20020=*
-exprs(#20020,80,#20019,0,"class Point {}")
-#20021=@"loc,{#10000},1,2,1,15"
-locations_default(#20021,#10000,1,2,1,15)
-hasLocation(#20020,#20021)
-enclosing_stmt(#20020,#20018)
+exprs(#20020,63,#20019,0,"(class Point {})")
+hasLocation(#20020,#20003)
+enclosing_stmt(#20020,#20019)
 expr_containers(#20020,#20001)
-#20022=*
-scopes(#20022,8)
-scopenodes(#20020,#20022)
-scopenesting(#20022,#20000)
-#20023=@"var;{Point};{#20022}"
-variables(#20023,"Point",#20022)
-#20024=@"local_type_name;{Point};{#20022}"
-local_type_names(#20024,"Point",#20022)
-#20025=*
-exprs(#20025,78,#20020,0,"Point")
-hasLocation(#20025,#20009)
-enclosing_stmt(#20025,#20018)
-expr_containers(#20025,#20001)
-literals("Point","Point",#20025)
-decl(#20025,#20023)
-typedecl(#20025,#20024)
-#20026=*
-properties(#20026,#20020,2,0,"constructor() {}")
-#20027=@"loc,{#10000},1,14,1,13"
-locations_default(#20027,#10000,1,14,1,13)
-hasLocation(#20026,#20027)
+#20021=*
+exprs(#20021,80,#20020,0,"class Point {}")
+#20022=@"loc,{#10000},1,2,1,15"
+locations_default(#20022,#10000,1,2,1,15)
+hasLocation(#20021,#20022)
+enclosing_stmt(#20021,#20019)
+expr_containers(#20021,#20001)
+#20023=*
+scopes(#20023,8)
+scopenodes(#20021,#20023)
+scopenesting(#20023,#20000)
+#20024=@"var;{this};{#20023}"
+variables(#20024,"this",#20023)
+#20025=@"var;{Point};{#20023}"
+variables(#20025,"Point",#20023)
+#20026=@"local_type_name;{Point};{#20023}"
+local_type_names(#20026,"Point",#20023)
+#20027=*
+exprs(#20027,78,#20021,0,"Point")
+hasLocation(#20027,#20009)
+enclosing_stmt(#20027,#20019)
+expr_containers(#20027,#20001)
+literals("Point","Point",#20027)
+decl(#20027,#20025)
+typedecl(#20027,#20026)
 #20028=*
-exprs(#20028,0,#20026,0,"constructor")
-hasLocation(#20028,#20027)
-enclosing_stmt(#20028,#20018)
-expr_containers(#20028,#20001)
-literals("constructor","constructor",#20028)
-#20029=*
-exprs(#20029,9,#20026,1,"() {}")
-hasLocation(#20029,#20027)
-enclosing_stmt(#20029,#20018)
-expr_containers(#20029,#20001)
+properties(#20028,#20021,2,0,"constructor() {}")
+#20029=@"loc,{#10000},1,14,1,13"
+locations_default(#20029,#10000,1,14,1,13)
+hasLocation(#20028,#20029)
 #20030=*
-scopes(#20030,1)
-scopenodes(#20029,#20030)
-scopenesting(#20030,#20022)
-#20031=@"var;{arguments};{#20030}"
-variables(#20031,"arguments",#20030)
-is_arguments_object(#20031)
+exprs(#20030,0,#20028,0,"constructor")
+hasLocation(#20030,#20029)
+enclosing_stmt(#20030,#20019)
+expr_containers(#20030,#20001)
+literals("constructor","constructor",#20030)
+#20031=*
+exprs(#20031,9,#20028,1,"() {}")
+hasLocation(#20031,#20029)
+enclosing_stmt(#20031,#20019)
+expr_containers(#20031,#20001)
 #20032=*
-stmts(#20032,1,#20029,-2,"{}")
-hasLocation(#20032,#20027)
-stmt_containers(#20032,#20029)
-is_method(#20026)
-#20033=*
-entry_cfg_node(#20033,#20001)
-#20034=@"loc,{#10000},1,1,1,0"
-locations_default(#20034,#10000,1,1,1,0)
-hasLocation(#20033,#20034)
+scopes(#20032,1)
+scopenodes(#20031,#20032)
+scopenesting(#20032,#20023)
+#20033=@"var;{this};{#20032}"
+variables(#20033,"this",#20032)
+#20034=@"var;{arguments};{#20032}"
+variables(#20034,"arguments",#20032)
+is_arguments_object(#20034)
 #20035=*
-exit_cfg_node(#20035,#20001)
-hasLocation(#20035,#20017)
-successor(#20018,#20019)
-successor(#20019,#20025)
-successor(#20029,#20026)
+stmts(#20035,1,#20031,-2,"{}")
+hasLocation(#20035,#20029)
+stmt_containers(#20035,#20031)
+is_method(#20028)
 #20036=*
-entry_cfg_node(#20036,#20029)
-hasLocation(#20036,#20027)
-#20037=*
-exit_cfg_node(#20037,#20029)
-hasLocation(#20037,#20027)
-successor(#20032,#20037)
-successor(#20036,#20032)
-successor(#20028,#20029)
-successor(#20026,#20020)
-successor(#20025,#20028)
-successor(#20020,#20035)
-successor(#20033,#20018)
+entry_cfg_node(#20036,#20001)
+#20037=@"loc,{#10000},1,1,1,0"
+locations_default(#20037,#10000,1,1,1,0)
+hasLocation(#20036,#20037)
+#20038=*
+exit_cfg_node(#20038,#20001)
+hasLocation(#20038,#20017)
+successor(#20019,#20020)
+successor(#20020,#20027)
+successor(#20031,#20028)
+#20039=*
+entry_cfg_node(#20039,#20031)
+hasLocation(#20039,#20029)
+#20040=*
+exit_cfg_node(#20040,#20031)
+hasLocation(#20040,#20029)
+successor(#20035,#20040)
+successor(#20039,#20035)
+successor(#20030,#20031)
+successor(#20028,#20021)
+successor(#20027,#20030)
+successor(#20021,#20038)
+successor(#20036,#20019)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap b/javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap
index 0380ce770f4..070cba610dc 100644
--- a/javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/classexpr2.js.trap
@@ -47,72 +47,82 @@ locations_default(#20015,#10000,1,17,1,16)
 hasLocation(#20014,#20015)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20016=*
-stmts(#20016,2,#20001,0,"(class       {})")
-hasLocation(#20016,#20003)
-stmt_containers(#20016,#20001)
+#20016=@"var;{this};{#20000}"
+variables(#20016,"this",#20000)
 #20017=*
-exprs(#20017,63,#20016,0,"(class       {})")
+stmts(#20017,2,#20001,0,"(class       {})")
 hasLocation(#20017,#20003)
-enclosing_stmt(#20017,#20016)
-expr_containers(#20017,#20001)
+stmt_containers(#20017,#20001)
 #20018=*
-exprs(#20018,80,#20017,0,"class       {}")
-#20019=@"loc,{#10000},1,2,1,15"
-locations_default(#20019,#10000,1,2,1,15)
-hasLocation(#20018,#20019)
-enclosing_stmt(#20018,#20016)
+exprs(#20018,63,#20017,0,"(class       {})")
+hasLocation(#20018,#20003)
+enclosing_stmt(#20018,#20017)
 expr_containers(#20018,#20001)
-#20020=*
-properties(#20020,#20018,2,0,"constructor() {}")
-#20021=@"loc,{#10000},1,14,1,13"
-locations_default(#20021,#10000,1,14,1,13)
-hasLocation(#20020,#20021)
-#20022=*
-exprs(#20022,0,#20020,0,"constructor")
-hasLocation(#20022,#20021)
-enclosing_stmt(#20022,#20016)
-expr_containers(#20022,#20001)
-literals("constructor","constructor",#20022)
+#20019=*
+exprs(#20019,80,#20018,0,"class       {}")
+#20020=@"loc,{#10000},1,2,1,15"
+locations_default(#20020,#10000,1,2,1,15)
+hasLocation(#20019,#20020)
+enclosing_stmt(#20019,#20017)
+expr_containers(#20019,#20001)
+#20021=*
+scopes(#20021,8)
+scopenodes(#20019,#20021)
+scopenesting(#20021,#20000)
+#20022=@"var;{this};{#20021}"
+variables(#20022,"this",#20021)
 #20023=*
-exprs(#20023,9,#20020,1,"() {}")
-hasLocation(#20023,#20021)
-enclosing_stmt(#20023,#20016)
-expr_containers(#20023,#20001)
-#20024=*
-scopes(#20024,1)
-scopenodes(#20023,#20024)
-scopenesting(#20024,#20000)
-#20025=@"var;{arguments};{#20024}"
-variables(#20025,"arguments",#20024)
-is_arguments_object(#20025)
+properties(#20023,#20019,2,0,"constructor() {}")
+#20024=@"loc,{#10000},1,14,1,13"
+locations_default(#20024,#10000,1,14,1,13)
+hasLocation(#20023,#20024)
+#20025=*
+exprs(#20025,0,#20023,0,"constructor")
+hasLocation(#20025,#20024)
+enclosing_stmt(#20025,#20017)
+expr_containers(#20025,#20001)
+literals("constructor","constructor",#20025)
 #20026=*
-stmts(#20026,1,#20023,-2,"{}")
-hasLocation(#20026,#20021)
-stmt_containers(#20026,#20023)
-is_method(#20020)
+exprs(#20026,9,#20023,1,"() {}")
+hasLocation(#20026,#20024)
+enclosing_stmt(#20026,#20017)
+expr_containers(#20026,#20001)
 #20027=*
-entry_cfg_node(#20027,#20001)
-#20028=@"loc,{#10000},1,1,1,0"
-locations_default(#20028,#10000,1,1,1,0)
-hasLocation(#20027,#20028)
-#20029=*
-exit_cfg_node(#20029,#20001)
-hasLocation(#20029,#20015)
-successor(#20016,#20017)
-successor(#20017,#20022)
-successor(#20023,#20020)
+scopes(#20027,1)
+scopenodes(#20026,#20027)
+scopenesting(#20027,#20021)
+#20028=@"var;{this};{#20027}"
+variables(#20028,"this",#20027)
+#20029=@"var;{arguments};{#20027}"
+variables(#20029,"arguments",#20027)
+is_arguments_object(#20029)
 #20030=*
-entry_cfg_node(#20030,#20023)
-hasLocation(#20030,#20021)
+stmts(#20030,1,#20026,-2,"{}")
+hasLocation(#20030,#20024)
+stmt_containers(#20030,#20026)
+is_method(#20023)
 #20031=*
-exit_cfg_node(#20031,#20023)
-hasLocation(#20031,#20021)
-successor(#20026,#20031)
-successor(#20030,#20026)
-successor(#20022,#20023)
-successor(#20020,#20018)
-successor(#20018,#20029)
-successor(#20027,#20016)
+entry_cfg_node(#20031,#20001)
+#20032=@"loc,{#10000},1,1,1,0"
+locations_default(#20032,#10000,1,1,1,0)
+hasLocation(#20031,#20032)
+#20033=*
+exit_cfg_node(#20033,#20001)
+hasLocation(#20033,#20015)
+successor(#20017,#20018)
+successor(#20018,#20025)
+successor(#20026,#20023)
+#20034=*
+entry_cfg_node(#20034,#20026)
+hasLocation(#20034,#20024)
+#20035=*
+exit_cfg_node(#20035,#20026)
+hasLocation(#20035,#20024)
+successor(#20030,#20035)
+successor(#20034,#20030)
+successor(#20025,#20026)
+successor(#20023,#20019)
+successor(#20019,#20033)
+successor(#20031,#20017)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/complex_array_pattern.js.trap b/javascript/extractor/tests/es2015/output/trap/complex_array_pattern.js.trap
index 2d46f91bfbb..8a982130490 100644
--- a/javascript/extractor/tests/es2015/output/trap/complex_array_pattern.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/complex_array_pattern.js.trap
@@ -72,77 +72,79 @@ locations_default(#20025,#10000,1,14,1,13)
 hasLocation(#20024,#20025)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20026=*
-stmts(#20026,2,#20001,0,"[o.x] = [42];")
-hasLocation(#20026,#20003)
-stmt_containers(#20026,#20001)
+#20026=@"var;{this};{#20000}"
+variables(#20026,"this",#20000)
 #20027=*
-exprs(#20027,47,#20026,0,"[o.x] = [42]")
-#20028=@"loc,{#10000},1,1,1,12"
-locations_default(#20028,#10000,1,1,1,12)
-hasLocation(#20027,#20028)
-enclosing_stmt(#20027,#20026)
-expr_containers(#20027,#20001)
-#20029=*
-exprs(#20029,67,#20027,0,"[o.x]")
-#20030=@"loc,{#10000},1,1,1,5"
-locations_default(#20030,#10000,1,1,1,5)
-hasLocation(#20029,#20030)
-enclosing_stmt(#20029,#20026)
-expr_containers(#20029,#20001)
-#20031=*
-exprs(#20031,14,#20029,0,"o.x")
-#20032=@"loc,{#10000},1,2,1,4"
-locations_default(#20032,#10000,1,2,1,4)
-hasLocation(#20031,#20032)
-enclosing_stmt(#20031,#20026)
-expr_containers(#20031,#20001)
-#20033=*
-exprs(#20033,79,#20031,0,"o")
-hasLocation(#20033,#20007)
-enclosing_stmt(#20033,#20026)
-expr_containers(#20033,#20001)
-literals("o","o",#20033)
-#20034=@"var;{o};{#20000}"
-variables(#20034,"o",#20000)
-bind(#20033,#20034)
-#20035=*
-exprs(#20035,0,#20031,1,"x")
-hasLocation(#20035,#20011)
-enclosing_stmt(#20035,#20026)
-expr_containers(#20035,#20001)
-literals("x","x",#20035)
-array_size(#20029,1)
+stmts(#20027,2,#20001,0,"[o.x] = [42];")
+hasLocation(#20027,#20003)
+stmt_containers(#20027,#20001)
+#20028=*
+exprs(#20028,47,#20027,0,"[o.x] = [42]")
+#20029=@"loc,{#10000},1,1,1,12"
+locations_default(#20029,#10000,1,1,1,12)
+hasLocation(#20028,#20029)
+enclosing_stmt(#20028,#20027)
+expr_containers(#20028,#20001)
+#20030=*
+exprs(#20030,67,#20028,0,"[o.x]")
+#20031=@"loc,{#10000},1,1,1,5"
+locations_default(#20031,#10000,1,1,1,5)
+hasLocation(#20030,#20031)
+enclosing_stmt(#20030,#20027)
+expr_containers(#20030,#20001)
+#20032=*
+exprs(#20032,14,#20030,0,"o.x")
+#20033=@"loc,{#10000},1,2,1,4"
+locations_default(#20033,#10000,1,2,1,4)
+hasLocation(#20032,#20033)
+enclosing_stmt(#20032,#20027)
+expr_containers(#20032,#20001)
+#20034=*
+exprs(#20034,79,#20032,0,"o")
+hasLocation(#20034,#20007)
+enclosing_stmt(#20034,#20027)
+expr_containers(#20034,#20001)
+literals("o","o",#20034)
+#20035=@"var;{o};{#20000}"
+variables(#20035,"o",#20000)
+bind(#20034,#20035)
 #20036=*
-exprs(#20036,7,#20027,1,"[42]")
-#20037=@"loc,{#10000},1,9,1,12"
-locations_default(#20037,#10000,1,9,1,12)
-hasLocation(#20036,#20037)
-enclosing_stmt(#20036,#20026)
+exprs(#20036,0,#20032,1,"x")
+hasLocation(#20036,#20011)
+enclosing_stmt(#20036,#20027)
 expr_containers(#20036,#20001)
-#20038=*
-exprs(#20038,3,#20036,0,"42")
-hasLocation(#20038,#20019)
-enclosing_stmt(#20038,#20026)
-expr_containers(#20038,#20001)
-literals("42","42",#20038)
-array_size(#20036,1)
+literals("x","x",#20036)
+array_size(#20030,1)
+#20037=*
+exprs(#20037,7,#20028,1,"[42]")
+#20038=@"loc,{#10000},1,9,1,12"
+locations_default(#20038,#10000,1,9,1,12)
+hasLocation(#20037,#20038)
+enclosing_stmt(#20037,#20027)
+expr_containers(#20037,#20001)
 #20039=*
-entry_cfg_node(#20039,#20001)
-#20040=@"loc,{#10000},1,1,1,0"
-locations_default(#20040,#10000,1,1,1,0)
-hasLocation(#20039,#20040)
-#20041=*
-exit_cfg_node(#20041,#20001)
-hasLocation(#20041,#20025)
-successor(#20026,#20036)
-successor(#20029,#20033)
-successor(#20035,#20031)
-successor(#20033,#20035)
-successor(#20031,#20027)
-successor(#20036,#20038)
-successor(#20038,#20029)
-successor(#20027,#20041)
-successor(#20039,#20026)
+exprs(#20039,3,#20037,0,"42")
+hasLocation(#20039,#20019)
+enclosing_stmt(#20039,#20027)
+expr_containers(#20039,#20001)
+literals("42","42",#20039)
+array_size(#20037,1)
+#20040=*
+entry_cfg_node(#20040,#20001)
+#20041=@"loc,{#10000},1,1,1,0"
+locations_default(#20041,#10000,1,1,1,0)
+hasLocation(#20040,#20041)
+#20042=*
+exit_cfg_node(#20042,#20001)
+hasLocation(#20042,#20025)
+successor(#20027,#20037)
+successor(#20030,#20034)
+successor(#20036,#20032)
+successor(#20034,#20036)
+successor(#20032,#20028)
+successor(#20037,#20039)
+successor(#20039,#20030)
+successor(#20028,#20042)
+successor(#20040,#20027)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/complex_object_pattern.js.trap b/javascript/extractor/tests/es2015/output/trap/complex_object_pattern.js.trap
index aff5d4f9957..8239f4aaa21 100644
--- a/javascript/extractor/tests/es2015/output/trap/complex_object_pattern.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/complex_object_pattern.js.trap
@@ -82,91 +82,93 @@ locations_default(#20029,#10000,1,18,1,17)
 hasLocation(#20028,#20029)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20030=*
-stmts(#20030,2,#20001,0,"({ x: o.x } = q);")
-hasLocation(#20030,#20003)
-stmt_containers(#20030,#20001)
+#20030=@"var;{this};{#20000}"
+variables(#20030,"this",#20000)
 #20031=*
-exprs(#20031,63,#20030,0,"({ x: o.x } = q)")
-#20032=@"loc,{#10000},1,1,1,16"
-locations_default(#20032,#10000,1,1,1,16)
-hasLocation(#20031,#20032)
-enclosing_stmt(#20031,#20030)
-expr_containers(#20031,#20001)
-#20033=*
-exprs(#20033,47,#20031,0,"{ x: o.x } = q")
-#20034=@"loc,{#10000},1,2,1,15"
-locations_default(#20034,#10000,1,2,1,15)
-hasLocation(#20033,#20034)
-enclosing_stmt(#20033,#20030)
-expr_containers(#20033,#20001)
-#20035=*
-exprs(#20035,68,#20033,0,"{ x: o.x }")
-#20036=@"loc,{#10000},1,2,1,11"
-locations_default(#20036,#10000,1,2,1,11)
-hasLocation(#20035,#20036)
-enclosing_stmt(#20035,#20030)
-expr_containers(#20035,#20001)
-#20037=*
-properties(#20037,#20035,0,0,"x: o.x")
-#20038=@"loc,{#10000},1,4,1,9"
-locations_default(#20038,#10000,1,4,1,9)
-hasLocation(#20037,#20038)
-#20039=*
-exprs(#20039,0,#20037,0,"x")
-hasLocation(#20039,#20009)
-enclosing_stmt(#20039,#20030)
-expr_containers(#20039,#20001)
-literals("x","x",#20039)
+stmts(#20031,2,#20001,0,"({ x: o.x } = q);")
+hasLocation(#20031,#20003)
+stmt_containers(#20031,#20001)
+#20032=*
+exprs(#20032,63,#20031,0,"({ x: o.x } = q)")
+#20033=@"loc,{#10000},1,1,1,16"
+locations_default(#20033,#10000,1,1,1,16)
+hasLocation(#20032,#20033)
+enclosing_stmt(#20032,#20031)
+expr_containers(#20032,#20001)
+#20034=*
+exprs(#20034,47,#20032,0,"{ x: o.x } = q")
+#20035=@"loc,{#10000},1,2,1,15"
+locations_default(#20035,#10000,1,2,1,15)
+hasLocation(#20034,#20035)
+enclosing_stmt(#20034,#20031)
+expr_containers(#20034,#20001)
+#20036=*
+exprs(#20036,68,#20034,0,"{ x: o.x }")
+#20037=@"loc,{#10000},1,2,1,11"
+locations_default(#20037,#10000,1,2,1,11)
+hasLocation(#20036,#20037)
+enclosing_stmt(#20036,#20031)
+expr_containers(#20036,#20001)
+#20038=*
+properties(#20038,#20036,0,0,"x: o.x")
+#20039=@"loc,{#10000},1,4,1,9"
+locations_default(#20039,#10000,1,4,1,9)
+hasLocation(#20038,#20039)
 #20040=*
-exprs(#20040,14,#20037,1,"o.x")
-#20041=@"loc,{#10000},1,7,1,9"
-locations_default(#20041,#10000,1,7,1,9)
-hasLocation(#20040,#20041)
-enclosing_stmt(#20040,#20030)
+exprs(#20040,0,#20038,0,"x")
+hasLocation(#20040,#20009)
+enclosing_stmt(#20040,#20031)
 expr_containers(#20040,#20001)
-#20042=*
-exprs(#20042,79,#20040,0,"o")
-hasLocation(#20042,#20013)
-enclosing_stmt(#20042,#20030)
-expr_containers(#20042,#20001)
-literals("o","o",#20042)
-#20043=@"var;{o};{#20000}"
-variables(#20043,"o",#20000)
-bind(#20042,#20043)
-#20044=*
-exprs(#20044,0,#20040,1,"x")
-hasLocation(#20044,#20017)
-enclosing_stmt(#20044,#20030)
-expr_containers(#20044,#20001)
-literals("x","x",#20044)
+literals("x","x",#20040)
+#20041=*
+exprs(#20041,14,#20038,1,"o.x")
+#20042=@"loc,{#10000},1,7,1,9"
+locations_default(#20042,#10000,1,7,1,9)
+hasLocation(#20041,#20042)
+enclosing_stmt(#20041,#20031)
+expr_containers(#20041,#20001)
+#20043=*
+exprs(#20043,79,#20041,0,"o")
+hasLocation(#20043,#20013)
+enclosing_stmt(#20043,#20031)
+expr_containers(#20043,#20001)
+literals("o","o",#20043)
+#20044=@"var;{o};{#20000}"
+variables(#20044,"o",#20000)
+bind(#20043,#20044)
 #20045=*
-exprs(#20045,79,#20033,1,"q")
-hasLocation(#20045,#20023)
-enclosing_stmt(#20045,#20030)
+exprs(#20045,0,#20041,1,"x")
+hasLocation(#20045,#20017)
+enclosing_stmt(#20045,#20031)
 expr_containers(#20045,#20001)
-literals("q","q",#20045)
-#20046=@"var;{q};{#20000}"
-variables(#20046,"q",#20000)
-bind(#20045,#20046)
-#20047=*
-entry_cfg_node(#20047,#20001)
-#20048=@"loc,{#10000},1,1,1,0"
-locations_default(#20048,#10000,1,1,1,0)
-hasLocation(#20047,#20048)
-#20049=*
-exit_cfg_node(#20049,#20001)
-hasLocation(#20049,#20029)
-successor(#20030,#20031)
-successor(#20031,#20045)
-successor(#20035,#20039)
-successor(#20044,#20040)
-successor(#20042,#20044)
-successor(#20040,#20037)
-successor(#20039,#20042)
-successor(#20037,#20033)
-successor(#20045,#20035)
-successor(#20033,#20049)
-successor(#20047,#20030)
+literals("x","x",#20045)
+#20046=*
+exprs(#20046,79,#20034,1,"q")
+hasLocation(#20046,#20023)
+enclosing_stmt(#20046,#20031)
+expr_containers(#20046,#20001)
+literals("q","q",#20046)
+#20047=@"var;{q};{#20000}"
+variables(#20047,"q",#20000)
+bind(#20046,#20047)
+#20048=*
+entry_cfg_node(#20048,#20001)
+#20049=@"loc,{#10000},1,1,1,0"
+locations_default(#20049,#10000,1,1,1,0)
+hasLocation(#20048,#20049)
+#20050=*
+exit_cfg_node(#20050,#20001)
+hasLocation(#20050,#20029)
+successor(#20031,#20032)
+successor(#20032,#20046)
+successor(#20036,#20040)
+successor(#20045,#20041)
+successor(#20043,#20045)
+successor(#20041,#20038)
+successor(#20040,#20043)
+successor(#20038,#20034)
+successor(#20046,#20036)
+successor(#20034,#20050)
+successor(#20048,#20031)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/const.js.trap b/javascript/extractor/tests/es2015/output/trap/const.js.trap
index 08a72521d89..8aeb647ec39 100644
--- a/javascript/extractor/tests/es2015/output/trap/const.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/const.js.trap
@@ -52,42 +52,44 @@ locations_default(#20016,#10000,1,1,2,0)
 hasLocation(#20001,#20016)
 #20017=@"var;{x};{#20000}"
 variables(#20017,"x",#20000)
-#20018=*
-stmts(#20018,22,#20001,0,"const x = 23;")
-hasLocation(#20018,#20003)
-stmt_containers(#20018,#20001)
+#20018=@"var;{this};{#20000}"
+variables(#20018,"this",#20000)
 #20019=*
-exprs(#20019,64,#20018,0,"x = 23")
-#20020=@"loc,{#10000},1,7,1,12"
-locations_default(#20020,#10000,1,7,1,12)
-hasLocation(#20019,#20020)
-enclosing_stmt(#20019,#20018)
-expr_containers(#20019,#20001)
-#20021=*
-exprs(#20021,78,#20019,0,"x")
-hasLocation(#20021,#20007)
-enclosing_stmt(#20021,#20018)
-expr_containers(#20021,#20001)
-literals("x","x",#20021)
-decl(#20021,#20017)
+stmts(#20019,22,#20001,0,"const x = 23;")
+hasLocation(#20019,#20003)
+stmt_containers(#20019,#20001)
+#20020=*
+exprs(#20020,64,#20019,0,"x = 23")
+#20021=@"loc,{#10000},1,7,1,12"
+locations_default(#20021,#10000,1,7,1,12)
+hasLocation(#20020,#20021)
+enclosing_stmt(#20020,#20019)
+expr_containers(#20020,#20001)
 #20022=*
-exprs(#20022,3,#20019,1,"23")
-hasLocation(#20022,#20011)
-enclosing_stmt(#20022,#20018)
+exprs(#20022,78,#20020,0,"x")
+hasLocation(#20022,#20007)
+enclosing_stmt(#20022,#20019)
 expr_containers(#20022,#20001)
-literals("23","23",#20022)
+literals("x","x",#20022)
+decl(#20022,#20017)
 #20023=*
-entry_cfg_node(#20023,#20001)
-#20024=@"loc,{#10000},1,1,1,0"
-locations_default(#20024,#10000,1,1,1,0)
-hasLocation(#20023,#20024)
-#20025=*
-exit_cfg_node(#20025,#20001)
-hasLocation(#20025,#20015)
-successor(#20018,#20021)
-successor(#20022,#20019)
-successor(#20021,#20022)
-successor(#20019,#20025)
-successor(#20023,#20018)
+exprs(#20023,3,#20020,1,"23")
+hasLocation(#20023,#20011)
+enclosing_stmt(#20023,#20019)
+expr_containers(#20023,#20001)
+literals("23","23",#20023)
+#20024=*
+entry_cfg_node(#20024,#20001)
+#20025=@"loc,{#10000},1,1,1,0"
+locations_default(#20025,#10000,1,1,1,0)
+hasLocation(#20024,#20025)
+#20026=*
+exit_cfg_node(#20026,#20001)
+hasLocation(#20026,#20015)
+successor(#20019,#20022)
+successor(#20023,#20020)
+successor(#20022,#20023)
+successor(#20020,#20026)
+successor(#20024,#20019)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/defaultargs.js.trap b/javascript/extractor/tests/es2015/output/trap/defaultargs.js.trap
index 00a6d7b38a5..33dfffbac9b 100644
--- a/javascript/extractor/tests/es2015/output/trap/defaultargs.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/defaultargs.js.trap
@@ -89,85 +89,89 @@ toplevels(#20001,0)
 hasLocation(#20001,#20003)
 #20032=@"var;{f};{#20000}"
 variables(#20032,"f",#20000)
-#20033=*
-stmts(#20033,17,#20001,0,"functio ... +19) {}")
-hasLocation(#20033,#20003)
-stmt_containers(#20033,#20001)
+#20033=@"var;{this};{#20000}"
+variables(#20033,"this",#20000)
 #20034=*
-exprs(#20034,78,#20033,-1,"f")
-hasLocation(#20034,#20007)
-expr_containers(#20034,#20033)
-literals("f","f",#20034)
-decl(#20034,#20032)
+stmts(#20034,17,#20001,0,"functio ... +19) {}")
+hasLocation(#20034,#20003)
+stmt_containers(#20034,#20001)
 #20035=*
-scopes(#20035,1)
-scopenodes(#20033,#20035)
-scopenesting(#20035,#20000)
-#20036=@"var;{x};{#20035}"
-variables(#20036,"x",#20035)
-#20037=*
-exprs(#20037,78,#20033,0,"x")
-hasLocation(#20037,#20011)
-expr_containers(#20037,#20033)
-literals("x","x",#20037)
-decl(#20037,#20036)
-#20038=@"var;{y};{#20035}"
-variables(#20038,"y",#20035)
+exprs(#20035,78,#20034,-1,"f")
+hasLocation(#20035,#20007)
+expr_containers(#20035,#20034)
+literals("f","f",#20035)
+decl(#20035,#20032)
+#20036=*
+scopes(#20036,1)
+scopenodes(#20034,#20036)
+scopenesting(#20036,#20000)
+#20037=@"var;{this};{#20036}"
+variables(#20037,"this",#20036)
+#20038=@"var;{x};{#20036}"
+variables(#20038,"x",#20036)
 #20039=*
-exprs(#20039,78,#20033,1,"y")
-hasLocation(#20039,#20015)
-expr_containers(#20039,#20033)
-literals("y","y",#20039)
+exprs(#20039,78,#20034,0,"x")
+hasLocation(#20039,#20011)
+expr_containers(#20039,#20034)
+literals("x","x",#20039)
 decl(#20039,#20038)
-#20040=@"var;{arguments};{#20035}"
-variables(#20040,"arguments",#20035)
-is_arguments_object(#20040)
+#20040=@"var;{y};{#20036}"
+variables(#20040,"y",#20036)
 #20041=*
-exprs(#20041,34,#20033,-9,"x+19")
-#20042=@"loc,{#10000},1,17,1,20"
-locations_default(#20042,#10000,1,17,1,20)
-hasLocation(#20041,#20042)
-expr_containers(#20041,#20033)
+exprs(#20041,78,#20034,1,"y")
+hasLocation(#20041,#20015)
+expr_containers(#20041,#20034)
+literals("y","y",#20041)
+decl(#20041,#20040)
+#20042=@"var;{arguments};{#20036}"
+variables(#20042,"arguments",#20036)
+is_arguments_object(#20042)
 #20043=*
-exprs(#20043,79,#20041,0,"x")
-hasLocation(#20043,#20019)
-expr_containers(#20043,#20033)
-literals("x","x",#20043)
-bind(#20043,#20036)
-#20044=*
-exprs(#20044,3,#20041,1,"19")
-hasLocation(#20044,#20023)
-expr_containers(#20044,#20033)
-literals("19","19",#20044)
+exprs(#20043,34,#20034,-9,"x+19")
+#20044=@"loc,{#10000},1,17,1,20"
+locations_default(#20044,#10000,1,17,1,20)
+hasLocation(#20043,#20044)
+expr_containers(#20043,#20034)
 #20045=*
-stmts(#20045,1,#20033,-2,"{}")
-#20046=@"loc,{#10000},1,23,1,24"
-locations_default(#20046,#10000,1,23,1,24)
-hasLocation(#20045,#20046)
-stmt_containers(#20045,#20033)
+exprs(#20045,79,#20043,0,"x")
+hasLocation(#20045,#20019)
+expr_containers(#20045,#20034)
+literals("x","x",#20045)
+bind(#20045,#20038)
+#20046=*
+exprs(#20046,3,#20043,1,"19")
+hasLocation(#20046,#20023)
+expr_containers(#20046,#20034)
+literals("19","19",#20046)
 #20047=*
-entry_cfg_node(#20047,#20001)
-#20048=@"loc,{#10000},1,1,1,0"
-locations_default(#20048,#10000,1,1,1,0)
+stmts(#20047,1,#20034,-2,"{}")
+#20048=@"loc,{#10000},1,23,1,24"
+locations_default(#20048,#10000,1,23,1,24)
 hasLocation(#20047,#20048)
+stmt_containers(#20047,#20034)
 #20049=*
-exit_cfg_node(#20049,#20001)
-hasLocation(#20049,#20031)
-successor(#20033,#20049)
-#20050=*
-entry_cfg_node(#20050,#20033)
-hasLocation(#20050,#20048)
+entry_cfg_node(#20049,#20001)
+#20050=@"loc,{#10000},1,1,1,0"
+locations_default(#20050,#10000,1,1,1,0)
+hasLocation(#20049,#20050)
 #20051=*
-exit_cfg_node(#20051,#20033)
+exit_cfg_node(#20051,#20001)
 hasLocation(#20051,#20031)
-successor(#20045,#20051)
+successor(#20034,#20051)
+#20052=*
+entry_cfg_node(#20052,#20034)
+hasLocation(#20052,#20050)
+#20053=*
+exit_cfg_node(#20053,#20034)
+hasLocation(#20053,#20031)
+successor(#20047,#20053)
+successor(#20041,#20047)
+successor(#20046,#20043)
+successor(#20045,#20046)
+successor(#20043,#20041)
 successor(#20039,#20045)
-successor(#20044,#20041)
-successor(#20043,#20044)
-successor(#20041,#20039)
-successor(#20037,#20043)
-successor(#20050,#20037)
-successor(#20034,#20033)
-successor(#20047,#20034)
+successor(#20052,#20039)
+successor(#20035,#20034)
+successor(#20049,#20035)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/delegating_yield.js.trap b/javascript/extractor/tests/es2015/output/trap/delegating_yield.js.trap
index 9b306a40f43..cfeecbafb90 100644
--- a/javascript/extractor/tests/es2015/output/trap/delegating_yield.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/delegating_yield.js.trap
@@ -102,82 +102,86 @@ locations_default(#20035,#10000,1,1,3,1)
 hasLocation(#20001,#20035)
 #20036=@"var;{f};{#20000}"
 variables(#20036,"f",#20000)
-#20037=*
-stmts(#20037,17,#20001,0,"functio ...  g();\n}")
-hasLocation(#20037,#20035)
-stmt_containers(#20037,#20001)
+#20037=@"var;{this};{#20000}"
+variables(#20037,"this",#20000)
 #20038=*
-exprs(#20038,78,#20037,-1,"f")
-hasLocation(#20038,#20013)
-expr_containers(#20038,#20037)
-literals("f","f",#20038)
-decl(#20038,#20036)
+stmts(#20038,17,#20001,0,"functio ...  g();\n}")
+hasLocation(#20038,#20035)
+stmt_containers(#20038,#20001)
 #20039=*
-scopes(#20039,1)
-scopenodes(#20037,#20039)
-scopenesting(#20039,#20000)
-#20040=@"var;{arguments};{#20039}"
-variables(#20040,"arguments",#20039)
-is_arguments_object(#20040)
-is_generator(#20037)
-#20041=*
-stmts(#20041,1,#20037,-2,"{\n    yield* g();\n}")
-#20042=@"loc,{#10000},1,15,3,1"
-locations_default(#20042,#10000,1,15,3,1)
-hasLocation(#20041,#20042)
-stmt_containers(#20041,#20037)
+exprs(#20039,78,#20038,-1,"f")
+hasLocation(#20039,#20013)
+expr_containers(#20039,#20038)
+literals("f","f",#20039)
+decl(#20039,#20036)
+#20040=*
+scopes(#20040,1)
+scopenodes(#20038,#20040)
+scopenesting(#20040,#20000)
+#20041=@"var;{this};{#20040}"
+variables(#20041,"this",#20040)
+#20042=@"var;{arguments};{#20040}"
+variables(#20042,"arguments",#20040)
+is_arguments_object(#20042)
+is_generator(#20038)
 #20043=*
-stmts(#20043,2,#20041,0,"yield* g();")
-#20044=@"loc,{#10000},2,5,2,15"
-locations_default(#20044,#10000,2,5,2,15)
+stmts(#20043,1,#20038,-2,"{\n    yield* g();\n}")
+#20044=@"loc,{#10000},1,15,3,1"
+locations_default(#20044,#10000,1,15,3,1)
 hasLocation(#20043,#20044)
-stmt_containers(#20043,#20037)
+stmt_containers(#20043,#20038)
 #20045=*
-exprs(#20045,69,#20043,0,"yield* g()")
-#20046=@"loc,{#10000},2,5,2,14"
-locations_default(#20046,#10000,2,5,2,14)
+stmts(#20045,2,#20043,0,"yield* g();")
+#20046=@"loc,{#10000},2,5,2,15"
+locations_default(#20046,#10000,2,5,2,15)
 hasLocation(#20045,#20046)
-enclosing_stmt(#20045,#20043)
-expr_containers(#20045,#20037)
+stmt_containers(#20045,#20038)
 #20047=*
-exprs(#20047,13,#20045,0,"g()")
-#20048=@"loc,{#10000},2,12,2,14"
-locations_default(#20048,#10000,2,12,2,14)
+exprs(#20047,69,#20045,0,"yield* g()")
+#20048=@"loc,{#10000},2,5,2,14"
+locations_default(#20048,#10000,2,5,2,14)
 hasLocation(#20047,#20048)
-enclosing_stmt(#20047,#20043)
-expr_containers(#20047,#20037)
+enclosing_stmt(#20047,#20045)
+expr_containers(#20047,#20038)
 #20049=*
-exprs(#20049,79,#20047,-1,"g")
-hasLocation(#20049,#20025)
-enclosing_stmt(#20049,#20043)
-expr_containers(#20049,#20037)
-literals("g","g",#20049)
-#20050=@"var;{g};{#20000}"
-variables(#20050,"g",#20000)
-bind(#20049,#20050)
-is_delegating(#20045)
+exprs(#20049,13,#20047,0,"g()")
+#20050=@"loc,{#10000},2,12,2,14"
+locations_default(#20050,#10000,2,12,2,14)
+hasLocation(#20049,#20050)
+enclosing_stmt(#20049,#20045)
+expr_containers(#20049,#20038)
 #20051=*
-entry_cfg_node(#20051,#20001)
-#20052=@"loc,{#10000},1,1,1,0"
-locations_default(#20052,#10000,1,1,1,0)
-hasLocation(#20051,#20052)
+exprs(#20051,79,#20049,-1,"g")
+hasLocation(#20051,#20025)
+enclosing_stmt(#20051,#20045)
+expr_containers(#20051,#20038)
+literals("g","g",#20051)
+#20052=@"var;{g};{#20000}"
+variables(#20052,"g",#20000)
+bind(#20051,#20052)
+is_delegating(#20047)
 #20053=*
-exit_cfg_node(#20053,#20001)
-hasLocation(#20053,#20034)
-successor(#20037,#20053)
-#20054=*
-entry_cfg_node(#20054,#20037)
-hasLocation(#20054,#20052)
+entry_cfg_node(#20053,#20001)
+#20054=@"loc,{#10000},1,1,1,0"
+locations_default(#20054,#10000,1,1,1,0)
+hasLocation(#20053,#20054)
 #20055=*
-exit_cfg_node(#20055,#20037)
+exit_cfg_node(#20055,#20001)
 hasLocation(#20055,#20034)
-successor(#20043,#20049)
+successor(#20038,#20055)
+#20056=*
+entry_cfg_node(#20056,#20038)
+hasLocation(#20056,#20054)
+#20057=*
+exit_cfg_node(#20057,#20038)
+hasLocation(#20057,#20034)
+successor(#20045,#20051)
+successor(#20051,#20049)
 successor(#20049,#20047)
-successor(#20047,#20045)
-successor(#20045,#20055)
-successor(#20041,#20043)
-successor(#20054,#20041)
-successor(#20038,#20037)
-successor(#20051,#20038)
+successor(#20047,#20057)
+successor(#20043,#20045)
+successor(#20056,#20043)
+successor(#20039,#20038)
+successor(#20053,#20039)
 numlines(#10000,3,3,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/destructuring.js.trap b/javascript/extractor/tests/es2015/output/trap/destructuring.js.trap
index 4677b4ce45b..493240593e8 100644
--- a/javascript/extractor/tests/es2015/output/trap/destructuring.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/destructuring.js.trap
@@ -469,415 +469,421 @@ hasLocation(#20001,#20174)
 variables(#20175,"f",#20000)
 #20176=@"var;{g};{#20000}"
 variables(#20176,"g",#20000)
-#20177=*
-stmts(#20177,17,#20001,0,"functio ... );\n\t}\n}")
-#20178=@"loc,{#10000},1,1,8,1"
-locations_default(#20178,#10000,1,1,8,1)
-hasLocation(#20177,#20178)
-stmt_containers(#20177,#20001)
-#20179=*
-exprs(#20179,78,#20177,-1,"f")
-hasLocation(#20179,#20031)
-expr_containers(#20179,#20177)
-literals("f","f",#20179)
-decl(#20179,#20175)
+#20177=@"var;{this};{#20000}"
+variables(#20177,"this",#20000)
+#20178=*
+stmts(#20178,17,#20001,0,"functio ... );\n\t}\n}")
+#20179=@"loc,{#10000},1,1,8,1"
+locations_default(#20179,#10000,1,1,8,1)
+hasLocation(#20178,#20179)
+stmt_containers(#20178,#20001)
 #20180=*
-scopes(#20180,1)
-scopenodes(#20177,#20180)
-scopenesting(#20180,#20000)
-#20181=@"var;{a};{#20180}"
-variables(#20181,"a",#20180)
-#20182=@"var;{c};{#20180}"
-variables(#20182,"c",#20180)
-#20183=@"var;{x};{#20180}"
-variables(#20183,"x",#20180)
-#20184=@"var;{y};{#20180}"
-variables(#20184,"y",#20180)
-#20185=*
-exprs(#20185,67,#20177,0,"[x, y]")
-#20186=@"loc,{#10000},1,12,1,17"
-locations_default(#20186,#10000,1,12,1,17)
-hasLocation(#20185,#20186)
-expr_containers(#20185,#20177)
+exprs(#20180,78,#20178,-1,"f")
+hasLocation(#20180,#20031)
+expr_containers(#20180,#20178)
+literals("f","f",#20180)
+decl(#20180,#20175)
+#20181=*
+scopes(#20181,1)
+scopenodes(#20178,#20181)
+scopenesting(#20181,#20000)
+#20182=@"var;{a};{#20181}"
+variables(#20182,"a",#20181)
+#20183=@"var;{c};{#20181}"
+variables(#20183,"c",#20181)
+#20184=@"var;{this};{#20181}"
+variables(#20184,"this",#20181)
+#20185=@"var;{x};{#20181}"
+variables(#20185,"x",#20181)
+#20186=@"var;{y};{#20181}"
+variables(#20186,"y",#20181)
 #20187=*
-exprs(#20187,78,#20185,0,"x")
-hasLocation(#20187,#20037)
-expr_containers(#20187,#20177)
-literals("x","x",#20187)
-decl(#20187,#20183)
-#20188=*
-exprs(#20188,78,#20185,1,"y")
-hasLocation(#20188,#20041)
-expr_containers(#20188,#20177)
-literals("y","y",#20188)
-decl(#20188,#20184)
-array_size(#20185,2)
-#20189=@"var;{arguments};{#20180}"
-variables(#20189,"arguments",#20180)
-is_arguments_object(#20189)
+exprs(#20187,67,#20178,0,"[x, y]")
+#20188=@"loc,{#10000},1,12,1,17"
+locations_default(#20188,#10000,1,12,1,17)
+hasLocation(#20187,#20188)
+expr_containers(#20187,#20178)
+#20189=*
+exprs(#20189,78,#20187,0,"x")
+hasLocation(#20189,#20037)
+expr_containers(#20189,#20178)
+literals("x","x",#20189)
+decl(#20189,#20185)
 #20190=*
-stmts(#20190,1,#20177,-2,"{\n\tvar  ... );\n\t}\n}")
-#20191=@"loc,{#10000},1,20,8,1"
-locations_default(#20191,#10000,1,20,8,1)
-hasLocation(#20190,#20191)
-stmt_containers(#20190,#20177)
+exprs(#20190,78,#20187,1,"y")
+hasLocation(#20190,#20041)
+expr_containers(#20190,#20178)
+literals("y","y",#20190)
+decl(#20190,#20186)
+array_size(#20187,2)
+#20191=@"var;{arguments};{#20181}"
+variables(#20191,"arguments",#20181)
+is_arguments_object(#20191)
 #20192=*
-stmts(#20192,18,#20190,0,"var [a, [, c]] = x;")
-#20193=@"loc,{#10000},2,2,2,20"
-locations_default(#20193,#10000,2,2,2,20)
+stmts(#20192,1,#20178,-2,"{\n\tvar  ... );\n\t}\n}")
+#20193=@"loc,{#10000},1,20,8,1"
+locations_default(#20193,#10000,1,20,8,1)
 hasLocation(#20192,#20193)
-stmt_containers(#20192,#20177)
+stmt_containers(#20192,#20178)
 #20194=*
-exprs(#20194,64,#20192,0,"[a, [, c]] = x")
-#20195=@"loc,{#10000},2,6,2,19"
-locations_default(#20195,#10000,2,6,2,19)
+stmts(#20194,18,#20192,0,"var [a, [, c]] = x;")
+#20195=@"loc,{#10000},2,2,2,20"
+locations_default(#20195,#10000,2,2,2,20)
 hasLocation(#20194,#20195)
-enclosing_stmt(#20194,#20192)
-expr_containers(#20194,#20177)
+stmt_containers(#20194,#20178)
 #20196=*
-exprs(#20196,67,#20194,0,"[a, [, c]]")
-#20197=@"loc,{#10000},2,6,2,15"
-locations_default(#20197,#10000,2,6,2,15)
+exprs(#20196,64,#20194,0,"[a, [, c]] = x")
+#20197=@"loc,{#10000},2,6,2,19"
+locations_default(#20197,#10000,2,6,2,19)
 hasLocation(#20196,#20197)
-enclosing_stmt(#20196,#20192)
-expr_containers(#20196,#20177)
+enclosing_stmt(#20196,#20194)
+expr_containers(#20196,#20178)
 #20198=*
-exprs(#20198,78,#20196,0,"a")
-hasLocation(#20198,#20053)
-enclosing_stmt(#20198,#20192)
-expr_containers(#20198,#20177)
-literals("a","a",#20198)
-decl(#20198,#20181)
-#20199=*
-exprs(#20199,67,#20196,1,"[, c]")
-#20200=@"loc,{#10000},2,10,2,14"
-locations_default(#20200,#10000,2,10,2,14)
-hasLocation(#20199,#20200)
-enclosing_stmt(#20199,#20192)
-expr_containers(#20199,#20177)
+exprs(#20198,67,#20196,0,"[a, [, c]]")
+#20199=@"loc,{#10000},2,6,2,15"
+locations_default(#20199,#10000,2,6,2,15)
+hasLocation(#20198,#20199)
+enclosing_stmt(#20198,#20194)
+expr_containers(#20198,#20178)
+#20200=*
+exprs(#20200,78,#20198,0,"a")
+hasLocation(#20200,#20053)
+enclosing_stmt(#20200,#20194)
+expr_containers(#20200,#20178)
+literals("a","a",#20200)
+decl(#20200,#20182)
 #20201=*
-exprs(#20201,78,#20199,1,"c")
-hasLocation(#20201,#20061)
-enclosing_stmt(#20201,#20192)
-expr_containers(#20201,#20177)
-literals("c","c",#20201)
-decl(#20201,#20182)
-array_size(#20199,2)
-array_size(#20196,2)
-#20202=*
-exprs(#20202,79,#20194,1,"x")
-hasLocation(#20202,#20069)
-enclosing_stmt(#20202,#20192)
-expr_containers(#20202,#20177)
-literals("x","x",#20202)
-bind(#20202,#20183)
+exprs(#20201,67,#20198,1,"[, c]")
+#20202=@"loc,{#10000},2,10,2,14"
+locations_default(#20202,#10000,2,10,2,14)
+hasLocation(#20201,#20202)
+enclosing_stmt(#20201,#20194)
+expr_containers(#20201,#20178)
 #20203=*
-stmts(#20203,11,#20190,1,"try {\n\t ... (d);\n\t}")
-#20204=@"loc,{#10000},3,2,7,2"
-locations_default(#20204,#10000,3,2,7,2)
-hasLocation(#20203,#20204)
-stmt_containers(#20203,#20177)
+exprs(#20203,78,#20201,1,"c")
+hasLocation(#20203,#20061)
+enclosing_stmt(#20203,#20194)
+expr_containers(#20203,#20178)
+literals("c","c",#20203)
+decl(#20203,#20183)
+array_size(#20201,2)
+array_size(#20198,2)
+#20204=*
+exprs(#20204,79,#20196,1,"x")
+hasLocation(#20204,#20069)
+enclosing_stmt(#20204,#20194)
+expr_containers(#20204,#20178)
+literals("x","x",#20204)
+bind(#20204,#20185)
 #20205=*
-stmts(#20205,1,#20203,0,"{\n\t\tthrow [a, c];\n\t}")
-#20206=@"loc,{#10000},3,6,5,2"
-locations_default(#20206,#10000,3,6,5,2)
+stmts(#20205,11,#20192,1,"try {\n\t ... (d);\n\t}")
+#20206=@"loc,{#10000},3,2,7,2"
+locations_default(#20206,#10000,3,2,7,2)
 hasLocation(#20205,#20206)
-stmt_containers(#20205,#20177)
+stmt_containers(#20205,#20178)
 #20207=*
-stmts(#20207,10,#20205,0,"throw [a, c];")
-#20208=@"loc,{#10000},4,3,4,15"
-locations_default(#20208,#10000,4,3,4,15)
+stmts(#20207,1,#20205,0,"{\n\t\tthrow [a, c];\n\t}")
+#20208=@"loc,{#10000},3,6,5,2"
+locations_default(#20208,#10000,3,6,5,2)
 hasLocation(#20207,#20208)
-stmt_containers(#20207,#20177)
+stmt_containers(#20207,#20178)
 #20209=*
-exprs(#20209,7,#20207,0,"[a, c]")
-#20210=@"loc,{#10000},4,9,4,14"
-locations_default(#20210,#10000,4,9,4,14)
+stmts(#20209,10,#20207,0,"throw [a, c];")
+#20210=@"loc,{#10000},4,3,4,15"
+locations_default(#20210,#10000,4,3,4,15)
 hasLocation(#20209,#20210)
-enclosing_stmt(#20209,#20207)
-expr_containers(#20209,#20177)
+stmt_containers(#20209,#20178)
 #20211=*
-exprs(#20211,79,#20209,0,"a")
-hasLocation(#20211,#20081)
-enclosing_stmt(#20211,#20207)
-expr_containers(#20211,#20177)
-literals("a","a",#20211)
-bind(#20211,#20181)
-#20212=*
-exprs(#20212,79,#20209,1,"c")
-hasLocation(#20212,#20085)
-enclosing_stmt(#20212,#20207)
-expr_containers(#20212,#20177)
-literals("c","c",#20212)
-bind(#20212,#20182)
-array_size(#20209,2)
+exprs(#20211,7,#20209,0,"[a, c]")
+#20212=@"loc,{#10000},4,9,4,14"
+locations_default(#20212,#10000,4,9,4,14)
+hasLocation(#20211,#20212)
+enclosing_stmt(#20211,#20209)
+expr_containers(#20211,#20178)
 #20213=*
-stmts(#20213,20,#20203,1,"catch ( ... (d);\n\t}")
-#20214=@"loc,{#10000},5,4,7,2"
-locations_default(#20214,#10000,5,4,7,2)
-hasLocation(#20213,#20214)
-stmt_containers(#20213,#20177)
+exprs(#20213,79,#20211,0,"a")
+hasLocation(#20213,#20081)
+enclosing_stmt(#20213,#20209)
+expr_containers(#20213,#20178)
+literals("a","a",#20213)
+bind(#20213,#20182)
+#20214=*
+exprs(#20214,79,#20211,1,"c")
+hasLocation(#20214,#20085)
+enclosing_stmt(#20214,#20209)
+expr_containers(#20214,#20178)
+literals("c","c",#20214)
+bind(#20214,#20183)
+array_size(#20211,2)
 #20215=*
-scopes(#20215,2)
-scopenodes(#20213,#20215)
-scopenesting(#20215,#20180)
-#20216=@"var;{d};{#20215}"
-variables(#20216,"d",#20215)
+stmts(#20215,20,#20205,1,"catch ( ... (d);\n\t}")
+#20216=@"loc,{#10000},5,4,7,2"
+locations_default(#20216,#10000,5,4,7,2)
+hasLocation(#20215,#20216)
+stmt_containers(#20215,#20178)
 #20217=*
-exprs(#20217,78,#20213,0,"d")
-hasLocation(#20217,#20097)
-enclosing_stmt(#20217,#20213)
-expr_containers(#20217,#20177)
-literals("d","d",#20217)
-decl(#20217,#20216)
-#20218=*
-stmts(#20218,1,#20213,1,"{\n\t\tcon ... (d);\n\t}")
-#20219=@"loc,{#10000},5,14,7,2"
-locations_default(#20219,#10000,5,14,7,2)
-hasLocation(#20218,#20219)
-stmt_containers(#20218,#20177)
+scopes(#20217,2)
+scopenodes(#20215,#20217)
+scopenesting(#20217,#20181)
+#20218=@"var;{d};{#20217}"
+variables(#20218,"d",#20217)
+#20219=*
+exprs(#20219,78,#20215,0,"d")
+hasLocation(#20219,#20097)
+enclosing_stmt(#20219,#20215)
+expr_containers(#20219,#20178)
+literals("d","d",#20219)
+decl(#20219,#20218)
 #20220=*
-stmts(#20220,2,#20218,0,"console.log(d);")
-#20221=@"loc,{#10000},6,3,6,17"
-locations_default(#20221,#10000,6,3,6,17)
+stmts(#20220,1,#20215,1,"{\n\t\tcon ... (d);\n\t}")
+#20221=@"loc,{#10000},5,14,7,2"
+locations_default(#20221,#10000,5,14,7,2)
 hasLocation(#20220,#20221)
-stmt_containers(#20220,#20177)
+stmt_containers(#20220,#20178)
 #20222=*
-exprs(#20222,13,#20220,0,"console.log(d)")
-#20223=@"loc,{#10000},6,3,6,16"
-locations_default(#20223,#10000,6,3,6,16)
+stmts(#20222,2,#20220,0,"console.log(d);")
+#20223=@"loc,{#10000},6,3,6,17"
+locations_default(#20223,#10000,6,3,6,17)
 hasLocation(#20222,#20223)
-enclosing_stmt(#20222,#20220)
-expr_containers(#20222,#20177)
+stmt_containers(#20222,#20178)
 #20224=*
-exprs(#20224,14,#20222,-1,"console.log")
-#20225=@"loc,{#10000},6,3,6,13"
-locations_default(#20225,#10000,6,3,6,13)
+exprs(#20224,13,#20222,0,"console.log(d)")
+#20225=@"loc,{#10000},6,3,6,16"
+locations_default(#20225,#10000,6,3,6,16)
 hasLocation(#20224,#20225)
-enclosing_stmt(#20224,#20220)
-expr_containers(#20224,#20177)
+enclosing_stmt(#20224,#20222)
+expr_containers(#20224,#20178)
 #20226=*
-exprs(#20226,79,#20224,0,"console")
-hasLocation(#20226,#20103)
-enclosing_stmt(#20226,#20220)
-expr_containers(#20226,#20177)
-literals("console","console",#20226)
-#20227=@"var;{console};{#20000}"
-variables(#20227,"console",#20000)
-bind(#20226,#20227)
+exprs(#20226,14,#20224,-1,"console.log")
+#20227=@"loc,{#10000},6,3,6,13"
+locations_default(#20227,#10000,6,3,6,13)
+hasLocation(#20226,#20227)
+enclosing_stmt(#20226,#20222)
+expr_containers(#20226,#20178)
 #20228=*
-exprs(#20228,0,#20224,1,"log")
-hasLocation(#20228,#20107)
-enclosing_stmt(#20228,#20220)
-expr_containers(#20228,#20177)
-literals("log","log",#20228)
-#20229=*
-exprs(#20229,79,#20222,0,"d")
-hasLocation(#20229,#20111)
-enclosing_stmt(#20229,#20220)
-expr_containers(#20229,#20177)
-literals("d","d",#20229)
-bind(#20229,#20216)
+exprs(#20228,79,#20226,0,"console")
+hasLocation(#20228,#20103)
+enclosing_stmt(#20228,#20222)
+expr_containers(#20228,#20178)
+literals("console","console",#20228)
+#20229=@"var;{console};{#20000}"
+variables(#20229,"console",#20000)
+bind(#20228,#20229)
 #20230=*
-stmts(#20230,17,#20001,1,"functio ... rn w;\n}")
-#20231=@"loc,{#10000},10,1,13,1"
-locations_default(#20231,#10000,10,1,13,1)
-hasLocation(#20230,#20231)
-stmt_containers(#20230,#20001)
+exprs(#20230,0,#20226,1,"log")
+hasLocation(#20230,#20107)
+enclosing_stmt(#20230,#20222)
+expr_containers(#20230,#20178)
+literals("log","log",#20230)
+#20231=*
+exprs(#20231,79,#20224,0,"d")
+hasLocation(#20231,#20111)
+enclosing_stmt(#20231,#20222)
+expr_containers(#20231,#20178)
+literals("d","d",#20231)
+bind(#20231,#20218)
 #20232=*
-exprs(#20232,78,#20230,-1,"g")
-hasLocation(#20232,#20122)
-expr_containers(#20232,#20230)
-literals("g","g",#20232)
-decl(#20232,#20176)
-#20233=*
-scopes(#20233,1)
-scopenodes(#20230,#20233)
-scopenesting(#20233,#20000)
-#20234=@"var;{w};{#20233}"
-variables(#20234,"w",#20233)
-#20235=@"var;{x};{#20233}"
-variables(#20235,"x",#20233)
-#20236=@"var;{z};{#20233}"
-variables(#20236,"z",#20233)
-#20237=*
-exprs(#20237,68,#20230,0,"{ x, y: z }")
-#20238=@"loc,{#10000},10,12,10,22"
-locations_default(#20238,#10000,10,12,10,22)
-hasLocation(#20237,#20238)
-expr_containers(#20237,#20230)
-#20239=*
-properties(#20239,#20237,0,0,"x")
-hasLocation(#20239,#20128)
+stmts(#20232,17,#20001,1,"functio ... rn w;\n}")
+#20233=@"loc,{#10000},10,1,13,1"
+locations_default(#20233,#10000,10,1,13,1)
+hasLocation(#20232,#20233)
+stmt_containers(#20232,#20001)
+#20234=*
+exprs(#20234,78,#20232,-1,"g")
+hasLocation(#20234,#20122)
+expr_containers(#20234,#20232)
+literals("g","g",#20234)
+decl(#20234,#20176)
+#20235=*
+scopes(#20235,1)
+scopenodes(#20232,#20235)
+scopenesting(#20235,#20000)
+#20236=@"var;{w};{#20235}"
+variables(#20236,"w",#20235)
+#20237=@"var;{this};{#20235}"
+variables(#20237,"this",#20235)
+#20238=@"var;{x};{#20235}"
+variables(#20238,"x",#20235)
+#20239=@"var;{z};{#20235}"
+variables(#20239,"z",#20235)
 #20240=*
-exprs(#20240,0,#20239,0,"x")
-hasLocation(#20240,#20128)
-expr_containers(#20240,#20230)
-literals("x","x",#20240)
-#20241=*
-exprs(#20241,78,#20239,1,"x")
-hasLocation(#20241,#20128)
-expr_containers(#20241,#20230)
-literals("x","x",#20241)
-decl(#20241,#20235)
+exprs(#20240,68,#20232,0,"{ x, y: z }")
+#20241=@"loc,{#10000},10,12,10,22"
+locations_default(#20241,#10000,10,12,10,22)
+hasLocation(#20240,#20241)
+expr_containers(#20240,#20232)
 #20242=*
-properties(#20242,#20237,1,0,"y: z")
-#20243=@"loc,{#10000},10,17,10,20"
-locations_default(#20243,#10000,10,17,10,20)
-hasLocation(#20242,#20243)
+properties(#20242,#20240,0,0,"x")
+hasLocation(#20242,#20128)
+#20243=*
+exprs(#20243,0,#20242,0,"x")
+hasLocation(#20243,#20128)
+expr_containers(#20243,#20232)
+literals("x","x",#20243)
 #20244=*
-exprs(#20244,0,#20242,0,"y")
-hasLocation(#20244,#20132)
-expr_containers(#20244,#20230)
-literals("y","y",#20244)
+exprs(#20244,78,#20242,1,"x")
+hasLocation(#20244,#20128)
+expr_containers(#20244,#20232)
+literals("x","x",#20244)
+decl(#20244,#20238)
 #20245=*
-exprs(#20245,78,#20242,1,"z")
-hasLocation(#20245,#20136)
-expr_containers(#20245,#20230)
-literals("z","z",#20245)
-decl(#20245,#20236)
-#20246=@"var;{arguments};{#20233}"
-variables(#20246,"arguments",#20233)
-is_arguments_object(#20246)
+properties(#20245,#20240,1,0,"y: z")
+#20246=@"loc,{#10000},10,17,10,20"
+locations_default(#20246,#10000,10,17,10,20)
+hasLocation(#20245,#20246)
 #20247=*
-stmts(#20247,1,#20230,-2,"{\n\tvar  ... rn w;\n}")
-#20248=@"loc,{#10000},10,25,13,1"
-locations_default(#20248,#10000,10,25,13,1)
-hasLocation(#20247,#20248)
-stmt_containers(#20247,#20230)
-#20249=*
-stmts(#20249,18,#20247,0,"var { [x]: w } = z;")
-#20250=@"loc,{#10000},11,2,11,20"
-locations_default(#20250,#10000,11,2,11,20)
-hasLocation(#20249,#20250)
-stmt_containers(#20249,#20230)
-#20251=*
-exprs(#20251,64,#20249,0,"{ [x]: w } = z")
-#20252=@"loc,{#10000},11,6,11,19"
-locations_default(#20252,#10000,11,6,11,19)
-hasLocation(#20251,#20252)
-enclosing_stmt(#20251,#20249)
-expr_containers(#20251,#20230)
-#20253=*
-exprs(#20253,68,#20251,0,"{ [x]: w }")
-#20254=@"loc,{#10000},11,6,11,15"
-locations_default(#20254,#10000,11,6,11,15)
-hasLocation(#20253,#20254)
-enclosing_stmt(#20253,#20249)
-expr_containers(#20253,#20230)
-#20255=*
-properties(#20255,#20253,0,0,"[x]: w")
-#20256=@"loc,{#10000},11,8,11,13"
-locations_default(#20256,#10000,11,8,11,13)
-hasLocation(#20255,#20256)
-#20257=*
-exprs(#20257,79,#20255,0,"x")
-hasLocation(#20257,#20150)
-enclosing_stmt(#20257,#20249)
-expr_containers(#20257,#20230)
-literals("x","x",#20257)
-bind(#20257,#20235)
+exprs(#20247,0,#20245,0,"y")
+hasLocation(#20247,#20132)
+expr_containers(#20247,#20232)
+literals("y","y",#20247)
+#20248=*
+exprs(#20248,78,#20245,1,"z")
+hasLocation(#20248,#20136)
+expr_containers(#20248,#20232)
+literals("z","z",#20248)
+decl(#20248,#20239)
+#20249=@"var;{arguments};{#20235}"
+variables(#20249,"arguments",#20235)
+is_arguments_object(#20249)
+#20250=*
+stmts(#20250,1,#20232,-2,"{\n\tvar  ... rn w;\n}")
+#20251=@"loc,{#10000},10,25,13,1"
+locations_default(#20251,#10000,10,25,13,1)
+hasLocation(#20250,#20251)
+stmt_containers(#20250,#20232)
+#20252=*
+stmts(#20252,18,#20250,0,"var { [x]: w } = z;")
+#20253=@"loc,{#10000},11,2,11,20"
+locations_default(#20253,#10000,11,2,11,20)
+hasLocation(#20252,#20253)
+stmt_containers(#20252,#20232)
+#20254=*
+exprs(#20254,64,#20252,0,"{ [x]: w } = z")
+#20255=@"loc,{#10000},11,6,11,19"
+locations_default(#20255,#10000,11,6,11,19)
+hasLocation(#20254,#20255)
+enclosing_stmt(#20254,#20252)
+expr_containers(#20254,#20232)
+#20256=*
+exprs(#20256,68,#20254,0,"{ [x]: w }")
+#20257=@"loc,{#10000},11,6,11,15"
+locations_default(#20257,#10000,11,6,11,15)
+hasLocation(#20256,#20257)
+enclosing_stmt(#20256,#20252)
+expr_containers(#20256,#20232)
 #20258=*
-exprs(#20258,78,#20255,1,"w")
-hasLocation(#20258,#20156)
-enclosing_stmt(#20258,#20249)
-expr_containers(#20258,#20230)
-literals("w","w",#20258)
-decl(#20258,#20234)
-is_computed(#20255)
-#20259=*
-exprs(#20259,79,#20251,1,"z")
-hasLocation(#20259,#20162)
-enclosing_stmt(#20259,#20249)
-expr_containers(#20259,#20230)
-literals("z","z",#20259)
-bind(#20259,#20236)
+properties(#20258,#20256,0,0,"[x]: w")
+#20259=@"loc,{#10000},11,8,11,13"
+locations_default(#20259,#10000,11,8,11,13)
+hasLocation(#20258,#20259)
 #20260=*
-stmts(#20260,9,#20247,1,"return w;")
-#20261=@"loc,{#10000},12,2,12,10"
-locations_default(#20261,#10000,12,2,12,10)
-hasLocation(#20260,#20261)
-stmt_containers(#20260,#20230)
+exprs(#20260,79,#20258,0,"x")
+hasLocation(#20260,#20150)
+enclosing_stmt(#20260,#20252)
+expr_containers(#20260,#20232)
+literals("x","x",#20260)
+bind(#20260,#20238)
+#20261=*
+exprs(#20261,78,#20258,1,"w")
+hasLocation(#20261,#20156)
+enclosing_stmt(#20261,#20252)
+expr_containers(#20261,#20232)
+literals("w","w",#20261)
+decl(#20261,#20236)
+is_computed(#20258)
 #20262=*
-exprs(#20262,79,#20260,0,"w")
-hasLocation(#20262,#20168)
-enclosing_stmt(#20262,#20260)
-expr_containers(#20262,#20230)
-literals("w","w",#20262)
-bind(#20262,#20234)
+exprs(#20262,79,#20254,1,"z")
+hasLocation(#20262,#20162)
+enclosing_stmt(#20262,#20252)
+expr_containers(#20262,#20232)
+literals("z","z",#20262)
+bind(#20262,#20239)
 #20263=*
-entry_cfg_node(#20263,#20001)
-#20264=@"loc,{#10000},1,1,1,0"
-locations_default(#20264,#10000,1,1,1,0)
+stmts(#20263,9,#20250,1,"return w;")
+#20264=@"loc,{#10000},12,2,12,10"
+locations_default(#20264,#10000,12,2,12,10)
 hasLocation(#20263,#20264)
+stmt_containers(#20263,#20232)
 #20265=*
-exit_cfg_node(#20265,#20001)
-hasLocation(#20265,#20173)
-successor(#20230,#20265)
+exprs(#20265,79,#20263,0,"w")
+hasLocation(#20265,#20168)
+enclosing_stmt(#20265,#20263)
+expr_containers(#20265,#20232)
+literals("w","w",#20265)
+bind(#20265,#20236)
 #20266=*
-entry_cfg_node(#20266,#20230)
-#20267=@"loc,{#10000},10,1,10,0"
-locations_default(#20267,#10000,10,1,10,0)
+entry_cfg_node(#20266,#20001)
+#20267=@"loc,{#10000},1,1,1,0"
+locations_default(#20267,#10000,1,1,1,0)
 hasLocation(#20266,#20267)
 #20268=*
-exit_cfg_node(#20268,#20230)
+exit_cfg_node(#20268,#20001)
 hasLocation(#20268,#20173)
-successor(#20262,#20260)
-successor(#20260,#20268)
-successor(#20249,#20259)
-successor(#20253,#20257)
-successor(#20258,#20255)
-successor(#20257,#20258)
-successor(#20255,#20251)
-successor(#20259,#20253)
-successor(#20251,#20262)
-successor(#20247,#20249)
-successor(#20237,#20240)
-successor(#20245,#20242)
-successor(#20244,#20245)
-successor(#20242,#20247)
-successor(#20241,#20239)
-successor(#20240,#20241)
-successor(#20239,#20244)
-successor(#20266,#20237)
-successor(#20177,#20230)
+successor(#20232,#20268)
 #20269=*
-entry_cfg_node(#20269,#20177)
-hasLocation(#20269,#20264)
-#20270=*
-exit_cfg_node(#20270,#20177)
-#20271=@"loc,{#10000},8,2,8,1"
-locations_default(#20271,#10000,8,2,8,1)
-hasLocation(#20270,#20271)
-successor(#20203,#20205)
-successor(#20209,#20211)
-successor(#20212,#20207)
-successor(#20211,#20212)
-successor(#20207,#20213)
-successor(#20205,#20209)
-successor(#20213,#20217)
-successor(#20220,#20226)
-successor(#20229,#20222)
-successor(#20228,#20224)
-successor(#20226,#20228)
-successor(#20224,#20229)
-successor(#20222,#20270)
-successor(#20218,#20220)
-successor(#20217,#20218)
-successor(#20192,#20202)
-successor(#20196,#20198)
-successor(#20199,#20201)
-successor(#20201,#20194)
-successor(#20198,#20199)
-successor(#20202,#20196)
-successor(#20194,#20203)
+entry_cfg_node(#20269,#20232)
+#20270=@"loc,{#10000},10,1,10,0"
+locations_default(#20270,#10000,10,1,10,0)
+hasLocation(#20269,#20270)
+#20271=*
+exit_cfg_node(#20271,#20232)
+hasLocation(#20271,#20173)
+successor(#20265,#20263)
+successor(#20263,#20271)
+successor(#20252,#20262)
+successor(#20256,#20260)
+successor(#20261,#20258)
+successor(#20260,#20261)
+successor(#20258,#20254)
+successor(#20262,#20256)
+successor(#20254,#20265)
+successor(#20250,#20252)
+successor(#20240,#20243)
+successor(#20248,#20245)
+successor(#20247,#20248)
+successor(#20245,#20250)
+successor(#20244,#20242)
+successor(#20243,#20244)
+successor(#20242,#20247)
+successor(#20269,#20240)
+successor(#20178,#20232)
+#20272=*
+entry_cfg_node(#20272,#20178)
+hasLocation(#20272,#20267)
+#20273=*
+exit_cfg_node(#20273,#20178)
+#20274=@"loc,{#10000},8,2,8,1"
+locations_default(#20274,#10000,8,2,8,1)
+hasLocation(#20273,#20274)
+successor(#20205,#20207)
+successor(#20211,#20213)
+successor(#20214,#20209)
+successor(#20213,#20214)
+successor(#20209,#20215)
+successor(#20207,#20211)
+successor(#20215,#20219)
+successor(#20222,#20228)
+successor(#20231,#20224)
+successor(#20230,#20226)
+successor(#20228,#20230)
+successor(#20226,#20231)
+successor(#20224,#20273)
+successor(#20220,#20222)
+successor(#20219,#20220)
+successor(#20194,#20204)
+successor(#20198,#20200)
+successor(#20201,#20203)
+successor(#20203,#20196)
+successor(#20200,#20201)
+successor(#20204,#20198)
+successor(#20196,#20205)
+successor(#20192,#20194)
+successor(#20187,#20189)
 successor(#20190,#20192)
-successor(#20185,#20187)
-successor(#20188,#20190)
-successor(#20187,#20188)
-successor(#20269,#20185)
-successor(#20232,#20177)
-successor(#20179,#20232)
-successor(#20263,#20179)
+successor(#20189,#20190)
+successor(#20272,#20187)
+successor(#20234,#20178)
+successor(#20180,#20234)
+successor(#20266,#20180)
 numlines(#10000,13,12,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/export1.js.trap b/javascript/extractor/tests/es2015/output/trap/export1.js.trap
index c1a7da9c4f4..fb5bd3bfe53 100644
--- a/javascript/extractor/tests/es2015/output/trap/export1.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export1.js.trap
@@ -60,49 +60,51 @@ is_module(#20001)
 is_es2015_module(#20001)
 #20019=@"var;{x};{#20018}"
 variables(#20019,"x",#20018)
-#20020=*
-stmts(#20020,30,#20001,0,"export var x = 23;")
-hasLocation(#20020,#20003)
-stmt_containers(#20020,#20001)
+#20020=@"var;{this};{#20018}"
+variables(#20020,"this",#20018)
 #20021=*
-stmts(#20021,18,#20020,-1,"var x = 23;")
-#20022=@"loc,{#10000},1,8,1,18"
-locations_default(#20022,#10000,1,8,1,18)
-hasLocation(#20021,#20022)
+stmts(#20021,30,#20001,0,"export var x = 23;")
+hasLocation(#20021,#20003)
 stmt_containers(#20021,#20001)
-#20023=*
-exprs(#20023,64,#20021,0,"x = 23")
-#20024=@"loc,{#10000},1,12,1,17"
-locations_default(#20024,#10000,1,12,1,17)
-hasLocation(#20023,#20024)
-enclosing_stmt(#20023,#20021)
-expr_containers(#20023,#20001)
-#20025=*
-exprs(#20025,78,#20023,0,"x")
-hasLocation(#20025,#20009)
-enclosing_stmt(#20025,#20021)
-expr_containers(#20025,#20001)
-literals("x","x",#20025)
-decl(#20025,#20019)
+#20022=*
+stmts(#20022,18,#20021,-1,"var x = 23;")
+#20023=@"loc,{#10000},1,8,1,18"
+locations_default(#20023,#10000,1,8,1,18)
+hasLocation(#20022,#20023)
+stmt_containers(#20022,#20001)
+#20024=*
+exprs(#20024,64,#20022,0,"x = 23")
+#20025=@"loc,{#10000},1,12,1,17"
+locations_default(#20025,#10000,1,12,1,17)
+hasLocation(#20024,#20025)
+enclosing_stmt(#20024,#20022)
+expr_containers(#20024,#20001)
 #20026=*
-exprs(#20026,3,#20023,1,"23")
-hasLocation(#20026,#20013)
-enclosing_stmt(#20026,#20021)
+exprs(#20026,78,#20024,0,"x")
+hasLocation(#20026,#20009)
+enclosing_stmt(#20026,#20022)
 expr_containers(#20026,#20001)
-literals("23","23",#20026)
+literals("x","x",#20026)
+decl(#20026,#20019)
 #20027=*
-entry_cfg_node(#20027,#20001)
-#20028=@"loc,{#10000},1,1,1,0"
-locations_default(#20028,#10000,1,1,1,0)
-hasLocation(#20027,#20028)
-#20029=*
-exit_cfg_node(#20029,#20001)
-hasLocation(#20029,#20017)
-successor(#20020,#20021)
-successor(#20021,#20025)
-successor(#20026,#20023)
-successor(#20025,#20026)
-successor(#20023,#20029)
-successor(#20027,#20020)
+exprs(#20027,3,#20024,1,"23")
+hasLocation(#20027,#20013)
+enclosing_stmt(#20027,#20022)
+expr_containers(#20027,#20001)
+literals("23","23",#20027)
+#20028=*
+entry_cfg_node(#20028,#20001)
+#20029=@"loc,{#10000},1,1,1,0"
+locations_default(#20029,#10000,1,1,1,0)
+hasLocation(#20028,#20029)
+#20030=*
+exit_cfg_node(#20030,#20001)
+hasLocation(#20030,#20017)
+successor(#20021,#20022)
+successor(#20022,#20026)
+successor(#20027,#20024)
+successor(#20026,#20027)
+successor(#20024,#20030)
+successor(#20028,#20021)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/export10.js.trap b/javascript/extractor/tests/es2015/output/trap/export10.js.trap
index 518cb55c45c..bacab841be4 100644
--- a/javascript/extractor/tests/es2015/output/trap/export10.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export10.js.trap
@@ -88,74 +88,78 @@ is_module(#20001)
 is_es2015_module(#20001)
 #20030=@"var;{f};{#20029}"
 variables(#20030,"f",#20029)
-#20031=*
-stmts(#20031,29,#20001,0,"export  ... f () {}")
-#20032=@"loc,{#10000},1,1,1,31"
-locations_default(#20032,#10000,1,1,1,31)
-hasLocation(#20031,#20032)
-stmt_containers(#20031,#20001)
-#20033=*
-stmts(#20033,17,#20031,0,"function f () {}")
-#20034=@"loc,{#10000},1,16,1,31"
-locations_default(#20034,#10000,1,16,1,31)
-hasLocation(#20033,#20034)
-stmt_containers(#20033,#20001)
-#20035=*
-exprs(#20035,78,#20033,-1,"f")
-hasLocation(#20035,#20011)
-expr_containers(#20035,#20033)
-literals("f","f",#20035)
-decl(#20035,#20030)
+#20031=@"var;{this};{#20029}"
+variables(#20031,"this",#20029)
+#20032=*
+stmts(#20032,29,#20001,0,"export  ... f () {}")
+#20033=@"loc,{#10000},1,1,1,31"
+locations_default(#20033,#10000,1,1,1,31)
+hasLocation(#20032,#20033)
+stmt_containers(#20032,#20001)
+#20034=*
+stmts(#20034,17,#20032,0,"function f () {}")
+#20035=@"loc,{#10000},1,16,1,31"
+locations_default(#20035,#10000,1,16,1,31)
+hasLocation(#20034,#20035)
+stmt_containers(#20034,#20001)
 #20036=*
-scopes(#20036,1)
-scopenodes(#20033,#20036)
-scopenesting(#20036,#20029)
-#20037=@"var;{arguments};{#20036}"
-variables(#20037,"arguments",#20036)
-is_arguments_object(#20037)
-#20038=*
-stmts(#20038,1,#20033,-2,"{}")
-#20039=@"loc,{#10000},1,30,1,31"
-locations_default(#20039,#10000,1,30,1,31)
-hasLocation(#20038,#20039)
-stmt_containers(#20038,#20033)
+exprs(#20036,78,#20034,-1,"f")
+hasLocation(#20036,#20011)
+expr_containers(#20036,#20034)
+literals("f","f",#20036)
+decl(#20036,#20030)
+#20037=*
+scopes(#20037,1)
+scopenodes(#20034,#20037)
+scopenesting(#20037,#20029)
+#20038=@"var;{this};{#20037}"
+variables(#20038,"this",#20037)
+#20039=@"var;{arguments};{#20037}"
+variables(#20039,"arguments",#20037)
+is_arguments_object(#20039)
 #20040=*
-stmts(#20040,2,#20001,1,"[,]")
-#20041=@"loc,{#10000},1,33,1,35"
-locations_default(#20041,#10000,1,33,1,35)
+stmts(#20040,1,#20034,-2,"{}")
+#20041=@"loc,{#10000},1,30,1,31"
+locations_default(#20041,#10000,1,30,1,31)
 hasLocation(#20040,#20041)
-stmt_containers(#20040,#20001)
+stmt_containers(#20040,#20034)
 #20042=*
-exprs(#20042,7,#20040,0,"[,]")
-hasLocation(#20042,#20041)
-enclosing_stmt(#20042,#20040)
-expr_containers(#20042,#20001)
-array_size(#20042,1)
-#20043=*
-entry_cfg_node(#20043,#20001)
-#20044=@"loc,{#10000},1,1,1,0"
-locations_default(#20044,#10000,1,1,1,0)
-hasLocation(#20043,#20044)
+stmts(#20042,2,#20001,1,"[,]")
+#20043=@"loc,{#10000},1,33,1,35"
+locations_default(#20043,#10000,1,33,1,35)
+hasLocation(#20042,#20043)
+stmt_containers(#20042,#20001)
+#20044=*
+exprs(#20044,7,#20042,0,"[,]")
+hasLocation(#20044,#20043)
+enclosing_stmt(#20044,#20042)
+expr_containers(#20044,#20001)
+array_size(#20044,1)
 #20045=*
-exit_cfg_node(#20045,#20001)
-hasLocation(#20045,#20027)
-successor(#20040,#20042)
-successor(#20042,#20045)
-successor(#20031,#20033)
-successor(#20033,#20040)
-#20046=*
-entry_cfg_node(#20046,#20033)
-#20047=@"loc,{#10000},1,16,1,15"
-locations_default(#20047,#10000,1,16,1,15)
-hasLocation(#20046,#20047)
+entry_cfg_node(#20045,#20001)
+#20046=@"loc,{#10000},1,1,1,0"
+locations_default(#20046,#10000,1,1,1,0)
+hasLocation(#20045,#20046)
+#20047=*
+exit_cfg_node(#20047,#20001)
+hasLocation(#20047,#20027)
+successor(#20042,#20044)
+successor(#20044,#20047)
+successor(#20032,#20034)
+successor(#20034,#20042)
 #20048=*
-exit_cfg_node(#20048,#20033)
-#20049=@"loc,{#10000},1,32,1,31"
-locations_default(#20049,#10000,1,32,1,31)
+entry_cfg_node(#20048,#20034)
+#20049=@"loc,{#10000},1,16,1,15"
+locations_default(#20049,#10000,1,16,1,15)
 hasLocation(#20048,#20049)
-successor(#20038,#20048)
-successor(#20046,#20038)
-successor(#20035,#20031)
-successor(#20043,#20035)
+#20050=*
+exit_cfg_node(#20050,#20034)
+#20051=@"loc,{#10000},1,32,1,31"
+locations_default(#20051,#10000,1,32,1,31)
+hasLocation(#20050,#20051)
+successor(#20040,#20050)
+successor(#20048,#20040)
+successor(#20036,#20032)
+successor(#20045,#20036)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/export11.js.trap b/javascript/extractor/tests/es2015/output/trap/export11.js.trap
index 57c45f044a1..32484bb7344 100644
--- a/javascript/extractor/tests/es2015/output/trap/export11.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export11.js.trap
@@ -56,66 +56,76 @@ scopenodes(#20001,#20017)
 scopenesting(#20017,#20000)
 is_module(#20001)
 is_es2015_module(#20001)
-#20018=*
-stmts(#20018,29,#20001,0,"export  ... lass {}")
-hasLocation(#20018,#20003)
-stmt_containers(#20018,#20001)
+#20018=@"var;{this};{#20017}"
+variables(#20018,"this",#20017)
 #20019=*
-exprs(#20019,80,#20018,0,"class {}")
-#20020=@"loc,{#10000},1,16,1,23"
-locations_default(#20020,#10000,1,16,1,23)
-hasLocation(#20019,#20020)
-enclosing_stmt(#20019,#20018)
-expr_containers(#20019,#20001)
-#20021=*
-properties(#20021,#20019,2,0,"constructor() {}")
-#20022=@"loc,{#10000},1,22,1,21"
-locations_default(#20022,#10000,1,22,1,21)
-hasLocation(#20021,#20022)
-#20023=*
-exprs(#20023,0,#20021,0,"constructor")
-hasLocation(#20023,#20022)
-enclosing_stmt(#20023,#20018)
-expr_containers(#20023,#20001)
-literals("constructor","constructor",#20023)
+stmts(#20019,29,#20001,0,"export  ... lass {}")
+hasLocation(#20019,#20003)
+stmt_containers(#20019,#20001)
+#20020=*
+exprs(#20020,80,#20019,0,"class {}")
+#20021=@"loc,{#10000},1,16,1,23"
+locations_default(#20021,#10000,1,16,1,23)
+hasLocation(#20020,#20021)
+enclosing_stmt(#20020,#20019)
+expr_containers(#20020,#20001)
+#20022=*
+scopes(#20022,8)
+scopenodes(#20020,#20022)
+scopenesting(#20022,#20017)
+#20023=@"var;{this};{#20022}"
+variables(#20023,"this",#20022)
 #20024=*
-exprs(#20024,9,#20021,1,"() {}")
-hasLocation(#20024,#20022)
-enclosing_stmt(#20024,#20018)
-expr_containers(#20024,#20001)
-#20025=*
-scopes(#20025,1)
-scopenodes(#20024,#20025)
-scopenesting(#20025,#20017)
-#20026=@"var;{arguments};{#20025}"
-variables(#20026,"arguments",#20025)
-is_arguments_object(#20026)
+properties(#20024,#20020,2,0,"constructor() {}")
+#20025=@"loc,{#10000},1,22,1,21"
+locations_default(#20025,#10000,1,22,1,21)
+hasLocation(#20024,#20025)
+#20026=*
+exprs(#20026,0,#20024,0,"constructor")
+hasLocation(#20026,#20025)
+enclosing_stmt(#20026,#20019)
+expr_containers(#20026,#20001)
+literals("constructor","constructor",#20026)
 #20027=*
-stmts(#20027,1,#20024,-2,"{}")
-hasLocation(#20027,#20022)
-stmt_containers(#20027,#20024)
-is_method(#20021)
+exprs(#20027,9,#20024,1,"() {}")
+hasLocation(#20027,#20025)
+enclosing_stmt(#20027,#20019)
+expr_containers(#20027,#20001)
 #20028=*
-entry_cfg_node(#20028,#20001)
-#20029=@"loc,{#10000},1,1,1,0"
-locations_default(#20029,#10000,1,1,1,0)
-hasLocation(#20028,#20029)
-#20030=*
-exit_cfg_node(#20030,#20001)
-hasLocation(#20030,#20015)
-successor(#20018,#20023)
-successor(#20024,#20021)
+scopes(#20028,1)
+scopenodes(#20027,#20028)
+scopenesting(#20028,#20022)
+#20029=@"var;{this};{#20028}"
+variables(#20029,"this",#20028)
+#20030=@"var;{arguments};{#20028}"
+variables(#20030,"arguments",#20028)
+is_arguments_object(#20030)
 #20031=*
-entry_cfg_node(#20031,#20024)
-hasLocation(#20031,#20022)
+stmts(#20031,1,#20027,-2,"{}")
+hasLocation(#20031,#20025)
+stmt_containers(#20031,#20027)
+is_method(#20024)
 #20032=*
-exit_cfg_node(#20032,#20024)
-hasLocation(#20032,#20022)
-successor(#20027,#20032)
-successor(#20031,#20027)
-successor(#20023,#20024)
-successor(#20021,#20019)
-successor(#20019,#20030)
-successor(#20028,#20018)
+entry_cfg_node(#20032,#20001)
+#20033=@"loc,{#10000},1,1,1,0"
+locations_default(#20033,#10000,1,1,1,0)
+hasLocation(#20032,#20033)
+#20034=*
+exit_cfg_node(#20034,#20001)
+hasLocation(#20034,#20015)
+successor(#20019,#20026)
+successor(#20027,#20024)
+#20035=*
+entry_cfg_node(#20035,#20027)
+hasLocation(#20035,#20025)
+#20036=*
+exit_cfg_node(#20036,#20027)
+hasLocation(#20036,#20025)
+successor(#20031,#20036)
+successor(#20035,#20031)
+successor(#20026,#20027)
+successor(#20024,#20020)
+successor(#20020,#20034)
+successor(#20032,#20019)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/export2.js.trap b/javascript/extractor/tests/es2015/output/trap/export2.js.trap
index 27a07ed5c9e..215e7539e6c 100644
--- a/javascript/extractor/tests/es2015/output/trap/export2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export2.js.trap
@@ -70,65 +70,69 @@ is_module(#20001)
 is_es2015_module(#20001)
 #20023=@"var;{f};{#20022}"
 variables(#20023,"f",#20022)
-#20024=*
-stmts(#20024,30,#20001,0,"export  ...  f() {}")
-#20025=@"loc,{#10000},1,1,1,22"
-locations_default(#20025,#10000,1,1,1,22)
-hasLocation(#20024,#20025)
-stmt_containers(#20024,#20001)
-#20026=*
-stmts(#20026,17,#20024,-1,"function f() {}")
-#20027=@"loc,{#10000},1,8,1,22"
-locations_default(#20027,#10000,1,8,1,22)
-hasLocation(#20026,#20027)
-stmt_containers(#20026,#20001)
-#20028=*
-exprs(#20028,78,#20026,-1,"f")
-hasLocation(#20028,#20009)
-expr_containers(#20028,#20026)
-literals("f","f",#20028)
-decl(#20028,#20023)
+#20024=@"var;{this};{#20022}"
+variables(#20024,"this",#20022)
+#20025=*
+stmts(#20025,30,#20001,0,"export  ...  f() {}")
+#20026=@"loc,{#10000},1,1,1,22"
+locations_default(#20026,#10000,1,1,1,22)
+hasLocation(#20025,#20026)
+stmt_containers(#20025,#20001)
+#20027=*
+stmts(#20027,17,#20025,-1,"function f() {}")
+#20028=@"loc,{#10000},1,8,1,22"
+locations_default(#20028,#10000,1,8,1,22)
+hasLocation(#20027,#20028)
+stmt_containers(#20027,#20001)
 #20029=*
-scopes(#20029,1)
-scopenodes(#20026,#20029)
-scopenesting(#20029,#20022)
-#20030=@"var;{arguments};{#20029}"
-variables(#20030,"arguments",#20029)
-is_arguments_object(#20030)
-#20031=*
-stmts(#20031,1,#20026,-2,"{}")
-#20032=@"loc,{#10000},1,21,1,22"
-locations_default(#20032,#10000,1,21,1,22)
-hasLocation(#20031,#20032)
-stmt_containers(#20031,#20026)
+exprs(#20029,78,#20027,-1,"f")
+hasLocation(#20029,#20009)
+expr_containers(#20029,#20027)
+literals("f","f",#20029)
+decl(#20029,#20023)
+#20030=*
+scopes(#20030,1)
+scopenodes(#20027,#20030)
+scopenesting(#20030,#20022)
+#20031=@"var;{this};{#20030}"
+variables(#20031,"this",#20030)
+#20032=@"var;{arguments};{#20030}"
+variables(#20032,"arguments",#20030)
+is_arguments_object(#20032)
 #20033=*
-stmts(#20033,0,#20001,1,";")
-hasLocation(#20033,#20019)
-stmt_containers(#20033,#20001)
-#20034=*
-entry_cfg_node(#20034,#20001)
-#20035=@"loc,{#10000},1,1,1,0"
-locations_default(#20035,#10000,1,1,1,0)
-hasLocation(#20034,#20035)
+stmts(#20033,1,#20027,-2,"{}")
+#20034=@"loc,{#10000},1,21,1,22"
+locations_default(#20034,#10000,1,21,1,22)
+hasLocation(#20033,#20034)
+stmt_containers(#20033,#20027)
+#20035=*
+stmts(#20035,0,#20001,1,";")
+hasLocation(#20035,#20019)
+stmt_containers(#20035,#20001)
 #20036=*
-exit_cfg_node(#20036,#20001)
-hasLocation(#20036,#20021)
-successor(#20033,#20036)
-successor(#20024,#20026)
-successor(#20026,#20033)
-#20037=*
-entry_cfg_node(#20037,#20026)
-#20038=@"loc,{#10000},1,8,1,7"
-locations_default(#20038,#10000,1,8,1,7)
-hasLocation(#20037,#20038)
+entry_cfg_node(#20036,#20001)
+#20037=@"loc,{#10000},1,1,1,0"
+locations_default(#20037,#10000,1,1,1,0)
+hasLocation(#20036,#20037)
+#20038=*
+exit_cfg_node(#20038,#20001)
+hasLocation(#20038,#20021)
+successor(#20035,#20038)
+successor(#20025,#20027)
+successor(#20027,#20035)
 #20039=*
-exit_cfg_node(#20039,#20026)
-#20040=@"loc,{#10000},1,23,1,22"
-locations_default(#20040,#10000,1,23,1,22)
+entry_cfg_node(#20039,#20027)
+#20040=@"loc,{#10000},1,8,1,7"
+locations_default(#20040,#10000,1,8,1,7)
 hasLocation(#20039,#20040)
-successor(#20031,#20039)
-successor(#20037,#20031)
-successor(#20028,#20024)
-successor(#20034,#20028)
+#20041=*
+exit_cfg_node(#20041,#20027)
+#20042=@"loc,{#10000},1,23,1,22"
+locations_default(#20042,#10000,1,23,1,22)
+hasLocation(#20041,#20042)
+successor(#20033,#20041)
+successor(#20039,#20033)
+successor(#20029,#20025)
+successor(#20036,#20029)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/export3.js.trap b/javascript/extractor/tests/es2015/output/trap/export3.js.trap
index df259c34824..5625d2815a4 100644
--- a/javascript/extractor/tests/es2015/output/trap/export3.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export3.js.trap
@@ -75,65 +75,69 @@ is_module(#20001)
 is_es2015_module(#20001)
 #20025=@"var;{f};{#20024}"
 variables(#20025,"f",#20024)
-#20026=*
-stmts(#20026,29,#20001,0,"export  ...  f() {}")
-#20027=@"loc,{#10000},1,1,1,30"
-locations_default(#20027,#10000,1,1,1,30)
-hasLocation(#20026,#20027)
-stmt_containers(#20026,#20001)
-#20028=*
-stmts(#20028,17,#20026,0,"function f() {}")
-#20029=@"loc,{#10000},1,16,1,30"
-locations_default(#20029,#10000,1,16,1,30)
-hasLocation(#20028,#20029)
-stmt_containers(#20028,#20001)
-#20030=*
-exprs(#20030,78,#20028,-1,"f")
-hasLocation(#20030,#20011)
-expr_containers(#20030,#20028)
-literals("f","f",#20030)
-decl(#20030,#20025)
+#20026=@"var;{this};{#20024}"
+variables(#20026,"this",#20024)
+#20027=*
+stmts(#20027,29,#20001,0,"export  ...  f() {}")
+#20028=@"loc,{#10000},1,1,1,30"
+locations_default(#20028,#10000,1,1,1,30)
+hasLocation(#20027,#20028)
+stmt_containers(#20027,#20001)
+#20029=*
+stmts(#20029,17,#20027,0,"function f() {}")
+#20030=@"loc,{#10000},1,16,1,30"
+locations_default(#20030,#10000,1,16,1,30)
+hasLocation(#20029,#20030)
+stmt_containers(#20029,#20001)
 #20031=*
-scopes(#20031,1)
-scopenodes(#20028,#20031)
-scopenesting(#20031,#20024)
-#20032=@"var;{arguments};{#20031}"
-variables(#20032,"arguments",#20031)
-is_arguments_object(#20032)
-#20033=*
-stmts(#20033,1,#20028,-2,"{}")
-#20034=@"loc,{#10000},1,29,1,30"
-locations_default(#20034,#10000,1,29,1,30)
-hasLocation(#20033,#20034)
-stmt_containers(#20033,#20028)
+exprs(#20031,78,#20029,-1,"f")
+hasLocation(#20031,#20011)
+expr_containers(#20031,#20029)
+literals("f","f",#20031)
+decl(#20031,#20025)
+#20032=*
+scopes(#20032,1)
+scopenodes(#20029,#20032)
+scopenesting(#20032,#20024)
+#20033=@"var;{this};{#20032}"
+variables(#20033,"this",#20032)
+#20034=@"var;{arguments};{#20032}"
+variables(#20034,"arguments",#20032)
+is_arguments_object(#20034)
 #20035=*
-stmts(#20035,0,#20001,1,";")
-hasLocation(#20035,#20021)
-stmt_containers(#20035,#20001)
-#20036=*
-entry_cfg_node(#20036,#20001)
-#20037=@"loc,{#10000},1,1,1,0"
-locations_default(#20037,#10000,1,1,1,0)
-hasLocation(#20036,#20037)
+stmts(#20035,1,#20029,-2,"{}")
+#20036=@"loc,{#10000},1,29,1,30"
+locations_default(#20036,#10000,1,29,1,30)
+hasLocation(#20035,#20036)
+stmt_containers(#20035,#20029)
+#20037=*
+stmts(#20037,0,#20001,1,";")
+hasLocation(#20037,#20021)
+stmt_containers(#20037,#20001)
 #20038=*
-exit_cfg_node(#20038,#20001)
-hasLocation(#20038,#20023)
-successor(#20035,#20038)
-successor(#20026,#20028)
-successor(#20028,#20035)
-#20039=*
-entry_cfg_node(#20039,#20028)
-#20040=@"loc,{#10000},1,16,1,15"
-locations_default(#20040,#10000,1,16,1,15)
-hasLocation(#20039,#20040)
+entry_cfg_node(#20038,#20001)
+#20039=@"loc,{#10000},1,1,1,0"
+locations_default(#20039,#10000,1,1,1,0)
+hasLocation(#20038,#20039)
+#20040=*
+exit_cfg_node(#20040,#20001)
+hasLocation(#20040,#20023)
+successor(#20037,#20040)
+successor(#20027,#20029)
+successor(#20029,#20037)
 #20041=*
-exit_cfg_node(#20041,#20028)
-#20042=@"loc,{#10000},1,31,1,30"
-locations_default(#20042,#10000,1,31,1,30)
+entry_cfg_node(#20041,#20029)
+#20042=@"loc,{#10000},1,16,1,15"
+locations_default(#20042,#10000,1,16,1,15)
 hasLocation(#20041,#20042)
-successor(#20033,#20041)
-successor(#20039,#20033)
-successor(#20030,#20026)
-successor(#20036,#20030)
+#20043=*
+exit_cfg_node(#20043,#20029)
+#20044=@"loc,{#10000},1,31,1,30"
+locations_default(#20044,#10000,1,31,1,30)
+hasLocation(#20043,#20044)
+successor(#20035,#20043)
+successor(#20041,#20035)
+successor(#20031,#20027)
+successor(#20038,#20031)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/export4.js.trap b/javascript/extractor/tests/es2015/output/trap/export4.js.trap
index 50a6952b59e..dec70dcd8ae 100644
--- a/javascript/extractor/tests/es2015/output/trap/export4.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export4.js.trap
@@ -68,59 +68,63 @@ scopenodes(#20001,#20022)
 scopenesting(#20022,#20000)
 is_module(#20001)
 is_es2015_module(#20001)
-#20023=*
-stmts(#20023,29,#20001,0,"export  ... n () {}")
-#20024=@"loc,{#10000},1,1,1,29"
-locations_default(#20024,#10000,1,1,1,29)
-hasLocation(#20023,#20024)
-stmt_containers(#20023,#20001)
-#20025=*
-exprs(#20025,9,#20023,0,"function () {}")
-#20026=@"loc,{#10000},1,16,1,29"
-locations_default(#20026,#10000,1,16,1,29)
-hasLocation(#20025,#20026)
-enclosing_stmt(#20025,#20023)
-expr_containers(#20025,#20001)
-#20027=*
-scopes(#20027,1)
-scopenodes(#20025,#20027)
-scopenesting(#20027,#20022)
-#20028=@"var;{arguments};{#20027}"
-variables(#20028,"arguments",#20027)
-is_arguments_object(#20028)
-#20029=*
-stmts(#20029,1,#20025,-2,"{}")
-#20030=@"loc,{#10000},1,28,1,29"
-locations_default(#20030,#10000,1,28,1,29)
-hasLocation(#20029,#20030)
-stmt_containers(#20029,#20025)
+#20023=@"var;{this};{#20022}"
+variables(#20023,"this",#20022)
+#20024=*
+stmts(#20024,29,#20001,0,"export  ... n () {}")
+#20025=@"loc,{#10000},1,1,1,29"
+locations_default(#20025,#10000,1,1,1,29)
+hasLocation(#20024,#20025)
+stmt_containers(#20024,#20001)
+#20026=*
+exprs(#20026,9,#20024,0,"function () {}")
+#20027=@"loc,{#10000},1,16,1,29"
+locations_default(#20027,#10000,1,16,1,29)
+hasLocation(#20026,#20027)
+enclosing_stmt(#20026,#20024)
+expr_containers(#20026,#20001)
+#20028=*
+scopes(#20028,1)
+scopenodes(#20026,#20028)
+scopenesting(#20028,#20022)
+#20029=@"var;{this};{#20028}"
+variables(#20029,"this",#20028)
+#20030=@"var;{arguments};{#20028}"
+variables(#20030,"arguments",#20028)
+is_arguments_object(#20030)
 #20031=*
-stmts(#20031,0,#20001,1,";")
-hasLocation(#20031,#20019)
-stmt_containers(#20031,#20001)
-#20032=*
-entry_cfg_node(#20032,#20001)
-#20033=@"loc,{#10000},1,1,1,0"
-locations_default(#20033,#10000,1,1,1,0)
-hasLocation(#20032,#20033)
+stmts(#20031,1,#20026,-2,"{}")
+#20032=@"loc,{#10000},1,28,1,29"
+locations_default(#20032,#10000,1,28,1,29)
+hasLocation(#20031,#20032)
+stmt_containers(#20031,#20026)
+#20033=*
+stmts(#20033,0,#20001,1,";")
+hasLocation(#20033,#20019)
+stmt_containers(#20033,#20001)
 #20034=*
-exit_cfg_node(#20034,#20001)
-hasLocation(#20034,#20021)
-successor(#20031,#20034)
-successor(#20023,#20025)
-successor(#20025,#20031)
-#20035=*
-entry_cfg_node(#20035,#20025)
-#20036=@"loc,{#10000},1,16,1,15"
-locations_default(#20036,#10000,1,16,1,15)
-hasLocation(#20035,#20036)
+entry_cfg_node(#20034,#20001)
+#20035=@"loc,{#10000},1,1,1,0"
+locations_default(#20035,#10000,1,1,1,0)
+hasLocation(#20034,#20035)
+#20036=*
+exit_cfg_node(#20036,#20001)
+hasLocation(#20036,#20021)
+successor(#20033,#20036)
+successor(#20024,#20026)
+successor(#20026,#20033)
 #20037=*
-exit_cfg_node(#20037,#20025)
-#20038=@"loc,{#10000},1,30,1,29"
-locations_default(#20038,#10000,1,30,1,29)
+entry_cfg_node(#20037,#20026)
+#20038=@"loc,{#10000},1,16,1,15"
+locations_default(#20038,#10000,1,16,1,15)
 hasLocation(#20037,#20038)
-successor(#20029,#20037)
-successor(#20035,#20029)
-successor(#20032,#20023)
+#20039=*
+exit_cfg_node(#20039,#20026)
+#20040=@"loc,{#10000},1,30,1,29"
+locations_default(#20040,#10000,1,30,1,29)
+hasLocation(#20039,#20040)
+successor(#20031,#20039)
+successor(#20037,#20031)
+successor(#20034,#20024)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/export5.js.trap b/javascript/extractor/tests/es2015/output/trap/export5.js.trap
index 861ea6d12c1..25ede7767a5 100644
--- a/javascript/extractor/tests/es2015/output/trap/export5.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export5.js.trap
@@ -130,114 +130,116 @@ is_es2015_module(#20001)
 variables(#20046,"x",#20045)
 #20047=@"var;{y};{#20045}"
 variables(#20047,"y",#20045)
-#20048=*
-stmts(#20048,18,#20001,0,"var x = 23, y = 42;")
-hasLocation(#20048,#20003)
-stmt_containers(#20048,#20001)
+#20048=@"var;{this};{#20045}"
+variables(#20048,"this",#20045)
 #20049=*
-exprs(#20049,64,#20048,0,"x = 23")
-#20050=@"loc,{#10000},1,5,1,10"
-locations_default(#20050,#10000,1,5,1,10)
-hasLocation(#20049,#20050)
-enclosing_stmt(#20049,#20048)
-expr_containers(#20049,#20001)
-#20051=*
-exprs(#20051,78,#20049,0,"x")
-hasLocation(#20051,#20009)
-enclosing_stmt(#20051,#20048)
-expr_containers(#20051,#20001)
-literals("x","x",#20051)
-decl(#20051,#20046)
+stmts(#20049,18,#20001,0,"var x = 23, y = 42;")
+hasLocation(#20049,#20003)
+stmt_containers(#20049,#20001)
+#20050=*
+exprs(#20050,64,#20049,0,"x = 23")
+#20051=@"loc,{#10000},1,5,1,10"
+locations_default(#20051,#10000,1,5,1,10)
+hasLocation(#20050,#20051)
+enclosing_stmt(#20050,#20049)
+expr_containers(#20050,#20001)
 #20052=*
-exprs(#20052,3,#20049,1,"23")
-hasLocation(#20052,#20013)
-enclosing_stmt(#20052,#20048)
+exprs(#20052,78,#20050,0,"x")
+hasLocation(#20052,#20009)
+enclosing_stmt(#20052,#20049)
 expr_containers(#20052,#20001)
-literals("23","23",#20052)
+literals("x","x",#20052)
+decl(#20052,#20046)
 #20053=*
-exprs(#20053,64,#20048,1,"y = 42")
-#20054=@"loc,{#10000},1,13,1,18"
-locations_default(#20054,#10000,1,13,1,18)
-hasLocation(#20053,#20054)
-enclosing_stmt(#20053,#20048)
+exprs(#20053,3,#20050,1,"23")
+hasLocation(#20053,#20013)
+enclosing_stmt(#20053,#20049)
 expr_containers(#20053,#20001)
-#20055=*
-exprs(#20055,78,#20053,0,"y")
-hasLocation(#20055,#20017)
-enclosing_stmt(#20055,#20048)
-expr_containers(#20055,#20001)
-literals("y","y",#20055)
-decl(#20055,#20047)
+literals("23","23",#20053)
+#20054=*
+exprs(#20054,64,#20049,1,"y = 42")
+#20055=@"loc,{#10000},1,13,1,18"
+locations_default(#20055,#10000,1,13,1,18)
+hasLocation(#20054,#20055)
+enclosing_stmt(#20054,#20049)
+expr_containers(#20054,#20001)
 #20056=*
-exprs(#20056,3,#20053,1,"42")
-hasLocation(#20056,#20021)
-enclosing_stmt(#20056,#20048)
+exprs(#20056,78,#20054,0,"y")
+hasLocation(#20056,#20017)
+enclosing_stmt(#20056,#20049)
 expr_containers(#20056,#20001)
-literals("42","42",#20056)
+literals("y","y",#20056)
+decl(#20056,#20047)
 #20057=*
-stmts(#20057,30,#20001,1,"export  ... as z };")
-hasLocation(#20057,#20005)
-stmt_containers(#20057,#20001)
+exprs(#20057,3,#20054,1,"42")
+hasLocation(#20057,#20021)
+enclosing_stmt(#20057,#20049)
+expr_containers(#20057,#20001)
+literals("42","42",#20057)
 #20058=*
-exprs(#20058,86,#20057,0,"x")
-hasLocation(#20058,#20029)
-enclosing_stmt(#20058,#20057)
-expr_containers(#20058,#20001)
+stmts(#20058,30,#20001,1,"export  ... as z };")
+hasLocation(#20058,#20005)
+stmt_containers(#20058,#20001)
 #20059=*
-exprs(#20059,103,#20058,0,"x")
+exprs(#20059,86,#20058,0,"x")
 hasLocation(#20059,#20029)
-enclosing_stmt(#20059,#20057)
+enclosing_stmt(#20059,#20058)
 expr_containers(#20059,#20001)
-literals("x","x",#20059)
-bind(#20059,#20046)
 #20060=*
-exprs(#20060,0,#20058,1,"x")
+exprs(#20060,103,#20059,0,"x")
 hasLocation(#20060,#20029)
-enclosing_stmt(#20060,#20057)
+enclosing_stmt(#20060,#20058)
 expr_containers(#20060,#20001)
 literals("x","x",#20060)
+bind(#20060,#20046)
 #20061=*
-exprs(#20061,86,#20057,1,"y as z")
-#20062=@"loc,{#10000},2,13,2,18"
-locations_default(#20062,#10000,2,13,2,18)
-hasLocation(#20061,#20062)
-enclosing_stmt(#20061,#20057)
+exprs(#20061,0,#20059,1,"x")
+hasLocation(#20061,#20029)
+enclosing_stmt(#20061,#20058)
 expr_containers(#20061,#20001)
-#20063=*
-exprs(#20063,103,#20061,0,"y")
-hasLocation(#20063,#20033)
-enclosing_stmt(#20063,#20057)
-expr_containers(#20063,#20001)
-literals("y","y",#20063)
-bind(#20063,#20047)
+literals("x","x",#20061)
+#20062=*
+exprs(#20062,86,#20058,1,"y as z")
+#20063=@"loc,{#10000},2,13,2,18"
+locations_default(#20063,#10000,2,13,2,18)
+hasLocation(#20062,#20063)
+enclosing_stmt(#20062,#20058)
+expr_containers(#20062,#20001)
 #20064=*
-exprs(#20064,0,#20061,1,"z")
-hasLocation(#20064,#20037)
-enclosing_stmt(#20064,#20057)
+exprs(#20064,103,#20062,0,"y")
+hasLocation(#20064,#20033)
+enclosing_stmt(#20064,#20058)
 expr_containers(#20064,#20001)
-literals("z","z",#20064)
+literals("y","y",#20064)
+bind(#20064,#20047)
 #20065=*
-entry_cfg_node(#20065,#20001)
-#20066=@"loc,{#10000},1,1,1,0"
-locations_default(#20066,#10000,1,1,1,0)
-hasLocation(#20065,#20066)
-#20067=*
-exit_cfg_node(#20067,#20001)
-hasLocation(#20067,#20043)
-successor(#20057,#20058)
-successor(#20061,#20063)
-successor(#20064,#20067)
-successor(#20063,#20064)
+exprs(#20065,0,#20062,1,"z")
+hasLocation(#20065,#20037)
+enclosing_stmt(#20065,#20058)
+expr_containers(#20065,#20001)
+literals("z","z",#20065)
+#20066=*
+entry_cfg_node(#20066,#20001)
+#20067=@"loc,{#10000},1,1,1,0"
+locations_default(#20067,#10000,1,1,1,0)
+hasLocation(#20066,#20067)
+#20068=*
+exit_cfg_node(#20068,#20001)
+hasLocation(#20068,#20043)
 successor(#20058,#20059)
-successor(#20060,#20061)
+successor(#20062,#20064)
+successor(#20065,#20068)
+successor(#20064,#20065)
 successor(#20059,#20060)
-successor(#20048,#20051)
-successor(#20056,#20053)
-successor(#20055,#20056)
-successor(#20053,#20057)
-successor(#20052,#20049)
-successor(#20051,#20052)
-successor(#20049,#20055)
-successor(#20065,#20048)
+successor(#20061,#20062)
+successor(#20060,#20061)
+successor(#20049,#20052)
+successor(#20057,#20054)
+successor(#20056,#20057)
+successor(#20054,#20058)
+successor(#20053,#20050)
+successor(#20052,#20053)
+successor(#20050,#20056)
+successor(#20066,#20049)
 numlines(#10000,2,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/export6.js.trap b/javascript/extractor/tests/es2015/output/trap/export6.js.trap
index 58381bfa820..8067f1536dc 100644
--- a/javascript/extractor/tests/es2015/output/trap/export6.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export6.js.trap
@@ -53,32 +53,34 @@ scopenodes(#20001,#20016)
 scopenesting(#20016,#20000)
 is_module(#20001)
 is_es2015_module(#20001)
-#20017=*
-stmts(#20017,28,#20001,0,"export * from 'foo';")
-hasLocation(#20017,#20003)
-stmt_containers(#20017,#20001)
+#20017=@"var;{this};{#20016}"
+variables(#20017,"this",#20016)
 #20018=*
-exprs(#20018,4,#20017,0,"'foo'")
-hasLocation(#20018,#20011)
-enclosing_stmt(#20018,#20017)
-expr_containers(#20018,#20001)
-literals("foo","'foo'",#20018)
+stmts(#20018,28,#20001,0,"export * from 'foo';")
+hasLocation(#20018,#20003)
+stmt_containers(#20018,#20001)
 #20019=*
-regexpterm(#20019,14,#20018,0,"foo")
-#20020=@"loc,{#10000},1,16,1,18"
-locations_default(#20020,#10000,1,16,1,18)
-hasLocation(#20019,#20020)
-regexp_const_value(#20019,"foo")
-#20021=*
-entry_cfg_node(#20021,#20001)
-#20022=@"loc,{#10000},1,1,1,0"
-locations_default(#20022,#10000,1,1,1,0)
-hasLocation(#20021,#20022)
-#20023=*
-exit_cfg_node(#20023,#20001)
-hasLocation(#20023,#20015)
-successor(#20017,#20018)
-successor(#20018,#20023)
-successor(#20021,#20017)
+exprs(#20019,4,#20018,0,"'foo'")
+hasLocation(#20019,#20011)
+enclosing_stmt(#20019,#20018)
+expr_containers(#20019,#20001)
+literals("foo","'foo'",#20019)
+#20020=*
+regexpterm(#20020,14,#20019,0,"foo")
+#20021=@"loc,{#10000},1,16,1,18"
+locations_default(#20021,#10000,1,16,1,18)
+hasLocation(#20020,#20021)
+regexp_const_value(#20020,"foo")
+#20022=*
+entry_cfg_node(#20022,#20001)
+#20023=@"loc,{#10000},1,1,1,0"
+locations_default(#20023,#10000,1,1,1,0)
+hasLocation(#20022,#20023)
+#20024=*
+exit_cfg_node(#20024,#20001)
+hasLocation(#20024,#20015)
+successor(#20018,#20019)
+successor(#20019,#20024)
+successor(#20022,#20018)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/export7.js.trap b/javascript/extractor/tests/es2015/output/trap/export7.js.trap
index 37370b5d502..1750e495935 100644
--- a/javascript/extractor/tests/es2015/output/trap/export7.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export7.js.trap
@@ -83,74 +83,76 @@ scopenodes(#20001,#20028)
 scopenesting(#20028,#20000)
 is_module(#20001)
 is_es2015_module(#20001)
-#20029=*
-stmts(#20029,30,#20001,0,"export  ...  'foo';")
-hasLocation(#20029,#20003)
-stmt_containers(#20029,#20001)
+#20029=@"var;{this};{#20028}"
+variables(#20029,"this",#20028)
 #20030=*
-exprs(#20030,4,#20029,-2,"'foo'")
-hasLocation(#20030,#20023)
-enclosing_stmt(#20030,#20029)
-expr_containers(#20030,#20001)
-literals("foo","'foo'",#20030)
+stmts(#20030,30,#20001,0,"export  ...  'foo';")
+hasLocation(#20030,#20003)
+stmt_containers(#20030,#20001)
 #20031=*
-regexpterm(#20031,14,#20030,0,"foo")
-#20032=@"loc,{#10000},1,28,1,30"
-locations_default(#20032,#10000,1,28,1,30)
-hasLocation(#20031,#20032)
-regexp_const_value(#20031,"foo")
-#20033=*
-exprs(#20033,86,#20029,0,"x")
-hasLocation(#20033,#20009)
-enclosing_stmt(#20033,#20029)
-expr_containers(#20033,#20001)
+exprs(#20031,4,#20030,-2,"'foo'")
+hasLocation(#20031,#20023)
+enclosing_stmt(#20031,#20030)
+expr_containers(#20031,#20001)
+literals("foo","'foo'",#20031)
+#20032=*
+regexpterm(#20032,14,#20031,0,"foo")
+#20033=@"loc,{#10000},1,28,1,30"
+locations_default(#20033,#10000,1,28,1,30)
+hasLocation(#20032,#20033)
+regexp_const_value(#20032,"foo")
 #20034=*
-exprs(#20034,0,#20033,0,"x")
+exprs(#20034,86,#20030,0,"x")
 hasLocation(#20034,#20009)
-enclosing_stmt(#20034,#20029)
+enclosing_stmt(#20034,#20030)
 expr_containers(#20034,#20001)
-literals("x","x",#20034)
 #20035=*
-exprs(#20035,0,#20033,1,"x")
+exprs(#20035,0,#20034,0,"x")
 hasLocation(#20035,#20009)
-enclosing_stmt(#20035,#20029)
+enclosing_stmt(#20035,#20030)
 expr_containers(#20035,#20001)
 literals("x","x",#20035)
 #20036=*
-exprs(#20036,86,#20029,1,"y as z")
-#20037=@"loc,{#10000},1,13,1,18"
-locations_default(#20037,#10000,1,13,1,18)
-hasLocation(#20036,#20037)
-enclosing_stmt(#20036,#20029)
+exprs(#20036,0,#20034,1,"x")
+hasLocation(#20036,#20009)
+enclosing_stmt(#20036,#20030)
 expr_containers(#20036,#20001)
-#20038=*
-exprs(#20038,0,#20036,0,"y")
-hasLocation(#20038,#20013)
-enclosing_stmt(#20038,#20029)
-expr_containers(#20038,#20001)
-literals("y","y",#20038)
+literals("x","x",#20036)
+#20037=*
+exprs(#20037,86,#20030,1,"y as z")
+#20038=@"loc,{#10000},1,13,1,18"
+locations_default(#20038,#10000,1,13,1,18)
+hasLocation(#20037,#20038)
+enclosing_stmt(#20037,#20030)
+expr_containers(#20037,#20001)
 #20039=*
-exprs(#20039,0,#20036,1,"z")
-hasLocation(#20039,#20017)
-enclosing_stmt(#20039,#20029)
+exprs(#20039,0,#20037,0,"y")
+hasLocation(#20039,#20013)
+enclosing_stmt(#20039,#20030)
 expr_containers(#20039,#20001)
-literals("z","z",#20039)
+literals("y","y",#20039)
 #20040=*
-entry_cfg_node(#20040,#20001)
-#20041=@"loc,{#10000},1,1,1,0"
-locations_default(#20041,#10000,1,1,1,0)
-hasLocation(#20040,#20041)
-#20042=*
-exit_cfg_node(#20042,#20001)
-hasLocation(#20042,#20027)
-successor(#20029,#20030)
-successor(#20036,#20038)
-successor(#20039,#20042)
-successor(#20038,#20039)
-successor(#20033,#20034)
-successor(#20035,#20036)
+exprs(#20040,0,#20037,1,"z")
+hasLocation(#20040,#20017)
+enclosing_stmt(#20040,#20030)
+expr_containers(#20040,#20001)
+literals("z","z",#20040)
+#20041=*
+entry_cfg_node(#20041,#20001)
+#20042=@"loc,{#10000},1,1,1,0"
+locations_default(#20042,#10000,1,1,1,0)
+hasLocation(#20041,#20042)
+#20043=*
+exit_cfg_node(#20043,#20001)
+hasLocation(#20043,#20027)
+successor(#20030,#20031)
+successor(#20037,#20039)
+successor(#20040,#20043)
+successor(#20039,#20040)
 successor(#20034,#20035)
-successor(#20030,#20033)
-successor(#20040,#20029)
+successor(#20036,#20037)
+successor(#20035,#20036)
+successor(#20031,#20034)
+successor(#20041,#20030)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/export8.js.trap b/javascript/extractor/tests/es2015/output/trap/export8.js.trap
index d79edbb8826..aac88cafa7f 100644
--- a/javascript/extractor/tests/es2015/output/trap/export8.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export8.js.trap
@@ -76,57 +76,59 @@ scopenodes(#20001,#20025)
 scopenesting(#20025,#20000)
 is_module(#20001)
 is_es2015_module(#20001)
-#20026=*
-stmts(#20026,2,#20001,0,"foo = 42;")
-hasLocation(#20026,#20003)
-stmt_containers(#20026,#20001)
+#20026=@"var;{this};{#20025}"
+variables(#20026,"this",#20025)
 #20027=*
-exprs(#20027,47,#20026,0,"foo = 42")
-#20028=@"loc,{#10000},1,1,1,8"
-locations_default(#20028,#10000,1,1,1,8)
-hasLocation(#20027,#20028)
-enclosing_stmt(#20027,#20026)
-expr_containers(#20027,#20001)
-#20029=*
-exprs(#20029,79,#20027,0,"foo")
-hasLocation(#20029,#20007)
-enclosing_stmt(#20029,#20026)
-expr_containers(#20029,#20001)
-literals("foo","foo",#20029)
-#20030=@"var;{foo};{#20000}"
-variables(#20030,"foo",#20000)
-bind(#20029,#20030)
-#20031=*
-exprs(#20031,3,#20027,1,"42")
-hasLocation(#20031,#20011)
-enclosing_stmt(#20031,#20026)
-expr_containers(#20031,#20001)
-literals("42","42",#20031)
+stmts(#20027,2,#20001,0,"foo = 42;")
+hasLocation(#20027,#20003)
+stmt_containers(#20027,#20001)
+#20028=*
+exprs(#20028,47,#20027,0,"foo = 42")
+#20029=@"loc,{#10000},1,1,1,8"
+locations_default(#20029,#10000,1,1,1,8)
+hasLocation(#20028,#20029)
+enclosing_stmt(#20028,#20027)
+expr_containers(#20028,#20001)
+#20030=*
+exprs(#20030,79,#20028,0,"foo")
+hasLocation(#20030,#20007)
+enclosing_stmt(#20030,#20027)
+expr_containers(#20030,#20001)
+literals("foo","foo",#20030)
+#20031=@"var;{foo};{#20000}"
+variables(#20031,"foo",#20000)
+bind(#20030,#20031)
 #20032=*
-stmts(#20032,29,#20001,1,"export default foo;")
-hasLocation(#20032,#20005)
-stmt_containers(#20032,#20001)
+exprs(#20032,3,#20028,1,"42")
+hasLocation(#20032,#20011)
+enclosing_stmt(#20032,#20027)
+expr_containers(#20032,#20001)
+literals("42","42",#20032)
 #20033=*
-exprs(#20033,103,#20032,0,"foo")
-hasLocation(#20033,#20019)
-enclosing_stmt(#20033,#20032)
-expr_containers(#20033,#20001)
-literals("foo","foo",#20033)
-bind(#20033,#20030)
+stmts(#20033,29,#20001,1,"export default foo;")
+hasLocation(#20033,#20005)
+stmt_containers(#20033,#20001)
 #20034=*
-entry_cfg_node(#20034,#20001)
-#20035=@"loc,{#10000},1,1,1,0"
-locations_default(#20035,#10000,1,1,1,0)
-hasLocation(#20034,#20035)
-#20036=*
-exit_cfg_node(#20036,#20001)
-hasLocation(#20036,#20023)
-successor(#20032,#20033)
-successor(#20033,#20036)
-successor(#20026,#20029)
-successor(#20031,#20027)
-successor(#20029,#20031)
-successor(#20027,#20032)
-successor(#20034,#20026)
+exprs(#20034,103,#20033,0,"foo")
+hasLocation(#20034,#20019)
+enclosing_stmt(#20034,#20033)
+expr_containers(#20034,#20001)
+literals("foo","foo",#20034)
+bind(#20034,#20031)
+#20035=*
+entry_cfg_node(#20035,#20001)
+#20036=@"loc,{#10000},1,1,1,0"
+locations_default(#20036,#10000,1,1,1,0)
+hasLocation(#20035,#20036)
+#20037=*
+exit_cfg_node(#20037,#20001)
+hasLocation(#20037,#20023)
+successor(#20033,#20034)
+successor(#20034,#20037)
+successor(#20027,#20030)
+successor(#20032,#20028)
+successor(#20030,#20032)
+successor(#20028,#20033)
+successor(#20035,#20027)
 numlines(#10000,2,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/export9.js.trap b/javascript/extractor/tests/es2015/output/trap/export9.js.trap
index 7bfdace6530..2aab6f65ab9 100644
--- a/javascript/extractor/tests/es2015/output/trap/export9.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/export9.js.trap
@@ -80,94 +80,100 @@ is_es2015_module(#20001)
 variables(#20026,"C",#20025)
 #20027=@"local_type_name;{C};{#20025}"
 local_type_names(#20027,"C",#20025)
-#20028=*
-stmts(#20028,29,#20001,0,"export  ... ss C {}")
-#20029=@"loc,{#10000},1,1,1,25"
-locations_default(#20029,#10000,1,1,1,25)
-hasLocation(#20028,#20029)
-stmt_containers(#20028,#20001)
-#20030=*
-stmts(#20030,26,#20028,0,"class C {}")
-#20031=@"loc,{#10000},1,16,1,25"
-locations_default(#20031,#10000,1,16,1,25)
-hasLocation(#20030,#20031)
-stmt_containers(#20030,#20001)
-#20032=*
-exprs(#20032,78,#20030,0,"C")
-hasLocation(#20032,#20011)
-enclosing_stmt(#20032,#20030)
-expr_containers(#20032,#20001)
-literals("C","C",#20032)
-decl(#20032,#20026)
-typedecl(#20032,#20027)
+#20028=@"var;{this};{#20025}"
+variables(#20028,"this",#20025)
+#20029=*
+stmts(#20029,29,#20001,0,"export  ... ss C {}")
+#20030=@"loc,{#10000},1,1,1,25"
+locations_default(#20030,#10000,1,1,1,25)
+hasLocation(#20029,#20030)
+stmt_containers(#20029,#20001)
+#20031=*
+stmts(#20031,26,#20029,0,"class C {}")
+#20032=@"loc,{#10000},1,16,1,25"
+locations_default(#20032,#10000,1,16,1,25)
+hasLocation(#20031,#20032)
+stmt_containers(#20031,#20001)
 #20033=*
-scopes(#20033,10)
-scopenodes(#20030,#20033)
-scopenesting(#20033,#20025)
+exprs(#20033,78,#20031,0,"C")
+hasLocation(#20033,#20011)
+enclosing_stmt(#20033,#20031)
+expr_containers(#20033,#20001)
+literals("C","C",#20033)
+decl(#20033,#20026)
+typedecl(#20033,#20027)
 #20034=*
-properties(#20034,#20030,2,0,"constructor() {}")
-#20035=@"loc,{#10000},1,24,1,23"
-locations_default(#20035,#10000,1,24,1,23)
-hasLocation(#20034,#20035)
+scopes(#20034,10)
+scopenodes(#20031,#20034)
+scopenesting(#20034,#20025)
+#20035=@"var;{this};{#20034}"
+variables(#20035,"this",#20034)
 #20036=*
-exprs(#20036,0,#20034,0,"constructor")
-hasLocation(#20036,#20035)
-enclosing_stmt(#20036,#20030)
-expr_containers(#20036,#20001)
-literals("constructor","constructor",#20036)
-#20037=*
-exprs(#20037,9,#20034,1,"() {}")
-hasLocation(#20037,#20035)
-enclosing_stmt(#20037,#20030)
-expr_containers(#20037,#20001)
+properties(#20036,#20031,2,0,"constructor() {}")
+#20037=@"loc,{#10000},1,24,1,23"
+locations_default(#20037,#10000,1,24,1,23)
+hasLocation(#20036,#20037)
 #20038=*
-scopes(#20038,1)
-scopenodes(#20037,#20038)
-scopenesting(#20038,#20033)
-#20039=@"var;{arguments};{#20038}"
-variables(#20039,"arguments",#20038)
-is_arguments_object(#20039)
+exprs(#20038,0,#20036,0,"constructor")
+hasLocation(#20038,#20037)
+enclosing_stmt(#20038,#20031)
+expr_containers(#20038,#20001)
+literals("constructor","constructor",#20038)
+#20039=*
+exprs(#20039,9,#20036,1,"() {}")
+hasLocation(#20039,#20037)
+enclosing_stmt(#20039,#20031)
+expr_containers(#20039,#20001)
 #20040=*
-stmts(#20040,1,#20037,-2,"{}")
-hasLocation(#20040,#20035)
-stmt_containers(#20040,#20037)
-is_method(#20034)
-#20041=*
-stmts(#20041,2,#20001,1,"[,]")
-#20042=@"loc,{#10000},1,27,1,29"
-locations_default(#20042,#10000,1,27,1,29)
-hasLocation(#20041,#20042)
-stmt_containers(#20041,#20001)
+scopes(#20040,1)
+scopenodes(#20039,#20040)
+scopenesting(#20040,#20034)
+#20041=@"var;{this};{#20040}"
+variables(#20041,"this",#20040)
+#20042=@"var;{arguments};{#20040}"
+variables(#20042,"arguments",#20040)
+is_arguments_object(#20042)
 #20043=*
-exprs(#20043,7,#20041,0,"[,]")
-hasLocation(#20043,#20042)
-enclosing_stmt(#20043,#20041)
-expr_containers(#20043,#20001)
-array_size(#20043,1)
+stmts(#20043,1,#20039,-2,"{}")
+hasLocation(#20043,#20037)
+stmt_containers(#20043,#20039)
+is_method(#20036)
 #20044=*
-entry_cfg_node(#20044,#20001)
-#20045=@"loc,{#10000},1,1,1,0"
-locations_default(#20045,#10000,1,1,1,0)
+stmts(#20044,2,#20001,1,"[,]")
+#20045=@"loc,{#10000},1,27,1,29"
+locations_default(#20045,#10000,1,27,1,29)
 hasLocation(#20044,#20045)
+stmt_containers(#20044,#20001)
 #20046=*
-exit_cfg_node(#20046,#20001)
-hasLocation(#20046,#20023)
-successor(#20041,#20043)
-successor(#20043,#20046)
-successor(#20028,#20032)
-successor(#20037,#20034)
+exprs(#20046,7,#20044,0,"[,]")
+hasLocation(#20046,#20045)
+enclosing_stmt(#20046,#20044)
+expr_containers(#20046,#20001)
+array_size(#20046,1)
 #20047=*
-entry_cfg_node(#20047,#20037)
-hasLocation(#20047,#20035)
-#20048=*
-exit_cfg_node(#20048,#20037)
-hasLocation(#20048,#20035)
-successor(#20040,#20048)
-successor(#20047,#20040)
-successor(#20036,#20037)
-successor(#20034,#20030)
-successor(#20032,#20036)
-successor(#20030,#20041)
-successor(#20044,#20028)
+entry_cfg_node(#20047,#20001)
+#20048=@"loc,{#10000},1,1,1,0"
+locations_default(#20048,#10000,1,1,1,0)
+hasLocation(#20047,#20048)
+#20049=*
+exit_cfg_node(#20049,#20001)
+hasLocation(#20049,#20023)
+successor(#20044,#20046)
+successor(#20046,#20049)
+successor(#20029,#20033)
+successor(#20039,#20036)
+#20050=*
+entry_cfg_node(#20050,#20039)
+hasLocation(#20050,#20037)
+#20051=*
+exit_cfg_node(#20051,#20039)
+hasLocation(#20051,#20037)
+successor(#20043,#20051)
+successor(#20050,#20043)
+successor(#20038,#20039)
+successor(#20036,#20031)
+successor(#20033,#20038)
+successor(#20031,#20044)
+successor(#20047,#20029)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/forof.js.trap b/javascript/extractor/tests/es2015/output/trap/forof.js.trap
index f9e60617614..9477e45051f 100644
--- a/javascript/extractor/tests/es2015/output/trap/forof.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/forof.js.trap
@@ -246,222 +246,226 @@ locations_default(#20090,#10000,1,1,8,0)
 hasLocation(#20001,#20090)
 #20091=@"var;{f};{#20000}"
 variables(#20091,"f",#20000)
-#20092=*
-stmts(#20092,21,#20001,0,"for (le ...  x+1;\n}")
-#20093=@"loc,{#10000},1,1,3,1"
-locations_default(#20093,#10000,1,1,3,1)
-hasLocation(#20092,#20093)
-stmt_containers(#20092,#20001)
-#20094=*
-exprs(#20094,7,#20092,1,"[1,2,3]")
-#20095=@"loc,{#10000},1,15,1,21"
-locations_default(#20095,#10000,1,15,1,21)
-hasLocation(#20094,#20095)
-enclosing_stmt(#20094,#20092)
-expr_containers(#20094,#20001)
-#20096=*
-exprs(#20096,3,#20094,0,"1")
-hasLocation(#20096,#20029)
-enclosing_stmt(#20096,#20092)
-expr_containers(#20096,#20001)
-literals("1","1",#20096)
+#20092=@"var;{this};{#20000}"
+variables(#20092,"this",#20000)
+#20093=*
+stmts(#20093,21,#20001,0,"for (le ...  x+1;\n}")
+#20094=@"loc,{#10000},1,1,3,1"
+locations_default(#20094,#10000,1,1,3,1)
+hasLocation(#20093,#20094)
+stmt_containers(#20093,#20001)
+#20095=*
+exprs(#20095,7,#20093,1,"[1,2,3]")
+#20096=@"loc,{#10000},1,15,1,21"
+locations_default(#20096,#10000,1,15,1,21)
+hasLocation(#20095,#20096)
+enclosing_stmt(#20095,#20093)
+expr_containers(#20095,#20001)
 #20097=*
-exprs(#20097,3,#20094,1,"2")
-hasLocation(#20097,#20033)
-enclosing_stmt(#20097,#20092)
+exprs(#20097,3,#20095,0,"1")
+hasLocation(#20097,#20029)
+enclosing_stmt(#20097,#20093)
 expr_containers(#20097,#20001)
-literals("2","2",#20097)
+literals("1","1",#20097)
 #20098=*
-exprs(#20098,3,#20094,2,"3")
-hasLocation(#20098,#20037)
-enclosing_stmt(#20098,#20092)
+exprs(#20098,3,#20095,1,"2")
+hasLocation(#20098,#20033)
+enclosing_stmt(#20098,#20093)
 expr_containers(#20098,#20001)
-literals("3","3",#20098)
-array_size(#20094,3)
+literals("2","2",#20098)
 #20099=*
-scopes(#20099,6)
-scopenodes(#20092,#20099)
-scopenesting(#20099,#20000)
-#20100=@"var;{x};{#20099}"
-variables(#20100,"x",#20099)
-#20101=*
-stmts(#20101,23,#20092,0,"let x")
-#20102=@"loc,{#10000},1,6,1,10"
-locations_default(#20102,#10000,1,6,1,10)
-hasLocation(#20101,#20102)
-stmt_containers(#20101,#20001)
-#20103=*
-exprs(#20103,64,#20101,0,"x")
-hasLocation(#20103,#20023)
-enclosing_stmt(#20103,#20101)
-expr_containers(#20103,#20001)
+exprs(#20099,3,#20095,2,"3")
+hasLocation(#20099,#20037)
+enclosing_stmt(#20099,#20093)
+expr_containers(#20099,#20001)
+literals("3","3",#20099)
+array_size(#20095,3)
+#20100=*
+scopes(#20100,6)
+scopenodes(#20093,#20100)
+scopenesting(#20100,#20000)
+#20101=@"var;{x};{#20100}"
+variables(#20101,"x",#20100)
+#20102=*
+stmts(#20102,23,#20093,0,"let x")
+#20103=@"loc,{#10000},1,6,1,10"
+locations_default(#20103,#10000,1,6,1,10)
+hasLocation(#20102,#20103)
+stmt_containers(#20102,#20001)
 #20104=*
-exprs(#20104,78,#20103,0,"x")
+exprs(#20104,64,#20102,0,"x")
 hasLocation(#20104,#20023)
-enclosing_stmt(#20104,#20101)
+enclosing_stmt(#20104,#20102)
 expr_containers(#20104,#20001)
-literals("x","x",#20104)
-decl(#20104,#20100)
 #20105=*
-stmts(#20105,1,#20092,2,"{\n    let y = x+1;\n}")
-#20106=@"loc,{#10000},1,24,3,1"
-locations_default(#20106,#10000,1,24,3,1)
-hasLocation(#20105,#20106)
-stmt_containers(#20105,#20001)
-#20107=*
-scopes(#20107,4)
-scopenodes(#20105,#20107)
-scopenesting(#20107,#20099)
-#20108=@"var;{y};{#20107}"
-variables(#20108,"y",#20107)
-#20109=*
-stmts(#20109,23,#20105,0,"let y = x+1;")
-#20110=@"loc,{#10000},2,5,2,16"
-locations_default(#20110,#10000,2,5,2,16)
-hasLocation(#20109,#20110)
-stmt_containers(#20109,#20001)
-#20111=*
-exprs(#20111,64,#20109,0,"y = x+1")
-#20112=@"loc,{#10000},2,9,2,15"
-locations_default(#20112,#10000,2,9,2,15)
-hasLocation(#20111,#20112)
-enclosing_stmt(#20111,#20109)
-expr_containers(#20111,#20001)
-#20113=*
-exprs(#20113,78,#20111,0,"y")
-hasLocation(#20113,#20047)
-enclosing_stmt(#20113,#20109)
-expr_containers(#20113,#20001)
-literals("y","y",#20113)
-decl(#20113,#20108)
+exprs(#20105,78,#20104,0,"x")
+hasLocation(#20105,#20023)
+enclosing_stmt(#20105,#20102)
+expr_containers(#20105,#20001)
+literals("x","x",#20105)
+decl(#20105,#20101)
+#20106=*
+stmts(#20106,1,#20093,2,"{\n    let y = x+1;\n}")
+#20107=@"loc,{#10000},1,24,3,1"
+locations_default(#20107,#10000,1,24,3,1)
+hasLocation(#20106,#20107)
+stmt_containers(#20106,#20001)
+#20108=*
+scopes(#20108,4)
+scopenodes(#20106,#20108)
+scopenesting(#20108,#20100)
+#20109=@"var;{y};{#20108}"
+variables(#20109,"y",#20108)
+#20110=*
+stmts(#20110,23,#20106,0,"let y = x+1;")
+#20111=@"loc,{#10000},2,5,2,16"
+locations_default(#20111,#10000,2,5,2,16)
+hasLocation(#20110,#20111)
+stmt_containers(#20110,#20001)
+#20112=*
+exprs(#20112,64,#20110,0,"y = x+1")
+#20113=@"loc,{#10000},2,9,2,15"
+locations_default(#20113,#10000,2,9,2,15)
+hasLocation(#20112,#20113)
+enclosing_stmt(#20112,#20110)
+expr_containers(#20112,#20001)
 #20114=*
-exprs(#20114,34,#20111,1,"x+1")
-#20115=@"loc,{#10000},2,13,2,15"
-locations_default(#20115,#10000,2,13,2,15)
-hasLocation(#20114,#20115)
-enclosing_stmt(#20114,#20109)
+exprs(#20114,78,#20112,0,"y")
+hasLocation(#20114,#20047)
+enclosing_stmt(#20114,#20110)
 expr_containers(#20114,#20001)
-#20116=*
-exprs(#20116,79,#20114,0,"x")
-hasLocation(#20116,#20051)
-enclosing_stmt(#20116,#20109)
-expr_containers(#20116,#20001)
-literals("x","x",#20116)
-bind(#20116,#20100)
+literals("y","y",#20114)
+decl(#20114,#20109)
+#20115=*
+exprs(#20115,34,#20112,1,"x+1")
+#20116=@"loc,{#10000},2,13,2,15"
+locations_default(#20116,#10000,2,13,2,15)
+hasLocation(#20115,#20116)
+enclosing_stmt(#20115,#20110)
+expr_containers(#20115,#20001)
 #20117=*
-exprs(#20117,3,#20114,1,"1")
-hasLocation(#20117,#20055)
-enclosing_stmt(#20117,#20109)
+exprs(#20117,79,#20115,0,"x")
+hasLocation(#20117,#20051)
+enclosing_stmt(#20117,#20110)
 expr_containers(#20117,#20001)
-literals("1","1",#20117)
+literals("x","x",#20117)
+bind(#20117,#20101)
 #20118=*
-stmts(#20118,17,#20001,1,"functio ...  []);\n}")
-#20119=@"loc,{#10000},5,1,7,1"
-locations_default(#20119,#10000,5,1,7,1)
-hasLocation(#20118,#20119)
-stmt_containers(#20118,#20001)
-#20120=*
-exprs(#20120,78,#20118,-1,"f")
-hasLocation(#20120,#20062)
-expr_containers(#20120,#20118)
-literals("f","f",#20120)
-decl(#20120,#20091)
+exprs(#20118,3,#20115,1,"1")
+hasLocation(#20118,#20055)
+enclosing_stmt(#20118,#20110)
+expr_containers(#20118,#20001)
+literals("1","1",#20118)
+#20119=*
+stmts(#20119,17,#20001,1,"functio ...  []);\n}")
+#20120=@"loc,{#10000},5,1,7,1"
+locations_default(#20120,#10000,5,1,7,1)
+hasLocation(#20119,#20120)
+stmt_containers(#20119,#20001)
 #20121=*
-scopes(#20121,1)
-scopenodes(#20118,#20121)
-scopenesting(#20121,#20000)
-#20122=@"var;{x};{#20121}"
-variables(#20122,"x",#20121)
-#20123=@"var;{arguments};{#20121}"
-variables(#20123,"arguments",#20121)
-is_arguments_object(#20123)
-#20124=*
-stmts(#20124,1,#20118,-2,"{\n    f ...  []);\n}")
-#20125=@"loc,{#10000},5,14,7,1"
-locations_default(#20125,#10000,5,14,7,1)
-hasLocation(#20124,#20125)
-stmt_containers(#20124,#20118)
+exprs(#20121,78,#20119,-1,"f")
+hasLocation(#20121,#20062)
+expr_containers(#20121,#20119)
+literals("f","f",#20121)
+decl(#20121,#20091)
+#20122=*
+scopes(#20122,1)
+scopenodes(#20119,#20122)
+scopenesting(#20122,#20000)
+#20123=@"var;{x};{#20122}"
+variables(#20123,"x",#20122)
+#20124=@"var;{this};{#20122}"
+variables(#20124,"this",#20122)
+#20125=@"var;{arguments};{#20122}"
+variables(#20125,"arguments",#20122)
+is_arguments_object(#20125)
 #20126=*
-stmts(#20126,21,#20124,0,"for (var x of []);")
-#20127=@"loc,{#10000},6,5,6,22"
-locations_default(#20127,#10000,6,5,6,22)
+stmts(#20126,1,#20119,-2,"{\n    f ...  []);\n}")
+#20127=@"loc,{#10000},5,14,7,1"
+locations_default(#20127,#10000,5,14,7,1)
 hasLocation(#20126,#20127)
-stmt_containers(#20126,#20118)
+stmt_containers(#20126,#20119)
 #20128=*
-exprs(#20128,7,#20126,1,"[]")
-#20129=@"loc,{#10000},6,19,6,20"
-locations_default(#20129,#10000,6,19,6,20)
+stmts(#20128,21,#20126,0,"for (var x of []);")
+#20129=@"loc,{#10000},6,5,6,22"
+locations_default(#20129,#10000,6,5,6,22)
 hasLocation(#20128,#20129)
-enclosing_stmt(#20128,#20126)
-expr_containers(#20128,#20118)
-array_size(#20128,0)
+stmt_containers(#20128,#20119)
 #20130=*
-stmts(#20130,18,#20126,0,"var x")
-#20131=@"loc,{#10000},6,10,6,14"
-locations_default(#20131,#10000,6,10,6,14)
+exprs(#20130,7,#20128,1,"[]")
+#20131=@"loc,{#10000},6,19,6,20"
+locations_default(#20131,#10000,6,19,6,20)
 hasLocation(#20130,#20131)
-stmt_containers(#20130,#20118)
+enclosing_stmt(#20130,#20128)
+expr_containers(#20130,#20119)
+array_size(#20130,0)
 #20132=*
-exprs(#20132,64,#20130,0,"x")
-hasLocation(#20132,#20076)
-enclosing_stmt(#20132,#20130)
-expr_containers(#20132,#20118)
-#20133=*
-exprs(#20133,78,#20132,0,"x")
-hasLocation(#20133,#20076)
-enclosing_stmt(#20133,#20130)
-expr_containers(#20133,#20118)
-literals("x","x",#20133)
-decl(#20133,#20122)
+stmts(#20132,18,#20128,0,"var x")
+#20133=@"loc,{#10000},6,10,6,14"
+locations_default(#20133,#10000,6,10,6,14)
+hasLocation(#20132,#20133)
+stmt_containers(#20132,#20119)
 #20134=*
-stmts(#20134,0,#20126,2,";")
-hasLocation(#20134,#20086)
-stmt_containers(#20134,#20118)
+exprs(#20134,64,#20132,0,"x")
+hasLocation(#20134,#20076)
+enclosing_stmt(#20134,#20132)
+expr_containers(#20134,#20119)
 #20135=*
-entry_cfg_node(#20135,#20001)
-#20136=@"loc,{#10000},1,1,1,0"
-locations_default(#20136,#10000,1,1,1,0)
-hasLocation(#20135,#20136)
+exprs(#20135,78,#20134,0,"x")
+hasLocation(#20135,#20076)
+enclosing_stmt(#20135,#20132)
+expr_containers(#20135,#20119)
+literals("x","x",#20135)
+decl(#20135,#20123)
+#20136=*
+stmts(#20136,0,#20128,2,";")
+hasLocation(#20136,#20086)
+stmt_containers(#20136,#20119)
 #20137=*
-exit_cfg_node(#20137,#20001)
-hasLocation(#20137,#20089)
-successor(#20118,#20137)
-#20138=*
-entry_cfg_node(#20138,#20118)
-#20139=@"loc,{#10000},5,1,5,0"
-locations_default(#20139,#10000,5,1,5,0)
-hasLocation(#20138,#20139)
+entry_cfg_node(#20137,#20001)
+#20138=@"loc,{#10000},1,1,1,0"
+locations_default(#20138,#10000,1,1,1,0)
+hasLocation(#20137,#20138)
+#20139=*
+exit_cfg_node(#20139,#20001)
+hasLocation(#20139,#20089)
+successor(#20119,#20139)
 #20140=*
-exit_cfg_node(#20140,#20118)
-#20141=@"loc,{#10000},7,2,7,1"
-locations_default(#20141,#10000,7,2,7,1)
+entry_cfg_node(#20140,#20119)
+#20141=@"loc,{#10000},5,1,5,0"
+locations_default(#20141,#10000,5,1,5,0)
 hasLocation(#20140,#20141)
-successor(#20128,#20126)
+#20142=*
+exit_cfg_node(#20142,#20119)
+#20143=@"loc,{#10000},7,2,7,1"
+locations_default(#20143,#10000,7,2,7,1)
+hasLocation(#20142,#20143)
+successor(#20130,#20128)
+successor(#20128,#20132)
+successor(#20128,#20142)
+successor(#20136,#20128)
+successor(#20132,#20135)
+successor(#20135,#20134)
+successor(#20134,#20136)
 successor(#20126,#20130)
-successor(#20126,#20140)
-successor(#20134,#20126)
-successor(#20130,#20133)
-successor(#20133,#20132)
-successor(#20132,#20134)
-successor(#20124,#20128)
-successor(#20138,#20124)
-successor(#20094,#20096)
-successor(#20098,#20092)
+successor(#20140,#20126)
+successor(#20095,#20097)
+successor(#20099,#20093)
+successor(#20098,#20099)
 successor(#20097,#20098)
-successor(#20096,#20097)
-successor(#20092,#20101)
-successor(#20092,#20118)
-successor(#20109,#20113)
-successor(#20117,#20114)
-successor(#20116,#20117)
-successor(#20114,#20111)
-successor(#20113,#20116)
-successor(#20111,#20092)
-successor(#20105,#20109)
-successor(#20101,#20104)
-successor(#20104,#20103)
-successor(#20103,#20105)
-successor(#20120,#20094)
-successor(#20135,#20120)
+successor(#20093,#20102)
+successor(#20093,#20119)
+successor(#20110,#20114)
+successor(#20118,#20115)
+successor(#20117,#20118)
+successor(#20115,#20112)
+successor(#20114,#20117)
+successor(#20112,#20093)
+successor(#20106,#20110)
+successor(#20102,#20105)
+successor(#20105,#20104)
+successor(#20104,#20106)
+successor(#20121,#20095)
+successor(#20137,#20121)
 numlines(#10000,7,6,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/import1.js.trap b/javascript/extractor/tests/es2015/output/trap/import1.js.trap
index b02b3375bba..ef8c3d0b3ef 100644
--- a/javascript/extractor/tests/es2015/output/trap/import1.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import1.js.trap
@@ -62,46 +62,48 @@ local_namespace_names(#20019,"x",#20016)
 variables(#20017,"x",#20016)
 local_type_names(#20018,"x",#20016)
 local_namespace_names(#20019,"x",#20016)
-#20020=*
-stmts(#20020,27,#20001,0,"import x from 'foo';")
-hasLocation(#20020,#20003)
-stmt_containers(#20020,#20001)
+#20020=@"var;{this};{#20016}"
+variables(#20020,"this",#20016)
 #20021=*
-exprs(#20021,4,#20020,-1,"'foo'")
-hasLocation(#20021,#20011)
-enclosing_stmt(#20021,#20020)
-expr_containers(#20021,#20001)
-literals("foo","'foo'",#20021)
+stmts(#20021,27,#20001,0,"import x from 'foo';")
+hasLocation(#20021,#20003)
+stmt_containers(#20021,#20001)
 #20022=*
-regexpterm(#20022,14,#20021,0,"foo")
-#20023=@"loc,{#10000},1,16,1,18"
-locations_default(#20023,#10000,1,16,1,18)
-hasLocation(#20022,#20023)
-regexp_const_value(#20022,"foo")
-#20024=*
-exprs(#20024,84,#20020,0,"x")
-hasLocation(#20024,#20007)
-enclosing_stmt(#20024,#20020)
-expr_containers(#20024,#20001)
+exprs(#20022,4,#20021,-1,"'foo'")
+hasLocation(#20022,#20011)
+enclosing_stmt(#20022,#20021)
+expr_containers(#20022,#20001)
+literals("foo","'foo'",#20022)
+#20023=*
+regexpterm(#20023,14,#20022,0,"foo")
+#20024=@"loc,{#10000},1,16,1,18"
+locations_default(#20024,#10000,1,16,1,18)
+hasLocation(#20023,#20024)
+regexp_const_value(#20023,"foo")
 #20025=*
-exprs(#20025,78,#20024,1,"x")
+exprs(#20025,84,#20021,0,"x")
 hasLocation(#20025,#20007)
-enclosing_stmt(#20025,#20020)
+enclosing_stmt(#20025,#20021)
 expr_containers(#20025,#20001)
-literals("x","x",#20025)
-decl(#20025,#20017)
-typedecl(#20025,#20018)
-namespacedecl(#20025,#20019)
 #20026=*
-entry_cfg_node(#20026,#20001)
-#20027=@"loc,{#10000},1,1,1,0"
-locations_default(#20027,#10000,1,1,1,0)
-hasLocation(#20026,#20027)
-#20028=*
-exit_cfg_node(#20028,#20001)
-hasLocation(#20028,#20015)
-successor(#20020,#20028)
-successor(#20024,#20020)
-successor(#20026,#20024)
+exprs(#20026,78,#20025,1,"x")
+hasLocation(#20026,#20007)
+enclosing_stmt(#20026,#20021)
+expr_containers(#20026,#20001)
+literals("x","x",#20026)
+decl(#20026,#20017)
+typedecl(#20026,#20018)
+namespacedecl(#20026,#20019)
+#20027=*
+entry_cfg_node(#20027,#20001)
+#20028=@"loc,{#10000},1,1,1,0"
+locations_default(#20028,#10000,1,1,1,0)
+hasLocation(#20027,#20028)
+#20029=*
+exit_cfg_node(#20029,#20001)
+hasLocation(#20029,#20015)
+successor(#20021,#20029)
+successor(#20025,#20021)
+successor(#20027,#20025)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/import2.js.trap b/javascript/extractor/tests/es2015/output/trap/import2.js.trap
index 360b201cdc8..3881f5e88d8 100644
--- a/javascript/extractor/tests/es2015/output/trap/import2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import2.js.trap
@@ -72,52 +72,54 @@ local_namespace_names(#20023,"y",#20020)
 variables(#20021,"y",#20020)
 local_type_names(#20022,"y",#20020)
 local_namespace_names(#20023,"y",#20020)
-#20024=*
-stmts(#20024,27,#20001,0,"import  ...  'foo';")
-hasLocation(#20024,#20003)
-stmt_containers(#20024,#20001)
+#20024=@"var;{this};{#20020}"
+variables(#20024,"this",#20020)
 #20025=*
-exprs(#20025,4,#20024,-1,"'foo'")
-hasLocation(#20025,#20015)
-enclosing_stmt(#20025,#20024)
-expr_containers(#20025,#20001)
-literals("foo","'foo'",#20025)
+stmts(#20025,27,#20001,0,"import  ...  'foo';")
+hasLocation(#20025,#20003)
+stmt_containers(#20025,#20001)
 #20026=*
-regexpterm(#20026,14,#20025,0,"foo")
-#20027=@"loc,{#10000},1,20,1,22"
-locations_default(#20027,#10000,1,20,1,22)
-hasLocation(#20026,#20027)
-regexp_const_value(#20026,"foo")
-#20028=*
-exprs(#20028,83,#20024,0,"y")
-hasLocation(#20028,#20009)
-enclosing_stmt(#20028,#20024)
-expr_containers(#20028,#20001)
+exprs(#20026,4,#20025,-1,"'foo'")
+hasLocation(#20026,#20015)
+enclosing_stmt(#20026,#20025)
+expr_containers(#20026,#20001)
+literals("foo","'foo'",#20026)
+#20027=*
+regexpterm(#20027,14,#20026,0,"foo")
+#20028=@"loc,{#10000},1,20,1,22"
+locations_default(#20028,#10000,1,20,1,22)
+hasLocation(#20027,#20028)
+regexp_const_value(#20027,"foo")
 #20029=*
-exprs(#20029,0,#20028,0,"y")
+exprs(#20029,83,#20025,0,"y")
 hasLocation(#20029,#20009)
-enclosing_stmt(#20029,#20024)
+enclosing_stmt(#20029,#20025)
 expr_containers(#20029,#20001)
-literals("y","y",#20029)
 #20030=*
-exprs(#20030,78,#20028,1,"y")
+exprs(#20030,0,#20029,0,"y")
 hasLocation(#20030,#20009)
-enclosing_stmt(#20030,#20024)
+enclosing_stmt(#20030,#20025)
 expr_containers(#20030,#20001)
 literals("y","y",#20030)
-decl(#20030,#20021)
-typedecl(#20030,#20022)
-namespacedecl(#20030,#20023)
 #20031=*
-entry_cfg_node(#20031,#20001)
-#20032=@"loc,{#10000},1,1,1,0"
-locations_default(#20032,#10000,1,1,1,0)
-hasLocation(#20031,#20032)
-#20033=*
-exit_cfg_node(#20033,#20001)
-hasLocation(#20033,#20019)
-successor(#20024,#20033)
-successor(#20028,#20024)
-successor(#20031,#20028)
+exprs(#20031,78,#20029,1,"y")
+hasLocation(#20031,#20009)
+enclosing_stmt(#20031,#20025)
+expr_containers(#20031,#20001)
+literals("y","y",#20031)
+decl(#20031,#20021)
+typedecl(#20031,#20022)
+namespacedecl(#20031,#20023)
+#20032=*
+entry_cfg_node(#20032,#20001)
+#20033=@"loc,{#10000},1,1,1,0"
+locations_default(#20033,#10000,1,1,1,0)
+hasLocation(#20032,#20033)
+#20034=*
+exit_cfg_node(#20034,#20001)
+hasLocation(#20034,#20019)
+successor(#20025,#20034)
+successor(#20029,#20025)
+successor(#20032,#20029)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/import3.js.trap b/javascript/extractor/tests/es2015/output/trap/import3.js.trap
index 5d2c1a7c676..209bcb08e50 100644
--- a/javascript/extractor/tests/es2015/output/trap/import3.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import3.js.trap
@@ -82,54 +82,56 @@ local_namespace_names(#20027,"z",#20024)
 variables(#20025,"z",#20024)
 local_type_names(#20026,"z",#20024)
 local_namespace_names(#20027,"z",#20024)
-#20028=*
-stmts(#20028,27,#20001,0,"import  ...  'foo';")
-hasLocation(#20028,#20003)
-stmt_containers(#20028,#20001)
+#20028=@"var;{this};{#20024}"
+variables(#20028,"this",#20024)
 #20029=*
-exprs(#20029,4,#20028,-1,"'foo'")
-hasLocation(#20029,#20019)
-enclosing_stmt(#20029,#20028)
-expr_containers(#20029,#20001)
-literals("foo","'foo'",#20029)
+stmts(#20029,27,#20001,0,"import  ...  'foo';")
+hasLocation(#20029,#20003)
+stmt_containers(#20029,#20001)
 #20030=*
-regexpterm(#20030,14,#20029,0,"foo")
-#20031=@"loc,{#10000},1,25,1,27"
-locations_default(#20031,#10000,1,25,1,27)
-hasLocation(#20030,#20031)
-regexp_const_value(#20030,"foo")
-#20032=*
-exprs(#20032,83,#20028,0,"y as z")
-#20033=@"loc,{#10000},1,10,1,15"
-locations_default(#20033,#10000,1,10,1,15)
-hasLocation(#20032,#20033)
-enclosing_stmt(#20032,#20028)
-expr_containers(#20032,#20001)
-#20034=*
-exprs(#20034,0,#20032,0,"y")
-hasLocation(#20034,#20009)
-enclosing_stmt(#20034,#20028)
-expr_containers(#20034,#20001)
-literals("y","y",#20034)
+exprs(#20030,4,#20029,-1,"'foo'")
+hasLocation(#20030,#20019)
+enclosing_stmt(#20030,#20029)
+expr_containers(#20030,#20001)
+literals("foo","'foo'",#20030)
+#20031=*
+regexpterm(#20031,14,#20030,0,"foo")
+#20032=@"loc,{#10000},1,25,1,27"
+locations_default(#20032,#10000,1,25,1,27)
+hasLocation(#20031,#20032)
+regexp_const_value(#20031,"foo")
+#20033=*
+exprs(#20033,83,#20029,0,"y as z")
+#20034=@"loc,{#10000},1,10,1,15"
+locations_default(#20034,#10000,1,10,1,15)
+hasLocation(#20033,#20034)
+enclosing_stmt(#20033,#20029)
+expr_containers(#20033,#20001)
 #20035=*
-exprs(#20035,78,#20032,1,"z")
-hasLocation(#20035,#20013)
-enclosing_stmt(#20035,#20028)
+exprs(#20035,0,#20033,0,"y")
+hasLocation(#20035,#20009)
+enclosing_stmt(#20035,#20029)
 expr_containers(#20035,#20001)
-literals("z","z",#20035)
-decl(#20035,#20025)
-typedecl(#20035,#20026)
-namespacedecl(#20035,#20027)
+literals("y","y",#20035)
 #20036=*
-entry_cfg_node(#20036,#20001)
-#20037=@"loc,{#10000},1,1,1,0"
-locations_default(#20037,#10000,1,1,1,0)
-hasLocation(#20036,#20037)
-#20038=*
-exit_cfg_node(#20038,#20001)
-hasLocation(#20038,#20023)
-successor(#20028,#20038)
-successor(#20032,#20028)
-successor(#20036,#20032)
+exprs(#20036,78,#20033,1,"z")
+hasLocation(#20036,#20013)
+enclosing_stmt(#20036,#20029)
+expr_containers(#20036,#20001)
+literals("z","z",#20036)
+decl(#20036,#20025)
+typedecl(#20036,#20026)
+namespacedecl(#20036,#20027)
+#20037=*
+entry_cfg_node(#20037,#20001)
+#20038=@"loc,{#10000},1,1,1,0"
+locations_default(#20038,#10000,1,1,1,0)
+hasLocation(#20037,#20038)
+#20039=*
+exit_cfg_node(#20039,#20001)
+hasLocation(#20039,#20023)
+successor(#20029,#20039)
+successor(#20033,#20029)
+successor(#20037,#20033)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/import4.js.trap b/javascript/extractor/tests/es2015/output/trap/import4.js.trap
index 3d0694f2e03..06883f4ffdb 100644
--- a/javascript/extractor/tests/es2015/output/trap/import4.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import4.js.trap
@@ -101,69 +101,71 @@ local_type_names(#20031,"x",#20028)
 local_type_names(#20032,"z",#20028)
 local_namespace_names(#20033,"x",#20028)
 local_namespace_names(#20034,"z",#20028)
-#20035=*
-stmts(#20035,27,#20001,0,"import  ...  'foo';")
-hasLocation(#20035,#20003)
-stmt_containers(#20035,#20001)
+#20035=@"var;{this};{#20028}"
+variables(#20035,"this",#20028)
 #20036=*
-exprs(#20036,4,#20035,-1,"'foo'")
-hasLocation(#20036,#20023)
-enclosing_stmt(#20036,#20035)
-expr_containers(#20036,#20001)
-literals("foo","'foo'",#20036)
+stmts(#20036,27,#20001,0,"import  ...  'foo';")
+hasLocation(#20036,#20003)
+stmt_containers(#20036,#20001)
 #20037=*
-regexpterm(#20037,14,#20036,0,"foo")
-#20038=@"loc,{#10000},1,28,1,30"
-locations_default(#20038,#10000,1,28,1,30)
-hasLocation(#20037,#20038)
-regexp_const_value(#20037,"foo")
-#20039=*
-exprs(#20039,84,#20035,0,"x")
-hasLocation(#20039,#20007)
-enclosing_stmt(#20039,#20035)
-expr_containers(#20039,#20001)
+exprs(#20037,4,#20036,-1,"'foo'")
+hasLocation(#20037,#20023)
+enclosing_stmt(#20037,#20036)
+expr_containers(#20037,#20001)
+literals("foo","'foo'",#20037)
+#20038=*
+regexpterm(#20038,14,#20037,0,"foo")
+#20039=@"loc,{#10000},1,28,1,30"
+locations_default(#20039,#10000,1,28,1,30)
+hasLocation(#20038,#20039)
+regexp_const_value(#20038,"foo")
 #20040=*
-exprs(#20040,78,#20039,1,"x")
+exprs(#20040,84,#20036,0,"x")
 hasLocation(#20040,#20007)
-enclosing_stmt(#20040,#20035)
+enclosing_stmt(#20040,#20036)
 expr_containers(#20040,#20001)
-literals("x","x",#20040)
-decl(#20040,#20029)
-typedecl(#20040,#20031)
-namespacedecl(#20040,#20033)
 #20041=*
-exprs(#20041,83,#20035,1,"y as z")
-#20042=@"loc,{#10000},1,13,1,18"
-locations_default(#20042,#10000,1,13,1,18)
-hasLocation(#20041,#20042)
-enclosing_stmt(#20041,#20035)
+exprs(#20041,78,#20040,1,"x")
+hasLocation(#20041,#20007)
+enclosing_stmt(#20041,#20036)
 expr_containers(#20041,#20001)
-#20043=*
-exprs(#20043,0,#20041,0,"y")
-hasLocation(#20043,#20013)
-enclosing_stmt(#20043,#20035)
-expr_containers(#20043,#20001)
-literals("y","y",#20043)
+literals("x","x",#20041)
+decl(#20041,#20029)
+typedecl(#20041,#20031)
+namespacedecl(#20041,#20033)
+#20042=*
+exprs(#20042,83,#20036,1,"y as z")
+#20043=@"loc,{#10000},1,13,1,18"
+locations_default(#20043,#10000,1,13,1,18)
+hasLocation(#20042,#20043)
+enclosing_stmt(#20042,#20036)
+expr_containers(#20042,#20001)
 #20044=*
-exprs(#20044,78,#20041,1,"z")
-hasLocation(#20044,#20017)
-enclosing_stmt(#20044,#20035)
+exprs(#20044,0,#20042,0,"y")
+hasLocation(#20044,#20013)
+enclosing_stmt(#20044,#20036)
 expr_containers(#20044,#20001)
-literals("z","z",#20044)
-decl(#20044,#20030)
-typedecl(#20044,#20032)
-namespacedecl(#20044,#20034)
+literals("y","y",#20044)
 #20045=*
-entry_cfg_node(#20045,#20001)
-#20046=@"loc,{#10000},1,1,1,0"
-locations_default(#20046,#10000,1,1,1,0)
-hasLocation(#20045,#20046)
-#20047=*
-exit_cfg_node(#20047,#20001)
-hasLocation(#20047,#20027)
-successor(#20035,#20047)
-successor(#20041,#20035)
-successor(#20039,#20041)
-successor(#20045,#20039)
+exprs(#20045,78,#20042,1,"z")
+hasLocation(#20045,#20017)
+enclosing_stmt(#20045,#20036)
+expr_containers(#20045,#20001)
+literals("z","z",#20045)
+decl(#20045,#20030)
+typedecl(#20045,#20032)
+namespacedecl(#20045,#20034)
+#20046=*
+entry_cfg_node(#20046,#20001)
+#20047=@"loc,{#10000},1,1,1,0"
+locations_default(#20047,#10000,1,1,1,0)
+hasLocation(#20046,#20047)
+#20048=*
+exit_cfg_node(#20048,#20001)
+hasLocation(#20048,#20027)
+successor(#20036,#20048)
+successor(#20042,#20036)
+successor(#20040,#20042)
+successor(#20046,#20040)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/import5.js.trap b/javascript/extractor/tests/es2015/output/trap/import5.js.trap
index a410731eff4..fc2157edacd 100644
--- a/javascript/extractor/tests/es2015/output/trap/import5.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import5.js.trap
@@ -72,48 +72,50 @@ local_namespace_names(#20023,"foo",#20020)
 variables(#20021,"foo",#20020)
 local_type_names(#20022,"foo",#20020)
 local_namespace_names(#20023,"foo",#20020)
-#20024=*
-stmts(#20024,27,#20001,0,"import  ...  'foo';")
-hasLocation(#20024,#20003)
-stmt_containers(#20024,#20001)
+#20024=@"var;{this};{#20020}"
+variables(#20024,"this",#20020)
 #20025=*
-exprs(#20025,4,#20024,-1,"'foo'")
-hasLocation(#20025,#20015)
-enclosing_stmt(#20025,#20024)
-expr_containers(#20025,#20001)
-literals("foo","'foo'",#20025)
+stmts(#20025,27,#20001,0,"import  ...  'foo';")
+hasLocation(#20025,#20003)
+stmt_containers(#20025,#20001)
 #20026=*
-regexpterm(#20026,14,#20025,0,"foo")
-#20027=@"loc,{#10000},1,23,1,25"
-locations_default(#20027,#10000,1,23,1,25)
-hasLocation(#20026,#20027)
-regexp_const_value(#20026,"foo")
-#20028=*
-exprs(#20028,85,#20024,0,"* as foo")
-#20029=@"loc,{#10000},1,8,1,15"
-locations_default(#20029,#10000,1,8,1,15)
-hasLocation(#20028,#20029)
-enclosing_stmt(#20028,#20024)
-expr_containers(#20028,#20001)
-#20030=*
-exprs(#20030,78,#20028,1,"foo")
-hasLocation(#20030,#20011)
-enclosing_stmt(#20030,#20024)
-expr_containers(#20030,#20001)
-literals("foo","foo",#20030)
-decl(#20030,#20021)
-typedecl(#20030,#20022)
-namespacedecl(#20030,#20023)
+exprs(#20026,4,#20025,-1,"'foo'")
+hasLocation(#20026,#20015)
+enclosing_stmt(#20026,#20025)
+expr_containers(#20026,#20001)
+literals("foo","'foo'",#20026)
+#20027=*
+regexpterm(#20027,14,#20026,0,"foo")
+#20028=@"loc,{#10000},1,23,1,25"
+locations_default(#20028,#10000,1,23,1,25)
+hasLocation(#20027,#20028)
+regexp_const_value(#20027,"foo")
+#20029=*
+exprs(#20029,85,#20025,0,"* as foo")
+#20030=@"loc,{#10000},1,8,1,15"
+locations_default(#20030,#10000,1,8,1,15)
+hasLocation(#20029,#20030)
+enclosing_stmt(#20029,#20025)
+expr_containers(#20029,#20001)
 #20031=*
-entry_cfg_node(#20031,#20001)
-#20032=@"loc,{#10000},1,1,1,0"
-locations_default(#20032,#10000,1,1,1,0)
-hasLocation(#20031,#20032)
-#20033=*
-exit_cfg_node(#20033,#20001)
-hasLocation(#20033,#20019)
-successor(#20024,#20033)
-successor(#20028,#20024)
-successor(#20031,#20028)
+exprs(#20031,78,#20029,1,"foo")
+hasLocation(#20031,#20011)
+enclosing_stmt(#20031,#20025)
+expr_containers(#20031,#20001)
+literals("foo","foo",#20031)
+decl(#20031,#20021)
+typedecl(#20031,#20022)
+namespacedecl(#20031,#20023)
+#20032=*
+entry_cfg_node(#20032,#20001)
+#20033=@"loc,{#10000},1,1,1,0"
+locations_default(#20033,#10000,1,1,1,0)
+hasLocation(#20032,#20033)
+#20034=*
+exit_cfg_node(#20034,#20001)
+hasLocation(#20034,#20019)
+successor(#20025,#20034)
+successor(#20029,#20025)
+successor(#20032,#20029)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/import6.js.trap b/javascript/extractor/tests/es2015/output/trap/import6.js.trap
index 429035fa6ed..bea74c406be 100644
--- a/javascript/extractor/tests/es2015/output/trap/import6.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import6.js.trap
@@ -43,31 +43,33 @@ scopenodes(#20001,#20012)
 scopenesting(#20012,#20000)
 is_module(#20001)
 is_es2015_module(#20001)
-#20013=*
-stmts(#20013,27,#20001,0,"import 'foo';")
-hasLocation(#20013,#20003)
-stmt_containers(#20013,#20001)
+#20013=@"var;{this};{#20012}"
+variables(#20013,"this",#20012)
 #20014=*
-exprs(#20014,4,#20013,-1,"'foo'")
-hasLocation(#20014,#20007)
-enclosing_stmt(#20014,#20013)
-expr_containers(#20014,#20001)
-literals("foo","'foo'",#20014)
+stmts(#20014,27,#20001,0,"import 'foo';")
+hasLocation(#20014,#20003)
+stmt_containers(#20014,#20001)
 #20015=*
-regexpterm(#20015,14,#20014,0,"foo")
-#20016=@"loc,{#10000},1,9,1,11"
-locations_default(#20016,#10000,1,9,1,11)
-hasLocation(#20015,#20016)
-regexp_const_value(#20015,"foo")
-#20017=*
-entry_cfg_node(#20017,#20001)
-#20018=@"loc,{#10000},1,1,1,0"
-locations_default(#20018,#10000,1,1,1,0)
-hasLocation(#20017,#20018)
-#20019=*
-exit_cfg_node(#20019,#20001)
-hasLocation(#20019,#20011)
-successor(#20013,#20019)
-successor(#20017,#20013)
+exprs(#20015,4,#20014,-1,"'foo'")
+hasLocation(#20015,#20007)
+enclosing_stmt(#20015,#20014)
+expr_containers(#20015,#20001)
+literals("foo","'foo'",#20015)
+#20016=*
+regexpterm(#20016,14,#20015,0,"foo")
+#20017=@"loc,{#10000},1,9,1,11"
+locations_default(#20017,#10000,1,9,1,11)
+hasLocation(#20016,#20017)
+regexp_const_value(#20016,"foo")
+#20018=*
+entry_cfg_node(#20018,#20001)
+#20019=@"loc,{#10000},1,1,1,0"
+locations_default(#20019,#10000,1,1,1,0)
+hasLocation(#20018,#20019)
+#20020=*
+exit_cfg_node(#20020,#20001)
+hasLocation(#20020,#20011)
+successor(#20014,#20020)
+successor(#20018,#20014)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/import7.js.trap b/javascript/extractor/tests/es2015/output/trap/import7.js.trap
index 315afa6d01b..a307e8d9f1e 100644
--- a/javascript/extractor/tests/es2015/output/trap/import7.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/import7.js.trap
@@ -145,103 +145,105 @@ local_type_names(#20048,"x",#20045)
 local_type_names(#20049,"z",#20045)
 local_namespace_names(#20050,"x",#20045)
 local_namespace_names(#20051,"z",#20045)
-#20052=*
-stmts(#20052,27,#20001,0,"import x from 'foo';")
-hasLocation(#20052,#20003)
-stmt_containers(#20052,#20001)
+#20052=@"var;{this};{#20045}"
+variables(#20052,"this",#20045)
 #20053=*
-exprs(#20053,4,#20052,-1,"'foo'")
-hasLocation(#20053,#20015)
-enclosing_stmt(#20053,#20052)
-expr_containers(#20053,#20001)
-literals("foo","'foo'",#20053)
+stmts(#20053,27,#20001,0,"import x from 'foo';")
+hasLocation(#20053,#20003)
+stmt_containers(#20053,#20001)
 #20054=*
-regexpterm(#20054,14,#20053,0,"foo")
-#20055=@"loc,{#10000},1,16,1,18"
-locations_default(#20055,#10000,1,16,1,18)
-hasLocation(#20054,#20055)
-regexp_const_value(#20054,"foo")
-#20056=*
-exprs(#20056,84,#20052,0,"x")
-hasLocation(#20056,#20011)
-enclosing_stmt(#20056,#20052)
-expr_containers(#20056,#20001)
+exprs(#20054,4,#20053,-1,"'foo'")
+hasLocation(#20054,#20015)
+enclosing_stmt(#20054,#20053)
+expr_containers(#20054,#20001)
+literals("foo","'foo'",#20054)
+#20055=*
+regexpterm(#20055,14,#20054,0,"foo")
+#20056=@"loc,{#10000},1,16,1,18"
+locations_default(#20056,#10000,1,16,1,18)
+hasLocation(#20055,#20056)
+regexp_const_value(#20055,"foo")
 #20057=*
-exprs(#20057,78,#20056,1,"x")
+exprs(#20057,84,#20053,0,"x")
 hasLocation(#20057,#20011)
-enclosing_stmt(#20057,#20052)
+enclosing_stmt(#20057,#20053)
 expr_containers(#20057,#20001)
-literals("x","x",#20057)
-decl(#20057,#20046)
-typedecl(#20057,#20048)
-namespacedecl(#20057,#20050)
 #20058=*
-stmts(#20058,27,#20001,1,"import 'bar';")
-hasLocation(#20058,#20005)
-stmt_containers(#20058,#20001)
+exprs(#20058,78,#20057,1,"x")
+hasLocation(#20058,#20011)
+enclosing_stmt(#20058,#20053)
+expr_containers(#20058,#20001)
+literals("x","x",#20058)
+decl(#20058,#20046)
+typedecl(#20058,#20048)
+namespacedecl(#20058,#20050)
 #20059=*
-exprs(#20059,4,#20058,-1,"'bar'")
-hasLocation(#20059,#20021)
-enclosing_stmt(#20059,#20058)
-expr_containers(#20059,#20001)
-literals("bar","'bar'",#20059)
+stmts(#20059,27,#20001,1,"import 'bar';")
+hasLocation(#20059,#20005)
+stmt_containers(#20059,#20001)
 #20060=*
-regexpterm(#20060,14,#20059,0,"bar")
-#20061=@"loc,{#10000},2,9,2,11"
-locations_default(#20061,#10000,2,9,2,11)
-hasLocation(#20060,#20061)
-regexp_const_value(#20060,"bar")
-#20062=*
-stmts(#20062,27,#20001,2,"import  ...  'baz';")
-hasLocation(#20062,#20007)
-stmt_containers(#20062,#20001)
+exprs(#20060,4,#20059,-1,"'bar'")
+hasLocation(#20060,#20021)
+enclosing_stmt(#20060,#20059)
+expr_containers(#20060,#20001)
+literals("bar","'bar'",#20060)
+#20061=*
+regexpterm(#20061,14,#20060,0,"bar")
+#20062=@"loc,{#10000},2,9,2,11"
+locations_default(#20062,#10000,2,9,2,11)
+hasLocation(#20061,#20062)
+regexp_const_value(#20061,"bar")
 #20063=*
-exprs(#20063,4,#20062,-1,"'baz'")
-hasLocation(#20063,#20039)
-enclosing_stmt(#20063,#20062)
-expr_containers(#20063,#20001)
-literals("baz","'baz'",#20063)
+stmts(#20063,27,#20001,2,"import  ...  'baz';")
+hasLocation(#20063,#20007)
+stmt_containers(#20063,#20001)
 #20064=*
-regexpterm(#20064,14,#20063,0,"baz")
-#20065=@"loc,{#10000},3,25,3,27"
-locations_default(#20065,#10000,3,25,3,27)
-hasLocation(#20064,#20065)
-regexp_const_value(#20064,"baz")
-#20066=*
-exprs(#20066,83,#20062,0,"y as z")
-#20067=@"loc,{#10000},3,10,3,15"
-locations_default(#20067,#10000,3,10,3,15)
-hasLocation(#20066,#20067)
-enclosing_stmt(#20066,#20062)
-expr_containers(#20066,#20001)
-#20068=*
-exprs(#20068,0,#20066,0,"y")
-hasLocation(#20068,#20029)
-enclosing_stmt(#20068,#20062)
-expr_containers(#20068,#20001)
-literals("y","y",#20068)
+exprs(#20064,4,#20063,-1,"'baz'")
+hasLocation(#20064,#20039)
+enclosing_stmt(#20064,#20063)
+expr_containers(#20064,#20001)
+literals("baz","'baz'",#20064)
+#20065=*
+regexpterm(#20065,14,#20064,0,"baz")
+#20066=@"loc,{#10000},3,25,3,27"
+locations_default(#20066,#10000,3,25,3,27)
+hasLocation(#20065,#20066)
+regexp_const_value(#20065,"baz")
+#20067=*
+exprs(#20067,83,#20063,0,"y as z")
+#20068=@"loc,{#10000},3,10,3,15"
+locations_default(#20068,#10000,3,10,3,15)
+hasLocation(#20067,#20068)
+enclosing_stmt(#20067,#20063)
+expr_containers(#20067,#20001)
 #20069=*
-exprs(#20069,78,#20066,1,"z")
-hasLocation(#20069,#20033)
-enclosing_stmt(#20069,#20062)
+exprs(#20069,0,#20067,0,"y")
+hasLocation(#20069,#20029)
+enclosing_stmt(#20069,#20063)
 expr_containers(#20069,#20001)
-literals("z","z",#20069)
-decl(#20069,#20047)
-typedecl(#20069,#20049)
-namespacedecl(#20069,#20051)
+literals("y","y",#20069)
 #20070=*
-entry_cfg_node(#20070,#20001)
-#20071=@"loc,{#10000},1,1,1,0"
-locations_default(#20071,#10000,1,1,1,0)
-hasLocation(#20070,#20071)
-#20072=*
-exit_cfg_node(#20072,#20001)
-hasLocation(#20072,#20043)
-successor(#20062,#20072)
-successor(#20058,#20062)
-successor(#20052,#20058)
-successor(#20066,#20052)
-successor(#20056,#20066)
-successor(#20070,#20056)
+exprs(#20070,78,#20067,1,"z")
+hasLocation(#20070,#20033)
+enclosing_stmt(#20070,#20063)
+expr_containers(#20070,#20001)
+literals("z","z",#20070)
+decl(#20070,#20047)
+typedecl(#20070,#20049)
+namespacedecl(#20070,#20051)
+#20071=*
+entry_cfg_node(#20071,#20001)
+#20072=@"loc,{#10000},1,1,1,0"
+locations_default(#20072,#10000,1,1,1,0)
+hasLocation(#20071,#20072)
+#20073=*
+exit_cfg_node(#20073,#20001)
+hasLocation(#20073,#20043)
+successor(#20063,#20073)
+successor(#20059,#20063)
+successor(#20053,#20059)
+successor(#20067,#20053)
+successor(#20057,#20067)
+successor(#20071,#20057)
 numlines(#10000,3,3,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/let.js.trap b/javascript/extractor/tests/es2015/output/trap/let.js.trap
index 3fbdfba7303..22c8f1c1116 100644
--- a/javascript/extractor/tests/es2015/output/trap/let.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/let.js.trap
@@ -371,359 +371,361 @@ toplevels(#20001,0)
 #20136=@"loc,{#10000},1,1,12,1"
 locations_default(#20136,#10000,1,1,12,1)
 hasLocation(#20001,#20136)
-#20137=*
-stmts(#20137,1,#20001,0,"{\n    l ...     }\n}")
-hasLocation(#20137,#20136)
-stmt_containers(#20137,#20001)
+#20137=@"var;{this};{#20000}"
+variables(#20137,"this",#20000)
 #20138=*
-scopes(#20138,4)
-scopenodes(#20137,#20138)
-scopenesting(#20138,#20000)
-#20139=@"var;{x};{#20138}"
-variables(#20139,"x",#20138)
-#20140=*
-stmts(#20140,23,#20137,0,"let x = 23;")
-#20141=@"loc,{#10000},2,5,2,15"
-locations_default(#20141,#10000,2,5,2,15)
-hasLocation(#20140,#20141)
-stmt_containers(#20140,#20001)
-#20142=*
-exprs(#20142,64,#20140,0,"x = 23")
-#20143=@"loc,{#10000},2,9,2,14"
-locations_default(#20143,#10000,2,9,2,14)
-hasLocation(#20142,#20143)
-enclosing_stmt(#20142,#20140)
-expr_containers(#20142,#20001)
-#20144=*
-exprs(#20144,78,#20142,0,"x")
-hasLocation(#20144,#20030)
-enclosing_stmt(#20144,#20140)
-expr_containers(#20144,#20001)
-literals("x","x",#20144)
-decl(#20144,#20139)
+stmts(#20138,1,#20001,0,"{\n    l ...     }\n}")
+hasLocation(#20138,#20136)
+stmt_containers(#20138,#20001)
+#20139=*
+scopes(#20139,4)
+scopenodes(#20138,#20139)
+scopenesting(#20139,#20000)
+#20140=@"var;{x};{#20139}"
+variables(#20140,"x",#20139)
+#20141=*
+stmts(#20141,23,#20138,0,"let x = 23;")
+#20142=@"loc,{#10000},2,5,2,15"
+locations_default(#20142,#10000,2,5,2,15)
+hasLocation(#20141,#20142)
+stmt_containers(#20141,#20001)
+#20143=*
+exprs(#20143,64,#20141,0,"x = 23")
+#20144=@"loc,{#10000},2,9,2,14"
+locations_default(#20144,#10000,2,9,2,14)
+hasLocation(#20143,#20144)
+enclosing_stmt(#20143,#20141)
+expr_containers(#20143,#20001)
 #20145=*
-exprs(#20145,3,#20142,1,"23")
-hasLocation(#20145,#20034)
-enclosing_stmt(#20145,#20140)
+exprs(#20145,78,#20143,0,"x")
+hasLocation(#20145,#20030)
+enclosing_stmt(#20145,#20141)
 expr_containers(#20145,#20001)
-literals("23","23",#20145)
+literals("x","x",#20145)
+decl(#20145,#20140)
 #20146=*
-stmts(#20146,1,#20137,1,"{\n      ... ;\n    }")
-#20147=@"loc,{#10000},3,5,11,5"
-locations_default(#20147,#10000,3,5,11,5)
-hasLocation(#20146,#20147)
-stmt_containers(#20146,#20001)
-#20148=*
-scopes(#20148,4)
-scopenodes(#20146,#20148)
-scopenesting(#20148,#20138)
-#20149=@"var;{x};{#20148}"
-variables(#20149,"x",#20148)
-#20150=*
-stmts(#20150,23,#20146,0,"let x = 42;")
-#20151=@"loc,{#10000},4,9,4,19"
-locations_default(#20151,#10000,4,9,4,19)
-hasLocation(#20150,#20151)
-stmt_containers(#20150,#20001)
-#20152=*
-exprs(#20152,64,#20150,0,"x = 42")
-#20153=@"loc,{#10000},4,13,4,18"
-locations_default(#20153,#10000,4,13,4,18)
-hasLocation(#20152,#20153)
-enclosing_stmt(#20152,#20150)
-expr_containers(#20152,#20001)
-#20154=*
-exprs(#20154,78,#20152,0,"x")
-hasLocation(#20154,#20042)
-enclosing_stmt(#20154,#20150)
-expr_containers(#20154,#20001)
-literals("x","x",#20154)
-decl(#20154,#20149)
+exprs(#20146,3,#20143,1,"23")
+hasLocation(#20146,#20034)
+enclosing_stmt(#20146,#20141)
+expr_containers(#20146,#20001)
+literals("23","23",#20146)
+#20147=*
+stmts(#20147,1,#20138,1,"{\n      ... ;\n    }")
+#20148=@"loc,{#10000},3,5,11,5"
+locations_default(#20148,#10000,3,5,11,5)
+hasLocation(#20147,#20148)
+stmt_containers(#20147,#20001)
+#20149=*
+scopes(#20149,4)
+scopenodes(#20147,#20149)
+scopenesting(#20149,#20139)
+#20150=@"var;{x};{#20149}"
+variables(#20150,"x",#20149)
+#20151=*
+stmts(#20151,23,#20147,0,"let x = 42;")
+#20152=@"loc,{#10000},4,9,4,19"
+locations_default(#20152,#10000,4,9,4,19)
+hasLocation(#20151,#20152)
+stmt_containers(#20151,#20001)
+#20153=*
+exprs(#20153,64,#20151,0,"x = 42")
+#20154=@"loc,{#10000},4,13,4,18"
+locations_default(#20154,#10000,4,13,4,18)
+hasLocation(#20153,#20154)
+enclosing_stmt(#20153,#20151)
+expr_containers(#20153,#20001)
 #20155=*
-exprs(#20155,3,#20152,1,"42")
-hasLocation(#20155,#20046)
-enclosing_stmt(#20155,#20150)
+exprs(#20155,78,#20153,0,"x")
+hasLocation(#20155,#20042)
+enclosing_stmt(#20155,#20151)
 expr_containers(#20155,#20001)
-literals("42","42",#20155)
+literals("x","x",#20155)
+decl(#20155,#20150)
 #20156=*
-stmts(#20156,14,#20146,1,"for (le ...       }")
-#20157=@"loc,{#10000},5,9,8,9"
-locations_default(#20157,#10000,5,9,8,9)
-hasLocation(#20156,#20157)
-stmt_containers(#20156,#20001)
-#20158=*
-scopes(#20158,5)
-scopenodes(#20156,#20158)
-scopenesting(#20158,#20148)
-#20159=@"var;{x};{#20158}"
-variables(#20159,"x",#20158)
-#20160=*
-exprs(#20160,27,#20156,1,"x<42")
-#20161=@"loc,{#10000},5,28,5,31"
-locations_default(#20161,#10000,5,28,5,31)
-hasLocation(#20160,#20161)
-enclosing_stmt(#20160,#20156)
-expr_containers(#20160,#20001)
-#20162=*
-exprs(#20162,79,#20160,0,"x")
-hasLocation(#20162,#20068)
-enclosing_stmt(#20162,#20156)
-expr_containers(#20162,#20001)
-literals("x","x",#20162)
-bind(#20162,#20159)
+exprs(#20156,3,#20153,1,"42")
+hasLocation(#20156,#20046)
+enclosing_stmt(#20156,#20151)
+expr_containers(#20156,#20001)
+literals("42","42",#20156)
+#20157=*
+stmts(#20157,14,#20147,1,"for (le ...       }")
+#20158=@"loc,{#10000},5,9,8,9"
+locations_default(#20158,#10000,5,9,8,9)
+hasLocation(#20157,#20158)
+stmt_containers(#20157,#20001)
+#20159=*
+scopes(#20159,5)
+scopenodes(#20157,#20159)
+scopenesting(#20159,#20149)
+#20160=@"var;{x};{#20159}"
+variables(#20160,"x",#20159)
+#20161=*
+exprs(#20161,27,#20157,1,"x<42")
+#20162=@"loc,{#10000},5,28,5,31"
+locations_default(#20162,#10000,5,28,5,31)
+hasLocation(#20161,#20162)
+enclosing_stmt(#20161,#20157)
+expr_containers(#20161,#20001)
 #20163=*
-exprs(#20163,3,#20160,1,"42")
-hasLocation(#20163,#20072)
-enclosing_stmt(#20163,#20156)
+exprs(#20163,79,#20161,0,"x")
+hasLocation(#20163,#20068)
+enclosing_stmt(#20163,#20157)
 expr_containers(#20163,#20001)
-literals("42","42",#20163)
+literals("x","x",#20163)
+bind(#20163,#20160)
 #20164=*
-stmts(#20164,23,#20156,0,"let x = x-19")
-#20165=@"loc,{#10000},5,14,5,25"
-locations_default(#20165,#10000,5,14,5,25)
-hasLocation(#20164,#20165)
-stmt_containers(#20164,#20001)
-#20166=*
-exprs(#20166,64,#20164,0,"x = x-19")
-#20167=@"loc,{#10000},5,18,5,25"
-locations_default(#20167,#10000,5,18,5,25)
-hasLocation(#20166,#20167)
-enclosing_stmt(#20166,#20164)
-expr_containers(#20166,#20001)
-#20168=*
-exprs(#20168,78,#20166,0,"x")
-hasLocation(#20168,#20056)
-enclosing_stmt(#20168,#20164)
-expr_containers(#20168,#20001)
-literals("x","x",#20168)
-decl(#20168,#20159)
+exprs(#20164,3,#20161,1,"42")
+hasLocation(#20164,#20072)
+enclosing_stmt(#20164,#20157)
+expr_containers(#20164,#20001)
+literals("42","42",#20164)
+#20165=*
+stmts(#20165,23,#20157,0,"let x = x-19")
+#20166=@"loc,{#10000},5,14,5,25"
+locations_default(#20166,#10000,5,14,5,25)
+hasLocation(#20165,#20166)
+stmt_containers(#20165,#20001)
+#20167=*
+exprs(#20167,64,#20165,0,"x = x-19")
+#20168=@"loc,{#10000},5,18,5,25"
+locations_default(#20168,#10000,5,18,5,25)
+hasLocation(#20167,#20168)
+enclosing_stmt(#20167,#20165)
+expr_containers(#20167,#20001)
 #20169=*
-exprs(#20169,35,#20166,1,"x-19")
-#20170=@"loc,{#10000},5,22,5,25"
-locations_default(#20170,#10000,5,22,5,25)
-hasLocation(#20169,#20170)
-enclosing_stmt(#20169,#20164)
+exprs(#20169,78,#20167,0,"x")
+hasLocation(#20169,#20056)
+enclosing_stmt(#20169,#20165)
 expr_containers(#20169,#20001)
-#20171=*
-exprs(#20171,79,#20169,0,"x")
-hasLocation(#20171,#20060)
-enclosing_stmt(#20171,#20164)
-expr_containers(#20171,#20001)
-literals("x","x",#20171)
-bind(#20171,#20149)
+literals("x","x",#20169)
+decl(#20169,#20160)
+#20170=*
+exprs(#20170,35,#20167,1,"x-19")
+#20171=@"loc,{#10000},5,22,5,25"
+locations_default(#20171,#10000,5,22,5,25)
+hasLocation(#20170,#20171)
+enclosing_stmt(#20170,#20165)
+expr_containers(#20170,#20001)
 #20172=*
-exprs(#20172,3,#20169,1,"19")
-hasLocation(#20172,#20064)
-enclosing_stmt(#20172,#20164)
+exprs(#20172,79,#20170,0,"x")
+hasLocation(#20172,#20060)
+enclosing_stmt(#20172,#20165)
 expr_containers(#20172,#20001)
-literals("19","19",#20172)
+literals("x","x",#20172)
+bind(#20172,#20150)
 #20173=*
-stmts(#20173,1,#20156,3,"{\n      ...       }")
-#20174=@"loc,{#10000},5,35,8,9"
-locations_default(#20174,#10000,5,35,8,9)
-hasLocation(#20173,#20174)
-stmt_containers(#20173,#20001)
-#20175=*
-scopes(#20175,4)
-scopenodes(#20173,#20175)
-scopenesting(#20175,#20158)
-#20176=@"var;{x};{#20175}"
-variables(#20176,"x",#20175)
-#20177=*
-stmts(#20177,23,#20173,0,"let x = 56;")
-#20178=@"loc,{#10000},6,13,6,23"
-locations_default(#20178,#10000,6,13,6,23)
-hasLocation(#20177,#20178)
-stmt_containers(#20177,#20001)
-#20179=*
-exprs(#20179,64,#20177,0,"x = 56")
-#20180=@"loc,{#10000},6,17,6,22"
-locations_default(#20180,#10000,6,17,6,22)
-hasLocation(#20179,#20180)
-enclosing_stmt(#20179,#20177)
-expr_containers(#20179,#20001)
-#20181=*
-exprs(#20181,78,#20179,0,"x")
-hasLocation(#20181,#20082)
-enclosing_stmt(#20181,#20177)
-expr_containers(#20181,#20001)
-literals("x","x",#20181)
-decl(#20181,#20176)
+exprs(#20173,3,#20170,1,"19")
+hasLocation(#20173,#20064)
+enclosing_stmt(#20173,#20165)
+expr_containers(#20173,#20001)
+literals("19","19",#20173)
+#20174=*
+stmts(#20174,1,#20157,3,"{\n      ...       }")
+#20175=@"loc,{#10000},5,35,8,9"
+locations_default(#20175,#10000,5,35,8,9)
+hasLocation(#20174,#20175)
+stmt_containers(#20174,#20001)
+#20176=*
+scopes(#20176,4)
+scopenodes(#20174,#20176)
+scopenesting(#20176,#20159)
+#20177=@"var;{x};{#20176}"
+variables(#20177,"x",#20176)
+#20178=*
+stmts(#20178,23,#20174,0,"let x = 56;")
+#20179=@"loc,{#10000},6,13,6,23"
+locations_default(#20179,#10000,6,13,6,23)
+hasLocation(#20178,#20179)
+stmt_containers(#20178,#20001)
+#20180=*
+exprs(#20180,64,#20178,0,"x = 56")
+#20181=@"loc,{#10000},6,17,6,22"
+locations_default(#20181,#10000,6,17,6,22)
+hasLocation(#20180,#20181)
+enclosing_stmt(#20180,#20178)
+expr_containers(#20180,#20001)
 #20182=*
-exprs(#20182,3,#20179,1,"56")
-hasLocation(#20182,#20086)
-enclosing_stmt(#20182,#20177)
+exprs(#20182,78,#20180,0,"x")
+hasLocation(#20182,#20082)
+enclosing_stmt(#20182,#20178)
 expr_containers(#20182,#20001)
-literals("56","56",#20182)
+literals("x","x",#20182)
+decl(#20182,#20177)
 #20183=*
-stmts(#20183,2,#20173,1,"console.log(x);")
-#20184=@"loc,{#10000},7,13,7,27"
-locations_default(#20184,#10000,7,13,7,27)
-hasLocation(#20183,#20184)
-stmt_containers(#20183,#20001)
-#20185=*
-exprs(#20185,13,#20183,0,"console.log(x)")
-#20186=@"loc,{#10000},7,13,7,26"
-locations_default(#20186,#10000,7,13,7,26)
-hasLocation(#20185,#20186)
-enclosing_stmt(#20185,#20183)
-expr_containers(#20185,#20001)
-#20187=*
-exprs(#20187,14,#20185,-1,"console.log")
-#20188=@"loc,{#10000},7,13,7,23"
-locations_default(#20188,#10000,7,13,7,23)
-hasLocation(#20187,#20188)
-enclosing_stmt(#20187,#20183)
-expr_containers(#20187,#20001)
-#20189=*
-exprs(#20189,79,#20187,0,"console")
-hasLocation(#20189,#20090)
-enclosing_stmt(#20189,#20183)
-expr_containers(#20189,#20001)
-literals("console","console",#20189)
-#20190=@"var;{console};{#20000}"
-variables(#20190,"console",#20000)
-bind(#20189,#20190)
-#20191=*
-exprs(#20191,0,#20187,1,"log")
-hasLocation(#20191,#20094)
-enclosing_stmt(#20191,#20183)
-expr_containers(#20191,#20001)
-literals("log","log",#20191)
+exprs(#20183,3,#20180,1,"56")
+hasLocation(#20183,#20086)
+enclosing_stmt(#20183,#20178)
+expr_containers(#20183,#20001)
+literals("56","56",#20183)
+#20184=*
+stmts(#20184,2,#20174,1,"console.log(x);")
+#20185=@"loc,{#10000},7,13,7,27"
+locations_default(#20185,#10000,7,13,7,27)
+hasLocation(#20184,#20185)
+stmt_containers(#20184,#20001)
+#20186=*
+exprs(#20186,13,#20184,0,"console.log(x)")
+#20187=@"loc,{#10000},7,13,7,26"
+locations_default(#20187,#10000,7,13,7,26)
+hasLocation(#20186,#20187)
+enclosing_stmt(#20186,#20184)
+expr_containers(#20186,#20001)
+#20188=*
+exprs(#20188,14,#20186,-1,"console.log")
+#20189=@"loc,{#10000},7,13,7,23"
+locations_default(#20189,#10000,7,13,7,23)
+hasLocation(#20188,#20189)
+enclosing_stmt(#20188,#20184)
+expr_containers(#20188,#20001)
+#20190=*
+exprs(#20190,79,#20188,0,"console")
+hasLocation(#20190,#20090)
+enclosing_stmt(#20190,#20184)
+expr_containers(#20190,#20001)
+literals("console","console",#20190)
+#20191=@"var;{console};{#20000}"
+variables(#20191,"console",#20000)
+bind(#20190,#20191)
 #20192=*
-exprs(#20192,79,#20185,0,"x")
-hasLocation(#20192,#20098)
-enclosing_stmt(#20192,#20183)
+exprs(#20192,0,#20188,1,"log")
+hasLocation(#20192,#20094)
+enclosing_stmt(#20192,#20184)
 expr_containers(#20192,#20001)
-literals("x","x",#20192)
-bind(#20192,#20176)
+literals("log","log",#20192)
 #20193=*
-stmts(#20193,15,#20146,2,"for (le ...      x;")
-#20194=@"loc,{#10000},9,9,10,14"
-locations_default(#20194,#10000,9,9,10,14)
-hasLocation(#20193,#20194)
-stmt_containers(#20193,#20001)
-#20195=*
-exprs(#20195,8,#20193,1,"{ x: x }")
-#20196=@"loc,{#10000},9,23,9,30"
-locations_default(#20196,#10000,9,23,9,30)
-hasLocation(#20195,#20196)
-enclosing_stmt(#20195,#20193)
-expr_containers(#20195,#20001)
-#20197=*
-properties(#20197,#20195,0,0,"x: x")
-#20198=@"loc,{#10000},9,25,9,28"
-locations_default(#20198,#10000,9,25,9,28)
-hasLocation(#20197,#20198)
-#20199=*
-exprs(#20199,0,#20197,0,"x")
-hasLocation(#20199,#20118)
-enclosing_stmt(#20199,#20193)
-expr_containers(#20199,#20001)
-literals("x","x",#20199)
+exprs(#20193,79,#20186,0,"x")
+hasLocation(#20193,#20098)
+enclosing_stmt(#20193,#20184)
+expr_containers(#20193,#20001)
+literals("x","x",#20193)
+bind(#20193,#20177)
+#20194=*
+stmts(#20194,15,#20147,2,"for (le ...      x;")
+#20195=@"loc,{#10000},9,9,10,14"
+locations_default(#20195,#10000,9,9,10,14)
+hasLocation(#20194,#20195)
+stmt_containers(#20194,#20001)
+#20196=*
+exprs(#20196,8,#20194,1,"{ x: x }")
+#20197=@"loc,{#10000},9,23,9,30"
+locations_default(#20197,#10000,9,23,9,30)
+hasLocation(#20196,#20197)
+enclosing_stmt(#20196,#20194)
+expr_containers(#20196,#20001)
+#20198=*
+properties(#20198,#20196,0,0,"x: x")
+#20199=@"loc,{#10000},9,25,9,28"
+locations_default(#20199,#10000,9,25,9,28)
+hasLocation(#20198,#20199)
 #20200=*
-exprs(#20200,79,#20197,1,"x")
-hasLocation(#20200,#20122)
-enclosing_stmt(#20200,#20193)
+exprs(#20200,0,#20198,0,"x")
+hasLocation(#20200,#20118)
+enclosing_stmt(#20200,#20194)
 expr_containers(#20200,#20001)
 literals("x","x",#20200)
-bind(#20200,#20149)
 #20201=*
-scopes(#20201,6)
-scopenodes(#20193,#20201)
-scopenesting(#20201,#20148)
-#20202=@"var;{x};{#20201}"
-variables(#20202,"x",#20201)
-#20203=*
-stmts(#20203,23,#20193,0,"let x")
-#20204=@"loc,{#10000},9,14,9,18"
-locations_default(#20204,#10000,9,14,9,18)
-hasLocation(#20203,#20204)
-stmt_containers(#20203,#20001)
-#20205=*
-exprs(#20205,64,#20203,0,"x")
-hasLocation(#20205,#20112)
-enclosing_stmt(#20205,#20203)
-expr_containers(#20205,#20001)
+exprs(#20201,79,#20198,1,"x")
+hasLocation(#20201,#20122)
+enclosing_stmt(#20201,#20194)
+expr_containers(#20201,#20001)
+literals("x","x",#20201)
+bind(#20201,#20150)
+#20202=*
+scopes(#20202,6)
+scopenodes(#20194,#20202)
+scopenesting(#20202,#20149)
+#20203=@"var;{x};{#20202}"
+variables(#20203,"x",#20202)
+#20204=*
+stmts(#20204,23,#20194,0,"let x")
+#20205=@"loc,{#10000},9,14,9,18"
+locations_default(#20205,#10000,9,14,9,18)
+hasLocation(#20204,#20205)
+stmt_containers(#20204,#20001)
 #20206=*
-exprs(#20206,78,#20205,0,"x")
+exprs(#20206,64,#20204,0,"x")
 hasLocation(#20206,#20112)
-enclosing_stmt(#20206,#20203)
+enclosing_stmt(#20206,#20204)
 expr_containers(#20206,#20001)
-literals("x","x",#20206)
-decl(#20206,#20202)
 #20207=*
-stmts(#20207,2,#20193,2,"x;")
-#20208=@"loc,{#10000},10,13,10,14"
-locations_default(#20208,#10000,10,13,10,14)
-hasLocation(#20207,#20208)
-stmt_containers(#20207,#20001)
-#20209=*
-exprs(#20209,79,#20207,0,"x")
-hasLocation(#20209,#20128)
-enclosing_stmt(#20209,#20207)
-expr_containers(#20209,#20001)
-literals("x","x",#20209)
-bind(#20209,#20202)
+exprs(#20207,78,#20206,0,"x")
+hasLocation(#20207,#20112)
+enclosing_stmt(#20207,#20204)
+expr_containers(#20207,#20001)
+literals("x","x",#20207)
+decl(#20207,#20203)
+#20208=*
+stmts(#20208,2,#20194,2,"x;")
+#20209=@"loc,{#10000},10,13,10,14"
+locations_default(#20209,#10000,10,13,10,14)
+hasLocation(#20208,#20209)
+stmt_containers(#20208,#20001)
 #20210=*
-entry_cfg_node(#20210,#20001)
-#20211=@"loc,{#10000},1,1,1,0"
-locations_default(#20211,#10000,1,1,1,0)
-hasLocation(#20210,#20211)
-#20212=*
-exit_cfg_node(#20212,#20001)
-hasLocation(#20212,#20135)
-successor(#20195,#20199)
-successor(#20200,#20197)
-successor(#20199,#20200)
-successor(#20197,#20193)
-successor(#20193,#20203)
-successor(#20193,#20212)
-successor(#20207,#20209)
-successor(#20209,#20193)
-successor(#20203,#20206)
-successor(#20206,#20205)
-successor(#20205,#20207)
-successor(#20156,#20164)
-successor(#20164,#20168)
-successor(#20172,#20169)
-successor(#20171,#20172)
-successor(#20169,#20166)
-successor(#20168,#20171)
-successor(#20166,#20162)
-successor(#20163,#20160)
-successor(#20162,#20163)
+exprs(#20210,79,#20208,0,"x")
+hasLocation(#20210,#20128)
+enclosing_stmt(#20210,#20208)
+expr_containers(#20210,#20001)
+literals("x","x",#20210)
+bind(#20210,#20203)
+#20211=*
+entry_cfg_node(#20211,#20001)
+#20212=@"loc,{#10000},1,1,1,0"
+locations_default(#20212,#10000,1,1,1,0)
+hasLocation(#20211,#20212)
 #20213=*
-guard_node(#20213,1,#20160)
-hasLocation(#20213,#20161)
-successor(#20213,#20173)
+exit_cfg_node(#20213,#20001)
+hasLocation(#20213,#20135)
+successor(#20196,#20200)
+successor(#20201,#20198)
+successor(#20200,#20201)
+successor(#20198,#20194)
+successor(#20194,#20204)
+successor(#20194,#20213)
+successor(#20208,#20210)
+successor(#20210,#20194)
+successor(#20204,#20207)
+successor(#20207,#20206)
+successor(#20206,#20208)
+successor(#20157,#20165)
+successor(#20165,#20169)
+successor(#20173,#20170)
+successor(#20172,#20173)
+successor(#20170,#20167)
+successor(#20169,#20172)
+successor(#20167,#20163)
+successor(#20164,#20161)
+successor(#20163,#20164)
 #20214=*
-guard_node(#20214,0,#20160)
-hasLocation(#20214,#20161)
-successor(#20214,#20195)
-successor(#20160,#20213)
-successor(#20160,#20214)
-successor(#20183,#20189)
-successor(#20192,#20185)
-successor(#20191,#20187)
-successor(#20189,#20191)
-successor(#20187,#20192)
-successor(#20185,#20162)
-successor(#20177,#20181)
-successor(#20182,#20179)
-successor(#20181,#20182)
-successor(#20179,#20183)
-successor(#20173,#20177)
-successor(#20150,#20154)
-successor(#20155,#20152)
-successor(#20154,#20155)
-successor(#20152,#20156)
-successor(#20146,#20150)
-successor(#20140,#20144)
-successor(#20145,#20142)
-successor(#20144,#20145)
-successor(#20142,#20146)
-successor(#20137,#20140)
-successor(#20210,#20137)
+guard_node(#20214,1,#20161)
+hasLocation(#20214,#20162)
+successor(#20214,#20174)
+#20215=*
+guard_node(#20215,0,#20161)
+hasLocation(#20215,#20162)
+successor(#20215,#20196)
+successor(#20161,#20214)
+successor(#20161,#20215)
+successor(#20184,#20190)
+successor(#20193,#20186)
+successor(#20192,#20188)
+successor(#20190,#20192)
+successor(#20188,#20193)
+successor(#20186,#20163)
+successor(#20178,#20182)
+successor(#20183,#20180)
+successor(#20182,#20183)
+successor(#20180,#20184)
+successor(#20174,#20178)
+successor(#20151,#20155)
+successor(#20156,#20153)
+successor(#20155,#20156)
+successor(#20153,#20157)
+successor(#20147,#20151)
+successor(#20141,#20145)
+successor(#20146,#20143)
+successor(#20145,#20146)
+successor(#20143,#20147)
+successor(#20138,#20141)
+successor(#20211,#20138)
 numlines(#10000,12,12,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/let2.js.trap b/javascript/extractor/tests/es2015/output/trap/let2.js.trap
index a05cddac410..b3fdace7388 100644
--- a/javascript/extractor/tests/es2015/output/trap/let2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/let2.js.trap
@@ -58,42 +58,44 @@ locations_default(#20018,#10000,1,1,2,0)
 hasLocation(#20001,#20018)
 #20019=@"var;{x};{#20000}"
 variables(#20019,"x",#20000)
-#20020=*
-stmts(#20020,23,#20001,0,"let /* **/ x = 42;")
-hasLocation(#20020,#20005)
-stmt_containers(#20020,#20001)
+#20020=@"var;{this};{#20000}"
+variables(#20020,"this",#20000)
 #20021=*
-exprs(#20021,64,#20020,0,"x = 42")
-#20022=@"loc,{#10000},1,12,1,17"
-locations_default(#20022,#10000,1,12,1,17)
-hasLocation(#20021,#20022)
-enclosing_stmt(#20021,#20020)
-expr_containers(#20021,#20001)
-#20023=*
-exprs(#20023,78,#20021,0,"x")
-hasLocation(#20023,#20009)
-enclosing_stmt(#20023,#20020)
-expr_containers(#20023,#20001)
-literals("x","x",#20023)
-decl(#20023,#20019)
+stmts(#20021,23,#20001,0,"let /* **/ x = 42;")
+hasLocation(#20021,#20005)
+stmt_containers(#20021,#20001)
+#20022=*
+exprs(#20022,64,#20021,0,"x = 42")
+#20023=@"loc,{#10000},1,12,1,17"
+locations_default(#20023,#10000,1,12,1,17)
+hasLocation(#20022,#20023)
+enclosing_stmt(#20022,#20021)
+expr_containers(#20022,#20001)
 #20024=*
-exprs(#20024,3,#20021,1,"42")
-hasLocation(#20024,#20013)
-enclosing_stmt(#20024,#20020)
+exprs(#20024,78,#20022,0,"x")
+hasLocation(#20024,#20009)
+enclosing_stmt(#20024,#20021)
 expr_containers(#20024,#20001)
-literals("42","42",#20024)
+literals("x","x",#20024)
+decl(#20024,#20019)
 #20025=*
-entry_cfg_node(#20025,#20001)
-#20026=@"loc,{#10000},1,1,1,0"
-locations_default(#20026,#10000,1,1,1,0)
-hasLocation(#20025,#20026)
-#20027=*
-exit_cfg_node(#20027,#20001)
-hasLocation(#20027,#20017)
-successor(#20020,#20023)
-successor(#20024,#20021)
-successor(#20023,#20024)
-successor(#20021,#20027)
-successor(#20025,#20020)
+exprs(#20025,3,#20022,1,"42")
+hasLocation(#20025,#20013)
+enclosing_stmt(#20025,#20021)
+expr_containers(#20025,#20001)
+literals("42","42",#20025)
+#20026=*
+entry_cfg_node(#20026,#20001)
+#20027=@"loc,{#10000},1,1,1,0"
+locations_default(#20027,#10000,1,1,1,0)
+hasLocation(#20026,#20027)
+#20028=*
+exit_cfg_node(#20028,#20001)
+hasLocation(#20028,#20017)
+successor(#20021,#20024)
+successor(#20025,#20022)
+successor(#20024,#20025)
+successor(#20022,#20028)
+successor(#20026,#20021)
 numlines(#10000,1,1,1)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/nested_import.js.trap b/javascript/extractor/tests/es2015/output/trap/nested_import.js.trap
index 7de82196cf6..f549fc0da0d 100644
--- a/javascript/extractor/tests/es2015/output/trap/nested_import.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/nested_import.js.trap
@@ -195,172 +195,174 @@ local_namespace_names(#20070,"y",#20064)
 variables(#20065,"x",#20064)
 local_type_names(#20067,"x",#20064)
 local_namespace_names(#20069,"x",#20064)
-#20071=*
-stmts(#20071,27,#20001,0,"import  ... om 'm';")
-hasLocation(#20071,#20003)
-stmt_containers(#20071,#20001)
+#20071=@"var;{this};{#20064}"
+variables(#20071,"this",#20064)
 #20072=*
-exprs(#20072,4,#20071,-1,"'m'")
-hasLocation(#20072,#20023)
-enclosing_stmt(#20072,#20071)
-expr_containers(#20072,#20001)
-literals("m","'m'",#20072)
+stmts(#20072,27,#20001,0,"import  ... om 'm';")
+hasLocation(#20072,#20003)
+stmt_containers(#20072,#20001)
 #20073=*
-regexpterm(#20073,14,#20072,0,"m")
-#20074=@"loc,{#10000},1,20,1,20"
-locations_default(#20074,#10000,1,20,1,20)
-hasLocation(#20073,#20074)
-regexp_const_value(#20073,"m")
-#20075=*
-exprs(#20075,83,#20071,0,"x")
-hasLocation(#20075,#20017)
-enclosing_stmt(#20075,#20071)
-expr_containers(#20075,#20001)
+exprs(#20073,4,#20072,-1,"'m'")
+hasLocation(#20073,#20023)
+enclosing_stmt(#20073,#20072)
+expr_containers(#20073,#20001)
+literals("m","'m'",#20073)
+#20074=*
+regexpterm(#20074,14,#20073,0,"m")
+#20075=@"loc,{#10000},1,20,1,20"
+locations_default(#20075,#10000,1,20,1,20)
+hasLocation(#20074,#20075)
+regexp_const_value(#20074,"m")
 #20076=*
-exprs(#20076,0,#20075,0,"x")
+exprs(#20076,83,#20072,0,"x")
 hasLocation(#20076,#20017)
-enclosing_stmt(#20076,#20071)
+enclosing_stmt(#20076,#20072)
 expr_containers(#20076,#20001)
-literals("x","x",#20076)
 #20077=*
-exprs(#20077,78,#20075,1,"x")
+exprs(#20077,0,#20076,0,"x")
 hasLocation(#20077,#20017)
-enclosing_stmt(#20077,#20071)
+enclosing_stmt(#20077,#20072)
 expr_containers(#20077,#20001)
 literals("x","x",#20077)
-decl(#20077,#20065)
-typedecl(#20077,#20067)
-namespacedecl(#20077,#20069)
 #20078=*
-stmts(#20078,3,#20001,1,"if (!x) ...  = y;\n}")
-#20079=@"loc,{#10000},2,1,5,1"
-locations_default(#20079,#10000,2,1,5,1)
-hasLocation(#20078,#20079)
-stmt_containers(#20078,#20001)
-#20080=*
-exprs(#20080,18,#20078,0,"!x")
-#20081=@"loc,{#10000},2,5,2,6"
-locations_default(#20081,#10000,2,5,2,6)
-hasLocation(#20080,#20081)
-enclosing_stmt(#20080,#20078)
-expr_containers(#20080,#20001)
-#20082=*
-exprs(#20082,79,#20080,0,"x")
-hasLocation(#20082,#20033)
-enclosing_stmt(#20082,#20078)
-expr_containers(#20082,#20001)
-literals("x","x",#20082)
-bind(#20082,#20065)
+exprs(#20078,78,#20076,1,"x")
+hasLocation(#20078,#20017)
+enclosing_stmt(#20078,#20072)
+expr_containers(#20078,#20001)
+literals("x","x",#20078)
+decl(#20078,#20065)
+typedecl(#20078,#20067)
+namespacedecl(#20078,#20069)
+#20079=*
+stmts(#20079,3,#20001,1,"if (!x) ...  = y;\n}")
+#20080=@"loc,{#10000},2,1,5,1"
+locations_default(#20080,#10000,2,1,5,1)
+hasLocation(#20079,#20080)
+stmt_containers(#20079,#20001)
+#20081=*
+exprs(#20081,18,#20079,0,"!x")
+#20082=@"loc,{#10000},2,5,2,6"
+locations_default(#20082,#10000,2,5,2,6)
+hasLocation(#20081,#20082)
+enclosing_stmt(#20081,#20079)
+expr_containers(#20081,#20001)
 #20083=*
-stmts(#20083,1,#20078,1,"{\n  imp ...  = y;\n}")
-#20084=@"loc,{#10000},2,9,5,1"
-locations_default(#20084,#10000,2,9,5,1)
-hasLocation(#20083,#20084)
-stmt_containers(#20083,#20001)
-#20085=*
-scopes(#20085,4)
-scopenodes(#20083,#20085)
-scopenesting(#20085,#20064)
-#20086=@"var;{y};{#20085}"
-variables(#20086,"y",#20085)
-#20087=@"local_type_name;{y};{#20085}"
-local_type_names(#20087,"y",#20085)
-#20088=@"local_namespace_name;{y};{#20085}"
-local_namespace_names(#20088,"y",#20085)
-#20089=*
-stmts(#20089,27,#20083,0,"import  ... om 'm';")
-#20090=@"loc,{#10000},3,3,3,24"
-locations_default(#20090,#10000,3,3,3,24)
-hasLocation(#20089,#20090)
-stmt_containers(#20089,#20001)
-#20091=*
-exprs(#20091,4,#20089,-1,"'m'")
-hasLocation(#20091,#20049)
-enclosing_stmt(#20091,#20089)
-expr_containers(#20091,#20001)
-literals("m","'m'",#20091)
+exprs(#20083,79,#20081,0,"x")
+hasLocation(#20083,#20033)
+enclosing_stmt(#20083,#20079)
+expr_containers(#20083,#20001)
+literals("x","x",#20083)
+bind(#20083,#20065)
+#20084=*
+stmts(#20084,1,#20079,1,"{\n  imp ...  = y;\n}")
+#20085=@"loc,{#10000},2,9,5,1"
+locations_default(#20085,#10000,2,9,5,1)
+hasLocation(#20084,#20085)
+stmt_containers(#20084,#20001)
+#20086=*
+scopes(#20086,4)
+scopenodes(#20084,#20086)
+scopenesting(#20086,#20064)
+#20087=@"var;{y};{#20086}"
+variables(#20087,"y",#20086)
+#20088=@"local_type_name;{y};{#20086}"
+local_type_names(#20088,"y",#20086)
+#20089=@"local_namespace_name;{y};{#20086}"
+local_namespace_names(#20089,"y",#20086)
+#20090=*
+stmts(#20090,27,#20084,0,"import  ... om 'm';")
+#20091=@"loc,{#10000},3,3,3,24"
+locations_default(#20091,#10000,3,3,3,24)
+hasLocation(#20090,#20091)
+stmt_containers(#20090,#20001)
 #20092=*
-regexpterm(#20092,14,#20091,0,"m")
-#20093=@"loc,{#10000},3,22,3,22"
-locations_default(#20093,#10000,3,22,3,22)
-hasLocation(#20092,#20093)
-regexp_const_value(#20092,"m")
-#20094=*
-exprs(#20094,83,#20089,0,"y")
-hasLocation(#20094,#20043)
-enclosing_stmt(#20094,#20089)
-expr_containers(#20094,#20001)
+exprs(#20092,4,#20090,-1,"'m'")
+hasLocation(#20092,#20049)
+enclosing_stmt(#20092,#20090)
+expr_containers(#20092,#20001)
+literals("m","'m'",#20092)
+#20093=*
+regexpterm(#20093,14,#20092,0,"m")
+#20094=@"loc,{#10000},3,22,3,22"
+locations_default(#20094,#10000,3,22,3,22)
+hasLocation(#20093,#20094)
+regexp_const_value(#20093,"m")
 #20095=*
-exprs(#20095,0,#20094,0,"y")
+exprs(#20095,83,#20090,0,"y")
 hasLocation(#20095,#20043)
-enclosing_stmt(#20095,#20089)
+enclosing_stmt(#20095,#20090)
 expr_containers(#20095,#20001)
-literals("y","y",#20095)
 #20096=*
-exprs(#20096,78,#20094,1,"y")
+exprs(#20096,0,#20095,0,"y")
 hasLocation(#20096,#20043)
-enclosing_stmt(#20096,#20089)
+enclosing_stmt(#20096,#20090)
 expr_containers(#20096,#20001)
 literals("y","y",#20096)
-decl(#20096,#20086)
-typedecl(#20096,#20087)
-namespacedecl(#20096,#20088)
 #20097=*
-stmts(#20097,2,#20083,1,"x = y;")
-#20098=@"loc,{#10000},4,3,4,8"
-locations_default(#20098,#10000,4,3,4,8)
-hasLocation(#20097,#20098)
-stmt_containers(#20097,#20001)
-#20099=*
-exprs(#20099,47,#20097,0,"x = y")
-#20100=@"loc,{#10000},4,3,4,7"
-locations_default(#20100,#10000,4,3,4,7)
-hasLocation(#20099,#20100)
-enclosing_stmt(#20099,#20097)
-expr_containers(#20099,#20001)
-#20101=*
-exprs(#20101,79,#20099,0,"x")
-hasLocation(#20101,#20053)
-enclosing_stmt(#20101,#20097)
-expr_containers(#20101,#20001)
-literals("x","x",#20101)
-bind(#20101,#20065)
+exprs(#20097,78,#20095,1,"y")
+hasLocation(#20097,#20043)
+enclosing_stmt(#20097,#20090)
+expr_containers(#20097,#20001)
+literals("y","y",#20097)
+decl(#20097,#20087)
+typedecl(#20097,#20088)
+namespacedecl(#20097,#20089)
+#20098=*
+stmts(#20098,2,#20084,1,"x = y;")
+#20099=@"loc,{#10000},4,3,4,8"
+locations_default(#20099,#10000,4,3,4,8)
+hasLocation(#20098,#20099)
+stmt_containers(#20098,#20001)
+#20100=*
+exprs(#20100,47,#20098,0,"x = y")
+#20101=@"loc,{#10000},4,3,4,7"
+locations_default(#20101,#10000,4,3,4,7)
+hasLocation(#20100,#20101)
+enclosing_stmt(#20100,#20098)
+expr_containers(#20100,#20001)
 #20102=*
-exprs(#20102,79,#20099,1,"y")
-hasLocation(#20102,#20057)
-enclosing_stmt(#20102,#20097)
+exprs(#20102,79,#20100,0,"x")
+hasLocation(#20102,#20053)
+enclosing_stmt(#20102,#20098)
 expr_containers(#20102,#20001)
-literals("y","y",#20102)
-bind(#20102,#20086)
+literals("x","x",#20102)
+bind(#20102,#20065)
 #20103=*
-entry_cfg_node(#20103,#20001)
-#20104=@"loc,{#10000},1,1,1,0"
-locations_default(#20104,#10000,1,1,1,0)
-hasLocation(#20103,#20104)
-#20105=*
-exit_cfg_node(#20105,#20001)
-hasLocation(#20105,#20062)
-successor(#20078,#20082)
-successor(#20082,#20080)
+exprs(#20103,79,#20100,1,"y")
+hasLocation(#20103,#20057)
+enclosing_stmt(#20103,#20098)
+expr_containers(#20103,#20001)
+literals("y","y",#20103)
+bind(#20103,#20087)
+#20104=*
+entry_cfg_node(#20104,#20001)
+#20105=@"loc,{#10000},1,1,1,0"
+locations_default(#20105,#10000,1,1,1,0)
+hasLocation(#20104,#20105)
 #20106=*
-guard_node(#20106,0,#20082)
-hasLocation(#20106,#20033)
-successor(#20106,#20083)
+exit_cfg_node(#20106,#20001)
+hasLocation(#20106,#20062)
+successor(#20079,#20083)
+successor(#20083,#20081)
 #20107=*
-guard_node(#20107,1,#20082)
+guard_node(#20107,0,#20083)
 hasLocation(#20107,#20033)
-successor(#20107,#20105)
-successor(#20080,#20106)
-successor(#20080,#20107)
-successor(#20097,#20101)
-successor(#20102,#20099)
-successor(#20101,#20102)
-successor(#20099,#20105)
-successor(#20089,#20094)
-successor(#20094,#20097)
-successor(#20083,#20089)
-successor(#20071,#20078)
-successor(#20075,#20071)
-successor(#20103,#20075)
+successor(#20107,#20084)
+#20108=*
+guard_node(#20108,1,#20083)
+hasLocation(#20108,#20033)
+successor(#20108,#20106)
+successor(#20081,#20107)
+successor(#20081,#20108)
+successor(#20098,#20102)
+successor(#20103,#20100)
+successor(#20102,#20103)
+successor(#20100,#20106)
+successor(#20090,#20095)
+successor(#20095,#20098)
+successor(#20084,#20090)
+successor(#20072,#20079)
+successor(#20076,#20072)
+successor(#20104,#20076)
 numlines(#10000,5,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/new_target.js.trap b/javascript/extractor/tests/es2015/output/trap/new_target.js.trap
index f517fb8e898..fc745ccfe47 100644
--- a/javascript/extractor/tests/es2015/output/trap/new_target.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/new_target.js.trap
@@ -102,78 +102,82 @@ locations_default(#20035,#10000,1,1,3,1)
 hasLocation(#20001,#20035)
 #20036=@"var;{f};{#20000}"
 variables(#20036,"f",#20000)
-#20037=*
-stmts(#20037,17,#20001,0,"functio ... rget;\n}")
-hasLocation(#20037,#20035)
-stmt_containers(#20037,#20001)
+#20037=@"var;{this};{#20000}"
+variables(#20037,"this",#20000)
 #20038=*
-exprs(#20038,78,#20037,-1,"f")
-hasLocation(#20038,#20011)
-expr_containers(#20038,#20037)
-literals("f","f",#20038)
-decl(#20038,#20036)
+stmts(#20038,17,#20001,0,"functio ... rget;\n}")
+hasLocation(#20038,#20035)
+stmt_containers(#20038,#20001)
 #20039=*
-scopes(#20039,1)
-scopenodes(#20037,#20039)
-scopenesting(#20039,#20000)
-#20040=@"var;{arguments};{#20039}"
-variables(#20040,"arguments",#20039)
-is_arguments_object(#20040)
-#20041=*
-stmts(#20041,1,#20037,-2,"{\n  ret ... rget;\n}")
-#20042=@"loc,{#10000},1,14,3,1"
-locations_default(#20042,#10000,1,14,3,1)
-hasLocation(#20041,#20042)
-stmt_containers(#20041,#20037)
+exprs(#20039,78,#20038,-1,"f")
+hasLocation(#20039,#20011)
+expr_containers(#20039,#20038)
+literals("f","f",#20039)
+decl(#20039,#20036)
+#20040=*
+scopes(#20040,1)
+scopenodes(#20038,#20040)
+scopenesting(#20040,#20000)
+#20041=@"var;{this};{#20040}"
+variables(#20041,"this",#20040)
+#20042=@"var;{arguments};{#20040}"
+variables(#20042,"arguments",#20040)
+is_arguments_object(#20042)
 #20043=*
-stmts(#20043,9,#20041,0,"return !!new.target;")
-#20044=@"loc,{#10000},2,3,2,22"
-locations_default(#20044,#10000,2,3,2,22)
+stmts(#20043,1,#20038,-2,"{\n  ret ... rget;\n}")
+#20044=@"loc,{#10000},1,14,3,1"
+locations_default(#20044,#10000,1,14,3,1)
 hasLocation(#20043,#20044)
-stmt_containers(#20043,#20037)
+stmt_containers(#20043,#20038)
 #20045=*
-exprs(#20045,18,#20043,0,"!!new.target")
-#20046=@"loc,{#10000},2,10,2,21"
-locations_default(#20046,#10000,2,10,2,21)
+stmts(#20045,9,#20043,0,"return !!new.target;")
+#20046=@"loc,{#10000},2,3,2,22"
+locations_default(#20046,#10000,2,3,2,22)
 hasLocation(#20045,#20046)
-enclosing_stmt(#20045,#20043)
-expr_containers(#20045,#20037)
+stmt_containers(#20045,#20038)
 #20047=*
-exprs(#20047,18,#20045,0,"!new.target")
-#20048=@"loc,{#10000},2,11,2,21"
-locations_default(#20048,#10000,2,11,2,21)
+exprs(#20047,18,#20045,0,"!!new.target")
+#20048=@"loc,{#10000},2,10,2,21"
+locations_default(#20048,#10000,2,10,2,21)
 hasLocation(#20047,#20048)
-enclosing_stmt(#20047,#20043)
-expr_containers(#20047,#20037)
+enclosing_stmt(#20047,#20045)
+expr_containers(#20047,#20038)
 #20049=*
-exprs(#20049,82,#20047,0,"new.target")
-#20050=@"loc,{#10000},2,12,2,21"
-locations_default(#20050,#10000,2,12,2,21)
+exprs(#20049,18,#20047,0,"!new.target")
+#20050=@"loc,{#10000},2,11,2,21"
+locations_default(#20050,#10000,2,11,2,21)
 hasLocation(#20049,#20050)
-enclosing_stmt(#20049,#20043)
-expr_containers(#20049,#20037)
+enclosing_stmt(#20049,#20045)
+expr_containers(#20049,#20038)
 #20051=*
-entry_cfg_node(#20051,#20001)
-#20052=@"loc,{#10000},1,1,1,0"
-locations_default(#20052,#10000,1,1,1,0)
+exprs(#20051,82,#20049,0,"new.target")
+#20052=@"loc,{#10000},2,12,2,21"
+locations_default(#20052,#10000,2,12,2,21)
 hasLocation(#20051,#20052)
+enclosing_stmt(#20051,#20045)
+expr_containers(#20051,#20038)
 #20053=*
-exit_cfg_node(#20053,#20001)
-hasLocation(#20053,#20034)
-successor(#20037,#20053)
-#20054=*
-entry_cfg_node(#20054,#20037)
-hasLocation(#20054,#20052)
+entry_cfg_node(#20053,#20001)
+#20054=@"loc,{#10000},1,1,1,0"
+locations_default(#20054,#10000,1,1,1,0)
+hasLocation(#20053,#20054)
 #20055=*
-exit_cfg_node(#20055,#20037)
+exit_cfg_node(#20055,#20001)
 hasLocation(#20055,#20034)
+successor(#20038,#20055)
+#20056=*
+entry_cfg_node(#20056,#20038)
+hasLocation(#20056,#20054)
+#20057=*
+exit_cfg_node(#20057,#20038)
+hasLocation(#20057,#20034)
+successor(#20051,#20049)
 successor(#20049,#20047)
 successor(#20047,#20045)
-successor(#20045,#20043)
-successor(#20043,#20055)
-successor(#20041,#20049)
-successor(#20054,#20041)
-successor(#20038,#20037)
-successor(#20051,#20038)
+successor(#20045,#20057)
+successor(#20043,#20051)
+successor(#20056,#20043)
+successor(#20039,#20038)
+successor(#20053,#20039)
 numlines(#10000,3,3,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/no-substitution.js.trap b/javascript/extractor/tests/es2015/output/trap/no-substitution.js.trap
index b7c9df13a7f..27ec327c960 100644
--- a/javascript/extractor/tests/es2015/output/trap/no-substitution.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/no-substitution.js.trap
@@ -40,25 +40,27 @@ toplevels(#20001,0)
 #20012=@"loc,{#10000},1,1,2,0"
 locations_default(#20012,#10000,1,1,2,0)
 hasLocation(#20001,#20012)
-#20013=*
-stmts(#20013,2,#20001,0,"``")
-hasLocation(#20013,#20003)
-stmt_containers(#20013,#20001)
+#20013=@"var;{this};{#20000}"
+variables(#20013,"this",#20000)
 #20014=*
-exprs(#20014,71,#20013,0,"``")
+stmts(#20014,2,#20001,0,"``")
 hasLocation(#20014,#20003)
-enclosing_stmt(#20014,#20013)
-expr_containers(#20014,#20001)
+stmt_containers(#20014,#20001)
 #20015=*
-entry_cfg_node(#20015,#20001)
-#20016=@"loc,{#10000},1,1,1,0"
-locations_default(#20016,#10000,1,1,1,0)
-hasLocation(#20015,#20016)
-#20017=*
-exit_cfg_node(#20017,#20001)
-hasLocation(#20017,#20011)
-successor(#20013,#20014)
-successor(#20014,#20017)
-successor(#20015,#20013)
+exprs(#20015,71,#20014,0,"``")
+hasLocation(#20015,#20003)
+enclosing_stmt(#20015,#20014)
+expr_containers(#20015,#20001)
+#20016=*
+entry_cfg_node(#20016,#20001)
+#20017=@"loc,{#10000},1,1,1,0"
+locations_default(#20017,#10000,1,1,1,0)
+hasLocation(#20016,#20017)
+#20018=*
+exit_cfg_node(#20018,#20001)
+hasLocation(#20018,#20011)
+successor(#20014,#20015)
+successor(#20015,#20018)
+successor(#20016,#20014)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/nullMethodName.js.trap b/javascript/extractor/tests/es2015/output/trap/nullMethodName.js.trap
index 21547848299..d19a621b458 100644
--- a/javascript/extractor/tests/es2015/output/trap/nullMethodName.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/nullMethodName.js.trap
@@ -105,130 +105,138 @@ hasLocation(#20001,#20035)
 variables(#20036,"C",#20000)
 #20037=@"local_type_name;{C};{#20000}"
 local_type_names(#20037,"C",#20000)
-#20038=*
-stmts(#20038,26,#20001,0,"class C ... ) { }\n}")
-#20039=@"loc,{#10000},1,1,3,1"
-locations_default(#20039,#10000,1,1,3,1)
-hasLocation(#20038,#20039)
-stmt_containers(#20038,#20001)
-#20040=*
-exprs(#20040,78,#20038,0,"C")
-hasLocation(#20040,#20011)
-enclosing_stmt(#20040,#20038)
-expr_containers(#20040,#20001)
-literals("C","C",#20040)
-decl(#20040,#20036)
-typedecl(#20040,#20037)
+#20038=@"var;{this};{#20000}"
+variables(#20038,"this",#20000)
+#20039=*
+stmts(#20039,26,#20001,0,"class C ... ) { }\n}")
+#20040=@"loc,{#10000},1,1,3,1"
+locations_default(#20040,#10000,1,1,3,1)
+hasLocation(#20039,#20040)
+stmt_containers(#20039,#20001)
 #20041=*
-scopes(#20041,10)
-scopenodes(#20038,#20041)
-scopenesting(#20041,#20000)
+exprs(#20041,78,#20039,0,"C")
+hasLocation(#20041,#20011)
+enclosing_stmt(#20041,#20039)
+expr_containers(#20041,#20001)
+literals("C","C",#20041)
+decl(#20041,#20036)
+typedecl(#20041,#20037)
 #20042=*
-properties(#20042,#20038,2,2,"set [null](v) { }")
-#20043=@"loc,{#10000},2,3,2,19"
-locations_default(#20043,#10000,2,3,2,19)
-hasLocation(#20042,#20043)
+scopes(#20042,10)
+scopenodes(#20039,#20042)
+scopenesting(#20042,#20000)
+#20043=@"var;{this};{#20042}"
+variables(#20043,"this",#20042)
 #20044=*
-exprs(#20044,1,#20042,0,"null")
-hasLocation(#20044,#20019)
-enclosing_stmt(#20044,#20038)
-expr_containers(#20044,#20001)
-literals("null","null",#20044)
-#20045=*
-exprs(#20045,9,#20042,1,"(v) { }")
-#20046=@"loc,{#10000},2,13,2,19"
-locations_default(#20046,#10000,2,13,2,19)
-hasLocation(#20045,#20046)
-enclosing_stmt(#20045,#20038)
-expr_containers(#20045,#20001)
+properties(#20044,#20039,2,2,"set [null](v) { }")
+#20045=@"loc,{#10000},2,3,2,19"
+locations_default(#20045,#10000,2,3,2,19)
+hasLocation(#20044,#20045)
+#20046=*
+exprs(#20046,1,#20044,0,"null")
+hasLocation(#20046,#20019)
+enclosing_stmt(#20046,#20039)
+expr_containers(#20046,#20001)
+literals("null","null",#20046)
 #20047=*
-scopes(#20047,1)
-scopenodes(#20045,#20047)
-scopenesting(#20047,#20041)
-#20048=@"var;{v};{#20047}"
-variables(#20048,"v",#20047)
+exprs(#20047,9,#20044,1,"(v) { }")
+#20048=@"loc,{#10000},2,13,2,19"
+locations_default(#20048,#10000,2,13,2,19)
+hasLocation(#20047,#20048)
+enclosing_stmt(#20047,#20039)
+expr_containers(#20047,#20001)
 #20049=*
-exprs(#20049,78,#20045,0,"v")
-hasLocation(#20049,#20025)
-expr_containers(#20049,#20045)
-literals("v","v",#20049)
-decl(#20049,#20048)
-#20050=@"var;{arguments};{#20047}"
-variables(#20050,"arguments",#20047)
-is_arguments_object(#20050)
-#20051=*
-stmts(#20051,1,#20045,-2,"{ }")
-#20052=@"loc,{#10000},2,17,2,19"
-locations_default(#20052,#10000,2,17,2,19)
-hasLocation(#20051,#20052)
-stmt_containers(#20051,#20045)
-is_method(#20042)
-is_computed(#20042)
-#20053=*
-properties(#20053,#20038,3,0,"constructor() {}")
-#20054=@"loc,{#10000},1,9,1,8"
-locations_default(#20054,#10000,1,9,1,8)
-hasLocation(#20053,#20054)
-#20055=*
-exprs(#20055,0,#20053,0,"constructor")
-hasLocation(#20055,#20054)
-enclosing_stmt(#20055,#20038)
-expr_containers(#20055,#20001)
-literals("constructor","constructor",#20055)
+scopes(#20049,1)
+scopenodes(#20047,#20049)
+scopenesting(#20049,#20042)
+#20050=@"var;{this};{#20049}"
+variables(#20050,"this",#20049)
+#20051=@"var;{v};{#20049}"
+variables(#20051,"v",#20049)
+#20052=*
+exprs(#20052,78,#20047,0,"v")
+hasLocation(#20052,#20025)
+expr_containers(#20052,#20047)
+literals("v","v",#20052)
+decl(#20052,#20051)
+#20053=@"var;{arguments};{#20049}"
+variables(#20053,"arguments",#20049)
+is_arguments_object(#20053)
+#20054=*
+stmts(#20054,1,#20047,-2,"{ }")
+#20055=@"loc,{#10000},2,17,2,19"
+locations_default(#20055,#10000,2,17,2,19)
+hasLocation(#20054,#20055)
+stmt_containers(#20054,#20047)
+is_method(#20044)
+is_computed(#20044)
 #20056=*
-exprs(#20056,9,#20053,1,"() {}")
-hasLocation(#20056,#20054)
-enclosing_stmt(#20056,#20038)
-expr_containers(#20056,#20001)
-#20057=*
-scopes(#20057,1)
-scopenodes(#20056,#20057)
-scopenesting(#20057,#20041)
-#20058=@"var;{arguments};{#20057}"
-variables(#20058,"arguments",#20057)
-is_arguments_object(#20058)
+properties(#20056,#20039,3,0,"constructor() {}")
+#20057=@"loc,{#10000},1,9,1,8"
+locations_default(#20057,#10000,1,9,1,8)
+hasLocation(#20056,#20057)
+#20058=*
+exprs(#20058,0,#20056,0,"constructor")
+hasLocation(#20058,#20057)
+enclosing_stmt(#20058,#20039)
+expr_containers(#20058,#20001)
+literals("constructor","constructor",#20058)
 #20059=*
-stmts(#20059,1,#20056,-2,"{}")
-hasLocation(#20059,#20054)
-stmt_containers(#20059,#20056)
-is_method(#20053)
+exprs(#20059,9,#20056,1,"() {}")
+hasLocation(#20059,#20057)
+enclosing_stmt(#20059,#20039)
+expr_containers(#20059,#20001)
 #20060=*
-entry_cfg_node(#20060,#20001)
-#20061=@"loc,{#10000},1,1,1,0"
-locations_default(#20061,#10000,1,1,1,0)
-hasLocation(#20060,#20061)
-#20062=*
-exit_cfg_node(#20062,#20001)
-hasLocation(#20062,#20034)
-successor(#20056,#20053)
+scopes(#20060,1)
+scopenodes(#20059,#20060)
+scopenesting(#20060,#20042)
+#20061=@"var;{this};{#20060}"
+variables(#20061,"this",#20060)
+#20062=@"var;{arguments};{#20060}"
+variables(#20062,"arguments",#20060)
+is_arguments_object(#20062)
 #20063=*
-entry_cfg_node(#20063,#20056)
-hasLocation(#20063,#20054)
+stmts(#20063,1,#20059,-2,"{}")
+hasLocation(#20063,#20057)
+stmt_containers(#20063,#20059)
+is_method(#20056)
 #20064=*
-exit_cfg_node(#20064,#20056)
-hasLocation(#20064,#20054)
-successor(#20059,#20064)
-successor(#20063,#20059)
-successor(#20055,#20056)
-successor(#20053,#20038)
-successor(#20045,#20042)
-#20065=*
-entry_cfg_node(#20065,#20045)
-#20066=@"loc,{#10000},2,13,2,12"
-locations_default(#20066,#10000,2,13,2,12)
-hasLocation(#20065,#20066)
+entry_cfg_node(#20064,#20001)
+#20065=@"loc,{#10000},1,1,1,0"
+locations_default(#20065,#10000,1,1,1,0)
+hasLocation(#20064,#20065)
+#20066=*
+exit_cfg_node(#20066,#20001)
+hasLocation(#20066,#20034)
+successor(#20059,#20056)
 #20067=*
-exit_cfg_node(#20067,#20045)
-#20068=@"loc,{#10000},2,20,2,19"
-locations_default(#20068,#10000,2,20,2,19)
-hasLocation(#20067,#20068)
-successor(#20051,#20067)
-successor(#20049,#20051)
-successor(#20065,#20049)
-successor(#20044,#20045)
-successor(#20042,#20055)
-successor(#20040,#20044)
-successor(#20038,#20062)
-successor(#20060,#20040)
+entry_cfg_node(#20067,#20059)
+hasLocation(#20067,#20057)
+#20068=*
+exit_cfg_node(#20068,#20059)
+hasLocation(#20068,#20057)
+successor(#20063,#20068)
+successor(#20067,#20063)
+successor(#20058,#20059)
+successor(#20056,#20039)
+successor(#20047,#20044)
+#20069=*
+entry_cfg_node(#20069,#20047)
+#20070=@"loc,{#10000},2,13,2,12"
+locations_default(#20070,#10000,2,13,2,12)
+hasLocation(#20069,#20070)
+#20071=*
+exit_cfg_node(#20071,#20047)
+#20072=@"loc,{#10000},2,20,2,19"
+locations_default(#20072,#10000,2,20,2,19)
+hasLocation(#20071,#20072)
+successor(#20054,#20071)
+successor(#20052,#20054)
+successor(#20069,#20052)
+successor(#20046,#20047)
+successor(#20044,#20058)
+successor(#20041,#20046)
+successor(#20039,#20066)
+successor(#20064,#20041)
 numlines(#10000,3,3,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/odasa-2593.js.trap b/javascript/extractor/tests/es2015/output/trap/odasa-2593.js.trap
index 7cc4e9be221..899b4a77071 100644
--- a/javascript/extractor/tests/es2015/output/trap/odasa-2593.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/odasa-2593.js.trap
@@ -109,95 +109,99 @@ locations_default(#20037,#10000,1,1,4,1)
 hasLocation(#20001,#20037)
 #20038=@"var;{test};{#20000}"
 variables(#20038,"test",#20000)
-#20039=*
-stmts(#20039,17,#20001,0,"functio ... nts);\n}")
-hasLocation(#20039,#20037)
-stmt_containers(#20039,#20001)
+#20039=@"var;{this};{#20000}"
+variables(#20039,"this",#20000)
 #20040=*
-exprs(#20040,78,#20039,-1,"test")
-hasLocation(#20040,#20013)
-expr_containers(#20040,#20039)
-literals("test","test",#20040)
-decl(#20040,#20038)
+stmts(#20040,17,#20001,0,"functio ... nts);\n}")
+hasLocation(#20040,#20037)
+stmt_containers(#20040,#20001)
 #20041=*
-scopes(#20041,1)
-scopenodes(#20039,#20041)
-scopenesting(#20041,#20000)
-#20042=@"var;{arguments};{#20041}"
-variables(#20042,"arguments",#20041)
-is_arguments_object(#20042)
-#20043=*
-stmts(#20043,1,#20039,-2,"{\n    a ... nts);\n}")
-#20044=@"loc,{#10000},1,17,4,1"
-locations_default(#20044,#10000,1,17,4,1)
-hasLocation(#20043,#20044)
-stmt_containers(#20043,#20039)
+exprs(#20041,78,#20040,-1,"test")
+hasLocation(#20041,#20013)
+expr_containers(#20041,#20040)
+literals("test","test",#20041)
+decl(#20041,#20038)
+#20042=*
+scopes(#20042,1)
+scopenodes(#20040,#20042)
+scopenesting(#20042,#20000)
+#20043=@"var;{this};{#20042}"
+variables(#20043,"this",#20042)
+#20044=@"var;{arguments};{#20042}"
+variables(#20044,"arguments",#20042)
+is_arguments_object(#20044)
 #20045=*
-stmts(#20045,2,#20043,0,"arguments;")
-#20046=@"loc,{#10000},2,5,2,14"
-locations_default(#20046,#10000,2,5,2,14)
+stmts(#20045,1,#20040,-2,"{\n    a ... nts);\n}")
+#20046=@"loc,{#10000},1,17,4,1"
+locations_default(#20046,#10000,1,17,4,1)
 hasLocation(#20045,#20046)
-stmt_containers(#20045,#20039)
+stmt_containers(#20045,#20040)
 #20047=*
-exprs(#20047,79,#20045,0,"arguments")
-hasLocation(#20047,#20021)
-enclosing_stmt(#20047,#20045)
-expr_containers(#20047,#20039)
-literals("arguments","arguments",#20047)
-bind(#20047,#20042)
-#20048=*
-stmts(#20048,2,#20043,1,"let (arguments);")
-#20049=@"loc,{#10000},3,5,3,20"
-locations_default(#20049,#10000,3,5,3,20)
-hasLocation(#20048,#20049)
-stmt_containers(#20048,#20039)
+stmts(#20047,2,#20045,0,"arguments;")
+#20048=@"loc,{#10000},2,5,2,14"
+locations_default(#20048,#10000,2,5,2,14)
+hasLocation(#20047,#20048)
+stmt_containers(#20047,#20040)
+#20049=*
+exprs(#20049,79,#20047,0,"arguments")
+hasLocation(#20049,#20021)
+enclosing_stmt(#20049,#20047)
+expr_containers(#20049,#20040)
+literals("arguments","arguments",#20049)
+bind(#20049,#20044)
 #20050=*
-exprs(#20050,13,#20048,0,"let (arguments)")
-#20051=@"loc,{#10000},3,5,3,19"
-locations_default(#20051,#10000,3,5,3,19)
+stmts(#20050,2,#20045,1,"let (arguments);")
+#20051=@"loc,{#10000},3,5,3,20"
+locations_default(#20051,#10000,3,5,3,20)
 hasLocation(#20050,#20051)
-enclosing_stmt(#20050,#20048)
-expr_containers(#20050,#20039)
+stmt_containers(#20050,#20040)
 #20052=*
-exprs(#20052,79,#20050,-1,"let")
-hasLocation(#20052,#20025)
-enclosing_stmt(#20052,#20048)
-expr_containers(#20052,#20039)
-literals("let","let",#20052)
-#20053=@"var;{let};{#20000}"
-variables(#20053,"let",#20000)
-bind(#20052,#20053)
+exprs(#20052,13,#20050,0,"let (arguments)")
+#20053=@"loc,{#10000},3,5,3,19"
+locations_default(#20053,#10000,3,5,3,19)
+hasLocation(#20052,#20053)
+enclosing_stmt(#20052,#20050)
+expr_containers(#20052,#20040)
 #20054=*
-exprs(#20054,79,#20050,0,"arguments")
-hasLocation(#20054,#20029)
-enclosing_stmt(#20054,#20048)
-expr_containers(#20054,#20039)
-literals("arguments","arguments",#20054)
-bind(#20054,#20042)
-#20055=*
-entry_cfg_node(#20055,#20001)
-#20056=@"loc,{#10000},1,1,1,0"
-locations_default(#20056,#10000,1,1,1,0)
-hasLocation(#20055,#20056)
+exprs(#20054,79,#20052,-1,"let")
+hasLocation(#20054,#20025)
+enclosing_stmt(#20054,#20050)
+expr_containers(#20054,#20040)
+literals("let","let",#20054)
+#20055=@"var;{let};{#20000}"
+variables(#20055,"let",#20000)
+bind(#20054,#20055)
+#20056=*
+exprs(#20056,79,#20052,0,"arguments")
+hasLocation(#20056,#20029)
+enclosing_stmt(#20056,#20050)
+expr_containers(#20056,#20040)
+literals("arguments","arguments",#20056)
+bind(#20056,#20044)
 #20057=*
-exit_cfg_node(#20057,#20001)
-hasLocation(#20057,#20036)
-successor(#20039,#20057)
-#20058=*
-entry_cfg_node(#20058,#20039)
-hasLocation(#20058,#20056)
+entry_cfg_node(#20057,#20001)
+#20058=@"loc,{#10000},1,1,1,0"
+locations_default(#20058,#10000,1,1,1,0)
+hasLocation(#20057,#20058)
 #20059=*
-exit_cfg_node(#20059,#20039)
+exit_cfg_node(#20059,#20001)
 hasLocation(#20059,#20036)
-successor(#20048,#20052)
-successor(#20054,#20050)
-successor(#20052,#20054)
-successor(#20050,#20059)
+successor(#20040,#20059)
+#20060=*
+entry_cfg_node(#20060,#20040)
+hasLocation(#20060,#20058)
+#20061=*
+exit_cfg_node(#20061,#20040)
+hasLocation(#20061,#20036)
+successor(#20050,#20054)
+successor(#20056,#20052)
+successor(#20054,#20056)
+successor(#20052,#20061)
+successor(#20047,#20049)
+successor(#20049,#20050)
 successor(#20045,#20047)
-successor(#20047,#20048)
-successor(#20043,#20045)
-successor(#20058,#20043)
-successor(#20040,#20039)
-successor(#20055,#20040)
+successor(#20060,#20045)
+successor(#20041,#20040)
+successor(#20057,#20041)
 numlines(#10000,4,4,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/properties.js.trap b/javascript/extractor/tests/es2015/output/trap/properties.js.trap
index 98746bb399d..b42ebda9dfe 100644
--- a/javascript/extractor/tests/es2015/output/trap/properties.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/properties.js.trap
@@ -223,208 +223,212 @@ hasLocation(#20001,#20080)
 variables(#20081,"x",#20000)
 #20082=@"var;{o};{#20000}"
 variables(#20082,"o",#20000)
-#20083=*
-stmts(#20083,18,#20001,0,"var x = ... \n    };")
-hasLocation(#20083,#20080)
-stmt_containers(#20083,#20001)
+#20083=@"var;{this};{#20000}"
+variables(#20083,"this",#20000)
 #20084=*
-exprs(#20084,64,#20083,0,"x = 42")
-#20085=@"loc,{#10000},1,5,1,10"
-locations_default(#20085,#10000,1,5,1,10)
-hasLocation(#20084,#20085)
-enclosing_stmt(#20084,#20083)
-expr_containers(#20084,#20001)
-#20086=*
-exprs(#20086,78,#20084,0,"x")
-hasLocation(#20086,#20017)
-enclosing_stmt(#20086,#20083)
-expr_containers(#20086,#20001)
-literals("x","x",#20086)
-decl(#20086,#20081)
+stmts(#20084,18,#20001,0,"var x = ... \n    };")
+hasLocation(#20084,#20080)
+stmt_containers(#20084,#20001)
+#20085=*
+exprs(#20085,64,#20084,0,"x = 42")
+#20086=@"loc,{#10000},1,5,1,10"
+locations_default(#20086,#10000,1,5,1,10)
+hasLocation(#20085,#20086)
+enclosing_stmt(#20085,#20084)
+expr_containers(#20085,#20001)
 #20087=*
-exprs(#20087,3,#20084,1,"42")
-hasLocation(#20087,#20021)
-enclosing_stmt(#20087,#20083)
+exprs(#20087,78,#20085,0,"x")
+hasLocation(#20087,#20017)
+enclosing_stmt(#20087,#20084)
 expr_containers(#20087,#20001)
-literals("42","42",#20087)
+literals("x","x",#20087)
+decl(#20087,#20081)
 #20088=*
-exprs(#20088,64,#20083,1,"o = {\n  ... }\n    }")
-#20089=@"loc,{#10000},2,5,6,5"
-locations_default(#20089,#10000,2,5,6,5)
-hasLocation(#20088,#20089)
-enclosing_stmt(#20088,#20083)
+exprs(#20088,3,#20085,1,"42")
+hasLocation(#20088,#20021)
+enclosing_stmt(#20088,#20084)
 expr_containers(#20088,#20001)
-#20090=*
-exprs(#20090,78,#20088,0,"o")
-hasLocation(#20090,#20025)
-enclosing_stmt(#20090,#20083)
-expr_containers(#20090,#20001)
-literals("o","o",#20090)
-decl(#20090,#20082)
+literals("42","42",#20088)
+#20089=*
+exprs(#20089,64,#20084,1,"o = {\n  ... }\n    }")
+#20090=@"loc,{#10000},2,5,6,5"
+locations_default(#20090,#10000,2,5,6,5)
+hasLocation(#20089,#20090)
+enclosing_stmt(#20089,#20084)
+expr_containers(#20089,#20001)
 #20091=*
-exprs(#20091,8,#20088,1,"{\n      ... }\n    }")
-#20092=@"loc,{#10000},2,9,6,5"
-locations_default(#20092,#10000,2,9,6,5)
-hasLocation(#20091,#20092)
-enclosing_stmt(#20091,#20083)
+exprs(#20091,78,#20089,0,"o")
+hasLocation(#20091,#20025)
+enclosing_stmt(#20091,#20084)
 expr_containers(#20091,#20001)
-#20093=*
-properties(#20093,#20091,0,0,"[""prop"" ... ()]: 23")
-#20094=@"loc,{#10000},3,9,3,36"
-locations_default(#20094,#10000,3,9,3,36)
-hasLocation(#20093,#20094)
-#20095=*
-exprs(#20095,34,#20093,0,"""prop""  ... andom()")
-#20096=@"loc,{#10000},3,10,3,31"
-locations_default(#20096,#10000,3,10,3,31)
-hasLocation(#20095,#20096)
-enclosing_stmt(#20095,#20083)
-expr_containers(#20095,#20001)
-#20097=*
-exprs(#20097,4,#20095,0,"""prop""")
-hasLocation(#20097,#20033)
-enclosing_stmt(#20097,#20083)
-expr_containers(#20097,#20001)
-literals("prop","""prop""",#20097)
+literals("o","o",#20091)
+decl(#20091,#20082)
+#20092=*
+exprs(#20092,8,#20089,1,"{\n      ... }\n    }")
+#20093=@"loc,{#10000},2,9,6,5"
+locations_default(#20093,#10000,2,9,6,5)
+hasLocation(#20092,#20093)
+enclosing_stmt(#20092,#20084)
+expr_containers(#20092,#20001)
+#20094=*
+properties(#20094,#20092,0,0,"[""prop"" ... ()]: 23")
+#20095=@"loc,{#10000},3,9,3,36"
+locations_default(#20095,#10000,3,9,3,36)
+hasLocation(#20094,#20095)
+#20096=*
+exprs(#20096,34,#20094,0,"""prop""  ... andom()")
+#20097=@"loc,{#10000},3,10,3,31"
+locations_default(#20097,#10000,3,10,3,31)
+hasLocation(#20096,#20097)
+enclosing_stmt(#20096,#20084)
+expr_containers(#20096,#20001)
 #20098=*
-exprs(#20098,13,#20095,1,"Math.random()")
-#20099=@"loc,{#10000},3,19,3,31"
-locations_default(#20099,#10000,3,19,3,31)
-hasLocation(#20098,#20099)
-enclosing_stmt(#20098,#20083)
+exprs(#20098,4,#20096,0,"""prop""")
+hasLocation(#20098,#20033)
+enclosing_stmt(#20098,#20084)
 expr_containers(#20098,#20001)
-#20100=*
-exprs(#20100,14,#20098,-1,"Math.random")
-#20101=@"loc,{#10000},3,19,3,29"
-locations_default(#20101,#10000,3,19,3,29)
-hasLocation(#20100,#20101)
-enclosing_stmt(#20100,#20083)
-expr_containers(#20100,#20001)
-#20102=*
-exprs(#20102,79,#20100,0,"Math")
-hasLocation(#20102,#20037)
-enclosing_stmt(#20102,#20083)
-expr_containers(#20102,#20001)
-literals("Math","Math",#20102)
-#20103=@"var;{Math};{#20000}"
-variables(#20103,"Math",#20000)
-bind(#20102,#20103)
-#20104=*
-exprs(#20104,0,#20100,1,"random")
-hasLocation(#20104,#20041)
-enclosing_stmt(#20104,#20083)
-expr_containers(#20104,#20001)
-literals("random","random",#20104)
+literals("prop","""prop""",#20098)
+#20099=*
+exprs(#20099,13,#20096,1,"Math.random()")
+#20100=@"loc,{#10000},3,19,3,31"
+locations_default(#20100,#10000,3,19,3,31)
+hasLocation(#20099,#20100)
+enclosing_stmt(#20099,#20084)
+expr_containers(#20099,#20001)
+#20101=*
+exprs(#20101,14,#20099,-1,"Math.random")
+#20102=@"loc,{#10000},3,19,3,29"
+locations_default(#20102,#10000,3,19,3,29)
+hasLocation(#20101,#20102)
+enclosing_stmt(#20101,#20084)
+expr_containers(#20101,#20001)
+#20103=*
+exprs(#20103,79,#20101,0,"Math")
+hasLocation(#20103,#20037)
+enclosing_stmt(#20103,#20084)
+expr_containers(#20103,#20001)
+literals("Math","Math",#20103)
+#20104=@"var;{Math};{#20000}"
+variables(#20104,"Math",#20000)
+bind(#20103,#20104)
 #20105=*
-exprs(#20105,3,#20093,1,"23")
-hasLocation(#20105,#20051)
-enclosing_stmt(#20105,#20083)
+exprs(#20105,0,#20101,1,"random")
+hasLocation(#20105,#20041)
+enclosing_stmt(#20105,#20084)
 expr_containers(#20105,#20001)
-literals("23","23",#20105)
-is_computed(#20093)
+literals("random","random",#20105)
 #20106=*
-properties(#20106,#20091,1,0,"x")
-hasLocation(#20106,#20055)
+exprs(#20106,3,#20094,1,"23")
+hasLocation(#20106,#20051)
+enclosing_stmt(#20106,#20084)
+expr_containers(#20106,#20001)
+literals("23","23",#20106)
+is_computed(#20094)
 #20107=*
-exprs(#20107,0,#20106,0,"x")
+properties(#20107,#20092,1,0,"x")
 hasLocation(#20107,#20055)
-enclosing_stmt(#20107,#20083)
-expr_containers(#20107,#20001)
-literals("x","x",#20107)
 #20108=*
-exprs(#20108,79,#20106,1,"x")
+exprs(#20108,0,#20107,0,"x")
 hasLocation(#20108,#20055)
-enclosing_stmt(#20108,#20083)
+enclosing_stmt(#20108,#20084)
 expr_containers(#20108,#20001)
 literals("x","x",#20108)
-bind(#20108,#20081)
 #20109=*
-properties(#20109,#20091,2,0,"m() { return 56; }")
-#20110=@"loc,{#10000},5,9,5,26"
-locations_default(#20110,#10000,5,9,5,26)
-hasLocation(#20109,#20110)
-#20111=*
-exprs(#20111,0,#20109,0,"m")
-hasLocation(#20111,#20059)
-enclosing_stmt(#20111,#20083)
-expr_containers(#20111,#20001)
-literals("m","m",#20111)
+exprs(#20109,79,#20107,1,"x")
+hasLocation(#20109,#20055)
+enclosing_stmt(#20109,#20084)
+expr_containers(#20109,#20001)
+literals("x","x",#20109)
+bind(#20109,#20081)
+#20110=*
+properties(#20110,#20092,2,0,"m() { return 56; }")
+#20111=@"loc,{#10000},5,9,5,26"
+locations_default(#20111,#10000,5,9,5,26)
+hasLocation(#20110,#20111)
 #20112=*
-exprs(#20112,9,#20109,1,"() { return 56; }")
-#20113=@"loc,{#10000},5,10,5,26"
-locations_default(#20113,#10000,5,10,5,26)
-hasLocation(#20112,#20113)
-enclosing_stmt(#20112,#20083)
+exprs(#20112,0,#20110,0,"m")
+hasLocation(#20112,#20059)
+enclosing_stmt(#20112,#20084)
 expr_containers(#20112,#20001)
-#20114=*
-scopes(#20114,1)
-scopenodes(#20112,#20114)
-scopenesting(#20114,#20000)
-#20115=@"var;{arguments};{#20114}"
-variables(#20115,"arguments",#20114)
-is_arguments_object(#20115)
-#20116=*
-stmts(#20116,1,#20112,-2,"{ return 56; }")
-#20117=@"loc,{#10000},5,13,5,26"
-locations_default(#20117,#10000,5,13,5,26)
-hasLocation(#20116,#20117)
-stmt_containers(#20116,#20112)
+literals("m","m",#20112)
+#20113=*
+exprs(#20113,9,#20110,1,"() { return 56; }")
+#20114=@"loc,{#10000},5,10,5,26"
+locations_default(#20114,#10000,5,10,5,26)
+hasLocation(#20113,#20114)
+enclosing_stmt(#20113,#20084)
+expr_containers(#20113,#20001)
+#20115=*
+scopes(#20115,1)
+scopenodes(#20113,#20115)
+scopenesting(#20115,#20000)
+#20116=@"var;{this};{#20115}"
+variables(#20116,"this",#20115)
+#20117=@"var;{arguments};{#20115}"
+variables(#20117,"arguments",#20115)
+is_arguments_object(#20117)
 #20118=*
-stmts(#20118,9,#20116,0,"return 56;")
-#20119=@"loc,{#10000},5,15,5,24"
-locations_default(#20119,#10000,5,15,5,24)
+stmts(#20118,1,#20113,-2,"{ return 56; }")
+#20119=@"loc,{#10000},5,13,5,26"
+locations_default(#20119,#10000,5,13,5,26)
 hasLocation(#20118,#20119)
-stmt_containers(#20118,#20112)
+stmt_containers(#20118,#20113)
 #20120=*
-exprs(#20120,3,#20118,0,"56")
-hasLocation(#20120,#20069)
-enclosing_stmt(#20120,#20118)
-expr_containers(#20120,#20112)
-literals("56","56",#20120)
-is_method(#20109)
-#20121=*
-entry_cfg_node(#20121,#20001)
-#20122=@"loc,{#10000},1,1,1,0"
-locations_default(#20122,#10000,1,1,1,0)
-hasLocation(#20121,#20122)
+stmts(#20120,9,#20118,0,"return 56;")
+#20121=@"loc,{#10000},5,15,5,24"
+locations_default(#20121,#10000,5,15,5,24)
+hasLocation(#20120,#20121)
+stmt_containers(#20120,#20113)
+#20122=*
+exprs(#20122,3,#20120,0,"56")
+hasLocation(#20122,#20069)
+enclosing_stmt(#20122,#20120)
+expr_containers(#20122,#20113)
+literals("56","56",#20122)
+is_method(#20110)
 #20123=*
-exit_cfg_node(#20123,#20001)
-hasLocation(#20123,#20079)
-successor(#20083,#20086)
-successor(#20091,#20097)
-successor(#20112,#20109)
-#20124=*
-entry_cfg_node(#20124,#20112)
-#20125=@"loc,{#10000},5,10,5,9"
-locations_default(#20125,#10000,5,10,5,9)
-hasLocation(#20124,#20125)
+entry_cfg_node(#20123,#20001)
+#20124=@"loc,{#10000},1,1,1,0"
+locations_default(#20124,#10000,1,1,1,0)
+hasLocation(#20123,#20124)
+#20125=*
+exit_cfg_node(#20125,#20001)
+hasLocation(#20125,#20079)
+successor(#20084,#20087)
+successor(#20092,#20098)
+successor(#20113,#20110)
 #20126=*
-exit_cfg_node(#20126,#20112)
-#20127=@"loc,{#10000},5,27,5,26"
-locations_default(#20127,#10000,5,27,5,26)
+entry_cfg_node(#20126,#20113)
+#20127=@"loc,{#10000},5,10,5,9"
+locations_default(#20127,#10000,5,10,5,9)
 hasLocation(#20126,#20127)
-successor(#20120,#20118)
-successor(#20118,#20126)
-successor(#20116,#20120)
-successor(#20124,#20116)
-successor(#20111,#20112)
-successor(#20109,#20088)
-successor(#20108,#20106)
-successor(#20107,#20108)
-successor(#20106,#20111)
-successor(#20105,#20093)
-successor(#20104,#20100)
-successor(#20102,#20104)
-successor(#20100,#20098)
-successor(#20098,#20095)
-successor(#20097,#20102)
-successor(#20095,#20105)
-successor(#20093,#20107)
-successor(#20090,#20091)
-successor(#20088,#20123)
-successor(#20087,#20084)
-successor(#20086,#20087)
-successor(#20084,#20090)
-successor(#20121,#20083)
+#20128=*
+exit_cfg_node(#20128,#20113)
+#20129=@"loc,{#10000},5,27,5,26"
+locations_default(#20129,#10000,5,27,5,26)
+hasLocation(#20128,#20129)
+successor(#20122,#20120)
+successor(#20120,#20128)
+successor(#20118,#20122)
+successor(#20126,#20118)
+successor(#20112,#20113)
+successor(#20110,#20089)
+successor(#20109,#20107)
+successor(#20108,#20109)
+successor(#20107,#20112)
+successor(#20106,#20094)
+successor(#20105,#20101)
+successor(#20103,#20105)
+successor(#20101,#20099)
+successor(#20099,#20096)
+successor(#20098,#20103)
+successor(#20096,#20106)
+successor(#20094,#20108)
+successor(#20091,#20092)
+successor(#20089,#20125)
+successor(#20088,#20085)
+successor(#20087,#20088)
+successor(#20085,#20091)
+successor(#20123,#20084)
 numlines(#10000,6,6,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/property_pattern_with_default.js.trap b/javascript/extractor/tests/es2015/output/trap/property_pattern_with_default.js.trap
index 2cc1015094f..f93e2fb0ced 100644
--- a/javascript/extractor/tests/es2015/output/trap/property_pattern_with_default.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/property_pattern_with_default.js.trap
@@ -72,81 +72,83 @@ locations_default(#20025,#10000,1,16,1,15)
 hasLocation(#20024,#20025)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20026=*
-stmts(#20026,2,#20001,0,"({x = 1}) => x;")
-hasLocation(#20026,#20003)
-stmt_containers(#20026,#20001)
+#20026=@"var;{this};{#20000}"
+variables(#20026,"this",#20000)
 #20027=*
-exprs(#20027,65,#20026,0,"({x = 1}) => x")
-#20028=@"loc,{#10000},1,1,1,14"
-locations_default(#20028,#10000,1,1,1,14)
-hasLocation(#20027,#20028)
-enclosing_stmt(#20027,#20026)
-expr_containers(#20027,#20001)
-#20029=*
-scopes(#20029,1)
-scopenodes(#20027,#20029)
-scopenesting(#20029,#20000)
-#20030=@"var;{x};{#20029}"
-variables(#20030,"x",#20029)
-#20031=*
-exprs(#20031,68,#20027,0,"{x = 1}")
-#20032=@"loc,{#10000},1,2,1,8"
-locations_default(#20032,#10000,1,2,1,8)
-hasLocation(#20031,#20032)
-expr_containers(#20031,#20027)
-#20033=*
-properties(#20033,#20031,0,0,"x = 1")
-#20034=@"loc,{#10000},1,3,1,7"
-locations_default(#20034,#10000,1,3,1,7)
-hasLocation(#20033,#20034)
-#20035=*
-exprs(#20035,0,#20033,0,"x")
-hasLocation(#20035,#20009)
-expr_containers(#20035,#20027)
-literals("x","x",#20035)
+stmts(#20027,2,#20001,0,"({x = 1}) => x;")
+hasLocation(#20027,#20003)
+stmt_containers(#20027,#20001)
+#20028=*
+exprs(#20028,65,#20027,0,"({x = 1}) => x")
+#20029=@"loc,{#10000},1,1,1,14"
+locations_default(#20029,#10000,1,1,1,14)
+hasLocation(#20028,#20029)
+enclosing_stmt(#20028,#20027)
+expr_containers(#20028,#20001)
+#20030=*
+scopes(#20030,1)
+scopenodes(#20028,#20030)
+scopenesting(#20030,#20000)
+#20031=@"var;{x};{#20030}"
+variables(#20031,"x",#20030)
+#20032=*
+exprs(#20032,68,#20028,0,"{x = 1}")
+#20033=@"loc,{#10000},1,2,1,8"
+locations_default(#20033,#10000,1,2,1,8)
+hasLocation(#20032,#20033)
+expr_containers(#20032,#20028)
+#20034=*
+properties(#20034,#20032,0,0,"x = 1")
+#20035=@"loc,{#10000},1,3,1,7"
+locations_default(#20035,#10000,1,3,1,7)
+hasLocation(#20034,#20035)
 #20036=*
-exprs(#20036,78,#20033,1,"x")
+exprs(#20036,0,#20034,0,"x")
 hasLocation(#20036,#20009)
-expr_containers(#20036,#20027)
+expr_containers(#20036,#20028)
 literals("x","x",#20036)
-decl(#20036,#20030)
 #20037=*
-exprs(#20037,3,#20033,2,"1")
-hasLocation(#20037,#20013)
-expr_containers(#20037,#20027)
-literals("1","1",#20037)
+exprs(#20037,78,#20034,1,"x")
+hasLocation(#20037,#20009)
+expr_containers(#20037,#20028)
+literals("x","x",#20037)
+decl(#20037,#20031)
 #20038=*
-exprs(#20038,79,#20027,-2,"x")
-hasLocation(#20038,#20021)
-expr_containers(#20038,#20027)
-literals("x","x",#20038)
-bind(#20038,#20030)
+exprs(#20038,3,#20034,2,"1")
+hasLocation(#20038,#20013)
+expr_containers(#20038,#20028)
+literals("1","1",#20038)
 #20039=*
-entry_cfg_node(#20039,#20001)
-#20040=@"loc,{#10000},1,1,1,0"
-locations_default(#20040,#10000,1,1,1,0)
-hasLocation(#20039,#20040)
-#20041=*
-exit_cfg_node(#20041,#20001)
-hasLocation(#20041,#20025)
-successor(#20026,#20027)
-successor(#20027,#20041)
+exprs(#20039,79,#20028,-2,"x")
+hasLocation(#20039,#20021)
+expr_containers(#20039,#20028)
+literals("x","x",#20039)
+bind(#20039,#20031)
+#20040=*
+entry_cfg_node(#20040,#20001)
+#20041=@"loc,{#10000},1,1,1,0"
+locations_default(#20041,#10000,1,1,1,0)
+hasLocation(#20040,#20041)
 #20042=*
-entry_cfg_node(#20042,#20027)
-hasLocation(#20042,#20040)
+exit_cfg_node(#20042,#20001)
+hasLocation(#20042,#20025)
+successor(#20027,#20028)
+successor(#20028,#20042)
 #20043=*
-exit_cfg_node(#20043,#20027)
-#20044=@"loc,{#10000},1,15,1,14"
-locations_default(#20044,#10000,1,15,1,14)
-hasLocation(#20043,#20044)
-successor(#20038,#20043)
-successor(#20031,#20035)
-successor(#20037,#20033)
+entry_cfg_node(#20043,#20028)
+hasLocation(#20043,#20041)
+#20044=*
+exit_cfg_node(#20044,#20028)
+#20045=@"loc,{#10000},1,15,1,14"
+locations_default(#20045,#10000,1,15,1,14)
+hasLocation(#20044,#20045)
+successor(#20039,#20044)
+successor(#20032,#20036)
+successor(#20038,#20034)
+successor(#20037,#20038)
 successor(#20036,#20037)
-successor(#20035,#20036)
-successor(#20033,#20038)
-successor(#20042,#20031)
-successor(#20039,#20026)
+successor(#20034,#20039)
+successor(#20043,#20032)
+successor(#20040,#20027)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/restparms.js.trap b/javascript/extractor/tests/es2015/output/trap/restparms.js.trap
index 627aaa15bcb..7359442ec2e 100644
--- a/javascript/extractor/tests/es2015/output/trap/restparms.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/restparms.js.trap
@@ -80,66 +80,70 @@ locations_default(#20027,#10000,1,1,2,1)
 hasLocation(#20001,#20027)
 #20028=@"var;{f};{#20000}"
 variables(#20028,"f",#20000)
-#20029=*
-stmts(#20029,17,#20001,0,"functio ... ys) {\n}")
-hasLocation(#20029,#20027)
-stmt_containers(#20029,#20001)
+#20029=@"var;{this};{#20000}"
+variables(#20029,"this",#20000)
 #20030=*
-exprs(#20030,78,#20029,-1,"f")
-hasLocation(#20030,#20009)
-expr_containers(#20030,#20029)
-literals("f","f",#20030)
-decl(#20030,#20028)
+stmts(#20030,17,#20001,0,"functio ... ys) {\n}")
+hasLocation(#20030,#20027)
+stmt_containers(#20030,#20001)
 #20031=*
-scopes(#20031,1)
-scopenodes(#20029,#20031)
-scopenesting(#20031,#20000)
-#20032=@"var;{x};{#20031}"
-variables(#20032,"x",#20031)
-#20033=*
-exprs(#20033,78,#20029,0,"x")
-hasLocation(#20033,#20013)
-expr_containers(#20033,#20029)
-literals("x","x",#20033)
-decl(#20033,#20032)
-#20034=@"var;{ys};{#20031}"
-variables(#20034,"ys",#20031)
+exprs(#20031,78,#20030,-1,"f")
+hasLocation(#20031,#20009)
+expr_containers(#20031,#20030)
+literals("f","f",#20031)
+decl(#20031,#20028)
+#20032=*
+scopes(#20032,1)
+scopenodes(#20030,#20032)
+scopenesting(#20032,#20000)
+#20033=@"var;{this};{#20032}"
+variables(#20033,"this",#20032)
+#20034=@"var;{x};{#20032}"
+variables(#20034,"x",#20032)
 #20035=*
-exprs(#20035,78,#20029,1,"ys")
-hasLocation(#20035,#20019)
-expr_containers(#20035,#20029)
-literals("ys","ys",#20035)
+exprs(#20035,78,#20030,0,"x")
+hasLocation(#20035,#20013)
+expr_containers(#20035,#20030)
+literals("x","x",#20035)
 decl(#20035,#20034)
-#20036=@"var;{arguments};{#20031}"
-variables(#20036,"arguments",#20031)
-is_arguments_object(#20036)
-has_rest_parameter(#20029)
+#20036=@"var;{ys};{#20032}"
+variables(#20036,"ys",#20032)
 #20037=*
-stmts(#20037,1,#20029,-2,"{\n}")
-#20038=@"loc,{#10000},1,22,2,1"
-locations_default(#20038,#10000,1,22,2,1)
-hasLocation(#20037,#20038)
-stmt_containers(#20037,#20029)
+exprs(#20037,78,#20030,1,"ys")
+hasLocation(#20037,#20019)
+expr_containers(#20037,#20030)
+literals("ys","ys",#20037)
+decl(#20037,#20036)
+#20038=@"var;{arguments};{#20032}"
+variables(#20038,"arguments",#20032)
+is_arguments_object(#20038)
+has_rest_parameter(#20030)
 #20039=*
-entry_cfg_node(#20039,#20001)
-#20040=@"loc,{#10000},1,1,1,0"
-locations_default(#20040,#10000,1,1,1,0)
+stmts(#20039,1,#20030,-2,"{\n}")
+#20040=@"loc,{#10000},1,22,2,1"
+locations_default(#20040,#10000,1,22,2,1)
 hasLocation(#20039,#20040)
+stmt_containers(#20039,#20030)
 #20041=*
-exit_cfg_node(#20041,#20001)
-hasLocation(#20041,#20026)
-successor(#20029,#20041)
-#20042=*
-entry_cfg_node(#20042,#20029)
-hasLocation(#20042,#20040)
+entry_cfg_node(#20041,#20001)
+#20042=@"loc,{#10000},1,1,1,0"
+locations_default(#20042,#10000,1,1,1,0)
+hasLocation(#20041,#20042)
 #20043=*
-exit_cfg_node(#20043,#20029)
+exit_cfg_node(#20043,#20001)
 hasLocation(#20043,#20026)
-successor(#20037,#20043)
+successor(#20030,#20043)
+#20044=*
+entry_cfg_node(#20044,#20030)
+hasLocation(#20044,#20042)
+#20045=*
+exit_cfg_node(#20045,#20030)
+hasLocation(#20045,#20026)
+successor(#20039,#20045)
+successor(#20037,#20039)
 successor(#20035,#20037)
-successor(#20033,#20035)
-successor(#20042,#20033)
-successor(#20030,#20029)
-successor(#20039,#20030)
+successor(#20044,#20035)
+successor(#20031,#20030)
+successor(#20041,#20031)
 numlines(#10000,2,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/spreadelement.js.trap b/javascript/extractor/tests/es2015/output/trap/spreadelement.js.trap
index 8c5c7723280..ce17adfce0b 100644
--- a/javascript/extractor/tests/es2015/output/trap/spreadelement.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/spreadelement.js.trap
@@ -100,97 +100,99 @@ toplevels(#20001,0)
 #20036=@"loc,{#10000},1,1,2,19"
 locations_default(#20036,#10000,1,1,2,19)
 hasLocation(#20001,#20036)
-#20037=*
-stmts(#20037,2,#20001,0,"[a, ...as];")
-hasLocation(#20037,#20003)
-stmt_containers(#20037,#20001)
+#20037=@"var;{this};{#20000}"
+variables(#20037,"this",#20000)
 #20038=*
-exprs(#20038,7,#20037,0,"[a, ...as]")
-#20039=@"loc,{#10000},1,1,1,10"
-locations_default(#20039,#10000,1,1,1,10)
-hasLocation(#20038,#20039)
-enclosing_stmt(#20038,#20037)
-expr_containers(#20038,#20001)
-#20040=*
-exprs(#20040,79,#20038,0,"a")
-hasLocation(#20040,#20009)
-enclosing_stmt(#20040,#20037)
-expr_containers(#20040,#20001)
-literals("a","a",#20040)
-#20041=@"var;{a};{#20000}"
-variables(#20041,"a",#20000)
-bind(#20040,#20041)
-#20042=*
-exprs(#20042,66,#20038,1,"...as")
-#20043=@"loc,{#10000},1,5,1,9"
-locations_default(#20043,#10000,1,5,1,9)
-hasLocation(#20042,#20043)
-enclosing_stmt(#20042,#20037)
-expr_containers(#20042,#20001)
-#20044=*
-exprs(#20044,79,#20042,0,"as")
-hasLocation(#20044,#20015)
-enclosing_stmt(#20044,#20037)
-expr_containers(#20044,#20001)
-literals("as","as",#20044)
-#20045=@"var;{as};{#20000}"
-variables(#20045,"as",#20000)
-bind(#20044,#20045)
-array_size(#20038,2)
-#20046=*
-stmts(#20046,2,#20001,1,"new Array(...elts);")
-hasLocation(#20046,#20005)
-stmt_containers(#20046,#20001)
+stmts(#20038,2,#20001,0,"[a, ...as];")
+hasLocation(#20038,#20003)
+stmt_containers(#20038,#20001)
+#20039=*
+exprs(#20039,7,#20038,0,"[a, ...as]")
+#20040=@"loc,{#10000},1,1,1,10"
+locations_default(#20040,#10000,1,1,1,10)
+hasLocation(#20039,#20040)
+enclosing_stmt(#20039,#20038)
+expr_containers(#20039,#20001)
+#20041=*
+exprs(#20041,79,#20039,0,"a")
+hasLocation(#20041,#20009)
+enclosing_stmt(#20041,#20038)
+expr_containers(#20041,#20001)
+literals("a","a",#20041)
+#20042=@"var;{a};{#20000}"
+variables(#20042,"a",#20000)
+bind(#20041,#20042)
+#20043=*
+exprs(#20043,66,#20039,1,"...as")
+#20044=@"loc,{#10000},1,5,1,9"
+locations_default(#20044,#10000,1,5,1,9)
+hasLocation(#20043,#20044)
+enclosing_stmt(#20043,#20038)
+expr_containers(#20043,#20001)
+#20045=*
+exprs(#20045,79,#20043,0,"as")
+hasLocation(#20045,#20015)
+enclosing_stmt(#20045,#20038)
+expr_containers(#20045,#20001)
+literals("as","as",#20045)
+#20046=@"var;{as};{#20000}"
+variables(#20046,"as",#20000)
+bind(#20045,#20046)
+array_size(#20039,2)
 #20047=*
-exprs(#20047,12,#20046,0,"new Array(...elts)")
-#20048=@"loc,{#10000},2,1,2,18"
-locations_default(#20048,#10000,2,1,2,18)
-hasLocation(#20047,#20048)
-enclosing_stmt(#20047,#20046)
-expr_containers(#20047,#20001)
-#20049=*
-exprs(#20049,79,#20047,-1,"Array")
-hasLocation(#20049,#20023)
-enclosing_stmt(#20049,#20046)
-expr_containers(#20049,#20001)
-literals("Array","Array",#20049)
-#20050=@"var;{Array};{#20000}"
-variables(#20050,"Array",#20000)
-bind(#20049,#20050)
-#20051=*
-exprs(#20051,66,#20047,0,"...elts")
-#20052=@"loc,{#10000},2,11,2,17"
-locations_default(#20052,#10000,2,11,2,17)
-hasLocation(#20051,#20052)
-enclosing_stmt(#20051,#20046)
-expr_containers(#20051,#20001)
-#20053=*
-exprs(#20053,79,#20051,0,"elts")
-hasLocation(#20053,#20029)
-enclosing_stmt(#20053,#20046)
-expr_containers(#20053,#20001)
-literals("elts","elts",#20053)
-#20054=@"var;{elts};{#20000}"
-variables(#20054,"elts",#20000)
-bind(#20053,#20054)
-#20055=*
-entry_cfg_node(#20055,#20001)
-#20056=@"loc,{#10000},1,1,1,0"
-locations_default(#20056,#10000,1,1,1,0)
-hasLocation(#20055,#20056)
-#20057=*
-exit_cfg_node(#20057,#20001)
-hasLocation(#20057,#20035)
-successor(#20046,#20049)
-successor(#20053,#20051)
-successor(#20051,#20047)
-successor(#20049,#20053)
-successor(#20047,#20057)
-successor(#20037,#20038)
-successor(#20038,#20040)
-successor(#20044,#20042)
-successor(#20042,#20046)
-successor(#20040,#20044)
-successor(#20055,#20037)
+stmts(#20047,2,#20001,1,"new Array(...elts);")
+hasLocation(#20047,#20005)
+stmt_containers(#20047,#20001)
+#20048=*
+exprs(#20048,12,#20047,0,"new Array(...elts)")
+#20049=@"loc,{#10000},2,1,2,18"
+locations_default(#20049,#10000,2,1,2,18)
+hasLocation(#20048,#20049)
+enclosing_stmt(#20048,#20047)
+expr_containers(#20048,#20001)
+#20050=*
+exprs(#20050,79,#20048,-1,"Array")
+hasLocation(#20050,#20023)
+enclosing_stmt(#20050,#20047)
+expr_containers(#20050,#20001)
+literals("Array","Array",#20050)
+#20051=@"var;{Array};{#20000}"
+variables(#20051,"Array",#20000)
+bind(#20050,#20051)
+#20052=*
+exprs(#20052,66,#20048,0,"...elts")
+#20053=@"loc,{#10000},2,11,2,17"
+locations_default(#20053,#10000,2,11,2,17)
+hasLocation(#20052,#20053)
+enclosing_stmt(#20052,#20047)
+expr_containers(#20052,#20001)
+#20054=*
+exprs(#20054,79,#20052,0,"elts")
+hasLocation(#20054,#20029)
+enclosing_stmt(#20054,#20047)
+expr_containers(#20054,#20001)
+literals("elts","elts",#20054)
+#20055=@"var;{elts};{#20000}"
+variables(#20055,"elts",#20000)
+bind(#20054,#20055)
+#20056=*
+entry_cfg_node(#20056,#20001)
+#20057=@"loc,{#10000},1,1,1,0"
+locations_default(#20057,#10000,1,1,1,0)
+hasLocation(#20056,#20057)
+#20058=*
+exit_cfg_node(#20058,#20001)
+hasLocation(#20058,#20035)
+successor(#20047,#20050)
+successor(#20054,#20052)
+successor(#20052,#20048)
+successor(#20050,#20054)
+successor(#20048,#20058)
+successor(#20038,#20039)
+successor(#20039,#20041)
+successor(#20045,#20043)
+successor(#20043,#20047)
+successor(#20041,#20045)
+successor(#20056,#20038)
 numlines(#10000,2,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/super_call.js.trap b/javascript/extractor/tests/es2015/output/trap/super_call.js.trap
index dfcf4192044..5cd884d0401 100644
--- a/javascript/extractor/tests/es2015/output/trap/super_call.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/super_call.js.trap
@@ -153,220 +153,228 @@ hasLocation(#20001,#20053)
 variables(#20054,"A",#20000)
 #20055=@"local_type_name;{A};{#20000}"
 local_type_names(#20055,"A",#20000)
-#20056=*
-stmts(#20056,26,#20001,0,"class A ... ;\n  }\n}")
-hasLocation(#20056,#20053)
-stmt_containers(#20056,#20001)
+#20056=@"var;{this};{#20000}"
+variables(#20056,"this",#20000)
 #20057=*
-exprs(#20057,78,#20056,0,"A")
-hasLocation(#20057,#20015)
-enclosing_stmt(#20057,#20056)
-expr_containers(#20057,#20001)
-literals("A","A",#20057)
-decl(#20057,#20054)
-typedecl(#20057,#20055)
+stmts(#20057,26,#20001,0,"class A ... ;\n  }\n}")
+hasLocation(#20057,#20053)
+stmt_containers(#20057,#20001)
 #20058=*
-scopes(#20058,10)
-scopenodes(#20056,#20058)
-scopenesting(#20058,#20000)
+exprs(#20058,78,#20057,0,"A")
+hasLocation(#20058,#20015)
+enclosing_stmt(#20058,#20057)
+expr_containers(#20058,#20001)
+literals("A","A",#20058)
+decl(#20058,#20054)
+typedecl(#20058,#20055)
 #20059=*
-exprs(#20059,79,#20056,1,"B")
-hasLocation(#20059,#20019)
-enclosing_stmt(#20059,#20056)
-expr_containers(#20059,#20001)
-literals("B","B",#20059)
-#20060=@"var;{B};{#20000}"
-variables(#20060,"B",#20000)
-bind(#20059,#20060)
+scopes(#20059,10)
+scopenodes(#20057,#20059)
+scopenesting(#20059,#20000)
+#20060=@"var;{this};{#20059}"
+variables(#20060,"this",#20059)
 #20061=*
-properties(#20061,#20056,2,0,"m() {\n  ... 19;\n  }")
-#20062=@"loc,{#10000},2,3,4,3"
-locations_default(#20062,#10000,2,3,4,3)
-hasLocation(#20061,#20062)
+exprs(#20061,79,#20057,1,"B")
+hasLocation(#20061,#20019)
+enclosing_stmt(#20061,#20057)
+expr_containers(#20061,#20001)
+literals("B","B",#20061)
+#20062=@"var;{B};{#20000}"
+variables(#20062,"B",#20000)
+bind(#20061,#20062)
 #20063=*
-exprs(#20063,0,#20061,0,"m")
-hasLocation(#20063,#20023)
-enclosing_stmt(#20063,#20056)
-expr_containers(#20063,#20001)
-literals("m","m",#20063)
-#20064=*
-exprs(#20064,9,#20061,1,"() {\n   ... 19;\n  }")
-#20065=@"loc,{#10000},2,4,4,3"
-locations_default(#20065,#10000,2,4,4,3)
-hasLocation(#20064,#20065)
-enclosing_stmt(#20064,#20056)
-expr_containers(#20064,#20001)
+properties(#20063,#20057,2,0,"m() {\n  ... 19;\n  }")
+#20064=@"loc,{#10000},2,3,4,3"
+locations_default(#20064,#10000,2,3,4,3)
+hasLocation(#20063,#20064)
+#20065=*
+exprs(#20065,0,#20063,0,"m")
+hasLocation(#20065,#20023)
+enclosing_stmt(#20065,#20057)
+expr_containers(#20065,#20001)
+literals("m","m",#20065)
 #20066=*
-scopes(#20066,1)
-scopenodes(#20064,#20066)
-scopenesting(#20066,#20058)
-#20067=@"var;{arguments};{#20066}"
-variables(#20067,"arguments",#20066)
-is_arguments_object(#20067)
+exprs(#20066,9,#20063,1,"() {\n   ... 19;\n  }")
+#20067=@"loc,{#10000},2,4,4,3"
+locations_default(#20067,#10000,2,4,4,3)
+hasLocation(#20066,#20067)
+enclosing_stmt(#20066,#20057)
+expr_containers(#20066,#20001)
 #20068=*
-stmts(#20068,1,#20064,-2,"{\n    r ... 19;\n  }")
-#20069=@"loc,{#10000},2,7,4,3"
-locations_default(#20069,#10000,2,7,4,3)
-hasLocation(#20068,#20069)
-stmt_containers(#20068,#20064)
-#20070=*
-stmts(#20070,9,#20068,0,"return  ... ) + 19;")
-#20071=@"loc,{#10000},3,5,3,26"
-locations_default(#20071,#10000,3,5,3,26)
-hasLocation(#20070,#20071)
-stmt_containers(#20070,#20064)
-#20072=*
-exprs(#20072,34,#20070,0,"super.m() + 19")
-#20073=@"loc,{#10000},3,12,3,25"
-locations_default(#20073,#10000,3,12,3,25)
-hasLocation(#20072,#20073)
-enclosing_stmt(#20072,#20070)
-expr_containers(#20072,#20064)
-#20074=*
-exprs(#20074,13,#20072,0,"super.m()")
-#20075=@"loc,{#10000},3,12,3,20"
-locations_default(#20075,#10000,3,12,3,20)
-hasLocation(#20074,#20075)
-enclosing_stmt(#20074,#20070)
-expr_containers(#20074,#20064)
-#20076=*
-exprs(#20076,14,#20074,-1,"super.m")
-#20077=@"loc,{#10000},3,12,3,18"
-locations_default(#20077,#10000,3,12,3,18)
-hasLocation(#20076,#20077)
-enclosing_stmt(#20076,#20070)
-expr_containers(#20076,#20064)
-#20078=*
-exprs(#20078,81,#20076,0,"super")
-hasLocation(#20078,#20033)
-enclosing_stmt(#20078,#20070)
-expr_containers(#20078,#20064)
+scopes(#20068,1)
+scopenodes(#20066,#20068)
+scopenesting(#20068,#20059)
+#20069=@"var;{this};{#20068}"
+variables(#20069,"this",#20068)
+#20070=@"var;{arguments};{#20068}"
+variables(#20070,"arguments",#20068)
+is_arguments_object(#20070)
+#20071=*
+stmts(#20071,1,#20066,-2,"{\n    r ... 19;\n  }")
+#20072=@"loc,{#10000},2,7,4,3"
+locations_default(#20072,#10000,2,7,4,3)
+hasLocation(#20071,#20072)
+stmt_containers(#20071,#20066)
+#20073=*
+stmts(#20073,9,#20071,0,"return  ... ) + 19;")
+#20074=@"loc,{#10000},3,5,3,26"
+locations_default(#20074,#10000,3,5,3,26)
+hasLocation(#20073,#20074)
+stmt_containers(#20073,#20066)
+#20075=*
+exprs(#20075,34,#20073,0,"super.m() + 19")
+#20076=@"loc,{#10000},3,12,3,25"
+locations_default(#20076,#10000,3,12,3,25)
+hasLocation(#20075,#20076)
+enclosing_stmt(#20075,#20073)
+expr_containers(#20075,#20066)
+#20077=*
+exprs(#20077,13,#20075,0,"super.m()")
+#20078=@"loc,{#10000},3,12,3,20"
+locations_default(#20078,#10000,3,12,3,20)
+hasLocation(#20077,#20078)
+enclosing_stmt(#20077,#20073)
+expr_containers(#20077,#20066)
 #20079=*
-exprs(#20079,0,#20076,1,"m")
-hasLocation(#20079,#20037)
-enclosing_stmt(#20079,#20070)
-expr_containers(#20079,#20064)
-literals("m","m",#20079)
-#20080=*
-exprs(#20080,3,#20072,1,"19")
-hasLocation(#20080,#20045)
-enclosing_stmt(#20080,#20070)
-expr_containers(#20080,#20064)
-literals("19","19",#20080)
-is_method(#20061)
+exprs(#20079,14,#20077,-1,"super.m")
+#20080=@"loc,{#10000},3,12,3,18"
+locations_default(#20080,#10000,3,12,3,18)
+hasLocation(#20079,#20080)
+enclosing_stmt(#20079,#20073)
+expr_containers(#20079,#20066)
 #20081=*
-properties(#20081,#20056,3,0,"constru ... rgs); }")
-#20082=@"loc,{#10000},1,19,1,18"
-locations_default(#20082,#10000,1,19,1,18)
-hasLocation(#20081,#20082)
+exprs(#20081,81,#20079,0,"super")
+hasLocation(#20081,#20033)
+enclosing_stmt(#20081,#20073)
+expr_containers(#20081,#20066)
+#20082=*
+exprs(#20082,0,#20079,1,"m")
+hasLocation(#20082,#20037)
+enclosing_stmt(#20082,#20073)
+expr_containers(#20082,#20066)
+literals("m","m",#20082)
 #20083=*
-exprs(#20083,0,#20081,0,"constructor")
-hasLocation(#20083,#20082)
-enclosing_stmt(#20083,#20056)
-expr_containers(#20083,#20001)
-literals("constructor","constructor",#20083)
+exprs(#20083,3,#20075,1,"19")
+hasLocation(#20083,#20045)
+enclosing_stmt(#20083,#20073)
+expr_containers(#20083,#20066)
+literals("19","19",#20083)
+is_method(#20063)
 #20084=*
-exprs(#20084,9,#20081,1,"(...arg ... rgs); }")
-hasLocation(#20084,#20082)
-enclosing_stmt(#20084,#20056)
-expr_containers(#20084,#20001)
-#20085=*
-scopes(#20085,1)
-scopenodes(#20084,#20085)
-scopenesting(#20085,#20058)
-#20086=@"var;{args};{#20085}"
-variables(#20086,"args",#20085)
+properties(#20084,#20057,3,0,"constru ... rgs); }")
+#20085=@"loc,{#10000},1,19,1,18"
+locations_default(#20085,#10000,1,19,1,18)
+hasLocation(#20084,#20085)
+#20086=*
+exprs(#20086,0,#20084,0,"constructor")
+hasLocation(#20086,#20085)
+enclosing_stmt(#20086,#20057)
+expr_containers(#20086,#20001)
+literals("constructor","constructor",#20086)
 #20087=*
-exprs(#20087,78,#20084,0,"args")
-hasLocation(#20087,#20082)
-expr_containers(#20087,#20084)
-literals("args","args",#20087)
-decl(#20087,#20086)
-#20088=@"var;{arguments};{#20085}"
-variables(#20088,"arguments",#20085)
-is_arguments_object(#20088)
-has_rest_parameter(#20084)
-#20089=*
-stmts(#20089,1,#20084,-2,"{ super(...args); }")
-hasLocation(#20089,#20082)
-stmt_containers(#20089,#20084)
-#20090=*
-stmts(#20090,2,#20089,0,"super(...args);")
-hasLocation(#20090,#20082)
-stmt_containers(#20090,#20084)
+exprs(#20087,9,#20084,1,"(...arg ... rgs); }")
+hasLocation(#20087,#20085)
+enclosing_stmt(#20087,#20057)
+expr_containers(#20087,#20001)
+#20088=*
+scopes(#20088,1)
+scopenodes(#20087,#20088)
+scopenesting(#20088,#20059)
+#20089=@"var;{this};{#20088}"
+variables(#20089,"this",#20088)
+#20090=@"var;{args};{#20088}"
+variables(#20090,"args",#20088)
 #20091=*
-exprs(#20091,13,#20090,0,"super(...args)")
-hasLocation(#20091,#20082)
-enclosing_stmt(#20091,#20090)
-expr_containers(#20091,#20084)
-#20092=*
-exprs(#20092,81,#20091,-1,"super")
-hasLocation(#20092,#20082)
-enclosing_stmt(#20092,#20090)
-expr_containers(#20092,#20084)
+exprs(#20091,78,#20087,0,"args")
+hasLocation(#20091,#20085)
+expr_containers(#20091,#20087)
+literals("args","args",#20091)
+decl(#20091,#20090)
+#20092=@"var;{arguments};{#20088}"
+variables(#20092,"arguments",#20088)
+is_arguments_object(#20092)
+has_rest_parameter(#20087)
 #20093=*
-exprs(#20093,66,#20091,0,"...args")
-hasLocation(#20093,#20082)
-enclosing_stmt(#20093,#20090)
-expr_containers(#20093,#20084)
+stmts(#20093,1,#20087,-2,"{ super(...args); }")
+hasLocation(#20093,#20085)
+stmt_containers(#20093,#20087)
 #20094=*
-exprs(#20094,79,#20093,0,"args")
-hasLocation(#20094,#20082)
-enclosing_stmt(#20094,#20090)
-expr_containers(#20094,#20084)
-literals("args","args",#20094)
-bind(#20094,#20086)
-is_method(#20081)
+stmts(#20094,2,#20093,0,"super(...args);")
+hasLocation(#20094,#20085)
+stmt_containers(#20094,#20087)
 #20095=*
-entry_cfg_node(#20095,#20001)
-#20096=@"loc,{#10000},1,1,1,0"
-locations_default(#20096,#10000,1,1,1,0)
-hasLocation(#20095,#20096)
+exprs(#20095,13,#20094,0,"super(...args)")
+hasLocation(#20095,#20085)
+enclosing_stmt(#20095,#20094)
+expr_containers(#20095,#20087)
+#20096=*
+exprs(#20096,81,#20095,-1,"super")
+hasLocation(#20096,#20085)
+enclosing_stmt(#20096,#20094)
+expr_containers(#20096,#20087)
 #20097=*
-exit_cfg_node(#20097,#20001)
-hasLocation(#20097,#20052)
-successor(#20084,#20081)
+exprs(#20097,66,#20095,0,"...args")
+hasLocation(#20097,#20085)
+enclosing_stmt(#20097,#20094)
+expr_containers(#20097,#20087)
 #20098=*
-entry_cfg_node(#20098,#20084)
-hasLocation(#20098,#20082)
+exprs(#20098,79,#20097,0,"args")
+hasLocation(#20098,#20085)
+enclosing_stmt(#20098,#20094)
+expr_containers(#20098,#20087)
+literals("args","args",#20098)
+bind(#20098,#20090)
+is_method(#20084)
 #20099=*
-exit_cfg_node(#20099,#20084)
-hasLocation(#20099,#20082)
-successor(#20090,#20092)
-successor(#20094,#20093)
-successor(#20093,#20091)
-successor(#20092,#20094)
-successor(#20091,#20099)
-successor(#20089,#20090)
-successor(#20087,#20089)
-successor(#20098,#20087)
-successor(#20083,#20084)
-successor(#20081,#20056)
-successor(#20064,#20061)
-#20100=*
-entry_cfg_node(#20100,#20064)
-#20101=@"loc,{#10000},2,4,2,3"
-locations_default(#20101,#10000,2,4,2,3)
-hasLocation(#20100,#20101)
+entry_cfg_node(#20099,#20001)
+#20100=@"loc,{#10000},1,1,1,0"
+locations_default(#20100,#10000,1,1,1,0)
+hasLocation(#20099,#20100)
+#20101=*
+exit_cfg_node(#20101,#20001)
+hasLocation(#20101,#20052)
+successor(#20087,#20084)
 #20102=*
-exit_cfg_node(#20102,#20064)
-#20103=@"loc,{#10000},4,4,4,3"
-locations_default(#20103,#10000,4,4,4,3)
-hasLocation(#20102,#20103)
-successor(#20080,#20072)
-successor(#20079,#20076)
-successor(#20078,#20079)
-successor(#20076,#20074)
-successor(#20074,#20080)
-successor(#20072,#20070)
-successor(#20070,#20102)
-successor(#20068,#20078)
-successor(#20100,#20068)
-successor(#20063,#20064)
-successor(#20061,#20083)
-successor(#20059,#20063)
-successor(#20057,#20059)
-successor(#20056,#20097)
-successor(#20095,#20057)
+entry_cfg_node(#20102,#20087)
+hasLocation(#20102,#20085)
+#20103=*
+exit_cfg_node(#20103,#20087)
+hasLocation(#20103,#20085)
+successor(#20094,#20096)
+successor(#20098,#20097)
+successor(#20097,#20095)
+successor(#20096,#20098)
+successor(#20095,#20103)
+successor(#20093,#20094)
+successor(#20091,#20093)
+successor(#20102,#20091)
+successor(#20086,#20087)
+successor(#20084,#20057)
+successor(#20066,#20063)
+#20104=*
+entry_cfg_node(#20104,#20066)
+#20105=@"loc,{#10000},2,4,2,3"
+locations_default(#20105,#10000,2,4,2,3)
+hasLocation(#20104,#20105)
+#20106=*
+exit_cfg_node(#20106,#20066)
+#20107=@"loc,{#10000},4,4,4,3"
+locations_default(#20107,#10000,4,4,4,3)
+hasLocation(#20106,#20107)
+successor(#20083,#20075)
+successor(#20082,#20079)
+successor(#20081,#20082)
+successor(#20079,#20077)
+successor(#20077,#20083)
+successor(#20075,#20073)
+successor(#20073,#20106)
+successor(#20071,#20081)
+successor(#20104,#20071)
+successor(#20065,#20066)
+successor(#20063,#20086)
+successor(#20061,#20065)
+successor(#20058,#20061)
+successor(#20057,#20101)
+successor(#20099,#20058)
 numlines(#10000,5,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/super_ctor.js.trap b/javascript/extractor/tests/es2015/output/trap/super_ctor.js.trap
index f5d8013e555..7fd482a7a6e 100644
--- a/javascript/extractor/tests/es2015/output/trap/super_ctor.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/super_ctor.js.trap
@@ -133,117 +133,123 @@ hasLocation(#20001,#20045)
 variables(#20046,"A",#20000)
 #20047=@"local_type_name;{A};{#20000}"
 local_type_names(#20047,"A",#20000)
-#20048=*
-stmts(#20048,26,#20001,0,"class A ... ;\n  }\n}")
-hasLocation(#20048,#20045)
-stmt_containers(#20048,#20001)
+#20048=@"var;{this};{#20000}"
+variables(#20048,"this",#20000)
 #20049=*
-exprs(#20049,78,#20048,0,"A")
-hasLocation(#20049,#20015)
-enclosing_stmt(#20049,#20048)
-expr_containers(#20049,#20001)
-literals("A","A",#20049)
-decl(#20049,#20046)
-typedecl(#20049,#20047)
+stmts(#20049,26,#20001,0,"class A ... ;\n  }\n}")
+hasLocation(#20049,#20045)
+stmt_containers(#20049,#20001)
 #20050=*
-scopes(#20050,10)
-scopenodes(#20048,#20050)
-scopenesting(#20050,#20000)
+exprs(#20050,78,#20049,0,"A")
+hasLocation(#20050,#20015)
+enclosing_stmt(#20050,#20049)
+expr_containers(#20050,#20001)
+literals("A","A",#20050)
+decl(#20050,#20046)
+typedecl(#20050,#20047)
 #20051=*
-exprs(#20051,79,#20048,1,"B")
-hasLocation(#20051,#20019)
-enclosing_stmt(#20051,#20048)
-expr_containers(#20051,#20001)
-literals("B","B",#20051)
-#20052=@"var;{B};{#20000}"
-variables(#20052,"B",#20000)
-bind(#20051,#20052)
+scopes(#20051,10)
+scopenodes(#20049,#20051)
+scopenesting(#20051,#20000)
+#20052=@"var;{this};{#20051}"
+variables(#20052,"this",#20051)
 #20053=*
-properties(#20053,#20048,2,0,"constru ... 2);\n  }")
-#20054=@"loc,{#10000},2,3,4,3"
-locations_default(#20054,#10000,2,3,4,3)
-hasLocation(#20053,#20054)
+exprs(#20053,79,#20049,1,"B")
+hasLocation(#20053,#20019)
+enclosing_stmt(#20053,#20049)
+expr_containers(#20053,#20001)
+literals("B","B",#20053)
+#20054=@"var;{B};{#20000}"
+variables(#20054,"B",#20000)
+bind(#20053,#20054)
 #20055=*
-exprs(#20055,0,#20053,0,"constructor")
-hasLocation(#20055,#20023)
-enclosing_stmt(#20055,#20048)
-expr_containers(#20055,#20001)
-literals("constructor","constructor",#20055)
-#20056=*
-exprs(#20056,9,#20053,1,"() {\n   ... 2);\n  }")
-#20057=@"loc,{#10000},2,14,4,3"
-locations_default(#20057,#10000,2,14,4,3)
-hasLocation(#20056,#20057)
-enclosing_stmt(#20056,#20048)
-expr_containers(#20056,#20001)
+properties(#20055,#20049,2,0,"constru ... 2);\n  }")
+#20056=@"loc,{#10000},2,3,4,3"
+locations_default(#20056,#10000,2,3,4,3)
+hasLocation(#20055,#20056)
+#20057=*
+exprs(#20057,0,#20055,0,"constructor")
+hasLocation(#20057,#20023)
+enclosing_stmt(#20057,#20049)
+expr_containers(#20057,#20001)
+literals("constructor","constructor",#20057)
 #20058=*
-scopes(#20058,1)
-scopenodes(#20056,#20058)
-scopenesting(#20058,#20050)
-#20059=@"var;{arguments};{#20058}"
-variables(#20059,"arguments",#20058)
-is_arguments_object(#20059)
+exprs(#20058,9,#20055,1,"() {\n   ... 2);\n  }")
+#20059=@"loc,{#10000},2,14,4,3"
+locations_default(#20059,#10000,2,14,4,3)
+hasLocation(#20058,#20059)
+enclosing_stmt(#20058,#20049)
+expr_containers(#20058,#20001)
 #20060=*
-stmts(#20060,1,#20056,-2,"{\n    super(42);\n  }")
-#20061=@"loc,{#10000},2,17,4,3"
-locations_default(#20061,#10000,2,17,4,3)
-hasLocation(#20060,#20061)
-stmt_containers(#20060,#20056)
-#20062=*
-stmts(#20062,2,#20060,0,"super(42);")
-#20063=@"loc,{#10000},3,5,3,14"
-locations_default(#20063,#10000,3,5,3,14)
-hasLocation(#20062,#20063)
-stmt_containers(#20062,#20056)
-#20064=*
-exprs(#20064,13,#20062,0,"super(42)")
-#20065=@"loc,{#10000},3,5,3,13"
-locations_default(#20065,#10000,3,5,3,13)
-hasLocation(#20064,#20065)
-enclosing_stmt(#20064,#20062)
-expr_containers(#20064,#20056)
-#20066=*
-exprs(#20066,81,#20064,-1,"super")
-hasLocation(#20066,#20031)
-enclosing_stmt(#20066,#20062)
-expr_containers(#20066,#20056)
+scopes(#20060,1)
+scopenodes(#20058,#20060)
+scopenesting(#20060,#20051)
+#20061=@"var;{this};{#20060}"
+variables(#20061,"this",#20060)
+#20062=@"var;{arguments};{#20060}"
+variables(#20062,"arguments",#20060)
+is_arguments_object(#20062)
+#20063=*
+stmts(#20063,1,#20058,-2,"{\n    super(42);\n  }")
+#20064=@"loc,{#10000},2,17,4,3"
+locations_default(#20064,#10000,2,17,4,3)
+hasLocation(#20063,#20064)
+stmt_containers(#20063,#20058)
+#20065=*
+stmts(#20065,2,#20063,0,"super(42);")
+#20066=@"loc,{#10000},3,5,3,14"
+locations_default(#20066,#10000,3,5,3,14)
+hasLocation(#20065,#20066)
+stmt_containers(#20065,#20058)
 #20067=*
-exprs(#20067,3,#20064,0,"42")
-hasLocation(#20067,#20035)
-enclosing_stmt(#20067,#20062)
-expr_containers(#20067,#20056)
-literals("42","42",#20067)
-is_method(#20053)
-#20068=*
-entry_cfg_node(#20068,#20001)
-#20069=@"loc,{#10000},1,1,1,0"
-locations_default(#20069,#10000,1,1,1,0)
-hasLocation(#20068,#20069)
+exprs(#20067,13,#20065,0,"super(42)")
+#20068=@"loc,{#10000},3,5,3,13"
+locations_default(#20068,#10000,3,5,3,13)
+hasLocation(#20067,#20068)
+enclosing_stmt(#20067,#20065)
+expr_containers(#20067,#20058)
+#20069=*
+exprs(#20069,81,#20067,-1,"super")
+hasLocation(#20069,#20031)
+enclosing_stmt(#20069,#20065)
+expr_containers(#20069,#20058)
 #20070=*
-exit_cfg_node(#20070,#20001)
-hasLocation(#20070,#20044)
-successor(#20056,#20053)
+exprs(#20070,3,#20067,0,"42")
+hasLocation(#20070,#20035)
+enclosing_stmt(#20070,#20065)
+expr_containers(#20070,#20058)
+literals("42","42",#20070)
+is_method(#20055)
 #20071=*
-entry_cfg_node(#20071,#20056)
-#20072=@"loc,{#10000},2,14,2,13"
-locations_default(#20072,#10000,2,14,2,13)
+entry_cfg_node(#20071,#20001)
+#20072=@"loc,{#10000},1,1,1,0"
+locations_default(#20072,#10000,1,1,1,0)
 hasLocation(#20071,#20072)
 #20073=*
-exit_cfg_node(#20073,#20056)
-#20074=@"loc,{#10000},4,4,4,3"
-locations_default(#20074,#10000,4,4,4,3)
-hasLocation(#20073,#20074)
-successor(#20062,#20066)
-successor(#20067,#20064)
-successor(#20066,#20067)
-successor(#20064,#20073)
-successor(#20060,#20062)
-successor(#20071,#20060)
-successor(#20055,#20056)
-successor(#20053,#20048)
-successor(#20051,#20055)
-successor(#20049,#20051)
-successor(#20048,#20070)
-successor(#20068,#20049)
+exit_cfg_node(#20073,#20001)
+hasLocation(#20073,#20044)
+successor(#20058,#20055)
+#20074=*
+entry_cfg_node(#20074,#20058)
+#20075=@"loc,{#10000},2,14,2,13"
+locations_default(#20075,#10000,2,14,2,13)
+hasLocation(#20074,#20075)
+#20076=*
+exit_cfg_node(#20076,#20058)
+#20077=@"loc,{#10000},4,4,4,3"
+locations_default(#20077,#10000,4,4,4,3)
+hasLocation(#20076,#20077)
+successor(#20065,#20069)
+successor(#20070,#20067)
+successor(#20069,#20070)
+successor(#20067,#20076)
+successor(#20063,#20065)
+successor(#20074,#20063)
+successor(#20057,#20058)
+successor(#20055,#20049)
+successor(#20053,#20057)
+successor(#20050,#20053)
+successor(#20049,#20073)
+successor(#20071,#20050)
 numlines(#10000,5,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/templates.js.trap b/javascript/extractor/tests/es2015/output/trap/templates.js.trap
index 01688946f3f..8d7dffe88e0 100644
--- a/javascript/extractor/tests/es2015/output/trap/templates.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/templates.js.trap
@@ -406,342 +406,346 @@ variables(#20154,"tag",#20000)
 variables(#20155,"x",#20000)
 #20156=@"var;{y};{#20000}"
 variables(#20156,"y",#20000)
-#20157=*
-stmts(#20157,17,#20001,0,"functio ... , ');\n}")
-#20158=@"loc,{#10000},1,1,3,1"
-locations_default(#20158,#10000,1,1,3,1)
-hasLocation(#20157,#20158)
-stmt_containers(#20157,#20001)
-#20159=*
-exprs(#20159,78,#20157,-1,"tag")
-hasLocation(#20159,#20021)
-expr_containers(#20159,#20157)
-literals("tag","tag",#20159)
-decl(#20159,#20154)
+#20157=@"var;{this};{#20000}"
+variables(#20157,"this",#20000)
+#20158=*
+stmts(#20158,17,#20001,0,"functio ... , ');\n}")
+#20159=@"loc,{#10000},1,1,3,1"
+locations_default(#20159,#10000,1,1,3,1)
+hasLocation(#20158,#20159)
+stmt_containers(#20158,#20001)
 #20160=*
-scopes(#20160,1)
-scopenodes(#20157,#20160)
-scopenesting(#20160,#20000)
-#20161=@"var;{strings};{#20160}"
-variables(#20161,"strings",#20160)
-#20162=*
-exprs(#20162,78,#20157,0,"strings")
-hasLocation(#20162,#20025)
-expr_containers(#20162,#20157)
-literals("strings","strings",#20162)
-decl(#20162,#20161)
-#20163=@"var;{values};{#20160}"
-variables(#20163,"values",#20160)
+exprs(#20160,78,#20158,-1,"tag")
+hasLocation(#20160,#20021)
+expr_containers(#20160,#20158)
+literals("tag","tag",#20160)
+decl(#20160,#20154)
+#20161=*
+scopes(#20161,1)
+scopenodes(#20158,#20161)
+scopenesting(#20161,#20000)
+#20162=@"var;{this};{#20161}"
+variables(#20162,"this",#20161)
+#20163=@"var;{strings};{#20161}"
+variables(#20163,"strings",#20161)
 #20164=*
-exprs(#20164,78,#20157,1,"values")
-hasLocation(#20164,#20031)
-expr_containers(#20164,#20157)
-literals("values","values",#20164)
+exprs(#20164,78,#20158,0,"strings")
+hasLocation(#20164,#20025)
+expr_containers(#20164,#20158)
+literals("strings","strings",#20164)
 decl(#20164,#20163)
-#20165=@"var;{arguments};{#20160}"
-variables(#20165,"arguments",#20160)
-is_arguments_object(#20165)
-has_rest_parameter(#20157)
+#20165=@"var;{values};{#20161}"
+variables(#20165,"values",#20161)
 #20166=*
-stmts(#20166,1,#20157,-2,"{\n  ret ... , ');\n}")
-#20167=@"loc,{#10000},1,34,3,1"
-locations_default(#20167,#10000,1,34,3,1)
-hasLocation(#20166,#20167)
-stmt_containers(#20166,#20157)
+exprs(#20166,78,#20158,1,"values")
+hasLocation(#20166,#20031)
+expr_containers(#20166,#20158)
+literals("values","values",#20166)
+decl(#20166,#20165)
+#20167=@"var;{arguments};{#20161}"
+variables(#20167,"arguments",#20161)
+is_arguments_object(#20167)
+has_rest_parameter(#20158)
 #20168=*
-stmts(#20168,9,#20166,0,"return  ... (', ');")
-#20169=@"loc,{#10000},2,3,2,40"
-locations_default(#20169,#10000,2,3,2,40)
+stmts(#20168,1,#20158,-2,"{\n  ret ... , ');\n}")
+#20169=@"loc,{#10000},1,34,3,1"
+locations_default(#20169,#10000,1,34,3,1)
 hasLocation(#20168,#20169)
-stmt_containers(#20168,#20157)
+stmt_containers(#20168,#20158)
 #20170=*
-exprs(#20170,34,#20168,0,"""values ... n(', ')")
-#20171=@"loc,{#10000},2,10,2,39"
-locations_default(#20171,#10000,2,10,2,39)
+stmts(#20170,9,#20168,0,"return  ... (', ');")
+#20171=@"loc,{#10000},2,3,2,40"
+locations_default(#20171,#10000,2,3,2,40)
 hasLocation(#20170,#20171)
-enclosing_stmt(#20170,#20168)
-expr_containers(#20170,#20157)
+stmt_containers(#20170,#20158)
 #20172=*
-exprs(#20172,4,#20170,0,"""values: """)
-hasLocation(#20172,#20039)
-enclosing_stmt(#20172,#20168)
-expr_containers(#20172,#20157)
-literals("values: ","""values: """,#20172)
-#20173=*
-exprs(#20173,13,#20170,1,"values.join(', ')")
-#20174=@"loc,{#10000},2,23,2,39"
-locations_default(#20174,#10000,2,23,2,39)
-hasLocation(#20173,#20174)
-enclosing_stmt(#20173,#20168)
-expr_containers(#20173,#20157)
+exprs(#20172,34,#20170,0,"""values ... n(', ')")
+#20173=@"loc,{#10000},2,10,2,39"
+locations_default(#20173,#10000,2,10,2,39)
+hasLocation(#20172,#20173)
+enclosing_stmt(#20172,#20170)
+expr_containers(#20172,#20158)
+#20174=*
+exprs(#20174,4,#20172,0,"""values: """)
+hasLocation(#20174,#20039)
+enclosing_stmt(#20174,#20170)
+expr_containers(#20174,#20158)
+literals("values: ","""values: """,#20174)
 #20175=*
-exprs(#20175,14,#20173,-1,"values.join")
-#20176=@"loc,{#10000},2,23,2,33"
-locations_default(#20176,#10000,2,23,2,33)
+exprs(#20175,13,#20172,1,"values.join(', ')")
+#20176=@"loc,{#10000},2,23,2,39"
+locations_default(#20176,#10000,2,23,2,39)
 hasLocation(#20175,#20176)
-enclosing_stmt(#20175,#20168)
-expr_containers(#20175,#20157)
+enclosing_stmt(#20175,#20170)
+expr_containers(#20175,#20158)
 #20177=*
-exprs(#20177,79,#20175,0,"values")
-hasLocation(#20177,#20043)
-enclosing_stmt(#20177,#20168)
-expr_containers(#20177,#20157)
-literals("values","values",#20177)
-bind(#20177,#20163)
-#20178=*
-exprs(#20178,0,#20175,1,"join")
-hasLocation(#20178,#20047)
-enclosing_stmt(#20178,#20168)
-expr_containers(#20178,#20157)
-literals("join","join",#20178)
+exprs(#20177,14,#20175,-1,"values.join")
+#20178=@"loc,{#10000},2,23,2,33"
+locations_default(#20178,#10000,2,23,2,33)
+hasLocation(#20177,#20178)
+enclosing_stmt(#20177,#20170)
+expr_containers(#20177,#20158)
 #20179=*
-exprs(#20179,4,#20173,0,"', '")
-hasLocation(#20179,#20051)
-enclosing_stmt(#20179,#20168)
-expr_containers(#20179,#20157)
-literals(", ","', '",#20179)
+exprs(#20179,79,#20177,0,"values")
+hasLocation(#20179,#20043)
+enclosing_stmt(#20179,#20170)
+expr_containers(#20179,#20158)
+literals("values","values",#20179)
+bind(#20179,#20165)
 #20180=*
-regexpterm(#20180,14,#20179,0,", ")
-#20181=@"loc,{#10000},2,36,2,37"
-locations_default(#20181,#10000,2,36,2,37)
-hasLocation(#20180,#20181)
-regexp_const_value(#20180,", ")
+exprs(#20180,0,#20177,1,"join")
+hasLocation(#20180,#20047)
+enclosing_stmt(#20180,#20170)
+expr_containers(#20180,#20158)
+literals("join","join",#20180)
+#20181=*
+exprs(#20181,4,#20175,0,"', '")
+hasLocation(#20181,#20051)
+enclosing_stmt(#20181,#20170)
+expr_containers(#20181,#20158)
+literals(", ","', '",#20181)
 #20182=*
-stmts(#20182,18,#20001,1,"var x = 23;")
-hasLocation(#20182,#20011)
-stmt_containers(#20182,#20001)
-#20183=*
-exprs(#20183,64,#20182,0,"x = 23")
-#20184=@"loc,{#10000},5,5,5,10"
-locations_default(#20184,#10000,5,5,5,10)
-hasLocation(#20183,#20184)
-enclosing_stmt(#20183,#20182)
-expr_containers(#20183,#20001)
+regexpterm(#20182,14,#20181,0,", ")
+#20183=@"loc,{#10000},2,36,2,37"
+locations_default(#20183,#10000,2,36,2,37)
+hasLocation(#20182,#20183)
+regexp_const_value(#20182,", ")
+#20184=*
+stmts(#20184,18,#20001,1,"var x = 23;")
+hasLocation(#20184,#20011)
+stmt_containers(#20184,#20001)
 #20185=*
-exprs(#20185,78,#20183,0,"x")
-hasLocation(#20185,#20060)
-enclosing_stmt(#20185,#20182)
+exprs(#20185,64,#20184,0,"x = 23")
+#20186=@"loc,{#10000},5,5,5,10"
+locations_default(#20186,#10000,5,5,5,10)
+hasLocation(#20185,#20186)
+enclosing_stmt(#20185,#20184)
 expr_containers(#20185,#20001)
-literals("x","x",#20185)
-decl(#20185,#20155)
-#20186=*
-exprs(#20186,3,#20183,1,"23")
-hasLocation(#20186,#20064)
-enclosing_stmt(#20186,#20182)
-expr_containers(#20186,#20001)
-literals("23","23",#20186)
 #20187=*
-stmts(#20187,18,#20001,2,"var y = 19;")
-hasLocation(#20187,#20013)
-stmt_containers(#20187,#20001)
+exprs(#20187,78,#20185,0,"x")
+hasLocation(#20187,#20060)
+enclosing_stmt(#20187,#20184)
+expr_containers(#20187,#20001)
+literals("x","x",#20187)
+decl(#20187,#20155)
 #20188=*
-exprs(#20188,64,#20187,0,"y = 19")
-#20189=@"loc,{#10000},6,5,6,10"
-locations_default(#20189,#10000,6,5,6,10)
-hasLocation(#20188,#20189)
-enclosing_stmt(#20188,#20187)
+exprs(#20188,3,#20185,1,"23")
+hasLocation(#20188,#20064)
+enclosing_stmt(#20188,#20184)
 expr_containers(#20188,#20001)
+literals("23","23",#20188)
+#20189=*
+stmts(#20189,18,#20001,2,"var y = 19;")
+hasLocation(#20189,#20013)
+stmt_containers(#20189,#20001)
 #20190=*
-exprs(#20190,78,#20188,0,"y")
-hasLocation(#20190,#20070)
-enclosing_stmt(#20190,#20187)
+exprs(#20190,64,#20189,0,"y = 19")
+#20191=@"loc,{#10000},6,5,6,10"
+locations_default(#20191,#10000,6,5,6,10)
+hasLocation(#20190,#20191)
+enclosing_stmt(#20190,#20189)
 expr_containers(#20190,#20001)
-literals("y","y",#20190)
-decl(#20190,#20156)
-#20191=*
-exprs(#20191,3,#20188,1,"19")
-hasLocation(#20191,#20074)
-enclosing_stmt(#20191,#20187)
-expr_containers(#20191,#20001)
-literals("19","19",#20191)
 #20192=*
-stmts(#20192,2,#20001,3,"`${x} + ...  + y}`;")
-hasLocation(#20192,#20015)
-stmt_containers(#20192,#20001)
+exprs(#20192,78,#20190,0,"y")
+hasLocation(#20192,#20070)
+enclosing_stmt(#20192,#20189)
+expr_containers(#20192,#20001)
+literals("y","y",#20192)
+decl(#20192,#20156)
 #20193=*
-exprs(#20193,71,#20192,0,"`${x} + ... x + y}`")
-#20194=@"loc,{#10000},7,1,7,24"
-locations_default(#20194,#10000,7,1,7,24)
-hasLocation(#20193,#20194)
-enclosing_stmt(#20193,#20192)
+exprs(#20193,3,#20190,1,"19")
+hasLocation(#20193,#20074)
+enclosing_stmt(#20193,#20189)
 expr_containers(#20193,#20001)
+literals("19","19",#20193)
+#20194=*
+stmts(#20194,2,#20001,3,"`${x} + ...  + y}`;")
+hasLocation(#20194,#20015)
+stmt_containers(#20194,#20001)
 #20195=*
-exprs(#20195,79,#20193,0,"x")
-hasLocation(#20195,#20084)
-enclosing_stmt(#20195,#20192)
+exprs(#20195,71,#20194,0,"`${x} + ... x + y}`")
+#20196=@"loc,{#10000},7,1,7,24"
+locations_default(#20196,#10000,7,1,7,24)
+hasLocation(#20195,#20196)
+enclosing_stmt(#20195,#20194)
 expr_containers(#20195,#20001)
-literals("x","x",#20195)
-bind(#20195,#20155)
-#20196=*
-exprs(#20196,72,#20193,1," + ")
-hasLocation(#20196,#20088)
-enclosing_stmt(#20196,#20192)
-expr_containers(#20196,#20001)
-literals(" + "," + ",#20196)
 #20197=*
-exprs(#20197,79,#20193,2,"y")
-hasLocation(#20197,#20092)
-enclosing_stmt(#20197,#20192)
+exprs(#20197,79,#20195,0,"x")
+hasLocation(#20197,#20084)
+enclosing_stmt(#20197,#20194)
 expr_containers(#20197,#20001)
-literals("y","y",#20197)
-bind(#20197,#20156)
+literals("x","x",#20197)
+bind(#20197,#20155)
 #20198=*
-exprs(#20198,72,#20193,3," = ")
-hasLocation(#20198,#20096)
-enclosing_stmt(#20198,#20192)
+exprs(#20198,72,#20195,1," + ")
+hasLocation(#20198,#20088)
+enclosing_stmt(#20198,#20194)
 expr_containers(#20198,#20001)
-literals(" = "," = ",#20198)
+literals(" + "," + ",#20198)
 #20199=*
-exprs(#20199,34,#20193,4,"x + y")
-#20200=@"loc,{#10000},7,18,7,22"
-locations_default(#20200,#10000,7,18,7,22)
-hasLocation(#20199,#20200)
-enclosing_stmt(#20199,#20192)
+exprs(#20199,79,#20195,2,"y")
+hasLocation(#20199,#20092)
+enclosing_stmt(#20199,#20194)
 expr_containers(#20199,#20001)
+literals("y","y",#20199)
+bind(#20199,#20156)
+#20200=*
+exprs(#20200,72,#20195,3," = ")
+hasLocation(#20200,#20096)
+enclosing_stmt(#20200,#20194)
+expr_containers(#20200,#20001)
+literals(" = "," = ",#20200)
 #20201=*
-exprs(#20201,79,#20199,0,"x")
-hasLocation(#20201,#20100)
-enclosing_stmt(#20201,#20192)
+exprs(#20201,34,#20195,4,"x + y")
+#20202=@"loc,{#10000},7,18,7,22"
+locations_default(#20202,#10000,7,18,7,22)
+hasLocation(#20201,#20202)
+enclosing_stmt(#20201,#20194)
 expr_containers(#20201,#20001)
-literals("x","x",#20201)
-bind(#20201,#20155)
-#20202=*
-exprs(#20202,79,#20199,1,"y")
-hasLocation(#20202,#20104)
-enclosing_stmt(#20202,#20192)
-expr_containers(#20202,#20001)
-literals("y","y",#20202)
-bind(#20202,#20156)
 #20203=*
-stmts(#20203,2,#20001,4,"tag `${ ...  + y}`;")
-hasLocation(#20203,#20017)
-stmt_containers(#20203,#20001)
+exprs(#20203,79,#20201,0,"x")
+hasLocation(#20203,#20100)
+enclosing_stmt(#20203,#20194)
+expr_containers(#20203,#20001)
+literals("x","x",#20203)
+bind(#20203,#20155)
 #20204=*
-exprs(#20204,70,#20203,0,"tag `${ ... x + y}`")
-#20205=@"loc,{#10000},8,1,8,28"
-locations_default(#20205,#10000,8,1,8,28)
-hasLocation(#20204,#20205)
-enclosing_stmt(#20204,#20203)
+exprs(#20204,79,#20201,1,"y")
+hasLocation(#20204,#20104)
+enclosing_stmt(#20204,#20194)
 expr_containers(#20204,#20001)
+literals("y","y",#20204)
+bind(#20204,#20156)
+#20205=*
+stmts(#20205,2,#20001,4,"tag `${ ...  + y}`;")
+hasLocation(#20205,#20017)
+stmt_containers(#20205,#20001)
 #20206=*
-exprs(#20206,79,#20204,0,"tag")
-hasLocation(#20206,#20114)
-enclosing_stmt(#20206,#20203)
+exprs(#20206,70,#20205,0,"tag `${ ... x + y}`")
+#20207=@"loc,{#10000},8,1,8,28"
+locations_default(#20207,#10000,8,1,8,28)
+hasLocation(#20206,#20207)
+enclosing_stmt(#20206,#20205)
 expr_containers(#20206,#20001)
-literals("tag","tag",#20206)
-bind(#20206,#20154)
-#20207=*
-exprs(#20207,71,#20204,1,"`${x} + ... x + y}`")
-#20208=@"loc,{#10000},8,5,8,28"
-locations_default(#20208,#10000,8,5,8,28)
-hasLocation(#20207,#20208)
-enclosing_stmt(#20207,#20203)
-expr_containers(#20207,#20001)
+#20208=*
+exprs(#20208,79,#20206,0,"tag")
+hasLocation(#20208,#20114)
+enclosing_stmt(#20208,#20205)
+expr_containers(#20208,#20001)
+literals("tag","tag",#20208)
+bind(#20208,#20154)
 #20209=*
-exprs(#20209,79,#20207,0,"x")
-hasLocation(#20209,#20122)
-enclosing_stmt(#20209,#20203)
+exprs(#20209,71,#20206,1,"`${x} + ... x + y}`")
+#20210=@"loc,{#10000},8,5,8,28"
+locations_default(#20210,#10000,8,5,8,28)
+hasLocation(#20209,#20210)
+enclosing_stmt(#20209,#20205)
 expr_containers(#20209,#20001)
-literals("x","x",#20209)
-bind(#20209,#20155)
-#20210=*
-exprs(#20210,72,#20207,1," + ")
-hasLocation(#20210,#20126)
-enclosing_stmt(#20210,#20203)
-expr_containers(#20210,#20001)
-literals(" + "," + ",#20210)
 #20211=*
-exprs(#20211,79,#20207,2,"y")
-hasLocation(#20211,#20130)
-enclosing_stmt(#20211,#20203)
+exprs(#20211,79,#20209,0,"x")
+hasLocation(#20211,#20122)
+enclosing_stmt(#20211,#20205)
 expr_containers(#20211,#20001)
-literals("y","y",#20211)
-bind(#20211,#20156)
+literals("x","x",#20211)
+bind(#20211,#20155)
 #20212=*
-exprs(#20212,72,#20207,3," = ")
-hasLocation(#20212,#20134)
-enclosing_stmt(#20212,#20203)
+exprs(#20212,72,#20209,1," + ")
+hasLocation(#20212,#20126)
+enclosing_stmt(#20212,#20205)
 expr_containers(#20212,#20001)
-literals(" = "," = ",#20212)
+literals(" + "," + ",#20212)
 #20213=*
-exprs(#20213,34,#20207,4,"x + y")
-#20214=@"loc,{#10000},8,22,8,26"
-locations_default(#20214,#10000,8,22,8,26)
-hasLocation(#20213,#20214)
-enclosing_stmt(#20213,#20203)
+exprs(#20213,79,#20209,2,"y")
+hasLocation(#20213,#20130)
+enclosing_stmt(#20213,#20205)
 expr_containers(#20213,#20001)
+literals("y","y",#20213)
+bind(#20213,#20156)
+#20214=*
+exprs(#20214,72,#20209,3," = ")
+hasLocation(#20214,#20134)
+enclosing_stmt(#20214,#20205)
+expr_containers(#20214,#20001)
+literals(" = "," = ",#20214)
 #20215=*
-exprs(#20215,79,#20213,0,"x")
-hasLocation(#20215,#20138)
-enclosing_stmt(#20215,#20203)
+exprs(#20215,34,#20209,4,"x + y")
+#20216=@"loc,{#10000},8,22,8,26"
+locations_default(#20216,#10000,8,22,8,26)
+hasLocation(#20215,#20216)
+enclosing_stmt(#20215,#20205)
 expr_containers(#20215,#20001)
-literals("x","x",#20215)
-bind(#20215,#20155)
-#20216=*
-exprs(#20216,79,#20213,1,"y")
-hasLocation(#20216,#20142)
-enclosing_stmt(#20216,#20203)
-expr_containers(#20216,#20001)
-literals("y","y",#20216)
-bind(#20216,#20156)
 #20217=*
-entry_cfg_node(#20217,#20001)
-#20218=@"loc,{#10000},1,1,1,0"
-locations_default(#20218,#10000,1,1,1,0)
-hasLocation(#20217,#20218)
+exprs(#20217,79,#20215,0,"x")
+hasLocation(#20217,#20138)
+enclosing_stmt(#20217,#20205)
+expr_containers(#20217,#20001)
+literals("x","x",#20217)
+bind(#20217,#20155)
+#20218=*
+exprs(#20218,79,#20215,1,"y")
+hasLocation(#20218,#20142)
+enclosing_stmt(#20218,#20205)
+expr_containers(#20218,#20001)
+literals("y","y",#20218)
+bind(#20218,#20156)
 #20219=*
-exit_cfg_node(#20219,#20001)
-hasLocation(#20219,#20152)
-successor(#20203,#20204)
-successor(#20204,#20206)
-successor(#20207,#20209)
-successor(#20216,#20213)
-successor(#20215,#20216)
-successor(#20213,#20219)
-successor(#20212,#20215)
-successor(#20211,#20212)
-successor(#20210,#20211)
-successor(#20209,#20210)
-successor(#20206,#20207)
-successor(#20192,#20193)
-successor(#20193,#20195)
-successor(#20202,#20199)
-successor(#20201,#20202)
-successor(#20199,#20203)
-successor(#20198,#20201)
-successor(#20197,#20198)
-successor(#20196,#20197)
-successor(#20195,#20196)
-successor(#20187,#20190)
-successor(#20191,#20188)
-successor(#20190,#20191)
-successor(#20188,#20192)
-successor(#20182,#20185)
-successor(#20186,#20183)
-successor(#20185,#20186)
-successor(#20183,#20187)
-successor(#20157,#20182)
-#20220=*
-entry_cfg_node(#20220,#20157)
-hasLocation(#20220,#20218)
+entry_cfg_node(#20219,#20001)
+#20220=@"loc,{#10000},1,1,1,0"
+locations_default(#20220,#10000,1,1,1,0)
+hasLocation(#20219,#20220)
 #20221=*
-exit_cfg_node(#20221,#20157)
-#20222=@"loc,{#10000},3,2,3,1"
-locations_default(#20222,#10000,3,2,3,1)
-hasLocation(#20221,#20222)
-successor(#20179,#20173)
-successor(#20178,#20175)
-successor(#20177,#20178)
-successor(#20175,#20179)
-successor(#20173,#20170)
-successor(#20172,#20177)
-successor(#20170,#20168)
-successor(#20168,#20221)
-successor(#20166,#20172)
+exit_cfg_node(#20221,#20001)
+hasLocation(#20221,#20152)
+successor(#20205,#20206)
+successor(#20206,#20208)
+successor(#20209,#20211)
+successor(#20218,#20215)
+successor(#20217,#20218)
+successor(#20215,#20221)
+successor(#20214,#20217)
+successor(#20213,#20214)
+successor(#20212,#20213)
+successor(#20211,#20212)
+successor(#20208,#20209)
+successor(#20194,#20195)
+successor(#20195,#20197)
+successor(#20204,#20201)
+successor(#20203,#20204)
+successor(#20201,#20205)
+successor(#20200,#20203)
+successor(#20199,#20200)
+successor(#20198,#20199)
+successor(#20197,#20198)
+successor(#20189,#20192)
+successor(#20193,#20190)
+successor(#20192,#20193)
+successor(#20190,#20194)
+successor(#20184,#20187)
+successor(#20188,#20185)
+successor(#20187,#20188)
+successor(#20185,#20189)
+successor(#20158,#20184)
+#20222=*
+entry_cfg_node(#20222,#20158)
+hasLocation(#20222,#20220)
+#20223=*
+exit_cfg_node(#20223,#20158)
+#20224=@"loc,{#10000},3,2,3,1"
+locations_default(#20224,#10000,3,2,3,1)
+hasLocation(#20223,#20224)
+successor(#20181,#20175)
+successor(#20180,#20177)
+successor(#20179,#20180)
+successor(#20177,#20181)
+successor(#20175,#20172)
+successor(#20174,#20179)
+successor(#20172,#20170)
+successor(#20170,#20223)
+successor(#20168,#20174)
+successor(#20166,#20168)
 successor(#20164,#20166)
-successor(#20162,#20164)
-successor(#20220,#20162)
-successor(#20159,#20157)
-successor(#20217,#20159)
+successor(#20222,#20164)
+successor(#20160,#20158)
+successor(#20219,#20160)
 numlines(#10000,8,7,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/unknown_meta_property.js.trap b/javascript/extractor/tests/es2015/output/trap/unknown_meta_property.js.trap
index 13db0f6a6fc..9198e92e8f6 100644
--- a/javascript/extractor/tests/es2015/output/trap/unknown_meta_property.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/unknown_meta_property.js.trap
@@ -87,81 +87,85 @@ locations_default(#20029,#10000,1,1,3,1)
 hasLocation(#20001,#20029)
 #20030=@"var;{g};{#20000}"
 variables(#20030,"g",#20000)
-#20031=*
-stmts(#20031,17,#20001,0,"functio ... urce;\n}")
-hasLocation(#20031,#20029)
-stmt_containers(#20031,#20001)
+#20031=@"var;{this};{#20000}"
+variables(#20031,"this",#20000)
 #20032=*
-exprs(#20032,78,#20031,-1,"g")
-hasLocation(#20032,#20011)
-expr_containers(#20032,#20031)
-literals("g","g",#20032)
-decl(#20032,#20030)
+stmts(#20032,17,#20001,0,"functio ... urce;\n}")
+hasLocation(#20032,#20029)
+stmt_containers(#20032,#20001)
 #20033=*
-scopes(#20033,1)
-scopenodes(#20031,#20033)
-scopenesting(#20033,#20000)
-#20034=@"var;{arguments};{#20033}"
-variables(#20034,"arguments",#20033)
-is_arguments_object(#20034)
-#20035=*
-stmts(#20035,1,#20031,-2,"{\n  new.source;\n}")
-#20036=@"loc,{#10000},1,14,3,1"
-locations_default(#20036,#10000,1,14,3,1)
-hasLocation(#20035,#20036)
-stmt_containers(#20035,#20031)
+exprs(#20033,78,#20032,-1,"g")
+hasLocation(#20033,#20011)
+expr_containers(#20033,#20032)
+literals("g","g",#20033)
+decl(#20033,#20030)
+#20034=*
+scopes(#20034,1)
+scopenodes(#20032,#20034)
+scopenesting(#20034,#20000)
+#20035=@"var;{this};{#20034}"
+variables(#20035,"this",#20034)
+#20036=@"var;{arguments};{#20034}"
+variables(#20036,"arguments",#20034)
+is_arguments_object(#20036)
 #20037=*
-stmts(#20037,2,#20035,0,"new.source;")
-#20038=@"loc,{#10000},2,3,2,13"
-locations_default(#20038,#10000,2,3,2,13)
+stmts(#20037,1,#20032,-2,"{\n  new.source;\n}")
+#20038=@"loc,{#10000},1,14,3,1"
+locations_default(#20038,#10000,1,14,3,1)
 hasLocation(#20037,#20038)
-stmt_containers(#20037,#20031)
+stmt_containers(#20037,#20032)
 #20039=*
-exprs(#20039,82,#20037,0,"new.source")
-#20040=@"loc,{#10000},2,3,2,12"
-locations_default(#20040,#10000,2,3,2,12)
+stmts(#20039,2,#20037,0,"new.source;")
+#20040=@"loc,{#10000},2,3,2,13"
+locations_default(#20040,#10000,2,3,2,13)
 hasLocation(#20039,#20040)
-enclosing_stmt(#20039,#20037)
-expr_containers(#20039,#20031)
+stmt_containers(#20039,#20032)
 #20041=*
-entry_cfg_node(#20041,#20001)
-#20042=@"loc,{#10000},1,1,1,0"
-locations_default(#20042,#10000,1,1,1,0)
+exprs(#20041,82,#20039,0,"new.source")
+#20042=@"loc,{#10000},2,3,2,12"
+locations_default(#20042,#10000,2,3,2,12)
 hasLocation(#20041,#20042)
+enclosing_stmt(#20041,#20039)
+expr_containers(#20041,#20032)
 #20043=*
-exit_cfg_node(#20043,#20001)
-hasLocation(#20043,#20028)
-successor(#20031,#20043)
-#20044=*
-entry_cfg_node(#20044,#20031)
-hasLocation(#20044,#20042)
+entry_cfg_node(#20043,#20001)
+#20044=@"loc,{#10000},1,1,1,0"
+locations_default(#20044,#10000,1,1,1,0)
+hasLocation(#20043,#20044)
 #20045=*
-exit_cfg_node(#20045,#20031)
+exit_cfg_node(#20045,#20001)
 hasLocation(#20045,#20028)
-successor(#20037,#20039)
-successor(#20039,#20045)
-successor(#20035,#20037)
-successor(#20044,#20035)
-successor(#20032,#20031)
-successor(#20041,#20032)
+successor(#20032,#20045)
 #20046=*
-js_parse_errors(#20046,#20001,"Error: The only valid meta property for new is new.target","  new.source;
-")
-#20047=@"loc,{#10000},2,7,2,7"
-locations_default(#20047,#10000,2,7,2,7)
-hasLocation(#20046,#20047)
+entry_cfg_node(#20046,#20032)
+hasLocation(#20046,#20044)
+#20047=*
+exit_cfg_node(#20047,#20032)
+hasLocation(#20047,#20028)
+successor(#20039,#20041)
+successor(#20041,#20047)
+successor(#20037,#20039)
+successor(#20046,#20037)
+successor(#20033,#20032)
+successor(#20043,#20033)
 #20048=*
-lines(#20048,#20001,"function g() {","
+js_parse_errors(#20048,#20001,"Error: The only valid meta property for new is new.target","  new.source;
 ")
-hasLocation(#20048,#20003)
-#20049=*
-lines(#20049,#20001,"  new.source;","
-")
-hasLocation(#20049,#20005)
-indentation(#10000,2," ",2)
+#20049=@"loc,{#10000},2,7,2,7"
+locations_default(#20049,#10000,2,7,2,7)
+hasLocation(#20048,#20049)
 #20050=*
-lines(#20050,#20001,"}","")
-hasLocation(#20050,#20007)
+lines(#20050,#20001,"function g() {","
+")
+hasLocation(#20050,#20003)
+#20051=*
+lines(#20051,#20001,"  new.source;","
+")
+hasLocation(#20051,#20005)
+indentation(#10000,2," ",2)
+#20052=*
+lines(#20052,#20001,"}","")
+hasLocation(#20052,#20007)
 numlines(#20001,3,0,0)
 numlines(#10000,3,3,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/yield.js.trap b/javascript/extractor/tests/es2015/output/trap/yield.js.trap
index 73886a34b3f..ab13e0bf865 100644
--- a/javascript/extractor/tests/es2015/output/trap/yield.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/yield.js.trap
@@ -167,150 +167,154 @@ locations_default(#20059,#10000,1,1,5,1)
 hasLocation(#20001,#20059)
 #20060=@"var;{foo};{#20000}"
 variables(#20060,"foo",#20000)
-#20061=*
-stmts(#20061,17,#20001,0,"functio ... ex++;\n}")
-hasLocation(#20061,#20059)
-stmt_containers(#20061,#20001)
+#20061=@"var;{this};{#20000}"
+variables(#20061,"this",#20000)
 #20062=*
-exprs(#20062,78,#20061,-1,"foo")
-hasLocation(#20062,#20019)
-expr_containers(#20062,#20061)
-literals("foo","foo",#20062)
-decl(#20062,#20060)
+stmts(#20062,17,#20001,0,"functio ... ex++;\n}")
+hasLocation(#20062,#20059)
+stmt_containers(#20062,#20001)
 #20063=*
-scopes(#20063,1)
-scopenodes(#20061,#20063)
-scopenesting(#20063,#20000)
-#20064=@"var;{index};{#20063}"
-variables(#20064,"index",#20063)
-#20065=@"var;{arguments};{#20063}"
-variables(#20065,"arguments",#20063)
-is_arguments_object(#20065)
-is_generator(#20061)
-#20066=*
-stmts(#20066,1,#20061,-2,"{\n  var ... ex++;\n}")
-#20067=@"loc,{#10000},1,16,5,1"
-locations_default(#20067,#10000,1,16,5,1)
-hasLocation(#20066,#20067)
-stmt_containers(#20066,#20061)
+exprs(#20063,78,#20062,-1,"foo")
+hasLocation(#20063,#20019)
+expr_containers(#20063,#20062)
+literals("foo","foo",#20063)
+decl(#20063,#20060)
+#20064=*
+scopes(#20064,1)
+scopenodes(#20062,#20064)
+scopenesting(#20064,#20000)
+#20065=@"var;{index};{#20064}"
+variables(#20065,"index",#20064)
+#20066=@"var;{this};{#20064}"
+variables(#20066,"this",#20064)
+#20067=@"var;{arguments};{#20064}"
+variables(#20067,"arguments",#20064)
+is_arguments_object(#20067)
+is_generator(#20062)
 #20068=*
-stmts(#20068,18,#20066,0,"var index = 0;")
-#20069=@"loc,{#10000},2,3,2,16"
-locations_default(#20069,#10000,2,3,2,16)
+stmts(#20068,1,#20062,-2,"{\n  var ... ex++;\n}")
+#20069=@"loc,{#10000},1,16,5,1"
+locations_default(#20069,#10000,1,16,5,1)
 hasLocation(#20068,#20069)
-stmt_containers(#20068,#20061)
+stmt_containers(#20068,#20062)
 #20070=*
-exprs(#20070,64,#20068,0,"index = 0")
-#20071=@"loc,{#10000},2,7,2,15"
-locations_default(#20071,#10000,2,7,2,15)
+stmts(#20070,18,#20068,0,"var index = 0;")
+#20071=@"loc,{#10000},2,3,2,16"
+locations_default(#20071,#10000,2,3,2,16)
 hasLocation(#20070,#20071)
-enclosing_stmt(#20070,#20068)
-expr_containers(#20070,#20061)
+stmt_containers(#20070,#20062)
 #20072=*
-exprs(#20072,78,#20070,0,"index")
-hasLocation(#20072,#20029)
-enclosing_stmt(#20072,#20068)
-expr_containers(#20072,#20061)
-literals("index","index",#20072)
-decl(#20072,#20064)
-#20073=*
-exprs(#20073,3,#20070,1,"0")
-hasLocation(#20073,#20033)
-enclosing_stmt(#20073,#20068)
-expr_containers(#20073,#20061)
-literals("0","0",#20073)
+exprs(#20072,64,#20070,0,"index = 0")
+#20073=@"loc,{#10000},2,7,2,15"
+locations_default(#20073,#10000,2,7,2,15)
+hasLocation(#20072,#20073)
+enclosing_stmt(#20072,#20070)
+expr_containers(#20072,#20062)
 #20074=*
-stmts(#20074,12,#20066,1,"while(i ... ndex++;")
-#20075=@"loc,{#10000},3,3,4,18"
-locations_default(#20075,#10000,3,3,4,18)
-hasLocation(#20074,#20075)
-stmt_containers(#20074,#20061)
+exprs(#20074,78,#20072,0,"index")
+hasLocation(#20074,#20029)
+enclosing_stmt(#20074,#20070)
+expr_containers(#20074,#20062)
+literals("index","index",#20074)
+decl(#20074,#20065)
+#20075=*
+exprs(#20075,3,#20072,1,"0")
+hasLocation(#20075,#20033)
+enclosing_stmt(#20075,#20070)
+expr_containers(#20075,#20062)
+literals("0","0",#20075)
 #20076=*
-exprs(#20076,28,#20074,0,"index <= 2")
-#20077=@"loc,{#10000},3,9,3,18"
-locations_default(#20077,#10000,3,9,3,18)
+stmts(#20076,12,#20068,1,"while(i ... ndex++;")
+#20077=@"loc,{#10000},3,3,4,18"
+locations_default(#20077,#10000,3,3,4,18)
 hasLocation(#20076,#20077)
-enclosing_stmt(#20076,#20074)
-expr_containers(#20076,#20061)
+stmt_containers(#20076,#20062)
 #20078=*
-exprs(#20078,79,#20076,0,"index")
-hasLocation(#20078,#20041)
-enclosing_stmt(#20078,#20074)
-expr_containers(#20078,#20061)
-literals("index","index",#20078)
-bind(#20078,#20064)
-#20079=*
-exprs(#20079,3,#20076,1,"2")
-hasLocation(#20079,#20045)
-enclosing_stmt(#20079,#20074)
-expr_containers(#20079,#20061)
-literals("2","2",#20079)
+exprs(#20078,28,#20076,0,"index <= 2")
+#20079=@"loc,{#10000},3,9,3,18"
+locations_default(#20079,#10000,3,9,3,18)
+hasLocation(#20078,#20079)
+enclosing_stmt(#20078,#20076)
+expr_containers(#20078,#20062)
 #20080=*
-stmts(#20080,2,#20074,1,"yield index++;")
-#20081=@"loc,{#10000},4,5,4,18"
-locations_default(#20081,#10000,4,5,4,18)
-hasLocation(#20080,#20081)
-stmt_containers(#20080,#20061)
+exprs(#20080,79,#20078,0,"index")
+hasLocation(#20080,#20041)
+enclosing_stmt(#20080,#20076)
+expr_containers(#20080,#20062)
+literals("index","index",#20080)
+bind(#20080,#20065)
+#20081=*
+exprs(#20081,3,#20078,1,"2")
+hasLocation(#20081,#20045)
+enclosing_stmt(#20081,#20076)
+expr_containers(#20081,#20062)
+literals("2","2",#20081)
 #20082=*
-exprs(#20082,69,#20080,0,"yield index++")
-#20083=@"loc,{#10000},4,5,4,17"
-locations_default(#20083,#10000,4,5,4,17)
+stmts(#20082,2,#20076,1,"yield index++;")
+#20083=@"loc,{#10000},4,5,4,18"
+locations_default(#20083,#10000,4,5,4,18)
 hasLocation(#20082,#20083)
-enclosing_stmt(#20082,#20080)
-expr_containers(#20082,#20061)
+stmt_containers(#20082,#20062)
 #20084=*
-exprs(#20084,60,#20082,0,"index++")
-#20085=@"loc,{#10000},4,11,4,17"
-locations_default(#20085,#10000,4,11,4,17)
+exprs(#20084,69,#20082,0,"yield index++")
+#20085=@"loc,{#10000},4,5,4,17"
+locations_default(#20085,#10000,4,5,4,17)
 hasLocation(#20084,#20085)
-enclosing_stmt(#20084,#20080)
-expr_containers(#20084,#20061)
+enclosing_stmt(#20084,#20082)
+expr_containers(#20084,#20062)
 #20086=*
-exprs(#20086,79,#20084,0,"index")
-hasLocation(#20086,#20051)
-enclosing_stmt(#20086,#20080)
-expr_containers(#20086,#20061)
-literals("index","index",#20086)
-bind(#20086,#20064)
-#20087=*
-entry_cfg_node(#20087,#20001)
-#20088=@"loc,{#10000},1,1,1,0"
-locations_default(#20088,#10000,1,1,1,0)
-hasLocation(#20087,#20088)
+exprs(#20086,60,#20084,0,"index++")
+#20087=@"loc,{#10000},4,11,4,17"
+locations_default(#20087,#10000,4,11,4,17)
+hasLocation(#20086,#20087)
+enclosing_stmt(#20086,#20082)
+expr_containers(#20086,#20062)
+#20088=*
+exprs(#20088,79,#20086,0,"index")
+hasLocation(#20088,#20051)
+enclosing_stmt(#20088,#20082)
+expr_containers(#20088,#20062)
+literals("index","index",#20088)
+bind(#20088,#20065)
 #20089=*
-exit_cfg_node(#20089,#20001)
-hasLocation(#20089,#20058)
-successor(#20061,#20089)
-#20090=*
-entry_cfg_node(#20090,#20061)
-hasLocation(#20090,#20088)
+entry_cfg_node(#20089,#20001)
+#20090=@"loc,{#10000},1,1,1,0"
+locations_default(#20090,#10000,1,1,1,0)
+hasLocation(#20089,#20090)
 #20091=*
-exit_cfg_node(#20091,#20061)
+exit_cfg_node(#20091,#20001)
 hasLocation(#20091,#20058)
-successor(#20074,#20078)
-successor(#20080,#20086)
-successor(#20086,#20084)
-successor(#20084,#20082)
-successor(#20082,#20078)
-successor(#20079,#20076)
-successor(#20078,#20079)
+successor(#20062,#20091)
 #20092=*
-guard_node(#20092,1,#20076)
-hasLocation(#20092,#20077)
-successor(#20092,#20080)
+entry_cfg_node(#20092,#20062)
+hasLocation(#20092,#20090)
 #20093=*
-guard_node(#20093,0,#20076)
-hasLocation(#20093,#20077)
-successor(#20093,#20091)
-successor(#20076,#20092)
-successor(#20076,#20093)
-successor(#20068,#20072)
-successor(#20073,#20070)
-successor(#20072,#20073)
+exit_cfg_node(#20093,#20062)
+hasLocation(#20093,#20058)
+successor(#20076,#20080)
+successor(#20082,#20088)
+successor(#20088,#20086)
+successor(#20086,#20084)
+successor(#20084,#20080)
+successor(#20081,#20078)
+successor(#20080,#20081)
+#20094=*
+guard_node(#20094,1,#20078)
+hasLocation(#20094,#20079)
+successor(#20094,#20082)
+#20095=*
+guard_node(#20095,0,#20078)
+hasLocation(#20095,#20079)
+successor(#20095,#20093)
+successor(#20078,#20094)
+successor(#20078,#20095)
 successor(#20070,#20074)
-successor(#20066,#20068)
-successor(#20090,#20066)
-successor(#20062,#20061)
-successor(#20087,#20062)
+successor(#20075,#20072)
+successor(#20074,#20075)
+successor(#20072,#20076)
+successor(#20068,#20070)
+successor(#20092,#20068)
+successor(#20063,#20062)
+successor(#20089,#20063)
 numlines(#10000,5,5,1)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2015/output/trap/yield2.js.trap b/javascript/extractor/tests/es2015/output/trap/yield2.js.trap
index 2bc654a7ee9..f676cfa0895 100644
--- a/javascript/extractor/tests/es2015/output/trap/yield2.js.trap
+++ b/javascript/extractor/tests/es2015/output/trap/yield2.js.trap
@@ -83,65 +83,69 @@ locations_default(#20027,#10000,1,1,4,0)
 hasLocation(#20001,#20027)
 #20028=@"var;{f};{#20000}"
 variables(#20028,"f",#20000)
-#20029=*
-stmts(#20029,17,#20001,0,"functio ... ield;\n}")
-#20030=@"loc,{#10000},1,1,3,1"
-locations_default(#20030,#10000,1,1,3,1)
-hasLocation(#20029,#20030)
-stmt_containers(#20029,#20001)
-#20031=*
-exprs(#20031,78,#20029,-1,"f")
-hasLocation(#20031,#20013)
-expr_containers(#20031,#20029)
-literals("f","f",#20031)
-decl(#20031,#20028)
+#20029=@"var;{this};{#20000}"
+variables(#20029,"this",#20000)
+#20030=*
+stmts(#20030,17,#20001,0,"functio ... ield;\n}")
+#20031=@"loc,{#10000},1,1,3,1"
+locations_default(#20031,#10000,1,1,3,1)
+hasLocation(#20030,#20031)
+stmt_containers(#20030,#20001)
 #20032=*
-scopes(#20032,1)
-scopenodes(#20029,#20032)
-scopenesting(#20032,#20000)
-#20033=@"var;{arguments};{#20032}"
-variables(#20033,"arguments",#20032)
-is_arguments_object(#20033)
-is_generator(#20029)
-#20034=*
-stmts(#20034,1,#20029,-2,"{\n    yield;\n}")
-#20035=@"loc,{#10000},1,15,3,1"
-locations_default(#20035,#10000,1,15,3,1)
-hasLocation(#20034,#20035)
-stmt_containers(#20034,#20029)
+exprs(#20032,78,#20030,-1,"f")
+hasLocation(#20032,#20013)
+expr_containers(#20032,#20030)
+literals("f","f",#20032)
+decl(#20032,#20028)
+#20033=*
+scopes(#20033,1)
+scopenodes(#20030,#20033)
+scopenesting(#20033,#20000)
+#20034=@"var;{this};{#20033}"
+variables(#20034,"this",#20033)
+#20035=@"var;{arguments};{#20033}"
+variables(#20035,"arguments",#20033)
+is_arguments_object(#20035)
+is_generator(#20030)
 #20036=*
-stmts(#20036,2,#20034,0,"yield;")
-#20037=@"loc,{#10000},2,5,2,10"
-locations_default(#20037,#10000,2,5,2,10)
+stmts(#20036,1,#20030,-2,"{\n    yield;\n}")
+#20037=@"loc,{#10000},1,15,3,1"
+locations_default(#20037,#10000,1,15,3,1)
 hasLocation(#20036,#20037)
-stmt_containers(#20036,#20029)
+stmt_containers(#20036,#20030)
 #20038=*
-exprs(#20038,69,#20036,0,"yield")
-hasLocation(#20038,#20021)
-enclosing_stmt(#20038,#20036)
-expr_containers(#20038,#20029)
-#20039=*
-entry_cfg_node(#20039,#20001)
-#20040=@"loc,{#10000},1,1,1,0"
-locations_default(#20040,#10000,1,1,1,0)
-hasLocation(#20039,#20040)
+stmts(#20038,2,#20036,0,"yield;")
+#20039=@"loc,{#10000},2,5,2,10"
+locations_default(#20039,#10000,2,5,2,10)
+hasLocation(#20038,#20039)
+stmt_containers(#20038,#20030)
+#20040=*
+exprs(#20040,69,#20038,0,"yield")
+hasLocation(#20040,#20021)
+enclosing_stmt(#20040,#20038)
+expr_containers(#20040,#20030)
 #20041=*
-exit_cfg_node(#20041,#20001)
-hasLocation(#20041,#20026)
-successor(#20029,#20041)
-#20042=*
-entry_cfg_node(#20042,#20029)
-hasLocation(#20042,#20040)
+entry_cfg_node(#20041,#20001)
+#20042=@"loc,{#10000},1,1,1,0"
+locations_default(#20042,#10000,1,1,1,0)
+hasLocation(#20041,#20042)
 #20043=*
-exit_cfg_node(#20043,#20029)
-#20044=@"loc,{#10000},3,2,3,1"
-locations_default(#20044,#10000,3,2,3,1)
-hasLocation(#20043,#20044)
+exit_cfg_node(#20043,#20001)
+hasLocation(#20043,#20026)
+successor(#20030,#20043)
+#20044=*
+entry_cfg_node(#20044,#20030)
+hasLocation(#20044,#20042)
+#20045=*
+exit_cfg_node(#20045,#20030)
+#20046=@"loc,{#10000},3,2,3,1"
+locations_default(#20046,#10000,3,2,3,1)
+hasLocation(#20045,#20046)
+successor(#20038,#20040)
+successor(#20040,#20045)
 successor(#20036,#20038)
-successor(#20038,#20043)
-successor(#20034,#20036)
-successor(#20042,#20034)
-successor(#20031,#20029)
-successor(#20039,#20031)
+successor(#20044,#20036)
+successor(#20032,#20030)
+successor(#20041,#20032)
 numlines(#10000,3,3,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2016/output/trap/exp.js.trap b/javascript/extractor/tests/es2016/output/trap/exp.js.trap
index c5103a7932f..3cb009465db 100644
--- a/javascript/extractor/tests/es2016/output/trap/exp.js.trap
+++ b/javascript/extractor/tests/es2016/output/trap/exp.js.trap
@@ -60,67 +60,69 @@ toplevels(#20001,0)
 #20020=@"loc,{#10000},1,1,2,5"
 locations_default(#20020,#10000,1,1,2,5)
 hasLocation(#20001,#20020)
-#20021=*
-stmts(#20021,2,#20001,0,"1**0")
-hasLocation(#20021,#20003)
-stmt_containers(#20021,#20001)
+#20021=@"var;{this};{#20000}"
+variables(#20021,"this",#20000)
 #20022=*
-exprs(#20022,87,#20021,0,"1**0")
+stmts(#20022,2,#20001,0,"1**0")
 hasLocation(#20022,#20003)
-enclosing_stmt(#20022,#20021)
-expr_containers(#20022,#20001)
+stmt_containers(#20022,#20001)
 #20023=*
-exprs(#20023,3,#20022,0,"1")
-hasLocation(#20023,#20007)
-enclosing_stmt(#20023,#20021)
+exprs(#20023,87,#20022,0,"1**0")
+hasLocation(#20023,#20003)
+enclosing_stmt(#20023,#20022)
 expr_containers(#20023,#20001)
-literals("1","1",#20023)
 #20024=*
-exprs(#20024,3,#20022,1,"0")
-hasLocation(#20024,#20011)
-enclosing_stmt(#20024,#20021)
+exprs(#20024,3,#20023,0,"1")
+hasLocation(#20024,#20007)
+enclosing_stmt(#20024,#20022)
 expr_containers(#20024,#20001)
-literals("0","0",#20024)
+literals("1","1",#20024)
 #20025=*
-stmts(#20025,2,#20001,1,"x**=2")
-hasLocation(#20025,#20005)
-stmt_containers(#20025,#20001)
+exprs(#20025,3,#20023,1,"0")
+hasLocation(#20025,#20011)
+enclosing_stmt(#20025,#20022)
+expr_containers(#20025,#20001)
+literals("0","0",#20025)
 #20026=*
-exprs(#20026,88,#20025,0,"x**=2")
+stmts(#20026,2,#20001,1,"x**=2")
 hasLocation(#20026,#20005)
-enclosing_stmt(#20026,#20025)
-expr_containers(#20026,#20001)
+stmt_containers(#20026,#20001)
 #20027=*
-exprs(#20027,79,#20026,0,"x")
-hasLocation(#20027,#20013)
-enclosing_stmt(#20027,#20025)
+exprs(#20027,88,#20026,0,"x**=2")
+hasLocation(#20027,#20005)
+enclosing_stmt(#20027,#20026)
 expr_containers(#20027,#20001)
-literals("x","x",#20027)
-#20028=@"var;{x};{#20000}"
-variables(#20028,"x",#20000)
-bind(#20027,#20028)
-#20029=*
-exprs(#20029,3,#20026,1,"2")
-hasLocation(#20029,#20017)
-enclosing_stmt(#20029,#20025)
-expr_containers(#20029,#20001)
-literals("2","2",#20029)
+#20028=*
+exprs(#20028,79,#20027,0,"x")
+hasLocation(#20028,#20013)
+enclosing_stmt(#20028,#20026)
+expr_containers(#20028,#20001)
+literals("x","x",#20028)
+#20029=@"var;{x};{#20000}"
+variables(#20029,"x",#20000)
+bind(#20028,#20029)
 #20030=*
-entry_cfg_node(#20030,#20001)
-#20031=@"loc,{#10000},1,1,1,0"
-locations_default(#20031,#10000,1,1,1,0)
-hasLocation(#20030,#20031)
-#20032=*
-exit_cfg_node(#20032,#20001)
-hasLocation(#20032,#20019)
-successor(#20025,#20027)
-successor(#20029,#20026)
-successor(#20027,#20029)
-successor(#20026,#20032)
-successor(#20021,#20023)
-successor(#20024,#20022)
-successor(#20023,#20024)
-successor(#20022,#20025)
-successor(#20030,#20021)
+exprs(#20030,3,#20027,1,"2")
+hasLocation(#20030,#20017)
+enclosing_stmt(#20030,#20026)
+expr_containers(#20030,#20001)
+literals("2","2",#20030)
+#20031=*
+entry_cfg_node(#20031,#20001)
+#20032=@"loc,{#10000},1,1,1,0"
+locations_default(#20032,#10000,1,1,1,0)
+hasLocation(#20031,#20032)
+#20033=*
+exit_cfg_node(#20033,#20001)
+hasLocation(#20033,#20019)
+successor(#20026,#20028)
+successor(#20030,#20027)
+successor(#20028,#20030)
+successor(#20027,#20033)
+successor(#20022,#20024)
+successor(#20025,#20023)
+successor(#20024,#20025)
+successor(#20023,#20026)
+successor(#20031,#20022)
 numlines(#10000,2,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2016/output/trap/usestrict.js.trap b/javascript/extractor/tests/es2016/output/trap/usestrict.js.trap
index 0ec333d2cf7..b9a9688ec82 100644
--- a/javascript/extractor/tests/es2016/output/trap/usestrict.js.trap
+++ b/javascript/extractor/tests/es2016/output/trap/usestrict.js.trap
@@ -79,91 +79,95 @@ toplevels(#20001,0)
 hasLocation(#20001,#20003)
 #20028=@"var;{f};{#20000}"
 variables(#20028,"f",#20000)
-#20029=*
-stmts(#20029,17,#20001,0,"functio ... ict'; }")
-hasLocation(#20029,#20003)
-stmt_containers(#20029,#20001)
+#20029=@"var;{this};{#20000}"
+variables(#20029,"this",#20000)
 #20030=*
-exprs(#20030,78,#20029,-1,"f")
-hasLocation(#20030,#20007)
-expr_containers(#20030,#20029)
-literals("f","f",#20030)
-decl(#20030,#20028)
+stmts(#20030,17,#20001,0,"functio ... ict'; }")
+hasLocation(#20030,#20003)
+stmt_containers(#20030,#20001)
 #20031=*
-scopes(#20031,1)
-scopenodes(#20029,#20031)
-scopenesting(#20031,#20000)
-#20032=@"var;{a};{#20031}"
-variables(#20032,"a",#20031)
-#20033=*
-exprs(#20033,78,#20029,0,"a")
-hasLocation(#20033,#20011)
-expr_containers(#20033,#20029)
-literals("a","a",#20033)
-decl(#20033,#20032)
-#20034=@"var;{arguments};{#20031}"
-variables(#20034,"arguments",#20031)
-is_arguments_object(#20034)
+exprs(#20031,78,#20030,-1,"f")
+hasLocation(#20031,#20007)
+expr_containers(#20031,#20030)
+literals("f","f",#20031)
+decl(#20031,#20028)
+#20032=*
+scopes(#20032,1)
+scopenodes(#20030,#20032)
+scopenesting(#20032,#20000)
+#20033=@"var;{this};{#20032}"
+variables(#20033,"this",#20032)
+#20034=@"var;{a};{#20032}"
+variables(#20034,"a",#20032)
 #20035=*
-exprs(#20035,3,#20029,-5,"2")
-hasLocation(#20035,#20015)
-expr_containers(#20035,#20029)
-literals("2","2",#20035)
-#20036=*
-stmts(#20036,1,#20029,-2,"{ 'use strict'; }")
-#20037=@"loc,{#10000},1,17,1,33"
-locations_default(#20037,#10000,1,17,1,33)
-hasLocation(#20036,#20037)
-stmt_containers(#20036,#20029)
+exprs(#20035,78,#20030,0,"a")
+hasLocation(#20035,#20011)
+expr_containers(#20035,#20030)
+literals("a","a",#20035)
+decl(#20035,#20034)
+#20036=@"var;{arguments};{#20032}"
+variables(#20036,"arguments",#20032)
+is_arguments_object(#20036)
+#20037=*
+exprs(#20037,3,#20030,-5,"2")
+hasLocation(#20037,#20015)
+expr_containers(#20037,#20030)
+literals("2","2",#20037)
 #20038=*
-stmts(#20038,2,#20036,0,"'use strict';")
-#20039=@"loc,{#10000},1,19,1,31"
-locations_default(#20039,#10000,1,19,1,31)
+stmts(#20038,1,#20030,-2,"{ 'use strict'; }")
+#20039=@"loc,{#10000},1,17,1,33"
+locations_default(#20039,#10000,1,17,1,33)
 hasLocation(#20038,#20039)
-stmt_containers(#20038,#20029)
+stmt_containers(#20038,#20030)
 #20040=*
-exprs(#20040,4,#20038,0,"'use strict'")
-hasLocation(#20040,#20021)
-enclosing_stmt(#20040,#20038)
-expr_containers(#20040,#20029)
-literals("use strict","'use strict'",#20040)
-#20041=*
-regexpterm(#20041,14,#20040,0,"use strict")
-#20042=@"loc,{#10000},1,20,1,29"
-locations_default(#20042,#10000,1,20,1,29)
-hasLocation(#20041,#20042)
-regexp_const_value(#20041,"use strict")
+stmts(#20040,2,#20038,0,"'use strict';")
+#20041=@"loc,{#10000},1,19,1,31"
+locations_default(#20041,#10000,1,19,1,31)
+hasLocation(#20040,#20041)
+stmt_containers(#20040,#20030)
+#20042=*
+exprs(#20042,4,#20040,0,"'use strict'")
+hasLocation(#20042,#20021)
+enclosing_stmt(#20042,#20040)
+expr_containers(#20042,#20030)
+literals("use strict","'use strict'",#20042)
 #20043=*
-entry_cfg_node(#20043,#20001)
-#20044=@"loc,{#10000},1,1,1,0"
-locations_default(#20044,#10000,1,1,1,0)
+regexpterm(#20043,14,#20042,0,"use strict")
+#20044=@"loc,{#10000},1,20,1,29"
+locations_default(#20044,#10000,1,20,1,29)
 hasLocation(#20043,#20044)
+regexp_const_value(#20043,"use strict")
 #20045=*
-exit_cfg_node(#20045,#20001)
-hasLocation(#20045,#20027)
-successor(#20029,#20045)
-#20046=*
-entry_cfg_node(#20046,#20029)
-hasLocation(#20046,#20044)
+entry_cfg_node(#20045,#20001)
+#20046=@"loc,{#10000},1,1,1,0"
+locations_default(#20046,#10000,1,1,1,0)
+hasLocation(#20045,#20046)
 #20047=*
-exit_cfg_node(#20047,#20029)
+exit_cfg_node(#20047,#20001)
 hasLocation(#20047,#20027)
-successor(#20038,#20040)
-successor(#20040,#20047)
-successor(#20036,#20038)
-successor(#20033,#20036)
-successor(#20035,#20033)
-successor(#20046,#20035)
-successor(#20030,#20029)
-successor(#20043,#20030)
+successor(#20030,#20047)
 #20048=*
-js_parse_errors(#20048,#20001,"Error: Illegal 'use strict' directive in function with non-simple parameter list","function f(a=2) { 'use strict'; }")
-#20049=@"loc,{#10000},1,19,1,19"
-locations_default(#20049,#10000,1,19,1,19)
-hasLocation(#20048,#20049)
+entry_cfg_node(#20048,#20030)
+hasLocation(#20048,#20046)
+#20049=*
+exit_cfg_node(#20049,#20030)
+hasLocation(#20049,#20027)
+successor(#20040,#20042)
+successor(#20042,#20049)
+successor(#20038,#20040)
+successor(#20035,#20038)
+successor(#20037,#20035)
+successor(#20048,#20037)
+successor(#20031,#20030)
+successor(#20045,#20031)
 #20050=*
-lines(#20050,#20001,"function f(a=2) { 'use strict'; }","")
-hasLocation(#20050,#20003)
+js_parse_errors(#20050,#20001,"Error: Illegal 'use strict' directive in function with non-simple parameter list","function f(a=2) { 'use strict'; }")
+#20051=@"loc,{#10000},1,19,1,19"
+locations_default(#20051,#10000,1,19,1,19)
+hasLocation(#20050,#20051)
+#20052=*
+lines(#20052,#20001,"function f(a=2) { 'use strict'; }","")
+hasLocation(#20052,#20003)
 numlines(#20001,1,0,0)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2017/output/trap/async-await.js.trap b/javascript/extractor/tests/es2017/output/trap/async-await.js.trap
index 28713055c6e..20db1f609d7 100644
--- a/javascript/extractor/tests/es2017/output/trap/async-await.js.trap
+++ b/javascript/extractor/tests/es2017/output/trap/async-await.js.trap
@@ -199,155 +199,159 @@ is_module(#20001)
 is_es2015_module(#20001)
 #20070=@"var;{foo};{#20069}"
 variables(#20070,"foo",#20069)
-#20071=*
-stmts(#20071,30,#20001,0,"export  ... ;\n  }\n}")
-#20072=@"loc,{#10000},1,1,7,1"
-locations_default(#20072,#10000,1,1,7,1)
-hasLocation(#20071,#20072)
-stmt_containers(#20071,#20001)
-#20073=*
-stmts(#20073,17,#20071,-1,"async f ... ;\n  }\n}")
-#20074=@"loc,{#10000},1,8,7,1"
-locations_default(#20074,#10000,1,8,7,1)
-hasLocation(#20073,#20074)
-stmt_containers(#20073,#20001)
-#20075=*
-exprs(#20075,78,#20073,-1,"foo")
-hasLocation(#20075,#20023)
-expr_containers(#20075,#20073)
-literals("foo","foo",#20075)
-decl(#20075,#20070)
+#20071=@"var;{this};{#20069}"
+variables(#20071,"this",#20069)
+#20072=*
+stmts(#20072,30,#20001,0,"export  ... ;\n  }\n}")
+#20073=@"loc,{#10000},1,1,7,1"
+locations_default(#20073,#10000,1,1,7,1)
+hasLocation(#20072,#20073)
+stmt_containers(#20072,#20001)
+#20074=*
+stmts(#20074,17,#20072,-1,"async f ... ;\n  }\n}")
+#20075=@"loc,{#10000},1,8,7,1"
+locations_default(#20075,#10000,1,8,7,1)
+hasLocation(#20074,#20075)
+stmt_containers(#20074,#20001)
 #20076=*
-scopes(#20076,1)
-scopenodes(#20073,#20076)
-scopenesting(#20076,#20069)
-#20077=@"var;{x};{#20076}"
-variables(#20077,"x",#20076)
-#20078=*
-exprs(#20078,78,#20073,0,"x")
-hasLocation(#20078,#20027)
-expr_containers(#20078,#20073)
-literals("x","x",#20078)
-decl(#20078,#20077)
-#20079=@"var;{arguments};{#20076}"
-variables(#20079,"arguments",#20076)
-is_arguments_object(#20079)
-is_async(#20073)
+exprs(#20076,78,#20074,-1,"foo")
+hasLocation(#20076,#20023)
+expr_containers(#20076,#20074)
+literals("foo","foo",#20076)
+decl(#20076,#20070)
+#20077=*
+scopes(#20077,1)
+scopenodes(#20074,#20077)
+scopenesting(#20077,#20069)
+#20078=@"var;{this};{#20077}"
+variables(#20078,"this",#20077)
+#20079=@"var;{x};{#20077}"
+variables(#20079,"x",#20077)
 #20080=*
-stmts(#20080,1,#20073,-2,"{\n  try ... ;\n  }\n}")
-#20081=@"loc,{#10000},1,30,7,1"
-locations_default(#20081,#10000,1,30,7,1)
-hasLocation(#20080,#20081)
-stmt_containers(#20080,#20073)
+exprs(#20080,78,#20074,0,"x")
+hasLocation(#20080,#20027)
+expr_containers(#20080,#20074)
+literals("x","x",#20080)
+decl(#20080,#20079)
+#20081=@"var;{arguments};{#20077}"
+variables(#20081,"arguments",#20077)
+is_arguments_object(#20081)
+is_async(#20074)
 #20082=*
-stmts(#20082,11,#20080,0,"try {\n  ... ll;\n  }")
-#20083=@"loc,{#10000},2,3,6,3"
-locations_default(#20083,#10000,2,3,6,3)
+stmts(#20082,1,#20074,-2,"{\n  try ... ;\n  }\n}")
+#20083=@"loc,{#10000},1,30,7,1"
+locations_default(#20083,#10000,1,30,7,1)
 hasLocation(#20082,#20083)
-stmt_containers(#20082,#20073)
+stmt_containers(#20082,#20074)
 #20084=*
-stmts(#20084,1,#20082,0,"{\n    await x;\n  }")
-#20085=@"loc,{#10000},2,7,4,3"
-locations_default(#20085,#10000,2,7,4,3)
+stmts(#20084,11,#20082,0,"try {\n  ... ll;\n  }")
+#20085=@"loc,{#10000},2,3,6,3"
+locations_default(#20085,#10000,2,3,6,3)
 hasLocation(#20084,#20085)
-stmt_containers(#20084,#20073)
+stmt_containers(#20084,#20074)
 #20086=*
-stmts(#20086,2,#20084,0,"await x;")
-#20087=@"loc,{#10000},3,5,3,12"
-locations_default(#20087,#10000,3,5,3,12)
+stmts(#20086,1,#20084,0,"{\n    await x;\n  }")
+#20087=@"loc,{#10000},2,7,4,3"
+locations_default(#20087,#10000,2,7,4,3)
 hasLocation(#20086,#20087)
-stmt_containers(#20086,#20073)
+stmt_containers(#20086,#20074)
 #20088=*
-exprs(#20088,92,#20086,0,"await x")
-#20089=@"loc,{#10000},3,5,3,11"
-locations_default(#20089,#10000,3,5,3,11)
+stmts(#20088,2,#20086,0,"await x;")
+#20089=@"loc,{#10000},3,5,3,12"
+locations_default(#20089,#10000,3,5,3,12)
 hasLocation(#20088,#20089)
-enclosing_stmt(#20088,#20086)
-expr_containers(#20088,#20073)
+stmt_containers(#20088,#20074)
 #20090=*
-exprs(#20090,79,#20088,0,"x")
-hasLocation(#20090,#20039)
-enclosing_stmt(#20090,#20086)
-expr_containers(#20090,#20073)
-literals("x","x",#20090)
-bind(#20090,#20077)
-#20091=*
-stmts(#20091,20,#20082,1,"catch ( ... ll;\n  }")
-#20092=@"loc,{#10000},4,5,6,3"
-locations_default(#20092,#10000,4,5,6,3)
-hasLocation(#20091,#20092)
-stmt_containers(#20091,#20073)
+exprs(#20090,92,#20088,0,"await x")
+#20091=@"loc,{#10000},3,5,3,11"
+locations_default(#20091,#10000,3,5,3,11)
+hasLocation(#20090,#20091)
+enclosing_stmt(#20090,#20088)
+expr_containers(#20090,#20074)
+#20092=*
+exprs(#20092,79,#20090,0,"x")
+hasLocation(#20092,#20039)
+enclosing_stmt(#20092,#20088)
+expr_containers(#20092,#20074)
+literals("x","x",#20092)
+bind(#20092,#20079)
 #20093=*
-scopes(#20093,2)
-scopenodes(#20091,#20093)
-scopenesting(#20093,#20076)
-#20094=@"var;{e};{#20093}"
-variables(#20094,"e",#20093)
+stmts(#20093,20,#20084,1,"catch ( ... ll;\n  }")
+#20094=@"loc,{#10000},4,5,6,3"
+locations_default(#20094,#10000,4,5,6,3)
+hasLocation(#20093,#20094)
+stmt_containers(#20093,#20074)
 #20095=*
-exprs(#20095,78,#20091,0,"e")
-hasLocation(#20095,#20049)
-enclosing_stmt(#20095,#20091)
-expr_containers(#20095,#20073)
-literals("e","e",#20095)
-decl(#20095,#20094)
-#20096=*
-stmts(#20096,1,#20091,1,"{\n    r ... ll;\n  }")
-#20097=@"loc,{#10000},4,15,6,3"
-locations_default(#20097,#10000,4,15,6,3)
-hasLocation(#20096,#20097)
-stmt_containers(#20096,#20073)
+scopes(#20095,2)
+scopenodes(#20093,#20095)
+scopenesting(#20095,#20077)
+#20096=@"var;{e};{#20095}"
+variables(#20096,"e",#20095)
+#20097=*
+exprs(#20097,78,#20093,0,"e")
+hasLocation(#20097,#20049)
+enclosing_stmt(#20097,#20093)
+expr_containers(#20097,#20074)
+literals("e","e",#20097)
+decl(#20097,#20096)
 #20098=*
-stmts(#20098,9,#20096,0,"return null;")
-#20099=@"loc,{#10000},5,5,5,16"
-locations_default(#20099,#10000,5,5,5,16)
+stmts(#20098,1,#20093,1,"{\n    r ... ll;\n  }")
+#20099=@"loc,{#10000},4,15,6,3"
+locations_default(#20099,#10000,4,15,6,3)
 hasLocation(#20098,#20099)
-stmt_containers(#20098,#20073)
+stmt_containers(#20098,#20074)
 #20100=*
-exprs(#20100,1,#20098,0,"null")
-hasLocation(#20100,#20057)
-enclosing_stmt(#20100,#20098)
-expr_containers(#20100,#20073)
-literals("null","null",#20100)
-#20101=*
-stmts(#20101,0,#20001,1,";")
-hasLocation(#20101,#20065)
-stmt_containers(#20101,#20001)
+stmts(#20100,9,#20098,0,"return null;")
+#20101=@"loc,{#10000},5,5,5,16"
+locations_default(#20101,#10000,5,5,5,16)
+hasLocation(#20100,#20101)
+stmt_containers(#20100,#20074)
 #20102=*
-entry_cfg_node(#20102,#20001)
-#20103=@"loc,{#10000},1,1,1,0"
-locations_default(#20103,#10000,1,1,1,0)
-hasLocation(#20102,#20103)
+exprs(#20102,1,#20100,0,"null")
+hasLocation(#20102,#20057)
+enclosing_stmt(#20102,#20100)
+expr_containers(#20102,#20074)
+literals("null","null",#20102)
+#20103=*
+stmts(#20103,0,#20001,1,";")
+hasLocation(#20103,#20065)
+stmt_containers(#20103,#20001)
 #20104=*
-exit_cfg_node(#20104,#20001)
-hasLocation(#20104,#20067)
-successor(#20101,#20104)
-successor(#20071,#20073)
-successor(#20073,#20101)
-#20105=*
-entry_cfg_node(#20105,#20073)
-#20106=@"loc,{#10000},1,8,1,7"
-locations_default(#20106,#10000,1,8,1,7)
-hasLocation(#20105,#20106)
+entry_cfg_node(#20104,#20001)
+#20105=@"loc,{#10000},1,1,1,0"
+locations_default(#20105,#10000,1,1,1,0)
+hasLocation(#20104,#20105)
+#20106=*
+exit_cfg_node(#20106,#20001)
+hasLocation(#20106,#20067)
+successor(#20103,#20106)
+successor(#20072,#20074)
+successor(#20074,#20103)
 #20107=*
-exit_cfg_node(#20107,#20073)
-#20108=@"loc,{#10000},7,2,7,1"
-locations_default(#20108,#10000,7,2,7,1)
+entry_cfg_node(#20107,#20074)
+#20108=@"loc,{#10000},1,8,1,7"
+locations_default(#20108,#10000,1,8,1,7)
 hasLocation(#20107,#20108)
-successor(#20082,#20084)
-successor(#20086,#20090)
-successor(#20090,#20088)
-successor(#20088,#20091)
-successor(#20088,#20107)
+#20109=*
+exit_cfg_node(#20109,#20074)
+#20110=@"loc,{#10000},7,2,7,1"
+locations_default(#20110,#10000,7,2,7,1)
+hasLocation(#20109,#20110)
 successor(#20084,#20086)
-successor(#20091,#20095)
-successor(#20100,#20098)
-successor(#20098,#20107)
-successor(#20096,#20100)
-successor(#20095,#20096)
+successor(#20088,#20092)
+successor(#20092,#20090)
+successor(#20090,#20093)
+successor(#20090,#20109)
+successor(#20086,#20088)
+successor(#20093,#20097)
+successor(#20102,#20100)
+successor(#20100,#20109)
+successor(#20098,#20102)
+successor(#20097,#20098)
+successor(#20082,#20084)
 successor(#20080,#20082)
-successor(#20078,#20080)
-successor(#20105,#20078)
-successor(#20075,#20071)
-successor(#20102,#20075)
+successor(#20107,#20080)
+successor(#20076,#20072)
+successor(#20104,#20076)
 numlines(#10000,7,7,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2017/output/trap/export-async-1.js.trap b/javascript/extractor/tests/es2017/output/trap/export-async-1.js.trap
index 62404dcc656..9466c9dbd00 100644
--- a/javascript/extractor/tests/es2017/output/trap/export-async-1.js.trap
+++ b/javascript/extractor/tests/es2017/output/trap/export-async-1.js.trap
@@ -83,66 +83,70 @@ is_module(#20001)
 is_es2015_module(#20001)
 #20028=@"var;{f};{#20027}"
 variables(#20028,"f",#20027)
-#20029=*
-stmts(#20029,29,#20001,0,"export  ...  f() {}")
-#20030=@"loc,{#10000},1,1,1,36"
-locations_default(#20030,#10000,1,1,1,36)
-hasLocation(#20029,#20030)
-stmt_containers(#20029,#20001)
-#20031=*
-stmts(#20031,17,#20029,0,"async f ...  f() {}")
-#20032=@"loc,{#10000},1,16,1,36"
-locations_default(#20032,#10000,1,16,1,36)
-hasLocation(#20031,#20032)
-stmt_containers(#20031,#20001)
-#20033=*
-exprs(#20033,78,#20031,-1,"f")
-hasLocation(#20033,#20013)
-expr_containers(#20033,#20031)
-literals("f","f",#20033)
-decl(#20033,#20028)
+#20029=@"var;{this};{#20027}"
+variables(#20029,"this",#20027)
+#20030=*
+stmts(#20030,29,#20001,0,"export  ...  f() {}")
+#20031=@"loc,{#10000},1,1,1,36"
+locations_default(#20031,#10000,1,1,1,36)
+hasLocation(#20030,#20031)
+stmt_containers(#20030,#20001)
+#20032=*
+stmts(#20032,17,#20030,0,"async f ...  f() {}")
+#20033=@"loc,{#10000},1,16,1,36"
+locations_default(#20033,#10000,1,16,1,36)
+hasLocation(#20032,#20033)
+stmt_containers(#20032,#20001)
 #20034=*
-scopes(#20034,1)
-scopenodes(#20031,#20034)
-scopenesting(#20034,#20027)
-#20035=@"var;{arguments};{#20034}"
-variables(#20035,"arguments",#20034)
-is_arguments_object(#20035)
-is_async(#20031)
-#20036=*
-stmts(#20036,1,#20031,-2,"{}")
-#20037=@"loc,{#10000},1,35,1,36"
-locations_default(#20037,#10000,1,35,1,36)
-hasLocation(#20036,#20037)
-stmt_containers(#20036,#20031)
+exprs(#20034,78,#20032,-1,"f")
+hasLocation(#20034,#20013)
+expr_containers(#20034,#20032)
+literals("f","f",#20034)
+decl(#20034,#20028)
+#20035=*
+scopes(#20035,1)
+scopenodes(#20032,#20035)
+scopenesting(#20035,#20027)
+#20036=@"var;{this};{#20035}"
+variables(#20036,"this",#20035)
+#20037=@"var;{arguments};{#20035}"
+variables(#20037,"arguments",#20035)
+is_arguments_object(#20037)
+is_async(#20032)
 #20038=*
-stmts(#20038,0,#20001,1,";")
-hasLocation(#20038,#20023)
-stmt_containers(#20038,#20001)
-#20039=*
-entry_cfg_node(#20039,#20001)
-#20040=@"loc,{#10000},1,1,1,0"
-locations_default(#20040,#10000,1,1,1,0)
-hasLocation(#20039,#20040)
+stmts(#20038,1,#20032,-2,"{}")
+#20039=@"loc,{#10000},1,35,1,36"
+locations_default(#20039,#10000,1,35,1,36)
+hasLocation(#20038,#20039)
+stmt_containers(#20038,#20032)
+#20040=*
+stmts(#20040,0,#20001,1,";")
+hasLocation(#20040,#20023)
+stmt_containers(#20040,#20001)
 #20041=*
-exit_cfg_node(#20041,#20001)
-hasLocation(#20041,#20025)
-successor(#20038,#20041)
-successor(#20029,#20031)
-successor(#20031,#20038)
-#20042=*
-entry_cfg_node(#20042,#20031)
-#20043=@"loc,{#10000},1,16,1,15"
-locations_default(#20043,#10000,1,16,1,15)
-hasLocation(#20042,#20043)
+entry_cfg_node(#20041,#20001)
+#20042=@"loc,{#10000},1,1,1,0"
+locations_default(#20042,#10000,1,1,1,0)
+hasLocation(#20041,#20042)
+#20043=*
+exit_cfg_node(#20043,#20001)
+hasLocation(#20043,#20025)
+successor(#20040,#20043)
+successor(#20030,#20032)
+successor(#20032,#20040)
 #20044=*
-exit_cfg_node(#20044,#20031)
-#20045=@"loc,{#10000},1,37,1,36"
-locations_default(#20045,#10000,1,37,1,36)
+entry_cfg_node(#20044,#20032)
+#20045=@"loc,{#10000},1,16,1,15"
+locations_default(#20045,#10000,1,16,1,15)
 hasLocation(#20044,#20045)
-successor(#20036,#20044)
-successor(#20042,#20036)
-successor(#20033,#20029)
-successor(#20039,#20033)
+#20046=*
+exit_cfg_node(#20046,#20032)
+#20047=@"loc,{#10000},1,37,1,36"
+locations_default(#20047,#10000,1,37,1,36)
+hasLocation(#20046,#20047)
+successor(#20038,#20046)
+successor(#20044,#20038)
+successor(#20034,#20030)
+successor(#20041,#20034)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2017/output/trap/export-async-2.js.trap b/javascript/extractor/tests/es2017/output/trap/export-async-2.js.trap
index 1fb2e0a1419..894e93fd966 100644
--- a/javascript/extractor/tests/es2017/output/trap/export-async-2.js.trap
+++ b/javascript/extractor/tests/es2017/output/trap/export-async-2.js.trap
@@ -76,60 +76,64 @@ scopenodes(#20001,#20025)
 scopenesting(#20025,#20000)
 is_module(#20001)
 is_es2015_module(#20001)
-#20026=*
-stmts(#20026,29,#20001,0,"export  ... n () {}")
-#20027=@"loc,{#10000},1,1,1,35"
-locations_default(#20027,#10000,1,1,1,35)
-hasLocation(#20026,#20027)
-stmt_containers(#20026,#20001)
-#20028=*
-exprs(#20028,9,#20026,0,"async function () {}")
-#20029=@"loc,{#10000},1,16,1,35"
-locations_default(#20029,#10000,1,16,1,35)
-hasLocation(#20028,#20029)
-enclosing_stmt(#20028,#20026)
-expr_containers(#20028,#20001)
-#20030=*
-scopes(#20030,1)
-scopenodes(#20028,#20030)
-scopenesting(#20030,#20025)
-#20031=@"var;{arguments};{#20030}"
-variables(#20031,"arguments",#20030)
-is_arguments_object(#20031)
-is_async(#20028)
-#20032=*
-stmts(#20032,1,#20028,-2,"{}")
-#20033=@"loc,{#10000},1,34,1,35"
-locations_default(#20033,#10000,1,34,1,35)
-hasLocation(#20032,#20033)
-stmt_containers(#20032,#20028)
+#20026=@"var;{this};{#20025}"
+variables(#20026,"this",#20025)
+#20027=*
+stmts(#20027,29,#20001,0,"export  ... n () {}")
+#20028=@"loc,{#10000},1,1,1,35"
+locations_default(#20028,#10000,1,1,1,35)
+hasLocation(#20027,#20028)
+stmt_containers(#20027,#20001)
+#20029=*
+exprs(#20029,9,#20027,0,"async function () {}")
+#20030=@"loc,{#10000},1,16,1,35"
+locations_default(#20030,#10000,1,16,1,35)
+hasLocation(#20029,#20030)
+enclosing_stmt(#20029,#20027)
+expr_containers(#20029,#20001)
+#20031=*
+scopes(#20031,1)
+scopenodes(#20029,#20031)
+scopenesting(#20031,#20025)
+#20032=@"var;{this};{#20031}"
+variables(#20032,"this",#20031)
+#20033=@"var;{arguments};{#20031}"
+variables(#20033,"arguments",#20031)
+is_arguments_object(#20033)
+is_async(#20029)
 #20034=*
-stmts(#20034,0,#20001,1,";")
-hasLocation(#20034,#20021)
-stmt_containers(#20034,#20001)
-#20035=*
-entry_cfg_node(#20035,#20001)
-#20036=@"loc,{#10000},1,1,1,0"
-locations_default(#20036,#10000,1,1,1,0)
-hasLocation(#20035,#20036)
+stmts(#20034,1,#20029,-2,"{}")
+#20035=@"loc,{#10000},1,34,1,35"
+locations_default(#20035,#10000,1,34,1,35)
+hasLocation(#20034,#20035)
+stmt_containers(#20034,#20029)
+#20036=*
+stmts(#20036,0,#20001,1,";")
+hasLocation(#20036,#20021)
+stmt_containers(#20036,#20001)
 #20037=*
-exit_cfg_node(#20037,#20001)
-hasLocation(#20037,#20023)
-successor(#20034,#20037)
-successor(#20026,#20028)
-successor(#20028,#20034)
-#20038=*
-entry_cfg_node(#20038,#20028)
-#20039=@"loc,{#10000},1,16,1,15"
-locations_default(#20039,#10000,1,16,1,15)
-hasLocation(#20038,#20039)
+entry_cfg_node(#20037,#20001)
+#20038=@"loc,{#10000},1,1,1,0"
+locations_default(#20038,#10000,1,1,1,0)
+hasLocation(#20037,#20038)
+#20039=*
+exit_cfg_node(#20039,#20001)
+hasLocation(#20039,#20023)
+successor(#20036,#20039)
+successor(#20027,#20029)
+successor(#20029,#20036)
 #20040=*
-exit_cfg_node(#20040,#20028)
-#20041=@"loc,{#10000},1,36,1,35"
-locations_default(#20041,#10000,1,36,1,35)
+entry_cfg_node(#20040,#20029)
+#20041=@"loc,{#10000},1,16,1,15"
+locations_default(#20041,#10000,1,16,1,15)
 hasLocation(#20040,#20041)
-successor(#20032,#20040)
-successor(#20038,#20032)
-successor(#20035,#20026)
+#20042=*
+exit_cfg_node(#20042,#20029)
+#20043=@"loc,{#10000},1,36,1,35"
+locations_default(#20043,#10000,1,36,1,35)
+hasLocation(#20042,#20043)
+successor(#20034,#20042)
+successor(#20040,#20034)
+successor(#20037,#20027)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2017/output/trap/invalid-async-fn.js.trap b/javascript/extractor/tests/es2017/output/trap/invalid-async-fn.js.trap
index 9572541ae8d..1b2769d43be 100644
--- a/javascript/extractor/tests/es2017/output/trap/invalid-async-fn.js.trap
+++ b/javascript/extractor/tests/es2017/output/trap/invalid-async-fn.js.trap
@@ -72,73 +72,75 @@ locations_default(#20025,#10000,1,21,1,20)
 hasLocation(#20024,#20025)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20026=*
-stmts(#20026,2,#20001,0,"f = async ((x)) => x")
-hasLocation(#20026,#20003)
-stmt_containers(#20026,#20001)
+#20026=@"var;{this};{#20000}"
+variables(#20026,"this",#20000)
 #20027=*
-exprs(#20027,47,#20026,0,"f = async ((x)) => x")
+stmts(#20027,2,#20001,0,"f = async ((x)) => x")
 hasLocation(#20027,#20003)
-enclosing_stmt(#20027,#20026)
-expr_containers(#20027,#20001)
+stmt_containers(#20027,#20001)
 #20028=*
-exprs(#20028,79,#20027,0,"f")
-hasLocation(#20028,#20005)
-enclosing_stmt(#20028,#20026)
+exprs(#20028,47,#20027,0,"f = async ((x)) => x")
+hasLocation(#20028,#20003)
+enclosing_stmt(#20028,#20027)
 expr_containers(#20028,#20001)
-literals("f","f",#20028)
-#20029=@"var;{f};{#20000}"
-variables(#20029,"f",#20000)
-bind(#20028,#20029)
-#20030=*
-exprs(#20030,65,#20027,1,"async ((x)) => x")
-#20031=@"loc,{#10000},1,5,1,20"
-locations_default(#20031,#10000,1,5,1,20)
-hasLocation(#20030,#20031)
-enclosing_stmt(#20030,#20026)
-expr_containers(#20030,#20001)
-#20032=*
-scopes(#20032,1)
-scopenodes(#20030,#20032)
-scopenesting(#20032,#20000)
-#20033=@"var;{x};{#20032}"
-variables(#20033,"x",#20032)
-#20034=*
-exprs(#20034,78,#20030,0,"x")
-hasLocation(#20034,#20015)
-expr_containers(#20034,#20030)
-literals("x","x",#20034)
-decl(#20034,#20033)
-is_async(#20030)
+#20029=*
+exprs(#20029,79,#20028,0,"f")
+hasLocation(#20029,#20005)
+enclosing_stmt(#20029,#20027)
+expr_containers(#20029,#20001)
+literals("f","f",#20029)
+#20030=@"var;{f};{#20000}"
+variables(#20030,"f",#20000)
+bind(#20029,#20030)
+#20031=*
+exprs(#20031,65,#20028,1,"async ((x)) => x")
+#20032=@"loc,{#10000},1,5,1,20"
+locations_default(#20032,#10000,1,5,1,20)
+hasLocation(#20031,#20032)
+enclosing_stmt(#20031,#20027)
+expr_containers(#20031,#20001)
+#20033=*
+scopes(#20033,1)
+scopenodes(#20031,#20033)
+scopenesting(#20033,#20000)
+#20034=@"var;{x};{#20033}"
+variables(#20034,"x",#20033)
 #20035=*
-exprs(#20035,79,#20030,-2,"x")
-hasLocation(#20035,#20023)
-expr_containers(#20035,#20030)
+exprs(#20035,78,#20031,0,"x")
+hasLocation(#20035,#20015)
+expr_containers(#20035,#20031)
 literals("x","x",#20035)
-bind(#20035,#20033)
+decl(#20035,#20034)
+is_async(#20031)
 #20036=*
-entry_cfg_node(#20036,#20001)
-#20037=@"loc,{#10000},1,1,1,0"
-locations_default(#20037,#10000,1,1,1,0)
-hasLocation(#20036,#20037)
-#20038=*
-exit_cfg_node(#20038,#20001)
-hasLocation(#20038,#20025)
-successor(#20026,#20028)
-successor(#20030,#20027)
+exprs(#20036,79,#20031,-2,"x")
+hasLocation(#20036,#20023)
+expr_containers(#20036,#20031)
+literals("x","x",#20036)
+bind(#20036,#20034)
+#20037=*
+entry_cfg_node(#20037,#20001)
+#20038=@"loc,{#10000},1,1,1,0"
+locations_default(#20038,#10000,1,1,1,0)
+hasLocation(#20037,#20038)
 #20039=*
-entry_cfg_node(#20039,#20030)
-#20040=@"loc,{#10000},1,5,1,4"
-locations_default(#20040,#10000,1,5,1,4)
-hasLocation(#20039,#20040)
-#20041=*
-exit_cfg_node(#20041,#20030)
-hasLocation(#20041,#20025)
-successor(#20035,#20041)
-successor(#20034,#20035)
-successor(#20039,#20034)
-successor(#20028,#20030)
-successor(#20027,#20038)
-successor(#20036,#20026)
+exit_cfg_node(#20039,#20001)
+hasLocation(#20039,#20025)
+successor(#20027,#20029)
+successor(#20031,#20028)
+#20040=*
+entry_cfg_node(#20040,#20031)
+#20041=@"loc,{#10000},1,5,1,4"
+locations_default(#20041,#10000,1,5,1,4)
+hasLocation(#20040,#20041)
+#20042=*
+exit_cfg_node(#20042,#20031)
+hasLocation(#20042,#20025)
+successor(#20036,#20042)
+successor(#20035,#20036)
+successor(#20040,#20035)
+successor(#20029,#20031)
+successor(#20028,#20039)
+successor(#20037,#20027)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2017/output/trap/shorthand-prop-async.js.trap b/javascript/extractor/tests/es2017/output/trap/shorthand-prop-async.js.trap
index 1c62daca205..3ff5c604429 100644
--- a/javascript/extractor/tests/es2017/output/trap/shorthand-prop-async.js.trap
+++ b/javascript/extractor/tests/es2017/output/trap/shorthand-prop-async.js.trap
@@ -55,56 +55,58 @@ toplevels(#20001,0)
 #20018=@"loc,{#10000},1,1,2,0"
 locations_default(#20018,#10000,1,1,2,0)
 hasLocation(#20001,#20018)
-#20019=*
-stmts(#20019,2,#20001,0,"({ async });")
-hasLocation(#20019,#20003)
-stmt_containers(#20019,#20001)
+#20019=@"var;{this};{#20000}"
+variables(#20019,"this",#20000)
 #20020=*
-exprs(#20020,63,#20019,0,"({ async })")
-#20021=@"loc,{#10000},1,1,1,11"
-locations_default(#20021,#10000,1,1,1,11)
-hasLocation(#20020,#20021)
-enclosing_stmt(#20020,#20019)
-expr_containers(#20020,#20001)
-#20022=*
-exprs(#20022,8,#20020,0,"{ async }")
-#20023=@"loc,{#10000},1,2,1,10"
-locations_default(#20023,#10000,1,2,1,10)
-hasLocation(#20022,#20023)
-enclosing_stmt(#20022,#20019)
-expr_containers(#20022,#20001)
-#20024=*
-properties(#20024,#20022,0,0,"async")
-hasLocation(#20024,#20009)
+stmts(#20020,2,#20001,0,"({ async });")
+hasLocation(#20020,#20003)
+stmt_containers(#20020,#20001)
+#20021=*
+exprs(#20021,63,#20020,0,"({ async })")
+#20022=@"loc,{#10000},1,1,1,11"
+locations_default(#20022,#10000,1,1,1,11)
+hasLocation(#20021,#20022)
+enclosing_stmt(#20021,#20020)
+expr_containers(#20021,#20001)
+#20023=*
+exprs(#20023,8,#20021,0,"{ async }")
+#20024=@"loc,{#10000},1,2,1,10"
+locations_default(#20024,#10000,1,2,1,10)
+hasLocation(#20023,#20024)
+enclosing_stmt(#20023,#20020)
+expr_containers(#20023,#20001)
 #20025=*
-exprs(#20025,0,#20024,0,"async")
+properties(#20025,#20023,0,0,"async")
 hasLocation(#20025,#20009)
-enclosing_stmt(#20025,#20019)
-expr_containers(#20025,#20001)
-literals("async","async",#20025)
 #20026=*
-exprs(#20026,79,#20024,1,"async")
+exprs(#20026,0,#20025,0,"async")
 hasLocation(#20026,#20009)
-enclosing_stmt(#20026,#20019)
+enclosing_stmt(#20026,#20020)
 expr_containers(#20026,#20001)
 literals("async","async",#20026)
-#20027=@"var;{async};{#20000}"
-variables(#20027,"async",#20000)
-bind(#20026,#20027)
-#20028=*
-entry_cfg_node(#20028,#20001)
-#20029=@"loc,{#10000},1,1,1,0"
-locations_default(#20029,#10000,1,1,1,0)
-hasLocation(#20028,#20029)
-#20030=*
-exit_cfg_node(#20030,#20001)
-hasLocation(#20030,#20017)
-successor(#20019,#20020)
-successor(#20020,#20022)
-successor(#20022,#20025)
-successor(#20026,#20024)
-successor(#20025,#20026)
-successor(#20024,#20030)
-successor(#20028,#20019)
+#20027=*
+exprs(#20027,79,#20025,1,"async")
+hasLocation(#20027,#20009)
+enclosing_stmt(#20027,#20020)
+expr_containers(#20027,#20001)
+literals("async","async",#20027)
+#20028=@"var;{async};{#20000}"
+variables(#20028,"async",#20000)
+bind(#20027,#20028)
+#20029=*
+entry_cfg_node(#20029,#20001)
+#20030=@"loc,{#10000},1,1,1,0"
+locations_default(#20030,#10000,1,1,1,0)
+hasLocation(#20029,#20030)
+#20031=*
+exit_cfg_node(#20031,#20001)
+hasLocation(#20031,#20017)
+successor(#20020,#20021)
+successor(#20021,#20023)
+successor(#20023,#20026)
+successor(#20027,#20025)
+successor(#20026,#20027)
+successor(#20025,#20031)
+successor(#20029,#20020)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2018/output/trap/asyncIter.js.trap b/javascript/extractor/tests/es2018/output/trap/asyncIter.js.trap
index dcb18552587..e0fb3ecdfbb 100644
--- a/javascript/extractor/tests/es2018/output/trap/asyncIter.js.trap
+++ b/javascript/extractor/tests/es2018/output/trap/asyncIter.js.trap
@@ -363,373 +363,389 @@ variables(#20134,"o",#20000)
 variables(#20135,"C",#20000)
 #20136=@"local_type_name;{C};{#20000}"
 local_type_names(#20136,"C",#20000)
-#20137=*
-stmts(#20137,17,#20001,0,"async f ... Fn() {}")
-hasLocation(#20137,#20003)
-stmt_containers(#20137,#20001)
+#20137=@"var;{this};{#20000}"
+variables(#20137,"this",#20000)
 #20138=*
-exprs(#20138,78,#20137,-1,"asyncFn")
-hasLocation(#20138,#20031)
-expr_containers(#20138,#20137)
-literals("asyncFn","asyncFn",#20138)
-decl(#20138,#20133)
+stmts(#20138,17,#20001,0,"async f ... Fn() {}")
+hasLocation(#20138,#20003)
+stmt_containers(#20138,#20001)
 #20139=*
-scopes(#20139,1)
-scopenodes(#20137,#20139)
-scopenesting(#20139,#20000)
-#20140=@"var;{arguments};{#20139}"
-variables(#20140,"arguments",#20139)
-is_arguments_object(#20140)
-is_generator(#20137)
-is_async(#20137)
-#20141=*
-stmts(#20141,1,#20137,-2,"{}")
-#20142=@"loc,{#10000},1,27,1,28"
-locations_default(#20142,#10000,1,27,1,28)
-hasLocation(#20141,#20142)
-stmt_containers(#20141,#20137)
+exprs(#20139,78,#20138,-1,"asyncFn")
+hasLocation(#20139,#20031)
+expr_containers(#20139,#20138)
+literals("asyncFn","asyncFn",#20139)
+decl(#20139,#20133)
+#20140=*
+scopes(#20140,1)
+scopenodes(#20138,#20140)
+scopenesting(#20140,#20000)
+#20141=@"var;{this};{#20140}"
+variables(#20141,"this",#20140)
+#20142=@"var;{arguments};{#20140}"
+variables(#20142,"arguments",#20140)
+is_arguments_object(#20142)
+is_generator(#20138)
+is_async(#20138)
 #20143=*
-stmts(#20143,26,#20001,1,"class C ... () {}\n}")
-#20144=@"loc,{#10000},3,1,6,1"
-locations_default(#20144,#10000,3,1,6,1)
+stmts(#20143,1,#20138,-2,"{}")
+#20144=@"loc,{#10000},1,27,1,28"
+locations_default(#20144,#10000,1,27,1,28)
 hasLocation(#20143,#20144)
-stmt_containers(#20143,#20001)
+stmt_containers(#20143,#20138)
 #20145=*
-exprs(#20145,78,#20143,0,"C")
-hasLocation(#20145,#20043)
-enclosing_stmt(#20145,#20143)
-expr_containers(#20145,#20001)
-literals("C","C",#20145)
-decl(#20145,#20135)
-typedecl(#20145,#20136)
-#20146=*
-scopes(#20146,10)
-scopenodes(#20143,#20146)
-scopenesting(#20146,#20000)
+stmts(#20145,26,#20001,1,"class C ... () {}\n}")
+#20146=@"loc,{#10000},3,1,6,1"
+locations_default(#20146,#10000,3,1,6,1)
+hasLocation(#20145,#20146)
+stmt_containers(#20145,#20001)
 #20147=*
-properties(#20147,#20143,2,0,"async * ... th() {}")
-#20148=@"loc,{#10000},4,3,4,23"
-locations_default(#20148,#10000,4,3,4,23)
-hasLocation(#20147,#20148)
-#20149=*
-exprs(#20149,0,#20147,0,"asyncMeth")
-hasLocation(#20149,#20051)
-enclosing_stmt(#20149,#20143)
-expr_containers(#20149,#20001)
-literals("asyncMeth","asyncMeth",#20149)
+exprs(#20147,78,#20145,0,"C")
+hasLocation(#20147,#20043)
+enclosing_stmt(#20147,#20145)
+expr_containers(#20147,#20001)
+literals("C","C",#20147)
+decl(#20147,#20135)
+typedecl(#20147,#20136)
+#20148=*
+scopes(#20148,10)
+scopenodes(#20145,#20148)
+scopenesting(#20148,#20000)
+#20149=@"var;{this};{#20148}"
+variables(#20149,"this",#20148)
 #20150=*
-exprs(#20150,9,#20147,1,"() {}")
-#20151=@"loc,{#10000},4,19,4,23"
-locations_default(#20151,#10000,4,19,4,23)
+properties(#20150,#20145,2,0,"async * ... th() {}")
+#20151=@"loc,{#10000},4,3,4,23"
+locations_default(#20151,#10000,4,3,4,23)
 hasLocation(#20150,#20151)
-enclosing_stmt(#20150,#20143)
-expr_containers(#20150,#20001)
 #20152=*
-scopes(#20152,1)
-scopenodes(#20150,#20152)
-scopenesting(#20152,#20146)
-#20153=@"var;{arguments};{#20152}"
-variables(#20153,"arguments",#20152)
-is_arguments_object(#20153)
-is_generator(#20150)
-is_async(#20150)
-#20154=*
-stmts(#20154,1,#20150,-2,"{}")
-#20155=@"loc,{#10000},4,22,4,23"
-locations_default(#20155,#10000,4,22,4,23)
-hasLocation(#20154,#20155)
-stmt_containers(#20154,#20150)
-is_method(#20147)
-#20156=*
-properties(#20156,#20143,3,0,"async * ... r]() {}")
-#20157=@"loc,{#10000},5,3,5,36"
-locations_default(#20157,#10000,5,3,5,36)
-hasLocation(#20156,#20157)
+exprs(#20152,0,#20150,0,"asyncMeth")
+hasLocation(#20152,#20051)
+enclosing_stmt(#20152,#20145)
+expr_containers(#20152,#20001)
+literals("asyncMeth","asyncMeth",#20152)
+#20153=*
+exprs(#20153,9,#20150,1,"() {}")
+#20154=@"loc,{#10000},4,19,4,23"
+locations_default(#20154,#10000,4,19,4,23)
+hasLocation(#20153,#20154)
+enclosing_stmt(#20153,#20145)
+expr_containers(#20153,#20001)
+#20155=*
+scopes(#20155,1)
+scopenodes(#20153,#20155)
+scopenesting(#20155,#20148)
+#20156=@"var;{this};{#20155}"
+variables(#20156,"this",#20155)
+#20157=@"var;{arguments};{#20155}"
+variables(#20157,"arguments",#20155)
+is_arguments_object(#20157)
+is_generator(#20153)
+is_async(#20153)
 #20158=*
-exprs(#20158,14,#20156,0,"Symbol.asyncIterator")
-#20159=@"loc,{#10000},5,11,5,30"
-locations_default(#20159,#10000,5,11,5,30)
+stmts(#20158,1,#20153,-2,"{}")
+#20159=@"loc,{#10000},4,22,4,23"
+locations_default(#20159,#10000,4,22,4,23)
 hasLocation(#20158,#20159)
-enclosing_stmt(#20158,#20143)
-expr_containers(#20158,#20001)
+stmt_containers(#20158,#20153)
+is_method(#20150)
 #20160=*
-exprs(#20160,79,#20158,0,"Symbol")
-hasLocation(#20160,#20067)
-enclosing_stmt(#20160,#20143)
-expr_containers(#20160,#20001)
-literals("Symbol","Symbol",#20160)
-#20161=@"var;{Symbol};{#20000}"
-variables(#20161,"Symbol",#20000)
-bind(#20160,#20161)
+properties(#20160,#20145,3,0,"async * ... r]() {}")
+#20161=@"loc,{#10000},5,3,5,36"
+locations_default(#20161,#10000,5,3,5,36)
+hasLocation(#20160,#20161)
 #20162=*
-exprs(#20162,0,#20158,1,"asyncIterator")
-hasLocation(#20162,#20071)
-enclosing_stmt(#20162,#20143)
+exprs(#20162,14,#20160,0,"Symbol.asyncIterator")
+#20163=@"loc,{#10000},5,11,5,30"
+locations_default(#20163,#10000,5,11,5,30)
+hasLocation(#20162,#20163)
+enclosing_stmt(#20162,#20145)
 expr_containers(#20162,#20001)
-literals("asyncIterator","asyncIterator",#20162)
-#20163=*
-exprs(#20163,9,#20156,1,"() {}")
-#20164=@"loc,{#10000},5,32,5,36"
-locations_default(#20164,#10000,5,32,5,36)
-hasLocation(#20163,#20164)
-enclosing_stmt(#20163,#20143)
-expr_containers(#20163,#20001)
-#20165=*
-scopes(#20165,1)
-scopenodes(#20163,#20165)
-scopenesting(#20165,#20146)
-#20166=@"var;{arguments};{#20165}"
-variables(#20166,"arguments",#20165)
-is_arguments_object(#20166)
-is_generator(#20163)
-is_async(#20163)
+#20164=*
+exprs(#20164,79,#20162,0,"Symbol")
+hasLocation(#20164,#20067)
+enclosing_stmt(#20164,#20145)
+expr_containers(#20164,#20001)
+literals("Symbol","Symbol",#20164)
+#20165=@"var;{Symbol};{#20000}"
+variables(#20165,"Symbol",#20000)
+bind(#20164,#20165)
+#20166=*
+exprs(#20166,0,#20162,1,"asyncIterator")
+hasLocation(#20166,#20071)
+enclosing_stmt(#20166,#20145)
+expr_containers(#20166,#20001)
+literals("asyncIterator","asyncIterator",#20166)
 #20167=*
-stmts(#20167,1,#20163,-2,"{}")
-#20168=@"loc,{#10000},5,35,5,36"
-locations_default(#20168,#10000,5,35,5,36)
+exprs(#20167,9,#20160,1,"() {}")
+#20168=@"loc,{#10000},5,32,5,36"
+locations_default(#20168,#10000,5,32,5,36)
 hasLocation(#20167,#20168)
-stmt_containers(#20167,#20163)
-is_method(#20156)
-is_computed(#20156)
+enclosing_stmt(#20167,#20145)
+expr_containers(#20167,#20001)
 #20169=*
-properties(#20169,#20143,4,0,"constructor() {}")
-#20170=@"loc,{#10000},3,9,3,8"
-locations_default(#20170,#10000,3,9,3,8)
-hasLocation(#20169,#20170)
-#20171=*
-exprs(#20171,0,#20169,0,"constructor")
-hasLocation(#20171,#20170)
-enclosing_stmt(#20171,#20143)
-expr_containers(#20171,#20001)
-literals("constructor","constructor",#20171)
+scopes(#20169,1)
+scopenodes(#20167,#20169)
+scopenesting(#20169,#20148)
+#20170=@"var;{this};{#20169}"
+variables(#20170,"this",#20169)
+#20171=@"var;{arguments};{#20169}"
+variables(#20171,"arguments",#20169)
+is_arguments_object(#20171)
+is_generator(#20167)
+is_async(#20167)
 #20172=*
-exprs(#20172,9,#20169,1,"() {}")
-hasLocation(#20172,#20170)
-enclosing_stmt(#20172,#20143)
-expr_containers(#20172,#20001)
-#20173=*
-scopes(#20173,1)
-scopenodes(#20172,#20173)
-scopenesting(#20173,#20146)
-#20174=@"var;{arguments};{#20173}"
-variables(#20174,"arguments",#20173)
-is_arguments_object(#20174)
-#20175=*
-stmts(#20175,1,#20172,-2,"{}")
-hasLocation(#20175,#20170)
-stmt_containers(#20175,#20172)
-is_method(#20169)
+stmts(#20172,1,#20167,-2,"{}")
+#20173=@"loc,{#10000},5,35,5,36"
+locations_default(#20173,#10000,5,35,5,36)
+hasLocation(#20172,#20173)
+stmt_containers(#20172,#20167)
+is_method(#20160)
+is_computed(#20160)
+#20174=*
+properties(#20174,#20145,4,0,"constructor() {}")
+#20175=@"loc,{#10000},3,9,3,8"
+locations_default(#20175,#10000,3,9,3,8)
+hasLocation(#20174,#20175)
 #20176=*
-stmts(#20176,18,#20001,2,"var o = ... () {}\n}")
-#20177=@"loc,{#10000},8,1,11,1"
-locations_default(#20177,#10000,8,1,11,1)
-hasLocation(#20176,#20177)
-stmt_containers(#20176,#20001)
+exprs(#20176,0,#20174,0,"constructor")
+hasLocation(#20176,#20175)
+enclosing_stmt(#20176,#20145)
+expr_containers(#20176,#20001)
+literals("constructor","constructor",#20176)
+#20177=*
+exprs(#20177,9,#20174,1,"() {}")
+hasLocation(#20177,#20175)
+enclosing_stmt(#20177,#20145)
+expr_containers(#20177,#20001)
 #20178=*
-exprs(#20178,64,#20176,0,"o = {\n  ... () {}\n}")
-#20179=@"loc,{#10000},8,5,11,1"
-locations_default(#20179,#10000,8,5,11,1)
-hasLocation(#20178,#20179)
-enclosing_stmt(#20178,#20176)
-expr_containers(#20178,#20001)
-#20180=*
-exprs(#20180,78,#20178,0,"o")
-hasLocation(#20180,#20086)
-enclosing_stmt(#20180,#20176)
-expr_containers(#20180,#20001)
-literals("o","o",#20180)
-decl(#20180,#20134)
+scopes(#20178,1)
+scopenodes(#20177,#20178)
+scopenesting(#20178,#20148)
+#20179=@"var;{this};{#20178}"
+variables(#20179,"this",#20178)
+#20180=@"var;{arguments};{#20178}"
+variables(#20180,"arguments",#20178)
+is_arguments_object(#20180)
 #20181=*
-exprs(#20181,8,#20178,1,"{\n  asy ... () {}\n}")
-#20182=@"loc,{#10000},8,9,11,1"
-locations_default(#20182,#10000,8,9,11,1)
-hasLocation(#20181,#20182)
-enclosing_stmt(#20181,#20176)
-expr_containers(#20181,#20001)
-#20183=*
-properties(#20183,#20181,0,0,"async * ... th() {}")
-#20184=@"loc,{#10000},9,3,9,23"
-locations_default(#20184,#10000,9,3,9,23)
-hasLocation(#20183,#20184)
-#20185=*
-exprs(#20185,0,#20183,0,"asyncMeth")
-hasLocation(#20185,#20096)
-enclosing_stmt(#20185,#20176)
-expr_containers(#20185,#20001)
-literals("asyncMeth","asyncMeth",#20185)
+stmts(#20181,1,#20177,-2,"{}")
+hasLocation(#20181,#20175)
+stmt_containers(#20181,#20177)
+is_method(#20174)
+#20182=*
+stmts(#20182,18,#20001,2,"var o = ... () {}\n}")
+#20183=@"loc,{#10000},8,1,11,1"
+locations_default(#20183,#10000,8,1,11,1)
+hasLocation(#20182,#20183)
+stmt_containers(#20182,#20001)
+#20184=*
+exprs(#20184,64,#20182,0,"o = {\n  ... () {}\n}")
+#20185=@"loc,{#10000},8,5,11,1"
+locations_default(#20185,#10000,8,5,11,1)
+hasLocation(#20184,#20185)
+enclosing_stmt(#20184,#20182)
+expr_containers(#20184,#20001)
 #20186=*
-exprs(#20186,9,#20183,1,"() {}")
-#20187=@"loc,{#10000},9,19,9,23"
-locations_default(#20187,#10000,9,19,9,23)
-hasLocation(#20186,#20187)
-enclosing_stmt(#20186,#20176)
+exprs(#20186,78,#20184,0,"o")
+hasLocation(#20186,#20086)
+enclosing_stmt(#20186,#20182)
 expr_containers(#20186,#20001)
-#20188=*
-scopes(#20188,1)
-scopenodes(#20186,#20188)
-scopenesting(#20188,#20000)
-#20189=@"var;{arguments};{#20188}"
-variables(#20189,"arguments",#20188)
-is_arguments_object(#20189)
-is_generator(#20186)
-is_async(#20186)
-#20190=*
-stmts(#20190,1,#20186,-2,"{}")
-#20191=@"loc,{#10000},9,22,9,23"
-locations_default(#20191,#10000,9,22,9,23)
-hasLocation(#20190,#20191)
-stmt_containers(#20190,#20186)
-is_method(#20183)
+literals("o","o",#20186)
+decl(#20186,#20134)
+#20187=*
+exprs(#20187,8,#20184,1,"{\n  asy ... () {}\n}")
+#20188=@"loc,{#10000},8,9,11,1"
+locations_default(#20188,#10000,8,9,11,1)
+hasLocation(#20187,#20188)
+enclosing_stmt(#20187,#20182)
+expr_containers(#20187,#20001)
+#20189=*
+properties(#20189,#20187,0,0,"async * ... th() {}")
+#20190=@"loc,{#10000},9,3,9,23"
+locations_default(#20190,#10000,9,3,9,23)
+hasLocation(#20189,#20190)
+#20191=*
+exprs(#20191,0,#20189,0,"asyncMeth")
+hasLocation(#20191,#20096)
+enclosing_stmt(#20191,#20182)
+expr_containers(#20191,#20001)
+literals("asyncMeth","asyncMeth",#20191)
 #20192=*
-properties(#20192,#20181,1,0,"async * ... r]() {}")
-#20193=@"loc,{#10000},10,3,10,36"
-locations_default(#20193,#10000,10,3,10,36)
+exprs(#20192,9,#20189,1,"() {}")
+#20193=@"loc,{#10000},9,19,9,23"
+locations_default(#20193,#10000,9,19,9,23)
 hasLocation(#20192,#20193)
+enclosing_stmt(#20192,#20182)
+expr_containers(#20192,#20001)
 #20194=*
-exprs(#20194,14,#20192,0,"Symbol.asyncIterator")
-#20195=@"loc,{#10000},10,11,10,30"
-locations_default(#20195,#10000,10,11,10,30)
-hasLocation(#20194,#20195)
-enclosing_stmt(#20194,#20176)
-expr_containers(#20194,#20001)
-#20196=*
-exprs(#20196,79,#20194,0,"Symbol")
-hasLocation(#20196,#20114)
-enclosing_stmt(#20196,#20176)
-expr_containers(#20196,#20001)
-literals("Symbol","Symbol",#20196)
-bind(#20196,#20161)
+scopes(#20194,1)
+scopenodes(#20192,#20194)
+scopenesting(#20194,#20000)
+#20195=@"var;{this};{#20194}"
+variables(#20195,"this",#20194)
+#20196=@"var;{arguments};{#20194}"
+variables(#20196,"arguments",#20194)
+is_arguments_object(#20196)
+is_generator(#20192)
+is_async(#20192)
 #20197=*
-exprs(#20197,0,#20194,1,"asyncIterator")
-hasLocation(#20197,#20118)
-enclosing_stmt(#20197,#20176)
-expr_containers(#20197,#20001)
-literals("asyncIterator","asyncIterator",#20197)
-#20198=*
-exprs(#20198,9,#20192,1,"() {}")
-#20199=@"loc,{#10000},10,32,10,36"
-locations_default(#20199,#10000,10,32,10,36)
-hasLocation(#20198,#20199)
-enclosing_stmt(#20198,#20176)
-expr_containers(#20198,#20001)
-#20200=*
-scopes(#20200,1)
-scopenodes(#20198,#20200)
-scopenesting(#20200,#20000)
-#20201=@"var;{arguments};{#20200}"
-variables(#20201,"arguments",#20200)
-is_arguments_object(#20201)
-is_generator(#20198)
-is_async(#20198)
-#20202=*
-stmts(#20202,1,#20198,-2,"{}")
-#20203=@"loc,{#10000},10,35,10,36"
-locations_default(#20203,#10000,10,35,10,36)
-hasLocation(#20202,#20203)
-stmt_containers(#20202,#20198)
-is_computed(#20192)
-is_method(#20192)
+stmts(#20197,1,#20192,-2,"{}")
+#20198=@"loc,{#10000},9,22,9,23"
+locations_default(#20198,#10000,9,22,9,23)
+hasLocation(#20197,#20198)
+stmt_containers(#20197,#20192)
+is_method(#20189)
+#20199=*
+properties(#20199,#20187,1,0,"async * ... r]() {}")
+#20200=@"loc,{#10000},10,3,10,36"
+locations_default(#20200,#10000,10,3,10,36)
+hasLocation(#20199,#20200)
+#20201=*
+exprs(#20201,14,#20199,0,"Symbol.asyncIterator")
+#20202=@"loc,{#10000},10,11,10,30"
+locations_default(#20202,#10000,10,11,10,30)
+hasLocation(#20201,#20202)
+enclosing_stmt(#20201,#20182)
+expr_containers(#20201,#20001)
+#20203=*
+exprs(#20203,79,#20201,0,"Symbol")
+hasLocation(#20203,#20114)
+enclosing_stmt(#20203,#20182)
+expr_containers(#20203,#20001)
+literals("Symbol","Symbol",#20203)
+bind(#20203,#20165)
 #20204=*
-entry_cfg_node(#20204,#20001)
-#20205=@"loc,{#10000},1,1,1,0"
-locations_default(#20205,#10000,1,1,1,0)
-hasLocation(#20204,#20205)
-#20206=*
-exit_cfg_node(#20206,#20001)
-hasLocation(#20206,#20131)
-successor(#20176,#20180)
-successor(#20181,#20185)
-successor(#20198,#20192)
+exprs(#20204,0,#20201,1,"asyncIterator")
+hasLocation(#20204,#20118)
+enclosing_stmt(#20204,#20182)
+expr_containers(#20204,#20001)
+literals("asyncIterator","asyncIterator",#20204)
+#20205=*
+exprs(#20205,9,#20199,1,"() {}")
+#20206=@"loc,{#10000},10,32,10,36"
+locations_default(#20206,#10000,10,32,10,36)
+hasLocation(#20205,#20206)
+enclosing_stmt(#20205,#20182)
+expr_containers(#20205,#20001)
 #20207=*
-entry_cfg_node(#20207,#20198)
-#20208=@"loc,{#10000},10,32,10,31"
-locations_default(#20208,#10000,10,32,10,31)
-hasLocation(#20207,#20208)
-#20209=*
-exit_cfg_node(#20209,#20198)
-#20210=@"loc,{#10000},10,37,10,36"
-locations_default(#20210,#10000,10,37,10,36)
-hasLocation(#20209,#20210)
-successor(#20202,#20209)
-successor(#20207,#20202)
-successor(#20197,#20194)
-successor(#20196,#20197)
-successor(#20194,#20198)
-successor(#20192,#20178)
-successor(#20186,#20183)
-#20211=*
-entry_cfg_node(#20211,#20186)
-#20212=@"loc,{#10000},9,19,9,18"
-locations_default(#20212,#10000,9,19,9,18)
-hasLocation(#20211,#20212)
-#20213=*
-exit_cfg_node(#20213,#20186)
-#20214=@"loc,{#10000},9,24,9,23"
-locations_default(#20214,#10000,9,24,9,23)
-hasLocation(#20213,#20214)
-successor(#20190,#20213)
-successor(#20211,#20190)
-successor(#20185,#20186)
-successor(#20183,#20196)
-successor(#20180,#20181)
-successor(#20178,#20206)
-successor(#20172,#20169)
+scopes(#20207,1)
+scopenodes(#20205,#20207)
+scopenesting(#20207,#20000)
+#20208=@"var;{this};{#20207}"
+variables(#20208,"this",#20207)
+#20209=@"var;{arguments};{#20207}"
+variables(#20209,"arguments",#20207)
+is_arguments_object(#20209)
+is_generator(#20205)
+is_async(#20205)
+#20210=*
+stmts(#20210,1,#20205,-2,"{}")
+#20211=@"loc,{#10000},10,35,10,36"
+locations_default(#20211,#10000,10,35,10,36)
+hasLocation(#20210,#20211)
+stmt_containers(#20210,#20205)
+is_computed(#20199)
+is_method(#20199)
+#20212=*
+entry_cfg_node(#20212,#20001)
+#20213=@"loc,{#10000},1,1,1,0"
+locations_default(#20213,#10000,1,1,1,0)
+hasLocation(#20212,#20213)
+#20214=*
+exit_cfg_node(#20214,#20001)
+hasLocation(#20214,#20131)
+successor(#20182,#20186)
+successor(#20187,#20191)
+successor(#20205,#20199)
 #20215=*
-entry_cfg_node(#20215,#20172)
-hasLocation(#20215,#20170)
-#20216=*
-exit_cfg_node(#20216,#20172)
-hasLocation(#20216,#20170)
-successor(#20175,#20216)
-successor(#20215,#20175)
-successor(#20171,#20172)
-successor(#20169,#20143)
-successor(#20163,#20156)
+entry_cfg_node(#20215,#20205)
+#20216=@"loc,{#10000},10,32,10,31"
+locations_default(#20216,#10000,10,32,10,31)
+hasLocation(#20215,#20216)
 #20217=*
-entry_cfg_node(#20217,#20163)
-#20218=@"loc,{#10000},5,32,5,31"
-locations_default(#20218,#10000,5,32,5,31)
+exit_cfg_node(#20217,#20205)
+#20218=@"loc,{#10000},10,37,10,36"
+locations_default(#20218,#10000,10,37,10,36)
 hasLocation(#20217,#20218)
+successor(#20210,#20217)
+successor(#20215,#20210)
+successor(#20204,#20201)
+successor(#20203,#20204)
+successor(#20201,#20205)
+successor(#20199,#20184)
+successor(#20192,#20189)
 #20219=*
-exit_cfg_node(#20219,#20163)
-#20220=@"loc,{#10000},5,37,5,36"
-locations_default(#20220,#10000,5,37,5,36)
+entry_cfg_node(#20219,#20192)
+#20220=@"loc,{#10000},9,19,9,18"
+locations_default(#20220,#10000,9,19,9,18)
 hasLocation(#20219,#20220)
-successor(#20167,#20219)
-successor(#20217,#20167)
-successor(#20162,#20158)
-successor(#20160,#20162)
-successor(#20158,#20163)
-successor(#20156,#20171)
-successor(#20150,#20147)
 #20221=*
-entry_cfg_node(#20221,#20150)
-#20222=@"loc,{#10000},4,19,4,18"
-locations_default(#20222,#10000,4,19,4,18)
+exit_cfg_node(#20221,#20192)
+#20222=@"loc,{#10000},9,24,9,23"
+locations_default(#20222,#10000,9,24,9,23)
 hasLocation(#20221,#20222)
+successor(#20197,#20221)
+successor(#20219,#20197)
+successor(#20191,#20192)
+successor(#20189,#20203)
+successor(#20186,#20187)
+successor(#20184,#20214)
+successor(#20177,#20174)
 #20223=*
-exit_cfg_node(#20223,#20150)
-#20224=@"loc,{#10000},4,24,4,23"
-locations_default(#20224,#10000,4,24,4,23)
-hasLocation(#20223,#20224)
-successor(#20154,#20223)
-successor(#20221,#20154)
-successor(#20149,#20150)
-successor(#20147,#20160)
-successor(#20145,#20149)
-successor(#20143,#20176)
-successor(#20137,#20145)
+entry_cfg_node(#20223,#20177)
+hasLocation(#20223,#20175)
+#20224=*
+exit_cfg_node(#20224,#20177)
+hasLocation(#20224,#20175)
+successor(#20181,#20224)
+successor(#20223,#20181)
+successor(#20176,#20177)
+successor(#20174,#20145)
+successor(#20167,#20160)
 #20225=*
-entry_cfg_node(#20225,#20137)
-hasLocation(#20225,#20205)
-#20226=*
-exit_cfg_node(#20226,#20137)
-#20227=@"loc,{#10000},1,29,1,28"
-locations_default(#20227,#10000,1,29,1,28)
-hasLocation(#20226,#20227)
-successor(#20141,#20226)
-successor(#20225,#20141)
-successor(#20138,#20137)
-successor(#20204,#20138)
+entry_cfg_node(#20225,#20167)
+#20226=@"loc,{#10000},5,32,5,31"
+locations_default(#20226,#10000,5,32,5,31)
+hasLocation(#20225,#20226)
+#20227=*
+exit_cfg_node(#20227,#20167)
+#20228=@"loc,{#10000},5,37,5,36"
+locations_default(#20228,#10000,5,37,5,36)
+hasLocation(#20227,#20228)
+successor(#20172,#20227)
+successor(#20225,#20172)
+successor(#20166,#20162)
+successor(#20164,#20166)
+successor(#20162,#20167)
+successor(#20160,#20176)
+successor(#20153,#20150)
+#20229=*
+entry_cfg_node(#20229,#20153)
+#20230=@"loc,{#10000},4,19,4,18"
+locations_default(#20230,#10000,4,19,4,18)
+hasLocation(#20229,#20230)
+#20231=*
+exit_cfg_node(#20231,#20153)
+#20232=@"loc,{#10000},4,24,4,23"
+locations_default(#20232,#10000,4,24,4,23)
+hasLocation(#20231,#20232)
+successor(#20158,#20231)
+successor(#20229,#20158)
+successor(#20152,#20153)
+successor(#20150,#20164)
+successor(#20147,#20152)
+successor(#20145,#20182)
+successor(#20138,#20147)
+#20233=*
+entry_cfg_node(#20233,#20138)
+hasLocation(#20233,#20213)
+#20234=*
+exit_cfg_node(#20234,#20138)
+#20235=@"loc,{#10000},1,29,1,28"
+locations_default(#20235,#10000,1,29,1,28)
+hasLocation(#20234,#20235)
+successor(#20143,#20234)
+successor(#20233,#20143)
+successor(#20139,#20138)
+successor(#20212,#20139)
 numlines(#10000,11,9,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2018/output/trap/templates.js.trap b/javascript/extractor/tests/es2018/output/trap/templates.js.trap
index 5f5ef870acd..bdb5e8d676a 100644
--- a/javascript/extractor/tests/es2018/output/trap/templates.js.trap
+++ b/javascript/extractor/tests/es2018/output/trap/templates.js.trap
@@ -376,429 +376,431 @@ toplevels(#20001,0)
 #20142=@"loc,{#10000},1,1,13,0"
 locations_default(#20142,#10000,1,1,13,0)
 hasLocation(#20001,#20142)
-#20143=*
-stmts(#20143,2,#20001,0,"`foo`\n` ... \u25a0`")
-#20144=@"loc,{#10000},1,1,3,17"
-locations_default(#20144,#10000,1,1,3,17)
-hasLocation(#20143,#20144)
-stmt_containers(#20143,#20001)
-#20145=*
-exprs(#20145,70,#20143,0,"`foo`\n` ... \u25a0`")
-hasLocation(#20145,#20144)
-enclosing_stmt(#20145,#20143)
-expr_containers(#20145,#20001)
+#20143=@"var;{this};{#20000}"
+variables(#20143,"this",#20000)
+#20144=*
+stmts(#20144,2,#20001,0,"`foo`\n` ... \u25a0`")
+#20145=@"loc,{#10000},1,1,3,17"
+locations_default(#20145,#10000,1,1,3,17)
+hasLocation(#20144,#20145)
+stmt_containers(#20144,#20001)
 #20146=*
-exprs(#20146,70,#20145,0,"`foo`\n`foo\u25a0`")
-#20147=@"loc,{#10000},1,1,2,11"
-locations_default(#20147,#10000,1,1,2,11)
-hasLocation(#20146,#20147)
-enclosing_stmt(#20146,#20143)
+exprs(#20146,70,#20144,0,"`foo`\n` ... \u25a0`")
+hasLocation(#20146,#20145)
+enclosing_stmt(#20146,#20144)
 expr_containers(#20146,#20001)
-#20148=*
-exprs(#20148,71,#20146,0,"`foo`")
-hasLocation(#20148,#20003)
-enclosing_stmt(#20148,#20143)
-expr_containers(#20148,#20001)
+#20147=*
+exprs(#20147,70,#20146,0,"`foo`\n`foo\u25a0`")
+#20148=@"loc,{#10000},1,1,2,11"
+locations_default(#20148,#10000,1,1,2,11)
+hasLocation(#20147,#20148)
+enclosing_stmt(#20147,#20144)
+expr_containers(#20147,#20001)
 #20149=*
-exprs(#20149,72,#20148,0,"foo")
-hasLocation(#20149,#20029)
-enclosing_stmt(#20149,#20143)
+exprs(#20149,71,#20147,0,"`foo`")
+hasLocation(#20149,#20003)
+enclosing_stmt(#20149,#20144)
 expr_containers(#20149,#20001)
-literals("foo","foo",#20149)
 #20150=*
-exprs(#20150,71,#20146,1,"`foo\u25a0`")
-hasLocation(#20150,#20005)
-enclosing_stmt(#20150,#20143)
+exprs(#20150,72,#20149,0,"foo")
+hasLocation(#20150,#20029)
+enclosing_stmt(#20150,#20144)
 expr_containers(#20150,#20001)
+literals("foo","foo",#20150)
 #20151=*
-exprs(#20151,72,#20150,0,"foo\u25a0")
-hasLocation(#20151,#20035)
-enclosing_stmt(#20151,#20143)
+exprs(#20151,71,#20147,1,"`foo\u25a0`")
+hasLocation(#20151,#20005)
+enclosing_stmt(#20151,#20144)
 expr_containers(#20151,#20001)
-literals("foo■","foo\u25a0",#20151)
 #20152=*
-exprs(#20152,71,#20145,1,"`foo${bar}\u25a0`")
-hasLocation(#20152,#20007)
-enclosing_stmt(#20152,#20143)
+exprs(#20152,72,#20151,0,"foo\u25a0")
+hasLocation(#20152,#20035)
+enclosing_stmt(#20152,#20144)
 expr_containers(#20152,#20001)
+literals("foo■","foo\u25a0",#20152)
 #20153=*
-exprs(#20153,72,#20152,0,"foo")
-hasLocation(#20153,#20041)
-enclosing_stmt(#20153,#20143)
+exprs(#20153,71,#20146,1,"`foo${bar}\u25a0`")
+hasLocation(#20153,#20007)
+enclosing_stmt(#20153,#20144)
 expr_containers(#20153,#20001)
-literals("foo","foo",#20153)
 #20154=*
-exprs(#20154,79,#20152,1,"bar")
-hasLocation(#20154,#20045)
-enclosing_stmt(#20154,#20143)
+exprs(#20154,72,#20153,0,"foo")
+hasLocation(#20154,#20041)
+enclosing_stmt(#20154,#20144)
 expr_containers(#20154,#20001)
-literals("bar","bar",#20154)
-#20155=@"var;{bar};{#20000}"
-variables(#20155,"bar",#20000)
-bind(#20154,#20155)
-#20156=*
-exprs(#20156,72,#20152,2,"\u25a0")
-hasLocation(#20156,#20049)
-enclosing_stmt(#20156,#20143)
-expr_containers(#20156,#20001)
-literals("■","\u25a0",#20156)
+literals("foo","foo",#20154)
+#20155=*
+exprs(#20155,79,#20153,1,"bar")
+hasLocation(#20155,#20045)
+enclosing_stmt(#20155,#20144)
+expr_containers(#20155,#20001)
+literals("bar","bar",#20155)
+#20156=@"var;{bar};{#20000}"
+variables(#20156,"bar",#20000)
+bind(#20155,#20156)
 #20157=*
-stmts(#20157,2,#20001,1,"foo `\u25a0`")
-hasLocation(#20157,#20009)
-stmt_containers(#20157,#20001)
+exprs(#20157,72,#20153,2,"\u25a0")
+hasLocation(#20157,#20049)
+enclosing_stmt(#20157,#20144)
+expr_containers(#20157,#20001)
+literals("■","\u25a0",#20157)
 #20158=*
-exprs(#20158,70,#20157,0,"foo `\u25a0`")
+stmts(#20158,2,#20001,1,"foo `\u25a0`")
 hasLocation(#20158,#20009)
-enclosing_stmt(#20158,#20157)
-expr_containers(#20158,#20001)
+stmt_containers(#20158,#20001)
 #20159=*
-exprs(#20159,79,#20158,0,"foo")
-hasLocation(#20159,#20053)
-enclosing_stmt(#20159,#20157)
+exprs(#20159,70,#20158,0,"foo `\u25a0`")
+hasLocation(#20159,#20009)
+enclosing_stmt(#20159,#20158)
 expr_containers(#20159,#20001)
-literals("foo","foo",#20159)
-#20160=@"var;{foo};{#20000}"
-variables(#20160,"foo",#20000)
-bind(#20159,#20160)
-#20161=*
-exprs(#20161,71,#20158,1,"`\u25a0`")
-#20162=@"loc,{#10000},4,5,4,12"
-locations_default(#20162,#10000,4,5,4,12)
-hasLocation(#20161,#20162)
-enclosing_stmt(#20161,#20157)
-expr_containers(#20161,#20001)
-#20163=*
-exprs(#20163,72,#20161,0,"\u25a0")
-hasLocation(#20163,#20057)
-enclosing_stmt(#20163,#20157)
-expr_containers(#20163,#20001)
-literals("■","\u25a0",#20163)
+#20160=*
+exprs(#20160,79,#20159,0,"foo")
+hasLocation(#20160,#20053)
+enclosing_stmt(#20160,#20158)
+expr_containers(#20160,#20001)
+literals("foo","foo",#20160)
+#20161=@"var;{foo};{#20000}"
+variables(#20161,"foo",#20000)
+bind(#20160,#20161)
+#20162=*
+exprs(#20162,71,#20159,1,"`\u25a0`")
+#20163=@"loc,{#10000},4,5,4,12"
+locations_default(#20163,#10000,4,5,4,12)
+hasLocation(#20162,#20163)
+enclosing_stmt(#20162,#20158)
+expr_containers(#20162,#20001)
 #20164=*
-stmts(#20164,2,#20001,2,"foo `fo ... \u25a0`")
-hasLocation(#20164,#20011)
-stmt_containers(#20164,#20001)
+exprs(#20164,72,#20162,0,"\u25a0")
+hasLocation(#20164,#20057)
+enclosing_stmt(#20164,#20158)
+expr_containers(#20164,#20001)
+literals("■","\u25a0",#20164)
 #20165=*
-exprs(#20165,70,#20164,0,"foo `fo ... \u25a0`")
+stmts(#20165,2,#20001,2,"foo `fo ... \u25a0`")
 hasLocation(#20165,#20011)
-enclosing_stmt(#20165,#20164)
-expr_containers(#20165,#20001)
+stmt_containers(#20165,#20001)
 #20166=*
-exprs(#20166,79,#20165,0,"foo")
-hasLocation(#20166,#20061)
-enclosing_stmt(#20166,#20164)
+exprs(#20166,70,#20165,0,"foo `fo ... \u25a0`")
+hasLocation(#20166,#20011)
+enclosing_stmt(#20166,#20165)
 expr_containers(#20166,#20001)
-literals("foo","foo",#20166)
-bind(#20166,#20160)
 #20167=*
-exprs(#20167,71,#20165,1,"`foo${bar}\u25a0`")
-#20168=@"loc,{#10000},5,5,5,21"
-locations_default(#20168,#10000,5,5,5,21)
-hasLocation(#20167,#20168)
-enclosing_stmt(#20167,#20164)
+exprs(#20167,79,#20166,0,"foo")
+hasLocation(#20167,#20061)
+enclosing_stmt(#20167,#20165)
 expr_containers(#20167,#20001)
-#20169=*
-exprs(#20169,72,#20167,0,"foo")
-hasLocation(#20169,#20065)
-enclosing_stmt(#20169,#20164)
-expr_containers(#20169,#20001)
-literals("foo","foo",#20169)
+literals("foo","foo",#20167)
+bind(#20167,#20161)
+#20168=*
+exprs(#20168,71,#20166,1,"`foo${bar}\u25a0`")
+#20169=@"loc,{#10000},5,5,5,21"
+locations_default(#20169,#10000,5,5,5,21)
+hasLocation(#20168,#20169)
+enclosing_stmt(#20168,#20165)
+expr_containers(#20168,#20001)
 #20170=*
-exprs(#20170,79,#20167,1,"bar")
-hasLocation(#20170,#20069)
-enclosing_stmt(#20170,#20164)
+exprs(#20170,72,#20168,0,"foo")
+hasLocation(#20170,#20065)
+enclosing_stmt(#20170,#20165)
 expr_containers(#20170,#20001)
-literals("bar","bar",#20170)
-bind(#20170,#20155)
+literals("foo","foo",#20170)
 #20171=*
-exprs(#20171,72,#20167,2,"\u25a0")
-hasLocation(#20171,#20073)
-enclosing_stmt(#20171,#20164)
+exprs(#20171,79,#20168,1,"bar")
+hasLocation(#20171,#20069)
+enclosing_stmt(#20171,#20165)
 expr_containers(#20171,#20001)
-literals("■","\u25a0",#20171)
+literals("bar","bar",#20171)
+bind(#20171,#20156)
 #20172=*
-stmts(#20172,2,#20001,3,"foo `\unicode`")
-hasLocation(#20172,#20013)
-stmt_containers(#20172,#20001)
+exprs(#20172,72,#20168,2,"\u25a0")
+hasLocation(#20172,#20073)
+enclosing_stmt(#20172,#20165)
+expr_containers(#20172,#20001)
+literals("■","\u25a0",#20172)
 #20173=*
-exprs(#20173,70,#20172,0,"foo `\unicode`")
+stmts(#20173,2,#20001,3,"foo `\unicode`")
 hasLocation(#20173,#20013)
-enclosing_stmt(#20173,#20172)
-expr_containers(#20173,#20001)
+stmt_containers(#20173,#20001)
 #20174=*
-exprs(#20174,79,#20173,0,"foo")
-hasLocation(#20174,#20077)
-enclosing_stmt(#20174,#20172)
+exprs(#20174,70,#20173,0,"foo `\unicode`")
+hasLocation(#20174,#20013)
+enclosing_stmt(#20174,#20173)
 expr_containers(#20174,#20001)
-literals("foo","foo",#20174)
-bind(#20174,#20160)
 #20175=*
-exprs(#20175,71,#20173,1,"`\unicode`")
-#20176=@"loc,{#10000},6,5,6,14"
-locations_default(#20176,#10000,6,5,6,14)
-hasLocation(#20175,#20176)
-enclosing_stmt(#20175,#20172)
+exprs(#20175,79,#20174,0,"foo")
+hasLocation(#20175,#20077)
+enclosing_stmt(#20175,#20173)
 expr_containers(#20175,#20001)
-#20177=*
-exprs(#20177,72,#20175,0,"\unicode")
-hasLocation(#20177,#20081)
-enclosing_stmt(#20177,#20172)
-expr_containers(#20177,#20001)
-literals("","\unicode",#20177)
+literals("foo","foo",#20175)
+bind(#20175,#20161)
+#20176=*
+exprs(#20176,71,#20174,1,"`\unicode`")
+#20177=@"loc,{#10000},6,5,6,14"
+locations_default(#20177,#10000,6,5,6,14)
+hasLocation(#20176,#20177)
+enclosing_stmt(#20176,#20173)
+expr_containers(#20176,#20001)
 #20178=*
-stmts(#20178,2,#20001,4,"foo `fo ... nicode`")
-hasLocation(#20178,#20015)
-stmt_containers(#20178,#20001)
+exprs(#20178,72,#20176,0,"\unicode")
+hasLocation(#20178,#20081)
+enclosing_stmt(#20178,#20173)
+expr_containers(#20178,#20001)
+literals("","\unicode",#20178)
 #20179=*
-exprs(#20179,70,#20178,0,"foo `fo ... nicode`")
+stmts(#20179,2,#20001,4,"foo `fo ... nicode`")
 hasLocation(#20179,#20015)
-enclosing_stmt(#20179,#20178)
-expr_containers(#20179,#20001)
+stmt_containers(#20179,#20001)
 #20180=*
-exprs(#20180,79,#20179,0,"foo")
-hasLocation(#20180,#20085)
-enclosing_stmt(#20180,#20178)
+exprs(#20180,70,#20179,0,"foo `fo ... nicode`")
+hasLocation(#20180,#20015)
+enclosing_stmt(#20180,#20179)
 expr_containers(#20180,#20001)
-literals("foo","foo",#20180)
-bind(#20180,#20160)
 #20181=*
-exprs(#20181,71,#20179,1,"`foo${bar}\unicode`")
-#20182=@"loc,{#10000},7,5,7,23"
-locations_default(#20182,#10000,7,5,7,23)
-hasLocation(#20181,#20182)
-enclosing_stmt(#20181,#20178)
+exprs(#20181,79,#20180,0,"foo")
+hasLocation(#20181,#20085)
+enclosing_stmt(#20181,#20179)
 expr_containers(#20181,#20001)
-#20183=*
-exprs(#20183,72,#20181,0,"foo")
-hasLocation(#20183,#20089)
-enclosing_stmt(#20183,#20178)
-expr_containers(#20183,#20001)
-literals("foo","foo",#20183)
+literals("foo","foo",#20181)
+bind(#20181,#20161)
+#20182=*
+exprs(#20182,71,#20180,1,"`foo${bar}\unicode`")
+#20183=@"loc,{#10000},7,5,7,23"
+locations_default(#20183,#10000,7,5,7,23)
+hasLocation(#20182,#20183)
+enclosing_stmt(#20182,#20179)
+expr_containers(#20182,#20001)
 #20184=*
-exprs(#20184,79,#20181,1,"bar")
-hasLocation(#20184,#20093)
-enclosing_stmt(#20184,#20178)
+exprs(#20184,72,#20182,0,"foo")
+hasLocation(#20184,#20089)
+enclosing_stmt(#20184,#20179)
 expr_containers(#20184,#20001)
-literals("bar","bar",#20184)
-bind(#20184,#20155)
+literals("foo","foo",#20184)
 #20185=*
-exprs(#20185,72,#20181,2,"\unicode")
-hasLocation(#20185,#20097)
-enclosing_stmt(#20185,#20178)
+exprs(#20185,79,#20182,1,"bar")
+hasLocation(#20185,#20093)
+enclosing_stmt(#20185,#20179)
 expr_containers(#20185,#20001)
-literals("","\unicode",#20185)
+literals("bar","bar",#20185)
+bind(#20185,#20156)
 #20186=*
-stmts(#20186,2,#20001,5,"foo `\u`")
-hasLocation(#20186,#20017)
-stmt_containers(#20186,#20001)
+exprs(#20186,72,#20182,2,"\unicode")
+hasLocation(#20186,#20097)
+enclosing_stmt(#20186,#20179)
+expr_containers(#20186,#20001)
+literals("","\unicode",#20186)
 #20187=*
-exprs(#20187,70,#20186,0,"foo `\u`")
+stmts(#20187,2,#20001,5,"foo `\u`")
 hasLocation(#20187,#20017)
-enclosing_stmt(#20187,#20186)
-expr_containers(#20187,#20001)
+stmt_containers(#20187,#20001)
 #20188=*
-exprs(#20188,79,#20187,0,"foo")
-hasLocation(#20188,#20101)
-enclosing_stmt(#20188,#20186)
+exprs(#20188,70,#20187,0,"foo `\u`")
+hasLocation(#20188,#20017)
+enclosing_stmt(#20188,#20187)
 expr_containers(#20188,#20001)
-literals("foo","foo",#20188)
-bind(#20188,#20160)
 #20189=*
-exprs(#20189,71,#20187,1,"`\u`")
-#20190=@"loc,{#10000},8,5,8,8"
-locations_default(#20190,#10000,8,5,8,8)
-hasLocation(#20189,#20190)
-enclosing_stmt(#20189,#20186)
+exprs(#20189,79,#20188,0,"foo")
+hasLocation(#20189,#20101)
+enclosing_stmt(#20189,#20187)
 expr_containers(#20189,#20001)
-#20191=*
-exprs(#20191,72,#20189,0,"\u")
-hasLocation(#20191,#20105)
-enclosing_stmt(#20191,#20186)
-expr_containers(#20191,#20001)
-literals("","\u",#20191)
+literals("foo","foo",#20189)
+bind(#20189,#20161)
+#20190=*
+exprs(#20190,71,#20188,1,"`\u`")
+#20191=@"loc,{#10000},8,5,8,8"
+locations_default(#20191,#10000,8,5,8,8)
+hasLocation(#20190,#20191)
+enclosing_stmt(#20190,#20187)
+expr_containers(#20190,#20001)
 #20192=*
-stmts(#20192,2,#20001,6,"foo `\u{`")
-hasLocation(#20192,#20019)
-stmt_containers(#20192,#20001)
+exprs(#20192,72,#20190,0,"\u")
+hasLocation(#20192,#20105)
+enclosing_stmt(#20192,#20187)
+expr_containers(#20192,#20001)
+literals("","\u",#20192)
 #20193=*
-exprs(#20193,70,#20192,0,"foo `\u{`")
+stmts(#20193,2,#20001,6,"foo `\u{`")
 hasLocation(#20193,#20019)
-enclosing_stmt(#20193,#20192)
-expr_containers(#20193,#20001)
+stmt_containers(#20193,#20001)
 #20194=*
-exprs(#20194,79,#20193,0,"foo")
-hasLocation(#20194,#20109)
-enclosing_stmt(#20194,#20192)
+exprs(#20194,70,#20193,0,"foo `\u{`")
+hasLocation(#20194,#20019)
+enclosing_stmt(#20194,#20193)
 expr_containers(#20194,#20001)
-literals("foo","foo",#20194)
-bind(#20194,#20160)
 #20195=*
-exprs(#20195,71,#20193,1,"`\u{`")
-#20196=@"loc,{#10000},9,5,9,9"
-locations_default(#20196,#10000,9,5,9,9)
-hasLocation(#20195,#20196)
-enclosing_stmt(#20195,#20192)
+exprs(#20195,79,#20194,0,"foo")
+hasLocation(#20195,#20109)
+enclosing_stmt(#20195,#20193)
 expr_containers(#20195,#20001)
-#20197=*
-exprs(#20197,72,#20195,0,"\u{")
-hasLocation(#20197,#20113)
-enclosing_stmt(#20197,#20192)
-expr_containers(#20197,#20001)
-literals("","\u{",#20197)
+literals("foo","foo",#20195)
+bind(#20195,#20161)
+#20196=*
+exprs(#20196,71,#20194,1,"`\u{`")
+#20197=@"loc,{#10000},9,5,9,9"
+locations_default(#20197,#10000,9,5,9,9)
+hasLocation(#20196,#20197)
+enclosing_stmt(#20196,#20193)
+expr_containers(#20196,#20001)
 #20198=*
-stmts(#20198,2,#20001,7,"foo `\u{abcdx`")
-hasLocation(#20198,#20021)
-stmt_containers(#20198,#20001)
+exprs(#20198,72,#20196,0,"\u{")
+hasLocation(#20198,#20113)
+enclosing_stmt(#20198,#20193)
+expr_containers(#20198,#20001)
+literals("","\u{",#20198)
 #20199=*
-exprs(#20199,70,#20198,0,"foo `\u{abcdx`")
+stmts(#20199,2,#20001,7,"foo `\u{abcdx`")
 hasLocation(#20199,#20021)
-enclosing_stmt(#20199,#20198)
-expr_containers(#20199,#20001)
+stmt_containers(#20199,#20001)
 #20200=*
-exprs(#20200,79,#20199,0,"foo")
-hasLocation(#20200,#20117)
-enclosing_stmt(#20200,#20198)
+exprs(#20200,70,#20199,0,"foo `\u{abcdx`")
+hasLocation(#20200,#20021)
+enclosing_stmt(#20200,#20199)
 expr_containers(#20200,#20001)
-literals("foo","foo",#20200)
-bind(#20200,#20160)
 #20201=*
-exprs(#20201,71,#20199,1,"`\u{abcdx`")
-#20202=@"loc,{#10000},10,5,10,14"
-locations_default(#20202,#10000,10,5,10,14)
-hasLocation(#20201,#20202)
-enclosing_stmt(#20201,#20198)
+exprs(#20201,79,#20200,0,"foo")
+hasLocation(#20201,#20117)
+enclosing_stmt(#20201,#20199)
 expr_containers(#20201,#20001)
-#20203=*
-exprs(#20203,72,#20201,0,"\u{abcdx")
-hasLocation(#20203,#20121)
-enclosing_stmt(#20203,#20198)
-expr_containers(#20203,#20001)
-literals("","\u{abcdx",#20203)
+literals("foo","foo",#20201)
+bind(#20201,#20161)
+#20202=*
+exprs(#20202,71,#20200,1,"`\u{abcdx`")
+#20203=@"loc,{#10000},10,5,10,14"
+locations_default(#20203,#10000,10,5,10,14)
+hasLocation(#20202,#20203)
+enclosing_stmt(#20202,#20199)
+expr_containers(#20202,#20001)
 #20204=*
-stmts(#20204,2,#20001,8,"foo `\u{abcdx}`")
-hasLocation(#20204,#20023)
-stmt_containers(#20204,#20001)
+exprs(#20204,72,#20202,0,"\u{abcdx")
+hasLocation(#20204,#20121)
+enclosing_stmt(#20204,#20199)
+expr_containers(#20204,#20001)
+literals("","\u{abcdx",#20204)
 #20205=*
-exprs(#20205,70,#20204,0,"foo `\u{abcdx}`")
+stmts(#20205,2,#20001,8,"foo `\u{abcdx}`")
 hasLocation(#20205,#20023)
-enclosing_stmt(#20205,#20204)
-expr_containers(#20205,#20001)
+stmt_containers(#20205,#20001)
 #20206=*
-exprs(#20206,79,#20205,0,"foo")
-hasLocation(#20206,#20125)
-enclosing_stmt(#20206,#20204)
+exprs(#20206,70,#20205,0,"foo `\u{abcdx}`")
+hasLocation(#20206,#20023)
+enclosing_stmt(#20206,#20205)
 expr_containers(#20206,#20001)
-literals("foo","foo",#20206)
-bind(#20206,#20160)
 #20207=*
-exprs(#20207,71,#20205,1,"`\u{abcdx}`")
-#20208=@"loc,{#10000},11,5,11,15"
-locations_default(#20208,#10000,11,5,11,15)
-hasLocation(#20207,#20208)
-enclosing_stmt(#20207,#20204)
+exprs(#20207,79,#20206,0,"foo")
+hasLocation(#20207,#20125)
+enclosing_stmt(#20207,#20205)
 expr_containers(#20207,#20001)
-#20209=*
-exprs(#20209,72,#20207,0,"\u{abcdx}")
-hasLocation(#20209,#20129)
-enclosing_stmt(#20209,#20204)
-expr_containers(#20209,#20001)
-literals("","\u{abcdx}",#20209)
+literals("foo","foo",#20207)
+bind(#20207,#20161)
+#20208=*
+exprs(#20208,71,#20206,1,"`\u{abcdx}`")
+#20209=@"loc,{#10000},11,5,11,15"
+locations_default(#20209,#10000,11,5,11,15)
+hasLocation(#20208,#20209)
+enclosing_stmt(#20208,#20205)
+expr_containers(#20208,#20001)
 #20210=*
-stmts(#20210,2,#20001,9,"foo `\unicode\\`")
-hasLocation(#20210,#20025)
-stmt_containers(#20210,#20001)
+exprs(#20210,72,#20208,0,"\u{abcdx}")
+hasLocation(#20210,#20129)
+enclosing_stmt(#20210,#20205)
+expr_containers(#20210,#20001)
+literals("","\u{abcdx}",#20210)
 #20211=*
-exprs(#20211,70,#20210,0,"foo `\unicode\\`")
+stmts(#20211,2,#20001,9,"foo `\unicode\\`")
 hasLocation(#20211,#20025)
-enclosing_stmt(#20211,#20210)
-expr_containers(#20211,#20001)
+stmt_containers(#20211,#20001)
 #20212=*
-exprs(#20212,79,#20211,0,"foo")
-hasLocation(#20212,#20133)
-enclosing_stmt(#20212,#20210)
+exprs(#20212,70,#20211,0,"foo `\unicode\\`")
+hasLocation(#20212,#20025)
+enclosing_stmt(#20212,#20211)
 expr_containers(#20212,#20001)
-literals("foo","foo",#20212)
-bind(#20212,#20160)
 #20213=*
-exprs(#20213,71,#20211,1,"`\unicode\\`")
-#20214=@"loc,{#10000},12,5,12,16"
-locations_default(#20214,#10000,12,5,12,16)
-hasLocation(#20213,#20214)
-enclosing_stmt(#20213,#20210)
+exprs(#20213,79,#20212,0,"foo")
+hasLocation(#20213,#20133)
+enclosing_stmt(#20213,#20211)
 expr_containers(#20213,#20001)
-#20215=*
-exprs(#20215,72,#20213,0,"\unicode\\")
-hasLocation(#20215,#20137)
-enclosing_stmt(#20215,#20210)
-expr_containers(#20215,#20001)
-literals("","\unicode\\",#20215)
+literals("foo","foo",#20213)
+bind(#20213,#20161)
+#20214=*
+exprs(#20214,71,#20212,1,"`\unicode\\`")
+#20215=@"loc,{#10000},12,5,12,16"
+locations_default(#20215,#10000,12,5,12,16)
+hasLocation(#20214,#20215)
+enclosing_stmt(#20214,#20211)
+expr_containers(#20214,#20001)
 #20216=*
-entry_cfg_node(#20216,#20001)
-#20217=@"loc,{#10000},1,1,1,0"
-locations_default(#20217,#10000,1,1,1,0)
-hasLocation(#20216,#20217)
-#20218=*
-exit_cfg_node(#20218,#20001)
-hasLocation(#20218,#20141)
-successor(#20210,#20211)
+exprs(#20216,72,#20214,0,"\unicode\\")
+hasLocation(#20216,#20137)
+enclosing_stmt(#20216,#20211)
+expr_containers(#20216,#20001)
+literals("","\unicode\\",#20216)
+#20217=*
+entry_cfg_node(#20217,#20001)
+#20218=@"loc,{#10000},1,1,1,0"
+locations_default(#20218,#10000,1,1,1,0)
+hasLocation(#20217,#20218)
+#20219=*
+exit_cfg_node(#20219,#20001)
+hasLocation(#20219,#20141)
 successor(#20211,#20212)
-successor(#20213,#20215)
-successor(#20215,#20218)
 successor(#20212,#20213)
-successor(#20204,#20205)
+successor(#20214,#20216)
+successor(#20216,#20219)
+successor(#20213,#20214)
 successor(#20205,#20206)
-successor(#20207,#20209)
-successor(#20209,#20210)
 successor(#20206,#20207)
-successor(#20198,#20199)
+successor(#20208,#20210)
+successor(#20210,#20211)
+successor(#20207,#20208)
 successor(#20199,#20200)
-successor(#20201,#20203)
-successor(#20203,#20204)
 successor(#20200,#20201)
-successor(#20192,#20193)
+successor(#20202,#20204)
+successor(#20204,#20205)
+successor(#20201,#20202)
 successor(#20193,#20194)
-successor(#20195,#20197)
-successor(#20197,#20198)
 successor(#20194,#20195)
-successor(#20186,#20187)
+successor(#20196,#20198)
+successor(#20198,#20199)
+successor(#20195,#20196)
 successor(#20187,#20188)
-successor(#20189,#20191)
-successor(#20191,#20192)
 successor(#20188,#20189)
-successor(#20178,#20179)
+successor(#20190,#20192)
+successor(#20192,#20193)
+successor(#20189,#20190)
 successor(#20179,#20180)
-successor(#20181,#20183)
+successor(#20180,#20181)
+successor(#20182,#20184)
+successor(#20186,#20187)
 successor(#20185,#20186)
 successor(#20184,#20185)
-successor(#20183,#20184)
-successor(#20180,#20181)
-successor(#20172,#20173)
+successor(#20181,#20182)
 successor(#20173,#20174)
-successor(#20175,#20177)
-successor(#20177,#20178)
 successor(#20174,#20175)
-successor(#20164,#20165)
+successor(#20176,#20178)
+successor(#20178,#20179)
+successor(#20175,#20176)
 successor(#20165,#20166)
-successor(#20167,#20169)
+successor(#20166,#20167)
+successor(#20168,#20170)
+successor(#20172,#20173)
 successor(#20171,#20172)
 successor(#20170,#20171)
-successor(#20169,#20170)
-successor(#20166,#20167)
-successor(#20157,#20158)
+successor(#20167,#20168)
 successor(#20158,#20159)
-successor(#20161,#20163)
-successor(#20163,#20164)
-successor(#20159,#20161)
-successor(#20143,#20145)
-successor(#20145,#20146)
-successor(#20152,#20153)
-successor(#20156,#20157)
-successor(#20154,#20156)
+successor(#20159,#20160)
+successor(#20162,#20164)
+successor(#20164,#20165)
+successor(#20160,#20162)
+successor(#20144,#20146)
+successor(#20146,#20147)
 successor(#20153,#20154)
-successor(#20146,#20148)
-successor(#20150,#20151)
+successor(#20157,#20158)
+successor(#20155,#20157)
+successor(#20154,#20155)
+successor(#20147,#20149)
 successor(#20151,#20152)
-successor(#20148,#20149)
+successor(#20152,#20153)
 successor(#20149,#20150)
-successor(#20216,#20143)
+successor(#20150,#20151)
+successor(#20217,#20144)
 numlines(#10000,12,12,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2019/output/trap/json-superset.js.trap b/javascript/extractor/tests/es2019/output/trap/json-superset.js.trap
index afc0749206a..0b19e7affe2 100644
--- a/javascript/extractor/tests/es2019/output/trap/json-superset.js.trap
+++ b/javascript/extractor/tests/es2019/output/trap/json-superset.js.trap
@@ -93,86 +93,88 @@ hasLocation(#20001,#20031)
 variables(#20032,"s1",#20000)
 #20033=@"var;{s2};{#20000}"
 variables(#20033,"s2",#20000)
-#20034=*
-stmts(#20034,18,#20001,0,"var s1 = ""ab\u2028c"";")
-#20035=@"loc,{#10000},1,1,1,16"
-locations_default(#20035,#10000,1,1,1,16)
-hasLocation(#20034,#20035)
-stmt_containers(#20034,#20001)
-#20036=*
-exprs(#20036,64,#20034,0,"s1 = ""ab\u2028c""")
-#20037=@"loc,{#10000},1,5,1,15"
-locations_default(#20037,#10000,1,5,1,15)
-hasLocation(#20036,#20037)
-enclosing_stmt(#20036,#20034)
-expr_containers(#20036,#20001)
-#20038=*
-exprs(#20038,78,#20036,0,"s1")
-hasLocation(#20038,#20013)
-enclosing_stmt(#20038,#20034)
-expr_containers(#20038,#20001)
-literals("s1","s1",#20038)
-decl(#20038,#20032)
+#20034=@"var;{this};{#20000}"
+variables(#20034,"this",#20000)
+#20035=*
+stmts(#20035,18,#20001,0,"var s1 = ""ab\u2028c"";")
+#20036=@"loc,{#10000},1,1,1,16"
+locations_default(#20036,#10000,1,1,1,16)
+hasLocation(#20035,#20036)
+stmt_containers(#20035,#20001)
+#20037=*
+exprs(#20037,64,#20035,0,"s1 = ""ab\u2028c""")
+#20038=@"loc,{#10000},1,5,1,15"
+locations_default(#20038,#10000,1,5,1,15)
+hasLocation(#20037,#20038)
+enclosing_stmt(#20037,#20035)
+expr_containers(#20037,#20001)
 #20039=*
-exprs(#20039,4,#20036,1,"""ab\u2028c""")
-hasLocation(#20039,#20017)
-enclosing_stmt(#20039,#20034)
+exprs(#20039,78,#20037,0,"s1")
+hasLocation(#20039,#20013)
+enclosing_stmt(#20039,#20035)
 expr_containers(#20039,#20001)
-literals("ab
c","""ab
c""",#20039)
+literals("s1","s1",#20039)
+decl(#20039,#20032)
 #20040=*
-regexpterm(#20040,14,#20039,0,"ab
c")
-#20041=@"loc,{#10000},1,11,1,14"
-locations_default(#20041,#10000,1,11,1,14)
-hasLocation(#20040,#20041)
-regexp_const_value(#20040,"ab
c")
-#20042=*
-stmts(#20042,18,#20001,1,"var s2 = ""ab\u2029c"";")
-#20043=@"loc,{#10000},2,1,2,16"
-locations_default(#20043,#10000,2,1,2,16)
-hasLocation(#20042,#20043)
-stmt_containers(#20042,#20001)
-#20044=*
-exprs(#20044,64,#20042,0,"s2 = ""ab\u2029c""")
-#20045=@"loc,{#10000},2,5,2,15"
-locations_default(#20045,#10000,2,5,2,15)
-hasLocation(#20044,#20045)
-enclosing_stmt(#20044,#20042)
-expr_containers(#20044,#20001)
-#20046=*
-exprs(#20046,78,#20044,0,"s2")
-hasLocation(#20046,#20022)
-enclosing_stmt(#20046,#20042)
-expr_containers(#20046,#20001)
-literals("s2","s2",#20046)
-decl(#20046,#20033)
+exprs(#20040,4,#20037,1,"""ab\u2028c""")
+hasLocation(#20040,#20017)
+enclosing_stmt(#20040,#20035)
+expr_containers(#20040,#20001)
+literals("ab
c","""ab
c""",#20040)
+#20041=*
+regexpterm(#20041,14,#20040,0,"ab
c")
+#20042=@"loc,{#10000},1,11,1,14"
+locations_default(#20042,#10000,1,11,1,14)
+hasLocation(#20041,#20042)
+regexp_const_value(#20041,"ab
c")
+#20043=*
+stmts(#20043,18,#20001,1,"var s2 = ""ab\u2029c"";")
+#20044=@"loc,{#10000},2,1,2,16"
+locations_default(#20044,#10000,2,1,2,16)
+hasLocation(#20043,#20044)
+stmt_containers(#20043,#20001)
+#20045=*
+exprs(#20045,64,#20043,0,"s2 = ""ab\u2029c""")
+#20046=@"loc,{#10000},2,5,2,15"
+locations_default(#20046,#10000,2,5,2,15)
+hasLocation(#20045,#20046)
+enclosing_stmt(#20045,#20043)
+expr_containers(#20045,#20001)
 #20047=*
-exprs(#20047,4,#20044,1,"""ab\u2029c""")
-hasLocation(#20047,#20026)
-enclosing_stmt(#20047,#20042)
+exprs(#20047,78,#20045,0,"s2")
+hasLocation(#20047,#20022)
+enclosing_stmt(#20047,#20043)
 expr_containers(#20047,#20001)
-literals("ab
c","""ab
c""",#20047)
+literals("s2","s2",#20047)
+decl(#20047,#20033)
 #20048=*
-regexpterm(#20048,14,#20047,0,"ab
c")
-#20049=@"loc,{#10000},2,11,2,14"
-locations_default(#20049,#10000,2,11,2,14)
-hasLocation(#20048,#20049)
-regexp_const_value(#20048,"ab
c")
-#20050=*
-entry_cfg_node(#20050,#20001)
-#20051=@"loc,{#10000},1,1,1,0"
-locations_default(#20051,#10000,1,1,1,0)
-hasLocation(#20050,#20051)
-#20052=*
-exit_cfg_node(#20052,#20001)
-hasLocation(#20052,#20030)
-successor(#20042,#20046)
-successor(#20047,#20044)
-successor(#20046,#20047)
-successor(#20044,#20052)
-successor(#20034,#20038)
-successor(#20039,#20036)
-successor(#20038,#20039)
-successor(#20036,#20042)
-successor(#20050,#20034)
+exprs(#20048,4,#20045,1,"""ab\u2029c""")
+hasLocation(#20048,#20026)
+enclosing_stmt(#20048,#20043)
+expr_containers(#20048,#20001)
+literals("ab
c","""ab
c""",#20048)
+#20049=*
+regexpterm(#20049,14,#20048,0,"ab
c")
+#20050=@"loc,{#10000},2,11,2,14"
+locations_default(#20050,#10000,2,11,2,14)
+hasLocation(#20049,#20050)
+regexp_const_value(#20049,"ab
c")
+#20051=*
+entry_cfg_node(#20051,#20001)
+#20052=@"loc,{#10000},1,1,1,0"
+locations_default(#20052,#10000,1,1,1,0)
+hasLocation(#20051,#20052)
+#20053=*
+exit_cfg_node(#20053,#20001)
+hasLocation(#20053,#20030)
+successor(#20043,#20047)
+successor(#20048,#20045)
+successor(#20047,#20048)
+successor(#20045,#20053)
+successor(#20035,#20039)
+successor(#20040,#20037)
+successor(#20039,#20040)
+successor(#20037,#20043)
+successor(#20051,#20035)
 numlines(#10000,4,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2021/output/trap/assign.js.trap b/javascript/extractor/tests/es2021/output/trap/assign.js.trap
index d0aaa18558b..d2f804fd01f 100644
--- a/javascript/extractor/tests/es2021/output/trap/assign.js.trap
+++ b/javascript/extractor/tests/es2021/output/trap/assign.js.trap
@@ -302,332 +302,334 @@ variables(#20112,"y",#20000)
 variables(#20113,"foo",#20000)
 #20114=@"var;{bar};{#20000}"
 variables(#20114,"bar",#20000)
-#20115=*
-stmts(#20115,18,#20001,0,"var x = 1;")
-hasLocation(#20115,#20005)
-stmt_containers(#20115,#20001)
+#20115=@"var;{this};{#20000}"
+variables(#20115,"this",#20000)
 #20116=*
-exprs(#20116,64,#20115,0,"x = 1")
-#20117=@"loc,{#10000},1,5,1,9"
-locations_default(#20117,#10000,1,5,1,9)
-hasLocation(#20116,#20117)
-enclosing_stmt(#20116,#20115)
-expr_containers(#20116,#20001)
-#20118=*
-exprs(#20118,78,#20116,0,"x")
-hasLocation(#20118,#20025)
-enclosing_stmt(#20118,#20115)
-expr_containers(#20118,#20001)
-literals("x","x",#20118)
-decl(#20118,#20111)
+stmts(#20116,18,#20001,0,"var x = 1;")
+hasLocation(#20116,#20005)
+stmt_containers(#20116,#20001)
+#20117=*
+exprs(#20117,64,#20116,0,"x = 1")
+#20118=@"loc,{#10000},1,5,1,9"
+locations_default(#20118,#10000,1,5,1,9)
+hasLocation(#20117,#20118)
+enclosing_stmt(#20117,#20116)
+expr_containers(#20117,#20001)
 #20119=*
-exprs(#20119,3,#20116,1,"1")
-hasLocation(#20119,#20029)
-enclosing_stmt(#20119,#20115)
+exprs(#20119,78,#20117,0,"x")
+hasLocation(#20119,#20025)
+enclosing_stmt(#20119,#20116)
 expr_containers(#20119,#20001)
-literals("1","1",#20119)
+literals("x","x",#20119)
+decl(#20119,#20111)
 #20120=*
-stmts(#20120,18,#20001,1,"var y = 2;")
-hasLocation(#20120,#20007)
-stmt_containers(#20120,#20001)
+exprs(#20120,3,#20117,1,"1")
+hasLocation(#20120,#20029)
+enclosing_stmt(#20120,#20116)
+expr_containers(#20120,#20001)
+literals("1","1",#20120)
 #20121=*
-exprs(#20121,64,#20120,0,"y = 2")
-#20122=@"loc,{#10000},2,5,2,9"
-locations_default(#20122,#10000,2,5,2,9)
-hasLocation(#20121,#20122)
-enclosing_stmt(#20121,#20120)
-expr_containers(#20121,#20001)
-#20123=*
-exprs(#20123,78,#20121,0,"y")
-hasLocation(#20123,#20035)
-enclosing_stmt(#20123,#20120)
-expr_containers(#20123,#20001)
-literals("y","y",#20123)
-decl(#20123,#20112)
+stmts(#20121,18,#20001,1,"var y = 2;")
+hasLocation(#20121,#20007)
+stmt_containers(#20121,#20001)
+#20122=*
+exprs(#20122,64,#20121,0,"y = 2")
+#20123=@"loc,{#10000},2,5,2,9"
+locations_default(#20123,#10000,2,5,2,9)
+hasLocation(#20122,#20123)
+enclosing_stmt(#20122,#20121)
+expr_containers(#20122,#20001)
 #20124=*
-exprs(#20124,3,#20121,1,"2")
-hasLocation(#20124,#20039)
-enclosing_stmt(#20124,#20120)
+exprs(#20124,78,#20122,0,"y")
+hasLocation(#20124,#20035)
+enclosing_stmt(#20124,#20121)
 expr_containers(#20124,#20001)
-literals("2","2",#20124)
+literals("y","y",#20124)
+decl(#20124,#20112)
 #20125=*
-stmts(#20125,18,#20001,2,"var foo = x && y;")
-hasLocation(#20125,#20009)
-stmt_containers(#20125,#20001)
+exprs(#20125,3,#20122,1,"2")
+hasLocation(#20125,#20039)
+enclosing_stmt(#20125,#20121)
+expr_containers(#20125,#20001)
+literals("2","2",#20125)
 #20126=*
-exprs(#20126,64,#20125,0,"foo = x && y")
-#20127=@"loc,{#10000},3,5,3,16"
-locations_default(#20127,#10000,3,5,3,16)
-hasLocation(#20126,#20127)
-enclosing_stmt(#20126,#20125)
-expr_containers(#20126,#20001)
-#20128=*
-exprs(#20128,78,#20126,0,"foo")
-hasLocation(#20128,#20045)
-enclosing_stmt(#20128,#20125)
-expr_containers(#20128,#20001)
-literals("foo","foo",#20128)
-decl(#20128,#20113)
+stmts(#20126,18,#20001,2,"var foo = x && y;")
+hasLocation(#20126,#20009)
+stmt_containers(#20126,#20001)
+#20127=*
+exprs(#20127,64,#20126,0,"foo = x && y")
+#20128=@"loc,{#10000},3,5,3,16"
+locations_default(#20128,#10000,3,5,3,16)
+hasLocation(#20127,#20128)
+enclosing_stmt(#20127,#20126)
+expr_containers(#20127,#20001)
 #20129=*
-exprs(#20129,44,#20126,1,"x && y")
-#20130=@"loc,{#10000},3,11,3,16"
-locations_default(#20130,#10000,3,11,3,16)
-hasLocation(#20129,#20130)
-enclosing_stmt(#20129,#20125)
+exprs(#20129,78,#20127,0,"foo")
+hasLocation(#20129,#20045)
+enclosing_stmt(#20129,#20126)
 expr_containers(#20129,#20001)
-#20131=*
-exprs(#20131,79,#20129,0,"x")
-hasLocation(#20131,#20049)
-enclosing_stmt(#20131,#20125)
-expr_containers(#20131,#20001)
-literals("x","x",#20131)
-bind(#20131,#20111)
+literals("foo","foo",#20129)
+decl(#20129,#20113)
+#20130=*
+exprs(#20130,44,#20127,1,"x && y")
+#20131=@"loc,{#10000},3,11,3,16"
+locations_default(#20131,#10000,3,11,3,16)
+hasLocation(#20130,#20131)
+enclosing_stmt(#20130,#20126)
+expr_containers(#20130,#20001)
 #20132=*
-exprs(#20132,79,#20129,1,"y")
-hasLocation(#20132,#20053)
-enclosing_stmt(#20132,#20125)
+exprs(#20132,79,#20130,0,"x")
+hasLocation(#20132,#20049)
+enclosing_stmt(#20132,#20126)
 expr_containers(#20132,#20001)
-literals("y","y",#20132)
-bind(#20132,#20112)
+literals("x","x",#20132)
+bind(#20132,#20111)
 #20133=*
-stmts(#20133,18,#20001,3,"var bar = x &&= y;")
-hasLocation(#20133,#20011)
-stmt_containers(#20133,#20001)
+exprs(#20133,79,#20130,1,"y")
+hasLocation(#20133,#20053)
+enclosing_stmt(#20133,#20126)
+expr_containers(#20133,#20001)
+literals("y","y",#20133)
+bind(#20133,#20112)
 #20134=*
-exprs(#20134,64,#20133,0,"bar = x &&= y")
-#20135=@"loc,{#10000},4,5,4,17"
-locations_default(#20135,#10000,4,5,4,17)
-hasLocation(#20134,#20135)
-enclosing_stmt(#20134,#20133)
-expr_containers(#20134,#20001)
-#20136=*
-exprs(#20136,78,#20134,0,"bar")
-hasLocation(#20136,#20059)
-enclosing_stmt(#20136,#20133)
-expr_containers(#20136,#20001)
-literals("bar","bar",#20136)
-decl(#20136,#20114)
+stmts(#20134,18,#20001,3,"var bar = x &&= y;")
+hasLocation(#20134,#20011)
+stmt_containers(#20134,#20001)
+#20135=*
+exprs(#20135,64,#20134,0,"bar = x &&= y")
+#20136=@"loc,{#10000},4,5,4,17"
+locations_default(#20136,#10000,4,5,4,17)
+hasLocation(#20135,#20136)
+enclosing_stmt(#20135,#20134)
+expr_containers(#20135,#20001)
 #20137=*
-exprs(#20137,116,#20134,1,"x &&= y")
-#20138=@"loc,{#10000},4,11,4,17"
-locations_default(#20138,#10000,4,11,4,17)
-hasLocation(#20137,#20138)
-enclosing_stmt(#20137,#20133)
+exprs(#20137,78,#20135,0,"bar")
+hasLocation(#20137,#20059)
+enclosing_stmt(#20137,#20134)
 expr_containers(#20137,#20001)
-#20139=*
-exprs(#20139,79,#20137,0,"x")
-hasLocation(#20139,#20063)
-enclosing_stmt(#20139,#20133)
-expr_containers(#20139,#20001)
-literals("x","x",#20139)
-bind(#20139,#20111)
+literals("bar","bar",#20137)
+decl(#20137,#20114)
+#20138=*
+exprs(#20138,116,#20135,1,"x &&= y")
+#20139=@"loc,{#10000},4,11,4,17"
+locations_default(#20139,#10000,4,11,4,17)
+hasLocation(#20138,#20139)
+enclosing_stmt(#20138,#20134)
+expr_containers(#20138,#20001)
 #20140=*
-exprs(#20140,79,#20137,1,"y")
-hasLocation(#20140,#20067)
-enclosing_stmt(#20140,#20133)
+exprs(#20140,79,#20138,0,"x")
+hasLocation(#20140,#20063)
+enclosing_stmt(#20140,#20134)
 expr_containers(#20140,#20001)
-literals("y","y",#20140)
-bind(#20140,#20112)
+literals("x","x",#20140)
+bind(#20140,#20111)
 #20141=*
-stmts(#20141,2,#20001,4,"console.log(x);")
-#20142=@"loc,{#10000},5,1,5,15"
-locations_default(#20142,#10000,5,1,5,15)
-hasLocation(#20141,#20142)
-stmt_containers(#20141,#20001)
-#20143=*
-exprs(#20143,13,#20141,0,"console.log(x)")
-#20144=@"loc,{#10000},5,1,5,14"
-locations_default(#20144,#10000,5,1,5,14)
-hasLocation(#20143,#20144)
-enclosing_stmt(#20143,#20141)
-expr_containers(#20143,#20001)
-#20145=*
-exprs(#20145,14,#20143,-1,"console.log")
-#20146=@"loc,{#10000},5,1,5,11"
-locations_default(#20146,#10000,5,1,5,11)
-hasLocation(#20145,#20146)
-enclosing_stmt(#20145,#20141)
-expr_containers(#20145,#20001)
-#20147=*
-exprs(#20147,79,#20145,0,"console")
-hasLocation(#20147,#20071)
-enclosing_stmt(#20147,#20141)
-expr_containers(#20147,#20001)
-literals("console","console",#20147)
-#20148=@"var;{console};{#20000}"
-variables(#20148,"console",#20000)
-bind(#20147,#20148)
-#20149=*
-exprs(#20149,0,#20145,1,"log")
-hasLocation(#20149,#20075)
-enclosing_stmt(#20149,#20141)
-expr_containers(#20149,#20001)
-literals("log","log",#20149)
+exprs(#20141,79,#20138,1,"y")
+hasLocation(#20141,#20067)
+enclosing_stmt(#20141,#20134)
+expr_containers(#20141,#20001)
+literals("y","y",#20141)
+bind(#20141,#20112)
+#20142=*
+stmts(#20142,2,#20001,4,"console.log(x);")
+#20143=@"loc,{#10000},5,1,5,15"
+locations_default(#20143,#10000,5,1,5,15)
+hasLocation(#20142,#20143)
+stmt_containers(#20142,#20001)
+#20144=*
+exprs(#20144,13,#20142,0,"console.log(x)")
+#20145=@"loc,{#10000},5,1,5,14"
+locations_default(#20145,#10000,5,1,5,14)
+hasLocation(#20144,#20145)
+enclosing_stmt(#20144,#20142)
+expr_containers(#20144,#20001)
+#20146=*
+exprs(#20146,14,#20144,-1,"console.log")
+#20147=@"loc,{#10000},5,1,5,11"
+locations_default(#20147,#10000,5,1,5,11)
+hasLocation(#20146,#20147)
+enclosing_stmt(#20146,#20142)
+expr_containers(#20146,#20001)
+#20148=*
+exprs(#20148,79,#20146,0,"console")
+hasLocation(#20148,#20071)
+enclosing_stmt(#20148,#20142)
+expr_containers(#20148,#20001)
+literals("console","console",#20148)
+#20149=@"var;{console};{#20000}"
+variables(#20149,"console",#20000)
+bind(#20148,#20149)
 #20150=*
-exprs(#20150,79,#20143,0,"x")
-hasLocation(#20150,#20079)
-enclosing_stmt(#20150,#20141)
+exprs(#20150,0,#20146,1,"log")
+hasLocation(#20150,#20075)
+enclosing_stmt(#20150,#20142)
 expr_containers(#20150,#20001)
-literals("x","x",#20150)
-bind(#20150,#20111)
+literals("log","log",#20150)
 #20151=*
-stmts(#20151,2,#20001,5,"x &&= y;")
-hasLocation(#20151,#20017)
-stmt_containers(#20151,#20001)
+exprs(#20151,79,#20144,0,"x")
+hasLocation(#20151,#20079)
+enclosing_stmt(#20151,#20142)
+expr_containers(#20151,#20001)
+literals("x","x",#20151)
+bind(#20151,#20111)
 #20152=*
-exprs(#20152,116,#20151,0,"x &&= y")
-#20153=@"loc,{#10000},7,1,7,7"
-locations_default(#20153,#10000,7,1,7,7)
-hasLocation(#20152,#20153)
-enclosing_stmt(#20152,#20151)
-expr_containers(#20152,#20001)
-#20154=*
-exprs(#20154,79,#20152,0,"x")
-hasLocation(#20154,#20085)
-enclosing_stmt(#20154,#20151)
-expr_containers(#20154,#20001)
-literals("x","x",#20154)
-bind(#20154,#20111)
+stmts(#20152,2,#20001,5,"x &&= y;")
+hasLocation(#20152,#20017)
+stmt_containers(#20152,#20001)
+#20153=*
+exprs(#20153,116,#20152,0,"x &&= y")
+#20154=@"loc,{#10000},7,1,7,7"
+locations_default(#20154,#10000,7,1,7,7)
+hasLocation(#20153,#20154)
+enclosing_stmt(#20153,#20152)
+expr_containers(#20153,#20001)
 #20155=*
-exprs(#20155,79,#20152,1,"y")
-hasLocation(#20155,#20089)
-enclosing_stmt(#20155,#20151)
+exprs(#20155,79,#20153,0,"x")
+hasLocation(#20155,#20085)
+enclosing_stmt(#20155,#20152)
 expr_containers(#20155,#20001)
-literals("y","y",#20155)
-bind(#20155,#20112)
+literals("x","x",#20155)
+bind(#20155,#20111)
 #20156=*
-stmts(#20156,2,#20001,6,"x ||= y;")
-hasLocation(#20156,#20019)
-stmt_containers(#20156,#20001)
+exprs(#20156,79,#20153,1,"y")
+hasLocation(#20156,#20089)
+enclosing_stmt(#20156,#20152)
+expr_containers(#20156,#20001)
+literals("y","y",#20156)
+bind(#20156,#20112)
 #20157=*
-exprs(#20157,117,#20156,0,"x ||= y")
-#20158=@"loc,{#10000},8,1,8,7"
-locations_default(#20158,#10000,8,1,8,7)
-hasLocation(#20157,#20158)
-enclosing_stmt(#20157,#20156)
-expr_containers(#20157,#20001)
-#20159=*
-exprs(#20159,79,#20157,0,"x")
-hasLocation(#20159,#20093)
-enclosing_stmt(#20159,#20156)
-expr_containers(#20159,#20001)
-literals("x","x",#20159)
-bind(#20159,#20111)
+stmts(#20157,2,#20001,6,"x ||= y;")
+hasLocation(#20157,#20019)
+stmt_containers(#20157,#20001)
+#20158=*
+exprs(#20158,117,#20157,0,"x ||= y")
+#20159=@"loc,{#10000},8,1,8,7"
+locations_default(#20159,#10000,8,1,8,7)
+hasLocation(#20158,#20159)
+enclosing_stmt(#20158,#20157)
+expr_containers(#20158,#20001)
 #20160=*
-exprs(#20160,79,#20157,1,"y")
-hasLocation(#20160,#20097)
-enclosing_stmt(#20160,#20156)
+exprs(#20160,79,#20158,0,"x")
+hasLocation(#20160,#20093)
+enclosing_stmt(#20160,#20157)
 expr_containers(#20160,#20001)
-literals("y","y",#20160)
-bind(#20160,#20112)
+literals("x","x",#20160)
+bind(#20160,#20111)
 #20161=*
-stmts(#20161,2,#20001,7,"x ??= y;")
-hasLocation(#20161,#20021)
-stmt_containers(#20161,#20001)
+exprs(#20161,79,#20158,1,"y")
+hasLocation(#20161,#20097)
+enclosing_stmt(#20161,#20157)
+expr_containers(#20161,#20001)
+literals("y","y",#20161)
+bind(#20161,#20112)
 #20162=*
-exprs(#20162,118,#20161,0,"x ??= y")
-#20163=@"loc,{#10000},9,1,9,7"
-locations_default(#20163,#10000,9,1,9,7)
-hasLocation(#20162,#20163)
-enclosing_stmt(#20162,#20161)
-expr_containers(#20162,#20001)
-#20164=*
-exprs(#20164,79,#20162,0,"x")
-hasLocation(#20164,#20101)
-enclosing_stmt(#20164,#20161)
-expr_containers(#20164,#20001)
-literals("x","x",#20164)
-bind(#20164,#20111)
+stmts(#20162,2,#20001,7,"x ??= y;")
+hasLocation(#20162,#20021)
+stmt_containers(#20162,#20001)
+#20163=*
+exprs(#20163,118,#20162,0,"x ??= y")
+#20164=@"loc,{#10000},9,1,9,7"
+locations_default(#20164,#10000,9,1,9,7)
+hasLocation(#20163,#20164)
+enclosing_stmt(#20163,#20162)
+expr_containers(#20163,#20001)
 #20165=*
-exprs(#20165,79,#20162,1,"y")
-hasLocation(#20165,#20105)
-enclosing_stmt(#20165,#20161)
+exprs(#20165,79,#20163,0,"x")
+hasLocation(#20165,#20101)
+enclosing_stmt(#20165,#20162)
 expr_containers(#20165,#20001)
-literals("y","y",#20165)
-bind(#20165,#20112)
+literals("x","x",#20165)
+bind(#20165,#20111)
 #20166=*
-entry_cfg_node(#20166,#20001)
-#20167=@"loc,{#10000},1,1,1,0"
-locations_default(#20167,#10000,1,1,1,0)
-hasLocation(#20166,#20167)
-#20168=*
-exit_cfg_node(#20168,#20001)
-hasLocation(#20168,#20109)
-successor(#20161,#20164)
-successor(#20164,#20165)
-successor(#20164,#20168)
-successor(#20165,#20162)
-successor(#20162,#20168)
-successor(#20156,#20159)
+exprs(#20166,79,#20163,1,"y")
+hasLocation(#20166,#20105)
+enclosing_stmt(#20166,#20162)
+expr_containers(#20166,#20001)
+literals("y","y",#20166)
+bind(#20166,#20112)
+#20167=*
+entry_cfg_node(#20167,#20001)
+#20168=@"loc,{#10000},1,1,1,0"
+locations_default(#20168,#10000,1,1,1,0)
+hasLocation(#20167,#20168)
 #20169=*
-guard_node(#20169,1,#20159)
-hasLocation(#20169,#20093)
-successor(#20169,#20161)
+exit_cfg_node(#20169,#20001)
+hasLocation(#20169,#20109)
+successor(#20162,#20165)
+successor(#20165,#20166)
+successor(#20165,#20169)
+successor(#20166,#20163)
+successor(#20163,#20169)
+successor(#20157,#20160)
 #20170=*
-guard_node(#20170,0,#20159)
+guard_node(#20170,1,#20160)
 hasLocation(#20170,#20093)
-successor(#20170,#20160)
-successor(#20159,#20169)
-successor(#20159,#20170)
-successor(#20160,#20157)
-successor(#20157,#20161)
-successor(#20151,#20154)
+successor(#20170,#20162)
 #20171=*
-guard_node(#20171,1,#20154)
-hasLocation(#20171,#20085)
-successor(#20171,#20155)
+guard_node(#20171,0,#20160)
+hasLocation(#20171,#20093)
+successor(#20171,#20161)
+successor(#20160,#20170)
+successor(#20160,#20171)
+successor(#20161,#20158)
+successor(#20158,#20162)
+successor(#20152,#20155)
 #20172=*
-guard_node(#20172,0,#20154)
+guard_node(#20172,1,#20155)
 hasLocation(#20172,#20085)
 successor(#20172,#20156)
-successor(#20154,#20171)
-successor(#20154,#20172)
-successor(#20155,#20152)
-successor(#20152,#20156)
-successor(#20141,#20147)
-successor(#20150,#20143)
-successor(#20149,#20145)
-successor(#20147,#20149)
-successor(#20145,#20150)
-successor(#20143,#20151)
-successor(#20133,#20136)
 #20173=*
-guard_node(#20173,1,#20139)
-hasLocation(#20173,#20063)
-successor(#20173,#20140)
+guard_node(#20173,0,#20155)
+hasLocation(#20173,#20085)
+successor(#20173,#20157)
+successor(#20155,#20172)
+successor(#20155,#20173)
+successor(#20156,#20153)
+successor(#20153,#20157)
+successor(#20142,#20148)
+successor(#20151,#20144)
+successor(#20150,#20146)
+successor(#20148,#20150)
+successor(#20146,#20151)
+successor(#20144,#20152)
+successor(#20134,#20137)
 #20174=*
-guard_node(#20174,0,#20139)
+guard_node(#20174,1,#20140)
 hasLocation(#20174,#20063)
-successor(#20174,#20134)
-successor(#20139,#20173)
-successor(#20139,#20174)
-successor(#20140,#20137)
-successor(#20137,#20134)
-successor(#20136,#20139)
-successor(#20134,#20141)
-successor(#20125,#20128)
-successor(#20129,#20131)
+successor(#20174,#20141)
 #20175=*
-guard_node(#20175,1,#20131)
-hasLocation(#20175,#20049)
-successor(#20175,#20132)
+guard_node(#20175,0,#20140)
+hasLocation(#20175,#20063)
+successor(#20175,#20135)
+successor(#20140,#20174)
+successor(#20140,#20175)
+successor(#20141,#20138)
+successor(#20138,#20135)
+successor(#20137,#20140)
+successor(#20135,#20142)
+successor(#20126,#20129)
+successor(#20130,#20132)
 #20176=*
-guard_node(#20176,0,#20131)
+guard_node(#20176,1,#20132)
 hasLocation(#20176,#20049)
-successor(#20176,#20126)
-successor(#20131,#20175)
-successor(#20131,#20176)
-successor(#20132,#20126)
-successor(#20128,#20129)
-successor(#20126,#20133)
-successor(#20120,#20123)
-successor(#20124,#20121)
-successor(#20123,#20124)
-successor(#20121,#20125)
-successor(#20115,#20118)
-successor(#20119,#20116)
-successor(#20118,#20119)
-successor(#20116,#20120)
-successor(#20166,#20115)
+successor(#20176,#20133)
+#20177=*
+guard_node(#20177,0,#20132)
+hasLocation(#20177,#20049)
+successor(#20177,#20127)
+successor(#20132,#20176)
+successor(#20132,#20177)
+successor(#20133,#20127)
+successor(#20129,#20130)
+successor(#20127,#20134)
+successor(#20121,#20124)
+successor(#20125,#20122)
+successor(#20124,#20125)
+successor(#20122,#20126)
+successor(#20116,#20119)
+successor(#20120,#20117)
+successor(#20119,#20120)
+successor(#20117,#20121)
+successor(#20167,#20116)
 numlines(#10000,9,8,1)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2021/output/trap/numeric.js.trap b/javascript/extractor/tests/es2021/output/trap/numeric.js.trap
index f6f86e94853..aad3815db45 100644
--- a/javascript/extractor/tests/es2021/output/trap/numeric.js.trap
+++ b/javascript/extractor/tests/es2021/output/trap/numeric.js.trap
@@ -248,188 +248,190 @@ hasLocation(#20001,#20088)
 variables(#20089,"fee",#20000)
 #20090=@"var;{amount};{#20000}"
 variables(#20090,"amount",#20000)
-#20091=*
-stmts(#20091,2,#20001,0,"1_000_000_000")
-hasLocation(#20091,#20033)
-stmt_containers(#20091,#20001)
+#20091=@"var;{this};{#20000}"
+variables(#20091,"this",#20000)
 #20092=*
-exprs(#20092,3,#20091,0,"1_000_000_000")
+stmts(#20092,2,#20001,0,"1_000_000_000")
 hasLocation(#20092,#20033)
-enclosing_stmt(#20092,#20091)
-expr_containers(#20092,#20001)
-literals("1000000000","1_000_000_000",#20092)
+stmt_containers(#20092,#20001)
 #20093=*
-stmts(#20093,2,#20001,1,"101_475_938.38")
-hasLocation(#20093,#20035)
-stmt_containers(#20093,#20001)
+exprs(#20093,3,#20092,0,"1_000_000_000")
+hasLocation(#20093,#20033)
+enclosing_stmt(#20093,#20092)
+expr_containers(#20093,#20001)
+literals("1000000000","1_000_000_000",#20093)
 #20094=*
-exprs(#20094,3,#20093,0,"101_475_938.38")
+stmts(#20094,2,#20001,1,"101_475_938.38")
 hasLocation(#20094,#20035)
-enclosing_stmt(#20094,#20093)
-expr_containers(#20094,#20001)
-literals("1.0147593838E8","101_475_938.38",#20094)
+stmt_containers(#20094,#20001)
 #20095=*
-stmts(#20095,23,#20001,2,"let fee = 123_00;")
-#20096=@"loc,{#10000},4,1,4,17"
-locations_default(#20096,#10000,4,1,4,17)
-hasLocation(#20095,#20096)
-stmt_containers(#20095,#20001)
-#20097=*
-exprs(#20097,64,#20095,0,"fee = 123_00")
-#20098=@"loc,{#10000},4,5,4,16"
-locations_default(#20098,#10000,4,5,4,16)
-hasLocation(#20097,#20098)
-enclosing_stmt(#20097,#20095)
-expr_containers(#20097,#20001)
-#20099=*
-exprs(#20099,78,#20097,0,"fee")
-hasLocation(#20099,#20039)
-enclosing_stmt(#20099,#20095)
-expr_containers(#20099,#20001)
-literals("fee","fee",#20099)
-decl(#20099,#20089)
+exprs(#20095,3,#20094,0,"101_475_938.38")
+hasLocation(#20095,#20035)
+enclosing_stmt(#20095,#20094)
+expr_containers(#20095,#20001)
+literals("1.0147593838E8","101_475_938.38",#20095)
+#20096=*
+stmts(#20096,23,#20001,2,"let fee = 123_00;")
+#20097=@"loc,{#10000},4,1,4,17"
+locations_default(#20097,#10000,4,1,4,17)
+hasLocation(#20096,#20097)
+stmt_containers(#20096,#20001)
+#20098=*
+exprs(#20098,64,#20096,0,"fee = 123_00")
+#20099=@"loc,{#10000},4,5,4,16"
+locations_default(#20099,#10000,4,5,4,16)
+hasLocation(#20098,#20099)
+enclosing_stmt(#20098,#20096)
+expr_containers(#20098,#20001)
 #20100=*
-exprs(#20100,3,#20097,1,"123_00")
-hasLocation(#20100,#20043)
-enclosing_stmt(#20100,#20095)
+exprs(#20100,78,#20098,0,"fee")
+hasLocation(#20100,#20039)
+enclosing_stmt(#20100,#20096)
 expr_containers(#20100,#20001)
-literals("12300","123_00",#20100)
+literals("fee","fee",#20100)
+decl(#20100,#20089)
 #20101=*
-stmts(#20101,23,#20001,3,"let fee = 12_300;")
-#20102=@"loc,{#10000},5,1,5,17"
-locations_default(#20102,#10000,5,1,5,17)
-hasLocation(#20101,#20102)
-stmt_containers(#20101,#20001)
-#20103=*
-exprs(#20103,64,#20101,0,"fee = 12_300")
-#20104=@"loc,{#10000},5,5,5,16"
-locations_default(#20104,#10000,5,5,5,16)
-hasLocation(#20103,#20104)
-enclosing_stmt(#20103,#20101)
-expr_containers(#20103,#20001)
-#20105=*
-exprs(#20105,78,#20103,0,"fee")
-hasLocation(#20105,#20049)
-enclosing_stmt(#20105,#20101)
-expr_containers(#20105,#20001)
-literals("fee","fee",#20105)
-decl(#20105,#20089)
+exprs(#20101,3,#20098,1,"123_00")
+hasLocation(#20101,#20043)
+enclosing_stmt(#20101,#20096)
+expr_containers(#20101,#20001)
+literals("12300","123_00",#20101)
+#20102=*
+stmts(#20102,23,#20001,3,"let fee = 12_300;")
+#20103=@"loc,{#10000},5,1,5,17"
+locations_default(#20103,#10000,5,1,5,17)
+hasLocation(#20102,#20103)
+stmt_containers(#20102,#20001)
+#20104=*
+exprs(#20104,64,#20102,0,"fee = 12_300")
+#20105=@"loc,{#10000},5,5,5,16"
+locations_default(#20105,#10000,5,5,5,16)
+hasLocation(#20104,#20105)
+enclosing_stmt(#20104,#20102)
+expr_containers(#20104,#20001)
 #20106=*
-exprs(#20106,3,#20103,1,"12_300")
-hasLocation(#20106,#20053)
-enclosing_stmt(#20106,#20101)
+exprs(#20106,78,#20104,0,"fee")
+hasLocation(#20106,#20049)
+enclosing_stmt(#20106,#20102)
 expr_containers(#20106,#20001)
-literals("12300","12_300",#20106)
+literals("fee","fee",#20106)
+decl(#20106,#20089)
 #20107=*
-stmts(#20107,23,#20001,4,"let amo ... 345_00;")
-#20108=@"loc,{#10000},6,1,6,22"
-locations_default(#20108,#10000,6,1,6,22)
-hasLocation(#20107,#20108)
-stmt_containers(#20107,#20001)
-#20109=*
-exprs(#20109,64,#20107,0,"amount = 12345_00")
-#20110=@"loc,{#10000},6,5,6,21"
-locations_default(#20110,#10000,6,5,6,21)
-hasLocation(#20109,#20110)
-enclosing_stmt(#20109,#20107)
-expr_containers(#20109,#20001)
-#20111=*
-exprs(#20111,78,#20109,0,"amount")
-hasLocation(#20111,#20059)
-enclosing_stmt(#20111,#20107)
-expr_containers(#20111,#20001)
-literals("amount","amount",#20111)
-decl(#20111,#20090)
+exprs(#20107,3,#20104,1,"12_300")
+hasLocation(#20107,#20053)
+enclosing_stmt(#20107,#20102)
+expr_containers(#20107,#20001)
+literals("12300","12_300",#20107)
+#20108=*
+stmts(#20108,23,#20001,4,"let amo ... 345_00;")
+#20109=@"loc,{#10000},6,1,6,22"
+locations_default(#20109,#10000,6,1,6,22)
+hasLocation(#20108,#20109)
+stmt_containers(#20108,#20001)
+#20110=*
+exprs(#20110,64,#20108,0,"amount = 12345_00")
+#20111=@"loc,{#10000},6,5,6,21"
+locations_default(#20111,#10000,6,5,6,21)
+hasLocation(#20110,#20111)
+enclosing_stmt(#20110,#20108)
+expr_containers(#20110,#20001)
 #20112=*
-exprs(#20112,3,#20109,1,"12345_00")
-hasLocation(#20112,#20063)
-enclosing_stmt(#20112,#20107)
+exprs(#20112,78,#20110,0,"amount")
+hasLocation(#20112,#20059)
+enclosing_stmt(#20112,#20108)
 expr_containers(#20112,#20001)
-literals("1234500","12345_00",#20112)
+literals("amount","amount",#20112)
+decl(#20112,#20090)
 #20113=*
-stmts(#20113,23,#20001,5,"let amo ... 3_4500;")
-#20114=@"loc,{#10000},7,1,7,22"
-locations_default(#20114,#10000,7,1,7,22)
-hasLocation(#20113,#20114)
-stmt_containers(#20113,#20001)
-#20115=*
-exprs(#20115,64,#20113,0,"amount = 123_4500")
-#20116=@"loc,{#10000},7,5,7,21"
-locations_default(#20116,#10000,7,5,7,21)
-hasLocation(#20115,#20116)
-enclosing_stmt(#20115,#20113)
-expr_containers(#20115,#20001)
-#20117=*
-exprs(#20117,78,#20115,0,"amount")
-hasLocation(#20117,#20069)
-enclosing_stmt(#20117,#20113)
-expr_containers(#20117,#20001)
-literals("amount","amount",#20117)
-decl(#20117,#20090)
+exprs(#20113,3,#20110,1,"12345_00")
+hasLocation(#20113,#20063)
+enclosing_stmt(#20113,#20108)
+expr_containers(#20113,#20001)
+literals("1234500","12345_00",#20113)
+#20114=*
+stmts(#20114,23,#20001,5,"let amo ... 3_4500;")
+#20115=@"loc,{#10000},7,1,7,22"
+locations_default(#20115,#10000,7,1,7,22)
+hasLocation(#20114,#20115)
+stmt_containers(#20114,#20001)
+#20116=*
+exprs(#20116,64,#20114,0,"amount = 123_4500")
+#20117=@"loc,{#10000},7,5,7,21"
+locations_default(#20117,#10000,7,5,7,21)
+hasLocation(#20116,#20117)
+enclosing_stmt(#20116,#20114)
+expr_containers(#20116,#20001)
 #20118=*
-exprs(#20118,3,#20115,1,"123_4500")
-hasLocation(#20118,#20073)
-enclosing_stmt(#20118,#20113)
+exprs(#20118,78,#20116,0,"amount")
+hasLocation(#20118,#20069)
+enclosing_stmt(#20118,#20114)
 expr_containers(#20118,#20001)
-literals("1234500","123_4500",#20118)
+literals("amount","amount",#20118)
+decl(#20118,#20090)
 #20119=*
-stmts(#20119,23,#20001,6,"let amo ... 34_500;")
-#20120=@"loc,{#10000},8,1,8,23"
-locations_default(#20120,#10000,8,1,8,23)
-hasLocation(#20119,#20120)
-stmt_containers(#20119,#20001)
-#20121=*
-exprs(#20121,64,#20119,0,"amount = 1_234_500")
-#20122=@"loc,{#10000},8,5,8,22"
-locations_default(#20122,#10000,8,5,8,22)
-hasLocation(#20121,#20122)
-enclosing_stmt(#20121,#20119)
-expr_containers(#20121,#20001)
-#20123=*
-exprs(#20123,78,#20121,0,"amount")
-hasLocation(#20123,#20079)
-enclosing_stmt(#20123,#20119)
-expr_containers(#20123,#20001)
-literals("amount","amount",#20123)
-decl(#20123,#20090)
+exprs(#20119,3,#20116,1,"123_4500")
+hasLocation(#20119,#20073)
+enclosing_stmt(#20119,#20114)
+expr_containers(#20119,#20001)
+literals("1234500","123_4500",#20119)
+#20120=*
+stmts(#20120,23,#20001,6,"let amo ... 34_500;")
+#20121=@"loc,{#10000},8,1,8,23"
+locations_default(#20121,#10000,8,1,8,23)
+hasLocation(#20120,#20121)
+stmt_containers(#20120,#20001)
+#20122=*
+exprs(#20122,64,#20120,0,"amount = 1_234_500")
+#20123=@"loc,{#10000},8,5,8,22"
+locations_default(#20123,#10000,8,5,8,22)
+hasLocation(#20122,#20123)
+enclosing_stmt(#20122,#20120)
+expr_containers(#20122,#20001)
 #20124=*
-exprs(#20124,3,#20121,1,"1_234_500")
-hasLocation(#20124,#20083)
-enclosing_stmt(#20124,#20119)
+exprs(#20124,78,#20122,0,"amount")
+hasLocation(#20124,#20079)
+enclosing_stmt(#20124,#20120)
 expr_containers(#20124,#20001)
-literals("1234500","1_234_500",#20124)
+literals("amount","amount",#20124)
+decl(#20124,#20090)
 #20125=*
-entry_cfg_node(#20125,#20001)
-#20126=@"loc,{#10000},1,1,1,0"
-locations_default(#20126,#10000,1,1,1,0)
-hasLocation(#20125,#20126)
-#20127=*
-exit_cfg_node(#20127,#20001)
-hasLocation(#20127,#20087)
-successor(#20119,#20123)
-successor(#20124,#20121)
-successor(#20123,#20124)
-successor(#20121,#20127)
-successor(#20113,#20117)
-successor(#20118,#20115)
-successor(#20117,#20118)
-successor(#20115,#20119)
-successor(#20107,#20111)
-successor(#20112,#20109)
-successor(#20111,#20112)
-successor(#20109,#20113)
-successor(#20101,#20105)
-successor(#20106,#20103)
-successor(#20105,#20106)
-successor(#20103,#20107)
-successor(#20095,#20099)
-successor(#20100,#20097)
-successor(#20099,#20100)
-successor(#20097,#20101)
-successor(#20093,#20094)
+exprs(#20125,3,#20122,1,"1_234_500")
+hasLocation(#20125,#20083)
+enclosing_stmt(#20125,#20120)
+expr_containers(#20125,#20001)
+literals("1234500","1_234_500",#20125)
+#20126=*
+entry_cfg_node(#20126,#20001)
+#20127=@"loc,{#10000},1,1,1,0"
+locations_default(#20127,#10000,1,1,1,0)
+hasLocation(#20126,#20127)
+#20128=*
+exit_cfg_node(#20128,#20001)
+hasLocation(#20128,#20087)
+successor(#20120,#20124)
+successor(#20125,#20122)
+successor(#20124,#20125)
+successor(#20122,#20128)
+successor(#20114,#20118)
+successor(#20119,#20116)
+successor(#20118,#20119)
+successor(#20116,#20120)
+successor(#20108,#20112)
+successor(#20113,#20110)
+successor(#20112,#20113)
+successor(#20110,#20114)
+successor(#20102,#20106)
+successor(#20107,#20104)
+successor(#20106,#20107)
+successor(#20104,#20108)
+successor(#20096,#20100)
+successor(#20101,#20098)
+successor(#20100,#20101)
+successor(#20098,#20102)
 successor(#20094,#20095)
-successor(#20091,#20092)
+successor(#20095,#20096)
 successor(#20092,#20093)
-successor(#20125,#20091)
+successor(#20093,#20094)
+successor(#20126,#20092)
 numlines(#10000,8,7,7)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2024/output/trap/additional_test_cases.js.trap b/javascript/extractor/tests/es2024/output/trap/additional_test_cases.js.trap
index bd2318dbc5c..2c6e264e9b3 100644
--- a/javascript/extractor/tests/es2024/output/trap/additional_test_cases.js.trap
+++ b/javascript/extractor/tests/es2024/output/trap/additional_test_cases.js.trap
@@ -51,496 +51,498 @@ toplevels(#20001,0)
 #20016=@"loc,{#10000},1,1,3,0"
 locations_default(#20016,#10000,1,1,3,0)
 hasLocation(#20001,#20016)
-#20017=*
-stmts(#20017,2,#20001,0,"/^p(ost ...  ]]*/g;")
-hasLocation(#20017,#20003)
-stmt_containers(#20017,#20001)
+#20017=@"var;{this};{#20000}"
+variables(#20017,"this",#20000)
 #20018=*
-exprs(#20018,5,#20017,0,"/^p(ost ... z ]]*/g")
-hasLocation(#20018,#20007)
-enclosing_stmt(#20018,#20017)
-expr_containers(#20018,#20001)
-literals("/^p(ost)?[ |\.]*o(ffice)?[ |\.]*(box)?[ 0-9]*[^[a-z ]]*/g","/^p(ost)?[ |\.]*o(ffice)?[ |\.]*(box)?[ 0-9]*[^[a-z ]]*/g",#20018)
+stmts(#20018,2,#20001,0,"/^p(ost ...  ]]*/g;")
+hasLocation(#20018,#20003)
+stmt_containers(#20018,#20001)
 #20019=*
-regexpterm(#20019,1,#20018,0,"^p(ost)?[ |\.]*o(ffice)?[ |\.]*(box)?[ 0-9]*[^[a-z ]]*")
-#20020=@"loc,{#10000},1,2,1,55"
-locations_default(#20020,#10000,1,2,1,55)
-hasLocation(#20019,#20020)
-#20021=*
-regexpterm(#20021,2,#20019,0,"^")
-#20022=@"loc,{#10000},1,2,1,2"
-locations_default(#20022,#10000,1,2,1,2)
-hasLocation(#20021,#20022)
-#20023=*
-regexpterm(#20023,14,#20019,1,"p")
-#20024=@"loc,{#10000},1,3,1,3"
-locations_default(#20024,#10000,1,3,1,3)
-hasLocation(#20023,#20024)
-regexp_const_value(#20023,"p")
-#20025=*
-regexpterm(#20025,10,#20019,2,"(ost)?")
-#20026=@"loc,{#10000},1,4,1,9"
-locations_default(#20026,#10000,1,4,1,9)
-hasLocation(#20025,#20026)
-is_greedy(#20025)
-#20027=*
-regexpterm(#20027,13,#20025,0,"(ost)")
-#20028=@"loc,{#10000},1,4,1,8"
-locations_default(#20028,#10000,1,4,1,8)
-hasLocation(#20027,#20028)
-is_capture(#20027,1)
-#20029=*
-regexpterm(#20029,14,#20027,0,"ost")
-#20030=@"loc,{#10000},1,5,1,7"
-locations_default(#20030,#10000,1,5,1,7)
-hasLocation(#20029,#20030)
-regexp_const_value(#20029,"ost")
-#20031=*
-regexpterm(#20031,8,#20019,3,"[ |\.]*")
-#20032=@"loc,{#10000},1,10,1,16"
-locations_default(#20032,#10000,1,10,1,16)
-hasLocation(#20031,#20032)
-is_greedy(#20031)
-#20033=*
-regexpterm(#20033,23,#20031,0,"[ |\.]")
-#20034=@"loc,{#10000},1,10,1,15"
-locations_default(#20034,#10000,1,10,1,15)
-hasLocation(#20033,#20034)
-#20035=*
-regexpterm(#20035,14,#20033,0," ")
-#20036=@"loc,{#10000},1,11,1,11"
-locations_default(#20036,#10000,1,11,1,11)
-hasLocation(#20035,#20036)
-regexp_const_value(#20035," ")
-#20037=*
-regexpterm(#20037,14,#20033,1,"|")
-#20038=@"loc,{#10000},1,12,1,12"
-locations_default(#20038,#10000,1,12,1,12)
-hasLocation(#20037,#20038)
-regexp_const_value(#20037,"|")
-#20039=*
-regexpterm(#20039,21,#20033,2,"\.")
-#20040=@"loc,{#10000},1,13,1,14"
-locations_default(#20040,#10000,1,13,1,14)
-hasLocation(#20039,#20040)
-regexp_const_value(#20039,".")
-#20041=*
-regexpterm(#20041,14,#20019,4,"o")
-#20042=@"loc,{#10000},1,17,1,17"
-locations_default(#20042,#10000,1,17,1,17)
-hasLocation(#20041,#20042)
-regexp_const_value(#20041,"o")
-#20043=*
-regexpterm(#20043,10,#20019,5,"(ffice)?")
-#20044=@"loc,{#10000},1,18,1,25"
-locations_default(#20044,#10000,1,18,1,25)
-hasLocation(#20043,#20044)
-is_greedy(#20043)
-#20045=*
-regexpterm(#20045,13,#20043,0,"(ffice)")
-#20046=@"loc,{#10000},1,18,1,24"
-locations_default(#20046,#10000,1,18,1,24)
-hasLocation(#20045,#20046)
-is_capture(#20045,2)
-#20047=*
-regexpterm(#20047,14,#20045,0,"ffice")
-#20048=@"loc,{#10000},1,19,1,23"
-locations_default(#20048,#10000,1,19,1,23)
-hasLocation(#20047,#20048)
-regexp_const_value(#20047,"ffice")
-#20049=*
-regexpterm(#20049,8,#20019,6,"[ |\.]*")
-#20050=@"loc,{#10000},1,26,1,32"
-locations_default(#20050,#10000,1,26,1,32)
-hasLocation(#20049,#20050)
-is_greedy(#20049)
-#20051=*
-regexpterm(#20051,23,#20049,0,"[ |\.]")
-#20052=@"loc,{#10000},1,26,1,31"
-locations_default(#20052,#10000,1,26,1,31)
-hasLocation(#20051,#20052)
-#20053=*
-regexpterm(#20053,14,#20051,0," ")
-#20054=@"loc,{#10000},1,27,1,27"
-locations_default(#20054,#10000,1,27,1,27)
-hasLocation(#20053,#20054)
-regexp_const_value(#20053," ")
-#20055=*
-regexpterm(#20055,14,#20051,1,"|")
-#20056=@"loc,{#10000},1,28,1,28"
-locations_default(#20056,#10000,1,28,1,28)
-hasLocation(#20055,#20056)
-regexp_const_value(#20055,"|")
-#20057=*
-regexpterm(#20057,21,#20051,2,"\.")
-#20058=@"loc,{#10000},1,29,1,30"
-locations_default(#20058,#10000,1,29,1,30)
-hasLocation(#20057,#20058)
-regexp_const_value(#20057,".")
-#20059=*
-regexpterm(#20059,10,#20019,7,"(box)?")
-#20060=@"loc,{#10000},1,33,1,38"
-locations_default(#20060,#10000,1,33,1,38)
-hasLocation(#20059,#20060)
-is_greedy(#20059)
-#20061=*
-regexpterm(#20061,13,#20059,0,"(box)")
-#20062=@"loc,{#10000},1,33,1,37"
-locations_default(#20062,#10000,1,33,1,37)
-hasLocation(#20061,#20062)
-is_capture(#20061,3)
-#20063=*
-regexpterm(#20063,14,#20061,0,"box")
-#20064=@"loc,{#10000},1,34,1,36"
-locations_default(#20064,#10000,1,34,1,36)
-hasLocation(#20063,#20064)
-regexp_const_value(#20063,"box")
-#20065=*
-regexpterm(#20065,8,#20019,8,"[ 0-9]*")
-#20066=@"loc,{#10000},1,39,1,45"
-locations_default(#20066,#10000,1,39,1,45)
-hasLocation(#20065,#20066)
-is_greedy(#20065)
-#20067=*
-regexpterm(#20067,23,#20065,0,"[ 0-9]")
-#20068=@"loc,{#10000},1,39,1,44"
-locations_default(#20068,#10000,1,39,1,44)
-hasLocation(#20067,#20068)
-#20069=*
-regexpterm(#20069,14,#20067,0," ")
-#20070=@"loc,{#10000},1,40,1,40"
-locations_default(#20070,#10000,1,40,1,40)
-hasLocation(#20069,#20070)
-regexp_const_value(#20069," ")
-#20071=*
-regexpterm(#20071,24,#20067,1,"0-9")
-#20072=@"loc,{#10000},1,41,1,43"
-locations_default(#20072,#10000,1,41,1,43)
-hasLocation(#20071,#20072)
-#20073=*
-regexpterm(#20073,14,#20071,0,"0")
-#20074=@"loc,{#10000},1,41,1,41"
-locations_default(#20074,#10000,1,41,1,41)
-hasLocation(#20073,#20074)
-regexp_const_value(#20073,"0")
-#20075=*
-regexpterm(#20075,14,#20071,1,"9")
-#20076=@"loc,{#10000},1,43,1,43"
-locations_default(#20076,#10000,1,43,1,43)
-hasLocation(#20075,#20076)
-regexp_const_value(#20075,"9")
-#20077=*
-regexpterm(#20077,23,#20019,9,"[^[a-z ]")
-#20078=@"loc,{#10000},1,46,1,53"
-locations_default(#20078,#10000,1,46,1,53)
-hasLocation(#20077,#20078)
-is_inverted(#20077)
-#20079=*
-regexpterm(#20079,14,#20077,0,"[")
-#20080=@"loc,{#10000},1,48,1,48"
-locations_default(#20080,#10000,1,48,1,48)
-hasLocation(#20079,#20080)
-regexp_const_value(#20079,"[")
-#20081=*
-regexpterm(#20081,24,#20077,1,"a-z")
-#20082=@"loc,{#10000},1,49,1,51"
-locations_default(#20082,#10000,1,49,1,51)
-hasLocation(#20081,#20082)
-#20083=*
-regexpterm(#20083,14,#20081,0,"a")
-#20084=@"loc,{#10000},1,49,1,49"
-locations_default(#20084,#10000,1,49,1,49)
-hasLocation(#20083,#20084)
-regexp_const_value(#20083,"a")
-#20085=*
-regexpterm(#20085,14,#20081,1,"z")
-#20086=@"loc,{#10000},1,51,1,51"
-locations_default(#20086,#10000,1,51,1,51)
-hasLocation(#20085,#20086)
-regexp_const_value(#20085,"z")
-#20087=*
-regexpterm(#20087,14,#20077,2," ")
-#20088=@"loc,{#10000},1,52,1,52"
-locations_default(#20088,#10000,1,52,1,52)
-hasLocation(#20087,#20088)
-regexp_const_value(#20087," ")
-#20089=*
-regexpterm(#20089,8,#20019,10,"]*")
-#20090=@"loc,{#10000},1,54,1,55"
-locations_default(#20090,#10000,1,54,1,55)
-hasLocation(#20089,#20090)
-is_greedy(#20089)
-#20091=*
-regexpterm(#20091,14,#20089,0,"]")
-#20092=@"loc,{#10000},1,54,1,54"
-locations_default(#20092,#10000,1,54,1,54)
-hasLocation(#20091,#20092)
-regexp_const_value(#20091,"]")
-#20093=*
-regexp_parse_errors(#20093,#20019,"unexpected character")
-hasLocation(#20093,#20092)
+exprs(#20019,5,#20018,0,"/^p(ost ... z ]]*/g")
+hasLocation(#20019,#20007)
+enclosing_stmt(#20019,#20018)
+expr_containers(#20019,#20001)
+literals("/^p(ost)?[ |\.]*o(ffice)?[ |\.]*(box)?[ 0-9]*[^[a-z ]]*/g","/^p(ost)?[ |\.]*o(ffice)?[ |\.]*(box)?[ 0-9]*[^[a-z ]]*/g",#20019)
+#20020=*
+regexpterm(#20020,1,#20019,0,"^p(ost)?[ |\.]*o(ffice)?[ |\.]*(box)?[ 0-9]*[^[a-z ]]*")
+#20021=@"loc,{#10000},1,2,1,55"
+locations_default(#20021,#10000,1,2,1,55)
+hasLocation(#20020,#20021)
+#20022=*
+regexpterm(#20022,2,#20020,0,"^")
+#20023=@"loc,{#10000},1,2,1,2"
+locations_default(#20023,#10000,1,2,1,2)
+hasLocation(#20022,#20023)
+#20024=*
+regexpterm(#20024,14,#20020,1,"p")
+#20025=@"loc,{#10000},1,3,1,3"
+locations_default(#20025,#10000,1,3,1,3)
+hasLocation(#20024,#20025)
+regexp_const_value(#20024,"p")
+#20026=*
+regexpterm(#20026,10,#20020,2,"(ost)?")
+#20027=@"loc,{#10000},1,4,1,9"
+locations_default(#20027,#10000,1,4,1,9)
+hasLocation(#20026,#20027)
+is_greedy(#20026)
+#20028=*
+regexpterm(#20028,13,#20026,0,"(ost)")
+#20029=@"loc,{#10000},1,4,1,8"
+locations_default(#20029,#10000,1,4,1,8)
+hasLocation(#20028,#20029)
+is_capture(#20028,1)
+#20030=*
+regexpterm(#20030,14,#20028,0,"ost")
+#20031=@"loc,{#10000},1,5,1,7"
+locations_default(#20031,#10000,1,5,1,7)
+hasLocation(#20030,#20031)
+regexp_const_value(#20030,"ost")
+#20032=*
+regexpterm(#20032,8,#20020,3,"[ |\.]*")
+#20033=@"loc,{#10000},1,10,1,16"
+locations_default(#20033,#10000,1,10,1,16)
+hasLocation(#20032,#20033)
+is_greedy(#20032)
+#20034=*
+regexpterm(#20034,23,#20032,0,"[ |\.]")
+#20035=@"loc,{#10000},1,10,1,15"
+locations_default(#20035,#10000,1,10,1,15)
+hasLocation(#20034,#20035)
+#20036=*
+regexpterm(#20036,14,#20034,0," ")
+#20037=@"loc,{#10000},1,11,1,11"
+locations_default(#20037,#10000,1,11,1,11)
+hasLocation(#20036,#20037)
+regexp_const_value(#20036," ")
+#20038=*
+regexpterm(#20038,14,#20034,1,"|")
+#20039=@"loc,{#10000},1,12,1,12"
+locations_default(#20039,#10000,1,12,1,12)
+hasLocation(#20038,#20039)
+regexp_const_value(#20038,"|")
+#20040=*
+regexpterm(#20040,21,#20034,2,"\.")
+#20041=@"loc,{#10000},1,13,1,14"
+locations_default(#20041,#10000,1,13,1,14)
+hasLocation(#20040,#20041)
+regexp_const_value(#20040,".")
+#20042=*
+regexpterm(#20042,14,#20020,4,"o")
+#20043=@"loc,{#10000},1,17,1,17"
+locations_default(#20043,#10000,1,17,1,17)
+hasLocation(#20042,#20043)
+regexp_const_value(#20042,"o")
+#20044=*
+regexpterm(#20044,10,#20020,5,"(ffice)?")
+#20045=@"loc,{#10000},1,18,1,25"
+locations_default(#20045,#10000,1,18,1,25)
+hasLocation(#20044,#20045)
+is_greedy(#20044)
+#20046=*
+regexpterm(#20046,13,#20044,0,"(ffice)")
+#20047=@"loc,{#10000},1,18,1,24"
+locations_default(#20047,#10000,1,18,1,24)
+hasLocation(#20046,#20047)
+is_capture(#20046,2)
+#20048=*
+regexpterm(#20048,14,#20046,0,"ffice")
+#20049=@"loc,{#10000},1,19,1,23"
+locations_default(#20049,#10000,1,19,1,23)
+hasLocation(#20048,#20049)
+regexp_const_value(#20048,"ffice")
+#20050=*
+regexpterm(#20050,8,#20020,6,"[ |\.]*")
+#20051=@"loc,{#10000},1,26,1,32"
+locations_default(#20051,#10000,1,26,1,32)
+hasLocation(#20050,#20051)
+is_greedy(#20050)
+#20052=*
+regexpterm(#20052,23,#20050,0,"[ |\.]")
+#20053=@"loc,{#10000},1,26,1,31"
+locations_default(#20053,#10000,1,26,1,31)
+hasLocation(#20052,#20053)
+#20054=*
+regexpterm(#20054,14,#20052,0," ")
+#20055=@"loc,{#10000},1,27,1,27"
+locations_default(#20055,#10000,1,27,1,27)
+hasLocation(#20054,#20055)
+regexp_const_value(#20054," ")
+#20056=*
+regexpterm(#20056,14,#20052,1,"|")
+#20057=@"loc,{#10000},1,28,1,28"
+locations_default(#20057,#10000,1,28,1,28)
+hasLocation(#20056,#20057)
+regexp_const_value(#20056,"|")
+#20058=*
+regexpterm(#20058,21,#20052,2,"\.")
+#20059=@"loc,{#10000},1,29,1,30"
+locations_default(#20059,#10000,1,29,1,30)
+hasLocation(#20058,#20059)
+regexp_const_value(#20058,".")
+#20060=*
+regexpterm(#20060,10,#20020,7,"(box)?")
+#20061=@"loc,{#10000},1,33,1,38"
+locations_default(#20061,#10000,1,33,1,38)
+hasLocation(#20060,#20061)
+is_greedy(#20060)
+#20062=*
+regexpterm(#20062,13,#20060,0,"(box)")
+#20063=@"loc,{#10000},1,33,1,37"
+locations_default(#20063,#10000,1,33,1,37)
+hasLocation(#20062,#20063)
+is_capture(#20062,3)
+#20064=*
+regexpterm(#20064,14,#20062,0,"box")
+#20065=@"loc,{#10000},1,34,1,36"
+locations_default(#20065,#10000,1,34,1,36)
+hasLocation(#20064,#20065)
+regexp_const_value(#20064,"box")
+#20066=*
+regexpterm(#20066,8,#20020,8,"[ 0-9]*")
+#20067=@"loc,{#10000},1,39,1,45"
+locations_default(#20067,#10000,1,39,1,45)
+hasLocation(#20066,#20067)
+is_greedy(#20066)
+#20068=*
+regexpterm(#20068,23,#20066,0,"[ 0-9]")
+#20069=@"loc,{#10000},1,39,1,44"
+locations_default(#20069,#10000,1,39,1,44)
+hasLocation(#20068,#20069)
+#20070=*
+regexpterm(#20070,14,#20068,0," ")
+#20071=@"loc,{#10000},1,40,1,40"
+locations_default(#20071,#10000,1,40,1,40)
+hasLocation(#20070,#20071)
+regexp_const_value(#20070," ")
+#20072=*
+regexpterm(#20072,24,#20068,1,"0-9")
+#20073=@"loc,{#10000},1,41,1,43"
+locations_default(#20073,#10000,1,41,1,43)
+hasLocation(#20072,#20073)
+#20074=*
+regexpterm(#20074,14,#20072,0,"0")
+#20075=@"loc,{#10000},1,41,1,41"
+locations_default(#20075,#10000,1,41,1,41)
+hasLocation(#20074,#20075)
+regexp_const_value(#20074,"0")
+#20076=*
+regexpterm(#20076,14,#20072,1,"9")
+#20077=@"loc,{#10000},1,43,1,43"
+locations_default(#20077,#10000,1,43,1,43)
+hasLocation(#20076,#20077)
+regexp_const_value(#20076,"9")
+#20078=*
+regexpterm(#20078,23,#20020,9,"[^[a-z ]")
+#20079=@"loc,{#10000},1,46,1,53"
+locations_default(#20079,#10000,1,46,1,53)
+hasLocation(#20078,#20079)
+is_inverted(#20078)
+#20080=*
+regexpterm(#20080,14,#20078,0,"[")
+#20081=@"loc,{#10000},1,48,1,48"
+locations_default(#20081,#10000,1,48,1,48)
+hasLocation(#20080,#20081)
+regexp_const_value(#20080,"[")
+#20082=*
+regexpterm(#20082,24,#20078,1,"a-z")
+#20083=@"loc,{#10000},1,49,1,51"
+locations_default(#20083,#10000,1,49,1,51)
+hasLocation(#20082,#20083)
+#20084=*
+regexpterm(#20084,14,#20082,0,"a")
+#20085=@"loc,{#10000},1,49,1,49"
+locations_default(#20085,#10000,1,49,1,49)
+hasLocation(#20084,#20085)
+regexp_const_value(#20084,"a")
+#20086=*
+regexpterm(#20086,14,#20082,1,"z")
+#20087=@"loc,{#10000},1,51,1,51"
+locations_default(#20087,#10000,1,51,1,51)
+hasLocation(#20086,#20087)
+regexp_const_value(#20086,"z")
+#20088=*
+regexpterm(#20088,14,#20078,2," ")
+#20089=@"loc,{#10000},1,52,1,52"
+locations_default(#20089,#10000,1,52,1,52)
+hasLocation(#20088,#20089)
+regexp_const_value(#20088," ")
+#20090=*
+regexpterm(#20090,8,#20020,10,"]*")
+#20091=@"loc,{#10000},1,54,1,55"
+locations_default(#20091,#10000,1,54,1,55)
+hasLocation(#20090,#20091)
+is_greedy(#20090)
+#20092=*
+regexpterm(#20092,14,#20090,0,"]")
+#20093=@"loc,{#10000},1,54,1,54"
+locations_default(#20093,#10000,1,54,1,54)
+hasLocation(#20092,#20093)
+regexp_const_value(#20092,"]")
 #20094=*
-stmts(#20094,2,#20001,1,"/([ ]*[ ... ]+)+X/;")
-hasLocation(#20094,#20005)
-stmt_containers(#20094,#20001)
+regexp_parse_errors(#20094,#20020,"unexpected character")
+hasLocation(#20094,#20093)
 #20095=*
-exprs(#20095,5,#20094,0,"/([ ]*[ ... -]+)+X/")
-hasLocation(#20095,#20011)
-enclosing_stmt(#20095,#20094)
-expr_containers(#20095,#20001)
-literals("/([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+X/","/([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+X/",#20095)
+stmts(#20095,2,#20001,1,"/([ ]*[ ... ]+)+X/;")
+hasLocation(#20095,#20005)
+stmt_containers(#20095,#20001)
 #20096=*
-regexpterm(#20096,1,#20095,0,"([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+X")
-#20097=@"loc,{#10000},2,2,2,45"
-locations_default(#20097,#10000,2,2,2,45)
-hasLocation(#20096,#20097)
-#20098=*
-regexpterm(#20098,9,#20096,0,"([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+")
-#20099=@"loc,{#10000},2,2,2,44"
-locations_default(#20099,#10000,2,2,2,44)
-hasLocation(#20098,#20099)
-is_greedy(#20098)
-#20100=*
-regexpterm(#20100,13,#20098,0,"([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)")
-#20101=@"loc,{#10000},2,2,2,43"
-locations_default(#20101,#10000,2,2,2,43)
-hasLocation(#20100,#20101)
-is_capture(#20100,1)
-#20102=*
-regexpterm(#20102,1,#20100,0,"[ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+")
-#20103=@"loc,{#10000},2,3,2,42"
-locations_default(#20103,#10000,2,3,2,42)
-hasLocation(#20102,#20103)
-#20104=*
-regexpterm(#20104,8,#20102,0,"[ ]*")
-#20105=@"loc,{#10000},2,3,2,6"
-locations_default(#20105,#10000,2,3,2,6)
-hasLocation(#20104,#20105)
-is_greedy(#20104)
-#20106=*
-regexpterm(#20106,23,#20104,0,"[ ]")
-#20107=@"loc,{#10000},2,3,2,5"
-locations_default(#20107,#10000,2,3,2,5)
-hasLocation(#20106,#20107)
-#20108=*
-regexpterm(#20108,14,#20106,0," ")
-#20109=@"loc,{#10000},2,4,2,4"
-locations_default(#20109,#10000,2,4,2,4)
-hasLocation(#20108,#20109)
-regexp_const_value(#20108," ")
-#20110=*
-regexpterm(#20110,9,#20102,1,"[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+")
-#20111=@"loc,{#10000},2,7,2,42"
-locations_default(#20111,#10000,2,7,2,42)
-hasLocation(#20110,#20111)
-is_greedy(#20110)
-#20112=*
-regexpterm(#20112,23,#20110,0,"[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]")
-#20113=@"loc,{#10000},2,7,2,41"
-locations_default(#20113,#10000,2,7,2,41)
-hasLocation(#20112,#20113)
-#20114=*
-regexpterm(#20114,24,#20112,0,"a-z")
-#20115=@"loc,{#10000},2,8,2,10"
-locations_default(#20115,#10000,2,8,2,10)
-hasLocation(#20114,#20115)
-#20116=*
-regexpterm(#20116,14,#20114,0,"a")
-#20117=@"loc,{#10000},2,8,2,8"
-locations_default(#20117,#10000,2,8,2,8)
-hasLocation(#20116,#20117)
-regexp_const_value(#20116,"a")
-#20118=*
-regexpterm(#20118,14,#20114,1,"z")
-#20119=@"loc,{#10000},2,10,2,10"
-locations_default(#20119,#10000,2,10,2,10)
-hasLocation(#20118,#20119)
-regexp_const_value(#20118,"z")
-#20120=*
-regexpterm(#20120,24,#20112,1,"0-9")
-#20121=@"loc,{#10000},2,11,2,13"
-locations_default(#20121,#10000,2,11,2,13)
-hasLocation(#20120,#20121)
-#20122=*
-regexpterm(#20122,14,#20120,0,"0")
-#20123=@"loc,{#10000},2,11,2,11"
-locations_default(#20123,#10000,2,11,2,11)
-hasLocation(#20122,#20123)
-regexp_const_value(#20122,"0")
-#20124=*
-regexpterm(#20124,14,#20120,1,"9")
-#20125=@"loc,{#10000},2,13,2,13"
-locations_default(#20125,#10000,2,13,2,13)
-hasLocation(#20124,#20125)
-regexp_const_value(#20124,"9")
-#20126=*
-regexpterm(#20126,14,#20112,2,"&")
-#20127=@"loc,{#10000},2,14,2,14"
-locations_default(#20127,#10000,2,14,2,14)
-hasLocation(#20126,#20127)
-regexp_const_value(#20126,"&")
-#20128=*
-regexpterm(#20128,14,#20112,3,"#")
-#20129=@"loc,{#10000},2,15,2,15"
-locations_default(#20129,#10000,2,15,2,15)
-hasLocation(#20128,#20129)
-regexp_const_value(#20128,"#")
-#20130=*
-regexpterm(#20130,14,#20112,4,"*")
-#20131=@"loc,{#10000},2,16,2,16"
-locations_default(#20131,#10000,2,16,2,16)
-hasLocation(#20130,#20131)
-regexp_const_value(#20130,"*")
-#20132=*
-regexpterm(#20132,14,#20112,5,"=")
-#20133=@"loc,{#10000},2,17,2,17"
-locations_default(#20133,#10000,2,17,2,17)
-hasLocation(#20132,#20133)
-regexp_const_value(#20132,"=")
-#20134=*
-regexpterm(#20134,14,#20112,6,"?")
-#20135=@"loc,{#10000},2,18,2,18"
-locations_default(#20135,#10000,2,18,2,18)
-hasLocation(#20134,#20135)
-regexp_const_value(#20134,"?")
-#20136=*
-regexpterm(#20136,14,#20112,7,"@")
-#20137=@"loc,{#10000},2,19,2,19"
-locations_default(#20137,#10000,2,19,2,19)
-hasLocation(#20136,#20137)
-regexp_const_value(#20136,"@")
-#20138=*
-regexpterm(#20138,21,#20112,8,"\\")
-#20139=@"loc,{#10000},2,20,2,21"
-locations_default(#20139,#10000,2,20,2,21)
-hasLocation(#20138,#20139)
-regexp_const_value(#20138,"\")
-#20140=*
-regexpterm(#20140,14,#20112,9,">")
-#20141=@"loc,{#10000},2,22,2,22"
-locations_default(#20141,#10000,2,22,2,22)
-hasLocation(#20140,#20141)
-regexp_const_value(#20140,">")
-#20142=*
-regexpterm(#20142,14,#20112,10,"<")
-#20143=@"loc,{#10000},2,23,2,23"
-locations_default(#20143,#10000,2,23,2,23)
-hasLocation(#20142,#20143)
-regexp_const_value(#20142,"<")
-#20144=*
-regexpterm(#20144,14,#20112,11,":")
-#20145=@"loc,{#10000},2,24,2,24"
-locations_default(#20145,#10000,2,24,2,24)
-hasLocation(#20144,#20145)
-regexp_const_value(#20144,":")
-#20146=*
-regexpterm(#20146,14,#20112,12,",")
-#20147=@"loc,{#10000},2,25,2,25"
-locations_default(#20147,#10000,2,25,2,25)
-hasLocation(#20146,#20147)
-regexp_const_value(#20146,",")
-#20148=*
-regexpterm(#20148,14,#20112,13,"(")
-#20149=@"loc,{#10000},2,26,2,26"
-locations_default(#20149,#10000,2,26,2,26)
-hasLocation(#20148,#20149)
-regexp_const_value(#20148,"(")
-#20150=*
-regexpterm(#20150,14,#20112,14,")")
-#20151=@"loc,{#10000},2,27,2,27"
-locations_default(#20151,#10000,2,27,2,27)
-hasLocation(#20150,#20151)
-regexp_const_value(#20150,")")
-#20152=*
-regexpterm(#20152,14,#20112,15,"$")
-#20153=@"loc,{#10000},2,28,2,28"
-locations_default(#20153,#10000,2,28,2,28)
-hasLocation(#20152,#20153)
-regexp_const_value(#20152,"$")
-#20154=*
-regexpterm(#20154,14,#20112,16,"[")
-#20155=@"loc,{#10000},2,29,2,29"
-locations_default(#20155,#10000,2,29,2,29)
-hasLocation(#20154,#20155)
-regexp_const_value(#20154,"[")
-#20156=*
-regexpterm(#20156,21,#20112,17,"\]")
-#20157=@"loc,{#10000},2,30,2,31"
-locations_default(#20157,#10000,2,30,2,31)
-hasLocation(#20156,#20157)
-regexp_const_value(#20156,"]")
-#20158=*
-regexpterm(#20158,14,#20112,18,"_")
-#20159=@"loc,{#10000},2,32,2,32"
-locations_default(#20159,#10000,2,32,2,32)
-hasLocation(#20158,#20159)
-regexp_const_value(#20158,"_")
-#20160=*
-regexpterm(#20160,14,#20112,19,".")
-#20161=@"loc,{#10000},2,33,2,33"
-locations_default(#20161,#10000,2,33,2,33)
-hasLocation(#20160,#20161)
-regexp_const_value(#20160,".")
-#20162=*
-regexpterm(#20162,14,#20112,20,"{")
-#20163=@"loc,{#10000},2,34,2,34"
-locations_default(#20163,#10000,2,34,2,34)
-hasLocation(#20162,#20163)
-regexp_const_value(#20162,"{")
-#20164=*
-regexpterm(#20164,14,#20112,21,"}")
-#20165=@"loc,{#10000},2,35,2,35"
-locations_default(#20165,#10000,2,35,2,35)
-hasLocation(#20164,#20165)
-regexp_const_value(#20164,"}")
-#20166=*
-regexpterm(#20166,14,#20112,22,"!")
-#20167=@"loc,{#10000},2,36,2,36"
-locations_default(#20167,#10000,2,36,2,36)
-hasLocation(#20166,#20167)
-regexp_const_value(#20166,"!")
-#20168=*
-regexpterm(#20168,14,#20112,23,"+")
-#20169=@"loc,{#10000},2,37,2,37"
-locations_default(#20169,#10000,2,37,2,37)
-hasLocation(#20168,#20169)
-regexp_const_value(#20168,"+")
-#20170=*
-regexpterm(#20170,14,#20112,24,"%")
-#20171=@"loc,{#10000},2,38,2,38"
-locations_default(#20171,#10000,2,38,2,38)
-hasLocation(#20170,#20171)
-regexp_const_value(#20170,"%")
-#20172=*
-regexpterm(#20172,14,#20112,25,"^")
-#20173=@"loc,{#10000},2,39,2,39"
-locations_default(#20173,#10000,2,39,2,39)
-hasLocation(#20172,#20173)
-regexp_const_value(#20172,"^")
-#20174=*
-regexpterm(#20174,14,#20112,26,"-")
-#20175=@"loc,{#10000},2,40,2,40"
-locations_default(#20175,#10000,2,40,2,40)
-hasLocation(#20174,#20175)
-regexp_const_value(#20174,"-")
-#20176=*
-regexpterm(#20176,14,#20096,1,"X")
-#20177=@"loc,{#10000},2,45,2,45"
-locations_default(#20177,#10000,2,45,2,45)
-hasLocation(#20176,#20177)
-regexp_const_value(#20176,"X")
-#20178=*
-entry_cfg_node(#20178,#20001)
-#20179=@"loc,{#10000},1,1,1,0"
-locations_default(#20179,#10000,1,1,1,0)
-hasLocation(#20178,#20179)
-#20180=*
-exit_cfg_node(#20180,#20001)
-hasLocation(#20180,#20015)
-successor(#20094,#20095)
-successor(#20095,#20180)
-successor(#20017,#20018)
-successor(#20018,#20094)
-successor(#20178,#20017)
+exprs(#20096,5,#20095,0,"/([ ]*[ ... -]+)+X/")
+hasLocation(#20096,#20011)
+enclosing_stmt(#20096,#20095)
+expr_containers(#20096,#20001)
+literals("/([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+X/","/([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+X/",#20096)
+#20097=*
+regexpterm(#20097,1,#20096,0,"([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+X")
+#20098=@"loc,{#10000},2,2,2,45"
+locations_default(#20098,#10000,2,2,2,45)
+hasLocation(#20097,#20098)
+#20099=*
+regexpterm(#20099,9,#20097,0,"([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)+")
+#20100=@"loc,{#10000},2,2,2,44"
+locations_default(#20100,#10000,2,2,2,44)
+hasLocation(#20099,#20100)
+is_greedy(#20099)
+#20101=*
+regexpterm(#20101,13,#20099,0,"([ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+)")
+#20102=@"loc,{#10000},2,2,2,43"
+locations_default(#20102,#10000,2,2,2,43)
+hasLocation(#20101,#20102)
+is_capture(#20101,1)
+#20103=*
+regexpterm(#20103,1,#20101,0,"[ ]*[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+")
+#20104=@"loc,{#10000},2,3,2,42"
+locations_default(#20104,#10000,2,3,2,42)
+hasLocation(#20103,#20104)
+#20105=*
+regexpterm(#20105,8,#20103,0,"[ ]*")
+#20106=@"loc,{#10000},2,3,2,6"
+locations_default(#20106,#10000,2,3,2,6)
+hasLocation(#20105,#20106)
+is_greedy(#20105)
+#20107=*
+regexpterm(#20107,23,#20105,0,"[ ]")
+#20108=@"loc,{#10000},2,3,2,5"
+locations_default(#20108,#10000,2,3,2,5)
+hasLocation(#20107,#20108)
+#20109=*
+regexpterm(#20109,14,#20107,0," ")
+#20110=@"loc,{#10000},2,4,2,4"
+locations_default(#20110,#10000,2,4,2,4)
+hasLocation(#20109,#20110)
+regexp_const_value(#20109," ")
+#20111=*
+regexpterm(#20111,9,#20103,1,"[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]+")
+#20112=@"loc,{#10000},2,7,2,42"
+locations_default(#20112,#10000,2,7,2,42)
+hasLocation(#20111,#20112)
+is_greedy(#20111)
+#20113=*
+regexpterm(#20113,23,#20111,0,"[a-z0-9&#*=?@\\><:,()$[\]_.{}!+%^-]")
+#20114=@"loc,{#10000},2,7,2,41"
+locations_default(#20114,#10000,2,7,2,41)
+hasLocation(#20113,#20114)
+#20115=*
+regexpterm(#20115,24,#20113,0,"a-z")
+#20116=@"loc,{#10000},2,8,2,10"
+locations_default(#20116,#10000,2,8,2,10)
+hasLocation(#20115,#20116)
+#20117=*
+regexpterm(#20117,14,#20115,0,"a")
+#20118=@"loc,{#10000},2,8,2,8"
+locations_default(#20118,#10000,2,8,2,8)
+hasLocation(#20117,#20118)
+regexp_const_value(#20117,"a")
+#20119=*
+regexpterm(#20119,14,#20115,1,"z")
+#20120=@"loc,{#10000},2,10,2,10"
+locations_default(#20120,#10000,2,10,2,10)
+hasLocation(#20119,#20120)
+regexp_const_value(#20119,"z")
+#20121=*
+regexpterm(#20121,24,#20113,1,"0-9")
+#20122=@"loc,{#10000},2,11,2,13"
+locations_default(#20122,#10000,2,11,2,13)
+hasLocation(#20121,#20122)
+#20123=*
+regexpterm(#20123,14,#20121,0,"0")
+#20124=@"loc,{#10000},2,11,2,11"
+locations_default(#20124,#10000,2,11,2,11)
+hasLocation(#20123,#20124)
+regexp_const_value(#20123,"0")
+#20125=*
+regexpterm(#20125,14,#20121,1,"9")
+#20126=@"loc,{#10000},2,13,2,13"
+locations_default(#20126,#10000,2,13,2,13)
+hasLocation(#20125,#20126)
+regexp_const_value(#20125,"9")
+#20127=*
+regexpterm(#20127,14,#20113,2,"&")
+#20128=@"loc,{#10000},2,14,2,14"
+locations_default(#20128,#10000,2,14,2,14)
+hasLocation(#20127,#20128)
+regexp_const_value(#20127,"&")
+#20129=*
+regexpterm(#20129,14,#20113,3,"#")
+#20130=@"loc,{#10000},2,15,2,15"
+locations_default(#20130,#10000,2,15,2,15)
+hasLocation(#20129,#20130)
+regexp_const_value(#20129,"#")
+#20131=*
+regexpterm(#20131,14,#20113,4,"*")
+#20132=@"loc,{#10000},2,16,2,16"
+locations_default(#20132,#10000,2,16,2,16)
+hasLocation(#20131,#20132)
+regexp_const_value(#20131,"*")
+#20133=*
+regexpterm(#20133,14,#20113,5,"=")
+#20134=@"loc,{#10000},2,17,2,17"
+locations_default(#20134,#10000,2,17,2,17)
+hasLocation(#20133,#20134)
+regexp_const_value(#20133,"=")
+#20135=*
+regexpterm(#20135,14,#20113,6,"?")
+#20136=@"loc,{#10000},2,18,2,18"
+locations_default(#20136,#10000,2,18,2,18)
+hasLocation(#20135,#20136)
+regexp_const_value(#20135,"?")
+#20137=*
+regexpterm(#20137,14,#20113,7,"@")
+#20138=@"loc,{#10000},2,19,2,19"
+locations_default(#20138,#10000,2,19,2,19)
+hasLocation(#20137,#20138)
+regexp_const_value(#20137,"@")
+#20139=*
+regexpterm(#20139,21,#20113,8,"\\")
+#20140=@"loc,{#10000},2,20,2,21"
+locations_default(#20140,#10000,2,20,2,21)
+hasLocation(#20139,#20140)
+regexp_const_value(#20139,"\")
+#20141=*
+regexpterm(#20141,14,#20113,9,">")
+#20142=@"loc,{#10000},2,22,2,22"
+locations_default(#20142,#10000,2,22,2,22)
+hasLocation(#20141,#20142)
+regexp_const_value(#20141,">")
+#20143=*
+regexpterm(#20143,14,#20113,10,"<")
+#20144=@"loc,{#10000},2,23,2,23"
+locations_default(#20144,#10000,2,23,2,23)
+hasLocation(#20143,#20144)
+regexp_const_value(#20143,"<")
+#20145=*
+regexpterm(#20145,14,#20113,11,":")
+#20146=@"loc,{#10000},2,24,2,24"
+locations_default(#20146,#10000,2,24,2,24)
+hasLocation(#20145,#20146)
+regexp_const_value(#20145,":")
+#20147=*
+regexpterm(#20147,14,#20113,12,",")
+#20148=@"loc,{#10000},2,25,2,25"
+locations_default(#20148,#10000,2,25,2,25)
+hasLocation(#20147,#20148)
+regexp_const_value(#20147,",")
+#20149=*
+regexpterm(#20149,14,#20113,13,"(")
+#20150=@"loc,{#10000},2,26,2,26"
+locations_default(#20150,#10000,2,26,2,26)
+hasLocation(#20149,#20150)
+regexp_const_value(#20149,"(")
+#20151=*
+regexpterm(#20151,14,#20113,14,")")
+#20152=@"loc,{#10000},2,27,2,27"
+locations_default(#20152,#10000,2,27,2,27)
+hasLocation(#20151,#20152)
+regexp_const_value(#20151,")")
+#20153=*
+regexpterm(#20153,14,#20113,15,"$")
+#20154=@"loc,{#10000},2,28,2,28"
+locations_default(#20154,#10000,2,28,2,28)
+hasLocation(#20153,#20154)
+regexp_const_value(#20153,"$")
+#20155=*
+regexpterm(#20155,14,#20113,16,"[")
+#20156=@"loc,{#10000},2,29,2,29"
+locations_default(#20156,#10000,2,29,2,29)
+hasLocation(#20155,#20156)
+regexp_const_value(#20155,"[")
+#20157=*
+regexpterm(#20157,21,#20113,17,"\]")
+#20158=@"loc,{#10000},2,30,2,31"
+locations_default(#20158,#10000,2,30,2,31)
+hasLocation(#20157,#20158)
+regexp_const_value(#20157,"]")
+#20159=*
+regexpterm(#20159,14,#20113,18,"_")
+#20160=@"loc,{#10000},2,32,2,32"
+locations_default(#20160,#10000,2,32,2,32)
+hasLocation(#20159,#20160)
+regexp_const_value(#20159,"_")
+#20161=*
+regexpterm(#20161,14,#20113,19,".")
+#20162=@"loc,{#10000},2,33,2,33"
+locations_default(#20162,#10000,2,33,2,33)
+hasLocation(#20161,#20162)
+regexp_const_value(#20161,".")
+#20163=*
+regexpterm(#20163,14,#20113,20,"{")
+#20164=@"loc,{#10000},2,34,2,34"
+locations_default(#20164,#10000,2,34,2,34)
+hasLocation(#20163,#20164)
+regexp_const_value(#20163,"{")
+#20165=*
+regexpterm(#20165,14,#20113,21,"}")
+#20166=@"loc,{#10000},2,35,2,35"
+locations_default(#20166,#10000,2,35,2,35)
+hasLocation(#20165,#20166)
+regexp_const_value(#20165,"}")
+#20167=*
+regexpterm(#20167,14,#20113,22,"!")
+#20168=@"loc,{#10000},2,36,2,36"
+locations_default(#20168,#10000,2,36,2,36)
+hasLocation(#20167,#20168)
+regexp_const_value(#20167,"!")
+#20169=*
+regexpterm(#20169,14,#20113,23,"+")
+#20170=@"loc,{#10000},2,37,2,37"
+locations_default(#20170,#10000,2,37,2,37)
+hasLocation(#20169,#20170)
+regexp_const_value(#20169,"+")
+#20171=*
+regexpterm(#20171,14,#20113,24,"%")
+#20172=@"loc,{#10000},2,38,2,38"
+locations_default(#20172,#10000,2,38,2,38)
+hasLocation(#20171,#20172)
+regexp_const_value(#20171,"%")
+#20173=*
+regexpterm(#20173,14,#20113,25,"^")
+#20174=@"loc,{#10000},2,39,2,39"
+locations_default(#20174,#10000,2,39,2,39)
+hasLocation(#20173,#20174)
+regexp_const_value(#20173,"^")
+#20175=*
+regexpterm(#20175,14,#20113,26,"-")
+#20176=@"loc,{#10000},2,40,2,40"
+locations_default(#20176,#10000,2,40,2,40)
+hasLocation(#20175,#20176)
+regexp_const_value(#20175,"-")
+#20177=*
+regexpterm(#20177,14,#20097,1,"X")
+#20178=@"loc,{#10000},2,45,2,45"
+locations_default(#20178,#10000,2,45,2,45)
+hasLocation(#20177,#20178)
+regexp_const_value(#20177,"X")
+#20179=*
+entry_cfg_node(#20179,#20001)
+#20180=@"loc,{#10000},1,1,1,0"
+locations_default(#20180,#10000,1,1,1,0)
+hasLocation(#20179,#20180)
+#20181=*
+exit_cfg_node(#20181,#20001)
+hasLocation(#20181,#20015)
+successor(#20095,#20096)
+successor(#20096,#20181)
+successor(#20018,#20019)
+successor(#20019,#20095)
+successor(#20179,#20018)
 numlines(#10000,2,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2024/output/trap/intersection.js.trap b/javascript/extractor/tests/es2024/output/trap/intersection.js.trap
index a48eccb5a74..f1aec3ba2b5 100644
--- a/javascript/extractor/tests/es2024/output/trap/intersection.js.trap
+++ b/javascript/extractor/tests/es2024/output/trap/intersection.js.trap
@@ -146,252 +146,254 @@ toplevels(#20001,0)
 #20048=@"loc,{#10000},1,1,8,0"
 locations_default(#20048,#10000,1,1,8,0)
 hasLocation(#20001,#20048)
-#20049=*
-stmts(#20049,2,#20001,0,"/[[abc]&&[bcd]]/v;")
-#20050=@"loc,{#10000},1,1,1,18"
-locations_default(#20050,#10000,1,1,1,18)
-hasLocation(#20049,#20050)
-stmt_containers(#20049,#20001)
-#20051=*
-exprs(#20051,5,#20049,0,"/[[abc]&&[bcd]]/v")
-hasLocation(#20051,#20031)
-enclosing_stmt(#20051,#20049)
-expr_containers(#20051,#20001)
-literals("/[[abc]&&[bcd]]/v","/[[abc]&&[bcd]]/v",#20051)
+#20049=@"var;{this};{#20000}"
+variables(#20049,"this",#20000)
+#20050=*
+stmts(#20050,2,#20001,0,"/[[abc]&&[bcd]]/v;")
+#20051=@"loc,{#10000},1,1,1,18"
+locations_default(#20051,#10000,1,1,1,18)
+hasLocation(#20050,#20051)
+stmt_containers(#20050,#20001)
 #20052=*
-regexpterm(#20052,23,#20051,0,"[[abc]&&[bcd]]")
-#20053=@"loc,{#10000},1,2,1,15"
-locations_default(#20053,#10000,1,2,1,15)
-hasLocation(#20052,#20053)
-#20054=*
-regexpterm(#20054,29,#20052,0,"[[abc]&&[bcd]]")
-hasLocation(#20054,#20053)
+exprs(#20052,5,#20050,0,"/[[abc]&&[bcd]]/v")
+hasLocation(#20052,#20031)
+enclosing_stmt(#20052,#20050)
+expr_containers(#20052,#20001)
+literals("/[[abc]&&[bcd]]/v","/[[abc]&&[bcd]]/v",#20052)
+#20053=*
+regexpterm(#20053,23,#20052,0,"[[abc]&&[bcd]]")
+#20054=@"loc,{#10000},1,2,1,15"
+locations_default(#20054,#10000,1,2,1,15)
+hasLocation(#20053,#20054)
 #20055=*
-regexpterm(#20055,23,#20054,0,"[abc]")
-#20056=@"loc,{#10000},1,3,1,7"
-locations_default(#20056,#10000,1,3,1,7)
-hasLocation(#20055,#20056)
-#20057=*
-regexpterm(#20057,14,#20055,0,"a")
-#20058=@"loc,{#10000},1,4,1,4"
-locations_default(#20058,#10000,1,4,1,4)
-hasLocation(#20057,#20058)
-regexp_const_value(#20057,"a")
-#20059=*
-regexpterm(#20059,14,#20055,1,"b")
-#20060=@"loc,{#10000},1,5,1,5"
-locations_default(#20060,#10000,1,5,1,5)
-hasLocation(#20059,#20060)
-regexp_const_value(#20059,"b")
-#20061=*
-regexpterm(#20061,14,#20055,2,"c")
-#20062=@"loc,{#10000},1,6,1,6"
-locations_default(#20062,#10000,1,6,1,6)
-hasLocation(#20061,#20062)
-regexp_const_value(#20061,"c")
-#20063=*
-regexpterm(#20063,23,#20054,1,"[bcd]")
-#20064=@"loc,{#10000},1,10,1,14"
-locations_default(#20064,#10000,1,10,1,14)
-hasLocation(#20063,#20064)
-#20065=*
-regexpterm(#20065,14,#20063,0,"b")
-#20066=@"loc,{#10000},1,11,1,11"
-locations_default(#20066,#10000,1,11,1,11)
-hasLocation(#20065,#20066)
-regexp_const_value(#20065,"b")
-#20067=*
-regexpterm(#20067,14,#20063,1,"c")
-#20068=@"loc,{#10000},1,12,1,12"
-locations_default(#20068,#10000,1,12,1,12)
-hasLocation(#20067,#20068)
-regexp_const_value(#20067,"c")
-#20069=*
-regexpterm(#20069,14,#20063,2,"d")
-#20070=@"loc,{#10000},1,13,1,13"
-locations_default(#20070,#10000,1,13,1,13)
-hasLocation(#20069,#20070)
-regexp_const_value(#20069,"d")
-#20071=*
-stmts(#20071,2,#20001,1,"/abc&&bcd/v;")
-#20072=@"loc,{#10000},2,1,2,12"
-locations_default(#20072,#10000,2,1,2,12)
-hasLocation(#20071,#20072)
-stmt_containers(#20071,#20001)
-#20073=*
-exprs(#20073,5,#20071,0,"/abc&&bcd/v")
-hasLocation(#20073,#20035)
-enclosing_stmt(#20073,#20071)
-expr_containers(#20073,#20001)
-literals("/abc&&bcd/v","/abc&&bcd/v",#20073)
+regexpterm(#20055,29,#20053,0,"[[abc]&&[bcd]]")
+hasLocation(#20055,#20054)
+#20056=*
+regexpterm(#20056,23,#20055,0,"[abc]")
+#20057=@"loc,{#10000},1,3,1,7"
+locations_default(#20057,#10000,1,3,1,7)
+hasLocation(#20056,#20057)
+#20058=*
+regexpterm(#20058,14,#20056,0,"a")
+#20059=@"loc,{#10000},1,4,1,4"
+locations_default(#20059,#10000,1,4,1,4)
+hasLocation(#20058,#20059)
+regexp_const_value(#20058,"a")
+#20060=*
+regexpterm(#20060,14,#20056,1,"b")
+#20061=@"loc,{#10000},1,5,1,5"
+locations_default(#20061,#10000,1,5,1,5)
+hasLocation(#20060,#20061)
+regexp_const_value(#20060,"b")
+#20062=*
+regexpterm(#20062,14,#20056,2,"c")
+#20063=@"loc,{#10000},1,6,1,6"
+locations_default(#20063,#10000,1,6,1,6)
+hasLocation(#20062,#20063)
+regexp_const_value(#20062,"c")
+#20064=*
+regexpterm(#20064,23,#20055,1,"[bcd]")
+#20065=@"loc,{#10000},1,10,1,14"
+locations_default(#20065,#10000,1,10,1,14)
+hasLocation(#20064,#20065)
+#20066=*
+regexpterm(#20066,14,#20064,0,"b")
+#20067=@"loc,{#10000},1,11,1,11"
+locations_default(#20067,#10000,1,11,1,11)
+hasLocation(#20066,#20067)
+regexp_const_value(#20066,"b")
+#20068=*
+regexpterm(#20068,14,#20064,1,"c")
+#20069=@"loc,{#10000},1,12,1,12"
+locations_default(#20069,#10000,1,12,1,12)
+hasLocation(#20068,#20069)
+regexp_const_value(#20068,"c")
+#20070=*
+regexpterm(#20070,14,#20064,2,"d")
+#20071=@"loc,{#10000},1,13,1,13"
+locations_default(#20071,#10000,1,13,1,13)
+hasLocation(#20070,#20071)
+regexp_const_value(#20070,"d")
+#20072=*
+stmts(#20072,2,#20001,1,"/abc&&bcd/v;")
+#20073=@"loc,{#10000},2,1,2,12"
+locations_default(#20073,#10000,2,1,2,12)
+hasLocation(#20072,#20073)
+stmt_containers(#20072,#20001)
 #20074=*
-regexpterm(#20074,14,#20073,0,"abc&&bcd")
-#20075=@"loc,{#10000},2,2,2,9"
-locations_default(#20075,#10000,2,2,2,9)
-hasLocation(#20074,#20075)
-regexp_const_value(#20074,"abc&&bcd")
-#20076=*
-stmts(#20076,2,#20001,2,"/[abc]&&[bcd]/v;")
-#20077=@"loc,{#10000},3,1,3,16"
-locations_default(#20077,#10000,3,1,3,16)
-hasLocation(#20076,#20077)
-stmt_containers(#20076,#20001)
-#20078=*
-exprs(#20078,5,#20076,0,"/[abc]&&[bcd]/v")
-hasLocation(#20078,#20039)
-enclosing_stmt(#20078,#20076)
-expr_containers(#20078,#20001)
-literals("/[abc]&&[bcd]/v","/[abc]&&[bcd]/v",#20078)
+exprs(#20074,5,#20072,0,"/abc&&bcd/v")
+hasLocation(#20074,#20035)
+enclosing_stmt(#20074,#20072)
+expr_containers(#20074,#20001)
+literals("/abc&&bcd/v","/abc&&bcd/v",#20074)
+#20075=*
+regexpterm(#20075,14,#20074,0,"abc&&bcd")
+#20076=@"loc,{#10000},2,2,2,9"
+locations_default(#20076,#10000,2,2,2,9)
+hasLocation(#20075,#20076)
+regexp_const_value(#20075,"abc&&bcd")
+#20077=*
+stmts(#20077,2,#20001,2,"/[abc]&&[bcd]/v;")
+#20078=@"loc,{#10000},3,1,3,16"
+locations_default(#20078,#10000,3,1,3,16)
+hasLocation(#20077,#20078)
+stmt_containers(#20077,#20001)
 #20079=*
-regexpterm(#20079,1,#20078,0,"[abc]&&[bcd]")
-#20080=@"loc,{#10000},3,2,3,13"
-locations_default(#20080,#10000,3,2,3,13)
-hasLocation(#20079,#20080)
-#20081=*
-regexpterm(#20081,23,#20079,0,"[abc]")
-#20082=@"loc,{#10000},3,2,3,6"
-locations_default(#20082,#10000,3,2,3,6)
-hasLocation(#20081,#20082)
-#20083=*
-regexpterm(#20083,14,#20081,0,"a")
-#20084=@"loc,{#10000},3,3,3,3"
-locations_default(#20084,#10000,3,3,3,3)
-hasLocation(#20083,#20084)
-regexp_const_value(#20083,"a")
-#20085=*
-regexpterm(#20085,14,#20081,1,"b")
-#20086=@"loc,{#10000},3,4,3,4"
-locations_default(#20086,#10000,3,4,3,4)
-hasLocation(#20085,#20086)
-regexp_const_value(#20085,"b")
-#20087=*
-regexpterm(#20087,14,#20081,2,"c")
-#20088=@"loc,{#10000},3,5,3,5"
-locations_default(#20088,#10000,3,5,3,5)
-hasLocation(#20087,#20088)
-regexp_const_value(#20087,"c")
-#20089=*
-regexpterm(#20089,14,#20079,1,"&&")
-#20090=@"loc,{#10000},3,7,3,8"
-locations_default(#20090,#10000,3,7,3,8)
-hasLocation(#20089,#20090)
-regexp_const_value(#20089,"&&")
-#20091=*
-regexpterm(#20091,23,#20079,2,"[bcd]")
-#20092=@"loc,{#10000},3,9,3,13"
-locations_default(#20092,#10000,3,9,3,13)
-hasLocation(#20091,#20092)
-#20093=*
-regexpterm(#20093,14,#20091,0,"b")
-#20094=@"loc,{#10000},3,10,3,10"
-locations_default(#20094,#10000,3,10,3,10)
-hasLocation(#20093,#20094)
-regexp_const_value(#20093,"b")
-#20095=*
-regexpterm(#20095,14,#20091,1,"c")
-#20096=@"loc,{#10000},3,11,3,11"
-locations_default(#20096,#10000,3,11,3,11)
-hasLocation(#20095,#20096)
-regexp_const_value(#20095,"c")
-#20097=*
-regexpterm(#20097,14,#20091,2,"d")
-#20098=@"loc,{#10000},3,12,3,12"
-locations_default(#20098,#10000,3,12,3,12)
-hasLocation(#20097,#20098)
-regexp_const_value(#20097,"d")
-#20099=*
-stmts(#20099,2,#20001,3,"/[[abc] ... [c]]/v;")
-#20100=@"loc,{#10000},7,1,7,23"
-locations_default(#20100,#10000,7,1,7,23)
-hasLocation(#20099,#20100)
-stmt_containers(#20099,#20001)
-#20101=*
-exprs(#20101,5,#20099,0,"/[[abc] ... &[c]]/v")
-hasLocation(#20101,#20043)
-enclosing_stmt(#20101,#20099)
-expr_containers(#20101,#20001)
-literals("/[[abc]&&[bcd]&&[c]]/v","/[[abc]&&[bcd]&&[c]]/v",#20101)
+exprs(#20079,5,#20077,0,"/[abc]&&[bcd]/v")
+hasLocation(#20079,#20039)
+enclosing_stmt(#20079,#20077)
+expr_containers(#20079,#20001)
+literals("/[abc]&&[bcd]/v","/[abc]&&[bcd]/v",#20079)
+#20080=*
+regexpterm(#20080,1,#20079,0,"[abc]&&[bcd]")
+#20081=@"loc,{#10000},3,2,3,13"
+locations_default(#20081,#10000,3,2,3,13)
+hasLocation(#20080,#20081)
+#20082=*
+regexpterm(#20082,23,#20080,0,"[abc]")
+#20083=@"loc,{#10000},3,2,3,6"
+locations_default(#20083,#10000,3,2,3,6)
+hasLocation(#20082,#20083)
+#20084=*
+regexpterm(#20084,14,#20082,0,"a")
+#20085=@"loc,{#10000},3,3,3,3"
+locations_default(#20085,#10000,3,3,3,3)
+hasLocation(#20084,#20085)
+regexp_const_value(#20084,"a")
+#20086=*
+regexpterm(#20086,14,#20082,1,"b")
+#20087=@"loc,{#10000},3,4,3,4"
+locations_default(#20087,#10000,3,4,3,4)
+hasLocation(#20086,#20087)
+regexp_const_value(#20086,"b")
+#20088=*
+regexpterm(#20088,14,#20082,2,"c")
+#20089=@"loc,{#10000},3,5,3,5"
+locations_default(#20089,#10000,3,5,3,5)
+hasLocation(#20088,#20089)
+regexp_const_value(#20088,"c")
+#20090=*
+regexpterm(#20090,14,#20080,1,"&&")
+#20091=@"loc,{#10000},3,7,3,8"
+locations_default(#20091,#10000,3,7,3,8)
+hasLocation(#20090,#20091)
+regexp_const_value(#20090,"&&")
+#20092=*
+regexpterm(#20092,23,#20080,2,"[bcd]")
+#20093=@"loc,{#10000},3,9,3,13"
+locations_default(#20093,#10000,3,9,3,13)
+hasLocation(#20092,#20093)
+#20094=*
+regexpterm(#20094,14,#20092,0,"b")
+#20095=@"loc,{#10000},3,10,3,10"
+locations_default(#20095,#10000,3,10,3,10)
+hasLocation(#20094,#20095)
+regexp_const_value(#20094,"b")
+#20096=*
+regexpterm(#20096,14,#20092,1,"c")
+#20097=@"loc,{#10000},3,11,3,11"
+locations_default(#20097,#10000,3,11,3,11)
+hasLocation(#20096,#20097)
+regexp_const_value(#20096,"c")
+#20098=*
+regexpterm(#20098,14,#20092,2,"d")
+#20099=@"loc,{#10000},3,12,3,12"
+locations_default(#20099,#10000,3,12,3,12)
+hasLocation(#20098,#20099)
+regexp_const_value(#20098,"d")
+#20100=*
+stmts(#20100,2,#20001,3,"/[[abc] ... [c]]/v;")
+#20101=@"loc,{#10000},7,1,7,23"
+locations_default(#20101,#10000,7,1,7,23)
+hasLocation(#20100,#20101)
+stmt_containers(#20100,#20001)
 #20102=*
-regexpterm(#20102,23,#20101,0,"[[abc]&&[bcd]&&[c]]")
-#20103=@"loc,{#10000},7,2,7,20"
-locations_default(#20103,#10000,7,2,7,20)
-hasLocation(#20102,#20103)
-#20104=*
-regexpterm(#20104,29,#20102,0,"[[abc]&&[bcd]&&[c]]")
-hasLocation(#20104,#20103)
+exprs(#20102,5,#20100,0,"/[[abc] ... &[c]]/v")
+hasLocation(#20102,#20043)
+enclosing_stmt(#20102,#20100)
+expr_containers(#20102,#20001)
+literals("/[[abc]&&[bcd]&&[c]]/v","/[[abc]&&[bcd]&&[c]]/v",#20102)
+#20103=*
+regexpterm(#20103,23,#20102,0,"[[abc]&&[bcd]&&[c]]")
+#20104=@"loc,{#10000},7,2,7,20"
+locations_default(#20104,#10000,7,2,7,20)
+hasLocation(#20103,#20104)
 #20105=*
-regexpterm(#20105,23,#20104,0,"[abc]")
-#20106=@"loc,{#10000},7,3,7,7"
-locations_default(#20106,#10000,7,3,7,7)
-hasLocation(#20105,#20106)
-#20107=*
-regexpterm(#20107,14,#20105,0,"a")
-#20108=@"loc,{#10000},7,4,7,4"
-locations_default(#20108,#10000,7,4,7,4)
-hasLocation(#20107,#20108)
-regexp_const_value(#20107,"a")
-#20109=*
-regexpterm(#20109,14,#20105,1,"b")
-#20110=@"loc,{#10000},7,5,7,5"
-locations_default(#20110,#10000,7,5,7,5)
-hasLocation(#20109,#20110)
-regexp_const_value(#20109,"b")
-#20111=*
-regexpterm(#20111,14,#20105,2,"c")
-#20112=@"loc,{#10000},7,6,7,6"
-locations_default(#20112,#10000,7,6,7,6)
-hasLocation(#20111,#20112)
-regexp_const_value(#20111,"c")
-#20113=*
-regexpterm(#20113,23,#20104,1,"[bcd]")
-#20114=@"loc,{#10000},7,10,7,14"
-locations_default(#20114,#10000,7,10,7,14)
-hasLocation(#20113,#20114)
-#20115=*
-regexpterm(#20115,14,#20113,0,"b")
-#20116=@"loc,{#10000},7,11,7,11"
-locations_default(#20116,#10000,7,11,7,11)
-hasLocation(#20115,#20116)
-regexp_const_value(#20115,"b")
-#20117=*
-regexpterm(#20117,14,#20113,1,"c")
-#20118=@"loc,{#10000},7,12,7,12"
-locations_default(#20118,#10000,7,12,7,12)
-hasLocation(#20117,#20118)
-regexp_const_value(#20117,"c")
-#20119=*
-regexpterm(#20119,14,#20113,2,"d")
-#20120=@"loc,{#10000},7,13,7,13"
-locations_default(#20120,#10000,7,13,7,13)
-hasLocation(#20119,#20120)
-regexp_const_value(#20119,"d")
-#20121=*
-regexpterm(#20121,23,#20104,2,"[c]")
-#20122=@"loc,{#10000},7,17,7,19"
-locations_default(#20122,#10000,7,17,7,19)
-hasLocation(#20121,#20122)
-#20123=*
-regexpterm(#20123,14,#20121,0,"c")
-#20124=@"loc,{#10000},7,18,7,18"
-locations_default(#20124,#10000,7,18,7,18)
-hasLocation(#20123,#20124)
-regexp_const_value(#20123,"c")
-#20125=*
-entry_cfg_node(#20125,#20001)
-#20126=@"loc,{#10000},1,1,1,0"
-locations_default(#20126,#10000,1,1,1,0)
-hasLocation(#20125,#20126)
-#20127=*
-exit_cfg_node(#20127,#20001)
-hasLocation(#20127,#20047)
-successor(#20099,#20101)
-successor(#20101,#20127)
-successor(#20076,#20078)
-successor(#20078,#20099)
-successor(#20071,#20073)
-successor(#20073,#20076)
-successor(#20049,#20051)
-successor(#20051,#20071)
-successor(#20125,#20049)
+regexpterm(#20105,29,#20103,0,"[[abc]&&[bcd]&&[c]]")
+hasLocation(#20105,#20104)
+#20106=*
+regexpterm(#20106,23,#20105,0,"[abc]")
+#20107=@"loc,{#10000},7,3,7,7"
+locations_default(#20107,#10000,7,3,7,7)
+hasLocation(#20106,#20107)
+#20108=*
+regexpterm(#20108,14,#20106,0,"a")
+#20109=@"loc,{#10000},7,4,7,4"
+locations_default(#20109,#10000,7,4,7,4)
+hasLocation(#20108,#20109)
+regexp_const_value(#20108,"a")
+#20110=*
+regexpterm(#20110,14,#20106,1,"b")
+#20111=@"loc,{#10000},7,5,7,5"
+locations_default(#20111,#10000,7,5,7,5)
+hasLocation(#20110,#20111)
+regexp_const_value(#20110,"b")
+#20112=*
+regexpterm(#20112,14,#20106,2,"c")
+#20113=@"loc,{#10000},7,6,7,6"
+locations_default(#20113,#10000,7,6,7,6)
+hasLocation(#20112,#20113)
+regexp_const_value(#20112,"c")
+#20114=*
+regexpterm(#20114,23,#20105,1,"[bcd]")
+#20115=@"loc,{#10000},7,10,7,14"
+locations_default(#20115,#10000,7,10,7,14)
+hasLocation(#20114,#20115)
+#20116=*
+regexpterm(#20116,14,#20114,0,"b")
+#20117=@"loc,{#10000},7,11,7,11"
+locations_default(#20117,#10000,7,11,7,11)
+hasLocation(#20116,#20117)
+regexp_const_value(#20116,"b")
+#20118=*
+regexpterm(#20118,14,#20114,1,"c")
+#20119=@"loc,{#10000},7,12,7,12"
+locations_default(#20119,#10000,7,12,7,12)
+hasLocation(#20118,#20119)
+regexp_const_value(#20118,"c")
+#20120=*
+regexpterm(#20120,14,#20114,2,"d")
+#20121=@"loc,{#10000},7,13,7,13"
+locations_default(#20121,#10000,7,13,7,13)
+hasLocation(#20120,#20121)
+regexp_const_value(#20120,"d")
+#20122=*
+regexpterm(#20122,23,#20105,2,"[c]")
+#20123=@"loc,{#10000},7,17,7,19"
+locations_default(#20123,#10000,7,17,7,19)
+hasLocation(#20122,#20123)
+#20124=*
+regexpterm(#20124,14,#20122,0,"c")
+#20125=@"loc,{#10000},7,18,7,18"
+locations_default(#20125,#10000,7,18,7,18)
+hasLocation(#20124,#20125)
+regexp_const_value(#20124,"c")
+#20126=*
+entry_cfg_node(#20126,#20001)
+#20127=@"loc,{#10000},1,1,1,0"
+locations_default(#20127,#10000,1,1,1,0)
+hasLocation(#20126,#20127)
+#20128=*
+exit_cfg_node(#20128,#20001)
+hasLocation(#20128,#20047)
+successor(#20100,#20102)
+successor(#20102,#20128)
+successor(#20077,#20079)
+successor(#20079,#20100)
+successor(#20072,#20074)
+successor(#20074,#20077)
+successor(#20050,#20052)
+successor(#20052,#20072)
+successor(#20126,#20050)
 numlines(#10000,7,4,7)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2024/output/trap/regex_nested_character_class.js.trap b/javascript/extractor/tests/es2024/output/trap/regex_nested_character_class.js.trap
index c3bc9112cc5..5bea0115e12 100644
--- a/javascript/extractor/tests/es2024/output/trap/regex_nested_character_class.js.trap
+++ b/javascript/extractor/tests/es2024/output/trap/regex_nested_character_class.js.trap
@@ -73,139 +73,141 @@ toplevels(#20001,0)
 #20024=@"loc,{#10000},1,1,4,0"
 locations_default(#20024,#10000,1,1,4,0)
 hasLocation(#20001,#20024)
-#20025=*
-stmts(#20025,2,#20001,0,"/[[]]/v;")
-#20026=@"loc,{#10000},1,1,1,8"
-locations_default(#20026,#10000,1,1,1,8)
-hasLocation(#20025,#20026)
-stmt_containers(#20025,#20001)
-#20027=*
-exprs(#20027,5,#20025,0,"/[[]]/v")
-hasLocation(#20027,#20011)
-enclosing_stmt(#20027,#20025)
-expr_containers(#20027,#20001)
-literals("/[[]]/v","/[[]]/v",#20027)
+#20025=@"var;{this};{#20000}"
+variables(#20025,"this",#20000)
+#20026=*
+stmts(#20026,2,#20001,0,"/[[]]/v;")
+#20027=@"loc,{#10000},1,1,1,8"
+locations_default(#20027,#10000,1,1,1,8)
+hasLocation(#20026,#20027)
+stmt_containers(#20026,#20001)
 #20028=*
-regexpterm(#20028,23,#20027,0,"[[]]")
-#20029=@"loc,{#10000},1,2,1,5"
-locations_default(#20029,#10000,1,2,1,5)
-hasLocation(#20028,#20029)
-#20030=*
-regexpterm(#20030,23,#20028,0,"[]")
-#20031=@"loc,{#10000},1,3,1,4"
-locations_default(#20031,#10000,1,3,1,4)
-hasLocation(#20030,#20031)
-#20032=*
-stmts(#20032,2,#20001,1,"/[[a]]/v;")
-hasLocation(#20032,#20007)
-stmt_containers(#20032,#20001)
+exprs(#20028,5,#20026,0,"/[[]]/v")
+hasLocation(#20028,#20011)
+enclosing_stmt(#20028,#20026)
+expr_containers(#20028,#20001)
+literals("/[[]]/v","/[[]]/v",#20028)
+#20029=*
+regexpterm(#20029,23,#20028,0,"[[]]")
+#20030=@"loc,{#10000},1,2,1,5"
+locations_default(#20030,#10000,1,2,1,5)
+hasLocation(#20029,#20030)
+#20031=*
+regexpterm(#20031,23,#20029,0,"[]")
+#20032=@"loc,{#10000},1,3,1,4"
+locations_default(#20032,#10000,1,3,1,4)
+hasLocation(#20031,#20032)
 #20033=*
-exprs(#20033,5,#20032,0,"/[[a]]/v")
-hasLocation(#20033,#20015)
-enclosing_stmt(#20033,#20032)
-expr_containers(#20033,#20001)
-literals("/[[a]]/v","/[[a]]/v",#20033)
+stmts(#20033,2,#20001,1,"/[[a]]/v;")
+hasLocation(#20033,#20007)
+stmt_containers(#20033,#20001)
 #20034=*
-regexpterm(#20034,23,#20033,0,"[[a]]")
-#20035=@"loc,{#10000},2,2,2,6"
-locations_default(#20035,#10000,2,2,2,6)
-hasLocation(#20034,#20035)
-#20036=*
-regexpterm(#20036,23,#20034,0,"[a]")
-#20037=@"loc,{#10000},2,3,2,5"
-locations_default(#20037,#10000,2,3,2,5)
-hasLocation(#20036,#20037)
-#20038=*
-regexpterm(#20038,14,#20036,0,"a")
-#20039=@"loc,{#10000},2,4,2,4"
-locations_default(#20039,#10000,2,4,2,4)
-hasLocation(#20038,#20039)
-regexp_const_value(#20038,"a")
-#20040=*
-stmts(#20040,2,#20001,2,"/[ [] [ [] [] ] ]/v;")
-hasLocation(#20040,#20009)
-stmt_containers(#20040,#20001)
+exprs(#20034,5,#20033,0,"/[[a]]/v")
+hasLocation(#20034,#20015)
+enclosing_stmt(#20034,#20033)
+expr_containers(#20034,#20001)
+literals("/[[a]]/v","/[[a]]/v",#20034)
+#20035=*
+regexpterm(#20035,23,#20034,0,"[[a]]")
+#20036=@"loc,{#10000},2,2,2,6"
+locations_default(#20036,#10000,2,2,2,6)
+hasLocation(#20035,#20036)
+#20037=*
+regexpterm(#20037,23,#20035,0,"[a]")
+#20038=@"loc,{#10000},2,3,2,5"
+locations_default(#20038,#10000,2,3,2,5)
+hasLocation(#20037,#20038)
+#20039=*
+regexpterm(#20039,14,#20037,0,"a")
+#20040=@"loc,{#10000},2,4,2,4"
+locations_default(#20040,#10000,2,4,2,4)
+hasLocation(#20039,#20040)
+regexp_const_value(#20039,"a")
 #20041=*
-exprs(#20041,5,#20040,0,"/[ [] [ [] [] ] ]/v")
-hasLocation(#20041,#20019)
-enclosing_stmt(#20041,#20040)
-expr_containers(#20041,#20001)
-literals("/[ [] [ [] [] ] ]/v","/[ [] [ [] [] ] ]/v",#20041)
+stmts(#20041,2,#20001,2,"/[ [] [ [] [] ] ]/v;")
+hasLocation(#20041,#20009)
+stmt_containers(#20041,#20001)
 #20042=*
-regexpterm(#20042,23,#20041,0,"[ [] [ [] [] ] ]")
-#20043=@"loc,{#10000},3,2,3,17"
-locations_default(#20043,#10000,3,2,3,17)
-hasLocation(#20042,#20043)
-#20044=*
-regexpterm(#20044,14,#20042,0," ")
-#20045=@"loc,{#10000},3,3,3,3"
-locations_default(#20045,#10000,3,3,3,3)
-hasLocation(#20044,#20045)
-regexp_const_value(#20044," ")
-#20046=*
-regexpterm(#20046,23,#20042,1,"[]")
-#20047=@"loc,{#10000},3,4,3,5"
-locations_default(#20047,#10000,3,4,3,5)
-hasLocation(#20046,#20047)
-#20048=*
-regexpterm(#20048,14,#20042,2," ")
-#20049=@"loc,{#10000},3,6,3,6"
-locations_default(#20049,#10000,3,6,3,6)
-hasLocation(#20048,#20049)
-regexp_const_value(#20048," ")
-#20050=*
-regexpterm(#20050,23,#20042,3,"[ [] [] ]")
-#20051=@"loc,{#10000},3,7,3,15"
-locations_default(#20051,#10000,3,7,3,15)
-hasLocation(#20050,#20051)
-#20052=*
-regexpterm(#20052,14,#20050,0," ")
-#20053=@"loc,{#10000},3,8,3,8"
-locations_default(#20053,#10000,3,8,3,8)
-hasLocation(#20052,#20053)
-regexp_const_value(#20052," ")
-#20054=*
-regexpterm(#20054,23,#20050,1,"[]")
-#20055=@"loc,{#10000},3,9,3,10"
-locations_default(#20055,#10000,3,9,3,10)
-hasLocation(#20054,#20055)
-#20056=*
-regexpterm(#20056,14,#20050,2," ")
-#20057=@"loc,{#10000},3,11,3,11"
-locations_default(#20057,#10000,3,11,3,11)
-hasLocation(#20056,#20057)
-regexp_const_value(#20056," ")
-#20058=*
-regexpterm(#20058,23,#20050,3,"[]")
-#20059=@"loc,{#10000},3,12,3,13"
-locations_default(#20059,#10000,3,12,3,13)
-hasLocation(#20058,#20059)
-#20060=*
-regexpterm(#20060,14,#20050,4," ")
-#20061=@"loc,{#10000},3,14,3,14"
-locations_default(#20061,#10000,3,14,3,14)
-hasLocation(#20060,#20061)
-regexp_const_value(#20060," ")
-#20062=*
-regexpterm(#20062,14,#20042,4," ")
-#20063=@"loc,{#10000},3,16,3,16"
-locations_default(#20063,#10000,3,16,3,16)
-hasLocation(#20062,#20063)
-regexp_const_value(#20062," ")
-#20064=*
-entry_cfg_node(#20064,#20001)
-#20065=@"loc,{#10000},1,1,1,0"
-locations_default(#20065,#10000,1,1,1,0)
-hasLocation(#20064,#20065)
-#20066=*
-exit_cfg_node(#20066,#20001)
-hasLocation(#20066,#20023)
-successor(#20040,#20041)
-successor(#20041,#20066)
-successor(#20032,#20033)
-successor(#20033,#20040)
-successor(#20025,#20027)
-successor(#20027,#20032)
-successor(#20064,#20025)
+exprs(#20042,5,#20041,0,"/[ [] [ [] [] ] ]/v")
+hasLocation(#20042,#20019)
+enclosing_stmt(#20042,#20041)
+expr_containers(#20042,#20001)
+literals("/[ [] [ [] [] ] ]/v","/[ [] [ [] [] ] ]/v",#20042)
+#20043=*
+regexpterm(#20043,23,#20042,0,"[ [] [ [] [] ] ]")
+#20044=@"loc,{#10000},3,2,3,17"
+locations_default(#20044,#10000,3,2,3,17)
+hasLocation(#20043,#20044)
+#20045=*
+regexpterm(#20045,14,#20043,0," ")
+#20046=@"loc,{#10000},3,3,3,3"
+locations_default(#20046,#10000,3,3,3,3)
+hasLocation(#20045,#20046)
+regexp_const_value(#20045," ")
+#20047=*
+regexpterm(#20047,23,#20043,1,"[]")
+#20048=@"loc,{#10000},3,4,3,5"
+locations_default(#20048,#10000,3,4,3,5)
+hasLocation(#20047,#20048)
+#20049=*
+regexpterm(#20049,14,#20043,2," ")
+#20050=@"loc,{#10000},3,6,3,6"
+locations_default(#20050,#10000,3,6,3,6)
+hasLocation(#20049,#20050)
+regexp_const_value(#20049," ")
+#20051=*
+regexpterm(#20051,23,#20043,3,"[ [] [] ]")
+#20052=@"loc,{#10000},3,7,3,15"
+locations_default(#20052,#10000,3,7,3,15)
+hasLocation(#20051,#20052)
+#20053=*
+regexpterm(#20053,14,#20051,0," ")
+#20054=@"loc,{#10000},3,8,3,8"
+locations_default(#20054,#10000,3,8,3,8)
+hasLocation(#20053,#20054)
+regexp_const_value(#20053," ")
+#20055=*
+regexpterm(#20055,23,#20051,1,"[]")
+#20056=@"loc,{#10000},3,9,3,10"
+locations_default(#20056,#10000,3,9,3,10)
+hasLocation(#20055,#20056)
+#20057=*
+regexpterm(#20057,14,#20051,2," ")
+#20058=@"loc,{#10000},3,11,3,11"
+locations_default(#20058,#10000,3,11,3,11)
+hasLocation(#20057,#20058)
+regexp_const_value(#20057," ")
+#20059=*
+regexpterm(#20059,23,#20051,3,"[]")
+#20060=@"loc,{#10000},3,12,3,13"
+locations_default(#20060,#10000,3,12,3,13)
+hasLocation(#20059,#20060)
+#20061=*
+regexpterm(#20061,14,#20051,4," ")
+#20062=@"loc,{#10000},3,14,3,14"
+locations_default(#20062,#10000,3,14,3,14)
+hasLocation(#20061,#20062)
+regexp_const_value(#20061," ")
+#20063=*
+regexpterm(#20063,14,#20043,4," ")
+#20064=@"loc,{#10000},3,16,3,16"
+locations_default(#20064,#10000,3,16,3,16)
+hasLocation(#20063,#20064)
+regexp_const_value(#20063," ")
+#20065=*
+entry_cfg_node(#20065,#20001)
+#20066=@"loc,{#10000},1,1,1,0"
+locations_default(#20066,#10000,1,1,1,0)
+hasLocation(#20065,#20066)
+#20067=*
+exit_cfg_node(#20067,#20001)
+hasLocation(#20067,#20023)
+successor(#20041,#20042)
+successor(#20042,#20067)
+successor(#20033,#20034)
+successor(#20034,#20041)
+successor(#20026,#20028)
+successor(#20028,#20033)
+successor(#20065,#20026)
 numlines(#10000,3,3,1)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2024/output/trap/regex_quoted_string.js.trap b/javascript/extractor/tests/es2024/output/trap/regex_quoted_string.js.trap
index 822a1302bcf..967bd261085 100644
--- a/javascript/extractor/tests/es2024/output/trap/regex_quoted_string.js.trap
+++ b/javascript/extractor/tests/es2024/output/trap/regex_quoted_string.js.trap
@@ -99,188 +99,190 @@ toplevels(#20001,0)
 #20034=@"loc,{#10000},1,1,6,0"
 locations_default(#20034,#10000,1,1,6,0)
 hasLocation(#20001,#20034)
-#20035=*
-stmts(#20035,2,#20001,0,"/[\q{abc}]/v;")
-hasLocation(#20035,#20003)
-stmt_containers(#20035,#20001)
+#20035=@"var;{this};{#20000}"
+variables(#20035,"this",#20000)
 #20036=*
-exprs(#20036,5,#20035,0,"/[\q{abc}]/v")
-hasLocation(#20036,#20013)
-enclosing_stmt(#20036,#20035)
-expr_containers(#20036,#20001)
-literals("/[\q{abc}]/v","/[\q{abc}]/v",#20036)
+stmts(#20036,2,#20001,0,"/[\q{abc}]/v;")
+hasLocation(#20036,#20003)
+stmt_containers(#20036,#20001)
 #20037=*
-regexpterm(#20037,23,#20036,0,"[\q{abc}]")
-#20038=@"loc,{#10000},1,2,1,10"
-locations_default(#20038,#10000,1,2,1,10)
-hasLocation(#20037,#20038)
-#20039=*
-regexpterm(#20039,28,#20037,0,"\q{abc}")
-#20040=@"loc,{#10000},1,3,1,9"
-locations_default(#20040,#10000,1,3,1,9)
-hasLocation(#20039,#20040)
-#20041=*
-regexpterm(#20041,14,#20039,0,"abc")
-#20042=@"loc,{#10000},1,6,1,8"
-locations_default(#20042,#10000,1,6,1,8)
-hasLocation(#20041,#20042)
-regexp_const_value(#20041,"abc")
-#20043=*
-stmts(#20043,2,#20001,1,"/[\q{ab ... cb}]/v;")
-hasLocation(#20043,#20005)
-stmt_containers(#20043,#20001)
+exprs(#20037,5,#20036,0,"/[\q{abc}]/v")
+hasLocation(#20037,#20013)
+enclosing_stmt(#20037,#20036)
+expr_containers(#20037,#20001)
+literals("/[\q{abc}]/v","/[\q{abc}]/v",#20037)
+#20038=*
+regexpterm(#20038,23,#20037,0,"[\q{abc}]")
+#20039=@"loc,{#10000},1,2,1,10"
+locations_default(#20039,#10000,1,2,1,10)
+hasLocation(#20038,#20039)
+#20040=*
+regexpterm(#20040,28,#20038,0,"\q{abc}")
+#20041=@"loc,{#10000},1,3,1,9"
+locations_default(#20041,#10000,1,3,1,9)
+hasLocation(#20040,#20041)
+#20042=*
+regexpterm(#20042,14,#20040,0,"abc")
+#20043=@"loc,{#10000},1,6,1,8"
+locations_default(#20043,#10000,1,6,1,8)
+hasLocation(#20042,#20043)
+regexp_const_value(#20042,"abc")
 #20044=*
-exprs(#20044,5,#20043,0,"/[\q{abc|cbd|dcb}]/v")
-hasLocation(#20044,#20017)
-enclosing_stmt(#20044,#20043)
-expr_containers(#20044,#20001)
-literals("/[\q{abc|cbd|dcb}]/v","/[\q{abc|cbd|dcb}]/v",#20044)
+stmts(#20044,2,#20001,1,"/[\q{ab ... cb}]/v;")
+hasLocation(#20044,#20005)
+stmt_containers(#20044,#20001)
 #20045=*
-regexpterm(#20045,23,#20044,0,"[\q{abc|cbd|dcb}]")
-#20046=@"loc,{#10000},2,2,2,18"
-locations_default(#20046,#10000,2,2,2,18)
-hasLocation(#20045,#20046)
-#20047=*
-regexpterm(#20047,28,#20045,0,"\q{abc|cbd|dcb}")
-#20048=@"loc,{#10000},2,3,2,17"
-locations_default(#20048,#10000,2,3,2,17)
-hasLocation(#20047,#20048)
-#20049=*
-regexpterm(#20049,0,#20047,0,"abc|cbd|dcb")
-#20050=@"loc,{#10000},2,6,2,16"
-locations_default(#20050,#10000,2,6,2,16)
-hasLocation(#20049,#20050)
-#20051=*
-regexpterm(#20051,14,#20049,0,"abc")
-#20052=@"loc,{#10000},2,6,2,8"
-locations_default(#20052,#10000,2,6,2,8)
-hasLocation(#20051,#20052)
-regexp_const_value(#20051,"abc")
-#20053=*
-regexpterm(#20053,14,#20049,1,"cbd")
-#20054=@"loc,{#10000},2,10,2,12"
-locations_default(#20054,#10000,2,10,2,12)
-hasLocation(#20053,#20054)
-regexp_const_value(#20053,"cbd")
-#20055=*
-regexpterm(#20055,14,#20049,2,"dcb")
-#20056=@"loc,{#10000},2,14,2,16"
-locations_default(#20056,#10000,2,14,2,16)
-hasLocation(#20055,#20056)
-regexp_const_value(#20055,"dcb")
-#20057=*
-stmts(#20057,2,#20001,2,"/[\q{\}}]/v;")
-hasLocation(#20057,#20007)
-stmt_containers(#20057,#20001)
+exprs(#20045,5,#20044,0,"/[\q{abc|cbd|dcb}]/v")
+hasLocation(#20045,#20017)
+enclosing_stmt(#20045,#20044)
+expr_containers(#20045,#20001)
+literals("/[\q{abc|cbd|dcb}]/v","/[\q{abc|cbd|dcb}]/v",#20045)
+#20046=*
+regexpterm(#20046,23,#20045,0,"[\q{abc|cbd|dcb}]")
+#20047=@"loc,{#10000},2,2,2,18"
+locations_default(#20047,#10000,2,2,2,18)
+hasLocation(#20046,#20047)
+#20048=*
+regexpterm(#20048,28,#20046,0,"\q{abc|cbd|dcb}")
+#20049=@"loc,{#10000},2,3,2,17"
+locations_default(#20049,#10000,2,3,2,17)
+hasLocation(#20048,#20049)
+#20050=*
+regexpterm(#20050,0,#20048,0,"abc|cbd|dcb")
+#20051=@"loc,{#10000},2,6,2,16"
+locations_default(#20051,#10000,2,6,2,16)
+hasLocation(#20050,#20051)
+#20052=*
+regexpterm(#20052,14,#20050,0,"abc")
+#20053=@"loc,{#10000},2,6,2,8"
+locations_default(#20053,#10000,2,6,2,8)
+hasLocation(#20052,#20053)
+regexp_const_value(#20052,"abc")
+#20054=*
+regexpterm(#20054,14,#20050,1,"cbd")
+#20055=@"loc,{#10000},2,10,2,12"
+locations_default(#20055,#10000,2,10,2,12)
+hasLocation(#20054,#20055)
+regexp_const_value(#20054,"cbd")
+#20056=*
+regexpterm(#20056,14,#20050,2,"dcb")
+#20057=@"loc,{#10000},2,14,2,16"
+locations_default(#20057,#10000,2,14,2,16)
+hasLocation(#20056,#20057)
+regexp_const_value(#20056,"dcb")
 #20058=*
-exprs(#20058,5,#20057,0,"/[\q{\}}]/v")
-hasLocation(#20058,#20021)
-enclosing_stmt(#20058,#20057)
-expr_containers(#20058,#20001)
-literals("/[\q{\}}]/v","/[\q{\}}]/v",#20058)
+stmts(#20058,2,#20001,2,"/[\q{\}}]/v;")
+hasLocation(#20058,#20007)
+stmt_containers(#20058,#20001)
 #20059=*
-regexpterm(#20059,23,#20058,0,"[\q{\}}]")
-#20060=@"loc,{#10000},3,2,3,9"
-locations_default(#20060,#10000,3,2,3,9)
-hasLocation(#20059,#20060)
-#20061=*
-regexpterm(#20061,28,#20059,0,"\q{\}}")
-#20062=@"loc,{#10000},3,3,3,8"
-locations_default(#20062,#10000,3,3,3,8)
-hasLocation(#20061,#20062)
-#20063=*
-regexpterm(#20063,14,#20061,0,"\}")
-#20064=@"loc,{#10000},3,6,3,7"
-locations_default(#20064,#10000,3,6,3,7)
-hasLocation(#20063,#20064)
-regexp_const_value(#20063,"\}")
-#20065=*
-stmts(#20065,2,#20001,3,"/[\q{\{}]/v;")
-hasLocation(#20065,#20009)
-stmt_containers(#20065,#20001)
+exprs(#20059,5,#20058,0,"/[\q{\}}]/v")
+hasLocation(#20059,#20021)
+enclosing_stmt(#20059,#20058)
+expr_containers(#20059,#20001)
+literals("/[\q{\}}]/v","/[\q{\}}]/v",#20059)
+#20060=*
+regexpterm(#20060,23,#20059,0,"[\q{\}}]")
+#20061=@"loc,{#10000},3,2,3,9"
+locations_default(#20061,#10000,3,2,3,9)
+hasLocation(#20060,#20061)
+#20062=*
+regexpterm(#20062,28,#20060,0,"\q{\}}")
+#20063=@"loc,{#10000},3,3,3,8"
+locations_default(#20063,#10000,3,3,3,8)
+hasLocation(#20062,#20063)
+#20064=*
+regexpterm(#20064,14,#20062,0,"\}")
+#20065=@"loc,{#10000},3,6,3,7"
+locations_default(#20065,#10000,3,6,3,7)
+hasLocation(#20064,#20065)
+regexp_const_value(#20064,"\}")
 #20066=*
-exprs(#20066,5,#20065,0,"/[\q{\{}]/v")
-hasLocation(#20066,#20025)
-enclosing_stmt(#20066,#20065)
-expr_containers(#20066,#20001)
-literals("/[\q{\{}]/v","/[\q{\{}]/v",#20066)
+stmts(#20066,2,#20001,3,"/[\q{\{}]/v;")
+hasLocation(#20066,#20009)
+stmt_containers(#20066,#20001)
 #20067=*
-regexpterm(#20067,23,#20066,0,"[\q{\{}]")
-#20068=@"loc,{#10000},4,2,4,9"
-locations_default(#20068,#10000,4,2,4,9)
-hasLocation(#20067,#20068)
-#20069=*
-regexpterm(#20069,28,#20067,0,"\q{\{}")
-#20070=@"loc,{#10000},4,3,4,8"
-locations_default(#20070,#10000,4,3,4,8)
-hasLocation(#20069,#20070)
-#20071=*
-regexpterm(#20071,14,#20069,0,"\{")
-#20072=@"loc,{#10000},4,6,4,7"
-locations_default(#20072,#10000,4,6,4,7)
-hasLocation(#20071,#20072)
-regexp_const_value(#20071,"\{")
-#20073=*
-stmts(#20073,2,#20001,4,"/[\q{cc|\}a|cc}]/v;")
-hasLocation(#20073,#20011)
-stmt_containers(#20073,#20001)
+exprs(#20067,5,#20066,0,"/[\q{\{}]/v")
+hasLocation(#20067,#20025)
+enclosing_stmt(#20067,#20066)
+expr_containers(#20067,#20001)
+literals("/[\q{\{}]/v","/[\q{\{}]/v",#20067)
+#20068=*
+regexpterm(#20068,23,#20067,0,"[\q{\{}]")
+#20069=@"loc,{#10000},4,2,4,9"
+locations_default(#20069,#10000,4,2,4,9)
+hasLocation(#20068,#20069)
+#20070=*
+regexpterm(#20070,28,#20068,0,"\q{\{}")
+#20071=@"loc,{#10000},4,3,4,8"
+locations_default(#20071,#10000,4,3,4,8)
+hasLocation(#20070,#20071)
+#20072=*
+regexpterm(#20072,14,#20070,0,"\{")
+#20073=@"loc,{#10000},4,6,4,7"
+locations_default(#20073,#10000,4,6,4,7)
+hasLocation(#20072,#20073)
+regexp_const_value(#20072,"\{")
 #20074=*
-exprs(#20074,5,#20073,0,"/[\q{cc|\}a|cc}]/v")
-hasLocation(#20074,#20029)
-enclosing_stmt(#20074,#20073)
-expr_containers(#20074,#20001)
-literals("/[\q{cc|\}a|cc}]/v","/[\q{cc|\}a|cc}]/v",#20074)
+stmts(#20074,2,#20001,4,"/[\q{cc|\}a|cc}]/v;")
+hasLocation(#20074,#20011)
+stmt_containers(#20074,#20001)
 #20075=*
-regexpterm(#20075,23,#20074,0,"[\q{cc|\}a|cc}]")
-#20076=@"loc,{#10000},5,2,5,16"
-locations_default(#20076,#10000,5,2,5,16)
-hasLocation(#20075,#20076)
-#20077=*
-regexpterm(#20077,28,#20075,0,"\q{cc|\}a|cc}")
-#20078=@"loc,{#10000},5,3,5,15"
-locations_default(#20078,#10000,5,3,5,15)
-hasLocation(#20077,#20078)
-#20079=*
-regexpterm(#20079,0,#20077,0,"cc|\}a|cc")
-#20080=@"loc,{#10000},5,6,5,14"
-locations_default(#20080,#10000,5,6,5,14)
-hasLocation(#20079,#20080)
-#20081=*
-regexpterm(#20081,14,#20079,0,"cc")
-#20082=@"loc,{#10000},5,6,5,7"
-locations_default(#20082,#10000,5,6,5,7)
-hasLocation(#20081,#20082)
-regexp_const_value(#20081,"cc")
-#20083=*
-regexpterm(#20083,14,#20079,1,"\}a")
-#20084=@"loc,{#10000},5,9,5,11"
-locations_default(#20084,#10000,5,9,5,11)
-hasLocation(#20083,#20084)
-regexp_const_value(#20083,"\}a")
-#20085=*
-regexpterm(#20085,14,#20079,2,"cc")
-#20086=@"loc,{#10000},5,13,5,14"
-locations_default(#20086,#10000,5,13,5,14)
-hasLocation(#20085,#20086)
-regexp_const_value(#20085,"cc")
-#20087=*
-entry_cfg_node(#20087,#20001)
-#20088=@"loc,{#10000},1,1,1,0"
-locations_default(#20088,#10000,1,1,1,0)
-hasLocation(#20087,#20088)
-#20089=*
-exit_cfg_node(#20089,#20001)
-hasLocation(#20089,#20033)
-successor(#20073,#20074)
-successor(#20074,#20089)
-successor(#20065,#20066)
-successor(#20066,#20073)
-successor(#20057,#20058)
-successor(#20058,#20065)
-successor(#20043,#20044)
-successor(#20044,#20057)
-successor(#20035,#20036)
-successor(#20036,#20043)
-successor(#20087,#20035)
+exprs(#20075,5,#20074,0,"/[\q{cc|\}a|cc}]/v")
+hasLocation(#20075,#20029)
+enclosing_stmt(#20075,#20074)
+expr_containers(#20075,#20001)
+literals("/[\q{cc|\}a|cc}]/v","/[\q{cc|\}a|cc}]/v",#20075)
+#20076=*
+regexpterm(#20076,23,#20075,0,"[\q{cc|\}a|cc}]")
+#20077=@"loc,{#10000},5,2,5,16"
+locations_default(#20077,#10000,5,2,5,16)
+hasLocation(#20076,#20077)
+#20078=*
+regexpterm(#20078,28,#20076,0,"\q{cc|\}a|cc}")
+#20079=@"loc,{#10000},5,3,5,15"
+locations_default(#20079,#10000,5,3,5,15)
+hasLocation(#20078,#20079)
+#20080=*
+regexpterm(#20080,0,#20078,0,"cc|\}a|cc")
+#20081=@"loc,{#10000},5,6,5,14"
+locations_default(#20081,#10000,5,6,5,14)
+hasLocation(#20080,#20081)
+#20082=*
+regexpterm(#20082,14,#20080,0,"cc")
+#20083=@"loc,{#10000},5,6,5,7"
+locations_default(#20083,#10000,5,6,5,7)
+hasLocation(#20082,#20083)
+regexp_const_value(#20082,"cc")
+#20084=*
+regexpterm(#20084,14,#20080,1,"\}a")
+#20085=@"loc,{#10000},5,9,5,11"
+locations_default(#20085,#10000,5,9,5,11)
+hasLocation(#20084,#20085)
+regexp_const_value(#20084,"\}a")
+#20086=*
+regexpterm(#20086,14,#20080,2,"cc")
+#20087=@"loc,{#10000},5,13,5,14"
+locations_default(#20087,#10000,5,13,5,14)
+hasLocation(#20086,#20087)
+regexp_const_value(#20086,"cc")
+#20088=*
+entry_cfg_node(#20088,#20001)
+#20089=@"loc,{#10000},1,1,1,0"
+locations_default(#20089,#10000,1,1,1,0)
+hasLocation(#20088,#20089)
+#20090=*
+exit_cfg_node(#20090,#20001)
+hasLocation(#20090,#20033)
+successor(#20074,#20075)
+successor(#20075,#20090)
+successor(#20066,#20067)
+successor(#20067,#20074)
+successor(#20058,#20059)
+successor(#20059,#20066)
+successor(#20044,#20045)
+successor(#20045,#20058)
+successor(#20036,#20037)
+successor(#20037,#20044)
+successor(#20088,#20036)
 numlines(#10000,5,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2024/output/trap/subtraction.js.trap b/javascript/extractor/tests/es2024/output/trap/subtraction.js.trap
index ee3dc27da9d..5ceb221aef9 100644
--- a/javascript/extractor/tests/es2024/output/trap/subtraction.js.trap
+++ b/javascript/extractor/tests/es2024/output/trap/subtraction.js.trap
@@ -67,202 +67,204 @@ toplevels(#20001,0)
 #20022=@"loc,{#10000},1,1,4,0"
 locations_default(#20022,#10000,1,1,4,0)
 hasLocation(#20001,#20022)
-#20023=*
-stmts(#20023,2,#20001,0,"/[\p{Sc ... er}]/v;")
-hasLocation(#20023,#20003)
-stmt_containers(#20023,#20001)
+#20023=@"var;{this};{#20000}"
+variables(#20023,"this",#20000)
 #20024=*
-exprs(#20024,5,#20023,0,"/[\p{Sc ... ter}]/v")
-hasLocation(#20024,#20009)
-enclosing_stmt(#20024,#20023)
-expr_containers(#20024,#20001)
-literals("/[\p{Script_Extensions=Greek}--\p{Letter}]/v","/[\p{Script_Extensions=Greek}--\p{Letter}]/v",#20024)
+stmts(#20024,2,#20001,0,"/[\p{Sc ... er}]/v;")
+hasLocation(#20024,#20003)
+stmt_containers(#20024,#20001)
 #20025=*
-regexpterm(#20025,23,#20024,0,"[\p{Script_Extensions=Greek}--\p{Letter}]")
-#20026=@"loc,{#10000},1,2,1,42"
-locations_default(#20026,#10000,1,2,1,42)
-hasLocation(#20025,#20026)
-#20027=*
-regexpterm(#20027,30,#20025,0,"[\p{Script_Extensions=Greek}--\p{Letter}]")
-hasLocation(#20027,#20026)
+exprs(#20025,5,#20024,0,"/[\p{Sc ... ter}]/v")
+hasLocation(#20025,#20009)
+enclosing_stmt(#20025,#20024)
+expr_containers(#20025,#20001)
+literals("/[\p{Script_Extensions=Greek}--\p{Letter}]/v","/[\p{Script_Extensions=Greek}--\p{Letter}]/v",#20025)
+#20026=*
+regexpterm(#20026,23,#20025,0,"[\p{Script_Extensions=Greek}--\p{Letter}]")
+#20027=@"loc,{#10000},1,2,1,42"
+locations_default(#20027,#10000,1,2,1,42)
+hasLocation(#20026,#20027)
 #20028=*
-regexpterm(#20028,27,#20027,0,"\p{Script_Extensions=Greek}")
-#20029=@"loc,{#10000},1,3,1,29"
-locations_default(#20029,#10000,1,3,1,29)
-hasLocation(#20028,#20029)
-unicode_property_escapename(#20028,"Script_Extensions")
-unicode_property_escapevalue(#20028,"Greek")
-#20030=*
-regexpterm(#20030,27,#20027,1,"\p{Letter}")
-#20031=@"loc,{#10000},1,32,1,41"
-locations_default(#20031,#10000,1,32,1,41)
-hasLocation(#20030,#20031)
-unicode_property_escapename(#20030,"Letter")
-#20032=*
-stmts(#20032,2,#20001,1,"/[[abc]--[cbd]]/v;")
-hasLocation(#20032,#20005)
-stmt_containers(#20032,#20001)
+regexpterm(#20028,30,#20026,0,"[\p{Script_Extensions=Greek}--\p{Letter}]")
+hasLocation(#20028,#20027)
+#20029=*
+regexpterm(#20029,27,#20028,0,"\p{Script_Extensions=Greek}")
+#20030=@"loc,{#10000},1,3,1,29"
+locations_default(#20030,#10000,1,3,1,29)
+hasLocation(#20029,#20030)
+unicode_property_escapename(#20029,"Script_Extensions")
+unicode_property_escapevalue(#20029,"Greek")
+#20031=*
+regexpterm(#20031,27,#20028,1,"\p{Letter}")
+#20032=@"loc,{#10000},1,32,1,41"
+locations_default(#20032,#10000,1,32,1,41)
+hasLocation(#20031,#20032)
+unicode_property_escapename(#20031,"Letter")
 #20033=*
-exprs(#20033,5,#20032,0,"/[[abc]--[cbd]]/v")
-hasLocation(#20033,#20013)
-enclosing_stmt(#20033,#20032)
-expr_containers(#20033,#20001)
-literals("/[[abc]--[cbd]]/v","/[[abc]--[cbd]]/v",#20033)
+stmts(#20033,2,#20001,1,"/[[abc]--[cbd]]/v;")
+hasLocation(#20033,#20005)
+stmt_containers(#20033,#20001)
 #20034=*
-regexpterm(#20034,23,#20033,0,"[[abc]--[cbd]]")
-#20035=@"loc,{#10000},2,2,2,15"
-locations_default(#20035,#10000,2,2,2,15)
-hasLocation(#20034,#20035)
-#20036=*
-regexpterm(#20036,30,#20034,0,"[[abc]--[cbd]]")
-hasLocation(#20036,#20035)
+exprs(#20034,5,#20033,0,"/[[abc]--[cbd]]/v")
+hasLocation(#20034,#20013)
+enclosing_stmt(#20034,#20033)
+expr_containers(#20034,#20001)
+literals("/[[abc]--[cbd]]/v","/[[abc]--[cbd]]/v",#20034)
+#20035=*
+regexpterm(#20035,23,#20034,0,"[[abc]--[cbd]]")
+#20036=@"loc,{#10000},2,2,2,15"
+locations_default(#20036,#10000,2,2,2,15)
+hasLocation(#20035,#20036)
 #20037=*
-regexpterm(#20037,23,#20036,0,"[abc]")
-#20038=@"loc,{#10000},2,3,2,7"
-locations_default(#20038,#10000,2,3,2,7)
-hasLocation(#20037,#20038)
-#20039=*
-regexpterm(#20039,14,#20037,0,"a")
-#20040=@"loc,{#10000},2,4,2,4"
-locations_default(#20040,#10000,2,4,2,4)
-hasLocation(#20039,#20040)
-regexp_const_value(#20039,"a")
-#20041=*
-regexpterm(#20041,14,#20037,1,"b")
-#20042=@"loc,{#10000},2,5,2,5"
-locations_default(#20042,#10000,2,5,2,5)
-hasLocation(#20041,#20042)
-regexp_const_value(#20041,"b")
-#20043=*
-regexpterm(#20043,14,#20037,2,"c")
-#20044=@"loc,{#10000},2,6,2,6"
-locations_default(#20044,#10000,2,6,2,6)
-hasLocation(#20043,#20044)
-regexp_const_value(#20043,"c")
-#20045=*
-regexpterm(#20045,23,#20036,1,"[cbd]")
-#20046=@"loc,{#10000},2,10,2,14"
-locations_default(#20046,#10000,2,10,2,14)
-hasLocation(#20045,#20046)
-#20047=*
-regexpterm(#20047,14,#20045,0,"c")
-#20048=@"loc,{#10000},2,11,2,11"
-locations_default(#20048,#10000,2,11,2,11)
-hasLocation(#20047,#20048)
-regexp_const_value(#20047,"c")
-#20049=*
-regexpterm(#20049,14,#20045,1,"b")
-#20050=@"loc,{#10000},2,12,2,12"
-locations_default(#20050,#10000,2,12,2,12)
-hasLocation(#20049,#20050)
-regexp_const_value(#20049,"b")
-#20051=*
-regexpterm(#20051,14,#20045,2,"d")
-#20052=@"loc,{#10000},2,13,2,13"
-locations_default(#20052,#10000,2,13,2,13)
-hasLocation(#20051,#20052)
-regexp_const_value(#20051,"d")
-#20053=*
-stmts(#20053,2,#20001,2,"/[[abc] ... de]]/v;")
-hasLocation(#20053,#20007)
-stmt_containers(#20053,#20001)
+regexpterm(#20037,30,#20035,0,"[[abc]--[cbd]]")
+hasLocation(#20037,#20036)
+#20038=*
+regexpterm(#20038,23,#20037,0,"[abc]")
+#20039=@"loc,{#10000},2,3,2,7"
+locations_default(#20039,#10000,2,3,2,7)
+hasLocation(#20038,#20039)
+#20040=*
+regexpterm(#20040,14,#20038,0,"a")
+#20041=@"loc,{#10000},2,4,2,4"
+locations_default(#20041,#10000,2,4,2,4)
+hasLocation(#20040,#20041)
+regexp_const_value(#20040,"a")
+#20042=*
+regexpterm(#20042,14,#20038,1,"b")
+#20043=@"loc,{#10000},2,5,2,5"
+locations_default(#20043,#10000,2,5,2,5)
+hasLocation(#20042,#20043)
+regexp_const_value(#20042,"b")
+#20044=*
+regexpterm(#20044,14,#20038,2,"c")
+#20045=@"loc,{#10000},2,6,2,6"
+locations_default(#20045,#10000,2,6,2,6)
+hasLocation(#20044,#20045)
+regexp_const_value(#20044,"c")
+#20046=*
+regexpterm(#20046,23,#20037,1,"[cbd]")
+#20047=@"loc,{#10000},2,10,2,14"
+locations_default(#20047,#10000,2,10,2,14)
+hasLocation(#20046,#20047)
+#20048=*
+regexpterm(#20048,14,#20046,0,"c")
+#20049=@"loc,{#10000},2,11,2,11"
+locations_default(#20049,#10000,2,11,2,11)
+hasLocation(#20048,#20049)
+regexp_const_value(#20048,"c")
+#20050=*
+regexpterm(#20050,14,#20046,1,"b")
+#20051=@"loc,{#10000},2,12,2,12"
+locations_default(#20051,#10000,2,12,2,12)
+hasLocation(#20050,#20051)
+regexp_const_value(#20050,"b")
+#20052=*
+regexpterm(#20052,14,#20046,2,"d")
+#20053=@"loc,{#10000},2,13,2,13"
+locations_default(#20053,#10000,2,13,2,13)
+hasLocation(#20052,#20053)
+regexp_const_value(#20052,"d")
 #20054=*
-exprs(#20054,5,#20053,0,"/[[abc] ... bde]]/v")
-hasLocation(#20054,#20017)
-enclosing_stmt(#20054,#20053)
-expr_containers(#20054,#20001)
-literals("/[[abc]--[cbd]--[bde]]/v","/[[abc]--[cbd]--[bde]]/v",#20054)
+stmts(#20054,2,#20001,2,"/[[abc] ... de]]/v;")
+hasLocation(#20054,#20007)
+stmt_containers(#20054,#20001)
 #20055=*
-regexpterm(#20055,23,#20054,0,"[[abc]--[cbd]--[bde]]")
-#20056=@"loc,{#10000},3,2,3,22"
-locations_default(#20056,#10000,3,2,3,22)
-hasLocation(#20055,#20056)
-#20057=*
-regexpterm(#20057,30,#20055,0,"[[abc]--[cbd]--[bde]]")
-hasLocation(#20057,#20056)
+exprs(#20055,5,#20054,0,"/[[abc] ... bde]]/v")
+hasLocation(#20055,#20017)
+enclosing_stmt(#20055,#20054)
+expr_containers(#20055,#20001)
+literals("/[[abc]--[cbd]--[bde]]/v","/[[abc]--[cbd]--[bde]]/v",#20055)
+#20056=*
+regexpterm(#20056,23,#20055,0,"[[abc]--[cbd]--[bde]]")
+#20057=@"loc,{#10000},3,2,3,22"
+locations_default(#20057,#10000,3,2,3,22)
+hasLocation(#20056,#20057)
 #20058=*
-regexpterm(#20058,23,#20057,0,"[abc]")
-#20059=@"loc,{#10000},3,3,3,7"
-locations_default(#20059,#10000,3,3,3,7)
-hasLocation(#20058,#20059)
-#20060=*
-regexpterm(#20060,14,#20058,0,"a")
-#20061=@"loc,{#10000},3,4,3,4"
-locations_default(#20061,#10000,3,4,3,4)
-hasLocation(#20060,#20061)
-regexp_const_value(#20060,"a")
-#20062=*
-regexpterm(#20062,14,#20058,1,"b")
-#20063=@"loc,{#10000},3,5,3,5"
-locations_default(#20063,#10000,3,5,3,5)
-hasLocation(#20062,#20063)
-regexp_const_value(#20062,"b")
-#20064=*
-regexpterm(#20064,14,#20058,2,"c")
-#20065=@"loc,{#10000},3,6,3,6"
-locations_default(#20065,#10000,3,6,3,6)
-hasLocation(#20064,#20065)
-regexp_const_value(#20064,"c")
-#20066=*
-regexpterm(#20066,23,#20057,1,"[cbd]")
-#20067=@"loc,{#10000},3,10,3,14"
-locations_default(#20067,#10000,3,10,3,14)
-hasLocation(#20066,#20067)
-#20068=*
-regexpterm(#20068,14,#20066,0,"c")
-#20069=@"loc,{#10000},3,11,3,11"
-locations_default(#20069,#10000,3,11,3,11)
-hasLocation(#20068,#20069)
-regexp_const_value(#20068,"c")
-#20070=*
-regexpterm(#20070,14,#20066,1,"b")
-#20071=@"loc,{#10000},3,12,3,12"
-locations_default(#20071,#10000,3,12,3,12)
-hasLocation(#20070,#20071)
-regexp_const_value(#20070,"b")
-#20072=*
-regexpterm(#20072,14,#20066,2,"d")
-#20073=@"loc,{#10000},3,13,3,13"
-locations_default(#20073,#10000,3,13,3,13)
-hasLocation(#20072,#20073)
-regexp_const_value(#20072,"d")
-#20074=*
-regexpterm(#20074,23,#20057,2,"[bde]")
-#20075=@"loc,{#10000},3,17,3,21"
-locations_default(#20075,#10000,3,17,3,21)
-hasLocation(#20074,#20075)
-#20076=*
-regexpterm(#20076,14,#20074,0,"b")
-#20077=@"loc,{#10000},3,18,3,18"
-locations_default(#20077,#10000,3,18,3,18)
-hasLocation(#20076,#20077)
-regexp_const_value(#20076,"b")
-#20078=*
-regexpterm(#20078,14,#20074,1,"d")
-#20079=@"loc,{#10000},3,19,3,19"
-locations_default(#20079,#10000,3,19,3,19)
-hasLocation(#20078,#20079)
-regexp_const_value(#20078,"d")
-#20080=*
-regexpterm(#20080,14,#20074,2,"e")
-#20081=@"loc,{#10000},3,20,3,20"
-locations_default(#20081,#10000,3,20,3,20)
-hasLocation(#20080,#20081)
-regexp_const_value(#20080,"e")
-#20082=*
-entry_cfg_node(#20082,#20001)
-#20083=@"loc,{#10000},1,1,1,0"
-locations_default(#20083,#10000,1,1,1,0)
-hasLocation(#20082,#20083)
-#20084=*
-exit_cfg_node(#20084,#20001)
-hasLocation(#20084,#20021)
-successor(#20053,#20054)
-successor(#20054,#20084)
-successor(#20032,#20033)
-successor(#20033,#20053)
-successor(#20023,#20024)
-successor(#20024,#20032)
-successor(#20082,#20023)
+regexpterm(#20058,30,#20056,0,"[[abc]--[cbd]--[bde]]")
+hasLocation(#20058,#20057)
+#20059=*
+regexpterm(#20059,23,#20058,0,"[abc]")
+#20060=@"loc,{#10000},3,3,3,7"
+locations_default(#20060,#10000,3,3,3,7)
+hasLocation(#20059,#20060)
+#20061=*
+regexpterm(#20061,14,#20059,0,"a")
+#20062=@"loc,{#10000},3,4,3,4"
+locations_default(#20062,#10000,3,4,3,4)
+hasLocation(#20061,#20062)
+regexp_const_value(#20061,"a")
+#20063=*
+regexpterm(#20063,14,#20059,1,"b")
+#20064=@"loc,{#10000},3,5,3,5"
+locations_default(#20064,#10000,3,5,3,5)
+hasLocation(#20063,#20064)
+regexp_const_value(#20063,"b")
+#20065=*
+regexpterm(#20065,14,#20059,2,"c")
+#20066=@"loc,{#10000},3,6,3,6"
+locations_default(#20066,#10000,3,6,3,6)
+hasLocation(#20065,#20066)
+regexp_const_value(#20065,"c")
+#20067=*
+regexpterm(#20067,23,#20058,1,"[cbd]")
+#20068=@"loc,{#10000},3,10,3,14"
+locations_default(#20068,#10000,3,10,3,14)
+hasLocation(#20067,#20068)
+#20069=*
+regexpterm(#20069,14,#20067,0,"c")
+#20070=@"loc,{#10000},3,11,3,11"
+locations_default(#20070,#10000,3,11,3,11)
+hasLocation(#20069,#20070)
+regexp_const_value(#20069,"c")
+#20071=*
+regexpterm(#20071,14,#20067,1,"b")
+#20072=@"loc,{#10000},3,12,3,12"
+locations_default(#20072,#10000,3,12,3,12)
+hasLocation(#20071,#20072)
+regexp_const_value(#20071,"b")
+#20073=*
+regexpterm(#20073,14,#20067,2,"d")
+#20074=@"loc,{#10000},3,13,3,13"
+locations_default(#20074,#10000,3,13,3,13)
+hasLocation(#20073,#20074)
+regexp_const_value(#20073,"d")
+#20075=*
+regexpterm(#20075,23,#20058,2,"[bde]")
+#20076=@"loc,{#10000},3,17,3,21"
+locations_default(#20076,#10000,3,17,3,21)
+hasLocation(#20075,#20076)
+#20077=*
+regexpterm(#20077,14,#20075,0,"b")
+#20078=@"loc,{#10000},3,18,3,18"
+locations_default(#20078,#10000,3,18,3,18)
+hasLocation(#20077,#20078)
+regexp_const_value(#20077,"b")
+#20079=*
+regexpterm(#20079,14,#20075,1,"d")
+#20080=@"loc,{#10000},3,19,3,19"
+locations_default(#20080,#10000,3,19,3,19)
+hasLocation(#20079,#20080)
+regexp_const_value(#20079,"d")
+#20081=*
+regexpterm(#20081,14,#20075,2,"e")
+#20082=@"loc,{#10000},3,20,3,20"
+locations_default(#20082,#10000,3,20,3,20)
+hasLocation(#20081,#20082)
+regexp_const_value(#20081,"e")
+#20083=*
+entry_cfg_node(#20083,#20001)
+#20084=@"loc,{#10000},1,1,1,0"
+locations_default(#20084,#10000,1,1,1,0)
+hasLocation(#20083,#20084)
+#20085=*
+exit_cfg_node(#20085,#20001)
+hasLocation(#20085,#20021)
+successor(#20054,#20055)
+successor(#20055,#20085)
+successor(#20033,#20034)
+successor(#20034,#20054)
+successor(#20024,#20025)
+successor(#20025,#20033)
+successor(#20083,#20024)
 numlines(#10000,3,3,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2024/output/trap/test.js.trap b/javascript/extractor/tests/es2024/output/trap/test.js.trap
index 2cacd2029ba..6033409a2e4 100644
--- a/javascript/extractor/tests/es2024/output/trap/test.js.trap
+++ b/javascript/extractor/tests/es2024/output/trap/test.js.trap
@@ -52,459 +52,461 @@ locations_default(#20016,#10000,1,1,2,0)
 hasLocation(#20001,#20016)
 #20017=@"var;{regex};{#20000}"
 variables(#20017,"regex",#20000)
-#20018=*
-stmts(#20018,22,#20001,0,"const r ... +)/gmv;")
-hasLocation(#20018,#20003)
-stmt_containers(#20018,#20001)
+#20018=@"var;{this};{#20000}"
+variables(#20018,"this",#20000)
 #20019=*
-exprs(#20019,64,#20018,0,"regex = ... )+)/gmv")
-#20020=@"loc,{#10000},1,7,1,171"
-locations_default(#20020,#10000,1,7,1,171)
-hasLocation(#20019,#20020)
-enclosing_stmt(#20019,#20018)
-expr_containers(#20019,#20001)
-#20021=*
-exprs(#20021,78,#20019,0,"regex")
-hasLocation(#20021,#20007)
-enclosing_stmt(#20021,#20018)
-expr_containers(#20021,#20001)
-literals("regex","regex",#20021)
-decl(#20021,#20017)
+stmts(#20019,22,#20001,0,"const r ... +)/gmv;")
+hasLocation(#20019,#20003)
+stmt_containers(#20019,#20001)
+#20020=*
+exprs(#20020,64,#20019,0,"regex = ... )+)/gmv")
+#20021=@"loc,{#10000},1,7,1,171"
+locations_default(#20021,#10000,1,7,1,171)
+hasLocation(#20020,#20021)
+enclosing_stmt(#20020,#20019)
+expr_containers(#20020,#20001)
 #20022=*
-exprs(#20022,5,#20019,1,"/\b(?:h ... )+)/gmv")
-hasLocation(#20022,#20011)
-enclosing_stmt(#20022,#20018)
+exprs(#20022,78,#20020,0,"regex")
+hasLocation(#20022,#20007)
+enclosing_stmt(#20022,#20019)
 expr_containers(#20022,#20001)
-literals("/\b(?:https?:\/\/|mailto:|www\.)(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+|\b[\S--[@\p{Ps}\p{Pe}<>]]+@([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)/gmv","/\b(?:https?:\/\/|mailto:|www\.)(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+|\b[\S--[@\p{Ps}\p{Pe}<>]]+@([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)/gmv",#20022)
+literals("regex","regex",#20022)
+decl(#20022,#20017)
 #20023=*
-regexpterm(#20023,0,#20022,0,"\b(?:https?:\/\/|mailto:|www\.)(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+|\b[\S--[@\p{Ps}\p{Pe}<>]]+@([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)")
-#20024=@"loc,{#10000},1,16,1,167"
-locations_default(#20024,#10000,1,16,1,167)
-hasLocation(#20023,#20024)
-#20025=*
-regexpterm(#20025,1,#20023,0,"\b(?:https?:\/\/|mailto:|www\.)(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+")
-#20026=@"loc,{#10000},1,16,1,98"
-locations_default(#20026,#10000,1,16,1,98)
-hasLocation(#20025,#20026)
-#20027=*
-regexpterm(#20027,4,#20025,0,"\b")
-#20028=@"loc,{#10000},1,16,1,17"
-locations_default(#20028,#10000,1,16,1,17)
-hasLocation(#20027,#20028)
-#20029=*
-regexpterm(#20029,13,#20025,1,"(?:https?:\/\/|mailto:|www\.)")
-#20030=@"loc,{#10000},1,18,1,46"
-locations_default(#20030,#10000,1,18,1,46)
-hasLocation(#20029,#20030)
-#20031=*
-regexpterm(#20031,0,#20029,0,"https?:\/\/|mailto:|www\.")
-#20032=@"loc,{#10000},1,21,1,45"
-locations_default(#20032,#10000,1,21,1,45)
-hasLocation(#20031,#20032)
-#20033=*
-regexpterm(#20033,1,#20031,0,"https?:\/\/")
-#20034=@"loc,{#10000},1,21,1,31"
-locations_default(#20034,#10000,1,21,1,31)
-hasLocation(#20033,#20034)
-#20035=*
-regexpterm(#20035,14,#20033,0,"http")
-#20036=@"loc,{#10000},1,21,1,24"
-locations_default(#20036,#10000,1,21,1,24)
-hasLocation(#20035,#20036)
-regexp_const_value(#20035,"http")
-#20037=*
-regexpterm(#20037,10,#20033,1,"s?")
-#20038=@"loc,{#10000},1,25,1,26"
-locations_default(#20038,#10000,1,25,1,26)
-hasLocation(#20037,#20038)
-is_greedy(#20037)
-#20039=*
-regexpterm(#20039,14,#20037,0,"s")
-#20040=@"loc,{#10000},1,25,1,25"
-locations_default(#20040,#10000,1,25,1,25)
-hasLocation(#20039,#20040)
-regexp_const_value(#20039,"s")
-#20041=*
-regexpterm(#20041,14,#20033,2,":")
-#20042=@"loc,{#10000},1,27,1,27"
-locations_default(#20042,#10000,1,27,1,27)
-hasLocation(#20041,#20042)
-regexp_const_value(#20041,":")
-#20043=*
-regexpterm(#20043,21,#20033,3,"\/")
-#20044=@"loc,{#10000},1,28,1,29"
-locations_default(#20044,#10000,1,28,1,29)
-hasLocation(#20043,#20044)
-regexp_const_value(#20043,"/")
-#20045=*
-regexpterm(#20045,21,#20033,4,"\/")
-#20046=@"loc,{#10000},1,30,1,31"
-locations_default(#20046,#10000,1,30,1,31)
-hasLocation(#20045,#20046)
-regexp_const_value(#20045,"/")
-#20047=*
-regexpterm(#20047,14,#20031,1,"mailto:")
-#20048=@"loc,{#10000},1,33,1,39"
-locations_default(#20048,#10000,1,33,1,39)
-hasLocation(#20047,#20048)
-regexp_const_value(#20047,"mailto:")
-#20049=*
-regexpterm(#20049,1,#20031,2,"www\.")
-#20050=@"loc,{#10000},1,41,1,45"
-locations_default(#20050,#10000,1,41,1,45)
-hasLocation(#20049,#20050)
-#20051=*
-regexpterm(#20051,14,#20049,0,"www")
-#20052=@"loc,{#10000},1,41,1,43"
-locations_default(#20052,#10000,1,41,1,43)
-hasLocation(#20051,#20052)
-regexp_const_value(#20051,"www")
-#20053=*
-regexpterm(#20053,21,#20049,1,"\.")
-#20054=@"loc,{#10000},1,44,1,45"
-locations_default(#20054,#10000,1,44,1,45)
-hasLocation(#20053,#20054)
-regexp_const_value(#20053,".")
-#20055=*
-regexpterm(#20055,9,#20025,2,"(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+")
-#20056=@"loc,{#10000},1,47,1,98"
-locations_default(#20056,#10000,1,47,1,98)
-hasLocation(#20055,#20056)
-is_greedy(#20055)
-#20057=*
-regexpterm(#20057,13,#20055,0,"(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])")
-#20058=@"loc,{#10000},1,47,1,97"
-locations_default(#20058,#10000,1,47,1,97)
-hasLocation(#20057,#20058)
-#20059=*
-regexpterm(#20059,0,#20057,0,"[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]]")
-#20060=@"loc,{#10000},1,50,1,96"
-locations_default(#20060,#10000,1,50,1,96)
-hasLocation(#20059,#20060)
-#20061=*
-regexpterm(#20061,23,#20059,0,"[\S--[\p{P}<>]]")
-#20062=@"loc,{#10000},1,50,1,64"
-locations_default(#20062,#10000,1,50,1,64)
-hasLocation(#20061,#20062)
-#20063=*
-regexpterm(#20063,30,#20061,0,"[\S--[\p{P}<>]]")
-hasLocation(#20063,#20062)
+exprs(#20023,5,#20020,1,"/\b(?:h ... )+)/gmv")
+hasLocation(#20023,#20011)
+enclosing_stmt(#20023,#20019)
+expr_containers(#20023,#20001)
+literals("/\b(?:https?:\/\/|mailto:|www\.)(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+|\b[\S--[@\p{Ps}\p{Pe}<>]]+@([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)/gmv","/\b(?:https?:\/\/|mailto:|www\.)(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+|\b[\S--[@\p{Ps}\p{Pe}<>]]+@([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)/gmv",#20023)
+#20024=*
+regexpterm(#20024,0,#20023,0,"\b(?:https?:\/\/|mailto:|www\.)(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+|\b[\S--[@\p{Ps}\p{Pe}<>]]+@([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)")
+#20025=@"loc,{#10000},1,16,1,167"
+locations_default(#20025,#10000,1,16,1,167)
+hasLocation(#20024,#20025)
+#20026=*
+regexpterm(#20026,1,#20024,0,"\b(?:https?:\/\/|mailto:|www\.)(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+")
+#20027=@"loc,{#10000},1,16,1,98"
+locations_default(#20027,#10000,1,16,1,98)
+hasLocation(#20026,#20027)
+#20028=*
+regexpterm(#20028,4,#20026,0,"\b")
+#20029=@"loc,{#10000},1,16,1,17"
+locations_default(#20029,#10000,1,16,1,17)
+hasLocation(#20028,#20029)
+#20030=*
+regexpterm(#20030,13,#20026,1,"(?:https?:\/\/|mailto:|www\.)")
+#20031=@"loc,{#10000},1,18,1,46"
+locations_default(#20031,#10000,1,18,1,46)
+hasLocation(#20030,#20031)
+#20032=*
+regexpterm(#20032,0,#20030,0,"https?:\/\/|mailto:|www\.")
+#20033=@"loc,{#10000},1,21,1,45"
+locations_default(#20033,#10000,1,21,1,45)
+hasLocation(#20032,#20033)
+#20034=*
+regexpterm(#20034,1,#20032,0,"https?:\/\/")
+#20035=@"loc,{#10000},1,21,1,31"
+locations_default(#20035,#10000,1,21,1,31)
+hasLocation(#20034,#20035)
+#20036=*
+regexpterm(#20036,14,#20034,0,"http")
+#20037=@"loc,{#10000},1,21,1,24"
+locations_default(#20037,#10000,1,21,1,24)
+hasLocation(#20036,#20037)
+regexp_const_value(#20036,"http")
+#20038=*
+regexpterm(#20038,10,#20034,1,"s?")
+#20039=@"loc,{#10000},1,25,1,26"
+locations_default(#20039,#10000,1,25,1,26)
+hasLocation(#20038,#20039)
+is_greedy(#20038)
+#20040=*
+regexpterm(#20040,14,#20038,0,"s")
+#20041=@"loc,{#10000},1,25,1,25"
+locations_default(#20041,#10000,1,25,1,25)
+hasLocation(#20040,#20041)
+regexp_const_value(#20040,"s")
+#20042=*
+regexpterm(#20042,14,#20034,2,":")
+#20043=@"loc,{#10000},1,27,1,27"
+locations_default(#20043,#10000,1,27,1,27)
+hasLocation(#20042,#20043)
+regexp_const_value(#20042,":")
+#20044=*
+regexpterm(#20044,21,#20034,3,"\/")
+#20045=@"loc,{#10000},1,28,1,29"
+locations_default(#20045,#10000,1,28,1,29)
+hasLocation(#20044,#20045)
+regexp_const_value(#20044,"/")
+#20046=*
+regexpterm(#20046,21,#20034,4,"\/")
+#20047=@"loc,{#10000},1,30,1,31"
+locations_default(#20047,#10000,1,30,1,31)
+hasLocation(#20046,#20047)
+regexp_const_value(#20046,"/")
+#20048=*
+regexpterm(#20048,14,#20032,1,"mailto:")
+#20049=@"loc,{#10000},1,33,1,39"
+locations_default(#20049,#10000,1,33,1,39)
+hasLocation(#20048,#20049)
+regexp_const_value(#20048,"mailto:")
+#20050=*
+regexpterm(#20050,1,#20032,2,"www\.")
+#20051=@"loc,{#10000},1,41,1,45"
+locations_default(#20051,#10000,1,41,1,45)
+hasLocation(#20050,#20051)
+#20052=*
+regexpterm(#20052,14,#20050,0,"www")
+#20053=@"loc,{#10000},1,41,1,43"
+locations_default(#20053,#10000,1,41,1,43)
+hasLocation(#20052,#20053)
+regexp_const_value(#20052,"www")
+#20054=*
+regexpterm(#20054,21,#20050,1,"\.")
+#20055=@"loc,{#10000},1,44,1,45"
+locations_default(#20055,#10000,1,44,1,45)
+hasLocation(#20054,#20055)
+regexp_const_value(#20054,".")
+#20056=*
+regexpterm(#20056,9,#20026,2,"(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+")
+#20057=@"loc,{#10000},1,47,1,98"
+locations_default(#20057,#10000,1,47,1,98)
+hasLocation(#20056,#20057)
+is_greedy(#20056)
+#20058=*
+regexpterm(#20058,13,#20056,0,"(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])")
+#20059=@"loc,{#10000},1,47,1,97"
+locations_default(#20059,#10000,1,47,1,97)
+hasLocation(#20058,#20059)
+#20060=*
+regexpterm(#20060,0,#20058,0,"[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]]")
+#20061=@"loc,{#10000},1,50,1,96"
+locations_default(#20061,#10000,1,50,1,96)
+hasLocation(#20060,#20061)
+#20062=*
+regexpterm(#20062,23,#20060,0,"[\S--[\p{P}<>]]")
+#20063=@"loc,{#10000},1,50,1,64"
+locations_default(#20063,#10000,1,50,1,64)
+hasLocation(#20062,#20063)
 #20064=*
-regexpterm(#20064,20,#20063,0,"\S")
-#20065=@"loc,{#10000},1,51,1,52"
-locations_default(#20065,#10000,1,51,1,52)
-hasLocation(#20064,#20065)
-char_class_escape(#20064,"S")
-#20066=*
-regexpterm(#20066,23,#20063,1,"[\p{P}<>]")
-#20067=@"loc,{#10000},1,55,1,63"
-locations_default(#20067,#10000,1,55,1,63)
-hasLocation(#20066,#20067)
-#20068=*
-regexpterm(#20068,27,#20066,0,"\p{P}")
-#20069=@"loc,{#10000},1,56,1,60"
-locations_default(#20069,#10000,1,56,1,60)
-hasLocation(#20068,#20069)
-unicode_property_escapename(#20068,"P")
-#20070=*
-regexpterm(#20070,14,#20066,1,"<")
-#20071=@"loc,{#10000},1,61,1,61"
-locations_default(#20071,#10000,1,61,1,61)
-hasLocation(#20070,#20071)
-regexp_const_value(#20070,"<")
-#20072=*
-regexpterm(#20072,14,#20066,2,">")
-#20073=@"loc,{#10000},1,62,1,62"
-locations_default(#20073,#10000,1,62,1,62)
-hasLocation(#20072,#20073)
-regexp_const_value(#20072,">")
-#20074=*
-regexpterm(#20074,21,#20059,1,"\/")
-#20075=@"loc,{#10000},1,66,1,67"
-locations_default(#20075,#10000,1,66,1,67)
-hasLocation(#20074,#20075)
-regexp_const_value(#20074,"/")
-#20076=*
-regexpterm(#20076,1,#20059,2,"[\S--[\[\]]]+[\S--[\p{P}<>]]")
-#20077=@"loc,{#10000},1,69,1,96"
-locations_default(#20077,#10000,1,69,1,96)
-hasLocation(#20076,#20077)
-#20078=*
-regexpterm(#20078,9,#20076,0,"[\S--[\[\]]]+")
-#20079=@"loc,{#10000},1,69,1,81"
-locations_default(#20079,#10000,1,69,1,81)
-hasLocation(#20078,#20079)
-is_greedy(#20078)
-#20080=*
-regexpterm(#20080,23,#20078,0,"[\S--[\[\]]]")
-#20081=@"loc,{#10000},1,69,1,80"
-locations_default(#20081,#10000,1,69,1,80)
-hasLocation(#20080,#20081)
-#20082=*
-regexpterm(#20082,30,#20080,0,"[\S--[\[\]]]")
-hasLocation(#20082,#20081)
+regexpterm(#20064,30,#20062,0,"[\S--[\p{P}<>]]")
+hasLocation(#20064,#20063)
+#20065=*
+regexpterm(#20065,20,#20064,0,"\S")
+#20066=@"loc,{#10000},1,51,1,52"
+locations_default(#20066,#10000,1,51,1,52)
+hasLocation(#20065,#20066)
+char_class_escape(#20065,"S")
+#20067=*
+regexpterm(#20067,23,#20064,1,"[\p{P}<>]")
+#20068=@"loc,{#10000},1,55,1,63"
+locations_default(#20068,#10000,1,55,1,63)
+hasLocation(#20067,#20068)
+#20069=*
+regexpterm(#20069,27,#20067,0,"\p{P}")
+#20070=@"loc,{#10000},1,56,1,60"
+locations_default(#20070,#10000,1,56,1,60)
+hasLocation(#20069,#20070)
+unicode_property_escapename(#20069,"P")
+#20071=*
+regexpterm(#20071,14,#20067,1,"<")
+#20072=@"loc,{#10000},1,61,1,61"
+locations_default(#20072,#10000,1,61,1,61)
+hasLocation(#20071,#20072)
+regexp_const_value(#20071,"<")
+#20073=*
+regexpterm(#20073,14,#20067,2,">")
+#20074=@"loc,{#10000},1,62,1,62"
+locations_default(#20074,#10000,1,62,1,62)
+hasLocation(#20073,#20074)
+regexp_const_value(#20073,">")
+#20075=*
+regexpterm(#20075,21,#20060,1,"\/")
+#20076=@"loc,{#10000},1,66,1,67"
+locations_default(#20076,#10000,1,66,1,67)
+hasLocation(#20075,#20076)
+regexp_const_value(#20075,"/")
+#20077=*
+regexpterm(#20077,1,#20060,2,"[\S--[\[\]]]+[\S--[\p{P}<>]]")
+#20078=@"loc,{#10000},1,69,1,96"
+locations_default(#20078,#10000,1,69,1,96)
+hasLocation(#20077,#20078)
+#20079=*
+regexpterm(#20079,9,#20077,0,"[\S--[\[\]]]+")
+#20080=@"loc,{#10000},1,69,1,81"
+locations_default(#20080,#10000,1,69,1,81)
+hasLocation(#20079,#20080)
+is_greedy(#20079)
+#20081=*
+regexpterm(#20081,23,#20079,0,"[\S--[\[\]]]")
+#20082=@"loc,{#10000},1,69,1,80"
+locations_default(#20082,#10000,1,69,1,80)
+hasLocation(#20081,#20082)
 #20083=*
-regexpterm(#20083,20,#20082,0,"\S")
-#20084=@"loc,{#10000},1,70,1,71"
-locations_default(#20084,#10000,1,70,1,71)
-hasLocation(#20083,#20084)
-char_class_escape(#20083,"S")
-#20085=*
-regexpterm(#20085,23,#20082,1,"[\[\]]")
-#20086=@"loc,{#10000},1,74,1,79"
-locations_default(#20086,#10000,1,74,1,79)
-hasLocation(#20085,#20086)
-#20087=*
-regexpterm(#20087,21,#20085,0,"\[")
-#20088=@"loc,{#10000},1,75,1,76"
-locations_default(#20088,#10000,1,75,1,76)
-hasLocation(#20087,#20088)
-regexp_const_value(#20087,"[")
-#20089=*
-regexpterm(#20089,21,#20085,1,"\]")
-#20090=@"loc,{#10000},1,77,1,78"
-locations_default(#20090,#10000,1,77,1,78)
-hasLocation(#20089,#20090)
-regexp_const_value(#20089,"]")
-#20091=*
-regexpterm(#20091,23,#20076,1,"[\S--[\p{P}<>]]")
-#20092=@"loc,{#10000},1,82,1,96"
-locations_default(#20092,#10000,1,82,1,96)
-hasLocation(#20091,#20092)
-#20093=*
-regexpterm(#20093,30,#20091,0,"[\S--[\p{P}<>]]")
-hasLocation(#20093,#20092)
+regexpterm(#20083,30,#20081,0,"[\S--[\[\]]]")
+hasLocation(#20083,#20082)
+#20084=*
+regexpterm(#20084,20,#20083,0,"\S")
+#20085=@"loc,{#10000},1,70,1,71"
+locations_default(#20085,#10000,1,70,1,71)
+hasLocation(#20084,#20085)
+char_class_escape(#20084,"S")
+#20086=*
+regexpterm(#20086,23,#20083,1,"[\[\]]")
+#20087=@"loc,{#10000},1,74,1,79"
+locations_default(#20087,#10000,1,74,1,79)
+hasLocation(#20086,#20087)
+#20088=*
+regexpterm(#20088,21,#20086,0,"\[")
+#20089=@"loc,{#10000},1,75,1,76"
+locations_default(#20089,#10000,1,75,1,76)
+hasLocation(#20088,#20089)
+regexp_const_value(#20088,"[")
+#20090=*
+regexpterm(#20090,21,#20086,1,"\]")
+#20091=@"loc,{#10000},1,77,1,78"
+locations_default(#20091,#10000,1,77,1,78)
+hasLocation(#20090,#20091)
+regexp_const_value(#20090,"]")
+#20092=*
+regexpterm(#20092,23,#20077,1,"[\S--[\p{P}<>]]")
+#20093=@"loc,{#10000},1,82,1,96"
+locations_default(#20093,#10000,1,82,1,96)
+hasLocation(#20092,#20093)
 #20094=*
-regexpterm(#20094,20,#20093,0,"\S")
-#20095=@"loc,{#10000},1,83,1,84"
-locations_default(#20095,#10000,1,83,1,84)
-hasLocation(#20094,#20095)
-char_class_escape(#20094,"S")
-#20096=*
-regexpterm(#20096,23,#20093,1,"[\p{P}<>]")
-#20097=@"loc,{#10000},1,87,1,95"
-locations_default(#20097,#10000,1,87,1,95)
-hasLocation(#20096,#20097)
-#20098=*
-regexpterm(#20098,27,#20096,0,"\p{P}")
-#20099=@"loc,{#10000},1,88,1,92"
-locations_default(#20099,#10000,1,88,1,92)
-hasLocation(#20098,#20099)
-unicode_property_escapename(#20098,"P")
-#20100=*
-regexpterm(#20100,14,#20096,1,"<")
-#20101=@"loc,{#10000},1,93,1,93"
-locations_default(#20101,#10000,1,93,1,93)
-hasLocation(#20100,#20101)
-regexp_const_value(#20100,"<")
-#20102=*
-regexpterm(#20102,14,#20096,2,">")
-#20103=@"loc,{#10000},1,94,1,94"
-locations_default(#20103,#10000,1,94,1,94)
-hasLocation(#20102,#20103)
-regexp_const_value(#20102,">")
-#20104=*
-regexpterm(#20104,1,#20023,1,"\b[\S--[@\p{Ps}\p{Pe}<>]]+@([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)")
-#20105=@"loc,{#10000},1,100,1,167"
-locations_default(#20105,#10000,1,100,1,167)
-hasLocation(#20104,#20105)
-#20106=*
-regexpterm(#20106,4,#20104,0,"\b")
-#20107=@"loc,{#10000},1,100,1,101"
-locations_default(#20107,#10000,1,100,1,101)
-hasLocation(#20106,#20107)
-#20108=*
-regexpterm(#20108,9,#20104,1,"[\S--[@\p{Ps}\p{Pe}<>]]+")
-#20109=@"loc,{#10000},1,102,1,125"
-locations_default(#20109,#10000,1,102,1,125)
-hasLocation(#20108,#20109)
-is_greedy(#20108)
-#20110=*
-regexpterm(#20110,23,#20108,0,"[\S--[@\p{Ps}\p{Pe}<>]]")
-#20111=@"loc,{#10000},1,102,1,124"
-locations_default(#20111,#10000,1,102,1,124)
-hasLocation(#20110,#20111)
-#20112=*
-regexpterm(#20112,30,#20110,0,"[\S--[@\p{Ps}\p{Pe}<>]]")
-hasLocation(#20112,#20111)
+regexpterm(#20094,30,#20092,0,"[\S--[\p{P}<>]]")
+hasLocation(#20094,#20093)
+#20095=*
+regexpterm(#20095,20,#20094,0,"\S")
+#20096=@"loc,{#10000},1,83,1,84"
+locations_default(#20096,#10000,1,83,1,84)
+hasLocation(#20095,#20096)
+char_class_escape(#20095,"S")
+#20097=*
+regexpterm(#20097,23,#20094,1,"[\p{P}<>]")
+#20098=@"loc,{#10000},1,87,1,95"
+locations_default(#20098,#10000,1,87,1,95)
+hasLocation(#20097,#20098)
+#20099=*
+regexpterm(#20099,27,#20097,0,"\p{P}")
+#20100=@"loc,{#10000},1,88,1,92"
+locations_default(#20100,#10000,1,88,1,92)
+hasLocation(#20099,#20100)
+unicode_property_escapename(#20099,"P")
+#20101=*
+regexpterm(#20101,14,#20097,1,"<")
+#20102=@"loc,{#10000},1,93,1,93"
+locations_default(#20102,#10000,1,93,1,93)
+hasLocation(#20101,#20102)
+regexp_const_value(#20101,"<")
+#20103=*
+regexpterm(#20103,14,#20097,2,">")
+#20104=@"loc,{#10000},1,94,1,94"
+locations_default(#20104,#10000,1,94,1,94)
+hasLocation(#20103,#20104)
+regexp_const_value(#20103,">")
+#20105=*
+regexpterm(#20105,1,#20024,1,"\b[\S--[@\p{Ps}\p{Pe}<>]]+@([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)")
+#20106=@"loc,{#10000},1,100,1,167"
+locations_default(#20106,#10000,1,100,1,167)
+hasLocation(#20105,#20106)
+#20107=*
+regexpterm(#20107,4,#20105,0,"\b")
+#20108=@"loc,{#10000},1,100,1,101"
+locations_default(#20108,#10000,1,100,1,101)
+hasLocation(#20107,#20108)
+#20109=*
+regexpterm(#20109,9,#20105,1,"[\S--[@\p{Ps}\p{Pe}<>]]+")
+#20110=@"loc,{#10000},1,102,1,125"
+locations_default(#20110,#10000,1,102,1,125)
+hasLocation(#20109,#20110)
+is_greedy(#20109)
+#20111=*
+regexpterm(#20111,23,#20109,0,"[\S--[@\p{Ps}\p{Pe}<>]]")
+#20112=@"loc,{#10000},1,102,1,124"
+locations_default(#20112,#10000,1,102,1,124)
+hasLocation(#20111,#20112)
 #20113=*
-regexpterm(#20113,20,#20112,0,"\S")
-#20114=@"loc,{#10000},1,103,1,104"
-locations_default(#20114,#10000,1,103,1,104)
-hasLocation(#20113,#20114)
-char_class_escape(#20113,"S")
-#20115=*
-regexpterm(#20115,23,#20112,1,"[@\p{Ps}\p{Pe}<>]")
-#20116=@"loc,{#10000},1,107,1,123"
-locations_default(#20116,#10000,1,107,1,123)
-hasLocation(#20115,#20116)
-#20117=*
-regexpterm(#20117,14,#20115,0,"@")
-#20118=@"loc,{#10000},1,108,1,108"
-locations_default(#20118,#10000,1,108,1,108)
-hasLocation(#20117,#20118)
-regexp_const_value(#20117,"@")
-#20119=*
-regexpterm(#20119,27,#20115,1,"\p{Ps}")
-#20120=@"loc,{#10000},1,109,1,114"
-locations_default(#20120,#10000,1,109,1,114)
-hasLocation(#20119,#20120)
-unicode_property_escapename(#20119,"Ps")
-#20121=*
-regexpterm(#20121,27,#20115,2,"\p{Pe}")
-#20122=@"loc,{#10000},1,115,1,120"
-locations_default(#20122,#10000,1,115,1,120)
-hasLocation(#20121,#20122)
-unicode_property_escapename(#20121,"Pe")
-#20123=*
-regexpterm(#20123,14,#20115,3,"<")
-#20124=@"loc,{#10000},1,121,1,121"
-locations_default(#20124,#10000,1,121,1,121)
-hasLocation(#20123,#20124)
-regexp_const_value(#20123,"<")
-#20125=*
-regexpterm(#20125,14,#20115,4,">")
-#20126=@"loc,{#10000},1,122,1,122"
-locations_default(#20126,#10000,1,122,1,122)
-hasLocation(#20125,#20126)
-regexp_const_value(#20125,">")
-#20127=*
-regexpterm(#20127,14,#20104,2,"@")
-#20128=@"loc,{#10000},1,126,1,126"
-locations_default(#20128,#10000,1,126,1,126)
-hasLocation(#20127,#20128)
-regexp_const_value(#20127,"@")
-#20129=*
-regexpterm(#20129,13,#20104,3,"([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)")
-#20130=@"loc,{#10000},1,127,1,167"
-locations_default(#20130,#10000,1,127,1,167)
-hasLocation(#20129,#20130)
-is_capture(#20129,1)
-#20131=*
-regexpterm(#20131,1,#20129,0,"[\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+")
-#20132=@"loc,{#10000},1,128,1,166"
-locations_default(#20132,#10000,1,128,1,166)
-hasLocation(#20131,#20132)
-#20133=*
-regexpterm(#20133,9,#20131,0,"[\S--[\p{P}<>]]+")
-#20134=@"loc,{#10000},1,128,1,143"
-locations_default(#20134,#10000,1,128,1,143)
-hasLocation(#20133,#20134)
-is_greedy(#20133)
-#20135=*
-regexpterm(#20135,23,#20133,0,"[\S--[\p{P}<>]]")
-#20136=@"loc,{#10000},1,128,1,142"
-locations_default(#20136,#10000,1,128,1,142)
-hasLocation(#20135,#20136)
-#20137=*
-regexpterm(#20137,30,#20135,0,"[\S--[\p{P}<>]]")
-hasLocation(#20137,#20136)
+regexpterm(#20113,30,#20111,0,"[\S--[@\p{Ps}\p{Pe}<>]]")
+hasLocation(#20113,#20112)
+#20114=*
+regexpterm(#20114,20,#20113,0,"\S")
+#20115=@"loc,{#10000},1,103,1,104"
+locations_default(#20115,#10000,1,103,1,104)
+hasLocation(#20114,#20115)
+char_class_escape(#20114,"S")
+#20116=*
+regexpterm(#20116,23,#20113,1,"[@\p{Ps}\p{Pe}<>]")
+#20117=@"loc,{#10000},1,107,1,123"
+locations_default(#20117,#10000,1,107,1,123)
+hasLocation(#20116,#20117)
+#20118=*
+regexpterm(#20118,14,#20116,0,"@")
+#20119=@"loc,{#10000},1,108,1,108"
+locations_default(#20119,#10000,1,108,1,108)
+hasLocation(#20118,#20119)
+regexp_const_value(#20118,"@")
+#20120=*
+regexpterm(#20120,27,#20116,1,"\p{Ps}")
+#20121=@"loc,{#10000},1,109,1,114"
+locations_default(#20121,#10000,1,109,1,114)
+hasLocation(#20120,#20121)
+unicode_property_escapename(#20120,"Ps")
+#20122=*
+regexpterm(#20122,27,#20116,2,"\p{Pe}")
+#20123=@"loc,{#10000},1,115,1,120"
+locations_default(#20123,#10000,1,115,1,120)
+hasLocation(#20122,#20123)
+unicode_property_escapename(#20122,"Pe")
+#20124=*
+regexpterm(#20124,14,#20116,3,"<")
+#20125=@"loc,{#10000},1,121,1,121"
+locations_default(#20125,#10000,1,121,1,121)
+hasLocation(#20124,#20125)
+regexp_const_value(#20124,"<")
+#20126=*
+regexpterm(#20126,14,#20116,4,">")
+#20127=@"loc,{#10000},1,122,1,122"
+locations_default(#20127,#10000,1,122,1,122)
+hasLocation(#20126,#20127)
+regexp_const_value(#20126,">")
+#20128=*
+regexpterm(#20128,14,#20105,2,"@")
+#20129=@"loc,{#10000},1,126,1,126"
+locations_default(#20129,#10000,1,126,1,126)
+hasLocation(#20128,#20129)
+regexp_const_value(#20128,"@")
+#20130=*
+regexpterm(#20130,13,#20105,3,"([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)")
+#20131=@"loc,{#10000},1,127,1,167"
+locations_default(#20131,#10000,1,127,1,167)
+hasLocation(#20130,#20131)
+is_capture(#20130,1)
+#20132=*
+regexpterm(#20132,1,#20130,0,"[\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+")
+#20133=@"loc,{#10000},1,128,1,166"
+locations_default(#20133,#10000,1,128,1,166)
+hasLocation(#20132,#20133)
+#20134=*
+regexpterm(#20134,9,#20132,0,"[\S--[\p{P}<>]]+")
+#20135=@"loc,{#10000},1,128,1,143"
+locations_default(#20135,#10000,1,128,1,143)
+hasLocation(#20134,#20135)
+is_greedy(#20134)
+#20136=*
+regexpterm(#20136,23,#20134,0,"[\S--[\p{P}<>]]")
+#20137=@"loc,{#10000},1,128,1,142"
+locations_default(#20137,#10000,1,128,1,142)
+hasLocation(#20136,#20137)
 #20138=*
-regexpterm(#20138,20,#20137,0,"\S")
-#20139=@"loc,{#10000},1,129,1,130"
-locations_default(#20139,#10000,1,129,1,130)
-hasLocation(#20138,#20139)
-char_class_escape(#20138,"S")
-#20140=*
-regexpterm(#20140,23,#20137,1,"[\p{P}<>]")
-#20141=@"loc,{#10000},1,133,1,141"
-locations_default(#20141,#10000,1,133,1,141)
-hasLocation(#20140,#20141)
-#20142=*
-regexpterm(#20142,27,#20140,0,"\p{P}")
-#20143=@"loc,{#10000},1,134,1,138"
-locations_default(#20143,#10000,1,134,1,138)
-hasLocation(#20142,#20143)
-unicode_property_escapename(#20142,"P")
-#20144=*
-regexpterm(#20144,14,#20140,1,"<")
-#20145=@"loc,{#10000},1,139,1,139"
-locations_default(#20145,#10000,1,139,1,139)
-hasLocation(#20144,#20145)
-regexp_const_value(#20144,"<")
-#20146=*
-regexpterm(#20146,14,#20140,2,">")
-#20147=@"loc,{#10000},1,140,1,140"
-locations_default(#20147,#10000,1,140,1,140)
-hasLocation(#20146,#20147)
-regexp_const_value(#20146,">")
-#20148=*
-regexpterm(#20148,9,#20131,1,"(?:\.[\S--[\p{P}<>]]+)+")
-#20149=@"loc,{#10000},1,144,1,166"
-locations_default(#20149,#10000,1,144,1,166)
-hasLocation(#20148,#20149)
-is_greedy(#20148)
-#20150=*
-regexpterm(#20150,13,#20148,0,"(?:\.[\S--[\p{P}<>]]+)")
-#20151=@"loc,{#10000},1,144,1,165"
-locations_default(#20151,#10000,1,144,1,165)
-hasLocation(#20150,#20151)
-#20152=*
-regexpterm(#20152,1,#20150,0,"\.[\S--[\p{P}<>]]+")
-#20153=@"loc,{#10000},1,147,1,164"
-locations_default(#20153,#10000,1,147,1,164)
-hasLocation(#20152,#20153)
-#20154=*
-regexpterm(#20154,21,#20152,0,"\.")
-#20155=@"loc,{#10000},1,147,1,148"
-locations_default(#20155,#10000,1,147,1,148)
-hasLocation(#20154,#20155)
-regexp_const_value(#20154,".")
-#20156=*
-regexpterm(#20156,9,#20152,1,"[\S--[\p{P}<>]]+")
-#20157=@"loc,{#10000},1,149,1,164"
-locations_default(#20157,#10000,1,149,1,164)
-hasLocation(#20156,#20157)
-is_greedy(#20156)
-#20158=*
-regexpterm(#20158,23,#20156,0,"[\S--[\p{P}<>]]")
-#20159=@"loc,{#10000},1,149,1,163"
-locations_default(#20159,#10000,1,149,1,163)
-hasLocation(#20158,#20159)
-#20160=*
-regexpterm(#20160,30,#20158,0,"[\S--[\p{P}<>]]")
-hasLocation(#20160,#20159)
+regexpterm(#20138,30,#20136,0,"[\S--[\p{P}<>]]")
+hasLocation(#20138,#20137)
+#20139=*
+regexpterm(#20139,20,#20138,0,"\S")
+#20140=@"loc,{#10000},1,129,1,130"
+locations_default(#20140,#10000,1,129,1,130)
+hasLocation(#20139,#20140)
+char_class_escape(#20139,"S")
+#20141=*
+regexpterm(#20141,23,#20138,1,"[\p{P}<>]")
+#20142=@"loc,{#10000},1,133,1,141"
+locations_default(#20142,#10000,1,133,1,141)
+hasLocation(#20141,#20142)
+#20143=*
+regexpterm(#20143,27,#20141,0,"\p{P}")
+#20144=@"loc,{#10000},1,134,1,138"
+locations_default(#20144,#10000,1,134,1,138)
+hasLocation(#20143,#20144)
+unicode_property_escapename(#20143,"P")
+#20145=*
+regexpterm(#20145,14,#20141,1,"<")
+#20146=@"loc,{#10000},1,139,1,139"
+locations_default(#20146,#10000,1,139,1,139)
+hasLocation(#20145,#20146)
+regexp_const_value(#20145,"<")
+#20147=*
+regexpterm(#20147,14,#20141,2,">")
+#20148=@"loc,{#10000},1,140,1,140"
+locations_default(#20148,#10000,1,140,1,140)
+hasLocation(#20147,#20148)
+regexp_const_value(#20147,">")
+#20149=*
+regexpterm(#20149,9,#20132,1,"(?:\.[\S--[\p{P}<>]]+)+")
+#20150=@"loc,{#10000},1,144,1,166"
+locations_default(#20150,#10000,1,144,1,166)
+hasLocation(#20149,#20150)
+is_greedy(#20149)
+#20151=*
+regexpterm(#20151,13,#20149,0,"(?:\.[\S--[\p{P}<>]]+)")
+#20152=@"loc,{#10000},1,144,1,165"
+locations_default(#20152,#10000,1,144,1,165)
+hasLocation(#20151,#20152)
+#20153=*
+regexpterm(#20153,1,#20151,0,"\.[\S--[\p{P}<>]]+")
+#20154=@"loc,{#10000},1,147,1,164"
+locations_default(#20154,#10000,1,147,1,164)
+hasLocation(#20153,#20154)
+#20155=*
+regexpterm(#20155,21,#20153,0,"\.")
+#20156=@"loc,{#10000},1,147,1,148"
+locations_default(#20156,#10000,1,147,1,148)
+hasLocation(#20155,#20156)
+regexp_const_value(#20155,".")
+#20157=*
+regexpterm(#20157,9,#20153,1,"[\S--[\p{P}<>]]+")
+#20158=@"loc,{#10000},1,149,1,164"
+locations_default(#20158,#10000,1,149,1,164)
+hasLocation(#20157,#20158)
+is_greedy(#20157)
+#20159=*
+regexpterm(#20159,23,#20157,0,"[\S--[\p{P}<>]]")
+#20160=@"loc,{#10000},1,149,1,163"
+locations_default(#20160,#10000,1,149,1,163)
+hasLocation(#20159,#20160)
 #20161=*
-regexpterm(#20161,20,#20160,0,"\S")
-#20162=@"loc,{#10000},1,150,1,151"
-locations_default(#20162,#10000,1,150,1,151)
-hasLocation(#20161,#20162)
-char_class_escape(#20161,"S")
-#20163=*
-regexpterm(#20163,23,#20160,1,"[\p{P}<>]")
-#20164=@"loc,{#10000},1,154,1,162"
-locations_default(#20164,#10000,1,154,1,162)
-hasLocation(#20163,#20164)
-#20165=*
-regexpterm(#20165,27,#20163,0,"\p{P}")
-#20166=@"loc,{#10000},1,155,1,159"
-locations_default(#20166,#10000,1,155,1,159)
-hasLocation(#20165,#20166)
-unicode_property_escapename(#20165,"P")
-#20167=*
-regexpterm(#20167,14,#20163,1,"<")
-#20168=@"loc,{#10000},1,160,1,160"
-locations_default(#20168,#10000,1,160,1,160)
-hasLocation(#20167,#20168)
-regexp_const_value(#20167,"<")
-#20169=*
-regexpterm(#20169,14,#20163,2,">")
-#20170=@"loc,{#10000},1,161,1,161"
-locations_default(#20170,#10000,1,161,1,161)
-hasLocation(#20169,#20170)
-regexp_const_value(#20169,">")
-#20171=*
-entry_cfg_node(#20171,#20001)
-#20172=@"loc,{#10000},1,1,1,0"
-locations_default(#20172,#10000,1,1,1,0)
-hasLocation(#20171,#20172)
-#20173=*
-exit_cfg_node(#20173,#20001)
-hasLocation(#20173,#20015)
-successor(#20018,#20021)
-successor(#20022,#20019)
-successor(#20021,#20022)
-successor(#20019,#20173)
-successor(#20171,#20018)
+regexpterm(#20161,30,#20159,0,"[\S--[\p{P}<>]]")
+hasLocation(#20161,#20160)
+#20162=*
+regexpterm(#20162,20,#20161,0,"\S")
+#20163=@"loc,{#10000},1,150,1,151"
+locations_default(#20163,#10000,1,150,1,151)
+hasLocation(#20162,#20163)
+char_class_escape(#20162,"S")
+#20164=*
+regexpterm(#20164,23,#20161,1,"[\p{P}<>]")
+#20165=@"loc,{#10000},1,154,1,162"
+locations_default(#20165,#10000,1,154,1,162)
+hasLocation(#20164,#20165)
+#20166=*
+regexpterm(#20166,27,#20164,0,"\p{P}")
+#20167=@"loc,{#10000},1,155,1,159"
+locations_default(#20167,#10000,1,155,1,159)
+hasLocation(#20166,#20167)
+unicode_property_escapename(#20166,"P")
+#20168=*
+regexpterm(#20168,14,#20164,1,"<")
+#20169=@"loc,{#10000},1,160,1,160"
+locations_default(#20169,#10000,1,160,1,160)
+hasLocation(#20168,#20169)
+regexp_const_value(#20168,"<")
+#20170=*
+regexpterm(#20170,14,#20164,2,">")
+#20171=@"loc,{#10000},1,161,1,161"
+locations_default(#20171,#10000,1,161,1,161)
+hasLocation(#20170,#20171)
+regexp_const_value(#20170,">")
+#20172=*
+entry_cfg_node(#20172,#20001)
+#20173=@"loc,{#10000},1,1,1,0"
+locations_default(#20173,#10000,1,1,1,0)
+hasLocation(#20172,#20173)
+#20174=*
+exit_cfg_node(#20174,#20001)
+hasLocation(#20174,#20015)
+successor(#20019,#20022)
+successor(#20023,#20020)
+successor(#20022,#20023)
+successor(#20020,#20174)
+successor(#20172,#20019)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/es2024/output/trap/union.js.trap b/javascript/extractor/tests/es2024/output/trap/union.js.trap
index 31d98f755e8..563e012f356 100644
--- a/javascript/extractor/tests/es2024/output/trap/union.js.trap
+++ b/javascript/extractor/tests/es2024/output/trap/union.js.trap
@@ -115,278 +115,280 @@ toplevels(#20001,0)
 #20040=@"loc,{#10000},1,1,7,0"
 locations_default(#20040,#10000,1,1,7,0)
 hasLocation(#20001,#20040)
-#20041=*
-stmts(#20041,2,#20001,0,"/[\p{Sc ... ji}]/v;")
-hasLocation(#20041,#20003)
-stmt_containers(#20041,#20001)
+#20041=@"var;{this};{#20000}"
+variables(#20041,"this",#20000)
 #20042=*
-exprs(#20042,5,#20041,0,"/[\p{Sc ... oji}]/v")
-hasLocation(#20042,#20015)
-enclosing_stmt(#20042,#20041)
-expr_containers(#20042,#20001)
-literals("/[\p{Script_Extensions=Greek}\p{RGI_Emoji}]/v","/[\p{Script_Extensions=Greek}\p{RGI_Emoji}]/v",#20042)
+stmts(#20042,2,#20001,0,"/[\p{Sc ... ji}]/v;")
+hasLocation(#20042,#20003)
+stmt_containers(#20042,#20001)
 #20043=*
-regexpterm(#20043,23,#20042,0,"[\p{Script_Extensions=Greek}\p{RGI_Emoji}]")
-#20044=@"loc,{#10000},1,2,1,43"
-locations_default(#20044,#10000,1,2,1,43)
-hasLocation(#20043,#20044)
-#20045=*
-regexpterm(#20045,27,#20043,0,"\p{Script_Extensions=Greek}")
-#20046=@"loc,{#10000},1,3,1,29"
-locations_default(#20046,#10000,1,3,1,29)
-hasLocation(#20045,#20046)
-unicode_property_escapename(#20045,"Script_Extensions")
-unicode_property_escapevalue(#20045,"Greek")
-#20047=*
-regexpterm(#20047,27,#20043,1,"\p{RGI_Emoji}")
-#20048=@"loc,{#10000},1,30,1,42"
-locations_default(#20048,#10000,1,30,1,42)
-hasLocation(#20047,#20048)
-unicode_property_escapename(#20047,"RGI_Emoji")
-#20049=*
-stmts(#20049,2,#20001,1,"/[[abc][cbd]]/v;")
-hasLocation(#20049,#20005)
-stmt_containers(#20049,#20001)
+exprs(#20043,5,#20042,0,"/[\p{Sc ... oji}]/v")
+hasLocation(#20043,#20015)
+enclosing_stmt(#20043,#20042)
+expr_containers(#20043,#20001)
+literals("/[\p{Script_Extensions=Greek}\p{RGI_Emoji}]/v","/[\p{Script_Extensions=Greek}\p{RGI_Emoji}]/v",#20043)
+#20044=*
+regexpterm(#20044,23,#20043,0,"[\p{Script_Extensions=Greek}\p{RGI_Emoji}]")
+#20045=@"loc,{#10000},1,2,1,43"
+locations_default(#20045,#10000,1,2,1,43)
+hasLocation(#20044,#20045)
+#20046=*
+regexpterm(#20046,27,#20044,0,"\p{Script_Extensions=Greek}")
+#20047=@"loc,{#10000},1,3,1,29"
+locations_default(#20047,#10000,1,3,1,29)
+hasLocation(#20046,#20047)
+unicode_property_escapename(#20046,"Script_Extensions")
+unicode_property_escapevalue(#20046,"Greek")
+#20048=*
+regexpterm(#20048,27,#20044,1,"\p{RGI_Emoji}")
+#20049=@"loc,{#10000},1,30,1,42"
+locations_default(#20049,#10000,1,30,1,42)
+hasLocation(#20048,#20049)
+unicode_property_escapename(#20048,"RGI_Emoji")
 #20050=*
-exprs(#20050,5,#20049,0,"/[[abc][cbd]]/v")
-hasLocation(#20050,#20019)
-enclosing_stmt(#20050,#20049)
-expr_containers(#20050,#20001)
-literals("/[[abc][cbd]]/v","/[[abc][cbd]]/v",#20050)
+stmts(#20050,2,#20001,1,"/[[abc][cbd]]/v;")
+hasLocation(#20050,#20005)
+stmt_containers(#20050,#20001)
 #20051=*
-regexpterm(#20051,23,#20050,0,"[[abc][cbd]]")
-#20052=@"loc,{#10000},2,2,2,13"
-locations_default(#20052,#10000,2,2,2,13)
-hasLocation(#20051,#20052)
-#20053=*
-regexpterm(#20053,23,#20051,0,"[abc]")
-#20054=@"loc,{#10000},2,3,2,7"
-locations_default(#20054,#10000,2,3,2,7)
-hasLocation(#20053,#20054)
-#20055=*
-regexpterm(#20055,14,#20053,0,"a")
-#20056=@"loc,{#10000},2,4,2,4"
-locations_default(#20056,#10000,2,4,2,4)
-hasLocation(#20055,#20056)
-regexp_const_value(#20055,"a")
-#20057=*
-regexpterm(#20057,14,#20053,1,"b")
-#20058=@"loc,{#10000},2,5,2,5"
-locations_default(#20058,#10000,2,5,2,5)
-hasLocation(#20057,#20058)
-regexp_const_value(#20057,"b")
-#20059=*
-regexpterm(#20059,14,#20053,2,"c")
-#20060=@"loc,{#10000},2,6,2,6"
-locations_default(#20060,#10000,2,6,2,6)
-hasLocation(#20059,#20060)
-regexp_const_value(#20059,"c")
-#20061=*
-regexpterm(#20061,23,#20051,1,"[cbd]")
-#20062=@"loc,{#10000},2,8,2,12"
-locations_default(#20062,#10000,2,8,2,12)
-hasLocation(#20061,#20062)
-#20063=*
-regexpterm(#20063,14,#20061,0,"c")
-#20064=@"loc,{#10000},2,9,2,9"
-locations_default(#20064,#10000,2,9,2,9)
-hasLocation(#20063,#20064)
-regexp_const_value(#20063,"c")
-#20065=*
-regexpterm(#20065,14,#20061,1,"b")
-#20066=@"loc,{#10000},2,10,2,10"
-locations_default(#20066,#10000,2,10,2,10)
-hasLocation(#20065,#20066)
-regexp_const_value(#20065,"b")
-#20067=*
-regexpterm(#20067,14,#20061,2,"d")
-#20068=@"loc,{#10000},2,11,2,11"
-locations_default(#20068,#10000,2,11,2,11)
-hasLocation(#20067,#20068)
-regexp_const_value(#20067,"d")
-#20069=*
-stmts(#20069,2,#20001,2,"/[\p{Em ... byz]/v;")
-hasLocation(#20069,#20007)
-stmt_containers(#20069,#20001)
+exprs(#20051,5,#20050,0,"/[[abc][cbd]]/v")
+hasLocation(#20051,#20019)
+enclosing_stmt(#20051,#20050)
+expr_containers(#20051,#20001)
+literals("/[[abc][cbd]]/v","/[[abc][cbd]]/v",#20051)
+#20052=*
+regexpterm(#20052,23,#20051,0,"[[abc][cbd]]")
+#20053=@"loc,{#10000},2,2,2,13"
+locations_default(#20053,#10000,2,2,2,13)
+hasLocation(#20052,#20053)
+#20054=*
+regexpterm(#20054,23,#20052,0,"[abc]")
+#20055=@"loc,{#10000},2,3,2,7"
+locations_default(#20055,#10000,2,3,2,7)
+hasLocation(#20054,#20055)
+#20056=*
+regexpterm(#20056,14,#20054,0,"a")
+#20057=@"loc,{#10000},2,4,2,4"
+locations_default(#20057,#10000,2,4,2,4)
+hasLocation(#20056,#20057)
+regexp_const_value(#20056,"a")
+#20058=*
+regexpterm(#20058,14,#20054,1,"b")
+#20059=@"loc,{#10000},2,5,2,5"
+locations_default(#20059,#10000,2,5,2,5)
+hasLocation(#20058,#20059)
+regexp_const_value(#20058,"b")
+#20060=*
+regexpterm(#20060,14,#20054,2,"c")
+#20061=@"loc,{#10000},2,6,2,6"
+locations_default(#20061,#10000,2,6,2,6)
+hasLocation(#20060,#20061)
+regexp_const_value(#20060,"c")
+#20062=*
+regexpterm(#20062,23,#20052,1,"[cbd]")
+#20063=@"loc,{#10000},2,8,2,12"
+locations_default(#20063,#10000,2,8,2,12)
+hasLocation(#20062,#20063)
+#20064=*
+regexpterm(#20064,14,#20062,0,"c")
+#20065=@"loc,{#10000},2,9,2,9"
+locations_default(#20065,#10000,2,9,2,9)
+hasLocation(#20064,#20065)
+regexp_const_value(#20064,"c")
+#20066=*
+regexpterm(#20066,14,#20062,1,"b")
+#20067=@"loc,{#10000},2,10,2,10"
+locations_default(#20067,#10000,2,10,2,10)
+hasLocation(#20066,#20067)
+regexp_const_value(#20066,"b")
+#20068=*
+regexpterm(#20068,14,#20062,2,"d")
+#20069=@"loc,{#10000},2,11,2,11"
+locations_default(#20069,#10000,2,11,2,11)
+hasLocation(#20068,#20069)
+regexp_const_value(#20068,"d")
 #20070=*
-exprs(#20070,5,#20069,0,"/[\p{Em ... }byz]/v")
-hasLocation(#20070,#20023)
-enclosing_stmt(#20070,#20069)
-expr_containers(#20070,#20001)
-literals("/[\p{Emoji}\q{a&}byz]/v","/[\p{Emoji}\q{a&}byz]/v",#20070)
+stmts(#20070,2,#20001,2,"/[\p{Em ... byz]/v;")
+hasLocation(#20070,#20007)
+stmt_containers(#20070,#20001)
 #20071=*
-regexpterm(#20071,23,#20070,0,"[\p{Emoji}\q{a&}byz]")
-#20072=@"loc,{#10000},3,2,3,21"
-locations_default(#20072,#10000,3,2,3,21)
-hasLocation(#20071,#20072)
-#20073=*
-regexpterm(#20073,27,#20071,0,"\p{Emoji}")
-#20074=@"loc,{#10000},3,3,3,11"
-locations_default(#20074,#10000,3,3,3,11)
-hasLocation(#20073,#20074)
-unicode_property_escapename(#20073,"Emoji")
-#20075=*
-regexpterm(#20075,28,#20071,1,"\q{a&}")
-#20076=@"loc,{#10000},3,12,3,17"
-locations_default(#20076,#10000,3,12,3,17)
-hasLocation(#20075,#20076)
-#20077=*
-regexpterm(#20077,14,#20075,0,"a&")
-#20078=@"loc,{#10000},3,15,3,16"
-locations_default(#20078,#10000,3,15,3,16)
-hasLocation(#20077,#20078)
-regexp_const_value(#20077,"a&")
-#20079=*
-regexpterm(#20079,14,#20071,2,"b")
-#20080=@"loc,{#10000},3,18,3,18"
-locations_default(#20080,#10000,3,18,3,18)
-hasLocation(#20079,#20080)
-regexp_const_value(#20079,"b")
-#20081=*
-regexpterm(#20081,14,#20071,3,"y")
-#20082=@"loc,{#10000},3,19,3,19"
-locations_default(#20082,#10000,3,19,3,19)
-hasLocation(#20081,#20082)
-regexp_const_value(#20081,"y")
-#20083=*
-regexpterm(#20083,14,#20071,4,"z")
-#20084=@"loc,{#10000},3,20,3,20"
-locations_default(#20084,#10000,3,20,3,20)
-hasLocation(#20083,#20084)
-regexp_const_value(#20083,"z")
-#20085=*
-stmts(#20085,2,#20001,3,"/[\q{\\\}a&}byz]/v;")
-hasLocation(#20085,#20009)
-stmt_containers(#20085,#20001)
+exprs(#20071,5,#20070,0,"/[\p{Em ... }byz]/v")
+hasLocation(#20071,#20023)
+enclosing_stmt(#20071,#20070)
+expr_containers(#20071,#20001)
+literals("/[\p{Emoji}\q{a&}byz]/v","/[\p{Emoji}\q{a&}byz]/v",#20071)
+#20072=*
+regexpterm(#20072,23,#20071,0,"[\p{Emoji}\q{a&}byz]")
+#20073=@"loc,{#10000},3,2,3,21"
+locations_default(#20073,#10000,3,2,3,21)
+hasLocation(#20072,#20073)
+#20074=*
+regexpterm(#20074,27,#20072,0,"\p{Emoji}")
+#20075=@"loc,{#10000},3,3,3,11"
+locations_default(#20075,#10000,3,3,3,11)
+hasLocation(#20074,#20075)
+unicode_property_escapename(#20074,"Emoji")
+#20076=*
+regexpterm(#20076,28,#20072,1,"\q{a&}")
+#20077=@"loc,{#10000},3,12,3,17"
+locations_default(#20077,#10000,3,12,3,17)
+hasLocation(#20076,#20077)
+#20078=*
+regexpterm(#20078,14,#20076,0,"a&")
+#20079=@"loc,{#10000},3,15,3,16"
+locations_default(#20079,#10000,3,15,3,16)
+hasLocation(#20078,#20079)
+regexp_const_value(#20078,"a&")
+#20080=*
+regexpterm(#20080,14,#20072,2,"b")
+#20081=@"loc,{#10000},3,18,3,18"
+locations_default(#20081,#10000,3,18,3,18)
+hasLocation(#20080,#20081)
+regexp_const_value(#20080,"b")
+#20082=*
+regexpterm(#20082,14,#20072,3,"y")
+#20083=@"loc,{#10000},3,19,3,19"
+locations_default(#20083,#10000,3,19,3,19)
+hasLocation(#20082,#20083)
+regexp_const_value(#20082,"y")
+#20084=*
+regexpterm(#20084,14,#20072,4,"z")
+#20085=@"loc,{#10000},3,20,3,20"
+locations_default(#20085,#10000,3,20,3,20)
+hasLocation(#20084,#20085)
+regexp_const_value(#20084,"z")
 #20086=*
-exprs(#20086,5,#20085,0,"/[\q{\\\}a&}byz]/v")
-hasLocation(#20086,#20027)
-enclosing_stmt(#20086,#20085)
-expr_containers(#20086,#20001)
-literals("/[\q{\\\}a&}byz]/v","/[\q{\\\}a&}byz]/v",#20086)
+stmts(#20086,2,#20001,3,"/[\q{\\\}a&}byz]/v;")
+hasLocation(#20086,#20009)
+stmt_containers(#20086,#20001)
 #20087=*
-regexpterm(#20087,23,#20086,0,"[\q{\\\}a&}byz]")
-#20088=@"loc,{#10000},4,2,4,16"
-locations_default(#20088,#10000,4,2,4,16)
-hasLocation(#20087,#20088)
-#20089=*
-regexpterm(#20089,28,#20087,0,"\q{\\\}a&}")
-#20090=@"loc,{#10000},4,3,4,12"
-locations_default(#20090,#10000,4,3,4,12)
-hasLocation(#20089,#20090)
-#20091=*
-regexpterm(#20091,14,#20089,0,"\\\}a&")
-#20092=@"loc,{#10000},4,6,4,11"
-locations_default(#20092,#10000,4,6,4,11)
-hasLocation(#20091,#20092)
-regexp_const_value(#20091,"\\\}a&")
-#20093=*
-regexpterm(#20093,14,#20087,1,"b")
-#20094=@"loc,{#10000},4,13,4,13"
-locations_default(#20094,#10000,4,13,4,13)
-hasLocation(#20093,#20094)
-regexp_const_value(#20093,"b")
-#20095=*
-regexpterm(#20095,14,#20087,2,"y")
-#20096=@"loc,{#10000},4,14,4,14"
-locations_default(#20096,#10000,4,14,4,14)
-hasLocation(#20095,#20096)
-regexp_const_value(#20095,"y")
-#20097=*
-regexpterm(#20097,14,#20087,3,"z")
-#20098=@"loc,{#10000},4,15,4,15"
-locations_default(#20098,#10000,4,15,4,15)
-hasLocation(#20097,#20098)
-regexp_const_value(#20097,"z")
-#20099=*
-stmts(#20099,2,#20001,4,"/[\q{\\}]/v;")
-hasLocation(#20099,#20011)
-stmt_containers(#20099,#20001)
+exprs(#20087,5,#20086,0,"/[\q{\\\}a&}byz]/v")
+hasLocation(#20087,#20027)
+enclosing_stmt(#20087,#20086)
+expr_containers(#20087,#20001)
+literals("/[\q{\\\}a&}byz]/v","/[\q{\\\}a&}byz]/v",#20087)
+#20088=*
+regexpterm(#20088,23,#20087,0,"[\q{\\\}a&}byz]")
+#20089=@"loc,{#10000},4,2,4,16"
+locations_default(#20089,#10000,4,2,4,16)
+hasLocation(#20088,#20089)
+#20090=*
+regexpterm(#20090,28,#20088,0,"\q{\\\}a&}")
+#20091=@"loc,{#10000},4,3,4,12"
+locations_default(#20091,#10000,4,3,4,12)
+hasLocation(#20090,#20091)
+#20092=*
+regexpterm(#20092,14,#20090,0,"\\\}a&")
+#20093=@"loc,{#10000},4,6,4,11"
+locations_default(#20093,#10000,4,6,4,11)
+hasLocation(#20092,#20093)
+regexp_const_value(#20092,"\\\}a&")
+#20094=*
+regexpterm(#20094,14,#20088,1,"b")
+#20095=@"loc,{#10000},4,13,4,13"
+locations_default(#20095,#10000,4,13,4,13)
+hasLocation(#20094,#20095)
+regexp_const_value(#20094,"b")
+#20096=*
+regexpterm(#20096,14,#20088,2,"y")
+#20097=@"loc,{#10000},4,14,4,14"
+locations_default(#20097,#10000,4,14,4,14)
+hasLocation(#20096,#20097)
+regexp_const_value(#20096,"y")
+#20098=*
+regexpterm(#20098,14,#20088,3,"z")
+#20099=@"loc,{#10000},4,15,4,15"
+locations_default(#20099,#10000,4,15,4,15)
+hasLocation(#20098,#20099)
+regexp_const_value(#20098,"z")
 #20100=*
-exprs(#20100,5,#20099,0,"/[\q{\\}]/v")
-hasLocation(#20100,#20031)
-enclosing_stmt(#20100,#20099)
-expr_containers(#20100,#20001)
-literals("/[\q{\\}]/v","/[\q{\\}]/v",#20100)
+stmts(#20100,2,#20001,4,"/[\q{\\}]/v;")
+hasLocation(#20100,#20011)
+stmt_containers(#20100,#20001)
 #20101=*
-regexpterm(#20101,23,#20100,0,"[\q{\\}]")
-#20102=@"loc,{#10000},5,2,5,9"
-locations_default(#20102,#10000,5,2,5,9)
-hasLocation(#20101,#20102)
-#20103=*
-regexpterm(#20103,28,#20101,0,"\q{\\}")
-#20104=@"loc,{#10000},5,3,5,8"
-locations_default(#20104,#10000,5,3,5,8)
-hasLocation(#20103,#20104)
-#20105=*
-regexpterm(#20105,14,#20103,0,"\\")
-#20106=@"loc,{#10000},5,6,5,7"
-locations_default(#20106,#10000,5,6,5,7)
-hasLocation(#20105,#20106)
-regexp_const_value(#20105,"\\")
-#20107=*
-stmts(#20107,2,#20001,5,"/[\q{abc|cbd|\}}]/v;")
-hasLocation(#20107,#20013)
-stmt_containers(#20107,#20001)
+exprs(#20101,5,#20100,0,"/[\q{\\}]/v")
+hasLocation(#20101,#20031)
+enclosing_stmt(#20101,#20100)
+expr_containers(#20101,#20001)
+literals("/[\q{\\}]/v","/[\q{\\}]/v",#20101)
+#20102=*
+regexpterm(#20102,23,#20101,0,"[\q{\\}]")
+#20103=@"loc,{#10000},5,2,5,9"
+locations_default(#20103,#10000,5,2,5,9)
+hasLocation(#20102,#20103)
+#20104=*
+regexpterm(#20104,28,#20102,0,"\q{\\}")
+#20105=@"loc,{#10000},5,3,5,8"
+locations_default(#20105,#10000,5,3,5,8)
+hasLocation(#20104,#20105)
+#20106=*
+regexpterm(#20106,14,#20104,0,"\\")
+#20107=@"loc,{#10000},5,6,5,7"
+locations_default(#20107,#10000,5,6,5,7)
+hasLocation(#20106,#20107)
+regexp_const_value(#20106,"\\")
 #20108=*
-exprs(#20108,5,#20107,0,"/[\q{abc|cbd|\}}]/v")
-hasLocation(#20108,#20035)
-enclosing_stmt(#20108,#20107)
-expr_containers(#20108,#20001)
-literals("/[\q{abc|cbd|\}}]/v","/[\q{abc|cbd|\}}]/v",#20108)
+stmts(#20108,2,#20001,5,"/[\q{abc|cbd|\}}]/v;")
+hasLocation(#20108,#20013)
+stmt_containers(#20108,#20001)
 #20109=*
-regexpterm(#20109,23,#20108,0,"[\q{abc|cbd|\}}]")
-#20110=@"loc,{#10000},6,2,6,17"
-locations_default(#20110,#10000,6,2,6,17)
-hasLocation(#20109,#20110)
-#20111=*
-regexpterm(#20111,28,#20109,0,"\q{abc|cbd|\}}")
-#20112=@"loc,{#10000},6,3,6,16"
-locations_default(#20112,#10000,6,3,6,16)
-hasLocation(#20111,#20112)
-#20113=*
-regexpterm(#20113,0,#20111,0,"abc|cbd|\}")
-#20114=@"loc,{#10000},6,6,6,15"
-locations_default(#20114,#10000,6,6,6,15)
-hasLocation(#20113,#20114)
-#20115=*
-regexpterm(#20115,14,#20113,0,"abc")
-#20116=@"loc,{#10000},6,6,6,8"
-locations_default(#20116,#10000,6,6,6,8)
-hasLocation(#20115,#20116)
-regexp_const_value(#20115,"abc")
-#20117=*
-regexpterm(#20117,14,#20113,1,"cbd")
-#20118=@"loc,{#10000},6,10,6,12"
-locations_default(#20118,#10000,6,10,6,12)
-hasLocation(#20117,#20118)
-regexp_const_value(#20117,"cbd")
-#20119=*
-regexpterm(#20119,14,#20113,2,"\}")
-#20120=@"loc,{#10000},6,14,6,15"
-locations_default(#20120,#10000,6,14,6,15)
-hasLocation(#20119,#20120)
-regexp_const_value(#20119,"\}")
-#20121=*
-entry_cfg_node(#20121,#20001)
-#20122=@"loc,{#10000},1,1,1,0"
-locations_default(#20122,#10000,1,1,1,0)
-hasLocation(#20121,#20122)
-#20123=*
-exit_cfg_node(#20123,#20001)
-hasLocation(#20123,#20039)
-successor(#20107,#20108)
-successor(#20108,#20123)
-successor(#20099,#20100)
-successor(#20100,#20107)
-successor(#20085,#20086)
-successor(#20086,#20099)
-successor(#20069,#20070)
-successor(#20070,#20085)
-successor(#20049,#20050)
-successor(#20050,#20069)
-successor(#20041,#20042)
-successor(#20042,#20049)
-successor(#20121,#20041)
+exprs(#20109,5,#20108,0,"/[\q{abc|cbd|\}}]/v")
+hasLocation(#20109,#20035)
+enclosing_stmt(#20109,#20108)
+expr_containers(#20109,#20001)
+literals("/[\q{abc|cbd|\}}]/v","/[\q{abc|cbd|\}}]/v",#20109)
+#20110=*
+regexpterm(#20110,23,#20109,0,"[\q{abc|cbd|\}}]")
+#20111=@"loc,{#10000},6,2,6,17"
+locations_default(#20111,#10000,6,2,6,17)
+hasLocation(#20110,#20111)
+#20112=*
+regexpterm(#20112,28,#20110,0,"\q{abc|cbd|\}}")
+#20113=@"loc,{#10000},6,3,6,16"
+locations_default(#20113,#10000,6,3,6,16)
+hasLocation(#20112,#20113)
+#20114=*
+regexpterm(#20114,0,#20112,0,"abc|cbd|\}")
+#20115=@"loc,{#10000},6,6,6,15"
+locations_default(#20115,#10000,6,6,6,15)
+hasLocation(#20114,#20115)
+#20116=*
+regexpterm(#20116,14,#20114,0,"abc")
+#20117=@"loc,{#10000},6,6,6,8"
+locations_default(#20117,#10000,6,6,6,8)
+hasLocation(#20116,#20117)
+regexp_const_value(#20116,"abc")
+#20118=*
+regexpterm(#20118,14,#20114,1,"cbd")
+#20119=@"loc,{#10000},6,10,6,12"
+locations_default(#20119,#10000,6,10,6,12)
+hasLocation(#20118,#20119)
+regexp_const_value(#20118,"cbd")
+#20120=*
+regexpterm(#20120,14,#20114,2,"\}")
+#20121=@"loc,{#10000},6,14,6,15"
+locations_default(#20121,#10000,6,14,6,15)
+hasLocation(#20120,#20121)
+regexp_const_value(#20120,"\}")
+#20122=*
+entry_cfg_node(#20122,#20001)
+#20123=@"loc,{#10000},1,1,1,0"
+locations_default(#20123,#10000,1,1,1,0)
+hasLocation(#20122,#20123)
+#20124=*
+exit_cfg_node(#20124,#20001)
+hasLocation(#20124,#20039)
+successor(#20108,#20109)
+successor(#20109,#20124)
+successor(#20100,#20101)
+successor(#20101,#20108)
+successor(#20086,#20087)
+successor(#20087,#20100)
+successor(#20070,#20071)
+successor(#20071,#20086)
+successor(#20050,#20051)
+successor(#20051,#20070)
+successor(#20042,#20043)
+successor(#20043,#20050)
+successor(#20122,#20042)
 numlines(#10000,6,6,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/esnext/output/trap/async-generators.js.trap b/javascript/extractor/tests/esnext/output/trap/async-generators.js.trap
index 172c4437445..b2d2130137d 100644
--- a/javascript/extractor/tests/esnext/output/trap/async-generators.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/async-generators.js.trap
@@ -186,146 +186,152 @@ hasLocation(#20001,#20066)
 variables(#20067,"foo",#20000)
 #20068=@"var;{bar};{#20000}"
 variables(#20068,"bar",#20000)
-#20069=*
-stmts(#20069,17,#20001,0,"async f ... o() {\n}")
-#20070=@"loc,{#10000},1,1,2,1"
-locations_default(#20070,#10000,1,1,2,1)
-hasLocation(#20069,#20070)
-stmt_containers(#20069,#20001)
-#20071=*
-exprs(#20071,78,#20069,-1,"foo")
-hasLocation(#20071,#20021)
-expr_containers(#20071,#20069)
-literals("foo","foo",#20071)
-decl(#20071,#20067)
+#20069=@"var;{this};{#20000}"
+variables(#20069,"this",#20000)
+#20070=*
+stmts(#20070,17,#20001,0,"async f ... o() {\n}")
+#20071=@"loc,{#10000},1,1,2,1"
+locations_default(#20071,#10000,1,1,2,1)
+hasLocation(#20070,#20071)
+stmt_containers(#20070,#20001)
 #20072=*
-scopes(#20072,1)
-scopenodes(#20069,#20072)
-scopenesting(#20072,#20000)
-#20073=@"var;{arguments};{#20072}"
-variables(#20073,"arguments",#20072)
-is_arguments_object(#20073)
-is_generator(#20069)
-is_async(#20069)
-#20074=*
-stmts(#20074,1,#20069,-2,"{\n}")
-#20075=@"loc,{#10000},1,23,2,1"
-locations_default(#20075,#10000,1,23,2,1)
-hasLocation(#20074,#20075)
-stmt_containers(#20074,#20069)
+exprs(#20072,78,#20070,-1,"foo")
+hasLocation(#20072,#20021)
+expr_containers(#20072,#20070)
+literals("foo","foo",#20072)
+decl(#20072,#20067)
+#20073=*
+scopes(#20073,1)
+scopenodes(#20070,#20073)
+scopenesting(#20073,#20000)
+#20074=@"var;{this};{#20073}"
+variables(#20074,"this",#20073)
+#20075=@"var;{arguments};{#20073}"
+variables(#20075,"arguments",#20073)
+is_arguments_object(#20075)
+is_generator(#20070)
+is_async(#20070)
 #20076=*
-stmts(#20076,17,#20001,1,"async f ... o());\n}")
-#20077=@"loc,{#10000},4,1,6,1"
-locations_default(#20077,#10000,4,1,6,1)
+stmts(#20076,1,#20070,-2,"{\n}")
+#20077=@"loc,{#10000},1,23,2,1"
+locations_default(#20077,#10000,1,23,2,1)
 hasLocation(#20076,#20077)
-stmt_containers(#20076,#20001)
+stmt_containers(#20076,#20070)
 #20078=*
-exprs(#20078,78,#20076,-1,"bar")
-hasLocation(#20078,#20034)
-expr_containers(#20078,#20076)
-literals("bar","bar",#20078)
-decl(#20078,#20068)
-#20079=*
-scopes(#20079,1)
-scopenodes(#20076,#20079)
-scopenesting(#20079,#20000)
-#20080=@"var;{x};{#20079}"
-variables(#20080,"x",#20079)
-#20081=@"var;{arguments};{#20079}"
-variables(#20081,"arguments",#20079)
-is_arguments_object(#20081)
-is_async(#20076)
-#20082=*
-stmts(#20082,1,#20076,-2,"{\n  for ... o());\n}")
-#20083=@"loc,{#10000},4,22,6,1"
-locations_default(#20083,#10000,4,22,6,1)
-hasLocation(#20082,#20083)
-stmt_containers(#20082,#20076)
-#20084=*
-stmts(#20084,21,#20082,0,"for awa ... foo());")
-#20085=@"loc,{#10000},5,3,5,28"
-locations_default(#20085,#10000,5,3,5,28)
-hasLocation(#20084,#20085)
-stmt_containers(#20084,#20076)
-#20086=*
-exprs(#20086,13,#20084,1,"foo()")
-#20087=@"loc,{#10000},5,22,5,26"
-locations_default(#20087,#10000,5,22,5,26)
-hasLocation(#20086,#20087)
-enclosing_stmt(#20086,#20084)
-expr_containers(#20086,#20076)
-#20088=*
-exprs(#20088,79,#20086,-1,"foo")
-hasLocation(#20088,#20054)
-enclosing_stmt(#20088,#20084)
-expr_containers(#20088,#20076)
-literals("foo","foo",#20088)
-bind(#20088,#20067)
+stmts(#20078,17,#20001,1,"async f ... o());\n}")
+#20079=@"loc,{#10000},4,1,6,1"
+locations_default(#20079,#10000,4,1,6,1)
+hasLocation(#20078,#20079)
+stmt_containers(#20078,#20001)
+#20080=*
+exprs(#20080,78,#20078,-1,"bar")
+hasLocation(#20080,#20034)
+expr_containers(#20080,#20078)
+literals("bar","bar",#20080)
+decl(#20080,#20068)
+#20081=*
+scopes(#20081,1)
+scopenodes(#20078,#20081)
+scopenesting(#20081,#20000)
+#20082=@"var;{x};{#20081}"
+variables(#20082,"x",#20081)
+#20083=@"var;{this};{#20081}"
+variables(#20083,"this",#20081)
+#20084=@"var;{arguments};{#20081}"
+variables(#20084,"arguments",#20081)
+is_arguments_object(#20084)
+is_async(#20078)
+#20085=*
+stmts(#20085,1,#20078,-2,"{\n  for ... o());\n}")
+#20086=@"loc,{#10000},4,22,6,1"
+locations_default(#20086,#10000,4,22,6,1)
+hasLocation(#20085,#20086)
+stmt_containers(#20085,#20078)
+#20087=*
+stmts(#20087,21,#20085,0,"for awa ... foo());")
+#20088=@"loc,{#10000},5,3,5,28"
+locations_default(#20088,#10000,5,3,5,28)
+hasLocation(#20087,#20088)
+stmt_containers(#20087,#20078)
 #20089=*
-stmts(#20089,18,#20084,0,"var x")
-#20090=@"loc,{#10000},5,13,5,17"
-locations_default(#20090,#10000,5,13,5,17)
+exprs(#20089,13,#20087,1,"foo()")
+#20090=@"loc,{#10000},5,22,5,26"
+locations_default(#20090,#10000,5,22,5,26)
 hasLocation(#20089,#20090)
-stmt_containers(#20089,#20076)
+enclosing_stmt(#20089,#20087)
+expr_containers(#20089,#20078)
 #20091=*
-exprs(#20091,64,#20089,0,"x")
-hasLocation(#20091,#20050)
-enclosing_stmt(#20091,#20089)
-expr_containers(#20091,#20076)
+exprs(#20091,79,#20089,-1,"foo")
+hasLocation(#20091,#20054)
+enclosing_stmt(#20091,#20087)
+expr_containers(#20091,#20078)
+literals("foo","foo",#20091)
+bind(#20091,#20067)
 #20092=*
-exprs(#20092,78,#20091,0,"x")
-hasLocation(#20092,#20050)
-enclosing_stmt(#20092,#20089)
-expr_containers(#20092,#20076)
-literals("x","x",#20092)
-decl(#20092,#20080)
-#20093=*
-stmts(#20093,0,#20084,2,";")
-hasLocation(#20093,#20062)
-stmt_containers(#20093,#20076)
-is_for_await_of(#20084)
+stmts(#20092,18,#20087,0,"var x")
+#20093=@"loc,{#10000},5,13,5,17"
+locations_default(#20093,#10000,5,13,5,17)
+hasLocation(#20092,#20093)
+stmt_containers(#20092,#20078)
 #20094=*
-entry_cfg_node(#20094,#20001)
-#20095=@"loc,{#10000},1,1,1,0"
-locations_default(#20095,#10000,1,1,1,0)
-hasLocation(#20094,#20095)
+exprs(#20094,64,#20092,0,"x")
+hasLocation(#20094,#20050)
+enclosing_stmt(#20094,#20092)
+expr_containers(#20094,#20078)
+#20095=*
+exprs(#20095,78,#20094,0,"x")
+hasLocation(#20095,#20050)
+enclosing_stmt(#20095,#20092)
+expr_containers(#20095,#20078)
+literals("x","x",#20095)
+decl(#20095,#20082)
 #20096=*
-exit_cfg_node(#20096,#20001)
-hasLocation(#20096,#20065)
-successor(#20076,#20096)
+stmts(#20096,0,#20087,2,";")
+hasLocation(#20096,#20062)
+stmt_containers(#20096,#20078)
+is_for_await_of(#20087)
 #20097=*
-entry_cfg_node(#20097,#20076)
-#20098=@"loc,{#10000},4,1,4,0"
-locations_default(#20098,#10000,4,1,4,0)
+entry_cfg_node(#20097,#20001)
+#20098=@"loc,{#10000},1,1,1,0"
+locations_default(#20098,#10000,1,1,1,0)
 hasLocation(#20097,#20098)
 #20099=*
-exit_cfg_node(#20099,#20076)
-#20100=@"loc,{#10000},6,2,6,1"
-locations_default(#20100,#10000,6,2,6,1)
-hasLocation(#20099,#20100)
-successor(#20088,#20086)
-successor(#20086,#20084)
-successor(#20084,#20089)
-successor(#20084,#20099)
-successor(#20093,#20084)
-successor(#20089,#20092)
-successor(#20092,#20091)
-successor(#20091,#20093)
-successor(#20082,#20088)
-successor(#20097,#20082)
-successor(#20069,#20076)
-#20101=*
-entry_cfg_node(#20101,#20069)
-hasLocation(#20101,#20095)
+exit_cfg_node(#20099,#20001)
+hasLocation(#20099,#20065)
+successor(#20078,#20099)
+#20100=*
+entry_cfg_node(#20100,#20078)
+#20101=@"loc,{#10000},4,1,4,0"
+locations_default(#20101,#10000,4,1,4,0)
+hasLocation(#20100,#20101)
 #20102=*
-exit_cfg_node(#20102,#20069)
-#20103=@"loc,{#10000},2,2,2,1"
-locations_default(#20103,#10000,2,2,2,1)
+exit_cfg_node(#20102,#20078)
+#20103=@"loc,{#10000},6,2,6,1"
+locations_default(#20103,#10000,6,2,6,1)
 hasLocation(#20102,#20103)
-successor(#20074,#20102)
-successor(#20101,#20074)
-successor(#20078,#20069)
-successor(#20071,#20078)
-successor(#20094,#20071)
+successor(#20091,#20089)
+successor(#20089,#20087)
+successor(#20087,#20092)
+successor(#20087,#20102)
+successor(#20096,#20087)
+successor(#20092,#20095)
+successor(#20095,#20094)
+successor(#20094,#20096)
+successor(#20085,#20091)
+successor(#20100,#20085)
+successor(#20070,#20078)
+#20104=*
+entry_cfg_node(#20104,#20070)
+hasLocation(#20104,#20098)
+#20105=*
+exit_cfg_node(#20105,#20070)
+#20106=@"loc,{#10000},2,2,2,1"
+locations_default(#20106,#10000,2,2,2,1)
+hasLocation(#20105,#20106)
+successor(#20076,#20105)
+successor(#20104,#20076)
+successor(#20080,#20070)
+successor(#20072,#20080)
+successor(#20097,#20072)
 numlines(#10000,6,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/esnext/output/trap/catchGuardAndNoBinding.js.trap b/javascript/extractor/tests/esnext/output/trap/catchGuardAndNoBinding.js.trap
index 49ae2b30eb0..5ab62545650 100644
--- a/javascript/extractor/tests/esnext/output/trap/catchGuardAndNoBinding.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/catchGuardAndNoBinding.js.trap
@@ -354,289 +354,291 @@ toplevels(#20001,0)
 #20134=@"loc,{#10000},1,1,11,0"
 locations_default(#20134,#10000,1,1,11,0)
 hasLocation(#20001,#20134)
-#20135=*
-stmts(#20135,11,#20001,0,"try {}\n ... atch {}")
-#20136=@"loc,{#10000},1,1,4,8"
-locations_default(#20136,#10000,1,1,4,8)
-hasLocation(#20135,#20136)
-stmt_containers(#20135,#20001)
-#20137=*
-stmts(#20137,1,#20135,0,"{}")
-#20138=@"loc,{#10000},1,5,1,6"
-locations_default(#20138,#10000,1,5,1,6)
-hasLocation(#20137,#20138)
-stmt_containers(#20137,#20001)
-#20139=*
-stmts(#20139,20,#20135,1,"catch ( ... ror) {}")
-hasLocation(#20139,#20005)
-stmt_containers(#20139,#20001)
+#20135=@"var;{this};{#20000}"
+variables(#20135,"this",#20000)
+#20136=*
+stmts(#20136,11,#20001,0,"try {}\n ... atch {}")
+#20137=@"loc,{#10000},1,1,4,8"
+locations_default(#20137,#10000,1,1,4,8)
+hasLocation(#20136,#20137)
+stmt_containers(#20136,#20001)
+#20138=*
+stmts(#20138,1,#20136,0,"{}")
+#20139=@"loc,{#10000},1,5,1,6"
+locations_default(#20139,#10000,1,5,1,6)
+hasLocation(#20138,#20139)
+stmt_containers(#20138,#20001)
 #20140=*
-scopes(#20140,2)
-scopenodes(#20139,#20140)
-scopenesting(#20140,#20000)
-#20141=@"var;{e};{#20140}"
-variables(#20141,"e",#20140)
-#20142=*
-exprs(#20142,78,#20139,0,"e")
-hasLocation(#20142,#20033)
-enclosing_stmt(#20142,#20139)
-expr_containers(#20142,#20001)
-literals("e","e",#20142)
-decl(#20142,#20141)
+stmts(#20140,20,#20136,1,"catch ( ... ror) {}")
+hasLocation(#20140,#20005)
+stmt_containers(#20140,#20001)
+#20141=*
+scopes(#20141,2)
+scopenodes(#20140,#20141)
+scopenesting(#20141,#20000)
+#20142=@"var;{e};{#20141}"
+variables(#20142,"e",#20141)
 #20143=*
-exprs(#20143,43,#20139,2,"e insta ... peError")
-#20144=@"loc,{#10000},2,13,2,34"
-locations_default(#20144,#10000,2,13,2,34)
-hasLocation(#20143,#20144)
-enclosing_stmt(#20143,#20139)
+exprs(#20143,78,#20140,0,"e")
+hasLocation(#20143,#20033)
+enclosing_stmt(#20143,#20140)
 expr_containers(#20143,#20001)
-#20145=*
-exprs(#20145,79,#20143,0,"e")
-hasLocation(#20145,#20037)
-enclosing_stmt(#20145,#20139)
-expr_containers(#20145,#20001)
-literals("e","e",#20145)
-bind(#20145,#20141)
+literals("e","e",#20143)
+decl(#20143,#20142)
+#20144=*
+exprs(#20144,43,#20140,2,"e insta ... peError")
+#20145=@"loc,{#10000},2,13,2,34"
+locations_default(#20145,#10000,2,13,2,34)
+hasLocation(#20144,#20145)
+enclosing_stmt(#20144,#20140)
+expr_containers(#20144,#20001)
 #20146=*
-exprs(#20146,79,#20143,1,"TypeError")
-hasLocation(#20146,#20041)
-enclosing_stmt(#20146,#20139)
+exprs(#20146,79,#20144,0,"e")
+hasLocation(#20146,#20037)
+enclosing_stmt(#20146,#20140)
 expr_containers(#20146,#20001)
-literals("TypeError","TypeError",#20146)
-#20147=@"var;{TypeError};{#20000}"
-variables(#20147,"TypeError",#20000)
-bind(#20146,#20147)
-#20148=*
-stmts(#20148,1,#20139,1,"{}")
-#20149=@"loc,{#10000},2,37,2,38"
-locations_default(#20149,#10000,2,37,2,38)
-hasLocation(#20148,#20149)
-stmt_containers(#20148,#20001)
-#20150=*
-stmts(#20150,20,#20135,2,"catch ( ... ror) {}")
-hasLocation(#20150,#20007)
-stmt_containers(#20150,#20001)
+literals("e","e",#20146)
+bind(#20146,#20142)
+#20147=*
+exprs(#20147,79,#20144,1,"TypeError")
+hasLocation(#20147,#20041)
+enclosing_stmt(#20147,#20140)
+expr_containers(#20147,#20001)
+literals("TypeError","TypeError",#20147)
+#20148=@"var;{TypeError};{#20000}"
+variables(#20148,"TypeError",#20000)
+bind(#20147,#20148)
+#20149=*
+stmts(#20149,1,#20140,1,"{}")
+#20150=@"loc,{#10000},2,37,2,38"
+locations_default(#20150,#10000,2,37,2,38)
+hasLocation(#20149,#20150)
+stmt_containers(#20149,#20001)
 #20151=*
-scopes(#20151,2)
-scopenodes(#20150,#20151)
-scopenesting(#20151,#20000)
-#20152=@"var;{e};{#20151}"
-variables(#20152,"e",#20151)
-#20153=*
-exprs(#20153,78,#20150,0,"e")
-hasLocation(#20153,#20053)
-enclosing_stmt(#20153,#20150)
-expr_containers(#20153,#20001)
-literals("e","e",#20153)
-decl(#20153,#20152)
+stmts(#20151,20,#20136,2,"catch ( ... ror) {}")
+hasLocation(#20151,#20007)
+stmt_containers(#20151,#20001)
+#20152=*
+scopes(#20152,2)
+scopenodes(#20151,#20152)
+scopenesting(#20152,#20000)
+#20153=@"var;{e};{#20152}"
+variables(#20153,"e",#20152)
 #20154=*
-exprs(#20154,43,#20150,2,"e instanceof Error")
-#20155=@"loc,{#10000},3,13,3,30"
-locations_default(#20155,#10000,3,13,3,30)
-hasLocation(#20154,#20155)
-enclosing_stmt(#20154,#20150)
+exprs(#20154,78,#20151,0,"e")
+hasLocation(#20154,#20053)
+enclosing_stmt(#20154,#20151)
 expr_containers(#20154,#20001)
-#20156=*
-exprs(#20156,79,#20154,0,"e")
-hasLocation(#20156,#20057)
-enclosing_stmt(#20156,#20150)
-expr_containers(#20156,#20001)
-literals("e","e",#20156)
-bind(#20156,#20152)
+literals("e","e",#20154)
+decl(#20154,#20153)
+#20155=*
+exprs(#20155,43,#20151,2,"e instanceof Error")
+#20156=@"loc,{#10000},3,13,3,30"
+locations_default(#20156,#10000,3,13,3,30)
+hasLocation(#20155,#20156)
+enclosing_stmt(#20155,#20151)
+expr_containers(#20155,#20001)
 #20157=*
-exprs(#20157,79,#20154,1,"Error")
-hasLocation(#20157,#20061)
-enclosing_stmt(#20157,#20150)
+exprs(#20157,79,#20155,0,"e")
+hasLocation(#20157,#20057)
+enclosing_stmt(#20157,#20151)
 expr_containers(#20157,#20001)
-literals("Error","Error",#20157)
-#20158=@"var;{Error};{#20000}"
-variables(#20158,"Error",#20000)
-bind(#20157,#20158)
-#20159=*
-stmts(#20159,1,#20150,1,"{}")
-#20160=@"loc,{#10000},3,33,3,34"
-locations_default(#20160,#10000,3,33,3,34)
-hasLocation(#20159,#20160)
-stmt_containers(#20159,#20001)
-#20161=*
-stmts(#20161,20,#20135,3,"catch {}")
-hasLocation(#20161,#20009)
-stmt_containers(#20161,#20001)
+literals("e","e",#20157)
+bind(#20157,#20153)
+#20158=*
+exprs(#20158,79,#20155,1,"Error")
+hasLocation(#20158,#20061)
+enclosing_stmt(#20158,#20151)
+expr_containers(#20158,#20001)
+literals("Error","Error",#20158)
+#20159=@"var;{Error};{#20000}"
+variables(#20159,"Error",#20000)
+bind(#20158,#20159)
+#20160=*
+stmts(#20160,1,#20151,1,"{}")
+#20161=@"loc,{#10000},3,33,3,34"
+locations_default(#20161,#10000,3,33,3,34)
+hasLocation(#20160,#20161)
+stmt_containers(#20160,#20001)
 #20162=*
-scopes(#20162,2)
-scopenodes(#20161,#20162)
-scopenesting(#20162,#20000)
+stmts(#20162,20,#20136,3,"catch {}")
+hasLocation(#20162,#20009)
+stmt_containers(#20162,#20001)
 #20163=*
-stmts(#20163,1,#20161,1,"{}")
-#20164=@"loc,{#10000},4,7,4,8"
-locations_default(#20164,#10000,4,7,4,8)
-hasLocation(#20163,#20164)
-stmt_containers(#20163,#20001)
-#20165=*
-stmts(#20165,11,#20001,1,"try {}\n ... ally {}")
-#20166=@"loc,{#10000},6,1,10,10"
-locations_default(#20166,#10000,6,1,10,10)
-hasLocation(#20165,#20166)
-stmt_containers(#20165,#20001)
-#20167=*
-stmts(#20167,1,#20165,0,"{}")
-#20168=@"loc,{#10000},6,5,6,6"
-locations_default(#20168,#10000,6,5,6,6)
-hasLocation(#20167,#20168)
-stmt_containers(#20167,#20001)
-#20169=*
-stmts(#20169,20,#20165,1,"catch ( ... ror) {}")
-hasLocation(#20169,#20015)
-stmt_containers(#20169,#20001)
+scopes(#20163,2)
+scopenodes(#20162,#20163)
+scopenesting(#20163,#20000)
+#20164=*
+stmts(#20164,1,#20162,1,"{}")
+#20165=@"loc,{#10000},4,7,4,8"
+locations_default(#20165,#10000,4,7,4,8)
+hasLocation(#20164,#20165)
+stmt_containers(#20164,#20001)
+#20166=*
+stmts(#20166,11,#20001,1,"try {}\n ... ally {}")
+#20167=@"loc,{#10000},6,1,10,10"
+locations_default(#20167,#10000,6,1,10,10)
+hasLocation(#20166,#20167)
+stmt_containers(#20166,#20001)
+#20168=*
+stmts(#20168,1,#20166,0,"{}")
+#20169=@"loc,{#10000},6,5,6,6"
+locations_default(#20169,#10000,6,5,6,6)
+hasLocation(#20168,#20169)
+stmt_containers(#20168,#20001)
 #20170=*
-scopes(#20170,2)
-scopenodes(#20169,#20170)
-scopenesting(#20170,#20000)
-#20171=@"var;{e};{#20170}"
-variables(#20171,"e",#20170)
-#20172=*
-exprs(#20172,78,#20169,0,"e")
-hasLocation(#20172,#20085)
-enclosing_stmt(#20172,#20169)
-expr_containers(#20172,#20001)
-literals("e","e",#20172)
-decl(#20172,#20171)
+stmts(#20170,20,#20166,1,"catch ( ... ror) {}")
+hasLocation(#20170,#20015)
+stmt_containers(#20170,#20001)
+#20171=*
+scopes(#20171,2)
+scopenodes(#20170,#20171)
+scopenesting(#20171,#20000)
+#20172=@"var;{e};{#20171}"
+variables(#20172,"e",#20171)
 #20173=*
-exprs(#20173,43,#20169,2,"e insta ... peError")
-#20174=@"loc,{#10000},7,13,7,34"
-locations_default(#20174,#10000,7,13,7,34)
-hasLocation(#20173,#20174)
-enclosing_stmt(#20173,#20169)
+exprs(#20173,78,#20170,0,"e")
+hasLocation(#20173,#20085)
+enclosing_stmt(#20173,#20170)
 expr_containers(#20173,#20001)
-#20175=*
-exprs(#20175,79,#20173,0,"e")
-hasLocation(#20175,#20089)
-enclosing_stmt(#20175,#20169)
-expr_containers(#20175,#20001)
-literals("e","e",#20175)
-bind(#20175,#20171)
+literals("e","e",#20173)
+decl(#20173,#20172)
+#20174=*
+exprs(#20174,43,#20170,2,"e insta ... peError")
+#20175=@"loc,{#10000},7,13,7,34"
+locations_default(#20175,#10000,7,13,7,34)
+hasLocation(#20174,#20175)
+enclosing_stmt(#20174,#20170)
+expr_containers(#20174,#20001)
 #20176=*
-exprs(#20176,79,#20173,1,"TypeError")
-hasLocation(#20176,#20093)
-enclosing_stmt(#20176,#20169)
+exprs(#20176,79,#20174,0,"e")
+hasLocation(#20176,#20089)
+enclosing_stmt(#20176,#20170)
 expr_containers(#20176,#20001)
-literals("TypeError","TypeError",#20176)
-bind(#20176,#20147)
+literals("e","e",#20176)
+bind(#20176,#20172)
 #20177=*
-stmts(#20177,1,#20169,1,"{}")
-#20178=@"loc,{#10000},7,37,7,38"
-locations_default(#20178,#10000,7,37,7,38)
-hasLocation(#20177,#20178)
-stmt_containers(#20177,#20001)
-#20179=*
-stmts(#20179,20,#20165,2,"catch ( ... ror) {}")
-hasLocation(#20179,#20017)
-stmt_containers(#20179,#20001)
+exprs(#20177,79,#20174,1,"TypeError")
+hasLocation(#20177,#20093)
+enclosing_stmt(#20177,#20170)
+expr_containers(#20177,#20001)
+literals("TypeError","TypeError",#20177)
+bind(#20177,#20148)
+#20178=*
+stmts(#20178,1,#20170,1,"{}")
+#20179=@"loc,{#10000},7,37,7,38"
+locations_default(#20179,#10000,7,37,7,38)
+hasLocation(#20178,#20179)
+stmt_containers(#20178,#20001)
 #20180=*
-scopes(#20180,2)
-scopenodes(#20179,#20180)
-scopenesting(#20180,#20000)
-#20181=@"var;{e};{#20180}"
-variables(#20181,"e",#20180)
-#20182=*
-exprs(#20182,78,#20179,0,"e")
-hasLocation(#20182,#20105)
-enclosing_stmt(#20182,#20179)
-expr_containers(#20182,#20001)
-literals("e","e",#20182)
-decl(#20182,#20181)
+stmts(#20180,20,#20166,2,"catch ( ... ror) {}")
+hasLocation(#20180,#20017)
+stmt_containers(#20180,#20001)
+#20181=*
+scopes(#20181,2)
+scopenodes(#20180,#20181)
+scopenesting(#20181,#20000)
+#20182=@"var;{e};{#20181}"
+variables(#20182,"e",#20181)
 #20183=*
-exprs(#20183,43,#20179,2,"e instanceof Error")
-#20184=@"loc,{#10000},8,13,8,30"
-locations_default(#20184,#10000,8,13,8,30)
-hasLocation(#20183,#20184)
-enclosing_stmt(#20183,#20179)
+exprs(#20183,78,#20180,0,"e")
+hasLocation(#20183,#20105)
+enclosing_stmt(#20183,#20180)
 expr_containers(#20183,#20001)
-#20185=*
-exprs(#20185,79,#20183,0,"e")
-hasLocation(#20185,#20109)
-enclosing_stmt(#20185,#20179)
-expr_containers(#20185,#20001)
-literals("e","e",#20185)
-bind(#20185,#20181)
+literals("e","e",#20183)
+decl(#20183,#20182)
+#20184=*
+exprs(#20184,43,#20180,2,"e instanceof Error")
+#20185=@"loc,{#10000},8,13,8,30"
+locations_default(#20185,#10000,8,13,8,30)
+hasLocation(#20184,#20185)
+enclosing_stmt(#20184,#20180)
+expr_containers(#20184,#20001)
 #20186=*
-exprs(#20186,79,#20183,1,"Error")
-hasLocation(#20186,#20113)
-enclosing_stmt(#20186,#20179)
+exprs(#20186,79,#20184,0,"e")
+hasLocation(#20186,#20109)
+enclosing_stmt(#20186,#20180)
 expr_containers(#20186,#20001)
-literals("Error","Error",#20186)
-bind(#20186,#20158)
+literals("e","e",#20186)
+bind(#20186,#20182)
 #20187=*
-stmts(#20187,1,#20179,1,"{}")
-#20188=@"loc,{#10000},8,33,8,34"
-locations_default(#20188,#10000,8,33,8,34)
-hasLocation(#20187,#20188)
-stmt_containers(#20187,#20001)
-#20189=*
-stmts(#20189,20,#20165,3,"catch {}")
-hasLocation(#20189,#20019)
-stmt_containers(#20189,#20001)
+exprs(#20187,79,#20184,1,"Error")
+hasLocation(#20187,#20113)
+enclosing_stmt(#20187,#20180)
+expr_containers(#20187,#20001)
+literals("Error","Error",#20187)
+bind(#20187,#20159)
+#20188=*
+stmts(#20188,1,#20180,1,"{}")
+#20189=@"loc,{#10000},8,33,8,34"
+locations_default(#20189,#10000,8,33,8,34)
+hasLocation(#20188,#20189)
+stmt_containers(#20188,#20001)
 #20190=*
-scopes(#20190,2)
-scopenodes(#20189,#20190)
-scopenesting(#20190,#20000)
+stmts(#20190,20,#20166,3,"catch {}")
+hasLocation(#20190,#20019)
+stmt_containers(#20190,#20001)
 #20191=*
-stmts(#20191,1,#20189,1,"{}")
-#20192=@"loc,{#10000},9,7,9,8"
-locations_default(#20192,#10000,9,7,9,8)
-hasLocation(#20191,#20192)
-stmt_containers(#20191,#20001)
-#20193=*
-stmts(#20193,1,#20165,-1,"{}")
-#20194=@"loc,{#10000},10,9,10,10"
-locations_default(#20194,#10000,10,9,10,10)
-hasLocation(#20193,#20194)
-stmt_containers(#20193,#20001)
-#20195=*
-entry_cfg_node(#20195,#20001)
-#20196=@"loc,{#10000},1,1,1,0"
-locations_default(#20196,#10000,1,1,1,0)
-hasLocation(#20195,#20196)
-#20197=*
-exit_cfg_node(#20197,#20001)
-hasLocation(#20197,#20133)
-successor(#20165,#20167)
-successor(#20167,#20193)
-successor(#20169,#20172)
-successor(#20176,#20173)
-successor(#20175,#20176)
-successor(#20173,#20177)
-successor(#20173,#20179)
-successor(#20172,#20175)
-successor(#20177,#20193)
-successor(#20179,#20182)
-successor(#20186,#20183)
-successor(#20185,#20186)
-successor(#20183,#20187)
-successor(#20183,#20189)
-successor(#20182,#20185)
-successor(#20187,#20193)
-successor(#20189,#20191)
-successor(#20191,#20193)
-successor(#20193,#20197)
-successor(#20135,#20137)
-successor(#20137,#20165)
-successor(#20139,#20142)
-successor(#20146,#20143)
-successor(#20145,#20146)
-successor(#20143,#20148)
-successor(#20143,#20150)
-successor(#20142,#20145)
-successor(#20148,#20165)
-successor(#20150,#20153)
-successor(#20157,#20154)
-successor(#20156,#20157)
-successor(#20154,#20159)
-successor(#20154,#20161)
-successor(#20153,#20156)
-successor(#20159,#20165)
-successor(#20161,#20163)
-successor(#20163,#20165)
-successor(#20195,#20135)
+scopes(#20191,2)
+scopenodes(#20190,#20191)
+scopenesting(#20191,#20000)
+#20192=*
+stmts(#20192,1,#20190,1,"{}")
+#20193=@"loc,{#10000},9,7,9,8"
+locations_default(#20193,#10000,9,7,9,8)
+hasLocation(#20192,#20193)
+stmt_containers(#20192,#20001)
+#20194=*
+stmts(#20194,1,#20166,-1,"{}")
+#20195=@"loc,{#10000},10,9,10,10"
+locations_default(#20195,#10000,10,9,10,10)
+hasLocation(#20194,#20195)
+stmt_containers(#20194,#20001)
+#20196=*
+entry_cfg_node(#20196,#20001)
+#20197=@"loc,{#10000},1,1,1,0"
+locations_default(#20197,#10000,1,1,1,0)
+hasLocation(#20196,#20197)
+#20198=*
+exit_cfg_node(#20198,#20001)
+hasLocation(#20198,#20133)
+successor(#20166,#20168)
+successor(#20168,#20194)
+successor(#20170,#20173)
+successor(#20177,#20174)
+successor(#20176,#20177)
+successor(#20174,#20178)
+successor(#20174,#20180)
+successor(#20173,#20176)
+successor(#20178,#20194)
+successor(#20180,#20183)
+successor(#20187,#20184)
+successor(#20186,#20187)
+successor(#20184,#20188)
+successor(#20184,#20190)
+successor(#20183,#20186)
+successor(#20188,#20194)
+successor(#20190,#20192)
+successor(#20192,#20194)
+successor(#20194,#20198)
+successor(#20136,#20138)
+successor(#20138,#20166)
+successor(#20140,#20143)
+successor(#20147,#20144)
+successor(#20146,#20147)
+successor(#20144,#20149)
+successor(#20144,#20151)
+successor(#20143,#20146)
+successor(#20149,#20166)
+successor(#20151,#20154)
+successor(#20158,#20155)
+successor(#20157,#20158)
+successor(#20155,#20160)
+successor(#20155,#20162)
+successor(#20154,#20157)
+successor(#20160,#20166)
+successor(#20162,#20164)
+successor(#20164,#20166)
+successor(#20196,#20136)
 numlines(#10000,10,9,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/esnext/output/trap/catchNoBinding.js.trap b/javascript/extractor/tests/esnext/output/trap/catchNoBinding.js.trap
index 28beb8736a2..f1884449f0e 100644
--- a/javascript/extractor/tests/esnext/output/trap/catchNoBinding.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/catchNoBinding.js.trap
@@ -154,117 +154,119 @@ toplevels(#20001,0)
 #20055=@"loc,{#10000},1,1,6,0"
 locations_default(#20055,#10000,1,1,6,0)
 hasLocation(#20001,#20055)
-#20056=*
-stmts(#20056,11,#20001,0,"try {\n\t ... ly {}\n}")
-#20057=@"loc,{#10000},1,1,5,1"
-locations_default(#20057,#10000,1,1,5,1)
-hasLocation(#20056,#20057)
-stmt_containers(#20056,#20001)
-#20058=*
-stmts(#20058,1,#20056,0,"{\n\ttry {} catch {}\n}")
-#20059=@"loc,{#10000},1,5,3,1"
-locations_default(#20059,#10000,1,5,3,1)
-hasLocation(#20058,#20059)
-stmt_containers(#20058,#20001)
-#20060=*
-stmts(#20060,11,#20058,0,"try {} catch {}")
-#20061=@"loc,{#10000},2,2,2,16"
-locations_default(#20061,#10000,2,2,2,16)
-hasLocation(#20060,#20061)
-stmt_containers(#20060,#20001)
-#20062=*
-stmts(#20062,1,#20060,0,"{}")
-#20063=@"loc,{#10000},2,6,2,7"
-locations_default(#20063,#10000,2,6,2,7)
-hasLocation(#20062,#20063)
-stmt_containers(#20062,#20001)
-#20064=*
-stmts(#20064,20,#20060,1,"catch {}")
-#20065=@"loc,{#10000},2,9,2,16"
-locations_default(#20065,#10000,2,9,2,16)
-hasLocation(#20064,#20065)
-stmt_containers(#20064,#20001)
-#20066=*
-scopes(#20066,2)
-scopenodes(#20064,#20066)
-scopenesting(#20066,#20000)
+#20056=@"var;{this};{#20000}"
+variables(#20056,"this",#20000)
+#20057=*
+stmts(#20057,11,#20001,0,"try {\n\t ... ly {}\n}")
+#20058=@"loc,{#10000},1,1,5,1"
+locations_default(#20058,#10000,1,1,5,1)
+hasLocation(#20057,#20058)
+stmt_containers(#20057,#20001)
+#20059=*
+stmts(#20059,1,#20057,0,"{\n\ttry {} catch {}\n}")
+#20060=@"loc,{#10000},1,5,3,1"
+locations_default(#20060,#10000,1,5,3,1)
+hasLocation(#20059,#20060)
+stmt_containers(#20059,#20001)
+#20061=*
+stmts(#20061,11,#20059,0,"try {} catch {}")
+#20062=@"loc,{#10000},2,2,2,16"
+locations_default(#20062,#10000,2,2,2,16)
+hasLocation(#20061,#20062)
+stmt_containers(#20061,#20001)
+#20063=*
+stmts(#20063,1,#20061,0,"{}")
+#20064=@"loc,{#10000},2,6,2,7"
+locations_default(#20064,#10000,2,6,2,7)
+hasLocation(#20063,#20064)
+stmt_containers(#20063,#20001)
+#20065=*
+stmts(#20065,20,#20061,1,"catch {}")
+#20066=@"loc,{#10000},2,9,2,16"
+locations_default(#20066,#10000,2,9,2,16)
+hasLocation(#20065,#20066)
+stmt_containers(#20065,#20001)
 #20067=*
-stmts(#20067,1,#20064,1,"{}")
-#20068=@"loc,{#10000},2,15,2,16"
-locations_default(#20068,#10000,2,15,2,16)
-hasLocation(#20067,#20068)
-stmt_containers(#20067,#20001)
-#20069=*
-stmts(#20069,20,#20056,1,"catch { ... ly {}\n}")
-#20070=@"loc,{#10000},3,3,5,1"
-locations_default(#20070,#10000,3,3,5,1)
-hasLocation(#20069,#20070)
-stmt_containers(#20069,#20001)
-#20071=*
-scopes(#20071,2)
-scopenodes(#20069,#20071)
-scopenesting(#20071,#20000)
+scopes(#20067,2)
+scopenodes(#20065,#20067)
+scopenesting(#20067,#20000)
+#20068=*
+stmts(#20068,1,#20065,1,"{}")
+#20069=@"loc,{#10000},2,15,2,16"
+locations_default(#20069,#10000,2,15,2,16)
+hasLocation(#20068,#20069)
+stmt_containers(#20068,#20001)
+#20070=*
+stmts(#20070,20,#20057,1,"catch { ... ly {}\n}")
+#20071=@"loc,{#10000},3,3,5,1"
+locations_default(#20071,#10000,3,3,5,1)
+hasLocation(#20070,#20071)
+stmt_containers(#20070,#20001)
 #20072=*
-stmts(#20072,1,#20069,1,"{\n\ttry  ... ly {}\n}")
-#20073=@"loc,{#10000},3,9,5,1"
-locations_default(#20073,#10000,3,9,5,1)
-hasLocation(#20072,#20073)
-stmt_containers(#20072,#20001)
-#20074=*
-stmts(#20074,11,#20072,0,"try {}  ... ally {}")
-#20075=@"loc,{#10000},4,2,4,27"
-locations_default(#20075,#10000,4,2,4,27)
-hasLocation(#20074,#20075)
-stmt_containers(#20074,#20001)
-#20076=*
-stmts(#20076,1,#20074,0,"{}")
-#20077=@"loc,{#10000},4,6,4,7"
-locations_default(#20077,#10000,4,6,4,7)
-hasLocation(#20076,#20077)
-stmt_containers(#20076,#20001)
-#20078=*
-stmts(#20078,20,#20074,1,"catch {}")
-#20079=@"loc,{#10000},4,9,4,16"
-locations_default(#20079,#10000,4,9,4,16)
-hasLocation(#20078,#20079)
-stmt_containers(#20078,#20001)
-#20080=*
-scopes(#20080,2)
-scopenodes(#20078,#20080)
-scopenesting(#20080,#20071)
+scopes(#20072,2)
+scopenodes(#20070,#20072)
+scopenesting(#20072,#20000)
+#20073=*
+stmts(#20073,1,#20070,1,"{\n\ttry  ... ly {}\n}")
+#20074=@"loc,{#10000},3,9,5,1"
+locations_default(#20074,#10000,3,9,5,1)
+hasLocation(#20073,#20074)
+stmt_containers(#20073,#20001)
+#20075=*
+stmts(#20075,11,#20073,0,"try {}  ... ally {}")
+#20076=@"loc,{#10000},4,2,4,27"
+locations_default(#20076,#10000,4,2,4,27)
+hasLocation(#20075,#20076)
+stmt_containers(#20075,#20001)
+#20077=*
+stmts(#20077,1,#20075,0,"{}")
+#20078=@"loc,{#10000},4,6,4,7"
+locations_default(#20078,#10000,4,6,4,7)
+hasLocation(#20077,#20078)
+stmt_containers(#20077,#20001)
+#20079=*
+stmts(#20079,20,#20075,1,"catch {}")
+#20080=@"loc,{#10000},4,9,4,16"
+locations_default(#20080,#10000,4,9,4,16)
+hasLocation(#20079,#20080)
+stmt_containers(#20079,#20001)
 #20081=*
-stmts(#20081,1,#20078,1,"{}")
-#20082=@"loc,{#10000},4,15,4,16"
-locations_default(#20082,#10000,4,15,4,16)
-hasLocation(#20081,#20082)
-stmt_containers(#20081,#20001)
-#20083=*
-stmts(#20083,1,#20074,-1,"{}")
-#20084=@"loc,{#10000},4,26,4,27"
-locations_default(#20084,#10000,4,26,4,27)
-hasLocation(#20083,#20084)
-stmt_containers(#20083,#20001)
-#20085=*
-entry_cfg_node(#20085,#20001)
-#20086=@"loc,{#10000},1,1,1,0"
-locations_default(#20086,#10000,1,1,1,0)
-hasLocation(#20085,#20086)
-#20087=*
-exit_cfg_node(#20087,#20001)
-hasLocation(#20087,#20054)
-successor(#20056,#20058)
-successor(#20060,#20062)
-successor(#20062,#20087)
-successor(#20064,#20067)
-successor(#20067,#20087)
-successor(#20058,#20060)
-successor(#20069,#20072)
-successor(#20074,#20076)
-successor(#20076,#20083)
-successor(#20078,#20081)
-successor(#20081,#20083)
-successor(#20083,#20087)
-successor(#20072,#20074)
-successor(#20085,#20056)
+scopes(#20081,2)
+scopenodes(#20079,#20081)
+scopenesting(#20081,#20072)
+#20082=*
+stmts(#20082,1,#20079,1,"{}")
+#20083=@"loc,{#10000},4,15,4,16"
+locations_default(#20083,#10000,4,15,4,16)
+hasLocation(#20082,#20083)
+stmt_containers(#20082,#20001)
+#20084=*
+stmts(#20084,1,#20075,-1,"{}")
+#20085=@"loc,{#10000},4,26,4,27"
+locations_default(#20085,#10000,4,26,4,27)
+hasLocation(#20084,#20085)
+stmt_containers(#20084,#20001)
+#20086=*
+entry_cfg_node(#20086,#20001)
+#20087=@"loc,{#10000},1,1,1,0"
+locations_default(#20087,#10000,1,1,1,0)
+hasLocation(#20086,#20087)
+#20088=*
+exit_cfg_node(#20088,#20001)
+hasLocation(#20088,#20054)
+successor(#20057,#20059)
+successor(#20061,#20063)
+successor(#20063,#20088)
+successor(#20065,#20068)
+successor(#20068,#20088)
+successor(#20059,#20061)
+successor(#20070,#20073)
+successor(#20075,#20077)
+successor(#20077,#20084)
+successor(#20079,#20082)
+successor(#20082,#20084)
+successor(#20084,#20088)
+successor(#20073,#20075)
+successor(#20086,#20057)
 numlines(#10000,5,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/esnext/output/trap/dynamic-import.js.trap b/javascript/extractor/tests/esnext/output/trap/dynamic-import.js.trap
index bed8c1d13dc..85b062a9bd4 100644
--- a/javascript/extractor/tests/esnext/output/trap/dynamic-import.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/dynamic-import.js.trap
@@ -286,248 +286,250 @@ scopenodes(#20001,#20107)
 scopenesting(#20107,#20000)
 is_module(#20001)
 is_es2015_module(#20001)
-#20108=*
-stmts(#20108,2,#20001,0,"import(""m"");")
-hasLocation(#20108,#20003)
-stmt_containers(#20108,#20001)
+#20108=@"var;{this};{#20107}"
+variables(#20108,"this",#20107)
 #20109=*
-exprs(#20109,99,#20108,0,"import(""m"")")
-#20110=@"loc,{#10000},1,1,1,11"
-locations_default(#20110,#10000,1,1,1,11)
-hasLocation(#20109,#20110)
-enclosing_stmt(#20109,#20108)
-expr_containers(#20109,#20001)
-#20111=*
-exprs(#20111,4,#20109,0,"""m""")
-hasLocation(#20111,#20019)
-enclosing_stmt(#20111,#20108)
-expr_containers(#20111,#20001)
-literals("m","""m""",#20111)
+stmts(#20109,2,#20001,0,"import(""m"");")
+hasLocation(#20109,#20003)
+stmt_containers(#20109,#20001)
+#20110=*
+exprs(#20110,99,#20109,0,"import(""m"")")
+#20111=@"loc,{#10000},1,1,1,11"
+locations_default(#20111,#10000,1,1,1,11)
+hasLocation(#20110,#20111)
+enclosing_stmt(#20110,#20109)
+expr_containers(#20110,#20001)
 #20112=*
-regexpterm(#20112,14,#20111,0,"m")
-#20113=@"loc,{#10000},1,9,1,9"
-locations_default(#20113,#10000,1,9,1,9)
-hasLocation(#20112,#20113)
-regexp_const_value(#20112,"m")
-#20114=*
-stmts(#20114,2,#20001,1,"b ? imp ... ) : {};")
-hasLocation(#20114,#20005)
-stmt_containers(#20114,#20001)
+exprs(#20112,4,#20110,0,"""m""")
+hasLocation(#20112,#20019)
+enclosing_stmt(#20112,#20109)
+expr_containers(#20112,#20001)
+literals("m","""m""",#20112)
+#20113=*
+regexpterm(#20113,14,#20112,0,"m")
+#20114=@"loc,{#10000},1,9,1,9"
+locations_default(#20114,#10000,1,9,1,9)
+hasLocation(#20113,#20114)
+regexp_const_value(#20113,"m")
 #20115=*
-exprs(#20115,11,#20114,0,"b ? import(""n"") : {}")
-#20116=@"loc,{#10000},2,1,2,20"
-locations_default(#20116,#10000,2,1,2,20)
-hasLocation(#20115,#20116)
-enclosing_stmt(#20115,#20114)
-expr_containers(#20115,#20001)
-#20117=*
-exprs(#20117,79,#20115,0,"b")
-hasLocation(#20117,#20025)
-enclosing_stmt(#20117,#20114)
-expr_containers(#20117,#20001)
-literals("b","b",#20117)
-#20118=@"var;{b};{#20000}"
-variables(#20118,"b",#20000)
-bind(#20117,#20118)
-#20119=*
-exprs(#20119,99,#20115,1,"import(""n"")")
-#20120=@"loc,{#10000},2,5,2,15"
-locations_default(#20120,#10000,2,5,2,15)
-hasLocation(#20119,#20120)
-enclosing_stmt(#20119,#20114)
-expr_containers(#20119,#20001)
-#20121=*
-exprs(#20121,4,#20119,0,"""n""")
-hasLocation(#20121,#20033)
-enclosing_stmt(#20121,#20114)
-expr_containers(#20121,#20001)
-literals("n","""n""",#20121)
+stmts(#20115,2,#20001,1,"b ? imp ... ) : {};")
+hasLocation(#20115,#20005)
+stmt_containers(#20115,#20001)
+#20116=*
+exprs(#20116,11,#20115,0,"b ? import(""n"") : {}")
+#20117=@"loc,{#10000},2,1,2,20"
+locations_default(#20117,#10000,2,1,2,20)
+hasLocation(#20116,#20117)
+enclosing_stmt(#20116,#20115)
+expr_containers(#20116,#20001)
+#20118=*
+exprs(#20118,79,#20116,0,"b")
+hasLocation(#20118,#20025)
+enclosing_stmt(#20118,#20115)
+expr_containers(#20118,#20001)
+literals("b","b",#20118)
+#20119=@"var;{b};{#20000}"
+variables(#20119,"b",#20000)
+bind(#20118,#20119)
+#20120=*
+exprs(#20120,99,#20116,1,"import(""n"")")
+#20121=@"loc,{#10000},2,5,2,15"
+locations_default(#20121,#10000,2,5,2,15)
+hasLocation(#20120,#20121)
+enclosing_stmt(#20120,#20115)
+expr_containers(#20120,#20001)
 #20122=*
-regexpterm(#20122,14,#20121,0,"n")
-#20123=@"loc,{#10000},2,13,2,13"
-locations_default(#20123,#10000,2,13,2,13)
-hasLocation(#20122,#20123)
-regexp_const_value(#20122,"n")
-#20124=*
-exprs(#20124,8,#20115,2,"{}")
-#20125=@"loc,{#10000},2,19,2,20"
-locations_default(#20125,#10000,2,19,2,20)
-hasLocation(#20124,#20125)
-enclosing_stmt(#20124,#20114)
-expr_containers(#20124,#20001)
-#20126=*
-stmts(#20126,2,#20001,2,"import( ... => {});")
-hasLocation(#20126,#20007)
-stmt_containers(#20126,#20001)
+exprs(#20122,4,#20120,0,"""n""")
+hasLocation(#20122,#20033)
+enclosing_stmt(#20122,#20115)
+expr_containers(#20122,#20001)
+literals("n","""n""",#20122)
+#20123=*
+regexpterm(#20123,14,#20122,0,"n")
+#20124=@"loc,{#10000},2,13,2,13"
+locations_default(#20124,#10000,2,13,2,13)
+hasLocation(#20123,#20124)
+regexp_const_value(#20123,"n")
+#20125=*
+exprs(#20125,8,#20116,2,"{}")
+#20126=@"loc,{#10000},2,19,2,20"
+locations_default(#20126,#10000,2,19,2,20)
+hasLocation(#20125,#20126)
+enclosing_stmt(#20125,#20115)
+expr_containers(#20125,#20001)
 #20127=*
-exprs(#20127,13,#20126,0,"import( ...  => {})")
-#20128=@"loc,{#10000},3,1,3,27"
-locations_default(#20128,#10000,3,1,3,27)
-hasLocation(#20127,#20128)
-enclosing_stmt(#20127,#20126)
-expr_containers(#20127,#20001)
-#20129=*
-exprs(#20129,14,#20127,-1,"import(""o"").then")
-#20130=@"loc,{#10000},3,1,3,16"
-locations_default(#20130,#10000,3,1,3,16)
-hasLocation(#20129,#20130)
-enclosing_stmt(#20129,#20126)
-expr_containers(#20129,#20001)
-#20131=*
-exprs(#20131,99,#20129,0,"import(""o"")")
-#20132=@"loc,{#10000},3,1,3,11"
-locations_default(#20132,#10000,3,1,3,11)
-hasLocation(#20131,#20132)
-enclosing_stmt(#20131,#20126)
-expr_containers(#20131,#20001)
-#20133=*
-exprs(#20133,4,#20131,0,"""o""")
-hasLocation(#20133,#20049)
-enclosing_stmt(#20133,#20126)
-expr_containers(#20133,#20001)
-literals("o","""o""",#20133)
+stmts(#20127,2,#20001,2,"import( ... => {});")
+hasLocation(#20127,#20007)
+stmt_containers(#20127,#20001)
+#20128=*
+exprs(#20128,13,#20127,0,"import( ...  => {})")
+#20129=@"loc,{#10000},3,1,3,27"
+locations_default(#20129,#10000,3,1,3,27)
+hasLocation(#20128,#20129)
+enclosing_stmt(#20128,#20127)
+expr_containers(#20128,#20001)
+#20130=*
+exprs(#20130,14,#20128,-1,"import(""o"").then")
+#20131=@"loc,{#10000},3,1,3,16"
+locations_default(#20131,#10000,3,1,3,16)
+hasLocation(#20130,#20131)
+enclosing_stmt(#20130,#20127)
+expr_containers(#20130,#20001)
+#20132=*
+exprs(#20132,99,#20130,0,"import(""o"")")
+#20133=@"loc,{#10000},3,1,3,11"
+locations_default(#20133,#10000,3,1,3,11)
+hasLocation(#20132,#20133)
+enclosing_stmt(#20132,#20127)
+expr_containers(#20132,#20001)
 #20134=*
-regexpterm(#20134,14,#20133,0,"o")
-#20135=@"loc,{#10000},3,9,3,9"
-locations_default(#20135,#10000,3,9,3,9)
-hasLocation(#20134,#20135)
-regexp_const_value(#20134,"o")
-#20136=*
-exprs(#20136,0,#20129,1,"then")
-hasLocation(#20136,#20055)
-enclosing_stmt(#20136,#20126)
-expr_containers(#20136,#20001)
-literals("then","then",#20136)
+exprs(#20134,4,#20132,0,"""o""")
+hasLocation(#20134,#20049)
+enclosing_stmt(#20134,#20127)
+expr_containers(#20134,#20001)
+literals("o","""o""",#20134)
+#20135=*
+regexpterm(#20135,14,#20134,0,"o")
+#20136=@"loc,{#10000},3,9,3,9"
+locations_default(#20136,#10000,3,9,3,9)
+hasLocation(#20135,#20136)
+regexp_const_value(#20135,"o")
 #20137=*
-exprs(#20137,65,#20127,0,"(o) => {}")
-#20138=@"loc,{#10000},3,18,3,26"
-locations_default(#20138,#10000,3,18,3,26)
-hasLocation(#20137,#20138)
-enclosing_stmt(#20137,#20126)
+exprs(#20137,0,#20130,1,"then")
+hasLocation(#20137,#20055)
+enclosing_stmt(#20137,#20127)
 expr_containers(#20137,#20001)
-#20139=*
-scopes(#20139,1)
-scopenodes(#20137,#20139)
-scopenesting(#20139,#20107)
-#20140=@"var;{o};{#20139}"
-variables(#20140,"o",#20139)
-#20141=*
-exprs(#20141,78,#20137,0,"o")
-hasLocation(#20141,#20061)
-expr_containers(#20141,#20137)
-literals("o","o",#20141)
-decl(#20141,#20140)
+literals("then","then",#20137)
+#20138=*
+exprs(#20138,65,#20128,0,"(o) => {}")
+#20139=@"loc,{#10000},3,18,3,26"
+locations_default(#20139,#10000,3,18,3,26)
+hasLocation(#20138,#20139)
+enclosing_stmt(#20138,#20127)
+expr_containers(#20138,#20001)
+#20140=*
+scopes(#20140,1)
+scopenodes(#20138,#20140)
+scopenesting(#20140,#20107)
+#20141=@"var;{o};{#20140}"
+variables(#20141,"o",#20140)
 #20142=*
-stmts(#20142,1,#20137,-2,"{}")
-#20143=@"loc,{#10000},3,25,3,26"
-locations_default(#20143,#10000,3,25,3,26)
-hasLocation(#20142,#20143)
-stmt_containers(#20142,#20137)
-#20144=*
-stmts(#20144,2,#20001,3,"import(""m"",);")
-hasLocation(#20144,#20011)
-stmt_containers(#20144,#20001)
+exprs(#20142,78,#20138,0,"o")
+hasLocation(#20142,#20061)
+expr_containers(#20142,#20138)
+literals("o","o",#20142)
+decl(#20142,#20141)
+#20143=*
+stmts(#20143,1,#20138,-2,"{}")
+#20144=@"loc,{#10000},3,25,3,26"
+locations_default(#20144,#10000,3,25,3,26)
+hasLocation(#20143,#20144)
+stmt_containers(#20143,#20138)
 #20145=*
-exprs(#20145,99,#20144,0,"import(""m"",)")
-#20146=@"loc,{#10000},5,1,5,12"
-locations_default(#20146,#10000,5,1,5,12)
-hasLocation(#20145,#20146)
-enclosing_stmt(#20145,#20144)
-expr_containers(#20145,#20001)
-#20147=*
-exprs(#20147,4,#20145,0,"""m""")
-hasLocation(#20147,#20079)
-enclosing_stmt(#20147,#20144)
-expr_containers(#20147,#20001)
-literals("m","""m""",#20147)
+stmts(#20145,2,#20001,3,"import(""m"",);")
+hasLocation(#20145,#20011)
+stmt_containers(#20145,#20001)
+#20146=*
+exprs(#20146,99,#20145,0,"import(""m"",)")
+#20147=@"loc,{#10000},5,1,5,12"
+locations_default(#20147,#10000,5,1,5,12)
+hasLocation(#20146,#20147)
+enclosing_stmt(#20146,#20145)
+expr_containers(#20146,#20001)
 #20148=*
-regexpterm(#20148,14,#20147,0,"m")
-#20149=@"loc,{#10000},5,9,5,9"
-locations_default(#20149,#10000,5,9,5,9)
-hasLocation(#20148,#20149)
-regexp_const_value(#20148,"m")
-#20150=*
-stmts(#20150,2,#20001,4,"import(""m"",{},);")
-hasLocation(#20150,#20013)
-stmt_containers(#20150,#20001)
+exprs(#20148,4,#20146,0,"""m""")
+hasLocation(#20148,#20079)
+enclosing_stmt(#20148,#20145)
+expr_containers(#20148,#20001)
+literals("m","""m""",#20148)
+#20149=*
+regexpterm(#20149,14,#20148,0,"m")
+#20150=@"loc,{#10000},5,9,5,9"
+locations_default(#20150,#10000,5,9,5,9)
+hasLocation(#20149,#20150)
+regexp_const_value(#20149,"m")
 #20151=*
-exprs(#20151,99,#20150,0,"import(""m"",{},)")
-#20152=@"loc,{#10000},6,1,6,15"
-locations_default(#20152,#10000,6,1,6,15)
-hasLocation(#20151,#20152)
-enclosing_stmt(#20151,#20150)
-expr_containers(#20151,#20001)
-#20153=*
-exprs(#20153,4,#20151,0,"""m""")
-hasLocation(#20153,#20091)
-enclosing_stmt(#20153,#20150)
-expr_containers(#20153,#20001)
-literals("m","""m""",#20153)
+stmts(#20151,2,#20001,4,"import(""m"",{},);")
+hasLocation(#20151,#20013)
+stmt_containers(#20151,#20001)
+#20152=*
+exprs(#20152,99,#20151,0,"import(""m"",{},)")
+#20153=@"loc,{#10000},6,1,6,15"
+locations_default(#20153,#10000,6,1,6,15)
+hasLocation(#20152,#20153)
+enclosing_stmt(#20152,#20151)
+expr_containers(#20152,#20001)
 #20154=*
-regexpterm(#20154,14,#20153,0,"m")
-#20155=@"loc,{#10000},6,9,6,9"
-locations_default(#20155,#10000,6,9,6,9)
-hasLocation(#20154,#20155)
-regexp_const_value(#20154,"m")
-#20156=*
-exprs(#20156,8,#20151,1,"{}")
-#20157=@"loc,{#10000},6,12,6,13"
-locations_default(#20157,#10000,6,12,6,13)
-hasLocation(#20156,#20157)
-enclosing_stmt(#20156,#20150)
-expr_containers(#20156,#20001)
-#20158=*
-entry_cfg_node(#20158,#20001)
-#20159=@"loc,{#10000},1,1,1,0"
-locations_default(#20159,#10000,1,1,1,0)
-hasLocation(#20158,#20159)
-#20160=*
-exit_cfg_node(#20160,#20001)
-hasLocation(#20160,#20105)
-successor(#20150,#20153)
-successor(#20153,#20151)
-successor(#20151,#20160)
-successor(#20144,#20147)
-successor(#20147,#20145)
-successor(#20145,#20150)
-successor(#20126,#20133)
-successor(#20137,#20127)
+exprs(#20154,4,#20152,0,"""m""")
+hasLocation(#20154,#20091)
+enclosing_stmt(#20154,#20151)
+expr_containers(#20154,#20001)
+literals("m","""m""",#20154)
+#20155=*
+regexpterm(#20155,14,#20154,0,"m")
+#20156=@"loc,{#10000},6,9,6,9"
+locations_default(#20156,#10000,6,9,6,9)
+hasLocation(#20155,#20156)
+regexp_const_value(#20155,"m")
+#20157=*
+exprs(#20157,8,#20152,1,"{}")
+#20158=@"loc,{#10000},6,12,6,13"
+locations_default(#20158,#10000,6,12,6,13)
+hasLocation(#20157,#20158)
+enclosing_stmt(#20157,#20151)
+expr_containers(#20157,#20001)
+#20159=*
+entry_cfg_node(#20159,#20001)
+#20160=@"loc,{#10000},1,1,1,0"
+locations_default(#20160,#10000,1,1,1,0)
+hasLocation(#20159,#20160)
 #20161=*
-entry_cfg_node(#20161,#20137)
-#20162=@"loc,{#10000},3,18,3,17"
-locations_default(#20162,#10000,3,18,3,17)
-hasLocation(#20161,#20162)
-#20163=*
-exit_cfg_node(#20163,#20137)
-#20164=@"loc,{#10000},3,27,3,26"
-locations_default(#20164,#10000,3,27,3,26)
-hasLocation(#20163,#20164)
-successor(#20142,#20163)
-successor(#20141,#20142)
-successor(#20161,#20141)
-successor(#20136,#20129)
-successor(#20133,#20131)
-successor(#20131,#20136)
-successor(#20129,#20137)
-successor(#20127,#20144)
-successor(#20114,#20115)
-successor(#20115,#20117)
-#20165=*
-guard_node(#20165,1,#20117)
-hasLocation(#20165,#20025)
-successor(#20165,#20121)
+exit_cfg_node(#20161,#20001)
+hasLocation(#20161,#20105)
+successor(#20151,#20154)
+successor(#20154,#20152)
+successor(#20152,#20161)
+successor(#20145,#20148)
+successor(#20148,#20146)
+successor(#20146,#20151)
+successor(#20127,#20134)
+successor(#20138,#20128)
+#20162=*
+entry_cfg_node(#20162,#20138)
+#20163=@"loc,{#10000},3,18,3,17"
+locations_default(#20163,#10000,3,18,3,17)
+hasLocation(#20162,#20163)
+#20164=*
+exit_cfg_node(#20164,#20138)
+#20165=@"loc,{#10000},3,27,3,26"
+locations_default(#20165,#10000,3,27,3,26)
+hasLocation(#20164,#20165)
+successor(#20143,#20164)
+successor(#20142,#20143)
+successor(#20162,#20142)
+successor(#20137,#20130)
+successor(#20134,#20132)
+successor(#20132,#20137)
+successor(#20130,#20138)
+successor(#20128,#20145)
+successor(#20115,#20116)
+successor(#20116,#20118)
 #20166=*
-guard_node(#20166,0,#20117)
+guard_node(#20166,1,#20118)
 hasLocation(#20166,#20025)
-successor(#20166,#20124)
-successor(#20117,#20165)
-successor(#20117,#20166)
-successor(#20121,#20119)
-successor(#20119,#20126)
-successor(#20124,#20126)
-successor(#20108,#20111)
-successor(#20111,#20109)
-successor(#20109,#20114)
-successor(#20158,#20108)
+successor(#20166,#20122)
+#20167=*
+guard_node(#20167,0,#20118)
+hasLocation(#20167,#20025)
+successor(#20167,#20125)
+successor(#20118,#20166)
+successor(#20118,#20167)
+successor(#20122,#20120)
+successor(#20120,#20127)
+successor(#20125,#20127)
+successor(#20109,#20112)
+successor(#20112,#20110)
+successor(#20110,#20115)
+successor(#20159,#20109)
 numlines(#10000,6,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/esnext/output/trap/fields.js.trap b/javascript/extractor/tests/esnext/output/trap/fields.js.trap
index b317e50f268..1442df18308 100644
--- a/javascript/extractor/tests/esnext/output/trap/fields.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/fields.js.trap
@@ -234,301 +234,315 @@ local_type_names(#20083,"A",#20000)
 local_type_names(#20084,"B",#20000)
 #20085=@"local_type_name;{C};{#20000}"
 local_type_names(#20085,"C",#20000)
-#20086=*
-stmts(#20086,26,#20001,0,"class A ... rget;\n}")
-#20087=@"loc,{#10000},1,1,3,1"
-locations_default(#20087,#10000,1,1,3,1)
-hasLocation(#20086,#20087)
-stmt_containers(#20086,#20001)
-#20088=*
-exprs(#20088,78,#20086,0,"A")
-hasLocation(#20088,#20027)
-enclosing_stmt(#20088,#20086)
-expr_containers(#20088,#20001)
-literals("A","A",#20088)
-decl(#20088,#20080)
-typedecl(#20088,#20083)
+#20086=@"var;{this};{#20000}"
+variables(#20086,"this",#20000)
+#20087=*
+stmts(#20087,26,#20001,0,"class A ... rget;\n}")
+#20088=@"loc,{#10000},1,1,3,1"
+locations_default(#20088,#10000,1,1,3,1)
+hasLocation(#20087,#20088)
+stmt_containers(#20087,#20001)
 #20089=*
-scopes(#20089,10)
-scopenodes(#20086,#20089)
-scopenesting(#20089,#20000)
+exprs(#20089,78,#20087,0,"A")
+hasLocation(#20089,#20027)
+enclosing_stmt(#20089,#20087)
+expr_containers(#20089,#20001)
+literals("A","A",#20089)
+decl(#20089,#20080)
+typedecl(#20089,#20083)
 #20090=*
-properties(#20090,#20086,2,8,"x = new.target;")
-#20091=@"loc,{#10000},2,3,2,17"
-locations_default(#20091,#10000,2,3,2,17)
-hasLocation(#20090,#20091)
+scopes(#20090,10)
+scopenodes(#20087,#20090)
+scopenesting(#20090,#20000)
+#20091=@"var;{this};{#20090}"
+variables(#20091,"this",#20090)
 #20092=*
-#20093=*
-exprs(#20093,0,#20090,0,"x")
-hasLocation(#20093,#20031)
-expr_containers(#20093,#20092)
-literals("x","x",#20093)
+properties(#20092,#20087,2,8,"x = new.target;")
+#20093=@"loc,{#10000},2,3,2,17"
+locations_default(#20093,#10000,2,3,2,17)
+hasLocation(#20092,#20093)
 #20094=*
-exprs(#20094,82,#20090,1,"new.target")
-#20095=@"loc,{#10000},2,7,2,16"
-locations_default(#20095,#10000,2,7,2,16)
-hasLocation(#20094,#20095)
-expr_containers(#20094,#20092)
+#20095=*
+exprs(#20095,0,#20092,0,"x")
+hasLocation(#20095,#20031)
+expr_containers(#20095,#20094)
+literals("x","x",#20095)
 #20096=*
-properties(#20096,#20086,3,0,"constructor() {}")
-#20097=@"loc,{#10000},1,9,1,8"
-locations_default(#20097,#10000,1,9,1,8)
+exprs(#20096,82,#20092,1,"new.target")
+#20097=@"loc,{#10000},2,7,2,16"
+locations_default(#20097,#10000,2,7,2,16)
 hasLocation(#20096,#20097)
+expr_containers(#20096,#20094)
 #20098=*
-exprs(#20098,0,#20096,0,"constructor")
-hasLocation(#20098,#20097)
-enclosing_stmt(#20098,#20086)
-expr_containers(#20098,#20001)
-literals("constructor","constructor",#20098)
-exprs(#20092,9,#20096,1,"() {}")
-hasLocation(#20092,#20097)
-enclosing_stmt(#20092,#20086)
-expr_containers(#20092,#20001)
-#20099=*
-scopes(#20099,1)
-scopenodes(#20092,#20099)
-scopenesting(#20099,#20089)
-#20100=@"var;{arguments};{#20099}"
-variables(#20100,"arguments",#20099)
-is_arguments_object(#20100)
+properties(#20098,#20087,3,0,"constructor() {}")
+#20099=@"loc,{#10000},1,9,1,8"
+locations_default(#20099,#10000,1,9,1,8)
+hasLocation(#20098,#20099)
+#20100=*
+exprs(#20100,0,#20098,0,"constructor")
+hasLocation(#20100,#20099)
+enclosing_stmt(#20100,#20087)
+expr_containers(#20100,#20001)
+literals("constructor","constructor",#20100)
+exprs(#20094,9,#20098,1,"() {}")
+hasLocation(#20094,#20099)
+enclosing_stmt(#20094,#20087)
+expr_containers(#20094,#20001)
 #20101=*
-stmts(#20101,1,#20092,-2,"{}")
-hasLocation(#20101,#20097)
-stmt_containers(#20101,#20092)
-is_method(#20096)
-#20102=*
-stmts(#20102,26,#20001,1,"class B ... er.x;\n}")
-#20103=@"loc,{#10000},5,1,7,1"
-locations_default(#20103,#10000,5,1,7,1)
-hasLocation(#20102,#20103)
-stmt_containers(#20102,#20001)
+scopes(#20101,1)
+scopenodes(#20094,#20101)
+scopenesting(#20101,#20090)
+#20102=@"var;{this};{#20101}"
+variables(#20102,"this",#20101)
+#20103=@"var;{arguments};{#20101}"
+variables(#20103,"arguments",#20101)
+is_arguments_object(#20103)
 #20104=*
-exprs(#20104,78,#20102,0,"B")
-hasLocation(#20104,#20046)
-enclosing_stmt(#20104,#20102)
-expr_containers(#20104,#20001)
-literals("B","B",#20104)
-decl(#20104,#20081)
-typedecl(#20104,#20084)
+stmts(#20104,1,#20094,-2,"{}")
+hasLocation(#20104,#20099)
+stmt_containers(#20104,#20094)
+is_method(#20098)
 #20105=*
-scopes(#20105,10)
-scopenodes(#20102,#20105)
-scopenesting(#20105,#20000)
-#20106=*
-exprs(#20106,79,#20102,1,"A")
-hasLocation(#20106,#20050)
-enclosing_stmt(#20106,#20102)
-expr_containers(#20106,#20001)
-literals("A","A",#20106)
-bind(#20106,#20080)
+stmts(#20105,26,#20001,1,"class B ... er.x;\n}")
+#20106=@"loc,{#10000},5,1,7,1"
+locations_default(#20106,#10000,5,1,7,1)
+hasLocation(#20105,#20106)
+stmt_containers(#20105,#20001)
 #20107=*
-properties(#20107,#20102,2,8,"y = super.x;")
-#20108=@"loc,{#10000},6,3,6,14"
-locations_default(#20108,#10000,6,3,6,14)
-hasLocation(#20107,#20108)
-#20109=*
+exprs(#20107,78,#20105,0,"B")
+hasLocation(#20107,#20046)
+enclosing_stmt(#20107,#20105)
+expr_containers(#20107,#20001)
+literals("B","B",#20107)
+decl(#20107,#20081)
+typedecl(#20107,#20084)
+#20108=*
+scopes(#20108,10)
+scopenodes(#20105,#20108)
+scopenesting(#20108,#20000)
+#20109=@"var;{this};{#20108}"
+variables(#20109,"this",#20108)
 #20110=*
-exprs(#20110,0,#20107,0,"y")
-hasLocation(#20110,#20054)
-expr_containers(#20110,#20109)
-literals("y","y",#20110)
+exprs(#20110,79,#20105,1,"A")
+hasLocation(#20110,#20050)
+enclosing_stmt(#20110,#20105)
+expr_containers(#20110,#20001)
+literals("A","A",#20110)
+bind(#20110,#20080)
 #20111=*
-exprs(#20111,14,#20107,1,"super.x")
-#20112=@"loc,{#10000},6,7,6,13"
-locations_default(#20112,#10000,6,7,6,13)
+properties(#20111,#20105,2,8,"y = super.x;")
+#20112=@"loc,{#10000},6,3,6,14"
+locations_default(#20112,#10000,6,3,6,14)
 hasLocation(#20111,#20112)
-expr_containers(#20111,#20109)
 #20113=*
-exprs(#20113,81,#20111,0,"super")
-hasLocation(#20113,#20058)
-expr_containers(#20113,#20109)
 #20114=*
-exprs(#20114,0,#20111,1,"x")
-hasLocation(#20114,#20062)
-expr_containers(#20114,#20109)
-literals("x","x",#20114)
+exprs(#20114,0,#20111,0,"y")
+hasLocation(#20114,#20054)
+expr_containers(#20114,#20113)
+literals("y","y",#20114)
 #20115=*
-properties(#20115,#20102,3,0,"constru ... rgs); }")
-#20116=@"loc,{#10000},5,19,5,18"
-locations_default(#20116,#10000,5,19,5,18)
+exprs(#20115,14,#20111,1,"super.x")
+#20116=@"loc,{#10000},6,7,6,13"
+locations_default(#20116,#10000,6,7,6,13)
 hasLocation(#20115,#20116)
+expr_containers(#20115,#20113)
 #20117=*
-exprs(#20117,0,#20115,0,"constructor")
-hasLocation(#20117,#20116)
-enclosing_stmt(#20117,#20102)
-expr_containers(#20117,#20001)
-literals("constructor","constructor",#20117)
-exprs(#20109,9,#20115,1,"(...arg ... rgs); }")
-hasLocation(#20109,#20116)
-enclosing_stmt(#20109,#20102)
-expr_containers(#20109,#20001)
+exprs(#20117,81,#20115,0,"super")
+hasLocation(#20117,#20058)
+expr_containers(#20117,#20113)
 #20118=*
-scopes(#20118,1)
-scopenodes(#20109,#20118)
-scopenesting(#20118,#20105)
-#20119=@"var;{args};{#20118}"
-variables(#20119,"args",#20118)
-#20120=*
-exprs(#20120,78,#20109,0,"args")
-hasLocation(#20120,#20116)
-expr_containers(#20120,#20109)
-literals("args","args",#20120)
-decl(#20120,#20119)
-#20121=@"var;{arguments};{#20118}"
-variables(#20121,"arguments",#20118)
-is_arguments_object(#20121)
-has_rest_parameter(#20109)
+exprs(#20118,0,#20115,1,"x")
+hasLocation(#20118,#20062)
+expr_containers(#20118,#20113)
+literals("x","x",#20118)
+#20119=*
+properties(#20119,#20105,3,0,"constru ... rgs); }")
+#20120=@"loc,{#10000},5,19,5,18"
+locations_default(#20120,#10000,5,19,5,18)
+hasLocation(#20119,#20120)
+#20121=*
+exprs(#20121,0,#20119,0,"constructor")
+hasLocation(#20121,#20120)
+enclosing_stmt(#20121,#20105)
+expr_containers(#20121,#20001)
+literals("constructor","constructor",#20121)
+exprs(#20113,9,#20119,1,"(...arg ... rgs); }")
+hasLocation(#20113,#20120)
+enclosing_stmt(#20113,#20105)
+expr_containers(#20113,#20001)
 #20122=*
-stmts(#20122,1,#20109,-2,"{ super(...args); }")
-hasLocation(#20122,#20116)
-stmt_containers(#20122,#20109)
-#20123=*
-stmts(#20123,2,#20122,0,"super(...args);")
-hasLocation(#20123,#20116)
-stmt_containers(#20123,#20109)
-#20124=*
-exprs(#20124,13,#20123,0,"super(...args)")
-hasLocation(#20124,#20116)
-enclosing_stmt(#20124,#20123)
-expr_containers(#20124,#20109)
+scopes(#20122,1)
+scopenodes(#20113,#20122)
+scopenesting(#20122,#20108)
+#20123=@"var;{this};{#20122}"
+variables(#20123,"this",#20122)
+#20124=@"var;{args};{#20122}"
+variables(#20124,"args",#20122)
 #20125=*
-exprs(#20125,81,#20124,-1,"super")
-hasLocation(#20125,#20116)
-enclosing_stmt(#20125,#20123)
-expr_containers(#20125,#20109)
-#20126=*
-exprs(#20126,66,#20124,0,"...args")
-hasLocation(#20126,#20116)
-enclosing_stmt(#20126,#20123)
-expr_containers(#20126,#20109)
+exprs(#20125,78,#20113,0,"args")
+hasLocation(#20125,#20120)
+expr_containers(#20125,#20113)
+literals("args","args",#20125)
+decl(#20125,#20124)
+#20126=@"var;{arguments};{#20122}"
+variables(#20126,"arguments",#20122)
+is_arguments_object(#20126)
+has_rest_parameter(#20113)
 #20127=*
-exprs(#20127,79,#20126,0,"args")
-hasLocation(#20127,#20116)
-enclosing_stmt(#20127,#20123)
-expr_containers(#20127,#20109)
-literals("args","args",#20127)
-bind(#20127,#20119)
-is_method(#20115)
+stmts(#20127,1,#20113,-2,"{ super(...args); }")
+hasLocation(#20127,#20120)
+stmt_containers(#20127,#20113)
 #20128=*
-stmts(#20128,26,#20001,2,"class C {\n  async;\n}")
-#20129=@"loc,{#10000},9,1,11,1"
-locations_default(#20129,#10000,9,1,11,1)
-hasLocation(#20128,#20129)
-stmt_containers(#20128,#20001)
+stmts(#20128,2,#20127,0,"super(...args);")
+hasLocation(#20128,#20120)
+stmt_containers(#20128,#20113)
+#20129=*
+exprs(#20129,13,#20128,0,"super(...args)")
+hasLocation(#20129,#20120)
+enclosing_stmt(#20129,#20128)
+expr_containers(#20129,#20113)
 #20130=*
-exprs(#20130,78,#20128,0,"C")
-hasLocation(#20130,#20069)
+exprs(#20130,81,#20129,-1,"super")
+hasLocation(#20130,#20120)
 enclosing_stmt(#20130,#20128)
-expr_containers(#20130,#20001)
-literals("C","C",#20130)
-decl(#20130,#20082)
-typedecl(#20130,#20085)
+expr_containers(#20130,#20113)
 #20131=*
-scopes(#20131,10)
-scopenodes(#20128,#20131)
-scopenesting(#20131,#20000)
+exprs(#20131,66,#20129,0,"...args")
+hasLocation(#20131,#20120)
+enclosing_stmt(#20131,#20128)
+expr_containers(#20131,#20113)
 #20132=*
-properties(#20132,#20128,2,8,"async;")
-#20133=@"loc,{#10000},10,3,10,8"
-locations_default(#20133,#10000,10,3,10,8)
-hasLocation(#20132,#20133)
-#20134=*
+exprs(#20132,79,#20131,0,"args")
+hasLocation(#20132,#20120)
+enclosing_stmt(#20132,#20128)
+expr_containers(#20132,#20113)
+literals("args","args",#20132)
+bind(#20132,#20124)
+is_method(#20119)
+#20133=*
+stmts(#20133,26,#20001,2,"class C {\n  async;\n}")
+#20134=@"loc,{#10000},9,1,11,1"
+locations_default(#20134,#10000,9,1,11,1)
+hasLocation(#20133,#20134)
+stmt_containers(#20133,#20001)
 #20135=*
-exprs(#20135,0,#20132,0,"async")
-hasLocation(#20135,#20073)
-expr_containers(#20135,#20134)
-literals("async","async",#20135)
+exprs(#20135,78,#20133,0,"C")
+hasLocation(#20135,#20069)
+enclosing_stmt(#20135,#20133)
+expr_containers(#20135,#20001)
+literals("C","C",#20135)
+decl(#20135,#20082)
+typedecl(#20135,#20085)
 #20136=*
-properties(#20136,#20128,3,0,"constructor() {}")
-#20137=@"loc,{#10000},9,9,9,8"
-locations_default(#20137,#10000,9,9,9,8)
-hasLocation(#20136,#20137)
+scopes(#20136,10)
+scopenodes(#20133,#20136)
+scopenesting(#20136,#20000)
+#20137=@"var;{this};{#20136}"
+variables(#20137,"this",#20136)
 #20138=*
-exprs(#20138,0,#20136,0,"constructor")
-hasLocation(#20138,#20137)
-enclosing_stmt(#20138,#20128)
-expr_containers(#20138,#20001)
-literals("constructor","constructor",#20138)
-exprs(#20134,9,#20136,1,"() {}")
-hasLocation(#20134,#20137)
-enclosing_stmt(#20134,#20128)
-expr_containers(#20134,#20001)
-#20139=*
-scopes(#20139,1)
-scopenodes(#20134,#20139)
-scopenesting(#20139,#20131)
-#20140=@"var;{arguments};{#20139}"
-variables(#20140,"arguments",#20139)
-is_arguments_object(#20140)
+properties(#20138,#20133,2,8,"async;")
+#20139=@"loc,{#10000},10,3,10,8"
+locations_default(#20139,#10000,10,3,10,8)
+hasLocation(#20138,#20139)
+#20140=*
 #20141=*
-stmts(#20141,1,#20134,-2,"{}")
-hasLocation(#20141,#20137)
-stmt_containers(#20141,#20134)
-is_method(#20136)
+exprs(#20141,0,#20138,0,"async")
+hasLocation(#20141,#20073)
+expr_containers(#20141,#20140)
+literals("async","async",#20141)
 #20142=*
-entry_cfg_node(#20142,#20001)
-#20143=@"loc,{#10000},1,1,1,0"
-locations_default(#20143,#10000,1,1,1,0)
+properties(#20142,#20133,3,0,"constructor() {}")
+#20143=@"loc,{#10000},9,9,9,8"
+locations_default(#20143,#10000,9,9,9,8)
 hasLocation(#20142,#20143)
 #20144=*
-exit_cfg_node(#20144,#20001)
-hasLocation(#20144,#20078)
-successor(#20135,#20132)
-successor(#20134,#20136)
+exprs(#20144,0,#20142,0,"constructor")
+hasLocation(#20144,#20143)
+enclosing_stmt(#20144,#20133)
+expr_containers(#20144,#20001)
+literals("constructor","constructor",#20144)
+exprs(#20140,9,#20142,1,"() {}")
+hasLocation(#20140,#20143)
+enclosing_stmt(#20140,#20133)
+expr_containers(#20140,#20001)
 #20145=*
-entry_cfg_node(#20145,#20134)
-hasLocation(#20145,#20137)
-successor(#20132,#20141)
-#20146=*
-exit_cfg_node(#20146,#20134)
-hasLocation(#20146,#20137)
-successor(#20141,#20146)
-successor(#20145,#20135)
-successor(#20138,#20134)
-successor(#20136,#20128)
-successor(#20130,#20138)
-successor(#20128,#20144)
-successor(#20114,#20111)
-successor(#20113,#20114)
-successor(#20111,#20107)
-successor(#20110,#20113)
-successor(#20109,#20115)
-#20147=*
-entry_cfg_node(#20147,#20109)
-hasLocation(#20147,#20116)
+scopes(#20145,1)
+scopenodes(#20140,#20145)
+scopenesting(#20145,#20136)
+#20146=@"var;{this};{#20145}"
+variables(#20146,"this",#20145)
+#20147=@"var;{arguments};{#20145}"
+variables(#20147,"arguments",#20145)
+is_arguments_object(#20147)
 #20148=*
-exit_cfg_node(#20148,#20109)
-hasLocation(#20148,#20116)
-successor(#20123,#20125)
-successor(#20127,#20126)
-successor(#20126,#20124)
-successor(#20125,#20127)
-successor(#20107,#20148)
-successor(#20124,#20110)
-successor(#20122,#20123)
-successor(#20120,#20122)
-successor(#20147,#20120)
-successor(#20117,#20109)
-successor(#20115,#20102)
-successor(#20106,#20117)
-successor(#20104,#20106)
-successor(#20102,#20130)
-successor(#20094,#20090)
-successor(#20093,#20094)
-successor(#20092,#20096)
+stmts(#20148,1,#20140,-2,"{}")
+hasLocation(#20148,#20143)
+stmt_containers(#20148,#20140)
+is_method(#20142)
 #20149=*
-entry_cfg_node(#20149,#20092)
-hasLocation(#20149,#20097)
-successor(#20090,#20101)
-#20150=*
-exit_cfg_node(#20150,#20092)
-hasLocation(#20150,#20097)
-successor(#20101,#20150)
-successor(#20149,#20093)
-successor(#20098,#20092)
-successor(#20096,#20086)
-successor(#20088,#20098)
-successor(#20086,#20104)
-successor(#20142,#20088)
+entry_cfg_node(#20149,#20001)
+#20150=@"loc,{#10000},1,1,1,0"
+locations_default(#20150,#10000,1,1,1,0)
+hasLocation(#20149,#20150)
+#20151=*
+exit_cfg_node(#20151,#20001)
+hasLocation(#20151,#20078)
+successor(#20141,#20138)
+successor(#20140,#20142)
+#20152=*
+entry_cfg_node(#20152,#20140)
+hasLocation(#20152,#20143)
+successor(#20138,#20148)
+#20153=*
+exit_cfg_node(#20153,#20140)
+hasLocation(#20153,#20143)
+successor(#20148,#20153)
+successor(#20152,#20141)
+successor(#20144,#20140)
+successor(#20142,#20133)
+successor(#20135,#20144)
+successor(#20133,#20151)
+successor(#20118,#20115)
+successor(#20117,#20118)
+successor(#20115,#20111)
+successor(#20114,#20117)
+successor(#20113,#20119)
+#20154=*
+entry_cfg_node(#20154,#20113)
+hasLocation(#20154,#20120)
+#20155=*
+exit_cfg_node(#20155,#20113)
+hasLocation(#20155,#20120)
+successor(#20128,#20130)
+successor(#20132,#20131)
+successor(#20131,#20129)
+successor(#20130,#20132)
+successor(#20111,#20155)
+successor(#20129,#20114)
+successor(#20127,#20128)
+successor(#20125,#20127)
+successor(#20154,#20125)
+successor(#20121,#20113)
+successor(#20119,#20105)
+successor(#20110,#20121)
+successor(#20107,#20110)
+successor(#20105,#20135)
+successor(#20096,#20092)
+successor(#20095,#20096)
+successor(#20094,#20098)
+#20156=*
+entry_cfg_node(#20156,#20094)
+hasLocation(#20156,#20099)
+successor(#20092,#20104)
+#20157=*
+exit_cfg_node(#20157,#20094)
+hasLocation(#20157,#20099)
+successor(#20104,#20157)
+successor(#20156,#20095)
+successor(#20100,#20094)
+successor(#20098,#20087)
+successor(#20089,#20100)
+successor(#20087,#20107)
+successor(#20149,#20089)
 numlines(#10000,11,9,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/esnext/output/trap/for-await.js.trap b/javascript/extractor/tests/esnext/output/trap/for-await.js.trap
index 5af93db3494..d2822cc80a7 100644
--- a/javascript/extractor/tests/esnext/output/trap/for-await.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/for-await.js.trap
@@ -249,202 +249,206 @@ locations_default(#20090,#10000,1,1,9,1)
 hasLocation(#20001,#20090)
 #20091=@"var;{foo};{#20000}"
 variables(#20091,"foo",#20000)
-#20092=*
-stmts(#20092,17,#20001,0,"async f ...     }\n}")
-#20093=@"loc,{#10000},1,1,5,1"
-locations_default(#20093,#10000,1,1,5,1)
-hasLocation(#20092,#20093)
-stmt_containers(#20092,#20001)
-#20094=*
-exprs(#20094,78,#20092,-1,"foo")
-hasLocation(#20094,#20025)
-expr_containers(#20094,#20092)
-literals("foo","foo",#20094)
-decl(#20094,#20091)
+#20092=@"var;{this};{#20000}"
+variables(#20092,"this",#20000)
+#20093=*
+stmts(#20093,17,#20001,0,"async f ...     }\n}")
+#20094=@"loc,{#10000},1,1,5,1"
+locations_default(#20094,#10000,1,1,5,1)
+hasLocation(#20093,#20094)
+stmt_containers(#20093,#20001)
 #20095=*
-scopes(#20095,1)
-scopenodes(#20092,#20095)
-scopenesting(#20095,#20000)
-#20096=@"var;{arguments};{#20095}"
-variables(#20096,"arguments",#20095)
-is_arguments_object(#20096)
-is_async(#20092)
-#20097=*
-stmts(#20097,1,#20092,-2,"{\n    f ...     }\n}")
-#20098=@"loc,{#10000},1,22,5,1"
-locations_default(#20098,#10000,1,22,5,1)
-hasLocation(#20097,#20098)
-stmt_containers(#20097,#20092)
+exprs(#20095,78,#20093,-1,"foo")
+hasLocation(#20095,#20025)
+expr_containers(#20095,#20093)
+literals("foo","foo",#20095)
+decl(#20095,#20091)
+#20096=*
+scopes(#20096,1)
+scopenodes(#20093,#20096)
+scopenesting(#20096,#20000)
+#20097=@"var;{this};{#20096}"
+variables(#20097,"this",#20096)
+#20098=@"var;{arguments};{#20096}"
+variables(#20098,"arguments",#20096)
+is_arguments_object(#20098)
+is_async(#20093)
 #20099=*
-stmts(#20099,21,#20097,0,"for awa ...  \n    }")
-#20100=@"loc,{#10000},2,5,4,5"
-locations_default(#20100,#10000,2,5,4,5)
+stmts(#20099,1,#20093,-2,"{\n    f ...     }\n}")
+#20100=@"loc,{#10000},1,22,5,1"
+locations_default(#20100,#10000,1,22,5,1)
 hasLocation(#20099,#20100)
-stmt_containers(#20099,#20092)
+stmt_containers(#20099,#20093)
 #20101=*
-exprs(#20101,79,#20099,1,"calls")
-hasLocation(#20101,#20045)
-enclosing_stmt(#20101,#20099)
-expr_containers(#20101,#20092)
-literals("calls","calls",#20101)
-#20102=@"var;{calls};{#20000}"
-variables(#20102,"calls",#20000)
-bind(#20101,#20102)
+stmts(#20101,21,#20099,0,"for awa ...  \n    }")
+#20102=@"loc,{#10000},2,5,4,5"
+locations_default(#20102,#10000,2,5,4,5)
+hasLocation(#20101,#20102)
+stmt_containers(#20101,#20093)
 #20103=*
-scopes(#20103,6)
-scopenodes(#20099,#20103)
-scopenesting(#20103,#20095)
-#20104=@"var;{call};{#20103}"
-variables(#20104,"call",#20103)
+exprs(#20103,79,#20101,1,"calls")
+hasLocation(#20103,#20045)
+enclosing_stmt(#20103,#20101)
+expr_containers(#20103,#20093)
+literals("calls","calls",#20103)
+#20104=@"var;{calls};{#20000}"
+variables(#20104,"calls",#20000)
+bind(#20103,#20104)
 #20105=*
-stmts(#20105,22,#20099,0,"const call")
-#20106=@"loc,{#10000},2,16,2,25"
-locations_default(#20106,#10000,2,16,2,25)
-hasLocation(#20105,#20106)
-stmt_containers(#20105,#20092)
+scopes(#20105,6)
+scopenodes(#20101,#20105)
+scopenesting(#20105,#20096)
+#20106=@"var;{call};{#20105}"
+variables(#20106,"call",#20105)
 #20107=*
-exprs(#20107,64,#20105,0,"call")
-hasLocation(#20107,#20041)
-enclosing_stmt(#20107,#20105)
-expr_containers(#20107,#20092)
-#20108=*
-exprs(#20108,78,#20107,0,"call")
-hasLocation(#20108,#20041)
-enclosing_stmt(#20108,#20105)
-expr_containers(#20108,#20092)
-literals("call","call",#20108)
-decl(#20108,#20104)
+stmts(#20107,22,#20101,0,"const call")
+#20108=@"loc,{#10000},2,16,2,25"
+locations_default(#20108,#10000,2,16,2,25)
+hasLocation(#20107,#20108)
+stmt_containers(#20107,#20093)
 #20109=*
-stmts(#20109,1,#20099,2,"{\n      ...  \n    }")
-#20110=@"loc,{#10000},2,37,4,5"
-locations_default(#20110,#10000,2,37,4,5)
-hasLocation(#20109,#20110)
-stmt_containers(#20109,#20092)
+exprs(#20109,64,#20107,0,"call")
+hasLocation(#20109,#20041)
+enclosing_stmt(#20109,#20107)
+expr_containers(#20109,#20093)
+#20110=*
+exprs(#20110,78,#20109,0,"call")
+hasLocation(#20110,#20041)
+enclosing_stmt(#20110,#20107)
+expr_containers(#20110,#20093)
+literals("call","call",#20110)
+decl(#20110,#20106)
 #20111=*
-stmts(#20111,2,#20109,0,"call();")
-#20112=@"loc,{#10000},3,9,3,15"
-locations_default(#20112,#10000,3,9,3,15)
+stmts(#20111,1,#20101,2,"{\n      ...  \n    }")
+#20112=@"loc,{#10000},2,37,4,5"
+locations_default(#20112,#10000,2,37,4,5)
 hasLocation(#20111,#20112)
-stmt_containers(#20111,#20092)
+stmt_containers(#20111,#20093)
 #20113=*
-exprs(#20113,13,#20111,0,"call()")
-#20114=@"loc,{#10000},3,9,3,14"
-locations_default(#20114,#10000,3,9,3,14)
+stmts(#20113,2,#20111,0,"call();")
+#20114=@"loc,{#10000},3,9,3,15"
+locations_default(#20114,#10000,3,9,3,15)
 hasLocation(#20113,#20114)
-enclosing_stmt(#20113,#20111)
-expr_containers(#20113,#20092)
+stmt_containers(#20113,#20093)
 #20115=*
-exprs(#20115,79,#20113,-1,"call")
-hasLocation(#20115,#20051)
-enclosing_stmt(#20115,#20111)
-expr_containers(#20115,#20092)
-literals("call","call",#20115)
-bind(#20115,#20104)
-is_for_await_of(#20099)
-#20116=*
-stmts(#20116,21,#20001,1,"for awa ... ll();\n}")
-#20117=@"loc,{#10000},7,1,9,1"
-locations_default(#20117,#10000,7,1,9,1)
-hasLocation(#20116,#20117)
-stmt_containers(#20116,#20001)
+exprs(#20115,13,#20113,0,"call()")
+#20116=@"loc,{#10000},3,9,3,14"
+locations_default(#20116,#10000,3,9,3,14)
+hasLocation(#20115,#20116)
+enclosing_stmt(#20115,#20113)
+expr_containers(#20115,#20093)
+#20117=*
+exprs(#20117,79,#20115,-1,"call")
+hasLocation(#20117,#20051)
+enclosing_stmt(#20117,#20113)
+expr_containers(#20117,#20093)
+literals("call","call",#20117)
+bind(#20117,#20106)
+is_for_await_of(#20101)
 #20118=*
-exprs(#20118,79,#20116,1,"calls")
-hasLocation(#20118,#20074)
-enclosing_stmt(#20118,#20116)
-expr_containers(#20118,#20001)
-literals("calls","calls",#20118)
-bind(#20118,#20102)
-#20119=*
-scopes(#20119,6)
-scopenodes(#20116,#20119)
-scopenesting(#20119,#20000)
-#20120=@"var;{call};{#20119}"
-variables(#20120,"call",#20119)
+stmts(#20118,21,#20001,1,"for awa ... ll();\n}")
+#20119=@"loc,{#10000},7,1,9,1"
+locations_default(#20119,#10000,7,1,9,1)
+hasLocation(#20118,#20119)
+stmt_containers(#20118,#20001)
+#20120=*
+exprs(#20120,79,#20118,1,"calls")
+hasLocation(#20120,#20074)
+enclosing_stmt(#20120,#20118)
+expr_containers(#20120,#20001)
+literals("calls","calls",#20120)
+bind(#20120,#20104)
 #20121=*
-stmts(#20121,22,#20116,0,"const call")
-#20122=@"loc,{#10000},7,12,7,21"
-locations_default(#20122,#10000,7,12,7,21)
-hasLocation(#20121,#20122)
-stmt_containers(#20121,#20001)
+scopes(#20121,6)
+scopenodes(#20118,#20121)
+scopenesting(#20121,#20000)
+#20122=@"var;{call};{#20121}"
+variables(#20122,"call",#20121)
 #20123=*
-exprs(#20123,64,#20121,0,"call")
-hasLocation(#20123,#20070)
-enclosing_stmt(#20123,#20121)
-expr_containers(#20123,#20001)
-#20124=*
-exprs(#20124,78,#20123,0,"call")
-hasLocation(#20124,#20070)
-enclosing_stmt(#20124,#20121)
-expr_containers(#20124,#20001)
-literals("call","call",#20124)
-decl(#20124,#20120)
+stmts(#20123,22,#20118,0,"const call")
+#20124=@"loc,{#10000},7,12,7,21"
+locations_default(#20124,#10000,7,12,7,21)
+hasLocation(#20123,#20124)
+stmt_containers(#20123,#20001)
 #20125=*
-stmts(#20125,1,#20116,2,"{\n    call();\n}")
-#20126=@"loc,{#10000},7,33,9,1"
-locations_default(#20126,#10000,7,33,9,1)
-hasLocation(#20125,#20126)
-stmt_containers(#20125,#20001)
+exprs(#20125,64,#20123,0,"call")
+hasLocation(#20125,#20070)
+enclosing_stmt(#20125,#20123)
+expr_containers(#20125,#20001)
+#20126=*
+exprs(#20126,78,#20125,0,"call")
+hasLocation(#20126,#20070)
+enclosing_stmt(#20126,#20123)
+expr_containers(#20126,#20001)
+literals("call","call",#20126)
+decl(#20126,#20122)
 #20127=*
-stmts(#20127,2,#20125,0,"call();")
-#20128=@"loc,{#10000},8,5,8,11"
-locations_default(#20128,#10000,8,5,8,11)
+stmts(#20127,1,#20118,2,"{\n    call();\n}")
+#20128=@"loc,{#10000},7,33,9,1"
+locations_default(#20128,#10000,7,33,9,1)
 hasLocation(#20127,#20128)
 stmt_containers(#20127,#20001)
 #20129=*
-exprs(#20129,13,#20127,0,"call()")
-#20130=@"loc,{#10000},8,5,8,10"
-locations_default(#20130,#10000,8,5,8,10)
+stmts(#20129,2,#20127,0,"call();")
+#20130=@"loc,{#10000},8,5,8,11"
+locations_default(#20130,#10000,8,5,8,11)
 hasLocation(#20129,#20130)
-enclosing_stmt(#20129,#20127)
-expr_containers(#20129,#20001)
+stmt_containers(#20129,#20001)
 #20131=*
-exprs(#20131,79,#20129,-1,"call")
-hasLocation(#20131,#20080)
-enclosing_stmt(#20131,#20127)
+exprs(#20131,13,#20129,0,"call()")
+#20132=@"loc,{#10000},8,5,8,10"
+locations_default(#20132,#10000,8,5,8,10)
+hasLocation(#20131,#20132)
+enclosing_stmt(#20131,#20129)
 expr_containers(#20131,#20001)
-literals("call","call",#20131)
-bind(#20131,#20120)
-is_for_await_of(#20116)
-#20132=*
-entry_cfg_node(#20132,#20001)
-#20133=@"loc,{#10000},1,1,1,0"
-locations_default(#20133,#10000,1,1,1,0)
-hasLocation(#20132,#20133)
+#20133=*
+exprs(#20133,79,#20131,-1,"call")
+hasLocation(#20133,#20080)
+enclosing_stmt(#20133,#20129)
+expr_containers(#20133,#20001)
+literals("call","call",#20133)
+bind(#20133,#20122)
+is_for_await_of(#20118)
 #20134=*
-exit_cfg_node(#20134,#20001)
-hasLocation(#20134,#20089)
-successor(#20118,#20116)
-successor(#20116,#20121)
-successor(#20116,#20134)
-successor(#20127,#20131)
-successor(#20131,#20129)
-successor(#20129,#20116)
-successor(#20125,#20127)
-successor(#20121,#20124)
-successor(#20124,#20123)
-successor(#20123,#20125)
-successor(#20092,#20118)
-#20135=*
-entry_cfg_node(#20135,#20092)
-hasLocation(#20135,#20133)
+entry_cfg_node(#20134,#20001)
+#20135=@"loc,{#10000},1,1,1,0"
+locations_default(#20135,#10000,1,1,1,0)
+hasLocation(#20134,#20135)
 #20136=*
-exit_cfg_node(#20136,#20092)
-#20137=@"loc,{#10000},5,2,5,1"
-locations_default(#20137,#10000,5,2,5,1)
-hasLocation(#20136,#20137)
-successor(#20101,#20099)
-successor(#20099,#20105)
-successor(#20099,#20136)
-successor(#20111,#20115)
-successor(#20115,#20113)
-successor(#20113,#20099)
+exit_cfg_node(#20136,#20001)
+hasLocation(#20136,#20089)
+successor(#20120,#20118)
+successor(#20118,#20123)
+successor(#20118,#20136)
+successor(#20129,#20133)
+successor(#20133,#20131)
+successor(#20131,#20118)
+successor(#20127,#20129)
+successor(#20123,#20126)
+successor(#20126,#20125)
+successor(#20125,#20127)
+successor(#20093,#20120)
+#20137=*
+entry_cfg_node(#20137,#20093)
+hasLocation(#20137,#20135)
+#20138=*
+exit_cfg_node(#20138,#20093)
+#20139=@"loc,{#10000},5,2,5,1"
+locations_default(#20139,#10000,5,2,5,1)
+hasLocation(#20138,#20139)
+successor(#20103,#20101)
+successor(#20101,#20107)
+successor(#20101,#20138)
+successor(#20113,#20117)
+successor(#20117,#20115)
+successor(#20115,#20101)
+successor(#20111,#20113)
+successor(#20107,#20110)
+successor(#20110,#20109)
 successor(#20109,#20111)
-successor(#20105,#20108)
-successor(#20108,#20107)
-successor(#20107,#20109)
-successor(#20097,#20101)
-successor(#20135,#20097)
-successor(#20094,#20092)
-successor(#20132,#20094)
+successor(#20099,#20103)
+successor(#20137,#20099)
+successor(#20095,#20093)
+successor(#20134,#20095)
 numlines(#10000,9,8,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/esnext/output/trap/import-attributes.js.trap b/javascript/extractor/tests/esnext/output/trap/import-attributes.js.trap
index 57d48206e41..c5634ed3af8 100644
--- a/javascript/extractor/tests/esnext/output/trap/import-attributes.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/import-attributes.js.trap
@@ -1275,1215 +1275,1217 @@ local_type_names(#20489,"v3",#20483)
 local_namespace_names(#20490,"v1",#20483)
 local_namespace_names(#20491,"v2",#20483)
 local_namespace_names(#20492,"v3",#20483)
-#20494=*
-stmts(#20494,27,#20001,0,"import  ... son"" };")
-hasLocation(#20494,#20007)
-stmt_containers(#20494,#20001)
+#20494=@"var;{this};{#20483}"
+variables(#20494,"this",#20483)
 #20495=*
-exprs(#20495,4,#20494,-1,"""module""")
-hasLocation(#20495,#20057)
-enclosing_stmt(#20495,#20494)
-expr_containers(#20495,#20001)
-literals("module","""module""",#20495)
+stmts(#20495,27,#20001,0,"import  ... son"" };")
+hasLocation(#20495,#20007)
+stmt_containers(#20495,#20001)
 #20496=*
-regexpterm(#20496,14,#20495,0,"module")
-#20497=@"loc,{#10000},1,9,1,14"
-locations_default(#20497,#10000,1,9,1,14)
-hasLocation(#20496,#20497)
-regexp_const_value(#20496,"module")
-#20498=*
-exprs(#20498,8,#20494,-10,"{ type: ""json"" }")
-#20499=@"loc,{#10000},1,22,1,37"
-locations_default(#20499,#10000,1,22,1,37)
-hasLocation(#20498,#20499)
-enclosing_stmt(#20498,#20494)
-expr_containers(#20498,#20001)
-#20500=*
-properties(#20500,#20498,0,0,"type: ""json""")
-#20501=@"loc,{#10000},1,24,1,35"
-locations_default(#20501,#10000,1,24,1,35)
-hasLocation(#20500,#20501)
-#20502=*
-exprs(#20502,0,#20500,0,"type")
-hasLocation(#20502,#20063)
-enclosing_stmt(#20502,#20494)
-expr_containers(#20502,#20001)
-literals("type","type",#20502)
+exprs(#20496,4,#20495,-1,"""module""")
+hasLocation(#20496,#20057)
+enclosing_stmt(#20496,#20495)
+expr_containers(#20496,#20001)
+literals("module","""module""",#20496)
+#20497=*
+regexpterm(#20497,14,#20496,0,"module")
+#20498=@"loc,{#10000},1,9,1,14"
+locations_default(#20498,#10000,1,9,1,14)
+hasLocation(#20497,#20498)
+regexp_const_value(#20497,"module")
+#20499=*
+exprs(#20499,8,#20495,-10,"{ type: ""json"" }")
+#20500=@"loc,{#10000},1,22,1,37"
+locations_default(#20500,#10000,1,22,1,37)
+hasLocation(#20499,#20500)
+enclosing_stmt(#20499,#20495)
+expr_containers(#20499,#20001)
+#20501=*
+properties(#20501,#20499,0,0,"type: ""json""")
+#20502=@"loc,{#10000},1,24,1,35"
+locations_default(#20502,#10000,1,24,1,35)
+hasLocation(#20501,#20502)
 #20503=*
-exprs(#20503,4,#20500,1,"""json""")
-hasLocation(#20503,#20067)
-enclosing_stmt(#20503,#20494)
+exprs(#20503,0,#20501,0,"type")
+hasLocation(#20503,#20063)
+enclosing_stmt(#20503,#20495)
 expr_containers(#20503,#20001)
-literals("json","""json""",#20503)
+literals("type","type",#20503)
 #20504=*
-regexpterm(#20504,14,#20503,0,"json")
-#20505=@"loc,{#10000},1,31,1,34"
-locations_default(#20505,#10000,1,31,1,34)
-hasLocation(#20504,#20505)
-regexp_const_value(#20504,"json")
-#20506=*
-stmts(#20506,27,#20001,1,"import  ... son"" };")
-hasLocation(#20506,#20009)
-stmt_containers(#20506,#20001)
+exprs(#20504,4,#20501,1,"""json""")
+hasLocation(#20504,#20067)
+enclosing_stmt(#20504,#20495)
+expr_containers(#20504,#20001)
+literals("json","""json""",#20504)
+#20505=*
+regexpterm(#20505,14,#20504,0,"json")
+#20506=@"loc,{#10000},1,31,1,34"
+locations_default(#20506,#10000,1,31,1,34)
+hasLocation(#20505,#20506)
+regexp_const_value(#20505,"json")
 #20507=*
-exprs(#20507,4,#20506,-1,"""module""")
-hasLocation(#20507,#20083)
-enclosing_stmt(#20507,#20506)
-expr_containers(#20507,#20001)
-literals("module","""module""",#20507)
+stmts(#20507,27,#20001,1,"import  ... son"" };")
+hasLocation(#20507,#20009)
+stmt_containers(#20507,#20001)
 #20508=*
-regexpterm(#20508,14,#20507,0,"module")
-#20509=@"loc,{#10000},2,22,2,27"
-locations_default(#20509,#10000,2,22,2,27)
-hasLocation(#20508,#20509)
-regexp_const_value(#20508,"module")
-#20510=*
-exprs(#20510,8,#20506,-10,"{ type: ""json"" }")
-#20511=@"loc,{#10000},2,35,2,50"
-locations_default(#20511,#10000,2,35,2,50)
-hasLocation(#20510,#20511)
-enclosing_stmt(#20510,#20506)
-expr_containers(#20510,#20001)
-#20512=*
-properties(#20512,#20510,0,0,"type: ""json""")
-#20513=@"loc,{#10000},2,37,2,48"
-locations_default(#20513,#10000,2,37,2,48)
-hasLocation(#20512,#20513)
-#20514=*
-exprs(#20514,0,#20512,0,"type")
-hasLocation(#20514,#20089)
-enclosing_stmt(#20514,#20506)
-expr_containers(#20514,#20001)
-literals("type","type",#20514)
+exprs(#20508,4,#20507,-1,"""module""")
+hasLocation(#20508,#20083)
+enclosing_stmt(#20508,#20507)
+expr_containers(#20508,#20001)
+literals("module","""module""",#20508)
+#20509=*
+regexpterm(#20509,14,#20508,0,"module")
+#20510=@"loc,{#10000},2,22,2,27"
+locations_default(#20510,#10000,2,22,2,27)
+hasLocation(#20509,#20510)
+regexp_const_value(#20509,"module")
+#20511=*
+exprs(#20511,8,#20507,-10,"{ type: ""json"" }")
+#20512=@"loc,{#10000},2,35,2,50"
+locations_default(#20512,#10000,2,35,2,50)
+hasLocation(#20511,#20512)
+enclosing_stmt(#20511,#20507)
+expr_containers(#20511,#20001)
+#20513=*
+properties(#20513,#20511,0,0,"type: ""json""")
+#20514=@"loc,{#10000},2,37,2,48"
+locations_default(#20514,#10000,2,37,2,48)
+hasLocation(#20513,#20514)
 #20515=*
-exprs(#20515,4,#20512,1,"""json""")
-hasLocation(#20515,#20093)
-enclosing_stmt(#20515,#20506)
+exprs(#20515,0,#20513,0,"type")
+hasLocation(#20515,#20089)
+enclosing_stmt(#20515,#20507)
 expr_containers(#20515,#20001)
-literals("json","""json""",#20515)
+literals("type","type",#20515)
 #20516=*
-regexpterm(#20516,14,#20515,0,"json")
-#20517=@"loc,{#10000},2,44,2,47"
-locations_default(#20517,#10000,2,44,2,47)
-hasLocation(#20516,#20517)
-regexp_const_value(#20516,"json")
-#20518=*
-exprs(#20518,85,#20506,0,"* as v1")
-#20519=@"loc,{#10000},2,8,2,14"
-locations_default(#20519,#10000,2,8,2,14)
-hasLocation(#20518,#20519)
-enclosing_stmt(#20518,#20506)
-expr_containers(#20518,#20001)
-#20520=*
-exprs(#20520,78,#20518,1,"v1")
-hasLocation(#20520,#20079)
-enclosing_stmt(#20520,#20506)
-expr_containers(#20520,#20001)
-literals("v1","v1",#20520)
-decl(#20520,#20484)
-typedecl(#20520,#20487)
-namespacedecl(#20520,#20490)
+exprs(#20516,4,#20513,1,"""json""")
+hasLocation(#20516,#20093)
+enclosing_stmt(#20516,#20507)
+expr_containers(#20516,#20001)
+literals("json","""json""",#20516)
+#20517=*
+regexpterm(#20517,14,#20516,0,"json")
+#20518=@"loc,{#10000},2,44,2,47"
+locations_default(#20518,#10000,2,44,2,47)
+hasLocation(#20517,#20518)
+regexp_const_value(#20517,"json")
+#20519=*
+exprs(#20519,85,#20507,0,"* as v1")
+#20520=@"loc,{#10000},2,8,2,14"
+locations_default(#20520,#10000,2,8,2,14)
+hasLocation(#20519,#20520)
+enclosing_stmt(#20519,#20507)
+expr_containers(#20519,#20001)
 #20521=*
-stmts(#20521,27,#20001,2,"import  ... son"" };")
-hasLocation(#20521,#20011)
-stmt_containers(#20521,#20001)
+exprs(#20521,78,#20519,1,"v1")
+hasLocation(#20521,#20079)
+enclosing_stmt(#20521,#20507)
+expr_containers(#20521,#20001)
+literals("v1","v1",#20521)
+decl(#20521,#20484)
+typedecl(#20521,#20487)
+namespacedecl(#20521,#20490)
 #20522=*
-exprs(#20522,4,#20521,-1,"""module""")
-hasLocation(#20522,#20109)
-enclosing_stmt(#20522,#20521)
-expr_containers(#20522,#20001)
-literals("module","""module""",#20522)
+stmts(#20522,27,#20001,2,"import  ... son"" };")
+hasLocation(#20522,#20011)
+stmt_containers(#20522,#20001)
 #20523=*
-regexpterm(#20523,14,#20522,0,"module")
-#20524=@"loc,{#10000},3,21,3,26"
-locations_default(#20524,#10000,3,21,3,26)
-hasLocation(#20523,#20524)
-regexp_const_value(#20523,"module")
-#20525=*
-exprs(#20525,8,#20521,-10,"{ type: ""json"" }")
-#20526=@"loc,{#10000},3,34,3,49"
-locations_default(#20526,#10000,3,34,3,49)
-hasLocation(#20525,#20526)
-enclosing_stmt(#20525,#20521)
-expr_containers(#20525,#20001)
-#20527=*
-properties(#20527,#20525,0,0,"type: ""json""")
-#20528=@"loc,{#10000},3,36,3,47"
-locations_default(#20528,#10000,3,36,3,47)
-hasLocation(#20527,#20528)
-#20529=*
-exprs(#20529,0,#20527,0,"type")
-hasLocation(#20529,#20115)
-enclosing_stmt(#20529,#20521)
-expr_containers(#20529,#20001)
-literals("type","type",#20529)
+exprs(#20523,4,#20522,-1,"""module""")
+hasLocation(#20523,#20109)
+enclosing_stmt(#20523,#20522)
+expr_containers(#20523,#20001)
+literals("module","""module""",#20523)
+#20524=*
+regexpterm(#20524,14,#20523,0,"module")
+#20525=@"loc,{#10000},3,21,3,26"
+locations_default(#20525,#10000,3,21,3,26)
+hasLocation(#20524,#20525)
+regexp_const_value(#20524,"module")
+#20526=*
+exprs(#20526,8,#20522,-10,"{ type: ""json"" }")
+#20527=@"loc,{#10000},3,34,3,49"
+locations_default(#20527,#10000,3,34,3,49)
+hasLocation(#20526,#20527)
+enclosing_stmt(#20526,#20522)
+expr_containers(#20526,#20001)
+#20528=*
+properties(#20528,#20526,0,0,"type: ""json""")
+#20529=@"loc,{#10000},3,36,3,47"
+locations_default(#20529,#10000,3,36,3,47)
+hasLocation(#20528,#20529)
 #20530=*
-exprs(#20530,4,#20527,1,"""json""")
-hasLocation(#20530,#20119)
-enclosing_stmt(#20530,#20521)
+exprs(#20530,0,#20528,0,"type")
+hasLocation(#20530,#20115)
+enclosing_stmt(#20530,#20522)
 expr_containers(#20530,#20001)
-literals("json","""json""",#20530)
+literals("type","type",#20530)
 #20531=*
-regexpterm(#20531,14,#20530,0,"json")
-#20532=@"loc,{#10000},3,43,3,46"
-locations_default(#20532,#10000,3,43,3,46)
-hasLocation(#20531,#20532)
-regexp_const_value(#20531,"json")
-#20533=*
-exprs(#20533,83,#20521,0,"v2")
-hasLocation(#20533,#20103)
-enclosing_stmt(#20533,#20521)
-expr_containers(#20533,#20001)
+exprs(#20531,4,#20528,1,"""json""")
+hasLocation(#20531,#20119)
+enclosing_stmt(#20531,#20522)
+expr_containers(#20531,#20001)
+literals("json","""json""",#20531)
+#20532=*
+regexpterm(#20532,14,#20531,0,"json")
+#20533=@"loc,{#10000},3,43,3,46"
+locations_default(#20533,#10000,3,43,3,46)
+hasLocation(#20532,#20533)
+regexp_const_value(#20532,"json")
 #20534=*
-exprs(#20534,0,#20533,0,"v2")
+exprs(#20534,83,#20522,0,"v2")
 hasLocation(#20534,#20103)
-enclosing_stmt(#20534,#20521)
+enclosing_stmt(#20534,#20522)
 expr_containers(#20534,#20001)
-literals("v2","v2",#20534)
 #20535=*
-exprs(#20535,78,#20533,1,"v2")
+exprs(#20535,0,#20534,0,"v2")
 hasLocation(#20535,#20103)
-enclosing_stmt(#20535,#20521)
+enclosing_stmt(#20535,#20522)
 expr_containers(#20535,#20001)
 literals("v2","v2",#20535)
-decl(#20535,#20485)
-typedecl(#20535,#20488)
-namespacedecl(#20535,#20491)
 #20536=*
-stmts(#20536,27,#20001,3,"import  ... son"" };")
-hasLocation(#20536,#20013)
-stmt_containers(#20536,#20001)
+exprs(#20536,78,#20534,1,"v2")
+hasLocation(#20536,#20103)
+enclosing_stmt(#20536,#20522)
+expr_containers(#20536,#20001)
+literals("v2","v2",#20536)
+decl(#20536,#20485)
+typedecl(#20536,#20488)
+namespacedecl(#20536,#20491)
 #20537=*
-exprs(#20537,4,#20536,-1,"""module""")
-hasLocation(#20537,#20131)
-enclosing_stmt(#20537,#20536)
-expr_containers(#20537,#20001)
-literals("module","""module""",#20537)
+stmts(#20537,27,#20001,3,"import  ... son"" };")
+hasLocation(#20537,#20013)
+stmt_containers(#20537,#20001)
 #20538=*
-regexpterm(#20538,14,#20537,0,"module")
-#20539=@"loc,{#10000},4,17,4,22"
-locations_default(#20539,#10000,4,17,4,22)
-hasLocation(#20538,#20539)
-regexp_const_value(#20538,"module")
-#20540=*
-exprs(#20540,8,#20536,-10,"{ type: ""json"" }")
-#20541=@"loc,{#10000},4,30,4,45"
-locations_default(#20541,#10000,4,30,4,45)
-hasLocation(#20540,#20541)
-enclosing_stmt(#20540,#20536)
-expr_containers(#20540,#20001)
-#20542=*
-properties(#20542,#20540,0,0,"type: ""json""")
-#20543=@"loc,{#10000},4,32,4,43"
-locations_default(#20543,#10000,4,32,4,43)
-hasLocation(#20542,#20543)
-#20544=*
-exprs(#20544,0,#20542,0,"type")
-hasLocation(#20544,#20137)
-enclosing_stmt(#20544,#20536)
-expr_containers(#20544,#20001)
-literals("type","type",#20544)
+exprs(#20538,4,#20537,-1,"""module""")
+hasLocation(#20538,#20131)
+enclosing_stmt(#20538,#20537)
+expr_containers(#20538,#20001)
+literals("module","""module""",#20538)
+#20539=*
+regexpterm(#20539,14,#20538,0,"module")
+#20540=@"loc,{#10000},4,17,4,22"
+locations_default(#20540,#10000,4,17,4,22)
+hasLocation(#20539,#20540)
+regexp_const_value(#20539,"module")
+#20541=*
+exprs(#20541,8,#20537,-10,"{ type: ""json"" }")
+#20542=@"loc,{#10000},4,30,4,45"
+locations_default(#20542,#10000,4,30,4,45)
+hasLocation(#20541,#20542)
+enclosing_stmt(#20541,#20537)
+expr_containers(#20541,#20001)
+#20543=*
+properties(#20543,#20541,0,0,"type: ""json""")
+#20544=@"loc,{#10000},4,32,4,43"
+locations_default(#20544,#10000,4,32,4,43)
+hasLocation(#20543,#20544)
 #20545=*
-exprs(#20545,4,#20542,1,"""json""")
-hasLocation(#20545,#20141)
-enclosing_stmt(#20545,#20536)
+exprs(#20545,0,#20543,0,"type")
+hasLocation(#20545,#20137)
+enclosing_stmt(#20545,#20537)
 expr_containers(#20545,#20001)
-literals("json","""json""",#20545)
+literals("type","type",#20545)
 #20546=*
-regexpterm(#20546,14,#20545,0,"json")
-#20547=@"loc,{#10000},4,39,4,42"
-locations_default(#20547,#10000,4,39,4,42)
-hasLocation(#20546,#20547)
-regexp_const_value(#20546,"json")
-#20548=*
-exprs(#20548,84,#20536,0,"v3")
-hasLocation(#20548,#20127)
-enclosing_stmt(#20548,#20536)
-expr_containers(#20548,#20001)
+exprs(#20546,4,#20543,1,"""json""")
+hasLocation(#20546,#20141)
+enclosing_stmt(#20546,#20537)
+expr_containers(#20546,#20001)
+literals("json","""json""",#20546)
+#20547=*
+regexpterm(#20547,14,#20546,0,"json")
+#20548=@"loc,{#10000},4,39,4,42"
+locations_default(#20548,#10000,4,39,4,42)
+hasLocation(#20547,#20548)
+regexp_const_value(#20547,"json")
 #20549=*
-exprs(#20549,78,#20548,1,"v3")
+exprs(#20549,84,#20537,0,"v3")
 hasLocation(#20549,#20127)
-enclosing_stmt(#20549,#20536)
+enclosing_stmt(#20549,#20537)
 expr_containers(#20549,#20001)
-literals("v3","v3",#20549)
-decl(#20549,#20486)
-typedecl(#20549,#20489)
-namespacedecl(#20549,#20492)
 #20550=*
-stmts(#20550,30,#20001,4,"export  ... son"" };")
-hasLocation(#20550,#20017)
-stmt_containers(#20550,#20001)
+exprs(#20550,78,#20549,1,"v3")
+hasLocation(#20550,#20127)
+enclosing_stmt(#20550,#20537)
+expr_containers(#20550,#20001)
+literals("v3","v3",#20550)
+decl(#20550,#20486)
+typedecl(#20550,#20489)
+namespacedecl(#20550,#20492)
 #20551=*
-exprs(#20551,4,#20550,-2,"""module""")
-hasLocation(#20551,#20157)
-enclosing_stmt(#20551,#20550)
-expr_containers(#20551,#20001)
-literals("module","""module""",#20551)
+stmts(#20551,30,#20001,4,"export  ... son"" };")
+hasLocation(#20551,#20017)
+stmt_containers(#20551,#20001)
 #20552=*
-regexpterm(#20552,14,#20551,0,"module")
-#20553=@"loc,{#10000},6,21,6,26"
-locations_default(#20553,#10000,6,21,6,26)
-hasLocation(#20552,#20553)
-regexp_const_value(#20552,"module")
-#20554=*
-exprs(#20554,8,#20550,-10,"{ type: ""json"" }")
-#20555=@"loc,{#10000},6,34,6,49"
-locations_default(#20555,#10000,6,34,6,49)
-hasLocation(#20554,#20555)
-enclosing_stmt(#20554,#20550)
-expr_containers(#20554,#20001)
-#20556=*
-properties(#20556,#20554,0,0,"type: ""json""")
-#20557=@"loc,{#10000},6,36,6,47"
-locations_default(#20557,#10000,6,36,6,47)
-hasLocation(#20556,#20557)
-#20558=*
-exprs(#20558,0,#20556,0,"type")
-hasLocation(#20558,#20163)
-enclosing_stmt(#20558,#20550)
-expr_containers(#20558,#20001)
-literals("type","type",#20558)
+exprs(#20552,4,#20551,-2,"""module""")
+hasLocation(#20552,#20157)
+enclosing_stmt(#20552,#20551)
+expr_containers(#20552,#20001)
+literals("module","""module""",#20552)
+#20553=*
+regexpterm(#20553,14,#20552,0,"module")
+#20554=@"loc,{#10000},6,21,6,26"
+locations_default(#20554,#10000,6,21,6,26)
+hasLocation(#20553,#20554)
+regexp_const_value(#20553,"module")
+#20555=*
+exprs(#20555,8,#20551,-10,"{ type: ""json"" }")
+#20556=@"loc,{#10000},6,34,6,49"
+locations_default(#20556,#10000,6,34,6,49)
+hasLocation(#20555,#20556)
+enclosing_stmt(#20555,#20551)
+expr_containers(#20555,#20001)
+#20557=*
+properties(#20557,#20555,0,0,"type: ""json""")
+#20558=@"loc,{#10000},6,36,6,47"
+locations_default(#20558,#10000,6,36,6,47)
+hasLocation(#20557,#20558)
 #20559=*
-exprs(#20559,4,#20556,1,"""json""")
-hasLocation(#20559,#20167)
-enclosing_stmt(#20559,#20550)
+exprs(#20559,0,#20557,0,"type")
+hasLocation(#20559,#20163)
+enclosing_stmt(#20559,#20551)
 expr_containers(#20559,#20001)
-literals("json","""json""",#20559)
+literals("type","type",#20559)
 #20560=*
-regexpterm(#20560,14,#20559,0,"json")
-#20561=@"loc,{#10000},6,43,6,46"
-locations_default(#20561,#10000,6,43,6,46)
-hasLocation(#20560,#20561)
-regexp_const_value(#20560,"json")
-#20562=*
-exprs(#20562,86,#20550,0,"v4")
-hasLocation(#20562,#20151)
-enclosing_stmt(#20562,#20550)
-expr_containers(#20562,#20001)
+exprs(#20560,4,#20557,1,"""json""")
+hasLocation(#20560,#20167)
+enclosing_stmt(#20560,#20551)
+expr_containers(#20560,#20001)
+literals("json","""json""",#20560)
+#20561=*
+regexpterm(#20561,14,#20560,0,"json")
+#20562=@"loc,{#10000},6,43,6,46"
+locations_default(#20562,#10000,6,43,6,46)
+hasLocation(#20561,#20562)
+regexp_const_value(#20561,"json")
 #20563=*
-exprs(#20563,0,#20562,0,"v4")
+exprs(#20563,86,#20551,0,"v4")
 hasLocation(#20563,#20151)
-enclosing_stmt(#20563,#20550)
+enclosing_stmt(#20563,#20551)
 expr_containers(#20563,#20001)
-literals("v4","v4",#20563)
 #20564=*
-exprs(#20564,0,#20562,1,"v4")
+exprs(#20564,0,#20563,0,"v4")
 hasLocation(#20564,#20151)
-enclosing_stmt(#20564,#20550)
+enclosing_stmt(#20564,#20551)
 expr_containers(#20564,#20001)
 literals("v4","v4",#20564)
 #20565=*
-stmts(#20565,28,#20001,5,"export  ... son"" };")
-hasLocation(#20565,#20019)
-stmt_containers(#20565,#20001)
+exprs(#20565,0,#20563,1,"v4")
+hasLocation(#20565,#20151)
+enclosing_stmt(#20565,#20551)
+expr_containers(#20565,#20001)
+literals("v4","v4",#20565)
 #20566=*
-exprs(#20566,4,#20565,0,"""module""")
-hasLocation(#20566,#20179)
-enclosing_stmt(#20566,#20565)
-expr_containers(#20566,#20001)
-literals("module","""module""",#20566)
+stmts(#20566,28,#20001,5,"export  ... son"" };")
+hasLocation(#20566,#20019)
+stmt_containers(#20566,#20001)
 #20567=*
-regexpterm(#20567,14,#20566,0,"module")
-#20568=@"loc,{#10000},7,16,7,21"
-locations_default(#20568,#10000,7,16,7,21)
-hasLocation(#20567,#20568)
-regexp_const_value(#20567,"module")
-#20569=*
-exprs(#20569,8,#20565,-10,"{ type: ""json"" }")
-#20570=@"loc,{#10000},7,29,7,44"
-locations_default(#20570,#10000,7,29,7,44)
-hasLocation(#20569,#20570)
-enclosing_stmt(#20569,#20565)
-expr_containers(#20569,#20001)
-#20571=*
-properties(#20571,#20569,0,0,"type: ""json""")
-#20572=@"loc,{#10000},7,31,7,42"
-locations_default(#20572,#10000,7,31,7,42)
-hasLocation(#20571,#20572)
-#20573=*
-exprs(#20573,0,#20571,0,"type")
-hasLocation(#20573,#20185)
-enclosing_stmt(#20573,#20565)
-expr_containers(#20573,#20001)
-literals("type","type",#20573)
+exprs(#20567,4,#20566,0,"""module""")
+hasLocation(#20567,#20179)
+enclosing_stmt(#20567,#20566)
+expr_containers(#20567,#20001)
+literals("module","""module""",#20567)
+#20568=*
+regexpterm(#20568,14,#20567,0,"module")
+#20569=@"loc,{#10000},7,16,7,21"
+locations_default(#20569,#10000,7,16,7,21)
+hasLocation(#20568,#20569)
+regexp_const_value(#20568,"module")
+#20570=*
+exprs(#20570,8,#20566,-10,"{ type: ""json"" }")
+#20571=@"loc,{#10000},7,29,7,44"
+locations_default(#20571,#10000,7,29,7,44)
+hasLocation(#20570,#20571)
+enclosing_stmt(#20570,#20566)
+expr_containers(#20570,#20001)
+#20572=*
+properties(#20572,#20570,0,0,"type: ""json""")
+#20573=@"loc,{#10000},7,31,7,42"
+locations_default(#20573,#10000,7,31,7,42)
+hasLocation(#20572,#20573)
 #20574=*
-exprs(#20574,4,#20571,1,"""json""")
-hasLocation(#20574,#20189)
-enclosing_stmt(#20574,#20565)
+exprs(#20574,0,#20572,0,"type")
+hasLocation(#20574,#20185)
+enclosing_stmt(#20574,#20566)
 expr_containers(#20574,#20001)
-literals("json","""json""",#20574)
+literals("type","type",#20574)
 #20575=*
-regexpterm(#20575,14,#20574,0,"json")
-#20576=@"loc,{#10000},7,38,7,41"
-locations_default(#20576,#10000,7,38,7,41)
-hasLocation(#20575,#20576)
-regexp_const_value(#20575,"json")
-#20577=*
-stmts(#20577,30,#20001,6,"export  ... son"" };")
-hasLocation(#20577,#20021)
-stmt_containers(#20577,#20001)
+exprs(#20575,4,#20572,1,"""json""")
+hasLocation(#20575,#20189)
+enclosing_stmt(#20575,#20566)
+expr_containers(#20575,#20001)
+literals("json","""json""",#20575)
+#20576=*
+regexpterm(#20576,14,#20575,0,"json")
+#20577=@"loc,{#10000},7,38,7,41"
+locations_default(#20577,#10000,7,38,7,41)
+hasLocation(#20576,#20577)
+regexp_const_value(#20576,"json")
 #20578=*
-exprs(#20578,4,#20577,-2,"""module""")
-hasLocation(#20578,#20205)
-enclosing_stmt(#20578,#20577)
-expr_containers(#20578,#20001)
-literals("module","""module""",#20578)
+stmts(#20578,30,#20001,6,"export  ... son"" };")
+hasLocation(#20578,#20021)
+stmt_containers(#20578,#20001)
 #20579=*
-regexpterm(#20579,14,#20578,0,"module")
-#20580=@"loc,{#10000},8,22,8,27"
-locations_default(#20580,#10000,8,22,8,27)
-hasLocation(#20579,#20580)
-regexp_const_value(#20579,"module")
-#20581=*
-exprs(#20581,8,#20577,-10,"{ type: ""json"" }")
-#20582=@"loc,{#10000},8,35,8,50"
-locations_default(#20582,#10000,8,35,8,50)
-hasLocation(#20581,#20582)
-enclosing_stmt(#20581,#20577)
-expr_containers(#20581,#20001)
-#20583=*
-properties(#20583,#20581,0,0,"type: ""json""")
-#20584=@"loc,{#10000},8,37,8,48"
-locations_default(#20584,#10000,8,37,8,48)
-hasLocation(#20583,#20584)
-#20585=*
-exprs(#20585,0,#20583,0,"type")
-hasLocation(#20585,#20211)
-enclosing_stmt(#20585,#20577)
-expr_containers(#20585,#20001)
-literals("type","type",#20585)
+exprs(#20579,4,#20578,-2,"""module""")
+hasLocation(#20579,#20205)
+enclosing_stmt(#20579,#20578)
+expr_containers(#20579,#20001)
+literals("module","""module""",#20579)
+#20580=*
+regexpterm(#20580,14,#20579,0,"module")
+#20581=@"loc,{#10000},8,22,8,27"
+locations_default(#20581,#10000,8,22,8,27)
+hasLocation(#20580,#20581)
+regexp_const_value(#20580,"module")
+#20582=*
+exprs(#20582,8,#20578,-10,"{ type: ""json"" }")
+#20583=@"loc,{#10000},8,35,8,50"
+locations_default(#20583,#10000,8,35,8,50)
+hasLocation(#20582,#20583)
+enclosing_stmt(#20582,#20578)
+expr_containers(#20582,#20001)
+#20584=*
+properties(#20584,#20582,0,0,"type: ""json""")
+#20585=@"loc,{#10000},8,37,8,48"
+locations_default(#20585,#10000,8,37,8,48)
+hasLocation(#20584,#20585)
 #20586=*
-exprs(#20586,4,#20583,1,"""json""")
-hasLocation(#20586,#20215)
-enclosing_stmt(#20586,#20577)
+exprs(#20586,0,#20584,0,"type")
+hasLocation(#20586,#20211)
+enclosing_stmt(#20586,#20578)
 expr_containers(#20586,#20001)
-literals("json","""json""",#20586)
+literals("type","type",#20586)
 #20587=*
-regexpterm(#20587,14,#20586,0,"json")
-#20588=@"loc,{#10000},8,44,8,47"
-locations_default(#20588,#10000,8,44,8,47)
-hasLocation(#20587,#20588)
-regexp_const_value(#20587,"json")
-#20589=*
-exprs(#20589,96,#20577,0,"* as v5")
-#20590=@"loc,{#10000},8,8,8,14"
-locations_default(#20590,#10000,8,8,8,14)
-hasLocation(#20589,#20590)
-enclosing_stmt(#20589,#20577)
-expr_containers(#20589,#20001)
-#20591=*
-exprs(#20591,0,#20589,1,"v5")
-hasLocation(#20591,#20201)
-enclosing_stmt(#20591,#20577)
-expr_containers(#20591,#20001)
-literals("v5","v5",#20591)
+exprs(#20587,4,#20584,1,"""json""")
+hasLocation(#20587,#20215)
+enclosing_stmt(#20587,#20578)
+expr_containers(#20587,#20001)
+literals("json","""json""",#20587)
+#20588=*
+regexpterm(#20588,14,#20587,0,"json")
+#20589=@"loc,{#10000},8,44,8,47"
+locations_default(#20589,#10000,8,44,8,47)
+hasLocation(#20588,#20589)
+regexp_const_value(#20588,"json")
+#20590=*
+exprs(#20590,96,#20578,0,"* as v5")
+#20591=@"loc,{#10000},8,8,8,14"
+locations_default(#20591,#10000,8,8,8,14)
+hasLocation(#20590,#20591)
+enclosing_stmt(#20590,#20578)
+expr_containers(#20590,#20001)
 #20592=*
-stmts(#20592,22,#20001,7,"const v ... "" } });")
-hasLocation(#20592,#20025)
-stmt_containers(#20592,#20001)
+exprs(#20592,0,#20590,1,"v5")
+hasLocation(#20592,#20201)
+enclosing_stmt(#20592,#20578)
+expr_containers(#20592,#20001)
+literals("v5","v5",#20592)
 #20593=*
-exprs(#20593,64,#20592,0,"v6 = im ... n"" } })")
-#20594=@"loc,{#10000},10,7,10,55"
-locations_default(#20594,#10000,10,7,10,55)
-hasLocation(#20593,#20594)
-enclosing_stmt(#20593,#20592)
-expr_containers(#20593,#20001)
-#20595=*
-exprs(#20595,78,#20593,0,"v6")
-hasLocation(#20595,#20223)
-enclosing_stmt(#20595,#20592)
-expr_containers(#20595,#20001)
-literals("v6","v6",#20595)
-decl(#20595,#20493)
+stmts(#20593,22,#20001,7,"const v ... "" } });")
+hasLocation(#20593,#20025)
+stmt_containers(#20593,#20001)
+#20594=*
+exprs(#20594,64,#20593,0,"v6 = im ... n"" } })")
+#20595=@"loc,{#10000},10,7,10,55"
+locations_default(#20595,#10000,10,7,10,55)
+hasLocation(#20594,#20595)
+enclosing_stmt(#20594,#20593)
+expr_containers(#20594,#20001)
 #20596=*
-exprs(#20596,99,#20593,1,"import( ... n"" } })")
-#20597=@"loc,{#10000},10,12,10,55"
-locations_default(#20597,#10000,10,12,10,55)
-hasLocation(#20596,#20597)
-enclosing_stmt(#20596,#20592)
+exprs(#20596,78,#20594,0,"v6")
+hasLocation(#20596,#20223)
+enclosing_stmt(#20596,#20593)
 expr_containers(#20596,#20001)
-#20598=*
-exprs(#20598,4,#20596,0,"""module""")
-hasLocation(#20598,#20231)
-enclosing_stmt(#20598,#20592)
-expr_containers(#20598,#20001)
-literals("module","""module""",#20598)
+literals("v6","v6",#20596)
+decl(#20596,#20493)
+#20597=*
+exprs(#20597,99,#20594,1,"import( ... n"" } })")
+#20598=@"loc,{#10000},10,12,10,55"
+locations_default(#20598,#10000,10,12,10,55)
+hasLocation(#20597,#20598)
+enclosing_stmt(#20597,#20593)
+expr_containers(#20597,#20001)
 #20599=*
-regexpterm(#20599,14,#20598,0,"module")
-#20600=@"loc,{#10000},10,20,10,25"
-locations_default(#20600,#10000,10,20,10,25)
-hasLocation(#20599,#20600)
-regexp_const_value(#20599,"module")
-#20601=*
-exprs(#20601,8,#20596,1,"{ with: ... on"" } }")
-#20602=@"loc,{#10000},10,29,10,54"
-locations_default(#20602,#10000,10,29,10,54)
-hasLocation(#20601,#20602)
-enclosing_stmt(#20601,#20592)
-expr_containers(#20601,#20001)
-#20603=*
-properties(#20603,#20601,0,0,"with: { ... json"" }")
-#20604=@"loc,{#10000},10,31,10,52"
-locations_default(#20604,#10000,10,31,10,52)
-hasLocation(#20603,#20604)
-#20605=*
-exprs(#20605,0,#20603,0,"with")
-hasLocation(#20605,#20237)
-enclosing_stmt(#20605,#20592)
-expr_containers(#20605,#20001)
-literals("with","with",#20605)
+exprs(#20599,4,#20597,0,"""module""")
+hasLocation(#20599,#20231)
+enclosing_stmt(#20599,#20593)
+expr_containers(#20599,#20001)
+literals("module","""module""",#20599)
+#20600=*
+regexpterm(#20600,14,#20599,0,"module")
+#20601=@"loc,{#10000},10,20,10,25"
+locations_default(#20601,#10000,10,20,10,25)
+hasLocation(#20600,#20601)
+regexp_const_value(#20600,"module")
+#20602=*
+exprs(#20602,8,#20597,1,"{ with: ... on"" } }")
+#20603=@"loc,{#10000},10,29,10,54"
+locations_default(#20603,#10000,10,29,10,54)
+hasLocation(#20602,#20603)
+enclosing_stmt(#20602,#20593)
+expr_containers(#20602,#20001)
+#20604=*
+properties(#20604,#20602,0,0,"with: { ... json"" }")
+#20605=@"loc,{#10000},10,31,10,52"
+locations_default(#20605,#10000,10,31,10,52)
+hasLocation(#20604,#20605)
 #20606=*
-exprs(#20606,8,#20603,1,"{ type: ""json"" }")
-#20607=@"loc,{#10000},10,37,10,52"
-locations_default(#20607,#10000,10,37,10,52)
-hasLocation(#20606,#20607)
-enclosing_stmt(#20606,#20592)
+exprs(#20606,0,#20604,0,"with")
+hasLocation(#20606,#20237)
+enclosing_stmt(#20606,#20593)
 expr_containers(#20606,#20001)
-#20608=*
-properties(#20608,#20606,0,0,"type: ""json""")
-#20609=@"loc,{#10000},10,39,10,50"
-locations_default(#20609,#10000,10,39,10,50)
-hasLocation(#20608,#20609)
-#20610=*
-exprs(#20610,0,#20608,0,"type")
-hasLocation(#20610,#20243)
-enclosing_stmt(#20610,#20592)
-expr_containers(#20610,#20001)
-literals("type","type",#20610)
+literals("with","with",#20606)
+#20607=*
+exprs(#20607,8,#20604,1,"{ type: ""json"" }")
+#20608=@"loc,{#10000},10,37,10,52"
+locations_default(#20608,#10000,10,37,10,52)
+hasLocation(#20607,#20608)
+enclosing_stmt(#20607,#20593)
+expr_containers(#20607,#20001)
+#20609=*
+properties(#20609,#20607,0,0,"type: ""json""")
+#20610=@"loc,{#10000},10,39,10,50"
+locations_default(#20610,#10000,10,39,10,50)
+hasLocation(#20609,#20610)
 #20611=*
-exprs(#20611,4,#20608,1,"""json""")
-hasLocation(#20611,#20247)
-enclosing_stmt(#20611,#20592)
+exprs(#20611,0,#20609,0,"type")
+hasLocation(#20611,#20243)
+enclosing_stmt(#20611,#20593)
 expr_containers(#20611,#20001)
-literals("json","""json""",#20611)
+literals("type","type",#20611)
 #20612=*
-regexpterm(#20612,14,#20611,0,"json")
-#20613=@"loc,{#10000},10,46,10,49"
-locations_default(#20613,#10000,10,46,10,49)
-hasLocation(#20612,#20613)
-regexp_const_value(#20612,"json")
-#20614=*
-stmts(#20614,27,#20001,8,"import ""module""")
-#20615=@"loc,{#10000},12,1,12,15"
-locations_default(#20615,#10000,12,1,12,15)
-hasLocation(#20614,#20615)
-stmt_containers(#20614,#20001)
-#20616=*
-exprs(#20616,4,#20614,-1,"""module""")
-hasLocation(#20616,#20259)
-enclosing_stmt(#20616,#20614)
-expr_containers(#20616,#20001)
-literals("module","""module""",#20616)
+exprs(#20612,4,#20609,1,"""json""")
+hasLocation(#20612,#20247)
+enclosing_stmt(#20612,#20593)
+expr_containers(#20612,#20001)
+literals("json","""json""",#20612)
+#20613=*
+regexpterm(#20613,14,#20612,0,"json")
+#20614=@"loc,{#10000},10,46,10,49"
+locations_default(#20614,#10000,10,46,10,49)
+hasLocation(#20613,#20614)
+regexp_const_value(#20613,"json")
+#20615=*
+stmts(#20615,27,#20001,8,"import ""module""")
+#20616=@"loc,{#10000},12,1,12,15"
+locations_default(#20616,#10000,12,1,12,15)
+hasLocation(#20615,#20616)
+stmt_containers(#20615,#20001)
 #20617=*
-regexpterm(#20617,14,#20616,0,"module")
-#20618=@"loc,{#10000},12,9,12,14"
-locations_default(#20618,#10000,12,9,12,14)
-hasLocation(#20617,#20618)
-regexp_const_value(#20617,"module")
-#20619=*
-stmts(#20619,2,#20001,9,"assert( ... son""});")
-#20620=@"loc,{#10000},13,1,13,23"
-locations_default(#20620,#10000,13,1,13,23)
-hasLocation(#20619,#20620)
-stmt_containers(#20619,#20001)
-#20621=*
-exprs(#20621,13,#20619,0,"assert( ... json""})")
-#20622=@"loc,{#10000},13,1,13,22"
-locations_default(#20622,#10000,13,1,13,22)
-hasLocation(#20621,#20622)
-enclosing_stmt(#20621,#20619)
-expr_containers(#20621,#20001)
-#20623=*
-exprs(#20623,79,#20621,-1,"assert")
-hasLocation(#20623,#20261)
-enclosing_stmt(#20623,#20619)
-expr_containers(#20623,#20001)
-literals("assert","assert",#20623)
-#20624=@"var;{assert};{#20000}"
-variables(#20624,"assert",#20000)
-bind(#20623,#20624)
-#20625=*
-exprs(#20625,8,#20621,0,"{type: ""json""}")
-#20626=@"loc,{#10000},13,8,13,21"
-locations_default(#20626,#10000,13,8,13,21)
-hasLocation(#20625,#20626)
-enclosing_stmt(#20625,#20619)
-expr_containers(#20625,#20001)
-#20627=*
-properties(#20627,#20625,0,0,"type: ""json""")
-#20628=@"loc,{#10000},13,9,13,20"
-locations_default(#20628,#10000,13,9,13,20)
-hasLocation(#20627,#20628)
-#20629=*
-exprs(#20629,0,#20627,0,"type")
-hasLocation(#20629,#20267)
-enclosing_stmt(#20629,#20619)
-expr_containers(#20629,#20001)
-literals("type","type",#20629)
+exprs(#20617,4,#20615,-1,"""module""")
+hasLocation(#20617,#20259)
+enclosing_stmt(#20617,#20615)
+expr_containers(#20617,#20001)
+literals("module","""module""",#20617)
+#20618=*
+regexpterm(#20618,14,#20617,0,"module")
+#20619=@"loc,{#10000},12,9,12,14"
+locations_default(#20619,#10000,12,9,12,14)
+hasLocation(#20618,#20619)
+regexp_const_value(#20618,"module")
+#20620=*
+stmts(#20620,2,#20001,9,"assert( ... son""});")
+#20621=@"loc,{#10000},13,1,13,23"
+locations_default(#20621,#10000,13,1,13,23)
+hasLocation(#20620,#20621)
+stmt_containers(#20620,#20001)
+#20622=*
+exprs(#20622,13,#20620,0,"assert( ... json""})")
+#20623=@"loc,{#10000},13,1,13,22"
+locations_default(#20623,#10000,13,1,13,22)
+hasLocation(#20622,#20623)
+enclosing_stmt(#20622,#20620)
+expr_containers(#20622,#20001)
+#20624=*
+exprs(#20624,79,#20622,-1,"assert")
+hasLocation(#20624,#20261)
+enclosing_stmt(#20624,#20620)
+expr_containers(#20624,#20001)
+literals("assert","assert",#20624)
+#20625=@"var;{assert};{#20000}"
+variables(#20625,"assert",#20000)
+bind(#20624,#20625)
+#20626=*
+exprs(#20626,8,#20622,0,"{type: ""json""}")
+#20627=@"loc,{#10000},13,8,13,21"
+locations_default(#20627,#10000,13,8,13,21)
+hasLocation(#20626,#20627)
+enclosing_stmt(#20626,#20620)
+expr_containers(#20626,#20001)
+#20628=*
+properties(#20628,#20626,0,0,"type: ""json""")
+#20629=@"loc,{#10000},13,9,13,20"
+locations_default(#20629,#10000,13,9,13,20)
+hasLocation(#20628,#20629)
 #20630=*
-exprs(#20630,4,#20627,1,"""json""")
-hasLocation(#20630,#20271)
-enclosing_stmt(#20630,#20619)
+exprs(#20630,0,#20628,0,"type")
+hasLocation(#20630,#20267)
+enclosing_stmt(#20630,#20620)
 expr_containers(#20630,#20001)
-literals("json","""json""",#20630)
+literals("type","type",#20630)
 #20631=*
-regexpterm(#20631,14,#20630,0,"json")
-#20632=@"loc,{#10000},13,16,13,19"
-locations_default(#20632,#10000,13,16,13,19)
-hasLocation(#20631,#20632)
-regexp_const_value(#20631,"json")
-#20633=*
-stmts(#20633,27,#20001,10,"import  ... son"" };")
-hasLocation(#20633,#20035)
-stmt_containers(#20633,#20001)
+exprs(#20631,4,#20628,1,"""json""")
+hasLocation(#20631,#20271)
+enclosing_stmt(#20631,#20620)
+expr_containers(#20631,#20001)
+literals("json","""json""",#20631)
+#20632=*
+regexpterm(#20632,14,#20631,0,"json")
+#20633=@"loc,{#10000},13,16,13,19"
+locations_default(#20633,#10000,13,16,13,19)
+hasLocation(#20632,#20633)
+regexp_const_value(#20632,"json")
 #20634=*
-exprs(#20634,4,#20633,-1,"""module""")
-hasLocation(#20634,#20281)
-enclosing_stmt(#20634,#20633)
-expr_containers(#20634,#20001)
-literals("module","""module""",#20634)
+stmts(#20634,27,#20001,10,"import  ... son"" };")
+hasLocation(#20634,#20035)
+stmt_containers(#20634,#20001)
 #20635=*
-regexpterm(#20635,14,#20634,0,"module")
-#20636=@"loc,{#10000},15,9,15,14"
-locations_default(#20636,#10000,15,9,15,14)
-hasLocation(#20635,#20636)
-regexp_const_value(#20635,"module")
-#20637=*
-exprs(#20637,8,#20633,-10,"{ type: ""json"" }")
-#20638=@"loc,{#10000},15,24,15,39"
-locations_default(#20638,#10000,15,24,15,39)
-hasLocation(#20637,#20638)
-enclosing_stmt(#20637,#20633)
-expr_containers(#20637,#20001)
-#20639=*
-properties(#20639,#20637,0,0,"type: ""json""")
-#20640=@"loc,{#10000},15,26,15,37"
-locations_default(#20640,#10000,15,26,15,37)
-hasLocation(#20639,#20640)
-#20641=*
-exprs(#20641,0,#20639,0,"type")
-hasLocation(#20641,#20287)
-enclosing_stmt(#20641,#20633)
-expr_containers(#20641,#20001)
-literals("type","type",#20641)
+exprs(#20635,4,#20634,-1,"""module""")
+hasLocation(#20635,#20281)
+enclosing_stmt(#20635,#20634)
+expr_containers(#20635,#20001)
+literals("module","""module""",#20635)
+#20636=*
+regexpterm(#20636,14,#20635,0,"module")
+#20637=@"loc,{#10000},15,9,15,14"
+locations_default(#20637,#10000,15,9,15,14)
+hasLocation(#20636,#20637)
+regexp_const_value(#20636,"module")
+#20638=*
+exprs(#20638,8,#20634,-10,"{ type: ""json"" }")
+#20639=@"loc,{#10000},15,24,15,39"
+locations_default(#20639,#10000,15,24,15,39)
+hasLocation(#20638,#20639)
+enclosing_stmt(#20638,#20634)
+expr_containers(#20638,#20001)
+#20640=*
+properties(#20640,#20638,0,0,"type: ""json""")
+#20641=@"loc,{#10000},15,26,15,37"
+locations_default(#20641,#10000,15,26,15,37)
+hasLocation(#20640,#20641)
 #20642=*
-exprs(#20642,4,#20639,1,"""json""")
-hasLocation(#20642,#20291)
-enclosing_stmt(#20642,#20633)
+exprs(#20642,0,#20640,0,"type")
+hasLocation(#20642,#20287)
+enclosing_stmt(#20642,#20634)
 expr_containers(#20642,#20001)
-literals("json","""json""",#20642)
+literals("type","type",#20642)
 #20643=*
-regexpterm(#20643,14,#20642,0,"json")
-#20644=@"loc,{#10000},15,33,15,36"
-locations_default(#20644,#10000,15,33,15,36)
-hasLocation(#20643,#20644)
-regexp_const_value(#20643,"json")
-#20645=*
-stmts(#20645,27,#20001,11,"import  ... son"" };")
-hasLocation(#20645,#20037)
-stmt_containers(#20645,#20001)
+exprs(#20643,4,#20640,1,"""json""")
+hasLocation(#20643,#20291)
+enclosing_stmt(#20643,#20634)
+expr_containers(#20643,#20001)
+literals("json","""json""",#20643)
+#20644=*
+regexpterm(#20644,14,#20643,0,"json")
+#20645=@"loc,{#10000},15,33,15,36"
+locations_default(#20645,#10000,15,33,15,36)
+hasLocation(#20644,#20645)
+regexp_const_value(#20644,"json")
 #20646=*
-exprs(#20646,4,#20645,-1,"""module""")
-hasLocation(#20646,#20307)
-enclosing_stmt(#20646,#20645)
-expr_containers(#20646,#20001)
-literals("module","""module""",#20646)
+stmts(#20646,27,#20001,11,"import  ... son"" };")
+hasLocation(#20646,#20037)
+stmt_containers(#20646,#20001)
 #20647=*
-regexpterm(#20647,14,#20646,0,"module")
-#20648=@"loc,{#10000},16,22,16,27"
-locations_default(#20648,#10000,16,22,16,27)
-hasLocation(#20647,#20648)
-regexp_const_value(#20647,"module")
-#20649=*
-exprs(#20649,8,#20645,-10,"{ type: ""json"" }")
-#20650=@"loc,{#10000},16,37,16,52"
-locations_default(#20650,#10000,16,37,16,52)
-hasLocation(#20649,#20650)
-enclosing_stmt(#20649,#20645)
-expr_containers(#20649,#20001)
-#20651=*
-properties(#20651,#20649,0,0,"type: ""json""")
-#20652=@"loc,{#10000},16,39,16,50"
-locations_default(#20652,#10000,16,39,16,50)
-hasLocation(#20651,#20652)
-#20653=*
-exprs(#20653,0,#20651,0,"type")
-hasLocation(#20653,#20313)
-enclosing_stmt(#20653,#20645)
-expr_containers(#20653,#20001)
-literals("type","type",#20653)
+exprs(#20647,4,#20646,-1,"""module""")
+hasLocation(#20647,#20307)
+enclosing_stmt(#20647,#20646)
+expr_containers(#20647,#20001)
+literals("module","""module""",#20647)
+#20648=*
+regexpterm(#20648,14,#20647,0,"module")
+#20649=@"loc,{#10000},16,22,16,27"
+locations_default(#20649,#10000,16,22,16,27)
+hasLocation(#20648,#20649)
+regexp_const_value(#20648,"module")
+#20650=*
+exprs(#20650,8,#20646,-10,"{ type: ""json"" }")
+#20651=@"loc,{#10000},16,37,16,52"
+locations_default(#20651,#10000,16,37,16,52)
+hasLocation(#20650,#20651)
+enclosing_stmt(#20650,#20646)
+expr_containers(#20650,#20001)
+#20652=*
+properties(#20652,#20650,0,0,"type: ""json""")
+#20653=@"loc,{#10000},16,39,16,50"
+locations_default(#20653,#10000,16,39,16,50)
+hasLocation(#20652,#20653)
 #20654=*
-exprs(#20654,4,#20651,1,"""json""")
-hasLocation(#20654,#20317)
-enclosing_stmt(#20654,#20645)
+exprs(#20654,0,#20652,0,"type")
+hasLocation(#20654,#20313)
+enclosing_stmt(#20654,#20646)
 expr_containers(#20654,#20001)
-literals("json","""json""",#20654)
+literals("type","type",#20654)
 #20655=*
-regexpterm(#20655,14,#20654,0,"json")
-#20656=@"loc,{#10000},16,46,16,49"
-locations_default(#20656,#10000,16,46,16,49)
-hasLocation(#20655,#20656)
-regexp_const_value(#20655,"json")
-#20657=*
-exprs(#20657,85,#20645,0,"* as v1")
-#20658=@"loc,{#10000},16,8,16,14"
-locations_default(#20658,#10000,16,8,16,14)
-hasLocation(#20657,#20658)
-enclosing_stmt(#20657,#20645)
-expr_containers(#20657,#20001)
-#20659=*
-exprs(#20659,78,#20657,1,"v1")
-hasLocation(#20659,#20303)
-enclosing_stmt(#20659,#20645)
-expr_containers(#20659,#20001)
-literals("v1","v1",#20659)
-decl(#20659,#20484)
-typedecl(#20659,#20487)
-namespacedecl(#20659,#20490)
+exprs(#20655,4,#20652,1,"""json""")
+hasLocation(#20655,#20317)
+enclosing_stmt(#20655,#20646)
+expr_containers(#20655,#20001)
+literals("json","""json""",#20655)
+#20656=*
+regexpterm(#20656,14,#20655,0,"json")
+#20657=@"loc,{#10000},16,46,16,49"
+locations_default(#20657,#10000,16,46,16,49)
+hasLocation(#20656,#20657)
+regexp_const_value(#20656,"json")
+#20658=*
+exprs(#20658,85,#20646,0,"* as v1")
+#20659=@"loc,{#10000},16,8,16,14"
+locations_default(#20659,#10000,16,8,16,14)
+hasLocation(#20658,#20659)
+enclosing_stmt(#20658,#20646)
+expr_containers(#20658,#20001)
 #20660=*
-stmts(#20660,27,#20001,12,"import  ... son"" };")
-hasLocation(#20660,#20039)
-stmt_containers(#20660,#20001)
+exprs(#20660,78,#20658,1,"v1")
+hasLocation(#20660,#20303)
+enclosing_stmt(#20660,#20646)
+expr_containers(#20660,#20001)
+literals("v1","v1",#20660)
+decl(#20660,#20484)
+typedecl(#20660,#20487)
+namespacedecl(#20660,#20490)
 #20661=*
-exprs(#20661,4,#20660,-1,"""module""")
-hasLocation(#20661,#20333)
-enclosing_stmt(#20661,#20660)
-expr_containers(#20661,#20001)
-literals("module","""module""",#20661)
+stmts(#20661,27,#20001,12,"import  ... son"" };")
+hasLocation(#20661,#20039)
+stmt_containers(#20661,#20001)
 #20662=*
-regexpterm(#20662,14,#20661,0,"module")
-#20663=@"loc,{#10000},17,21,17,26"
-locations_default(#20663,#10000,17,21,17,26)
-hasLocation(#20662,#20663)
-regexp_const_value(#20662,"module")
-#20664=*
-exprs(#20664,8,#20660,-10,"{ type: ""json"" }")
-#20665=@"loc,{#10000},17,36,17,51"
-locations_default(#20665,#10000,17,36,17,51)
-hasLocation(#20664,#20665)
-enclosing_stmt(#20664,#20660)
-expr_containers(#20664,#20001)
-#20666=*
-properties(#20666,#20664,0,0,"type: ""json""")
-#20667=@"loc,{#10000},17,38,17,49"
-locations_default(#20667,#10000,17,38,17,49)
-hasLocation(#20666,#20667)
-#20668=*
-exprs(#20668,0,#20666,0,"type")
-hasLocation(#20668,#20339)
-enclosing_stmt(#20668,#20660)
-expr_containers(#20668,#20001)
-literals("type","type",#20668)
+exprs(#20662,4,#20661,-1,"""module""")
+hasLocation(#20662,#20333)
+enclosing_stmt(#20662,#20661)
+expr_containers(#20662,#20001)
+literals("module","""module""",#20662)
+#20663=*
+regexpterm(#20663,14,#20662,0,"module")
+#20664=@"loc,{#10000},17,21,17,26"
+locations_default(#20664,#10000,17,21,17,26)
+hasLocation(#20663,#20664)
+regexp_const_value(#20663,"module")
+#20665=*
+exprs(#20665,8,#20661,-10,"{ type: ""json"" }")
+#20666=@"loc,{#10000},17,36,17,51"
+locations_default(#20666,#10000,17,36,17,51)
+hasLocation(#20665,#20666)
+enclosing_stmt(#20665,#20661)
+expr_containers(#20665,#20001)
+#20667=*
+properties(#20667,#20665,0,0,"type: ""json""")
+#20668=@"loc,{#10000},17,38,17,49"
+locations_default(#20668,#10000,17,38,17,49)
+hasLocation(#20667,#20668)
 #20669=*
-exprs(#20669,4,#20666,1,"""json""")
-hasLocation(#20669,#20343)
-enclosing_stmt(#20669,#20660)
+exprs(#20669,0,#20667,0,"type")
+hasLocation(#20669,#20339)
+enclosing_stmt(#20669,#20661)
 expr_containers(#20669,#20001)
-literals("json","""json""",#20669)
+literals("type","type",#20669)
 #20670=*
-regexpterm(#20670,14,#20669,0,"json")
-#20671=@"loc,{#10000},17,45,17,48"
-locations_default(#20671,#10000,17,45,17,48)
-hasLocation(#20670,#20671)
-regexp_const_value(#20670,"json")
-#20672=*
-exprs(#20672,83,#20660,0,"v2")
-hasLocation(#20672,#20327)
-enclosing_stmt(#20672,#20660)
-expr_containers(#20672,#20001)
+exprs(#20670,4,#20667,1,"""json""")
+hasLocation(#20670,#20343)
+enclosing_stmt(#20670,#20661)
+expr_containers(#20670,#20001)
+literals("json","""json""",#20670)
+#20671=*
+regexpterm(#20671,14,#20670,0,"json")
+#20672=@"loc,{#10000},17,45,17,48"
+locations_default(#20672,#10000,17,45,17,48)
+hasLocation(#20671,#20672)
+regexp_const_value(#20671,"json")
 #20673=*
-exprs(#20673,0,#20672,0,"v2")
+exprs(#20673,83,#20661,0,"v2")
 hasLocation(#20673,#20327)
-enclosing_stmt(#20673,#20660)
+enclosing_stmt(#20673,#20661)
 expr_containers(#20673,#20001)
-literals("v2","v2",#20673)
 #20674=*
-exprs(#20674,78,#20672,1,"v2")
+exprs(#20674,0,#20673,0,"v2")
 hasLocation(#20674,#20327)
-enclosing_stmt(#20674,#20660)
+enclosing_stmt(#20674,#20661)
 expr_containers(#20674,#20001)
 literals("v2","v2",#20674)
-decl(#20674,#20485)
-typedecl(#20674,#20488)
-namespacedecl(#20674,#20491)
 #20675=*
-stmts(#20675,27,#20001,13,"import  ... son"" };")
-hasLocation(#20675,#20041)
-stmt_containers(#20675,#20001)
+exprs(#20675,78,#20673,1,"v2")
+hasLocation(#20675,#20327)
+enclosing_stmt(#20675,#20661)
+expr_containers(#20675,#20001)
+literals("v2","v2",#20675)
+decl(#20675,#20485)
+typedecl(#20675,#20488)
+namespacedecl(#20675,#20491)
 #20676=*
-exprs(#20676,4,#20675,-1,"""module""")
-hasLocation(#20676,#20355)
-enclosing_stmt(#20676,#20675)
-expr_containers(#20676,#20001)
-literals("module","""module""",#20676)
+stmts(#20676,27,#20001,13,"import  ... son"" };")
+hasLocation(#20676,#20041)
+stmt_containers(#20676,#20001)
 #20677=*
-regexpterm(#20677,14,#20676,0,"module")
-#20678=@"loc,{#10000},18,17,18,22"
-locations_default(#20678,#10000,18,17,18,22)
-hasLocation(#20677,#20678)
-regexp_const_value(#20677,"module")
-#20679=*
-exprs(#20679,8,#20675,-10,"{ type: ""json"" }")
-#20680=@"loc,{#10000},18,32,18,47"
-locations_default(#20680,#10000,18,32,18,47)
-hasLocation(#20679,#20680)
-enclosing_stmt(#20679,#20675)
-expr_containers(#20679,#20001)
-#20681=*
-properties(#20681,#20679,0,0,"type: ""json""")
-#20682=@"loc,{#10000},18,34,18,45"
-locations_default(#20682,#10000,18,34,18,45)
-hasLocation(#20681,#20682)
-#20683=*
-exprs(#20683,0,#20681,0,"type")
-hasLocation(#20683,#20361)
-enclosing_stmt(#20683,#20675)
-expr_containers(#20683,#20001)
-literals("type","type",#20683)
+exprs(#20677,4,#20676,-1,"""module""")
+hasLocation(#20677,#20355)
+enclosing_stmt(#20677,#20676)
+expr_containers(#20677,#20001)
+literals("module","""module""",#20677)
+#20678=*
+regexpterm(#20678,14,#20677,0,"module")
+#20679=@"loc,{#10000},18,17,18,22"
+locations_default(#20679,#10000,18,17,18,22)
+hasLocation(#20678,#20679)
+regexp_const_value(#20678,"module")
+#20680=*
+exprs(#20680,8,#20676,-10,"{ type: ""json"" }")
+#20681=@"loc,{#10000},18,32,18,47"
+locations_default(#20681,#10000,18,32,18,47)
+hasLocation(#20680,#20681)
+enclosing_stmt(#20680,#20676)
+expr_containers(#20680,#20001)
+#20682=*
+properties(#20682,#20680,0,0,"type: ""json""")
+#20683=@"loc,{#10000},18,34,18,45"
+locations_default(#20683,#10000,18,34,18,45)
+hasLocation(#20682,#20683)
 #20684=*
-exprs(#20684,4,#20681,1,"""json""")
-hasLocation(#20684,#20365)
-enclosing_stmt(#20684,#20675)
+exprs(#20684,0,#20682,0,"type")
+hasLocation(#20684,#20361)
+enclosing_stmt(#20684,#20676)
 expr_containers(#20684,#20001)
-literals("json","""json""",#20684)
+literals("type","type",#20684)
 #20685=*
-regexpterm(#20685,14,#20684,0,"json")
-#20686=@"loc,{#10000},18,41,18,44"
-locations_default(#20686,#10000,18,41,18,44)
-hasLocation(#20685,#20686)
-regexp_const_value(#20685,"json")
-#20687=*
-exprs(#20687,84,#20675,0,"v3")
-hasLocation(#20687,#20351)
-enclosing_stmt(#20687,#20675)
-expr_containers(#20687,#20001)
+exprs(#20685,4,#20682,1,"""json""")
+hasLocation(#20685,#20365)
+enclosing_stmt(#20685,#20676)
+expr_containers(#20685,#20001)
+literals("json","""json""",#20685)
+#20686=*
+regexpterm(#20686,14,#20685,0,"json")
+#20687=@"loc,{#10000},18,41,18,44"
+locations_default(#20687,#10000,18,41,18,44)
+hasLocation(#20686,#20687)
+regexp_const_value(#20686,"json")
 #20688=*
-exprs(#20688,78,#20687,1,"v3")
+exprs(#20688,84,#20676,0,"v3")
 hasLocation(#20688,#20351)
-enclosing_stmt(#20688,#20675)
+enclosing_stmt(#20688,#20676)
 expr_containers(#20688,#20001)
-literals("v3","v3",#20688)
-decl(#20688,#20486)
-typedecl(#20688,#20489)
-namespacedecl(#20688,#20492)
 #20689=*
-stmts(#20689,30,#20001,14,"export  ... son"" };")
-hasLocation(#20689,#20045)
-stmt_containers(#20689,#20001)
+exprs(#20689,78,#20688,1,"v3")
+hasLocation(#20689,#20351)
+enclosing_stmt(#20689,#20676)
+expr_containers(#20689,#20001)
+literals("v3","v3",#20689)
+decl(#20689,#20486)
+typedecl(#20689,#20489)
+namespacedecl(#20689,#20492)
 #20690=*
-exprs(#20690,4,#20689,-2,"""module""")
-hasLocation(#20690,#20381)
-enclosing_stmt(#20690,#20689)
-expr_containers(#20690,#20001)
-literals("module","""module""",#20690)
+stmts(#20690,30,#20001,14,"export  ... son"" };")
+hasLocation(#20690,#20045)
+stmt_containers(#20690,#20001)
 #20691=*
-regexpterm(#20691,14,#20690,0,"module")
-#20692=@"loc,{#10000},20,21,20,26"
-locations_default(#20692,#10000,20,21,20,26)
-hasLocation(#20691,#20692)
-regexp_const_value(#20691,"module")
-#20693=*
-exprs(#20693,8,#20689,-10,"{ type: ""json"" }")
-#20694=@"loc,{#10000},20,36,20,51"
-locations_default(#20694,#10000,20,36,20,51)
-hasLocation(#20693,#20694)
-enclosing_stmt(#20693,#20689)
-expr_containers(#20693,#20001)
-#20695=*
-properties(#20695,#20693,0,0,"type: ""json""")
-#20696=@"loc,{#10000},20,38,20,49"
-locations_default(#20696,#10000,20,38,20,49)
-hasLocation(#20695,#20696)
-#20697=*
-exprs(#20697,0,#20695,0,"type")
-hasLocation(#20697,#20387)
-enclosing_stmt(#20697,#20689)
-expr_containers(#20697,#20001)
-literals("type","type",#20697)
+exprs(#20691,4,#20690,-2,"""module""")
+hasLocation(#20691,#20381)
+enclosing_stmt(#20691,#20690)
+expr_containers(#20691,#20001)
+literals("module","""module""",#20691)
+#20692=*
+regexpterm(#20692,14,#20691,0,"module")
+#20693=@"loc,{#10000},20,21,20,26"
+locations_default(#20693,#10000,20,21,20,26)
+hasLocation(#20692,#20693)
+regexp_const_value(#20692,"module")
+#20694=*
+exprs(#20694,8,#20690,-10,"{ type: ""json"" }")
+#20695=@"loc,{#10000},20,36,20,51"
+locations_default(#20695,#10000,20,36,20,51)
+hasLocation(#20694,#20695)
+enclosing_stmt(#20694,#20690)
+expr_containers(#20694,#20001)
+#20696=*
+properties(#20696,#20694,0,0,"type: ""json""")
+#20697=@"loc,{#10000},20,38,20,49"
+locations_default(#20697,#10000,20,38,20,49)
+hasLocation(#20696,#20697)
 #20698=*
-exprs(#20698,4,#20695,1,"""json""")
-hasLocation(#20698,#20391)
-enclosing_stmt(#20698,#20689)
+exprs(#20698,0,#20696,0,"type")
+hasLocation(#20698,#20387)
+enclosing_stmt(#20698,#20690)
 expr_containers(#20698,#20001)
-literals("json","""json""",#20698)
+literals("type","type",#20698)
 #20699=*
-regexpterm(#20699,14,#20698,0,"json")
-#20700=@"loc,{#10000},20,45,20,48"
-locations_default(#20700,#10000,20,45,20,48)
-hasLocation(#20699,#20700)
-regexp_const_value(#20699,"json")
-#20701=*
-exprs(#20701,86,#20689,0,"v4")
-hasLocation(#20701,#20375)
-enclosing_stmt(#20701,#20689)
-expr_containers(#20701,#20001)
+exprs(#20699,4,#20696,1,"""json""")
+hasLocation(#20699,#20391)
+enclosing_stmt(#20699,#20690)
+expr_containers(#20699,#20001)
+literals("json","""json""",#20699)
+#20700=*
+regexpterm(#20700,14,#20699,0,"json")
+#20701=@"loc,{#10000},20,45,20,48"
+locations_default(#20701,#10000,20,45,20,48)
+hasLocation(#20700,#20701)
+regexp_const_value(#20700,"json")
 #20702=*
-exprs(#20702,0,#20701,0,"v4")
+exprs(#20702,86,#20690,0,"v4")
 hasLocation(#20702,#20375)
-enclosing_stmt(#20702,#20689)
+enclosing_stmt(#20702,#20690)
 expr_containers(#20702,#20001)
-literals("v4","v4",#20702)
 #20703=*
-exprs(#20703,0,#20701,1,"v4")
+exprs(#20703,0,#20702,0,"v4")
 hasLocation(#20703,#20375)
-enclosing_stmt(#20703,#20689)
+enclosing_stmt(#20703,#20690)
 expr_containers(#20703,#20001)
 literals("v4","v4",#20703)
 #20704=*
-stmts(#20704,28,#20001,15,"export  ... son"" };")
-hasLocation(#20704,#20047)
-stmt_containers(#20704,#20001)
+exprs(#20704,0,#20702,1,"v4")
+hasLocation(#20704,#20375)
+enclosing_stmt(#20704,#20690)
+expr_containers(#20704,#20001)
+literals("v4","v4",#20704)
 #20705=*
-exprs(#20705,4,#20704,0,"""module""")
-hasLocation(#20705,#20403)
-enclosing_stmt(#20705,#20704)
-expr_containers(#20705,#20001)
-literals("module","""module""",#20705)
+stmts(#20705,28,#20001,15,"export  ... son"" };")
+hasLocation(#20705,#20047)
+stmt_containers(#20705,#20001)
 #20706=*
-regexpterm(#20706,14,#20705,0,"module")
-#20707=@"loc,{#10000},21,16,21,21"
-locations_default(#20707,#10000,21,16,21,21)
-hasLocation(#20706,#20707)
-regexp_const_value(#20706,"module")
-#20708=*
-exprs(#20708,8,#20704,-10,"{ type: ""json"" }")
-#20709=@"loc,{#10000},21,31,21,46"
-locations_default(#20709,#10000,21,31,21,46)
-hasLocation(#20708,#20709)
-enclosing_stmt(#20708,#20704)
-expr_containers(#20708,#20001)
-#20710=*
-properties(#20710,#20708,0,0,"type: ""json""")
-#20711=@"loc,{#10000},21,33,21,44"
-locations_default(#20711,#10000,21,33,21,44)
-hasLocation(#20710,#20711)
-#20712=*
-exprs(#20712,0,#20710,0,"type")
-hasLocation(#20712,#20409)
-enclosing_stmt(#20712,#20704)
-expr_containers(#20712,#20001)
-literals("type","type",#20712)
+exprs(#20706,4,#20705,0,"""module""")
+hasLocation(#20706,#20403)
+enclosing_stmt(#20706,#20705)
+expr_containers(#20706,#20001)
+literals("module","""module""",#20706)
+#20707=*
+regexpterm(#20707,14,#20706,0,"module")
+#20708=@"loc,{#10000},21,16,21,21"
+locations_default(#20708,#10000,21,16,21,21)
+hasLocation(#20707,#20708)
+regexp_const_value(#20707,"module")
+#20709=*
+exprs(#20709,8,#20705,-10,"{ type: ""json"" }")
+#20710=@"loc,{#10000},21,31,21,46"
+locations_default(#20710,#10000,21,31,21,46)
+hasLocation(#20709,#20710)
+enclosing_stmt(#20709,#20705)
+expr_containers(#20709,#20001)
+#20711=*
+properties(#20711,#20709,0,0,"type: ""json""")
+#20712=@"loc,{#10000},21,33,21,44"
+locations_default(#20712,#10000,21,33,21,44)
+hasLocation(#20711,#20712)
 #20713=*
-exprs(#20713,4,#20710,1,"""json""")
-hasLocation(#20713,#20413)
-enclosing_stmt(#20713,#20704)
+exprs(#20713,0,#20711,0,"type")
+hasLocation(#20713,#20409)
+enclosing_stmt(#20713,#20705)
 expr_containers(#20713,#20001)
-literals("json","""json""",#20713)
+literals("type","type",#20713)
 #20714=*
-regexpterm(#20714,14,#20713,0,"json")
-#20715=@"loc,{#10000},21,40,21,43"
-locations_default(#20715,#10000,21,40,21,43)
-hasLocation(#20714,#20715)
-regexp_const_value(#20714,"json")
-#20716=*
-stmts(#20716,30,#20001,16,"export  ... son"" };")
-hasLocation(#20716,#20049)
-stmt_containers(#20716,#20001)
+exprs(#20714,4,#20711,1,"""json""")
+hasLocation(#20714,#20413)
+enclosing_stmt(#20714,#20705)
+expr_containers(#20714,#20001)
+literals("json","""json""",#20714)
+#20715=*
+regexpterm(#20715,14,#20714,0,"json")
+#20716=@"loc,{#10000},21,40,21,43"
+locations_default(#20716,#10000,21,40,21,43)
+hasLocation(#20715,#20716)
+regexp_const_value(#20715,"json")
 #20717=*
-exprs(#20717,4,#20716,-2,"""module""")
-hasLocation(#20717,#20429)
-enclosing_stmt(#20717,#20716)
-expr_containers(#20717,#20001)
-literals("module","""module""",#20717)
+stmts(#20717,30,#20001,16,"export  ... son"" };")
+hasLocation(#20717,#20049)
+stmt_containers(#20717,#20001)
 #20718=*
-regexpterm(#20718,14,#20717,0,"module")
-#20719=@"loc,{#10000},22,22,22,27"
-locations_default(#20719,#10000,22,22,22,27)
-hasLocation(#20718,#20719)
-regexp_const_value(#20718,"module")
-#20720=*
-exprs(#20720,8,#20716,-10,"{ type: ""json"" }")
-#20721=@"loc,{#10000},22,37,22,52"
-locations_default(#20721,#10000,22,37,22,52)
-hasLocation(#20720,#20721)
-enclosing_stmt(#20720,#20716)
-expr_containers(#20720,#20001)
-#20722=*
-properties(#20722,#20720,0,0,"type: ""json""")
-#20723=@"loc,{#10000},22,39,22,50"
-locations_default(#20723,#10000,22,39,22,50)
-hasLocation(#20722,#20723)
-#20724=*
-exprs(#20724,0,#20722,0,"type")
-hasLocation(#20724,#20435)
-enclosing_stmt(#20724,#20716)
-expr_containers(#20724,#20001)
-literals("type","type",#20724)
+exprs(#20718,4,#20717,-2,"""module""")
+hasLocation(#20718,#20429)
+enclosing_stmt(#20718,#20717)
+expr_containers(#20718,#20001)
+literals("module","""module""",#20718)
+#20719=*
+regexpterm(#20719,14,#20718,0,"module")
+#20720=@"loc,{#10000},22,22,22,27"
+locations_default(#20720,#10000,22,22,22,27)
+hasLocation(#20719,#20720)
+regexp_const_value(#20719,"module")
+#20721=*
+exprs(#20721,8,#20717,-10,"{ type: ""json"" }")
+#20722=@"loc,{#10000},22,37,22,52"
+locations_default(#20722,#10000,22,37,22,52)
+hasLocation(#20721,#20722)
+enclosing_stmt(#20721,#20717)
+expr_containers(#20721,#20001)
+#20723=*
+properties(#20723,#20721,0,0,"type: ""json""")
+#20724=@"loc,{#10000},22,39,22,50"
+locations_default(#20724,#10000,22,39,22,50)
+hasLocation(#20723,#20724)
 #20725=*
-exprs(#20725,4,#20722,1,"""json""")
-hasLocation(#20725,#20439)
-enclosing_stmt(#20725,#20716)
+exprs(#20725,0,#20723,0,"type")
+hasLocation(#20725,#20435)
+enclosing_stmt(#20725,#20717)
 expr_containers(#20725,#20001)
-literals("json","""json""",#20725)
+literals("type","type",#20725)
 #20726=*
-regexpterm(#20726,14,#20725,0,"json")
-#20727=@"loc,{#10000},22,46,22,49"
-locations_default(#20727,#10000,22,46,22,49)
-hasLocation(#20726,#20727)
-regexp_const_value(#20726,"json")
-#20728=*
-exprs(#20728,96,#20716,0,"* as v5")
-#20729=@"loc,{#10000},22,8,22,14"
-locations_default(#20729,#10000,22,8,22,14)
-hasLocation(#20728,#20729)
-enclosing_stmt(#20728,#20716)
-expr_containers(#20728,#20001)
-#20730=*
-exprs(#20730,0,#20728,1,"v5")
-hasLocation(#20730,#20425)
-enclosing_stmt(#20730,#20716)
-expr_containers(#20730,#20001)
-literals("v5","v5",#20730)
+exprs(#20726,4,#20723,1,"""json""")
+hasLocation(#20726,#20439)
+enclosing_stmt(#20726,#20717)
+expr_containers(#20726,#20001)
+literals("json","""json""",#20726)
+#20727=*
+regexpterm(#20727,14,#20726,0,"json")
+#20728=@"loc,{#10000},22,46,22,49"
+locations_default(#20728,#10000,22,46,22,49)
+hasLocation(#20727,#20728)
+regexp_const_value(#20727,"json")
+#20729=*
+exprs(#20729,96,#20717,0,"* as v5")
+#20730=@"loc,{#10000},22,8,22,14"
+locations_default(#20730,#10000,22,8,22,14)
+hasLocation(#20729,#20730)
+enclosing_stmt(#20729,#20717)
+expr_containers(#20729,#20001)
 #20731=*
-stmts(#20731,22,#20001,17,"const v ... "" } });")
-hasLocation(#20731,#20053)
-stmt_containers(#20731,#20001)
+exprs(#20731,0,#20729,1,"v5")
+hasLocation(#20731,#20425)
+enclosing_stmt(#20731,#20717)
+expr_containers(#20731,#20001)
+literals("v5","v5",#20731)
 #20732=*
-exprs(#20732,64,#20731,0,"v6 = im ... n"" } })")
-#20733=@"loc,{#10000},24,7,24,57"
-locations_default(#20733,#10000,24,7,24,57)
-hasLocation(#20732,#20733)
-enclosing_stmt(#20732,#20731)
-expr_containers(#20732,#20001)
-#20734=*
-exprs(#20734,78,#20732,0,"v6")
-hasLocation(#20734,#20447)
-enclosing_stmt(#20734,#20731)
-expr_containers(#20734,#20001)
-literals("v6","v6",#20734)
-decl(#20734,#20493)
+stmts(#20732,22,#20001,17,"const v ... "" } });")
+hasLocation(#20732,#20053)
+stmt_containers(#20732,#20001)
+#20733=*
+exprs(#20733,64,#20732,0,"v6 = im ... n"" } })")
+#20734=@"loc,{#10000},24,7,24,57"
+locations_default(#20734,#10000,24,7,24,57)
+hasLocation(#20733,#20734)
+enclosing_stmt(#20733,#20732)
+expr_containers(#20733,#20001)
 #20735=*
-exprs(#20735,99,#20732,1,"import( ... n"" } })")
-#20736=@"loc,{#10000},24,12,24,57"
-locations_default(#20736,#10000,24,12,24,57)
-hasLocation(#20735,#20736)
-enclosing_stmt(#20735,#20731)
+exprs(#20735,78,#20733,0,"v6")
+hasLocation(#20735,#20447)
+enclosing_stmt(#20735,#20732)
 expr_containers(#20735,#20001)
-#20737=*
-exprs(#20737,4,#20735,0,"""module""")
-hasLocation(#20737,#20455)
-enclosing_stmt(#20737,#20731)
-expr_containers(#20737,#20001)
-literals("module","""module""",#20737)
+literals("v6","v6",#20735)
+decl(#20735,#20493)
+#20736=*
+exprs(#20736,99,#20733,1,"import( ... n"" } })")
+#20737=@"loc,{#10000},24,12,24,57"
+locations_default(#20737,#10000,24,12,24,57)
+hasLocation(#20736,#20737)
+enclosing_stmt(#20736,#20732)
+expr_containers(#20736,#20001)
 #20738=*
-regexpterm(#20738,14,#20737,0,"module")
-#20739=@"loc,{#10000},24,20,24,25"
-locations_default(#20739,#10000,24,20,24,25)
-hasLocation(#20738,#20739)
-regexp_const_value(#20738,"module")
-#20740=*
-exprs(#20740,8,#20735,1,"{ asser ... on"" } }")
-#20741=@"loc,{#10000},24,29,24,56"
-locations_default(#20741,#10000,24,29,24,56)
-hasLocation(#20740,#20741)
-enclosing_stmt(#20740,#20731)
-expr_containers(#20740,#20001)
-#20742=*
-properties(#20742,#20740,0,0,"assert: ... json"" }")
-#20743=@"loc,{#10000},24,31,24,54"
-locations_default(#20743,#10000,24,31,24,54)
-hasLocation(#20742,#20743)
-#20744=*
-exprs(#20744,0,#20742,0,"assert")
-hasLocation(#20744,#20461)
-enclosing_stmt(#20744,#20731)
-expr_containers(#20744,#20001)
-literals("assert","assert",#20744)
+exprs(#20738,4,#20736,0,"""module""")
+hasLocation(#20738,#20455)
+enclosing_stmt(#20738,#20732)
+expr_containers(#20738,#20001)
+literals("module","""module""",#20738)
+#20739=*
+regexpterm(#20739,14,#20738,0,"module")
+#20740=@"loc,{#10000},24,20,24,25"
+locations_default(#20740,#10000,24,20,24,25)
+hasLocation(#20739,#20740)
+regexp_const_value(#20739,"module")
+#20741=*
+exprs(#20741,8,#20736,1,"{ asser ... on"" } }")
+#20742=@"loc,{#10000},24,29,24,56"
+locations_default(#20742,#10000,24,29,24,56)
+hasLocation(#20741,#20742)
+enclosing_stmt(#20741,#20732)
+expr_containers(#20741,#20001)
+#20743=*
+properties(#20743,#20741,0,0,"assert: ... json"" }")
+#20744=@"loc,{#10000},24,31,24,54"
+locations_default(#20744,#10000,24,31,24,54)
+hasLocation(#20743,#20744)
 #20745=*
-exprs(#20745,8,#20742,1,"{ type: ""json"" }")
-#20746=@"loc,{#10000},24,39,24,54"
-locations_default(#20746,#10000,24,39,24,54)
-hasLocation(#20745,#20746)
-enclosing_stmt(#20745,#20731)
+exprs(#20745,0,#20743,0,"assert")
+hasLocation(#20745,#20461)
+enclosing_stmt(#20745,#20732)
 expr_containers(#20745,#20001)
-#20747=*
-properties(#20747,#20745,0,0,"type: ""json""")
-#20748=@"loc,{#10000},24,41,24,52"
-locations_default(#20748,#10000,24,41,24,52)
-hasLocation(#20747,#20748)
-#20749=*
-exprs(#20749,0,#20747,0,"type")
-hasLocation(#20749,#20467)
-enclosing_stmt(#20749,#20731)
-expr_containers(#20749,#20001)
-literals("type","type",#20749)
+literals("assert","assert",#20745)
+#20746=*
+exprs(#20746,8,#20743,1,"{ type: ""json"" }")
+#20747=@"loc,{#10000},24,39,24,54"
+locations_default(#20747,#10000,24,39,24,54)
+hasLocation(#20746,#20747)
+enclosing_stmt(#20746,#20732)
+expr_containers(#20746,#20001)
+#20748=*
+properties(#20748,#20746,0,0,"type: ""json""")
+#20749=@"loc,{#10000},24,41,24,52"
+locations_default(#20749,#10000,24,41,24,52)
+hasLocation(#20748,#20749)
 #20750=*
-exprs(#20750,4,#20747,1,"""json""")
-hasLocation(#20750,#20471)
-enclosing_stmt(#20750,#20731)
+exprs(#20750,0,#20748,0,"type")
+hasLocation(#20750,#20467)
+enclosing_stmt(#20750,#20732)
 expr_containers(#20750,#20001)
-literals("json","""json""",#20750)
+literals("type","type",#20750)
 #20751=*
-regexpterm(#20751,14,#20750,0,"json")
-#20752=@"loc,{#10000},24,48,24,51"
-locations_default(#20752,#10000,24,48,24,51)
-hasLocation(#20751,#20752)
-regexp_const_value(#20751,"json")
-#20753=*
-entry_cfg_node(#20753,#20001)
-#20754=@"loc,{#10000},1,1,1,0"
-locations_default(#20754,#10000,1,1,1,0)
-hasLocation(#20753,#20754)
-#20755=*
-exit_cfg_node(#20755,#20001)
-hasLocation(#20755,#20481)
-successor(#20731,#20734)
-successor(#20737,#20735)
-successor(#20735,#20732)
-successor(#20734,#20737)
-successor(#20732,#20755)
-successor(#20716,#20717)
-successor(#20728,#20730)
-successor(#20730,#20731)
-successor(#20717,#20728)
-successor(#20704,#20705)
-successor(#20705,#20716)
-successor(#20689,#20690)
-successor(#20701,#20702)
-successor(#20703,#20704)
-successor(#20702,#20703)
-successor(#20690,#20701)
-successor(#20675,#20689)
-successor(#20660,#20675)
-successor(#20645,#20660)
-successor(#20633,#20645)
-successor(#20619,#20623)
-successor(#20625,#20629)
-successor(#20630,#20627)
-successor(#20629,#20630)
-successor(#20627,#20621)
-successor(#20623,#20625)
-successor(#20621,#20633)
-successor(#20614,#20619)
-successor(#20592,#20595)
-successor(#20598,#20596)
-successor(#20596,#20593)
-successor(#20595,#20598)
-successor(#20593,#20614)
-successor(#20577,#20578)
-successor(#20589,#20591)
-successor(#20591,#20592)
-successor(#20578,#20589)
-successor(#20565,#20566)
-successor(#20566,#20577)
-successor(#20550,#20551)
-successor(#20562,#20563)
-successor(#20564,#20565)
-successor(#20563,#20564)
-successor(#20551,#20562)
-successor(#20536,#20550)
-successor(#20521,#20536)
-successor(#20506,#20521)
-successor(#20494,#20506)
-successor(#20687,#20494)
-successor(#20672,#20687)
-successor(#20657,#20672)
-successor(#20548,#20657)
-successor(#20533,#20548)
-successor(#20518,#20533)
-successor(#20753,#20518)
+exprs(#20751,4,#20748,1,"""json""")
+hasLocation(#20751,#20471)
+enclosing_stmt(#20751,#20732)
+expr_containers(#20751,#20001)
+literals("json","""json""",#20751)
+#20752=*
+regexpterm(#20752,14,#20751,0,"json")
+#20753=@"loc,{#10000},24,48,24,51"
+locations_default(#20753,#10000,24,48,24,51)
+hasLocation(#20752,#20753)
+regexp_const_value(#20752,"json")
+#20754=*
+entry_cfg_node(#20754,#20001)
+#20755=@"loc,{#10000},1,1,1,0"
+locations_default(#20755,#10000,1,1,1,0)
+hasLocation(#20754,#20755)
 #20756=*
-js_parse_errors(#20756,#20001,"Error: Duplicate export 'v4'","export { v4 } from ""module"" assert { type: ""json"" };
+exit_cfg_node(#20756,#20001)
+hasLocation(#20756,#20481)
+successor(#20732,#20735)
+successor(#20738,#20736)
+successor(#20736,#20733)
+successor(#20735,#20738)
+successor(#20733,#20756)
+successor(#20717,#20718)
+successor(#20729,#20731)
+successor(#20731,#20732)
+successor(#20718,#20729)
+successor(#20705,#20706)
+successor(#20706,#20717)
+successor(#20690,#20691)
+successor(#20702,#20703)
+successor(#20704,#20705)
+successor(#20703,#20704)
+successor(#20691,#20702)
+successor(#20676,#20690)
+successor(#20661,#20676)
+successor(#20646,#20661)
+successor(#20634,#20646)
+successor(#20620,#20624)
+successor(#20626,#20630)
+successor(#20631,#20628)
+successor(#20630,#20631)
+successor(#20628,#20622)
+successor(#20624,#20626)
+successor(#20622,#20634)
+successor(#20615,#20620)
+successor(#20593,#20596)
+successor(#20599,#20597)
+successor(#20597,#20594)
+successor(#20596,#20599)
+successor(#20594,#20615)
+successor(#20578,#20579)
+successor(#20590,#20592)
+successor(#20592,#20593)
+successor(#20579,#20590)
+successor(#20566,#20567)
+successor(#20567,#20578)
+successor(#20551,#20552)
+successor(#20563,#20564)
+successor(#20565,#20566)
+successor(#20564,#20565)
+successor(#20552,#20563)
+successor(#20537,#20551)
+successor(#20522,#20537)
+successor(#20507,#20522)
+successor(#20495,#20507)
+successor(#20688,#20495)
+successor(#20673,#20688)
+successor(#20658,#20673)
+successor(#20549,#20658)
+successor(#20534,#20549)
+successor(#20519,#20534)
+successor(#20754,#20519)
+#20757=*
+js_parse_errors(#20757,#20001,"Error: Duplicate export 'v4'","export { v4 } from ""module"" assert { type: ""json"" };
 ")
-#20757=@"loc,{#10000},20,10,20,10"
-locations_default(#20757,#10000,20,10,20,10)
-hasLocation(#20756,#20757)
-#20758=*
-lines(#20758,#20001,"import ""module"" with { type: ""json"" };","
-")
-hasLocation(#20758,#20007)
+#20758=@"loc,{#10000},20,10,20,10"
+locations_default(#20758,#10000,20,10,20,10)
+hasLocation(#20757,#20758)
 #20759=*
-lines(#20759,#20001,"import * as v1 from ""module"" with { type: ""json"" };","
+lines(#20759,#20001,"import ""module"" with { type: ""json"" };","
 ")
-hasLocation(#20759,#20009)
+hasLocation(#20759,#20007)
 #20760=*
-lines(#20760,#20001,"import { v2 } from ""module"" with { type: ""json"" };","
+lines(#20760,#20001,"import * as v1 from ""module"" with { type: ""json"" };","
 ")
-hasLocation(#20760,#20011)
+hasLocation(#20760,#20009)
 #20761=*
-lines(#20761,#20001,"import v3 from ""module"" with { type: ""json"" };","
+lines(#20761,#20001,"import { v2 } from ""module"" with { type: ""json"" };","
 ")
-hasLocation(#20761,#20013)
+hasLocation(#20761,#20011)
 #20762=*
-lines(#20762,#20001,"","
+lines(#20762,#20001,"import v3 from ""module"" with { type: ""json"" };","
 ")
-hasLocation(#20762,#20015)
+hasLocation(#20762,#20013)
 #20763=*
-lines(#20763,#20001,"export { v4 } from ""module"" with { type: ""json"" };","
+lines(#20763,#20001,"","
 ")
-hasLocation(#20763,#20017)
+hasLocation(#20763,#20015)
 #20764=*
-lines(#20764,#20001,"export * from ""module"" with { type: ""json"" };","
+lines(#20764,#20001,"export { v4 } from ""module"" with { type: ""json"" };","
 ")
-hasLocation(#20764,#20019)
+hasLocation(#20764,#20017)
 #20765=*
-lines(#20765,#20001,"export * as v5 from ""module"" with { type: ""json"" };","
+lines(#20765,#20001,"export * from ""module"" with { type: ""json"" };","
 ")
-hasLocation(#20765,#20021)
+hasLocation(#20765,#20019)
 #20766=*
-lines(#20766,#20001,"","
+lines(#20766,#20001,"export * as v5 from ""module"" with { type: ""json"" };","
 ")
-hasLocation(#20766,#20023)
+hasLocation(#20766,#20021)
 #20767=*
-lines(#20767,#20001,"const v6 = import(""module"", { with: { type: ""json"" } });","
+lines(#20767,#20001,"","
 ")
-hasLocation(#20767,#20025)
+hasLocation(#20767,#20023)
 #20768=*
-lines(#20768,#20001,"","
+lines(#20768,#20001,"const v6 = import(""module"", { with: { type: ""json"" } });","
 ")
-hasLocation(#20768,#20027)
+hasLocation(#20768,#20025)
 #20769=*
-lines(#20769,#20001,"import ""module"" // missing semicolon","
+lines(#20769,#20001,"","
 ")
-hasLocation(#20769,#20029)
+hasLocation(#20769,#20027)
 #20770=*
-lines(#20770,#20001,"assert({type: ""json""}); // function call, not import assertion","
+lines(#20770,#20001,"import ""module"" // missing semicolon","
 ")
-hasLocation(#20770,#20031)
+hasLocation(#20770,#20029)
 #20771=*
-lines(#20771,#20001,"","
+lines(#20771,#20001,"assert({type: ""json""}); // function call, not import assertion","
 ")
-hasLocation(#20771,#20033)
+hasLocation(#20771,#20031)
 #20772=*
-lines(#20772,#20001,"import ""module"" assert { type: ""json"" };","
+lines(#20772,#20001,"","
 ")
-hasLocation(#20772,#20035)
+hasLocation(#20772,#20033)
 #20773=*
-lines(#20773,#20001,"import * as v1 from ""module"" assert { type: ""json"" };","
+lines(#20773,#20001,"import ""module"" assert { type: ""json"" };","
 ")
-hasLocation(#20773,#20037)
+hasLocation(#20773,#20035)
 #20774=*
-lines(#20774,#20001,"import { v2 } from ""module"" assert { type: ""json"" };","
+lines(#20774,#20001,"import * as v1 from ""module"" assert { type: ""json"" };","
 ")
-hasLocation(#20774,#20039)
+hasLocation(#20774,#20037)
 #20775=*
-lines(#20775,#20001,"import v3 from ""module"" assert { type: ""json"" };","
+lines(#20775,#20001,"import { v2 } from ""module"" assert { type: ""json"" };","
 ")
-hasLocation(#20775,#20041)
+hasLocation(#20775,#20039)
 #20776=*
-lines(#20776,#20001,"","
+lines(#20776,#20001,"import v3 from ""module"" assert { type: ""json"" };","
 ")
-hasLocation(#20776,#20043)
+hasLocation(#20776,#20041)
 #20777=*
-lines(#20777,#20001,"export { v4 } from ""module"" assert { type: ""json"" };","
+lines(#20777,#20001,"","
 ")
-hasLocation(#20777,#20045)
+hasLocation(#20777,#20043)
 #20778=*
-lines(#20778,#20001,"export * from ""module"" assert { type: ""json"" };","
+lines(#20778,#20001,"export { v4 } from ""module"" assert { type: ""json"" };","
 ")
-hasLocation(#20778,#20047)
+hasLocation(#20778,#20045)
 #20779=*
-lines(#20779,#20001,"export * as v5 from ""module"" assert { type: ""json"" };","
+lines(#20779,#20001,"export * from ""module"" assert { type: ""json"" };","
 ")
-hasLocation(#20779,#20049)
+hasLocation(#20779,#20047)
 #20780=*
-lines(#20780,#20001,"","
+lines(#20780,#20001,"export * as v5 from ""module"" assert { type: ""json"" };","
 ")
-hasLocation(#20780,#20051)
+hasLocation(#20780,#20049)
 #20781=*
-lines(#20781,#20001,"const v6 = import(""module"", { assert: { type: ""json"" } });","
+lines(#20781,#20001,"","
 ")
-hasLocation(#20781,#20053)
+hasLocation(#20781,#20051)
+#20782=*
+lines(#20782,#20001,"const v6 = import(""module"", { assert: { type: ""json"" } });","
+")
+hasLocation(#20782,#20053)
 numlines(#20001,24,0,0)
 numlines(#10000,24,18,2)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/esnext/output/trap/nullish-coalescing.js.trap b/javascript/extractor/tests/esnext/output/trap/nullish-coalescing.js.trap
index 234c05a9446..e926b5a287a 100644
--- a/javascript/extractor/tests/esnext/output/trap/nullish-coalescing.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/nullish-coalescing.js.trap
@@ -200,295 +200,297 @@ toplevels(#20001,0)
 #20074=@"loc,{#10000},1,1,7,15"
 locations_default(#20074,#10000,1,1,7,15)
 hasLocation(#20001,#20074)
-#20075=*
-stmts(#20075,2,#20001,0,"x1 ?? y1;")
-hasLocation(#20075,#20003)
-stmt_containers(#20075,#20001)
+#20075=@"var;{this};{#20000}"
+variables(#20075,"this",#20000)
 #20076=*
-exprs(#20076,107,#20075,0,"x1 ?? y1")
-#20077=@"loc,{#10000},1,1,1,8"
-locations_default(#20077,#10000,1,1,1,8)
-hasLocation(#20076,#20077)
-enclosing_stmt(#20076,#20075)
-expr_containers(#20076,#20001)
-#20078=*
-exprs(#20078,79,#20076,0,"x1")
-hasLocation(#20078,#20017)
-enclosing_stmt(#20078,#20075)
-expr_containers(#20078,#20001)
-literals("x1","x1",#20078)
-#20079=@"var;{x1};{#20000}"
-variables(#20079,"x1",#20000)
-bind(#20078,#20079)
-#20080=*
-exprs(#20080,79,#20076,1,"y1")
-hasLocation(#20080,#20021)
-enclosing_stmt(#20080,#20075)
-expr_containers(#20080,#20001)
-literals("y1","y1",#20080)
-#20081=@"var;{y1};{#20000}"
-variables(#20081,"y1",#20000)
-bind(#20080,#20081)
-#20082=*
-stmts(#20082,2,#20001,1,"x2 || y2 ?? z2;")
-hasLocation(#20082,#20007)
-stmt_containers(#20082,#20001)
+stmts(#20076,2,#20001,0,"x1 ?? y1;")
+hasLocation(#20076,#20003)
+stmt_containers(#20076,#20001)
+#20077=*
+exprs(#20077,107,#20076,0,"x1 ?? y1")
+#20078=@"loc,{#10000},1,1,1,8"
+locations_default(#20078,#10000,1,1,1,8)
+hasLocation(#20077,#20078)
+enclosing_stmt(#20077,#20076)
+expr_containers(#20077,#20001)
+#20079=*
+exprs(#20079,79,#20077,0,"x1")
+hasLocation(#20079,#20017)
+enclosing_stmt(#20079,#20076)
+expr_containers(#20079,#20001)
+literals("x1","x1",#20079)
+#20080=@"var;{x1};{#20000}"
+variables(#20080,"x1",#20000)
+bind(#20079,#20080)
+#20081=*
+exprs(#20081,79,#20077,1,"y1")
+hasLocation(#20081,#20021)
+enclosing_stmt(#20081,#20076)
+expr_containers(#20081,#20001)
+literals("y1","y1",#20081)
+#20082=@"var;{y1};{#20000}"
+variables(#20082,"y1",#20000)
+bind(#20081,#20082)
 #20083=*
-exprs(#20083,107,#20082,0,"x2 || y2 ?? z2")
-#20084=@"loc,{#10000},3,1,3,14"
-locations_default(#20084,#10000,3,1,3,14)
-hasLocation(#20083,#20084)
-enclosing_stmt(#20083,#20082)
-expr_containers(#20083,#20001)
-#20085=*
-exprs(#20085,45,#20083,0,"x2 || y2")
-#20086=@"loc,{#10000},3,1,3,8"
-locations_default(#20086,#10000,3,1,3,8)
-hasLocation(#20085,#20086)
-enclosing_stmt(#20085,#20082)
-expr_containers(#20085,#20001)
-#20087=*
-exprs(#20087,79,#20085,0,"x2")
-hasLocation(#20087,#20025)
-enclosing_stmt(#20087,#20082)
-expr_containers(#20087,#20001)
-literals("x2","x2",#20087)
-#20088=@"var;{x2};{#20000}"
-variables(#20088,"x2",#20000)
-bind(#20087,#20088)
-#20089=*
-exprs(#20089,79,#20085,1,"y2")
-hasLocation(#20089,#20029)
-enclosing_stmt(#20089,#20082)
-expr_containers(#20089,#20001)
-literals("y2","y2",#20089)
-#20090=@"var;{y2};{#20000}"
-variables(#20090,"y2",#20000)
-bind(#20089,#20090)
-#20091=*
-exprs(#20091,79,#20083,1,"z2")
-hasLocation(#20091,#20033)
-enclosing_stmt(#20091,#20082)
-expr_containers(#20091,#20001)
-literals("z2","z2",#20091)
-#20092=@"var;{z2};{#20000}"
-variables(#20092,"z2",#20000)
-bind(#20091,#20092)
-#20093=*
-stmts(#20093,2,#20001,2,"x3 ?? y3 || z3;")
-hasLocation(#20093,#20009)
-stmt_containers(#20093,#20001)
+stmts(#20083,2,#20001,1,"x2 || y2 ?? z2;")
+hasLocation(#20083,#20007)
+stmt_containers(#20083,#20001)
+#20084=*
+exprs(#20084,107,#20083,0,"x2 || y2 ?? z2")
+#20085=@"loc,{#10000},3,1,3,14"
+locations_default(#20085,#10000,3,1,3,14)
+hasLocation(#20084,#20085)
+enclosing_stmt(#20084,#20083)
+expr_containers(#20084,#20001)
+#20086=*
+exprs(#20086,45,#20084,0,"x2 || y2")
+#20087=@"loc,{#10000},3,1,3,8"
+locations_default(#20087,#10000,3,1,3,8)
+hasLocation(#20086,#20087)
+enclosing_stmt(#20086,#20083)
+expr_containers(#20086,#20001)
+#20088=*
+exprs(#20088,79,#20086,0,"x2")
+hasLocation(#20088,#20025)
+enclosing_stmt(#20088,#20083)
+expr_containers(#20088,#20001)
+literals("x2","x2",#20088)
+#20089=@"var;{x2};{#20000}"
+variables(#20089,"x2",#20000)
+bind(#20088,#20089)
+#20090=*
+exprs(#20090,79,#20086,1,"y2")
+hasLocation(#20090,#20029)
+enclosing_stmt(#20090,#20083)
+expr_containers(#20090,#20001)
+literals("y2","y2",#20090)
+#20091=@"var;{y2};{#20000}"
+variables(#20091,"y2",#20000)
+bind(#20090,#20091)
+#20092=*
+exprs(#20092,79,#20084,1,"z2")
+hasLocation(#20092,#20033)
+enclosing_stmt(#20092,#20083)
+expr_containers(#20092,#20001)
+literals("z2","z2",#20092)
+#20093=@"var;{z2};{#20000}"
+variables(#20093,"z2",#20000)
+bind(#20092,#20093)
 #20094=*
-exprs(#20094,45,#20093,0,"x3 ?? y3 || z3")
-#20095=@"loc,{#10000},4,1,4,14"
-locations_default(#20095,#10000,4,1,4,14)
-hasLocation(#20094,#20095)
-enclosing_stmt(#20094,#20093)
-expr_containers(#20094,#20001)
-#20096=*
-exprs(#20096,107,#20094,0,"x3 ?? y3")
-#20097=@"loc,{#10000},4,1,4,8"
-locations_default(#20097,#10000,4,1,4,8)
-hasLocation(#20096,#20097)
-enclosing_stmt(#20096,#20093)
-expr_containers(#20096,#20001)
-#20098=*
-exprs(#20098,79,#20096,0,"x3")
-hasLocation(#20098,#20037)
-enclosing_stmt(#20098,#20093)
-expr_containers(#20098,#20001)
-literals("x3","x3",#20098)
-#20099=@"var;{x3};{#20000}"
-variables(#20099,"x3",#20000)
-bind(#20098,#20099)
-#20100=*
-exprs(#20100,79,#20096,1,"y3")
-hasLocation(#20100,#20041)
-enclosing_stmt(#20100,#20093)
-expr_containers(#20100,#20001)
-literals("y3","y3",#20100)
-#20101=@"var;{y3};{#20000}"
-variables(#20101,"y3",#20000)
-bind(#20100,#20101)
-#20102=*
-exprs(#20102,79,#20094,1,"z3")
-hasLocation(#20102,#20045)
-enclosing_stmt(#20102,#20093)
-expr_containers(#20102,#20001)
-literals("z3","z3",#20102)
-#20103=@"var;{z3};{#20000}"
-variables(#20103,"z3",#20000)
-bind(#20102,#20103)
-#20104=*
-stmts(#20104,2,#20001,3,"x4 && y4 ?? z4;")
-hasLocation(#20104,#20013)
-stmt_containers(#20104,#20001)
+stmts(#20094,2,#20001,2,"x3 ?? y3 || z3;")
+hasLocation(#20094,#20009)
+stmt_containers(#20094,#20001)
+#20095=*
+exprs(#20095,45,#20094,0,"x3 ?? y3 || z3")
+#20096=@"loc,{#10000},4,1,4,14"
+locations_default(#20096,#10000,4,1,4,14)
+hasLocation(#20095,#20096)
+enclosing_stmt(#20095,#20094)
+expr_containers(#20095,#20001)
+#20097=*
+exprs(#20097,107,#20095,0,"x3 ?? y3")
+#20098=@"loc,{#10000},4,1,4,8"
+locations_default(#20098,#10000,4,1,4,8)
+hasLocation(#20097,#20098)
+enclosing_stmt(#20097,#20094)
+expr_containers(#20097,#20001)
+#20099=*
+exprs(#20099,79,#20097,0,"x3")
+hasLocation(#20099,#20037)
+enclosing_stmt(#20099,#20094)
+expr_containers(#20099,#20001)
+literals("x3","x3",#20099)
+#20100=@"var;{x3};{#20000}"
+variables(#20100,"x3",#20000)
+bind(#20099,#20100)
+#20101=*
+exprs(#20101,79,#20097,1,"y3")
+hasLocation(#20101,#20041)
+enclosing_stmt(#20101,#20094)
+expr_containers(#20101,#20001)
+literals("y3","y3",#20101)
+#20102=@"var;{y3};{#20000}"
+variables(#20102,"y3",#20000)
+bind(#20101,#20102)
+#20103=*
+exprs(#20103,79,#20095,1,"z3")
+hasLocation(#20103,#20045)
+enclosing_stmt(#20103,#20094)
+expr_containers(#20103,#20001)
+literals("z3","z3",#20103)
+#20104=@"var;{z3};{#20000}"
+variables(#20104,"z3",#20000)
+bind(#20103,#20104)
 #20105=*
-exprs(#20105,107,#20104,0,"x4 && y4 ?? z4")
-#20106=@"loc,{#10000},6,1,6,14"
-locations_default(#20106,#10000,6,1,6,14)
-hasLocation(#20105,#20106)
-enclosing_stmt(#20105,#20104)
-expr_containers(#20105,#20001)
-#20107=*
-exprs(#20107,44,#20105,0,"x4 && y4")
-#20108=@"loc,{#10000},6,1,6,8"
-locations_default(#20108,#10000,6,1,6,8)
-hasLocation(#20107,#20108)
-enclosing_stmt(#20107,#20104)
-expr_containers(#20107,#20001)
-#20109=*
-exprs(#20109,79,#20107,0,"x4")
-hasLocation(#20109,#20049)
-enclosing_stmt(#20109,#20104)
-expr_containers(#20109,#20001)
-literals("x4","x4",#20109)
-#20110=@"var;{x4};{#20000}"
-variables(#20110,"x4",#20000)
-bind(#20109,#20110)
-#20111=*
-exprs(#20111,79,#20107,1,"y4")
-hasLocation(#20111,#20053)
-enclosing_stmt(#20111,#20104)
-expr_containers(#20111,#20001)
-literals("y4","y4",#20111)
-#20112=@"var;{y4};{#20000}"
-variables(#20112,"y4",#20000)
-bind(#20111,#20112)
-#20113=*
-exprs(#20113,79,#20105,1,"z4")
-hasLocation(#20113,#20057)
-enclosing_stmt(#20113,#20104)
-expr_containers(#20113,#20001)
-literals("z4","z4",#20113)
-#20114=@"var;{z4};{#20000}"
-variables(#20114,"z4",#20000)
-bind(#20113,#20114)
-#20115=*
-stmts(#20115,2,#20001,4,"x5 ?? y5 && z5;")
-hasLocation(#20115,#20015)
-stmt_containers(#20115,#20001)
+stmts(#20105,2,#20001,3,"x4 && y4 ?? z4;")
+hasLocation(#20105,#20013)
+stmt_containers(#20105,#20001)
+#20106=*
+exprs(#20106,107,#20105,0,"x4 && y4 ?? z4")
+#20107=@"loc,{#10000},6,1,6,14"
+locations_default(#20107,#10000,6,1,6,14)
+hasLocation(#20106,#20107)
+enclosing_stmt(#20106,#20105)
+expr_containers(#20106,#20001)
+#20108=*
+exprs(#20108,44,#20106,0,"x4 && y4")
+#20109=@"loc,{#10000},6,1,6,8"
+locations_default(#20109,#10000,6,1,6,8)
+hasLocation(#20108,#20109)
+enclosing_stmt(#20108,#20105)
+expr_containers(#20108,#20001)
+#20110=*
+exprs(#20110,79,#20108,0,"x4")
+hasLocation(#20110,#20049)
+enclosing_stmt(#20110,#20105)
+expr_containers(#20110,#20001)
+literals("x4","x4",#20110)
+#20111=@"var;{x4};{#20000}"
+variables(#20111,"x4",#20000)
+bind(#20110,#20111)
+#20112=*
+exprs(#20112,79,#20108,1,"y4")
+hasLocation(#20112,#20053)
+enclosing_stmt(#20112,#20105)
+expr_containers(#20112,#20001)
+literals("y4","y4",#20112)
+#20113=@"var;{y4};{#20000}"
+variables(#20113,"y4",#20000)
+bind(#20112,#20113)
+#20114=*
+exprs(#20114,79,#20106,1,"z4")
+hasLocation(#20114,#20057)
+enclosing_stmt(#20114,#20105)
+expr_containers(#20114,#20001)
+literals("z4","z4",#20114)
+#20115=@"var;{z4};{#20000}"
+variables(#20115,"z4",#20000)
+bind(#20114,#20115)
 #20116=*
-exprs(#20116,107,#20115,0,"x5 ?? y5 && z5")
-#20117=@"loc,{#10000},7,1,7,14"
-locations_default(#20117,#10000,7,1,7,14)
-hasLocation(#20116,#20117)
-enclosing_stmt(#20116,#20115)
-expr_containers(#20116,#20001)
-#20118=*
-exprs(#20118,79,#20116,0,"x5")
-hasLocation(#20118,#20061)
-enclosing_stmt(#20118,#20115)
-expr_containers(#20118,#20001)
-literals("x5","x5",#20118)
-#20119=@"var;{x5};{#20000}"
-variables(#20119,"x5",#20000)
-bind(#20118,#20119)
-#20120=*
-exprs(#20120,44,#20116,1,"y5 && z5")
-#20121=@"loc,{#10000},7,7,7,14"
-locations_default(#20121,#10000,7,7,7,14)
-hasLocation(#20120,#20121)
-enclosing_stmt(#20120,#20115)
-expr_containers(#20120,#20001)
-#20122=*
-exprs(#20122,79,#20120,0,"y5")
-hasLocation(#20122,#20065)
-enclosing_stmt(#20122,#20115)
-expr_containers(#20122,#20001)
-literals("y5","y5",#20122)
-#20123=@"var;{y5};{#20000}"
-variables(#20123,"y5",#20000)
-bind(#20122,#20123)
-#20124=*
-exprs(#20124,79,#20120,1,"z5")
-hasLocation(#20124,#20069)
-enclosing_stmt(#20124,#20115)
-expr_containers(#20124,#20001)
-literals("z5","z5",#20124)
-#20125=@"var;{z5};{#20000}"
-variables(#20125,"z5",#20000)
-bind(#20124,#20125)
-#20126=*
-entry_cfg_node(#20126,#20001)
-#20127=@"loc,{#10000},1,1,1,0"
-locations_default(#20127,#10000,1,1,1,0)
-hasLocation(#20126,#20127)
-#20128=*
-exit_cfg_node(#20128,#20001)
-hasLocation(#20128,#20073)
-successor(#20115,#20116)
-successor(#20116,#20118)
-successor(#20118,#20120)
-successor(#20118,#20128)
-successor(#20120,#20122)
+stmts(#20116,2,#20001,4,"x5 ?? y5 && z5;")
+hasLocation(#20116,#20015)
+stmt_containers(#20116,#20001)
+#20117=*
+exprs(#20117,107,#20116,0,"x5 ?? y5 && z5")
+#20118=@"loc,{#10000},7,1,7,14"
+locations_default(#20118,#10000,7,1,7,14)
+hasLocation(#20117,#20118)
+enclosing_stmt(#20117,#20116)
+expr_containers(#20117,#20001)
+#20119=*
+exprs(#20119,79,#20117,0,"x5")
+hasLocation(#20119,#20061)
+enclosing_stmt(#20119,#20116)
+expr_containers(#20119,#20001)
+literals("x5","x5",#20119)
+#20120=@"var;{x5};{#20000}"
+variables(#20120,"x5",#20000)
+bind(#20119,#20120)
+#20121=*
+exprs(#20121,44,#20117,1,"y5 && z5")
+#20122=@"loc,{#10000},7,7,7,14"
+locations_default(#20122,#10000,7,7,7,14)
+hasLocation(#20121,#20122)
+enclosing_stmt(#20121,#20116)
+expr_containers(#20121,#20001)
+#20123=*
+exprs(#20123,79,#20121,0,"y5")
+hasLocation(#20123,#20065)
+enclosing_stmt(#20123,#20116)
+expr_containers(#20123,#20001)
+literals("y5","y5",#20123)
+#20124=@"var;{y5};{#20000}"
+variables(#20124,"y5",#20000)
+bind(#20123,#20124)
+#20125=*
+exprs(#20125,79,#20121,1,"z5")
+hasLocation(#20125,#20069)
+enclosing_stmt(#20125,#20116)
+expr_containers(#20125,#20001)
+literals("z5","z5",#20125)
+#20126=@"var;{z5};{#20000}"
+variables(#20126,"z5",#20000)
+bind(#20125,#20126)
+#20127=*
+entry_cfg_node(#20127,#20001)
+#20128=@"loc,{#10000},1,1,1,0"
+locations_default(#20128,#10000,1,1,1,0)
+hasLocation(#20127,#20128)
 #20129=*
-guard_node(#20129,1,#20122)
-hasLocation(#20129,#20065)
-successor(#20129,#20124)
+exit_cfg_node(#20129,#20001)
+hasLocation(#20129,#20073)
+successor(#20116,#20117)
+successor(#20117,#20119)
+successor(#20119,#20121)
+successor(#20119,#20129)
+successor(#20121,#20123)
 #20130=*
-guard_node(#20130,0,#20122)
+guard_node(#20130,1,#20123)
 hasLocation(#20130,#20065)
-successor(#20130,#20128)
-successor(#20122,#20129)
-successor(#20122,#20130)
-successor(#20124,#20128)
-successor(#20104,#20105)
-successor(#20105,#20107)
-successor(#20107,#20109)
+successor(#20130,#20125)
 #20131=*
-guard_node(#20131,1,#20109)
-hasLocation(#20131,#20049)
-successor(#20131,#20111)
+guard_node(#20131,0,#20123)
+hasLocation(#20131,#20065)
+successor(#20131,#20129)
+successor(#20123,#20130)
+successor(#20123,#20131)
+successor(#20125,#20129)
+successor(#20105,#20106)
+successor(#20106,#20108)
+successor(#20108,#20110)
 #20132=*
-guard_node(#20132,0,#20109)
+guard_node(#20132,1,#20110)
 hasLocation(#20132,#20049)
-successor(#20132,#20113)
-successor(#20132,#20115)
-successor(#20109,#20131)
-successor(#20109,#20132)
-successor(#20111,#20113)
-successor(#20111,#20115)
-successor(#20113,#20115)
-successor(#20093,#20094)
-successor(#20094,#20096)
-successor(#20096,#20098)
-successor(#20098,#20100)
-successor(#20098,#20104)
-successor(#20098,#20102)
+successor(#20132,#20112)
 #20133=*
-guard_node(#20133,1,#20100)
-hasLocation(#20133,#20041)
-successor(#20133,#20104)
+guard_node(#20133,0,#20110)
+hasLocation(#20133,#20049)
+successor(#20133,#20114)
+successor(#20133,#20116)
+successor(#20110,#20132)
+successor(#20110,#20133)
+successor(#20112,#20114)
+successor(#20112,#20116)
+successor(#20114,#20116)
+successor(#20094,#20095)
+successor(#20095,#20097)
+successor(#20097,#20099)
+successor(#20099,#20101)
+successor(#20099,#20105)
+successor(#20099,#20103)
 #20134=*
-guard_node(#20134,0,#20100)
+guard_node(#20134,1,#20101)
 hasLocation(#20134,#20041)
-successor(#20134,#20102)
-successor(#20100,#20133)
-successor(#20100,#20134)
-successor(#20102,#20104)
-successor(#20082,#20083)
-successor(#20083,#20085)
-successor(#20085,#20087)
+successor(#20134,#20105)
 #20135=*
-guard_node(#20135,1,#20087)
-hasLocation(#20135,#20025)
-successor(#20135,#20091)
-successor(#20135,#20093)
+guard_node(#20135,0,#20101)
+hasLocation(#20135,#20041)
+successor(#20135,#20103)
+successor(#20101,#20134)
+successor(#20101,#20135)
+successor(#20103,#20105)
+successor(#20083,#20084)
+successor(#20084,#20086)
+successor(#20086,#20088)
 #20136=*
-guard_node(#20136,0,#20087)
+guard_node(#20136,1,#20088)
 hasLocation(#20136,#20025)
-successor(#20136,#20089)
-successor(#20087,#20135)
-successor(#20087,#20136)
-successor(#20089,#20091)
-successor(#20089,#20093)
-successor(#20091,#20093)
-successor(#20075,#20076)
-successor(#20076,#20078)
-successor(#20078,#20080)
-successor(#20078,#20082)
-successor(#20080,#20082)
-successor(#20126,#20075)
+successor(#20136,#20092)
+successor(#20136,#20094)
+#20137=*
+guard_node(#20137,0,#20088)
+hasLocation(#20137,#20025)
+successor(#20137,#20090)
+successor(#20088,#20136)
+successor(#20088,#20137)
+successor(#20090,#20092)
+successor(#20090,#20094)
+successor(#20092,#20094)
+successor(#20076,#20077)
+successor(#20077,#20079)
+successor(#20079,#20081)
+successor(#20079,#20083)
+successor(#20081,#20083)
+successor(#20127,#20076)
 numlines(#10000,7,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/esnext/output/trap/optional-chaining.js.trap b/javascript/extractor/tests/esnext/output/trap/optional-chaining.js.trap
index fb44a997170..15f922d5b4e 100644
--- a/javascript/extractor/tests/esnext/output/trap/optional-chaining.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/optional-chaining.js.trap
@@ -326,330 +326,332 @@ toplevels(#20001,0)
 #20122=@"loc,{#10000},1,1,13,11"
 locations_default(#20122,#10000,1,1,13,11)
 hasLocation(#20001,#20122)
-#20123=*
-stmts(#20123,2,#20001,0,"a1?.b1;")
-hasLocation(#20123,#20003)
-stmt_containers(#20123,#20001)
+#20123=@"var;{this};{#20000}"
+variables(#20123,"this",#20000)
 #20124=*
-exprs(#20124,14,#20123,0,"a1?.b1")
-#20125=@"loc,{#10000},1,1,1,6"
-locations_default(#20125,#10000,1,1,1,6)
-hasLocation(#20124,#20125)
-enclosing_stmt(#20124,#20123)
-expr_containers(#20124,#20001)
-#20126=*
-exprs(#20126,79,#20124,0,"a1")
-hasLocation(#20126,#20029)
-enclosing_stmt(#20126,#20123)
-expr_containers(#20126,#20001)
-literals("a1","a1",#20126)
-#20127=@"var;{a1};{#20000}"
-variables(#20127,"a1",#20000)
-bind(#20126,#20127)
-#20128=*
-exprs(#20128,0,#20124,1,"b1")
-hasLocation(#20128,#20033)
-enclosing_stmt(#20128,#20123)
-expr_containers(#20128,#20001)
-literals("b1","b1",#20128)
-isOptionalChaining(#20124)
+stmts(#20124,2,#20001,0,"a1?.b1;")
+hasLocation(#20124,#20003)
+stmt_containers(#20124,#20001)
+#20125=*
+exprs(#20125,14,#20124,0,"a1?.b1")
+#20126=@"loc,{#10000},1,1,1,6"
+locations_default(#20126,#10000,1,1,1,6)
+hasLocation(#20125,#20126)
+enclosing_stmt(#20125,#20124)
+expr_containers(#20125,#20001)
+#20127=*
+exprs(#20127,79,#20125,0,"a1")
+hasLocation(#20127,#20029)
+enclosing_stmt(#20127,#20124)
+expr_containers(#20127,#20001)
+literals("a1","a1",#20127)
+#20128=@"var;{a1};{#20000}"
+variables(#20128,"a1",#20000)
+bind(#20127,#20128)
 #20129=*
-stmts(#20129,2,#20001,1,"a2?.[x2];")
-hasLocation(#20129,#20007)
-stmt_containers(#20129,#20001)
+exprs(#20129,0,#20125,1,"b1")
+hasLocation(#20129,#20033)
+enclosing_stmt(#20129,#20124)
+expr_containers(#20129,#20001)
+literals("b1","b1",#20129)
+isOptionalChaining(#20125)
 #20130=*
-exprs(#20130,15,#20129,0,"a2?.[x2]")
-#20131=@"loc,{#10000},3,1,3,8"
-locations_default(#20131,#10000,3,1,3,8)
-hasLocation(#20130,#20131)
-enclosing_stmt(#20130,#20129)
-expr_containers(#20130,#20001)
-#20132=*
-exprs(#20132,79,#20130,0,"a2")
-hasLocation(#20132,#20037)
-enclosing_stmt(#20132,#20129)
-expr_containers(#20132,#20001)
-literals("a2","a2",#20132)
-#20133=@"var;{a2};{#20000}"
-variables(#20133,"a2",#20000)
-bind(#20132,#20133)
-#20134=*
-exprs(#20134,79,#20130,1,"x2")
-hasLocation(#20134,#20043)
-enclosing_stmt(#20134,#20129)
-expr_containers(#20134,#20001)
-literals("x2","x2",#20134)
-#20135=@"var;{x2};{#20000}"
-variables(#20135,"x2",#20000)
-bind(#20134,#20135)
-isOptionalChaining(#20130)
-#20136=*
-stmts(#20136,2,#20001,2,"a3?.b3();")
-hasLocation(#20136,#20011)
-stmt_containers(#20136,#20001)
+stmts(#20130,2,#20001,1,"a2?.[x2];")
+hasLocation(#20130,#20007)
+stmt_containers(#20130,#20001)
+#20131=*
+exprs(#20131,15,#20130,0,"a2?.[x2]")
+#20132=@"loc,{#10000},3,1,3,8"
+locations_default(#20132,#10000,3,1,3,8)
+hasLocation(#20131,#20132)
+enclosing_stmt(#20131,#20130)
+expr_containers(#20131,#20001)
+#20133=*
+exprs(#20133,79,#20131,0,"a2")
+hasLocation(#20133,#20037)
+enclosing_stmt(#20133,#20130)
+expr_containers(#20133,#20001)
+literals("a2","a2",#20133)
+#20134=@"var;{a2};{#20000}"
+variables(#20134,"a2",#20000)
+bind(#20133,#20134)
+#20135=*
+exprs(#20135,79,#20131,1,"x2")
+hasLocation(#20135,#20043)
+enclosing_stmt(#20135,#20130)
+expr_containers(#20135,#20001)
+literals("x2","x2",#20135)
+#20136=@"var;{x2};{#20000}"
+variables(#20136,"x2",#20000)
+bind(#20135,#20136)
+isOptionalChaining(#20131)
 #20137=*
-exprs(#20137,13,#20136,0,"a3?.b3()")
-#20138=@"loc,{#10000},5,1,5,8"
-locations_default(#20138,#10000,5,1,5,8)
-hasLocation(#20137,#20138)
-enclosing_stmt(#20137,#20136)
-expr_containers(#20137,#20001)
-#20139=*
-exprs(#20139,14,#20137,-1,"a3?.b3")
-#20140=@"loc,{#10000},5,1,5,6"
-locations_default(#20140,#10000,5,1,5,6)
-hasLocation(#20139,#20140)
-enclosing_stmt(#20139,#20136)
-expr_containers(#20139,#20001)
-#20141=*
-exprs(#20141,79,#20139,0,"a3")
-hasLocation(#20141,#20049)
-enclosing_stmt(#20141,#20136)
-expr_containers(#20141,#20001)
-literals("a3","a3",#20141)
-#20142=@"var;{a3};{#20000}"
-variables(#20142,"a3",#20000)
-bind(#20141,#20142)
-#20143=*
-exprs(#20143,0,#20139,1,"b3")
-hasLocation(#20143,#20053)
-enclosing_stmt(#20143,#20136)
-expr_containers(#20143,#20001)
-literals("b3","b3",#20143)
-isOptionalChaining(#20139)
+stmts(#20137,2,#20001,2,"a3?.b3();")
+hasLocation(#20137,#20011)
+stmt_containers(#20137,#20001)
+#20138=*
+exprs(#20138,13,#20137,0,"a3?.b3()")
+#20139=@"loc,{#10000},5,1,5,8"
+locations_default(#20139,#10000,5,1,5,8)
+hasLocation(#20138,#20139)
+enclosing_stmt(#20138,#20137)
+expr_containers(#20138,#20001)
+#20140=*
+exprs(#20140,14,#20138,-1,"a3?.b3")
+#20141=@"loc,{#10000},5,1,5,6"
+locations_default(#20141,#10000,5,1,5,6)
+hasLocation(#20140,#20141)
+enclosing_stmt(#20140,#20137)
+expr_containers(#20140,#20001)
+#20142=*
+exprs(#20142,79,#20140,0,"a3")
+hasLocation(#20142,#20049)
+enclosing_stmt(#20142,#20137)
+expr_containers(#20142,#20001)
+literals("a3","a3",#20142)
+#20143=@"var;{a3};{#20000}"
+variables(#20143,"a3",#20000)
+bind(#20142,#20143)
 #20144=*
-stmts(#20144,2,#20001,3,"a4?.();")
-hasLocation(#20144,#20015)
-stmt_containers(#20144,#20001)
+exprs(#20144,0,#20140,1,"b3")
+hasLocation(#20144,#20053)
+enclosing_stmt(#20144,#20137)
+expr_containers(#20144,#20001)
+literals("b3","b3",#20144)
+isOptionalChaining(#20140)
 #20145=*
-exprs(#20145,13,#20144,0,"a4?.()")
-#20146=@"loc,{#10000},7,1,7,6"
-locations_default(#20146,#10000,7,1,7,6)
-hasLocation(#20145,#20146)
-enclosing_stmt(#20145,#20144)
-expr_containers(#20145,#20001)
-#20147=*
-exprs(#20147,79,#20145,-1,"a4")
-hasLocation(#20147,#20061)
-enclosing_stmt(#20147,#20144)
-expr_containers(#20147,#20001)
-literals("a4","a4",#20147)
-#20148=@"var;{a4};{#20000}"
-variables(#20148,"a4",#20000)
-bind(#20147,#20148)
-isOptionalChaining(#20145)
-#20149=*
-stmts(#20149,2,#20001,4,"o5?.3:2;")
-hasLocation(#20149,#20019)
-stmt_containers(#20149,#20001)
+stmts(#20145,2,#20001,3,"a4?.();")
+hasLocation(#20145,#20015)
+stmt_containers(#20145,#20001)
+#20146=*
+exprs(#20146,13,#20145,0,"a4?.()")
+#20147=@"loc,{#10000},7,1,7,6"
+locations_default(#20147,#10000,7,1,7,6)
+hasLocation(#20146,#20147)
+enclosing_stmt(#20146,#20145)
+expr_containers(#20146,#20001)
+#20148=*
+exprs(#20148,79,#20146,-1,"a4")
+hasLocation(#20148,#20061)
+enclosing_stmt(#20148,#20145)
+expr_containers(#20148,#20001)
+literals("a4","a4",#20148)
+#20149=@"var;{a4};{#20000}"
+variables(#20149,"a4",#20000)
+bind(#20148,#20149)
+isOptionalChaining(#20146)
 #20150=*
-exprs(#20150,11,#20149,0,"o5?.3:2")
-#20151=@"loc,{#10000},9,1,9,7"
-locations_default(#20151,#10000,9,1,9,7)
-hasLocation(#20150,#20151)
-enclosing_stmt(#20150,#20149)
-expr_containers(#20150,#20001)
-#20152=*
-exprs(#20152,79,#20150,0,"o5")
-hasLocation(#20152,#20071)
-enclosing_stmt(#20152,#20149)
-expr_containers(#20152,#20001)
-literals("o5","o5",#20152)
-#20153=@"var;{o5};{#20000}"
-variables(#20153,"o5",#20000)
-bind(#20152,#20153)
-#20154=*
-exprs(#20154,3,#20150,1,".3")
-hasLocation(#20154,#20075)
-enclosing_stmt(#20154,#20149)
-expr_containers(#20154,#20001)
-literals("0.3",".3",#20154)
+stmts(#20150,2,#20001,4,"o5?.3:2;")
+hasLocation(#20150,#20019)
+stmt_containers(#20150,#20001)
+#20151=*
+exprs(#20151,11,#20150,0,"o5?.3:2")
+#20152=@"loc,{#10000},9,1,9,7"
+locations_default(#20152,#10000,9,1,9,7)
+hasLocation(#20151,#20152)
+enclosing_stmt(#20151,#20150)
+expr_containers(#20151,#20001)
+#20153=*
+exprs(#20153,79,#20151,0,"o5")
+hasLocation(#20153,#20071)
+enclosing_stmt(#20153,#20150)
+expr_containers(#20153,#20001)
+literals("o5","o5",#20153)
+#20154=@"var;{o5};{#20000}"
+variables(#20154,"o5",#20000)
+bind(#20153,#20154)
 #20155=*
-exprs(#20155,3,#20150,2,"2")
-hasLocation(#20155,#20079)
-enclosing_stmt(#20155,#20149)
+exprs(#20155,3,#20151,1,".3")
+hasLocation(#20155,#20075)
+enclosing_stmt(#20155,#20150)
 expr_containers(#20155,#20001)
-literals("2","2",#20155)
+literals("0.3",".3",#20155)
 #20156=*
-stmts(#20156,2,#20001,5,"a6?.b6[ ... y6).d6;")
-hasLocation(#20156,#20023)
-stmt_containers(#20156,#20001)
+exprs(#20156,3,#20151,2,"2")
+hasLocation(#20156,#20079)
+enclosing_stmt(#20156,#20150)
+expr_containers(#20156,#20001)
+literals("2","2",#20156)
 #20157=*
-exprs(#20157,14,#20156,0,"a6?.b6[ ... (y6).d6")
-#20158=@"loc,{#10000},11,1,11,22"
-locations_default(#20158,#10000,11,1,11,22)
-hasLocation(#20157,#20158)
-enclosing_stmt(#20157,#20156)
-expr_containers(#20157,#20001)
-#20159=*
-exprs(#20159,13,#20157,0,"a6?.b6[x6].c6?.(y6)")
-#20160=@"loc,{#10000},11,1,11,19"
-locations_default(#20160,#10000,11,1,11,19)
-hasLocation(#20159,#20160)
-enclosing_stmt(#20159,#20156)
-expr_containers(#20159,#20001)
-#20161=*
-exprs(#20161,14,#20159,-1,"a6?.b6[x6].c6")
-#20162=@"loc,{#10000},11,1,11,13"
-locations_default(#20162,#10000,11,1,11,13)
-hasLocation(#20161,#20162)
-enclosing_stmt(#20161,#20156)
-expr_containers(#20161,#20001)
-#20163=*
-exprs(#20163,15,#20161,0,"a6?.b6[x6]")
-#20164=@"loc,{#10000},11,1,11,10"
-locations_default(#20164,#10000,11,1,11,10)
-hasLocation(#20163,#20164)
-enclosing_stmt(#20163,#20156)
-expr_containers(#20163,#20001)
-#20165=*
-exprs(#20165,14,#20163,0,"a6?.b6")
-#20166=@"loc,{#10000},11,1,11,6"
-locations_default(#20166,#10000,11,1,11,6)
-hasLocation(#20165,#20166)
-enclosing_stmt(#20165,#20156)
-expr_containers(#20165,#20001)
-#20167=*
-exprs(#20167,79,#20165,0,"a6")
-hasLocation(#20167,#20083)
-enclosing_stmt(#20167,#20156)
-expr_containers(#20167,#20001)
-literals("a6","a6",#20167)
-#20168=@"var;{a6};{#20000}"
-variables(#20168,"a6",#20000)
-bind(#20167,#20168)
-#20169=*
-exprs(#20169,0,#20165,1,"b6")
-hasLocation(#20169,#20087)
-enclosing_stmt(#20169,#20156)
-expr_containers(#20169,#20001)
-literals("b6","b6",#20169)
-isOptionalChaining(#20165)
+stmts(#20157,2,#20001,5,"a6?.b6[ ... y6).d6;")
+hasLocation(#20157,#20023)
+stmt_containers(#20157,#20001)
+#20158=*
+exprs(#20158,14,#20157,0,"a6?.b6[ ... (y6).d6")
+#20159=@"loc,{#10000},11,1,11,22"
+locations_default(#20159,#10000,11,1,11,22)
+hasLocation(#20158,#20159)
+enclosing_stmt(#20158,#20157)
+expr_containers(#20158,#20001)
+#20160=*
+exprs(#20160,13,#20158,0,"a6?.b6[x6].c6?.(y6)")
+#20161=@"loc,{#10000},11,1,11,19"
+locations_default(#20161,#10000,11,1,11,19)
+hasLocation(#20160,#20161)
+enclosing_stmt(#20160,#20157)
+expr_containers(#20160,#20001)
+#20162=*
+exprs(#20162,14,#20160,-1,"a6?.b6[x6].c6")
+#20163=@"loc,{#10000},11,1,11,13"
+locations_default(#20163,#10000,11,1,11,13)
+hasLocation(#20162,#20163)
+enclosing_stmt(#20162,#20157)
+expr_containers(#20162,#20001)
+#20164=*
+exprs(#20164,15,#20162,0,"a6?.b6[x6]")
+#20165=@"loc,{#10000},11,1,11,10"
+locations_default(#20165,#10000,11,1,11,10)
+hasLocation(#20164,#20165)
+enclosing_stmt(#20164,#20157)
+expr_containers(#20164,#20001)
+#20166=*
+exprs(#20166,14,#20164,0,"a6?.b6")
+#20167=@"loc,{#10000},11,1,11,6"
+locations_default(#20167,#10000,11,1,11,6)
+hasLocation(#20166,#20167)
+enclosing_stmt(#20166,#20157)
+expr_containers(#20166,#20001)
+#20168=*
+exprs(#20168,79,#20166,0,"a6")
+hasLocation(#20168,#20083)
+enclosing_stmt(#20168,#20157)
+expr_containers(#20168,#20001)
+literals("a6","a6",#20168)
+#20169=@"var;{a6};{#20000}"
+variables(#20169,"a6",#20000)
+bind(#20168,#20169)
 #20170=*
-exprs(#20170,79,#20163,1,"x6")
-hasLocation(#20170,#20091)
-enclosing_stmt(#20170,#20156)
+exprs(#20170,0,#20166,1,"b6")
+hasLocation(#20170,#20087)
+enclosing_stmt(#20170,#20157)
 expr_containers(#20170,#20001)
-literals("x6","x6",#20170)
-#20171=@"var;{x6};{#20000}"
-variables(#20171,"x6",#20000)
-bind(#20170,#20171)
-#20172=*
-exprs(#20172,0,#20161,1,"c6")
-hasLocation(#20172,#20097)
-enclosing_stmt(#20172,#20156)
-expr_containers(#20172,#20001)
-literals("c6","c6",#20172)
+literals("b6","b6",#20170)
+isOptionalChaining(#20166)
+#20171=*
+exprs(#20171,79,#20164,1,"x6")
+hasLocation(#20171,#20091)
+enclosing_stmt(#20171,#20157)
+expr_containers(#20171,#20001)
+literals("x6","x6",#20171)
+#20172=@"var;{x6};{#20000}"
+variables(#20172,"x6",#20000)
+bind(#20171,#20172)
 #20173=*
-exprs(#20173,79,#20159,0,"y6")
-hasLocation(#20173,#20103)
-enclosing_stmt(#20173,#20156)
+exprs(#20173,0,#20162,1,"c6")
+hasLocation(#20173,#20097)
+enclosing_stmt(#20173,#20157)
 expr_containers(#20173,#20001)
-literals("y6","y6",#20173)
-#20174=@"var;{y6};{#20000}"
-variables(#20174,"y6",#20000)
-bind(#20173,#20174)
-isOptionalChaining(#20159)
-#20175=*
-exprs(#20175,0,#20157,1,"d6")
-hasLocation(#20175,#20109)
-enclosing_stmt(#20175,#20156)
-expr_containers(#20175,#20001)
-literals("d6","d6",#20175)
+literals("c6","c6",#20173)
+#20174=*
+exprs(#20174,79,#20160,0,"y6")
+hasLocation(#20174,#20103)
+enclosing_stmt(#20174,#20157)
+expr_containers(#20174,#20001)
+literals("y6","y6",#20174)
+#20175=@"var;{y6};{#20000}"
+variables(#20175,"y6",#20000)
+bind(#20174,#20175)
+isOptionalChaining(#20160)
 #20176=*
-stmts(#20176,2,#20001,6,"delete a?.b")
-hasLocation(#20176,#20027)
-stmt_containers(#20176,#20001)
+exprs(#20176,0,#20158,1,"d6")
+hasLocation(#20176,#20109)
+enclosing_stmt(#20176,#20157)
+expr_containers(#20176,#20001)
+literals("d6","d6",#20176)
 #20177=*
-exprs(#20177,22,#20176,0,"delete a?.b")
+stmts(#20177,2,#20001,6,"delete a?.b")
 hasLocation(#20177,#20027)
-enclosing_stmt(#20177,#20176)
-expr_containers(#20177,#20001)
+stmt_containers(#20177,#20001)
 #20178=*
-exprs(#20178,14,#20177,0,"a?.b")
-#20179=@"loc,{#10000},13,8,13,11"
-locations_default(#20179,#10000,13,8,13,11)
-hasLocation(#20178,#20179)
-enclosing_stmt(#20178,#20176)
+exprs(#20178,22,#20177,0,"delete a?.b")
+hasLocation(#20178,#20027)
+enclosing_stmt(#20178,#20177)
 expr_containers(#20178,#20001)
-#20180=*
-exprs(#20180,79,#20178,0,"a")
-hasLocation(#20180,#20115)
-enclosing_stmt(#20180,#20176)
-expr_containers(#20180,#20001)
-literals("a","a",#20180)
-#20181=@"var;{a};{#20000}"
-variables(#20181,"a",#20000)
-bind(#20180,#20181)
-#20182=*
-exprs(#20182,0,#20178,1,"b")
-hasLocation(#20182,#20119)
-enclosing_stmt(#20182,#20176)
-expr_containers(#20182,#20001)
-literals("b","b",#20182)
-isOptionalChaining(#20178)
+#20179=*
+exprs(#20179,14,#20178,0,"a?.b")
+#20180=@"loc,{#10000},13,8,13,11"
+locations_default(#20180,#10000,13,8,13,11)
+hasLocation(#20179,#20180)
+enclosing_stmt(#20179,#20177)
+expr_containers(#20179,#20001)
+#20181=*
+exprs(#20181,79,#20179,0,"a")
+hasLocation(#20181,#20115)
+enclosing_stmt(#20181,#20177)
+expr_containers(#20181,#20001)
+literals("a","a",#20181)
+#20182=@"var;{a};{#20000}"
+variables(#20182,"a",#20000)
+bind(#20181,#20182)
 #20183=*
-entry_cfg_node(#20183,#20001)
-#20184=@"loc,{#10000},1,1,1,0"
-locations_default(#20184,#10000,1,1,1,0)
-hasLocation(#20183,#20184)
-#20185=*
-exit_cfg_node(#20185,#20001)
-hasLocation(#20185,#20121)
-successor(#20176,#20180)
-successor(#20182,#20178)
-successor(#20180,#20182)
-successor(#20178,#20177)
-successor(#20180,#20177)
-successor(#20177,#20185)
-successor(#20156,#20167)
-successor(#20175,#20157)
-successor(#20173,#20159)
-successor(#20172,#20161)
-successor(#20170,#20163)
-successor(#20169,#20165)
-successor(#20167,#20169)
-successor(#20165,#20170)
-successor(#20167,#20176)
-successor(#20163,#20172)
-successor(#20161,#20173)
-successor(#20159,#20175)
-successor(#20161,#20176)
-successor(#20157,#20176)
-successor(#20149,#20150)
-successor(#20150,#20152)
+exprs(#20183,0,#20179,1,"b")
+hasLocation(#20183,#20119)
+enclosing_stmt(#20183,#20177)
+expr_containers(#20183,#20001)
+literals("b","b",#20183)
+isOptionalChaining(#20179)
+#20184=*
+entry_cfg_node(#20184,#20001)
+#20185=@"loc,{#10000},1,1,1,0"
+locations_default(#20185,#10000,1,1,1,0)
+hasLocation(#20184,#20185)
 #20186=*
-guard_node(#20186,1,#20152)
-hasLocation(#20186,#20071)
-successor(#20186,#20154)
+exit_cfg_node(#20186,#20001)
+hasLocation(#20186,#20121)
+successor(#20177,#20181)
+successor(#20183,#20179)
+successor(#20181,#20183)
+successor(#20179,#20178)
+successor(#20181,#20178)
+successor(#20178,#20186)
+successor(#20157,#20168)
+successor(#20176,#20158)
+successor(#20174,#20160)
+successor(#20173,#20162)
+successor(#20171,#20164)
+successor(#20170,#20166)
+successor(#20168,#20170)
+successor(#20166,#20171)
+successor(#20168,#20177)
+successor(#20164,#20173)
+successor(#20162,#20174)
+successor(#20160,#20176)
+successor(#20162,#20177)
+successor(#20158,#20177)
+successor(#20150,#20151)
+successor(#20151,#20153)
 #20187=*
-guard_node(#20187,0,#20152)
+guard_node(#20187,1,#20153)
 hasLocation(#20187,#20071)
 successor(#20187,#20155)
-successor(#20152,#20186)
-successor(#20152,#20187)
-successor(#20154,#20156)
-successor(#20155,#20156)
-successor(#20144,#20147)
-successor(#20147,#20145)
-successor(#20145,#20149)
-successor(#20147,#20149)
-successor(#20136,#20141)
-successor(#20143,#20139)
-successor(#20141,#20143)
-successor(#20139,#20137)
-successor(#20141,#20144)
-successor(#20137,#20144)
-successor(#20129,#20132)
-successor(#20134,#20130)
-successor(#20132,#20134)
-successor(#20130,#20136)
-successor(#20132,#20136)
-successor(#20123,#20126)
-successor(#20128,#20124)
-successor(#20126,#20128)
-successor(#20124,#20129)
-successor(#20126,#20129)
-successor(#20183,#20123)
+#20188=*
+guard_node(#20188,0,#20153)
+hasLocation(#20188,#20071)
+successor(#20188,#20156)
+successor(#20153,#20187)
+successor(#20153,#20188)
+successor(#20155,#20157)
+successor(#20156,#20157)
+successor(#20145,#20148)
+successor(#20148,#20146)
+successor(#20146,#20150)
+successor(#20148,#20150)
+successor(#20137,#20142)
+successor(#20144,#20140)
+successor(#20142,#20144)
+successor(#20140,#20138)
+successor(#20142,#20145)
+successor(#20138,#20145)
+successor(#20130,#20133)
+successor(#20135,#20131)
+successor(#20133,#20135)
+successor(#20131,#20137)
+successor(#20133,#20137)
+successor(#20124,#20127)
+successor(#20129,#20125)
+successor(#20127,#20129)
+successor(#20125,#20130)
+successor(#20127,#20130)
+successor(#20184,#20124)
 numlines(#10000,13,7,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/esnext/output/trap/optional-chaining_short-circuiting.js.trap b/javascript/extractor/tests/esnext/output/trap/optional-chaining_short-circuiting.js.trap
index 70fe3585215..c74fcdf8b1e 100644
--- a/javascript/extractor/tests/esnext/output/trap/optional-chaining_short-circuiting.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/optional-chaining_short-circuiting.js.trap
@@ -863,845 +863,847 @@ toplevels(#20001,0)
 #20327=@"loc,{#10000},1,1,30,0"
 locations_default(#20327,#10000,1,1,30,0)
 hasLocation(#20001,#20327)
-#20328=*
-stmts(#20328,2,#20001,0,"a?.b.c(++x).d;")
-hasLocation(#20328,#20003)
-stmt_containers(#20328,#20001)
+#20328=@"var;{this};{#20000}"
+variables(#20328,"this",#20000)
 #20329=*
-exprs(#20329,14,#20328,0,"a?.b.c(++x).d")
-#20330=@"loc,{#10000},1,1,1,13"
-locations_default(#20330,#10000,1,1,1,13)
-hasLocation(#20329,#20330)
-enclosing_stmt(#20329,#20328)
-expr_containers(#20329,#20001)
-#20331=*
-exprs(#20331,13,#20329,0,"a?.b.c(++x)")
-#20332=@"loc,{#10000},1,1,1,11"
-locations_default(#20332,#10000,1,1,1,11)
-hasLocation(#20331,#20332)
-enclosing_stmt(#20331,#20328)
-expr_containers(#20331,#20001)
-#20333=*
-exprs(#20333,14,#20331,-1,"a?.b.c")
-#20334=@"loc,{#10000},1,1,1,6"
-locations_default(#20334,#10000,1,1,1,6)
-hasLocation(#20333,#20334)
-enclosing_stmt(#20333,#20328)
-expr_containers(#20333,#20001)
-#20335=*
-exprs(#20335,14,#20333,0,"a?.b")
-#20336=@"loc,{#10000},1,1,1,4"
-locations_default(#20336,#10000,1,1,1,4)
-hasLocation(#20335,#20336)
-enclosing_stmt(#20335,#20328)
-expr_containers(#20335,#20001)
-#20337=*
-exprs(#20337,79,#20335,0,"a")
-hasLocation(#20337,#20061)
-enclosing_stmt(#20337,#20328)
-expr_containers(#20337,#20001)
-literals("a","a",#20337)
-#20338=@"var;{a};{#20000}"
-variables(#20338,"a",#20000)
-bind(#20337,#20338)
-#20339=*
-exprs(#20339,0,#20335,1,"b")
-hasLocation(#20339,#20065)
-enclosing_stmt(#20339,#20328)
-expr_containers(#20339,#20001)
-literals("b","b",#20339)
-isOptionalChaining(#20335)
+stmts(#20329,2,#20001,0,"a?.b.c(++x).d;")
+hasLocation(#20329,#20003)
+stmt_containers(#20329,#20001)
+#20330=*
+exprs(#20330,14,#20329,0,"a?.b.c(++x).d")
+#20331=@"loc,{#10000},1,1,1,13"
+locations_default(#20331,#10000,1,1,1,13)
+hasLocation(#20330,#20331)
+enclosing_stmt(#20330,#20329)
+expr_containers(#20330,#20001)
+#20332=*
+exprs(#20332,13,#20330,0,"a?.b.c(++x)")
+#20333=@"loc,{#10000},1,1,1,11"
+locations_default(#20333,#10000,1,1,1,11)
+hasLocation(#20332,#20333)
+enclosing_stmt(#20332,#20329)
+expr_containers(#20332,#20001)
+#20334=*
+exprs(#20334,14,#20332,-1,"a?.b.c")
+#20335=@"loc,{#10000},1,1,1,6"
+locations_default(#20335,#10000,1,1,1,6)
+hasLocation(#20334,#20335)
+enclosing_stmt(#20334,#20329)
+expr_containers(#20334,#20001)
+#20336=*
+exprs(#20336,14,#20334,0,"a?.b")
+#20337=@"loc,{#10000},1,1,1,4"
+locations_default(#20337,#10000,1,1,1,4)
+hasLocation(#20336,#20337)
+enclosing_stmt(#20336,#20329)
+expr_containers(#20336,#20001)
+#20338=*
+exprs(#20338,79,#20336,0,"a")
+hasLocation(#20338,#20061)
+enclosing_stmt(#20338,#20329)
+expr_containers(#20338,#20001)
+literals("a","a",#20338)
+#20339=@"var;{a};{#20000}"
+variables(#20339,"a",#20000)
+bind(#20338,#20339)
 #20340=*
-exprs(#20340,0,#20333,1,"c")
-hasLocation(#20340,#20069)
-enclosing_stmt(#20340,#20328)
+exprs(#20340,0,#20336,1,"b")
+hasLocation(#20340,#20065)
+enclosing_stmt(#20340,#20329)
 expr_containers(#20340,#20001)
-literals("c","c",#20340)
+literals("b","b",#20340)
+isOptionalChaining(#20336)
 #20341=*
-exprs(#20341,59,#20331,0,"++x")
-#20342=@"loc,{#10000},1,8,1,10"
-locations_default(#20342,#10000,1,8,1,10)
-hasLocation(#20341,#20342)
-enclosing_stmt(#20341,#20328)
+exprs(#20341,0,#20334,1,"c")
+hasLocation(#20341,#20069)
+enclosing_stmt(#20341,#20329)
 expr_containers(#20341,#20001)
-#20343=*
-exprs(#20343,79,#20341,0,"x")
-hasLocation(#20343,#20075)
-enclosing_stmt(#20343,#20328)
-expr_containers(#20343,#20001)
-literals("x","x",#20343)
-#20344=@"var;{x};{#20000}"
-variables(#20344,"x",#20000)
-bind(#20343,#20344)
-#20345=*
-exprs(#20345,0,#20329,1,"d")
-hasLocation(#20345,#20081)
-enclosing_stmt(#20345,#20328)
-expr_containers(#20345,#20001)
-literals("d","d",#20345)
+literals("c","c",#20341)
+#20342=*
+exprs(#20342,59,#20332,0,"++x")
+#20343=@"loc,{#10000},1,8,1,10"
+locations_default(#20343,#10000,1,8,1,10)
+hasLocation(#20342,#20343)
+enclosing_stmt(#20342,#20329)
+expr_containers(#20342,#20001)
+#20344=*
+exprs(#20344,79,#20342,0,"x")
+hasLocation(#20344,#20075)
+enclosing_stmt(#20344,#20329)
+expr_containers(#20344,#20001)
+literals("x","x",#20344)
+#20345=@"var;{x};{#20000}"
+variables(#20345,"x",#20000)
+bind(#20344,#20345)
 #20346=*
-stmts(#20346,2,#20001,1,"a?.b[3].c?.(x).d;")
-hasLocation(#20346,#20007)
-stmt_containers(#20346,#20001)
+exprs(#20346,0,#20330,1,"d")
+hasLocation(#20346,#20081)
+enclosing_stmt(#20346,#20329)
+expr_containers(#20346,#20001)
+literals("d","d",#20346)
 #20347=*
-exprs(#20347,14,#20346,0,"a?.b[3].c?.(x).d")
-#20348=@"loc,{#10000},3,1,3,16"
-locations_default(#20348,#10000,3,1,3,16)
-hasLocation(#20347,#20348)
-enclosing_stmt(#20347,#20346)
-expr_containers(#20347,#20001)
-#20349=*
-exprs(#20349,13,#20347,0,"a?.b[3].c?.(x)")
-#20350=@"loc,{#10000},3,1,3,14"
-locations_default(#20350,#10000,3,1,3,14)
-hasLocation(#20349,#20350)
-enclosing_stmt(#20349,#20346)
-expr_containers(#20349,#20001)
-#20351=*
-exprs(#20351,14,#20349,-1,"a?.b[3].c")
-#20352=@"loc,{#10000},3,1,3,9"
-locations_default(#20352,#10000,3,1,3,9)
-hasLocation(#20351,#20352)
-enclosing_stmt(#20351,#20346)
-expr_containers(#20351,#20001)
-#20353=*
-exprs(#20353,15,#20351,0,"a?.b[3]")
-#20354=@"loc,{#10000},3,1,3,7"
-locations_default(#20354,#10000,3,1,3,7)
-hasLocation(#20353,#20354)
-enclosing_stmt(#20353,#20346)
-expr_containers(#20353,#20001)
-#20355=*
-exprs(#20355,14,#20353,0,"a?.b")
-#20356=@"loc,{#10000},3,1,3,4"
-locations_default(#20356,#10000,3,1,3,4)
-hasLocation(#20355,#20356)
-enclosing_stmt(#20355,#20346)
-expr_containers(#20355,#20001)
-#20357=*
-exprs(#20357,79,#20355,0,"a")
-hasLocation(#20357,#20085)
-enclosing_stmt(#20357,#20346)
-expr_containers(#20357,#20001)
-literals("a","a",#20357)
-bind(#20357,#20338)
+stmts(#20347,2,#20001,1,"a?.b[3].c?.(x).d;")
+hasLocation(#20347,#20007)
+stmt_containers(#20347,#20001)
+#20348=*
+exprs(#20348,14,#20347,0,"a?.b[3].c?.(x).d")
+#20349=@"loc,{#10000},3,1,3,16"
+locations_default(#20349,#10000,3,1,3,16)
+hasLocation(#20348,#20349)
+enclosing_stmt(#20348,#20347)
+expr_containers(#20348,#20001)
+#20350=*
+exprs(#20350,13,#20348,0,"a?.b[3].c?.(x)")
+#20351=@"loc,{#10000},3,1,3,14"
+locations_default(#20351,#10000,3,1,3,14)
+hasLocation(#20350,#20351)
+enclosing_stmt(#20350,#20347)
+expr_containers(#20350,#20001)
+#20352=*
+exprs(#20352,14,#20350,-1,"a?.b[3].c")
+#20353=@"loc,{#10000},3,1,3,9"
+locations_default(#20353,#10000,3,1,3,9)
+hasLocation(#20352,#20353)
+enclosing_stmt(#20352,#20347)
+expr_containers(#20352,#20001)
+#20354=*
+exprs(#20354,15,#20352,0,"a?.b[3]")
+#20355=@"loc,{#10000},3,1,3,7"
+locations_default(#20355,#10000,3,1,3,7)
+hasLocation(#20354,#20355)
+enclosing_stmt(#20354,#20347)
+expr_containers(#20354,#20001)
+#20356=*
+exprs(#20356,14,#20354,0,"a?.b")
+#20357=@"loc,{#10000},3,1,3,4"
+locations_default(#20357,#10000,3,1,3,4)
+hasLocation(#20356,#20357)
+enclosing_stmt(#20356,#20347)
+expr_containers(#20356,#20001)
 #20358=*
-exprs(#20358,0,#20355,1,"b")
-hasLocation(#20358,#20089)
-enclosing_stmt(#20358,#20346)
+exprs(#20358,79,#20356,0,"a")
+hasLocation(#20358,#20085)
+enclosing_stmt(#20358,#20347)
 expr_containers(#20358,#20001)
-literals("b","b",#20358)
-isOptionalChaining(#20355)
+literals("a","a",#20358)
+bind(#20358,#20339)
 #20359=*
-exprs(#20359,3,#20353,1,"3")
-hasLocation(#20359,#20093)
-enclosing_stmt(#20359,#20346)
+exprs(#20359,0,#20356,1,"b")
+hasLocation(#20359,#20089)
+enclosing_stmt(#20359,#20347)
 expr_containers(#20359,#20001)
-literals("3","3",#20359)
+literals("b","b",#20359)
+isOptionalChaining(#20356)
 #20360=*
-exprs(#20360,0,#20351,1,"c")
-hasLocation(#20360,#20099)
-enclosing_stmt(#20360,#20346)
+exprs(#20360,3,#20354,1,"3")
+hasLocation(#20360,#20093)
+enclosing_stmt(#20360,#20347)
 expr_containers(#20360,#20001)
-literals("c","c",#20360)
+literals("3","3",#20360)
 #20361=*
-exprs(#20361,79,#20349,0,"x")
-hasLocation(#20361,#20105)
-enclosing_stmt(#20361,#20346)
+exprs(#20361,0,#20352,1,"c")
+hasLocation(#20361,#20099)
+enclosing_stmt(#20361,#20347)
 expr_containers(#20361,#20001)
-literals("x","x",#20361)
-bind(#20361,#20344)
-isOptionalChaining(#20349)
+literals("c","c",#20361)
 #20362=*
-exprs(#20362,0,#20347,1,"d")
-hasLocation(#20362,#20111)
-enclosing_stmt(#20362,#20346)
+exprs(#20362,79,#20350,0,"x")
+hasLocation(#20362,#20105)
+enclosing_stmt(#20362,#20347)
 expr_containers(#20362,#20001)
-literals("d","d",#20362)
+literals("x","x",#20362)
+bind(#20362,#20345)
+isOptionalChaining(#20350)
 #20363=*
-stmts(#20363,2,#20001,2,"(a?.b).c;")
-hasLocation(#20363,#20011)
-stmt_containers(#20363,#20001)
+exprs(#20363,0,#20348,1,"d")
+hasLocation(#20363,#20111)
+enclosing_stmt(#20363,#20347)
+expr_containers(#20363,#20001)
+literals("d","d",#20363)
 #20364=*
-exprs(#20364,14,#20363,0,"(a?.b).c")
-#20365=@"loc,{#10000},5,1,5,8"
-locations_default(#20365,#10000,5,1,5,8)
-hasLocation(#20364,#20365)
-enclosing_stmt(#20364,#20363)
-expr_containers(#20364,#20001)
-#20366=*
-exprs(#20366,63,#20364,0,"(a?.b)")
-#20367=@"loc,{#10000},5,1,5,6"
-locations_default(#20367,#10000,5,1,5,6)
-hasLocation(#20366,#20367)
-enclosing_stmt(#20366,#20363)
-expr_containers(#20366,#20001)
-#20368=*
-exprs(#20368,14,#20366,0,"a?.b")
-#20369=@"loc,{#10000},5,2,5,5"
-locations_default(#20369,#10000,5,2,5,5)
-hasLocation(#20368,#20369)
-enclosing_stmt(#20368,#20363)
-expr_containers(#20368,#20001)
-#20370=*
-exprs(#20370,79,#20368,0,"a")
-hasLocation(#20370,#20117)
-enclosing_stmt(#20370,#20363)
-expr_containers(#20370,#20001)
-literals("a","a",#20370)
-bind(#20370,#20338)
+stmts(#20364,2,#20001,2,"(a?.b).c;")
+hasLocation(#20364,#20011)
+stmt_containers(#20364,#20001)
+#20365=*
+exprs(#20365,14,#20364,0,"(a?.b).c")
+#20366=@"loc,{#10000},5,1,5,8"
+locations_default(#20366,#10000,5,1,5,8)
+hasLocation(#20365,#20366)
+enclosing_stmt(#20365,#20364)
+expr_containers(#20365,#20001)
+#20367=*
+exprs(#20367,63,#20365,0,"(a?.b)")
+#20368=@"loc,{#10000},5,1,5,6"
+locations_default(#20368,#10000,5,1,5,6)
+hasLocation(#20367,#20368)
+enclosing_stmt(#20367,#20364)
+expr_containers(#20367,#20001)
+#20369=*
+exprs(#20369,14,#20367,0,"a?.b")
+#20370=@"loc,{#10000},5,2,5,5"
+locations_default(#20370,#10000,5,2,5,5)
+hasLocation(#20369,#20370)
+enclosing_stmt(#20369,#20364)
+expr_containers(#20369,#20001)
 #20371=*
-exprs(#20371,0,#20368,1,"b")
-hasLocation(#20371,#20121)
-enclosing_stmt(#20371,#20363)
+exprs(#20371,79,#20369,0,"a")
+hasLocation(#20371,#20117)
+enclosing_stmt(#20371,#20364)
 expr_containers(#20371,#20001)
-literals("b","b",#20371)
-isOptionalChaining(#20368)
+literals("a","a",#20371)
+bind(#20371,#20339)
 #20372=*
-exprs(#20372,0,#20364,1,"c")
-hasLocation(#20372,#20127)
-enclosing_stmt(#20372,#20363)
+exprs(#20372,0,#20369,1,"b")
+hasLocation(#20372,#20121)
+enclosing_stmt(#20372,#20364)
 expr_containers(#20372,#20001)
-literals("c","c",#20372)
+literals("b","b",#20372)
+isOptionalChaining(#20369)
 #20373=*
-stmts(#20373,2,#20001,3,"(a?.b.c).d;")
-hasLocation(#20373,#20015)
-stmt_containers(#20373,#20001)
+exprs(#20373,0,#20365,1,"c")
+hasLocation(#20373,#20127)
+enclosing_stmt(#20373,#20364)
+expr_containers(#20373,#20001)
+literals("c","c",#20373)
 #20374=*
-exprs(#20374,14,#20373,0,"(a?.b.c).d")
-#20375=@"loc,{#10000},7,1,7,10"
-locations_default(#20375,#10000,7,1,7,10)
-hasLocation(#20374,#20375)
-enclosing_stmt(#20374,#20373)
-expr_containers(#20374,#20001)
-#20376=*
-exprs(#20376,63,#20374,0,"(a?.b.c)")
-#20377=@"loc,{#10000},7,1,7,8"
-locations_default(#20377,#10000,7,1,7,8)
-hasLocation(#20376,#20377)
-enclosing_stmt(#20376,#20373)
-expr_containers(#20376,#20001)
-#20378=*
-exprs(#20378,14,#20376,0,"a?.b.c")
-#20379=@"loc,{#10000},7,2,7,7"
-locations_default(#20379,#10000,7,2,7,7)
-hasLocation(#20378,#20379)
-enclosing_stmt(#20378,#20373)
-expr_containers(#20378,#20001)
-#20380=*
-exprs(#20380,14,#20378,0,"a?.b")
-#20381=@"loc,{#10000},7,2,7,5"
-locations_default(#20381,#10000,7,2,7,5)
-hasLocation(#20380,#20381)
-enclosing_stmt(#20380,#20373)
-expr_containers(#20380,#20001)
-#20382=*
-exprs(#20382,79,#20380,0,"a")
-hasLocation(#20382,#20133)
-enclosing_stmt(#20382,#20373)
-expr_containers(#20382,#20001)
-literals("a","a",#20382)
-bind(#20382,#20338)
+stmts(#20374,2,#20001,3,"(a?.b.c).d;")
+hasLocation(#20374,#20015)
+stmt_containers(#20374,#20001)
+#20375=*
+exprs(#20375,14,#20374,0,"(a?.b.c).d")
+#20376=@"loc,{#10000},7,1,7,10"
+locations_default(#20376,#10000,7,1,7,10)
+hasLocation(#20375,#20376)
+enclosing_stmt(#20375,#20374)
+expr_containers(#20375,#20001)
+#20377=*
+exprs(#20377,63,#20375,0,"(a?.b.c)")
+#20378=@"loc,{#10000},7,1,7,8"
+locations_default(#20378,#10000,7,1,7,8)
+hasLocation(#20377,#20378)
+enclosing_stmt(#20377,#20374)
+expr_containers(#20377,#20001)
+#20379=*
+exprs(#20379,14,#20377,0,"a?.b.c")
+#20380=@"loc,{#10000},7,2,7,7"
+locations_default(#20380,#10000,7,2,7,7)
+hasLocation(#20379,#20380)
+enclosing_stmt(#20379,#20374)
+expr_containers(#20379,#20001)
+#20381=*
+exprs(#20381,14,#20379,0,"a?.b")
+#20382=@"loc,{#10000},7,2,7,5"
+locations_default(#20382,#10000,7,2,7,5)
+hasLocation(#20381,#20382)
+enclosing_stmt(#20381,#20374)
+expr_containers(#20381,#20001)
 #20383=*
-exprs(#20383,0,#20380,1,"b")
-hasLocation(#20383,#20137)
-enclosing_stmt(#20383,#20373)
+exprs(#20383,79,#20381,0,"a")
+hasLocation(#20383,#20133)
+enclosing_stmt(#20383,#20374)
 expr_containers(#20383,#20001)
-literals("b","b",#20383)
-isOptionalChaining(#20380)
+literals("a","a",#20383)
+bind(#20383,#20339)
 #20384=*
-exprs(#20384,0,#20378,1,"c")
-hasLocation(#20384,#20141)
-enclosing_stmt(#20384,#20373)
+exprs(#20384,0,#20381,1,"b")
+hasLocation(#20384,#20137)
+enclosing_stmt(#20384,#20374)
 expr_containers(#20384,#20001)
-literals("c","c",#20384)
+literals("b","b",#20384)
+isOptionalChaining(#20381)
 #20385=*
-exprs(#20385,0,#20374,1,"d")
-hasLocation(#20385,#20147)
-enclosing_stmt(#20385,#20373)
+exprs(#20385,0,#20379,1,"c")
+hasLocation(#20385,#20141)
+enclosing_stmt(#20385,#20374)
 expr_containers(#20385,#20001)
-literals("d","d",#20385)
+literals("c","c",#20385)
 #20386=*
-stmts(#20386,2,#20001,4,"a?.[b?.c?.d].e?.f;")
-hasLocation(#20386,#20019)
-stmt_containers(#20386,#20001)
+exprs(#20386,0,#20375,1,"d")
+hasLocation(#20386,#20147)
+enclosing_stmt(#20386,#20374)
+expr_containers(#20386,#20001)
+literals("d","d",#20386)
 #20387=*
-exprs(#20387,14,#20386,0,"a?.[b?.c?.d].e?.f")
-#20388=@"loc,{#10000},9,1,9,17"
-locations_default(#20388,#10000,9,1,9,17)
-hasLocation(#20387,#20388)
-enclosing_stmt(#20387,#20386)
-expr_containers(#20387,#20001)
-#20389=*
-exprs(#20389,14,#20387,0,"a?.[b?.c?.d].e")
-#20390=@"loc,{#10000},9,1,9,14"
-locations_default(#20390,#10000,9,1,9,14)
-hasLocation(#20389,#20390)
-enclosing_stmt(#20389,#20386)
-expr_containers(#20389,#20001)
-#20391=*
-exprs(#20391,15,#20389,0,"a?.[b?.c?.d]")
-#20392=@"loc,{#10000},9,1,9,12"
-locations_default(#20392,#10000,9,1,9,12)
-hasLocation(#20391,#20392)
-enclosing_stmt(#20391,#20386)
-expr_containers(#20391,#20001)
-#20393=*
-exprs(#20393,79,#20391,0,"a")
-hasLocation(#20393,#20151)
-enclosing_stmt(#20393,#20386)
-expr_containers(#20393,#20001)
-literals("a","a",#20393)
-bind(#20393,#20338)
+stmts(#20387,2,#20001,4,"a?.[b?.c?.d].e?.f;")
+hasLocation(#20387,#20019)
+stmt_containers(#20387,#20001)
+#20388=*
+exprs(#20388,14,#20387,0,"a?.[b?.c?.d].e?.f")
+#20389=@"loc,{#10000},9,1,9,17"
+locations_default(#20389,#10000,9,1,9,17)
+hasLocation(#20388,#20389)
+enclosing_stmt(#20388,#20387)
+expr_containers(#20388,#20001)
+#20390=*
+exprs(#20390,14,#20388,0,"a?.[b?.c?.d].e")
+#20391=@"loc,{#10000},9,1,9,14"
+locations_default(#20391,#10000,9,1,9,14)
+hasLocation(#20390,#20391)
+enclosing_stmt(#20390,#20387)
+expr_containers(#20390,#20001)
+#20392=*
+exprs(#20392,15,#20390,0,"a?.[b?.c?.d]")
+#20393=@"loc,{#10000},9,1,9,12"
+locations_default(#20393,#10000,9,1,9,12)
+hasLocation(#20392,#20393)
+enclosing_stmt(#20392,#20387)
+expr_containers(#20392,#20001)
 #20394=*
-exprs(#20394,14,#20391,1,"b?.c?.d")
-#20395=@"loc,{#10000},9,5,9,11"
-locations_default(#20395,#10000,9,5,9,11)
-hasLocation(#20394,#20395)
-enclosing_stmt(#20394,#20386)
+exprs(#20394,79,#20392,0,"a")
+hasLocation(#20394,#20151)
+enclosing_stmt(#20394,#20387)
 expr_containers(#20394,#20001)
-#20396=*
-exprs(#20396,14,#20394,0,"b?.c")
-#20397=@"loc,{#10000},9,5,9,8"
-locations_default(#20397,#10000,9,5,9,8)
-hasLocation(#20396,#20397)
-enclosing_stmt(#20396,#20386)
-expr_containers(#20396,#20001)
-#20398=*
-exprs(#20398,79,#20396,0,"b")
-hasLocation(#20398,#20157)
-enclosing_stmt(#20398,#20386)
-expr_containers(#20398,#20001)
-literals("b","b",#20398)
-#20399=@"var;{b};{#20000}"
-variables(#20399,"b",#20000)
-bind(#20398,#20399)
-#20400=*
-exprs(#20400,0,#20396,1,"c")
-hasLocation(#20400,#20161)
-enclosing_stmt(#20400,#20386)
-expr_containers(#20400,#20001)
-literals("c","c",#20400)
-isOptionalChaining(#20396)
+literals("a","a",#20394)
+bind(#20394,#20339)
+#20395=*
+exprs(#20395,14,#20392,1,"b?.c?.d")
+#20396=@"loc,{#10000},9,5,9,11"
+locations_default(#20396,#10000,9,5,9,11)
+hasLocation(#20395,#20396)
+enclosing_stmt(#20395,#20387)
+expr_containers(#20395,#20001)
+#20397=*
+exprs(#20397,14,#20395,0,"b?.c")
+#20398=@"loc,{#10000},9,5,9,8"
+locations_default(#20398,#10000,9,5,9,8)
+hasLocation(#20397,#20398)
+enclosing_stmt(#20397,#20387)
+expr_containers(#20397,#20001)
+#20399=*
+exprs(#20399,79,#20397,0,"b")
+hasLocation(#20399,#20157)
+enclosing_stmt(#20399,#20387)
+expr_containers(#20399,#20001)
+literals("b","b",#20399)
+#20400=@"var;{b};{#20000}"
+variables(#20400,"b",#20000)
+bind(#20399,#20400)
 #20401=*
-exprs(#20401,0,#20394,1,"d")
-hasLocation(#20401,#20165)
-enclosing_stmt(#20401,#20386)
+exprs(#20401,0,#20397,1,"c")
+hasLocation(#20401,#20161)
+enclosing_stmt(#20401,#20387)
 expr_containers(#20401,#20001)
-literals("d","d",#20401)
-isOptionalChaining(#20394)
-isOptionalChaining(#20391)
+literals("c","c",#20401)
+isOptionalChaining(#20397)
 #20402=*
-exprs(#20402,0,#20389,1,"e")
-hasLocation(#20402,#20171)
-enclosing_stmt(#20402,#20386)
+exprs(#20402,0,#20395,1,"d")
+hasLocation(#20402,#20165)
+enclosing_stmt(#20402,#20387)
 expr_containers(#20402,#20001)
-literals("e","e",#20402)
+literals("d","d",#20402)
+isOptionalChaining(#20395)
+isOptionalChaining(#20392)
 #20403=*
-exprs(#20403,0,#20387,1,"f")
-hasLocation(#20403,#20175)
-enclosing_stmt(#20403,#20386)
+exprs(#20403,0,#20390,1,"e")
+hasLocation(#20403,#20171)
+enclosing_stmt(#20403,#20387)
 expr_containers(#20403,#20001)
-literals("f","f",#20403)
-isOptionalChaining(#20387)
+literals("e","e",#20403)
 #20404=*
-stmts(#20404,2,#20001,5,"a?.()[b ... ?.().f;")
-hasLocation(#20404,#20023)
-stmt_containers(#20404,#20001)
+exprs(#20404,0,#20388,1,"f")
+hasLocation(#20404,#20175)
+enclosing_stmt(#20404,#20387)
+expr_containers(#20404,#20001)
+literals("f","f",#20404)
+isOptionalChaining(#20388)
 #20405=*
-exprs(#20405,14,#20404,0,"a?.()[b ... e?.().f")
-#20406=@"loc,{#10000},11,1,11,28"
-locations_default(#20406,#10000,11,1,11,28)
-hasLocation(#20405,#20406)
-enclosing_stmt(#20405,#20404)
-expr_containers(#20405,#20001)
-#20407=*
-exprs(#20407,13,#20405,0,"a?.()[b ... ].e?.()")
-#20408=@"loc,{#10000},11,1,11,26"
-locations_default(#20408,#10000,11,1,11,26)
-hasLocation(#20407,#20408)
-enclosing_stmt(#20407,#20404)
-expr_containers(#20407,#20001)
-#20409=*
-exprs(#20409,14,#20407,-1,"a?.()[b ... ().d].e")
-#20410=@"loc,{#10000},11,1,11,22"
-locations_default(#20410,#10000,11,1,11,22)
-hasLocation(#20409,#20410)
-enclosing_stmt(#20409,#20404)
-expr_containers(#20409,#20001)
-#20411=*
-exprs(#20411,15,#20409,0,"a?.()[b?.().c?.().d]")
-#20412=@"loc,{#10000},11,1,11,20"
-locations_default(#20412,#10000,11,1,11,20)
-hasLocation(#20411,#20412)
-enclosing_stmt(#20411,#20404)
-expr_containers(#20411,#20001)
-#20413=*
-exprs(#20413,13,#20411,0,"a?.()")
-#20414=@"loc,{#10000},11,1,11,5"
-locations_default(#20414,#10000,11,1,11,5)
-hasLocation(#20413,#20414)
-enclosing_stmt(#20413,#20404)
-expr_containers(#20413,#20001)
-#20415=*
-exprs(#20415,79,#20413,-1,"a")
-hasLocation(#20415,#20179)
-enclosing_stmt(#20415,#20404)
-expr_containers(#20415,#20001)
-literals("a","a",#20415)
-bind(#20415,#20338)
-isOptionalChaining(#20413)
+stmts(#20405,2,#20001,5,"a?.()[b ... ?.().f;")
+hasLocation(#20405,#20023)
+stmt_containers(#20405,#20001)
+#20406=*
+exprs(#20406,14,#20405,0,"a?.()[b ... e?.().f")
+#20407=@"loc,{#10000},11,1,11,28"
+locations_default(#20407,#10000,11,1,11,28)
+hasLocation(#20406,#20407)
+enclosing_stmt(#20406,#20405)
+expr_containers(#20406,#20001)
+#20408=*
+exprs(#20408,13,#20406,0,"a?.()[b ... ].e?.()")
+#20409=@"loc,{#10000},11,1,11,26"
+locations_default(#20409,#10000,11,1,11,26)
+hasLocation(#20408,#20409)
+enclosing_stmt(#20408,#20405)
+expr_containers(#20408,#20001)
+#20410=*
+exprs(#20410,14,#20408,-1,"a?.()[b ... ().d].e")
+#20411=@"loc,{#10000},11,1,11,22"
+locations_default(#20411,#10000,11,1,11,22)
+hasLocation(#20410,#20411)
+enclosing_stmt(#20410,#20405)
+expr_containers(#20410,#20001)
+#20412=*
+exprs(#20412,15,#20410,0,"a?.()[b?.().c?.().d]")
+#20413=@"loc,{#10000},11,1,11,20"
+locations_default(#20413,#10000,11,1,11,20)
+hasLocation(#20412,#20413)
+enclosing_stmt(#20412,#20405)
+expr_containers(#20412,#20001)
+#20414=*
+exprs(#20414,13,#20412,0,"a?.()")
+#20415=@"loc,{#10000},11,1,11,5"
+locations_default(#20415,#10000,11,1,11,5)
+hasLocation(#20414,#20415)
+enclosing_stmt(#20414,#20405)
+expr_containers(#20414,#20001)
 #20416=*
-exprs(#20416,14,#20411,1,"b?.().c?.().d")
-#20417=@"loc,{#10000},11,7,11,19"
-locations_default(#20417,#10000,11,7,11,19)
-hasLocation(#20416,#20417)
-enclosing_stmt(#20416,#20404)
+exprs(#20416,79,#20414,-1,"a")
+hasLocation(#20416,#20179)
+enclosing_stmt(#20416,#20405)
 expr_containers(#20416,#20001)
-#20418=*
-exprs(#20418,13,#20416,0,"b?.().c?.()")
-#20419=@"loc,{#10000},11,7,11,17"
-locations_default(#20419,#10000,11,7,11,17)
-hasLocation(#20418,#20419)
-enclosing_stmt(#20418,#20404)
-expr_containers(#20418,#20001)
-#20420=*
-exprs(#20420,14,#20418,-1,"b?.().c")
-#20421=@"loc,{#10000},11,7,11,13"
-locations_default(#20421,#10000,11,7,11,13)
-hasLocation(#20420,#20421)
-enclosing_stmt(#20420,#20404)
-expr_containers(#20420,#20001)
-#20422=*
-exprs(#20422,13,#20420,0,"b?.()")
-#20423=@"loc,{#10000},11,7,11,11"
-locations_default(#20423,#10000,11,7,11,11)
-hasLocation(#20422,#20423)
-enclosing_stmt(#20422,#20404)
-expr_containers(#20422,#20001)
-#20424=*
-exprs(#20424,79,#20422,-1,"b")
-hasLocation(#20424,#20189)
-enclosing_stmt(#20424,#20404)
-expr_containers(#20424,#20001)
-literals("b","b",#20424)
-bind(#20424,#20399)
-isOptionalChaining(#20422)
+literals("a","a",#20416)
+bind(#20416,#20339)
+isOptionalChaining(#20414)
+#20417=*
+exprs(#20417,14,#20412,1,"b?.().c?.().d")
+#20418=@"loc,{#10000},11,7,11,19"
+locations_default(#20418,#10000,11,7,11,19)
+hasLocation(#20417,#20418)
+enclosing_stmt(#20417,#20405)
+expr_containers(#20417,#20001)
+#20419=*
+exprs(#20419,13,#20417,0,"b?.().c?.()")
+#20420=@"loc,{#10000},11,7,11,17"
+locations_default(#20420,#10000,11,7,11,17)
+hasLocation(#20419,#20420)
+enclosing_stmt(#20419,#20405)
+expr_containers(#20419,#20001)
+#20421=*
+exprs(#20421,14,#20419,-1,"b?.().c")
+#20422=@"loc,{#10000},11,7,11,13"
+locations_default(#20422,#10000,11,7,11,13)
+hasLocation(#20421,#20422)
+enclosing_stmt(#20421,#20405)
+expr_containers(#20421,#20001)
+#20423=*
+exprs(#20423,13,#20421,0,"b?.()")
+#20424=@"loc,{#10000},11,7,11,11"
+locations_default(#20424,#10000,11,7,11,11)
+hasLocation(#20423,#20424)
+enclosing_stmt(#20423,#20405)
+expr_containers(#20423,#20001)
 #20425=*
-exprs(#20425,0,#20420,1,"c")
-hasLocation(#20425,#20199)
-enclosing_stmt(#20425,#20404)
+exprs(#20425,79,#20423,-1,"b")
+hasLocation(#20425,#20189)
+enclosing_stmt(#20425,#20405)
 expr_containers(#20425,#20001)
-literals("c","c",#20425)
-isOptionalChaining(#20418)
+literals("b","b",#20425)
+bind(#20425,#20400)
+isOptionalChaining(#20423)
 #20426=*
-exprs(#20426,0,#20416,1,"d")
-hasLocation(#20426,#20209)
-enclosing_stmt(#20426,#20404)
+exprs(#20426,0,#20421,1,"c")
+hasLocation(#20426,#20199)
+enclosing_stmt(#20426,#20405)
 expr_containers(#20426,#20001)
-literals("d","d",#20426)
+literals("c","c",#20426)
+isOptionalChaining(#20419)
 #20427=*
-exprs(#20427,0,#20409,1,"e")
-hasLocation(#20427,#20215)
-enclosing_stmt(#20427,#20404)
+exprs(#20427,0,#20417,1,"d")
+hasLocation(#20427,#20209)
+enclosing_stmt(#20427,#20405)
 expr_containers(#20427,#20001)
-literals("e","e",#20427)
-isOptionalChaining(#20407)
+literals("d","d",#20427)
 #20428=*
-exprs(#20428,0,#20405,1,"f")
-hasLocation(#20428,#20225)
-enclosing_stmt(#20428,#20404)
+exprs(#20428,0,#20410,1,"e")
+hasLocation(#20428,#20215)
+enclosing_stmt(#20428,#20405)
 expr_containers(#20428,#20001)
-literals("f","f",#20428)
+literals("e","e",#20428)
+isOptionalChaining(#20408)
 #20429=*
-stmts(#20429,3,#20001,6,"if (a?. ... alse;\n}")
-#20430=@"loc,{#10000},13,1,17,1"
-locations_default(#20430,#10000,13,1,17,1)
-hasLocation(#20429,#20430)
-stmt_containers(#20429,#20001)
-#20431=*
-exprs(#20431,14,#20429,0,"a?.b")
-#20432=@"loc,{#10000},13,5,13,8"
-locations_default(#20432,#10000,13,5,13,8)
-hasLocation(#20431,#20432)
-enclosing_stmt(#20431,#20429)
-expr_containers(#20431,#20001)
-#20433=*
-exprs(#20433,79,#20431,0,"a")
-hasLocation(#20433,#20233)
-enclosing_stmt(#20433,#20429)
-expr_containers(#20433,#20001)
-literals("a","a",#20433)
-bind(#20433,#20338)
+exprs(#20429,0,#20406,1,"f")
+hasLocation(#20429,#20225)
+enclosing_stmt(#20429,#20405)
+expr_containers(#20429,#20001)
+literals("f","f",#20429)
+#20430=*
+stmts(#20430,3,#20001,6,"if (a?. ... alse;\n}")
+#20431=@"loc,{#10000},13,1,17,1"
+locations_default(#20431,#10000,13,1,17,1)
+hasLocation(#20430,#20431)
+stmt_containers(#20430,#20001)
+#20432=*
+exprs(#20432,14,#20430,0,"a?.b")
+#20433=@"loc,{#10000},13,5,13,8"
+locations_default(#20433,#10000,13,5,13,8)
+hasLocation(#20432,#20433)
+enclosing_stmt(#20432,#20430)
+expr_containers(#20432,#20001)
 #20434=*
-exprs(#20434,0,#20431,1,"b")
-hasLocation(#20434,#20237)
-enclosing_stmt(#20434,#20429)
+exprs(#20434,79,#20432,0,"a")
+hasLocation(#20434,#20233)
+enclosing_stmt(#20434,#20430)
 expr_containers(#20434,#20001)
-literals("b","b",#20434)
-isOptionalChaining(#20431)
+literals("a","a",#20434)
+bind(#20434,#20339)
 #20435=*
-stmts(#20435,1,#20429,1,"{\n    true;\n}")
-#20436=@"loc,{#10000},13,11,15,1"
-locations_default(#20436,#10000,13,11,15,1)
-hasLocation(#20435,#20436)
-stmt_containers(#20435,#20001)
-#20437=*
-stmts(#20437,2,#20435,0,"true;")
-#20438=@"loc,{#10000},14,5,14,9"
-locations_default(#20438,#10000,14,5,14,9)
-hasLocation(#20437,#20438)
-stmt_containers(#20437,#20001)
-#20439=*
-exprs(#20439,2,#20437,0,"true")
-hasLocation(#20439,#20243)
-enclosing_stmt(#20439,#20437)
-expr_containers(#20439,#20001)
-literals("true","true",#20439)
+exprs(#20435,0,#20432,1,"b")
+hasLocation(#20435,#20237)
+enclosing_stmt(#20435,#20430)
+expr_containers(#20435,#20001)
+literals("b","b",#20435)
+isOptionalChaining(#20432)
+#20436=*
+stmts(#20436,1,#20430,1,"{\n    true;\n}")
+#20437=@"loc,{#10000},13,11,15,1"
+locations_default(#20437,#10000,13,11,15,1)
+hasLocation(#20436,#20437)
+stmt_containers(#20436,#20001)
+#20438=*
+stmts(#20438,2,#20436,0,"true;")
+#20439=@"loc,{#10000},14,5,14,9"
+locations_default(#20439,#10000,14,5,14,9)
+hasLocation(#20438,#20439)
+stmt_containers(#20438,#20001)
 #20440=*
-stmts(#20440,1,#20429,2,"{\n    false;\n}")
-#20441=@"loc,{#10000},15,8,17,1"
-locations_default(#20441,#10000,15,8,17,1)
-hasLocation(#20440,#20441)
-stmt_containers(#20440,#20001)
-#20442=*
-stmts(#20442,2,#20440,0,"false;")
-#20443=@"loc,{#10000},16,5,16,10"
-locations_default(#20443,#10000,16,5,16,10)
-hasLocation(#20442,#20443)
-stmt_containers(#20442,#20001)
-#20444=*
-exprs(#20444,2,#20442,0,"false")
-hasLocation(#20444,#20253)
-enclosing_stmt(#20444,#20442)
-expr_containers(#20444,#20001)
-literals("false","false",#20444)
+exprs(#20440,2,#20438,0,"true")
+hasLocation(#20440,#20243)
+enclosing_stmt(#20440,#20438)
+expr_containers(#20440,#20001)
+literals("true","true",#20440)
+#20441=*
+stmts(#20441,1,#20430,2,"{\n    false;\n}")
+#20442=@"loc,{#10000},15,8,17,1"
+locations_default(#20442,#10000,15,8,17,1)
+hasLocation(#20441,#20442)
+stmt_containers(#20441,#20001)
+#20443=*
+stmts(#20443,2,#20441,0,"false;")
+#20444=@"loc,{#10000},16,5,16,10"
+locations_default(#20444,#10000,16,5,16,10)
+hasLocation(#20443,#20444)
+stmt_containers(#20443,#20001)
 #20445=*
-stmts(#20445,3,#20001,7,"if (!a? ... alse;\n}")
-#20446=@"loc,{#10000},19,1,23,1"
-locations_default(#20446,#10000,19,1,23,1)
-hasLocation(#20445,#20446)
-stmt_containers(#20445,#20001)
-#20447=*
-exprs(#20447,18,#20445,0,"!a?.b")
-#20448=@"loc,{#10000},19,5,19,9"
-locations_default(#20448,#10000,19,5,19,9)
-hasLocation(#20447,#20448)
-enclosing_stmt(#20447,#20445)
-expr_containers(#20447,#20001)
-#20449=*
-exprs(#20449,14,#20447,0,"a?.b")
-#20450=@"loc,{#10000},19,6,19,9"
-locations_default(#20450,#10000,19,6,19,9)
-hasLocation(#20449,#20450)
-enclosing_stmt(#20449,#20445)
-expr_containers(#20449,#20001)
-#20451=*
-exprs(#20451,79,#20449,0,"a")
-hasLocation(#20451,#20264)
-enclosing_stmt(#20451,#20445)
-expr_containers(#20451,#20001)
-literals("a","a",#20451)
-bind(#20451,#20338)
+exprs(#20445,2,#20443,0,"false")
+hasLocation(#20445,#20253)
+enclosing_stmt(#20445,#20443)
+expr_containers(#20445,#20001)
+literals("false","false",#20445)
+#20446=*
+stmts(#20446,3,#20001,7,"if (!a? ... alse;\n}")
+#20447=@"loc,{#10000},19,1,23,1"
+locations_default(#20447,#10000,19,1,23,1)
+hasLocation(#20446,#20447)
+stmt_containers(#20446,#20001)
+#20448=*
+exprs(#20448,18,#20446,0,"!a?.b")
+#20449=@"loc,{#10000},19,5,19,9"
+locations_default(#20449,#10000,19,5,19,9)
+hasLocation(#20448,#20449)
+enclosing_stmt(#20448,#20446)
+expr_containers(#20448,#20001)
+#20450=*
+exprs(#20450,14,#20448,0,"a?.b")
+#20451=@"loc,{#10000},19,6,19,9"
+locations_default(#20451,#10000,19,6,19,9)
+hasLocation(#20450,#20451)
+enclosing_stmt(#20450,#20446)
+expr_containers(#20450,#20001)
 #20452=*
-exprs(#20452,0,#20449,1,"b")
-hasLocation(#20452,#20268)
-enclosing_stmt(#20452,#20445)
+exprs(#20452,79,#20450,0,"a")
+hasLocation(#20452,#20264)
+enclosing_stmt(#20452,#20446)
 expr_containers(#20452,#20001)
-literals("b","b",#20452)
-isOptionalChaining(#20449)
+literals("a","a",#20452)
+bind(#20452,#20339)
 #20453=*
-stmts(#20453,1,#20445,1,"{\n    true;\n}")
-#20454=@"loc,{#10000},19,12,21,1"
-locations_default(#20454,#10000,19,12,21,1)
-hasLocation(#20453,#20454)
-stmt_containers(#20453,#20001)
-#20455=*
-stmts(#20455,2,#20453,0,"true;")
-#20456=@"loc,{#10000},20,5,20,9"
-locations_default(#20456,#10000,20,5,20,9)
-hasLocation(#20455,#20456)
-stmt_containers(#20455,#20001)
-#20457=*
-exprs(#20457,2,#20455,0,"true")
-hasLocation(#20457,#20274)
-enclosing_stmt(#20457,#20455)
-expr_containers(#20457,#20001)
-literals("true","true",#20457)
+exprs(#20453,0,#20450,1,"b")
+hasLocation(#20453,#20268)
+enclosing_stmt(#20453,#20446)
+expr_containers(#20453,#20001)
+literals("b","b",#20453)
+isOptionalChaining(#20450)
+#20454=*
+stmts(#20454,1,#20446,1,"{\n    true;\n}")
+#20455=@"loc,{#10000},19,12,21,1"
+locations_default(#20455,#10000,19,12,21,1)
+hasLocation(#20454,#20455)
+stmt_containers(#20454,#20001)
+#20456=*
+stmts(#20456,2,#20454,0,"true;")
+#20457=@"loc,{#10000},20,5,20,9"
+locations_default(#20457,#10000,20,5,20,9)
+hasLocation(#20456,#20457)
+stmt_containers(#20456,#20001)
 #20458=*
-stmts(#20458,1,#20445,2,"{\n    false;\n}")
-#20459=@"loc,{#10000},21,8,23,1"
-locations_default(#20459,#10000,21,8,23,1)
-hasLocation(#20458,#20459)
-stmt_containers(#20458,#20001)
-#20460=*
-stmts(#20460,2,#20458,0,"false;")
-#20461=@"loc,{#10000},22,5,22,10"
-locations_default(#20461,#10000,22,5,22,10)
-hasLocation(#20460,#20461)
-stmt_containers(#20460,#20001)
-#20462=*
-exprs(#20462,2,#20460,0,"false")
-hasLocation(#20462,#20284)
-enclosing_stmt(#20462,#20460)
-expr_containers(#20462,#20001)
-literals("false","false",#20462)
+exprs(#20458,2,#20456,0,"true")
+hasLocation(#20458,#20274)
+enclosing_stmt(#20458,#20456)
+expr_containers(#20458,#20001)
+literals("true","true",#20458)
+#20459=*
+stmts(#20459,1,#20446,2,"{\n    false;\n}")
+#20460=@"loc,{#10000},21,8,23,1"
+locations_default(#20460,#10000,21,8,23,1)
+hasLocation(#20459,#20460)
+stmt_containers(#20459,#20001)
+#20461=*
+stmts(#20461,2,#20459,0,"false;")
+#20462=@"loc,{#10000},22,5,22,10"
+locations_default(#20462,#10000,22,5,22,10)
+hasLocation(#20461,#20462)
+stmt_containers(#20461,#20001)
 #20463=*
-stmts(#20463,3,#20001,8,"if (a?. ... alse;\n}")
-#20464=@"loc,{#10000},25,1,29,1"
-locations_default(#20464,#10000,25,1,29,1)
-hasLocation(#20463,#20464)
-stmt_containers(#20463,#20001)
-#20465=*
-exprs(#20465,44,#20463,0,"a?.b && c?.d")
-#20466=@"loc,{#10000},25,5,25,16"
-locations_default(#20466,#10000,25,5,25,16)
-hasLocation(#20465,#20466)
-enclosing_stmt(#20465,#20463)
-expr_containers(#20465,#20001)
-#20467=*
-exprs(#20467,14,#20465,0,"a?.b")
-#20468=@"loc,{#10000},25,5,25,8"
-locations_default(#20468,#10000,25,5,25,8)
-hasLocation(#20467,#20468)
-enclosing_stmt(#20467,#20463)
-expr_containers(#20467,#20001)
-#20469=*
-exprs(#20469,79,#20467,0,"a")
-hasLocation(#20469,#20293)
-enclosing_stmt(#20469,#20463)
-expr_containers(#20469,#20001)
-literals("a","a",#20469)
-bind(#20469,#20338)
+exprs(#20463,2,#20461,0,"false")
+hasLocation(#20463,#20284)
+enclosing_stmt(#20463,#20461)
+expr_containers(#20463,#20001)
+literals("false","false",#20463)
+#20464=*
+stmts(#20464,3,#20001,8,"if (a?. ... alse;\n}")
+#20465=@"loc,{#10000},25,1,29,1"
+locations_default(#20465,#10000,25,1,29,1)
+hasLocation(#20464,#20465)
+stmt_containers(#20464,#20001)
+#20466=*
+exprs(#20466,44,#20464,0,"a?.b && c?.d")
+#20467=@"loc,{#10000},25,5,25,16"
+locations_default(#20467,#10000,25,5,25,16)
+hasLocation(#20466,#20467)
+enclosing_stmt(#20466,#20464)
+expr_containers(#20466,#20001)
+#20468=*
+exprs(#20468,14,#20466,0,"a?.b")
+#20469=@"loc,{#10000},25,5,25,8"
+locations_default(#20469,#10000,25,5,25,8)
+hasLocation(#20468,#20469)
+enclosing_stmt(#20468,#20464)
+expr_containers(#20468,#20001)
 #20470=*
-exprs(#20470,0,#20467,1,"b")
-hasLocation(#20470,#20297)
-enclosing_stmt(#20470,#20463)
+exprs(#20470,79,#20468,0,"a")
+hasLocation(#20470,#20293)
+enclosing_stmt(#20470,#20464)
 expr_containers(#20470,#20001)
-literals("b","b",#20470)
-isOptionalChaining(#20467)
+literals("a","a",#20470)
+bind(#20470,#20339)
 #20471=*
-exprs(#20471,14,#20465,1,"c?.d")
-#20472=@"loc,{#10000},25,13,25,16"
-locations_default(#20472,#10000,25,13,25,16)
-hasLocation(#20471,#20472)
-enclosing_stmt(#20471,#20463)
+exprs(#20471,0,#20468,1,"b")
+hasLocation(#20471,#20297)
+enclosing_stmt(#20471,#20464)
 expr_containers(#20471,#20001)
-#20473=*
-exprs(#20473,79,#20471,0,"c")
-hasLocation(#20473,#20301)
-enclosing_stmt(#20473,#20463)
-expr_containers(#20473,#20001)
-literals("c","c",#20473)
-#20474=@"var;{c};{#20000}"
-variables(#20474,"c",#20000)
-bind(#20473,#20474)
-#20475=*
-exprs(#20475,0,#20471,1,"d")
-hasLocation(#20475,#20305)
-enclosing_stmt(#20475,#20463)
-expr_containers(#20475,#20001)
-literals("d","d",#20475)
-isOptionalChaining(#20471)
+literals("b","b",#20471)
+isOptionalChaining(#20468)
+#20472=*
+exprs(#20472,14,#20466,1,"c?.d")
+#20473=@"loc,{#10000},25,13,25,16"
+locations_default(#20473,#10000,25,13,25,16)
+hasLocation(#20472,#20473)
+enclosing_stmt(#20472,#20464)
+expr_containers(#20472,#20001)
+#20474=*
+exprs(#20474,79,#20472,0,"c")
+hasLocation(#20474,#20301)
+enclosing_stmt(#20474,#20464)
+expr_containers(#20474,#20001)
+literals("c","c",#20474)
+#20475=@"var;{c};{#20000}"
+variables(#20475,"c",#20000)
+bind(#20474,#20475)
 #20476=*
-stmts(#20476,1,#20463,1,"{\n    true;\n}")
-#20477=@"loc,{#10000},25,19,27,1"
-locations_default(#20477,#10000,25,19,27,1)
-hasLocation(#20476,#20477)
-stmt_containers(#20476,#20001)
-#20478=*
-stmts(#20478,2,#20476,0,"true;")
-#20479=@"loc,{#10000},26,5,26,9"
-locations_default(#20479,#10000,26,5,26,9)
-hasLocation(#20478,#20479)
-stmt_containers(#20478,#20001)
-#20480=*
-exprs(#20480,2,#20478,0,"true")
-hasLocation(#20480,#20311)
-enclosing_stmt(#20480,#20478)
-expr_containers(#20480,#20001)
-literals("true","true",#20480)
+exprs(#20476,0,#20472,1,"d")
+hasLocation(#20476,#20305)
+enclosing_stmt(#20476,#20464)
+expr_containers(#20476,#20001)
+literals("d","d",#20476)
+isOptionalChaining(#20472)
+#20477=*
+stmts(#20477,1,#20464,1,"{\n    true;\n}")
+#20478=@"loc,{#10000},25,19,27,1"
+locations_default(#20478,#10000,25,19,27,1)
+hasLocation(#20477,#20478)
+stmt_containers(#20477,#20001)
+#20479=*
+stmts(#20479,2,#20477,0,"true;")
+#20480=@"loc,{#10000},26,5,26,9"
+locations_default(#20480,#10000,26,5,26,9)
+hasLocation(#20479,#20480)
+stmt_containers(#20479,#20001)
 #20481=*
-stmts(#20481,1,#20463,2,"{\n    false;\n}")
-#20482=@"loc,{#10000},27,8,29,1"
-locations_default(#20482,#10000,27,8,29,1)
-hasLocation(#20481,#20482)
-stmt_containers(#20481,#20001)
-#20483=*
-stmts(#20483,2,#20481,0,"false;")
-#20484=@"loc,{#10000},28,5,28,10"
-locations_default(#20484,#10000,28,5,28,10)
-hasLocation(#20483,#20484)
-stmt_containers(#20483,#20001)
-#20485=*
-exprs(#20485,2,#20483,0,"false")
-hasLocation(#20485,#20321)
-enclosing_stmt(#20485,#20483)
-expr_containers(#20485,#20001)
-literals("false","false",#20485)
+exprs(#20481,2,#20479,0,"true")
+hasLocation(#20481,#20311)
+enclosing_stmt(#20481,#20479)
+expr_containers(#20481,#20001)
+literals("true","true",#20481)
+#20482=*
+stmts(#20482,1,#20464,2,"{\n    false;\n}")
+#20483=@"loc,{#10000},27,8,29,1"
+locations_default(#20483,#10000,27,8,29,1)
+hasLocation(#20482,#20483)
+stmt_containers(#20482,#20001)
+#20484=*
+stmts(#20484,2,#20482,0,"false;")
+#20485=@"loc,{#10000},28,5,28,10"
+locations_default(#20485,#10000,28,5,28,10)
+hasLocation(#20484,#20485)
+stmt_containers(#20484,#20001)
 #20486=*
-entry_cfg_node(#20486,#20001)
-#20487=@"loc,{#10000},1,1,1,0"
-locations_default(#20487,#10000,1,1,1,0)
-hasLocation(#20486,#20487)
-#20488=*
-exit_cfg_node(#20488,#20001)
-hasLocation(#20488,#20326)
-successor(#20463,#20465)
-successor(#20465,#20469)
-successor(#20470,#20467)
-successor(#20469,#20470)
+exprs(#20486,2,#20484,0,"false")
+hasLocation(#20486,#20321)
+enclosing_stmt(#20486,#20484)
+expr_containers(#20486,#20001)
+literals("false","false",#20486)
+#20487=*
+entry_cfg_node(#20487,#20001)
+#20488=@"loc,{#10000},1,1,1,0"
+locations_default(#20488,#10000,1,1,1,0)
+hasLocation(#20487,#20488)
 #20489=*
-guard_node(#20489,1,#20467)
-hasLocation(#20489,#20468)
-successor(#20489,#20473)
+exit_cfg_node(#20489,#20001)
+hasLocation(#20489,#20326)
+successor(#20464,#20466)
+successor(#20466,#20470)
+successor(#20471,#20468)
+successor(#20470,#20471)
 #20490=*
-guard_node(#20490,0,#20467)
-hasLocation(#20490,#20468)
-successor(#20490,#20481)
-successor(#20467,#20489)
-successor(#20467,#20490)
-successor(#20469,#20481)
-successor(#20475,#20471)
-successor(#20473,#20475)
+guard_node(#20490,1,#20468)
+hasLocation(#20490,#20469)
+successor(#20490,#20474)
 #20491=*
-guard_node(#20491,1,#20471)
-hasLocation(#20491,#20472)
-successor(#20491,#20476)
+guard_node(#20491,0,#20468)
+hasLocation(#20491,#20469)
+successor(#20491,#20482)
+successor(#20468,#20490)
+successor(#20468,#20491)
+successor(#20470,#20482)
+successor(#20476,#20472)
+successor(#20474,#20476)
 #20492=*
-guard_node(#20492,0,#20471)
-hasLocation(#20492,#20472)
-successor(#20492,#20481)
-successor(#20471,#20491)
-successor(#20471,#20492)
-successor(#20473,#20481)
-successor(#20478,#20480)
-successor(#20480,#20488)
-successor(#20476,#20478)
-successor(#20483,#20485)
-successor(#20485,#20488)
-successor(#20481,#20483)
-successor(#20445,#20451)
-successor(#20452,#20449)
-successor(#20451,#20452)
-successor(#20449,#20447)
-successor(#20451,#20447)
+guard_node(#20492,1,#20472)
+hasLocation(#20492,#20473)
+successor(#20492,#20477)
 #20493=*
-guard_node(#20493,0,#20449)
-hasLocation(#20493,#20450)
-successor(#20493,#20453)
+guard_node(#20493,0,#20472)
+hasLocation(#20493,#20473)
+successor(#20493,#20482)
+successor(#20472,#20492)
+successor(#20472,#20493)
+successor(#20474,#20482)
+successor(#20479,#20481)
+successor(#20481,#20489)
+successor(#20477,#20479)
+successor(#20484,#20486)
+successor(#20486,#20489)
+successor(#20482,#20484)
+successor(#20446,#20452)
+successor(#20453,#20450)
+successor(#20452,#20453)
+successor(#20450,#20448)
+successor(#20452,#20448)
 #20494=*
-guard_node(#20494,1,#20449)
-hasLocation(#20494,#20450)
-successor(#20494,#20458)
-successor(#20447,#20493)
-successor(#20447,#20494)
-successor(#20455,#20457)
-successor(#20457,#20463)
-successor(#20453,#20455)
-successor(#20460,#20462)
-successor(#20462,#20463)
-successor(#20458,#20460)
-successor(#20429,#20433)
-successor(#20434,#20431)
-successor(#20433,#20434)
+guard_node(#20494,0,#20450)
+hasLocation(#20494,#20451)
+successor(#20494,#20454)
 #20495=*
-guard_node(#20495,1,#20431)
-hasLocation(#20495,#20432)
-successor(#20495,#20435)
+guard_node(#20495,1,#20450)
+hasLocation(#20495,#20451)
+successor(#20495,#20459)
+successor(#20448,#20494)
+successor(#20448,#20495)
+successor(#20456,#20458)
+successor(#20458,#20464)
+successor(#20454,#20456)
+successor(#20461,#20463)
+successor(#20463,#20464)
+successor(#20459,#20461)
+successor(#20430,#20434)
+successor(#20435,#20432)
+successor(#20434,#20435)
 #20496=*
-guard_node(#20496,0,#20431)
-hasLocation(#20496,#20432)
-successor(#20496,#20440)
-successor(#20431,#20495)
-successor(#20431,#20496)
-successor(#20433,#20440)
-successor(#20437,#20439)
-successor(#20439,#20445)
-successor(#20435,#20437)
-successor(#20442,#20444)
-successor(#20444,#20445)
-successor(#20440,#20442)
-successor(#20404,#20415)
-successor(#20428,#20405)
-successor(#20427,#20409)
-successor(#20426,#20416)
-successor(#20425,#20420)
-successor(#20424,#20422)
-successor(#20422,#20425)
-successor(#20424,#20411)
-successor(#20420,#20418)
-successor(#20418,#20426)
-successor(#20420,#20411)
-successor(#20416,#20411)
-successor(#20415,#20413)
-successor(#20413,#20424)
-successor(#20415,#20429)
-successor(#20411,#20427)
-successor(#20409,#20407)
-successor(#20407,#20428)
-successor(#20409,#20429)
-successor(#20405,#20429)
-successor(#20386,#20393)
-successor(#20403,#20387)
-successor(#20402,#20389)
-successor(#20401,#20394)
-successor(#20400,#20396)
-successor(#20398,#20400)
-successor(#20396,#20401)
-successor(#20398,#20391)
-successor(#20394,#20391)
-successor(#20396,#20391)
-successor(#20393,#20398)
-successor(#20391,#20402)
-successor(#20393,#20404)
-successor(#20389,#20403)
-successor(#20387,#20404)
-successor(#20389,#20404)
-successor(#20373,#20376)
-successor(#20385,#20374)
-successor(#20376,#20382)
-successor(#20384,#20378)
-successor(#20383,#20380)
-successor(#20382,#20383)
-successor(#20380,#20384)
-successor(#20382,#20385)
-successor(#20378,#20385)
-successor(#20374,#20386)
-successor(#20363,#20366)
-successor(#20372,#20364)
-successor(#20366,#20370)
-successor(#20371,#20368)
-successor(#20370,#20371)
-successor(#20368,#20372)
-successor(#20370,#20372)
-successor(#20364,#20373)
-successor(#20346,#20357)
-successor(#20362,#20347)
-successor(#20361,#20349)
-successor(#20360,#20351)
-successor(#20359,#20353)
-successor(#20358,#20355)
-successor(#20357,#20358)
-successor(#20355,#20359)
-successor(#20357,#20363)
-successor(#20353,#20360)
-successor(#20351,#20361)
-successor(#20349,#20362)
-successor(#20351,#20363)
-successor(#20347,#20363)
-successor(#20328,#20337)
-successor(#20345,#20329)
-successor(#20343,#20341)
-successor(#20341,#20331)
-successor(#20340,#20333)
-successor(#20339,#20335)
-successor(#20337,#20339)
-successor(#20335,#20340)
-successor(#20337,#20346)
-successor(#20333,#20343)
-successor(#20331,#20345)
-successor(#20329,#20346)
-successor(#20486,#20328)
+guard_node(#20496,1,#20432)
+hasLocation(#20496,#20433)
+successor(#20496,#20436)
+#20497=*
+guard_node(#20497,0,#20432)
+hasLocation(#20497,#20433)
+successor(#20497,#20441)
+successor(#20432,#20496)
+successor(#20432,#20497)
+successor(#20434,#20441)
+successor(#20438,#20440)
+successor(#20440,#20446)
+successor(#20436,#20438)
+successor(#20443,#20445)
+successor(#20445,#20446)
+successor(#20441,#20443)
+successor(#20405,#20416)
+successor(#20429,#20406)
+successor(#20428,#20410)
+successor(#20427,#20417)
+successor(#20426,#20421)
+successor(#20425,#20423)
+successor(#20423,#20426)
+successor(#20425,#20412)
+successor(#20421,#20419)
+successor(#20419,#20427)
+successor(#20421,#20412)
+successor(#20417,#20412)
+successor(#20416,#20414)
+successor(#20414,#20425)
+successor(#20416,#20430)
+successor(#20412,#20428)
+successor(#20410,#20408)
+successor(#20408,#20429)
+successor(#20410,#20430)
+successor(#20406,#20430)
+successor(#20387,#20394)
+successor(#20404,#20388)
+successor(#20403,#20390)
+successor(#20402,#20395)
+successor(#20401,#20397)
+successor(#20399,#20401)
+successor(#20397,#20402)
+successor(#20399,#20392)
+successor(#20395,#20392)
+successor(#20397,#20392)
+successor(#20394,#20399)
+successor(#20392,#20403)
+successor(#20394,#20405)
+successor(#20390,#20404)
+successor(#20388,#20405)
+successor(#20390,#20405)
+successor(#20374,#20377)
+successor(#20386,#20375)
+successor(#20377,#20383)
+successor(#20385,#20379)
+successor(#20384,#20381)
+successor(#20383,#20384)
+successor(#20381,#20385)
+successor(#20383,#20386)
+successor(#20379,#20386)
+successor(#20375,#20387)
+successor(#20364,#20367)
+successor(#20373,#20365)
+successor(#20367,#20371)
+successor(#20372,#20369)
+successor(#20371,#20372)
+successor(#20369,#20373)
+successor(#20371,#20373)
+successor(#20365,#20374)
+successor(#20347,#20358)
+successor(#20363,#20348)
+successor(#20362,#20350)
+successor(#20361,#20352)
+successor(#20360,#20354)
+successor(#20359,#20356)
+successor(#20358,#20359)
+successor(#20356,#20360)
+successor(#20358,#20364)
+successor(#20354,#20361)
+successor(#20352,#20362)
+successor(#20350,#20363)
+successor(#20352,#20364)
+successor(#20348,#20364)
+successor(#20329,#20338)
+successor(#20346,#20330)
+successor(#20344,#20342)
+successor(#20342,#20332)
+successor(#20341,#20334)
+successor(#20340,#20336)
+successor(#20338,#20340)
+successor(#20336,#20341)
+successor(#20338,#20347)
+successor(#20334,#20344)
+successor(#20332,#20346)
+successor(#20330,#20347)
+successor(#20487,#20329)
 numlines(#10000,29,21,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/esnext/output/trap/top-level-await.js.trap b/javascript/extractor/tests/esnext/output/trap/top-level-await.js.trap
index 1b436f9a6b8..f057961bfc7 100644
--- a/javascript/extractor/tests/esnext/output/trap/top-level-await.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/top-level-await.js.trap
@@ -158,112 +158,114 @@ variables(#20054,"language",#20053)
 variables(#20057,"strings",#20053)
 local_type_names(#20055,"language",#20053)
 local_namespace_names(#20056,"language",#20053)
-#20058=*
-stmts(#20058,27,#20001,0,"import  ... tings';")
-hasLocation(#20058,#20003)
-stmt_containers(#20058,#20001)
+#20058=@"var;{this};{#20053}"
+variables(#20058,"this",#20053)
 #20059=*
-exprs(#20059,4,#20058,-1,"'settings'")
-hasLocation(#20059,#20017)
-enclosing_stmt(#20059,#20058)
-expr_containers(#20059,#20001)
-literals("settings","'settings'",#20059)
+stmts(#20059,27,#20001,0,"import  ... tings';")
+hasLocation(#20059,#20003)
+stmt_containers(#20059,#20001)
 #20060=*
-regexpterm(#20060,14,#20059,0,"settings")
-#20061=@"loc,{#10000},1,27,1,34"
-locations_default(#20061,#10000,1,27,1,34)
-hasLocation(#20060,#20061)
-regexp_const_value(#20060,"settings")
-#20062=*
-exprs(#20062,83,#20058,0,"language")
-hasLocation(#20062,#20011)
-enclosing_stmt(#20062,#20058)
-expr_containers(#20062,#20001)
+exprs(#20060,4,#20059,-1,"'settings'")
+hasLocation(#20060,#20017)
+enclosing_stmt(#20060,#20059)
+expr_containers(#20060,#20001)
+literals("settings","'settings'",#20060)
+#20061=*
+regexpterm(#20061,14,#20060,0,"settings")
+#20062=@"loc,{#10000},1,27,1,34"
+locations_default(#20062,#10000,1,27,1,34)
+hasLocation(#20061,#20062)
+regexp_const_value(#20061,"settings")
 #20063=*
-exprs(#20063,0,#20062,0,"language")
+exprs(#20063,83,#20059,0,"language")
 hasLocation(#20063,#20011)
-enclosing_stmt(#20063,#20058)
+enclosing_stmt(#20063,#20059)
 expr_containers(#20063,#20001)
-literals("language","language",#20063)
 #20064=*
-exprs(#20064,78,#20062,1,"language")
+exprs(#20064,0,#20063,0,"language")
 hasLocation(#20064,#20011)
-enclosing_stmt(#20064,#20058)
+enclosing_stmt(#20064,#20059)
 expr_containers(#20064,#20001)
 literals("language","language",#20064)
-decl(#20064,#20054)
-typedecl(#20064,#20055)
-namespacedecl(#20064,#20056)
 #20065=*
-stmts(#20065,22,#20001,1,"const s ... age}`);")
-hasLocation(#20065,#20005)
-stmt_containers(#20065,#20001)
+exprs(#20065,78,#20063,1,"language")
+hasLocation(#20065,#20011)
+enclosing_stmt(#20065,#20059)
+expr_containers(#20065,#20001)
+literals("language","language",#20065)
+decl(#20065,#20054)
+typedecl(#20065,#20055)
+namespacedecl(#20065,#20056)
 #20066=*
-exprs(#20066,64,#20065,0,"strings ... uage}`)")
-#20067=@"loc,{#10000},2,7,2,50"
-locations_default(#20067,#10000,2,7,2,50)
-hasLocation(#20066,#20067)
-enclosing_stmt(#20066,#20065)
-expr_containers(#20066,#20001)
-#20068=*
-exprs(#20068,78,#20066,0,"strings")
-hasLocation(#20068,#20023)
-enclosing_stmt(#20068,#20065)
-expr_containers(#20068,#20001)
-literals("strings","strings",#20068)
-decl(#20068,#20057)
+stmts(#20066,22,#20001,1,"const s ... age}`);")
+hasLocation(#20066,#20005)
+stmt_containers(#20066,#20001)
+#20067=*
+exprs(#20067,64,#20066,0,"strings ... uage}`)")
+#20068=@"loc,{#10000},2,7,2,50"
+locations_default(#20068,#10000,2,7,2,50)
+hasLocation(#20067,#20068)
+enclosing_stmt(#20067,#20066)
+expr_containers(#20067,#20001)
 #20069=*
-exprs(#20069,92,#20066,1,"await i ... uage}`)")
-#20070=@"loc,{#10000},2,17,2,50"
-locations_default(#20070,#10000,2,17,2,50)
-hasLocation(#20069,#20070)
-enclosing_stmt(#20069,#20065)
+exprs(#20069,78,#20067,0,"strings")
+hasLocation(#20069,#20023)
+enclosing_stmt(#20069,#20066)
 expr_containers(#20069,#20001)
-#20071=*
-exprs(#20071,99,#20069,0,"import( ... uage}`)")
-#20072=@"loc,{#10000},2,23,2,50"
-locations_default(#20072,#10000,2,23,2,50)
-hasLocation(#20071,#20072)
-enclosing_stmt(#20071,#20065)
-expr_containers(#20071,#20001)
-#20073=*
-exprs(#20073,71,#20071,0,"`./i18n/${language}`")
-#20074=@"loc,{#10000},2,30,2,49"
-locations_default(#20074,#10000,2,30,2,49)
-hasLocation(#20073,#20074)
-enclosing_stmt(#20073,#20065)
-expr_containers(#20073,#20001)
-#20075=*
-exprs(#20075,72,#20073,0,"./i18n/")
-hasLocation(#20075,#20035)
-enclosing_stmt(#20075,#20065)
-expr_containers(#20075,#20001)
-literals("./i18n/","./i18n/",#20075)
+literals("strings","strings",#20069)
+decl(#20069,#20057)
+#20070=*
+exprs(#20070,92,#20067,1,"await i ... uage}`)")
+#20071=@"loc,{#10000},2,17,2,50"
+locations_default(#20071,#10000,2,17,2,50)
+hasLocation(#20070,#20071)
+enclosing_stmt(#20070,#20066)
+expr_containers(#20070,#20001)
+#20072=*
+exprs(#20072,99,#20070,0,"import( ... uage}`)")
+#20073=@"loc,{#10000},2,23,2,50"
+locations_default(#20073,#10000,2,23,2,50)
+hasLocation(#20072,#20073)
+enclosing_stmt(#20072,#20066)
+expr_containers(#20072,#20001)
+#20074=*
+exprs(#20074,71,#20072,0,"`./i18n/${language}`")
+#20075=@"loc,{#10000},2,30,2,49"
+locations_default(#20075,#10000,2,30,2,49)
+hasLocation(#20074,#20075)
+enclosing_stmt(#20074,#20066)
+expr_containers(#20074,#20001)
 #20076=*
-exprs(#20076,79,#20073,1,"language")
-hasLocation(#20076,#20039)
-enclosing_stmt(#20076,#20065)
+exprs(#20076,72,#20074,0,"./i18n/")
+hasLocation(#20076,#20035)
+enclosing_stmt(#20076,#20066)
 expr_containers(#20076,#20001)
-literals("language","language",#20076)
-bind(#20076,#20054)
+literals("./i18n/","./i18n/",#20076)
 #20077=*
-entry_cfg_node(#20077,#20001)
-#20078=@"loc,{#10000},1,1,1,0"
-locations_default(#20078,#10000,1,1,1,0)
-hasLocation(#20077,#20078)
-#20079=*
-exit_cfg_node(#20079,#20001)
-hasLocation(#20079,#20051)
-successor(#20065,#20068)
-successor(#20073,#20075)
-successor(#20076,#20071)
-successor(#20075,#20076)
-successor(#20071,#20069)
-successor(#20069,#20066)
-successor(#20068,#20073)
-successor(#20066,#20079)
-successor(#20058,#20065)
-successor(#20062,#20058)
-successor(#20077,#20062)
+exprs(#20077,79,#20074,1,"language")
+hasLocation(#20077,#20039)
+enclosing_stmt(#20077,#20066)
+expr_containers(#20077,#20001)
+literals("language","language",#20077)
+bind(#20077,#20054)
+#20078=*
+entry_cfg_node(#20078,#20001)
+#20079=@"loc,{#10000},1,1,1,0"
+locations_default(#20079,#10000,1,1,1,0)
+hasLocation(#20078,#20079)
+#20080=*
+exit_cfg_node(#20080,#20001)
+hasLocation(#20080,#20051)
+successor(#20066,#20069)
+successor(#20074,#20076)
+successor(#20077,#20072)
+successor(#20076,#20077)
+successor(#20072,#20070)
+successor(#20070,#20067)
+successor(#20069,#20074)
+successor(#20067,#20080)
+successor(#20059,#20066)
+successor(#20063,#20059)
+successor(#20078,#20063)
 numlines(#10000,2,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/esnext/output/trap/yield-import.js.trap b/javascript/extractor/tests/esnext/output/trap/yield-import.js.trap
index 8a2a95ffc20..b7ea932ad32 100644
--- a/javascript/extractor/tests/esnext/output/trap/yield-import.js.trap
+++ b/javascript/extractor/tests/esnext/output/trap/yield-import.js.trap
@@ -98,86 +98,90 @@ locations_default(#20033,#10000,1,1,4,0)
 hasLocation(#20001,#20033)
 #20034=@"var;{f};{#20000}"
 variables(#20034,"f",#20000)
-#20035=*
-stmts(#20035,17,#20001,0,"functio ... foo"")\n}")
-#20036=@"loc,{#10000},1,1,3,1"
-locations_default(#20036,#10000,1,1,3,1)
-hasLocation(#20035,#20036)
-stmt_containers(#20035,#20001)
-#20037=*
-exprs(#20037,78,#20035,-1,"f")
-hasLocation(#20037,#20013)
-expr_containers(#20037,#20035)
-literals("f","f",#20037)
-decl(#20037,#20034)
+#20035=@"var;{this};{#20000}"
+variables(#20035,"this",#20000)
+#20036=*
+stmts(#20036,17,#20001,0,"functio ... foo"")\n}")
+#20037=@"loc,{#10000},1,1,3,1"
+locations_default(#20037,#10000,1,1,3,1)
+hasLocation(#20036,#20037)
+stmt_containers(#20036,#20001)
 #20038=*
-scopes(#20038,1)
-scopenodes(#20035,#20038)
-scopenesting(#20038,#20000)
-#20039=@"var;{arguments};{#20038}"
-variables(#20039,"arguments",#20038)
-is_arguments_object(#20039)
-is_generator(#20035)
-#20040=*
-stmts(#20040,1,#20035,-2,"{\n  yie ... foo"")\n}")
-#20041=@"loc,{#10000},1,15,3,1"
-locations_default(#20041,#10000,1,15,3,1)
-hasLocation(#20040,#20041)
-stmt_containers(#20040,#20035)
+exprs(#20038,78,#20036,-1,"f")
+hasLocation(#20038,#20013)
+expr_containers(#20038,#20036)
+literals("f","f",#20038)
+decl(#20038,#20034)
+#20039=*
+scopes(#20039,1)
+scopenodes(#20036,#20039)
+scopenesting(#20039,#20000)
+#20040=@"var;{this};{#20039}"
+variables(#20040,"this",#20039)
+#20041=@"var;{arguments};{#20039}"
+variables(#20041,"arguments",#20039)
+is_arguments_object(#20041)
+is_generator(#20036)
 #20042=*
-stmts(#20042,2,#20040,0,"yield import(""foo"")")
-#20043=@"loc,{#10000},2,3,2,21"
-locations_default(#20043,#10000,2,3,2,21)
+stmts(#20042,1,#20036,-2,"{\n  yie ... foo"")\n}")
+#20043=@"loc,{#10000},1,15,3,1"
+locations_default(#20043,#10000,1,15,3,1)
 hasLocation(#20042,#20043)
-stmt_containers(#20042,#20035)
+stmt_containers(#20042,#20036)
 #20044=*
-exprs(#20044,69,#20042,0,"yield import(""foo"")")
-hasLocation(#20044,#20043)
-enclosing_stmt(#20044,#20042)
-expr_containers(#20044,#20035)
-#20045=*
-exprs(#20045,99,#20044,0,"import(""foo"")")
-#20046=@"loc,{#10000},2,9,2,21"
-locations_default(#20046,#10000,2,9,2,21)
-hasLocation(#20045,#20046)
-enclosing_stmt(#20045,#20042)
-expr_containers(#20045,#20035)
+stmts(#20044,2,#20042,0,"yield import(""foo"")")
+#20045=@"loc,{#10000},2,3,2,21"
+locations_default(#20045,#10000,2,3,2,21)
+hasLocation(#20044,#20045)
+stmt_containers(#20044,#20036)
+#20046=*
+exprs(#20046,69,#20044,0,"yield import(""foo"")")
+hasLocation(#20046,#20045)
+enclosing_stmt(#20046,#20044)
+expr_containers(#20046,#20036)
 #20047=*
-exprs(#20047,4,#20045,0,"""foo""")
-hasLocation(#20047,#20027)
-enclosing_stmt(#20047,#20042)
-expr_containers(#20047,#20035)
-literals("foo","""foo""",#20047)
-#20048=*
-regexpterm(#20048,14,#20047,0,"foo")
-#20049=@"loc,{#10000},2,17,2,19"
-locations_default(#20049,#10000,2,17,2,19)
-hasLocation(#20048,#20049)
-regexp_const_value(#20048,"foo")
+exprs(#20047,99,#20046,0,"import(""foo"")")
+#20048=@"loc,{#10000},2,9,2,21"
+locations_default(#20048,#10000,2,9,2,21)
+hasLocation(#20047,#20048)
+enclosing_stmt(#20047,#20044)
+expr_containers(#20047,#20036)
+#20049=*
+exprs(#20049,4,#20047,0,"""foo""")
+hasLocation(#20049,#20027)
+enclosing_stmt(#20049,#20044)
+expr_containers(#20049,#20036)
+literals("foo","""foo""",#20049)
 #20050=*
-entry_cfg_node(#20050,#20001)
-#20051=@"loc,{#10000},1,1,1,0"
-locations_default(#20051,#10000,1,1,1,0)
+regexpterm(#20050,14,#20049,0,"foo")
+#20051=@"loc,{#10000},2,17,2,19"
+locations_default(#20051,#10000,2,17,2,19)
 hasLocation(#20050,#20051)
+regexp_const_value(#20050,"foo")
 #20052=*
-exit_cfg_node(#20052,#20001)
-hasLocation(#20052,#20032)
-successor(#20035,#20052)
-#20053=*
-entry_cfg_node(#20053,#20035)
-hasLocation(#20053,#20051)
+entry_cfg_node(#20052,#20001)
+#20053=@"loc,{#10000},1,1,1,0"
+locations_default(#20053,#10000,1,1,1,0)
+hasLocation(#20052,#20053)
 #20054=*
-exit_cfg_node(#20054,#20035)
-#20055=@"loc,{#10000},3,2,3,1"
-locations_default(#20055,#10000,3,2,3,1)
-hasLocation(#20054,#20055)
-successor(#20042,#20047)
-successor(#20047,#20045)
-successor(#20045,#20044)
-successor(#20044,#20054)
-successor(#20040,#20042)
-successor(#20053,#20040)
-successor(#20037,#20035)
-successor(#20050,#20037)
+exit_cfg_node(#20054,#20001)
+hasLocation(#20054,#20032)
+successor(#20036,#20054)
+#20055=*
+entry_cfg_node(#20055,#20036)
+hasLocation(#20055,#20053)
+#20056=*
+exit_cfg_node(#20056,#20036)
+#20057=@"loc,{#10000},3,2,3,1"
+locations_default(#20057,#10000,3,2,3,1)
+hasLocation(#20056,#20057)
+successor(#20044,#20049)
+successor(#20049,#20047)
+successor(#20047,#20046)
+successor(#20046,#20056)
+successor(#20042,#20044)
+successor(#20055,#20042)
+successor(#20038,#20036)
+successor(#20052,#20038)
 numlines(#10000,3,3,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/exprs/output/trap/assignment.js.trap b/javascript/extractor/tests/exprs/output/trap/assignment.js.trap
index 42df8f6fe5b..307ba799b5d 100644
--- a/javascript/extractor/tests/exprs/output/trap/assignment.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/assignment.js.trap
@@ -330,355 +330,357 @@ toplevels(#20001,0)
 #20124=@"loc,{#10000},1,1,12,7"
 locations_default(#20124,#10000,1,1,12,7)
 hasLocation(#20001,#20124)
-#20125=*
-stmts(#20125,2,#20001,0,"a = 23;")
-hasLocation(#20125,#20003)
-stmt_containers(#20125,#20001)
+#20125=@"var;{this};{#20000}"
+variables(#20125,"this",#20000)
 #20126=*
-exprs(#20126,47,#20125,0,"a = 23")
-#20127=@"loc,{#10000},1,1,1,6"
-locations_default(#20127,#10000,1,1,1,6)
-hasLocation(#20126,#20127)
-enclosing_stmt(#20126,#20125)
-expr_containers(#20126,#20001)
-#20128=*
-exprs(#20128,79,#20126,0,"a")
-hasLocation(#20128,#20027)
-enclosing_stmt(#20128,#20125)
-expr_containers(#20128,#20001)
-literals("a","a",#20128)
-#20129=@"var;{a};{#20000}"
-variables(#20129,"a",#20000)
-bind(#20128,#20129)
-#20130=*
-exprs(#20130,3,#20126,1,"23")
-hasLocation(#20130,#20031)
-enclosing_stmt(#20130,#20125)
-expr_containers(#20130,#20001)
-literals("23","23",#20130)
+stmts(#20126,2,#20001,0,"a = 23;")
+hasLocation(#20126,#20003)
+stmt_containers(#20126,#20001)
+#20127=*
+exprs(#20127,47,#20126,0,"a = 23")
+#20128=@"loc,{#10000},1,1,1,6"
+locations_default(#20128,#10000,1,1,1,6)
+hasLocation(#20127,#20128)
+enclosing_stmt(#20127,#20126)
+expr_containers(#20127,#20001)
+#20129=*
+exprs(#20129,79,#20127,0,"a")
+hasLocation(#20129,#20027)
+enclosing_stmt(#20129,#20126)
+expr_containers(#20129,#20001)
+literals("a","a",#20129)
+#20130=@"var;{a};{#20000}"
+variables(#20130,"a",#20000)
+bind(#20129,#20130)
 #20131=*
-stmts(#20131,2,#20001,1,"a += 19;")
-hasLocation(#20131,#20005)
-stmt_containers(#20131,#20001)
+exprs(#20131,3,#20127,1,"23")
+hasLocation(#20131,#20031)
+enclosing_stmt(#20131,#20126)
+expr_containers(#20131,#20001)
+literals("23","23",#20131)
 #20132=*
-exprs(#20132,48,#20131,0,"a += 19")
-#20133=@"loc,{#10000},2,1,2,7"
-locations_default(#20133,#10000,2,1,2,7)
-hasLocation(#20132,#20133)
-enclosing_stmt(#20132,#20131)
-expr_containers(#20132,#20001)
-#20134=*
-exprs(#20134,79,#20132,0,"a")
-hasLocation(#20134,#20035)
-enclosing_stmt(#20134,#20131)
-expr_containers(#20134,#20001)
-literals("a","a",#20134)
-bind(#20134,#20129)
+stmts(#20132,2,#20001,1,"a += 19;")
+hasLocation(#20132,#20005)
+stmt_containers(#20132,#20001)
+#20133=*
+exprs(#20133,48,#20132,0,"a += 19")
+#20134=@"loc,{#10000},2,1,2,7"
+locations_default(#20134,#10000,2,1,2,7)
+hasLocation(#20133,#20134)
+enclosing_stmt(#20133,#20132)
+expr_containers(#20133,#20001)
 #20135=*
-exprs(#20135,3,#20132,1,"19")
-hasLocation(#20135,#20039)
-enclosing_stmt(#20135,#20131)
+exprs(#20135,79,#20133,0,"a")
+hasLocation(#20135,#20035)
+enclosing_stmt(#20135,#20132)
 expr_containers(#20135,#20001)
-literals("19","19",#20135)
+literals("a","a",#20135)
+bind(#20135,#20130)
 #20136=*
-stmts(#20136,2,#20001,2,"a -= 9;")
-hasLocation(#20136,#20007)
-stmt_containers(#20136,#20001)
+exprs(#20136,3,#20133,1,"19")
+hasLocation(#20136,#20039)
+enclosing_stmt(#20136,#20132)
+expr_containers(#20136,#20001)
+literals("19","19",#20136)
 #20137=*
-exprs(#20137,49,#20136,0,"a -= 9")
-#20138=@"loc,{#10000},3,1,3,6"
-locations_default(#20138,#10000,3,1,3,6)
-hasLocation(#20137,#20138)
-enclosing_stmt(#20137,#20136)
-expr_containers(#20137,#20001)
-#20139=*
-exprs(#20139,79,#20137,0,"a")
-hasLocation(#20139,#20043)
-enclosing_stmt(#20139,#20136)
-expr_containers(#20139,#20001)
-literals("a","a",#20139)
-bind(#20139,#20129)
+stmts(#20137,2,#20001,2,"a -= 9;")
+hasLocation(#20137,#20007)
+stmt_containers(#20137,#20001)
+#20138=*
+exprs(#20138,49,#20137,0,"a -= 9")
+#20139=@"loc,{#10000},3,1,3,6"
+locations_default(#20139,#10000,3,1,3,6)
+hasLocation(#20138,#20139)
+enclosing_stmt(#20138,#20137)
+expr_containers(#20138,#20001)
 #20140=*
-exprs(#20140,3,#20137,1,"9")
-hasLocation(#20140,#20047)
-enclosing_stmt(#20140,#20136)
+exprs(#20140,79,#20138,0,"a")
+hasLocation(#20140,#20043)
+enclosing_stmt(#20140,#20137)
 expr_containers(#20140,#20001)
-literals("9","9",#20140)
+literals("a","a",#20140)
+bind(#20140,#20130)
 #20141=*
-stmts(#20141,2,#20001,3,"a *= b;")
-hasLocation(#20141,#20009)
-stmt_containers(#20141,#20001)
+exprs(#20141,3,#20138,1,"9")
+hasLocation(#20141,#20047)
+enclosing_stmt(#20141,#20137)
+expr_containers(#20141,#20001)
+literals("9","9",#20141)
 #20142=*
-exprs(#20142,50,#20141,0,"a *= b")
-#20143=@"loc,{#10000},4,1,4,6"
-locations_default(#20143,#10000,4,1,4,6)
-hasLocation(#20142,#20143)
-enclosing_stmt(#20142,#20141)
-expr_containers(#20142,#20001)
-#20144=*
-exprs(#20144,79,#20142,0,"a")
-hasLocation(#20144,#20051)
-enclosing_stmt(#20144,#20141)
-expr_containers(#20144,#20001)
-literals("a","a",#20144)
-bind(#20144,#20129)
+stmts(#20142,2,#20001,3,"a *= b;")
+hasLocation(#20142,#20009)
+stmt_containers(#20142,#20001)
+#20143=*
+exprs(#20143,50,#20142,0,"a *= b")
+#20144=@"loc,{#10000},4,1,4,6"
+locations_default(#20144,#10000,4,1,4,6)
+hasLocation(#20143,#20144)
+enclosing_stmt(#20143,#20142)
+expr_containers(#20143,#20001)
 #20145=*
-exprs(#20145,79,#20142,1,"b")
-hasLocation(#20145,#20055)
-enclosing_stmt(#20145,#20141)
+exprs(#20145,79,#20143,0,"a")
+hasLocation(#20145,#20051)
+enclosing_stmt(#20145,#20142)
 expr_containers(#20145,#20001)
-literals("b","b",#20145)
-#20146=@"var;{b};{#20000}"
-variables(#20146,"b",#20000)
-bind(#20145,#20146)
-#20147=*
-stmts(#20147,2,#20001,4,"a /= 2;")
-hasLocation(#20147,#20011)
-stmt_containers(#20147,#20001)
+literals("a","a",#20145)
+bind(#20145,#20130)
+#20146=*
+exprs(#20146,79,#20143,1,"b")
+hasLocation(#20146,#20055)
+enclosing_stmt(#20146,#20142)
+expr_containers(#20146,#20001)
+literals("b","b",#20146)
+#20147=@"var;{b};{#20000}"
+variables(#20147,"b",#20000)
+bind(#20146,#20147)
 #20148=*
-exprs(#20148,51,#20147,0,"a /= 2")
-#20149=@"loc,{#10000},5,1,5,6"
-locations_default(#20149,#10000,5,1,5,6)
-hasLocation(#20148,#20149)
-enclosing_stmt(#20148,#20147)
-expr_containers(#20148,#20001)
-#20150=*
-exprs(#20150,79,#20148,0,"a")
-hasLocation(#20150,#20059)
-enclosing_stmt(#20150,#20147)
-expr_containers(#20150,#20001)
-literals("a","a",#20150)
-bind(#20150,#20129)
+stmts(#20148,2,#20001,4,"a /= 2;")
+hasLocation(#20148,#20011)
+stmt_containers(#20148,#20001)
+#20149=*
+exprs(#20149,51,#20148,0,"a /= 2")
+#20150=@"loc,{#10000},5,1,5,6"
+locations_default(#20150,#10000,5,1,5,6)
+hasLocation(#20149,#20150)
+enclosing_stmt(#20149,#20148)
+expr_containers(#20149,#20001)
 #20151=*
-exprs(#20151,3,#20148,1,"2")
-hasLocation(#20151,#20063)
-enclosing_stmt(#20151,#20147)
+exprs(#20151,79,#20149,0,"a")
+hasLocation(#20151,#20059)
+enclosing_stmt(#20151,#20148)
 expr_containers(#20151,#20001)
-literals("2","2",#20151)
+literals("a","a",#20151)
+bind(#20151,#20130)
 #20152=*
-stmts(#20152,2,#20001,5,"a %= 2;")
-hasLocation(#20152,#20013)
-stmt_containers(#20152,#20001)
+exprs(#20152,3,#20149,1,"2")
+hasLocation(#20152,#20063)
+enclosing_stmt(#20152,#20148)
+expr_containers(#20152,#20001)
+literals("2","2",#20152)
 #20153=*
-exprs(#20153,52,#20152,0,"a %= 2")
-#20154=@"loc,{#10000},6,1,6,6"
-locations_default(#20154,#10000,6,1,6,6)
-hasLocation(#20153,#20154)
-enclosing_stmt(#20153,#20152)
-expr_containers(#20153,#20001)
-#20155=*
-exprs(#20155,79,#20153,0,"a")
-hasLocation(#20155,#20067)
-enclosing_stmt(#20155,#20152)
-expr_containers(#20155,#20001)
-literals("a","a",#20155)
-bind(#20155,#20129)
+stmts(#20153,2,#20001,5,"a %= 2;")
+hasLocation(#20153,#20013)
+stmt_containers(#20153,#20001)
+#20154=*
+exprs(#20154,52,#20153,0,"a %= 2")
+#20155=@"loc,{#10000},6,1,6,6"
+locations_default(#20155,#10000,6,1,6,6)
+hasLocation(#20154,#20155)
+enclosing_stmt(#20154,#20153)
+expr_containers(#20154,#20001)
 #20156=*
-exprs(#20156,3,#20153,1,"2")
-hasLocation(#20156,#20071)
-enclosing_stmt(#20156,#20152)
+exprs(#20156,79,#20154,0,"a")
+hasLocation(#20156,#20067)
+enclosing_stmt(#20156,#20153)
 expr_containers(#20156,#20001)
-literals("2","2",#20156)
+literals("a","a",#20156)
+bind(#20156,#20130)
 #20157=*
-stmts(#20157,2,#20001,6,"a <<= 8;")
-hasLocation(#20157,#20015)
-stmt_containers(#20157,#20001)
+exprs(#20157,3,#20154,1,"2")
+hasLocation(#20157,#20071)
+enclosing_stmt(#20157,#20153)
+expr_containers(#20157,#20001)
+literals("2","2",#20157)
 #20158=*
-exprs(#20158,53,#20157,0,"a <<= 8")
-#20159=@"loc,{#10000},7,1,7,7"
-locations_default(#20159,#10000,7,1,7,7)
-hasLocation(#20158,#20159)
-enclosing_stmt(#20158,#20157)
-expr_containers(#20158,#20001)
-#20160=*
-exprs(#20160,79,#20158,0,"a")
-hasLocation(#20160,#20075)
-enclosing_stmt(#20160,#20157)
-expr_containers(#20160,#20001)
-literals("a","a",#20160)
-bind(#20160,#20129)
+stmts(#20158,2,#20001,6,"a <<= 8;")
+hasLocation(#20158,#20015)
+stmt_containers(#20158,#20001)
+#20159=*
+exprs(#20159,53,#20158,0,"a <<= 8")
+#20160=@"loc,{#10000},7,1,7,7"
+locations_default(#20160,#10000,7,1,7,7)
+hasLocation(#20159,#20160)
+enclosing_stmt(#20159,#20158)
+expr_containers(#20159,#20001)
 #20161=*
-exprs(#20161,3,#20158,1,"8")
-hasLocation(#20161,#20079)
-enclosing_stmt(#20161,#20157)
+exprs(#20161,79,#20159,0,"a")
+hasLocation(#20161,#20075)
+enclosing_stmt(#20161,#20158)
 expr_containers(#20161,#20001)
-literals("8","8",#20161)
+literals("a","a",#20161)
+bind(#20161,#20130)
 #20162=*
-stmts(#20162,2,#20001,7,"a >>= 7;")
-hasLocation(#20162,#20017)
-stmt_containers(#20162,#20001)
+exprs(#20162,3,#20159,1,"8")
+hasLocation(#20162,#20079)
+enclosing_stmt(#20162,#20158)
+expr_containers(#20162,#20001)
+literals("8","8",#20162)
 #20163=*
-exprs(#20163,54,#20162,0,"a >>= 7")
-#20164=@"loc,{#10000},8,1,8,7"
-locations_default(#20164,#10000,8,1,8,7)
-hasLocation(#20163,#20164)
-enclosing_stmt(#20163,#20162)
-expr_containers(#20163,#20001)
-#20165=*
-exprs(#20165,79,#20163,0,"a")
-hasLocation(#20165,#20083)
-enclosing_stmt(#20165,#20162)
-expr_containers(#20165,#20001)
-literals("a","a",#20165)
-bind(#20165,#20129)
+stmts(#20163,2,#20001,7,"a >>= 7;")
+hasLocation(#20163,#20017)
+stmt_containers(#20163,#20001)
+#20164=*
+exprs(#20164,54,#20163,0,"a >>= 7")
+#20165=@"loc,{#10000},8,1,8,7"
+locations_default(#20165,#10000,8,1,8,7)
+hasLocation(#20164,#20165)
+enclosing_stmt(#20164,#20163)
+expr_containers(#20164,#20001)
 #20166=*
-exprs(#20166,3,#20163,1,"7")
-hasLocation(#20166,#20087)
-enclosing_stmt(#20166,#20162)
+exprs(#20166,79,#20164,0,"a")
+hasLocation(#20166,#20083)
+enclosing_stmt(#20166,#20163)
 expr_containers(#20166,#20001)
-literals("7","7",#20166)
+literals("a","a",#20166)
+bind(#20166,#20130)
 #20167=*
-stmts(#20167,2,#20001,8,"a >>>= 2;")
-hasLocation(#20167,#20019)
-stmt_containers(#20167,#20001)
+exprs(#20167,3,#20164,1,"7")
+hasLocation(#20167,#20087)
+enclosing_stmt(#20167,#20163)
+expr_containers(#20167,#20001)
+literals("7","7",#20167)
 #20168=*
-exprs(#20168,55,#20167,0,"a >>>= 2")
-#20169=@"loc,{#10000},9,1,9,8"
-locations_default(#20169,#10000,9,1,9,8)
-hasLocation(#20168,#20169)
-enclosing_stmt(#20168,#20167)
-expr_containers(#20168,#20001)
-#20170=*
-exprs(#20170,79,#20168,0,"a")
-hasLocation(#20170,#20091)
-enclosing_stmt(#20170,#20167)
-expr_containers(#20170,#20001)
-literals("a","a",#20170)
-bind(#20170,#20129)
+stmts(#20168,2,#20001,8,"a >>>= 2;")
+hasLocation(#20168,#20019)
+stmt_containers(#20168,#20001)
+#20169=*
+exprs(#20169,55,#20168,0,"a >>>= 2")
+#20170=@"loc,{#10000},9,1,9,8"
+locations_default(#20170,#10000,9,1,9,8)
+hasLocation(#20169,#20170)
+enclosing_stmt(#20169,#20168)
+expr_containers(#20169,#20001)
 #20171=*
-exprs(#20171,3,#20168,1,"2")
-hasLocation(#20171,#20095)
-enclosing_stmt(#20171,#20167)
+exprs(#20171,79,#20169,0,"a")
+hasLocation(#20171,#20091)
+enclosing_stmt(#20171,#20168)
 expr_containers(#20171,#20001)
-literals("2","2",#20171)
+literals("a","a",#20171)
+bind(#20171,#20130)
 #20172=*
-stmts(#20172,2,#20001,9,"a |= 2;")
-hasLocation(#20172,#20021)
-stmt_containers(#20172,#20001)
+exprs(#20172,3,#20169,1,"2")
+hasLocation(#20172,#20095)
+enclosing_stmt(#20172,#20168)
+expr_containers(#20172,#20001)
+literals("2","2",#20172)
 #20173=*
-exprs(#20173,56,#20172,0,"a |= 2")
-#20174=@"loc,{#10000},10,1,10,6"
-locations_default(#20174,#10000,10,1,10,6)
-hasLocation(#20173,#20174)
-enclosing_stmt(#20173,#20172)
-expr_containers(#20173,#20001)
-#20175=*
-exprs(#20175,79,#20173,0,"a")
-hasLocation(#20175,#20099)
-enclosing_stmt(#20175,#20172)
-expr_containers(#20175,#20001)
-literals("a","a",#20175)
-bind(#20175,#20129)
+stmts(#20173,2,#20001,9,"a |= 2;")
+hasLocation(#20173,#20021)
+stmt_containers(#20173,#20001)
+#20174=*
+exprs(#20174,56,#20173,0,"a |= 2")
+#20175=@"loc,{#10000},10,1,10,6"
+locations_default(#20175,#10000,10,1,10,6)
+hasLocation(#20174,#20175)
+enclosing_stmt(#20174,#20173)
+expr_containers(#20174,#20001)
 #20176=*
-exprs(#20176,3,#20173,1,"2")
-hasLocation(#20176,#20103)
-enclosing_stmt(#20176,#20172)
+exprs(#20176,79,#20174,0,"a")
+hasLocation(#20176,#20099)
+enclosing_stmt(#20176,#20173)
 expr_containers(#20176,#20001)
-literals("2","2",#20176)
+literals("a","a",#20176)
+bind(#20176,#20130)
 #20177=*
-stmts(#20177,2,#20001,10,"a ^= 1;")
-hasLocation(#20177,#20023)
-stmt_containers(#20177,#20001)
+exprs(#20177,3,#20174,1,"2")
+hasLocation(#20177,#20103)
+enclosing_stmt(#20177,#20173)
+expr_containers(#20177,#20001)
+literals("2","2",#20177)
 #20178=*
-exprs(#20178,57,#20177,0,"a ^= 1")
-#20179=@"loc,{#10000},11,1,11,6"
-locations_default(#20179,#10000,11,1,11,6)
-hasLocation(#20178,#20179)
-enclosing_stmt(#20178,#20177)
-expr_containers(#20178,#20001)
-#20180=*
-exprs(#20180,79,#20178,0,"a")
-hasLocation(#20180,#20107)
-enclosing_stmt(#20180,#20177)
-expr_containers(#20180,#20001)
-literals("a","a",#20180)
-bind(#20180,#20129)
+stmts(#20178,2,#20001,10,"a ^= 1;")
+hasLocation(#20178,#20023)
+stmt_containers(#20178,#20001)
+#20179=*
+exprs(#20179,57,#20178,0,"a ^= 1")
+#20180=@"loc,{#10000},11,1,11,6"
+locations_default(#20180,#10000,11,1,11,6)
+hasLocation(#20179,#20180)
+enclosing_stmt(#20179,#20178)
+expr_containers(#20179,#20001)
 #20181=*
-exprs(#20181,3,#20178,1,"1")
-hasLocation(#20181,#20111)
-enclosing_stmt(#20181,#20177)
+exprs(#20181,79,#20179,0,"a")
+hasLocation(#20181,#20107)
+enclosing_stmt(#20181,#20178)
 expr_containers(#20181,#20001)
-literals("1","1",#20181)
+literals("a","a",#20181)
+bind(#20181,#20130)
 #20182=*
-stmts(#20182,2,#20001,11,"a &= 3;")
-hasLocation(#20182,#20025)
-stmt_containers(#20182,#20001)
+exprs(#20182,3,#20179,1,"1")
+hasLocation(#20182,#20111)
+enclosing_stmt(#20182,#20178)
+expr_containers(#20182,#20001)
+literals("1","1",#20182)
 #20183=*
-exprs(#20183,58,#20182,0,"a &= 3")
-#20184=@"loc,{#10000},12,1,12,6"
-locations_default(#20184,#10000,12,1,12,6)
-hasLocation(#20183,#20184)
-enclosing_stmt(#20183,#20182)
-expr_containers(#20183,#20001)
-#20185=*
-exprs(#20185,79,#20183,0,"a")
-hasLocation(#20185,#20115)
-enclosing_stmt(#20185,#20182)
-expr_containers(#20185,#20001)
-literals("a","a",#20185)
-bind(#20185,#20129)
+stmts(#20183,2,#20001,11,"a &= 3;")
+hasLocation(#20183,#20025)
+stmt_containers(#20183,#20001)
+#20184=*
+exprs(#20184,58,#20183,0,"a &= 3")
+#20185=@"loc,{#10000},12,1,12,6"
+locations_default(#20185,#10000,12,1,12,6)
+hasLocation(#20184,#20185)
+enclosing_stmt(#20184,#20183)
+expr_containers(#20184,#20001)
 #20186=*
-exprs(#20186,3,#20183,1,"3")
-hasLocation(#20186,#20119)
-enclosing_stmt(#20186,#20182)
+exprs(#20186,79,#20184,0,"a")
+hasLocation(#20186,#20115)
+enclosing_stmt(#20186,#20183)
 expr_containers(#20186,#20001)
-literals("3","3",#20186)
+literals("a","a",#20186)
+bind(#20186,#20130)
 #20187=*
-entry_cfg_node(#20187,#20001)
-#20188=@"loc,{#10000},1,1,1,0"
-locations_default(#20188,#10000,1,1,1,0)
-hasLocation(#20187,#20188)
-#20189=*
-exit_cfg_node(#20189,#20001)
-hasLocation(#20189,#20123)
-successor(#20182,#20185)
-successor(#20186,#20183)
-successor(#20185,#20186)
-successor(#20183,#20189)
-successor(#20177,#20180)
-successor(#20181,#20178)
-successor(#20180,#20181)
-successor(#20178,#20182)
-successor(#20172,#20175)
-successor(#20176,#20173)
-successor(#20175,#20176)
-successor(#20173,#20177)
-successor(#20167,#20170)
-successor(#20171,#20168)
-successor(#20170,#20171)
-successor(#20168,#20172)
-successor(#20162,#20165)
-successor(#20166,#20163)
-successor(#20165,#20166)
-successor(#20163,#20167)
-successor(#20157,#20160)
-successor(#20161,#20158)
-successor(#20160,#20161)
-successor(#20158,#20162)
-successor(#20152,#20155)
-successor(#20156,#20153)
-successor(#20155,#20156)
-successor(#20153,#20157)
-successor(#20147,#20150)
-successor(#20151,#20148)
-successor(#20150,#20151)
-successor(#20148,#20152)
-successor(#20141,#20144)
-successor(#20145,#20142)
-successor(#20144,#20145)
-successor(#20142,#20147)
-successor(#20136,#20139)
-successor(#20140,#20137)
-successor(#20139,#20140)
-successor(#20137,#20141)
-successor(#20131,#20134)
-successor(#20135,#20132)
-successor(#20134,#20135)
-successor(#20132,#20136)
-successor(#20125,#20128)
-successor(#20130,#20126)
-successor(#20128,#20130)
-successor(#20126,#20131)
-successor(#20187,#20125)
+exprs(#20187,3,#20184,1,"3")
+hasLocation(#20187,#20119)
+enclosing_stmt(#20187,#20183)
+expr_containers(#20187,#20001)
+literals("3","3",#20187)
+#20188=*
+entry_cfg_node(#20188,#20001)
+#20189=@"loc,{#10000},1,1,1,0"
+locations_default(#20189,#10000,1,1,1,0)
+hasLocation(#20188,#20189)
+#20190=*
+exit_cfg_node(#20190,#20001)
+hasLocation(#20190,#20123)
+successor(#20183,#20186)
+successor(#20187,#20184)
+successor(#20186,#20187)
+successor(#20184,#20190)
+successor(#20178,#20181)
+successor(#20182,#20179)
+successor(#20181,#20182)
+successor(#20179,#20183)
+successor(#20173,#20176)
+successor(#20177,#20174)
+successor(#20176,#20177)
+successor(#20174,#20178)
+successor(#20168,#20171)
+successor(#20172,#20169)
+successor(#20171,#20172)
+successor(#20169,#20173)
+successor(#20163,#20166)
+successor(#20167,#20164)
+successor(#20166,#20167)
+successor(#20164,#20168)
+successor(#20158,#20161)
+successor(#20162,#20159)
+successor(#20161,#20162)
+successor(#20159,#20163)
+successor(#20153,#20156)
+successor(#20157,#20154)
+successor(#20156,#20157)
+successor(#20154,#20158)
+successor(#20148,#20151)
+successor(#20152,#20149)
+successor(#20151,#20152)
+successor(#20149,#20153)
+successor(#20142,#20145)
+successor(#20146,#20143)
+successor(#20145,#20146)
+successor(#20143,#20148)
+successor(#20137,#20140)
+successor(#20141,#20138)
+successor(#20140,#20141)
+successor(#20138,#20142)
+successor(#20132,#20135)
+successor(#20136,#20133)
+successor(#20135,#20136)
+successor(#20133,#20137)
+successor(#20126,#20129)
+successor(#20131,#20127)
+successor(#20129,#20131)
+successor(#20127,#20132)
+successor(#20188,#20126)
 numlines(#10000,12,12,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/exprs/output/trap/binary.js.trap b/javascript/extractor/tests/exprs/output/trap/binary.js.trap
index ef7f0d95e51..ec19934cd50 100644
--- a/javascript/extractor/tests/exprs/output/trap/binary.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/binary.js.trap
@@ -414,427 +414,429 @@ toplevels(#20001,0)
 #20156=@"loc,{#10000},1,1,16,0"
 locations_default(#20156,#10000,1,1,16,0)
 hasLocation(#20001,#20156)
-#20157=*
-stmts(#20157,2,#20001,0,"1 << 2;")
-hasLocation(#20157,#20003)
-stmt_containers(#20157,#20001)
+#20157=@"var;{this};{#20000}"
+variables(#20157,"this",#20000)
 #20158=*
-exprs(#20158,31,#20157,0,"1 << 2")
-#20159=@"loc,{#10000},1,1,1,6"
-locations_default(#20159,#10000,1,1,1,6)
-hasLocation(#20158,#20159)
-enclosing_stmt(#20158,#20157)
-expr_containers(#20158,#20001)
-#20160=*
-exprs(#20160,3,#20158,0,"1")
-hasLocation(#20160,#20033)
-enclosing_stmt(#20160,#20157)
-expr_containers(#20160,#20001)
-literals("1","1",#20160)
+stmts(#20158,2,#20001,0,"1 << 2;")
+hasLocation(#20158,#20003)
+stmt_containers(#20158,#20001)
+#20159=*
+exprs(#20159,31,#20158,0,"1 << 2")
+#20160=@"loc,{#10000},1,1,1,6"
+locations_default(#20160,#10000,1,1,1,6)
+hasLocation(#20159,#20160)
+enclosing_stmt(#20159,#20158)
+expr_containers(#20159,#20001)
 #20161=*
-exprs(#20161,3,#20158,1,"2")
-hasLocation(#20161,#20037)
-enclosing_stmt(#20161,#20157)
+exprs(#20161,3,#20159,0,"1")
+hasLocation(#20161,#20033)
+enclosing_stmt(#20161,#20158)
 expr_containers(#20161,#20001)
-literals("2","2",#20161)
+literals("1","1",#20161)
 #20162=*
-stmts(#20162,2,#20001,1,"2 >> 1;")
-hasLocation(#20162,#20005)
-stmt_containers(#20162,#20001)
+exprs(#20162,3,#20159,1,"2")
+hasLocation(#20162,#20037)
+enclosing_stmt(#20162,#20158)
+expr_containers(#20162,#20001)
+literals("2","2",#20162)
 #20163=*
-exprs(#20163,32,#20162,0,"2 >> 1")
-#20164=@"loc,{#10000},2,1,2,6"
-locations_default(#20164,#10000,2,1,2,6)
-hasLocation(#20163,#20164)
-enclosing_stmt(#20163,#20162)
-expr_containers(#20163,#20001)
-#20165=*
-exprs(#20165,3,#20163,0,"2")
-hasLocation(#20165,#20041)
-enclosing_stmt(#20165,#20162)
-expr_containers(#20165,#20001)
-literals("2","2",#20165)
+stmts(#20163,2,#20001,1,"2 >> 1;")
+hasLocation(#20163,#20005)
+stmt_containers(#20163,#20001)
+#20164=*
+exprs(#20164,32,#20163,0,"2 >> 1")
+#20165=@"loc,{#10000},2,1,2,6"
+locations_default(#20165,#10000,2,1,2,6)
+hasLocation(#20164,#20165)
+enclosing_stmt(#20164,#20163)
+expr_containers(#20164,#20001)
 #20166=*
-exprs(#20166,3,#20163,1,"1")
-hasLocation(#20166,#20045)
-enclosing_stmt(#20166,#20162)
+exprs(#20166,3,#20164,0,"2")
+hasLocation(#20166,#20041)
+enclosing_stmt(#20166,#20163)
 expr_containers(#20166,#20001)
-literals("1","1",#20166)
+literals("2","2",#20166)
 #20167=*
-stmts(#20167,2,#20001,2,"2 >>> 1;")
-hasLocation(#20167,#20007)
-stmt_containers(#20167,#20001)
+exprs(#20167,3,#20164,1,"1")
+hasLocation(#20167,#20045)
+enclosing_stmt(#20167,#20163)
+expr_containers(#20167,#20001)
+literals("1","1",#20167)
 #20168=*
-exprs(#20168,33,#20167,0,"2 >>> 1")
-#20169=@"loc,{#10000},3,1,3,7"
-locations_default(#20169,#10000,3,1,3,7)
-hasLocation(#20168,#20169)
-enclosing_stmt(#20168,#20167)
-expr_containers(#20168,#20001)
-#20170=*
-exprs(#20170,3,#20168,0,"2")
-hasLocation(#20170,#20049)
-enclosing_stmt(#20170,#20167)
-expr_containers(#20170,#20001)
-literals("2","2",#20170)
+stmts(#20168,2,#20001,2,"2 >>> 1;")
+hasLocation(#20168,#20007)
+stmt_containers(#20168,#20001)
+#20169=*
+exprs(#20169,33,#20168,0,"2 >>> 1")
+#20170=@"loc,{#10000},3,1,3,7"
+locations_default(#20170,#10000,3,1,3,7)
+hasLocation(#20169,#20170)
+enclosing_stmt(#20169,#20168)
+expr_containers(#20169,#20001)
 #20171=*
-exprs(#20171,3,#20168,1,"1")
-hasLocation(#20171,#20053)
-enclosing_stmt(#20171,#20167)
+exprs(#20171,3,#20169,0,"2")
+hasLocation(#20171,#20049)
+enclosing_stmt(#20171,#20168)
 expr_containers(#20171,#20001)
-literals("1","1",#20171)
+literals("2","2",#20171)
 #20172=*
-stmts(#20172,2,#20001,3,"23 + 19;")
-hasLocation(#20172,#20009)
-stmt_containers(#20172,#20001)
+exprs(#20172,3,#20169,1,"1")
+hasLocation(#20172,#20053)
+enclosing_stmt(#20172,#20168)
+expr_containers(#20172,#20001)
+literals("1","1",#20172)
 #20173=*
-exprs(#20173,34,#20172,0,"23 + 19")
-#20174=@"loc,{#10000},4,1,4,7"
-locations_default(#20174,#10000,4,1,4,7)
-hasLocation(#20173,#20174)
-enclosing_stmt(#20173,#20172)
-expr_containers(#20173,#20001)
-#20175=*
-exprs(#20175,3,#20173,0,"23")
-hasLocation(#20175,#20057)
-enclosing_stmt(#20175,#20172)
-expr_containers(#20175,#20001)
-literals("23","23",#20175)
+stmts(#20173,2,#20001,3,"23 + 19;")
+hasLocation(#20173,#20009)
+stmt_containers(#20173,#20001)
+#20174=*
+exprs(#20174,34,#20173,0,"23 + 19")
+#20175=@"loc,{#10000},4,1,4,7"
+locations_default(#20175,#10000,4,1,4,7)
+hasLocation(#20174,#20175)
+enclosing_stmt(#20174,#20173)
+expr_containers(#20174,#20001)
 #20176=*
-exprs(#20176,3,#20173,1,"19")
-hasLocation(#20176,#20061)
-enclosing_stmt(#20176,#20172)
+exprs(#20176,3,#20174,0,"23")
+hasLocation(#20176,#20057)
+enclosing_stmt(#20176,#20173)
 expr_containers(#20176,#20001)
-literals("19","19",#20176)
+literals("23","23",#20176)
 #20177=*
-stmts(#20177,2,#20001,4,"42 - 19;")
-hasLocation(#20177,#20011)
-stmt_containers(#20177,#20001)
+exprs(#20177,3,#20174,1,"19")
+hasLocation(#20177,#20061)
+enclosing_stmt(#20177,#20173)
+expr_containers(#20177,#20001)
+literals("19","19",#20177)
 #20178=*
-exprs(#20178,35,#20177,0,"42 - 19")
-#20179=@"loc,{#10000},5,1,5,7"
-locations_default(#20179,#10000,5,1,5,7)
-hasLocation(#20178,#20179)
-enclosing_stmt(#20178,#20177)
-expr_containers(#20178,#20001)
-#20180=*
-exprs(#20180,3,#20178,0,"42")
-hasLocation(#20180,#20065)
-enclosing_stmt(#20180,#20177)
-expr_containers(#20180,#20001)
-literals("42","42",#20180)
+stmts(#20178,2,#20001,4,"42 - 19;")
+hasLocation(#20178,#20011)
+stmt_containers(#20178,#20001)
+#20179=*
+exprs(#20179,35,#20178,0,"42 - 19")
+#20180=@"loc,{#10000},5,1,5,7"
+locations_default(#20180,#10000,5,1,5,7)
+hasLocation(#20179,#20180)
+enclosing_stmt(#20179,#20178)
+expr_containers(#20179,#20001)
 #20181=*
-exprs(#20181,3,#20178,1,"19")
-hasLocation(#20181,#20069)
-enclosing_stmt(#20181,#20177)
+exprs(#20181,3,#20179,0,"42")
+hasLocation(#20181,#20065)
+enclosing_stmt(#20181,#20178)
 expr_containers(#20181,#20001)
-literals("19","19",#20181)
+literals("42","42",#20181)
 #20182=*
-stmts(#20182,2,#20001,5,"2 * 3;")
-hasLocation(#20182,#20013)
-stmt_containers(#20182,#20001)
+exprs(#20182,3,#20179,1,"19")
+hasLocation(#20182,#20069)
+enclosing_stmt(#20182,#20178)
+expr_containers(#20182,#20001)
+literals("19","19",#20182)
 #20183=*
-exprs(#20183,36,#20182,0,"2 * 3")
-#20184=@"loc,{#10000},6,1,6,5"
-locations_default(#20184,#10000,6,1,6,5)
-hasLocation(#20183,#20184)
-enclosing_stmt(#20183,#20182)
-expr_containers(#20183,#20001)
-#20185=*
-exprs(#20185,3,#20183,0,"2")
-hasLocation(#20185,#20073)
-enclosing_stmt(#20185,#20182)
-expr_containers(#20185,#20001)
-literals("2","2",#20185)
+stmts(#20183,2,#20001,5,"2 * 3;")
+hasLocation(#20183,#20013)
+stmt_containers(#20183,#20001)
+#20184=*
+exprs(#20184,36,#20183,0,"2 * 3")
+#20185=@"loc,{#10000},6,1,6,5"
+locations_default(#20185,#10000,6,1,6,5)
+hasLocation(#20184,#20185)
+enclosing_stmt(#20184,#20183)
+expr_containers(#20184,#20001)
 #20186=*
-exprs(#20186,3,#20183,1,"3")
-hasLocation(#20186,#20077)
-enclosing_stmt(#20186,#20182)
+exprs(#20186,3,#20184,0,"2")
+hasLocation(#20186,#20073)
+enclosing_stmt(#20186,#20183)
 expr_containers(#20186,#20001)
-literals("3","3",#20186)
+literals("2","2",#20186)
 #20187=*
-stmts(#20187,2,#20001,6,"8 / 5;")
-hasLocation(#20187,#20015)
-stmt_containers(#20187,#20001)
+exprs(#20187,3,#20184,1,"3")
+hasLocation(#20187,#20077)
+enclosing_stmt(#20187,#20183)
+expr_containers(#20187,#20001)
+literals("3","3",#20187)
 #20188=*
-exprs(#20188,37,#20187,0,"8 / 5")
-#20189=@"loc,{#10000},7,1,7,5"
-locations_default(#20189,#10000,7,1,7,5)
-hasLocation(#20188,#20189)
-enclosing_stmt(#20188,#20187)
-expr_containers(#20188,#20001)
-#20190=*
-exprs(#20190,3,#20188,0,"8")
-hasLocation(#20190,#20081)
-enclosing_stmt(#20190,#20187)
-expr_containers(#20190,#20001)
-literals("8","8",#20190)
+stmts(#20188,2,#20001,6,"8 / 5;")
+hasLocation(#20188,#20015)
+stmt_containers(#20188,#20001)
+#20189=*
+exprs(#20189,37,#20188,0,"8 / 5")
+#20190=@"loc,{#10000},7,1,7,5"
+locations_default(#20190,#10000,7,1,7,5)
+hasLocation(#20189,#20190)
+enclosing_stmt(#20189,#20188)
+expr_containers(#20189,#20001)
 #20191=*
-exprs(#20191,3,#20188,1,"5")
-hasLocation(#20191,#20085)
-enclosing_stmt(#20191,#20187)
+exprs(#20191,3,#20189,0,"8")
+hasLocation(#20191,#20081)
+enclosing_stmt(#20191,#20188)
 expr_containers(#20191,#20001)
-literals("5","5",#20191)
+literals("8","8",#20191)
 #20192=*
-stmts(#20192,2,#20001,7,"2 % 1;")
-hasLocation(#20192,#20017)
-stmt_containers(#20192,#20001)
+exprs(#20192,3,#20189,1,"5")
+hasLocation(#20192,#20085)
+enclosing_stmt(#20192,#20188)
+expr_containers(#20192,#20001)
+literals("5","5",#20192)
 #20193=*
-exprs(#20193,38,#20192,0,"2 % 1")
-#20194=@"loc,{#10000},8,1,8,5"
-locations_default(#20194,#10000,8,1,8,5)
-hasLocation(#20193,#20194)
-enclosing_stmt(#20193,#20192)
-expr_containers(#20193,#20001)
-#20195=*
-exprs(#20195,3,#20193,0,"2")
-hasLocation(#20195,#20089)
-enclosing_stmt(#20195,#20192)
-expr_containers(#20195,#20001)
-literals("2","2",#20195)
+stmts(#20193,2,#20001,7,"2 % 1;")
+hasLocation(#20193,#20017)
+stmt_containers(#20193,#20001)
+#20194=*
+exprs(#20194,38,#20193,0,"2 % 1")
+#20195=@"loc,{#10000},8,1,8,5"
+locations_default(#20195,#10000,8,1,8,5)
+hasLocation(#20194,#20195)
+enclosing_stmt(#20194,#20193)
+expr_containers(#20194,#20001)
 #20196=*
-exprs(#20196,3,#20193,1,"1")
-hasLocation(#20196,#20093)
-enclosing_stmt(#20196,#20192)
+exprs(#20196,3,#20194,0,"2")
+hasLocation(#20196,#20089)
+enclosing_stmt(#20196,#20193)
 expr_containers(#20196,#20001)
-literals("1","1",#20196)
+literals("2","2",#20196)
 #20197=*
-stmts(#20197,2,#20001,8,"2 | 3;")
-hasLocation(#20197,#20019)
-stmt_containers(#20197,#20001)
+exprs(#20197,3,#20194,1,"1")
+hasLocation(#20197,#20093)
+enclosing_stmt(#20197,#20193)
+expr_containers(#20197,#20001)
+literals("1","1",#20197)
 #20198=*
-exprs(#20198,39,#20197,0,"2 | 3")
-#20199=@"loc,{#10000},9,1,9,5"
-locations_default(#20199,#10000,9,1,9,5)
-hasLocation(#20198,#20199)
-enclosing_stmt(#20198,#20197)
-expr_containers(#20198,#20001)
-#20200=*
-exprs(#20200,3,#20198,0,"2")
-hasLocation(#20200,#20097)
-enclosing_stmt(#20200,#20197)
-expr_containers(#20200,#20001)
-literals("2","2",#20200)
+stmts(#20198,2,#20001,8,"2 | 3;")
+hasLocation(#20198,#20019)
+stmt_containers(#20198,#20001)
+#20199=*
+exprs(#20199,39,#20198,0,"2 | 3")
+#20200=@"loc,{#10000},9,1,9,5"
+locations_default(#20200,#10000,9,1,9,5)
+hasLocation(#20199,#20200)
+enclosing_stmt(#20199,#20198)
+expr_containers(#20199,#20001)
 #20201=*
-exprs(#20201,3,#20198,1,"3")
-hasLocation(#20201,#20101)
-enclosing_stmt(#20201,#20197)
+exprs(#20201,3,#20199,0,"2")
+hasLocation(#20201,#20097)
+enclosing_stmt(#20201,#20198)
 expr_containers(#20201,#20001)
-literals("3","3",#20201)
+literals("2","2",#20201)
 #20202=*
-stmts(#20202,2,#20001,9,"2 ^ 3;")
-hasLocation(#20202,#20021)
-stmt_containers(#20202,#20001)
+exprs(#20202,3,#20199,1,"3")
+hasLocation(#20202,#20101)
+enclosing_stmt(#20202,#20198)
+expr_containers(#20202,#20001)
+literals("3","3",#20202)
 #20203=*
-exprs(#20203,40,#20202,0,"2 ^ 3")
-#20204=@"loc,{#10000},10,1,10,5"
-locations_default(#20204,#10000,10,1,10,5)
-hasLocation(#20203,#20204)
-enclosing_stmt(#20203,#20202)
-expr_containers(#20203,#20001)
-#20205=*
-exprs(#20205,3,#20203,0,"2")
-hasLocation(#20205,#20105)
-enclosing_stmt(#20205,#20202)
-expr_containers(#20205,#20001)
-literals("2","2",#20205)
+stmts(#20203,2,#20001,9,"2 ^ 3;")
+hasLocation(#20203,#20021)
+stmt_containers(#20203,#20001)
+#20204=*
+exprs(#20204,40,#20203,0,"2 ^ 3")
+#20205=@"loc,{#10000},10,1,10,5"
+locations_default(#20205,#10000,10,1,10,5)
+hasLocation(#20204,#20205)
+enclosing_stmt(#20204,#20203)
+expr_containers(#20204,#20001)
 #20206=*
-exprs(#20206,3,#20203,1,"3")
-hasLocation(#20206,#20109)
-enclosing_stmt(#20206,#20202)
+exprs(#20206,3,#20204,0,"2")
+hasLocation(#20206,#20105)
+enclosing_stmt(#20206,#20203)
 expr_containers(#20206,#20001)
-literals("3","3",#20206)
+literals("2","2",#20206)
 #20207=*
-stmts(#20207,2,#20001,10,"2 & 3;")
-hasLocation(#20207,#20023)
-stmt_containers(#20207,#20001)
+exprs(#20207,3,#20204,1,"3")
+hasLocation(#20207,#20109)
+enclosing_stmt(#20207,#20203)
+expr_containers(#20207,#20001)
+literals("3","3",#20207)
 #20208=*
-exprs(#20208,41,#20207,0,"2 & 3")
-#20209=@"loc,{#10000},11,1,11,5"
-locations_default(#20209,#10000,11,1,11,5)
-hasLocation(#20208,#20209)
-enclosing_stmt(#20208,#20207)
-expr_containers(#20208,#20001)
-#20210=*
-exprs(#20210,3,#20208,0,"2")
-hasLocation(#20210,#20113)
-enclosing_stmt(#20210,#20207)
-expr_containers(#20210,#20001)
-literals("2","2",#20210)
+stmts(#20208,2,#20001,10,"2 & 3;")
+hasLocation(#20208,#20023)
+stmt_containers(#20208,#20001)
+#20209=*
+exprs(#20209,41,#20208,0,"2 & 3")
+#20210=@"loc,{#10000},11,1,11,5"
+locations_default(#20210,#10000,11,1,11,5)
+hasLocation(#20209,#20210)
+enclosing_stmt(#20209,#20208)
+expr_containers(#20209,#20001)
 #20211=*
-exprs(#20211,3,#20208,1,"3")
-hasLocation(#20211,#20117)
-enclosing_stmt(#20211,#20207)
+exprs(#20211,3,#20209,0,"2")
+hasLocation(#20211,#20113)
+enclosing_stmt(#20211,#20208)
 expr_containers(#20211,#20001)
-literals("3","3",#20211)
+literals("2","2",#20211)
 #20212=*
-stmts(#20212,2,#20001,11,"'protot ... Object;")
-hasLocation(#20212,#20025)
-stmt_containers(#20212,#20001)
+exprs(#20212,3,#20209,1,"3")
+hasLocation(#20212,#20117)
+enclosing_stmt(#20212,#20208)
+expr_containers(#20212,#20001)
+literals("3","3",#20212)
 #20213=*
-exprs(#20213,42,#20212,0,"'protot ...  Object")
-#20214=@"loc,{#10000},12,1,12,21"
-locations_default(#20214,#10000,12,1,12,21)
-hasLocation(#20213,#20214)
-enclosing_stmt(#20213,#20212)
-expr_containers(#20213,#20001)
-#20215=*
-exprs(#20215,4,#20213,0,"'prototype'")
-hasLocation(#20215,#20121)
-enclosing_stmt(#20215,#20212)
-expr_containers(#20215,#20001)
-literals("prototype","'prototype'",#20215)
+stmts(#20213,2,#20001,11,"'protot ... Object;")
+hasLocation(#20213,#20025)
+stmt_containers(#20213,#20001)
+#20214=*
+exprs(#20214,42,#20213,0,"'protot ...  Object")
+#20215=@"loc,{#10000},12,1,12,21"
+locations_default(#20215,#10000,12,1,12,21)
+hasLocation(#20214,#20215)
+enclosing_stmt(#20214,#20213)
+expr_containers(#20214,#20001)
 #20216=*
-exprs(#20216,79,#20213,1,"Object")
-hasLocation(#20216,#20125)
-enclosing_stmt(#20216,#20212)
+exprs(#20216,4,#20214,0,"'prototype'")
+hasLocation(#20216,#20121)
+enclosing_stmt(#20216,#20213)
 expr_containers(#20216,#20001)
-literals("Object","Object",#20216)
-#20217=@"var;{Object};{#20000}"
-variables(#20217,"Object",#20000)
-bind(#20216,#20217)
-#20218=*
-stmts(#20218,2,#20001,12,"[] instanceof Array;")
-hasLocation(#20218,#20027)
-stmt_containers(#20218,#20001)
+literals("prototype","'prototype'",#20216)
+#20217=*
+exprs(#20217,79,#20214,1,"Object")
+hasLocation(#20217,#20125)
+enclosing_stmt(#20217,#20213)
+expr_containers(#20217,#20001)
+literals("Object","Object",#20217)
+#20218=@"var;{Object};{#20000}"
+variables(#20218,"Object",#20000)
+bind(#20217,#20218)
 #20219=*
-exprs(#20219,43,#20218,0,"[] instanceof Array")
-#20220=@"loc,{#10000},13,1,13,19"
-locations_default(#20220,#10000,13,1,13,19)
-hasLocation(#20219,#20220)
-enclosing_stmt(#20219,#20218)
-expr_containers(#20219,#20001)
-#20221=*
-exprs(#20221,7,#20219,0,"[]")
-#20222=@"loc,{#10000},13,1,13,2"
-locations_default(#20222,#10000,13,1,13,2)
-hasLocation(#20221,#20222)
-enclosing_stmt(#20221,#20218)
-expr_containers(#20221,#20001)
-array_size(#20221,0)
-#20223=*
-exprs(#20223,79,#20219,1,"Array")
-hasLocation(#20223,#20135)
-enclosing_stmt(#20223,#20218)
-expr_containers(#20223,#20001)
-literals("Array","Array",#20223)
-#20224=@"var;{Array};{#20000}"
-variables(#20224,"Array",#20000)
-bind(#20223,#20224)
-#20225=*
-stmts(#20225,2,#20001,13,"1 && 2;")
-hasLocation(#20225,#20029)
-stmt_containers(#20225,#20001)
+stmts(#20219,2,#20001,12,"[] instanceof Array;")
+hasLocation(#20219,#20027)
+stmt_containers(#20219,#20001)
+#20220=*
+exprs(#20220,43,#20219,0,"[] instanceof Array")
+#20221=@"loc,{#10000},13,1,13,19"
+locations_default(#20221,#10000,13,1,13,19)
+hasLocation(#20220,#20221)
+enclosing_stmt(#20220,#20219)
+expr_containers(#20220,#20001)
+#20222=*
+exprs(#20222,7,#20220,0,"[]")
+#20223=@"loc,{#10000},13,1,13,2"
+locations_default(#20223,#10000,13,1,13,2)
+hasLocation(#20222,#20223)
+enclosing_stmt(#20222,#20219)
+expr_containers(#20222,#20001)
+array_size(#20222,0)
+#20224=*
+exprs(#20224,79,#20220,1,"Array")
+hasLocation(#20224,#20135)
+enclosing_stmt(#20224,#20219)
+expr_containers(#20224,#20001)
+literals("Array","Array",#20224)
+#20225=@"var;{Array};{#20000}"
+variables(#20225,"Array",#20000)
+bind(#20224,#20225)
 #20226=*
-exprs(#20226,44,#20225,0,"1 && 2")
-#20227=@"loc,{#10000},14,1,14,6"
-locations_default(#20227,#10000,14,1,14,6)
-hasLocation(#20226,#20227)
-enclosing_stmt(#20226,#20225)
-expr_containers(#20226,#20001)
-#20228=*
-exprs(#20228,3,#20226,0,"1")
-hasLocation(#20228,#20139)
-enclosing_stmt(#20228,#20225)
-expr_containers(#20228,#20001)
-literals("1","1",#20228)
+stmts(#20226,2,#20001,13,"1 && 2;")
+hasLocation(#20226,#20029)
+stmt_containers(#20226,#20001)
+#20227=*
+exprs(#20227,44,#20226,0,"1 && 2")
+#20228=@"loc,{#10000},14,1,14,6"
+locations_default(#20228,#10000,14,1,14,6)
+hasLocation(#20227,#20228)
+enclosing_stmt(#20227,#20226)
+expr_containers(#20227,#20001)
 #20229=*
-exprs(#20229,3,#20226,1,"2")
-hasLocation(#20229,#20143)
-enclosing_stmt(#20229,#20225)
+exprs(#20229,3,#20227,0,"1")
+hasLocation(#20229,#20139)
+enclosing_stmt(#20229,#20226)
 expr_containers(#20229,#20001)
-literals("2","2",#20229)
+literals("1","1",#20229)
 #20230=*
-stmts(#20230,2,#20001,14,"1 || 2;")
-hasLocation(#20230,#20031)
-stmt_containers(#20230,#20001)
+exprs(#20230,3,#20227,1,"2")
+hasLocation(#20230,#20143)
+enclosing_stmt(#20230,#20226)
+expr_containers(#20230,#20001)
+literals("2","2",#20230)
 #20231=*
-exprs(#20231,45,#20230,0,"1 || 2")
-#20232=@"loc,{#10000},15,1,15,6"
-locations_default(#20232,#10000,15,1,15,6)
-hasLocation(#20231,#20232)
-enclosing_stmt(#20231,#20230)
-expr_containers(#20231,#20001)
-#20233=*
-exprs(#20233,3,#20231,0,"1")
-hasLocation(#20233,#20147)
-enclosing_stmt(#20233,#20230)
-expr_containers(#20233,#20001)
-literals("1","1",#20233)
+stmts(#20231,2,#20001,14,"1 || 2;")
+hasLocation(#20231,#20031)
+stmt_containers(#20231,#20001)
+#20232=*
+exprs(#20232,45,#20231,0,"1 || 2")
+#20233=@"loc,{#10000},15,1,15,6"
+locations_default(#20233,#10000,15,1,15,6)
+hasLocation(#20232,#20233)
+enclosing_stmt(#20232,#20231)
+expr_containers(#20232,#20001)
 #20234=*
-exprs(#20234,3,#20231,1,"2")
-hasLocation(#20234,#20151)
-enclosing_stmt(#20234,#20230)
+exprs(#20234,3,#20232,0,"1")
+hasLocation(#20234,#20147)
+enclosing_stmt(#20234,#20231)
 expr_containers(#20234,#20001)
-literals("2","2",#20234)
+literals("1","1",#20234)
 #20235=*
-entry_cfg_node(#20235,#20001)
-#20236=@"loc,{#10000},1,1,1,0"
-locations_default(#20236,#10000,1,1,1,0)
-hasLocation(#20235,#20236)
-#20237=*
-exit_cfg_node(#20237,#20001)
-hasLocation(#20237,#20155)
-successor(#20230,#20231)
-successor(#20231,#20233)
-successor(#20233,#20237)
-successor(#20234,#20237)
-successor(#20225,#20226)
-successor(#20226,#20228)
-successor(#20228,#20229)
+exprs(#20235,3,#20232,1,"2")
+hasLocation(#20235,#20151)
+enclosing_stmt(#20235,#20231)
+expr_containers(#20235,#20001)
+literals("2","2",#20235)
+#20236=*
+entry_cfg_node(#20236,#20001)
+#20237=@"loc,{#10000},1,1,1,0"
+locations_default(#20237,#10000,1,1,1,0)
+hasLocation(#20236,#20237)
+#20238=*
+exit_cfg_node(#20238,#20001)
+hasLocation(#20238,#20155)
+successor(#20231,#20232)
+successor(#20232,#20234)
+successor(#20234,#20238)
+successor(#20235,#20238)
+successor(#20226,#20227)
+successor(#20227,#20229)
 successor(#20229,#20230)
-successor(#20218,#20221)
-successor(#20223,#20219)
-successor(#20221,#20223)
-successor(#20219,#20225)
-successor(#20212,#20215)
-successor(#20216,#20213)
-successor(#20215,#20216)
-successor(#20213,#20218)
-successor(#20207,#20210)
-successor(#20211,#20208)
-successor(#20210,#20211)
-successor(#20208,#20212)
-successor(#20202,#20205)
-successor(#20206,#20203)
-successor(#20205,#20206)
-successor(#20203,#20207)
-successor(#20197,#20200)
-successor(#20201,#20198)
-successor(#20200,#20201)
-successor(#20198,#20202)
-successor(#20192,#20195)
-successor(#20196,#20193)
-successor(#20195,#20196)
-successor(#20193,#20197)
-successor(#20187,#20190)
-successor(#20191,#20188)
-successor(#20190,#20191)
-successor(#20188,#20192)
-successor(#20182,#20185)
-successor(#20186,#20183)
-successor(#20185,#20186)
-successor(#20183,#20187)
-successor(#20177,#20180)
-successor(#20181,#20178)
-successor(#20180,#20181)
-successor(#20178,#20182)
-successor(#20172,#20175)
-successor(#20176,#20173)
-successor(#20175,#20176)
-successor(#20173,#20177)
-successor(#20167,#20170)
-successor(#20171,#20168)
-successor(#20170,#20171)
-successor(#20168,#20172)
-successor(#20162,#20165)
-successor(#20166,#20163)
-successor(#20165,#20166)
-successor(#20163,#20167)
-successor(#20157,#20160)
-successor(#20161,#20158)
-successor(#20160,#20161)
-successor(#20158,#20162)
-successor(#20235,#20157)
+successor(#20230,#20231)
+successor(#20219,#20222)
+successor(#20224,#20220)
+successor(#20222,#20224)
+successor(#20220,#20226)
+successor(#20213,#20216)
+successor(#20217,#20214)
+successor(#20216,#20217)
+successor(#20214,#20219)
+successor(#20208,#20211)
+successor(#20212,#20209)
+successor(#20211,#20212)
+successor(#20209,#20213)
+successor(#20203,#20206)
+successor(#20207,#20204)
+successor(#20206,#20207)
+successor(#20204,#20208)
+successor(#20198,#20201)
+successor(#20202,#20199)
+successor(#20201,#20202)
+successor(#20199,#20203)
+successor(#20193,#20196)
+successor(#20197,#20194)
+successor(#20196,#20197)
+successor(#20194,#20198)
+successor(#20188,#20191)
+successor(#20192,#20189)
+successor(#20191,#20192)
+successor(#20189,#20193)
+successor(#20183,#20186)
+successor(#20187,#20184)
+successor(#20186,#20187)
+successor(#20184,#20188)
+successor(#20178,#20181)
+successor(#20182,#20179)
+successor(#20181,#20182)
+successor(#20179,#20183)
+successor(#20173,#20176)
+successor(#20177,#20174)
+successor(#20176,#20177)
+successor(#20174,#20178)
+successor(#20168,#20171)
+successor(#20172,#20169)
+successor(#20171,#20172)
+successor(#20169,#20173)
+successor(#20163,#20166)
+successor(#20167,#20164)
+successor(#20166,#20167)
+successor(#20164,#20168)
+successor(#20158,#20161)
+successor(#20162,#20159)
+successor(#20161,#20162)
+successor(#20159,#20163)
+successor(#20236,#20158)
 numlines(#10000,15,15,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/exprs/output/trap/comparison.js.trap b/javascript/extractor/tests/exprs/output/trap/comparison.js.trap
index 40cd1291c1d..3ed0becc419 100644
--- a/javascript/extractor/tests/exprs/output/trap/comparison.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/comparison.js.trap
@@ -227,230 +227,232 @@ toplevels(#20001,0)
 #20084=@"loc,{#10000},1,1,9,0"
 locations_default(#20084,#10000,1,1,9,0)
 hasLocation(#20001,#20084)
-#20085=*
-stmts(#20085,2,#20001,0,"1 == 1;")
-hasLocation(#20085,#20003)
-stmt_containers(#20085,#20001)
+#20085=@"var;{this};{#20000}"
+variables(#20085,"this",#20000)
 #20086=*
-exprs(#20086,23,#20085,0,"1 == 1")
-#20087=@"loc,{#10000},1,1,1,6"
-locations_default(#20087,#10000,1,1,1,6)
-hasLocation(#20086,#20087)
-enclosing_stmt(#20086,#20085)
-expr_containers(#20086,#20001)
-#20088=*
-exprs(#20088,3,#20086,0,"1")
-hasLocation(#20088,#20019)
-enclosing_stmt(#20088,#20085)
-expr_containers(#20088,#20001)
-literals("1","1",#20088)
+stmts(#20086,2,#20001,0,"1 == 1;")
+hasLocation(#20086,#20003)
+stmt_containers(#20086,#20001)
+#20087=*
+exprs(#20087,23,#20086,0,"1 == 1")
+#20088=@"loc,{#10000},1,1,1,6"
+locations_default(#20088,#10000,1,1,1,6)
+hasLocation(#20087,#20088)
+enclosing_stmt(#20087,#20086)
+expr_containers(#20087,#20001)
 #20089=*
-exprs(#20089,3,#20086,1,"1")
-hasLocation(#20089,#20023)
-enclosing_stmt(#20089,#20085)
+exprs(#20089,3,#20087,0,"1")
+hasLocation(#20089,#20019)
+enclosing_stmt(#20089,#20086)
 expr_containers(#20089,#20001)
 literals("1","1",#20089)
 #20090=*
-stmts(#20090,2,#20001,1,"1 != 2;")
-hasLocation(#20090,#20005)
-stmt_containers(#20090,#20001)
+exprs(#20090,3,#20087,1,"1")
+hasLocation(#20090,#20023)
+enclosing_stmt(#20090,#20086)
+expr_containers(#20090,#20001)
+literals("1","1",#20090)
 #20091=*
-exprs(#20091,24,#20090,0,"1 != 2")
-#20092=@"loc,{#10000},2,1,2,6"
-locations_default(#20092,#10000,2,1,2,6)
-hasLocation(#20091,#20092)
-enclosing_stmt(#20091,#20090)
-expr_containers(#20091,#20001)
-#20093=*
-exprs(#20093,3,#20091,0,"1")
-hasLocation(#20093,#20027)
-enclosing_stmt(#20093,#20090)
-expr_containers(#20093,#20001)
-literals("1","1",#20093)
+stmts(#20091,2,#20001,1,"1 != 2;")
+hasLocation(#20091,#20005)
+stmt_containers(#20091,#20001)
+#20092=*
+exprs(#20092,24,#20091,0,"1 != 2")
+#20093=@"loc,{#10000},2,1,2,6"
+locations_default(#20093,#10000,2,1,2,6)
+hasLocation(#20092,#20093)
+enclosing_stmt(#20092,#20091)
+expr_containers(#20092,#20001)
 #20094=*
-exprs(#20094,3,#20091,1,"2")
-hasLocation(#20094,#20031)
-enclosing_stmt(#20094,#20090)
+exprs(#20094,3,#20092,0,"1")
+hasLocation(#20094,#20027)
+enclosing_stmt(#20094,#20091)
 expr_containers(#20094,#20001)
-literals("2","2",#20094)
+literals("1","1",#20094)
 #20095=*
-stmts(#20095,2,#20001,2,"1 === 1;")
-hasLocation(#20095,#20007)
-stmt_containers(#20095,#20001)
+exprs(#20095,3,#20092,1,"2")
+hasLocation(#20095,#20031)
+enclosing_stmt(#20095,#20091)
+expr_containers(#20095,#20001)
+literals("2","2",#20095)
 #20096=*
-exprs(#20096,25,#20095,0,"1 === 1")
-#20097=@"loc,{#10000},3,1,3,7"
-locations_default(#20097,#10000,3,1,3,7)
-hasLocation(#20096,#20097)
-enclosing_stmt(#20096,#20095)
-expr_containers(#20096,#20001)
-#20098=*
-exprs(#20098,3,#20096,0,"1")
-hasLocation(#20098,#20035)
-enclosing_stmt(#20098,#20095)
-expr_containers(#20098,#20001)
-literals("1","1",#20098)
+stmts(#20096,2,#20001,2,"1 === 1;")
+hasLocation(#20096,#20007)
+stmt_containers(#20096,#20001)
+#20097=*
+exprs(#20097,25,#20096,0,"1 === 1")
+#20098=@"loc,{#10000},3,1,3,7"
+locations_default(#20098,#10000,3,1,3,7)
+hasLocation(#20097,#20098)
+enclosing_stmt(#20097,#20096)
+expr_containers(#20097,#20001)
 #20099=*
-exprs(#20099,3,#20096,1,"1")
-hasLocation(#20099,#20039)
-enclosing_stmt(#20099,#20095)
+exprs(#20099,3,#20097,0,"1")
+hasLocation(#20099,#20035)
+enclosing_stmt(#20099,#20096)
 expr_containers(#20099,#20001)
 literals("1","1",#20099)
 #20100=*
-stmts(#20100,2,#20001,3,"1 !== 2;")
-hasLocation(#20100,#20009)
-stmt_containers(#20100,#20001)
+exprs(#20100,3,#20097,1,"1")
+hasLocation(#20100,#20039)
+enclosing_stmt(#20100,#20096)
+expr_containers(#20100,#20001)
+literals("1","1",#20100)
 #20101=*
-exprs(#20101,26,#20100,0,"1 !== 2")
-#20102=@"loc,{#10000},4,1,4,7"
-locations_default(#20102,#10000,4,1,4,7)
-hasLocation(#20101,#20102)
-enclosing_stmt(#20101,#20100)
-expr_containers(#20101,#20001)
-#20103=*
-exprs(#20103,3,#20101,0,"1")
-hasLocation(#20103,#20043)
-enclosing_stmt(#20103,#20100)
-expr_containers(#20103,#20001)
-literals("1","1",#20103)
+stmts(#20101,2,#20001,3,"1 !== 2;")
+hasLocation(#20101,#20009)
+stmt_containers(#20101,#20001)
+#20102=*
+exprs(#20102,26,#20101,0,"1 !== 2")
+#20103=@"loc,{#10000},4,1,4,7"
+locations_default(#20103,#10000,4,1,4,7)
+hasLocation(#20102,#20103)
+enclosing_stmt(#20102,#20101)
+expr_containers(#20102,#20001)
 #20104=*
-exprs(#20104,3,#20101,1,"2")
-hasLocation(#20104,#20047)
-enclosing_stmt(#20104,#20100)
+exprs(#20104,3,#20102,0,"1")
+hasLocation(#20104,#20043)
+enclosing_stmt(#20104,#20101)
 expr_containers(#20104,#20001)
-literals("2","2",#20104)
+literals("1","1",#20104)
 #20105=*
-stmts(#20105,2,#20001,4,"1 < 2;")
-hasLocation(#20105,#20011)
-stmt_containers(#20105,#20001)
+exprs(#20105,3,#20102,1,"2")
+hasLocation(#20105,#20047)
+enclosing_stmt(#20105,#20101)
+expr_containers(#20105,#20001)
+literals("2","2",#20105)
 #20106=*
-exprs(#20106,27,#20105,0,"1 < 2")
-#20107=@"loc,{#10000},5,1,5,5"
-locations_default(#20107,#10000,5,1,5,5)
-hasLocation(#20106,#20107)
-enclosing_stmt(#20106,#20105)
-expr_containers(#20106,#20001)
-#20108=*
-exprs(#20108,3,#20106,0,"1")
-hasLocation(#20108,#20051)
-enclosing_stmt(#20108,#20105)
-expr_containers(#20108,#20001)
-literals("1","1",#20108)
+stmts(#20106,2,#20001,4,"1 < 2;")
+hasLocation(#20106,#20011)
+stmt_containers(#20106,#20001)
+#20107=*
+exprs(#20107,27,#20106,0,"1 < 2")
+#20108=@"loc,{#10000},5,1,5,5"
+locations_default(#20108,#10000,5,1,5,5)
+hasLocation(#20107,#20108)
+enclosing_stmt(#20107,#20106)
+expr_containers(#20107,#20001)
 #20109=*
-exprs(#20109,3,#20106,1,"2")
-hasLocation(#20109,#20055)
-enclosing_stmt(#20109,#20105)
+exprs(#20109,3,#20107,0,"1")
+hasLocation(#20109,#20051)
+enclosing_stmt(#20109,#20106)
 expr_containers(#20109,#20001)
-literals("2","2",#20109)
+literals("1","1",#20109)
 #20110=*
-stmts(#20110,2,#20001,5,"1 <= 2;")
-hasLocation(#20110,#20013)
-stmt_containers(#20110,#20001)
+exprs(#20110,3,#20107,1,"2")
+hasLocation(#20110,#20055)
+enclosing_stmt(#20110,#20106)
+expr_containers(#20110,#20001)
+literals("2","2",#20110)
 #20111=*
-exprs(#20111,28,#20110,0,"1 <= 2")
-#20112=@"loc,{#10000},6,1,6,6"
-locations_default(#20112,#10000,6,1,6,6)
-hasLocation(#20111,#20112)
-enclosing_stmt(#20111,#20110)
-expr_containers(#20111,#20001)
-#20113=*
-exprs(#20113,3,#20111,0,"1")
-hasLocation(#20113,#20059)
-enclosing_stmt(#20113,#20110)
-expr_containers(#20113,#20001)
-literals("1","1",#20113)
+stmts(#20111,2,#20001,5,"1 <= 2;")
+hasLocation(#20111,#20013)
+stmt_containers(#20111,#20001)
+#20112=*
+exprs(#20112,28,#20111,0,"1 <= 2")
+#20113=@"loc,{#10000},6,1,6,6"
+locations_default(#20113,#10000,6,1,6,6)
+hasLocation(#20112,#20113)
+enclosing_stmt(#20112,#20111)
+expr_containers(#20112,#20001)
 #20114=*
-exprs(#20114,3,#20111,1,"2")
-hasLocation(#20114,#20063)
-enclosing_stmt(#20114,#20110)
+exprs(#20114,3,#20112,0,"1")
+hasLocation(#20114,#20059)
+enclosing_stmt(#20114,#20111)
 expr_containers(#20114,#20001)
-literals("2","2",#20114)
+literals("1","1",#20114)
 #20115=*
-stmts(#20115,2,#20001,6,"2 > 1;")
-hasLocation(#20115,#20015)
-stmt_containers(#20115,#20001)
+exprs(#20115,3,#20112,1,"2")
+hasLocation(#20115,#20063)
+enclosing_stmt(#20115,#20111)
+expr_containers(#20115,#20001)
+literals("2","2",#20115)
 #20116=*
-exprs(#20116,29,#20115,0,"2 > 1")
-#20117=@"loc,{#10000},7,1,7,5"
-locations_default(#20117,#10000,7,1,7,5)
-hasLocation(#20116,#20117)
-enclosing_stmt(#20116,#20115)
-expr_containers(#20116,#20001)
-#20118=*
-exprs(#20118,3,#20116,0,"2")
-hasLocation(#20118,#20067)
-enclosing_stmt(#20118,#20115)
-expr_containers(#20118,#20001)
-literals("2","2",#20118)
+stmts(#20116,2,#20001,6,"2 > 1;")
+hasLocation(#20116,#20015)
+stmt_containers(#20116,#20001)
+#20117=*
+exprs(#20117,29,#20116,0,"2 > 1")
+#20118=@"loc,{#10000},7,1,7,5"
+locations_default(#20118,#10000,7,1,7,5)
+hasLocation(#20117,#20118)
+enclosing_stmt(#20117,#20116)
+expr_containers(#20117,#20001)
 #20119=*
-exprs(#20119,3,#20116,1,"1")
-hasLocation(#20119,#20071)
-enclosing_stmt(#20119,#20115)
+exprs(#20119,3,#20117,0,"2")
+hasLocation(#20119,#20067)
+enclosing_stmt(#20119,#20116)
 expr_containers(#20119,#20001)
-literals("1","1",#20119)
+literals("2","2",#20119)
 #20120=*
-stmts(#20120,2,#20001,7,"2 >= 1;")
-hasLocation(#20120,#20017)
-stmt_containers(#20120,#20001)
+exprs(#20120,3,#20117,1,"1")
+hasLocation(#20120,#20071)
+enclosing_stmt(#20120,#20116)
+expr_containers(#20120,#20001)
+literals("1","1",#20120)
 #20121=*
-exprs(#20121,30,#20120,0,"2 >= 1")
-#20122=@"loc,{#10000},8,1,8,6"
-locations_default(#20122,#10000,8,1,8,6)
-hasLocation(#20121,#20122)
-enclosing_stmt(#20121,#20120)
-expr_containers(#20121,#20001)
-#20123=*
-exprs(#20123,3,#20121,0,"2")
-hasLocation(#20123,#20075)
-enclosing_stmt(#20123,#20120)
-expr_containers(#20123,#20001)
-literals("2","2",#20123)
+stmts(#20121,2,#20001,7,"2 >= 1;")
+hasLocation(#20121,#20017)
+stmt_containers(#20121,#20001)
+#20122=*
+exprs(#20122,30,#20121,0,"2 >= 1")
+#20123=@"loc,{#10000},8,1,8,6"
+locations_default(#20123,#10000,8,1,8,6)
+hasLocation(#20122,#20123)
+enclosing_stmt(#20122,#20121)
+expr_containers(#20122,#20001)
 #20124=*
-exprs(#20124,3,#20121,1,"1")
-hasLocation(#20124,#20079)
-enclosing_stmt(#20124,#20120)
+exprs(#20124,3,#20122,0,"2")
+hasLocation(#20124,#20075)
+enclosing_stmt(#20124,#20121)
 expr_containers(#20124,#20001)
-literals("1","1",#20124)
+literals("2","2",#20124)
 #20125=*
-entry_cfg_node(#20125,#20001)
-#20126=@"loc,{#10000},1,1,1,0"
-locations_default(#20126,#10000,1,1,1,0)
-hasLocation(#20125,#20126)
-#20127=*
-exit_cfg_node(#20127,#20001)
-hasLocation(#20127,#20083)
-successor(#20120,#20123)
-successor(#20124,#20121)
-successor(#20123,#20124)
-successor(#20121,#20127)
-successor(#20115,#20118)
-successor(#20119,#20116)
-successor(#20118,#20119)
-successor(#20116,#20120)
-successor(#20110,#20113)
-successor(#20114,#20111)
-successor(#20113,#20114)
-successor(#20111,#20115)
-successor(#20105,#20108)
-successor(#20109,#20106)
-successor(#20108,#20109)
-successor(#20106,#20110)
-successor(#20100,#20103)
-successor(#20104,#20101)
-successor(#20103,#20104)
-successor(#20101,#20105)
-successor(#20095,#20098)
-successor(#20099,#20096)
-successor(#20098,#20099)
-successor(#20096,#20100)
-successor(#20090,#20093)
-successor(#20094,#20091)
-successor(#20093,#20094)
-successor(#20091,#20095)
-successor(#20085,#20088)
-successor(#20089,#20086)
-successor(#20088,#20089)
-successor(#20086,#20090)
-successor(#20125,#20085)
+exprs(#20125,3,#20122,1,"1")
+hasLocation(#20125,#20079)
+enclosing_stmt(#20125,#20121)
+expr_containers(#20125,#20001)
+literals("1","1",#20125)
+#20126=*
+entry_cfg_node(#20126,#20001)
+#20127=@"loc,{#10000},1,1,1,0"
+locations_default(#20127,#10000,1,1,1,0)
+hasLocation(#20126,#20127)
+#20128=*
+exit_cfg_node(#20128,#20001)
+hasLocation(#20128,#20083)
+successor(#20121,#20124)
+successor(#20125,#20122)
+successor(#20124,#20125)
+successor(#20122,#20128)
+successor(#20116,#20119)
+successor(#20120,#20117)
+successor(#20119,#20120)
+successor(#20117,#20121)
+successor(#20111,#20114)
+successor(#20115,#20112)
+successor(#20114,#20115)
+successor(#20112,#20116)
+successor(#20106,#20109)
+successor(#20110,#20107)
+successor(#20109,#20110)
+successor(#20107,#20111)
+successor(#20101,#20104)
+successor(#20105,#20102)
+successor(#20104,#20105)
+successor(#20102,#20106)
+successor(#20096,#20099)
+successor(#20100,#20097)
+successor(#20099,#20100)
+successor(#20097,#20101)
+successor(#20091,#20094)
+successor(#20095,#20092)
+successor(#20094,#20095)
+successor(#20092,#20096)
+successor(#20086,#20089)
+successor(#20090,#20087)
+successor(#20089,#20090)
+successor(#20087,#20091)
+successor(#20126,#20086)
 numlines(#10000,8,8,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/exprs/output/trap/fnnesting.js.trap b/javascript/extractor/tests/exprs/output/trap/fnnesting.js.trap
index c2b52eb4df8..c05fbeb4255 100644
--- a/javascript/extractor/tests/exprs/output/trap/fnnesting.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/fnnesting.js.trap
@@ -77,77 +77,81 @@ locations_default(#20027,#10000,1,21,1,20)
 hasLocation(#20026,#20027)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20028=*
-stmts(#20028,2,#20001,0,"f(function(){}, 23);")
-hasLocation(#20028,#20003)
-stmt_containers(#20028,#20001)
+#20028=@"var;{this};{#20000}"
+variables(#20028,"this",#20000)
 #20029=*
-exprs(#20029,13,#20028,0,"f(function(){}, 23)")
-#20030=@"loc,{#10000},1,1,1,19"
-locations_default(#20030,#10000,1,1,1,19)
-hasLocation(#20029,#20030)
-enclosing_stmt(#20029,#20028)
-expr_containers(#20029,#20001)
-#20031=*
-exprs(#20031,79,#20029,-1,"f")
-hasLocation(#20031,#20005)
-enclosing_stmt(#20031,#20028)
-expr_containers(#20031,#20001)
-literals("f","f",#20031)
-#20032=@"var;{f};{#20000}"
-variables(#20032,"f",#20000)
-bind(#20031,#20032)
-#20033=*
-exprs(#20033,9,#20029,0,"function(){}")
-#20034=@"loc,{#10000},1,3,1,14"
-locations_default(#20034,#10000,1,3,1,14)
-hasLocation(#20033,#20034)
-enclosing_stmt(#20033,#20028)
-expr_containers(#20033,#20001)
-#20035=*
-scopes(#20035,1)
-scopenodes(#20033,#20035)
-scopenesting(#20035,#20000)
-#20036=@"var;{arguments};{#20035}"
-variables(#20036,"arguments",#20035)
-is_arguments_object(#20036)
-#20037=*
-stmts(#20037,1,#20033,-2,"{}")
-#20038=@"loc,{#10000},1,13,1,14"
-locations_default(#20038,#10000,1,13,1,14)
-hasLocation(#20037,#20038)
-stmt_containers(#20037,#20033)
+stmts(#20029,2,#20001,0,"f(function(){}, 23);")
+hasLocation(#20029,#20003)
+stmt_containers(#20029,#20001)
+#20030=*
+exprs(#20030,13,#20029,0,"f(function(){}, 23)")
+#20031=@"loc,{#10000},1,1,1,19"
+locations_default(#20031,#10000,1,1,1,19)
+hasLocation(#20030,#20031)
+enclosing_stmt(#20030,#20029)
+expr_containers(#20030,#20001)
+#20032=*
+exprs(#20032,79,#20030,-1,"f")
+hasLocation(#20032,#20005)
+enclosing_stmt(#20032,#20029)
+expr_containers(#20032,#20001)
+literals("f","f",#20032)
+#20033=@"var;{f};{#20000}"
+variables(#20033,"f",#20000)
+bind(#20032,#20033)
+#20034=*
+exprs(#20034,9,#20030,0,"function(){}")
+#20035=@"loc,{#10000},1,3,1,14"
+locations_default(#20035,#10000,1,3,1,14)
+hasLocation(#20034,#20035)
+enclosing_stmt(#20034,#20029)
+expr_containers(#20034,#20001)
+#20036=*
+scopes(#20036,1)
+scopenodes(#20034,#20036)
+scopenesting(#20036,#20000)
+#20037=@"var;{this};{#20036}"
+variables(#20037,"this",#20036)
+#20038=@"var;{arguments};{#20036}"
+variables(#20038,"arguments",#20036)
+is_arguments_object(#20038)
 #20039=*
-exprs(#20039,3,#20029,1,"23")
-hasLocation(#20039,#20021)
-enclosing_stmt(#20039,#20028)
-expr_containers(#20039,#20001)
-literals("23","23",#20039)
-#20040=*
-entry_cfg_node(#20040,#20001)
-#20041=@"loc,{#10000},1,1,1,0"
-locations_default(#20041,#10000,1,1,1,0)
-hasLocation(#20040,#20041)
+stmts(#20039,1,#20034,-2,"{}")
+#20040=@"loc,{#10000},1,13,1,14"
+locations_default(#20040,#10000,1,13,1,14)
+hasLocation(#20039,#20040)
+stmt_containers(#20039,#20034)
+#20041=*
+exprs(#20041,3,#20030,1,"23")
+hasLocation(#20041,#20021)
+enclosing_stmt(#20041,#20029)
+expr_containers(#20041,#20001)
+literals("23","23",#20041)
 #20042=*
-exit_cfg_node(#20042,#20001)
-hasLocation(#20042,#20027)
-successor(#20028,#20031)
-successor(#20039,#20029)
-successor(#20033,#20039)
-#20043=*
-entry_cfg_node(#20043,#20033)
-#20044=@"loc,{#10000},1,3,1,2"
-locations_default(#20044,#10000,1,3,1,2)
-hasLocation(#20043,#20044)
+entry_cfg_node(#20042,#20001)
+#20043=@"loc,{#10000},1,1,1,0"
+locations_default(#20043,#10000,1,1,1,0)
+hasLocation(#20042,#20043)
+#20044=*
+exit_cfg_node(#20044,#20001)
+hasLocation(#20044,#20027)
+successor(#20029,#20032)
+successor(#20041,#20030)
+successor(#20034,#20041)
 #20045=*
-exit_cfg_node(#20045,#20033)
-#20046=@"loc,{#10000},1,15,1,14"
-locations_default(#20046,#10000,1,15,1,14)
+entry_cfg_node(#20045,#20034)
+#20046=@"loc,{#10000},1,3,1,2"
+locations_default(#20046,#10000,1,3,1,2)
 hasLocation(#20045,#20046)
-successor(#20037,#20045)
-successor(#20043,#20037)
-successor(#20031,#20033)
-successor(#20029,#20042)
-successor(#20040,#20028)
+#20047=*
+exit_cfg_node(#20047,#20034)
+#20048=@"loc,{#10000},1,15,1,14"
+locations_default(#20048,#10000,1,15,1,14)
+hasLocation(#20047,#20048)
+successor(#20039,#20047)
+successor(#20045,#20039)
+successor(#20032,#20034)
+successor(#20030,#20044)
+successor(#20042,#20029)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/exprs/output/trap/others.js.trap b/javascript/extractor/tests/exprs/output/trap/others.js.trap
index 5fc397235e8..1983b9ce74f 100644
--- a/javascript/extractor/tests/exprs/output/trap/others.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/others.js.trap
@@ -117,109 +117,111 @@ toplevels(#20001,0)
 #20042=@"loc,{#10000},1,1,4,0"
 locations_default(#20042,#10000,1,1,4,0)
 hasLocation(#20001,#20042)
-#20043=*
-stmts(#20043,2,#20001,0,"23, 42;")
-hasLocation(#20043,#20003)
-stmt_containers(#20043,#20001)
+#20043=@"var;{this};{#20000}"
+variables(#20043,"this",#20000)
 #20044=*
-exprs(#20044,10,#20043,0,"23, 42")
-#20045=@"loc,{#10000},1,1,1,6"
-locations_default(#20045,#10000,1,1,1,6)
-hasLocation(#20044,#20045)
-enclosing_stmt(#20044,#20043)
-expr_containers(#20044,#20001)
-#20046=*
-exprs(#20046,3,#20044,0,"23")
-hasLocation(#20046,#20009)
-enclosing_stmt(#20046,#20043)
-expr_containers(#20046,#20001)
-literals("23","23",#20046)
+stmts(#20044,2,#20001,0,"23, 42;")
+hasLocation(#20044,#20003)
+stmt_containers(#20044,#20001)
+#20045=*
+exprs(#20045,10,#20044,0,"23, 42")
+#20046=@"loc,{#10000},1,1,1,6"
+locations_default(#20046,#10000,1,1,1,6)
+hasLocation(#20045,#20046)
+enclosing_stmt(#20045,#20044)
+expr_containers(#20045,#20001)
 #20047=*
-exprs(#20047,3,#20044,1,"42")
-hasLocation(#20047,#20013)
-enclosing_stmt(#20047,#20043)
+exprs(#20047,3,#20045,0,"23")
+hasLocation(#20047,#20009)
+enclosing_stmt(#20047,#20044)
 expr_containers(#20047,#20001)
-literals("42","42",#20047)
+literals("23","23",#20047)
 #20048=*
-stmts(#20048,2,#20001,1,"23, 42, 56;")
-hasLocation(#20048,#20005)
-stmt_containers(#20048,#20001)
+exprs(#20048,3,#20045,1,"42")
+hasLocation(#20048,#20013)
+enclosing_stmt(#20048,#20044)
+expr_containers(#20048,#20001)
+literals("42","42",#20048)
 #20049=*
-exprs(#20049,10,#20048,0,"23, 42, 56")
-#20050=@"loc,{#10000},2,1,2,10"
-locations_default(#20050,#10000,2,1,2,10)
-hasLocation(#20049,#20050)
-enclosing_stmt(#20049,#20048)
-expr_containers(#20049,#20001)
-#20051=*
-exprs(#20051,3,#20049,0,"23")
-hasLocation(#20051,#20017)
-enclosing_stmt(#20051,#20048)
-expr_containers(#20051,#20001)
-literals("23","23",#20051)
+stmts(#20049,2,#20001,1,"23, 42, 56;")
+hasLocation(#20049,#20005)
+stmt_containers(#20049,#20001)
+#20050=*
+exprs(#20050,10,#20049,0,"23, 42, 56")
+#20051=@"loc,{#10000},2,1,2,10"
+locations_default(#20051,#10000,2,1,2,10)
+hasLocation(#20050,#20051)
+enclosing_stmt(#20050,#20049)
+expr_containers(#20050,#20001)
 #20052=*
-exprs(#20052,3,#20049,1,"42")
-hasLocation(#20052,#20021)
-enclosing_stmt(#20052,#20048)
+exprs(#20052,3,#20050,0,"23")
+hasLocation(#20052,#20017)
+enclosing_stmt(#20052,#20049)
 expr_containers(#20052,#20001)
-literals("42","42",#20052)
+literals("23","23",#20052)
 #20053=*
-exprs(#20053,3,#20049,2,"56")
-hasLocation(#20053,#20025)
-enclosing_stmt(#20053,#20048)
+exprs(#20053,3,#20050,1,"42")
+hasLocation(#20053,#20021)
+enclosing_stmt(#20053,#20049)
 expr_containers(#20053,#20001)
-literals("56","56",#20053)
+literals("42","42",#20053)
 #20054=*
-stmts(#20054,2,#20001,2,"true ? 0 : 1;")
-hasLocation(#20054,#20007)
-stmt_containers(#20054,#20001)
+exprs(#20054,3,#20050,2,"56")
+hasLocation(#20054,#20025)
+enclosing_stmt(#20054,#20049)
+expr_containers(#20054,#20001)
+literals("56","56",#20054)
 #20055=*
-exprs(#20055,11,#20054,0,"true ? 0 : 1")
-#20056=@"loc,{#10000},3,1,3,12"
-locations_default(#20056,#10000,3,1,3,12)
-hasLocation(#20055,#20056)
-enclosing_stmt(#20055,#20054)
-expr_containers(#20055,#20001)
-#20057=*
-exprs(#20057,2,#20055,0,"true")
-hasLocation(#20057,#20029)
-enclosing_stmt(#20057,#20054)
-expr_containers(#20057,#20001)
-literals("true","true",#20057)
+stmts(#20055,2,#20001,2,"true ? 0 : 1;")
+hasLocation(#20055,#20007)
+stmt_containers(#20055,#20001)
+#20056=*
+exprs(#20056,11,#20055,0,"true ? 0 : 1")
+#20057=@"loc,{#10000},3,1,3,12"
+locations_default(#20057,#10000,3,1,3,12)
+hasLocation(#20056,#20057)
+enclosing_stmt(#20056,#20055)
+expr_containers(#20056,#20001)
 #20058=*
-exprs(#20058,3,#20055,1,"0")
-hasLocation(#20058,#20033)
-enclosing_stmt(#20058,#20054)
+exprs(#20058,2,#20056,0,"true")
+hasLocation(#20058,#20029)
+enclosing_stmt(#20058,#20055)
 expr_containers(#20058,#20001)
-literals("0","0",#20058)
+literals("true","true",#20058)
 #20059=*
-exprs(#20059,3,#20055,2,"1")
-hasLocation(#20059,#20037)
-enclosing_stmt(#20059,#20054)
+exprs(#20059,3,#20056,1,"0")
+hasLocation(#20059,#20033)
+enclosing_stmt(#20059,#20055)
 expr_containers(#20059,#20001)
-literals("1","1",#20059)
+literals("0","0",#20059)
 #20060=*
-entry_cfg_node(#20060,#20001)
-#20061=@"loc,{#10000},1,1,1,0"
-locations_default(#20061,#10000,1,1,1,0)
-hasLocation(#20060,#20061)
-#20062=*
-exit_cfg_node(#20062,#20001)
-hasLocation(#20062,#20041)
+exprs(#20060,3,#20056,2,"1")
+hasLocation(#20060,#20037)
+enclosing_stmt(#20060,#20055)
+expr_containers(#20060,#20001)
+literals("1","1",#20060)
+#20061=*
+entry_cfg_node(#20061,#20001)
+#20062=@"loc,{#10000},1,1,1,0"
+locations_default(#20062,#10000,1,1,1,0)
+hasLocation(#20061,#20062)
+#20063=*
+exit_cfg_node(#20063,#20001)
+hasLocation(#20063,#20041)
+successor(#20055,#20056)
+successor(#20056,#20058)
+successor(#20058,#20059)
+successor(#20059,#20063)
+successor(#20060,#20063)
+successor(#20049,#20050)
+successor(#20050,#20052)
 successor(#20054,#20055)
-successor(#20055,#20057)
-successor(#20057,#20058)
-successor(#20058,#20062)
-successor(#20059,#20062)
-successor(#20048,#20049)
-successor(#20049,#20051)
 successor(#20053,#20054)
 successor(#20052,#20053)
-successor(#20051,#20052)
-successor(#20043,#20044)
-successor(#20044,#20046)
+successor(#20044,#20045)
+successor(#20045,#20047)
+successor(#20048,#20049)
 successor(#20047,#20048)
-successor(#20046,#20047)
-successor(#20060,#20043)
+successor(#20061,#20044)
 numlines(#10000,3,3,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/exprs/output/trap/parens.js.trap b/javascript/extractor/tests/exprs/output/trap/parens.js.trap
index 8b8d9b592ba..e924f9b5ee0 100644
--- a/javascript/extractor/tests/exprs/output/trap/parens.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/parens.js.trap
@@ -47,45 +47,47 @@ locations_default(#20015,#10000,1,9,1,8)
 hasLocation(#20014,#20015)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20016=*
-stmts(#20016,2,#20001,0,"--(NaN);")
-hasLocation(#20016,#20003)
-stmt_containers(#20016,#20001)
+#20016=@"var;{this};{#20000}"
+variables(#20016,"this",#20000)
 #20017=*
-exprs(#20017,61,#20016,0,"--(NaN)")
-#20018=@"loc,{#10000},1,1,1,7"
-locations_default(#20018,#10000,1,1,1,7)
-hasLocation(#20017,#20018)
-enclosing_stmt(#20017,#20016)
-expr_containers(#20017,#20001)
-#20019=*
-exprs(#20019,63,#20017,0,"(NaN)")
-#20020=@"loc,{#10000},1,3,1,7"
-locations_default(#20020,#10000,1,3,1,7)
-hasLocation(#20019,#20020)
-enclosing_stmt(#20019,#20016)
-expr_containers(#20019,#20001)
-#20021=*
-exprs(#20021,79,#20019,0,"NaN")
-hasLocation(#20021,#20009)
-enclosing_stmt(#20021,#20016)
-expr_containers(#20021,#20001)
-literals("NaN","NaN",#20021)
-#20022=@"var;{NaN};{#20000}"
-variables(#20022,"NaN",#20000)
-bind(#20021,#20022)
-#20023=*
-entry_cfg_node(#20023,#20001)
-#20024=@"loc,{#10000},1,1,1,0"
-locations_default(#20024,#10000,1,1,1,0)
-hasLocation(#20023,#20024)
-#20025=*
-exit_cfg_node(#20025,#20001)
-hasLocation(#20025,#20015)
-successor(#20016,#20019)
-successor(#20019,#20021)
-successor(#20021,#20017)
-successor(#20017,#20025)
-successor(#20023,#20016)
+stmts(#20017,2,#20001,0,"--(NaN);")
+hasLocation(#20017,#20003)
+stmt_containers(#20017,#20001)
+#20018=*
+exprs(#20018,61,#20017,0,"--(NaN)")
+#20019=@"loc,{#10000},1,1,1,7"
+locations_default(#20019,#10000,1,1,1,7)
+hasLocation(#20018,#20019)
+enclosing_stmt(#20018,#20017)
+expr_containers(#20018,#20001)
+#20020=*
+exprs(#20020,63,#20018,0,"(NaN)")
+#20021=@"loc,{#10000},1,3,1,7"
+locations_default(#20021,#10000,1,3,1,7)
+hasLocation(#20020,#20021)
+enclosing_stmt(#20020,#20017)
+expr_containers(#20020,#20001)
+#20022=*
+exprs(#20022,79,#20020,0,"NaN")
+hasLocation(#20022,#20009)
+enclosing_stmt(#20022,#20017)
+expr_containers(#20022,#20001)
+literals("NaN","NaN",#20022)
+#20023=@"var;{NaN};{#20000}"
+variables(#20023,"NaN",#20000)
+bind(#20022,#20023)
+#20024=*
+entry_cfg_node(#20024,#20001)
+#20025=@"loc,{#10000},1,1,1,0"
+locations_default(#20025,#10000,1,1,1,0)
+hasLocation(#20024,#20025)
+#20026=*
+exit_cfg_node(#20026,#20001)
+hasLocation(#20026,#20015)
+successor(#20017,#20020)
+successor(#20020,#20022)
+successor(#20022,#20018)
+successor(#20018,#20026)
+successor(#20024,#20017)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/exprs/output/trap/patterns.js.trap b/javascript/extractor/tests/exprs/output/trap/patterns.js.trap
index 18c8b4851ed..9bc25db30a3 100644
--- a/javascript/extractor/tests/exprs/output/trap/patterns.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/patterns.js.trap
@@ -247,282 +247,284 @@ hasLocation(#20001,#20092)
 variables(#20093,"get",#20000)
 #20094=@"var;{set};{#20000}"
 variables(#20094,"set",#20000)
-#20095=*
-stmts(#20095,18,#20001,0,"var { g ...  } = x;")
-hasLocation(#20095,#20003)
-stmt_containers(#20095,#20001)
+#20095=@"var;{this};{#20000}"
+variables(#20095,"this",#20000)
 #20096=*
-exprs(#20096,64,#20095,0,"{ get, set } = x")
-#20097=@"loc,{#10000},1,5,1,20"
-locations_default(#20097,#10000,1,5,1,20)
-hasLocation(#20096,#20097)
-enclosing_stmt(#20096,#20095)
-expr_containers(#20096,#20001)
-#20098=*
-exprs(#20098,68,#20096,0,"{ get, set }")
-#20099=@"loc,{#10000},1,5,1,16"
-locations_default(#20099,#10000,1,5,1,16)
-hasLocation(#20098,#20099)
-enclosing_stmt(#20098,#20095)
-expr_containers(#20098,#20001)
-#20100=*
-properties(#20100,#20098,0,0,"get")
-hasLocation(#20100,#20015)
+stmts(#20096,18,#20001,0,"var { g ...  } = x;")
+hasLocation(#20096,#20003)
+stmt_containers(#20096,#20001)
+#20097=*
+exprs(#20097,64,#20096,0,"{ get, set } = x")
+#20098=@"loc,{#10000},1,5,1,20"
+locations_default(#20098,#10000,1,5,1,20)
+hasLocation(#20097,#20098)
+enclosing_stmt(#20097,#20096)
+expr_containers(#20097,#20001)
+#20099=*
+exprs(#20099,68,#20097,0,"{ get, set }")
+#20100=@"loc,{#10000},1,5,1,16"
+locations_default(#20100,#10000,1,5,1,16)
+hasLocation(#20099,#20100)
+enclosing_stmt(#20099,#20096)
+expr_containers(#20099,#20001)
 #20101=*
-exprs(#20101,0,#20100,0,"get")
+properties(#20101,#20099,0,0,"get")
 hasLocation(#20101,#20015)
-enclosing_stmt(#20101,#20095)
-expr_containers(#20101,#20001)
-literals("get","get",#20101)
 #20102=*
-exprs(#20102,78,#20100,1,"get")
+exprs(#20102,0,#20101,0,"get")
 hasLocation(#20102,#20015)
-enclosing_stmt(#20102,#20095)
+enclosing_stmt(#20102,#20096)
 expr_containers(#20102,#20001)
 literals("get","get",#20102)
-decl(#20102,#20093)
 #20103=*
-properties(#20103,#20098,1,0,"set")
-hasLocation(#20103,#20019)
+exprs(#20103,78,#20101,1,"get")
+hasLocation(#20103,#20015)
+enclosing_stmt(#20103,#20096)
+expr_containers(#20103,#20001)
+literals("get","get",#20103)
+decl(#20103,#20093)
 #20104=*
-exprs(#20104,0,#20103,0,"set")
+properties(#20104,#20099,1,0,"set")
 hasLocation(#20104,#20019)
-enclosing_stmt(#20104,#20095)
-expr_containers(#20104,#20001)
-literals("set","set",#20104)
 #20105=*
-exprs(#20105,78,#20103,1,"set")
+exprs(#20105,0,#20104,0,"set")
 hasLocation(#20105,#20019)
-enclosing_stmt(#20105,#20095)
+enclosing_stmt(#20105,#20096)
 expr_containers(#20105,#20001)
 literals("set","set",#20105)
-decl(#20105,#20094)
 #20106=*
-exprs(#20106,79,#20096,1,"x")
-hasLocation(#20106,#20025)
-enclosing_stmt(#20106,#20095)
+exprs(#20106,78,#20104,1,"set")
+hasLocation(#20106,#20019)
+enclosing_stmt(#20106,#20096)
 expr_containers(#20106,#20001)
-literals("x","x",#20106)
-#20107=@"var;{x};{#20000}"
-variables(#20107,"x",#20000)
-bind(#20106,#20107)
-#20108=*
-stmts(#20108,18,#20001,1,"var { get = 1 } = x;")
-hasLocation(#20108,#20005)
-stmt_containers(#20108,#20001)
+literals("set","set",#20106)
+decl(#20106,#20094)
+#20107=*
+exprs(#20107,79,#20097,1,"x")
+hasLocation(#20107,#20025)
+enclosing_stmt(#20107,#20096)
+expr_containers(#20107,#20001)
+literals("x","x",#20107)
+#20108=@"var;{x};{#20000}"
+variables(#20108,"x",#20000)
+bind(#20107,#20108)
 #20109=*
-exprs(#20109,64,#20108,0,"{ get = 1 } = x")
-#20110=@"loc,{#10000},2,5,2,19"
-locations_default(#20110,#10000,2,5,2,19)
-hasLocation(#20109,#20110)
-enclosing_stmt(#20109,#20108)
-expr_containers(#20109,#20001)
-#20111=*
-exprs(#20111,68,#20109,0,"{ get = 1 }")
-#20112=@"loc,{#10000},2,5,2,15"
-locations_default(#20112,#10000,2,5,2,15)
-hasLocation(#20111,#20112)
-enclosing_stmt(#20111,#20108)
-expr_containers(#20111,#20001)
-#20113=*
-properties(#20113,#20111,0,0,"get = 1")
-#20114=@"loc,{#10000},2,7,2,13"
-locations_default(#20114,#10000,2,7,2,13)
-hasLocation(#20113,#20114)
-#20115=*
-exprs(#20115,0,#20113,0,"get")
-hasLocation(#20115,#20033)
-enclosing_stmt(#20115,#20108)
-expr_containers(#20115,#20001)
-literals("get","get",#20115)
+stmts(#20109,18,#20001,1,"var { get = 1 } = x;")
+hasLocation(#20109,#20005)
+stmt_containers(#20109,#20001)
+#20110=*
+exprs(#20110,64,#20109,0,"{ get = 1 } = x")
+#20111=@"loc,{#10000},2,5,2,19"
+locations_default(#20111,#10000,2,5,2,19)
+hasLocation(#20110,#20111)
+enclosing_stmt(#20110,#20109)
+expr_containers(#20110,#20001)
+#20112=*
+exprs(#20112,68,#20110,0,"{ get = 1 }")
+#20113=@"loc,{#10000},2,5,2,15"
+locations_default(#20113,#10000,2,5,2,15)
+hasLocation(#20112,#20113)
+enclosing_stmt(#20112,#20109)
+expr_containers(#20112,#20001)
+#20114=*
+properties(#20114,#20112,0,0,"get = 1")
+#20115=@"loc,{#10000},2,7,2,13"
+locations_default(#20115,#10000,2,7,2,13)
+hasLocation(#20114,#20115)
 #20116=*
-exprs(#20116,78,#20113,1,"get")
+exprs(#20116,0,#20114,0,"get")
 hasLocation(#20116,#20033)
-enclosing_stmt(#20116,#20108)
+enclosing_stmt(#20116,#20109)
 expr_containers(#20116,#20001)
 literals("get","get",#20116)
-decl(#20116,#20093)
 #20117=*
-exprs(#20117,3,#20113,2,"1")
-hasLocation(#20117,#20037)
-enclosing_stmt(#20117,#20108)
+exprs(#20117,78,#20114,1,"get")
+hasLocation(#20117,#20033)
+enclosing_stmt(#20117,#20109)
 expr_containers(#20117,#20001)
-literals("1","1",#20117)
+literals("get","get",#20117)
+decl(#20117,#20093)
 #20118=*
-exprs(#20118,79,#20109,1,"x")
-hasLocation(#20118,#20043)
-enclosing_stmt(#20118,#20108)
+exprs(#20118,3,#20114,2,"1")
+hasLocation(#20118,#20037)
+enclosing_stmt(#20118,#20109)
 expr_containers(#20118,#20001)
-literals("x","x",#20118)
-bind(#20118,#20107)
+literals("1","1",#20118)
 #20119=*
-stmts(#20119,18,#20001,2,"var { set = 1 } = x;")
-hasLocation(#20119,#20007)
-stmt_containers(#20119,#20001)
+exprs(#20119,79,#20110,1,"x")
+hasLocation(#20119,#20043)
+enclosing_stmt(#20119,#20109)
+expr_containers(#20119,#20001)
+literals("x","x",#20119)
+bind(#20119,#20108)
 #20120=*
-exprs(#20120,64,#20119,0,"{ set = 1 } = x")
-#20121=@"loc,{#10000},3,5,3,19"
-locations_default(#20121,#10000,3,5,3,19)
-hasLocation(#20120,#20121)
-enclosing_stmt(#20120,#20119)
-expr_containers(#20120,#20001)
-#20122=*
-exprs(#20122,68,#20120,0,"{ set = 1 }")
-#20123=@"loc,{#10000},3,5,3,15"
-locations_default(#20123,#10000,3,5,3,15)
-hasLocation(#20122,#20123)
-enclosing_stmt(#20122,#20119)
-expr_containers(#20122,#20001)
-#20124=*
-properties(#20124,#20122,0,0,"set = 1")
-#20125=@"loc,{#10000},3,7,3,13"
-locations_default(#20125,#10000,3,7,3,13)
-hasLocation(#20124,#20125)
-#20126=*
-exprs(#20126,0,#20124,0,"set")
-hasLocation(#20126,#20051)
-enclosing_stmt(#20126,#20119)
-expr_containers(#20126,#20001)
-literals("set","set",#20126)
+stmts(#20120,18,#20001,2,"var { set = 1 } = x;")
+hasLocation(#20120,#20007)
+stmt_containers(#20120,#20001)
+#20121=*
+exprs(#20121,64,#20120,0,"{ set = 1 } = x")
+#20122=@"loc,{#10000},3,5,3,19"
+locations_default(#20122,#10000,3,5,3,19)
+hasLocation(#20121,#20122)
+enclosing_stmt(#20121,#20120)
+expr_containers(#20121,#20001)
+#20123=*
+exprs(#20123,68,#20121,0,"{ set = 1 }")
+#20124=@"loc,{#10000},3,5,3,15"
+locations_default(#20124,#10000,3,5,3,15)
+hasLocation(#20123,#20124)
+enclosing_stmt(#20123,#20120)
+expr_containers(#20123,#20001)
+#20125=*
+properties(#20125,#20123,0,0,"set = 1")
+#20126=@"loc,{#10000},3,7,3,13"
+locations_default(#20126,#10000,3,7,3,13)
+hasLocation(#20125,#20126)
 #20127=*
-exprs(#20127,78,#20124,1,"set")
+exprs(#20127,0,#20125,0,"set")
 hasLocation(#20127,#20051)
-enclosing_stmt(#20127,#20119)
+enclosing_stmt(#20127,#20120)
 expr_containers(#20127,#20001)
 literals("set","set",#20127)
-decl(#20127,#20094)
 #20128=*
-exprs(#20128,3,#20124,2,"1")
-hasLocation(#20128,#20055)
-enclosing_stmt(#20128,#20119)
+exprs(#20128,78,#20125,1,"set")
+hasLocation(#20128,#20051)
+enclosing_stmt(#20128,#20120)
 expr_containers(#20128,#20001)
-literals("1","1",#20128)
+literals("set","set",#20128)
+decl(#20128,#20094)
 #20129=*
-exprs(#20129,79,#20120,1,"x")
-hasLocation(#20129,#20061)
-enclosing_stmt(#20129,#20119)
+exprs(#20129,3,#20125,2,"1")
+hasLocation(#20129,#20055)
+enclosing_stmt(#20129,#20120)
 expr_containers(#20129,#20001)
-literals("x","x",#20129)
-bind(#20129,#20107)
+literals("1","1",#20129)
 #20130=*
-stmts(#20130,18,#20001,3,"var { g ...  } = x;")
-hasLocation(#20130,#20009)
-stmt_containers(#20130,#20001)
+exprs(#20130,79,#20121,1,"x")
+hasLocation(#20130,#20061)
+enclosing_stmt(#20130,#20120)
+expr_containers(#20130,#20001)
+literals("x","x",#20130)
+bind(#20130,#20108)
 #20131=*
-exprs(#20131,64,#20130,0,"{ get = ... 1 } = x")
-#20132=@"loc,{#10000},4,5,4,28"
-locations_default(#20132,#10000,4,5,4,28)
-hasLocation(#20131,#20132)
-enclosing_stmt(#20131,#20130)
-expr_containers(#20131,#20001)
-#20133=*
-exprs(#20133,68,#20131,0,"{ get = 1, set = 1 }")
-#20134=@"loc,{#10000},4,5,4,24"
-locations_default(#20134,#10000,4,5,4,24)
-hasLocation(#20133,#20134)
-enclosing_stmt(#20133,#20130)
-expr_containers(#20133,#20001)
-#20135=*
-properties(#20135,#20133,0,0,"get = 1")
-#20136=@"loc,{#10000},4,7,4,13"
-locations_default(#20136,#10000,4,7,4,13)
-hasLocation(#20135,#20136)
-#20137=*
-exprs(#20137,0,#20135,0,"get")
-hasLocation(#20137,#20069)
-enclosing_stmt(#20137,#20130)
-expr_containers(#20137,#20001)
-literals("get","get",#20137)
+stmts(#20131,18,#20001,3,"var { g ...  } = x;")
+hasLocation(#20131,#20009)
+stmt_containers(#20131,#20001)
+#20132=*
+exprs(#20132,64,#20131,0,"{ get = ... 1 } = x")
+#20133=@"loc,{#10000},4,5,4,28"
+locations_default(#20133,#10000,4,5,4,28)
+hasLocation(#20132,#20133)
+enclosing_stmt(#20132,#20131)
+expr_containers(#20132,#20001)
+#20134=*
+exprs(#20134,68,#20132,0,"{ get = 1, set = 1 }")
+#20135=@"loc,{#10000},4,5,4,24"
+locations_default(#20135,#10000,4,5,4,24)
+hasLocation(#20134,#20135)
+enclosing_stmt(#20134,#20131)
+expr_containers(#20134,#20001)
+#20136=*
+properties(#20136,#20134,0,0,"get = 1")
+#20137=@"loc,{#10000},4,7,4,13"
+locations_default(#20137,#10000,4,7,4,13)
+hasLocation(#20136,#20137)
 #20138=*
-exprs(#20138,78,#20135,1,"get")
+exprs(#20138,0,#20136,0,"get")
 hasLocation(#20138,#20069)
-enclosing_stmt(#20138,#20130)
+enclosing_stmt(#20138,#20131)
 expr_containers(#20138,#20001)
 literals("get","get",#20138)
-decl(#20138,#20093)
 #20139=*
-exprs(#20139,3,#20135,2,"1")
-hasLocation(#20139,#20073)
-enclosing_stmt(#20139,#20130)
+exprs(#20139,78,#20136,1,"get")
+hasLocation(#20139,#20069)
+enclosing_stmt(#20139,#20131)
 expr_containers(#20139,#20001)
-literals("1","1",#20139)
+literals("get","get",#20139)
+decl(#20139,#20093)
 #20140=*
-properties(#20140,#20133,1,0,"set = 1")
-#20141=@"loc,{#10000},4,16,4,22"
-locations_default(#20141,#10000,4,16,4,22)
-hasLocation(#20140,#20141)
-#20142=*
-exprs(#20142,0,#20140,0,"set")
-hasLocation(#20142,#20077)
-enclosing_stmt(#20142,#20130)
-expr_containers(#20142,#20001)
-literals("set","set",#20142)
+exprs(#20140,3,#20136,2,"1")
+hasLocation(#20140,#20073)
+enclosing_stmt(#20140,#20131)
+expr_containers(#20140,#20001)
+literals("1","1",#20140)
+#20141=*
+properties(#20141,#20134,1,0,"set = 1")
+#20142=@"loc,{#10000},4,16,4,22"
+locations_default(#20142,#10000,4,16,4,22)
+hasLocation(#20141,#20142)
 #20143=*
-exprs(#20143,78,#20140,1,"set")
+exprs(#20143,0,#20141,0,"set")
 hasLocation(#20143,#20077)
-enclosing_stmt(#20143,#20130)
+enclosing_stmt(#20143,#20131)
 expr_containers(#20143,#20001)
 literals("set","set",#20143)
-decl(#20143,#20094)
 #20144=*
-exprs(#20144,3,#20140,2,"1")
-hasLocation(#20144,#20081)
-enclosing_stmt(#20144,#20130)
+exprs(#20144,78,#20141,1,"set")
+hasLocation(#20144,#20077)
+enclosing_stmt(#20144,#20131)
 expr_containers(#20144,#20001)
-literals("1","1",#20144)
+literals("set","set",#20144)
+decl(#20144,#20094)
 #20145=*
-exprs(#20145,79,#20131,1,"x")
-hasLocation(#20145,#20087)
-enclosing_stmt(#20145,#20130)
+exprs(#20145,3,#20141,2,"1")
+hasLocation(#20145,#20081)
+enclosing_stmt(#20145,#20131)
 expr_containers(#20145,#20001)
-literals("x","x",#20145)
-bind(#20145,#20107)
+literals("1","1",#20145)
 #20146=*
-entry_cfg_node(#20146,#20001)
-#20147=@"loc,{#10000},1,1,1,0"
-locations_default(#20147,#10000,1,1,1,0)
-hasLocation(#20146,#20147)
-#20148=*
-exit_cfg_node(#20148,#20001)
-hasLocation(#20148,#20091)
-successor(#20130,#20145)
-successor(#20133,#20137)
-successor(#20144,#20140)
+exprs(#20146,79,#20132,1,"x")
+hasLocation(#20146,#20087)
+enclosing_stmt(#20146,#20131)
+expr_containers(#20146,#20001)
+literals("x","x",#20146)
+bind(#20146,#20108)
+#20147=*
+entry_cfg_node(#20147,#20001)
+#20148=@"loc,{#10000},1,1,1,0"
+locations_default(#20148,#10000,1,1,1,0)
+hasLocation(#20147,#20148)
+#20149=*
+exit_cfg_node(#20149,#20001)
+hasLocation(#20149,#20091)
+successor(#20131,#20146)
+successor(#20134,#20138)
+successor(#20145,#20141)
+successor(#20144,#20145)
 successor(#20143,#20144)
-successor(#20142,#20143)
-successor(#20140,#20131)
-successor(#20139,#20135)
+successor(#20141,#20132)
+successor(#20140,#20136)
+successor(#20139,#20140)
 successor(#20138,#20139)
-successor(#20137,#20138)
-successor(#20135,#20142)
-successor(#20145,#20133)
-successor(#20131,#20148)
-successor(#20119,#20129)
-successor(#20122,#20126)
-successor(#20128,#20124)
-successor(#20127,#20128)
-successor(#20126,#20127)
-successor(#20124,#20120)
-successor(#20129,#20122)
+successor(#20136,#20143)
+successor(#20146,#20134)
+successor(#20132,#20149)
 successor(#20120,#20130)
-successor(#20108,#20118)
-successor(#20111,#20115)
-successor(#20117,#20113)
-successor(#20116,#20117)
-successor(#20115,#20116)
-successor(#20113,#20109)
-successor(#20118,#20111)
+successor(#20123,#20127)
+successor(#20129,#20125)
+successor(#20128,#20129)
+successor(#20127,#20128)
+successor(#20125,#20121)
+successor(#20130,#20123)
+successor(#20121,#20131)
 successor(#20109,#20119)
-successor(#20095,#20106)
-successor(#20098,#20101)
-successor(#20105,#20103)
-successor(#20104,#20105)
-successor(#20103,#20096)
-successor(#20102,#20100)
-successor(#20101,#20102)
-successor(#20100,#20104)
-successor(#20106,#20098)
-successor(#20096,#20108)
-successor(#20146,#20095)
+successor(#20112,#20116)
+successor(#20118,#20114)
+successor(#20117,#20118)
+successor(#20116,#20117)
+successor(#20114,#20110)
+successor(#20119,#20112)
+successor(#20110,#20120)
+successor(#20096,#20107)
+successor(#20099,#20102)
+successor(#20106,#20104)
+successor(#20105,#20106)
+successor(#20104,#20097)
+successor(#20103,#20101)
+successor(#20102,#20103)
+successor(#20101,#20105)
+successor(#20107,#20099)
+successor(#20097,#20109)
+successor(#20147,#20096)
 numlines(#10000,4,4,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/exprs/output/trap/primaries.js.trap b/javascript/extractor/tests/exprs/output/trap/primaries.js.trap
index 034ff1c98c0..f8625fd5cc7 100644
--- a/javascript/extractor/tests/exprs/output/trap/primaries.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/primaries.js.trap
@@ -852,873 +852,882 @@ toplevels(#20001,0)
 #20324=@"loc,{#10000},1,1,30,13"
 locations_default(#20324,#10000,1,1,30,13)
 hasLocation(#20001,#20324)
-#20325=*
-stmts(#20325,2,#20001,0,"null;")
-hasLocation(#20325,#20003)
-stmt_containers(#20325,#20001)
+#20325=@"var;{this};{#20000}"
+variables(#20325,"this",#20000)
 #20326=*
-exprs(#20326,1,#20325,0,"null")
-hasLocation(#20326,#20063)
-enclosing_stmt(#20326,#20325)
-expr_containers(#20326,#20001)
-literals("null","null",#20326)
+stmts(#20326,2,#20001,0,"null;")
+hasLocation(#20326,#20003)
+stmt_containers(#20326,#20001)
 #20327=*
-stmts(#20327,2,#20001,1,"true;")
-hasLocation(#20327,#20005)
-stmt_containers(#20327,#20001)
+exprs(#20327,1,#20326,0,"null")
+hasLocation(#20327,#20063)
+enclosing_stmt(#20327,#20326)
+expr_containers(#20327,#20001)
+literals("null","null",#20327)
 #20328=*
-exprs(#20328,2,#20327,0,"true")
-hasLocation(#20328,#20067)
-enclosing_stmt(#20328,#20327)
-expr_containers(#20328,#20001)
-literals("true","true",#20328)
+stmts(#20328,2,#20001,1,"true;")
+hasLocation(#20328,#20005)
+stmt_containers(#20328,#20001)
 #20329=*
-stmts(#20329,2,#20001,2,"false;")
-hasLocation(#20329,#20007)
-stmt_containers(#20329,#20001)
+exprs(#20329,2,#20328,0,"true")
+hasLocation(#20329,#20067)
+enclosing_stmt(#20329,#20328)
+expr_containers(#20329,#20001)
+literals("true","true",#20329)
 #20330=*
-exprs(#20330,2,#20329,0,"false")
-hasLocation(#20330,#20071)
-enclosing_stmt(#20330,#20329)
-expr_containers(#20330,#20001)
-literals("false","false",#20330)
+stmts(#20330,2,#20001,2,"false;")
+hasLocation(#20330,#20007)
+stmt_containers(#20330,#20001)
 #20331=*
-stmts(#20331,2,#20001,3,"23;")
-hasLocation(#20331,#20009)
-stmt_containers(#20331,#20001)
+exprs(#20331,2,#20330,0,"false")
+hasLocation(#20331,#20071)
+enclosing_stmt(#20331,#20330)
+expr_containers(#20331,#20001)
+literals("false","false",#20331)
 #20332=*
-exprs(#20332,3,#20331,0,"23")
-hasLocation(#20332,#20075)
-enclosing_stmt(#20332,#20331)
-expr_containers(#20332,#20001)
-literals("23","23",#20332)
+stmts(#20332,2,#20001,3,"23;")
+hasLocation(#20332,#20009)
+stmt_containers(#20332,#20001)
 #20333=*
-stmts(#20333,2,#20001,4,"2.3;")
-hasLocation(#20333,#20011)
-stmt_containers(#20333,#20001)
+exprs(#20333,3,#20332,0,"23")
+hasLocation(#20333,#20075)
+enclosing_stmt(#20333,#20332)
+expr_containers(#20333,#20001)
+literals("23","23",#20333)
 #20334=*
-exprs(#20334,3,#20333,0,"2.3")
-hasLocation(#20334,#20079)
-enclosing_stmt(#20334,#20333)
-expr_containers(#20334,#20001)
-literals("2.3","2.3",#20334)
+stmts(#20334,2,#20001,4,"2.3;")
+hasLocation(#20334,#20011)
+stmt_containers(#20334,#20001)
 #20335=*
-stmts(#20335,2,#20001,5,".42;")
-hasLocation(#20335,#20013)
-stmt_containers(#20335,#20001)
+exprs(#20335,3,#20334,0,"2.3")
+hasLocation(#20335,#20079)
+enclosing_stmt(#20335,#20334)
+expr_containers(#20335,#20001)
+literals("2.3","2.3",#20335)
 #20336=*
-exprs(#20336,3,#20335,0,".42")
-hasLocation(#20336,#20083)
-enclosing_stmt(#20336,#20335)
-expr_containers(#20336,#20001)
-literals("0.42",".42",#20336)
+stmts(#20336,2,#20001,5,".42;")
+hasLocation(#20336,#20013)
+stmt_containers(#20336,#20001)
 #20337=*
-stmts(#20337,2,#20001,6,"7.6e23;")
-hasLocation(#20337,#20015)
-stmt_containers(#20337,#20001)
+exprs(#20337,3,#20336,0,".42")
+hasLocation(#20337,#20083)
+enclosing_stmt(#20337,#20336)
+expr_containers(#20337,#20001)
+literals("0.42",".42",#20337)
 #20338=*
-exprs(#20338,3,#20337,0,"7.6e23")
-hasLocation(#20338,#20087)
-enclosing_stmt(#20338,#20337)
-expr_containers(#20338,#20001)
-literals("7.6E23","7.6e23",#20338)
+stmts(#20338,2,#20001,6,"7.6e23;")
+hasLocation(#20338,#20015)
+stmt_containers(#20338,#20001)
 #20339=*
-stmts(#20339,2,#20001,7,"1E-42;")
-hasLocation(#20339,#20017)
-stmt_containers(#20339,#20001)
+exprs(#20339,3,#20338,0,"7.6e23")
+hasLocation(#20339,#20087)
+enclosing_stmt(#20339,#20338)
+expr_containers(#20339,#20001)
+literals("7.6E23","7.6e23",#20339)
 #20340=*
-exprs(#20340,3,#20339,0,"1E-42")
-hasLocation(#20340,#20091)
-enclosing_stmt(#20340,#20339)
-expr_containers(#20340,#20001)
-literals("1.0E-42","1E-42",#20340)
+stmts(#20340,2,#20001,7,"1E-42;")
+hasLocation(#20340,#20017)
+stmt_containers(#20340,#20001)
 #20341=*
-stmts(#20341,2,#20001,8,"0xdeadbeef;")
-hasLocation(#20341,#20019)
-stmt_containers(#20341,#20001)
+exprs(#20341,3,#20340,0,"1E-42")
+hasLocation(#20341,#20091)
+enclosing_stmt(#20341,#20340)
+expr_containers(#20341,#20001)
+literals("1.0E-42","1E-42",#20341)
 #20342=*
-exprs(#20342,3,#20341,0,"0xdeadbeef")
-hasLocation(#20342,#20095)
-enclosing_stmt(#20342,#20341)
-expr_containers(#20342,#20001)
-literals("3735928559","0xdeadbeef",#20342)
+stmts(#20342,2,#20001,8,"0xdeadbeef;")
+hasLocation(#20342,#20019)
+stmt_containers(#20342,#20001)
 #20343=*
-stmts(#20343,2,#20001,9,"""Hello"";")
-hasLocation(#20343,#20021)
-stmt_containers(#20343,#20001)
+exprs(#20343,3,#20342,0,"0xdeadbeef")
+hasLocation(#20343,#20095)
+enclosing_stmt(#20343,#20342)
+expr_containers(#20343,#20001)
+literals("3735928559","0xdeadbeef",#20343)
 #20344=*
-exprs(#20344,4,#20343,0,"""Hello""")
-hasLocation(#20344,#20099)
-enclosing_stmt(#20344,#20343)
-expr_containers(#20344,#20001)
-literals("Hello","""Hello""",#20344)
+stmts(#20344,2,#20001,9,"""Hello"";")
+hasLocation(#20344,#20021)
+stmt_containers(#20344,#20001)
 #20345=*
-regexpterm(#20345,14,#20344,0,"Hello")
-#20346=@"loc,{#10000},10,2,10,6"
-locations_default(#20346,#10000,10,2,10,6)
-hasLocation(#20345,#20346)
-regexp_const_value(#20345,"Hello")
-#20347=*
-stmts(#20347,2,#20001,10,"'world';")
-hasLocation(#20347,#20023)
-stmt_containers(#20347,#20001)
+exprs(#20345,4,#20344,0,"""Hello""")
+hasLocation(#20345,#20099)
+enclosing_stmt(#20345,#20344)
+expr_containers(#20345,#20001)
+literals("Hello","""Hello""",#20345)
+#20346=*
+regexpterm(#20346,14,#20345,0,"Hello")
+#20347=@"loc,{#10000},10,2,10,6"
+locations_default(#20347,#10000,10,2,10,6)
+hasLocation(#20346,#20347)
+regexp_const_value(#20346,"Hello")
 #20348=*
-exprs(#20348,4,#20347,0,"'world'")
-hasLocation(#20348,#20103)
-enclosing_stmt(#20348,#20347)
-expr_containers(#20348,#20001)
-literals("world","'world'",#20348)
+stmts(#20348,2,#20001,10,"'world';")
+hasLocation(#20348,#20023)
+stmt_containers(#20348,#20001)
 #20349=*
-regexpterm(#20349,14,#20348,0,"world")
-#20350=@"loc,{#10000},11,2,11,6"
-locations_default(#20350,#10000,11,2,11,6)
-hasLocation(#20349,#20350)
-regexp_const_value(#20349,"world")
-#20351=*
-stmts(#20351,2,#20001,11,"""'what?'\x0a"";")
-hasLocation(#20351,#20025)
-stmt_containers(#20351,#20001)
+exprs(#20349,4,#20348,0,"'world'")
+hasLocation(#20349,#20103)
+enclosing_stmt(#20349,#20348)
+expr_containers(#20349,#20001)
+literals("world","'world'",#20349)
+#20350=*
+regexpterm(#20350,14,#20349,0,"world")
+#20351=@"loc,{#10000},11,2,11,6"
+locations_default(#20351,#10000,11,2,11,6)
+hasLocation(#20350,#20351)
+regexp_const_value(#20350,"world")
 #20352=*
-exprs(#20352,4,#20351,0,"""'what?'\x0a""")
-hasLocation(#20352,#20107)
-enclosing_stmt(#20352,#20351)
-expr_containers(#20352,#20001)
-literals("'what?'
-","""'what?'\x0a""",#20352)
+stmts(#20352,2,#20001,11,"""'what?'\x0a"";")
+hasLocation(#20352,#20025)
+stmt_containers(#20352,#20001)
 #20353=*
-regexpterm(#20353,1,#20352,0,"'what?'
+exprs(#20353,4,#20352,0,"""'what?'\x0a""")
+hasLocation(#20353,#20107)
+enclosing_stmt(#20353,#20352)
+expr_containers(#20353,#20001)
+literals("'what?'
+","""'what?'\x0a""",#20353)
+#20354=*
+regexpterm(#20354,1,#20353,0,"'what?'
 ")
-#20354=@"loc,{#10000},12,2,12,12"
-locations_default(#20354,#10000,12,2,12,12)
-hasLocation(#20353,#20354)
-#20355=*
-regexpterm(#20355,14,#20353,0,"'wha")
-#20356=@"loc,{#10000},12,2,12,5"
-locations_default(#20356,#10000,12,2,12,5)
-hasLocation(#20355,#20356)
-regexp_const_value(#20355,"'wha")
-#20357=*
-regexpterm(#20357,10,#20353,1,"t?")
-#20358=@"loc,{#10000},12,6,12,7"
-locations_default(#20358,#10000,12,6,12,7)
-hasLocation(#20357,#20358)
-is_greedy(#20357)
-#20359=*
-regexpterm(#20359,14,#20357,0,"t")
-#20360=@"loc,{#10000},12,6,12,6"
-locations_default(#20360,#10000,12,6,12,6)
-hasLocation(#20359,#20360)
-regexp_const_value(#20359,"t")
-#20361=*
-regexpterm(#20361,14,#20353,2,"'
+#20355=@"loc,{#10000},12,2,12,12"
+locations_default(#20355,#10000,12,2,12,12)
+hasLocation(#20354,#20355)
+#20356=*
+regexpterm(#20356,14,#20354,0,"'wha")
+#20357=@"loc,{#10000},12,2,12,5"
+locations_default(#20357,#10000,12,2,12,5)
+hasLocation(#20356,#20357)
+regexp_const_value(#20356,"'wha")
+#20358=*
+regexpterm(#20358,10,#20354,1,"t?")
+#20359=@"loc,{#10000},12,6,12,7"
+locations_default(#20359,#10000,12,6,12,7)
+hasLocation(#20358,#20359)
+is_greedy(#20358)
+#20360=*
+regexpterm(#20360,14,#20358,0,"t")
+#20361=@"loc,{#10000},12,6,12,6"
+locations_default(#20361,#10000,12,6,12,6)
+hasLocation(#20360,#20361)
+regexp_const_value(#20360,"t")
+#20362=*
+regexpterm(#20362,14,#20354,2,"'
 ")
-#20362=@"loc,{#10000},12,8,12,12"
-locations_default(#20362,#10000,12,8,12,12)
-hasLocation(#20361,#20362)
-regexp_const_value(#20361,"'
+#20363=@"loc,{#10000},12,8,12,12"
+locations_default(#20363,#10000,12,8,12,12)
+hasLocation(#20362,#20363)
+regexp_const_value(#20362,"'
 ")
-#20363=*
-stmts(#20363,2,#20001,12,"'""why?""\n';")
-hasLocation(#20363,#20027)
-stmt_containers(#20363,#20001)
 #20364=*
-exprs(#20364,4,#20363,0,"'""why?""\n'")
-hasLocation(#20364,#20111)
-enclosing_stmt(#20364,#20363)
-expr_containers(#20364,#20001)
-literals("""why?""
-","'""why?""\n'",#20364)
+stmts(#20364,2,#20001,12,"'""why?""\n';")
+hasLocation(#20364,#20027)
+stmt_containers(#20364,#20001)
 #20365=*
-regexpterm(#20365,1,#20364,0,"""why?""
+exprs(#20365,4,#20364,0,"'""why?""\n'")
+hasLocation(#20365,#20111)
+enclosing_stmt(#20365,#20364)
+expr_containers(#20365,#20001)
+literals("""why?""
+","'""why?""\n'",#20365)
+#20366=*
+regexpterm(#20366,1,#20365,0,"""why?""
 ")
-#20366=@"loc,{#10000},13,2,13,9"
-locations_default(#20366,#10000,13,2,13,9)
-hasLocation(#20365,#20366)
-#20367=*
-regexpterm(#20367,14,#20365,0,"""wh")
-#20368=@"loc,{#10000},13,2,13,4"
-locations_default(#20368,#10000,13,2,13,4)
-hasLocation(#20367,#20368)
-regexp_const_value(#20367,"""wh")
-#20369=*
-regexpterm(#20369,10,#20365,1,"y?")
-#20370=@"loc,{#10000},13,5,13,6"
-locations_default(#20370,#10000,13,5,13,6)
-hasLocation(#20369,#20370)
-is_greedy(#20369)
-#20371=*
-regexpterm(#20371,14,#20369,0,"y")
-#20372=@"loc,{#10000},13,5,13,5"
-locations_default(#20372,#10000,13,5,13,5)
-hasLocation(#20371,#20372)
-regexp_const_value(#20371,"y")
-#20373=*
-regexpterm(#20373,14,#20365,2,"""
+#20367=@"loc,{#10000},13,2,13,9"
+locations_default(#20367,#10000,13,2,13,9)
+hasLocation(#20366,#20367)
+#20368=*
+regexpterm(#20368,14,#20366,0,"""wh")
+#20369=@"loc,{#10000},13,2,13,4"
+locations_default(#20369,#10000,13,2,13,4)
+hasLocation(#20368,#20369)
+regexp_const_value(#20368,"""wh")
+#20370=*
+regexpterm(#20370,10,#20366,1,"y?")
+#20371=@"loc,{#10000},13,5,13,6"
+locations_default(#20371,#10000,13,5,13,6)
+hasLocation(#20370,#20371)
+is_greedy(#20370)
+#20372=*
+regexpterm(#20372,14,#20370,0,"y")
+#20373=@"loc,{#10000},13,5,13,5"
+locations_default(#20373,#10000,13,5,13,5)
+hasLocation(#20372,#20373)
+regexp_const_value(#20372,"y")
+#20374=*
+regexpterm(#20374,14,#20366,2,"""
 ")
-#20374=@"loc,{#10000},13,7,13,9"
-locations_default(#20374,#10000,13,7,13,9)
-hasLocation(#20373,#20374)
-regexp_const_value(#20373,"""
+#20375=@"loc,{#10000},13,7,13,9"
+locations_default(#20375,#10000,13,7,13,9)
+hasLocation(#20374,#20375)
+regexp_const_value(#20374,"""
 ")
-#20375=*
-stmts(#20375,2,#20001,13,"/^(need?le)+/gi;")
-hasLocation(#20375,#20029)
-stmt_containers(#20375,#20001)
 #20376=*
-exprs(#20376,5,#20375,0,"/^(need?le)+/gi")
-hasLocation(#20376,#20115)
-enclosing_stmt(#20376,#20375)
-expr_containers(#20376,#20001)
-literals("/^(need?le)+/gi","/^(need?le)+/gi",#20376)
+stmts(#20376,2,#20001,13,"/^(need?le)+/gi;")
+hasLocation(#20376,#20029)
+stmt_containers(#20376,#20001)
 #20377=*
-regexpterm(#20377,1,#20376,0,"^(need?le)+")
-#20378=@"loc,{#10000},14,2,14,12"
-locations_default(#20378,#10000,14,2,14,12)
-hasLocation(#20377,#20378)
-#20379=*
-regexpterm(#20379,2,#20377,0,"^")
-#20380=@"loc,{#10000},14,2,14,2"
-locations_default(#20380,#10000,14,2,14,2)
-hasLocation(#20379,#20380)
-#20381=*
-regexpterm(#20381,9,#20377,1,"(need?le)+")
-#20382=@"loc,{#10000},14,3,14,12"
-locations_default(#20382,#10000,14,3,14,12)
-hasLocation(#20381,#20382)
-is_greedy(#20381)
-#20383=*
-regexpterm(#20383,13,#20381,0,"(need?le)")
-#20384=@"loc,{#10000},14,3,14,11"
-locations_default(#20384,#10000,14,3,14,11)
-hasLocation(#20383,#20384)
-is_capture(#20383,1)
-#20385=*
-regexpterm(#20385,1,#20383,0,"need?le")
-#20386=@"loc,{#10000},14,4,14,10"
-locations_default(#20386,#10000,14,4,14,10)
-hasLocation(#20385,#20386)
-#20387=*
-regexpterm(#20387,14,#20385,0,"nee")
-#20388=@"loc,{#10000},14,4,14,6"
-locations_default(#20388,#10000,14,4,14,6)
-hasLocation(#20387,#20388)
-regexp_const_value(#20387,"nee")
-#20389=*
-regexpterm(#20389,10,#20385,1,"d?")
-#20390=@"loc,{#10000},14,7,14,8"
-locations_default(#20390,#10000,14,7,14,8)
-hasLocation(#20389,#20390)
-is_greedy(#20389)
-#20391=*
-regexpterm(#20391,14,#20389,0,"d")
-#20392=@"loc,{#10000},14,7,14,7"
-locations_default(#20392,#10000,14,7,14,7)
-hasLocation(#20391,#20392)
-regexp_const_value(#20391,"d")
-#20393=*
-regexpterm(#20393,14,#20385,2,"le")
-#20394=@"loc,{#10000},14,9,14,10"
-locations_default(#20394,#10000,14,9,14,10)
-hasLocation(#20393,#20394)
-regexp_const_value(#20393,"le")
-#20395=*
-stmts(#20395,2,#20001,14,"(23);")
-hasLocation(#20395,#20031)
-stmt_containers(#20395,#20001)
+exprs(#20377,5,#20376,0,"/^(need?le)+/gi")
+hasLocation(#20377,#20115)
+enclosing_stmt(#20377,#20376)
+expr_containers(#20377,#20001)
+literals("/^(need?le)+/gi","/^(need?le)+/gi",#20377)
+#20378=*
+regexpterm(#20378,1,#20377,0,"^(need?le)+")
+#20379=@"loc,{#10000},14,2,14,12"
+locations_default(#20379,#10000,14,2,14,12)
+hasLocation(#20378,#20379)
+#20380=*
+regexpterm(#20380,2,#20378,0,"^")
+#20381=@"loc,{#10000},14,2,14,2"
+locations_default(#20381,#10000,14,2,14,2)
+hasLocation(#20380,#20381)
+#20382=*
+regexpterm(#20382,9,#20378,1,"(need?le)+")
+#20383=@"loc,{#10000},14,3,14,12"
+locations_default(#20383,#10000,14,3,14,12)
+hasLocation(#20382,#20383)
+is_greedy(#20382)
+#20384=*
+regexpterm(#20384,13,#20382,0,"(need?le)")
+#20385=@"loc,{#10000},14,3,14,11"
+locations_default(#20385,#10000,14,3,14,11)
+hasLocation(#20384,#20385)
+is_capture(#20384,1)
+#20386=*
+regexpterm(#20386,1,#20384,0,"need?le")
+#20387=@"loc,{#10000},14,4,14,10"
+locations_default(#20387,#10000,14,4,14,10)
+hasLocation(#20386,#20387)
+#20388=*
+regexpterm(#20388,14,#20386,0,"nee")
+#20389=@"loc,{#10000},14,4,14,6"
+locations_default(#20389,#10000,14,4,14,6)
+hasLocation(#20388,#20389)
+regexp_const_value(#20388,"nee")
+#20390=*
+regexpterm(#20390,10,#20386,1,"d?")
+#20391=@"loc,{#10000},14,7,14,8"
+locations_default(#20391,#10000,14,7,14,8)
+hasLocation(#20390,#20391)
+is_greedy(#20390)
+#20392=*
+regexpterm(#20392,14,#20390,0,"d")
+#20393=@"loc,{#10000},14,7,14,7"
+locations_default(#20393,#10000,14,7,14,7)
+hasLocation(#20392,#20393)
+regexp_const_value(#20392,"d")
+#20394=*
+regexpterm(#20394,14,#20386,2,"le")
+#20395=@"loc,{#10000},14,9,14,10"
+locations_default(#20395,#10000,14,9,14,10)
+hasLocation(#20394,#20395)
+regexp_const_value(#20394,"le")
 #20396=*
-exprs(#20396,63,#20395,0,"(23)")
-#20397=@"loc,{#10000},15,1,15,4"
-locations_default(#20397,#10000,15,1,15,4)
-hasLocation(#20396,#20397)
-enclosing_stmt(#20396,#20395)
-expr_containers(#20396,#20001)
-#20398=*
-exprs(#20398,3,#20396,0,"23")
-hasLocation(#20398,#20121)
-enclosing_stmt(#20398,#20395)
-expr_containers(#20398,#20001)
-literals("23","23",#20398)
+stmts(#20396,2,#20001,14,"(23);")
+hasLocation(#20396,#20031)
+stmt_containers(#20396,#20001)
+#20397=*
+exprs(#20397,63,#20396,0,"(23)")
+#20398=@"loc,{#10000},15,1,15,4"
+locations_default(#20398,#10000,15,1,15,4)
+hasLocation(#20397,#20398)
+enclosing_stmt(#20397,#20396)
+expr_containers(#20397,#20001)
 #20399=*
-stmts(#20399,2,#20001,15,"[23, 42, , ""hi"" ];")
-hasLocation(#20399,#20033)
-stmt_containers(#20399,#20001)
+exprs(#20399,3,#20397,0,"23")
+hasLocation(#20399,#20121)
+enclosing_stmt(#20399,#20396)
+expr_containers(#20399,#20001)
+literals("23","23",#20399)
 #20400=*
-exprs(#20400,7,#20399,0,"[23, 42, , ""hi"" ]")
-#20401=@"loc,{#10000},16,1,16,17"
-locations_default(#20401,#10000,16,1,16,17)
-hasLocation(#20400,#20401)
-enclosing_stmt(#20400,#20399)
-expr_containers(#20400,#20001)
-#20402=*
-exprs(#20402,3,#20400,0,"23")
-hasLocation(#20402,#20129)
-enclosing_stmt(#20402,#20399)
-expr_containers(#20402,#20001)
-literals("23","23",#20402)
+stmts(#20400,2,#20001,15,"[23, 42, , ""hi"" ];")
+hasLocation(#20400,#20033)
+stmt_containers(#20400,#20001)
+#20401=*
+exprs(#20401,7,#20400,0,"[23, 42, , ""hi"" ]")
+#20402=@"loc,{#10000},16,1,16,17"
+locations_default(#20402,#10000,16,1,16,17)
+hasLocation(#20401,#20402)
+enclosing_stmt(#20401,#20400)
+expr_containers(#20401,#20001)
 #20403=*
-exprs(#20403,3,#20400,1,"42")
-hasLocation(#20403,#20133)
-enclosing_stmt(#20403,#20399)
+exprs(#20403,3,#20401,0,"23")
+hasLocation(#20403,#20129)
+enclosing_stmt(#20403,#20400)
 expr_containers(#20403,#20001)
-literals("42","42",#20403)
+literals("23","23",#20403)
 #20404=*
-exprs(#20404,4,#20400,3,"""hi""")
-hasLocation(#20404,#20139)
-enclosing_stmt(#20404,#20399)
+exprs(#20404,3,#20401,1,"42")
+hasLocation(#20404,#20133)
+enclosing_stmt(#20404,#20400)
 expr_containers(#20404,#20001)
-literals("hi","""hi""",#20404)
+literals("42","42",#20404)
 #20405=*
-regexpterm(#20405,14,#20404,0,"hi")
-#20406=@"loc,{#10000},16,13,16,14"
-locations_default(#20406,#10000,16,13,16,14)
-hasLocation(#20405,#20406)
-regexp_const_value(#20405,"hi")
-array_size(#20400,4)
-#20407=*
-stmts(#20407,2,#20001,16,"({ x: 2 ... ) {}});")
-#20408=@"loc,{#10000},17,1,21,17"
-locations_default(#20408,#10000,17,1,21,17)
-hasLocation(#20407,#20408)
-stmt_containers(#20407,#20001)
-#20409=*
-exprs(#20409,63,#20407,0,"({ x: 2 ... v) {}})")
-#20410=@"loc,{#10000},17,1,21,16"
-locations_default(#20410,#10000,17,1,21,16)
-hasLocation(#20409,#20410)
-enclosing_stmt(#20409,#20407)
-expr_containers(#20409,#20001)
-#20411=*
-exprs(#20411,8,#20409,0,"{ x: 23 ... (v) {}}")
-#20412=@"loc,{#10000},17,2,21,15"
-locations_default(#20412,#10000,17,2,21,15)
-hasLocation(#20411,#20412)
-enclosing_stmt(#20411,#20407)
-expr_containers(#20411,#20001)
-#20413=*
-properties(#20413,#20411,0,0,"x: 23")
-#20414=@"loc,{#10000},17,4,17,8"
-locations_default(#20414,#10000,17,4,17,8)
-hasLocation(#20413,#20414)
-#20415=*
-exprs(#20415,0,#20413,0,"x")
-hasLocation(#20415,#20149)
-enclosing_stmt(#20415,#20407)
-expr_containers(#20415,#20001)
-literals("x","x",#20415)
+exprs(#20405,4,#20401,3,"""hi""")
+hasLocation(#20405,#20139)
+enclosing_stmt(#20405,#20400)
+expr_containers(#20405,#20001)
+literals("hi","""hi""",#20405)
+#20406=*
+regexpterm(#20406,14,#20405,0,"hi")
+#20407=@"loc,{#10000},16,13,16,14"
+locations_default(#20407,#10000,16,13,16,14)
+hasLocation(#20406,#20407)
+regexp_const_value(#20406,"hi")
+array_size(#20401,4)
+#20408=*
+stmts(#20408,2,#20001,16,"({ x: 2 ... ) {}});")
+#20409=@"loc,{#10000},17,1,21,17"
+locations_default(#20409,#10000,17,1,21,17)
+hasLocation(#20408,#20409)
+stmt_containers(#20408,#20001)
+#20410=*
+exprs(#20410,63,#20408,0,"({ x: 2 ... v) {}})")
+#20411=@"loc,{#10000},17,1,21,16"
+locations_default(#20411,#10000,17,1,21,16)
+hasLocation(#20410,#20411)
+enclosing_stmt(#20410,#20408)
+expr_containers(#20410,#20001)
+#20412=*
+exprs(#20412,8,#20410,0,"{ x: 23 ... (v) {}}")
+#20413=@"loc,{#10000},17,2,21,15"
+locations_default(#20413,#10000,17,2,21,15)
+hasLocation(#20412,#20413)
+enclosing_stmt(#20412,#20408)
+expr_containers(#20412,#20001)
+#20414=*
+properties(#20414,#20412,0,0,"x: 23")
+#20415=@"loc,{#10000},17,4,17,8"
+locations_default(#20415,#10000,17,4,17,8)
+hasLocation(#20414,#20415)
 #20416=*
-exprs(#20416,3,#20413,1,"23")
-hasLocation(#20416,#20153)
-enclosing_stmt(#20416,#20407)
+exprs(#20416,0,#20414,0,"x")
+hasLocation(#20416,#20149)
+enclosing_stmt(#20416,#20408)
 expr_containers(#20416,#20001)
-literals("23","23",#20416)
+literals("x","x",#20416)
 #20417=*
-properties(#20417,#20411,1,0,"y: this")
-#20418=@"loc,{#10000},18,4,18,10"
-locations_default(#20418,#10000,18,4,18,10)
-hasLocation(#20417,#20418)
-#20419=*
-exprs(#20419,0,#20417,0,"y")
-hasLocation(#20419,#20157)
-enclosing_stmt(#20419,#20407)
-expr_containers(#20419,#20001)
-literals("y","y",#20419)
+exprs(#20417,3,#20414,1,"23")
+hasLocation(#20417,#20153)
+enclosing_stmt(#20417,#20408)
+expr_containers(#20417,#20001)
+literals("23","23",#20417)
+#20418=*
+properties(#20418,#20412,1,0,"y: this")
+#20419=@"loc,{#10000},18,4,18,10"
+locations_default(#20419,#10000,18,4,18,10)
+hasLocation(#20418,#20419)
 #20420=*
-exprs(#20420,6,#20417,1,"this")
-hasLocation(#20420,#20161)
-enclosing_stmt(#20420,#20407)
+exprs(#20420,0,#20418,0,"y")
+hasLocation(#20420,#20157)
+enclosing_stmt(#20420,#20408)
 expr_containers(#20420,#20001)
+literals("y","y",#20420)
 #20421=*
-properties(#20421,#20411,2,1,"get o() {}")
-#20422=@"loc,{#10000},19,4,19,13"
-locations_default(#20422,#10000,19,4,19,13)
-hasLocation(#20421,#20422)
-#20423=*
-exprs(#20423,0,#20421,0,"o")
-hasLocation(#20423,#20167)
-enclosing_stmt(#20423,#20407)
-expr_containers(#20423,#20001)
-literals("o","o",#20423)
+exprs(#20421,6,#20418,1,"this")
+hasLocation(#20421,#20161)
+enclosing_stmt(#20421,#20408)
+expr_containers(#20421,#20001)
+bind(#20421,#20325)
+#20422=*
+properties(#20422,#20412,2,1,"get o() {}")
+#20423=@"loc,{#10000},19,4,19,13"
+locations_default(#20423,#10000,19,4,19,13)
+hasLocation(#20422,#20423)
 #20424=*
-exprs(#20424,9,#20421,1,"() {}")
-#20425=@"loc,{#10000},19,9,19,13"
-locations_default(#20425,#10000,19,9,19,13)
-hasLocation(#20424,#20425)
-enclosing_stmt(#20424,#20407)
+exprs(#20424,0,#20422,0,"o")
+hasLocation(#20424,#20167)
+enclosing_stmt(#20424,#20408)
 expr_containers(#20424,#20001)
-#20426=*
-scopes(#20426,1)
-scopenodes(#20424,#20426)
-scopenesting(#20426,#20000)
-#20427=@"var;{arguments};{#20426}"
-variables(#20427,"arguments",#20426)
-is_arguments_object(#20427)
-#20428=*
-stmts(#20428,1,#20424,-2,"{}")
-#20429=@"loc,{#10000},19,12,19,13"
-locations_default(#20429,#10000,19,12,19,13)
-hasLocation(#20428,#20429)
-stmt_containers(#20428,#20424)
+literals("o","o",#20424)
+#20425=*
+exprs(#20425,9,#20422,1,"() {}")
+#20426=@"loc,{#10000},19,9,19,13"
+locations_default(#20426,#10000,19,9,19,13)
+hasLocation(#20425,#20426)
+enclosing_stmt(#20425,#20408)
+expr_containers(#20425,#20001)
+#20427=*
+scopes(#20427,1)
+scopenodes(#20425,#20427)
+scopenesting(#20427,#20000)
+#20428=@"var;{this};{#20427}"
+variables(#20428,"this",#20427)
+#20429=@"var;{arguments};{#20427}"
+variables(#20429,"arguments",#20427)
+is_arguments_object(#20429)
 #20430=*
-properties(#20430,#20411,3,1,"get p() {}")
-#20431=@"loc,{#10000},20,4,20,13"
-locations_default(#20431,#10000,20,4,20,13)
+stmts(#20430,1,#20425,-2,"{}")
+#20431=@"loc,{#10000},19,12,19,13"
+locations_default(#20431,#10000,19,12,19,13)
 hasLocation(#20430,#20431)
+stmt_containers(#20430,#20425)
 #20432=*
-exprs(#20432,0,#20430,0,"p")
-hasLocation(#20432,#20181)
-enclosing_stmt(#20432,#20407)
-expr_containers(#20432,#20001)
-literals("p","p",#20432)
-#20433=*
-exprs(#20433,9,#20430,1,"() {}")
-#20434=@"loc,{#10000},20,9,20,13"
-locations_default(#20434,#10000,20,9,20,13)
-hasLocation(#20433,#20434)
-enclosing_stmt(#20433,#20407)
-expr_containers(#20433,#20001)
+properties(#20432,#20412,3,1,"get p() {}")
+#20433=@"loc,{#10000},20,4,20,13"
+locations_default(#20433,#10000,20,4,20,13)
+hasLocation(#20432,#20433)
+#20434=*
+exprs(#20434,0,#20432,0,"p")
+hasLocation(#20434,#20181)
+enclosing_stmt(#20434,#20408)
+expr_containers(#20434,#20001)
+literals("p","p",#20434)
 #20435=*
-scopes(#20435,1)
-scopenodes(#20433,#20435)
-scopenesting(#20435,#20000)
-#20436=@"var;{arguments};{#20435}"
-variables(#20436,"arguments",#20435)
-is_arguments_object(#20436)
+exprs(#20435,9,#20432,1,"() {}")
+#20436=@"loc,{#10000},20,9,20,13"
+locations_default(#20436,#10000,20,9,20,13)
+hasLocation(#20435,#20436)
+enclosing_stmt(#20435,#20408)
+expr_containers(#20435,#20001)
 #20437=*
-stmts(#20437,1,#20433,-2,"{}")
-#20438=@"loc,{#10000},20,12,20,13"
-locations_default(#20438,#10000,20,12,20,13)
-hasLocation(#20437,#20438)
-stmt_containers(#20437,#20433)
-#20439=*
-properties(#20439,#20411,4,2,"set p(v) {}")
-#20440=@"loc,{#10000},21,4,21,14"
-locations_default(#20440,#10000,21,4,21,14)
-hasLocation(#20439,#20440)
-#20441=*
-exprs(#20441,0,#20439,0,"p")
-hasLocation(#20441,#20195)
-enclosing_stmt(#20441,#20407)
-expr_containers(#20441,#20001)
-literals("p","p",#20441)
+scopes(#20437,1)
+scopenodes(#20435,#20437)
+scopenesting(#20437,#20000)
+#20438=@"var;{this};{#20437}"
+variables(#20438,"this",#20437)
+#20439=@"var;{arguments};{#20437}"
+variables(#20439,"arguments",#20437)
+is_arguments_object(#20439)
+#20440=*
+stmts(#20440,1,#20435,-2,"{}")
+#20441=@"loc,{#10000},20,12,20,13"
+locations_default(#20441,#10000,20,12,20,13)
+hasLocation(#20440,#20441)
+stmt_containers(#20440,#20435)
 #20442=*
-exprs(#20442,9,#20439,1,"(v) {}")
-#20443=@"loc,{#10000},21,9,21,14"
-locations_default(#20443,#10000,21,9,21,14)
+properties(#20442,#20412,4,2,"set p(v) {}")
+#20443=@"loc,{#10000},21,4,21,14"
+locations_default(#20443,#10000,21,4,21,14)
 hasLocation(#20442,#20443)
-enclosing_stmt(#20442,#20407)
-expr_containers(#20442,#20001)
 #20444=*
-scopes(#20444,1)
-scopenodes(#20442,#20444)
-scopenesting(#20444,#20000)
-#20445=@"var;{v};{#20444}"
-variables(#20445,"v",#20444)
-#20446=*
-exprs(#20446,78,#20442,0,"v")
-hasLocation(#20446,#20199)
-expr_containers(#20446,#20442)
-literals("v","v",#20446)
-decl(#20446,#20445)
-#20447=@"var;{arguments};{#20444}"
-variables(#20447,"arguments",#20444)
-is_arguments_object(#20447)
-#20448=*
-stmts(#20448,1,#20442,-2,"{}")
-#20449=@"loc,{#10000},21,13,21,14"
-locations_default(#20449,#10000,21,13,21,14)
-hasLocation(#20448,#20449)
-stmt_containers(#20448,#20442)
+exprs(#20444,0,#20442,0,"p")
+hasLocation(#20444,#20195)
+enclosing_stmt(#20444,#20408)
+expr_containers(#20444,#20001)
+literals("p","p",#20444)
+#20445=*
+exprs(#20445,9,#20442,1,"(v) {}")
+#20446=@"loc,{#10000},21,9,21,14"
+locations_default(#20446,#10000,21,9,21,14)
+hasLocation(#20445,#20446)
+enclosing_stmt(#20445,#20408)
+expr_containers(#20445,#20001)
+#20447=*
+scopes(#20447,1)
+scopenodes(#20445,#20447)
+scopenesting(#20447,#20000)
+#20448=@"var;{this};{#20447}"
+variables(#20448,"this",#20447)
+#20449=@"var;{v};{#20447}"
+variables(#20449,"v",#20447)
 #20450=*
-stmts(#20450,2,#20001,17,"new Array;")
-hasLocation(#20450,#20045)
-stmt_containers(#20450,#20001)
-#20451=*
-exprs(#20451,12,#20450,0,"new Array")
-#20452=@"loc,{#10000},22,1,22,9"
-locations_default(#20452,#10000,22,1,22,9)
-hasLocation(#20451,#20452)
-enclosing_stmt(#20451,#20450)
-expr_containers(#20451,#20001)
-#20453=*
-exprs(#20453,79,#20451,-1,"Array")
-hasLocation(#20453,#20215)
-enclosing_stmt(#20453,#20450)
-expr_containers(#20453,#20001)
-literals("Array","Array",#20453)
-#20454=@"var;{Array};{#20000}"
-variables(#20454,"Array",#20000)
-bind(#20453,#20454)
+exprs(#20450,78,#20445,0,"v")
+hasLocation(#20450,#20199)
+expr_containers(#20450,#20445)
+literals("v","v",#20450)
+decl(#20450,#20449)
+#20451=@"var;{arguments};{#20447}"
+variables(#20451,"arguments",#20447)
+is_arguments_object(#20451)
+#20452=*
+stmts(#20452,1,#20445,-2,"{}")
+#20453=@"loc,{#10000},21,13,21,14"
+locations_default(#20453,#10000,21,13,21,14)
+hasLocation(#20452,#20453)
+stmt_containers(#20452,#20445)
+#20454=*
+stmts(#20454,2,#20001,17,"new Array;")
+hasLocation(#20454,#20045)
+stmt_containers(#20454,#20001)
 #20455=*
-stmts(#20455,2,#20001,18,"new Object();")
-hasLocation(#20455,#20047)
-stmt_containers(#20455,#20001)
-#20456=*
-exprs(#20456,12,#20455,0,"new Object()")
-#20457=@"loc,{#10000},23,1,23,12"
-locations_default(#20457,#10000,23,1,23,12)
-hasLocation(#20456,#20457)
-enclosing_stmt(#20456,#20455)
-expr_containers(#20456,#20001)
-#20458=*
-exprs(#20458,79,#20456,-1,"Object")
-hasLocation(#20458,#20221)
-enclosing_stmt(#20458,#20455)
-expr_containers(#20458,#20001)
-literals("Object","Object",#20458)
-#20459=@"var;{Object};{#20000}"
-variables(#20459,"Object",#20000)
-bind(#20458,#20459)
+exprs(#20455,12,#20454,0,"new Array")
+#20456=@"loc,{#10000},22,1,22,9"
+locations_default(#20456,#10000,22,1,22,9)
+hasLocation(#20455,#20456)
+enclosing_stmt(#20455,#20454)
+expr_containers(#20455,#20001)
+#20457=*
+exprs(#20457,79,#20455,-1,"Array")
+hasLocation(#20457,#20215)
+enclosing_stmt(#20457,#20454)
+expr_containers(#20457,#20001)
+literals("Array","Array",#20457)
+#20458=@"var;{Array};{#20000}"
+variables(#20458,"Array",#20000)
+bind(#20457,#20458)
+#20459=*
+stmts(#20459,2,#20001,18,"new Object();")
+hasLocation(#20459,#20047)
+stmt_containers(#20459,#20001)
 #20460=*
-stmts(#20460,2,#20001,19,"new String(""hi"");")
-hasLocation(#20460,#20049)
-stmt_containers(#20460,#20001)
-#20461=*
-exprs(#20461,12,#20460,0,"new String(""hi"")")
-#20462=@"loc,{#10000},24,1,24,16"
-locations_default(#20462,#10000,24,1,24,16)
-hasLocation(#20461,#20462)
-enclosing_stmt(#20461,#20460)
-expr_containers(#20461,#20001)
-#20463=*
-exprs(#20463,79,#20461,-1,"String")
-hasLocation(#20463,#20231)
-enclosing_stmt(#20463,#20460)
-expr_containers(#20463,#20001)
-literals("String","String",#20463)
-#20464=@"var;{String};{#20000}"
-variables(#20464,"String",#20000)
-bind(#20463,#20464)
+exprs(#20460,12,#20459,0,"new Object()")
+#20461=@"loc,{#10000},23,1,23,12"
+locations_default(#20461,#10000,23,1,23,12)
+hasLocation(#20460,#20461)
+enclosing_stmt(#20460,#20459)
+expr_containers(#20460,#20001)
+#20462=*
+exprs(#20462,79,#20460,-1,"Object")
+hasLocation(#20462,#20221)
+enclosing_stmt(#20462,#20459)
+expr_containers(#20462,#20001)
+literals("Object","Object",#20462)
+#20463=@"var;{Object};{#20000}"
+variables(#20463,"Object",#20000)
+bind(#20462,#20463)
+#20464=*
+stmts(#20464,2,#20001,19,"new String(""hi"");")
+hasLocation(#20464,#20049)
+stmt_containers(#20464,#20001)
 #20465=*
-exprs(#20465,4,#20461,0,"""hi""")
-hasLocation(#20465,#20235)
-enclosing_stmt(#20465,#20460)
+exprs(#20465,12,#20464,0,"new String(""hi"")")
+#20466=@"loc,{#10000},24,1,24,16"
+locations_default(#20466,#10000,24,1,24,16)
+hasLocation(#20465,#20466)
+enclosing_stmt(#20465,#20464)
 expr_containers(#20465,#20001)
-literals("hi","""hi""",#20465)
-#20466=*
-regexpterm(#20466,14,#20465,0,"hi")
-#20467=@"loc,{#10000},24,13,24,14"
-locations_default(#20467,#10000,24,13,24,14)
-hasLocation(#20466,#20467)
-regexp_const_value(#20466,"hi")
-#20468=*
-stmts(#20468,2,#20001,20,"String("""");")
-hasLocation(#20468,#20051)
-stmt_containers(#20468,#20001)
+#20467=*
+exprs(#20467,79,#20465,-1,"String")
+hasLocation(#20467,#20231)
+enclosing_stmt(#20467,#20464)
+expr_containers(#20467,#20001)
+literals("String","String",#20467)
+#20468=@"var;{String};{#20000}"
+variables(#20468,"String",#20000)
+bind(#20467,#20468)
 #20469=*
-exprs(#20469,13,#20468,0,"String("""")")
-#20470=@"loc,{#10000},25,1,25,10"
-locations_default(#20470,#10000,25,1,25,10)
-hasLocation(#20469,#20470)
-enclosing_stmt(#20469,#20468)
+exprs(#20469,4,#20465,0,"""hi""")
+hasLocation(#20469,#20235)
+enclosing_stmt(#20469,#20464)
 expr_containers(#20469,#20001)
-#20471=*
-exprs(#20471,79,#20469,-1,"String")
-hasLocation(#20471,#20241)
-enclosing_stmt(#20471,#20468)
-expr_containers(#20471,#20001)
-literals("String","String",#20471)
-bind(#20471,#20464)
+literals("hi","""hi""",#20469)
+#20470=*
+regexpterm(#20470,14,#20469,0,"hi")
+#20471=@"loc,{#10000},24,13,24,14"
+locations_default(#20471,#10000,24,13,24,14)
+hasLocation(#20470,#20471)
+regexp_const_value(#20470,"hi")
 #20472=*
-exprs(#20472,4,#20469,0,"""""")
-hasLocation(#20472,#20245)
-enclosing_stmt(#20472,#20468)
-expr_containers(#20472,#20001)
-literals("","""""",#20472)
+stmts(#20472,2,#20001,20,"String("""");")
+hasLocation(#20472,#20051)
+stmt_containers(#20472,#20001)
 #20473=*
-regexpterm(#20473,1,#20472,0,"")
-#20474=@"loc,{#10000},25,9,25,8"
-locations_default(#20474,#10000,25,9,25,8)
+exprs(#20473,13,#20472,0,"String("""")")
+#20474=@"loc,{#10000},25,1,25,10"
+locations_default(#20474,#10000,25,1,25,10)
 hasLocation(#20473,#20474)
+enclosing_stmt(#20473,#20472)
+expr_containers(#20473,#20001)
 #20475=*
-stmts(#20475,2,#20001,21,"Object.create({});")
-hasLocation(#20475,#20053)
-stmt_containers(#20475,#20001)
+exprs(#20475,79,#20473,-1,"String")
+hasLocation(#20475,#20241)
+enclosing_stmt(#20475,#20472)
+expr_containers(#20475,#20001)
+literals("String","String",#20475)
+bind(#20475,#20468)
 #20476=*
-exprs(#20476,13,#20475,0,"Object.create({})")
-#20477=@"loc,{#10000},26,1,26,17"
-locations_default(#20477,#10000,26,1,26,17)
-hasLocation(#20476,#20477)
-enclosing_stmt(#20476,#20475)
+exprs(#20476,4,#20473,0,"""""")
+hasLocation(#20476,#20245)
+enclosing_stmt(#20476,#20472)
 expr_containers(#20476,#20001)
-#20478=*
-exprs(#20478,14,#20476,-1,"Object.create")
-#20479=@"loc,{#10000},26,1,26,13"
-locations_default(#20479,#10000,26,1,26,13)
-hasLocation(#20478,#20479)
-enclosing_stmt(#20478,#20475)
-expr_containers(#20478,#20001)
+literals("","""""",#20476)
+#20477=*
+regexpterm(#20477,1,#20476,0,"")
+#20478=@"loc,{#10000},25,9,25,8"
+locations_default(#20478,#10000,25,9,25,8)
+hasLocation(#20477,#20478)
+#20479=*
+stmts(#20479,2,#20001,21,"Object.create({});")
+hasLocation(#20479,#20053)
+stmt_containers(#20479,#20001)
 #20480=*
-exprs(#20480,79,#20478,0,"Object")
-hasLocation(#20480,#20251)
-enclosing_stmt(#20480,#20475)
+exprs(#20480,13,#20479,0,"Object.create({})")
+#20481=@"loc,{#10000},26,1,26,17"
+locations_default(#20481,#10000,26,1,26,17)
+hasLocation(#20480,#20481)
+enclosing_stmt(#20480,#20479)
 expr_containers(#20480,#20001)
-literals("Object","Object",#20480)
-bind(#20480,#20459)
-#20481=*
-exprs(#20481,0,#20478,1,"create")
-hasLocation(#20481,#20255)
-enclosing_stmt(#20481,#20475)
-expr_containers(#20481,#20001)
-literals("create","create",#20481)
 #20482=*
-exprs(#20482,8,#20476,0,"{}")
-#20483=@"loc,{#10000},26,15,26,16"
-locations_default(#20483,#10000,26,15,26,16)
+exprs(#20482,14,#20480,-1,"Object.create")
+#20483=@"loc,{#10000},26,1,26,13"
+locations_default(#20483,#10000,26,1,26,13)
 hasLocation(#20482,#20483)
-enclosing_stmt(#20482,#20475)
+enclosing_stmt(#20482,#20479)
 expr_containers(#20482,#20001)
 #20484=*
-stmts(#20484,2,#20001,22,"String[ ... rse()];")
-hasLocation(#20484,#20055)
-stmt_containers(#20484,#20001)
+exprs(#20484,79,#20482,0,"Object")
+hasLocation(#20484,#20251)
+enclosing_stmt(#20484,#20479)
+expr_containers(#20484,#20001)
+literals("Object","Object",#20484)
+bind(#20484,#20463)
 #20485=*
-exprs(#20485,15,#20484,0,"String[ ... erse()]")
-#20486=@"loc,{#10000},27,1,27,29"
-locations_default(#20486,#10000,27,1,27,29)
-hasLocation(#20485,#20486)
-enclosing_stmt(#20485,#20484)
+exprs(#20485,0,#20482,1,"create")
+hasLocation(#20485,#20255)
+enclosing_stmt(#20485,#20479)
 expr_containers(#20485,#20001)
-#20487=*
-exprs(#20487,79,#20485,0,"String")
-hasLocation(#20487,#20267)
-enclosing_stmt(#20487,#20484)
-expr_containers(#20487,#20001)
-literals("String","String",#20487)
-bind(#20487,#20464)
+literals("create","create",#20485)
+#20486=*
+exprs(#20486,8,#20480,0,"{}")
+#20487=@"loc,{#10000},26,15,26,16"
+locations_default(#20487,#10000,26,15,26,16)
+hasLocation(#20486,#20487)
+enclosing_stmt(#20486,#20479)
+expr_containers(#20486,#20001)
 #20488=*
-exprs(#20488,13,#20485,1,"'epytot ... verse()")
-#20489=@"loc,{#10000},27,8,27,28"
-locations_default(#20489,#10000,27,8,27,28)
-hasLocation(#20488,#20489)
-enclosing_stmt(#20488,#20484)
-expr_containers(#20488,#20001)
-#20490=*
-exprs(#20490,14,#20488,-1,"'epytotorp'.reverse")
-#20491=@"loc,{#10000},27,8,27,26"
-locations_default(#20491,#10000,27,8,27,26)
-hasLocation(#20490,#20491)
-enclosing_stmt(#20490,#20484)
-expr_containers(#20490,#20001)
+stmts(#20488,2,#20001,22,"String[ ... rse()];")
+hasLocation(#20488,#20055)
+stmt_containers(#20488,#20001)
+#20489=*
+exprs(#20489,15,#20488,0,"String[ ... erse()]")
+#20490=@"loc,{#10000},27,1,27,29"
+locations_default(#20490,#10000,27,1,27,29)
+hasLocation(#20489,#20490)
+enclosing_stmt(#20489,#20488)
+expr_containers(#20489,#20001)
+#20491=*
+exprs(#20491,79,#20489,0,"String")
+hasLocation(#20491,#20267)
+enclosing_stmt(#20491,#20488)
+expr_containers(#20491,#20001)
+literals("String","String",#20491)
+bind(#20491,#20468)
 #20492=*
-exprs(#20492,4,#20490,0,"'epytotorp'")
-hasLocation(#20492,#20271)
-enclosing_stmt(#20492,#20484)
+exprs(#20492,13,#20489,1,"'epytot ... verse()")
+#20493=@"loc,{#10000},27,8,27,28"
+locations_default(#20493,#10000,27,8,27,28)
+hasLocation(#20492,#20493)
+enclosing_stmt(#20492,#20488)
 expr_containers(#20492,#20001)
-literals("epytotorp","'epytotorp'",#20492)
-#20493=*
-regexpterm(#20493,14,#20492,0,"epytotorp")
-#20494=@"loc,{#10000},27,9,27,17"
-locations_default(#20494,#10000,27,9,27,17)
-hasLocation(#20493,#20494)
-regexp_const_value(#20493,"epytotorp")
-#20495=*
-exprs(#20495,0,#20490,1,"reverse")
-hasLocation(#20495,#20275)
-enclosing_stmt(#20495,#20484)
-expr_containers(#20495,#20001)
-literals("reverse","reverse",#20495)
+#20494=*
+exprs(#20494,14,#20492,-1,"'epytotorp'.reverse")
+#20495=@"loc,{#10000},27,8,27,26"
+locations_default(#20495,#10000,27,8,27,26)
+hasLocation(#20494,#20495)
+enclosing_stmt(#20494,#20488)
+expr_containers(#20494,#20001)
 #20496=*
-stmts(#20496,2,#20001,23,"[,,];")
-hasLocation(#20496,#20057)
-stmt_containers(#20496,#20001)
+exprs(#20496,4,#20494,0,"'epytotorp'")
+hasLocation(#20496,#20271)
+enclosing_stmt(#20496,#20488)
+expr_containers(#20496,#20001)
+literals("epytotorp","'epytotorp'",#20496)
 #20497=*
-exprs(#20497,7,#20496,0,"[,,]")
-#20498=@"loc,{#10000},28,1,28,4"
-locations_default(#20498,#10000,28,1,28,4)
+regexpterm(#20497,14,#20496,0,"epytotorp")
+#20498=@"loc,{#10000},27,9,27,17"
+locations_default(#20498,#10000,27,9,27,17)
 hasLocation(#20497,#20498)
-enclosing_stmt(#20497,#20496)
-expr_containers(#20497,#20001)
-array_size(#20497,2)
+regexp_const_value(#20497,"epytotorp")
 #20499=*
-stmts(#20499,2,#20001,24,"[1,];")
-hasLocation(#20499,#20059)
-stmt_containers(#20499,#20001)
+exprs(#20499,0,#20494,1,"reverse")
+hasLocation(#20499,#20275)
+enclosing_stmt(#20499,#20488)
+expr_containers(#20499,#20001)
+literals("reverse","reverse",#20499)
 #20500=*
-exprs(#20500,7,#20499,0,"[1,]")
-#20501=@"loc,{#10000},29,1,29,4"
-locations_default(#20501,#10000,29,1,29,4)
-hasLocation(#20500,#20501)
-enclosing_stmt(#20500,#20499)
-expr_containers(#20500,#20001)
-#20502=*
-exprs(#20502,3,#20500,0,"1")
-hasLocation(#20502,#20297)
-enclosing_stmt(#20502,#20499)
-expr_containers(#20502,#20001)
-literals("1","1",#20502)
-array_size(#20500,1)
+stmts(#20500,2,#20001,23,"[,,];")
+hasLocation(#20500,#20057)
+stmt_containers(#20500,#20001)
+#20501=*
+exprs(#20501,7,#20500,0,"[,,]")
+#20502=@"loc,{#10000},28,1,28,4"
+locations_default(#20502,#10000,28,1,28,4)
+hasLocation(#20501,#20502)
+enclosing_stmt(#20501,#20500)
+expr_containers(#20501,#20001)
+array_size(#20501,2)
 #20503=*
-stmts(#20503,2,#20001,25,"({ z: 56, });")
-hasLocation(#20503,#20061)
+stmts(#20503,2,#20001,24,"[1,];")
+hasLocation(#20503,#20059)
 stmt_containers(#20503,#20001)
 #20504=*
-exprs(#20504,63,#20503,0,"({ z: 56, })")
-#20505=@"loc,{#10000},30,1,30,12"
-locations_default(#20505,#10000,30,1,30,12)
+exprs(#20504,7,#20503,0,"[1,]")
+#20505=@"loc,{#10000},29,1,29,4"
+locations_default(#20505,#10000,29,1,29,4)
 hasLocation(#20504,#20505)
 enclosing_stmt(#20504,#20503)
 expr_containers(#20504,#20001)
 #20506=*
-exprs(#20506,8,#20504,0,"{ z: 56, }")
-#20507=@"loc,{#10000},30,2,30,11"
-locations_default(#20507,#10000,30,2,30,11)
-hasLocation(#20506,#20507)
+exprs(#20506,3,#20504,0,"1")
+hasLocation(#20506,#20297)
 enclosing_stmt(#20506,#20503)
 expr_containers(#20506,#20001)
+literals("1","1",#20506)
+array_size(#20504,1)
+#20507=*
+stmts(#20507,2,#20001,25,"({ z: 56, });")
+hasLocation(#20507,#20061)
+stmt_containers(#20507,#20001)
 #20508=*
-properties(#20508,#20506,0,0,"z: 56")
-#20509=@"loc,{#10000},30,4,30,8"
-locations_default(#20509,#10000,30,4,30,8)
+exprs(#20508,63,#20507,0,"({ z: 56, })")
+#20509=@"loc,{#10000},30,1,30,12"
+locations_default(#20509,#10000,30,1,30,12)
 hasLocation(#20508,#20509)
+enclosing_stmt(#20508,#20507)
+expr_containers(#20508,#20001)
 #20510=*
-exprs(#20510,0,#20508,0,"z")
-hasLocation(#20510,#20309)
-enclosing_stmt(#20510,#20503)
+exprs(#20510,8,#20508,0,"{ z: 56, }")
+#20511=@"loc,{#10000},30,2,30,11"
+locations_default(#20511,#10000,30,2,30,11)
+hasLocation(#20510,#20511)
+enclosing_stmt(#20510,#20507)
 expr_containers(#20510,#20001)
-literals("z","z",#20510)
-#20511=*
-exprs(#20511,3,#20508,1,"56")
-hasLocation(#20511,#20313)
-enclosing_stmt(#20511,#20503)
-expr_containers(#20511,#20001)
-literals("56","56",#20511)
 #20512=*
-entry_cfg_node(#20512,#20001)
-#20513=@"loc,{#10000},1,1,1,0"
-locations_default(#20513,#10000,1,1,1,0)
+properties(#20512,#20510,0,0,"z: 56")
+#20513=@"loc,{#10000},30,4,30,8"
+locations_default(#20513,#10000,30,4,30,8)
 hasLocation(#20512,#20513)
 #20514=*
-exit_cfg_node(#20514,#20001)
-hasLocation(#20514,#20323)
+exprs(#20514,0,#20512,0,"z")
+hasLocation(#20514,#20309)
+enclosing_stmt(#20514,#20507)
+expr_containers(#20514,#20001)
+literals("z","z",#20514)
+#20515=*
+exprs(#20515,3,#20512,1,"56")
+hasLocation(#20515,#20313)
+enclosing_stmt(#20515,#20507)
+expr_containers(#20515,#20001)
+literals("56","56",#20515)
+#20516=*
+entry_cfg_node(#20516,#20001)
+#20517=@"loc,{#10000},1,1,1,0"
+locations_default(#20517,#10000,1,1,1,0)
+hasLocation(#20516,#20517)
+#20518=*
+exit_cfg_node(#20518,#20001)
+hasLocation(#20518,#20323)
+successor(#20507,#20508)
+successor(#20508,#20510)
+successor(#20510,#20514)
+successor(#20515,#20512)
+successor(#20514,#20515)
+successor(#20512,#20518)
 successor(#20503,#20504)
 successor(#20504,#20506)
-successor(#20506,#20510)
-successor(#20511,#20508)
-successor(#20510,#20511)
-successor(#20508,#20514)
-successor(#20499,#20500)
-successor(#20500,#20502)
-successor(#20502,#20503)
-successor(#20496,#20497)
-successor(#20497,#20499)
-successor(#20484,#20487)
-successor(#20495,#20490)
-successor(#20492,#20495)
-successor(#20490,#20488)
-successor(#20488,#20485)
-successor(#20487,#20492)
-successor(#20485,#20496)
-successor(#20475,#20480)
-successor(#20482,#20476)
-successor(#20481,#20478)
-successor(#20480,#20481)
-successor(#20478,#20482)
-successor(#20476,#20484)
-successor(#20468,#20471)
-successor(#20472,#20469)
-successor(#20471,#20472)
-successor(#20469,#20475)
-successor(#20460,#20463)
-successor(#20465,#20461)
-successor(#20463,#20465)
-successor(#20461,#20468)
-successor(#20455,#20458)
-successor(#20458,#20456)
-successor(#20456,#20460)
-successor(#20450,#20453)
-successor(#20453,#20451)
-successor(#20451,#20455)
-successor(#20407,#20409)
-successor(#20409,#20411)
-successor(#20411,#20415)
-successor(#20442,#20439)
-#20515=*
-entry_cfg_node(#20515,#20442)
-#20516=@"loc,{#10000},21,9,21,8"
-locations_default(#20516,#10000,21,9,21,8)
-hasLocation(#20515,#20516)
-#20517=*
-exit_cfg_node(#20517,#20442)
-#20518=@"loc,{#10000},21,15,21,14"
-locations_default(#20518,#10000,21,15,21,14)
-hasLocation(#20517,#20518)
-successor(#20448,#20517)
-successor(#20446,#20448)
-successor(#20515,#20446)
-successor(#20441,#20442)
-successor(#20439,#20450)
-successor(#20433,#20430)
+successor(#20506,#20507)
+successor(#20500,#20501)
+successor(#20501,#20503)
+successor(#20488,#20491)
+successor(#20499,#20494)
+successor(#20496,#20499)
+successor(#20494,#20492)
+successor(#20492,#20489)
+successor(#20491,#20496)
+successor(#20489,#20500)
+successor(#20479,#20484)
+successor(#20486,#20480)
+successor(#20485,#20482)
+successor(#20484,#20485)
+successor(#20482,#20486)
+successor(#20480,#20488)
+successor(#20472,#20475)
+successor(#20476,#20473)
+successor(#20475,#20476)
+successor(#20473,#20479)
+successor(#20464,#20467)
+successor(#20469,#20465)
+successor(#20467,#20469)
+successor(#20465,#20472)
+successor(#20459,#20462)
+successor(#20462,#20460)
+successor(#20460,#20464)
+successor(#20454,#20457)
+successor(#20457,#20455)
+successor(#20455,#20459)
+successor(#20408,#20410)
+successor(#20410,#20412)
+successor(#20412,#20416)
+successor(#20445,#20442)
 #20519=*
-entry_cfg_node(#20519,#20433)
-#20520=@"loc,{#10000},20,9,20,8"
-locations_default(#20520,#10000,20,9,20,8)
+entry_cfg_node(#20519,#20445)
+#20520=@"loc,{#10000},21,9,21,8"
+locations_default(#20520,#10000,21,9,21,8)
 hasLocation(#20519,#20520)
 #20521=*
-exit_cfg_node(#20521,#20433)
-#20522=@"loc,{#10000},20,14,20,13"
-locations_default(#20522,#10000,20,14,20,13)
+exit_cfg_node(#20521,#20445)
+#20522=@"loc,{#10000},21,15,21,14"
+locations_default(#20522,#10000,21,15,21,14)
 hasLocation(#20521,#20522)
-successor(#20437,#20521)
-successor(#20519,#20437)
-successor(#20432,#20433)
-successor(#20430,#20441)
-successor(#20424,#20421)
+successor(#20452,#20521)
+successor(#20450,#20452)
+successor(#20519,#20450)
+successor(#20444,#20445)
+successor(#20442,#20454)
+successor(#20435,#20432)
 #20523=*
-entry_cfg_node(#20523,#20424)
-#20524=@"loc,{#10000},19,9,19,8"
-locations_default(#20524,#10000,19,9,19,8)
+entry_cfg_node(#20523,#20435)
+#20524=@"loc,{#10000},20,9,20,8"
+locations_default(#20524,#10000,20,9,20,8)
 hasLocation(#20523,#20524)
 #20525=*
-exit_cfg_node(#20525,#20424)
-#20526=@"loc,{#10000},19,14,19,13"
-locations_default(#20526,#10000,19,14,19,13)
+exit_cfg_node(#20525,#20435)
+#20526=@"loc,{#10000},20,14,20,13"
+locations_default(#20526,#10000,20,14,20,13)
 hasLocation(#20525,#20526)
-successor(#20428,#20525)
-successor(#20523,#20428)
-successor(#20423,#20424)
-successor(#20421,#20432)
-successor(#20420,#20417)
-successor(#20419,#20420)
-successor(#20417,#20423)
-successor(#20416,#20413)
-successor(#20415,#20416)
-successor(#20413,#20419)
-successor(#20399,#20400)
-successor(#20400,#20402)
-successor(#20404,#20407)
+successor(#20440,#20525)
+successor(#20523,#20440)
+successor(#20434,#20435)
+successor(#20432,#20444)
+successor(#20425,#20422)
+#20527=*
+entry_cfg_node(#20527,#20425)
+#20528=@"loc,{#10000},19,9,19,8"
+locations_default(#20528,#10000,19,9,19,8)
+hasLocation(#20527,#20528)
+#20529=*
+exit_cfg_node(#20529,#20425)
+#20530=@"loc,{#10000},19,14,19,13"
+locations_default(#20530,#10000,19,14,19,13)
+hasLocation(#20529,#20530)
+successor(#20430,#20529)
+successor(#20527,#20430)
+successor(#20424,#20425)
+successor(#20422,#20434)
+successor(#20421,#20418)
+successor(#20420,#20421)
+successor(#20418,#20424)
+successor(#20417,#20414)
+successor(#20416,#20417)
+successor(#20414,#20420)
+successor(#20400,#20401)
+successor(#20401,#20403)
+successor(#20405,#20408)
+successor(#20404,#20405)
 successor(#20403,#20404)
-successor(#20402,#20403)
-successor(#20395,#20396)
-successor(#20396,#20398)
-successor(#20398,#20399)
-successor(#20375,#20376)
-successor(#20376,#20395)
-successor(#20363,#20364)
-successor(#20364,#20375)
-successor(#20351,#20352)
-successor(#20352,#20363)
-successor(#20347,#20348)
-successor(#20348,#20351)
-successor(#20343,#20344)
-successor(#20344,#20347)
-successor(#20341,#20342)
+successor(#20396,#20397)
+successor(#20397,#20399)
+successor(#20399,#20400)
+successor(#20376,#20377)
+successor(#20377,#20396)
+successor(#20364,#20365)
+successor(#20365,#20376)
+successor(#20352,#20353)
+successor(#20353,#20364)
+successor(#20348,#20349)
+successor(#20349,#20352)
+successor(#20344,#20345)
+successor(#20345,#20348)
 successor(#20342,#20343)
-successor(#20339,#20340)
+successor(#20343,#20344)
 successor(#20340,#20341)
-successor(#20337,#20338)
+successor(#20341,#20342)
 successor(#20338,#20339)
-successor(#20335,#20336)
+successor(#20339,#20340)
 successor(#20336,#20337)
-successor(#20333,#20334)
+successor(#20337,#20338)
 successor(#20334,#20335)
-successor(#20331,#20332)
+successor(#20335,#20336)
 successor(#20332,#20333)
-successor(#20329,#20330)
+successor(#20333,#20334)
 successor(#20330,#20331)
-successor(#20327,#20328)
+successor(#20331,#20332)
 successor(#20328,#20329)
-successor(#20325,#20326)
+successor(#20329,#20330)
 successor(#20326,#20327)
-successor(#20512,#20325)
+successor(#20327,#20328)
+successor(#20516,#20326)
 numlines(#10000,30,30,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/exprs/output/trap/regexp.js.trap b/javascript/extractor/tests/exprs/output/trap/regexp.js.trap
index 3b58a28545b..7a1b12cd130 100644
--- a/javascript/extractor/tests/exprs/output/trap/regexp.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/regexp.js.trap
@@ -722,1397 +722,1399 @@ toplevels(#20001,0)
 #20268=@"loc,{#10000},1,1,44,60"
 locations_default(#20268,#10000,1,1,44,60)
 hasLocation(#20001,#20268)
-#20269=*
-stmts(#20269,2,#20001,0,"/t/;")
-hasLocation(#20269,#20003)
-stmt_containers(#20269,#20001)
+#20269=@"var;{this};{#20000}"
+variables(#20269,"this",#20000)
 #20270=*
-exprs(#20270,5,#20269,0,"/t/")
-hasLocation(#20270,#20091)
-enclosing_stmt(#20270,#20269)
-expr_containers(#20270,#20001)
-literals("/t/","/t/",#20270)
+stmts(#20270,2,#20001,0,"/t/;")
+hasLocation(#20270,#20003)
+stmt_containers(#20270,#20001)
 #20271=*
-regexpterm(#20271,14,#20270,0,"t")
-#20272=@"loc,{#10000},1,2,1,2"
-locations_default(#20272,#10000,1,2,1,2)
-hasLocation(#20271,#20272)
-regexp_const_value(#20271,"t")
-#20273=*
-stmts(#20273,2,#20001,1,"/foo|bar/;")
-hasLocation(#20273,#20005)
-stmt_containers(#20273,#20001)
+exprs(#20271,5,#20270,0,"/t/")
+hasLocation(#20271,#20091)
+enclosing_stmt(#20271,#20270)
+expr_containers(#20271,#20001)
+literals("/t/","/t/",#20271)
+#20272=*
+regexpterm(#20272,14,#20271,0,"t")
+#20273=@"loc,{#10000},1,2,1,2"
+locations_default(#20273,#10000,1,2,1,2)
+hasLocation(#20272,#20273)
+regexp_const_value(#20272,"t")
 #20274=*
-exprs(#20274,5,#20273,0,"/foo|bar/")
-hasLocation(#20274,#20095)
-enclosing_stmt(#20274,#20273)
-expr_containers(#20274,#20001)
-literals("/foo|bar/","/foo|bar/",#20274)
+stmts(#20274,2,#20001,1,"/foo|bar/;")
+hasLocation(#20274,#20005)
+stmt_containers(#20274,#20001)
 #20275=*
-regexpterm(#20275,0,#20274,0,"foo|bar")
-#20276=@"loc,{#10000},2,2,2,8"
-locations_default(#20276,#10000,2,2,2,8)
-hasLocation(#20275,#20276)
-#20277=*
-regexpterm(#20277,14,#20275,0,"foo")
-#20278=@"loc,{#10000},2,2,2,4"
-locations_default(#20278,#10000,2,2,2,4)
-hasLocation(#20277,#20278)
-regexp_const_value(#20277,"foo")
-#20279=*
-regexpterm(#20279,14,#20275,1,"bar")
-#20280=@"loc,{#10000},2,6,2,8"
-locations_default(#20280,#10000,2,6,2,8)
-hasLocation(#20279,#20280)
-regexp_const_value(#20279,"bar")
-#20281=*
-stmts(#20281,2,#20001,2,"/(?:)/;")
-hasLocation(#20281,#20007)
-stmt_containers(#20281,#20001)
+exprs(#20275,5,#20274,0,"/foo|bar/")
+hasLocation(#20275,#20095)
+enclosing_stmt(#20275,#20274)
+expr_containers(#20275,#20001)
+literals("/foo|bar/","/foo|bar/",#20275)
+#20276=*
+regexpterm(#20276,0,#20275,0,"foo|bar")
+#20277=@"loc,{#10000},2,2,2,8"
+locations_default(#20277,#10000,2,2,2,8)
+hasLocation(#20276,#20277)
+#20278=*
+regexpterm(#20278,14,#20276,0,"foo")
+#20279=@"loc,{#10000},2,2,2,4"
+locations_default(#20279,#10000,2,2,2,4)
+hasLocation(#20278,#20279)
+regexp_const_value(#20278,"foo")
+#20280=*
+regexpterm(#20280,14,#20276,1,"bar")
+#20281=@"loc,{#10000},2,6,2,8"
+locations_default(#20281,#10000,2,6,2,8)
+hasLocation(#20280,#20281)
+regexp_const_value(#20280,"bar")
 #20282=*
-exprs(#20282,5,#20281,0,"/(?:)/")
-hasLocation(#20282,#20099)
-enclosing_stmt(#20282,#20281)
-expr_containers(#20282,#20001)
-literals("/(?:)/","/(?:)/",#20282)
+stmts(#20282,2,#20001,2,"/(?:)/;")
+hasLocation(#20282,#20007)
+stmt_containers(#20282,#20001)
 #20283=*
-regexpterm(#20283,13,#20282,0,"(?:)")
-#20284=@"loc,{#10000},3,2,3,5"
-locations_default(#20284,#10000,3,2,3,5)
-hasLocation(#20283,#20284)
-#20285=*
-regexpterm(#20285,1,#20283,0,"")
-#20286=@"loc,{#10000},3,5,3,4"
-locations_default(#20286,#10000,3,5,3,4)
-hasLocation(#20285,#20286)
-#20287=*
-stmts(#20287,2,#20001,3,"/^abc$/;")
-hasLocation(#20287,#20009)
-stmt_containers(#20287,#20001)
+exprs(#20283,5,#20282,0,"/(?:)/")
+hasLocation(#20283,#20099)
+enclosing_stmt(#20283,#20282)
+expr_containers(#20283,#20001)
+literals("/(?:)/","/(?:)/",#20283)
+#20284=*
+regexpterm(#20284,13,#20283,0,"(?:)")
+#20285=@"loc,{#10000},3,2,3,5"
+locations_default(#20285,#10000,3,2,3,5)
+hasLocation(#20284,#20285)
+#20286=*
+regexpterm(#20286,1,#20284,0,"")
+#20287=@"loc,{#10000},3,5,3,4"
+locations_default(#20287,#10000,3,5,3,4)
+hasLocation(#20286,#20287)
 #20288=*
-exprs(#20288,5,#20287,0,"/^abc$/")
-hasLocation(#20288,#20103)
-enclosing_stmt(#20288,#20287)
-expr_containers(#20288,#20001)
-literals("/^abc$/","/^abc$/",#20288)
+stmts(#20288,2,#20001,3,"/^abc$/;")
+hasLocation(#20288,#20009)
+stmt_containers(#20288,#20001)
 #20289=*
-regexpterm(#20289,1,#20288,0,"^abc$")
-#20290=@"loc,{#10000},4,2,4,6"
-locations_default(#20290,#10000,4,2,4,6)
-hasLocation(#20289,#20290)
-#20291=*
-regexpterm(#20291,2,#20289,0,"^")
-#20292=@"loc,{#10000},4,2,4,2"
-locations_default(#20292,#10000,4,2,4,2)
-hasLocation(#20291,#20292)
-#20293=*
-regexpterm(#20293,14,#20289,1,"abc")
-#20294=@"loc,{#10000},4,3,4,5"
-locations_default(#20294,#10000,4,3,4,5)
-hasLocation(#20293,#20294)
-regexp_const_value(#20293,"abc")
-#20295=*
-regexpterm(#20295,3,#20289,2,"$")
-#20296=@"loc,{#10000},4,6,4,6"
-locations_default(#20296,#10000,4,6,4,6)
-hasLocation(#20295,#20296)
-#20297=*
-stmts(#20297,2,#20001,4,"/\bx\b/;")
-hasLocation(#20297,#20011)
-stmt_containers(#20297,#20001)
+exprs(#20289,5,#20288,0,"/^abc$/")
+hasLocation(#20289,#20103)
+enclosing_stmt(#20289,#20288)
+expr_containers(#20289,#20001)
+literals("/^abc$/","/^abc$/",#20289)
+#20290=*
+regexpterm(#20290,1,#20289,0,"^abc$")
+#20291=@"loc,{#10000},4,2,4,6"
+locations_default(#20291,#10000,4,2,4,6)
+hasLocation(#20290,#20291)
+#20292=*
+regexpterm(#20292,2,#20290,0,"^")
+#20293=@"loc,{#10000},4,2,4,2"
+locations_default(#20293,#10000,4,2,4,2)
+hasLocation(#20292,#20293)
+#20294=*
+regexpterm(#20294,14,#20290,1,"abc")
+#20295=@"loc,{#10000},4,3,4,5"
+locations_default(#20295,#10000,4,3,4,5)
+hasLocation(#20294,#20295)
+regexp_const_value(#20294,"abc")
+#20296=*
+regexpterm(#20296,3,#20290,2,"$")
+#20297=@"loc,{#10000},4,6,4,6"
+locations_default(#20297,#10000,4,6,4,6)
+hasLocation(#20296,#20297)
 #20298=*
-exprs(#20298,5,#20297,0,"/\bx\b/")
-hasLocation(#20298,#20107)
-enclosing_stmt(#20298,#20297)
-expr_containers(#20298,#20001)
-literals("/\bx\b/","/\bx\b/",#20298)
+stmts(#20298,2,#20001,4,"/\bx\b/;")
+hasLocation(#20298,#20011)
+stmt_containers(#20298,#20001)
 #20299=*
-regexpterm(#20299,1,#20298,0,"\bx\b")
-#20300=@"loc,{#10000},5,2,5,6"
-locations_default(#20300,#10000,5,2,5,6)
-hasLocation(#20299,#20300)
-#20301=*
-regexpterm(#20301,4,#20299,0,"\b")
-#20302=@"loc,{#10000},5,2,5,3"
-locations_default(#20302,#10000,5,2,5,3)
-hasLocation(#20301,#20302)
-#20303=*
-regexpterm(#20303,14,#20299,1,"x")
-#20304=@"loc,{#10000},5,4,5,4"
-locations_default(#20304,#10000,5,4,5,4)
-hasLocation(#20303,#20304)
-regexp_const_value(#20303,"x")
-#20305=*
-regexpterm(#20305,4,#20299,2,"\b")
-#20306=@"loc,{#10000},5,5,5,6"
-locations_default(#20306,#10000,5,5,5,6)
-hasLocation(#20305,#20306)
-#20307=*
-stmts(#20307,2,#20001,5,"/\bx\B/;")
-hasLocation(#20307,#20013)
-stmt_containers(#20307,#20001)
+exprs(#20299,5,#20298,0,"/\bx\b/")
+hasLocation(#20299,#20107)
+enclosing_stmt(#20299,#20298)
+expr_containers(#20299,#20001)
+literals("/\bx\b/","/\bx\b/",#20299)
+#20300=*
+regexpterm(#20300,1,#20299,0,"\bx\b")
+#20301=@"loc,{#10000},5,2,5,6"
+locations_default(#20301,#10000,5,2,5,6)
+hasLocation(#20300,#20301)
+#20302=*
+regexpterm(#20302,4,#20300,0,"\b")
+#20303=@"loc,{#10000},5,2,5,3"
+locations_default(#20303,#10000,5,2,5,3)
+hasLocation(#20302,#20303)
+#20304=*
+regexpterm(#20304,14,#20300,1,"x")
+#20305=@"loc,{#10000},5,4,5,4"
+locations_default(#20305,#10000,5,4,5,4)
+hasLocation(#20304,#20305)
+regexp_const_value(#20304,"x")
+#20306=*
+regexpterm(#20306,4,#20300,2,"\b")
+#20307=@"loc,{#10000},5,5,5,6"
+locations_default(#20307,#10000,5,5,5,6)
+hasLocation(#20306,#20307)
 #20308=*
-exprs(#20308,5,#20307,0,"/\bx\B/")
-hasLocation(#20308,#20111)
-enclosing_stmt(#20308,#20307)
-expr_containers(#20308,#20001)
-literals("/\bx\B/","/\bx\B/",#20308)
+stmts(#20308,2,#20001,5,"/\bx\B/;")
+hasLocation(#20308,#20013)
+stmt_containers(#20308,#20001)
 #20309=*
-regexpterm(#20309,1,#20308,0,"\bx\B")
-#20310=@"loc,{#10000},6,2,6,6"
-locations_default(#20310,#10000,6,2,6,6)
-hasLocation(#20309,#20310)
-#20311=*
-regexpterm(#20311,4,#20309,0,"\b")
-#20312=@"loc,{#10000},6,2,6,3"
-locations_default(#20312,#10000,6,2,6,3)
-hasLocation(#20311,#20312)
-#20313=*
-regexpterm(#20313,14,#20309,1,"x")
-#20314=@"loc,{#10000},6,4,6,4"
-locations_default(#20314,#10000,6,4,6,4)
-hasLocation(#20313,#20314)
-regexp_const_value(#20313,"x")
-#20315=*
-regexpterm(#20315,5,#20309,2,"\B")
-#20316=@"loc,{#10000},6,5,6,6"
-locations_default(#20316,#10000,6,5,6,6)
-hasLocation(#20315,#20316)
-#20317=*
-stmts(#20317,2,#20001,6,"/x(?=y)/;")
-hasLocation(#20317,#20015)
-stmt_containers(#20317,#20001)
+exprs(#20309,5,#20308,0,"/\bx\B/")
+hasLocation(#20309,#20111)
+enclosing_stmt(#20309,#20308)
+expr_containers(#20309,#20001)
+literals("/\bx\B/","/\bx\B/",#20309)
+#20310=*
+regexpterm(#20310,1,#20309,0,"\bx\B")
+#20311=@"loc,{#10000},6,2,6,6"
+locations_default(#20311,#10000,6,2,6,6)
+hasLocation(#20310,#20311)
+#20312=*
+regexpterm(#20312,4,#20310,0,"\b")
+#20313=@"loc,{#10000},6,2,6,3"
+locations_default(#20313,#10000,6,2,6,3)
+hasLocation(#20312,#20313)
+#20314=*
+regexpterm(#20314,14,#20310,1,"x")
+#20315=@"loc,{#10000},6,4,6,4"
+locations_default(#20315,#10000,6,4,6,4)
+hasLocation(#20314,#20315)
+regexp_const_value(#20314,"x")
+#20316=*
+regexpterm(#20316,5,#20310,2,"\B")
+#20317=@"loc,{#10000},6,5,6,6"
+locations_default(#20317,#10000,6,5,6,6)
+hasLocation(#20316,#20317)
 #20318=*
-exprs(#20318,5,#20317,0,"/x(?=y)/")
-hasLocation(#20318,#20115)
-enclosing_stmt(#20318,#20317)
-expr_containers(#20318,#20001)
-literals("/x(?=y)/","/x(?=y)/",#20318)
+stmts(#20318,2,#20001,6,"/x(?=y)/;")
+hasLocation(#20318,#20015)
+stmt_containers(#20318,#20001)
 #20319=*
-regexpterm(#20319,1,#20318,0,"x(?=y)")
-#20320=@"loc,{#10000},7,2,7,7"
-locations_default(#20320,#10000,7,2,7,7)
-hasLocation(#20319,#20320)
-#20321=*
-regexpterm(#20321,14,#20319,0,"x")
-#20322=@"loc,{#10000},7,2,7,2"
-locations_default(#20322,#10000,7,2,7,2)
-hasLocation(#20321,#20322)
-regexp_const_value(#20321,"x")
-#20323=*
-regexpterm(#20323,6,#20319,1,"(?=y)")
-#20324=@"loc,{#10000},7,3,7,7"
-locations_default(#20324,#10000,7,3,7,7)
-hasLocation(#20323,#20324)
-#20325=*
-regexpterm(#20325,14,#20323,0,"y")
-#20326=@"loc,{#10000},7,6,7,6"
-locations_default(#20326,#10000,7,6,7,6)
-hasLocation(#20325,#20326)
-regexp_const_value(#20325,"y")
-#20327=*
-stmts(#20327,2,#20001,7,"/x(?!z)/;")
-hasLocation(#20327,#20017)
-stmt_containers(#20327,#20001)
+exprs(#20319,5,#20318,0,"/x(?=y)/")
+hasLocation(#20319,#20115)
+enclosing_stmt(#20319,#20318)
+expr_containers(#20319,#20001)
+literals("/x(?=y)/","/x(?=y)/",#20319)
+#20320=*
+regexpterm(#20320,1,#20319,0,"x(?=y)")
+#20321=@"loc,{#10000},7,2,7,7"
+locations_default(#20321,#10000,7,2,7,7)
+hasLocation(#20320,#20321)
+#20322=*
+regexpterm(#20322,14,#20320,0,"x")
+#20323=@"loc,{#10000},7,2,7,2"
+locations_default(#20323,#10000,7,2,7,2)
+hasLocation(#20322,#20323)
+regexp_const_value(#20322,"x")
+#20324=*
+regexpterm(#20324,6,#20320,1,"(?=y)")
+#20325=@"loc,{#10000},7,3,7,7"
+locations_default(#20325,#10000,7,3,7,7)
+hasLocation(#20324,#20325)
+#20326=*
+regexpterm(#20326,14,#20324,0,"y")
+#20327=@"loc,{#10000},7,6,7,6"
+locations_default(#20327,#10000,7,6,7,6)
+hasLocation(#20326,#20327)
+regexp_const_value(#20326,"y")
 #20328=*
-exprs(#20328,5,#20327,0,"/x(?!z)/")
-hasLocation(#20328,#20119)
-enclosing_stmt(#20328,#20327)
-expr_containers(#20328,#20001)
-literals("/x(?!z)/","/x(?!z)/",#20328)
+stmts(#20328,2,#20001,7,"/x(?!z)/;")
+hasLocation(#20328,#20017)
+stmt_containers(#20328,#20001)
 #20329=*
-regexpterm(#20329,1,#20328,0,"x(?!z)")
-#20330=@"loc,{#10000},8,2,8,7"
-locations_default(#20330,#10000,8,2,8,7)
-hasLocation(#20329,#20330)
-#20331=*
-regexpterm(#20331,14,#20329,0,"x")
-#20332=@"loc,{#10000},8,2,8,2"
-locations_default(#20332,#10000,8,2,8,2)
-hasLocation(#20331,#20332)
-regexp_const_value(#20331,"x")
-#20333=*
-regexpterm(#20333,7,#20329,1,"(?!z)")
-#20334=@"loc,{#10000},8,3,8,7"
-locations_default(#20334,#10000,8,3,8,7)
-hasLocation(#20333,#20334)
-#20335=*
-regexpterm(#20335,14,#20333,0,"z")
-#20336=@"loc,{#10000},8,6,8,6"
-locations_default(#20336,#10000,8,6,8,6)
-hasLocation(#20335,#20336)
-regexp_const_value(#20335,"z")
-#20337=*
-stmts(#20337,2,#20001,8,"/a*/;")
-hasLocation(#20337,#20019)
-stmt_containers(#20337,#20001)
+exprs(#20329,5,#20328,0,"/x(?!z)/")
+hasLocation(#20329,#20119)
+enclosing_stmt(#20329,#20328)
+expr_containers(#20329,#20001)
+literals("/x(?!z)/","/x(?!z)/",#20329)
+#20330=*
+regexpterm(#20330,1,#20329,0,"x(?!z)")
+#20331=@"loc,{#10000},8,2,8,7"
+locations_default(#20331,#10000,8,2,8,7)
+hasLocation(#20330,#20331)
+#20332=*
+regexpterm(#20332,14,#20330,0,"x")
+#20333=@"loc,{#10000},8,2,8,2"
+locations_default(#20333,#10000,8,2,8,2)
+hasLocation(#20332,#20333)
+regexp_const_value(#20332,"x")
+#20334=*
+regexpterm(#20334,7,#20330,1,"(?!z)")
+#20335=@"loc,{#10000},8,3,8,7"
+locations_default(#20335,#10000,8,3,8,7)
+hasLocation(#20334,#20335)
+#20336=*
+regexpterm(#20336,14,#20334,0,"z")
+#20337=@"loc,{#10000},8,6,8,6"
+locations_default(#20337,#10000,8,6,8,6)
+hasLocation(#20336,#20337)
+regexp_const_value(#20336,"z")
 #20338=*
-exprs(#20338,5,#20337,0,"/a*/")
-hasLocation(#20338,#20123)
-enclosing_stmt(#20338,#20337)
-expr_containers(#20338,#20001)
-literals("/a*/","/a*/",#20338)
+stmts(#20338,2,#20001,8,"/a*/;")
+hasLocation(#20338,#20019)
+stmt_containers(#20338,#20001)
 #20339=*
-regexpterm(#20339,8,#20338,0,"a*")
-#20340=@"loc,{#10000},9,2,9,3"
-locations_default(#20340,#10000,9,2,9,3)
-hasLocation(#20339,#20340)
-is_greedy(#20339)
-#20341=*
-regexpterm(#20341,14,#20339,0,"a")
-#20342=@"loc,{#10000},9,2,9,2"
-locations_default(#20342,#10000,9,2,9,2)
-hasLocation(#20341,#20342)
-regexp_const_value(#20341,"a")
-#20343=*
-stmts(#20343,2,#20001,9,"/a*?/;")
-hasLocation(#20343,#20021)
-stmt_containers(#20343,#20001)
+exprs(#20339,5,#20338,0,"/a*/")
+hasLocation(#20339,#20123)
+enclosing_stmt(#20339,#20338)
+expr_containers(#20339,#20001)
+literals("/a*/","/a*/",#20339)
+#20340=*
+regexpterm(#20340,8,#20339,0,"a*")
+#20341=@"loc,{#10000},9,2,9,3"
+locations_default(#20341,#10000,9,2,9,3)
+hasLocation(#20340,#20341)
+is_greedy(#20340)
+#20342=*
+regexpterm(#20342,14,#20340,0,"a")
+#20343=@"loc,{#10000},9,2,9,2"
+locations_default(#20343,#10000,9,2,9,2)
+hasLocation(#20342,#20343)
+regexp_const_value(#20342,"a")
 #20344=*
-exprs(#20344,5,#20343,0,"/a*?/")
-hasLocation(#20344,#20127)
-enclosing_stmt(#20344,#20343)
-expr_containers(#20344,#20001)
-literals("/a*?/","/a*?/",#20344)
+stmts(#20344,2,#20001,9,"/a*?/;")
+hasLocation(#20344,#20021)
+stmt_containers(#20344,#20001)
 #20345=*
-regexpterm(#20345,8,#20344,0,"a*?")
-#20346=@"loc,{#10000},10,2,10,4"
-locations_default(#20346,#10000,10,2,10,4)
-hasLocation(#20345,#20346)
-#20347=*
-regexpterm(#20347,14,#20345,0,"a")
-#20348=@"loc,{#10000},10,2,10,2"
-locations_default(#20348,#10000,10,2,10,2)
-hasLocation(#20347,#20348)
-regexp_const_value(#20347,"a")
-#20349=*
-stmts(#20349,2,#20001,10,"/a+/;")
-hasLocation(#20349,#20023)
-stmt_containers(#20349,#20001)
+exprs(#20345,5,#20344,0,"/a*?/")
+hasLocation(#20345,#20127)
+enclosing_stmt(#20345,#20344)
+expr_containers(#20345,#20001)
+literals("/a*?/","/a*?/",#20345)
+#20346=*
+regexpterm(#20346,8,#20345,0,"a*?")
+#20347=@"loc,{#10000},10,2,10,4"
+locations_default(#20347,#10000,10,2,10,4)
+hasLocation(#20346,#20347)
+#20348=*
+regexpterm(#20348,14,#20346,0,"a")
+#20349=@"loc,{#10000},10,2,10,2"
+locations_default(#20349,#10000,10,2,10,2)
+hasLocation(#20348,#20349)
+regexp_const_value(#20348,"a")
 #20350=*
-exprs(#20350,5,#20349,0,"/a+/")
-hasLocation(#20350,#20131)
-enclosing_stmt(#20350,#20349)
-expr_containers(#20350,#20001)
-literals("/a+/","/a+/",#20350)
+stmts(#20350,2,#20001,10,"/a+/;")
+hasLocation(#20350,#20023)
+stmt_containers(#20350,#20001)
 #20351=*
-regexpterm(#20351,9,#20350,0,"a+")
-#20352=@"loc,{#10000},11,2,11,3"
-locations_default(#20352,#10000,11,2,11,3)
-hasLocation(#20351,#20352)
-is_greedy(#20351)
-#20353=*
-regexpterm(#20353,14,#20351,0,"a")
-#20354=@"loc,{#10000},11,2,11,2"
-locations_default(#20354,#10000,11,2,11,2)
-hasLocation(#20353,#20354)
-regexp_const_value(#20353,"a")
-#20355=*
-stmts(#20355,2,#20001,11,"/a+?/;")
-hasLocation(#20355,#20025)
-stmt_containers(#20355,#20001)
+exprs(#20351,5,#20350,0,"/a+/")
+hasLocation(#20351,#20131)
+enclosing_stmt(#20351,#20350)
+expr_containers(#20351,#20001)
+literals("/a+/","/a+/",#20351)
+#20352=*
+regexpterm(#20352,9,#20351,0,"a+")
+#20353=@"loc,{#10000},11,2,11,3"
+locations_default(#20353,#10000,11,2,11,3)
+hasLocation(#20352,#20353)
+is_greedy(#20352)
+#20354=*
+regexpterm(#20354,14,#20352,0,"a")
+#20355=@"loc,{#10000},11,2,11,2"
+locations_default(#20355,#10000,11,2,11,2)
+hasLocation(#20354,#20355)
+regexp_const_value(#20354,"a")
 #20356=*
-exprs(#20356,5,#20355,0,"/a+?/")
-hasLocation(#20356,#20135)
-enclosing_stmt(#20356,#20355)
-expr_containers(#20356,#20001)
-literals("/a+?/","/a+?/",#20356)
+stmts(#20356,2,#20001,11,"/a+?/;")
+hasLocation(#20356,#20025)
+stmt_containers(#20356,#20001)
 #20357=*
-regexpterm(#20357,9,#20356,0,"a+?")
-#20358=@"loc,{#10000},12,2,12,4"
-locations_default(#20358,#10000,12,2,12,4)
-hasLocation(#20357,#20358)
-#20359=*
-regexpterm(#20359,14,#20357,0,"a")
-#20360=@"loc,{#10000},12,2,12,2"
-locations_default(#20360,#10000,12,2,12,2)
-hasLocation(#20359,#20360)
-regexp_const_value(#20359,"a")
-#20361=*
-stmts(#20361,2,#20001,12,"/a?/;")
-hasLocation(#20361,#20027)
-stmt_containers(#20361,#20001)
+exprs(#20357,5,#20356,0,"/a+?/")
+hasLocation(#20357,#20135)
+enclosing_stmt(#20357,#20356)
+expr_containers(#20357,#20001)
+literals("/a+?/","/a+?/",#20357)
+#20358=*
+regexpterm(#20358,9,#20357,0,"a+?")
+#20359=@"loc,{#10000},12,2,12,4"
+locations_default(#20359,#10000,12,2,12,4)
+hasLocation(#20358,#20359)
+#20360=*
+regexpterm(#20360,14,#20358,0,"a")
+#20361=@"loc,{#10000},12,2,12,2"
+locations_default(#20361,#10000,12,2,12,2)
+hasLocation(#20360,#20361)
+regexp_const_value(#20360,"a")
 #20362=*
-exprs(#20362,5,#20361,0,"/a?/")
-hasLocation(#20362,#20139)
-enclosing_stmt(#20362,#20361)
-expr_containers(#20362,#20001)
-literals("/a?/","/a?/",#20362)
+stmts(#20362,2,#20001,12,"/a?/;")
+hasLocation(#20362,#20027)
+stmt_containers(#20362,#20001)
 #20363=*
-regexpterm(#20363,10,#20362,0,"a?")
-#20364=@"loc,{#10000},13,2,13,3"
-locations_default(#20364,#10000,13,2,13,3)
-hasLocation(#20363,#20364)
-is_greedy(#20363)
-#20365=*
-regexpterm(#20365,14,#20363,0,"a")
-#20366=@"loc,{#10000},13,2,13,2"
-locations_default(#20366,#10000,13,2,13,2)
-hasLocation(#20365,#20366)
-regexp_const_value(#20365,"a")
-#20367=*
-stmts(#20367,2,#20001,13,"/a??/;")
-hasLocation(#20367,#20029)
-stmt_containers(#20367,#20001)
+exprs(#20363,5,#20362,0,"/a?/")
+hasLocation(#20363,#20139)
+enclosing_stmt(#20363,#20362)
+expr_containers(#20363,#20001)
+literals("/a?/","/a?/",#20363)
+#20364=*
+regexpterm(#20364,10,#20363,0,"a?")
+#20365=@"loc,{#10000},13,2,13,3"
+locations_default(#20365,#10000,13,2,13,3)
+hasLocation(#20364,#20365)
+is_greedy(#20364)
+#20366=*
+regexpterm(#20366,14,#20364,0,"a")
+#20367=@"loc,{#10000},13,2,13,2"
+locations_default(#20367,#10000,13,2,13,2)
+hasLocation(#20366,#20367)
+regexp_const_value(#20366,"a")
 #20368=*
-exprs(#20368,5,#20367,0,"/a??/")
-hasLocation(#20368,#20143)
-enclosing_stmt(#20368,#20367)
-expr_containers(#20368,#20001)
-literals("/a??/","/a??/",#20368)
+stmts(#20368,2,#20001,13,"/a??/;")
+hasLocation(#20368,#20029)
+stmt_containers(#20368,#20001)
 #20369=*
-regexpterm(#20369,10,#20368,0,"a??")
-#20370=@"loc,{#10000},14,2,14,4"
-locations_default(#20370,#10000,14,2,14,4)
-hasLocation(#20369,#20370)
-#20371=*
-regexpterm(#20371,14,#20369,0,"a")
-#20372=@"loc,{#10000},14,2,14,2"
-locations_default(#20372,#10000,14,2,14,2)
-hasLocation(#20371,#20372)
-regexp_const_value(#20371,"a")
-#20373=*
-stmts(#20373,2,#20001,14,"/a{1}/;")
-hasLocation(#20373,#20031)
-stmt_containers(#20373,#20001)
+exprs(#20369,5,#20368,0,"/a??/")
+hasLocation(#20369,#20143)
+enclosing_stmt(#20369,#20368)
+expr_containers(#20369,#20001)
+literals("/a??/","/a??/",#20369)
+#20370=*
+regexpterm(#20370,10,#20369,0,"a??")
+#20371=@"loc,{#10000},14,2,14,4"
+locations_default(#20371,#10000,14,2,14,4)
+hasLocation(#20370,#20371)
+#20372=*
+regexpterm(#20372,14,#20370,0,"a")
+#20373=@"loc,{#10000},14,2,14,2"
+locations_default(#20373,#10000,14,2,14,2)
+hasLocation(#20372,#20373)
+regexp_const_value(#20372,"a")
 #20374=*
-exprs(#20374,5,#20373,0,"/a{1}/")
-hasLocation(#20374,#20147)
-enclosing_stmt(#20374,#20373)
-expr_containers(#20374,#20001)
-literals("/a{1}/","/a{1}/",#20374)
+stmts(#20374,2,#20001,14,"/a{1}/;")
+hasLocation(#20374,#20031)
+stmt_containers(#20374,#20001)
 #20375=*
-regexpterm(#20375,11,#20374,0,"a{1}")
-#20376=@"loc,{#10000},15,2,15,5"
-locations_default(#20376,#10000,15,2,15,5)
-hasLocation(#20375,#20376)
-is_greedy(#20375)
-range_quantifier_lower_bound(#20375,1)
-range_quantifier_upper_bound(#20375,1)
-#20377=*
-regexpterm(#20377,14,#20375,0,"a")
-#20378=@"loc,{#10000},15,2,15,2"
-locations_default(#20378,#10000,15,2,15,2)
-hasLocation(#20377,#20378)
-regexp_const_value(#20377,"a")
-#20379=*
-stmts(#20379,2,#20001,15,"/a{1,}/;")
-hasLocation(#20379,#20033)
-stmt_containers(#20379,#20001)
+exprs(#20375,5,#20374,0,"/a{1}/")
+hasLocation(#20375,#20147)
+enclosing_stmt(#20375,#20374)
+expr_containers(#20375,#20001)
+literals("/a{1}/","/a{1}/",#20375)
+#20376=*
+regexpterm(#20376,11,#20375,0,"a{1}")
+#20377=@"loc,{#10000},15,2,15,5"
+locations_default(#20377,#10000,15,2,15,5)
+hasLocation(#20376,#20377)
+is_greedy(#20376)
+range_quantifier_lower_bound(#20376,1)
+range_quantifier_upper_bound(#20376,1)
+#20378=*
+regexpterm(#20378,14,#20376,0,"a")
+#20379=@"loc,{#10000},15,2,15,2"
+locations_default(#20379,#10000,15,2,15,2)
+hasLocation(#20378,#20379)
+regexp_const_value(#20378,"a")
 #20380=*
-exprs(#20380,5,#20379,0,"/a{1,}/")
-hasLocation(#20380,#20151)
-enclosing_stmt(#20380,#20379)
-expr_containers(#20380,#20001)
-literals("/a{1,}/","/a{1,}/",#20380)
+stmts(#20380,2,#20001,15,"/a{1,}/;")
+hasLocation(#20380,#20033)
+stmt_containers(#20380,#20001)
 #20381=*
-regexpterm(#20381,11,#20380,0,"a{1,}")
-#20382=@"loc,{#10000},16,2,16,6"
-locations_default(#20382,#10000,16,2,16,6)
-hasLocation(#20381,#20382)
-is_greedy(#20381)
-range_quantifier_lower_bound(#20381,1)
-#20383=*
-regexpterm(#20383,14,#20381,0,"a")
-#20384=@"loc,{#10000},16,2,16,2"
-locations_default(#20384,#10000,16,2,16,2)
-hasLocation(#20383,#20384)
-regexp_const_value(#20383,"a")
-#20385=*
-stmts(#20385,2,#20001,16,"/a{1,2}/;")
-hasLocation(#20385,#20035)
-stmt_containers(#20385,#20001)
+exprs(#20381,5,#20380,0,"/a{1,}/")
+hasLocation(#20381,#20151)
+enclosing_stmt(#20381,#20380)
+expr_containers(#20381,#20001)
+literals("/a{1,}/","/a{1,}/",#20381)
+#20382=*
+regexpterm(#20382,11,#20381,0,"a{1,}")
+#20383=@"loc,{#10000},16,2,16,6"
+locations_default(#20383,#10000,16,2,16,6)
+hasLocation(#20382,#20383)
+is_greedy(#20382)
+range_quantifier_lower_bound(#20382,1)
+#20384=*
+regexpterm(#20384,14,#20382,0,"a")
+#20385=@"loc,{#10000},16,2,16,2"
+locations_default(#20385,#10000,16,2,16,2)
+hasLocation(#20384,#20385)
+regexp_const_value(#20384,"a")
 #20386=*
-exprs(#20386,5,#20385,0,"/a{1,2}/")
-hasLocation(#20386,#20155)
-enclosing_stmt(#20386,#20385)
-expr_containers(#20386,#20001)
-literals("/a{1,2}/","/a{1,2}/",#20386)
+stmts(#20386,2,#20001,16,"/a{1,2}/;")
+hasLocation(#20386,#20035)
+stmt_containers(#20386,#20001)
 #20387=*
-regexpterm(#20387,11,#20386,0,"a{1,2}")
-#20388=@"loc,{#10000},17,2,17,7"
-locations_default(#20388,#10000,17,2,17,7)
-hasLocation(#20387,#20388)
-is_greedy(#20387)
-range_quantifier_lower_bound(#20387,1)
-range_quantifier_upper_bound(#20387,2)
-#20389=*
-regexpterm(#20389,14,#20387,0,"a")
-#20390=@"loc,{#10000},17,2,17,2"
-locations_default(#20390,#10000,17,2,17,2)
-hasLocation(#20389,#20390)
-regexp_const_value(#20389,"a")
-#20391=*
-stmts(#20391,2,#20001,17,"/a{1}?/;")
-hasLocation(#20391,#20037)
-stmt_containers(#20391,#20001)
+exprs(#20387,5,#20386,0,"/a{1,2}/")
+hasLocation(#20387,#20155)
+enclosing_stmt(#20387,#20386)
+expr_containers(#20387,#20001)
+literals("/a{1,2}/","/a{1,2}/",#20387)
+#20388=*
+regexpterm(#20388,11,#20387,0,"a{1,2}")
+#20389=@"loc,{#10000},17,2,17,7"
+locations_default(#20389,#10000,17,2,17,7)
+hasLocation(#20388,#20389)
+is_greedy(#20388)
+range_quantifier_lower_bound(#20388,1)
+range_quantifier_upper_bound(#20388,2)
+#20390=*
+regexpterm(#20390,14,#20388,0,"a")
+#20391=@"loc,{#10000},17,2,17,2"
+locations_default(#20391,#10000,17,2,17,2)
+hasLocation(#20390,#20391)
+regexp_const_value(#20390,"a")
 #20392=*
-exprs(#20392,5,#20391,0,"/a{1}?/")
-hasLocation(#20392,#20159)
-enclosing_stmt(#20392,#20391)
-expr_containers(#20392,#20001)
-literals("/a{1}?/","/a{1}?/",#20392)
+stmts(#20392,2,#20001,17,"/a{1}?/;")
+hasLocation(#20392,#20037)
+stmt_containers(#20392,#20001)
 #20393=*
-regexpterm(#20393,11,#20392,0,"a{1}?")
-#20394=@"loc,{#10000},18,2,18,6"
-locations_default(#20394,#10000,18,2,18,6)
-hasLocation(#20393,#20394)
-range_quantifier_lower_bound(#20393,1)
-range_quantifier_upper_bound(#20393,1)
-#20395=*
-regexpterm(#20395,14,#20393,0,"a")
-#20396=@"loc,{#10000},18,2,18,2"
-locations_default(#20396,#10000,18,2,18,2)
-hasLocation(#20395,#20396)
-regexp_const_value(#20395,"a")
-#20397=*
-stmts(#20397,2,#20001,18,"/a{1,}?/;")
-hasLocation(#20397,#20039)
-stmt_containers(#20397,#20001)
+exprs(#20393,5,#20392,0,"/a{1}?/")
+hasLocation(#20393,#20159)
+enclosing_stmt(#20393,#20392)
+expr_containers(#20393,#20001)
+literals("/a{1}?/","/a{1}?/",#20393)
+#20394=*
+regexpterm(#20394,11,#20393,0,"a{1}?")
+#20395=@"loc,{#10000},18,2,18,6"
+locations_default(#20395,#10000,18,2,18,6)
+hasLocation(#20394,#20395)
+range_quantifier_lower_bound(#20394,1)
+range_quantifier_upper_bound(#20394,1)
+#20396=*
+regexpterm(#20396,14,#20394,0,"a")
+#20397=@"loc,{#10000},18,2,18,2"
+locations_default(#20397,#10000,18,2,18,2)
+hasLocation(#20396,#20397)
+regexp_const_value(#20396,"a")
 #20398=*
-exprs(#20398,5,#20397,0,"/a{1,}?/")
-hasLocation(#20398,#20163)
-enclosing_stmt(#20398,#20397)
-expr_containers(#20398,#20001)
-literals("/a{1,}?/","/a{1,}?/",#20398)
+stmts(#20398,2,#20001,18,"/a{1,}?/;")
+hasLocation(#20398,#20039)
+stmt_containers(#20398,#20001)
 #20399=*
-regexpterm(#20399,11,#20398,0,"a{1,}?")
-#20400=@"loc,{#10000},19,2,19,7"
-locations_default(#20400,#10000,19,2,19,7)
-hasLocation(#20399,#20400)
-range_quantifier_lower_bound(#20399,1)
-#20401=*
-regexpterm(#20401,14,#20399,0,"a")
-#20402=@"loc,{#10000},19,2,19,2"
-locations_default(#20402,#10000,19,2,19,2)
-hasLocation(#20401,#20402)
-regexp_const_value(#20401,"a")
-#20403=*
-stmts(#20403,2,#20001,19,"/a{1,2}?/;")
-hasLocation(#20403,#20041)
-stmt_containers(#20403,#20001)
+exprs(#20399,5,#20398,0,"/a{1,}?/")
+hasLocation(#20399,#20163)
+enclosing_stmt(#20399,#20398)
+expr_containers(#20399,#20001)
+literals("/a{1,}?/","/a{1,}?/",#20399)
+#20400=*
+regexpterm(#20400,11,#20399,0,"a{1,}?")
+#20401=@"loc,{#10000},19,2,19,7"
+locations_default(#20401,#10000,19,2,19,7)
+hasLocation(#20400,#20401)
+range_quantifier_lower_bound(#20400,1)
+#20402=*
+regexpterm(#20402,14,#20400,0,"a")
+#20403=@"loc,{#10000},19,2,19,2"
+locations_default(#20403,#10000,19,2,19,2)
+hasLocation(#20402,#20403)
+regexp_const_value(#20402,"a")
 #20404=*
-exprs(#20404,5,#20403,0,"/a{1,2}?/")
-hasLocation(#20404,#20167)
-enclosing_stmt(#20404,#20403)
-expr_containers(#20404,#20001)
-literals("/a{1,2}?/","/a{1,2}?/",#20404)
+stmts(#20404,2,#20001,19,"/a{1,2}?/;")
+hasLocation(#20404,#20041)
+stmt_containers(#20404,#20001)
 #20405=*
-regexpterm(#20405,11,#20404,0,"a{1,2}?")
-#20406=@"loc,{#10000},20,2,20,8"
-locations_default(#20406,#10000,20,2,20,8)
-hasLocation(#20405,#20406)
-range_quantifier_lower_bound(#20405,1)
-range_quantifier_upper_bound(#20405,2)
-#20407=*
-regexpterm(#20407,14,#20405,0,"a")
-#20408=@"loc,{#10000},20,2,20,2"
-locations_default(#20408,#10000,20,2,20,2)
-hasLocation(#20407,#20408)
-regexp_const_value(#20407,"a")
-#20409=*
-stmts(#20409,2,#20001,20,"/./;")
-hasLocation(#20409,#20043)
-stmt_containers(#20409,#20001)
+exprs(#20405,5,#20404,0,"/a{1,2}?/")
+hasLocation(#20405,#20167)
+enclosing_stmt(#20405,#20404)
+expr_containers(#20405,#20001)
+literals("/a{1,2}?/","/a{1,2}?/",#20405)
+#20406=*
+regexpterm(#20406,11,#20405,0,"a{1,2}?")
+#20407=@"loc,{#10000},20,2,20,8"
+locations_default(#20407,#10000,20,2,20,8)
+hasLocation(#20406,#20407)
+range_quantifier_lower_bound(#20406,1)
+range_quantifier_upper_bound(#20406,2)
+#20408=*
+regexpterm(#20408,14,#20406,0,"a")
+#20409=@"loc,{#10000},20,2,20,2"
+locations_default(#20409,#10000,20,2,20,2)
+hasLocation(#20408,#20409)
+regexp_const_value(#20408,"a")
 #20410=*
-exprs(#20410,5,#20409,0,"/./")
-hasLocation(#20410,#20171)
-enclosing_stmt(#20410,#20409)
-expr_containers(#20410,#20001)
-literals("/./","/./",#20410)
+stmts(#20410,2,#20001,20,"/./;")
+hasLocation(#20410,#20043)
+stmt_containers(#20410,#20001)
 #20411=*
-regexpterm(#20411,12,#20410,0,".")
-#20412=@"loc,{#10000},21,2,21,2"
-locations_default(#20412,#10000,21,2,21,2)
-hasLocation(#20411,#20412)
-#20413=*
-stmts(#20413,2,#20001,21,"/(abc)/;")
-hasLocation(#20413,#20045)
-stmt_containers(#20413,#20001)
+exprs(#20411,5,#20410,0,"/./")
+hasLocation(#20411,#20171)
+enclosing_stmt(#20411,#20410)
+expr_containers(#20411,#20001)
+literals("/./","/./",#20411)
+#20412=*
+regexpterm(#20412,12,#20411,0,".")
+#20413=@"loc,{#10000},21,2,21,2"
+locations_default(#20413,#10000,21,2,21,2)
+hasLocation(#20412,#20413)
 #20414=*
-exprs(#20414,5,#20413,0,"/(abc)/")
-hasLocation(#20414,#20175)
-enclosing_stmt(#20414,#20413)
-expr_containers(#20414,#20001)
-literals("/(abc)/","/(abc)/",#20414)
+stmts(#20414,2,#20001,21,"/(abc)/;")
+hasLocation(#20414,#20045)
+stmt_containers(#20414,#20001)
 #20415=*
-regexpterm(#20415,13,#20414,0,"(abc)")
-#20416=@"loc,{#10000},22,2,22,6"
-locations_default(#20416,#10000,22,2,22,6)
-hasLocation(#20415,#20416)
-is_capture(#20415,1)
-#20417=*
-regexpterm(#20417,14,#20415,0,"abc")
-#20418=@"loc,{#10000},22,3,22,5"
-locations_default(#20418,#10000,22,3,22,5)
-hasLocation(#20417,#20418)
-regexp_const_value(#20417,"abc")
-#20419=*
-stmts(#20419,2,#20001,22,"/(?:abc)/;")
-hasLocation(#20419,#20047)
-stmt_containers(#20419,#20001)
+exprs(#20415,5,#20414,0,"/(abc)/")
+hasLocation(#20415,#20175)
+enclosing_stmt(#20415,#20414)
+expr_containers(#20415,#20001)
+literals("/(abc)/","/(abc)/",#20415)
+#20416=*
+regexpterm(#20416,13,#20415,0,"(abc)")
+#20417=@"loc,{#10000},22,2,22,6"
+locations_default(#20417,#10000,22,2,22,6)
+hasLocation(#20416,#20417)
+is_capture(#20416,1)
+#20418=*
+regexpterm(#20418,14,#20416,0,"abc")
+#20419=@"loc,{#10000},22,3,22,5"
+locations_default(#20419,#10000,22,3,22,5)
+hasLocation(#20418,#20419)
+regexp_const_value(#20418,"abc")
 #20420=*
-exprs(#20420,5,#20419,0,"/(?:abc)/")
-hasLocation(#20420,#20179)
-enclosing_stmt(#20420,#20419)
-expr_containers(#20420,#20001)
-literals("/(?:abc)/","/(?:abc)/",#20420)
+stmts(#20420,2,#20001,22,"/(?:abc)/;")
+hasLocation(#20420,#20047)
+stmt_containers(#20420,#20001)
 #20421=*
-regexpterm(#20421,13,#20420,0,"(?:abc)")
-#20422=@"loc,{#10000},23,2,23,8"
-locations_default(#20422,#10000,23,2,23,8)
-hasLocation(#20421,#20422)
-#20423=*
-regexpterm(#20423,14,#20421,0,"abc")
-#20424=@"loc,{#10000},23,5,23,7"
-locations_default(#20424,#10000,23,5,23,7)
-hasLocation(#20423,#20424)
-regexp_const_value(#20423,"abc")
-#20425=*
-stmts(#20425,2,#20001,23,"/\x0a/;")
-hasLocation(#20425,#20049)
-stmt_containers(#20425,#20001)
+exprs(#20421,5,#20420,0,"/(?:abc)/")
+hasLocation(#20421,#20179)
+enclosing_stmt(#20421,#20420)
+expr_containers(#20421,#20001)
+literals("/(?:abc)/","/(?:abc)/",#20421)
+#20422=*
+regexpterm(#20422,13,#20421,0,"(?:abc)")
+#20423=@"loc,{#10000},23,2,23,8"
+locations_default(#20423,#10000,23,2,23,8)
+hasLocation(#20422,#20423)
+#20424=*
+regexpterm(#20424,14,#20422,0,"abc")
+#20425=@"loc,{#10000},23,5,23,7"
+locations_default(#20425,#10000,23,5,23,7)
+hasLocation(#20424,#20425)
+regexp_const_value(#20424,"abc")
 #20426=*
-exprs(#20426,5,#20425,0,"/\x0a/")
-hasLocation(#20426,#20183)
-enclosing_stmt(#20426,#20425)
-expr_containers(#20426,#20001)
-literals("/\x0a/","/\x0a/",#20426)
+stmts(#20426,2,#20001,23,"/\x0a/;")
+hasLocation(#20426,#20049)
+stmt_containers(#20426,#20001)
 #20427=*
-regexpterm(#20427,15,#20426,0,"\x0a")
-#20428=@"loc,{#10000},24,2,24,5"
-locations_default(#20428,#10000,24,2,24,5)
-hasLocation(#20427,#20428)
-regexp_const_value(#20427,"
+exprs(#20427,5,#20426,0,"/\x0a/")
+hasLocation(#20427,#20183)
+enclosing_stmt(#20427,#20426)
+expr_containers(#20427,#20001)
+literals("/\x0a/","/\x0a/",#20427)
+#20428=*
+regexpterm(#20428,15,#20427,0,"\x0a")
+#20429=@"loc,{#10000},24,2,24,5"
+locations_default(#20429,#10000,24,2,24,5)
+hasLocation(#20428,#20429)
+regexp_const_value(#20428,"
 ")
-#20429=*
-stmts(#20429,2,#20001,24,"/\u000a/;")
-hasLocation(#20429,#20051)
-stmt_containers(#20429,#20001)
 #20430=*
-exprs(#20430,5,#20429,0,"/\u000a/")
-hasLocation(#20430,#20187)
-enclosing_stmt(#20430,#20429)
-expr_containers(#20430,#20001)
-literals("/\u000a/","/\u000a/",#20430)
+stmts(#20430,2,#20001,24,"/\u000a/;")
+hasLocation(#20430,#20051)
+stmt_containers(#20430,#20001)
 #20431=*
-regexpterm(#20431,16,#20430,0,"\u000a")
-#20432=@"loc,{#10000},25,2,25,7"
-locations_default(#20432,#10000,25,2,25,7)
-hasLocation(#20431,#20432)
-regexp_const_value(#20431,"
+exprs(#20431,5,#20430,0,"/\u000a/")
+hasLocation(#20431,#20187)
+enclosing_stmt(#20431,#20430)
+expr_containers(#20431,#20001)
+literals("/\u000a/","/\u000a/",#20431)
+#20432=*
+regexpterm(#20432,16,#20431,0,"\u000a")
+#20433=@"loc,{#10000},25,2,25,7"
+locations_default(#20433,#10000,25,2,25,7)
+hasLocation(#20432,#20433)
+regexp_const_value(#20432,"
 ")
-#20433=*
-stmts(#20433,2,#20001,25,"/\10/;")
-hasLocation(#20433,#20053)
-stmt_containers(#20433,#20001)
 #20434=*
-exprs(#20434,5,#20433,0,"/\10/")
-hasLocation(#20434,#20191)
-enclosing_stmt(#20434,#20433)
-expr_containers(#20434,#20001)
-literals("/\10/","/\10/",#20434)
+stmts(#20434,2,#20001,25,"/\10/;")
+hasLocation(#20434,#20053)
+stmt_containers(#20434,#20001)
 #20435=*
-regexpterm(#20435,22,#20434,0,"\10")
-#20436=@"loc,{#10000},26,2,26,4"
-locations_default(#20436,#10000,26,2,26,4)
-hasLocation(#20435,#20436)
-backref(#20435,10)
-#20437=*
-regexp_parse_errors(#20437,#20435,"invalid back reference")
-hasLocation(#20437,#20436)
+exprs(#20435,5,#20434,0,"/\10/")
+hasLocation(#20435,#20191)
+enclosing_stmt(#20435,#20434)
+expr_containers(#20435,#20001)
+literals("/\10/","/\10/",#20435)
+#20436=*
+regexpterm(#20436,22,#20435,0,"\10")
+#20437=@"loc,{#10000},26,2,26,4"
+locations_default(#20437,#10000,26,2,26,4)
+hasLocation(#20436,#20437)
+backref(#20436,10)
 #20438=*
-stmts(#20438,2,#20001,26,"/\t\n\r\f\v/;")
-hasLocation(#20438,#20055)
-stmt_containers(#20438,#20001)
+regexp_parse_errors(#20438,#20436,"invalid back reference")
+hasLocation(#20438,#20437)
 #20439=*
-exprs(#20439,5,#20438,0,"/\t\n\r\f\v/")
-hasLocation(#20439,#20195)
-enclosing_stmt(#20439,#20438)
-expr_containers(#20439,#20001)
-literals("/\t\n\r\f\v/","/\t\n\r\f\v/",#20439)
+stmts(#20439,2,#20001,26,"/\t\n\r\f\v/;")
+hasLocation(#20439,#20055)
+stmt_containers(#20439,#20001)
 #20440=*
-regexpterm(#20440,1,#20439,0,"\t\n\r\f\v")
-#20441=@"loc,{#10000},27,2,27,11"
-locations_default(#20441,#10000,27,2,27,11)
-hasLocation(#20440,#20441)
-#20442=*
-regexpterm(#20442,19,#20440,0,"\t")
-#20443=@"loc,{#10000},27,2,27,3"
-locations_default(#20443,#10000,27,2,27,3)
-hasLocation(#20442,#20443)
-regexp_const_value(#20442,"	")
-#20444=*
-regexpterm(#20444,19,#20440,1,"\n")
-#20445=@"loc,{#10000},27,4,27,5"
-locations_default(#20445,#10000,27,4,27,5)
-hasLocation(#20444,#20445)
-regexp_const_value(#20444,"
+exprs(#20440,5,#20439,0,"/\t\n\r\f\v/")
+hasLocation(#20440,#20195)
+enclosing_stmt(#20440,#20439)
+expr_containers(#20440,#20001)
+literals("/\t\n\r\f\v/","/\t\n\r\f\v/",#20440)
+#20441=*
+regexpterm(#20441,1,#20440,0,"\t\n\r\f\v")
+#20442=@"loc,{#10000},27,2,27,11"
+locations_default(#20442,#10000,27,2,27,11)
+hasLocation(#20441,#20442)
+#20443=*
+regexpterm(#20443,19,#20441,0,"\t")
+#20444=@"loc,{#10000},27,2,27,3"
+locations_default(#20444,#10000,27,2,27,3)
+hasLocation(#20443,#20444)
+regexp_const_value(#20443,"	")
+#20445=*
+regexpterm(#20445,19,#20441,1,"\n")
+#20446=@"loc,{#10000},27,4,27,5"
+locations_default(#20446,#10000,27,4,27,5)
+hasLocation(#20445,#20446)
+regexp_const_value(#20445,"
 ")
-#20446=*
-regexpterm(#20446,19,#20440,2,"\r")
-#20447=@"loc,{#10000},27,6,27,7"
-locations_default(#20447,#10000,27,6,27,7)
-hasLocation(#20446,#20447)
-regexp_const_value(#20446,"
")
-#20448=*
-regexpterm(#20448,19,#20440,3,"\f")
-#20449=@"loc,{#10000},27,8,27,9"
-locations_default(#20449,#10000,27,8,27,9)
-hasLocation(#20448,#20449)
-regexp_const_value(#20448,"")
-#20450=*
-regexpterm(#20450,19,#20440,4,"\v")
-#20451=@"loc,{#10000},27,10,27,11"
-locations_default(#20451,#10000,27,10,27,11)
-hasLocation(#20450,#20451)
-regexp_const_value(#20450,"")
-#20452=*
-stmts(#20452,2,#20001,27,"/\ca\cN/;")
-hasLocation(#20452,#20057)
-stmt_containers(#20452,#20001)
+#20447=*
+regexpterm(#20447,19,#20441,2,"\r")
+#20448=@"loc,{#10000},27,6,27,7"
+locations_default(#20448,#10000,27,6,27,7)
+hasLocation(#20447,#20448)
+regexp_const_value(#20447,"
")
+#20449=*
+regexpterm(#20449,19,#20441,3,"\f")
+#20450=@"loc,{#10000},27,8,27,9"
+locations_default(#20450,#10000,27,8,27,9)
+hasLocation(#20449,#20450)
+regexp_const_value(#20449,"")
+#20451=*
+regexpterm(#20451,19,#20441,4,"\v")
+#20452=@"loc,{#10000},27,10,27,11"
+locations_default(#20452,#10000,27,10,27,11)
+hasLocation(#20451,#20452)
+regexp_const_value(#20451,"")
 #20453=*
-exprs(#20453,5,#20452,0,"/\ca\cN/")
-hasLocation(#20453,#20199)
-enclosing_stmt(#20453,#20452)
-expr_containers(#20453,#20001)
-literals("/\ca\cN/","/\ca\cN/",#20453)
+stmts(#20453,2,#20001,27,"/\ca\cN/;")
+hasLocation(#20453,#20057)
+stmt_containers(#20453,#20001)
 #20454=*
-regexpterm(#20454,1,#20453,0,"\ca\cN")
-#20455=@"loc,{#10000},28,2,28,7"
-locations_default(#20455,#10000,28,2,28,7)
-hasLocation(#20454,#20455)
-#20456=*
-regexpterm(#20456,19,#20454,0,"\ca")
-#20457=@"loc,{#10000},28,2,28,4"
-locations_default(#20457,#10000,28,2,28,4)
-hasLocation(#20456,#20457)
-regexp_const_value(#20456,"
")
-#20458=*
-regexpterm(#20458,19,#20454,1,"\cN")
-#20459=@"loc,{#10000},28,5,28,7"
-locations_default(#20459,#10000,28,5,28,7)
-hasLocation(#20458,#20459)
-regexp_const_value(#20458,"")
-#20460=*
-stmts(#20460,2,#20001,28,"/\w\S/;")
-hasLocation(#20460,#20059)
-stmt_containers(#20460,#20001)
+exprs(#20454,5,#20453,0,"/\ca\cN/")
+hasLocation(#20454,#20199)
+enclosing_stmt(#20454,#20453)
+expr_containers(#20454,#20001)
+literals("/\ca\cN/","/\ca\cN/",#20454)
+#20455=*
+regexpterm(#20455,1,#20454,0,"\ca\cN")
+#20456=@"loc,{#10000},28,2,28,7"
+locations_default(#20456,#10000,28,2,28,7)
+hasLocation(#20455,#20456)
+#20457=*
+regexpterm(#20457,19,#20455,0,"\ca")
+#20458=@"loc,{#10000},28,2,28,4"
+locations_default(#20458,#10000,28,2,28,4)
+hasLocation(#20457,#20458)
+regexp_const_value(#20457,"
")
+#20459=*
+regexpterm(#20459,19,#20455,1,"\cN")
+#20460=@"loc,{#10000},28,5,28,7"
+locations_default(#20460,#10000,28,5,28,7)
+hasLocation(#20459,#20460)
+regexp_const_value(#20459,"")
 #20461=*
-exprs(#20461,5,#20460,0,"/\w\S/")
-hasLocation(#20461,#20203)
-enclosing_stmt(#20461,#20460)
-expr_containers(#20461,#20001)
-literals("/\w\S/","/\w\S/",#20461)
+stmts(#20461,2,#20001,28,"/\w\S/;")
+hasLocation(#20461,#20059)
+stmt_containers(#20461,#20001)
 #20462=*
-regexpterm(#20462,1,#20461,0,"\w\S")
-#20463=@"loc,{#10000},29,2,29,5"
-locations_default(#20463,#10000,29,2,29,5)
-hasLocation(#20462,#20463)
-#20464=*
-regexpterm(#20464,20,#20462,0,"\w")
-#20465=@"loc,{#10000},29,2,29,3"
-locations_default(#20465,#10000,29,2,29,3)
-hasLocation(#20464,#20465)
-char_class_escape(#20464,"w")
-#20466=*
-regexpterm(#20466,20,#20462,1,"\S")
-#20467=@"loc,{#10000},29,4,29,5"
-locations_default(#20467,#10000,29,4,29,5)
-hasLocation(#20466,#20467)
-char_class_escape(#20466,"S")
-#20468=*
-stmts(#20468,2,#20001,29,"/\\/;")
-hasLocation(#20468,#20061)
-stmt_containers(#20468,#20001)
+exprs(#20462,5,#20461,0,"/\w\S/")
+hasLocation(#20462,#20203)
+enclosing_stmt(#20462,#20461)
+expr_containers(#20462,#20001)
+literals("/\w\S/","/\w\S/",#20462)
+#20463=*
+regexpterm(#20463,1,#20462,0,"\w\S")
+#20464=@"loc,{#10000},29,2,29,5"
+locations_default(#20464,#10000,29,2,29,5)
+hasLocation(#20463,#20464)
+#20465=*
+regexpterm(#20465,20,#20463,0,"\w")
+#20466=@"loc,{#10000},29,2,29,3"
+locations_default(#20466,#10000,29,2,29,3)
+hasLocation(#20465,#20466)
+char_class_escape(#20465,"w")
+#20467=*
+regexpterm(#20467,20,#20463,1,"\S")
+#20468=@"loc,{#10000},29,4,29,5"
+locations_default(#20468,#10000,29,4,29,5)
+hasLocation(#20467,#20468)
+char_class_escape(#20467,"S")
 #20469=*
-exprs(#20469,5,#20468,0,"/\\/")
-hasLocation(#20469,#20207)
-enclosing_stmt(#20469,#20468)
-expr_containers(#20469,#20001)
-literals("/\\/","/\\/",#20469)
+stmts(#20469,2,#20001,29,"/\\/;")
+hasLocation(#20469,#20061)
+stmt_containers(#20469,#20001)
 #20470=*
-regexpterm(#20470,21,#20469,0,"\\")
-#20471=@"loc,{#10000},30,2,30,3"
-locations_default(#20471,#10000,30,2,30,3)
-hasLocation(#20470,#20471)
-regexp_const_value(#20470,"\")
-#20472=*
-stmts(#20472,2,#20001,30,"/[abc]/;")
-hasLocation(#20472,#20063)
-stmt_containers(#20472,#20001)
+exprs(#20470,5,#20469,0,"/\\/")
+hasLocation(#20470,#20207)
+enclosing_stmt(#20470,#20469)
+expr_containers(#20470,#20001)
+literals("/\\/","/\\/",#20470)
+#20471=*
+regexpterm(#20471,21,#20470,0,"\\")
+#20472=@"loc,{#10000},30,2,30,3"
+locations_default(#20472,#10000,30,2,30,3)
+hasLocation(#20471,#20472)
+regexp_const_value(#20471,"\")
 #20473=*
-exprs(#20473,5,#20472,0,"/[abc]/")
-hasLocation(#20473,#20211)
-enclosing_stmt(#20473,#20472)
-expr_containers(#20473,#20001)
-literals("/[abc]/","/[abc]/",#20473)
+stmts(#20473,2,#20001,30,"/[abc]/;")
+hasLocation(#20473,#20063)
+stmt_containers(#20473,#20001)
 #20474=*
-regexpterm(#20474,23,#20473,0,"[abc]")
-#20475=@"loc,{#10000},31,2,31,6"
-locations_default(#20475,#10000,31,2,31,6)
-hasLocation(#20474,#20475)
-#20476=*
-regexpterm(#20476,14,#20474,0,"a")
-#20477=@"loc,{#10000},31,3,31,3"
-locations_default(#20477,#10000,31,3,31,3)
-hasLocation(#20476,#20477)
-regexp_const_value(#20476,"a")
-#20478=*
-regexpterm(#20478,14,#20474,1,"b")
-#20479=@"loc,{#10000},31,4,31,4"
-locations_default(#20479,#10000,31,4,31,4)
-hasLocation(#20478,#20479)
-regexp_const_value(#20478,"b")
-#20480=*
-regexpterm(#20480,14,#20474,2,"c")
-#20481=@"loc,{#10000},31,5,31,5"
-locations_default(#20481,#10000,31,5,31,5)
-hasLocation(#20480,#20481)
-regexp_const_value(#20480,"c")
-#20482=*
-stmts(#20482,2,#20001,31,"/[a-z]/;")
-hasLocation(#20482,#20065)
-stmt_containers(#20482,#20001)
+exprs(#20474,5,#20473,0,"/[abc]/")
+hasLocation(#20474,#20211)
+enclosing_stmt(#20474,#20473)
+expr_containers(#20474,#20001)
+literals("/[abc]/","/[abc]/",#20474)
+#20475=*
+regexpterm(#20475,23,#20474,0,"[abc]")
+#20476=@"loc,{#10000},31,2,31,6"
+locations_default(#20476,#10000,31,2,31,6)
+hasLocation(#20475,#20476)
+#20477=*
+regexpterm(#20477,14,#20475,0,"a")
+#20478=@"loc,{#10000},31,3,31,3"
+locations_default(#20478,#10000,31,3,31,3)
+hasLocation(#20477,#20478)
+regexp_const_value(#20477,"a")
+#20479=*
+regexpterm(#20479,14,#20475,1,"b")
+#20480=@"loc,{#10000},31,4,31,4"
+locations_default(#20480,#10000,31,4,31,4)
+hasLocation(#20479,#20480)
+regexp_const_value(#20479,"b")
+#20481=*
+regexpterm(#20481,14,#20475,2,"c")
+#20482=@"loc,{#10000},31,5,31,5"
+locations_default(#20482,#10000,31,5,31,5)
+hasLocation(#20481,#20482)
+regexp_const_value(#20481,"c")
 #20483=*
-exprs(#20483,5,#20482,0,"/[a-z]/")
-hasLocation(#20483,#20215)
-enclosing_stmt(#20483,#20482)
-expr_containers(#20483,#20001)
-literals("/[a-z]/","/[a-z]/",#20483)
+stmts(#20483,2,#20001,31,"/[a-z]/;")
+hasLocation(#20483,#20065)
+stmt_containers(#20483,#20001)
 #20484=*
-regexpterm(#20484,23,#20483,0,"[a-z]")
-#20485=@"loc,{#10000},32,2,32,6"
-locations_default(#20485,#10000,32,2,32,6)
-hasLocation(#20484,#20485)
-#20486=*
-regexpterm(#20486,24,#20484,0,"a-z")
-#20487=@"loc,{#10000},32,3,32,5"
-locations_default(#20487,#10000,32,3,32,5)
-hasLocation(#20486,#20487)
-#20488=*
-regexpterm(#20488,14,#20486,0,"a")
-#20489=@"loc,{#10000},32,3,32,3"
-locations_default(#20489,#10000,32,3,32,3)
-hasLocation(#20488,#20489)
-regexp_const_value(#20488,"a")
-#20490=*
-regexpterm(#20490,14,#20486,1,"z")
-#20491=@"loc,{#10000},32,5,32,5"
-locations_default(#20491,#10000,32,5,32,5)
-hasLocation(#20490,#20491)
-regexp_const_value(#20490,"z")
-#20492=*
-stmts(#20492,2,#20001,32,"/[a-zA-Z]/;")
-hasLocation(#20492,#20067)
-stmt_containers(#20492,#20001)
+exprs(#20484,5,#20483,0,"/[a-z]/")
+hasLocation(#20484,#20215)
+enclosing_stmt(#20484,#20483)
+expr_containers(#20484,#20001)
+literals("/[a-z]/","/[a-z]/",#20484)
+#20485=*
+regexpterm(#20485,23,#20484,0,"[a-z]")
+#20486=@"loc,{#10000},32,2,32,6"
+locations_default(#20486,#10000,32,2,32,6)
+hasLocation(#20485,#20486)
+#20487=*
+regexpterm(#20487,24,#20485,0,"a-z")
+#20488=@"loc,{#10000},32,3,32,5"
+locations_default(#20488,#10000,32,3,32,5)
+hasLocation(#20487,#20488)
+#20489=*
+regexpterm(#20489,14,#20487,0,"a")
+#20490=@"loc,{#10000},32,3,32,3"
+locations_default(#20490,#10000,32,3,32,3)
+hasLocation(#20489,#20490)
+regexp_const_value(#20489,"a")
+#20491=*
+regexpterm(#20491,14,#20487,1,"z")
+#20492=@"loc,{#10000},32,5,32,5"
+locations_default(#20492,#10000,32,5,32,5)
+hasLocation(#20491,#20492)
+regexp_const_value(#20491,"z")
 #20493=*
-exprs(#20493,5,#20492,0,"/[a-zA-Z]/")
-hasLocation(#20493,#20219)
-enclosing_stmt(#20493,#20492)
-expr_containers(#20493,#20001)
-literals("/[a-zA-Z]/","/[a-zA-Z]/",#20493)
+stmts(#20493,2,#20001,32,"/[a-zA-Z]/;")
+hasLocation(#20493,#20067)
+stmt_containers(#20493,#20001)
 #20494=*
-regexpterm(#20494,23,#20493,0,"[a-zA-Z]")
-#20495=@"loc,{#10000},33,2,33,9"
-locations_default(#20495,#10000,33,2,33,9)
-hasLocation(#20494,#20495)
-#20496=*
-regexpterm(#20496,24,#20494,0,"a-z")
-#20497=@"loc,{#10000},33,3,33,5"
-locations_default(#20497,#10000,33,3,33,5)
-hasLocation(#20496,#20497)
-#20498=*
-regexpterm(#20498,14,#20496,0,"a")
-#20499=@"loc,{#10000},33,3,33,3"
-locations_default(#20499,#10000,33,3,33,3)
-hasLocation(#20498,#20499)
-regexp_const_value(#20498,"a")
-#20500=*
-regexpterm(#20500,14,#20496,1,"z")
-#20501=@"loc,{#10000},33,5,33,5"
-locations_default(#20501,#10000,33,5,33,5)
-hasLocation(#20500,#20501)
-regexp_const_value(#20500,"z")
-#20502=*
-regexpterm(#20502,24,#20494,1,"A-Z")
-#20503=@"loc,{#10000},33,6,33,8"
-locations_default(#20503,#10000,33,6,33,8)
-hasLocation(#20502,#20503)
-#20504=*
-regexpterm(#20504,14,#20502,0,"A")
-#20505=@"loc,{#10000},33,6,33,6"
-locations_default(#20505,#10000,33,6,33,6)
-hasLocation(#20504,#20505)
-regexp_const_value(#20504,"A")
-#20506=*
-regexpterm(#20506,14,#20502,1,"Z")
-#20507=@"loc,{#10000},33,8,33,8"
-locations_default(#20507,#10000,33,8,33,8)
-hasLocation(#20506,#20507)
-regexp_const_value(#20506,"Z")
-#20508=*
-stmts(#20508,2,#20001,33,"/[-a-z]/;")
-hasLocation(#20508,#20069)
-stmt_containers(#20508,#20001)
+exprs(#20494,5,#20493,0,"/[a-zA-Z]/")
+hasLocation(#20494,#20219)
+enclosing_stmt(#20494,#20493)
+expr_containers(#20494,#20001)
+literals("/[a-zA-Z]/","/[a-zA-Z]/",#20494)
+#20495=*
+regexpterm(#20495,23,#20494,0,"[a-zA-Z]")
+#20496=@"loc,{#10000},33,2,33,9"
+locations_default(#20496,#10000,33,2,33,9)
+hasLocation(#20495,#20496)
+#20497=*
+regexpterm(#20497,24,#20495,0,"a-z")
+#20498=@"loc,{#10000},33,3,33,5"
+locations_default(#20498,#10000,33,3,33,5)
+hasLocation(#20497,#20498)
+#20499=*
+regexpterm(#20499,14,#20497,0,"a")
+#20500=@"loc,{#10000},33,3,33,3"
+locations_default(#20500,#10000,33,3,33,3)
+hasLocation(#20499,#20500)
+regexp_const_value(#20499,"a")
+#20501=*
+regexpterm(#20501,14,#20497,1,"z")
+#20502=@"loc,{#10000},33,5,33,5"
+locations_default(#20502,#10000,33,5,33,5)
+hasLocation(#20501,#20502)
+regexp_const_value(#20501,"z")
+#20503=*
+regexpterm(#20503,24,#20495,1,"A-Z")
+#20504=@"loc,{#10000},33,6,33,8"
+locations_default(#20504,#10000,33,6,33,8)
+hasLocation(#20503,#20504)
+#20505=*
+regexpterm(#20505,14,#20503,0,"A")
+#20506=@"loc,{#10000},33,6,33,6"
+locations_default(#20506,#10000,33,6,33,6)
+hasLocation(#20505,#20506)
+regexp_const_value(#20505,"A")
+#20507=*
+regexpterm(#20507,14,#20503,1,"Z")
+#20508=@"loc,{#10000},33,8,33,8"
+locations_default(#20508,#10000,33,8,33,8)
+hasLocation(#20507,#20508)
+regexp_const_value(#20507,"Z")
 #20509=*
-exprs(#20509,5,#20508,0,"/[-a-z]/")
-hasLocation(#20509,#20223)
-enclosing_stmt(#20509,#20508)
-expr_containers(#20509,#20001)
-literals("/[-a-z]/","/[-a-z]/",#20509)
+stmts(#20509,2,#20001,33,"/[-a-z]/;")
+hasLocation(#20509,#20069)
+stmt_containers(#20509,#20001)
 #20510=*
-regexpterm(#20510,23,#20509,0,"[-a-z]")
-#20511=@"loc,{#10000},34,2,34,7"
-locations_default(#20511,#10000,34,2,34,7)
-hasLocation(#20510,#20511)
-#20512=*
-regexpterm(#20512,14,#20510,0,"-")
-#20513=@"loc,{#10000},34,3,34,3"
-locations_default(#20513,#10000,34,3,34,3)
-hasLocation(#20512,#20513)
-regexp_const_value(#20512,"-")
-#20514=*
-regexpterm(#20514,24,#20510,1,"a-z")
-#20515=@"loc,{#10000},34,4,34,6"
-locations_default(#20515,#10000,34,4,34,6)
-hasLocation(#20514,#20515)
-#20516=*
-regexpterm(#20516,14,#20514,0,"a")
-#20517=@"loc,{#10000},34,4,34,4"
-locations_default(#20517,#10000,34,4,34,4)
-hasLocation(#20516,#20517)
-regexp_const_value(#20516,"a")
-#20518=*
-regexpterm(#20518,14,#20514,1,"z")
-#20519=@"loc,{#10000},34,6,34,6"
-locations_default(#20519,#10000,34,6,34,6)
-hasLocation(#20518,#20519)
-regexp_const_value(#20518,"z")
-#20520=*
-stmts(#20520,2,#20001,34,"/[^a-z]/;")
-hasLocation(#20520,#20071)
-stmt_containers(#20520,#20001)
+exprs(#20510,5,#20509,0,"/[-a-z]/")
+hasLocation(#20510,#20223)
+enclosing_stmt(#20510,#20509)
+expr_containers(#20510,#20001)
+literals("/[-a-z]/","/[-a-z]/",#20510)
+#20511=*
+regexpterm(#20511,23,#20510,0,"[-a-z]")
+#20512=@"loc,{#10000},34,2,34,7"
+locations_default(#20512,#10000,34,2,34,7)
+hasLocation(#20511,#20512)
+#20513=*
+regexpterm(#20513,14,#20511,0,"-")
+#20514=@"loc,{#10000},34,3,34,3"
+locations_default(#20514,#10000,34,3,34,3)
+hasLocation(#20513,#20514)
+regexp_const_value(#20513,"-")
+#20515=*
+regexpterm(#20515,24,#20511,1,"a-z")
+#20516=@"loc,{#10000},34,4,34,6"
+locations_default(#20516,#10000,34,4,34,6)
+hasLocation(#20515,#20516)
+#20517=*
+regexpterm(#20517,14,#20515,0,"a")
+#20518=@"loc,{#10000},34,4,34,4"
+locations_default(#20518,#10000,34,4,34,4)
+hasLocation(#20517,#20518)
+regexp_const_value(#20517,"a")
+#20519=*
+regexpterm(#20519,14,#20515,1,"z")
+#20520=@"loc,{#10000},34,6,34,6"
+locations_default(#20520,#10000,34,6,34,6)
+hasLocation(#20519,#20520)
+regexp_const_value(#20519,"z")
 #20521=*
-exprs(#20521,5,#20520,0,"/[^a-z]/")
-hasLocation(#20521,#20227)
-enclosing_stmt(#20521,#20520)
-expr_containers(#20521,#20001)
-literals("/[^a-z]/","/[^a-z]/",#20521)
+stmts(#20521,2,#20001,34,"/[^a-z]/;")
+hasLocation(#20521,#20071)
+stmt_containers(#20521,#20001)
 #20522=*
-regexpterm(#20522,23,#20521,0,"[^a-z]")
-#20523=@"loc,{#10000},35,2,35,7"
-locations_default(#20523,#10000,35,2,35,7)
-hasLocation(#20522,#20523)
-is_inverted(#20522)
-#20524=*
-regexpterm(#20524,24,#20522,0,"a-z")
-#20525=@"loc,{#10000},35,4,35,6"
-locations_default(#20525,#10000,35,4,35,6)
-hasLocation(#20524,#20525)
-#20526=*
-regexpterm(#20526,14,#20524,0,"a")
-#20527=@"loc,{#10000},35,4,35,4"
-locations_default(#20527,#10000,35,4,35,4)
-hasLocation(#20526,#20527)
-regexp_const_value(#20526,"a")
-#20528=*
-regexpterm(#20528,14,#20524,1,"z")
-#20529=@"loc,{#10000},35,6,35,6"
-locations_default(#20529,#10000,35,6,35,6)
-hasLocation(#20528,#20529)
-regexp_const_value(#20528,"z")
-#20530=*
-stmts(#20530,2,#20001,35,"/[a\b\x0c]/;")
-hasLocation(#20530,#20073)
-stmt_containers(#20530,#20001)
+exprs(#20522,5,#20521,0,"/[^a-z]/")
+hasLocation(#20522,#20227)
+enclosing_stmt(#20522,#20521)
+expr_containers(#20522,#20001)
+literals("/[^a-z]/","/[^a-z]/",#20522)
+#20523=*
+regexpterm(#20523,23,#20522,0,"[^a-z]")
+#20524=@"loc,{#10000},35,2,35,7"
+locations_default(#20524,#10000,35,2,35,7)
+hasLocation(#20523,#20524)
+is_inverted(#20523)
+#20525=*
+regexpterm(#20525,24,#20523,0,"a-z")
+#20526=@"loc,{#10000},35,4,35,6"
+locations_default(#20526,#10000,35,4,35,6)
+hasLocation(#20525,#20526)
+#20527=*
+regexpterm(#20527,14,#20525,0,"a")
+#20528=@"loc,{#10000},35,4,35,4"
+locations_default(#20528,#10000,35,4,35,4)
+hasLocation(#20527,#20528)
+regexp_const_value(#20527,"a")
+#20529=*
+regexpterm(#20529,14,#20525,1,"z")
+#20530=@"loc,{#10000},35,6,35,6"
+locations_default(#20530,#10000,35,6,35,6)
+hasLocation(#20529,#20530)
+regexp_const_value(#20529,"z")
 #20531=*
-exprs(#20531,5,#20530,0,"/[a\b\x0c]/")
-hasLocation(#20531,#20231)
-enclosing_stmt(#20531,#20530)
-expr_containers(#20531,#20001)
-literals("/[a\b\x0c]/","/[a\b\x0c]/",#20531)
+stmts(#20531,2,#20001,35,"/[a\b\x0c]/;")
+hasLocation(#20531,#20073)
+stmt_containers(#20531,#20001)
 #20532=*
-regexpterm(#20532,23,#20531,0,"[a\b\x0c]")
-#20533=@"loc,{#10000},36,2,36,10"
-locations_default(#20533,#10000,36,2,36,10)
-hasLocation(#20532,#20533)
-#20534=*
-regexpterm(#20534,14,#20532,0,"a")
-#20535=@"loc,{#10000},36,3,36,3"
-locations_default(#20535,#10000,36,3,36,3)
-hasLocation(#20534,#20535)
-regexp_const_value(#20534,"a")
-#20536=*
-regexpterm(#20536,19,#20532,1,"\b")
-#20537=@"loc,{#10000},36,4,36,5"
-locations_default(#20537,#10000,36,4,36,5)
-hasLocation(#20536,#20537)
-regexp_const_value(#20536,"")
-#20538=*
-regexpterm(#20538,15,#20532,2,"\x0c")
-#20539=@"loc,{#10000},36,6,36,9"
-locations_default(#20539,#10000,36,6,36,9)
-hasLocation(#20538,#20539)
-regexp_const_value(#20538,"")
-#20540=*
-stmts(#20540,2,#20001,36,"/a{/;")
-hasLocation(#20540,#20075)
-stmt_containers(#20540,#20001)
+exprs(#20532,5,#20531,0,"/[a\b\x0c]/")
+hasLocation(#20532,#20231)
+enclosing_stmt(#20532,#20531)
+expr_containers(#20532,#20001)
+literals("/[a\b\x0c]/","/[a\b\x0c]/",#20532)
+#20533=*
+regexpterm(#20533,23,#20532,0,"[a\b\x0c]")
+#20534=@"loc,{#10000},36,2,36,10"
+locations_default(#20534,#10000,36,2,36,10)
+hasLocation(#20533,#20534)
+#20535=*
+regexpterm(#20535,14,#20533,0,"a")
+#20536=@"loc,{#10000},36,3,36,3"
+locations_default(#20536,#10000,36,3,36,3)
+hasLocation(#20535,#20536)
+regexp_const_value(#20535,"a")
+#20537=*
+regexpterm(#20537,19,#20533,1,"\b")
+#20538=@"loc,{#10000},36,4,36,5"
+locations_default(#20538,#10000,36,4,36,5)
+hasLocation(#20537,#20538)
+regexp_const_value(#20537,"")
+#20539=*
+regexpterm(#20539,15,#20533,2,"\x0c")
+#20540=@"loc,{#10000},36,6,36,9"
+locations_default(#20540,#10000,36,6,36,9)
+hasLocation(#20539,#20540)
+regexp_const_value(#20539,"")
 #20541=*
-exprs(#20541,5,#20540,0,"/a{/")
-hasLocation(#20541,#20235)
-enclosing_stmt(#20541,#20540)
-expr_containers(#20541,#20001)
-literals("/a{/","/a{/",#20541)
+stmts(#20541,2,#20001,36,"/a{/;")
+hasLocation(#20541,#20075)
+stmt_containers(#20541,#20001)
 #20542=*
-regexpterm(#20542,1,#20541,0,"a{")
-#20543=@"loc,{#10000},37,2,37,3"
-locations_default(#20543,#10000,37,2,37,3)
-hasLocation(#20542,#20543)
-#20544=*
-regexpterm(#20544,14,#20542,0,"a")
-#20545=@"loc,{#10000},37,2,37,2"
-locations_default(#20545,#10000,37,2,37,2)
-hasLocation(#20544,#20545)
-regexp_const_value(#20544,"a")
-#20546=*
-regexpterm(#20546,14,#20542,1,"a{")
-hasLocation(#20546,#20543)
-regexp_const_value(#20546,"{")
+exprs(#20542,5,#20541,0,"/a{/")
+hasLocation(#20542,#20235)
+enclosing_stmt(#20542,#20541)
+expr_containers(#20542,#20001)
+literals("/a{/","/a{/",#20542)
+#20543=*
+regexpterm(#20543,1,#20542,0,"a{")
+#20544=@"loc,{#10000},37,2,37,3"
+locations_default(#20544,#10000,37,2,37,3)
+hasLocation(#20543,#20544)
+#20545=*
+regexpterm(#20545,14,#20543,0,"a")
+#20546=@"loc,{#10000},37,2,37,2"
+locations_default(#20546,#10000,37,2,37,2)
+hasLocation(#20545,#20546)
+regexp_const_value(#20545,"a")
 #20547=*
-regexp_parse_errors(#20547,#20542,"expected digit")
-#20548=@"loc,{#10000},37,4,37,4"
-locations_default(#20548,#10000,37,4,37,4)
-hasLocation(#20547,#20548)
-#20549=*
-stmts(#20549,2,#20001,37,"/a{b}/;")
-hasLocation(#20549,#20077)
-stmt_containers(#20549,#20001)
+regexpterm(#20547,14,#20543,1,"a{")
+hasLocation(#20547,#20544)
+regexp_const_value(#20547,"{")
+#20548=*
+regexp_parse_errors(#20548,#20543,"expected digit")
+#20549=@"loc,{#10000},37,4,37,4"
+locations_default(#20549,#10000,37,4,37,4)
+hasLocation(#20548,#20549)
 #20550=*
-exprs(#20550,5,#20549,0,"/a{b}/")
-hasLocation(#20550,#20239)
-enclosing_stmt(#20550,#20549)
-expr_containers(#20550,#20001)
-literals("/a{b}/","/a{b}/",#20550)
+stmts(#20550,2,#20001,37,"/a{b}/;")
+hasLocation(#20550,#20077)
+stmt_containers(#20550,#20001)
 #20551=*
-regexpterm(#20551,1,#20550,0,"a{b}")
-#20552=@"loc,{#10000},38,2,38,5"
-locations_default(#20552,#10000,38,2,38,5)
-hasLocation(#20551,#20552)
-#20553=*
-regexpterm(#20553,1,#20551,0,"a{")
-#20554=@"loc,{#10000},38,2,38,3"
-locations_default(#20554,#10000,38,2,38,3)
-hasLocation(#20553,#20554)
-#20555=*
-regexpterm(#20555,14,#20553,0,"a")
-#20556=@"loc,{#10000},38,2,38,2"
-locations_default(#20556,#10000,38,2,38,2)
-hasLocation(#20555,#20556)
-regexp_const_value(#20555,"a")
-#20557=*
-regexpterm(#20557,14,#20553,1,"a{")
-hasLocation(#20557,#20554)
-regexp_const_value(#20557,"{")
+exprs(#20551,5,#20550,0,"/a{b}/")
+hasLocation(#20551,#20239)
+enclosing_stmt(#20551,#20550)
+expr_containers(#20551,#20001)
+literals("/a{b}/","/a{b}/",#20551)
+#20552=*
+regexpterm(#20552,1,#20551,0,"a{b}")
+#20553=@"loc,{#10000},38,2,38,5"
+locations_default(#20553,#10000,38,2,38,5)
+hasLocation(#20552,#20553)
+#20554=*
+regexpterm(#20554,1,#20552,0,"a{")
+#20555=@"loc,{#10000},38,2,38,3"
+locations_default(#20555,#10000,38,2,38,3)
+hasLocation(#20554,#20555)
+#20556=*
+regexpterm(#20556,14,#20554,0,"a")
+#20557=@"loc,{#10000},38,2,38,2"
+locations_default(#20557,#10000,38,2,38,2)
+hasLocation(#20556,#20557)
+regexp_const_value(#20556,"a")
 #20558=*
-regexpterm(#20558,14,#20551,1,"b")
-#20559=@"loc,{#10000},38,4,38,4"
-locations_default(#20559,#10000,38,4,38,4)
-hasLocation(#20558,#20559)
-regexp_const_value(#20558,"b")
-#20560=*
-regexpterm(#20560,14,#20551,2,"}")
-#20561=@"loc,{#10000},38,5,38,5"
-locations_default(#20561,#10000,38,5,38,5)
-hasLocation(#20560,#20561)
-regexp_const_value(#20560,"}")
-#20562=*
-regexp_parse_errors(#20562,#20551,"expected digit")
-hasLocation(#20562,#20559)
+regexpterm(#20558,14,#20554,1,"a{")
+hasLocation(#20558,#20555)
+regexp_const_value(#20558,"{")
+#20559=*
+regexpterm(#20559,14,#20552,1,"b")
+#20560=@"loc,{#10000},38,4,38,4"
+locations_default(#20560,#10000,38,4,38,4)
+hasLocation(#20559,#20560)
+regexp_const_value(#20559,"b")
+#20561=*
+regexpterm(#20561,14,#20552,2,"}")
+#20562=@"loc,{#10000},38,5,38,5"
+locations_default(#20562,#10000,38,5,38,5)
+hasLocation(#20561,#20562)
+regexp_const_value(#20561,"}")
 #20563=*
-regexp_parse_errors(#20563,#20551,"unexpected character")
-hasLocation(#20563,#20561)
+regexp_parse_errors(#20563,#20552,"expected digit")
+hasLocation(#20563,#20560)
 #20564=*
-stmts(#20564,2,#20001,38,"/a{2/;")
-hasLocation(#20564,#20079)
-stmt_containers(#20564,#20001)
+regexp_parse_errors(#20564,#20552,"unexpected character")
+hasLocation(#20564,#20562)
 #20565=*
-exprs(#20565,5,#20564,0,"/a{2/")
-hasLocation(#20565,#20243)
-enclosing_stmt(#20565,#20564)
-expr_containers(#20565,#20001)
-literals("/a{2/","/a{2/",#20565)
+stmts(#20565,2,#20001,38,"/a{2/;")
+hasLocation(#20565,#20079)
+stmt_containers(#20565,#20001)
 #20566=*
-regexpterm(#20566,1,#20565,0,"a{2")
-#20567=@"loc,{#10000},39,2,39,4"
-locations_default(#20567,#10000,39,2,39,4)
-hasLocation(#20566,#20567)
-#20568=*
-regexpterm(#20568,14,#20566,0,"a")
-#20569=@"loc,{#10000},39,2,39,2"
-locations_default(#20569,#10000,39,2,39,2)
-hasLocation(#20568,#20569)
-regexp_const_value(#20568,"a")
-#20570=*
-regexpterm(#20570,14,#20566,1,"a{2")
-hasLocation(#20570,#20567)
-regexp_const_value(#20570,"{2")
+exprs(#20566,5,#20565,0,"/a{2/")
+hasLocation(#20566,#20243)
+enclosing_stmt(#20566,#20565)
+expr_containers(#20566,#20001)
+literals("/a{2/","/a{2/",#20566)
+#20567=*
+regexpterm(#20567,1,#20566,0,"a{2")
+#20568=@"loc,{#10000},39,2,39,4"
+locations_default(#20568,#10000,39,2,39,4)
+hasLocation(#20567,#20568)
+#20569=*
+regexpterm(#20569,14,#20567,0,"a")
+#20570=@"loc,{#10000},39,2,39,2"
+locations_default(#20570,#10000,39,2,39,2)
+hasLocation(#20569,#20570)
+regexp_const_value(#20569,"a")
 #20571=*
-stmts(#20571,2,#20001,39,"/\xa/;")
-hasLocation(#20571,#20081)
-stmt_containers(#20571,#20001)
+regexpterm(#20571,14,#20567,1,"a{2")
+hasLocation(#20571,#20568)
+regexp_const_value(#20571,"{2")
 #20572=*
-exprs(#20572,5,#20571,0,"/\xa/")
-hasLocation(#20572,#20247)
-enclosing_stmt(#20572,#20571)
-expr_containers(#20572,#20001)
-literals("/\xa/","/\xa/",#20572)
+stmts(#20572,2,#20001,39,"/\xa/;")
+hasLocation(#20572,#20081)
+stmt_containers(#20572,#20001)
 #20573=*
-regexpterm(#20573,15,#20572,0,"\xa")
-#20574=@"loc,{#10000},40,2,40,4"
-locations_default(#20574,#10000,40,2,40,4)
-hasLocation(#20573,#20574)
-regexp_const_value(#20573,"
+exprs(#20573,5,#20572,0,"/\xa/")
+hasLocation(#20573,#20247)
+enclosing_stmt(#20573,#20572)
+expr_containers(#20573,#20001)
+literals("/\xa/","/\xa/",#20573)
+#20574=*
+regexpterm(#20574,15,#20573,0,"\xa")
+#20575=@"loc,{#10000},40,2,40,4"
+locations_default(#20575,#10000,40,2,40,4)
+hasLocation(#20574,#20575)
+regexp_const_value(#20574,"
 ")
-#20575=*
-regexp_parse_errors(#20575,#20573,"unexpected end of regular expression")
-#20576=@"loc,{#10000},40,5,40,5"
-locations_default(#20576,#10000,40,5,40,5)
-hasLocation(#20575,#20576)
-#20577=*
-stmts(#20577,2,#20001,40,"/\c0/;")
-hasLocation(#20577,#20083)
-stmt_containers(#20577,#20001)
+#20576=*
+regexp_parse_errors(#20576,#20574,"unexpected end of regular expression")
+#20577=@"loc,{#10000},40,5,40,5"
+locations_default(#20577,#10000,40,5,40,5)
+hasLocation(#20576,#20577)
 #20578=*
-exprs(#20578,5,#20577,0,"/\c0/")
-hasLocation(#20578,#20251)
-enclosing_stmt(#20578,#20577)
-expr_containers(#20578,#20001)
-literals("/\c0/","/\c0/",#20578)
+stmts(#20578,2,#20001,40,"/\c0/;")
+hasLocation(#20578,#20083)
+stmt_containers(#20578,#20001)
 #20579=*
-regexpterm(#20579,19,#20578,0,"\c0")
-#20580=@"loc,{#10000},41,2,41,4"
-locations_default(#20580,#10000,41,2,41,4)
-hasLocation(#20579,#20580)
-regexp_const_value(#20579,"")
-#20581=*
-regexp_parse_errors(#20581,#20579,"expected control letter")
-#20582=@"loc,{#10000},41,4,41,4"
-locations_default(#20582,#10000,41,4,41,4)
-hasLocation(#20581,#20582)
-#20583=*
-stmts(#20583,2,#20001,41,"/[]/;")
-hasLocation(#20583,#20085)
-stmt_containers(#20583,#20001)
+exprs(#20579,5,#20578,0,"/\c0/")
+hasLocation(#20579,#20251)
+enclosing_stmt(#20579,#20578)
+expr_containers(#20579,#20001)
+literals("/\c0/","/\c0/",#20579)
+#20580=*
+regexpterm(#20580,19,#20579,0,"\c0")
+#20581=@"loc,{#10000},41,2,41,4"
+locations_default(#20581,#10000,41,2,41,4)
+hasLocation(#20580,#20581)
+regexp_const_value(#20580,"")
+#20582=*
+regexp_parse_errors(#20582,#20580,"expected control letter")
+#20583=@"loc,{#10000},41,4,41,4"
+locations_default(#20583,#10000,41,4,41,4)
+hasLocation(#20582,#20583)
 #20584=*
-exprs(#20584,5,#20583,0,"/[]/")
-hasLocation(#20584,#20255)
-enclosing_stmt(#20584,#20583)
-expr_containers(#20584,#20001)
-literals("/[]/","/[]/",#20584)
+stmts(#20584,2,#20001,41,"/[]/;")
+hasLocation(#20584,#20085)
+stmt_containers(#20584,#20001)
 #20585=*
-regexpterm(#20585,23,#20584,0,"[]")
-#20586=@"loc,{#10000},42,2,42,3"
-locations_default(#20586,#10000,42,2,42,3)
-hasLocation(#20585,#20586)
-#20587=*
-stmts(#20587,2,#20001,42,"/[^]/;")
-hasLocation(#20587,#20087)
-stmt_containers(#20587,#20001)
+exprs(#20585,5,#20584,0,"/[]/")
+hasLocation(#20585,#20255)
+enclosing_stmt(#20585,#20584)
+expr_containers(#20585,#20001)
+literals("/[]/","/[]/",#20585)
+#20586=*
+regexpterm(#20586,23,#20585,0,"[]")
+#20587=@"loc,{#10000},42,2,42,3"
+locations_default(#20587,#10000,42,2,42,3)
+hasLocation(#20586,#20587)
 #20588=*
-exprs(#20588,5,#20587,0,"/[^]/")
-hasLocation(#20588,#20259)
-enclosing_stmt(#20588,#20587)
-expr_containers(#20588,#20001)
-literals("/[^]/","/[^]/",#20588)
+stmts(#20588,2,#20001,42,"/[^]/;")
+hasLocation(#20588,#20087)
+stmt_containers(#20588,#20001)
 #20589=*
-regexpterm(#20589,23,#20588,0,"[^]")
-#20590=@"loc,{#10000},43,2,43,4"
-locations_default(#20590,#10000,43,2,43,4)
-hasLocation(#20589,#20590)
-is_inverted(#20589)
-#20591=*
-stmts(#20591,2,#20001,43,"/<tpl\b ... /tpl>/;")
-hasLocation(#20591,#20089)
-stmt_containers(#20591,#20001)
+exprs(#20589,5,#20588,0,"/[^]/")
+hasLocation(#20589,#20259)
+enclosing_stmt(#20589,#20588)
+expr_containers(#20589,#20001)
+literals("/[^]/","/[^]/",#20589)
+#20590=*
+regexpterm(#20590,23,#20589,0,"[^]")
+#20591=@"loc,{#10000},43,2,43,4"
+locations_default(#20591,#10000,43,2,43,4)
+hasLocation(#20590,#20591)
+is_inverted(#20590)
 #20592=*
-exprs(#20592,5,#20591,0,"/<tpl\b ... \/tpl>/")
-hasLocation(#20592,#20263)
-enclosing_stmt(#20592,#20591)
-expr_containers(#20592,#20001)
-literals("/<tpl\b[^>]*>((?:(?=([^<]+))\2|<(?!tpl\b[^>]*>))*?)<\/tpl>/","/<tpl\b[^>]*>((?:(?=([^<]+))\2|<(?!tpl\b[^>]*>))*?)<\/tpl>/",#20592)
+stmts(#20592,2,#20001,43,"/<tpl\b ... /tpl>/;")
+hasLocation(#20592,#20089)
+stmt_containers(#20592,#20001)
 #20593=*
-regexpterm(#20593,1,#20592,0,"<tpl\b[^>]*>((?:(?=([^<]+))\2|<(?!tpl\b[^>]*>))*?)<\/tpl>")
-#20594=@"loc,{#10000},44,2,44,58"
-locations_default(#20594,#10000,44,2,44,58)
-hasLocation(#20593,#20594)
-#20595=*
-regexpterm(#20595,14,#20593,0,"<tpl")
-#20596=@"loc,{#10000},44,2,44,5"
-locations_default(#20596,#10000,44,2,44,5)
-hasLocation(#20595,#20596)
-regexp_const_value(#20595,"<tpl")
-#20597=*
-regexpterm(#20597,4,#20593,1,"\b")
-#20598=@"loc,{#10000},44,6,44,7"
-locations_default(#20598,#10000,44,6,44,7)
-hasLocation(#20597,#20598)
-#20599=*
-regexpterm(#20599,8,#20593,2,"[^>]*")
-#20600=@"loc,{#10000},44,8,44,12"
-locations_default(#20600,#10000,44,8,44,12)
-hasLocation(#20599,#20600)
-is_greedy(#20599)
-#20601=*
-regexpterm(#20601,23,#20599,0,"[^>]")
-#20602=@"loc,{#10000},44,8,44,11"
-locations_default(#20602,#10000,44,8,44,11)
-hasLocation(#20601,#20602)
-is_inverted(#20601)
-#20603=*
-regexpterm(#20603,14,#20601,0,">")
-#20604=@"loc,{#10000},44,10,44,10"
-locations_default(#20604,#10000,44,10,44,10)
-hasLocation(#20603,#20604)
-regexp_const_value(#20603,">")
-#20605=*
-regexpterm(#20605,14,#20593,3,">")
-#20606=@"loc,{#10000},44,13,44,13"
-locations_default(#20606,#10000,44,13,44,13)
-hasLocation(#20605,#20606)
-regexp_const_value(#20605,">")
-#20607=*
-regexpterm(#20607,13,#20593,4,"((?:(?=([^<]+))\2|<(?!tpl\b[^>]*>))*?)")
-#20608=@"loc,{#10000},44,14,44,51"
-locations_default(#20608,#10000,44,14,44,51)
-hasLocation(#20607,#20608)
-is_capture(#20607,1)
-#20609=*
-regexpterm(#20609,8,#20607,0,"(?:(?=([^<]+))\2|<(?!tpl\b[^>]*>))*?")
-#20610=@"loc,{#10000},44,15,44,50"
-locations_default(#20610,#10000,44,15,44,50)
-hasLocation(#20609,#20610)
-#20611=*
-regexpterm(#20611,13,#20609,0,"(?:(?=([^<]+))\2|<(?!tpl\b[^>]*>))")
-#20612=@"loc,{#10000},44,15,44,48"
-locations_default(#20612,#10000,44,15,44,48)
-hasLocation(#20611,#20612)
-#20613=*
-regexpterm(#20613,0,#20611,0,"(?=([^<]+))\2|<(?!tpl\b[^>]*>)")
-#20614=@"loc,{#10000},44,18,44,47"
-locations_default(#20614,#10000,44,18,44,47)
-hasLocation(#20613,#20614)
-#20615=*
-regexpterm(#20615,1,#20613,0,"(?=([^<]+))\2")
-#20616=@"loc,{#10000},44,18,44,30"
-locations_default(#20616,#10000,44,18,44,30)
-hasLocation(#20615,#20616)
-#20617=*
-regexpterm(#20617,6,#20615,0,"(?=([^<]+))")
-#20618=@"loc,{#10000},44,18,44,28"
-locations_default(#20618,#10000,44,18,44,28)
-hasLocation(#20617,#20618)
-#20619=*
-regexpterm(#20619,13,#20617,0,"([^<]+)")
-#20620=@"loc,{#10000},44,21,44,27"
-locations_default(#20620,#10000,44,21,44,27)
-hasLocation(#20619,#20620)
-is_capture(#20619,2)
-#20621=*
-regexpterm(#20621,9,#20619,0,"[^<]+")
-#20622=@"loc,{#10000},44,22,44,26"
-locations_default(#20622,#10000,44,22,44,26)
-hasLocation(#20621,#20622)
-is_greedy(#20621)
-#20623=*
-regexpterm(#20623,23,#20621,0,"[^<]")
-#20624=@"loc,{#10000},44,22,44,25"
-locations_default(#20624,#10000,44,22,44,25)
-hasLocation(#20623,#20624)
-is_inverted(#20623)
-#20625=*
-regexpterm(#20625,14,#20623,0,"<")
-#20626=@"loc,{#10000},44,24,44,24"
-locations_default(#20626,#10000,44,24,44,24)
-hasLocation(#20625,#20626)
-regexp_const_value(#20625,"<")
-#20627=*
-regexpterm(#20627,22,#20615,1,"\2")
-#20628=@"loc,{#10000},44,29,44,30"
-locations_default(#20628,#10000,44,29,44,30)
-hasLocation(#20627,#20628)
-backref(#20627,2)
-#20629=*
-regexpterm(#20629,1,#20613,1,"<(?!tpl\b[^>]*>)")
-#20630=@"loc,{#10000},44,32,44,47"
-locations_default(#20630,#10000,44,32,44,47)
-hasLocation(#20629,#20630)
-#20631=*
-regexpterm(#20631,14,#20629,0,"<")
-#20632=@"loc,{#10000},44,32,44,32"
-locations_default(#20632,#10000,44,32,44,32)
-hasLocation(#20631,#20632)
-regexp_const_value(#20631,"<")
-#20633=*
-regexpterm(#20633,7,#20629,1,"(?!tpl\b[^>]*>)")
-#20634=@"loc,{#10000},44,33,44,47"
-locations_default(#20634,#10000,44,33,44,47)
-hasLocation(#20633,#20634)
-#20635=*
-regexpterm(#20635,1,#20633,0,"tpl\b[^>]*>")
-#20636=@"loc,{#10000},44,36,44,46"
-locations_default(#20636,#10000,44,36,44,46)
-hasLocation(#20635,#20636)
-#20637=*
-regexpterm(#20637,14,#20635,0,"tpl")
-#20638=@"loc,{#10000},44,36,44,38"
-locations_default(#20638,#10000,44,36,44,38)
-hasLocation(#20637,#20638)
-regexp_const_value(#20637,"tpl")
-#20639=*
-regexpterm(#20639,4,#20635,1,"\b")
-#20640=@"loc,{#10000},44,39,44,40"
-locations_default(#20640,#10000,44,39,44,40)
-hasLocation(#20639,#20640)
-#20641=*
-regexpterm(#20641,8,#20635,2,"[^>]*")
-#20642=@"loc,{#10000},44,41,44,45"
-locations_default(#20642,#10000,44,41,44,45)
-hasLocation(#20641,#20642)
-is_greedy(#20641)
-#20643=*
-regexpterm(#20643,23,#20641,0,"[^>]")
-#20644=@"loc,{#10000},44,41,44,44"
-locations_default(#20644,#10000,44,41,44,44)
-hasLocation(#20643,#20644)
-is_inverted(#20643)
-#20645=*
-regexpterm(#20645,14,#20643,0,">")
-#20646=@"loc,{#10000},44,43,44,43"
-locations_default(#20646,#10000,44,43,44,43)
-hasLocation(#20645,#20646)
-regexp_const_value(#20645,">")
-#20647=*
-regexpterm(#20647,14,#20635,3,">")
-#20648=@"loc,{#10000},44,46,44,46"
-locations_default(#20648,#10000,44,46,44,46)
-hasLocation(#20647,#20648)
-regexp_const_value(#20647,">")
-#20649=*
-regexpterm(#20649,14,#20593,5,"<")
-#20650=@"loc,{#10000},44,52,44,52"
-locations_default(#20650,#10000,44,52,44,52)
-hasLocation(#20649,#20650)
-regexp_const_value(#20649,"<")
-#20651=*
-regexpterm(#20651,21,#20593,6,"\/")
-#20652=@"loc,{#10000},44,53,44,54"
-locations_default(#20652,#10000,44,53,44,54)
-hasLocation(#20651,#20652)
-regexp_const_value(#20651,"/")
-#20653=*
-regexpterm(#20653,14,#20593,7,"tpl>")
-#20654=@"loc,{#10000},44,55,44,58"
-locations_default(#20654,#10000,44,55,44,58)
-hasLocation(#20653,#20654)
-regexp_const_value(#20653,"tpl>")
-#20655=*
-entry_cfg_node(#20655,#20001)
-#20656=@"loc,{#10000},1,1,1,0"
-locations_default(#20656,#10000,1,1,1,0)
-hasLocation(#20655,#20656)
-#20657=*
-exit_cfg_node(#20657,#20001)
-hasLocation(#20657,#20267)
-successor(#20591,#20592)
-successor(#20592,#20657)
-successor(#20587,#20588)
-successor(#20588,#20591)
-successor(#20583,#20584)
-successor(#20584,#20587)
-successor(#20577,#20578)
-successor(#20578,#20583)
-successor(#20571,#20572)
-successor(#20572,#20577)
-successor(#20564,#20565)
-successor(#20565,#20571)
-successor(#20549,#20550)
-successor(#20550,#20564)
-successor(#20540,#20541)
-successor(#20541,#20549)
-successor(#20530,#20531)
-successor(#20531,#20540)
-successor(#20520,#20521)
-successor(#20521,#20530)
-successor(#20508,#20509)
-successor(#20509,#20520)
-successor(#20492,#20493)
-successor(#20493,#20508)
-successor(#20482,#20483)
-successor(#20483,#20492)
-successor(#20472,#20473)
-successor(#20473,#20482)
-successor(#20468,#20469)
-successor(#20469,#20472)
-successor(#20460,#20461)
-successor(#20461,#20468)
-successor(#20452,#20453)
-successor(#20453,#20460)
-successor(#20438,#20439)
-successor(#20439,#20452)
-successor(#20433,#20434)
-successor(#20434,#20438)
-successor(#20429,#20430)
-successor(#20430,#20433)
-successor(#20425,#20426)
-successor(#20426,#20429)
-successor(#20419,#20420)
-successor(#20420,#20425)
-successor(#20413,#20414)
-successor(#20414,#20419)
-successor(#20409,#20410)
-successor(#20410,#20413)
-successor(#20403,#20404)
-successor(#20404,#20409)
-successor(#20397,#20398)
-successor(#20398,#20403)
-successor(#20391,#20392)
-successor(#20392,#20397)
-successor(#20385,#20386)
-successor(#20386,#20391)
-successor(#20379,#20380)
-successor(#20380,#20385)
-successor(#20373,#20374)
-successor(#20374,#20379)
-successor(#20367,#20368)
-successor(#20368,#20373)
-successor(#20361,#20362)
-successor(#20362,#20367)
-successor(#20355,#20356)
-successor(#20356,#20361)
-successor(#20349,#20350)
-successor(#20350,#20355)
-successor(#20343,#20344)
-successor(#20344,#20349)
-successor(#20337,#20338)
-successor(#20338,#20343)
-successor(#20327,#20328)
-successor(#20328,#20337)
-successor(#20317,#20318)
-successor(#20318,#20327)
-successor(#20307,#20308)
-successor(#20308,#20317)
-successor(#20297,#20298)
-successor(#20298,#20307)
-successor(#20287,#20288)
-successor(#20288,#20297)
-successor(#20281,#20282)
-successor(#20282,#20287)
-successor(#20273,#20274)
-successor(#20274,#20281)
-successor(#20269,#20270)
-successor(#20270,#20273)
-successor(#20655,#20269)
+exprs(#20593,5,#20592,0,"/<tpl\b ... \/tpl>/")
+hasLocation(#20593,#20263)
+enclosing_stmt(#20593,#20592)
+expr_containers(#20593,#20001)
+literals("/<tpl\b[^>]*>((?:(?=([^<]+))\2|<(?!tpl\b[^>]*>))*?)<\/tpl>/","/<tpl\b[^>]*>((?:(?=([^<]+))\2|<(?!tpl\b[^>]*>))*?)<\/tpl>/",#20593)
+#20594=*
+regexpterm(#20594,1,#20593,0,"<tpl\b[^>]*>((?:(?=([^<]+))\2|<(?!tpl\b[^>]*>))*?)<\/tpl>")
+#20595=@"loc,{#10000},44,2,44,58"
+locations_default(#20595,#10000,44,2,44,58)
+hasLocation(#20594,#20595)
+#20596=*
+regexpterm(#20596,14,#20594,0,"<tpl")
+#20597=@"loc,{#10000},44,2,44,5"
+locations_default(#20597,#10000,44,2,44,5)
+hasLocation(#20596,#20597)
+regexp_const_value(#20596,"<tpl")
+#20598=*
+regexpterm(#20598,4,#20594,1,"\b")
+#20599=@"loc,{#10000},44,6,44,7"
+locations_default(#20599,#10000,44,6,44,7)
+hasLocation(#20598,#20599)
+#20600=*
+regexpterm(#20600,8,#20594,2,"[^>]*")
+#20601=@"loc,{#10000},44,8,44,12"
+locations_default(#20601,#10000,44,8,44,12)
+hasLocation(#20600,#20601)
+is_greedy(#20600)
+#20602=*
+regexpterm(#20602,23,#20600,0,"[^>]")
+#20603=@"loc,{#10000},44,8,44,11"
+locations_default(#20603,#10000,44,8,44,11)
+hasLocation(#20602,#20603)
+is_inverted(#20602)
+#20604=*
+regexpterm(#20604,14,#20602,0,">")
+#20605=@"loc,{#10000},44,10,44,10"
+locations_default(#20605,#10000,44,10,44,10)
+hasLocation(#20604,#20605)
+regexp_const_value(#20604,">")
+#20606=*
+regexpterm(#20606,14,#20594,3,">")
+#20607=@"loc,{#10000},44,13,44,13"
+locations_default(#20607,#10000,44,13,44,13)
+hasLocation(#20606,#20607)
+regexp_const_value(#20606,">")
+#20608=*
+regexpterm(#20608,13,#20594,4,"((?:(?=([^<]+))\2|<(?!tpl\b[^>]*>))*?)")
+#20609=@"loc,{#10000},44,14,44,51"
+locations_default(#20609,#10000,44,14,44,51)
+hasLocation(#20608,#20609)
+is_capture(#20608,1)
+#20610=*
+regexpterm(#20610,8,#20608,0,"(?:(?=([^<]+))\2|<(?!tpl\b[^>]*>))*?")
+#20611=@"loc,{#10000},44,15,44,50"
+locations_default(#20611,#10000,44,15,44,50)
+hasLocation(#20610,#20611)
+#20612=*
+regexpterm(#20612,13,#20610,0,"(?:(?=([^<]+))\2|<(?!tpl\b[^>]*>))")
+#20613=@"loc,{#10000},44,15,44,48"
+locations_default(#20613,#10000,44,15,44,48)
+hasLocation(#20612,#20613)
+#20614=*
+regexpterm(#20614,0,#20612,0,"(?=([^<]+))\2|<(?!tpl\b[^>]*>)")
+#20615=@"loc,{#10000},44,18,44,47"
+locations_default(#20615,#10000,44,18,44,47)
+hasLocation(#20614,#20615)
+#20616=*
+regexpterm(#20616,1,#20614,0,"(?=([^<]+))\2")
+#20617=@"loc,{#10000},44,18,44,30"
+locations_default(#20617,#10000,44,18,44,30)
+hasLocation(#20616,#20617)
+#20618=*
+regexpterm(#20618,6,#20616,0,"(?=([^<]+))")
+#20619=@"loc,{#10000},44,18,44,28"
+locations_default(#20619,#10000,44,18,44,28)
+hasLocation(#20618,#20619)
+#20620=*
+regexpterm(#20620,13,#20618,0,"([^<]+)")
+#20621=@"loc,{#10000},44,21,44,27"
+locations_default(#20621,#10000,44,21,44,27)
+hasLocation(#20620,#20621)
+is_capture(#20620,2)
+#20622=*
+regexpterm(#20622,9,#20620,0,"[^<]+")
+#20623=@"loc,{#10000},44,22,44,26"
+locations_default(#20623,#10000,44,22,44,26)
+hasLocation(#20622,#20623)
+is_greedy(#20622)
+#20624=*
+regexpterm(#20624,23,#20622,0,"[^<]")
+#20625=@"loc,{#10000},44,22,44,25"
+locations_default(#20625,#10000,44,22,44,25)
+hasLocation(#20624,#20625)
+is_inverted(#20624)
+#20626=*
+regexpterm(#20626,14,#20624,0,"<")
+#20627=@"loc,{#10000},44,24,44,24"
+locations_default(#20627,#10000,44,24,44,24)
+hasLocation(#20626,#20627)
+regexp_const_value(#20626,"<")
+#20628=*
+regexpterm(#20628,22,#20616,1,"\2")
+#20629=@"loc,{#10000},44,29,44,30"
+locations_default(#20629,#10000,44,29,44,30)
+hasLocation(#20628,#20629)
+backref(#20628,2)
+#20630=*
+regexpterm(#20630,1,#20614,1,"<(?!tpl\b[^>]*>)")
+#20631=@"loc,{#10000},44,32,44,47"
+locations_default(#20631,#10000,44,32,44,47)
+hasLocation(#20630,#20631)
+#20632=*
+regexpterm(#20632,14,#20630,0,"<")
+#20633=@"loc,{#10000},44,32,44,32"
+locations_default(#20633,#10000,44,32,44,32)
+hasLocation(#20632,#20633)
+regexp_const_value(#20632,"<")
+#20634=*
+regexpterm(#20634,7,#20630,1,"(?!tpl\b[^>]*>)")
+#20635=@"loc,{#10000},44,33,44,47"
+locations_default(#20635,#10000,44,33,44,47)
+hasLocation(#20634,#20635)
+#20636=*
+regexpterm(#20636,1,#20634,0,"tpl\b[^>]*>")
+#20637=@"loc,{#10000},44,36,44,46"
+locations_default(#20637,#10000,44,36,44,46)
+hasLocation(#20636,#20637)
+#20638=*
+regexpterm(#20638,14,#20636,0,"tpl")
+#20639=@"loc,{#10000},44,36,44,38"
+locations_default(#20639,#10000,44,36,44,38)
+hasLocation(#20638,#20639)
+regexp_const_value(#20638,"tpl")
+#20640=*
+regexpterm(#20640,4,#20636,1,"\b")
+#20641=@"loc,{#10000},44,39,44,40"
+locations_default(#20641,#10000,44,39,44,40)
+hasLocation(#20640,#20641)
+#20642=*
+regexpterm(#20642,8,#20636,2,"[^>]*")
+#20643=@"loc,{#10000},44,41,44,45"
+locations_default(#20643,#10000,44,41,44,45)
+hasLocation(#20642,#20643)
+is_greedy(#20642)
+#20644=*
+regexpterm(#20644,23,#20642,0,"[^>]")
+#20645=@"loc,{#10000},44,41,44,44"
+locations_default(#20645,#10000,44,41,44,44)
+hasLocation(#20644,#20645)
+is_inverted(#20644)
+#20646=*
+regexpterm(#20646,14,#20644,0,">")
+#20647=@"loc,{#10000},44,43,44,43"
+locations_default(#20647,#10000,44,43,44,43)
+hasLocation(#20646,#20647)
+regexp_const_value(#20646,">")
+#20648=*
+regexpterm(#20648,14,#20636,3,">")
+#20649=@"loc,{#10000},44,46,44,46"
+locations_default(#20649,#10000,44,46,44,46)
+hasLocation(#20648,#20649)
+regexp_const_value(#20648,">")
+#20650=*
+regexpterm(#20650,14,#20594,5,"<")
+#20651=@"loc,{#10000},44,52,44,52"
+locations_default(#20651,#10000,44,52,44,52)
+hasLocation(#20650,#20651)
+regexp_const_value(#20650,"<")
+#20652=*
+regexpterm(#20652,21,#20594,6,"\/")
+#20653=@"loc,{#10000},44,53,44,54"
+locations_default(#20653,#10000,44,53,44,54)
+hasLocation(#20652,#20653)
+regexp_const_value(#20652,"/")
+#20654=*
+regexpterm(#20654,14,#20594,7,"tpl>")
+#20655=@"loc,{#10000},44,55,44,58"
+locations_default(#20655,#10000,44,55,44,58)
+hasLocation(#20654,#20655)
+regexp_const_value(#20654,"tpl>")
+#20656=*
+entry_cfg_node(#20656,#20001)
+#20657=@"loc,{#10000},1,1,1,0"
+locations_default(#20657,#10000,1,1,1,0)
+hasLocation(#20656,#20657)
+#20658=*
+exit_cfg_node(#20658,#20001)
+hasLocation(#20658,#20267)
+successor(#20592,#20593)
+successor(#20593,#20658)
+successor(#20588,#20589)
+successor(#20589,#20592)
+successor(#20584,#20585)
+successor(#20585,#20588)
+successor(#20578,#20579)
+successor(#20579,#20584)
+successor(#20572,#20573)
+successor(#20573,#20578)
+successor(#20565,#20566)
+successor(#20566,#20572)
+successor(#20550,#20551)
+successor(#20551,#20565)
+successor(#20541,#20542)
+successor(#20542,#20550)
+successor(#20531,#20532)
+successor(#20532,#20541)
+successor(#20521,#20522)
+successor(#20522,#20531)
+successor(#20509,#20510)
+successor(#20510,#20521)
+successor(#20493,#20494)
+successor(#20494,#20509)
+successor(#20483,#20484)
+successor(#20484,#20493)
+successor(#20473,#20474)
+successor(#20474,#20483)
+successor(#20469,#20470)
+successor(#20470,#20473)
+successor(#20461,#20462)
+successor(#20462,#20469)
+successor(#20453,#20454)
+successor(#20454,#20461)
+successor(#20439,#20440)
+successor(#20440,#20453)
+successor(#20434,#20435)
+successor(#20435,#20439)
+successor(#20430,#20431)
+successor(#20431,#20434)
+successor(#20426,#20427)
+successor(#20427,#20430)
+successor(#20420,#20421)
+successor(#20421,#20426)
+successor(#20414,#20415)
+successor(#20415,#20420)
+successor(#20410,#20411)
+successor(#20411,#20414)
+successor(#20404,#20405)
+successor(#20405,#20410)
+successor(#20398,#20399)
+successor(#20399,#20404)
+successor(#20392,#20393)
+successor(#20393,#20398)
+successor(#20386,#20387)
+successor(#20387,#20392)
+successor(#20380,#20381)
+successor(#20381,#20386)
+successor(#20374,#20375)
+successor(#20375,#20380)
+successor(#20368,#20369)
+successor(#20369,#20374)
+successor(#20362,#20363)
+successor(#20363,#20368)
+successor(#20356,#20357)
+successor(#20357,#20362)
+successor(#20350,#20351)
+successor(#20351,#20356)
+successor(#20344,#20345)
+successor(#20345,#20350)
+successor(#20338,#20339)
+successor(#20339,#20344)
+successor(#20328,#20329)
+successor(#20329,#20338)
+successor(#20318,#20319)
+successor(#20319,#20328)
+successor(#20308,#20309)
+successor(#20309,#20318)
+successor(#20298,#20299)
+successor(#20299,#20308)
+successor(#20288,#20289)
+successor(#20289,#20298)
+successor(#20282,#20283)
+successor(#20283,#20288)
+successor(#20274,#20275)
+successor(#20275,#20282)
+successor(#20270,#20271)
+successor(#20271,#20274)
+successor(#20656,#20270)
 numlines(#10000,44,44,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/exprs/output/trap/unary.js.trap b/javascript/extractor/tests/exprs/output/trap/unary.js.trap
index aca29eb7033..bf2ceef513d 100644
--- a/javascript/extractor/tests/exprs/output/trap/unary.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/unary.js.trap
@@ -185,181 +185,183 @@ toplevels(#20001,0)
 #20068=@"loc,{#10000},1,1,7,24"
 locations_default(#20068,#10000,1,1,7,24)
 hasLocation(#20001,#20068)
-#20069=*
-stmts(#20069,2,#20001,0,"-23;")
-hasLocation(#20069,#20003)
-stmt_containers(#20069,#20001)
+#20069=@"var;{this};{#20000}"
+variables(#20069,"this",#20000)
 #20070=*
-exprs(#20070,16,#20069,0,"-23")
-#20071=@"loc,{#10000},1,1,1,3"
-locations_default(#20071,#10000,1,1,1,3)
-hasLocation(#20070,#20071)
-enclosing_stmt(#20070,#20069)
-expr_containers(#20070,#20001)
-#20072=*
-exprs(#20072,3,#20070,0,"23")
-hasLocation(#20072,#20019)
-enclosing_stmt(#20072,#20069)
-expr_containers(#20072,#20001)
-literals("23","23",#20072)
+stmts(#20070,2,#20001,0,"-23;")
+hasLocation(#20070,#20003)
+stmt_containers(#20070,#20001)
+#20071=*
+exprs(#20071,16,#20070,0,"-23")
+#20072=@"loc,{#10000},1,1,1,3"
+locations_default(#20072,#10000,1,1,1,3)
+hasLocation(#20071,#20072)
+enclosing_stmt(#20071,#20070)
+expr_containers(#20071,#20001)
 #20073=*
-stmts(#20073,2,#20001,1,"+42;")
-hasLocation(#20073,#20005)
-stmt_containers(#20073,#20001)
+exprs(#20073,3,#20071,0,"23")
+hasLocation(#20073,#20019)
+enclosing_stmt(#20073,#20070)
+expr_containers(#20073,#20001)
+literals("23","23",#20073)
 #20074=*
-exprs(#20074,17,#20073,0,"+42")
-#20075=@"loc,{#10000},2,1,2,3"
-locations_default(#20075,#10000,2,1,2,3)
-hasLocation(#20074,#20075)
-enclosing_stmt(#20074,#20073)
-expr_containers(#20074,#20001)
-#20076=*
-exprs(#20076,3,#20074,0,"42")
-hasLocation(#20076,#20025)
-enclosing_stmt(#20076,#20073)
-expr_containers(#20076,#20001)
-literals("42","42",#20076)
+stmts(#20074,2,#20001,1,"+42;")
+hasLocation(#20074,#20005)
+stmt_containers(#20074,#20001)
+#20075=*
+exprs(#20075,17,#20074,0,"+42")
+#20076=@"loc,{#10000},2,1,2,3"
+locations_default(#20076,#10000,2,1,2,3)
+hasLocation(#20075,#20076)
+enclosing_stmt(#20075,#20074)
+expr_containers(#20075,#20001)
 #20077=*
-stmts(#20077,2,#20001,2,"!true;")
-hasLocation(#20077,#20007)
-stmt_containers(#20077,#20001)
+exprs(#20077,3,#20075,0,"42")
+hasLocation(#20077,#20025)
+enclosing_stmt(#20077,#20074)
+expr_containers(#20077,#20001)
+literals("42","42",#20077)
 #20078=*
-exprs(#20078,18,#20077,0,"!true")
-#20079=@"loc,{#10000},3,1,3,5"
-locations_default(#20079,#10000,3,1,3,5)
-hasLocation(#20078,#20079)
-enclosing_stmt(#20078,#20077)
-expr_containers(#20078,#20001)
-#20080=*
-exprs(#20080,2,#20078,0,"true")
-hasLocation(#20080,#20031)
-enclosing_stmt(#20080,#20077)
-expr_containers(#20080,#20001)
-literals("true","true",#20080)
+stmts(#20078,2,#20001,2,"!true;")
+hasLocation(#20078,#20007)
+stmt_containers(#20078,#20001)
+#20079=*
+exprs(#20079,18,#20078,0,"!true")
+#20080=@"loc,{#10000},3,1,3,5"
+locations_default(#20080,#10000,3,1,3,5)
+hasLocation(#20079,#20080)
+enclosing_stmt(#20079,#20078)
+expr_containers(#20079,#20001)
 #20081=*
-stmts(#20081,2,#20001,3,"~2;")
-hasLocation(#20081,#20009)
-stmt_containers(#20081,#20001)
+exprs(#20081,2,#20079,0,"true")
+hasLocation(#20081,#20031)
+enclosing_stmt(#20081,#20078)
+expr_containers(#20081,#20001)
+literals("true","true",#20081)
 #20082=*
-exprs(#20082,19,#20081,0,"~2")
-#20083=@"loc,{#10000},4,1,4,2"
-locations_default(#20083,#10000,4,1,4,2)
-hasLocation(#20082,#20083)
-enclosing_stmt(#20082,#20081)
-expr_containers(#20082,#20001)
-#20084=*
-exprs(#20084,3,#20082,0,"2")
-hasLocation(#20084,#20037)
-enclosing_stmt(#20084,#20081)
-expr_containers(#20084,#20001)
-literals("2","2",#20084)
+stmts(#20082,2,#20001,3,"~2;")
+hasLocation(#20082,#20009)
+stmt_containers(#20082,#20001)
+#20083=*
+exprs(#20083,19,#20082,0,"~2")
+#20084=@"loc,{#10000},4,1,4,2"
+locations_default(#20084,#10000,4,1,4,2)
+hasLocation(#20083,#20084)
+enclosing_stmt(#20083,#20082)
+expr_containers(#20083,#20001)
 #20085=*
-stmts(#20085,2,#20001,4,"typeof Object;")
-hasLocation(#20085,#20011)
-stmt_containers(#20085,#20001)
+exprs(#20085,3,#20083,0,"2")
+hasLocation(#20085,#20037)
+enclosing_stmt(#20085,#20082)
+expr_containers(#20085,#20001)
+literals("2","2",#20085)
 #20086=*
-exprs(#20086,20,#20085,0,"typeof Object")
-#20087=@"loc,{#10000},5,1,5,13"
-locations_default(#20087,#10000,5,1,5,13)
-hasLocation(#20086,#20087)
-enclosing_stmt(#20086,#20085)
-expr_containers(#20086,#20001)
-#20088=*
-exprs(#20088,79,#20086,0,"Object")
-hasLocation(#20088,#20043)
-enclosing_stmt(#20088,#20085)
-expr_containers(#20088,#20001)
-literals("Object","Object",#20088)
-#20089=@"var;{Object};{#20000}"
-variables(#20089,"Object",#20000)
-bind(#20088,#20089)
-#20090=*
-stmts(#20090,2,#20001,5,"void(0);")
-hasLocation(#20090,#20013)
-stmt_containers(#20090,#20001)
+stmts(#20086,2,#20001,4,"typeof Object;")
+hasLocation(#20086,#20011)
+stmt_containers(#20086,#20001)
+#20087=*
+exprs(#20087,20,#20086,0,"typeof Object")
+#20088=@"loc,{#10000},5,1,5,13"
+locations_default(#20088,#10000,5,1,5,13)
+hasLocation(#20087,#20088)
+enclosing_stmt(#20087,#20086)
+expr_containers(#20087,#20001)
+#20089=*
+exprs(#20089,79,#20087,0,"Object")
+hasLocation(#20089,#20043)
+enclosing_stmt(#20089,#20086)
+expr_containers(#20089,#20001)
+literals("Object","Object",#20089)
+#20090=@"var;{Object};{#20000}"
+variables(#20090,"Object",#20000)
+bind(#20089,#20090)
 #20091=*
-exprs(#20091,21,#20090,0,"void(0)")
-#20092=@"loc,{#10000},6,1,6,7"
-locations_default(#20092,#10000,6,1,6,7)
-hasLocation(#20091,#20092)
-enclosing_stmt(#20091,#20090)
-expr_containers(#20091,#20001)
-#20093=*
-exprs(#20093,63,#20091,0,"(0)")
-#20094=@"loc,{#10000},6,5,6,7"
-locations_default(#20094,#10000,6,5,6,7)
-hasLocation(#20093,#20094)
-enclosing_stmt(#20093,#20090)
-expr_containers(#20093,#20001)
-#20095=*
-exprs(#20095,3,#20093,0,"0")
-hasLocation(#20095,#20051)
-enclosing_stmt(#20095,#20090)
-expr_containers(#20095,#20001)
-literals("0","0",#20095)
+stmts(#20091,2,#20001,5,"void(0);")
+hasLocation(#20091,#20013)
+stmt_containers(#20091,#20001)
+#20092=*
+exprs(#20092,21,#20091,0,"void(0)")
+#20093=@"loc,{#10000},6,1,6,7"
+locations_default(#20093,#10000,6,1,6,7)
+hasLocation(#20092,#20093)
+enclosing_stmt(#20092,#20091)
+expr_containers(#20092,#20001)
+#20094=*
+exprs(#20094,63,#20092,0,"(0)")
+#20095=@"loc,{#10000},6,5,6,7"
+locations_default(#20095,#10000,6,5,6,7)
+hasLocation(#20094,#20095)
+enclosing_stmt(#20094,#20091)
+expr_containers(#20094,#20001)
 #20096=*
-stmts(#20096,2,#20001,6,"delete  ... totype;")
-hasLocation(#20096,#20015)
-stmt_containers(#20096,#20001)
+exprs(#20096,3,#20094,0,"0")
+hasLocation(#20096,#20051)
+enclosing_stmt(#20096,#20091)
+expr_containers(#20096,#20001)
+literals("0","0",#20096)
 #20097=*
-exprs(#20097,22,#20096,0,"delete  ... ototype")
-#20098=@"loc,{#10000},7,1,7,23"
-locations_default(#20098,#10000,7,1,7,23)
-hasLocation(#20097,#20098)
-enclosing_stmt(#20097,#20096)
-expr_containers(#20097,#20001)
-#20099=*
-exprs(#20099,14,#20097,0,"Object.prototype")
-#20100=@"loc,{#10000},7,8,7,23"
-locations_default(#20100,#10000,7,8,7,23)
-hasLocation(#20099,#20100)
-enclosing_stmt(#20099,#20096)
-expr_containers(#20099,#20001)
-#20101=*
-exprs(#20101,79,#20099,0,"Object")
-hasLocation(#20101,#20059)
-enclosing_stmt(#20101,#20096)
-expr_containers(#20101,#20001)
-literals("Object","Object",#20101)
-bind(#20101,#20089)
+stmts(#20097,2,#20001,6,"delete  ... totype;")
+hasLocation(#20097,#20015)
+stmt_containers(#20097,#20001)
+#20098=*
+exprs(#20098,22,#20097,0,"delete  ... ototype")
+#20099=@"loc,{#10000},7,1,7,23"
+locations_default(#20099,#10000,7,1,7,23)
+hasLocation(#20098,#20099)
+enclosing_stmt(#20098,#20097)
+expr_containers(#20098,#20001)
+#20100=*
+exprs(#20100,14,#20098,0,"Object.prototype")
+#20101=@"loc,{#10000},7,8,7,23"
+locations_default(#20101,#10000,7,8,7,23)
+hasLocation(#20100,#20101)
+enclosing_stmt(#20100,#20097)
+expr_containers(#20100,#20001)
 #20102=*
-exprs(#20102,0,#20099,1,"prototype")
-hasLocation(#20102,#20063)
-enclosing_stmt(#20102,#20096)
+exprs(#20102,79,#20100,0,"Object")
+hasLocation(#20102,#20059)
+enclosing_stmt(#20102,#20097)
 expr_containers(#20102,#20001)
-literals("prototype","prototype",#20102)
+literals("Object","Object",#20102)
+bind(#20102,#20090)
 #20103=*
-entry_cfg_node(#20103,#20001)
-#20104=@"loc,{#10000},1,1,1,0"
-locations_default(#20104,#10000,1,1,1,0)
-hasLocation(#20103,#20104)
-#20105=*
-exit_cfg_node(#20105,#20001)
-hasLocation(#20105,#20067)
-successor(#20096,#20101)
-successor(#20102,#20099)
-successor(#20101,#20102)
-successor(#20099,#20097)
-successor(#20097,#20105)
-successor(#20090,#20093)
-successor(#20093,#20095)
-successor(#20095,#20091)
-successor(#20091,#20096)
-successor(#20085,#20088)
-successor(#20088,#20086)
-successor(#20086,#20090)
-successor(#20081,#20084)
-successor(#20084,#20082)
+exprs(#20103,0,#20100,1,"prototype")
+hasLocation(#20103,#20063)
+enclosing_stmt(#20103,#20097)
+expr_containers(#20103,#20001)
+literals("prototype","prototype",#20103)
+#20104=*
+entry_cfg_node(#20104,#20001)
+#20105=@"loc,{#10000},1,1,1,0"
+locations_default(#20105,#10000,1,1,1,0)
+hasLocation(#20104,#20105)
+#20106=*
+exit_cfg_node(#20106,#20001)
+hasLocation(#20106,#20067)
+successor(#20097,#20102)
+successor(#20103,#20100)
+successor(#20102,#20103)
+successor(#20100,#20098)
+successor(#20098,#20106)
+successor(#20091,#20094)
+successor(#20094,#20096)
+successor(#20096,#20092)
+successor(#20092,#20097)
+successor(#20086,#20089)
+successor(#20089,#20087)
+successor(#20087,#20091)
 successor(#20082,#20085)
-successor(#20077,#20080)
-successor(#20080,#20078)
+successor(#20085,#20083)
+successor(#20083,#20086)
 successor(#20078,#20081)
-successor(#20073,#20076)
-successor(#20076,#20074)
+successor(#20081,#20079)
+successor(#20079,#20082)
 successor(#20074,#20077)
-successor(#20069,#20072)
-successor(#20072,#20070)
+successor(#20077,#20075)
+successor(#20075,#20078)
 successor(#20070,#20073)
-successor(#20103,#20069)
+successor(#20073,#20071)
+successor(#20071,#20074)
+successor(#20104,#20070)
 numlines(#10000,7,7,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/exprs/output/trap/update.js.trap b/javascript/extractor/tests/exprs/output/trap/update.js.trap
index dba8253323f..dbf0a06d9f3 100644
--- a/javascript/extractor/tests/exprs/output/trap/update.js.trap
+++ b/javascript/extractor/tests/exprs/output/trap/update.js.trap
@@ -103,102 +103,104 @@ toplevels(#20001,0)
 #20036=@"loc,{#10000},1,1,5,0"
 locations_default(#20036,#10000,1,1,5,0)
 hasLocation(#20001,#20036)
-#20037=*
-stmts(#20037,2,#20001,0,"++a;")
-hasLocation(#20037,#20003)
-stmt_containers(#20037,#20001)
+#20037=@"var;{this};{#20000}"
+variables(#20037,"this",#20000)
 #20038=*
-exprs(#20038,59,#20037,0,"++a")
-#20039=@"loc,{#10000},1,1,1,3"
-locations_default(#20039,#10000,1,1,1,3)
-hasLocation(#20038,#20039)
-enclosing_stmt(#20038,#20037)
-expr_containers(#20038,#20001)
-#20040=*
-exprs(#20040,79,#20038,0,"a")
-hasLocation(#20040,#20013)
-enclosing_stmt(#20040,#20037)
-expr_containers(#20040,#20001)
-literals("a","a",#20040)
-#20041=@"var;{a};{#20000}"
-variables(#20041,"a",#20000)
-bind(#20040,#20041)
-#20042=*
-stmts(#20042,2,#20001,1,"a++;")
-hasLocation(#20042,#20005)
-stmt_containers(#20042,#20001)
+stmts(#20038,2,#20001,0,"++a;")
+hasLocation(#20038,#20003)
+stmt_containers(#20038,#20001)
+#20039=*
+exprs(#20039,59,#20038,0,"++a")
+#20040=@"loc,{#10000},1,1,1,3"
+locations_default(#20040,#10000,1,1,1,3)
+hasLocation(#20039,#20040)
+enclosing_stmt(#20039,#20038)
+expr_containers(#20039,#20001)
+#20041=*
+exprs(#20041,79,#20039,0,"a")
+hasLocation(#20041,#20013)
+enclosing_stmt(#20041,#20038)
+expr_containers(#20041,#20001)
+literals("a","a",#20041)
+#20042=@"var;{a};{#20000}"
+variables(#20042,"a",#20000)
+bind(#20041,#20042)
 #20043=*
-exprs(#20043,60,#20042,0,"a++")
-#20044=@"loc,{#10000},2,1,2,3"
-locations_default(#20044,#10000,2,1,2,3)
-hasLocation(#20043,#20044)
-enclosing_stmt(#20043,#20042)
-expr_containers(#20043,#20001)
-#20045=*
-exprs(#20045,79,#20043,0,"a")
-hasLocation(#20045,#20017)
-enclosing_stmt(#20045,#20042)
-expr_containers(#20045,#20001)
-literals("a","a",#20045)
-bind(#20045,#20041)
+stmts(#20043,2,#20001,1,"a++;")
+hasLocation(#20043,#20005)
+stmt_containers(#20043,#20001)
+#20044=*
+exprs(#20044,60,#20043,0,"a++")
+#20045=@"loc,{#10000},2,1,2,3"
+locations_default(#20045,#10000,2,1,2,3)
+hasLocation(#20044,#20045)
+enclosing_stmt(#20044,#20043)
+expr_containers(#20044,#20001)
 #20046=*
-stmts(#20046,2,#20001,2,"--b;")
-hasLocation(#20046,#20007)
-stmt_containers(#20046,#20001)
+exprs(#20046,79,#20044,0,"a")
+hasLocation(#20046,#20017)
+enclosing_stmt(#20046,#20043)
+expr_containers(#20046,#20001)
+literals("a","a",#20046)
+bind(#20046,#20042)
 #20047=*
-exprs(#20047,61,#20046,0,"--b")
-#20048=@"loc,{#10000},3,1,3,3"
-locations_default(#20048,#10000,3,1,3,3)
-hasLocation(#20047,#20048)
-enclosing_stmt(#20047,#20046)
-expr_containers(#20047,#20001)
-#20049=*
-exprs(#20049,79,#20047,0,"b")
-hasLocation(#20049,#20025)
-enclosing_stmt(#20049,#20046)
-expr_containers(#20049,#20001)
-literals("b","b",#20049)
-#20050=@"var;{b};{#20000}"
-variables(#20050,"b",#20000)
-bind(#20049,#20050)
-#20051=*
-stmts(#20051,2,#20001,3,"b--;")
-hasLocation(#20051,#20009)
-stmt_containers(#20051,#20001)
+stmts(#20047,2,#20001,2,"--b;")
+hasLocation(#20047,#20007)
+stmt_containers(#20047,#20001)
+#20048=*
+exprs(#20048,61,#20047,0,"--b")
+#20049=@"loc,{#10000},3,1,3,3"
+locations_default(#20049,#10000,3,1,3,3)
+hasLocation(#20048,#20049)
+enclosing_stmt(#20048,#20047)
+expr_containers(#20048,#20001)
+#20050=*
+exprs(#20050,79,#20048,0,"b")
+hasLocation(#20050,#20025)
+enclosing_stmt(#20050,#20047)
+expr_containers(#20050,#20001)
+literals("b","b",#20050)
+#20051=@"var;{b};{#20000}"
+variables(#20051,"b",#20000)
+bind(#20050,#20051)
 #20052=*
-exprs(#20052,62,#20051,0,"b--")
-#20053=@"loc,{#10000},4,1,4,3"
-locations_default(#20053,#10000,4,1,4,3)
-hasLocation(#20052,#20053)
-enclosing_stmt(#20052,#20051)
-expr_containers(#20052,#20001)
-#20054=*
-exprs(#20054,79,#20052,0,"b")
-hasLocation(#20054,#20029)
-enclosing_stmt(#20054,#20051)
-expr_containers(#20054,#20001)
-literals("b","b",#20054)
-bind(#20054,#20050)
+stmts(#20052,2,#20001,3,"b--;")
+hasLocation(#20052,#20009)
+stmt_containers(#20052,#20001)
+#20053=*
+exprs(#20053,62,#20052,0,"b--")
+#20054=@"loc,{#10000},4,1,4,3"
+locations_default(#20054,#10000,4,1,4,3)
+hasLocation(#20053,#20054)
+enclosing_stmt(#20053,#20052)
+expr_containers(#20053,#20001)
 #20055=*
-entry_cfg_node(#20055,#20001)
-#20056=@"loc,{#10000},1,1,1,0"
-locations_default(#20056,#10000,1,1,1,0)
-hasLocation(#20055,#20056)
-#20057=*
-exit_cfg_node(#20057,#20001)
-hasLocation(#20057,#20035)
-successor(#20051,#20054)
-successor(#20054,#20052)
-successor(#20052,#20057)
-successor(#20046,#20049)
-successor(#20049,#20047)
-successor(#20047,#20051)
-successor(#20042,#20045)
-successor(#20045,#20043)
+exprs(#20055,79,#20053,0,"b")
+hasLocation(#20055,#20029)
+enclosing_stmt(#20055,#20052)
+expr_containers(#20055,#20001)
+literals("b","b",#20055)
+bind(#20055,#20051)
+#20056=*
+entry_cfg_node(#20056,#20001)
+#20057=@"loc,{#10000},1,1,1,0"
+locations_default(#20057,#10000,1,1,1,0)
+hasLocation(#20056,#20057)
+#20058=*
+exit_cfg_node(#20058,#20001)
+hasLocation(#20058,#20035)
+successor(#20052,#20055)
+successor(#20055,#20053)
+successor(#20053,#20058)
+successor(#20047,#20050)
+successor(#20050,#20048)
+successor(#20048,#20052)
 successor(#20043,#20046)
-successor(#20037,#20040)
-successor(#20040,#20038)
-successor(#20038,#20042)
-successor(#20055,#20037)
+successor(#20046,#20044)
+successor(#20044,#20047)
+successor(#20038,#20041)
+successor(#20041,#20039)
+successor(#20039,#20043)
+successor(#20056,#20038)
 numlines(#10000,4,4,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/extensions/output/trap/tst.es6.trap b/javascript/extractor/tests/extensions/output/trap/tst.es6.trap
index 1f8496da9b0..5d88f752770 100644
--- a/javascript/extractor/tests/extensions/output/trap/tst.es6.trap
+++ b/javascript/extractor/tests/extensions/output/trap/tst.es6.trap
@@ -66,65 +66,67 @@ scopenodes(#20001,#20021)
 scopenesting(#20021,#20000)
 is_module(#20001)
 is_es2015_module(#20001)
-#20022=*
-stmts(#20022,2,#20001,0,"console ...  ES6"");")
-hasLocation(#20022,#20003)
-stmt_containers(#20022,#20001)
+#20022=@"var;{this};{#20021}"
+variables(#20022,"this",#20021)
 #20023=*
-exprs(#20023,13,#20022,0,"console ... o ES6"")")
-#20024=@"loc,{#10000},1,1,1,24"
-locations_default(#20024,#10000,1,1,1,24)
-hasLocation(#20023,#20024)
-enclosing_stmt(#20023,#20022)
-expr_containers(#20023,#20001)
-#20025=*
-exprs(#20025,14,#20023,-1,"console.log")
-#20026=@"loc,{#10000},1,1,1,11"
-locations_default(#20026,#10000,1,1,1,11)
-hasLocation(#20025,#20026)
-enclosing_stmt(#20025,#20022)
-expr_containers(#20025,#20001)
-#20027=*
-exprs(#20027,79,#20025,0,"console")
-hasLocation(#20027,#20005)
-enclosing_stmt(#20027,#20022)
-expr_containers(#20027,#20001)
-literals("console","console",#20027)
-#20028=@"var;{console};{#20000}"
-variables(#20028,"console",#20000)
-bind(#20027,#20028)
-#20029=*
-exprs(#20029,0,#20025,1,"log")
-hasLocation(#20029,#20009)
-enclosing_stmt(#20029,#20022)
-expr_containers(#20029,#20001)
-literals("log","log",#20029)
+stmts(#20023,2,#20001,0,"console ...  ES6"");")
+hasLocation(#20023,#20003)
+stmt_containers(#20023,#20001)
+#20024=*
+exprs(#20024,13,#20023,0,"console ... o ES6"")")
+#20025=@"loc,{#10000},1,1,1,24"
+locations_default(#20025,#10000,1,1,1,24)
+hasLocation(#20024,#20025)
+enclosing_stmt(#20024,#20023)
+expr_containers(#20024,#20001)
+#20026=*
+exprs(#20026,14,#20024,-1,"console.log")
+#20027=@"loc,{#10000},1,1,1,11"
+locations_default(#20027,#10000,1,1,1,11)
+hasLocation(#20026,#20027)
+enclosing_stmt(#20026,#20023)
+expr_containers(#20026,#20001)
+#20028=*
+exprs(#20028,79,#20026,0,"console")
+hasLocation(#20028,#20005)
+enclosing_stmt(#20028,#20023)
+expr_containers(#20028,#20001)
+literals("console","console",#20028)
+#20029=@"var;{console};{#20000}"
+variables(#20029,"console",#20000)
+bind(#20028,#20029)
 #20030=*
-exprs(#20030,4,#20023,0,"""Hello ES6""")
-hasLocation(#20030,#20013)
-enclosing_stmt(#20030,#20022)
+exprs(#20030,0,#20026,1,"log")
+hasLocation(#20030,#20009)
+enclosing_stmt(#20030,#20023)
 expr_containers(#20030,#20001)
-literals("Hello ES6","""Hello ES6""",#20030)
+literals("log","log",#20030)
 #20031=*
-regexpterm(#20031,14,#20030,0,"Hello ES6")
-#20032=@"loc,{#10000},1,14,1,22"
-locations_default(#20032,#10000,1,14,1,22)
-hasLocation(#20031,#20032)
-regexp_const_value(#20031,"Hello ES6")
-#20033=*
-entry_cfg_node(#20033,#20001)
-#20034=@"loc,{#10000},1,1,1,0"
-locations_default(#20034,#10000,1,1,1,0)
-hasLocation(#20033,#20034)
-#20035=*
-exit_cfg_node(#20035,#20001)
-hasLocation(#20035,#20019)
-successor(#20022,#20027)
-successor(#20030,#20023)
-successor(#20029,#20025)
-successor(#20027,#20029)
-successor(#20025,#20030)
-successor(#20023,#20035)
-successor(#20033,#20022)
+exprs(#20031,4,#20024,0,"""Hello ES6""")
+hasLocation(#20031,#20013)
+enclosing_stmt(#20031,#20023)
+expr_containers(#20031,#20001)
+literals("Hello ES6","""Hello ES6""",#20031)
+#20032=*
+regexpterm(#20032,14,#20031,0,"Hello ES6")
+#20033=@"loc,{#10000},1,14,1,22"
+locations_default(#20033,#10000,1,14,1,22)
+hasLocation(#20032,#20033)
+regexp_const_value(#20032,"Hello ES6")
+#20034=*
+entry_cfg_node(#20034,#20001)
+#20035=@"loc,{#10000},1,1,1,0"
+locations_default(#20035,#10000,1,1,1,0)
+hasLocation(#20034,#20035)
+#20036=*
+exit_cfg_node(#20036,#20001)
+hasLocation(#20036,#20019)
+successor(#20023,#20028)
+successor(#20031,#20024)
+successor(#20030,#20026)
+successor(#20028,#20030)
+successor(#20026,#20031)
+successor(#20024,#20036)
+successor(#20034,#20023)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/extensions/output/trap/tst2.es.trap b/javascript/extractor/tests/extensions/output/trap/tst2.es.trap
index e07f93a1571..c0f30389939 100644
--- a/javascript/extractor/tests/extensions/output/trap/tst2.es.trap
+++ b/javascript/extractor/tests/extensions/output/trap/tst2.es.trap
@@ -66,65 +66,67 @@ scopenodes(#20001,#20021)
 scopenesting(#20021,#20000)
 is_module(#20001)
 is_es2015_module(#20001)
-#20022=*
-stmts(#20022,2,#20001,0,"console ... o ES"");")
-hasLocation(#20022,#20003)
-stmt_containers(#20022,#20001)
+#20022=@"var;{this};{#20021}"
+variables(#20022,"this",#20021)
 #20023=*
-exprs(#20023,13,#20022,0,"console ... lo ES"")")
-#20024=@"loc,{#10000},1,1,1,23"
-locations_default(#20024,#10000,1,1,1,23)
-hasLocation(#20023,#20024)
-enclosing_stmt(#20023,#20022)
-expr_containers(#20023,#20001)
-#20025=*
-exprs(#20025,14,#20023,-1,"console.log")
-#20026=@"loc,{#10000},1,1,1,11"
-locations_default(#20026,#10000,1,1,1,11)
-hasLocation(#20025,#20026)
-enclosing_stmt(#20025,#20022)
-expr_containers(#20025,#20001)
-#20027=*
-exprs(#20027,79,#20025,0,"console")
-hasLocation(#20027,#20005)
-enclosing_stmt(#20027,#20022)
-expr_containers(#20027,#20001)
-literals("console","console",#20027)
-#20028=@"var;{console};{#20000}"
-variables(#20028,"console",#20000)
-bind(#20027,#20028)
-#20029=*
-exprs(#20029,0,#20025,1,"log")
-hasLocation(#20029,#20009)
-enclosing_stmt(#20029,#20022)
-expr_containers(#20029,#20001)
-literals("log","log",#20029)
+stmts(#20023,2,#20001,0,"console ... o ES"");")
+hasLocation(#20023,#20003)
+stmt_containers(#20023,#20001)
+#20024=*
+exprs(#20024,13,#20023,0,"console ... lo ES"")")
+#20025=@"loc,{#10000},1,1,1,23"
+locations_default(#20025,#10000,1,1,1,23)
+hasLocation(#20024,#20025)
+enclosing_stmt(#20024,#20023)
+expr_containers(#20024,#20001)
+#20026=*
+exprs(#20026,14,#20024,-1,"console.log")
+#20027=@"loc,{#10000},1,1,1,11"
+locations_default(#20027,#10000,1,1,1,11)
+hasLocation(#20026,#20027)
+enclosing_stmt(#20026,#20023)
+expr_containers(#20026,#20001)
+#20028=*
+exprs(#20028,79,#20026,0,"console")
+hasLocation(#20028,#20005)
+enclosing_stmt(#20028,#20023)
+expr_containers(#20028,#20001)
+literals("console","console",#20028)
+#20029=@"var;{console};{#20000}"
+variables(#20029,"console",#20000)
+bind(#20028,#20029)
 #20030=*
-exprs(#20030,4,#20023,0,"""Hello ES""")
-hasLocation(#20030,#20013)
-enclosing_stmt(#20030,#20022)
+exprs(#20030,0,#20026,1,"log")
+hasLocation(#20030,#20009)
+enclosing_stmt(#20030,#20023)
 expr_containers(#20030,#20001)
-literals("Hello ES","""Hello ES""",#20030)
+literals("log","log",#20030)
 #20031=*
-regexpterm(#20031,14,#20030,0,"Hello ES")
-#20032=@"loc,{#10000},1,14,1,21"
-locations_default(#20032,#10000,1,14,1,21)
-hasLocation(#20031,#20032)
-regexp_const_value(#20031,"Hello ES")
-#20033=*
-entry_cfg_node(#20033,#20001)
-#20034=@"loc,{#10000},1,1,1,0"
-locations_default(#20034,#10000,1,1,1,0)
-hasLocation(#20033,#20034)
-#20035=*
-exit_cfg_node(#20035,#20001)
-hasLocation(#20035,#20019)
-successor(#20022,#20027)
-successor(#20030,#20023)
-successor(#20029,#20025)
-successor(#20027,#20029)
-successor(#20025,#20030)
-successor(#20023,#20035)
-successor(#20033,#20022)
+exprs(#20031,4,#20024,0,"""Hello ES""")
+hasLocation(#20031,#20013)
+enclosing_stmt(#20031,#20023)
+expr_containers(#20031,#20001)
+literals("Hello ES","""Hello ES""",#20031)
+#20032=*
+regexpterm(#20032,14,#20031,0,"Hello ES")
+#20033=@"loc,{#10000},1,14,1,21"
+locations_default(#20033,#10000,1,14,1,21)
+hasLocation(#20032,#20033)
+regexp_const_value(#20032,"Hello ES")
+#20034=*
+entry_cfg_node(#20034,#20001)
+#20035=@"loc,{#10000},1,1,1,0"
+locations_default(#20035,#10000,1,1,1,0)
+hasLocation(#20034,#20035)
+#20036=*
+exit_cfg_node(#20036,#20001)
+hasLocation(#20036,#20019)
+successor(#20023,#20028)
+successor(#20031,#20024)
+successor(#20030,#20026)
+successor(#20028,#20030)
+successor(#20026,#20031)
+successor(#20024,#20036)
+successor(#20034,#20023)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/extensions/output/trap/tst4.cjs.trap b/javascript/extractor/tests/extensions/output/trap/tst4.cjs.trap
index 4323614bf4d..44a75e37949 100644
--- a/javascript/extractor/tests/extensions/output/trap/tst4.cjs.trap
+++ b/javascript/extractor/tests/extensions/output/trap/tst4.cjs.trap
@@ -85,64 +85,66 @@ variables(#20030,"__dirname",#20025)
 #20031=@"var;{arguments};{#20025}"
 variables(#20031,"arguments",#20025)
 is_module(#20001)
-#20032=*
-stmts(#20032,2,#20001,0,"console ... onJS"");")
-hasLocation(#20032,#20003)
-stmt_containers(#20032,#20001)
+#20032=@"var;{this};{#20025}"
+variables(#20032,"this",#20025)
 #20033=*
-exprs(#20033,13,#20032,0,"console ... monJS"")")
-#20034=@"loc,{#10000},1,1,1,29"
-locations_default(#20034,#10000,1,1,1,29)
-hasLocation(#20033,#20034)
-enclosing_stmt(#20033,#20032)
-expr_containers(#20033,#20001)
-#20035=*
-exprs(#20035,14,#20033,-1,"console.log")
-#20036=@"loc,{#10000},1,1,1,11"
-locations_default(#20036,#10000,1,1,1,11)
-hasLocation(#20035,#20036)
-enclosing_stmt(#20035,#20032)
-expr_containers(#20035,#20001)
-#20037=*
-exprs(#20037,79,#20035,0,"console")
-hasLocation(#20037,#20005)
-enclosing_stmt(#20037,#20032)
-expr_containers(#20037,#20001)
-literals("console","console",#20037)
-bind(#20037,#20023)
+stmts(#20033,2,#20001,0,"console ... onJS"");")
+hasLocation(#20033,#20003)
+stmt_containers(#20033,#20001)
+#20034=*
+exprs(#20034,13,#20033,0,"console ... monJS"")")
+#20035=@"loc,{#10000},1,1,1,29"
+locations_default(#20035,#10000,1,1,1,29)
+hasLocation(#20034,#20035)
+enclosing_stmt(#20034,#20033)
+expr_containers(#20034,#20001)
+#20036=*
+exprs(#20036,14,#20034,-1,"console.log")
+#20037=@"loc,{#10000},1,1,1,11"
+locations_default(#20037,#10000,1,1,1,11)
+hasLocation(#20036,#20037)
+enclosing_stmt(#20036,#20033)
+expr_containers(#20036,#20001)
 #20038=*
-exprs(#20038,0,#20035,1,"log")
-hasLocation(#20038,#20009)
-enclosing_stmt(#20038,#20032)
+exprs(#20038,79,#20036,0,"console")
+hasLocation(#20038,#20005)
+enclosing_stmt(#20038,#20033)
 expr_containers(#20038,#20001)
-literals("log","log",#20038)
+literals("console","console",#20038)
+bind(#20038,#20023)
 #20039=*
-exprs(#20039,4,#20033,0,"""Hello CommonJS""")
-hasLocation(#20039,#20013)
-enclosing_stmt(#20039,#20032)
+exprs(#20039,0,#20036,1,"log")
+hasLocation(#20039,#20009)
+enclosing_stmt(#20039,#20033)
 expr_containers(#20039,#20001)
-literals("Hello CommonJS","""Hello CommonJS""",#20039)
+literals("log","log",#20039)
 #20040=*
-regexpterm(#20040,14,#20039,0,"Hello CommonJS")
-#20041=@"loc,{#10000},1,14,1,27"
-locations_default(#20041,#10000,1,14,1,27)
-hasLocation(#20040,#20041)
-regexp_const_value(#20040,"Hello CommonJS")
-#20042=*
-entry_cfg_node(#20042,#20001)
-#20043=@"loc,{#10000},1,1,1,0"
-locations_default(#20043,#10000,1,1,1,0)
-hasLocation(#20042,#20043)
-#20044=*
-exit_cfg_node(#20044,#20001)
-hasLocation(#20044,#20019)
-successor(#20032,#20037)
-successor(#20039,#20033)
-successor(#20038,#20035)
-successor(#20037,#20038)
-successor(#20035,#20039)
-successor(#20033,#20044)
-successor(#20042,#20032)
+exprs(#20040,4,#20034,0,"""Hello CommonJS""")
+hasLocation(#20040,#20013)
+enclosing_stmt(#20040,#20033)
+expr_containers(#20040,#20001)
+literals("Hello CommonJS","""Hello CommonJS""",#20040)
+#20041=*
+regexpterm(#20041,14,#20040,0,"Hello CommonJS")
+#20042=@"loc,{#10000},1,14,1,27"
+locations_default(#20042,#10000,1,14,1,27)
+hasLocation(#20041,#20042)
+regexp_const_value(#20041,"Hello CommonJS")
+#20043=*
+entry_cfg_node(#20043,#20001)
+#20044=@"loc,{#10000},1,1,1,0"
+locations_default(#20044,#10000,1,1,1,0)
+hasLocation(#20043,#20044)
+#20045=*
+exit_cfg_node(#20045,#20001)
+hasLocation(#20045,#20019)
+successor(#20033,#20038)
+successor(#20040,#20034)
+successor(#20039,#20036)
+successor(#20038,#20039)
+successor(#20036,#20040)
+successor(#20034,#20045)
+successor(#20043,#20033)
 is_nodejs(#20001)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/externs/output/trap/Point.js.trap b/javascript/extractor/tests/externs/output/trap/Point.js.trap
index d69c901ea89..adfef77d7a9 100644
--- a/javascript/extractor/tests/externs/output/trap/Point.js.trap
+++ b/javascript/extractor/tests/externs/output/trap/Point.js.trap
@@ -483,474 +483,482 @@ variables(#20181,"Point",#20000)
 variables(#20182,"someGlobal",#20000)
 #20183=@"var;{MyString};{#20000}"
 variables(#20183,"MyString",#20000)
-#20184=*
-stmts(#20184,17,#20001,0,"functio ... , y) {}")
-hasLocation(#20184,#20005)
-stmt_containers(#20184,#20001)
+#20184=@"var;{this};{#20000}"
+variables(#20184,"this",#20000)
 #20185=*
-exprs(#20185,78,#20184,-1,"Point")
-hasLocation(#20185,#20040)
-expr_containers(#20185,#20184)
-literals("Point","Point",#20185)
-decl(#20185,#20181)
+stmts(#20185,17,#20001,0,"functio ... , y) {}")
+hasLocation(#20185,#20005)
+stmt_containers(#20185,#20001)
 #20186=*
-scopes(#20186,1)
-scopenodes(#20184,#20186)
-scopenesting(#20186,#20000)
-#20187=@"var;{x};{#20186}"
-variables(#20187,"x",#20186)
-#20188=*
-exprs(#20188,78,#20184,0,"x")
-hasLocation(#20188,#20044)
-expr_containers(#20188,#20184)
-literals("x","x",#20188)
-decl(#20188,#20187)
-#20189=@"var;{y};{#20186}"
-variables(#20189,"y",#20186)
+exprs(#20186,78,#20185,-1,"Point")
+hasLocation(#20186,#20040)
+expr_containers(#20186,#20185)
+literals("Point","Point",#20186)
+decl(#20186,#20181)
+#20187=*
+scopes(#20187,1)
+scopenodes(#20185,#20187)
+scopenesting(#20187,#20000)
+#20188=@"var;{this};{#20187}"
+variables(#20188,"this",#20187)
+#20189=@"var;{x};{#20187}"
+variables(#20189,"x",#20187)
 #20190=*
-exprs(#20190,78,#20184,1,"y")
-hasLocation(#20190,#20048)
-expr_containers(#20190,#20184)
-literals("y","y",#20190)
+exprs(#20190,78,#20185,0,"x")
+hasLocation(#20190,#20044)
+expr_containers(#20190,#20185)
+literals("x","x",#20190)
 decl(#20190,#20189)
-#20191=@"var;{arguments};{#20186}"
-variables(#20191,"arguments",#20186)
-is_arguments_object(#20191)
+#20191=@"var;{y};{#20187}"
+variables(#20191,"y",#20187)
 #20192=*
-stmts(#20192,1,#20184,-2,"{}")
-#20193=@"loc,{#10000},1,22,1,23"
-locations_default(#20193,#10000,1,22,1,23)
-hasLocation(#20192,#20193)
-stmt_containers(#20192,#20184)
+exprs(#20192,78,#20185,1,"y")
+hasLocation(#20192,#20048)
+expr_containers(#20192,#20185)
+literals("y","y",#20192)
+decl(#20192,#20191)
+#20193=@"var;{arguments};{#20187}"
+variables(#20193,"arguments",#20187)
+is_arguments_object(#20193)
 #20194=*
-stmts(#20194,2,#20001,1,"Point.p ... dy) {};")
-hasLocation(#20194,#20009)
-stmt_containers(#20194,#20001)
-#20195=*
-exprs(#20195,47,#20194,0,"Point.p ...  dy) {}")
-#20196=@"loc,{#10000},3,1,3,42"
-locations_default(#20196,#10000,3,1,3,42)
-hasLocation(#20195,#20196)
-enclosing_stmt(#20195,#20194)
-expr_containers(#20195,#20001)
+stmts(#20194,1,#20185,-2,"{}")
+#20195=@"loc,{#10000},1,22,1,23"
+locations_default(#20195,#10000,1,22,1,23)
+hasLocation(#20194,#20195)
+stmt_containers(#20194,#20185)
+#20196=*
+stmts(#20196,2,#20001,1,"Point.p ... dy) {};")
+hasLocation(#20196,#20009)
+stmt_containers(#20196,#20001)
 #20197=*
-exprs(#20197,14,#20195,0,"Point.prototype.move")
-#20198=@"loc,{#10000},3,1,3,20"
-locations_default(#20198,#10000,3,1,3,20)
+exprs(#20197,47,#20196,0,"Point.p ...  dy) {}")
+#20198=@"loc,{#10000},3,1,3,42"
+locations_default(#20198,#10000,3,1,3,42)
 hasLocation(#20197,#20198)
-enclosing_stmt(#20197,#20194)
+enclosing_stmt(#20197,#20196)
 expr_containers(#20197,#20001)
 #20199=*
-exprs(#20199,14,#20197,0,"Point.prototype")
-#20200=@"loc,{#10000},3,1,3,15"
-locations_default(#20200,#10000,3,1,3,15)
+exprs(#20199,14,#20197,0,"Point.prototype.move")
+#20200=@"loc,{#10000},3,1,3,20"
+locations_default(#20200,#10000,3,1,3,20)
 hasLocation(#20199,#20200)
-enclosing_stmt(#20199,#20194)
+enclosing_stmt(#20199,#20196)
 expr_containers(#20199,#20001)
 #20201=*
-exprs(#20201,79,#20199,0,"Point")
-hasLocation(#20201,#20056)
-enclosing_stmt(#20201,#20194)
+exprs(#20201,14,#20199,0,"Point.prototype")
+#20202=@"loc,{#10000},3,1,3,15"
+locations_default(#20202,#10000,3,1,3,15)
+hasLocation(#20201,#20202)
+enclosing_stmt(#20201,#20196)
 expr_containers(#20201,#20001)
-literals("Point","Point",#20201)
-bind(#20201,#20181)
-#20202=*
-exprs(#20202,0,#20199,1,"prototype")
-hasLocation(#20202,#20060)
-enclosing_stmt(#20202,#20194)
-expr_containers(#20202,#20001)
-literals("prototype","prototype",#20202)
 #20203=*
-exprs(#20203,0,#20197,1,"move")
-hasLocation(#20203,#20064)
-enclosing_stmt(#20203,#20194)
+exprs(#20203,79,#20201,0,"Point")
+hasLocation(#20203,#20056)
+enclosing_stmt(#20203,#20196)
 expr_containers(#20203,#20001)
-literals("move","move",#20203)
+literals("Point","Point",#20203)
+bind(#20203,#20181)
 #20204=*
-exprs(#20204,9,#20195,1,"function(dx, dy) {}")
-#20205=@"loc,{#10000},3,24,3,42"
-locations_default(#20205,#10000,3,24,3,42)
-hasLocation(#20204,#20205)
-enclosing_stmt(#20204,#20194)
+exprs(#20204,0,#20201,1,"prototype")
+hasLocation(#20204,#20060)
+enclosing_stmt(#20204,#20196)
 expr_containers(#20204,#20001)
+literals("prototype","prototype",#20204)
+#20205=*
+exprs(#20205,0,#20199,1,"move")
+hasLocation(#20205,#20064)
+enclosing_stmt(#20205,#20196)
+expr_containers(#20205,#20001)
+literals("move","move",#20205)
 #20206=*
-scopes(#20206,1)
-scopenodes(#20204,#20206)
-scopenesting(#20206,#20000)
-#20207=@"var;{dx};{#20206}"
-variables(#20207,"dx",#20206)
+exprs(#20206,9,#20197,1,"function(dx, dy) {}")
+#20207=@"loc,{#10000},3,24,3,42"
+locations_default(#20207,#10000,3,24,3,42)
+hasLocation(#20206,#20207)
+enclosing_stmt(#20206,#20196)
+expr_containers(#20206,#20001)
 #20208=*
-exprs(#20208,78,#20204,0,"dx")
-hasLocation(#20208,#20072)
-expr_containers(#20208,#20204)
-literals("dx","dx",#20208)
-decl(#20208,#20207)
-#20209=@"var;{dy};{#20206}"
-variables(#20209,"dy",#20206)
-#20210=*
-exprs(#20210,78,#20204,1,"dy")
-hasLocation(#20210,#20076)
-expr_containers(#20210,#20204)
-literals("dy","dy",#20210)
-decl(#20210,#20209)
-#20211=@"var;{arguments};{#20206}"
-variables(#20211,"arguments",#20206)
-is_arguments_object(#20211)
-#20212=*
-stmts(#20212,1,#20204,-2,"{}")
-#20213=@"loc,{#10000},3,41,3,42"
-locations_default(#20213,#10000,3,41,3,42)
-hasLocation(#20212,#20213)
-stmt_containers(#20212,#20204)
-#20214=*
-stmts(#20214,2,#20001,2,"Point.p ... j = {};")
-hasLocation(#20214,#20011)
-stmt_containers(#20214,#20001)
+scopes(#20208,1)
+scopenodes(#20206,#20208)
+scopenesting(#20208,#20000)
+#20209=@"var;{this};{#20208}"
+variables(#20209,"this",#20208)
+#20210=@"var;{dx};{#20208}"
+variables(#20210,"dx",#20208)
+#20211=*
+exprs(#20211,78,#20206,0,"dx")
+hasLocation(#20211,#20072)
+expr_containers(#20211,#20206)
+literals("dx","dx",#20211)
+decl(#20211,#20210)
+#20212=@"var;{dy};{#20208}"
+variables(#20212,"dy",#20208)
+#20213=*
+exprs(#20213,78,#20206,1,"dy")
+hasLocation(#20213,#20076)
+expr_containers(#20213,#20206)
+literals("dy","dy",#20213)
+decl(#20213,#20212)
+#20214=@"var;{arguments};{#20208}"
+variables(#20214,"arguments",#20208)
+is_arguments_object(#20214)
 #20215=*
-exprs(#20215,47,#20214,0,"Point.p ... bj = {}")
-#20216=@"loc,{#10000},4,1,4,24"
-locations_default(#20216,#10000,4,1,4,24)
+stmts(#20215,1,#20206,-2,"{}")
+#20216=@"loc,{#10000},3,41,3,42"
+locations_default(#20216,#10000,3,41,3,42)
 hasLocation(#20215,#20216)
-enclosing_stmt(#20215,#20214)
-expr_containers(#20215,#20001)
+stmt_containers(#20215,#20206)
 #20217=*
-exprs(#20217,14,#20215,0,"Point.prototype.obj")
-#20218=@"loc,{#10000},4,1,4,19"
-locations_default(#20218,#10000,4,1,4,19)
-hasLocation(#20217,#20218)
-enclosing_stmt(#20217,#20214)
-expr_containers(#20217,#20001)
-#20219=*
-exprs(#20219,14,#20217,0,"Point.prototype")
-#20220=@"loc,{#10000},4,1,4,15"
-locations_default(#20220,#10000,4,1,4,15)
-hasLocation(#20219,#20220)
-enclosing_stmt(#20219,#20214)
-expr_containers(#20219,#20001)
-#20221=*
-exprs(#20221,79,#20219,0,"Point")
-hasLocation(#20221,#20086)
-enclosing_stmt(#20221,#20214)
-expr_containers(#20221,#20001)
-literals("Point","Point",#20221)
-bind(#20221,#20181)
+stmts(#20217,2,#20001,2,"Point.p ... j = {};")
+hasLocation(#20217,#20011)
+stmt_containers(#20217,#20001)
+#20218=*
+exprs(#20218,47,#20217,0,"Point.p ... bj = {}")
+#20219=@"loc,{#10000},4,1,4,24"
+locations_default(#20219,#10000,4,1,4,24)
+hasLocation(#20218,#20219)
+enclosing_stmt(#20218,#20217)
+expr_containers(#20218,#20001)
+#20220=*
+exprs(#20220,14,#20218,0,"Point.prototype.obj")
+#20221=@"loc,{#10000},4,1,4,19"
+locations_default(#20221,#10000,4,1,4,19)
+hasLocation(#20220,#20221)
+enclosing_stmt(#20220,#20217)
+expr_containers(#20220,#20001)
 #20222=*
-exprs(#20222,0,#20219,1,"prototype")
-hasLocation(#20222,#20090)
-enclosing_stmt(#20222,#20214)
+exprs(#20222,14,#20220,0,"Point.prototype")
+#20223=@"loc,{#10000},4,1,4,15"
+locations_default(#20223,#10000,4,1,4,15)
+hasLocation(#20222,#20223)
+enclosing_stmt(#20222,#20217)
 expr_containers(#20222,#20001)
-literals("prototype","prototype",#20222)
-#20223=*
-exprs(#20223,0,#20217,1,"obj")
-hasLocation(#20223,#20094)
-enclosing_stmt(#20223,#20214)
-expr_containers(#20223,#20001)
-literals("obj","obj",#20223)
 #20224=*
-exprs(#20224,8,#20215,1,"{}")
-#20225=@"loc,{#10000},4,23,4,24"
-locations_default(#20225,#10000,4,23,4,24)
-hasLocation(#20224,#20225)
-enclosing_stmt(#20224,#20214)
+exprs(#20224,79,#20222,0,"Point")
+hasLocation(#20224,#20086)
+enclosing_stmt(#20224,#20217)
 expr_containers(#20224,#20001)
+literals("Point","Point",#20224)
+bind(#20224,#20181)
+#20225=*
+exprs(#20225,0,#20222,1,"prototype")
+hasLocation(#20225,#20090)
+enclosing_stmt(#20225,#20217)
+expr_containers(#20225,#20001)
+literals("prototype","prototype",#20225)
 #20226=*
-stmts(#20226,2,#20001,3,"Point.p ... secret;")
-hasLocation(#20226,#20013)
-stmt_containers(#20226,#20001)
+exprs(#20226,0,#20220,1,"obj")
+hasLocation(#20226,#20094)
+enclosing_stmt(#20226,#20217)
+expr_containers(#20226,#20001)
+literals("obj","obj",#20226)
 #20227=*
-exprs(#20227,14,#20226,0,"Point.p ... .secret")
-#20228=@"loc,{#10000},5,1,5,22"
-locations_default(#20228,#10000,5,1,5,22)
+exprs(#20227,8,#20218,1,"{}")
+#20228=@"loc,{#10000},4,23,4,24"
+locations_default(#20228,#10000,4,23,4,24)
 hasLocation(#20227,#20228)
-enclosing_stmt(#20227,#20226)
+enclosing_stmt(#20227,#20217)
 expr_containers(#20227,#20001)
 #20229=*
-exprs(#20229,14,#20227,0,"Point.prototype")
-#20230=@"loc,{#10000},5,1,5,15"
-locations_default(#20230,#10000,5,1,5,15)
-hasLocation(#20229,#20230)
-enclosing_stmt(#20229,#20226)
-expr_containers(#20229,#20001)
-#20231=*
-exprs(#20231,79,#20229,0,"Point")
-hasLocation(#20231,#20104)
-enclosing_stmt(#20231,#20226)
-expr_containers(#20231,#20001)
-literals("Point","Point",#20231)
-bind(#20231,#20181)
+stmts(#20229,2,#20001,3,"Point.p ... secret;")
+hasLocation(#20229,#20013)
+stmt_containers(#20229,#20001)
+#20230=*
+exprs(#20230,14,#20229,0,"Point.p ... .secret")
+#20231=@"loc,{#10000},5,1,5,22"
+locations_default(#20231,#10000,5,1,5,22)
+hasLocation(#20230,#20231)
+enclosing_stmt(#20230,#20229)
+expr_containers(#20230,#20001)
 #20232=*
-exprs(#20232,0,#20229,1,"prototype")
-hasLocation(#20232,#20108)
-enclosing_stmt(#20232,#20226)
+exprs(#20232,14,#20230,0,"Point.prototype")
+#20233=@"loc,{#10000},5,1,5,15"
+locations_default(#20233,#10000,5,1,5,15)
+hasLocation(#20232,#20233)
+enclosing_stmt(#20232,#20229)
 expr_containers(#20232,#20001)
-literals("prototype","prototype",#20232)
-#20233=*
-exprs(#20233,0,#20227,1,"secret")
-hasLocation(#20233,#20112)
-enclosing_stmt(#20233,#20226)
-expr_containers(#20233,#20001)
-literals("secret","secret",#20233)
 #20234=*
-stmts(#20234,2,#20001,4,"Point.ORIGIN;")
-hasLocation(#20234,#20017)
-stmt_containers(#20234,#20001)
+exprs(#20234,79,#20232,0,"Point")
+hasLocation(#20234,#20104)
+enclosing_stmt(#20234,#20229)
+expr_containers(#20234,#20001)
+literals("Point","Point",#20234)
+bind(#20234,#20181)
 #20235=*
-exprs(#20235,14,#20234,0,"Point.ORIGIN")
-#20236=@"loc,{#10000},7,1,7,12"
-locations_default(#20236,#10000,7,1,7,12)
-hasLocation(#20235,#20236)
-enclosing_stmt(#20235,#20234)
+exprs(#20235,0,#20232,1,"prototype")
+hasLocation(#20235,#20108)
+enclosing_stmt(#20235,#20229)
 expr_containers(#20235,#20001)
+literals("prototype","prototype",#20235)
+#20236=*
+exprs(#20236,0,#20230,1,"secret")
+hasLocation(#20236,#20112)
+enclosing_stmt(#20236,#20229)
+expr_containers(#20236,#20001)
+literals("secret","secret",#20236)
 #20237=*
-exprs(#20237,79,#20235,0,"Point")
-hasLocation(#20237,#20116)
-enclosing_stmt(#20237,#20234)
-expr_containers(#20237,#20001)
-literals("Point","Point",#20237)
-bind(#20237,#20181)
+stmts(#20237,2,#20001,4,"Point.ORIGIN;")
+hasLocation(#20237,#20017)
+stmt_containers(#20237,#20001)
 #20238=*
-exprs(#20238,0,#20235,1,"ORIGIN")
-hasLocation(#20238,#20120)
-enclosing_stmt(#20238,#20234)
+exprs(#20238,14,#20237,0,"Point.ORIGIN")
+#20239=@"loc,{#10000},7,1,7,12"
+locations_default(#20239,#10000,7,1,7,12)
+hasLocation(#20238,#20239)
+enclosing_stmt(#20238,#20237)
 expr_containers(#20238,#20001)
-literals("ORIGIN","ORIGIN",#20238)
-#20239=*
-stmts(#20239,2,#20001,5,"Point.f ... n() {};")
-hasLocation(#20239,#20019)
-stmt_containers(#20239,#20001)
 #20240=*
-exprs(#20240,47,#20239,0,"Point.f ... on() {}")
-#20241=@"loc,{#10000},8,1,8,25"
-locations_default(#20241,#10000,8,1,8,25)
-hasLocation(#20240,#20241)
-enclosing_stmt(#20240,#20239)
+exprs(#20240,79,#20238,0,"Point")
+hasLocation(#20240,#20116)
+enclosing_stmt(#20240,#20237)
 expr_containers(#20240,#20001)
+literals("Point","Point",#20240)
+bind(#20240,#20181)
+#20241=*
+exprs(#20241,0,#20238,1,"ORIGIN")
+hasLocation(#20241,#20120)
+enclosing_stmt(#20241,#20237)
+expr_containers(#20241,#20001)
+literals("ORIGIN","ORIGIN",#20241)
 #20242=*
-exprs(#20242,14,#20240,0,"Point.foo")
-#20243=@"loc,{#10000},8,1,8,9"
-locations_default(#20243,#10000,8,1,8,9)
-hasLocation(#20242,#20243)
-enclosing_stmt(#20242,#20239)
-expr_containers(#20242,#20001)
-#20244=*
-exprs(#20244,79,#20242,0,"Point")
-hasLocation(#20244,#20124)
-enclosing_stmt(#20244,#20239)
-expr_containers(#20244,#20001)
-literals("Point","Point",#20244)
-bind(#20244,#20181)
+stmts(#20242,2,#20001,5,"Point.f ... n() {};")
+hasLocation(#20242,#20019)
+stmt_containers(#20242,#20001)
+#20243=*
+exprs(#20243,47,#20242,0,"Point.f ... on() {}")
+#20244=@"loc,{#10000},8,1,8,25"
+locations_default(#20244,#10000,8,1,8,25)
+hasLocation(#20243,#20244)
+enclosing_stmt(#20243,#20242)
+expr_containers(#20243,#20001)
 #20245=*
-exprs(#20245,0,#20242,1,"foo")
-hasLocation(#20245,#20128)
-enclosing_stmt(#20245,#20239)
+exprs(#20245,14,#20243,0,"Point.foo")
+#20246=@"loc,{#10000},8,1,8,9"
+locations_default(#20246,#10000,8,1,8,9)
+hasLocation(#20245,#20246)
+enclosing_stmt(#20245,#20242)
 expr_containers(#20245,#20001)
-literals("foo","foo",#20245)
-#20246=*
-exprs(#20246,9,#20240,1,"function() {}")
-#20247=@"loc,{#10000},8,13,8,25"
-locations_default(#20247,#10000,8,13,8,25)
-hasLocation(#20246,#20247)
-enclosing_stmt(#20246,#20239)
-expr_containers(#20246,#20001)
+#20247=*
+exprs(#20247,79,#20245,0,"Point")
+hasLocation(#20247,#20124)
+enclosing_stmt(#20247,#20242)
+expr_containers(#20247,#20001)
+literals("Point","Point",#20247)
+bind(#20247,#20181)
 #20248=*
-scopes(#20248,1)
-scopenodes(#20246,#20248)
-scopenesting(#20248,#20000)
-#20249=@"var;{arguments};{#20248}"
-variables(#20249,"arguments",#20248)
-is_arguments_object(#20249)
-#20250=*
-stmts(#20250,1,#20246,-2,"{}")
-#20251=@"loc,{#10000},8,24,8,25"
-locations_default(#20251,#10000,8,24,8,25)
-hasLocation(#20250,#20251)
-stmt_containers(#20250,#20246)
-#20252=*
-stmts(#20252,18,#20001,6,"var someGlobal;")
-hasLocation(#20252,#20023)
-stmt_containers(#20252,#20001)
-#20253=*
-exprs(#20253,64,#20252,0,"someGlobal")
-hasLocation(#20253,#20146)
-enclosing_stmt(#20253,#20252)
-expr_containers(#20253,#20001)
+exprs(#20248,0,#20245,1,"foo")
+hasLocation(#20248,#20128)
+enclosing_stmt(#20248,#20242)
+expr_containers(#20248,#20001)
+literals("foo","foo",#20248)
+#20249=*
+exprs(#20249,9,#20243,1,"function() {}")
+#20250=@"loc,{#10000},8,13,8,25"
+locations_default(#20250,#10000,8,13,8,25)
+hasLocation(#20249,#20250)
+enclosing_stmt(#20249,#20242)
+expr_containers(#20249,#20001)
+#20251=*
+scopes(#20251,1)
+scopenodes(#20249,#20251)
+scopenesting(#20251,#20000)
+#20252=@"var;{this};{#20251}"
+variables(#20252,"this",#20251)
+#20253=@"var;{arguments};{#20251}"
+variables(#20253,"arguments",#20251)
+is_arguments_object(#20253)
 #20254=*
-exprs(#20254,78,#20253,0,"someGlobal")
-hasLocation(#20254,#20146)
-enclosing_stmt(#20254,#20252)
-expr_containers(#20254,#20001)
-literals("someGlobal","someGlobal",#20254)
-decl(#20254,#20182)
-#20255=*
-stmts(#20255,18,#20001,7,"var MyString;")
-hasLocation(#20255,#20028)
-stmt_containers(#20255,#20001)
+stmts(#20254,1,#20249,-2,"{}")
+#20255=@"loc,{#10000},8,24,8,25"
+locations_default(#20255,#10000,8,24,8,25)
+hasLocation(#20254,#20255)
+stmt_containers(#20254,#20249)
 #20256=*
-exprs(#20256,64,#20255,0,"MyString")
-hasLocation(#20256,#20152)
-enclosing_stmt(#20256,#20255)
-expr_containers(#20256,#20001)
+stmts(#20256,18,#20001,6,"var someGlobal;")
+hasLocation(#20256,#20023)
+stmt_containers(#20256,#20001)
 #20257=*
-exprs(#20257,78,#20256,0,"MyString")
-hasLocation(#20257,#20152)
-enclosing_stmt(#20257,#20255)
+exprs(#20257,64,#20256,0,"someGlobal")
+hasLocation(#20257,#20146)
+enclosing_stmt(#20257,#20256)
 expr_containers(#20257,#20001)
-literals("MyString","MyString",#20257)
-decl(#20257,#20183)
 #20258=*
-stmts(#20258,2,#20001,8,"Point.p ... inal'];")
-hasLocation(#20258,#20032)
-stmt_containers(#20258,#20001)
+exprs(#20258,78,#20257,0,"someGlobal")
+hasLocation(#20258,#20146)
+enclosing_stmt(#20258,#20256)
+expr_containers(#20258,#20001)
+literals("someGlobal","someGlobal",#20258)
+decl(#20258,#20182)
 #20259=*
-exprs(#20259,15,#20258,0,"Point.p ... final']")
-#20260=@"loc,{#10000},15,1,15,24"
-locations_default(#20260,#10000,15,1,15,24)
-hasLocation(#20259,#20260)
-enclosing_stmt(#20259,#20258)
-expr_containers(#20259,#20001)
+stmts(#20259,18,#20001,7,"var MyString;")
+hasLocation(#20259,#20028)
+stmt_containers(#20259,#20001)
+#20260=*
+exprs(#20260,64,#20259,0,"MyString")
+hasLocation(#20260,#20152)
+enclosing_stmt(#20260,#20259)
+expr_containers(#20260,#20001)
 #20261=*
-exprs(#20261,14,#20259,0,"Point.prototype")
-#20262=@"loc,{#10000},15,1,15,15"
-locations_default(#20262,#10000,15,1,15,15)
-hasLocation(#20261,#20262)
-enclosing_stmt(#20261,#20258)
+exprs(#20261,78,#20260,0,"MyString")
+hasLocation(#20261,#20152)
+enclosing_stmt(#20261,#20259)
 expr_containers(#20261,#20001)
+literals("MyString","MyString",#20261)
+decl(#20261,#20183)
+#20262=*
+stmts(#20262,2,#20001,8,"Point.p ... inal'];")
+hasLocation(#20262,#20032)
+stmt_containers(#20262,#20001)
 #20263=*
-exprs(#20263,79,#20261,0,"Point")
-hasLocation(#20263,#20156)
-enclosing_stmt(#20263,#20258)
+exprs(#20263,15,#20262,0,"Point.p ... final']")
+#20264=@"loc,{#10000},15,1,15,24"
+locations_default(#20264,#10000,15,1,15,24)
+hasLocation(#20263,#20264)
+enclosing_stmt(#20263,#20262)
 expr_containers(#20263,#20001)
-literals("Point","Point",#20263)
-bind(#20263,#20181)
-#20264=*
-exprs(#20264,0,#20261,1,"prototype")
-hasLocation(#20264,#20160)
-enclosing_stmt(#20264,#20258)
-expr_containers(#20264,#20001)
-literals("prototype","prototype",#20264)
 #20265=*
-exprs(#20265,4,#20259,1,"'final'")
-hasLocation(#20265,#20164)
-enclosing_stmt(#20265,#20258)
+exprs(#20265,14,#20263,0,"Point.prototype")
+#20266=@"loc,{#10000},15,1,15,15"
+locations_default(#20266,#10000,15,1,15,15)
+hasLocation(#20265,#20266)
+enclosing_stmt(#20265,#20262)
 expr_containers(#20265,#20001)
-literals("final","'final'",#20265)
-#20266=*
-regexpterm(#20266,14,#20265,0,"final")
-#20267=@"loc,{#10000},15,18,15,22"
-locations_default(#20267,#10000,15,18,15,22)
-hasLocation(#20266,#20267)
-regexp_const_value(#20266,"final")
+#20267=*
+exprs(#20267,79,#20265,0,"Point")
+hasLocation(#20267,#20156)
+enclosing_stmt(#20267,#20262)
+expr_containers(#20267,#20001)
+literals("Point","Point",#20267)
+bind(#20267,#20181)
 #20268=*
-stmts(#20268,2,#20001,9,"'use strict';")
-hasLocation(#20268,#20036)
-stmt_containers(#20268,#20001)
+exprs(#20268,0,#20265,1,"prototype")
+hasLocation(#20268,#20160)
+enclosing_stmt(#20268,#20262)
+expr_containers(#20268,#20001)
+literals("prototype","prototype",#20268)
 #20269=*
-exprs(#20269,4,#20268,0,"'use strict'")
-hasLocation(#20269,#20170)
-enclosing_stmt(#20269,#20268)
+exprs(#20269,4,#20263,1,"'final'")
+hasLocation(#20269,#20164)
+enclosing_stmt(#20269,#20262)
 expr_containers(#20269,#20001)
-literals("use strict","'use strict'",#20269)
+literals("final","'final'",#20269)
 #20270=*
-regexpterm(#20270,14,#20269,0,"use strict")
-#20271=@"loc,{#10000},17,2,17,11"
-locations_default(#20271,#10000,17,2,17,11)
+regexpterm(#20270,14,#20269,0,"final")
+#20271=@"loc,{#10000},15,18,15,22"
+locations_default(#20271,#10000,15,18,15,22)
 hasLocation(#20270,#20271)
-regexp_const_value(#20270,"use strict")
+regexp_const_value(#20270,"final")
 #20272=*
-entry_cfg_node(#20272,#20001)
-#20273=@"loc,{#10000},1,1,1,0"
-locations_default(#20273,#10000,1,1,1,0)
-hasLocation(#20272,#20273)
+stmts(#20272,2,#20001,9,"'use strict';")
+hasLocation(#20272,#20036)
+stmt_containers(#20272,#20001)
+#20273=*
+exprs(#20273,4,#20272,0,"'use strict'")
+hasLocation(#20273,#20170)
+enclosing_stmt(#20273,#20272)
+expr_containers(#20273,#20001)
+literals("use strict","'use strict'",#20273)
 #20274=*
-exit_cfg_node(#20274,#20001)
-hasLocation(#20274,#20174)
-successor(#20268,#20269)
-successor(#20269,#20274)
-successor(#20258,#20263)
-successor(#20265,#20259)
-successor(#20264,#20261)
-successor(#20263,#20264)
-successor(#20261,#20265)
-successor(#20259,#20268)
-successor(#20255,#20257)
-successor(#20257,#20256)
+regexpterm(#20274,14,#20273,0,"use strict")
+#20275=@"loc,{#10000},17,2,17,11"
+locations_default(#20275,#10000,17,2,17,11)
+hasLocation(#20274,#20275)
+regexp_const_value(#20274,"use strict")
+#20276=*
+entry_cfg_node(#20276,#20001)
+#20277=@"loc,{#10000},1,1,1,0"
+locations_default(#20277,#10000,1,1,1,0)
+hasLocation(#20276,#20277)
+#20278=*
+exit_cfg_node(#20278,#20001)
+hasLocation(#20278,#20174)
+successor(#20272,#20273)
+successor(#20273,#20278)
+successor(#20262,#20267)
+successor(#20269,#20263)
+successor(#20268,#20265)
+successor(#20267,#20268)
+successor(#20265,#20269)
+successor(#20263,#20272)
+successor(#20259,#20261)
+successor(#20261,#20260)
+successor(#20260,#20262)
 successor(#20256,#20258)
-successor(#20252,#20254)
-successor(#20254,#20253)
-successor(#20253,#20255)
-successor(#20239,#20244)
-successor(#20246,#20240)
-#20275=*
-entry_cfg_node(#20275,#20246)
-#20276=@"loc,{#10000},8,13,8,12"
-locations_default(#20276,#10000,8,13,8,12)
-hasLocation(#20275,#20276)
-#20277=*
-exit_cfg_node(#20277,#20246)
-#20278=@"loc,{#10000},8,26,8,25"
-locations_default(#20278,#10000,8,26,8,25)
-hasLocation(#20277,#20278)
-successor(#20250,#20277)
-successor(#20275,#20250)
-successor(#20245,#20242)
-successor(#20244,#20245)
-successor(#20242,#20246)
-successor(#20240,#20252)
-successor(#20234,#20237)
-successor(#20238,#20235)
-successor(#20237,#20238)
-successor(#20235,#20239)
-successor(#20226,#20231)
-successor(#20233,#20227)
-successor(#20232,#20229)
-successor(#20231,#20232)
-successor(#20229,#20233)
-successor(#20227,#20234)
-successor(#20214,#20221)
-successor(#20224,#20215)
-successor(#20223,#20217)
-successor(#20222,#20219)
-successor(#20221,#20222)
-successor(#20219,#20223)
-successor(#20217,#20224)
-successor(#20215,#20226)
-successor(#20194,#20201)
-successor(#20204,#20195)
+successor(#20258,#20257)
+successor(#20257,#20259)
+successor(#20242,#20247)
+successor(#20249,#20243)
 #20279=*
-entry_cfg_node(#20279,#20204)
-#20280=@"loc,{#10000},3,24,3,23"
-locations_default(#20280,#10000,3,24,3,23)
+entry_cfg_node(#20279,#20249)
+#20280=@"loc,{#10000},8,13,8,12"
+locations_default(#20280,#10000,8,13,8,12)
 hasLocation(#20279,#20280)
 #20281=*
-exit_cfg_node(#20281,#20204)
-#20282=@"loc,{#10000},3,43,3,42"
-locations_default(#20282,#10000,3,43,3,42)
+exit_cfg_node(#20281,#20249)
+#20282=@"loc,{#10000},8,26,8,25"
+locations_default(#20282,#10000,8,26,8,25)
 hasLocation(#20281,#20282)
-successor(#20212,#20281)
-successor(#20210,#20212)
-successor(#20208,#20210)
-successor(#20279,#20208)
-successor(#20203,#20197)
-successor(#20202,#20199)
-successor(#20201,#20202)
-successor(#20199,#20203)
-successor(#20197,#20204)
-successor(#20195,#20214)
-successor(#20184,#20194)
+successor(#20254,#20281)
+successor(#20279,#20254)
+successor(#20248,#20245)
+successor(#20247,#20248)
+successor(#20245,#20249)
+successor(#20243,#20256)
+successor(#20237,#20240)
+successor(#20241,#20238)
+successor(#20240,#20241)
+successor(#20238,#20242)
+successor(#20229,#20234)
+successor(#20236,#20230)
+successor(#20235,#20232)
+successor(#20234,#20235)
+successor(#20232,#20236)
+successor(#20230,#20237)
+successor(#20217,#20224)
+successor(#20227,#20218)
+successor(#20226,#20220)
+successor(#20225,#20222)
+successor(#20224,#20225)
+successor(#20222,#20226)
+successor(#20220,#20227)
+successor(#20218,#20229)
+successor(#20196,#20203)
+successor(#20206,#20197)
 #20283=*
-entry_cfg_node(#20283,#20184)
-hasLocation(#20283,#20273)
-#20284=*
-exit_cfg_node(#20284,#20184)
-#20285=@"loc,{#10000},1,24,1,23"
-locations_default(#20285,#10000,1,24,1,23)
-hasLocation(#20284,#20285)
-successor(#20192,#20284)
+entry_cfg_node(#20283,#20206)
+#20284=@"loc,{#10000},3,24,3,23"
+locations_default(#20284,#10000,3,24,3,23)
+hasLocation(#20283,#20284)
+#20285=*
+exit_cfg_node(#20285,#20206)
+#20286=@"loc,{#10000},3,43,3,42"
+locations_default(#20286,#10000,3,43,3,42)
+hasLocation(#20285,#20286)
+successor(#20215,#20285)
+successor(#20213,#20215)
+successor(#20211,#20213)
+successor(#20283,#20211)
+successor(#20205,#20199)
+successor(#20204,#20201)
+successor(#20203,#20204)
+successor(#20201,#20205)
+successor(#20199,#20206)
+successor(#20197,#20217)
+successor(#20185,#20196)
+#20287=*
+entry_cfg_node(#20287,#20185)
+hasLocation(#20287,#20277)
+#20288=*
+exit_cfg_node(#20288,#20185)
+#20289=@"loc,{#10000},1,24,1,23"
+locations_default(#20289,#10000,1,24,1,23)
+hasLocation(#20288,#20289)
+successor(#20194,#20288)
+successor(#20192,#20194)
 successor(#20190,#20192)
-successor(#20188,#20190)
-successor(#20283,#20188)
-successor(#20185,#20184)
-successor(#20272,#20185)
+successor(#20287,#20190)
+successor(#20186,#20185)
+successor(#20276,#20186)
 is_externs(#20001)
 numlines(#10000,17,10,1)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/ambig.js.trap b/javascript/extractor/tests/flow/output/trap/ambig.js.trap
index 5c03f0309c2..640d3607fb0 100644
--- a/javascript/extractor/tests/flow/output/trap/ambig.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/ambig.js.trap
@@ -215,14 +215,16 @@ toplevels(#20001,0)
 #20077=@"loc,{#10000},1,1,9,0"
 locations_default(#20077,#10000,1,1,9,0)
 hasLocation(#20001,#20077)
-#20078=*
-entry_cfg_node(#20078,#20001)
-#20079=@"loc,{#10000},1,1,1,0"
-locations_default(#20079,#10000,1,1,1,0)
-hasLocation(#20078,#20079)
-#20080=*
-exit_cfg_node(#20080,#20001)
-hasLocation(#20080,#20076)
-successor(#20078,#20080)
+#20078=@"var;{this};{#20000}"
+variables(#20078,"this",#20000)
+#20079=*
+entry_cfg_node(#20079,#20001)
+#20080=@"loc,{#10000},1,1,1,0"
+locations_default(#20080,#10000,1,1,1,0)
+hasLocation(#20079,#20080)
+#20081=*
+exit_cfg_node(#20081,#20001)
+hasLocation(#20081,#20076)
+successor(#20079,#20081)
 numlines(#10000,8,7,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/anonFunctionOptionalParm.js.trap b/javascript/extractor/tests/flow/output/trap/anonFunctionOptionalParm.js.trap
index 8a5bb69f6ab..9437949324c 100644
--- a/javascript/extractor/tests/flow/output/trap/anonFunctionOptionalParm.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/anonFunctionOptionalParm.js.trap
@@ -92,74 +92,76 @@ locations_default(#20032,#10000,1,1,2,0)
 hasLocation(#20001,#20032)
 #20033=@"var;{f};{#20000}"
 variables(#20033,"f",#20000)
-#20034=*
-stmts(#20034,18,#20001,0,"var f = ...  => {};")
-hasLocation(#20034,#20003)
-stmt_containers(#20034,#20001)
+#20034=@"var;{this};{#20000}"
+variables(#20034,"this",#20000)
 #20035=*
-exprs(#20035,64,#20034,0,"f = (x?:int) => {}")
-#20036=@"loc,{#10000},1,5,1,22"
-locations_default(#20036,#10000,1,5,1,22)
-hasLocation(#20035,#20036)
-enclosing_stmt(#20035,#20034)
-expr_containers(#20035,#20001)
-#20037=*
-exprs(#20037,78,#20035,0,"f")
-hasLocation(#20037,#20007)
-enclosing_stmt(#20037,#20034)
-expr_containers(#20037,#20001)
-literals("f","f",#20037)
-decl(#20037,#20033)
+stmts(#20035,18,#20001,0,"var f = ...  => {};")
+hasLocation(#20035,#20003)
+stmt_containers(#20035,#20001)
+#20036=*
+exprs(#20036,64,#20035,0,"f = (x?:int) => {}")
+#20037=@"loc,{#10000},1,5,1,22"
+locations_default(#20037,#10000,1,5,1,22)
+hasLocation(#20036,#20037)
+enclosing_stmt(#20036,#20035)
+expr_containers(#20036,#20001)
 #20038=*
-exprs(#20038,65,#20035,1,"(x?:int) => {}")
-#20039=@"loc,{#10000},1,9,1,22"
-locations_default(#20039,#10000,1,9,1,22)
-hasLocation(#20038,#20039)
-enclosing_stmt(#20038,#20034)
+exprs(#20038,78,#20036,0,"f")
+hasLocation(#20038,#20007)
+enclosing_stmt(#20038,#20035)
 expr_containers(#20038,#20001)
-#20040=*
-scopes(#20040,1)
-scopenodes(#20038,#20040)
-scopenesting(#20040,#20000)
-#20041=@"var;{x};{#20040}"
-variables(#20041,"x",#20040)
-#20042=*
-exprs(#20042,78,#20038,0,"x")
-hasLocation(#20042,#20013)
-expr_containers(#20042,#20038)
-literals("x","x",#20042)
-decl(#20042,#20041)
+literals("f","f",#20038)
+decl(#20038,#20033)
+#20039=*
+exprs(#20039,65,#20036,1,"(x?:int) => {}")
+#20040=@"loc,{#10000},1,9,1,22"
+locations_default(#20040,#10000,1,9,1,22)
+hasLocation(#20039,#20040)
+enclosing_stmt(#20039,#20035)
+expr_containers(#20039,#20001)
+#20041=*
+scopes(#20041,1)
+scopenodes(#20039,#20041)
+scopenesting(#20041,#20000)
+#20042=@"var;{x};{#20041}"
+variables(#20042,"x",#20041)
 #20043=*
-stmts(#20043,1,#20038,-2,"{}")
-#20044=@"loc,{#10000},1,21,1,22"
-locations_default(#20044,#10000,1,21,1,22)
-hasLocation(#20043,#20044)
-stmt_containers(#20043,#20038)
-#20045=*
-entry_cfg_node(#20045,#20001)
-#20046=@"loc,{#10000},1,1,1,0"
-locations_default(#20046,#10000,1,1,1,0)
-hasLocation(#20045,#20046)
-#20047=*
-exit_cfg_node(#20047,#20001)
-hasLocation(#20047,#20031)
-successor(#20034,#20037)
-successor(#20038,#20035)
+exprs(#20043,78,#20039,0,"x")
+hasLocation(#20043,#20013)
+expr_containers(#20043,#20039)
+literals("x","x",#20043)
+decl(#20043,#20042)
+#20044=*
+stmts(#20044,1,#20039,-2,"{}")
+#20045=@"loc,{#10000},1,21,1,22"
+locations_default(#20045,#10000,1,21,1,22)
+hasLocation(#20044,#20045)
+stmt_containers(#20044,#20039)
+#20046=*
+entry_cfg_node(#20046,#20001)
+#20047=@"loc,{#10000},1,1,1,0"
+locations_default(#20047,#10000,1,1,1,0)
+hasLocation(#20046,#20047)
 #20048=*
-entry_cfg_node(#20048,#20038)
-#20049=@"loc,{#10000},1,9,1,8"
-locations_default(#20049,#10000,1,9,1,8)
-hasLocation(#20048,#20049)
-#20050=*
-exit_cfg_node(#20050,#20038)
-#20051=@"loc,{#10000},1,23,1,22"
-locations_default(#20051,#10000,1,23,1,22)
-hasLocation(#20050,#20051)
-successor(#20043,#20050)
-successor(#20042,#20043)
-successor(#20048,#20042)
-successor(#20037,#20038)
-successor(#20035,#20047)
-successor(#20045,#20034)
+exit_cfg_node(#20048,#20001)
+hasLocation(#20048,#20031)
+successor(#20035,#20038)
+successor(#20039,#20036)
+#20049=*
+entry_cfg_node(#20049,#20039)
+#20050=@"loc,{#10000},1,9,1,8"
+locations_default(#20050,#10000,1,9,1,8)
+hasLocation(#20049,#20050)
+#20051=*
+exit_cfg_node(#20051,#20039)
+#20052=@"loc,{#10000},1,23,1,22"
+locations_default(#20052,#10000,1,23,1,22)
+hasLocation(#20051,#20052)
+successor(#20044,#20051)
+successor(#20043,#20044)
+successor(#20049,#20043)
+successor(#20038,#20039)
+successor(#20036,#20048)
+successor(#20046,#20035)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/anonFunctionReturnType.js.trap b/javascript/extractor/tests/flow/output/trap/anonFunctionReturnType.js.trap
index 6118bba7388..4850f4069f9 100644
--- a/javascript/extractor/tests/flow/output/trap/anonFunctionReturnType.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/anonFunctionReturnType.js.trap
@@ -99,74 +99,76 @@ toplevels(#20001,0)
 hasLocation(#20001,#20003)
 #20036=@"var;{f};{#20000}"
 variables(#20036,"f",#20000)
-#20037=*
-stmts(#20037,18,#20001,0,"var f = ...  => {};")
-hasLocation(#20037,#20003)
-stmt_containers(#20037,#20001)
+#20037=@"var;{this};{#20000}"
+variables(#20037,"this",#20000)
 #20038=*
-exprs(#20038,64,#20037,0,"f = (vi ... n => {}")
-#20039=@"loc,{#10000},1,5,1,47"
-locations_default(#20039,#10000,1,5,1,47)
-hasLocation(#20038,#20039)
-enclosing_stmt(#20038,#20037)
-expr_containers(#20038,#20001)
-#20040=*
-exprs(#20040,78,#20038,0,"f")
-hasLocation(#20040,#20007)
-enclosing_stmt(#20040,#20037)
-expr_containers(#20040,#20001)
-literals("f","f",#20040)
-decl(#20040,#20036)
+stmts(#20038,18,#20001,0,"var f = ...  => {};")
+hasLocation(#20038,#20003)
+stmt_containers(#20038,#20001)
+#20039=*
+exprs(#20039,64,#20038,0,"f = (vi ... n => {}")
+#20040=@"loc,{#10000},1,5,1,47"
+locations_default(#20040,#10000,1,5,1,47)
+hasLocation(#20039,#20040)
+enclosing_stmt(#20039,#20038)
+expr_containers(#20039,#20001)
 #20041=*
-exprs(#20041,65,#20038,1,"(viewab ... n => {}")
-#20042=@"loc,{#10000},1,9,1,47"
-locations_default(#20042,#10000,1,9,1,47)
-hasLocation(#20041,#20042)
-enclosing_stmt(#20041,#20037)
+exprs(#20041,78,#20039,0,"f")
+hasLocation(#20041,#20007)
+enclosing_stmt(#20041,#20038)
 expr_containers(#20041,#20001)
-#20043=*
-scopes(#20043,1)
-scopenodes(#20041,#20043)
-scopenesting(#20043,#20000)
-#20044=@"var;{viewable};{#20043}"
-variables(#20044,"viewable",#20043)
-#20045=*
-exprs(#20045,78,#20041,0,"viewable")
-hasLocation(#20045,#20013)
-expr_containers(#20045,#20041)
-literals("viewable","viewable",#20045)
-decl(#20045,#20044)
+literals("f","f",#20041)
+decl(#20041,#20036)
+#20042=*
+exprs(#20042,65,#20039,1,"(viewab ... n => {}")
+#20043=@"loc,{#10000},1,9,1,47"
+locations_default(#20043,#10000,1,9,1,47)
+hasLocation(#20042,#20043)
+enclosing_stmt(#20042,#20038)
+expr_containers(#20042,#20001)
+#20044=*
+scopes(#20044,1)
+scopenodes(#20042,#20044)
+scopenesting(#20044,#20000)
+#20045=@"var;{viewable};{#20044}"
+variables(#20045,"viewable",#20044)
 #20046=*
-stmts(#20046,1,#20041,-2,"{}")
-#20047=@"loc,{#10000},1,46,1,47"
-locations_default(#20047,#10000,1,46,1,47)
-hasLocation(#20046,#20047)
-stmt_containers(#20046,#20041)
-#20048=*
-entry_cfg_node(#20048,#20001)
-#20049=@"loc,{#10000},1,1,1,0"
-locations_default(#20049,#10000,1,1,1,0)
-hasLocation(#20048,#20049)
-#20050=*
-exit_cfg_node(#20050,#20001)
-hasLocation(#20050,#20035)
-successor(#20037,#20040)
-successor(#20041,#20038)
+exprs(#20046,78,#20042,0,"viewable")
+hasLocation(#20046,#20013)
+expr_containers(#20046,#20042)
+literals("viewable","viewable",#20046)
+decl(#20046,#20045)
+#20047=*
+stmts(#20047,1,#20042,-2,"{}")
+#20048=@"loc,{#10000},1,46,1,47"
+locations_default(#20048,#10000,1,46,1,47)
+hasLocation(#20047,#20048)
+stmt_containers(#20047,#20042)
+#20049=*
+entry_cfg_node(#20049,#20001)
+#20050=@"loc,{#10000},1,1,1,0"
+locations_default(#20050,#10000,1,1,1,0)
+hasLocation(#20049,#20050)
 #20051=*
-entry_cfg_node(#20051,#20041)
-#20052=@"loc,{#10000},1,9,1,8"
-locations_default(#20052,#10000,1,9,1,8)
-hasLocation(#20051,#20052)
-#20053=*
-exit_cfg_node(#20053,#20041)
-#20054=@"loc,{#10000},1,48,1,47"
-locations_default(#20054,#10000,1,48,1,47)
-hasLocation(#20053,#20054)
-successor(#20046,#20053)
-successor(#20045,#20046)
-successor(#20051,#20045)
-successor(#20040,#20041)
-successor(#20038,#20050)
-successor(#20048,#20037)
+exit_cfg_node(#20051,#20001)
+hasLocation(#20051,#20035)
+successor(#20038,#20041)
+successor(#20042,#20039)
+#20052=*
+entry_cfg_node(#20052,#20042)
+#20053=@"loc,{#10000},1,9,1,8"
+locations_default(#20053,#10000,1,9,1,8)
+hasLocation(#20052,#20053)
+#20054=*
+exit_cfg_node(#20054,#20042)
+#20055=@"loc,{#10000},1,48,1,47"
+locations_default(#20055,#10000,1,48,1,47)
+hasLocation(#20054,#20055)
+successor(#20047,#20054)
+successor(#20046,#20047)
+successor(#20052,#20046)
+successor(#20041,#20042)
+successor(#20039,#20051)
+successor(#20049,#20038)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/anonFunctionWithoutParens.js.trap b/javascript/extractor/tests/flow/output/trap/anonFunctionWithoutParens.js.trap
index 154751cda15..9a1b1c05f6c 100644
--- a/javascript/extractor/tests/flow/output/trap/anonFunctionWithoutParens.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/anonFunctionWithoutParens.js.trap
@@ -72,14 +72,16 @@ locations_default(#20025,#10000,1,40,1,39)
 hasLocation(#20024,#20025)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20026=*
-entry_cfg_node(#20026,#20001)
-#20027=@"loc,{#10000},1,1,1,0"
-locations_default(#20027,#10000,1,1,1,0)
-hasLocation(#20026,#20027)
-#20028=*
-exit_cfg_node(#20028,#20001)
-hasLocation(#20028,#20025)
-successor(#20026,#20028)
+#20026=@"var;{this};{#20000}"
+variables(#20026,"this",#20000)
+#20027=*
+entry_cfg_node(#20027,#20001)
+#20028=@"loc,{#10000},1,1,1,0"
+locations_default(#20028,#10000,1,1,1,0)
+hasLocation(#20027,#20028)
+#20029=*
+exit_cfg_node(#20029,#20001)
+hasLocation(#20029,#20025)
+successor(#20027,#20029)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/anonIndexer.js.trap b/javascript/extractor/tests/flow/output/trap/anonIndexer.js.trap
index 6f75d1228b7..c26879b6499 100644
--- a/javascript/extractor/tests/flow/output/trap/anonIndexer.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/anonIndexer.js.trap
@@ -85,14 +85,16 @@ toplevels(#20001,0)
 #20030=@"loc,{#10000},1,1,2,0"
 locations_default(#20030,#10000,1,1,2,0)
 hasLocation(#20001,#20030)
-#20031=*
-entry_cfg_node(#20031,#20001)
-#20032=@"loc,{#10000},1,1,1,0"
-locations_default(#20032,#10000,1,1,1,0)
-hasLocation(#20031,#20032)
-#20033=*
-exit_cfg_node(#20033,#20001)
-hasLocation(#20033,#20029)
-successor(#20031,#20033)
+#20031=@"var;{this};{#20000}"
+variables(#20031,"this",#20000)
+#20032=*
+entry_cfg_node(#20032,#20001)
+#20033=@"loc,{#10000},1,1,1,0"
+locations_default(#20033,#10000,1,1,1,0)
+hasLocation(#20032,#20033)
+#20034=*
+exit_cfg_node(#20034,#20001)
+hasLocation(#20034,#20029)
+successor(#20032,#20034)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/arbitaryModuleSpecifier.js.trap b/javascript/extractor/tests/flow/output/trap/arbitaryModuleSpecifier.js.trap
index 50ec6a88c65..03bf7785bf5 100644
--- a/javascript/extractor/tests/flow/output/trap/arbitaryModuleSpecifier.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/arbitaryModuleSpecifier.js.trap
@@ -81,63 +81,65 @@ local_namespace_names(#20026,"foo",#20023)
 variables(#20024,"foo",#20023)
 local_type_names(#20025,"foo",#20023)
 local_namespace_names(#20026,"foo",#20023)
-#20027=*
-stmts(#20027,27,#20001,0,"import  ...  ""foo"";")
-#20028=@"loc,{#10000},1,1,1,28"
-locations_default(#20028,#10000,1,1,1,28)
-hasLocation(#20027,#20028)
-stmt_containers(#20027,#20001)
-#20029=*
-exprs(#20029,4,#20027,-1,"""foo""")
-hasLocation(#20029,#20017)
-enclosing_stmt(#20029,#20027)
-expr_containers(#20029,#20001)
-literals("foo","""foo""",#20029)
+#20027=@"var;{this};{#20023}"
+variables(#20027,"this",#20023)
+#20028=*
+stmts(#20028,27,#20001,0,"import  ...  ""foo"";")
+#20029=@"loc,{#10000},1,1,1,28"
+locations_default(#20029,#10000,1,1,1,28)
+hasLocation(#20028,#20029)
+stmt_containers(#20028,#20001)
 #20030=*
-regexpterm(#20030,14,#20029,0,"foo")
-#20031=@"loc,{#10000},1,24,1,26"
-locations_default(#20031,#10000,1,24,1,26)
-hasLocation(#20030,#20031)
-regexp_const_value(#20030,"foo")
-#20032=*
-exprs(#20032,83,#20027,0,"""foo""")
-hasLocation(#20032,#20011)
-enclosing_stmt(#20032,#20027)
-expr_containers(#20032,#20001)
+exprs(#20030,4,#20028,-1,"""foo""")
+hasLocation(#20030,#20017)
+enclosing_stmt(#20030,#20028)
+expr_containers(#20030,#20001)
+literals("foo","""foo""",#20030)
+#20031=*
+regexpterm(#20031,14,#20030,0,"foo")
+#20032=@"loc,{#10000},1,24,1,26"
+locations_default(#20032,#10000,1,24,1,26)
+hasLocation(#20031,#20032)
+regexp_const_value(#20031,"foo")
 #20033=*
-exprs(#20033,0,#20032,0,"""foo""")
+exprs(#20033,83,#20028,0,"""foo""")
 hasLocation(#20033,#20011)
-enclosing_stmt(#20033,#20027)
+enclosing_stmt(#20033,#20028)
 expr_containers(#20033,#20001)
-literals("foo","foo",#20033)
 #20034=*
-exprs(#20034,78,#20032,1,"""foo""")
+exprs(#20034,0,#20033,0,"""foo""")
 hasLocation(#20034,#20011)
-enclosing_stmt(#20034,#20027)
+enclosing_stmt(#20034,#20028)
 expr_containers(#20034,#20001)
 literals("foo","foo",#20034)
-decl(#20034,#20024)
-typedecl(#20034,#20025)
-namespacedecl(#20034,#20026)
 #20035=*
-entry_cfg_node(#20035,#20001)
-#20036=@"loc,{#10000},1,1,1,0"
-locations_default(#20036,#10000,1,1,1,0)
-hasLocation(#20035,#20036)
-#20037=*
-exit_cfg_node(#20037,#20001)
-hasLocation(#20037,#20021)
-successor(#20027,#20037)
-successor(#20032,#20027)
-successor(#20035,#20032)
+exprs(#20035,78,#20033,1,"""foo""")
+hasLocation(#20035,#20011)
+enclosing_stmt(#20035,#20028)
+expr_containers(#20035,#20001)
+literals("foo","foo",#20035)
+decl(#20035,#20024)
+typedecl(#20035,#20025)
+namespacedecl(#20035,#20026)
+#20036=*
+entry_cfg_node(#20036,#20001)
+#20037=@"loc,{#10000},1,1,1,0"
+locations_default(#20037,#10000,1,1,1,0)
+hasLocation(#20036,#20037)
 #20038=*
-js_parse_errors(#20038,#20001,"Error: Unexpected string","import { ""foo"" } from ""foo""; // syntax-error, but it shouldn't crash the extractor
-")
-hasLocation(#20038,#20013)
+exit_cfg_node(#20038,#20001)
+hasLocation(#20038,#20021)
+successor(#20028,#20038)
+successor(#20033,#20028)
+successor(#20036,#20033)
 #20039=*
-lines(#20039,#20001,"import { ""foo"" } from ""foo""; // syntax-error, but it shouldn't crash the extractor","
+js_parse_errors(#20039,#20001,"Error: Unexpected string","import { ""foo"" } from ""foo""; // syntax-error, but it shouldn't crash the extractor
 ")
-hasLocation(#20039,#20005)
+hasLocation(#20039,#20013)
+#20040=*
+lines(#20040,#20001,"import { ""foo"" } from ""foo""; // syntax-error, but it shouldn't crash the extractor","
+")
+hasLocation(#20040,#20005)
 numlines(#20001,1,0,0)
 numlines(#10000,1,1,1)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/array-types.js.trap b/javascript/extractor/tests/flow/output/trap/array-types.js.trap
index de8a4aa77d9..0d92ed3735b 100644
--- a/javascript/extractor/tests/flow/output/trap/array-types.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/array-types.js.trap
@@ -285,204 +285,214 @@ locations_default(#20108,#10000,1,1,5,0)
 hasLocation(#20001,#20108)
 #20109=@"var;{f};{#20000}"
 variables(#20109,"f",#20000)
-#20110=*
-stmts(#20110,17,#20001,0,"function f(p: T) {}")
-hasLocation(#20110,#20003)
-stmt_containers(#20110,#20001)
+#20110=@"var;{this};{#20000}"
+variables(#20110,"this",#20000)
 #20111=*
-exprs(#20111,78,#20110,-1,"f")
-hasLocation(#20111,#20013)
-expr_containers(#20111,#20110)
-literals("f","f",#20111)
-decl(#20111,#20109)
+stmts(#20111,17,#20001,0,"function f(p: T) {}")
+hasLocation(#20111,#20003)
+stmt_containers(#20111,#20001)
 #20112=*
-scopes(#20112,1)
-scopenodes(#20110,#20112)
-scopenesting(#20112,#20000)
-#20113=@"var;{p};{#20112}"
-variables(#20113,"p",#20112)
-#20114=*
-exprs(#20114,78,#20110,0,"p: T")
-#20115=@"loc,{#10000},1,12,1,15"
-locations_default(#20115,#10000,1,12,1,15)
-hasLocation(#20114,#20115)
-expr_containers(#20114,#20110)
-literals("p","p",#20114)
-decl(#20114,#20113)
-#20116=@"var;{arguments};{#20112}"
-variables(#20116,"arguments",#20112)
-is_arguments_object(#20116)
-#20117=*
-stmts(#20117,1,#20110,-2,"{}")
-#20118=@"loc,{#10000},1,18,1,19"
-locations_default(#20118,#10000,1,18,1,19)
-hasLocation(#20117,#20118)
-stmt_containers(#20117,#20110)
+exprs(#20112,78,#20111,-1,"f")
+hasLocation(#20112,#20013)
+expr_containers(#20112,#20111)
+literals("f","f",#20112)
+decl(#20112,#20109)
+#20113=*
+scopes(#20113,1)
+scopenodes(#20111,#20113)
+scopenesting(#20113,#20000)
+#20114=@"var;{this};{#20113}"
+variables(#20114,"this",#20113)
+#20115=@"var;{p};{#20113}"
+variables(#20115,"p",#20113)
+#20116=*
+exprs(#20116,78,#20111,0,"p: T")
+#20117=@"loc,{#10000},1,12,1,15"
+locations_default(#20117,#10000,1,12,1,15)
+hasLocation(#20116,#20117)
+expr_containers(#20116,#20111)
+literals("p","p",#20116)
+decl(#20116,#20115)
+#20118=@"var;{arguments};{#20113}"
+variables(#20118,"arguments",#20113)
+is_arguments_object(#20118)
 #20119=*
-stmts(#20119,17,#20001,1,"functio ... T[]) {}")
-hasLocation(#20119,#20005)
-stmt_containers(#20119,#20001)
-#20120=*
-exprs(#20120,78,#20119,-1,"f")
-hasLocation(#20120,#20031)
-expr_containers(#20120,#20119)
-literals("f","f",#20120)
-decl(#20120,#20109)
+stmts(#20119,1,#20111,-2,"{}")
+#20120=@"loc,{#10000},1,18,1,19"
+locations_default(#20120,#10000,1,18,1,19)
+hasLocation(#20119,#20120)
+stmt_containers(#20119,#20111)
 #20121=*
-scopes(#20121,1)
-scopenodes(#20119,#20121)
-scopenesting(#20121,#20000)
-#20122=@"var;{p};{#20121}"
-variables(#20122,"p",#20121)
+stmts(#20121,17,#20001,1,"functio ... T[]) {}")
+hasLocation(#20121,#20005)
+stmt_containers(#20121,#20001)
+#20122=*
+exprs(#20122,78,#20121,-1,"f")
+hasLocation(#20122,#20031)
+expr_containers(#20122,#20121)
+literals("f","f",#20122)
+decl(#20122,#20109)
 #20123=*
-exprs(#20123,78,#20119,0,"p: T[]")
-#20124=@"loc,{#10000},2,12,2,17"
-locations_default(#20124,#10000,2,12,2,17)
-hasLocation(#20123,#20124)
-expr_containers(#20123,#20119)
-literals("p","p",#20123)
-decl(#20123,#20122)
-#20125=@"var;{arguments};{#20121}"
-variables(#20125,"arguments",#20121)
-is_arguments_object(#20125)
+scopes(#20123,1)
+scopenodes(#20121,#20123)
+scopenesting(#20123,#20000)
+#20124=@"var;{this};{#20123}"
+variables(#20124,"this",#20123)
+#20125=@"var;{p};{#20123}"
+variables(#20125,"p",#20123)
 #20126=*
-stmts(#20126,1,#20119,-2,"{}")
-#20127=@"loc,{#10000},2,20,2,21"
-locations_default(#20127,#10000,2,20,2,21)
+exprs(#20126,78,#20121,0,"p: T[]")
+#20127=@"loc,{#10000},2,12,2,17"
+locations_default(#20127,#10000,2,12,2,17)
 hasLocation(#20126,#20127)
-stmt_containers(#20126,#20119)
-#20128=*
-stmts(#20128,17,#20001,2,"functio ... ][]) {}")
-hasLocation(#20128,#20007)
-stmt_containers(#20128,#20001)
+expr_containers(#20126,#20121)
+literals("p","p",#20126)
+decl(#20126,#20125)
+#20128=@"var;{arguments};{#20123}"
+variables(#20128,"arguments",#20123)
+is_arguments_object(#20128)
 #20129=*
-exprs(#20129,78,#20128,-1,"f")
-hasLocation(#20129,#20053)
-expr_containers(#20129,#20128)
-literals("f","f",#20129)
-decl(#20129,#20109)
-#20130=*
-scopes(#20130,1)
-scopenodes(#20128,#20130)
-scopenesting(#20130,#20000)
-#20131=@"var;{p};{#20130}"
-variables(#20131,"p",#20130)
+stmts(#20129,1,#20121,-2,"{}")
+#20130=@"loc,{#10000},2,20,2,21"
+locations_default(#20130,#10000,2,20,2,21)
+hasLocation(#20129,#20130)
+stmt_containers(#20129,#20121)
+#20131=*
+stmts(#20131,17,#20001,2,"functio ... ][]) {}")
+hasLocation(#20131,#20007)
+stmt_containers(#20131,#20001)
 #20132=*
-exprs(#20132,78,#20128,0,"p: T[][]")
-#20133=@"loc,{#10000},3,12,3,19"
-locations_default(#20133,#10000,3,12,3,19)
-hasLocation(#20132,#20133)
-expr_containers(#20132,#20128)
-literals("p","p",#20132)
-decl(#20132,#20131)
-#20134=@"var;{arguments};{#20130}"
-variables(#20134,"arguments",#20130)
-is_arguments_object(#20134)
-#20135=*
-stmts(#20135,1,#20128,-2,"{}")
-#20136=@"loc,{#10000},3,22,3,23"
-locations_default(#20136,#10000,3,22,3,23)
-hasLocation(#20135,#20136)
-stmt_containers(#20135,#20128)
-#20137=*
-stmts(#20137,17,#20001,3,"functio ... ][]) {}")
-hasLocation(#20137,#20009)
-stmt_containers(#20137,#20001)
-#20138=*
-exprs(#20138,78,#20137,-1,"f")
-hasLocation(#20138,#20079)
-expr_containers(#20138,#20137)
-literals("f","f",#20138)
-decl(#20138,#20109)
+exprs(#20132,78,#20131,-1,"f")
+hasLocation(#20132,#20053)
+expr_containers(#20132,#20131)
+literals("f","f",#20132)
+decl(#20132,#20109)
+#20133=*
+scopes(#20133,1)
+scopenodes(#20131,#20133)
+scopenesting(#20133,#20000)
+#20134=@"var;{this};{#20133}"
+variables(#20134,"this",#20133)
+#20135=@"var;{p};{#20133}"
+variables(#20135,"p",#20133)
+#20136=*
+exprs(#20136,78,#20131,0,"p: T[][]")
+#20137=@"loc,{#10000},3,12,3,19"
+locations_default(#20137,#10000,3,12,3,19)
+hasLocation(#20136,#20137)
+expr_containers(#20136,#20131)
+literals("p","p",#20136)
+decl(#20136,#20135)
+#20138=@"var;{arguments};{#20133}"
+variables(#20138,"arguments",#20133)
+is_arguments_object(#20138)
 #20139=*
-scopes(#20139,1)
-scopenodes(#20137,#20139)
-scopenesting(#20139,#20000)
-#20140=@"var;{p};{#20139}"
-variables(#20140,"p",#20139)
+stmts(#20139,1,#20131,-2,"{}")
+#20140=@"loc,{#10000},3,22,3,23"
+locations_default(#20140,#10000,3,22,3,23)
+hasLocation(#20139,#20140)
+stmt_containers(#20139,#20131)
 #20141=*
-exprs(#20141,78,#20137,0,"p: T[][][]")
-#20142=@"loc,{#10000},4,12,4,21"
-locations_default(#20142,#10000,4,12,4,21)
-hasLocation(#20141,#20142)
-expr_containers(#20141,#20137)
-literals("p","p",#20141)
-decl(#20141,#20140)
-#20143=@"var;{arguments};{#20139}"
-variables(#20143,"arguments",#20139)
-is_arguments_object(#20143)
-#20144=*
-stmts(#20144,1,#20137,-2,"{}")
-#20145=@"loc,{#10000},4,24,4,25"
-locations_default(#20145,#10000,4,24,4,25)
-hasLocation(#20144,#20145)
-stmt_containers(#20144,#20137)
+stmts(#20141,17,#20001,3,"functio ... ][]) {}")
+hasLocation(#20141,#20009)
+stmt_containers(#20141,#20001)
+#20142=*
+exprs(#20142,78,#20141,-1,"f")
+hasLocation(#20142,#20079)
+expr_containers(#20142,#20141)
+literals("f","f",#20142)
+decl(#20142,#20109)
+#20143=*
+scopes(#20143,1)
+scopenodes(#20141,#20143)
+scopenesting(#20143,#20000)
+#20144=@"var;{this};{#20143}"
+variables(#20144,"this",#20143)
+#20145=@"var;{p};{#20143}"
+variables(#20145,"p",#20143)
 #20146=*
-entry_cfg_node(#20146,#20001)
-#20147=@"loc,{#10000},1,1,1,0"
-locations_default(#20147,#10000,1,1,1,0)
+exprs(#20146,78,#20141,0,"p: T[][][]")
+#20147=@"loc,{#10000},4,12,4,21"
+locations_default(#20147,#10000,4,12,4,21)
 hasLocation(#20146,#20147)
-#20148=*
-exit_cfg_node(#20148,#20001)
-hasLocation(#20148,#20107)
-successor(#20137,#20148)
+expr_containers(#20146,#20141)
+literals("p","p",#20146)
+decl(#20146,#20145)
+#20148=@"var;{arguments};{#20143}"
+variables(#20148,"arguments",#20143)
+is_arguments_object(#20148)
 #20149=*
-entry_cfg_node(#20149,#20137)
-#20150=@"loc,{#10000},4,1,4,0"
-locations_default(#20150,#10000,4,1,4,0)
+stmts(#20149,1,#20141,-2,"{}")
+#20150=@"loc,{#10000},4,24,4,25"
+locations_default(#20150,#10000,4,24,4,25)
 hasLocation(#20149,#20150)
+stmt_containers(#20149,#20141)
 #20151=*
-exit_cfg_node(#20151,#20137)
-#20152=@"loc,{#10000},4,26,4,25"
-locations_default(#20152,#10000,4,26,4,25)
+entry_cfg_node(#20151,#20001)
+#20152=@"loc,{#10000},1,1,1,0"
+locations_default(#20152,#10000,1,1,1,0)
 hasLocation(#20151,#20152)
-successor(#20144,#20151)
-successor(#20141,#20144)
-successor(#20149,#20141)
-successor(#20128,#20137)
 #20153=*
-entry_cfg_node(#20153,#20128)
-#20154=@"loc,{#10000},3,1,3,0"
-locations_default(#20154,#10000,3,1,3,0)
-hasLocation(#20153,#20154)
-#20155=*
-exit_cfg_node(#20155,#20128)
-#20156=@"loc,{#10000},3,24,3,23"
-locations_default(#20156,#10000,3,24,3,23)
-hasLocation(#20155,#20156)
-successor(#20135,#20155)
-successor(#20132,#20135)
-successor(#20153,#20132)
-successor(#20119,#20128)
-#20157=*
-entry_cfg_node(#20157,#20119)
-#20158=@"loc,{#10000},2,1,2,0"
-locations_default(#20158,#10000,2,1,2,0)
-hasLocation(#20157,#20158)
-#20159=*
-exit_cfg_node(#20159,#20119)
-#20160=@"loc,{#10000},2,22,2,21"
-locations_default(#20160,#10000,2,22,2,21)
-hasLocation(#20159,#20160)
-successor(#20126,#20159)
-successor(#20123,#20126)
-successor(#20157,#20123)
-successor(#20110,#20119)
-#20161=*
-entry_cfg_node(#20161,#20110)
-hasLocation(#20161,#20147)
+exit_cfg_node(#20153,#20001)
+hasLocation(#20153,#20107)
+successor(#20141,#20153)
+#20154=*
+entry_cfg_node(#20154,#20141)
+#20155=@"loc,{#10000},4,1,4,0"
+locations_default(#20155,#10000,4,1,4,0)
+hasLocation(#20154,#20155)
+#20156=*
+exit_cfg_node(#20156,#20141)
+#20157=@"loc,{#10000},4,26,4,25"
+locations_default(#20157,#10000,4,26,4,25)
+hasLocation(#20156,#20157)
+successor(#20149,#20156)
+successor(#20146,#20149)
+successor(#20154,#20146)
+successor(#20131,#20141)
+#20158=*
+entry_cfg_node(#20158,#20131)
+#20159=@"loc,{#10000},3,1,3,0"
+locations_default(#20159,#10000,3,1,3,0)
+hasLocation(#20158,#20159)
+#20160=*
+exit_cfg_node(#20160,#20131)
+#20161=@"loc,{#10000},3,24,3,23"
+locations_default(#20161,#10000,3,24,3,23)
+hasLocation(#20160,#20161)
+successor(#20139,#20160)
+successor(#20136,#20139)
+successor(#20158,#20136)
+successor(#20121,#20131)
 #20162=*
-exit_cfg_node(#20162,#20110)
-#20163=@"loc,{#10000},1,20,1,19"
-locations_default(#20163,#10000,1,20,1,19)
+entry_cfg_node(#20162,#20121)
+#20163=@"loc,{#10000},2,1,2,0"
+locations_default(#20163,#10000,2,1,2,0)
 hasLocation(#20162,#20163)
-successor(#20117,#20162)
-successor(#20114,#20117)
-successor(#20161,#20114)
-successor(#20138,#20110)
-successor(#20129,#20138)
-successor(#20120,#20129)
-successor(#20111,#20120)
-successor(#20146,#20111)
+#20164=*
+exit_cfg_node(#20164,#20121)
+#20165=@"loc,{#10000},2,22,2,21"
+locations_default(#20165,#10000,2,22,2,21)
+hasLocation(#20164,#20165)
+successor(#20129,#20164)
+successor(#20126,#20129)
+successor(#20162,#20126)
+successor(#20111,#20121)
+#20166=*
+entry_cfg_node(#20166,#20111)
+hasLocation(#20166,#20152)
+#20167=*
+exit_cfg_node(#20167,#20111)
+#20168=@"loc,{#10000},1,20,1,19"
+locations_default(#20168,#10000,1,20,1,19)
+hasLocation(#20167,#20168)
+successor(#20119,#20167)
+successor(#20116,#20119)
+successor(#20166,#20116)
+successor(#20142,#20111)
+successor(#20132,#20142)
+successor(#20122,#20132)
+successor(#20112,#20122)
+successor(#20151,#20112)
 numlines(#10000,4,4,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/async.js.trap b/javascript/extractor/tests/flow/output/trap/async.js.trap
index c1a1fbdaa7f..08066c0b647 100644
--- a/javascript/extractor/tests/flow/output/trap/async.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/async.js.trap
@@ -112,82 +112,84 @@ locations_default(#20040,#10000,1,1,2,0)
 hasLocation(#20001,#20040)
 #20041=@"var;{f};{#20000}"
 variables(#20041,"f",#20000)
-#20042=*
-stmts(#20042,23,#20001,0,"let f = ...  foo();")
-hasLocation(#20042,#20003)
-stmt_containers(#20042,#20001)
+#20042=@"var;{this};{#20000}"
+variables(#20042,"this",#20000)
 #20043=*
-exprs(#20043,64,#20042,0,"f = asy ... t foo()")
-#20044=@"loc,{#10000},1,5,1,48"
-locations_default(#20044,#10000,1,5,1,48)
-hasLocation(#20043,#20044)
-enclosing_stmt(#20043,#20042)
-expr_containers(#20043,#20001)
-#20045=*
-exprs(#20045,78,#20043,0,"f")
-hasLocation(#20045,#20007)
-enclosing_stmt(#20045,#20042)
-expr_containers(#20045,#20001)
-literals("f","f",#20045)
-decl(#20045,#20041)
+stmts(#20043,23,#20001,0,"let f = ...  foo();")
+hasLocation(#20043,#20003)
+stmt_containers(#20043,#20001)
+#20044=*
+exprs(#20044,64,#20043,0,"f = asy ... t foo()")
+#20045=@"loc,{#10000},1,5,1,48"
+locations_default(#20045,#10000,1,5,1,48)
+hasLocation(#20044,#20045)
+enclosing_stmt(#20044,#20043)
+expr_containers(#20044,#20001)
 #20046=*
-exprs(#20046,65,#20043,1,"async() ... t foo()")
-#20047=@"loc,{#10000},1,9,1,48"
-locations_default(#20047,#10000,1,9,1,48)
-hasLocation(#20046,#20047)
-enclosing_stmt(#20046,#20042)
+exprs(#20046,78,#20044,0,"f")
+hasLocation(#20046,#20007)
+enclosing_stmt(#20046,#20043)
 expr_containers(#20046,#20001)
-#20048=*
-scopes(#20048,1)
-scopenodes(#20046,#20048)
-scopenesting(#20048,#20000)
-is_async(#20046)
+literals("f","f",#20046)
+decl(#20046,#20041)
+#20047=*
+exprs(#20047,65,#20044,1,"async() ... t foo()")
+#20048=@"loc,{#10000},1,9,1,48"
+locations_default(#20048,#10000,1,9,1,48)
+hasLocation(#20047,#20048)
+enclosing_stmt(#20047,#20043)
+expr_containers(#20047,#20001)
 #20049=*
-exprs(#20049,92,#20046,-2,"await foo()")
-#20050=@"loc,{#10000},1,38,1,48"
-locations_default(#20050,#10000,1,38,1,48)
-hasLocation(#20049,#20050)
-expr_containers(#20049,#20046)
-#20051=*
-exprs(#20051,13,#20049,0,"foo()")
-#20052=@"loc,{#10000},1,44,1,48"
-locations_default(#20052,#10000,1,44,1,48)
-hasLocation(#20051,#20052)
-expr_containers(#20051,#20046)
-#20053=*
-exprs(#20053,79,#20051,-1,"foo")
-hasLocation(#20053,#20031)
-expr_containers(#20053,#20046)
-literals("foo","foo",#20053)
-#20054=@"var;{foo};{#20000}"
-variables(#20054,"foo",#20000)
-bind(#20053,#20054)
-#20055=*
-entry_cfg_node(#20055,#20001)
-#20056=@"loc,{#10000},1,1,1,0"
-locations_default(#20056,#10000,1,1,1,0)
-hasLocation(#20055,#20056)
-#20057=*
-exit_cfg_node(#20057,#20001)
-hasLocation(#20057,#20039)
-successor(#20042,#20045)
-successor(#20046,#20043)
+scopes(#20049,1)
+scopenodes(#20047,#20049)
+scopenesting(#20049,#20000)
+is_async(#20047)
+#20050=*
+exprs(#20050,92,#20047,-2,"await foo()")
+#20051=@"loc,{#10000},1,38,1,48"
+locations_default(#20051,#10000,1,38,1,48)
+hasLocation(#20050,#20051)
+expr_containers(#20050,#20047)
+#20052=*
+exprs(#20052,13,#20050,0,"foo()")
+#20053=@"loc,{#10000},1,44,1,48"
+locations_default(#20053,#10000,1,44,1,48)
+hasLocation(#20052,#20053)
+expr_containers(#20052,#20047)
+#20054=*
+exprs(#20054,79,#20052,-1,"foo")
+hasLocation(#20054,#20031)
+expr_containers(#20054,#20047)
+literals("foo","foo",#20054)
+#20055=@"var;{foo};{#20000}"
+variables(#20055,"foo",#20000)
+bind(#20054,#20055)
+#20056=*
+entry_cfg_node(#20056,#20001)
+#20057=@"loc,{#10000},1,1,1,0"
+locations_default(#20057,#10000,1,1,1,0)
+hasLocation(#20056,#20057)
 #20058=*
-entry_cfg_node(#20058,#20046)
-#20059=@"loc,{#10000},1,9,1,8"
-locations_default(#20059,#10000,1,9,1,8)
-hasLocation(#20058,#20059)
-#20060=*
-exit_cfg_node(#20060,#20046)
-#20061=@"loc,{#10000},1,49,1,48"
-locations_default(#20061,#10000,1,49,1,48)
-hasLocation(#20060,#20061)
-successor(#20053,#20051)
-successor(#20051,#20049)
-successor(#20049,#20060)
-successor(#20058,#20053)
-successor(#20045,#20046)
-successor(#20043,#20057)
-successor(#20055,#20042)
+exit_cfg_node(#20058,#20001)
+hasLocation(#20058,#20039)
+successor(#20043,#20046)
+successor(#20047,#20044)
+#20059=*
+entry_cfg_node(#20059,#20047)
+#20060=@"loc,{#10000},1,9,1,8"
+locations_default(#20060,#10000,1,9,1,8)
+hasLocation(#20059,#20060)
+#20061=*
+exit_cfg_node(#20061,#20047)
+#20062=@"loc,{#10000},1,49,1,48"
+locations_default(#20062,#10000,1,49,1,48)
+hasLocation(#20061,#20062)
+successor(#20054,#20052)
+successor(#20052,#20050)
+successor(#20050,#20061)
+successor(#20059,#20054)
+successor(#20046,#20047)
+successor(#20044,#20058)
+successor(#20056,#20043)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/atAtIteratorProp.js.trap b/javascript/extractor/tests/flow/output/trap/atAtIteratorProp.js.trap
index 3e4fbaa2bec..ce1ef10e5ad 100644
--- a/javascript/extractor/tests/flow/output/trap/atAtIteratorProp.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/atAtIteratorProp.js.trap
@@ -95,14 +95,16 @@ toplevels(#20001,0)
 #20033=@"loc,{#10000},1,1,3,1"
 locations_default(#20033,#10000,1,1,3,1)
 hasLocation(#20001,#20033)
-#20034=*
-entry_cfg_node(#20034,#20001)
-#20035=@"loc,{#10000},1,1,1,0"
-locations_default(#20035,#10000,1,1,1,0)
-hasLocation(#20034,#20035)
-#20036=*
-exit_cfg_node(#20036,#20001)
-hasLocation(#20036,#20032)
-successor(#20034,#20036)
+#20034=@"var;{this};{#20000}"
+variables(#20034,"this",#20000)
+#20035=*
+entry_cfg_node(#20035,#20001)
+#20036=@"loc,{#10000},1,1,1,0"
+locations_default(#20036,#10000,1,1,1,0)
+hasLocation(#20035,#20036)
+#20037=*
+exit_cfg_node(#20037,#20001)
+hasLocation(#20037,#20032)
+successor(#20035,#20037)
 numlines(#10000,3,3,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/complexParamTypes.js.trap b/javascript/extractor/tests/flow/output/trap/complexParamTypes.js.trap
index d6b8e03674e..963d98a3581 100644
--- a/javascript/extractor/tests/flow/output/trap/complexParamTypes.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/complexParamTypes.js.trap
@@ -182,14 +182,16 @@ locations_default(#20069,#10000,1,70,1,69)
 hasLocation(#20068,#20069)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20070=*
-entry_cfg_node(#20070,#20001)
-#20071=@"loc,{#10000},1,1,1,0"
-locations_default(#20071,#10000,1,1,1,0)
-hasLocation(#20070,#20071)
-#20072=*
-exit_cfg_node(#20072,#20001)
-hasLocation(#20072,#20069)
-successor(#20070,#20072)
+#20070=@"var;{this};{#20000}"
+variables(#20070,"this",#20000)
+#20071=*
+entry_cfg_node(#20071,#20001)
+#20072=@"loc,{#10000},1,1,1,0"
+locations_default(#20072,#10000,1,1,1,0)
+hasLocation(#20071,#20072)
+#20073=*
+exit_cfg_node(#20073,#20001)
+hasLocation(#20073,#20069)
+successor(#20071,#20073)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/complexParamTypes2.js.trap b/javascript/extractor/tests/flow/output/trap/complexParamTypes2.js.trap
index e03ae461c44..123e531b563 100644
--- a/javascript/extractor/tests/flow/output/trap/complexParamTypes2.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/complexParamTypes2.js.trap
@@ -135,14 +135,16 @@ toplevels(#20001,0)
 #20049=@"loc,{#10000},1,1,3,1"
 locations_default(#20049,#10000,1,1,3,1)
 hasLocation(#20001,#20049)
-#20050=*
-entry_cfg_node(#20050,#20001)
-#20051=@"loc,{#10000},1,1,1,0"
-locations_default(#20051,#10000,1,1,1,0)
-hasLocation(#20050,#20051)
-#20052=*
-exit_cfg_node(#20052,#20001)
-hasLocation(#20052,#20048)
-successor(#20050,#20052)
+#20050=@"var;{this};{#20000}"
+variables(#20050,"this",#20000)
+#20051=*
+entry_cfg_node(#20051,#20001)
+#20052=@"loc,{#10000},1,1,1,0"
+locations_default(#20052,#10000,1,1,1,0)
+hasLocation(#20051,#20052)
+#20053=*
+exit_cfg_node(#20053,#20001)
+hasLocation(#20053,#20048)
+successor(#20051,#20053)
 numlines(#10000,3,3,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/declareExport.js.trap b/javascript/extractor/tests/flow/output/trap/declareExport.js.trap
index 5a01cf475c0..fda3af2d12b 100644
--- a/javascript/extractor/tests/flow/output/trap/declareExport.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/declareExport.js.trap
@@ -238,14 +238,16 @@ toplevels(#20001,0)
 #20090=@"loc,{#10000},1,1,5,58"
 locations_default(#20090,#10000,1,1,5,58)
 hasLocation(#20001,#20090)
-#20091=*
-entry_cfg_node(#20091,#20001)
-#20092=@"loc,{#10000},1,1,1,0"
-locations_default(#20092,#10000,1,1,1,0)
-hasLocation(#20091,#20092)
-#20093=*
-exit_cfg_node(#20093,#20001)
-hasLocation(#20093,#20089)
-successor(#20091,#20093)
+#20091=@"var;{this};{#20000}"
+variables(#20091,"this",#20000)
+#20092=*
+entry_cfg_node(#20092,#20001)
+#20093=@"loc,{#10000},1,1,1,0"
+locations_default(#20093,#10000,1,1,1,0)
+hasLocation(#20092,#20093)
+#20094=*
+exit_cfg_node(#20094,#20001)
+hasLocation(#20094,#20089)
+successor(#20092,#20094)
 numlines(#10000,5,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/declareModuleExports.js.trap b/javascript/extractor/tests/flow/output/trap/declareModuleExports.js.trap
index b65fd64d976..56c2b8e3874 100644
--- a/javascript/extractor/tests/flow/output/trap/declareModuleExports.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/declareModuleExports.js.trap
@@ -102,14 +102,16 @@ toplevels(#20001,0)
 #20035=@"loc,{#10000},1,1,4,1"
 locations_default(#20035,#10000,1,1,4,1)
 hasLocation(#20001,#20035)
-#20036=*
-entry_cfg_node(#20036,#20001)
-#20037=@"loc,{#10000},1,1,1,0"
-locations_default(#20037,#10000,1,1,1,0)
-hasLocation(#20036,#20037)
-#20038=*
-exit_cfg_node(#20038,#20001)
-hasLocation(#20038,#20034)
-successor(#20036,#20038)
+#20036=@"var;{this};{#20000}"
+variables(#20036,"this",#20000)
+#20037=*
+entry_cfg_node(#20037,#20001)
+#20038=@"loc,{#10000},1,1,1,0"
+locations_default(#20038,#10000,1,1,1,0)
+hasLocation(#20037,#20038)
+#20039=*
+exit_cfg_node(#20039,#20001)
+hasLocation(#20039,#20034)
+successor(#20037,#20039)
 numlines(#10000,4,4,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/declared-module-imports.js.trap b/javascript/extractor/tests/flow/output/trap/declared-module-imports.js.trap
index 1588e279e76..26add106f4f 100644
--- a/javascript/extractor/tests/flow/output/trap/declared-module-imports.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/declared-module-imports.js.trap
@@ -128,14 +128,16 @@ toplevels(#20001,0)
 #20045=@"loc,{#10000},1,1,5,0"
 locations_default(#20045,#10000,1,1,5,0)
 hasLocation(#20001,#20045)
-#20046=*
-entry_cfg_node(#20046,#20001)
-#20047=@"loc,{#10000},1,1,1,0"
-locations_default(#20047,#10000,1,1,1,0)
-hasLocation(#20046,#20047)
-#20048=*
-exit_cfg_node(#20048,#20001)
-hasLocation(#20048,#20044)
-successor(#20046,#20048)
+#20046=@"var;{this};{#20000}"
+variables(#20046,"this",#20000)
+#20047=*
+entry_cfg_node(#20047,#20001)
+#20048=@"loc,{#10000},1,1,1,0"
+locations_default(#20048,#10000,1,1,1,0)
+hasLocation(#20047,#20048)
+#20049=*
+exit_cfg_node(#20049,#20001)
+hasLocation(#20049,#20044)
+successor(#20047,#20049)
 numlines(#10000,4,4,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/explicitTypeParameters.js.trap b/javascript/extractor/tests/flow/output/trap/explicitTypeParameters.js.trap
index eeeaf349ea4..73ced595abc 100644
--- a/javascript/extractor/tests/flow/output/trap/explicitTypeParameters.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/explicitTypeParameters.js.trap
@@ -445,242 +445,246 @@ locations_default(#20167,#10000,1,1,12,5)
 hasLocation(#20001,#20167)
 #20168=@"var;{f2};{#20000}"
 variables(#20168,"f2",#20000)
-#20169=*
-stmts(#20169,2,#20001,0,"new K1<T1>();")
-hasLocation(#20169,#20003)
-stmt_containers(#20169,#20001)
+#20169=@"var;{this};{#20000}"
+variables(#20169,"this",#20000)
 #20170=*
-exprs(#20170,12,#20169,0,"new K1<T1>()")
-#20171=@"loc,{#10000},1,1,1,12"
-locations_default(#20171,#10000,1,1,1,12)
-hasLocation(#20170,#20171)
-enclosing_stmt(#20170,#20169)
-expr_containers(#20170,#20001)
-#20172=*
-exprs(#20172,79,#20170,-1,"K1")
-hasLocation(#20172,#20029)
-enclosing_stmt(#20172,#20169)
-expr_containers(#20172,#20001)
-literals("K1","K1",#20172)
-#20173=@"var;{K1};{#20000}"
-variables(#20173,"K1",#20000)
-bind(#20172,#20173)
-#20174=*
-stmts(#20174,2,#20001,1,"f1<T2>();")
-hasLocation(#20174,#20005)
-stmt_containers(#20174,#20001)
+stmts(#20170,2,#20001,0,"new K1<T1>();")
+hasLocation(#20170,#20003)
+stmt_containers(#20170,#20001)
+#20171=*
+exprs(#20171,12,#20170,0,"new K1<T1>()")
+#20172=@"loc,{#10000},1,1,1,12"
+locations_default(#20172,#10000,1,1,1,12)
+hasLocation(#20171,#20172)
+enclosing_stmt(#20171,#20170)
+expr_containers(#20171,#20001)
+#20173=*
+exprs(#20173,79,#20171,-1,"K1")
+hasLocation(#20173,#20029)
+enclosing_stmt(#20173,#20170)
+expr_containers(#20173,#20001)
+literals("K1","K1",#20173)
+#20174=@"var;{K1};{#20000}"
+variables(#20174,"K1",#20000)
+bind(#20173,#20174)
 #20175=*
-exprs(#20175,13,#20174,0,"f1<T2>()")
-#20176=@"loc,{#10000},2,1,2,8"
-locations_default(#20176,#10000,2,1,2,8)
-hasLocation(#20175,#20176)
-enclosing_stmt(#20175,#20174)
-expr_containers(#20175,#20001)
-#20177=*
-exprs(#20177,79,#20175,-1,"f1")
-hasLocation(#20177,#20043)
-enclosing_stmt(#20177,#20174)
-expr_containers(#20177,#20001)
-literals("f1","f1",#20177)
-#20178=@"var;{f1};{#20000}"
-variables(#20178,"f1",#20000)
-bind(#20177,#20178)
-#20179=*
-stmts(#20179,22,#20001,2,"const f ... >(x);\n}")
-#20180=@"loc,{#10000},3,1,5,1"
-locations_default(#20180,#10000,3,1,5,1)
-hasLocation(#20179,#20180)
-stmt_containers(#20179,#20001)
-#20181=*
-exprs(#20181,64,#20179,0,"f2 = fu ... >(x);\n}")
-#20182=@"loc,{#10000},3,7,5,1"
-locations_default(#20182,#10000,3,7,5,1)
-hasLocation(#20181,#20182)
-enclosing_stmt(#20181,#20179)
-expr_containers(#20181,#20001)
-#20183=*
-exprs(#20183,78,#20181,0,"f2")
-hasLocation(#20183,#20059)
-enclosing_stmt(#20183,#20179)
-expr_containers(#20183,#20001)
-literals("f2","f2",#20183)
-decl(#20183,#20168)
+stmts(#20175,2,#20001,1,"f1<T2>();")
+hasLocation(#20175,#20005)
+stmt_containers(#20175,#20001)
+#20176=*
+exprs(#20176,13,#20175,0,"f1<T2>()")
+#20177=@"loc,{#10000},2,1,2,8"
+locations_default(#20177,#10000,2,1,2,8)
+hasLocation(#20176,#20177)
+enclosing_stmt(#20176,#20175)
+expr_containers(#20176,#20001)
+#20178=*
+exprs(#20178,79,#20176,-1,"f1")
+hasLocation(#20178,#20043)
+enclosing_stmt(#20178,#20175)
+expr_containers(#20178,#20001)
+literals("f1","f1",#20178)
+#20179=@"var;{f1};{#20000}"
+variables(#20179,"f1",#20000)
+bind(#20178,#20179)
+#20180=*
+stmts(#20180,22,#20001,2,"const f ... >(x);\n}")
+#20181=@"loc,{#10000},3,1,5,1"
+locations_default(#20181,#10000,3,1,5,1)
+hasLocation(#20180,#20181)
+stmt_containers(#20180,#20001)
+#20182=*
+exprs(#20182,64,#20180,0,"f2 = fu ... >(x);\n}")
+#20183=@"loc,{#10000},3,7,5,1"
+locations_default(#20183,#10000,3,7,5,1)
+hasLocation(#20182,#20183)
+enclosing_stmt(#20182,#20180)
+expr_containers(#20182,#20001)
 #20184=*
-exprs(#20184,9,#20181,1,"functio ... >(x);\n}")
-#20185=@"loc,{#10000},3,12,5,1"
-locations_default(#20185,#10000,3,12,5,1)
-hasLocation(#20184,#20185)
-enclosing_stmt(#20184,#20179)
+exprs(#20184,78,#20182,0,"f2")
+hasLocation(#20184,#20059)
+enclosing_stmt(#20184,#20180)
 expr_containers(#20184,#20001)
-#20186=*
-scopes(#20186,1)
-scopenodes(#20184,#20186)
-scopenesting(#20186,#20000)
-#20187=@"var;{arguments};{#20186}"
-variables(#20187,"arguments",#20186)
-is_arguments_object(#20187)
-is_generator(#20184)
-#20188=*
-stmts(#20188,1,#20184,-2,"{\n  yie ... >(x);\n}")
-#20189=@"loc,{#10000},3,32,5,1"
-locations_default(#20189,#10000,3,32,5,1)
-hasLocation(#20188,#20189)
-stmt_containers(#20188,#20184)
+literals("f2","f2",#20184)
+decl(#20184,#20168)
+#20185=*
+exprs(#20185,9,#20182,1,"functio ... >(x);\n}")
+#20186=@"loc,{#10000},3,12,5,1"
+locations_default(#20186,#10000,3,12,5,1)
+hasLocation(#20185,#20186)
+enclosing_stmt(#20185,#20180)
+expr_containers(#20185,#20001)
+#20187=*
+scopes(#20187,1)
+scopenodes(#20185,#20187)
+scopenesting(#20187,#20000)
+#20188=@"var;{this};{#20187}"
+variables(#20188,"this",#20187)
+#20189=@"var;{arguments};{#20187}"
+variables(#20189,"arguments",#20187)
+is_arguments_object(#20189)
+is_generator(#20185)
 #20190=*
-stmts(#20190,2,#20188,0,"yield* f3<T5>(x);")
-#20191=@"loc,{#10000},4,3,4,19"
-locations_default(#20191,#10000,4,3,4,19)
+stmts(#20190,1,#20185,-2,"{\n  yie ... >(x);\n}")
+#20191=@"loc,{#10000},3,32,5,1"
+locations_default(#20191,#10000,3,32,5,1)
 hasLocation(#20190,#20191)
-stmt_containers(#20190,#20184)
+stmt_containers(#20190,#20185)
 #20192=*
-exprs(#20192,69,#20190,0,"yield* f3<T5>(x)")
-#20193=@"loc,{#10000},4,3,4,18"
-locations_default(#20193,#10000,4,3,4,18)
+stmts(#20192,2,#20190,0,"yield* f3<T5>(x);")
+#20193=@"loc,{#10000},4,3,4,19"
+locations_default(#20193,#10000,4,3,4,19)
 hasLocation(#20192,#20193)
-enclosing_stmt(#20192,#20190)
-expr_containers(#20192,#20184)
+stmt_containers(#20192,#20185)
 #20194=*
-exprs(#20194,13,#20192,0,"f3<T5>(x)")
-#20195=@"loc,{#10000},4,10,4,18"
-locations_default(#20195,#10000,4,10,4,18)
+exprs(#20194,69,#20192,0,"yield* f3<T5>(x)")
+#20195=@"loc,{#10000},4,3,4,18"
+locations_default(#20195,#10000,4,3,4,18)
 hasLocation(#20194,#20195)
-enclosing_stmt(#20194,#20190)
-expr_containers(#20194,#20184)
+enclosing_stmt(#20194,#20192)
+expr_containers(#20194,#20185)
 #20196=*
-exprs(#20196,79,#20194,-1,"f3")
-hasLocation(#20196,#20087)
-enclosing_stmt(#20196,#20190)
-expr_containers(#20196,#20184)
-literals("f3","f3",#20196)
-#20197=@"var;{f3};{#20000}"
-variables(#20197,"f3",#20000)
-bind(#20196,#20197)
+exprs(#20196,13,#20194,0,"f3<T5>(x)")
+#20197=@"loc,{#10000},4,10,4,18"
+locations_default(#20197,#10000,4,10,4,18)
+hasLocation(#20196,#20197)
+enclosing_stmt(#20196,#20192)
+expr_containers(#20196,#20185)
 #20198=*
-exprs(#20198,79,#20194,0,"x")
-hasLocation(#20198,#20097)
-enclosing_stmt(#20198,#20190)
-expr_containers(#20198,#20184)
-literals("x","x",#20198)
-#20199=@"var;{x};{#20000}"
-variables(#20199,"x",#20000)
+exprs(#20198,79,#20196,-1,"f3")
+hasLocation(#20198,#20087)
+enclosing_stmt(#20198,#20192)
+expr_containers(#20198,#20185)
+literals("f3","f3",#20198)
+#20199=@"var;{f3};{#20000}"
+variables(#20199,"f3",#20000)
 bind(#20198,#20199)
-is_delegating(#20192)
 #20200=*
-stmts(#20200,2,#20001,3,"f4<T6>(v1);")
-hasLocation(#20200,#20013)
-stmt_containers(#20200,#20001)
-#20201=*
-exprs(#20201,13,#20200,0,"f4<T6>(v1)")
-#20202=@"loc,{#10000},6,1,6,10"
-locations_default(#20202,#10000,6,1,6,10)
-hasLocation(#20201,#20202)
-enclosing_stmt(#20201,#20200)
-expr_containers(#20201,#20001)
+exprs(#20200,79,#20196,0,"x")
+hasLocation(#20200,#20097)
+enclosing_stmt(#20200,#20192)
+expr_containers(#20200,#20185)
+literals("x","x",#20200)
+#20201=@"var;{x};{#20000}"
+variables(#20201,"x",#20000)
+bind(#20200,#20201)
+is_delegating(#20194)
+#20202=*
+stmts(#20202,2,#20001,3,"f4<T6>(v1);")
+hasLocation(#20202,#20013)
+stmt_containers(#20202,#20001)
 #20203=*
-exprs(#20203,79,#20201,-1,"f4")
-hasLocation(#20203,#20104)
-enclosing_stmt(#20203,#20200)
+exprs(#20203,13,#20202,0,"f4<T6>(v1)")
+#20204=@"loc,{#10000},6,1,6,10"
+locations_default(#20204,#10000,6,1,6,10)
+hasLocation(#20203,#20204)
+enclosing_stmt(#20203,#20202)
 expr_containers(#20203,#20001)
-literals("f4","f4",#20203)
-#20204=@"var;{f4};{#20000}"
-variables(#20204,"f4",#20000)
-bind(#20203,#20204)
 #20205=*
-exprs(#20205,79,#20201,0,"v1")
-hasLocation(#20205,#20114)
-enclosing_stmt(#20205,#20200)
+exprs(#20205,79,#20203,-1,"f4")
+hasLocation(#20205,#20104)
+enclosing_stmt(#20205,#20202)
 expr_containers(#20205,#20001)
-literals("v1","v1",#20205)
-#20206=@"var;{v1};{#20000}"
-variables(#20206,"v1",#20000)
+literals("f4","f4",#20205)
+#20206=@"var;{f4};{#20000}"
+variables(#20206,"f4",#20000)
 bind(#20205,#20206)
 #20207=*
-stmts(#20207,2,#20001,4,"f5<_,_,_>();")
-hasLocation(#20207,#20015)
-stmt_containers(#20207,#20001)
-#20208=*
-exprs(#20208,13,#20207,0,"f5<_,_,_>()")
-#20209=@"loc,{#10000},7,1,7,11"
-locations_default(#20209,#10000,7,1,7,11)
-hasLocation(#20208,#20209)
-enclosing_stmt(#20208,#20207)
-expr_containers(#20208,#20001)
+exprs(#20207,79,#20203,0,"v1")
+hasLocation(#20207,#20114)
+enclosing_stmt(#20207,#20202)
+expr_containers(#20207,#20001)
+literals("v1","v1",#20207)
+#20208=@"var;{v1};{#20000}"
+variables(#20208,"v1",#20000)
+bind(#20207,#20208)
+#20209=*
+stmts(#20209,2,#20001,4,"f5<_,_,_>();")
+hasLocation(#20209,#20015)
+stmt_containers(#20209,#20001)
 #20210=*
-exprs(#20210,79,#20208,-1,"f5")
-hasLocation(#20210,#20120)
-enclosing_stmt(#20210,#20207)
+exprs(#20210,13,#20209,0,"f5<_,_,_>()")
+#20211=@"loc,{#10000},7,1,7,11"
+locations_default(#20211,#10000,7,1,7,11)
+hasLocation(#20210,#20211)
+enclosing_stmt(#20210,#20209)
 expr_containers(#20210,#20001)
-literals("f5","f5",#20210)
-#20211=@"var;{f5};{#20000}"
-variables(#20211,"f5",#20000)
-bind(#20210,#20211)
 #20212=*
-stmts(#20212,2,#20001,5,"f6<\n\t|T ... 9\n\t>();")
-#20213=@"loc,{#10000},8,1,12,5"
-locations_default(#20213,#10000,8,1,12,5)
-hasLocation(#20212,#20213)
-stmt_containers(#20212,#20001)
+exprs(#20212,79,#20210,-1,"f5")
+hasLocation(#20212,#20120)
+enclosing_stmt(#20212,#20209)
+expr_containers(#20212,#20001)
+literals("f5","f5",#20212)
+#20213=@"var;{f5};{#20000}"
+variables(#20213,"f5",#20000)
+bind(#20212,#20213)
 #20214=*
-exprs(#20214,13,#20212,0,"f6<\n\t|T ... T9\n\t>()")
-#20215=@"loc,{#10000},8,1,12,4"
-locations_default(#20215,#10000,8,1,12,4)
+stmts(#20214,2,#20001,5,"f6<\n\t|T ... 9\n\t>();")
+#20215=@"loc,{#10000},8,1,12,5"
+locations_default(#20215,#10000,8,1,12,5)
 hasLocation(#20214,#20215)
-enclosing_stmt(#20214,#20212)
-expr_containers(#20214,#20001)
+stmt_containers(#20214,#20001)
 #20216=*
-exprs(#20216,79,#20214,-1,"f6")
-hasLocation(#20216,#20142)
-enclosing_stmt(#20216,#20212)
+exprs(#20216,13,#20214,0,"f6<\n\t|T ... T9\n\t>()")
+#20217=@"loc,{#10000},8,1,12,4"
+locations_default(#20217,#10000,8,1,12,4)
+hasLocation(#20216,#20217)
+enclosing_stmt(#20216,#20214)
 expr_containers(#20216,#20001)
-literals("f6","f6",#20216)
-#20217=@"var;{f6};{#20000}"
-variables(#20217,"f6",#20000)
-bind(#20216,#20217)
 #20218=*
-entry_cfg_node(#20218,#20001)
-#20219=@"loc,{#10000},1,1,1,0"
-locations_default(#20219,#10000,1,1,1,0)
-hasLocation(#20218,#20219)
+exprs(#20218,79,#20216,-1,"f6")
+hasLocation(#20218,#20142)
+enclosing_stmt(#20218,#20214)
+expr_containers(#20218,#20001)
+literals("f6","f6",#20218)
+#20219=@"var;{f6};{#20000}"
+variables(#20219,"f6",#20000)
+bind(#20218,#20219)
 #20220=*
-exit_cfg_node(#20220,#20001)
-hasLocation(#20220,#20166)
-successor(#20212,#20216)
-successor(#20216,#20214)
-successor(#20214,#20220)
-successor(#20207,#20210)
-successor(#20210,#20208)
-successor(#20208,#20212)
-successor(#20200,#20203)
-successor(#20205,#20201)
-successor(#20203,#20205)
-successor(#20201,#20207)
-successor(#20179,#20183)
-successor(#20184,#20181)
-#20221=*
-entry_cfg_node(#20221,#20184)
-#20222=@"loc,{#10000},3,12,3,11"
-locations_default(#20222,#10000,3,12,3,11)
-hasLocation(#20221,#20222)
+entry_cfg_node(#20220,#20001)
+#20221=@"loc,{#10000},1,1,1,0"
+locations_default(#20221,#10000,1,1,1,0)
+hasLocation(#20220,#20221)
+#20222=*
+exit_cfg_node(#20222,#20001)
+hasLocation(#20222,#20166)
+successor(#20214,#20218)
+successor(#20218,#20216)
+successor(#20216,#20222)
+successor(#20209,#20212)
+successor(#20212,#20210)
+successor(#20210,#20214)
+successor(#20202,#20205)
+successor(#20207,#20203)
+successor(#20205,#20207)
+successor(#20203,#20209)
+successor(#20180,#20184)
+successor(#20185,#20182)
 #20223=*
-exit_cfg_node(#20223,#20184)
-#20224=@"loc,{#10000},5,2,5,1"
-locations_default(#20224,#10000,5,2,5,1)
+entry_cfg_node(#20223,#20185)
+#20224=@"loc,{#10000},3,12,3,11"
+locations_default(#20224,#10000,3,12,3,11)
 hasLocation(#20223,#20224)
-successor(#20190,#20196)
-successor(#20198,#20194)
-successor(#20196,#20198)
-successor(#20194,#20192)
-successor(#20192,#20223)
-successor(#20188,#20190)
-successor(#20221,#20188)
-successor(#20183,#20184)
-successor(#20181,#20200)
-successor(#20174,#20177)
-successor(#20177,#20175)
-successor(#20175,#20179)
-successor(#20169,#20172)
-successor(#20172,#20170)
-successor(#20170,#20174)
-successor(#20218,#20169)
+#20225=*
+exit_cfg_node(#20225,#20185)
+#20226=@"loc,{#10000},5,2,5,1"
+locations_default(#20226,#10000,5,2,5,1)
+hasLocation(#20225,#20226)
+successor(#20192,#20198)
+successor(#20200,#20196)
+successor(#20198,#20200)
+successor(#20196,#20194)
+successor(#20194,#20225)
+successor(#20190,#20192)
+successor(#20223,#20190)
+successor(#20184,#20185)
+successor(#20182,#20202)
+successor(#20175,#20178)
+successor(#20178,#20176)
+successor(#20176,#20180)
+successor(#20170,#20173)
+successor(#20173,#20171)
+successor(#20171,#20175)
+successor(#20220,#20170)
 numlines(#10000,12,12,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/explicitTypeParametersForArgumentlessConstructorCall.js.trap b/javascript/extractor/tests/flow/output/trap/explicitTypeParametersForArgumentlessConstructorCall.js.trap
index e96f25d995b..50139c469f9 100644
--- a/javascript/extractor/tests/flow/output/trap/explicitTypeParametersForArgumentlessConstructorCall.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/explicitTypeParametersForArgumentlessConstructorCall.js.trap
@@ -52,37 +52,39 @@ locations_default(#20017,#10000,1,12,1,11)
 hasLocation(#20016,#20017)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20018=*
-stmts(#20018,2,#20001,0,"new K1<T1>;")
-hasLocation(#20018,#20003)
-stmt_containers(#20018,#20001)
+#20018=@"var;{this};{#20000}"
+variables(#20018,"this",#20000)
 #20019=*
-exprs(#20019,12,#20018,0,"new K1<T1>")
-#20020=@"loc,{#10000},1,1,1,10"
-locations_default(#20020,#10000,1,1,1,10)
-hasLocation(#20019,#20020)
-enclosing_stmt(#20019,#20018)
-expr_containers(#20019,#20001)
-#20021=*
-exprs(#20021,79,#20019,-1,"K1")
-hasLocation(#20021,#20007)
-enclosing_stmt(#20021,#20018)
-expr_containers(#20021,#20001)
-literals("K1","K1",#20021)
-#20022=@"var;{K1};{#20000}"
-variables(#20022,"K1",#20000)
-bind(#20021,#20022)
-#20023=*
-entry_cfg_node(#20023,#20001)
-#20024=@"loc,{#10000},1,1,1,0"
-locations_default(#20024,#10000,1,1,1,0)
-hasLocation(#20023,#20024)
-#20025=*
-exit_cfg_node(#20025,#20001)
-hasLocation(#20025,#20017)
-successor(#20018,#20021)
-successor(#20021,#20019)
-successor(#20019,#20025)
-successor(#20023,#20018)
+stmts(#20019,2,#20001,0,"new K1<T1>;")
+hasLocation(#20019,#20003)
+stmt_containers(#20019,#20001)
+#20020=*
+exprs(#20020,12,#20019,0,"new K1<T1>")
+#20021=@"loc,{#10000},1,1,1,10"
+locations_default(#20021,#10000,1,1,1,10)
+hasLocation(#20020,#20021)
+enclosing_stmt(#20020,#20019)
+expr_containers(#20020,#20001)
+#20022=*
+exprs(#20022,79,#20020,-1,"K1")
+hasLocation(#20022,#20007)
+enclosing_stmt(#20022,#20019)
+expr_containers(#20022,#20001)
+literals("K1","K1",#20022)
+#20023=@"var;{K1};{#20000}"
+variables(#20023,"K1",#20000)
+bind(#20022,#20023)
+#20024=*
+entry_cfg_node(#20024,#20001)
+#20025=@"loc,{#10000},1,1,1,0"
+locations_default(#20025,#10000,1,1,1,0)
+hasLocation(#20024,#20025)
+#20026=*
+exit_cfg_node(#20026,#20001)
+hasLocation(#20026,#20017)
+successor(#20019,#20022)
+successor(#20022,#20020)
+successor(#20020,#20026)
+successor(#20024,#20019)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/export.js.trap b/javascript/extractor/tests/flow/output/trap/export.js.trap
index 94465ac5a54..60795580ca4 100644
--- a/javascript/extractor/tests/flow/output/trap/export.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/export.js.trap
@@ -224,70 +224,72 @@ scopenodes(#20001,#20083)
 scopenesting(#20083,#20000)
 is_module(#20001)
 is_es2015_module(#20001)
-#20084=*
-stmts(#20084,30,#20001,0,"export  ... om ""m"";")
-hasLocation(#20084,#20003)
-stmt_containers(#20084,#20001)
+#20084=@"var;{this};{#20083}"
+variables(#20084,"this",#20083)
 #20085=*
-exprs(#20085,4,#20084,-2,"""m""")
-hasLocation(#20085,#20023)
-enclosing_stmt(#20085,#20084)
-expr_containers(#20085,#20001)
-literals("m","""m""",#20085)
+stmts(#20085,30,#20001,0,"export  ... om ""m"";")
+hasLocation(#20085,#20003)
+stmt_containers(#20085,#20001)
 #20086=*
-regexpterm(#20086,14,#20085,0,"m")
-#20087=@"loc,{#10000},1,20,1,20"
-locations_default(#20087,#10000,1,20,1,20)
-hasLocation(#20086,#20087)
-regexp_const_value(#20086,"m")
-#20088=*
-exprs(#20088,86,#20084,0,"a")
-hasLocation(#20088,#20017)
-enclosing_stmt(#20088,#20084)
-expr_containers(#20088,#20001)
+exprs(#20086,4,#20085,-2,"""m""")
+hasLocation(#20086,#20023)
+enclosing_stmt(#20086,#20085)
+expr_containers(#20086,#20001)
+literals("m","""m""",#20086)
+#20087=*
+regexpterm(#20087,14,#20086,0,"m")
+#20088=@"loc,{#10000},1,20,1,20"
+locations_default(#20088,#10000,1,20,1,20)
+hasLocation(#20087,#20088)
+regexp_const_value(#20087,"m")
 #20089=*
-exprs(#20089,0,#20088,0,"a")
+exprs(#20089,86,#20085,0,"a")
 hasLocation(#20089,#20017)
-enclosing_stmt(#20089,#20084)
+enclosing_stmt(#20089,#20085)
 expr_containers(#20089,#20001)
-literals("a","a",#20089)
 #20090=*
-exprs(#20090,0,#20088,1,"a")
+exprs(#20090,0,#20089,0,"a")
 hasLocation(#20090,#20017)
-enclosing_stmt(#20090,#20084)
+enclosing_stmt(#20090,#20085)
 expr_containers(#20090,#20001)
 literals("a","a",#20090)
 #20091=*
-stmts(#20091,28,#20001,1,"export * from ""m"";")
-hasLocation(#20091,#20005)
-stmt_containers(#20091,#20001)
+exprs(#20091,0,#20089,1,"a")
+hasLocation(#20091,#20017)
+enclosing_stmt(#20091,#20085)
+expr_containers(#20091,#20001)
+literals("a","a",#20091)
 #20092=*
-exprs(#20092,4,#20091,0,"""m""")
-hasLocation(#20092,#20033)
-enclosing_stmt(#20092,#20091)
-expr_containers(#20092,#20001)
-literals("m","""m""",#20092)
+stmts(#20092,28,#20001,1,"export * from ""m"";")
+hasLocation(#20092,#20005)
+stmt_containers(#20092,#20001)
 #20093=*
-regexpterm(#20093,14,#20092,0,"m")
-#20094=@"loc,{#10000},2,16,2,16"
-locations_default(#20094,#10000,2,16,2,16)
-hasLocation(#20093,#20094)
-regexp_const_value(#20093,"m")
-#20095=*
-entry_cfg_node(#20095,#20001)
-#20096=@"loc,{#10000},1,1,1,0"
-locations_default(#20096,#10000,1,1,1,0)
-hasLocation(#20095,#20096)
-#20097=*
-exit_cfg_node(#20097,#20001)
-hasLocation(#20097,#20081)
-successor(#20091,#20092)
-successor(#20092,#20097)
-successor(#20084,#20085)
-successor(#20088,#20089)
-successor(#20090,#20091)
+exprs(#20093,4,#20092,0,"""m""")
+hasLocation(#20093,#20033)
+enclosing_stmt(#20093,#20092)
+expr_containers(#20093,#20001)
+literals("m","""m""",#20093)
+#20094=*
+regexpterm(#20094,14,#20093,0,"m")
+#20095=@"loc,{#10000},2,16,2,16"
+locations_default(#20095,#10000,2,16,2,16)
+hasLocation(#20094,#20095)
+regexp_const_value(#20094,"m")
+#20096=*
+entry_cfg_node(#20096,#20001)
+#20097=@"loc,{#10000},1,1,1,0"
+locations_default(#20097,#10000,1,1,1,0)
+hasLocation(#20096,#20097)
+#20098=*
+exit_cfg_node(#20098,#20001)
+hasLocation(#20098,#20081)
+successor(#20092,#20093)
+successor(#20093,#20098)
+successor(#20085,#20086)
 successor(#20089,#20090)
-successor(#20085,#20088)
-successor(#20095,#20084)
+successor(#20091,#20092)
+successor(#20090,#20091)
+successor(#20086,#20089)
+successor(#20096,#20085)
 numlines(#10000,5,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/exportOpaqueType.js.trap b/javascript/extractor/tests/flow/output/trap/exportOpaqueType.js.trap
index 5b8c2c2b7d9..dbd977e810a 100644
--- a/javascript/extractor/tests/flow/output/trap/exportOpaqueType.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/exportOpaqueType.js.trap
@@ -70,14 +70,16 @@ toplevels(#20001,0)
 #20024=@"loc,{#10000},1,1,2,0"
 locations_default(#20024,#10000,1,1,2,0)
 hasLocation(#20001,#20024)
-#20025=*
-entry_cfg_node(#20025,#20001)
-#20026=@"loc,{#10000},1,1,1,0"
-locations_default(#20026,#10000,1,1,1,0)
-hasLocation(#20025,#20026)
-#20027=*
-exit_cfg_node(#20027,#20001)
-hasLocation(#20027,#20023)
-successor(#20025,#20027)
+#20025=@"var;{this};{#20000}"
+variables(#20025,"this",#20000)
+#20026=*
+entry_cfg_node(#20026,#20001)
+#20027=@"loc,{#10000},1,1,1,0"
+locations_default(#20027,#10000,1,1,1,0)
+hasLocation(#20026,#20027)
+#20028=*
+exit_cfg_node(#20028,#20001)
+hasLocation(#20028,#20023)
+successor(#20026,#20028)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/get-set-methods.js.trap b/javascript/extractor/tests/flow/output/trap/get-set-methods.js.trap
index 1a55904a396..d2ec876feb6 100644
--- a/javascript/extractor/tests/flow/output/trap/get-set-methods.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/get-set-methods.js.trap
@@ -177,189 +177,199 @@ hasLocation(#20001,#20063)
 variables(#20064,"C",#20000)
 #20065=@"local_type_name;{C};{#20000}"
 local_type_names(#20065,"C",#20000)
-#20066=*
-stmts(#20066,26,#20001,0,"class C ... ) { }\n}")
-#20067=@"loc,{#10000},1,1,4,1"
-locations_default(#20067,#10000,1,1,4,1)
-hasLocation(#20066,#20067)
-stmt_containers(#20066,#20001)
-#20068=*
-exprs(#20068,78,#20066,0,"C")
-hasLocation(#20068,#20013)
-enclosing_stmt(#20068,#20066)
-expr_containers(#20068,#20001)
-literals("C","C",#20068)
-decl(#20068,#20064)
-typedecl(#20068,#20065)
+#20066=@"var;{this};{#20000}"
+variables(#20066,"this",#20000)
+#20067=*
+stmts(#20067,26,#20001,0,"class C ... ) { }\n}")
+#20068=@"loc,{#10000},1,1,4,1"
+locations_default(#20068,#10000,1,1,4,1)
+hasLocation(#20067,#20068)
+stmt_containers(#20067,#20001)
 #20069=*
-scopes(#20069,10)
-scopenodes(#20066,#20069)
-scopenesting(#20069,#20000)
+exprs(#20069,78,#20067,0,"C")
+hasLocation(#20069,#20013)
+enclosing_stmt(#20069,#20067)
+expr_containers(#20069,#20001)
+literals("C","C",#20069)
+decl(#20069,#20064)
+typedecl(#20069,#20065)
 #20070=*
-properties(#20070,#20066,2,0,"get<T>(v: T) { }")
-#20071=@"loc,{#10000},2,5,2,20"
-locations_default(#20071,#10000,2,5,2,20)
-hasLocation(#20070,#20071)
+scopes(#20070,10)
+scopenodes(#20067,#20070)
+scopenesting(#20070,#20000)
+#20071=@"var;{this};{#20070}"
+variables(#20071,"this",#20070)
 #20072=*
-exprs(#20072,0,#20070,0,"get")
-hasLocation(#20072,#20017)
-enclosing_stmt(#20072,#20066)
-expr_containers(#20072,#20001)
-literals("get","get",#20072)
-#20073=*
-exprs(#20073,9,#20070,1,"(v: T) { }")
-#20074=@"loc,{#10000},2,11,2,20"
-locations_default(#20074,#10000,2,11,2,20)
-hasLocation(#20073,#20074)
-enclosing_stmt(#20073,#20066)
-expr_containers(#20073,#20001)
+properties(#20072,#20067,2,0,"get<T>(v: T) { }")
+#20073=@"loc,{#10000},2,5,2,20"
+locations_default(#20073,#10000,2,5,2,20)
+hasLocation(#20072,#20073)
+#20074=*
+exprs(#20074,0,#20072,0,"get")
+hasLocation(#20074,#20017)
+enclosing_stmt(#20074,#20067)
+expr_containers(#20074,#20001)
+literals("get","get",#20074)
 #20075=*
-scopes(#20075,1)
-scopenodes(#20073,#20075)
-scopenesting(#20075,#20069)
-#20076=@"var;{v};{#20075}"
-variables(#20076,"v",#20075)
+exprs(#20075,9,#20072,1,"(v: T) { }")
+#20076=@"loc,{#10000},2,11,2,20"
+locations_default(#20076,#10000,2,11,2,20)
+hasLocation(#20075,#20076)
+enclosing_stmt(#20075,#20067)
+expr_containers(#20075,#20001)
 #20077=*
-exprs(#20077,78,#20073,0,"v: T")
-#20078=@"loc,{#10000},2,12,2,15"
-locations_default(#20078,#10000,2,12,2,15)
-hasLocation(#20077,#20078)
-expr_containers(#20077,#20073)
-literals("v","v",#20077)
-decl(#20077,#20076)
-#20079=@"var;{arguments};{#20075}"
-variables(#20079,"arguments",#20075)
-is_arguments_object(#20079)
+scopes(#20077,1)
+scopenodes(#20075,#20077)
+scopenesting(#20077,#20070)
+#20078=@"var;{this};{#20077}"
+variables(#20078,"this",#20077)
+#20079=@"var;{v};{#20077}"
+variables(#20079,"v",#20077)
 #20080=*
-stmts(#20080,1,#20073,-2,"{ }")
-#20081=@"loc,{#10000},2,18,2,20"
-locations_default(#20081,#10000,2,18,2,20)
+exprs(#20080,78,#20075,0,"v: T")
+#20081=@"loc,{#10000},2,12,2,15"
+locations_default(#20081,#10000,2,12,2,15)
 hasLocation(#20080,#20081)
-stmt_containers(#20080,#20073)
-is_method(#20070)
-#20082=*
-properties(#20082,#20066,3,0,"set<T>(v: T) { }")
-#20083=@"loc,{#10000},3,5,3,20"
-locations_default(#20083,#10000,3,5,3,20)
-hasLocation(#20082,#20083)
-#20084=*
-exprs(#20084,0,#20082,0,"set")
-hasLocation(#20084,#20039)
-enclosing_stmt(#20084,#20066)
-expr_containers(#20084,#20001)
-literals("set","set",#20084)
+expr_containers(#20080,#20075)
+literals("v","v",#20080)
+decl(#20080,#20079)
+#20082=@"var;{arguments};{#20077}"
+variables(#20082,"arguments",#20077)
+is_arguments_object(#20082)
+#20083=*
+stmts(#20083,1,#20075,-2,"{ }")
+#20084=@"loc,{#10000},2,18,2,20"
+locations_default(#20084,#10000,2,18,2,20)
+hasLocation(#20083,#20084)
+stmt_containers(#20083,#20075)
+is_method(#20072)
 #20085=*
-exprs(#20085,9,#20082,1,"(v: T) { }")
-#20086=@"loc,{#10000},3,11,3,20"
-locations_default(#20086,#10000,3,11,3,20)
+properties(#20085,#20067,3,0,"set<T>(v: T) { }")
+#20086=@"loc,{#10000},3,5,3,20"
+locations_default(#20086,#10000,3,5,3,20)
 hasLocation(#20085,#20086)
-enclosing_stmt(#20085,#20066)
-expr_containers(#20085,#20001)
 #20087=*
-scopes(#20087,1)
-scopenodes(#20085,#20087)
-scopenesting(#20087,#20069)
-#20088=@"var;{v};{#20087}"
-variables(#20088,"v",#20087)
-#20089=*
-exprs(#20089,78,#20085,0,"v: T")
-#20090=@"loc,{#10000},3,12,3,15"
-locations_default(#20090,#10000,3,12,3,15)
-hasLocation(#20089,#20090)
-expr_containers(#20089,#20085)
-literals("v","v",#20089)
-decl(#20089,#20088)
-#20091=@"var;{arguments};{#20087}"
-variables(#20091,"arguments",#20087)
-is_arguments_object(#20091)
-#20092=*
-stmts(#20092,1,#20085,-2,"{ }")
-#20093=@"loc,{#10000},3,18,3,20"
-locations_default(#20093,#10000,3,18,3,20)
-hasLocation(#20092,#20093)
-stmt_containers(#20092,#20085)
-is_method(#20082)
-#20094=*
-properties(#20094,#20066,4,0,"constructor() {}")
-#20095=@"loc,{#10000},1,9,1,8"
-locations_default(#20095,#10000,1,9,1,8)
-hasLocation(#20094,#20095)
+exprs(#20087,0,#20085,0,"set")
+hasLocation(#20087,#20039)
+enclosing_stmt(#20087,#20067)
+expr_containers(#20087,#20001)
+literals("set","set",#20087)
+#20088=*
+exprs(#20088,9,#20085,1,"(v: T) { }")
+#20089=@"loc,{#10000},3,11,3,20"
+locations_default(#20089,#10000,3,11,3,20)
+hasLocation(#20088,#20089)
+enclosing_stmt(#20088,#20067)
+expr_containers(#20088,#20001)
+#20090=*
+scopes(#20090,1)
+scopenodes(#20088,#20090)
+scopenesting(#20090,#20070)
+#20091=@"var;{this};{#20090}"
+variables(#20091,"this",#20090)
+#20092=@"var;{v};{#20090}"
+variables(#20092,"v",#20090)
+#20093=*
+exprs(#20093,78,#20088,0,"v: T")
+#20094=@"loc,{#10000},3,12,3,15"
+locations_default(#20094,#10000,3,12,3,15)
+hasLocation(#20093,#20094)
+expr_containers(#20093,#20088)
+literals("v","v",#20093)
+decl(#20093,#20092)
+#20095=@"var;{arguments};{#20090}"
+variables(#20095,"arguments",#20090)
+is_arguments_object(#20095)
 #20096=*
-exprs(#20096,0,#20094,0,"constructor")
-hasLocation(#20096,#20095)
-enclosing_stmt(#20096,#20066)
-expr_containers(#20096,#20001)
-literals("constructor","constructor",#20096)
-#20097=*
-exprs(#20097,9,#20094,1,"() {}")
-hasLocation(#20097,#20095)
-enclosing_stmt(#20097,#20066)
-expr_containers(#20097,#20001)
+stmts(#20096,1,#20088,-2,"{ }")
+#20097=@"loc,{#10000},3,18,3,20"
+locations_default(#20097,#10000,3,18,3,20)
+hasLocation(#20096,#20097)
+stmt_containers(#20096,#20088)
+is_method(#20085)
 #20098=*
-scopes(#20098,1)
-scopenodes(#20097,#20098)
-scopenesting(#20098,#20069)
-#20099=@"var;{arguments};{#20098}"
-variables(#20099,"arguments",#20098)
-is_arguments_object(#20099)
+properties(#20098,#20067,4,0,"constructor() {}")
+#20099=@"loc,{#10000},1,9,1,8"
+locations_default(#20099,#10000,1,9,1,8)
+hasLocation(#20098,#20099)
 #20100=*
-stmts(#20100,1,#20097,-2,"{}")
-hasLocation(#20100,#20095)
-stmt_containers(#20100,#20097)
-is_method(#20094)
+exprs(#20100,0,#20098,0,"constructor")
+hasLocation(#20100,#20099)
+enclosing_stmt(#20100,#20067)
+expr_containers(#20100,#20001)
+literals("constructor","constructor",#20100)
 #20101=*
-entry_cfg_node(#20101,#20001)
-#20102=@"loc,{#10000},1,1,1,0"
-locations_default(#20102,#10000,1,1,1,0)
-hasLocation(#20101,#20102)
-#20103=*
-exit_cfg_node(#20103,#20001)
-hasLocation(#20103,#20062)
-successor(#20097,#20094)
-#20104=*
-entry_cfg_node(#20104,#20097)
-hasLocation(#20104,#20095)
+exprs(#20101,9,#20098,1,"() {}")
+hasLocation(#20101,#20099)
+enclosing_stmt(#20101,#20067)
+expr_containers(#20101,#20001)
+#20102=*
+scopes(#20102,1)
+scopenodes(#20101,#20102)
+scopenesting(#20102,#20070)
+#20103=@"var;{this};{#20102}"
+variables(#20103,"this",#20102)
+#20104=@"var;{arguments};{#20102}"
+variables(#20104,"arguments",#20102)
+is_arguments_object(#20104)
 #20105=*
-exit_cfg_node(#20105,#20097)
-hasLocation(#20105,#20095)
-successor(#20100,#20105)
-successor(#20104,#20100)
-successor(#20096,#20097)
-successor(#20094,#20066)
-successor(#20085,#20082)
+stmts(#20105,1,#20101,-2,"{}")
+hasLocation(#20105,#20099)
+stmt_containers(#20105,#20101)
+is_method(#20098)
 #20106=*
-entry_cfg_node(#20106,#20085)
-#20107=@"loc,{#10000},3,11,3,10"
-locations_default(#20107,#10000,3,11,3,10)
+entry_cfg_node(#20106,#20001)
+#20107=@"loc,{#10000},1,1,1,0"
+locations_default(#20107,#10000,1,1,1,0)
 hasLocation(#20106,#20107)
 #20108=*
-exit_cfg_node(#20108,#20085)
-#20109=@"loc,{#10000},3,21,3,20"
-locations_default(#20109,#10000,3,21,3,20)
-hasLocation(#20108,#20109)
-successor(#20092,#20108)
-successor(#20089,#20092)
-successor(#20106,#20089)
-successor(#20084,#20085)
-successor(#20082,#20096)
-successor(#20073,#20070)
+exit_cfg_node(#20108,#20001)
+hasLocation(#20108,#20062)
+successor(#20101,#20098)
+#20109=*
+entry_cfg_node(#20109,#20101)
+hasLocation(#20109,#20099)
 #20110=*
-entry_cfg_node(#20110,#20073)
-#20111=@"loc,{#10000},2,11,2,10"
-locations_default(#20111,#10000,2,11,2,10)
-hasLocation(#20110,#20111)
-#20112=*
-exit_cfg_node(#20112,#20073)
-#20113=@"loc,{#10000},2,21,2,20"
-locations_default(#20113,#10000,2,21,2,20)
-hasLocation(#20112,#20113)
-successor(#20080,#20112)
-successor(#20077,#20080)
-successor(#20110,#20077)
-successor(#20072,#20073)
-successor(#20070,#20084)
-successor(#20068,#20072)
-successor(#20066,#20103)
-successor(#20101,#20068)
+exit_cfg_node(#20110,#20101)
+hasLocation(#20110,#20099)
+successor(#20105,#20110)
+successor(#20109,#20105)
+successor(#20100,#20101)
+successor(#20098,#20067)
+successor(#20088,#20085)
+#20111=*
+entry_cfg_node(#20111,#20088)
+#20112=@"loc,{#10000},3,11,3,10"
+locations_default(#20112,#10000,3,11,3,10)
+hasLocation(#20111,#20112)
+#20113=*
+exit_cfg_node(#20113,#20088)
+#20114=@"loc,{#10000},3,21,3,20"
+locations_default(#20114,#10000,3,21,3,20)
+hasLocation(#20113,#20114)
+successor(#20096,#20113)
+successor(#20093,#20096)
+successor(#20111,#20093)
+successor(#20087,#20088)
+successor(#20085,#20100)
+successor(#20075,#20072)
+#20115=*
+entry_cfg_node(#20115,#20075)
+#20116=@"loc,{#10000},2,11,2,10"
+locations_default(#20116,#10000,2,11,2,10)
+hasLocation(#20115,#20116)
+#20117=*
+exit_cfg_node(#20117,#20075)
+#20118=@"loc,{#10000},2,21,2,20"
+locations_default(#20118,#10000,2,21,2,20)
+hasLocation(#20117,#20118)
+successor(#20083,#20117)
+successor(#20080,#20083)
+successor(#20115,#20080)
+successor(#20074,#20075)
+successor(#20072,#20087)
+successor(#20069,#20074)
+successor(#20067,#20108)
+successor(#20106,#20069)
 numlines(#10000,4,4,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/importType.js.trap b/javascript/extractor/tests/flow/output/trap/importType.js.trap
index 9e2e2885049..88efc5b76f6 100644
--- a/javascript/extractor/tests/flow/output/trap/importType.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/importType.js.trap
@@ -196,52 +196,54 @@ local_namespace_names(#20072,"type",#20069)
 variables(#20070,"type",#20069)
 local_type_names(#20071,"type",#20069)
 local_namespace_names(#20072,"type",#20069)
-#20073=*
-stmts(#20073,27,#20001,0,"import  ... om 'm';")
-hasLocation(#20073,#20003)
-stmt_containers(#20073,#20001)
+#20073=@"var;{this};{#20069}"
+variables(#20073,"this",#20069)
 #20074=*
-exprs(#20074,4,#20073,-1,"'m'")
-hasLocation(#20074,#20031)
-enclosing_stmt(#20074,#20073)
-expr_containers(#20074,#20001)
-literals("m","'m'",#20074)
+stmts(#20074,27,#20001,0,"import  ... om 'm';")
+hasLocation(#20074,#20003)
+stmt_containers(#20074,#20001)
 #20075=*
-regexpterm(#20075,14,#20074,0,"m")
-#20076=@"loc,{#10000},1,43,1,43"
-locations_default(#20076,#10000,1,43,1,43)
-hasLocation(#20075,#20076)
-regexp_const_value(#20075,"m")
-#20077=*
-exprs(#20077,83,#20073,0,"type")
-hasLocation(#20077,#20013)
-enclosing_stmt(#20077,#20073)
-expr_containers(#20077,#20001)
+exprs(#20075,4,#20074,-1,"'m'")
+hasLocation(#20075,#20031)
+enclosing_stmt(#20075,#20074)
+expr_containers(#20075,#20001)
+literals("m","'m'",#20075)
+#20076=*
+regexpterm(#20076,14,#20075,0,"m")
+#20077=@"loc,{#10000},1,43,1,43"
+locations_default(#20077,#10000,1,43,1,43)
+hasLocation(#20076,#20077)
+regexp_const_value(#20076,"m")
 #20078=*
-exprs(#20078,0,#20077,0,"type")
+exprs(#20078,83,#20074,0,"type")
 hasLocation(#20078,#20013)
-enclosing_stmt(#20078,#20073)
+enclosing_stmt(#20078,#20074)
 expr_containers(#20078,#20001)
-literals("type","type",#20078)
 #20079=*
-exprs(#20079,78,#20077,1,"type")
+exprs(#20079,0,#20078,0,"type")
 hasLocation(#20079,#20013)
-enclosing_stmt(#20079,#20073)
+enclosing_stmt(#20079,#20074)
 expr_containers(#20079,#20001)
 literals("type","type",#20079)
-decl(#20079,#20070)
-typedecl(#20079,#20071)
-namespacedecl(#20079,#20072)
 #20080=*
-entry_cfg_node(#20080,#20001)
-#20081=@"loc,{#10000},1,1,1,0"
-locations_default(#20081,#10000,1,1,1,0)
-hasLocation(#20080,#20081)
-#20082=*
-exit_cfg_node(#20082,#20001)
-hasLocation(#20082,#20067)
-successor(#20073,#20082)
-successor(#20077,#20073)
-successor(#20080,#20077)
+exprs(#20080,78,#20078,1,"type")
+hasLocation(#20080,#20013)
+enclosing_stmt(#20080,#20074)
+expr_containers(#20080,#20001)
+literals("type","type",#20080)
+decl(#20080,#20070)
+typedecl(#20080,#20071)
+namespacedecl(#20080,#20072)
+#20081=*
+entry_cfg_node(#20081,#20001)
+#20082=@"loc,{#10000},1,1,1,0"
+locations_default(#20082,#10000,1,1,1,0)
+hasLocation(#20081,#20082)
+#20083=*
+exit_cfg_node(#20083,#20001)
+hasLocation(#20083,#20067)
+successor(#20074,#20083)
+successor(#20078,#20074)
+successor(#20081,#20078)
 numlines(#10000,3,3,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/importTypeInDeclaredModule.js.trap b/javascript/extractor/tests/flow/output/trap/importTypeInDeclaredModule.js.trap
index 8c4b5a30f4a..5f07abf6d59 100644
--- a/javascript/extractor/tests/flow/output/trap/importTypeInDeclaredModule.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/importTypeInDeclaredModule.js.trap
@@ -205,14 +205,16 @@ toplevels(#20001,0)
 #20071=@"loc,{#10000},1,1,11,2"
 locations_default(#20071,#10000,1,1,11,2)
 hasLocation(#20001,#20071)
-#20072=*
-entry_cfg_node(#20072,#20001)
-#20073=@"loc,{#10000},1,1,1,0"
-locations_default(#20073,#10000,1,1,1,0)
-hasLocation(#20072,#20073)
-#20074=*
-exit_cfg_node(#20074,#20001)
-hasLocation(#20074,#20070)
-successor(#20072,#20074)
+#20072=@"var;{this};{#20000}"
+variables(#20072,"this",#20000)
+#20073=*
+entry_cfg_node(#20073,#20001)
+#20074=@"loc,{#10000},1,1,1,0"
+locations_default(#20074,#10000,1,1,1,0)
+hasLocation(#20073,#20074)
+#20075=*
+exit_cfg_node(#20075,#20001)
+hasLocation(#20075,#20070)
+successor(#20073,#20075)
 numlines(#10000,11,10,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/methodTypeParams.js.trap b/javascript/extractor/tests/flow/output/trap/methodTypeParams.js.trap
index b2681d328ff..74c7f4d2c99 100644
--- a/javascript/extractor/tests/flow/output/trap/methodTypeParams.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/methodTypeParams.js.trap
@@ -146,116 +146,120 @@ locations_default(#20051,#10000,1,1,5,1)
 hasLocation(#20001,#20051)
 #20052=@"var;{o};{#20000}"
 variables(#20052,"o",#20000)
-#20053=*
-stmts(#20053,18,#20001,0,"var o = ... ;\n  }\n}")
-hasLocation(#20053,#20051)
-stmt_containers(#20053,#20001)
+#20053=@"var;{this};{#20000}"
+variables(#20053,"this",#20000)
 #20054=*
-exprs(#20054,64,#20053,0,"o = {\n  ... ;\n  }\n}")
-#20055=@"loc,{#10000},1,5,5,1"
-locations_default(#20055,#10000,1,5,5,1)
-hasLocation(#20054,#20055)
-enclosing_stmt(#20054,#20053)
-expr_containers(#20054,#20001)
-#20056=*
-exprs(#20056,78,#20054,0,"o")
-hasLocation(#20056,#20015)
-enclosing_stmt(#20056,#20053)
-expr_containers(#20056,#20001)
-literals("o","o",#20056)
-decl(#20056,#20052)
+stmts(#20054,18,#20001,0,"var o = ... ;\n  }\n}")
+hasLocation(#20054,#20051)
+stmt_containers(#20054,#20001)
+#20055=*
+exprs(#20055,64,#20054,0,"o = {\n  ... ;\n  }\n}")
+#20056=@"loc,{#10000},1,5,5,1"
+locations_default(#20056,#10000,1,5,5,1)
+hasLocation(#20055,#20056)
+enclosing_stmt(#20055,#20054)
+expr_containers(#20055,#20001)
 #20057=*
-exprs(#20057,8,#20054,1,"{\n  id< ... ;\n  }\n}")
-#20058=@"loc,{#10000},1,9,5,1"
-locations_default(#20058,#10000,1,9,5,1)
-hasLocation(#20057,#20058)
-enclosing_stmt(#20057,#20053)
+exprs(#20057,78,#20055,0,"o")
+hasLocation(#20057,#20015)
+enclosing_stmt(#20057,#20054)
 expr_containers(#20057,#20001)
-#20059=*
-properties(#20059,#20057,0,0,"id<A>(a ...  a;\n  }")
-#20060=@"loc,{#10000},2,3,4,3"
-locations_default(#20060,#10000,2,3,4,3)
-hasLocation(#20059,#20060)
-#20061=*
-exprs(#20061,0,#20059,0,"id")
-hasLocation(#20061,#20021)
-enclosing_stmt(#20061,#20053)
-expr_containers(#20061,#20001)
-literals("id","id",#20061)
+literals("o","o",#20057)
+decl(#20057,#20052)
+#20058=*
+exprs(#20058,8,#20055,1,"{\n  id< ... ;\n  }\n}")
+#20059=@"loc,{#10000},1,9,5,1"
+locations_default(#20059,#10000,1,9,5,1)
+hasLocation(#20058,#20059)
+enclosing_stmt(#20058,#20054)
+expr_containers(#20058,#20001)
+#20060=*
+properties(#20060,#20058,0,0,"id<A>(a ...  a;\n  }")
+#20061=@"loc,{#10000},2,3,4,3"
+locations_default(#20061,#10000,2,3,4,3)
+hasLocation(#20060,#20061)
 #20062=*
-exprs(#20062,9,#20059,1,"(a : A) ...  a;\n  }")
-#20063=@"loc,{#10000},2,8,4,3"
-locations_default(#20063,#10000,2,8,4,3)
-hasLocation(#20062,#20063)
-enclosing_stmt(#20062,#20053)
+exprs(#20062,0,#20060,0,"id")
+hasLocation(#20062,#20021)
+enclosing_stmt(#20062,#20054)
 expr_containers(#20062,#20001)
-#20064=*
-scopes(#20064,1)
-scopenodes(#20062,#20064)
-scopenesting(#20064,#20000)
-#20065=@"var;{a};{#20064}"
-variables(#20065,"a",#20064)
-#20066=*
-exprs(#20066,78,#20062,0,"a : A")
-#20067=@"loc,{#10000},2,9,2,13"
-locations_default(#20067,#10000,2,9,2,13)
-hasLocation(#20066,#20067)
-expr_containers(#20066,#20062)
-literals("a","a",#20066)
-decl(#20066,#20065)
-#20068=@"var;{arguments};{#20064}"
-variables(#20068,"arguments",#20064)
-is_arguments_object(#20068)
-#20069=*
-stmts(#20069,1,#20062,-2,"{\n    return a;\n  }")
-#20070=@"loc,{#10000},2,16,4,3"
-locations_default(#20070,#10000,2,16,4,3)
-hasLocation(#20069,#20070)
-stmt_containers(#20069,#20062)
+literals("id","id",#20062)
+#20063=*
+exprs(#20063,9,#20060,1,"(a : A) ...  a;\n  }")
+#20064=@"loc,{#10000},2,8,4,3"
+locations_default(#20064,#10000,2,8,4,3)
+hasLocation(#20063,#20064)
+enclosing_stmt(#20063,#20054)
+expr_containers(#20063,#20001)
+#20065=*
+scopes(#20065,1)
+scopenodes(#20063,#20065)
+scopenesting(#20065,#20000)
+#20066=@"var;{this};{#20065}"
+variables(#20066,"this",#20065)
+#20067=@"var;{a};{#20065}"
+variables(#20067,"a",#20065)
+#20068=*
+exprs(#20068,78,#20063,0,"a : A")
+#20069=@"loc,{#10000},2,9,2,13"
+locations_default(#20069,#10000,2,9,2,13)
+hasLocation(#20068,#20069)
+expr_containers(#20068,#20063)
+literals("a","a",#20068)
+decl(#20068,#20067)
+#20070=@"var;{arguments};{#20065}"
+variables(#20070,"arguments",#20065)
+is_arguments_object(#20070)
 #20071=*
-stmts(#20071,9,#20069,0,"return a;")
-#20072=@"loc,{#10000},3,5,3,13"
-locations_default(#20072,#10000,3,5,3,13)
+stmts(#20071,1,#20063,-2,"{\n    return a;\n  }")
+#20072=@"loc,{#10000},2,16,4,3"
+locations_default(#20072,#10000,2,16,4,3)
 hasLocation(#20071,#20072)
-stmt_containers(#20071,#20062)
+stmt_containers(#20071,#20063)
 #20073=*
-exprs(#20073,79,#20071,0,"a")
-hasLocation(#20073,#20043)
-enclosing_stmt(#20073,#20071)
-expr_containers(#20073,#20062)
-literals("a","a",#20073)
-bind(#20073,#20065)
-is_method(#20059)
-#20074=*
-entry_cfg_node(#20074,#20001)
-#20075=@"loc,{#10000},1,1,1,0"
-locations_default(#20075,#10000,1,1,1,0)
-hasLocation(#20074,#20075)
+stmts(#20073,9,#20071,0,"return a;")
+#20074=@"loc,{#10000},3,5,3,13"
+locations_default(#20074,#10000,3,5,3,13)
+hasLocation(#20073,#20074)
+stmt_containers(#20073,#20063)
+#20075=*
+exprs(#20075,79,#20073,0,"a")
+hasLocation(#20075,#20043)
+enclosing_stmt(#20075,#20073)
+expr_containers(#20075,#20063)
+literals("a","a",#20075)
+bind(#20075,#20067)
+is_method(#20060)
 #20076=*
-exit_cfg_node(#20076,#20001)
-hasLocation(#20076,#20050)
-successor(#20053,#20056)
-successor(#20057,#20061)
-successor(#20062,#20059)
-#20077=*
-entry_cfg_node(#20077,#20062)
-#20078=@"loc,{#10000},2,8,2,7"
-locations_default(#20078,#10000,2,8,2,7)
-hasLocation(#20077,#20078)
+entry_cfg_node(#20076,#20001)
+#20077=@"loc,{#10000},1,1,1,0"
+locations_default(#20077,#10000,1,1,1,0)
+hasLocation(#20076,#20077)
+#20078=*
+exit_cfg_node(#20078,#20001)
+hasLocation(#20078,#20050)
+successor(#20054,#20057)
+successor(#20058,#20062)
+successor(#20063,#20060)
 #20079=*
-exit_cfg_node(#20079,#20062)
-#20080=@"loc,{#10000},4,4,4,3"
-locations_default(#20080,#10000,4,4,4,3)
+entry_cfg_node(#20079,#20063)
+#20080=@"loc,{#10000},2,8,2,7"
+locations_default(#20080,#10000,2,8,2,7)
 hasLocation(#20079,#20080)
-successor(#20073,#20071)
-successor(#20071,#20079)
-successor(#20069,#20073)
-successor(#20066,#20069)
-successor(#20077,#20066)
-successor(#20061,#20062)
-successor(#20059,#20054)
-successor(#20056,#20057)
-successor(#20054,#20076)
-successor(#20074,#20053)
+#20081=*
+exit_cfg_node(#20081,#20063)
+#20082=@"loc,{#10000},4,4,4,3"
+locations_default(#20082,#10000,4,4,4,3)
+hasLocation(#20081,#20082)
+successor(#20075,#20073)
+successor(#20073,#20081)
+successor(#20071,#20075)
+successor(#20068,#20071)
+successor(#20079,#20068)
+successor(#20062,#20063)
+successor(#20060,#20055)
+successor(#20057,#20058)
+successor(#20055,#20078)
+successor(#20076,#20054)
 numlines(#10000,5,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters1.js.trap b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters1.js.trap
index f7fd599eb4b..4f5ca5d7683 100644
--- a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters1.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters1.js.trap
@@ -62,64 +62,66 @@ locations_default(#20021,#10000,1,9,1,8)
 hasLocation(#20020,#20021)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20022=*
-stmts(#20022,2,#20001,0,"1<2>(3);")
-hasLocation(#20022,#20003)
-stmt_containers(#20022,#20001)
+#20022=@"var;{this};{#20000}"
+variables(#20022,"this",#20000)
 #20023=*
-exprs(#20023,29,#20022,0,"1<2>(3)")
-#20024=@"loc,{#10000},1,1,1,7"
-locations_default(#20024,#10000,1,1,1,7)
-hasLocation(#20023,#20024)
-enclosing_stmt(#20023,#20022)
-expr_containers(#20023,#20001)
-#20025=*
-exprs(#20025,27,#20023,0,"1<2")
-#20026=@"loc,{#10000},1,1,1,3"
-locations_default(#20026,#10000,1,1,1,3)
-hasLocation(#20025,#20026)
-enclosing_stmt(#20025,#20022)
-expr_containers(#20025,#20001)
-#20027=*
-exprs(#20027,3,#20025,0,"1")
-hasLocation(#20027,#20005)
-enclosing_stmt(#20027,#20022)
-expr_containers(#20027,#20001)
-literals("1","1",#20027)
+stmts(#20023,2,#20001,0,"1<2>(3);")
+hasLocation(#20023,#20003)
+stmt_containers(#20023,#20001)
+#20024=*
+exprs(#20024,29,#20023,0,"1<2>(3)")
+#20025=@"loc,{#10000},1,1,1,7"
+locations_default(#20025,#10000,1,1,1,7)
+hasLocation(#20024,#20025)
+enclosing_stmt(#20024,#20023)
+expr_containers(#20024,#20001)
+#20026=*
+exprs(#20026,27,#20024,0,"1<2")
+#20027=@"loc,{#10000},1,1,1,3"
+locations_default(#20027,#10000,1,1,1,3)
+hasLocation(#20026,#20027)
+enclosing_stmt(#20026,#20023)
+expr_containers(#20026,#20001)
 #20028=*
-exprs(#20028,3,#20025,1,"2")
-hasLocation(#20028,#20009)
-enclosing_stmt(#20028,#20022)
+exprs(#20028,3,#20026,0,"1")
+hasLocation(#20028,#20005)
+enclosing_stmt(#20028,#20023)
 expr_containers(#20028,#20001)
-literals("2","2",#20028)
+literals("1","1",#20028)
 #20029=*
-exprs(#20029,63,#20023,1,"(3)")
-#20030=@"loc,{#10000},1,5,1,7"
-locations_default(#20030,#10000,1,5,1,7)
-hasLocation(#20029,#20030)
-enclosing_stmt(#20029,#20022)
+exprs(#20029,3,#20026,1,"2")
+hasLocation(#20029,#20009)
+enclosing_stmt(#20029,#20023)
 expr_containers(#20029,#20001)
-#20031=*
-exprs(#20031,3,#20029,0,"3")
-hasLocation(#20031,#20015)
-enclosing_stmt(#20031,#20022)
-expr_containers(#20031,#20001)
-literals("3","3",#20031)
+literals("2","2",#20029)
+#20030=*
+exprs(#20030,63,#20024,1,"(3)")
+#20031=@"loc,{#10000},1,5,1,7"
+locations_default(#20031,#10000,1,5,1,7)
+hasLocation(#20030,#20031)
+enclosing_stmt(#20030,#20023)
+expr_containers(#20030,#20001)
 #20032=*
-entry_cfg_node(#20032,#20001)
-#20033=@"loc,{#10000},1,1,1,0"
-locations_default(#20033,#10000,1,1,1,0)
-hasLocation(#20032,#20033)
-#20034=*
-exit_cfg_node(#20034,#20001)
-hasLocation(#20034,#20021)
-successor(#20022,#20027)
-successor(#20029,#20031)
-successor(#20031,#20023)
-successor(#20028,#20025)
-successor(#20027,#20028)
-successor(#20025,#20029)
-successor(#20023,#20034)
-successor(#20032,#20022)
+exprs(#20032,3,#20030,0,"3")
+hasLocation(#20032,#20015)
+enclosing_stmt(#20032,#20023)
+expr_containers(#20032,#20001)
+literals("3","3",#20032)
+#20033=*
+entry_cfg_node(#20033,#20001)
+#20034=@"loc,{#10000},1,1,1,0"
+locations_default(#20034,#10000,1,1,1,0)
+hasLocation(#20033,#20034)
+#20035=*
+exit_cfg_node(#20035,#20001)
+hasLocation(#20035,#20021)
+successor(#20023,#20028)
+successor(#20030,#20032)
+successor(#20032,#20024)
+successor(#20029,#20026)
+successor(#20028,#20029)
+successor(#20026,#20030)
+successor(#20024,#20035)
+successor(#20033,#20023)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters2.js.trap b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters2.js.trap
index a7d9edcc6eb..e148737d83e 100644
--- a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters2.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters2.js.trap
@@ -82,89 +82,91 @@ locations_default(#20029,#10000,1,13,1,12)
 hasLocation(#20028,#20029)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20030=*
-stmts(#20030,2,#20001,0,"f<g()>(h());")
-hasLocation(#20030,#20003)
-stmt_containers(#20030,#20001)
+#20030=@"var;{this};{#20000}"
+variables(#20030,"this",#20000)
 #20031=*
-exprs(#20031,29,#20030,0,"f<g()>(h())")
-#20032=@"loc,{#10000},1,1,1,11"
-locations_default(#20032,#10000,1,1,1,11)
-hasLocation(#20031,#20032)
-enclosing_stmt(#20031,#20030)
-expr_containers(#20031,#20001)
-#20033=*
-exprs(#20033,27,#20031,0,"f<g()")
-#20034=@"loc,{#10000},1,1,1,5"
-locations_default(#20034,#10000,1,1,1,5)
-hasLocation(#20033,#20034)
-enclosing_stmt(#20033,#20030)
-expr_containers(#20033,#20001)
-#20035=*
-exprs(#20035,79,#20033,0,"f")
-hasLocation(#20035,#20005)
-enclosing_stmt(#20035,#20030)
-expr_containers(#20035,#20001)
-literals("f","f",#20035)
-#20036=@"var;{f};{#20000}"
-variables(#20036,"f",#20000)
-bind(#20035,#20036)
-#20037=*
-exprs(#20037,13,#20033,1,"g()")
-#20038=@"loc,{#10000},1,3,1,5"
-locations_default(#20038,#10000,1,3,1,5)
-hasLocation(#20037,#20038)
-enclosing_stmt(#20037,#20030)
-expr_containers(#20037,#20001)
-#20039=*
-exprs(#20039,79,#20037,-1,"g")
-hasLocation(#20039,#20009)
-enclosing_stmt(#20039,#20030)
-expr_containers(#20039,#20001)
-literals("g","g",#20039)
-#20040=@"var;{g};{#20000}"
-variables(#20040,"g",#20000)
-bind(#20039,#20040)
-#20041=*
-exprs(#20041,63,#20031,1,"(h())")
-#20042=@"loc,{#10000},1,7,1,11"
-locations_default(#20042,#10000,1,7,1,11)
-hasLocation(#20041,#20042)
-enclosing_stmt(#20041,#20030)
-expr_containers(#20041,#20001)
-#20043=*
-exprs(#20043,13,#20041,0,"h()")
-#20044=@"loc,{#10000},1,8,1,10"
-locations_default(#20044,#10000,1,8,1,10)
-hasLocation(#20043,#20044)
-enclosing_stmt(#20043,#20030)
-expr_containers(#20043,#20001)
-#20045=*
-exprs(#20045,79,#20043,-1,"h")
-hasLocation(#20045,#20019)
-enclosing_stmt(#20045,#20030)
-expr_containers(#20045,#20001)
-literals("h","h",#20045)
-#20046=@"var;{h};{#20000}"
-variables(#20046,"h",#20000)
-bind(#20045,#20046)
-#20047=*
-entry_cfg_node(#20047,#20001)
-#20048=@"loc,{#10000},1,1,1,0"
-locations_default(#20048,#10000,1,1,1,0)
-hasLocation(#20047,#20048)
-#20049=*
-exit_cfg_node(#20049,#20001)
-hasLocation(#20049,#20029)
-successor(#20030,#20035)
-successor(#20041,#20045)
-successor(#20045,#20043)
-successor(#20043,#20031)
-successor(#20039,#20037)
-successor(#20037,#20033)
-successor(#20035,#20039)
-successor(#20033,#20041)
-successor(#20031,#20049)
-successor(#20047,#20030)
+stmts(#20031,2,#20001,0,"f<g()>(h());")
+hasLocation(#20031,#20003)
+stmt_containers(#20031,#20001)
+#20032=*
+exprs(#20032,29,#20031,0,"f<g()>(h())")
+#20033=@"loc,{#10000},1,1,1,11"
+locations_default(#20033,#10000,1,1,1,11)
+hasLocation(#20032,#20033)
+enclosing_stmt(#20032,#20031)
+expr_containers(#20032,#20001)
+#20034=*
+exprs(#20034,27,#20032,0,"f<g()")
+#20035=@"loc,{#10000},1,1,1,5"
+locations_default(#20035,#10000,1,1,1,5)
+hasLocation(#20034,#20035)
+enclosing_stmt(#20034,#20031)
+expr_containers(#20034,#20001)
+#20036=*
+exprs(#20036,79,#20034,0,"f")
+hasLocation(#20036,#20005)
+enclosing_stmt(#20036,#20031)
+expr_containers(#20036,#20001)
+literals("f","f",#20036)
+#20037=@"var;{f};{#20000}"
+variables(#20037,"f",#20000)
+bind(#20036,#20037)
+#20038=*
+exprs(#20038,13,#20034,1,"g()")
+#20039=@"loc,{#10000},1,3,1,5"
+locations_default(#20039,#10000,1,3,1,5)
+hasLocation(#20038,#20039)
+enclosing_stmt(#20038,#20031)
+expr_containers(#20038,#20001)
+#20040=*
+exprs(#20040,79,#20038,-1,"g")
+hasLocation(#20040,#20009)
+enclosing_stmt(#20040,#20031)
+expr_containers(#20040,#20001)
+literals("g","g",#20040)
+#20041=@"var;{g};{#20000}"
+variables(#20041,"g",#20000)
+bind(#20040,#20041)
+#20042=*
+exprs(#20042,63,#20032,1,"(h())")
+#20043=@"loc,{#10000},1,7,1,11"
+locations_default(#20043,#10000,1,7,1,11)
+hasLocation(#20042,#20043)
+enclosing_stmt(#20042,#20031)
+expr_containers(#20042,#20001)
+#20044=*
+exprs(#20044,13,#20042,0,"h()")
+#20045=@"loc,{#10000},1,8,1,10"
+locations_default(#20045,#10000,1,8,1,10)
+hasLocation(#20044,#20045)
+enclosing_stmt(#20044,#20031)
+expr_containers(#20044,#20001)
+#20046=*
+exprs(#20046,79,#20044,-1,"h")
+hasLocation(#20046,#20019)
+enclosing_stmt(#20046,#20031)
+expr_containers(#20046,#20001)
+literals("h","h",#20046)
+#20047=@"var;{h};{#20000}"
+variables(#20047,"h",#20000)
+bind(#20046,#20047)
+#20048=*
+entry_cfg_node(#20048,#20001)
+#20049=@"loc,{#10000},1,1,1,0"
+locations_default(#20049,#10000,1,1,1,0)
+hasLocation(#20048,#20049)
+#20050=*
+exit_cfg_node(#20050,#20001)
+hasLocation(#20050,#20029)
+successor(#20031,#20036)
+successor(#20042,#20046)
+successor(#20046,#20044)
+successor(#20044,#20032)
+successor(#20040,#20038)
+successor(#20038,#20034)
+successor(#20036,#20040)
+successor(#20034,#20042)
+successor(#20032,#20050)
+successor(#20048,#20031)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters3.js.trap b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters3.js.trap
index 0758eddced7..b424a33bf2b 100644
--- a/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters3.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/notExplicitTypeParameters3.js.trap
@@ -62,70 +62,72 @@ locations_default(#20021,#10000,1,11,1,10)
 hasLocation(#20020,#20021)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20022=*
-stmts(#20022,2,#20001,0,"/x/<2>(3);")
-hasLocation(#20022,#20003)
-stmt_containers(#20022,#20001)
+#20022=@"var;{this};{#20000}"
+variables(#20022,"this",#20000)
 #20023=*
-exprs(#20023,29,#20022,0,"/x/<2>(3)")
-#20024=@"loc,{#10000},1,1,1,9"
-locations_default(#20024,#10000,1,1,1,9)
-hasLocation(#20023,#20024)
-enclosing_stmt(#20023,#20022)
-expr_containers(#20023,#20001)
-#20025=*
-exprs(#20025,27,#20023,0,"/x/<2")
-#20026=@"loc,{#10000},1,1,1,5"
-locations_default(#20026,#10000,1,1,1,5)
-hasLocation(#20025,#20026)
-enclosing_stmt(#20025,#20022)
-expr_containers(#20025,#20001)
-#20027=*
-exprs(#20027,5,#20025,0,"/x/")
-hasLocation(#20027,#20005)
-enclosing_stmt(#20027,#20022)
-expr_containers(#20027,#20001)
-literals("/x/","/x/",#20027)
+stmts(#20023,2,#20001,0,"/x/<2>(3);")
+hasLocation(#20023,#20003)
+stmt_containers(#20023,#20001)
+#20024=*
+exprs(#20024,29,#20023,0,"/x/<2>(3)")
+#20025=@"loc,{#10000},1,1,1,9"
+locations_default(#20025,#10000,1,1,1,9)
+hasLocation(#20024,#20025)
+enclosing_stmt(#20024,#20023)
+expr_containers(#20024,#20001)
+#20026=*
+exprs(#20026,27,#20024,0,"/x/<2")
+#20027=@"loc,{#10000},1,1,1,5"
+locations_default(#20027,#10000,1,1,1,5)
+hasLocation(#20026,#20027)
+enclosing_stmt(#20026,#20023)
+expr_containers(#20026,#20001)
 #20028=*
-regexpterm(#20028,14,#20027,0,"x")
-#20029=@"loc,{#10000},1,2,1,2"
-locations_default(#20029,#10000,1,2,1,2)
-hasLocation(#20028,#20029)
-regexp_const_value(#20028,"x")
-#20030=*
-exprs(#20030,3,#20025,1,"2")
-hasLocation(#20030,#20009)
-enclosing_stmt(#20030,#20022)
-expr_containers(#20030,#20001)
-literals("2","2",#20030)
+exprs(#20028,5,#20026,0,"/x/")
+hasLocation(#20028,#20005)
+enclosing_stmt(#20028,#20023)
+expr_containers(#20028,#20001)
+literals("/x/","/x/",#20028)
+#20029=*
+regexpterm(#20029,14,#20028,0,"x")
+#20030=@"loc,{#10000},1,2,1,2"
+locations_default(#20030,#10000,1,2,1,2)
+hasLocation(#20029,#20030)
+regexp_const_value(#20029,"x")
 #20031=*
-exprs(#20031,63,#20023,1,"(3)")
-#20032=@"loc,{#10000},1,7,1,9"
-locations_default(#20032,#10000,1,7,1,9)
-hasLocation(#20031,#20032)
-enclosing_stmt(#20031,#20022)
+exprs(#20031,3,#20026,1,"2")
+hasLocation(#20031,#20009)
+enclosing_stmt(#20031,#20023)
 expr_containers(#20031,#20001)
-#20033=*
-exprs(#20033,3,#20031,0,"3")
-hasLocation(#20033,#20015)
-enclosing_stmt(#20033,#20022)
-expr_containers(#20033,#20001)
-literals("3","3",#20033)
+literals("2","2",#20031)
+#20032=*
+exprs(#20032,63,#20024,1,"(3)")
+#20033=@"loc,{#10000},1,7,1,9"
+locations_default(#20033,#10000,1,7,1,9)
+hasLocation(#20032,#20033)
+enclosing_stmt(#20032,#20023)
+expr_containers(#20032,#20001)
 #20034=*
-entry_cfg_node(#20034,#20001)
-#20035=@"loc,{#10000},1,1,1,0"
-locations_default(#20035,#10000,1,1,1,0)
-hasLocation(#20034,#20035)
-#20036=*
-exit_cfg_node(#20036,#20001)
-hasLocation(#20036,#20021)
-successor(#20022,#20027)
-successor(#20031,#20033)
-successor(#20033,#20023)
-successor(#20030,#20025)
-successor(#20027,#20030)
-successor(#20025,#20031)
-successor(#20023,#20036)
-successor(#20034,#20022)
+exprs(#20034,3,#20032,0,"3")
+hasLocation(#20034,#20015)
+enclosing_stmt(#20034,#20023)
+expr_containers(#20034,#20001)
+literals("3","3",#20034)
+#20035=*
+entry_cfg_node(#20035,#20001)
+#20036=@"loc,{#10000},1,1,1,0"
+locations_default(#20036,#10000,1,1,1,0)
+hasLocation(#20035,#20036)
+#20037=*
+exit_cfg_node(#20037,#20001)
+hasLocation(#20037,#20021)
+successor(#20023,#20028)
+successor(#20032,#20034)
+successor(#20034,#20024)
+successor(#20031,#20026)
+successor(#20028,#20031)
+successor(#20026,#20032)
+successor(#20024,#20037)
+successor(#20035,#20023)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/objectTypeSpread.js.trap b/javascript/extractor/tests/flow/output/trap/objectTypeSpread.js.trap
index b6bb522eb5d..85f67052329 100644
--- a/javascript/extractor/tests/flow/output/trap/objectTypeSpread.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/objectTypeSpread.js.trap
@@ -347,14 +347,16 @@ toplevels(#20001,0)
 #20134=@"loc,{#10000},1,1,4,24"
 locations_default(#20134,#10000,1,1,4,24)
 hasLocation(#20001,#20134)
-#20135=*
-entry_cfg_node(#20135,#20001)
-#20136=@"loc,{#10000},1,1,1,0"
-locations_default(#20136,#10000,1,1,1,0)
-hasLocation(#20135,#20136)
-#20137=*
-exit_cfg_node(#20137,#20001)
-hasLocation(#20137,#20133)
-successor(#20135,#20137)
+#20135=@"var;{this};{#20000}"
+variables(#20135,"this",#20000)
+#20136=*
+entry_cfg_node(#20136,#20001)
+#20137=@"loc,{#10000},1,1,1,0"
+locations_default(#20137,#10000,1,1,1,0)
+hasLocation(#20136,#20137)
+#20138=*
+exit_cfg_node(#20138,#20001)
+hasLocation(#20138,#20133)
+successor(#20136,#20138)
 numlines(#10000,4,4,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/optParms.js.trap b/javascript/extractor/tests/flow/output/trap/optParms.js.trap
index 44212bfc13e..4c4cb33ef52 100644
--- a/javascript/extractor/tests/flow/output/trap/optParms.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/optParms.js.trap
@@ -155,143 +155,145 @@ hasLocation(#20001,#20056)
 variables(#20057,"f",#20000)
 #20058=@"var;{g};{#20000}"
 variables(#20058,"g",#20000)
-#20059=*
-stmts(#20059,23,#20001,0,"let f = (x?) => {};")
-hasLocation(#20059,#20003)
-stmt_containers(#20059,#20001)
+#20059=@"var;{this};{#20000}"
+variables(#20059,"this",#20000)
 #20060=*
-exprs(#20060,64,#20059,0,"f = (x?) => {}")
-#20061=@"loc,{#10000},1,5,1,18"
-locations_default(#20061,#10000,1,5,1,18)
-hasLocation(#20060,#20061)
-enclosing_stmt(#20060,#20059)
-expr_containers(#20060,#20001)
-#20062=*
-exprs(#20062,78,#20060,0,"f")
-hasLocation(#20062,#20009)
-enclosing_stmt(#20062,#20059)
-expr_containers(#20062,#20001)
-literals("f","f",#20062)
-decl(#20062,#20057)
+stmts(#20060,23,#20001,0,"let f = (x?) => {};")
+hasLocation(#20060,#20003)
+stmt_containers(#20060,#20001)
+#20061=*
+exprs(#20061,64,#20060,0,"f = (x?) => {}")
+#20062=@"loc,{#10000},1,5,1,18"
+locations_default(#20062,#10000,1,5,1,18)
+hasLocation(#20061,#20062)
+enclosing_stmt(#20061,#20060)
+expr_containers(#20061,#20001)
 #20063=*
-exprs(#20063,65,#20060,1,"(x?) => {}")
-#20064=@"loc,{#10000},1,9,1,18"
-locations_default(#20064,#10000,1,9,1,18)
-hasLocation(#20063,#20064)
-enclosing_stmt(#20063,#20059)
+exprs(#20063,78,#20061,0,"f")
+hasLocation(#20063,#20009)
+enclosing_stmt(#20063,#20060)
 expr_containers(#20063,#20001)
-#20065=*
-scopes(#20065,1)
-scopenodes(#20063,#20065)
-scopenesting(#20065,#20000)
-#20066=@"var;{x};{#20065}"
-variables(#20066,"x",#20065)
-#20067=*
-exprs(#20067,78,#20063,0,"x")
-hasLocation(#20067,#20015)
-expr_containers(#20067,#20063)
-literals("x","x",#20067)
-decl(#20067,#20066)
+literals("f","f",#20063)
+decl(#20063,#20057)
+#20064=*
+exprs(#20064,65,#20061,1,"(x?) => {}")
+#20065=@"loc,{#10000},1,9,1,18"
+locations_default(#20065,#10000,1,9,1,18)
+hasLocation(#20064,#20065)
+enclosing_stmt(#20064,#20060)
+expr_containers(#20064,#20001)
+#20066=*
+scopes(#20066,1)
+scopenodes(#20064,#20066)
+scopenesting(#20066,#20000)
+#20067=@"var;{x};{#20066}"
+variables(#20067,"x",#20066)
 #20068=*
-stmts(#20068,1,#20063,-2,"{}")
-#20069=@"loc,{#10000},1,17,1,18"
-locations_default(#20069,#10000,1,17,1,18)
-hasLocation(#20068,#20069)
-stmt_containers(#20068,#20063)
-#20070=*
-stmts(#20070,23,#20001,1,"let g = ...  => {};")
-hasLocation(#20070,#20005)
-stmt_containers(#20070,#20001)
+exprs(#20068,78,#20064,0,"x")
+hasLocation(#20068,#20015)
+expr_containers(#20068,#20064)
+literals("x","x",#20068)
+decl(#20068,#20067)
+#20069=*
+stmts(#20069,1,#20064,-2,"{}")
+#20070=@"loc,{#10000},1,17,1,18"
+locations_default(#20070,#10000,1,17,1,18)
+hasLocation(#20069,#20070)
+stmt_containers(#20069,#20064)
 #20071=*
-exprs(#20071,64,#20070,0,"g = (x?, y) => {}")
-#20072=@"loc,{#10000},2,5,2,21"
-locations_default(#20072,#10000,2,5,2,21)
-hasLocation(#20071,#20072)
-enclosing_stmt(#20071,#20070)
-expr_containers(#20071,#20001)
-#20073=*
-exprs(#20073,78,#20071,0,"g")
-hasLocation(#20073,#20031)
-enclosing_stmt(#20073,#20070)
-expr_containers(#20073,#20001)
-literals("g","g",#20073)
-decl(#20073,#20058)
+stmts(#20071,23,#20001,1,"let g = ...  => {};")
+hasLocation(#20071,#20005)
+stmt_containers(#20071,#20001)
+#20072=*
+exprs(#20072,64,#20071,0,"g = (x?, y) => {}")
+#20073=@"loc,{#10000},2,5,2,21"
+locations_default(#20073,#10000,2,5,2,21)
+hasLocation(#20072,#20073)
+enclosing_stmt(#20072,#20071)
+expr_containers(#20072,#20001)
 #20074=*
-exprs(#20074,65,#20071,1,"(x?, y) => {}")
-#20075=@"loc,{#10000},2,9,2,21"
-locations_default(#20075,#10000,2,9,2,21)
-hasLocation(#20074,#20075)
-enclosing_stmt(#20074,#20070)
+exprs(#20074,78,#20072,0,"g")
+hasLocation(#20074,#20031)
+enclosing_stmt(#20074,#20071)
 expr_containers(#20074,#20001)
-#20076=*
-scopes(#20076,1)
-scopenodes(#20074,#20076)
-scopenesting(#20076,#20000)
-#20077=@"var;{x};{#20076}"
-variables(#20077,"x",#20076)
-#20078=*
-exprs(#20078,78,#20074,0,"x")
-hasLocation(#20078,#20037)
-expr_containers(#20078,#20074)
-literals("x","x",#20078)
-decl(#20078,#20077)
-#20079=@"var;{y};{#20076}"
-variables(#20079,"y",#20076)
-#20080=*
-exprs(#20080,78,#20074,1,"y")
-hasLocation(#20080,#20043)
-expr_containers(#20080,#20074)
-literals("y","y",#20080)
-decl(#20080,#20079)
+literals("g","g",#20074)
+decl(#20074,#20058)
+#20075=*
+exprs(#20075,65,#20072,1,"(x?, y) => {}")
+#20076=@"loc,{#10000},2,9,2,21"
+locations_default(#20076,#10000,2,9,2,21)
+hasLocation(#20075,#20076)
+enclosing_stmt(#20075,#20071)
+expr_containers(#20075,#20001)
+#20077=*
+scopes(#20077,1)
+scopenodes(#20075,#20077)
+scopenesting(#20077,#20000)
+#20078=@"var;{x};{#20077}"
+variables(#20078,"x",#20077)
+#20079=*
+exprs(#20079,78,#20075,0,"x")
+hasLocation(#20079,#20037)
+expr_containers(#20079,#20075)
+literals("x","x",#20079)
+decl(#20079,#20078)
+#20080=@"var;{y};{#20077}"
+variables(#20080,"y",#20077)
 #20081=*
-stmts(#20081,1,#20074,-2,"{}")
-#20082=@"loc,{#10000},2,20,2,21"
-locations_default(#20082,#10000,2,20,2,21)
-hasLocation(#20081,#20082)
-stmt_containers(#20081,#20074)
-#20083=*
-entry_cfg_node(#20083,#20001)
-#20084=@"loc,{#10000},1,1,1,0"
-locations_default(#20084,#10000,1,1,1,0)
-hasLocation(#20083,#20084)
-#20085=*
-exit_cfg_node(#20085,#20001)
-hasLocation(#20085,#20055)
-successor(#20070,#20073)
-successor(#20074,#20071)
+exprs(#20081,78,#20075,1,"y")
+hasLocation(#20081,#20043)
+expr_containers(#20081,#20075)
+literals("y","y",#20081)
+decl(#20081,#20080)
+#20082=*
+stmts(#20082,1,#20075,-2,"{}")
+#20083=@"loc,{#10000},2,20,2,21"
+locations_default(#20083,#10000,2,20,2,21)
+hasLocation(#20082,#20083)
+stmt_containers(#20082,#20075)
+#20084=*
+entry_cfg_node(#20084,#20001)
+#20085=@"loc,{#10000},1,1,1,0"
+locations_default(#20085,#10000,1,1,1,0)
+hasLocation(#20084,#20085)
 #20086=*
-entry_cfg_node(#20086,#20074)
-#20087=@"loc,{#10000},2,9,2,8"
-locations_default(#20087,#10000,2,9,2,8)
-hasLocation(#20086,#20087)
-#20088=*
-exit_cfg_node(#20088,#20074)
-#20089=@"loc,{#10000},2,22,2,21"
-locations_default(#20089,#10000,2,22,2,21)
-hasLocation(#20088,#20089)
-successor(#20081,#20088)
-successor(#20080,#20081)
-successor(#20078,#20080)
-successor(#20086,#20078)
-successor(#20073,#20074)
-successor(#20071,#20085)
-successor(#20059,#20062)
-successor(#20063,#20060)
-#20090=*
-entry_cfg_node(#20090,#20063)
-#20091=@"loc,{#10000},1,9,1,8"
-locations_default(#20091,#10000,1,9,1,8)
-hasLocation(#20090,#20091)
-#20092=*
-exit_cfg_node(#20092,#20063)
-#20093=@"loc,{#10000},1,19,1,18"
-locations_default(#20093,#10000,1,19,1,18)
-hasLocation(#20092,#20093)
-successor(#20068,#20092)
-successor(#20067,#20068)
-successor(#20090,#20067)
-successor(#20062,#20063)
-successor(#20060,#20070)
-successor(#20083,#20059)
+exit_cfg_node(#20086,#20001)
+hasLocation(#20086,#20055)
+successor(#20071,#20074)
+successor(#20075,#20072)
+#20087=*
+entry_cfg_node(#20087,#20075)
+#20088=@"loc,{#10000},2,9,2,8"
+locations_default(#20088,#10000,2,9,2,8)
+hasLocation(#20087,#20088)
+#20089=*
+exit_cfg_node(#20089,#20075)
+#20090=@"loc,{#10000},2,22,2,21"
+locations_default(#20090,#10000,2,22,2,21)
+hasLocation(#20089,#20090)
+successor(#20082,#20089)
+successor(#20081,#20082)
+successor(#20079,#20081)
+successor(#20087,#20079)
+successor(#20074,#20075)
+successor(#20072,#20086)
+successor(#20060,#20063)
+successor(#20064,#20061)
+#20091=*
+entry_cfg_node(#20091,#20064)
+#20092=@"loc,{#10000},1,9,1,8"
+locations_default(#20092,#10000,1,9,1,8)
+hasLocation(#20091,#20092)
+#20093=*
+exit_cfg_node(#20093,#20064)
+#20094=@"loc,{#10000},1,19,1,18"
+locations_default(#20094,#10000,1,19,1,18)
+hasLocation(#20093,#20094)
+successor(#20069,#20093)
+successor(#20068,#20069)
+successor(#20091,#20068)
+successor(#20063,#20064)
+successor(#20061,#20071)
+successor(#20084,#20060)
 numlines(#10000,2,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/parmAnonFunctionType.js.trap b/javascript/extractor/tests/flow/output/trap/parmAnonFunctionType.js.trap
index 7fc6015201a..11f32ffffb5 100644
--- a/javascript/extractor/tests/flow/output/trap/parmAnonFunctionType.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/parmAnonFunctionType.js.trap
@@ -148,92 +148,96 @@ locations_default(#20053,#10000,1,1,4,0)
 hasLocation(#20001,#20053)
 #20054=@"var;{f};{#20000}"
 variables(#20054,"f",#20000)
-#20055=*
-stmts(#20055,17,#20001,0,"functio ... (42);\n}")
-#20056=@"loc,{#10000},1,1,3,1"
-locations_default(#20056,#10000,1,1,3,1)
-hasLocation(#20055,#20056)
-stmt_containers(#20055,#20001)
-#20057=*
-exprs(#20057,78,#20055,-1,"f")
-hasLocation(#20057,#20011)
-expr_containers(#20057,#20055)
-literals("f","f",#20057)
-decl(#20057,#20054)
+#20055=@"var;{this};{#20000}"
+variables(#20055,"this",#20000)
+#20056=*
+stmts(#20056,17,#20001,0,"functio ... (42);\n}")
+#20057=@"loc,{#10000},1,1,3,1"
+locations_default(#20057,#10000,1,1,3,1)
+hasLocation(#20056,#20057)
+stmt_containers(#20056,#20001)
 #20058=*
-scopes(#20058,1)
-scopenodes(#20055,#20058)
-scopenesting(#20058,#20000)
-#20059=@"var;{g};{#20058}"
-variables(#20059,"g",#20058)
-#20060=*
-exprs(#20060,78,#20055,0,"g: ({y: ... => void")
-#20061=@"loc,{#10000},1,12,1,32"
-locations_default(#20061,#10000,1,12,1,32)
-hasLocation(#20060,#20061)
-expr_containers(#20060,#20055)
-literals("g","g",#20060)
-decl(#20060,#20059)
-#20062=@"var;{arguments};{#20058}"
-variables(#20062,"arguments",#20058)
-is_arguments_object(#20062)
-#20063=*
-stmts(#20063,1,#20055,-2,"{\n  g(42);\n}")
-#20064=@"loc,{#10000},1,35,3,1"
-locations_default(#20064,#10000,1,35,3,1)
-hasLocation(#20063,#20064)
-stmt_containers(#20063,#20055)
+exprs(#20058,78,#20056,-1,"f")
+hasLocation(#20058,#20011)
+expr_containers(#20058,#20056)
+literals("f","f",#20058)
+decl(#20058,#20054)
+#20059=*
+scopes(#20059,1)
+scopenodes(#20056,#20059)
+scopenesting(#20059,#20000)
+#20060=@"var;{this};{#20059}"
+variables(#20060,"this",#20059)
+#20061=@"var;{g};{#20059}"
+variables(#20061,"g",#20059)
+#20062=*
+exprs(#20062,78,#20056,0,"g: ({y: ... => void")
+#20063=@"loc,{#10000},1,12,1,32"
+locations_default(#20063,#10000,1,12,1,32)
+hasLocation(#20062,#20063)
+expr_containers(#20062,#20056)
+literals("g","g",#20062)
+decl(#20062,#20061)
+#20064=@"var;{arguments};{#20059}"
+variables(#20064,"arguments",#20059)
+is_arguments_object(#20064)
 #20065=*
-stmts(#20065,2,#20063,0,"g(42);")
-#20066=@"loc,{#10000},2,3,2,8"
-locations_default(#20066,#10000,2,3,2,8)
+stmts(#20065,1,#20056,-2,"{\n  g(42);\n}")
+#20066=@"loc,{#10000},1,35,3,1"
+locations_default(#20066,#10000,1,35,3,1)
 hasLocation(#20065,#20066)
-stmt_containers(#20065,#20055)
+stmt_containers(#20065,#20056)
 #20067=*
-exprs(#20067,13,#20065,0,"g(42)")
-#20068=@"loc,{#10000},2,3,2,7"
-locations_default(#20068,#10000,2,3,2,7)
+stmts(#20067,2,#20065,0,"g(42);")
+#20068=@"loc,{#10000},2,3,2,8"
+locations_default(#20068,#10000,2,3,2,8)
 hasLocation(#20067,#20068)
-enclosing_stmt(#20067,#20065)
-expr_containers(#20067,#20055)
+stmt_containers(#20067,#20056)
 #20069=*
-exprs(#20069,79,#20067,-1,"g")
-hasLocation(#20069,#20041)
-enclosing_stmt(#20069,#20065)
-expr_containers(#20069,#20055)
-literals("g","g",#20069)
-bind(#20069,#20059)
-#20070=*
-exprs(#20070,3,#20067,0,"42")
-hasLocation(#20070,#20045)
-enclosing_stmt(#20070,#20065)
-expr_containers(#20070,#20055)
-literals("42","42",#20070)
+exprs(#20069,13,#20067,0,"g(42)")
+#20070=@"loc,{#10000},2,3,2,7"
+locations_default(#20070,#10000,2,3,2,7)
+hasLocation(#20069,#20070)
+enclosing_stmt(#20069,#20067)
+expr_containers(#20069,#20056)
 #20071=*
-entry_cfg_node(#20071,#20001)
-#20072=@"loc,{#10000},1,1,1,0"
-locations_default(#20072,#10000,1,1,1,0)
-hasLocation(#20071,#20072)
+exprs(#20071,79,#20069,-1,"g")
+hasLocation(#20071,#20041)
+enclosing_stmt(#20071,#20067)
+expr_containers(#20071,#20056)
+literals("g","g",#20071)
+bind(#20071,#20061)
+#20072=*
+exprs(#20072,3,#20069,0,"42")
+hasLocation(#20072,#20045)
+enclosing_stmt(#20072,#20067)
+expr_containers(#20072,#20056)
+literals("42","42",#20072)
 #20073=*
-exit_cfg_node(#20073,#20001)
-hasLocation(#20073,#20052)
-successor(#20055,#20073)
-#20074=*
-entry_cfg_node(#20074,#20055)
-hasLocation(#20074,#20072)
+entry_cfg_node(#20073,#20001)
+#20074=@"loc,{#10000},1,1,1,0"
+locations_default(#20074,#10000,1,1,1,0)
+hasLocation(#20073,#20074)
 #20075=*
-exit_cfg_node(#20075,#20055)
-#20076=@"loc,{#10000},3,2,3,1"
-locations_default(#20076,#10000,3,2,3,1)
-hasLocation(#20075,#20076)
-successor(#20065,#20069)
-successor(#20070,#20067)
-successor(#20069,#20070)
-successor(#20067,#20075)
-successor(#20063,#20065)
-successor(#20060,#20063)
-successor(#20074,#20060)
-successor(#20057,#20055)
-successor(#20071,#20057)
+exit_cfg_node(#20075,#20001)
+hasLocation(#20075,#20052)
+successor(#20056,#20075)
+#20076=*
+entry_cfg_node(#20076,#20056)
+hasLocation(#20076,#20074)
+#20077=*
+exit_cfg_node(#20077,#20056)
+#20078=@"loc,{#10000},3,2,3,1"
+locations_default(#20078,#10000,3,2,3,1)
+hasLocation(#20077,#20078)
+successor(#20067,#20071)
+successor(#20072,#20069)
+successor(#20071,#20072)
+successor(#20069,#20077)
+successor(#20065,#20067)
+successor(#20062,#20065)
+successor(#20076,#20062)
+successor(#20058,#20056)
+successor(#20073,#20058)
 numlines(#10000,3,3,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/practicallyAmbigiousExplicitTypeParameters.js.trap b/javascript/extractor/tests/flow/output/trap/practicallyAmbigiousExplicitTypeParameters.js.trap
index 8d579436330..9b299d3c679 100644
--- a/javascript/extractor/tests/flow/output/trap/practicallyAmbigiousExplicitTypeParameters.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/practicallyAmbigiousExplicitTypeParameters.js.trap
@@ -561,704 +561,706 @@ toplevels(#20001,0)
 #20220=@"loc,{#10000},1,1,3,53"
 locations_default(#20220,#10000,1,1,3,53)
 hasLocation(#20001,#20220)
-#20221=*
-stmts(#20221,3,#20001,0,"if(!(0< ... |0))){}")
-hasLocation(#20221,#20003)
-stmt_containers(#20221,#20001)
+#20221=@"var;{this};{#20000}"
+variables(#20221,"this",#20000)
 #20222=*
-exprs(#20222,18,#20221,0,"!(0<(jd|0)&0>(Wc|0))")
-#20223=@"loc,{#10000},1,4,1,23"
-locations_default(#20223,#10000,1,4,1,23)
-hasLocation(#20222,#20223)
-enclosing_stmt(#20222,#20221)
-expr_containers(#20222,#20001)
-#20224=*
-exprs(#20224,63,#20222,0,"(0<(jd|0)&0>(Wc|0))")
-#20225=@"loc,{#10000},1,5,1,23"
-locations_default(#20225,#10000,1,5,1,23)
-hasLocation(#20224,#20225)
-enclosing_stmt(#20224,#20221)
-expr_containers(#20224,#20001)
-#20226=*
-exprs(#20226,41,#20224,0,"0<(jd|0)&0>(Wc|0)")
-#20227=@"loc,{#10000},1,6,1,22"
-locations_default(#20227,#10000,1,6,1,22)
-hasLocation(#20226,#20227)
-enclosing_stmt(#20226,#20221)
-expr_containers(#20226,#20001)
-#20228=*
-exprs(#20228,27,#20226,0,"0<(jd|0)")
-#20229=@"loc,{#10000},1,6,1,13"
-locations_default(#20229,#10000,1,6,1,13)
-hasLocation(#20228,#20229)
-enclosing_stmt(#20228,#20221)
-expr_containers(#20228,#20001)
-#20230=*
-exprs(#20230,3,#20228,0,"0")
-hasLocation(#20230,#20017)
-enclosing_stmt(#20230,#20221)
-expr_containers(#20230,#20001)
-literals("0","0",#20230)
+stmts(#20222,3,#20001,0,"if(!(0< ... |0))){}")
+hasLocation(#20222,#20003)
+stmt_containers(#20222,#20001)
+#20223=*
+exprs(#20223,18,#20222,0,"!(0<(jd|0)&0>(Wc|0))")
+#20224=@"loc,{#10000},1,4,1,23"
+locations_default(#20224,#10000,1,4,1,23)
+hasLocation(#20223,#20224)
+enclosing_stmt(#20223,#20222)
+expr_containers(#20223,#20001)
+#20225=*
+exprs(#20225,63,#20223,0,"(0<(jd|0)&0>(Wc|0))")
+#20226=@"loc,{#10000},1,5,1,23"
+locations_default(#20226,#10000,1,5,1,23)
+hasLocation(#20225,#20226)
+enclosing_stmt(#20225,#20222)
+expr_containers(#20225,#20001)
+#20227=*
+exprs(#20227,41,#20225,0,"0<(jd|0)&0>(Wc|0)")
+#20228=@"loc,{#10000},1,6,1,22"
+locations_default(#20228,#10000,1,6,1,22)
+hasLocation(#20227,#20228)
+enclosing_stmt(#20227,#20222)
+expr_containers(#20227,#20001)
+#20229=*
+exprs(#20229,27,#20227,0,"0<(jd|0)")
+#20230=@"loc,{#10000},1,6,1,13"
+locations_default(#20230,#10000,1,6,1,13)
+hasLocation(#20229,#20230)
+enclosing_stmt(#20229,#20222)
+expr_containers(#20229,#20001)
 #20231=*
-exprs(#20231,63,#20228,1,"(jd|0)")
-#20232=@"loc,{#10000},1,8,1,13"
-locations_default(#20232,#10000,1,8,1,13)
-hasLocation(#20231,#20232)
-enclosing_stmt(#20231,#20221)
+exprs(#20231,3,#20229,0,"0")
+hasLocation(#20231,#20017)
+enclosing_stmt(#20231,#20222)
 expr_containers(#20231,#20001)
-#20233=*
-exprs(#20233,39,#20231,0,"jd|0")
-#20234=@"loc,{#10000},1,9,1,12"
-locations_default(#20234,#10000,1,9,1,12)
-hasLocation(#20233,#20234)
-enclosing_stmt(#20233,#20221)
-expr_containers(#20233,#20001)
-#20235=*
-exprs(#20235,79,#20233,0,"jd")
-hasLocation(#20235,#20023)
-enclosing_stmt(#20235,#20221)
-expr_containers(#20235,#20001)
-literals("jd","jd",#20235)
-#20236=@"var;{jd};{#20000}"
-variables(#20236,"jd",#20000)
-bind(#20235,#20236)
-#20237=*
-exprs(#20237,3,#20233,1,"0")
-hasLocation(#20237,#20027)
-enclosing_stmt(#20237,#20221)
-expr_containers(#20237,#20001)
-literals("0","0",#20237)
+literals("0","0",#20231)
+#20232=*
+exprs(#20232,63,#20229,1,"(jd|0)")
+#20233=@"loc,{#10000},1,8,1,13"
+locations_default(#20233,#10000,1,8,1,13)
+hasLocation(#20232,#20233)
+enclosing_stmt(#20232,#20222)
+expr_containers(#20232,#20001)
+#20234=*
+exprs(#20234,39,#20232,0,"jd|0")
+#20235=@"loc,{#10000},1,9,1,12"
+locations_default(#20235,#10000,1,9,1,12)
+hasLocation(#20234,#20235)
+enclosing_stmt(#20234,#20222)
+expr_containers(#20234,#20001)
+#20236=*
+exprs(#20236,79,#20234,0,"jd")
+hasLocation(#20236,#20023)
+enclosing_stmt(#20236,#20222)
+expr_containers(#20236,#20001)
+literals("jd","jd",#20236)
+#20237=@"var;{jd};{#20000}"
+variables(#20237,"jd",#20000)
+bind(#20236,#20237)
 #20238=*
-exprs(#20238,29,#20226,1,"0>(Wc|0)")
-#20239=@"loc,{#10000},1,15,1,22"
-locations_default(#20239,#10000,1,15,1,22)
-hasLocation(#20238,#20239)
-enclosing_stmt(#20238,#20221)
+exprs(#20238,3,#20234,1,"0")
+hasLocation(#20238,#20027)
+enclosing_stmt(#20238,#20222)
 expr_containers(#20238,#20001)
-#20240=*
-exprs(#20240,3,#20238,0,"0")
-hasLocation(#20240,#20033)
-enclosing_stmt(#20240,#20221)
-expr_containers(#20240,#20001)
-literals("0","0",#20240)
+literals("0","0",#20238)
+#20239=*
+exprs(#20239,29,#20227,1,"0>(Wc|0)")
+#20240=@"loc,{#10000},1,15,1,22"
+locations_default(#20240,#10000,1,15,1,22)
+hasLocation(#20239,#20240)
+enclosing_stmt(#20239,#20222)
+expr_containers(#20239,#20001)
 #20241=*
-exprs(#20241,63,#20238,1,"(Wc|0)")
-#20242=@"loc,{#10000},1,17,1,22"
-locations_default(#20242,#10000,1,17,1,22)
-hasLocation(#20241,#20242)
-enclosing_stmt(#20241,#20221)
+exprs(#20241,3,#20239,0,"0")
+hasLocation(#20241,#20033)
+enclosing_stmt(#20241,#20222)
 expr_containers(#20241,#20001)
-#20243=*
-exprs(#20243,39,#20241,0,"Wc|0")
-#20244=@"loc,{#10000},1,18,1,21"
-locations_default(#20244,#10000,1,18,1,21)
-hasLocation(#20243,#20244)
-enclosing_stmt(#20243,#20221)
-expr_containers(#20243,#20001)
-#20245=*
-exprs(#20245,79,#20243,0,"Wc")
-hasLocation(#20245,#20039)
-enclosing_stmt(#20245,#20221)
-expr_containers(#20245,#20001)
-literals("Wc","Wc",#20245)
-#20246=@"var;{Wc};{#20000}"
-variables(#20246,"Wc",#20000)
-bind(#20245,#20246)
-#20247=*
-exprs(#20247,3,#20243,1,"0")
-hasLocation(#20247,#20043)
-enclosing_stmt(#20247,#20221)
-expr_containers(#20247,#20001)
-literals("0","0",#20247)
+literals("0","0",#20241)
+#20242=*
+exprs(#20242,63,#20239,1,"(Wc|0)")
+#20243=@"loc,{#10000},1,17,1,22"
+locations_default(#20243,#10000,1,17,1,22)
+hasLocation(#20242,#20243)
+enclosing_stmt(#20242,#20222)
+expr_containers(#20242,#20001)
+#20244=*
+exprs(#20244,39,#20242,0,"Wc|0")
+#20245=@"loc,{#10000},1,18,1,21"
+locations_default(#20245,#10000,1,18,1,21)
+hasLocation(#20244,#20245)
+enclosing_stmt(#20244,#20222)
+expr_containers(#20244,#20001)
+#20246=*
+exprs(#20246,79,#20244,0,"Wc")
+hasLocation(#20246,#20039)
+enclosing_stmt(#20246,#20222)
+expr_containers(#20246,#20001)
+literals("Wc","Wc",#20246)
+#20247=@"var;{Wc};{#20000}"
+variables(#20247,"Wc",#20000)
+bind(#20246,#20247)
 #20248=*
-stmts(#20248,1,#20221,1,"{}")
-#20249=@"loc,{#10000},1,25,1,26"
-locations_default(#20249,#10000,1,25,1,26)
-hasLocation(#20248,#20249)
-stmt_containers(#20248,#20001)
-#20250=*
-stmts(#20250,2,#20001,1,"g=(g|0) ... 0)?e:g;")
-hasLocation(#20250,#20005)
-stmt_containers(#20250,#20001)
+exprs(#20248,3,#20244,1,"0")
+hasLocation(#20248,#20043)
+enclosing_stmt(#20248,#20222)
+expr_containers(#20248,#20001)
+literals("0","0",#20248)
+#20249=*
+stmts(#20249,1,#20222,1,"{}")
+#20250=@"loc,{#10000},1,25,1,26"
+locations_default(#20250,#10000,1,25,1,26)
+hasLocation(#20249,#20250)
+stmt_containers(#20249,#20001)
 #20251=*
-exprs(#20251,47,#20250,0,"g=(g|0) ... |0)?e:g")
-#20252=@"loc,{#10000},2,1,2,29"
-locations_default(#20252,#10000,2,1,2,29)
-hasLocation(#20251,#20252)
-enclosing_stmt(#20251,#20250)
-expr_containers(#20251,#20001)
-#20253=*
-exprs(#20253,79,#20251,0,"g")
-hasLocation(#20253,#20055)
-enclosing_stmt(#20253,#20250)
-expr_containers(#20253,#20001)
-literals("g","g",#20253)
-#20254=@"var;{g};{#20000}"
-variables(#20254,"g",#20000)
-bind(#20253,#20254)
-#20255=*
-exprs(#20255,11,#20251,1,"(g|0)<( ... |0)?e:g")
-#20256=@"loc,{#10000},2,3,2,29"
-locations_default(#20256,#10000,2,3,2,29)
-hasLocation(#20255,#20256)
-enclosing_stmt(#20255,#20250)
-expr_containers(#20255,#20001)
-#20257=*
-exprs(#20257,39,#20255,0,"(g|0)<( ... )>(b|0)")
-#20258=@"loc,{#10000},2,3,2,25"
-locations_default(#20258,#10000,2,3,2,25)
-hasLocation(#20257,#20258)
-enclosing_stmt(#20257,#20250)
-expr_containers(#20257,#20001)
-#20259=*
-exprs(#20259,27,#20257,0,"(g|0)<(e|0)")
-#20260=@"loc,{#10000},2,3,2,13"
-locations_default(#20260,#10000,2,3,2,13)
-hasLocation(#20259,#20260)
-enclosing_stmt(#20259,#20250)
-expr_containers(#20259,#20001)
-#20261=*
-exprs(#20261,63,#20259,0,"(g|0)")
-#20262=@"loc,{#10000},2,3,2,7"
-locations_default(#20262,#10000,2,3,2,7)
-hasLocation(#20261,#20262)
-enclosing_stmt(#20261,#20250)
-expr_containers(#20261,#20001)
-#20263=*
-exprs(#20263,39,#20261,0,"g|0")
-#20264=@"loc,{#10000},2,4,2,6"
-locations_default(#20264,#10000,2,4,2,6)
-hasLocation(#20263,#20264)
-enclosing_stmt(#20263,#20250)
-expr_containers(#20263,#20001)
-#20265=*
-exprs(#20265,79,#20263,0,"g")
-hasLocation(#20265,#20061)
-enclosing_stmt(#20265,#20250)
-expr_containers(#20265,#20001)
-literals("g","g",#20265)
-bind(#20265,#20254)
+stmts(#20251,2,#20001,1,"g=(g|0) ... 0)?e:g;")
+hasLocation(#20251,#20005)
+stmt_containers(#20251,#20001)
+#20252=*
+exprs(#20252,47,#20251,0,"g=(g|0) ... |0)?e:g")
+#20253=@"loc,{#10000},2,1,2,29"
+locations_default(#20253,#10000,2,1,2,29)
+hasLocation(#20252,#20253)
+enclosing_stmt(#20252,#20251)
+expr_containers(#20252,#20001)
+#20254=*
+exprs(#20254,79,#20252,0,"g")
+hasLocation(#20254,#20055)
+enclosing_stmt(#20254,#20251)
+expr_containers(#20254,#20001)
+literals("g","g",#20254)
+#20255=@"var;{g};{#20000}"
+variables(#20255,"g",#20000)
+bind(#20254,#20255)
+#20256=*
+exprs(#20256,11,#20252,1,"(g|0)<( ... |0)?e:g")
+#20257=@"loc,{#10000},2,3,2,29"
+locations_default(#20257,#10000,2,3,2,29)
+hasLocation(#20256,#20257)
+enclosing_stmt(#20256,#20251)
+expr_containers(#20256,#20001)
+#20258=*
+exprs(#20258,39,#20256,0,"(g|0)<( ... )>(b|0)")
+#20259=@"loc,{#10000},2,3,2,25"
+locations_default(#20259,#10000,2,3,2,25)
+hasLocation(#20258,#20259)
+enclosing_stmt(#20258,#20251)
+expr_containers(#20258,#20001)
+#20260=*
+exprs(#20260,27,#20258,0,"(g|0)<(e|0)")
+#20261=@"loc,{#10000},2,3,2,13"
+locations_default(#20261,#10000,2,3,2,13)
+hasLocation(#20260,#20261)
+enclosing_stmt(#20260,#20251)
+expr_containers(#20260,#20001)
+#20262=*
+exprs(#20262,63,#20260,0,"(g|0)")
+#20263=@"loc,{#10000},2,3,2,7"
+locations_default(#20263,#10000,2,3,2,7)
+hasLocation(#20262,#20263)
+enclosing_stmt(#20262,#20251)
+expr_containers(#20262,#20001)
+#20264=*
+exprs(#20264,39,#20262,0,"g|0")
+#20265=@"loc,{#10000},2,4,2,6"
+locations_default(#20265,#10000,2,4,2,6)
+hasLocation(#20264,#20265)
+enclosing_stmt(#20264,#20251)
+expr_containers(#20264,#20001)
 #20266=*
-exprs(#20266,3,#20263,1,"0")
-hasLocation(#20266,#20065)
-enclosing_stmt(#20266,#20250)
+exprs(#20266,79,#20264,0,"g")
+hasLocation(#20266,#20061)
+enclosing_stmt(#20266,#20251)
 expr_containers(#20266,#20001)
-literals("0","0",#20266)
+literals("g","g",#20266)
+bind(#20266,#20255)
 #20267=*
-exprs(#20267,63,#20259,1,"(e|0)")
-#20268=@"loc,{#10000},2,9,2,13"
-locations_default(#20268,#10000,2,9,2,13)
-hasLocation(#20267,#20268)
-enclosing_stmt(#20267,#20250)
+exprs(#20267,3,#20264,1,"0")
+hasLocation(#20267,#20065)
+enclosing_stmt(#20267,#20251)
 expr_containers(#20267,#20001)
-#20269=*
-exprs(#20269,39,#20267,0,"e|0")
-#20270=@"loc,{#10000},2,10,2,12"
-locations_default(#20270,#10000,2,10,2,12)
-hasLocation(#20269,#20270)
-enclosing_stmt(#20269,#20250)
-expr_containers(#20269,#20001)
-#20271=*
-exprs(#20271,79,#20269,0,"e")
-hasLocation(#20271,#20073)
-enclosing_stmt(#20271,#20250)
-expr_containers(#20271,#20001)
-literals("e","e",#20271)
-#20272=@"var;{e};{#20000}"
-variables(#20272,"e",#20000)
-bind(#20271,#20272)
-#20273=*
-exprs(#20273,3,#20269,1,"0")
-hasLocation(#20273,#20077)
-enclosing_stmt(#20273,#20250)
-expr_containers(#20273,#20001)
-literals("0","0",#20273)
+literals("0","0",#20267)
+#20268=*
+exprs(#20268,63,#20260,1,"(e|0)")
+#20269=@"loc,{#10000},2,9,2,13"
+locations_default(#20269,#10000,2,9,2,13)
+hasLocation(#20268,#20269)
+enclosing_stmt(#20268,#20251)
+expr_containers(#20268,#20001)
+#20270=*
+exprs(#20270,39,#20268,0,"e|0")
+#20271=@"loc,{#10000},2,10,2,12"
+locations_default(#20271,#10000,2,10,2,12)
+hasLocation(#20270,#20271)
+enclosing_stmt(#20270,#20251)
+expr_containers(#20270,#20001)
+#20272=*
+exprs(#20272,79,#20270,0,"e")
+hasLocation(#20272,#20073)
+enclosing_stmt(#20272,#20251)
+expr_containers(#20272,#20001)
+literals("e","e",#20272)
+#20273=@"var;{e};{#20000}"
+variables(#20273,"e",#20000)
+bind(#20272,#20273)
 #20274=*
-exprs(#20274,29,#20257,1,"(g|0)>(b|0)")
-#20275=@"loc,{#10000},2,15,2,25"
-locations_default(#20275,#10000,2,15,2,25)
-hasLocation(#20274,#20275)
-enclosing_stmt(#20274,#20250)
+exprs(#20274,3,#20270,1,"0")
+hasLocation(#20274,#20077)
+enclosing_stmt(#20274,#20251)
 expr_containers(#20274,#20001)
-#20276=*
-exprs(#20276,63,#20274,0,"(g|0)")
-#20277=@"loc,{#10000},2,15,2,19"
-locations_default(#20277,#10000,2,15,2,19)
-hasLocation(#20276,#20277)
-enclosing_stmt(#20276,#20250)
-expr_containers(#20276,#20001)
-#20278=*
-exprs(#20278,39,#20276,0,"g|0")
-#20279=@"loc,{#10000},2,16,2,18"
-locations_default(#20279,#10000,2,16,2,18)
-hasLocation(#20278,#20279)
-enclosing_stmt(#20278,#20250)
-expr_containers(#20278,#20001)
-#20280=*
-exprs(#20280,79,#20278,0,"g")
-hasLocation(#20280,#20085)
-enclosing_stmt(#20280,#20250)
-expr_containers(#20280,#20001)
-literals("g","g",#20280)
-bind(#20280,#20254)
+literals("0","0",#20274)
+#20275=*
+exprs(#20275,29,#20258,1,"(g|0)>(b|0)")
+#20276=@"loc,{#10000},2,15,2,25"
+locations_default(#20276,#10000,2,15,2,25)
+hasLocation(#20275,#20276)
+enclosing_stmt(#20275,#20251)
+expr_containers(#20275,#20001)
+#20277=*
+exprs(#20277,63,#20275,0,"(g|0)")
+#20278=@"loc,{#10000},2,15,2,19"
+locations_default(#20278,#10000,2,15,2,19)
+hasLocation(#20277,#20278)
+enclosing_stmt(#20277,#20251)
+expr_containers(#20277,#20001)
+#20279=*
+exprs(#20279,39,#20277,0,"g|0")
+#20280=@"loc,{#10000},2,16,2,18"
+locations_default(#20280,#10000,2,16,2,18)
+hasLocation(#20279,#20280)
+enclosing_stmt(#20279,#20251)
+expr_containers(#20279,#20001)
 #20281=*
-exprs(#20281,3,#20278,1,"0")
-hasLocation(#20281,#20089)
-enclosing_stmt(#20281,#20250)
+exprs(#20281,79,#20279,0,"g")
+hasLocation(#20281,#20085)
+enclosing_stmt(#20281,#20251)
 expr_containers(#20281,#20001)
-literals("0","0",#20281)
+literals("g","g",#20281)
+bind(#20281,#20255)
 #20282=*
-exprs(#20282,63,#20274,1,"(b|0)")
-#20283=@"loc,{#10000},2,21,2,25"
-locations_default(#20283,#10000,2,21,2,25)
-hasLocation(#20282,#20283)
-enclosing_stmt(#20282,#20250)
+exprs(#20282,3,#20279,1,"0")
+hasLocation(#20282,#20089)
+enclosing_stmt(#20282,#20251)
 expr_containers(#20282,#20001)
-#20284=*
-exprs(#20284,39,#20282,0,"b|0")
-#20285=@"loc,{#10000},2,22,2,24"
-locations_default(#20285,#10000,2,22,2,24)
-hasLocation(#20284,#20285)
-enclosing_stmt(#20284,#20250)
-expr_containers(#20284,#20001)
-#20286=*
-exprs(#20286,79,#20284,0,"b")
-hasLocation(#20286,#20097)
-enclosing_stmt(#20286,#20250)
-expr_containers(#20286,#20001)
-literals("b","b",#20286)
-#20287=@"var;{b};{#20000}"
-variables(#20287,"b",#20000)
-bind(#20286,#20287)
-#20288=*
-exprs(#20288,3,#20284,1,"0")
-hasLocation(#20288,#20101)
-enclosing_stmt(#20288,#20250)
-expr_containers(#20288,#20001)
-literals("0","0",#20288)
+literals("0","0",#20282)
+#20283=*
+exprs(#20283,63,#20275,1,"(b|0)")
+#20284=@"loc,{#10000},2,21,2,25"
+locations_default(#20284,#10000,2,21,2,25)
+hasLocation(#20283,#20284)
+enclosing_stmt(#20283,#20251)
+expr_containers(#20283,#20001)
+#20285=*
+exprs(#20285,39,#20283,0,"b|0")
+#20286=@"loc,{#10000},2,22,2,24"
+locations_default(#20286,#10000,2,22,2,24)
+hasLocation(#20285,#20286)
+enclosing_stmt(#20285,#20251)
+expr_containers(#20285,#20001)
+#20287=*
+exprs(#20287,79,#20285,0,"b")
+hasLocation(#20287,#20097)
+enclosing_stmt(#20287,#20251)
+expr_containers(#20287,#20001)
+literals("b","b",#20287)
+#20288=@"var;{b};{#20000}"
+variables(#20288,"b",#20000)
+bind(#20287,#20288)
 #20289=*
-exprs(#20289,79,#20255,1,"e")
-hasLocation(#20289,#20107)
-enclosing_stmt(#20289,#20250)
+exprs(#20289,3,#20285,1,"0")
+hasLocation(#20289,#20101)
+enclosing_stmt(#20289,#20251)
 expr_containers(#20289,#20001)
-literals("e","e",#20289)
-bind(#20289,#20272)
+literals("0","0",#20289)
 #20290=*
-exprs(#20290,79,#20255,2,"g")
-hasLocation(#20290,#20111)
-enclosing_stmt(#20290,#20250)
+exprs(#20290,79,#20256,1,"e")
+hasLocation(#20290,#20107)
+enclosing_stmt(#20290,#20251)
 expr_containers(#20290,#20001)
-literals("g","g",#20290)
-bind(#20290,#20254)
+literals("e","e",#20290)
+bind(#20290,#20273)
 #20291=*
-stmts(#20291,3,#20001,2,"if((I|0 ... H|0)){}")
-hasLocation(#20291,#20007)
-stmt_containers(#20291,#20001)
+exprs(#20291,79,#20256,2,"g")
+hasLocation(#20291,#20111)
+enclosing_stmt(#20291,#20251)
+expr_containers(#20291,#20001)
+literals("g","g",#20291)
+bind(#20291,#20255)
 #20292=*
-exprs(#20292,39,#20291,0,"(I|0)<( ... )>(H|0)")
-#20293=@"loc,{#10000},3,4,3,50"
-locations_default(#20293,#10000,3,4,3,50)
-hasLocation(#20292,#20293)
-enclosing_stmt(#20292,#20291)
-expr_containers(#20292,#20001)
-#20294=*
-exprs(#20294,39,#20292,0,"(I|0)<( ... )<(F|0)")
-#20295=@"loc,{#10000},3,4,3,38"
-locations_default(#20295,#10000,3,4,3,38)
-hasLocation(#20294,#20295)
-enclosing_stmt(#20294,#20291)
-expr_containers(#20294,#20001)
-#20296=*
-exprs(#20296,39,#20294,0,"(I|0)<( ... )>(P|0)")
-#20297=@"loc,{#10000},3,4,3,26"
-locations_default(#20297,#10000,3,4,3,26)
-hasLocation(#20296,#20297)
-enclosing_stmt(#20296,#20291)
-expr_containers(#20296,#20001)
-#20298=*
-exprs(#20298,27,#20296,0,"(I|0)<(D|0)")
-#20299=@"loc,{#10000},3,4,3,14"
-locations_default(#20299,#10000,3,4,3,14)
-hasLocation(#20298,#20299)
-enclosing_stmt(#20298,#20291)
-expr_containers(#20298,#20001)
-#20300=*
-exprs(#20300,63,#20298,0,"(I|0)")
-#20301=@"loc,{#10000},3,4,3,8"
-locations_default(#20301,#10000,3,4,3,8)
-hasLocation(#20300,#20301)
-enclosing_stmt(#20300,#20291)
-expr_containers(#20300,#20001)
-#20302=*
-exprs(#20302,39,#20300,0,"I|0")
-#20303=@"loc,{#10000},3,5,3,7"
-locations_default(#20303,#10000,3,5,3,7)
-hasLocation(#20302,#20303)
-enclosing_stmt(#20302,#20291)
-expr_containers(#20302,#20001)
-#20304=*
-exprs(#20304,79,#20302,0,"I")
-hasLocation(#20304,#20121)
-enclosing_stmt(#20304,#20291)
-expr_containers(#20304,#20001)
-literals("I","I",#20304)
-#20305=@"var;{I};{#20000}"
-variables(#20305,"I",#20000)
-bind(#20304,#20305)
-#20306=*
-exprs(#20306,3,#20302,1,"0")
-hasLocation(#20306,#20125)
-enclosing_stmt(#20306,#20291)
-expr_containers(#20306,#20001)
-literals("0","0",#20306)
+stmts(#20292,3,#20001,2,"if((I|0 ... H|0)){}")
+hasLocation(#20292,#20007)
+stmt_containers(#20292,#20001)
+#20293=*
+exprs(#20293,39,#20292,0,"(I|0)<( ... )>(H|0)")
+#20294=@"loc,{#10000},3,4,3,50"
+locations_default(#20294,#10000,3,4,3,50)
+hasLocation(#20293,#20294)
+enclosing_stmt(#20293,#20292)
+expr_containers(#20293,#20001)
+#20295=*
+exprs(#20295,39,#20293,0,"(I|0)<( ... )<(F|0)")
+#20296=@"loc,{#10000},3,4,3,38"
+locations_default(#20296,#10000,3,4,3,38)
+hasLocation(#20295,#20296)
+enclosing_stmt(#20295,#20292)
+expr_containers(#20295,#20001)
+#20297=*
+exprs(#20297,39,#20295,0,"(I|0)<( ... )>(P|0)")
+#20298=@"loc,{#10000},3,4,3,26"
+locations_default(#20298,#10000,3,4,3,26)
+hasLocation(#20297,#20298)
+enclosing_stmt(#20297,#20292)
+expr_containers(#20297,#20001)
+#20299=*
+exprs(#20299,27,#20297,0,"(I|0)<(D|0)")
+#20300=@"loc,{#10000},3,4,3,14"
+locations_default(#20300,#10000,3,4,3,14)
+hasLocation(#20299,#20300)
+enclosing_stmt(#20299,#20292)
+expr_containers(#20299,#20001)
+#20301=*
+exprs(#20301,63,#20299,0,"(I|0)")
+#20302=@"loc,{#10000},3,4,3,8"
+locations_default(#20302,#10000,3,4,3,8)
+hasLocation(#20301,#20302)
+enclosing_stmt(#20301,#20292)
+expr_containers(#20301,#20001)
+#20303=*
+exprs(#20303,39,#20301,0,"I|0")
+#20304=@"loc,{#10000},3,5,3,7"
+locations_default(#20304,#10000,3,5,3,7)
+hasLocation(#20303,#20304)
+enclosing_stmt(#20303,#20292)
+expr_containers(#20303,#20001)
+#20305=*
+exprs(#20305,79,#20303,0,"I")
+hasLocation(#20305,#20121)
+enclosing_stmt(#20305,#20292)
+expr_containers(#20305,#20001)
+literals("I","I",#20305)
+#20306=@"var;{I};{#20000}"
+variables(#20306,"I",#20000)
+bind(#20305,#20306)
 #20307=*
-exprs(#20307,63,#20298,1,"(D|0)")
-#20308=@"loc,{#10000},3,10,3,14"
-locations_default(#20308,#10000,3,10,3,14)
-hasLocation(#20307,#20308)
-enclosing_stmt(#20307,#20291)
+exprs(#20307,3,#20303,1,"0")
+hasLocation(#20307,#20125)
+enclosing_stmt(#20307,#20292)
 expr_containers(#20307,#20001)
-#20309=*
-exprs(#20309,39,#20307,0,"D|0")
-#20310=@"loc,{#10000},3,11,3,13"
-locations_default(#20310,#10000,3,11,3,13)
-hasLocation(#20309,#20310)
-enclosing_stmt(#20309,#20291)
-expr_containers(#20309,#20001)
-#20311=*
-exprs(#20311,79,#20309,0,"D")
-hasLocation(#20311,#20133)
-enclosing_stmt(#20311,#20291)
-expr_containers(#20311,#20001)
-literals("D","D",#20311)
-#20312=@"var;{D};{#20000}"
-variables(#20312,"D",#20000)
-bind(#20311,#20312)
-#20313=*
-exprs(#20313,3,#20309,1,"0")
-hasLocation(#20313,#20137)
-enclosing_stmt(#20313,#20291)
-expr_containers(#20313,#20001)
-literals("0","0",#20313)
+literals("0","0",#20307)
+#20308=*
+exprs(#20308,63,#20299,1,"(D|0)")
+#20309=@"loc,{#10000},3,10,3,14"
+locations_default(#20309,#10000,3,10,3,14)
+hasLocation(#20308,#20309)
+enclosing_stmt(#20308,#20292)
+expr_containers(#20308,#20001)
+#20310=*
+exprs(#20310,39,#20308,0,"D|0")
+#20311=@"loc,{#10000},3,11,3,13"
+locations_default(#20311,#10000,3,11,3,13)
+hasLocation(#20310,#20311)
+enclosing_stmt(#20310,#20292)
+expr_containers(#20310,#20001)
+#20312=*
+exprs(#20312,79,#20310,0,"D")
+hasLocation(#20312,#20133)
+enclosing_stmt(#20312,#20292)
+expr_containers(#20312,#20001)
+literals("D","D",#20312)
+#20313=@"var;{D};{#20000}"
+variables(#20313,"D",#20000)
+bind(#20312,#20313)
 #20314=*
-exprs(#20314,29,#20296,1,"(N|0)>(P|0)")
-#20315=@"loc,{#10000},3,16,3,26"
-locations_default(#20315,#10000,3,16,3,26)
-hasLocation(#20314,#20315)
-enclosing_stmt(#20314,#20291)
+exprs(#20314,3,#20310,1,"0")
+hasLocation(#20314,#20137)
+enclosing_stmt(#20314,#20292)
 expr_containers(#20314,#20001)
-#20316=*
-exprs(#20316,63,#20314,0,"(N|0)")
-#20317=@"loc,{#10000},3,16,3,20"
-locations_default(#20317,#10000,3,16,3,20)
-hasLocation(#20316,#20317)
-enclosing_stmt(#20316,#20291)
-expr_containers(#20316,#20001)
-#20318=*
-exprs(#20318,39,#20316,0,"N|0")
-#20319=@"loc,{#10000},3,17,3,19"
-locations_default(#20319,#10000,3,17,3,19)
-hasLocation(#20318,#20319)
-enclosing_stmt(#20318,#20291)
-expr_containers(#20318,#20001)
-#20320=*
-exprs(#20320,79,#20318,0,"N")
-hasLocation(#20320,#20145)
-enclosing_stmt(#20320,#20291)
-expr_containers(#20320,#20001)
-literals("N","N",#20320)
-#20321=@"var;{N};{#20000}"
-variables(#20321,"N",#20000)
-bind(#20320,#20321)
-#20322=*
-exprs(#20322,3,#20318,1,"0")
-hasLocation(#20322,#20149)
-enclosing_stmt(#20322,#20291)
-expr_containers(#20322,#20001)
-literals("0","0",#20322)
+literals("0","0",#20314)
+#20315=*
+exprs(#20315,29,#20297,1,"(N|0)>(P|0)")
+#20316=@"loc,{#10000},3,16,3,26"
+locations_default(#20316,#10000,3,16,3,26)
+hasLocation(#20315,#20316)
+enclosing_stmt(#20315,#20292)
+expr_containers(#20315,#20001)
+#20317=*
+exprs(#20317,63,#20315,0,"(N|0)")
+#20318=@"loc,{#10000},3,16,3,20"
+locations_default(#20318,#10000,3,16,3,20)
+hasLocation(#20317,#20318)
+enclosing_stmt(#20317,#20292)
+expr_containers(#20317,#20001)
+#20319=*
+exprs(#20319,39,#20317,0,"N|0")
+#20320=@"loc,{#10000},3,17,3,19"
+locations_default(#20320,#10000,3,17,3,19)
+hasLocation(#20319,#20320)
+enclosing_stmt(#20319,#20292)
+expr_containers(#20319,#20001)
+#20321=*
+exprs(#20321,79,#20319,0,"N")
+hasLocation(#20321,#20145)
+enclosing_stmt(#20321,#20292)
+expr_containers(#20321,#20001)
+literals("N","N",#20321)
+#20322=@"var;{N};{#20000}"
+variables(#20322,"N",#20000)
+bind(#20321,#20322)
 #20323=*
-exprs(#20323,63,#20314,1,"(P|0)")
-#20324=@"loc,{#10000},3,22,3,26"
-locations_default(#20324,#10000,3,22,3,26)
-hasLocation(#20323,#20324)
-enclosing_stmt(#20323,#20291)
+exprs(#20323,3,#20319,1,"0")
+hasLocation(#20323,#20149)
+enclosing_stmt(#20323,#20292)
 expr_containers(#20323,#20001)
-#20325=*
-exprs(#20325,39,#20323,0,"P|0")
-#20326=@"loc,{#10000},3,23,3,25"
-locations_default(#20326,#10000,3,23,3,25)
-hasLocation(#20325,#20326)
-enclosing_stmt(#20325,#20291)
-expr_containers(#20325,#20001)
-#20327=*
-exprs(#20327,79,#20325,0,"P")
-hasLocation(#20327,#20157)
-enclosing_stmt(#20327,#20291)
-expr_containers(#20327,#20001)
-literals("P","P",#20327)
-#20328=@"var;{P};{#20000}"
-variables(#20328,"P",#20000)
-bind(#20327,#20328)
-#20329=*
-exprs(#20329,3,#20325,1,"0")
-hasLocation(#20329,#20161)
-enclosing_stmt(#20329,#20291)
-expr_containers(#20329,#20001)
-literals("0","0",#20329)
+literals("0","0",#20323)
+#20324=*
+exprs(#20324,63,#20315,1,"(P|0)")
+#20325=@"loc,{#10000},3,22,3,26"
+locations_default(#20325,#10000,3,22,3,26)
+hasLocation(#20324,#20325)
+enclosing_stmt(#20324,#20292)
+expr_containers(#20324,#20001)
+#20326=*
+exprs(#20326,39,#20324,0,"P|0")
+#20327=@"loc,{#10000},3,23,3,25"
+locations_default(#20327,#10000,3,23,3,25)
+hasLocation(#20326,#20327)
+enclosing_stmt(#20326,#20292)
+expr_containers(#20326,#20001)
+#20328=*
+exprs(#20328,79,#20326,0,"P")
+hasLocation(#20328,#20157)
+enclosing_stmt(#20328,#20292)
+expr_containers(#20328,#20001)
+literals("P","P",#20328)
+#20329=@"var;{P};{#20000}"
+variables(#20329,"P",#20000)
+bind(#20328,#20329)
 #20330=*
-exprs(#20330,27,#20294,1,"(M|0)<(F|0)")
-#20331=@"loc,{#10000},3,28,3,38"
-locations_default(#20331,#10000,3,28,3,38)
-hasLocation(#20330,#20331)
-enclosing_stmt(#20330,#20291)
+exprs(#20330,3,#20326,1,"0")
+hasLocation(#20330,#20161)
+enclosing_stmt(#20330,#20292)
 expr_containers(#20330,#20001)
-#20332=*
-exprs(#20332,63,#20330,0,"(M|0)")
-#20333=@"loc,{#10000},3,28,3,32"
-locations_default(#20333,#10000,3,28,3,32)
-hasLocation(#20332,#20333)
-enclosing_stmt(#20332,#20291)
-expr_containers(#20332,#20001)
-#20334=*
-exprs(#20334,39,#20332,0,"M|0")
-#20335=@"loc,{#10000},3,29,3,31"
-locations_default(#20335,#10000,3,29,3,31)
-hasLocation(#20334,#20335)
-enclosing_stmt(#20334,#20291)
-expr_containers(#20334,#20001)
-#20336=*
-exprs(#20336,79,#20334,0,"M")
-hasLocation(#20336,#20169)
-enclosing_stmt(#20336,#20291)
-expr_containers(#20336,#20001)
-literals("M","M",#20336)
-#20337=@"var;{M};{#20000}"
-variables(#20337,"M",#20000)
-bind(#20336,#20337)
-#20338=*
-exprs(#20338,3,#20334,1,"0")
-hasLocation(#20338,#20173)
-enclosing_stmt(#20338,#20291)
-expr_containers(#20338,#20001)
-literals("0","0",#20338)
+literals("0","0",#20330)
+#20331=*
+exprs(#20331,27,#20295,1,"(M|0)<(F|0)")
+#20332=@"loc,{#10000},3,28,3,38"
+locations_default(#20332,#10000,3,28,3,38)
+hasLocation(#20331,#20332)
+enclosing_stmt(#20331,#20292)
+expr_containers(#20331,#20001)
+#20333=*
+exprs(#20333,63,#20331,0,"(M|0)")
+#20334=@"loc,{#10000},3,28,3,32"
+locations_default(#20334,#10000,3,28,3,32)
+hasLocation(#20333,#20334)
+enclosing_stmt(#20333,#20292)
+expr_containers(#20333,#20001)
+#20335=*
+exprs(#20335,39,#20333,0,"M|0")
+#20336=@"loc,{#10000},3,29,3,31"
+locations_default(#20336,#10000,3,29,3,31)
+hasLocation(#20335,#20336)
+enclosing_stmt(#20335,#20292)
+expr_containers(#20335,#20001)
+#20337=*
+exprs(#20337,79,#20335,0,"M")
+hasLocation(#20337,#20169)
+enclosing_stmt(#20337,#20292)
+expr_containers(#20337,#20001)
+literals("M","M",#20337)
+#20338=@"var;{M};{#20000}"
+variables(#20338,"M",#20000)
+bind(#20337,#20338)
 #20339=*
-exprs(#20339,63,#20330,1,"(F|0)")
-#20340=@"loc,{#10000},3,34,3,38"
-locations_default(#20340,#10000,3,34,3,38)
-hasLocation(#20339,#20340)
-enclosing_stmt(#20339,#20291)
+exprs(#20339,3,#20335,1,"0")
+hasLocation(#20339,#20173)
+enclosing_stmt(#20339,#20292)
 expr_containers(#20339,#20001)
-#20341=*
-exprs(#20341,39,#20339,0,"F|0")
-#20342=@"loc,{#10000},3,35,3,37"
-locations_default(#20342,#10000,3,35,3,37)
-hasLocation(#20341,#20342)
-enclosing_stmt(#20341,#20291)
-expr_containers(#20341,#20001)
-#20343=*
-exprs(#20343,79,#20341,0,"F")
-hasLocation(#20343,#20181)
-enclosing_stmt(#20343,#20291)
-expr_containers(#20343,#20001)
-literals("F","F",#20343)
-#20344=@"var;{F};{#20000}"
-variables(#20344,"F",#20000)
-bind(#20343,#20344)
-#20345=*
-exprs(#20345,3,#20341,1,"0")
-hasLocation(#20345,#20185)
-enclosing_stmt(#20345,#20291)
-expr_containers(#20345,#20001)
-literals("0","0",#20345)
+literals("0","0",#20339)
+#20340=*
+exprs(#20340,63,#20331,1,"(F|0)")
+#20341=@"loc,{#10000},3,34,3,38"
+locations_default(#20341,#10000,3,34,3,38)
+hasLocation(#20340,#20341)
+enclosing_stmt(#20340,#20292)
+expr_containers(#20340,#20001)
+#20342=*
+exprs(#20342,39,#20340,0,"F|0")
+#20343=@"loc,{#10000},3,35,3,37"
+locations_default(#20343,#10000,3,35,3,37)
+hasLocation(#20342,#20343)
+enclosing_stmt(#20342,#20292)
+expr_containers(#20342,#20001)
+#20344=*
+exprs(#20344,79,#20342,0,"F")
+hasLocation(#20344,#20181)
+enclosing_stmt(#20344,#20292)
+expr_containers(#20344,#20001)
+literals("F","F",#20344)
+#20345=@"var;{F};{#20000}"
+variables(#20345,"F",#20000)
+bind(#20344,#20345)
 #20346=*
-exprs(#20346,29,#20292,1,"(L|0)>(H|0)")
-#20347=@"loc,{#10000},3,40,3,50"
-locations_default(#20347,#10000,3,40,3,50)
-hasLocation(#20346,#20347)
-enclosing_stmt(#20346,#20291)
+exprs(#20346,3,#20342,1,"0")
+hasLocation(#20346,#20185)
+enclosing_stmt(#20346,#20292)
 expr_containers(#20346,#20001)
-#20348=*
-exprs(#20348,63,#20346,0,"(L|0)")
-#20349=@"loc,{#10000},3,40,3,44"
-locations_default(#20349,#10000,3,40,3,44)
-hasLocation(#20348,#20349)
-enclosing_stmt(#20348,#20291)
-expr_containers(#20348,#20001)
-#20350=*
-exprs(#20350,39,#20348,0,"L|0")
-#20351=@"loc,{#10000},3,41,3,43"
-locations_default(#20351,#10000,3,41,3,43)
-hasLocation(#20350,#20351)
-enclosing_stmt(#20350,#20291)
-expr_containers(#20350,#20001)
-#20352=*
-exprs(#20352,79,#20350,0,"L")
-hasLocation(#20352,#20193)
-enclosing_stmt(#20352,#20291)
-expr_containers(#20352,#20001)
-literals("L","L",#20352)
-#20353=@"var;{L};{#20000}"
-variables(#20353,"L",#20000)
-bind(#20352,#20353)
-#20354=*
-exprs(#20354,3,#20350,1,"0")
-hasLocation(#20354,#20197)
-enclosing_stmt(#20354,#20291)
-expr_containers(#20354,#20001)
-literals("0","0",#20354)
+literals("0","0",#20346)
+#20347=*
+exprs(#20347,29,#20293,1,"(L|0)>(H|0)")
+#20348=@"loc,{#10000},3,40,3,50"
+locations_default(#20348,#10000,3,40,3,50)
+hasLocation(#20347,#20348)
+enclosing_stmt(#20347,#20292)
+expr_containers(#20347,#20001)
+#20349=*
+exprs(#20349,63,#20347,0,"(L|0)")
+#20350=@"loc,{#10000},3,40,3,44"
+locations_default(#20350,#10000,3,40,3,44)
+hasLocation(#20349,#20350)
+enclosing_stmt(#20349,#20292)
+expr_containers(#20349,#20001)
+#20351=*
+exprs(#20351,39,#20349,0,"L|0")
+#20352=@"loc,{#10000},3,41,3,43"
+locations_default(#20352,#10000,3,41,3,43)
+hasLocation(#20351,#20352)
+enclosing_stmt(#20351,#20292)
+expr_containers(#20351,#20001)
+#20353=*
+exprs(#20353,79,#20351,0,"L")
+hasLocation(#20353,#20193)
+enclosing_stmt(#20353,#20292)
+expr_containers(#20353,#20001)
+literals("L","L",#20353)
+#20354=@"var;{L};{#20000}"
+variables(#20354,"L",#20000)
+bind(#20353,#20354)
 #20355=*
-exprs(#20355,63,#20346,1,"(H|0)")
-#20356=@"loc,{#10000},3,46,3,50"
-locations_default(#20356,#10000,3,46,3,50)
-hasLocation(#20355,#20356)
-enclosing_stmt(#20355,#20291)
+exprs(#20355,3,#20351,1,"0")
+hasLocation(#20355,#20197)
+enclosing_stmt(#20355,#20292)
 expr_containers(#20355,#20001)
-#20357=*
-exprs(#20357,39,#20355,0,"H|0")
-#20358=@"loc,{#10000},3,47,3,49"
-locations_default(#20358,#10000,3,47,3,49)
-hasLocation(#20357,#20358)
-enclosing_stmt(#20357,#20291)
-expr_containers(#20357,#20001)
-#20359=*
-exprs(#20359,79,#20357,0,"H")
-hasLocation(#20359,#20205)
-enclosing_stmt(#20359,#20291)
-expr_containers(#20359,#20001)
-literals("H","H",#20359)
-#20360=@"var;{H};{#20000}"
-variables(#20360,"H",#20000)
-bind(#20359,#20360)
-#20361=*
-exprs(#20361,3,#20357,1,"0")
-hasLocation(#20361,#20209)
-enclosing_stmt(#20361,#20291)
-expr_containers(#20361,#20001)
-literals("0","0",#20361)
+literals("0","0",#20355)
+#20356=*
+exprs(#20356,63,#20347,1,"(H|0)")
+#20357=@"loc,{#10000},3,46,3,50"
+locations_default(#20357,#10000,3,46,3,50)
+hasLocation(#20356,#20357)
+enclosing_stmt(#20356,#20292)
+expr_containers(#20356,#20001)
+#20358=*
+exprs(#20358,39,#20356,0,"H|0")
+#20359=@"loc,{#10000},3,47,3,49"
+locations_default(#20359,#10000,3,47,3,49)
+hasLocation(#20358,#20359)
+enclosing_stmt(#20358,#20292)
+expr_containers(#20358,#20001)
+#20360=*
+exprs(#20360,79,#20358,0,"H")
+hasLocation(#20360,#20205)
+enclosing_stmt(#20360,#20292)
+expr_containers(#20360,#20001)
+literals("H","H",#20360)
+#20361=@"var;{H};{#20000}"
+variables(#20361,"H",#20000)
+bind(#20360,#20361)
 #20362=*
-stmts(#20362,1,#20291,1,"{}")
-#20363=@"loc,{#10000},3,52,3,53"
-locations_default(#20363,#10000,3,52,3,53)
-hasLocation(#20362,#20363)
-stmt_containers(#20362,#20001)
-#20364=*
-entry_cfg_node(#20364,#20001)
-#20365=@"loc,{#10000},1,1,1,0"
-locations_default(#20365,#10000,1,1,1,0)
-hasLocation(#20364,#20365)
-#20366=*
-exit_cfg_node(#20366,#20001)
-hasLocation(#20366,#20219)
-successor(#20291,#20300)
-successor(#20355,#20359)
-successor(#20361,#20357)
-successor(#20359,#20361)
-successor(#20357,#20346)
-successor(#20348,#20352)
-successor(#20354,#20350)
-successor(#20352,#20354)
-successor(#20350,#20355)
-successor(#20346,#20292)
-successor(#20339,#20343)
-successor(#20345,#20341)
-successor(#20343,#20345)
-successor(#20341,#20330)
-successor(#20332,#20336)
-successor(#20338,#20334)
-successor(#20336,#20338)
-successor(#20334,#20339)
-successor(#20330,#20294)
-successor(#20323,#20327)
-successor(#20329,#20325)
-successor(#20327,#20329)
-successor(#20325,#20314)
-successor(#20316,#20320)
-successor(#20322,#20318)
-successor(#20320,#20322)
-successor(#20318,#20323)
-successor(#20314,#20296)
-successor(#20307,#20311)
-successor(#20313,#20309)
-successor(#20311,#20313)
-successor(#20309,#20298)
-successor(#20300,#20304)
-successor(#20306,#20302)
-successor(#20304,#20306)
-successor(#20302,#20307)
-successor(#20298,#20316)
-successor(#20296,#20332)
-successor(#20294,#20348)
+exprs(#20362,3,#20358,1,"0")
+hasLocation(#20362,#20209)
+enclosing_stmt(#20362,#20292)
+expr_containers(#20362,#20001)
+literals("0","0",#20362)
+#20363=*
+stmts(#20363,1,#20292,1,"{}")
+#20364=@"loc,{#10000},3,52,3,53"
+locations_default(#20364,#10000,3,52,3,53)
+hasLocation(#20363,#20364)
+stmt_containers(#20363,#20001)
+#20365=*
+entry_cfg_node(#20365,#20001)
+#20366=@"loc,{#10000},1,1,1,0"
+locations_default(#20366,#10000,1,1,1,0)
+hasLocation(#20365,#20366)
 #20367=*
-guard_node(#20367,1,#20292)
-hasLocation(#20367,#20293)
-successor(#20367,#20362)
+exit_cfg_node(#20367,#20001)
+hasLocation(#20367,#20219)
+successor(#20292,#20301)
+successor(#20356,#20360)
+successor(#20362,#20358)
+successor(#20360,#20362)
+successor(#20358,#20347)
+successor(#20349,#20353)
+successor(#20355,#20351)
+successor(#20353,#20355)
+successor(#20351,#20356)
+successor(#20347,#20293)
+successor(#20340,#20344)
+successor(#20346,#20342)
+successor(#20344,#20346)
+successor(#20342,#20331)
+successor(#20333,#20337)
+successor(#20339,#20335)
+successor(#20337,#20339)
+successor(#20335,#20340)
+successor(#20331,#20295)
+successor(#20324,#20328)
+successor(#20330,#20326)
+successor(#20328,#20330)
+successor(#20326,#20315)
+successor(#20317,#20321)
+successor(#20323,#20319)
+successor(#20321,#20323)
+successor(#20319,#20324)
+successor(#20315,#20297)
+successor(#20308,#20312)
+successor(#20314,#20310)
+successor(#20312,#20314)
+successor(#20310,#20299)
+successor(#20301,#20305)
+successor(#20307,#20303)
+successor(#20305,#20307)
+successor(#20303,#20308)
+successor(#20299,#20317)
+successor(#20297,#20333)
+successor(#20295,#20349)
 #20368=*
-guard_node(#20368,0,#20292)
-hasLocation(#20368,#20293)
-successor(#20368,#20366)
-successor(#20292,#20367)
-successor(#20292,#20368)
-successor(#20362,#20366)
-successor(#20250,#20253)
-successor(#20255,#20261)
-successor(#20282,#20286)
-successor(#20288,#20284)
-successor(#20286,#20288)
-successor(#20284,#20274)
-successor(#20276,#20280)
-successor(#20281,#20278)
-successor(#20280,#20281)
-successor(#20278,#20282)
-successor(#20274,#20257)
-successor(#20267,#20271)
-successor(#20273,#20269)
-successor(#20271,#20273)
-successor(#20269,#20259)
-successor(#20261,#20265)
-successor(#20266,#20263)
-successor(#20265,#20266)
-successor(#20263,#20267)
-successor(#20259,#20276)
+guard_node(#20368,1,#20293)
+hasLocation(#20368,#20294)
+successor(#20368,#20363)
 #20369=*
-guard_node(#20369,1,#20257)
-hasLocation(#20369,#20258)
-successor(#20369,#20289)
+guard_node(#20369,0,#20293)
+hasLocation(#20369,#20294)
+successor(#20369,#20367)
+successor(#20293,#20368)
+successor(#20293,#20369)
+successor(#20363,#20367)
+successor(#20251,#20254)
+successor(#20256,#20262)
+successor(#20283,#20287)
+successor(#20289,#20285)
+successor(#20287,#20289)
+successor(#20285,#20275)
+successor(#20277,#20281)
+successor(#20282,#20279)
+successor(#20281,#20282)
+successor(#20279,#20283)
+successor(#20275,#20258)
+successor(#20268,#20272)
+successor(#20274,#20270)
+successor(#20272,#20274)
+successor(#20270,#20260)
+successor(#20262,#20266)
+successor(#20267,#20264)
+successor(#20266,#20267)
+successor(#20264,#20268)
+successor(#20260,#20277)
 #20370=*
-guard_node(#20370,0,#20257)
-hasLocation(#20370,#20258)
+guard_node(#20370,1,#20258)
+hasLocation(#20370,#20259)
 successor(#20370,#20290)
-successor(#20257,#20369)
-successor(#20257,#20370)
-successor(#20289,#20251)
-successor(#20290,#20251)
-successor(#20253,#20255)
-successor(#20251,#20291)
-successor(#20221,#20224)
-successor(#20224,#20230)
-successor(#20241,#20245)
-successor(#20247,#20243)
-successor(#20245,#20247)
-successor(#20243,#20238)
-successor(#20240,#20241)
-successor(#20238,#20226)
-successor(#20231,#20235)
-successor(#20237,#20233)
-successor(#20235,#20237)
-successor(#20233,#20228)
-successor(#20230,#20231)
-successor(#20228,#20240)
-successor(#20226,#20222)
 #20371=*
-guard_node(#20371,0,#20226)
-hasLocation(#20371,#20227)
-successor(#20371,#20248)
+guard_node(#20371,0,#20258)
+hasLocation(#20371,#20259)
+successor(#20371,#20291)
+successor(#20258,#20370)
+successor(#20258,#20371)
+successor(#20290,#20252)
+successor(#20291,#20252)
+successor(#20254,#20256)
+successor(#20252,#20292)
+successor(#20222,#20225)
+successor(#20225,#20231)
+successor(#20242,#20246)
+successor(#20248,#20244)
+successor(#20246,#20248)
+successor(#20244,#20239)
+successor(#20241,#20242)
+successor(#20239,#20227)
+successor(#20232,#20236)
+successor(#20238,#20234)
+successor(#20236,#20238)
+successor(#20234,#20229)
+successor(#20231,#20232)
+successor(#20229,#20241)
+successor(#20227,#20223)
 #20372=*
-guard_node(#20372,1,#20226)
-hasLocation(#20372,#20227)
-successor(#20372,#20250)
-successor(#20222,#20371)
-successor(#20222,#20372)
-successor(#20248,#20250)
-successor(#20364,#20221)
+guard_node(#20372,0,#20227)
+hasLocation(#20372,#20228)
+successor(#20372,#20249)
+#20373=*
+guard_node(#20373,1,#20227)
+hasLocation(#20373,#20228)
+successor(#20373,#20251)
+successor(#20223,#20372)
+successor(#20223,#20373)
+successor(#20249,#20251)
+successor(#20365,#20222)
 numlines(#10000,3,3,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/predicate-function-annotation.js.trap b/javascript/extractor/tests/flow/output/trap/predicate-function-annotation.js.trap
index b43afc81579..97310124e7b 100644
--- a/javascript/extractor/tests/flow/output/trap/predicate-function-annotation.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/predicate-function-annotation.js.trap
@@ -310,226 +310,232 @@ hasLocation(#20001,#20114)
 variables(#20115,"f",#20000)
 #20116=@"var;{g};{#20000}"
 variables(#20116,"g",#20000)
-#20117=*
-stmts(#20117,17,#20001,0,"functio ... rn a;\n}")
-#20118=@"loc,{#10000},1,1,3,1"
-locations_default(#20118,#10000,1,1,3,1)
-hasLocation(#20117,#20118)
-stmt_containers(#20117,#20001)
-#20119=*
-exprs(#20119,78,#20117,-1,"f")
-hasLocation(#20119,#20023)
-expr_containers(#20119,#20117)
-literals("f","f",#20119)
-decl(#20119,#20115)
+#20117=@"var;{this};{#20000}"
+variables(#20117,"this",#20000)
+#20118=*
+stmts(#20118,17,#20001,0,"functio ... rn a;\n}")
+#20119=@"loc,{#10000},1,1,3,1"
+locations_default(#20119,#10000,1,1,3,1)
+hasLocation(#20118,#20119)
+stmt_containers(#20118,#20001)
 #20120=*
-scopes(#20120,1)
-scopenodes(#20117,#20120)
-scopenesting(#20120,#20000)
-#20121=@"var;{a};{#20120}"
-variables(#20121,"a",#20120)
-#20122=*
-exprs(#20122,78,#20117,0,"a")
-hasLocation(#20122,#20027)
-expr_containers(#20122,#20117)
-literals("a","a",#20122)
-decl(#20122,#20121)
-#20123=@"var;{arguments};{#20120}"
-variables(#20123,"arguments",#20120)
-is_arguments_object(#20123)
+exprs(#20120,78,#20118,-1,"f")
+hasLocation(#20120,#20023)
+expr_containers(#20120,#20118)
+literals("f","f",#20120)
+decl(#20120,#20115)
+#20121=*
+scopes(#20121,1)
+scopenodes(#20118,#20121)
+scopenesting(#20121,#20000)
+#20122=@"var;{this};{#20121}"
+variables(#20122,"this",#20121)
+#20123=@"var;{a};{#20121}"
+variables(#20123,"a",#20121)
 #20124=*
-stmts(#20124,1,#20117,-2,"{\n    return a;\n}")
-#20125=@"loc,{#10000},1,32,3,1"
-locations_default(#20125,#10000,1,32,3,1)
-hasLocation(#20124,#20125)
-stmt_containers(#20124,#20117)
+exprs(#20124,78,#20118,0,"a")
+hasLocation(#20124,#20027)
+expr_containers(#20124,#20118)
+literals("a","a",#20124)
+decl(#20124,#20123)
+#20125=@"var;{arguments};{#20121}"
+variables(#20125,"arguments",#20121)
+is_arguments_object(#20125)
 #20126=*
-stmts(#20126,9,#20124,0,"return a;")
-#20127=@"loc,{#10000},2,5,2,13"
-locations_default(#20127,#10000,2,5,2,13)
+stmts(#20126,1,#20118,-2,"{\n    return a;\n}")
+#20127=@"loc,{#10000},1,32,3,1"
+locations_default(#20127,#10000,1,32,3,1)
 hasLocation(#20126,#20127)
-stmt_containers(#20126,#20117)
+stmt_containers(#20126,#20118)
 #20128=*
-exprs(#20128,79,#20126,0,"a")
-hasLocation(#20128,#20043)
-enclosing_stmt(#20128,#20126)
-expr_containers(#20128,#20117)
-literals("a","a",#20128)
-bind(#20128,#20121)
-#20129=*
-stmts(#20129,17,#20001,1,"functio ... ecks {}")
-#20130=@"loc,{#10000},4,1,4,24"
-locations_default(#20130,#10000,4,1,4,24)
-hasLocation(#20129,#20130)
-stmt_containers(#20129,#20001)
+stmts(#20128,9,#20126,0,"return a;")
+#20129=@"loc,{#10000},2,5,2,13"
+locations_default(#20129,#10000,2,5,2,13)
+hasLocation(#20128,#20129)
+stmt_containers(#20128,#20118)
+#20130=*
+exprs(#20130,79,#20128,0,"a")
+hasLocation(#20130,#20043)
+enclosing_stmt(#20130,#20128)
+expr_containers(#20130,#20118)
+literals("a","a",#20130)
+bind(#20130,#20123)
 #20131=*
-exprs(#20131,78,#20129,-1,"g")
-hasLocation(#20131,#20050)
-expr_containers(#20131,#20129)
-literals("g","g",#20131)
-decl(#20131,#20116)
-#20132=*
-scopes(#20132,1)
-scopenodes(#20129,#20132)
-scopenesting(#20132,#20000)
-#20133=@"var;{arguments};{#20132}"
-variables(#20133,"arguments",#20132)
-is_arguments_object(#20133)
+stmts(#20131,17,#20001,1,"functio ... ecks {}")
+#20132=@"loc,{#10000},4,1,4,24"
+locations_default(#20132,#10000,4,1,4,24)
+hasLocation(#20131,#20132)
+stmt_containers(#20131,#20001)
+#20133=*
+exprs(#20133,78,#20131,-1,"g")
+hasLocation(#20133,#20050)
+expr_containers(#20133,#20131)
+literals("g","g",#20133)
+decl(#20133,#20116)
 #20134=*
-stmts(#20134,1,#20129,-2,"{}")
-#20135=@"loc,{#10000},4,23,4,24"
-locations_default(#20135,#10000,4,23,4,24)
-hasLocation(#20134,#20135)
-stmt_containers(#20134,#20129)
-#20136=*
-stmts(#20136,1,#20001,2,"{\n    return b;\n}")
-#20137=@"loc,{#10000},4,26,6,1"
-locations_default(#20137,#10000,4,26,6,1)
-hasLocation(#20136,#20137)
-stmt_containers(#20136,#20001)
-#20138=*
-stmts(#20138,9,#20136,0,"return b;")
-#20139=@"loc,{#10000},5,5,5,13"
-locations_default(#20139,#10000,5,5,5,13)
-hasLocation(#20138,#20139)
-stmt_containers(#20138,#20001)
-#20140=*
-exprs(#20140,79,#20138,0,"b")
-hasLocation(#20140,#20070)
-enclosing_stmt(#20140,#20138)
-expr_containers(#20140,#20001)
-literals("b","b",#20140)
-#20141=@"var;{b};{#20000}"
-variables(#20141,"b",#20000)
-bind(#20140,#20141)
-#20142=*
-stmts(#20142,2,#20001,3,"(c): bo ... s => c;")
-hasLocation(#20142,#20017)
-stmt_containers(#20142,#20001)
+scopes(#20134,1)
+scopenodes(#20131,#20134)
+scopenesting(#20134,#20000)
+#20135=@"var;{this};{#20134}"
+variables(#20135,"this",#20134)
+#20136=@"var;{arguments};{#20134}"
+variables(#20136,"arguments",#20134)
+is_arguments_object(#20136)
+#20137=*
+stmts(#20137,1,#20131,-2,"{}")
+#20138=@"loc,{#10000},4,23,4,24"
+locations_default(#20138,#10000,4,23,4,24)
+hasLocation(#20137,#20138)
+stmt_containers(#20137,#20131)
+#20139=*
+stmts(#20139,1,#20001,2,"{\n    return b;\n}")
+#20140=@"loc,{#10000},4,26,6,1"
+locations_default(#20140,#10000,4,26,6,1)
+hasLocation(#20139,#20140)
+stmt_containers(#20139,#20001)
+#20141=*
+stmts(#20141,9,#20139,0,"return b;")
+#20142=@"loc,{#10000},5,5,5,13"
+locations_default(#20142,#10000,5,5,5,13)
+hasLocation(#20141,#20142)
+stmt_containers(#20141,#20001)
 #20143=*
-exprs(#20143,65,#20142,0,"(c): bo ... ks => c")
-#20144=@"loc,{#10000},8,1,8,25"
-locations_default(#20144,#10000,8,1,8,25)
-hasLocation(#20143,#20144)
-enclosing_stmt(#20143,#20142)
+exprs(#20143,79,#20141,0,"b")
+hasLocation(#20143,#20070)
+enclosing_stmt(#20143,#20141)
 expr_containers(#20143,#20001)
+literals("b","b",#20143)
+#20144=@"var;{b};{#20000}"
+variables(#20144,"b",#20000)
+bind(#20143,#20144)
 #20145=*
-scopes(#20145,1)
-scopenodes(#20143,#20145)
-scopenesting(#20145,#20000)
-#20146=@"var;{c};{#20145}"
-variables(#20146,"c",#20145)
-#20147=*
-exprs(#20147,78,#20143,0,"c")
-hasLocation(#20147,#20077)
-expr_containers(#20147,#20143)
-literals("c","c",#20147)
-decl(#20147,#20146)
+stmts(#20145,2,#20001,3,"(c): bo ... s => c;")
+hasLocation(#20145,#20017)
+stmt_containers(#20145,#20001)
+#20146=*
+exprs(#20146,65,#20145,0,"(c): bo ... ks => c")
+#20147=@"loc,{#10000},8,1,8,25"
+locations_default(#20147,#10000,8,1,8,25)
+hasLocation(#20146,#20147)
+enclosing_stmt(#20146,#20145)
+expr_containers(#20146,#20001)
 #20148=*
-exprs(#20148,79,#20143,-2,"c")
-hasLocation(#20148,#20091)
-expr_containers(#20148,#20143)
-literals("c","c",#20148)
-bind(#20148,#20146)
-#20149=*
-stmts(#20149,2,#20001,4,"(d): %checks => d;")
-hasLocation(#20149,#20019)
-stmt_containers(#20149,#20001)
+scopes(#20148,1)
+scopenodes(#20146,#20148)
+scopenesting(#20148,#20000)
+#20149=@"var;{c};{#20148}"
+variables(#20149,"c",#20148)
 #20150=*
-exprs(#20150,65,#20149,0,"(d): %checks => d")
-#20151=@"loc,{#10000},9,1,9,17"
-locations_default(#20151,#10000,9,1,9,17)
-hasLocation(#20150,#20151)
-enclosing_stmt(#20150,#20149)
-expr_containers(#20150,#20001)
+exprs(#20150,78,#20146,0,"c")
+hasLocation(#20150,#20077)
+expr_containers(#20150,#20146)
+literals("c","c",#20150)
+decl(#20150,#20149)
+#20151=*
+exprs(#20151,79,#20146,-2,"c")
+hasLocation(#20151,#20091)
+expr_containers(#20151,#20146)
+literals("c","c",#20151)
+bind(#20151,#20149)
 #20152=*
-scopes(#20152,1)
-scopenodes(#20150,#20152)
-scopenesting(#20152,#20000)
-#20153=@"var;{d};{#20152}"
-variables(#20153,"d",#20152)
-#20154=*
-exprs(#20154,78,#20150,0,"d")
-hasLocation(#20154,#20097)
-expr_containers(#20154,#20150)
-literals("d","d",#20154)
-decl(#20154,#20153)
+stmts(#20152,2,#20001,4,"(d): %checks => d;")
+hasLocation(#20152,#20019)
+stmt_containers(#20152,#20001)
+#20153=*
+exprs(#20153,65,#20152,0,"(d): %checks => d")
+#20154=@"loc,{#10000},9,1,9,17"
+locations_default(#20154,#10000,9,1,9,17)
+hasLocation(#20153,#20154)
+enclosing_stmt(#20153,#20152)
+expr_containers(#20153,#20001)
 #20155=*
-exprs(#20155,79,#20150,-2,"d")
-hasLocation(#20155,#20109)
-expr_containers(#20155,#20150)
-literals("d","d",#20155)
-bind(#20155,#20153)
-#20156=*
-entry_cfg_node(#20156,#20001)
-#20157=@"loc,{#10000},1,1,1,0"
-locations_default(#20157,#10000,1,1,1,0)
-hasLocation(#20156,#20157)
+scopes(#20155,1)
+scopenodes(#20153,#20155)
+scopenesting(#20155,#20000)
+#20156=@"var;{d};{#20155}"
+variables(#20156,"d",#20155)
+#20157=*
+exprs(#20157,78,#20153,0,"d")
+hasLocation(#20157,#20097)
+expr_containers(#20157,#20153)
+literals("d","d",#20157)
+decl(#20157,#20156)
 #20158=*
-exit_cfg_node(#20158,#20001)
-hasLocation(#20158,#20113)
-successor(#20149,#20150)
-successor(#20150,#20158)
+exprs(#20158,79,#20153,-2,"d")
+hasLocation(#20158,#20109)
+expr_containers(#20158,#20153)
+literals("d","d",#20158)
+bind(#20158,#20156)
 #20159=*
-entry_cfg_node(#20159,#20150)
-#20160=@"loc,{#10000},9,1,9,0"
-locations_default(#20160,#10000,9,1,9,0)
+entry_cfg_node(#20159,#20001)
+#20160=@"loc,{#10000},1,1,1,0"
+locations_default(#20160,#10000,1,1,1,0)
 hasLocation(#20159,#20160)
 #20161=*
-exit_cfg_node(#20161,#20150)
-#20162=@"loc,{#10000},9,18,9,17"
-locations_default(#20162,#10000,9,18,9,17)
-hasLocation(#20161,#20162)
-successor(#20155,#20161)
-successor(#20154,#20155)
-successor(#20159,#20154)
-successor(#20142,#20143)
-successor(#20143,#20149)
-#20163=*
-entry_cfg_node(#20163,#20143)
-#20164=@"loc,{#10000},8,1,8,0"
-locations_default(#20164,#10000,8,1,8,0)
-hasLocation(#20163,#20164)
-#20165=*
-exit_cfg_node(#20165,#20143)
-#20166=@"loc,{#10000},8,26,8,25"
-locations_default(#20166,#10000,8,26,8,25)
-hasLocation(#20165,#20166)
-successor(#20148,#20165)
-successor(#20147,#20148)
-successor(#20163,#20147)
-successor(#20140,#20138)
-successor(#20138,#20158)
-successor(#20136,#20140)
-successor(#20129,#20136)
-#20167=*
-entry_cfg_node(#20167,#20129)
-#20168=@"loc,{#10000},4,1,4,0"
-locations_default(#20168,#10000,4,1,4,0)
-hasLocation(#20167,#20168)
-#20169=*
-exit_cfg_node(#20169,#20129)
-#20170=@"loc,{#10000},4,25,4,24"
-locations_default(#20170,#10000,4,25,4,24)
-hasLocation(#20169,#20170)
-successor(#20134,#20169)
-successor(#20167,#20134)
-successor(#20117,#20129)
-#20171=*
-entry_cfg_node(#20171,#20117)
-hasLocation(#20171,#20157)
+exit_cfg_node(#20161,#20001)
+hasLocation(#20161,#20113)
+successor(#20152,#20153)
+successor(#20153,#20161)
+#20162=*
+entry_cfg_node(#20162,#20153)
+#20163=@"loc,{#10000},9,1,9,0"
+locations_default(#20163,#10000,9,1,9,0)
+hasLocation(#20162,#20163)
+#20164=*
+exit_cfg_node(#20164,#20153)
+#20165=@"loc,{#10000},9,18,9,17"
+locations_default(#20165,#10000,9,18,9,17)
+hasLocation(#20164,#20165)
+successor(#20158,#20164)
+successor(#20157,#20158)
+successor(#20162,#20157)
+successor(#20145,#20146)
+successor(#20146,#20152)
+#20166=*
+entry_cfg_node(#20166,#20146)
+#20167=@"loc,{#10000},8,1,8,0"
+locations_default(#20167,#10000,8,1,8,0)
+hasLocation(#20166,#20167)
+#20168=*
+exit_cfg_node(#20168,#20146)
+#20169=@"loc,{#10000},8,26,8,25"
+locations_default(#20169,#10000,8,26,8,25)
+hasLocation(#20168,#20169)
+successor(#20151,#20168)
+successor(#20150,#20151)
+successor(#20166,#20150)
+successor(#20143,#20141)
+successor(#20141,#20161)
+successor(#20139,#20143)
+successor(#20131,#20139)
+#20170=*
+entry_cfg_node(#20170,#20131)
+#20171=@"loc,{#10000},4,1,4,0"
+locations_default(#20171,#10000,4,1,4,0)
+hasLocation(#20170,#20171)
 #20172=*
-exit_cfg_node(#20172,#20117)
-#20173=@"loc,{#10000},3,2,3,1"
-locations_default(#20173,#10000,3,2,3,1)
+exit_cfg_node(#20172,#20131)
+#20173=@"loc,{#10000},4,25,4,24"
+locations_default(#20173,#10000,4,25,4,24)
 hasLocation(#20172,#20173)
-successor(#20128,#20126)
-successor(#20126,#20172)
-successor(#20124,#20128)
-successor(#20122,#20124)
-successor(#20171,#20122)
-successor(#20131,#20117)
-successor(#20119,#20131)
-successor(#20156,#20119)
+successor(#20137,#20172)
+successor(#20170,#20137)
+successor(#20118,#20131)
+#20174=*
+entry_cfg_node(#20174,#20118)
+hasLocation(#20174,#20160)
+#20175=*
+exit_cfg_node(#20175,#20118)
+#20176=@"loc,{#10000},3,2,3,1"
+locations_default(#20176,#10000,3,2,3,1)
+hasLocation(#20175,#20176)
+successor(#20130,#20128)
+successor(#20128,#20175)
+successor(#20126,#20130)
+successor(#20124,#20126)
+successor(#20174,#20124)
+successor(#20133,#20118)
+successor(#20120,#20133)
+successor(#20159,#20120)
 numlines(#10000,9,8,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/qualifiedInterface.js.trap b/javascript/extractor/tests/flow/output/trap/qualifiedInterface.js.trap
index e384b03c9d3..a47417615f6 100644
--- a/javascript/extractor/tests/flow/output/trap/qualifiedInterface.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/qualifiedInterface.js.trap
@@ -65,14 +65,16 @@ toplevels(#20001,0)
 #20022=@"loc,{#10000},1,1,2,0"
 locations_default(#20022,#10000,1,1,2,0)
 hasLocation(#20001,#20022)
-#20023=*
-entry_cfg_node(#20023,#20001)
-#20024=@"loc,{#10000},1,1,1,0"
-locations_default(#20024,#10000,1,1,1,0)
-hasLocation(#20023,#20024)
-#20025=*
-exit_cfg_node(#20025,#20001)
-hasLocation(#20025,#20021)
-successor(#20023,#20025)
+#20023=@"var;{this};{#20000}"
+variables(#20023,"this",#20000)
+#20024=*
+entry_cfg_node(#20024,#20001)
+#20025=@"loc,{#10000},1,1,1,0"
+locations_default(#20025,#10000,1,1,1,0)
+hasLocation(#20024,#20025)
+#20026=*
+exit_cfg_node(#20026,#20001)
+hasLocation(#20026,#20021)
+successor(#20024,#20026)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/tst.js.trap b/javascript/extractor/tests/flow/output/trap/tst.js.trap
index 05f0c5ce687..92ee708a601 100644
--- a/javascript/extractor/tests/flow/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/tst.js.trap
@@ -518,210 +518,220 @@ variables(#20190,"f",#20000)
 variables(#20191,"A",#20000)
 #20192=@"local_type_name;{A};{#20000}"
 local_type_names(#20192,"A",#20000)
-#20193=*
-stmts(#20193,26,#20001,0,"class A ... nt {}\n}")
-#20194=@"loc,{#10000},6,1,9,1"
-locations_default(#20194,#10000,6,1,9,1)
-hasLocation(#20193,#20194)
-stmt_containers(#20193,#20001)
-#20195=*
-exprs(#20195,78,#20193,0,"A")
-hasLocation(#20195,#20072)
-enclosing_stmt(#20195,#20193)
-expr_containers(#20195,#20001)
-literals("A","A",#20195)
-decl(#20195,#20191)
-typedecl(#20195,#20192)
+#20193=@"var;{this};{#20000}"
+variables(#20193,"this",#20000)
+#20194=*
+stmts(#20194,26,#20001,0,"class A ... nt {}\n}")
+#20195=@"loc,{#10000},6,1,9,1"
+locations_default(#20195,#10000,6,1,9,1)
+hasLocation(#20194,#20195)
+stmt_containers(#20194,#20001)
 #20196=*
-scopes(#20196,10)
-scopenodes(#20193,#20196)
-scopenesting(#20196,#20000)
+exprs(#20196,78,#20194,0,"A")
+hasLocation(#20196,#20072)
+enclosing_stmt(#20196,#20194)
+expr_containers(#20196,#20001)
+literals("A","A",#20196)
+decl(#20196,#20191)
+typedecl(#20196,#20192)
 #20197=*
-properties(#20197,#20193,2,8,"x: T;")
-#20198=@"loc,{#10000},7,3,7,7"
-locations_default(#20198,#10000,7,3,7,7)
-hasLocation(#20197,#20198)
+scopes(#20197,10)
+scopenodes(#20194,#20197)
+scopenesting(#20197,#20000)
+#20198=@"var;{this};{#20197}"
+variables(#20198,"this",#20197)
 #20199=*
-#20200=*
-exprs(#20200,0,#20197,0,"x")
-hasLocation(#20200,#20082)
-expr_containers(#20200,#20199)
-literals("x","x",#20200)
+properties(#20199,#20194,2,8,"x: T;")
+#20200=@"loc,{#10000},7,3,7,7"
+locations_default(#20200,#10000,7,3,7,7)
+hasLocation(#20199,#20200)
 #20201=*
-properties(#20201,#20193,3,0,"m() : Point {}")
-#20202=@"loc,{#10000},8,3,8,16"
-locations_default(#20202,#10000,8,3,8,16)
-hasLocation(#20201,#20202)
+#20202=*
+exprs(#20202,0,#20199,0,"x")
+hasLocation(#20202,#20082)
+expr_containers(#20202,#20201)
+literals("x","x",#20202)
 #20203=*
-exprs(#20203,0,#20201,0,"m")
-hasLocation(#20203,#20090)
-enclosing_stmt(#20203,#20193)
-expr_containers(#20203,#20001)
-literals("m","m",#20203)
-#20204=*
-exprs(#20204,9,#20201,1,"() : Point {}")
-#20205=@"loc,{#10000},8,4,8,16"
-locations_default(#20205,#10000,8,4,8,16)
-hasLocation(#20204,#20205)
-enclosing_stmt(#20204,#20193)
-expr_containers(#20204,#20001)
+properties(#20203,#20194,3,0,"m() : Point {}")
+#20204=@"loc,{#10000},8,3,8,16"
+locations_default(#20204,#10000,8,3,8,16)
+hasLocation(#20203,#20204)
+#20205=*
+exprs(#20205,0,#20203,0,"m")
+hasLocation(#20205,#20090)
+enclosing_stmt(#20205,#20194)
+expr_containers(#20205,#20001)
+literals("m","m",#20205)
 #20206=*
-scopes(#20206,1)
-scopenodes(#20204,#20206)
-scopenesting(#20206,#20196)
-#20207=@"var;{arguments};{#20206}"
-variables(#20207,"arguments",#20206)
-is_arguments_object(#20207)
+exprs(#20206,9,#20203,1,"() : Point {}")
+#20207=@"loc,{#10000},8,4,8,16"
+locations_default(#20207,#10000,8,4,8,16)
+hasLocation(#20206,#20207)
+enclosing_stmt(#20206,#20194)
+expr_containers(#20206,#20001)
 #20208=*
-stmts(#20208,1,#20204,-2,"{}")
-#20209=@"loc,{#10000},8,15,8,16"
-locations_default(#20209,#10000,8,15,8,16)
-hasLocation(#20208,#20209)
-stmt_containers(#20208,#20204)
-is_method(#20201)
-#20210=*
-properties(#20210,#20193,4,0,"constructor() {}")
-#20211=@"loc,{#10000},6,12,6,11"
-locations_default(#20211,#10000,6,12,6,11)
-hasLocation(#20210,#20211)
-#20212=*
-exprs(#20212,0,#20210,0,"constructor")
-hasLocation(#20212,#20211)
-enclosing_stmt(#20212,#20193)
-expr_containers(#20212,#20001)
-literals("constructor","constructor",#20212)
-exprs(#20199,9,#20210,1,"() {}")
-hasLocation(#20199,#20211)
-enclosing_stmt(#20199,#20193)
-expr_containers(#20199,#20001)
+scopes(#20208,1)
+scopenodes(#20206,#20208)
+scopenesting(#20208,#20197)
+#20209=@"var;{this};{#20208}"
+variables(#20209,"this",#20208)
+#20210=@"var;{arguments};{#20208}"
+variables(#20210,"arguments",#20208)
+is_arguments_object(#20210)
+#20211=*
+stmts(#20211,1,#20206,-2,"{}")
+#20212=@"loc,{#10000},8,15,8,16"
+locations_default(#20212,#10000,8,15,8,16)
+hasLocation(#20211,#20212)
+stmt_containers(#20211,#20206)
+is_method(#20203)
 #20213=*
-scopes(#20213,1)
-scopenodes(#20199,#20213)
-scopenesting(#20213,#20196)
-#20214=@"var;{arguments};{#20213}"
-variables(#20214,"arguments",#20213)
-is_arguments_object(#20214)
+properties(#20213,#20194,4,0,"constructor() {}")
+#20214=@"loc,{#10000},6,12,6,11"
+locations_default(#20214,#10000,6,12,6,11)
+hasLocation(#20213,#20214)
 #20215=*
-stmts(#20215,1,#20199,-2,"{}")
-hasLocation(#20215,#20211)
-stmt_containers(#20215,#20199)
-is_method(#20210)
+exprs(#20215,0,#20213,0,"constructor")
+hasLocation(#20215,#20214)
+enclosing_stmt(#20215,#20194)
+expr_containers(#20215,#20001)
+literals("constructor","constructor",#20215)
+exprs(#20201,9,#20213,1,"() {}")
+hasLocation(#20201,#20214)
+enclosing_stmt(#20201,#20194)
+expr_containers(#20201,#20001)
 #20216=*
-stmts(#20216,17,#20001,1,"functio ... :\n  }\n}")
-#20217=@"loc,{#10000},11,1,15,1"
-locations_default(#20217,#10000,11,1,15,1)
-hasLocation(#20216,#20217)
-stmt_containers(#20216,#20001)
-#20218=*
-exprs(#20218,78,#20216,-1,"f")
-hasLocation(#20218,#20107)
-expr_containers(#20218,#20216)
-literals("f","f",#20218)
-decl(#20218,#20190)
+scopes(#20216,1)
+scopenodes(#20201,#20216)
+scopenesting(#20216,#20197)
+#20217=@"var;{this};{#20216}"
+variables(#20217,"this",#20216)
+#20218=@"var;{arguments};{#20216}"
+variables(#20218,"arguments",#20216)
+is_arguments_object(#20218)
 #20219=*
-scopes(#20219,1)
-scopenodes(#20216,#20219)
-scopenesting(#20219,#20000)
-#20220=@"var;{arguments};{#20219}"
-variables(#20220,"arguments",#20219)
-is_arguments_object(#20220)
-#20221=*
-stmts(#20221,1,#20216,-2,"{\n  swi ... :\n  }\n}")
-#20222=@"loc,{#10000},11,14,15,1"
-locations_default(#20222,#10000,11,14,15,1)
-hasLocation(#20221,#20222)
-stmt_containers(#20221,#20216)
+stmts(#20219,1,#20201,-2,"{}")
+hasLocation(#20219,#20214)
+stmt_containers(#20219,#20201)
+is_method(#20213)
+#20220=*
+stmts(#20220,17,#20001,1,"functio ... :\n  }\n}")
+#20221=@"loc,{#10000},11,1,15,1"
+locations_default(#20221,#10000,11,1,15,1)
+hasLocation(#20220,#20221)
+stmt_containers(#20220,#20001)
+#20222=*
+exprs(#20222,78,#20220,-1,"f")
+hasLocation(#20222,#20107)
+expr_containers(#20222,#20220)
+literals("f","f",#20222)
+decl(#20222,#20190)
 #20223=*
-stmts(#20223,8,#20221,0,"switch( ... 2):\n  }")
-#20224=@"loc,{#10000},12,3,14,3"
-locations_default(#20224,#10000,12,3,14,3)
-hasLocation(#20223,#20224)
-stmt_containers(#20223,#20216)
-#20225=*
-exprs(#20225,79,#20223,-1,"x")
-hasLocation(#20225,#20119)
-enclosing_stmt(#20225,#20223)
-expr_containers(#20225,#20216)
-literals("x","x",#20225)
-#20226=@"var;{x};{#20000}"
-variables(#20226,"x",#20000)
-bind(#20225,#20226)
-#20227=*
-stmts(#20227,19,#20223,0,"case (42):")
-#20228=@"loc,{#10000},13,3,13,12"
-locations_default(#20228,#10000,13,3,13,12)
-hasLocation(#20227,#20228)
-stmt_containers(#20227,#20216)
-#20229=*
-exprs(#20229,63,#20227,-1,"(42)")
-#20230=@"loc,{#10000},13,8,13,11"
-locations_default(#20230,#10000,13,8,13,11)
-hasLocation(#20229,#20230)
-enclosing_stmt(#20229,#20227)
-expr_containers(#20229,#20216)
-#20231=*
-exprs(#20231,3,#20229,0,"42")
-hasLocation(#20231,#20129)
-enclosing_stmt(#20231,#20227)
-expr_containers(#20231,#20216)
-literals("42","42",#20231)
+scopes(#20223,1)
+scopenodes(#20220,#20223)
+scopenesting(#20223,#20000)
+#20224=@"var;{this};{#20223}"
+variables(#20224,"this",#20223)
+#20225=@"var;{arguments};{#20223}"
+variables(#20225,"arguments",#20223)
+is_arguments_object(#20225)
+#20226=*
+stmts(#20226,1,#20220,-2,"{\n  swi ... :\n  }\n}")
+#20227=@"loc,{#10000},11,14,15,1"
+locations_default(#20227,#10000,11,14,15,1)
+hasLocation(#20226,#20227)
+stmt_containers(#20226,#20220)
+#20228=*
+stmts(#20228,8,#20226,0,"switch( ... 2):\n  }")
+#20229=@"loc,{#10000},12,3,14,3"
+locations_default(#20229,#10000,12,3,14,3)
+hasLocation(#20228,#20229)
+stmt_containers(#20228,#20220)
+#20230=*
+exprs(#20230,79,#20228,-1,"x")
+hasLocation(#20230,#20119)
+enclosing_stmt(#20230,#20228)
+expr_containers(#20230,#20220)
+literals("x","x",#20230)
+#20231=@"var;{x};{#20000}"
+variables(#20231,"x",#20000)
+bind(#20230,#20231)
 #20232=*
-entry_cfg_node(#20232,#20001)
-#20233=@"loc,{#10000},1,1,1,0"
-locations_default(#20233,#10000,1,1,1,0)
+stmts(#20232,19,#20228,0,"case (42):")
+#20233=@"loc,{#10000},13,3,13,12"
+locations_default(#20233,#10000,13,3,13,12)
 hasLocation(#20232,#20233)
+stmt_containers(#20232,#20220)
 #20234=*
-exit_cfg_node(#20234,#20001)
-hasLocation(#20234,#20188)
-successor(#20216,#20234)
-#20235=*
-entry_cfg_node(#20235,#20216)
-#20236=@"loc,{#10000},11,1,11,0"
-locations_default(#20236,#10000,11,1,11,0)
-hasLocation(#20235,#20236)
+exprs(#20234,63,#20232,-1,"(42)")
+#20235=@"loc,{#10000},13,8,13,11"
+locations_default(#20235,#10000,13,8,13,11)
+hasLocation(#20234,#20235)
+enclosing_stmt(#20234,#20232)
+expr_containers(#20234,#20220)
+#20236=*
+exprs(#20236,3,#20234,0,"42")
+hasLocation(#20236,#20129)
+enclosing_stmt(#20236,#20232)
+expr_containers(#20236,#20220)
+literals("42","42",#20236)
 #20237=*
-exit_cfg_node(#20237,#20216)
-#20238=@"loc,{#10000},15,2,15,1"
-locations_default(#20238,#10000,15,2,15,1)
+entry_cfg_node(#20237,#20001)
+#20238=@"loc,{#10000},1,1,1,0"
+locations_default(#20238,#10000,1,1,1,0)
 hasLocation(#20237,#20238)
-successor(#20223,#20225)
-successor(#20225,#20227)
-successor(#20227,#20229)
-successor(#20229,#20231)
-successor(#20231,#20237)
-successor(#20221,#20223)
-successor(#20235,#20221)
-successor(#20200,#20197)
-successor(#20199,#20210)
 #20239=*
-entry_cfg_node(#20239,#20199)
-hasLocation(#20239,#20211)
-successor(#20197,#20215)
+exit_cfg_node(#20239,#20001)
+hasLocation(#20239,#20188)
+successor(#20220,#20239)
 #20240=*
-exit_cfg_node(#20240,#20199)
-hasLocation(#20240,#20211)
-successor(#20215,#20240)
-successor(#20239,#20200)
-successor(#20212,#20199)
-successor(#20210,#20193)
-successor(#20204,#20201)
-#20241=*
-entry_cfg_node(#20241,#20204)
-#20242=@"loc,{#10000},8,4,8,3"
-locations_default(#20242,#10000,8,4,8,3)
-hasLocation(#20241,#20242)
-#20243=*
-exit_cfg_node(#20243,#20204)
-#20244=@"loc,{#10000},8,17,8,16"
-locations_default(#20244,#10000,8,17,8,16)
-hasLocation(#20243,#20244)
-successor(#20208,#20243)
-successor(#20241,#20208)
-successor(#20203,#20204)
-successor(#20201,#20212)
-successor(#20195,#20203)
-successor(#20193,#20216)
-successor(#20218,#20195)
-successor(#20232,#20218)
+entry_cfg_node(#20240,#20220)
+#20241=@"loc,{#10000},11,1,11,0"
+locations_default(#20241,#10000,11,1,11,0)
+hasLocation(#20240,#20241)
+#20242=*
+exit_cfg_node(#20242,#20220)
+#20243=@"loc,{#10000},15,2,15,1"
+locations_default(#20243,#10000,15,2,15,1)
+hasLocation(#20242,#20243)
+successor(#20228,#20230)
+successor(#20230,#20232)
+successor(#20232,#20234)
+successor(#20234,#20236)
+successor(#20236,#20242)
+successor(#20226,#20228)
+successor(#20240,#20226)
+successor(#20202,#20199)
+successor(#20201,#20213)
+#20244=*
+entry_cfg_node(#20244,#20201)
+hasLocation(#20244,#20214)
+successor(#20199,#20219)
+#20245=*
+exit_cfg_node(#20245,#20201)
+hasLocation(#20245,#20214)
+successor(#20219,#20245)
+successor(#20244,#20202)
+successor(#20215,#20201)
+successor(#20213,#20194)
+successor(#20206,#20203)
+#20246=*
+entry_cfg_node(#20246,#20206)
+#20247=@"loc,{#10000},8,4,8,3"
+locations_default(#20247,#10000,8,4,8,3)
+hasLocation(#20246,#20247)
+#20248=*
+exit_cfg_node(#20248,#20206)
+#20249=@"loc,{#10000},8,17,8,16"
+locations_default(#20249,#10000,8,17,8,16)
+hasLocation(#20248,#20249)
+successor(#20211,#20248)
+successor(#20246,#20211)
+successor(#20205,#20206)
+successor(#20203,#20215)
+successor(#20196,#20205)
+successor(#20194,#20220)
+successor(#20222,#20196)
+successor(#20237,#20222)
 numlines(#10000,22,17,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/flow/output/trap/variance.js.trap b/javascript/extractor/tests/flow/output/trap/variance.js.trap
index cd1ea42f228..af2e45fd6f8 100644
--- a/javascript/extractor/tests/flow/output/trap/variance.js.trap
+++ b/javascript/extractor/tests/flow/output/trap/variance.js.trap
@@ -164,85 +164,91 @@ hasLocation(#20001,#20057)
 variables(#20058,"Foo",#20000)
 #20059=@"local_type_name;{Foo};{#20000}"
 local_type_names(#20059,"Foo",#20000)
-#20060=*
-stmts(#20060,26,#20001,0,"class F ... : int\n}")
-#20061=@"loc,{#10000},5,1,7,1"
-locations_default(#20061,#10000,5,1,7,1)
-hasLocation(#20060,#20061)
-stmt_containers(#20060,#20001)
-#20062=*
-exprs(#20062,78,#20060,0,"Foo")
-hasLocation(#20062,#20043)
-enclosing_stmt(#20062,#20060)
-expr_containers(#20062,#20001)
-literals("Foo","Foo",#20062)
-decl(#20062,#20058)
-typedecl(#20062,#20059)
+#20060=@"var;{this};{#20000}"
+variables(#20060,"this",#20000)
+#20061=*
+stmts(#20061,26,#20001,0,"class F ... : int\n}")
+#20062=@"loc,{#10000},5,1,7,1"
+locations_default(#20062,#10000,5,1,7,1)
+hasLocation(#20061,#20062)
+stmt_containers(#20061,#20001)
 #20063=*
-scopes(#20063,10)
-scopenodes(#20060,#20063)
-scopenesting(#20063,#20000)
+exprs(#20063,78,#20061,0,"Foo")
+hasLocation(#20063,#20043)
+enclosing_stmt(#20063,#20061)
+expr_containers(#20063,#20001)
+literals("Foo","Foo",#20063)
+decl(#20063,#20058)
+typedecl(#20063,#20059)
 #20064=*
-properties(#20064,#20060,2,8,"+x: int")
-#20065=@"loc,{#10000},6,3,6,9"
-locations_default(#20065,#10000,6,3,6,9)
-hasLocation(#20064,#20065)
+scopes(#20064,10)
+scopenodes(#20061,#20064)
+scopenesting(#20064,#20000)
+#20065=@"var;{this};{#20064}"
+variables(#20065,"this",#20064)
 #20066=*
-#20067=*
-exprs(#20067,0,#20064,0,"x")
-hasLocation(#20067,#20049)
-expr_containers(#20067,#20066)
-literals("x","x",#20067)
+properties(#20066,#20061,2,8,"+x: int")
+#20067=@"loc,{#10000},6,3,6,9"
+locations_default(#20067,#10000,6,3,6,9)
+hasLocation(#20066,#20067)
 #20068=*
-properties(#20068,#20060,3,0,"constructor() {}")
-#20069=@"loc,{#10000},5,11,5,10"
-locations_default(#20069,#10000,5,11,5,10)
-hasLocation(#20068,#20069)
+#20069=*
+exprs(#20069,0,#20066,0,"x")
+hasLocation(#20069,#20049)
+expr_containers(#20069,#20068)
+literals("x","x",#20069)
 #20070=*
-exprs(#20070,0,#20068,0,"constructor")
-hasLocation(#20070,#20069)
-enclosing_stmt(#20070,#20060)
-expr_containers(#20070,#20001)
-literals("constructor","constructor",#20070)
-exprs(#20066,9,#20068,1,"() {}")
-hasLocation(#20066,#20069)
-enclosing_stmt(#20066,#20060)
-expr_containers(#20066,#20001)
-#20071=*
-scopes(#20071,1)
-scopenodes(#20066,#20071)
-scopenesting(#20071,#20063)
-#20072=@"var;{arguments};{#20071}"
-variables(#20072,"arguments",#20071)
-is_arguments_object(#20072)
+properties(#20070,#20061,3,0,"constructor() {}")
+#20071=@"loc,{#10000},5,11,5,10"
+locations_default(#20071,#10000,5,11,5,10)
+hasLocation(#20070,#20071)
+#20072=*
+exprs(#20072,0,#20070,0,"constructor")
+hasLocation(#20072,#20071)
+enclosing_stmt(#20072,#20061)
+expr_containers(#20072,#20001)
+literals("constructor","constructor",#20072)
+exprs(#20068,9,#20070,1,"() {}")
+hasLocation(#20068,#20071)
+enclosing_stmt(#20068,#20061)
+expr_containers(#20068,#20001)
 #20073=*
-stmts(#20073,1,#20066,-2,"{}")
-hasLocation(#20073,#20069)
-stmt_containers(#20073,#20066)
-is_method(#20068)
-#20074=*
-entry_cfg_node(#20074,#20001)
-#20075=@"loc,{#10000},1,1,1,0"
-locations_default(#20075,#10000,1,1,1,0)
-hasLocation(#20074,#20075)
+scopes(#20073,1)
+scopenodes(#20068,#20073)
+scopenesting(#20073,#20064)
+#20074=@"var;{this};{#20073}"
+variables(#20074,"this",#20073)
+#20075=@"var;{arguments};{#20073}"
+variables(#20075,"arguments",#20073)
+is_arguments_object(#20075)
 #20076=*
-exit_cfg_node(#20076,#20001)
-hasLocation(#20076,#20056)
-successor(#20067,#20064)
-successor(#20066,#20068)
+stmts(#20076,1,#20068,-2,"{}")
+hasLocation(#20076,#20071)
+stmt_containers(#20076,#20068)
+is_method(#20070)
 #20077=*
-entry_cfg_node(#20077,#20066)
-hasLocation(#20077,#20069)
-successor(#20064,#20073)
-#20078=*
-exit_cfg_node(#20078,#20066)
-hasLocation(#20078,#20069)
-successor(#20073,#20078)
-successor(#20077,#20067)
-successor(#20070,#20066)
-successor(#20068,#20060)
-successor(#20062,#20070)
-successor(#20060,#20076)
-successor(#20074,#20062)
+entry_cfg_node(#20077,#20001)
+#20078=@"loc,{#10000},1,1,1,0"
+locations_default(#20078,#10000,1,1,1,0)
+hasLocation(#20077,#20078)
+#20079=*
+exit_cfg_node(#20079,#20001)
+hasLocation(#20079,#20056)
+successor(#20069,#20066)
+successor(#20068,#20070)
+#20080=*
+entry_cfg_node(#20080,#20068)
+hasLocation(#20080,#20071)
+successor(#20066,#20076)
+#20081=*
+exit_cfg_node(#20081,#20068)
+hasLocation(#20081,#20071)
+successor(#20076,#20081)
+successor(#20080,#20069)
+successor(#20072,#20068)
+successor(#20070,#20061)
+successor(#20063,#20072)
+successor(#20061,#20079)
+successor(#20077,#20063)
 numlines(#10000,7,6,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/functionbind/output/trap/tst.js.trap b/javascript/extractor/tests/functionbind/output/trap/tst.js.trap
index 8ec6dfe8c8a..9afdfe05de1 100644
--- a/javascript/extractor/tests/functionbind/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/functionbind/output/trap/tst.js.trap
@@ -237,260 +237,262 @@ hasLocation(#20001,#20088)
 variables(#20089,"hasOwnProp",#20000)
 #20090=@"var;{obj};{#20000}"
 variables(#20090,"obj",#20000)
-#20091=*
-stmts(#20091,2,#20001,0,"process ... e.log);")
-hasLocation(#20091,#20003)
-stmt_containers(#20091,#20001)
+#20091=@"var;{this};{#20000}"
+variables(#20091,"this",#20000)
 #20092=*
-exprs(#20092,13,#20091,0,"process ... le.log)")
-#20093=@"loc,{#10000},1,1,1,31"
-locations_default(#20093,#10000,1,1,1,31)
-hasLocation(#20092,#20093)
-enclosing_stmt(#20092,#20091)
-expr_containers(#20092,#20001)
-#20094=*
-exprs(#20094,14,#20092,-1,"process.argv.map")
-#20095=@"loc,{#10000},1,1,1,16"
-locations_default(#20095,#10000,1,1,1,16)
-hasLocation(#20094,#20095)
-enclosing_stmt(#20094,#20091)
-expr_containers(#20094,#20001)
-#20096=*
-exprs(#20096,14,#20094,0,"process.argv")
-#20097=@"loc,{#10000},1,1,1,12"
-locations_default(#20097,#10000,1,1,1,12)
-hasLocation(#20096,#20097)
-enclosing_stmt(#20096,#20091)
-expr_containers(#20096,#20001)
-#20098=*
-exprs(#20098,79,#20096,0,"process")
-hasLocation(#20098,#20013)
-enclosing_stmt(#20098,#20091)
-expr_containers(#20098,#20001)
-literals("process","process",#20098)
-#20099=@"var;{process};{#20000}"
-variables(#20099,"process",#20000)
-bind(#20098,#20099)
-#20100=*
-exprs(#20100,0,#20096,1,"argv")
-hasLocation(#20100,#20017)
-enclosing_stmt(#20100,#20091)
-expr_containers(#20100,#20001)
-literals("argv","argv",#20100)
+stmts(#20092,2,#20001,0,"process ... e.log);")
+hasLocation(#20092,#20003)
+stmt_containers(#20092,#20001)
+#20093=*
+exprs(#20093,13,#20092,0,"process ... le.log)")
+#20094=@"loc,{#10000},1,1,1,31"
+locations_default(#20094,#10000,1,1,1,31)
+hasLocation(#20093,#20094)
+enclosing_stmt(#20093,#20092)
+expr_containers(#20093,#20001)
+#20095=*
+exprs(#20095,14,#20093,-1,"process.argv.map")
+#20096=@"loc,{#10000},1,1,1,16"
+locations_default(#20096,#10000,1,1,1,16)
+hasLocation(#20095,#20096)
+enclosing_stmt(#20095,#20092)
+expr_containers(#20095,#20001)
+#20097=*
+exprs(#20097,14,#20095,0,"process.argv")
+#20098=@"loc,{#10000},1,1,1,12"
+locations_default(#20098,#10000,1,1,1,12)
+hasLocation(#20097,#20098)
+enclosing_stmt(#20097,#20092)
+expr_containers(#20097,#20001)
+#20099=*
+exprs(#20099,79,#20097,0,"process")
+hasLocation(#20099,#20013)
+enclosing_stmt(#20099,#20092)
+expr_containers(#20099,#20001)
+literals("process","process",#20099)
+#20100=@"var;{process};{#20000}"
+variables(#20100,"process",#20000)
+bind(#20099,#20100)
 #20101=*
-exprs(#20101,0,#20094,1,"map")
-hasLocation(#20101,#20021)
-enclosing_stmt(#20101,#20091)
+exprs(#20101,0,#20097,1,"argv")
+hasLocation(#20101,#20017)
+enclosing_stmt(#20101,#20092)
 expr_containers(#20101,#20001)
-literals("map","map",#20101)
+literals("argv","argv",#20101)
 #20102=*
-exprs(#20102,97,#20092,0,"::console.log")
-#20103=@"loc,{#10000},1,18,1,30"
-locations_default(#20103,#10000,1,18,1,30)
-hasLocation(#20102,#20103)
-enclosing_stmt(#20102,#20091)
+exprs(#20102,0,#20095,1,"map")
+hasLocation(#20102,#20021)
+enclosing_stmt(#20102,#20092)
 expr_containers(#20102,#20001)
-#20104=*
-exprs(#20104,14,#20102,1,"console.log")
-#20105=@"loc,{#10000},1,20,1,30"
-locations_default(#20105,#10000,1,20,1,30)
-hasLocation(#20104,#20105)
-enclosing_stmt(#20104,#20091)
-expr_containers(#20104,#20001)
-#20106=*
-exprs(#20106,79,#20104,0,"console")
-hasLocation(#20106,#20027)
-enclosing_stmt(#20106,#20091)
-expr_containers(#20106,#20001)
-literals("console","console",#20106)
-#20107=@"var;{console};{#20000}"
-variables(#20107,"console",#20000)
-bind(#20106,#20107)
-#20108=*
-exprs(#20108,0,#20104,1,"log")
-hasLocation(#20108,#20031)
-enclosing_stmt(#20108,#20091)
-expr_containers(#20108,#20001)
-literals("log","log",#20108)
+literals("map","map",#20102)
+#20103=*
+exprs(#20103,97,#20093,0,"::console.log")
+#20104=@"loc,{#10000},1,18,1,30"
+locations_default(#20104,#10000,1,18,1,30)
+hasLocation(#20103,#20104)
+enclosing_stmt(#20103,#20092)
+expr_containers(#20103,#20001)
+#20105=*
+exprs(#20105,14,#20103,1,"console.log")
+#20106=@"loc,{#10000},1,20,1,30"
+locations_default(#20106,#10000,1,20,1,30)
+hasLocation(#20105,#20106)
+enclosing_stmt(#20105,#20092)
+expr_containers(#20105,#20001)
+#20107=*
+exprs(#20107,79,#20105,0,"console")
+hasLocation(#20107,#20027)
+enclosing_stmt(#20107,#20092)
+expr_containers(#20107,#20001)
+literals("console","console",#20107)
+#20108=@"var;{console};{#20000}"
+variables(#20108,"console",#20000)
+bind(#20107,#20108)
 #20109=*
-stmts(#20109,23,#20001,1,"let has ... operty;")
-hasLocation(#20109,#20007)
-stmt_containers(#20109,#20001)
+exprs(#20109,0,#20105,1,"log")
+hasLocation(#20109,#20031)
+enclosing_stmt(#20109,#20092)
+expr_containers(#20109,#20001)
+literals("log","log",#20109)
 #20110=*
-exprs(#20110,64,#20109,0,"hasOwnP ... roperty")
-#20111=@"loc,{#10000},3,5,3,48"
-locations_default(#20111,#10000,3,5,3,48)
-hasLocation(#20110,#20111)
-enclosing_stmt(#20110,#20109)
-expr_containers(#20110,#20001)
-#20112=*
-exprs(#20112,78,#20110,0,"hasOwnProp")
-hasLocation(#20112,#20039)
-enclosing_stmt(#20112,#20109)
-expr_containers(#20112,#20001)
-literals("hasOwnProp","hasOwnProp",#20112)
-decl(#20112,#20089)
+stmts(#20110,23,#20001,1,"let has ... operty;")
+hasLocation(#20110,#20007)
+stmt_containers(#20110,#20001)
+#20111=*
+exprs(#20111,64,#20110,0,"hasOwnP ... roperty")
+#20112=@"loc,{#10000},3,5,3,48"
+locations_default(#20112,#10000,3,5,3,48)
+hasLocation(#20111,#20112)
+enclosing_stmt(#20111,#20110)
+expr_containers(#20111,#20001)
 #20113=*
-exprs(#20113,14,#20110,1,"Object. ... roperty")
-#20114=@"loc,{#10000},3,18,3,48"
-locations_default(#20114,#10000,3,18,3,48)
-hasLocation(#20113,#20114)
-enclosing_stmt(#20113,#20109)
+exprs(#20113,78,#20111,0,"hasOwnProp")
+hasLocation(#20113,#20039)
+enclosing_stmt(#20113,#20110)
 expr_containers(#20113,#20001)
-#20115=*
-exprs(#20115,14,#20113,0,"Object.prototype")
-#20116=@"loc,{#10000},3,18,3,33"
-locations_default(#20116,#10000,3,18,3,33)
-hasLocation(#20115,#20116)
-enclosing_stmt(#20115,#20109)
-expr_containers(#20115,#20001)
-#20117=*
-exprs(#20117,79,#20115,0,"Object")
-hasLocation(#20117,#20043)
-enclosing_stmt(#20117,#20109)
-expr_containers(#20117,#20001)
-literals("Object","Object",#20117)
-#20118=@"var;{Object};{#20000}"
-variables(#20118,"Object",#20000)
-bind(#20117,#20118)
-#20119=*
-exprs(#20119,0,#20115,1,"prototype")
-hasLocation(#20119,#20047)
-enclosing_stmt(#20119,#20109)
-expr_containers(#20119,#20001)
-literals("prototype","prototype",#20119)
+literals("hasOwnProp","hasOwnProp",#20113)
+decl(#20113,#20089)
+#20114=*
+exprs(#20114,14,#20111,1,"Object. ... roperty")
+#20115=@"loc,{#10000},3,18,3,48"
+locations_default(#20115,#10000,3,18,3,48)
+hasLocation(#20114,#20115)
+enclosing_stmt(#20114,#20110)
+expr_containers(#20114,#20001)
+#20116=*
+exprs(#20116,14,#20114,0,"Object.prototype")
+#20117=@"loc,{#10000},3,18,3,33"
+locations_default(#20117,#10000,3,18,3,33)
+hasLocation(#20116,#20117)
+enclosing_stmt(#20116,#20110)
+expr_containers(#20116,#20001)
+#20118=*
+exprs(#20118,79,#20116,0,"Object")
+hasLocation(#20118,#20043)
+enclosing_stmt(#20118,#20110)
+expr_containers(#20118,#20001)
+literals("Object","Object",#20118)
+#20119=@"var;{Object};{#20000}"
+variables(#20119,"Object",#20000)
+bind(#20118,#20119)
 #20120=*
-exprs(#20120,0,#20113,1,"hasOwnProperty")
-hasLocation(#20120,#20051)
-enclosing_stmt(#20120,#20109)
+exprs(#20120,0,#20116,1,"prototype")
+hasLocation(#20120,#20047)
+enclosing_stmt(#20120,#20110)
 expr_containers(#20120,#20001)
-literals("hasOwnProperty","hasOwnProperty",#20120)
+literals("prototype","prototype",#20120)
 #20121=*
-stmts(#20121,23,#20001,2,"let obj ...  100 };")
-hasLocation(#20121,#20009)
-stmt_containers(#20121,#20001)
+exprs(#20121,0,#20114,1,"hasOwnProperty")
+hasLocation(#20121,#20051)
+enclosing_stmt(#20121,#20110)
+expr_containers(#20121,#20001)
+literals("hasOwnProperty","hasOwnProperty",#20121)
 #20122=*
-exprs(#20122,64,#20121,0,"obj = { x: 100 }")
-#20123=@"loc,{#10000},4,5,4,20"
-locations_default(#20123,#10000,4,5,4,20)
-hasLocation(#20122,#20123)
-enclosing_stmt(#20122,#20121)
-expr_containers(#20122,#20001)
-#20124=*
-exprs(#20124,78,#20122,0,"obj")
-hasLocation(#20124,#20057)
-enclosing_stmt(#20124,#20121)
-expr_containers(#20124,#20001)
-literals("obj","obj",#20124)
-decl(#20124,#20090)
+stmts(#20122,23,#20001,2,"let obj ...  100 };")
+hasLocation(#20122,#20009)
+stmt_containers(#20122,#20001)
+#20123=*
+exprs(#20123,64,#20122,0,"obj = { x: 100 }")
+#20124=@"loc,{#10000},4,5,4,20"
+locations_default(#20124,#10000,4,5,4,20)
+hasLocation(#20123,#20124)
+enclosing_stmt(#20123,#20122)
+expr_containers(#20123,#20001)
 #20125=*
-exprs(#20125,8,#20122,1,"{ x: 100 }")
-#20126=@"loc,{#10000},4,11,4,20"
-locations_default(#20126,#10000,4,11,4,20)
-hasLocation(#20125,#20126)
-enclosing_stmt(#20125,#20121)
+exprs(#20125,78,#20123,0,"obj")
+hasLocation(#20125,#20057)
+enclosing_stmt(#20125,#20122)
 expr_containers(#20125,#20001)
-#20127=*
-properties(#20127,#20125,0,0,"x: 100")
-#20128=@"loc,{#10000},4,13,4,18"
-locations_default(#20128,#10000,4,13,4,18)
-hasLocation(#20127,#20128)
-#20129=*
-exprs(#20129,0,#20127,0,"x")
-hasLocation(#20129,#20063)
-enclosing_stmt(#20129,#20121)
-expr_containers(#20129,#20001)
-literals("x","x",#20129)
+literals("obj","obj",#20125)
+decl(#20125,#20090)
+#20126=*
+exprs(#20126,8,#20123,1,"{ x: 100 }")
+#20127=@"loc,{#10000},4,11,4,20"
+locations_default(#20127,#10000,4,11,4,20)
+hasLocation(#20126,#20127)
+enclosing_stmt(#20126,#20122)
+expr_containers(#20126,#20001)
+#20128=*
+properties(#20128,#20126,0,0,"x: 100")
+#20129=@"loc,{#10000},4,13,4,18"
+locations_default(#20129,#10000,4,13,4,18)
+hasLocation(#20128,#20129)
 #20130=*
-exprs(#20130,3,#20127,1,"100")
-hasLocation(#20130,#20067)
-enclosing_stmt(#20130,#20121)
+exprs(#20130,0,#20128,0,"x")
+hasLocation(#20130,#20063)
+enclosing_stmt(#20130,#20122)
 expr_containers(#20130,#20001)
-literals("100","100",#20130)
+literals("x","x",#20130)
 #20131=*
-stmts(#20131,2,#20001,3,"obj::ha ... p(""x"");")
-hasLocation(#20131,#20011)
-stmt_containers(#20131,#20001)
+exprs(#20131,3,#20128,1,"100")
+hasLocation(#20131,#20067)
+enclosing_stmt(#20131,#20122)
+expr_containers(#20131,#20001)
+literals("100","100",#20131)
 #20132=*
-exprs(#20132,13,#20131,0,"obj::hasOwnProp(""x"")")
-#20133=@"loc,{#10000},5,1,5,20"
-locations_default(#20133,#10000,5,1,5,20)
-hasLocation(#20132,#20133)
-enclosing_stmt(#20132,#20131)
-expr_containers(#20132,#20001)
-#20134=*
-exprs(#20134,97,#20132,-1,"obj::hasOwnProp")
-#20135=@"loc,{#10000},5,1,5,15"
-locations_default(#20135,#10000,5,1,5,15)
-hasLocation(#20134,#20135)
-enclosing_stmt(#20134,#20131)
-expr_containers(#20134,#20001)
-#20136=*
-exprs(#20136,79,#20134,0,"obj")
-hasLocation(#20136,#20073)
-enclosing_stmt(#20136,#20131)
-expr_containers(#20136,#20001)
-literals("obj","obj",#20136)
-bind(#20136,#20090)
+stmts(#20132,2,#20001,3,"obj::ha ... p(""x"");")
+hasLocation(#20132,#20011)
+stmt_containers(#20132,#20001)
+#20133=*
+exprs(#20133,13,#20132,0,"obj::hasOwnProp(""x"")")
+#20134=@"loc,{#10000},5,1,5,20"
+locations_default(#20134,#10000,5,1,5,20)
+hasLocation(#20133,#20134)
+enclosing_stmt(#20133,#20132)
+expr_containers(#20133,#20001)
+#20135=*
+exprs(#20135,97,#20133,-1,"obj::hasOwnProp")
+#20136=@"loc,{#10000},5,1,5,15"
+locations_default(#20136,#10000,5,1,5,15)
+hasLocation(#20135,#20136)
+enclosing_stmt(#20135,#20132)
+expr_containers(#20135,#20001)
 #20137=*
-exprs(#20137,79,#20134,1,"hasOwnProp")
-hasLocation(#20137,#20077)
-enclosing_stmt(#20137,#20131)
+exprs(#20137,79,#20135,0,"obj")
+hasLocation(#20137,#20073)
+enclosing_stmt(#20137,#20132)
 expr_containers(#20137,#20001)
-literals("hasOwnProp","hasOwnProp",#20137)
-bind(#20137,#20089)
+literals("obj","obj",#20137)
+bind(#20137,#20090)
 #20138=*
-exprs(#20138,4,#20132,0,"""x""")
-hasLocation(#20138,#20081)
-enclosing_stmt(#20138,#20131)
+exprs(#20138,79,#20135,1,"hasOwnProp")
+hasLocation(#20138,#20077)
+enclosing_stmt(#20138,#20132)
 expr_containers(#20138,#20001)
-literals("x","""x""",#20138)
+literals("hasOwnProp","hasOwnProp",#20138)
+bind(#20138,#20089)
 #20139=*
-regexpterm(#20139,14,#20138,0,"x")
-#20140=@"loc,{#10000},5,18,5,18"
-locations_default(#20140,#10000,5,18,5,18)
-hasLocation(#20139,#20140)
-regexp_const_value(#20139,"x")
-#20141=*
-entry_cfg_node(#20141,#20001)
-#20142=@"loc,{#10000},1,1,1,0"
-locations_default(#20142,#10000,1,1,1,0)
-hasLocation(#20141,#20142)
-#20143=*
-exit_cfg_node(#20143,#20001)
-hasLocation(#20143,#20087)
-successor(#20131,#20136)
-successor(#20138,#20132)
-successor(#20137,#20134)
-successor(#20136,#20137)
-successor(#20134,#20138)
-successor(#20132,#20143)
-successor(#20121,#20124)
-successor(#20125,#20129)
-successor(#20130,#20127)
-successor(#20129,#20130)
-successor(#20127,#20122)
-successor(#20124,#20125)
-successor(#20122,#20131)
-successor(#20109,#20112)
-successor(#20120,#20113)
-successor(#20119,#20115)
-successor(#20117,#20119)
-successor(#20115,#20120)
-successor(#20113,#20110)
-successor(#20112,#20117)
-successor(#20110,#20121)
-successor(#20091,#20098)
-successor(#20108,#20104)
-successor(#20106,#20108)
-successor(#20104,#20102)
-successor(#20102,#20092)
-successor(#20101,#20094)
-successor(#20100,#20096)
-successor(#20098,#20100)
-successor(#20096,#20101)
-successor(#20094,#20106)
-successor(#20092,#20109)
-successor(#20141,#20091)
+exprs(#20139,4,#20133,0,"""x""")
+hasLocation(#20139,#20081)
+enclosing_stmt(#20139,#20132)
+expr_containers(#20139,#20001)
+literals("x","""x""",#20139)
+#20140=*
+regexpterm(#20140,14,#20139,0,"x")
+#20141=@"loc,{#10000},5,18,5,18"
+locations_default(#20141,#10000,5,18,5,18)
+hasLocation(#20140,#20141)
+regexp_const_value(#20140,"x")
+#20142=*
+entry_cfg_node(#20142,#20001)
+#20143=@"loc,{#10000},1,1,1,0"
+locations_default(#20143,#10000,1,1,1,0)
+hasLocation(#20142,#20143)
+#20144=*
+exit_cfg_node(#20144,#20001)
+hasLocation(#20144,#20087)
+successor(#20132,#20137)
+successor(#20139,#20133)
+successor(#20138,#20135)
+successor(#20137,#20138)
+successor(#20135,#20139)
+successor(#20133,#20144)
+successor(#20122,#20125)
+successor(#20126,#20130)
+successor(#20131,#20128)
+successor(#20130,#20131)
+successor(#20128,#20123)
+successor(#20125,#20126)
+successor(#20123,#20132)
+successor(#20110,#20113)
+successor(#20121,#20114)
+successor(#20120,#20116)
+successor(#20118,#20120)
+successor(#20116,#20121)
+successor(#20114,#20111)
+successor(#20113,#20118)
+successor(#20111,#20122)
+successor(#20092,#20099)
+successor(#20109,#20105)
+successor(#20107,#20109)
+successor(#20105,#20103)
+successor(#20103,#20093)
+successor(#20102,#20095)
+successor(#20101,#20097)
+successor(#20099,#20101)
+successor(#20097,#20102)
+successor(#20095,#20107)
+successor(#20093,#20110)
+successor(#20142,#20092)
 numlines(#10000,5,4,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/generatedcode/output/trap/attributes.html.trap b/javascript/extractor/tests/generatedcode/output/trap/attributes.html.trap
index 69857f54fde..78bc57a4340 100644
--- a/javascript/extractor/tests/generatedcode/output/trap/attributes.html.trap
+++ b/javascript/extractor/tests/generatedcode/output/trap/attributes.html.trap
@@ -37,374 +37,380 @@ scopes(#20010,3)
 scopenodes(#20004,#20010)
 scopenesting(#20010,#20000)
 is_module(#20004)
-#20011=*
-stmts(#20011,2,#20004,0,"foo")
-hasLocation(#20011,#20006)
-stmt_containers(#20011,#20004)
+#20011=@"var;{this};{#20010}"
+variables(#20011,"this",#20010)
 #20012=*
-exprs(#20012,79,#20011,0,"foo")
+stmts(#20012,2,#20004,0,"foo")
 hasLocation(#20012,#20006)
-enclosing_stmt(#20012,#20011)
-expr_containers(#20012,#20004)
-literals("foo","foo",#20012)
-#20013=@"var;{foo};{#20010}"
-variables(#20013,"foo",#20010)
-bind(#20012,#20013)
-#20014=*
-entry_cfg_node(#20014,#20004)
-#20015=@"loc,{#10000},4,16,4,15"
-locations_default(#20015,#10000,4,16,4,15)
-hasLocation(#20014,#20015)
-#20016=*
-exit_cfg_node(#20016,#20004)
-hasLocation(#20016,#20009)
-successor(#20011,#20012)
-successor(#20012,#20016)
-successor(#20014,#20011)
-toplevel_parent_xml_node(#20004,#20001)
+stmt_containers(#20012,#20004)
+#20013=*
+exprs(#20013,79,#20012,0,"foo")
+hasLocation(#20013,#20006)
+enclosing_stmt(#20013,#20012)
+expr_containers(#20013,#20004)
+literals("foo","foo",#20013)
+#20014=@"var;{foo};{#20010}"
+variables(#20014,"foo",#20010)
+bind(#20013,#20014)
+#20015=*
+entry_cfg_node(#20015,#20004)
+#20016=@"loc,{#10000},4,16,4,15"
+locations_default(#20016,#10000,4,16,4,15)
+hasLocation(#20015,#20016)
 #20017=*
+exit_cfg_node(#20017,#20004)
+hasLocation(#20017,#20009)
+successor(#20012,#20013)
+successor(#20013,#20017)
+successor(#20015,#20012)
+toplevel_parent_xml_node(#20004,#20001)
 #20018=*
-template_placeholder_tag_info(#20017,#20018,"{{{foo}}}")
-#20019=@"loc,{#10000},5,14,5,22"
-locations_default(#20019,#10000,5,14,5,22)
-hasLocation(#20017,#20019)
+#20019=*
+template_placeholder_tag_info(#20018,#20019,"{{{foo}}}")
+#20020=@"loc,{#10000},5,14,5,22"
+locations_default(#20020,#10000,5,14,5,22)
+hasLocation(#20018,#20020)
 scopes(#20000,0)
-#20020=@"script;{#10000},5,17"
-#20021=*
-lines(#20021,#20020,"foo","")
-#20022=@"loc,{#10000},5,17,5,19"
-locations_default(#20022,#10000,5,17,5,19)
-hasLocation(#20021,#20022)
-numlines(#20020,1,1,0)
-#20023=*
-tokeninfo(#20023,6,#20020,0,"foo")
-hasLocation(#20023,#20022)
+#20021=@"script;{#10000},5,17"
+#20022=*
+lines(#20022,#20021,"foo","")
+#20023=@"loc,{#10000},5,17,5,19"
+locations_default(#20023,#10000,5,17,5,19)
+hasLocation(#20022,#20023)
+numlines(#20021,1,1,0)
 #20024=*
-tokeninfo(#20024,0,#20020,1,"")
-#20025=@"loc,{#10000},5,20,5,19"
-locations_default(#20025,#10000,5,20,5,19)
-hasLocation(#20024,#20025)
-toplevels(#20020,4)
-hasLocation(#20020,#20022)
-#20026=@"module;{#10000},5,17"
-scopes(#20026,3)
-scopenodes(#20020,#20026)
-scopenesting(#20026,#20000)
-is_module(#20020)
-#20027=*
-stmts(#20027,2,#20020,0,"foo")
-hasLocation(#20027,#20022)
-stmt_containers(#20027,#20020)
-#20028=*
-exprs(#20028,79,#20027,0,"foo")
-hasLocation(#20028,#20022)
-enclosing_stmt(#20028,#20027)
-expr_containers(#20028,#20020)
-literals("foo","foo",#20028)
-#20029=@"var;{foo};{#20026}"
-variables(#20029,"foo",#20026)
-bind(#20028,#20029)
+tokeninfo(#20024,6,#20021,0,"foo")
+hasLocation(#20024,#20023)
+#20025=*
+tokeninfo(#20025,0,#20021,1,"")
+#20026=@"loc,{#10000},5,20,5,19"
+locations_default(#20026,#10000,5,20,5,19)
+hasLocation(#20025,#20026)
+toplevels(#20021,4)
+hasLocation(#20021,#20023)
+#20027=@"module;{#10000},5,17"
+scopes(#20027,3)
+scopenodes(#20021,#20027)
+scopenesting(#20027,#20000)
+is_module(#20021)
+#20028=@"var;{this};{#20027}"
+variables(#20028,"this",#20027)
+#20029=*
+stmts(#20029,2,#20021,0,"foo")
+hasLocation(#20029,#20023)
+stmt_containers(#20029,#20021)
 #20030=*
-entry_cfg_node(#20030,#20020)
-#20031=@"loc,{#10000},5,17,5,16"
-locations_default(#20031,#10000,5,17,5,16)
-hasLocation(#20030,#20031)
+exprs(#20030,79,#20029,0,"foo")
+hasLocation(#20030,#20023)
+enclosing_stmt(#20030,#20029)
+expr_containers(#20030,#20021)
+literals("foo","foo",#20030)
+#20031=@"var;{foo};{#20027}"
+variables(#20031,"foo",#20027)
+bind(#20030,#20031)
 #20032=*
-exit_cfg_node(#20032,#20020)
-hasLocation(#20032,#20025)
-successor(#20027,#20028)
-successor(#20028,#20032)
-successor(#20030,#20027)
-toplevel_parent_xml_node(#20020,#20017)
-#20033=*
-template_placeholder_tag_info(#20033,#20018,"{{/foo}}")
-#20034=@"loc,{#10000},5,23,5,30"
-locations_default(#20034,#10000,5,23,5,30)
-hasLocation(#20033,#20034)
-scopes(#20000,0)
-#20035=@"script;{#10000},5,25"
-toplevels(#20035,4)
-#20036=@"loc,{#10000},5,25,5,25"
-locations_default(#20036,#10000,5,25,5,25)
+entry_cfg_node(#20032,#20021)
+#20033=@"loc,{#10000},5,17,5,16"
+locations_default(#20033,#10000,5,17,5,16)
+hasLocation(#20032,#20033)
+#20034=*
+exit_cfg_node(#20034,#20021)
+hasLocation(#20034,#20026)
+successor(#20029,#20030)
+successor(#20030,#20034)
+successor(#20032,#20029)
+toplevel_parent_xml_node(#20021,#20018)
+#20035=*
+template_placeholder_tag_info(#20035,#20019,"{{/foo}}")
+#20036=@"loc,{#10000},5,23,5,30"
+locations_default(#20036,#10000,5,23,5,30)
 hasLocation(#20035,#20036)
-#20037=*
-js_parse_errors(#20037,#20035,"Error: Unterminated regular expression","/foo")
-#20038=@"loc,{#10000},5,26,5,26"
-locations_default(#20038,#10000,5,26,5,26)
+scopes(#20000,0)
+#20037=@"script;{#10000},5,25"
+toplevels(#20037,4)
+#20038=@"loc,{#10000},5,25,5,25"
+locations_default(#20038,#10000,5,25,5,25)
 hasLocation(#20037,#20038)
 #20039=*
-lines(#20039,#20035,"/foo","")
-#20040=@"loc,{#10000},5,25,5,28"
-locations_default(#20040,#10000,5,25,5,28)
+js_parse_errors(#20039,#20037,"Error: Unterminated regular expression","/foo")
+#20040=@"loc,{#10000},5,26,5,26"
+locations_default(#20040,#10000,5,26,5,26)
 hasLocation(#20039,#20040)
-numlines(#20035,1,0,0)
-toplevel_parent_xml_node(#20035,#20033)
 #20041=*
-#20042=*
-template_placeholder_tag_info(#20041,#20042,"{{#foo}}")
-#20043=@"loc,{#10000},6,14,6,21"
-locations_default(#20043,#10000,6,14,6,21)
-hasLocation(#20041,#20043)
+lines(#20041,#20037,"/foo","")
+#20042=@"loc,{#10000},5,25,5,28"
+locations_default(#20042,#10000,5,25,5,28)
+hasLocation(#20041,#20042)
+numlines(#20037,1,0,0)
+toplevel_parent_xml_node(#20037,#20035)
+#20043=*
+#20044=*
+template_placeholder_tag_info(#20043,#20044,"{{#foo}}")
+#20045=@"loc,{#10000},6,14,6,21"
+locations_default(#20045,#10000,6,14,6,21)
+hasLocation(#20043,#20045)
 scopes(#20000,0)
-#20044=@"script;{#10000},6,16"
-toplevels(#20044,4)
-#20045=@"loc,{#10000},6,16,6,16"
-locations_default(#20045,#10000,6,16,6,16)
-hasLocation(#20044,#20045)
-#20046=*
-js_parse_errors(#20046,#20044,"Error: Cannot use private fields outside a class","#foo")
-#20047=@"loc,{#10000},6,20,6,20"
-locations_default(#20047,#10000,6,20,6,20)
+#20046=@"script;{#10000},6,16"
+toplevels(#20046,4)
+#20047=@"loc,{#10000},6,16,6,16"
+locations_default(#20047,#10000,6,16,6,16)
 hasLocation(#20046,#20047)
 #20048=*
-lines(#20048,#20044,"#foo","")
-#20049=@"loc,{#10000},6,16,6,19"
-locations_default(#20049,#10000,6,16,6,19)
+js_parse_errors(#20048,#20046,"Error: Cannot use private fields outside a class","#foo")
+#20049=@"loc,{#10000},6,20,6,20"
+locations_default(#20049,#10000,6,20,6,20)
 hasLocation(#20048,#20049)
-numlines(#20044,1,0,0)
 #20050=*
-js_parse_errors(#20050,#20044,"Error: Unexpected token","#foo")
-hasLocation(#20050,#20045)
-#20051=*
-lines(#20051,#20044,"#foo","")
-hasLocation(#20051,#20049)
-numlines(#20044,1,0,0)
-toplevel_parent_xml_node(#20044,#20041)
+lines(#20050,#20046,"#foo","")
+#20051=@"loc,{#10000},6,16,6,19"
+locations_default(#20051,#10000,6,16,6,19)
+hasLocation(#20050,#20051)
+numlines(#20046,1,0,0)
 #20052=*
-template_placeholder_tag_info(#20052,#20042,"{{/foo}}")
-#20053=@"loc,{#10000},6,22,6,29"
-locations_default(#20053,#10000,6,22,6,29)
-hasLocation(#20052,#20053)
-scopes(#20000,0)
-#20054=@"script;{#10000},6,24"
-toplevels(#20054,4)
-#20055=@"loc,{#10000},6,24,6,24"
-locations_default(#20055,#10000,6,24,6,24)
+js_parse_errors(#20052,#20046,"Error: Unexpected token","#foo")
+hasLocation(#20052,#20047)
+#20053=*
+lines(#20053,#20046,"#foo","")
+hasLocation(#20053,#20051)
+numlines(#20046,1,0,0)
+toplevel_parent_xml_node(#20046,#20043)
+#20054=*
+template_placeholder_tag_info(#20054,#20044,"{{/foo}}")
+#20055=@"loc,{#10000},6,22,6,29"
+locations_default(#20055,#10000,6,22,6,29)
 hasLocation(#20054,#20055)
-#20056=*
-js_parse_errors(#20056,#20054,"Error: Unterminated regular expression","/foo")
-#20057=@"loc,{#10000},6,25,6,25"
-locations_default(#20057,#10000,6,25,6,25)
+scopes(#20000,0)
+#20056=@"script;{#10000},6,24"
+toplevels(#20056,4)
+#20057=@"loc,{#10000},6,24,6,24"
+locations_default(#20057,#10000,6,24,6,24)
 hasLocation(#20056,#20057)
 #20058=*
-lines(#20058,#20054,"/foo","")
-#20059=@"loc,{#10000},6,24,6,27"
-locations_default(#20059,#10000,6,24,6,27)
+js_parse_errors(#20058,#20056,"Error: Unterminated regular expression","/foo")
+#20059=@"loc,{#10000},6,25,6,25"
+locations_default(#20059,#10000,6,25,6,25)
 hasLocation(#20058,#20059)
-numlines(#20054,1,0,0)
-toplevel_parent_xml_node(#20054,#20052)
 #20060=*
-#20061=*
-template_placeholder_tag_info(#20060,#20061,"{{#foo}}")
-#20062=@"loc,{#10000},8,18,8,25"
-locations_default(#20062,#10000,8,18,8,25)
-hasLocation(#20060,#20062)
+lines(#20060,#20056,"/foo","")
+#20061=@"loc,{#10000},6,24,6,27"
+locations_default(#20061,#10000,6,24,6,27)
+hasLocation(#20060,#20061)
+numlines(#20056,1,0,0)
+toplevel_parent_xml_node(#20056,#20054)
+#20062=*
+#20063=*
+template_placeholder_tag_info(#20062,#20063,"{{#foo}}")
+#20064=@"loc,{#10000},8,18,8,25"
+locations_default(#20064,#10000,8,18,8,25)
+hasLocation(#20062,#20064)
 scopes(#20000,0)
-#20063=@"script;{#10000},8,20"
-toplevels(#20063,4)
-#20064=@"loc,{#10000},8,20,8,20"
-locations_default(#20064,#10000,8,20,8,20)
-hasLocation(#20063,#20064)
-#20065=*
-js_parse_errors(#20065,#20063,"Error: Cannot use private fields outside a class","#foo")
-#20066=@"loc,{#10000},8,24,8,24"
-locations_default(#20066,#10000,8,24,8,24)
+#20065=@"script;{#10000},8,20"
+toplevels(#20065,4)
+#20066=@"loc,{#10000},8,20,8,20"
+locations_default(#20066,#10000,8,20,8,20)
 hasLocation(#20065,#20066)
 #20067=*
-lines(#20067,#20063,"#foo","")
-#20068=@"loc,{#10000},8,20,8,23"
-locations_default(#20068,#10000,8,20,8,23)
+js_parse_errors(#20067,#20065,"Error: Cannot use private fields outside a class","#foo")
+#20068=@"loc,{#10000},8,24,8,24"
+locations_default(#20068,#10000,8,24,8,24)
 hasLocation(#20067,#20068)
-numlines(#20063,1,0,0)
 #20069=*
-js_parse_errors(#20069,#20063,"Error: Unexpected token","#foo")
-hasLocation(#20069,#20064)
-#20070=*
-lines(#20070,#20063,"#foo","")
-hasLocation(#20070,#20068)
-numlines(#20063,1,0,0)
-toplevel_parent_xml_node(#20063,#20060)
+lines(#20069,#20065,"#foo","")
+#20070=@"loc,{#10000},8,20,8,23"
+locations_default(#20070,#10000,8,20,8,23)
+hasLocation(#20069,#20070)
+numlines(#20065,1,0,0)
 #20071=*
-template_placeholder_tag_info(#20071,#20061,"{{baz}}")
-#20072=@"loc,{#10000},8,30,8,36"
-locations_default(#20072,#10000,8,30,8,36)
-hasLocation(#20071,#20072)
+js_parse_errors(#20071,#20065,"Error: Unexpected token","#foo")
+hasLocation(#20071,#20066)
+#20072=*
+lines(#20072,#20065,"#foo","")
+hasLocation(#20072,#20070)
+numlines(#20065,1,0,0)
+toplevel_parent_xml_node(#20065,#20062)
+#20073=*
+template_placeholder_tag_info(#20073,#20063,"{{baz}}")
+#20074=@"loc,{#10000},8,30,8,36"
+locations_default(#20074,#10000,8,30,8,36)
+hasLocation(#20073,#20074)
 scopes(#20000,0)
-#20073=@"script;{#10000},8,32"
-#20074=*
-lines(#20074,#20073,"baz","")
-#20075=@"loc,{#10000},8,32,8,34"
-locations_default(#20075,#10000,8,32,8,34)
-hasLocation(#20074,#20075)
-numlines(#20073,1,1,0)
+#20075=@"script;{#10000},8,32"
 #20076=*
-tokeninfo(#20076,6,#20073,0,"baz")
-hasLocation(#20076,#20075)
-#20077=*
-tokeninfo(#20077,0,#20073,1,"")
-#20078=@"loc,{#10000},8,35,8,34"
-locations_default(#20078,#10000,8,35,8,34)
-hasLocation(#20077,#20078)
-toplevels(#20073,4)
-hasLocation(#20073,#20075)
-#20079=@"module;{#10000},8,32"
-scopes(#20079,3)
-scopenodes(#20073,#20079)
-scopenesting(#20079,#20000)
-is_module(#20073)
-#20080=*
-stmts(#20080,2,#20073,0,"baz")
-hasLocation(#20080,#20075)
-stmt_containers(#20080,#20073)
-#20081=*
-exprs(#20081,79,#20080,0,"baz")
-hasLocation(#20081,#20075)
-enclosing_stmt(#20081,#20080)
-expr_containers(#20081,#20073)
-literals("baz","baz",#20081)
-#20082=@"var;{baz};{#20079}"
-variables(#20082,"baz",#20079)
-bind(#20081,#20082)
+lines(#20076,#20075,"baz","")
+#20077=@"loc,{#10000},8,32,8,34"
+locations_default(#20077,#10000,8,32,8,34)
+hasLocation(#20076,#20077)
+numlines(#20075,1,1,0)
+#20078=*
+tokeninfo(#20078,6,#20075,0,"baz")
+hasLocation(#20078,#20077)
+#20079=*
+tokeninfo(#20079,0,#20075,1,"")
+#20080=@"loc,{#10000},8,35,8,34"
+locations_default(#20080,#10000,8,35,8,34)
+hasLocation(#20079,#20080)
+toplevels(#20075,4)
+hasLocation(#20075,#20077)
+#20081=@"module;{#10000},8,32"
+scopes(#20081,3)
+scopenodes(#20075,#20081)
+scopenesting(#20081,#20000)
+is_module(#20075)
+#20082=@"var;{this};{#20081}"
+variables(#20082,"this",#20081)
 #20083=*
-entry_cfg_node(#20083,#20073)
-#20084=@"loc,{#10000},8,32,8,31"
-locations_default(#20084,#10000,8,32,8,31)
-hasLocation(#20083,#20084)
-#20085=*
-exit_cfg_node(#20085,#20073)
-hasLocation(#20085,#20078)
-successor(#20080,#20081)
-successor(#20081,#20085)
-successor(#20083,#20080)
-toplevel_parent_xml_node(#20073,#20071)
+stmts(#20083,2,#20075,0,"baz")
+hasLocation(#20083,#20077)
+stmt_containers(#20083,#20075)
+#20084=*
+exprs(#20084,79,#20083,0,"baz")
+hasLocation(#20084,#20077)
+enclosing_stmt(#20084,#20083)
+expr_containers(#20084,#20075)
+literals("baz","baz",#20084)
+#20085=@"var;{baz};{#20081}"
+variables(#20085,"baz",#20081)
+bind(#20084,#20085)
 #20086=*
-template_placeholder_tag_info(#20086,#20061,"{{/foo}}")
-#20087=@"loc,{#10000},8,37,8,44"
-locations_default(#20087,#10000,8,37,8,44)
+entry_cfg_node(#20086,#20075)
+#20087=@"loc,{#10000},8,32,8,31"
+locations_default(#20087,#10000,8,32,8,31)
 hasLocation(#20086,#20087)
+#20088=*
+exit_cfg_node(#20088,#20075)
+hasLocation(#20088,#20080)
+successor(#20083,#20084)
+successor(#20084,#20088)
+successor(#20086,#20083)
+toplevel_parent_xml_node(#20075,#20073)
+#20089=*
+template_placeholder_tag_info(#20089,#20063,"{{/foo}}")
+#20090=@"loc,{#10000},8,37,8,44"
+locations_default(#20090,#10000,8,37,8,44)
+hasLocation(#20089,#20090)
 scopes(#20000,0)
-#20088=@"script;{#10000},8,39"
-toplevels(#20088,4)
-#20089=@"loc,{#10000},8,39,8,39"
-locations_default(#20089,#10000,8,39,8,39)
-hasLocation(#20088,#20089)
-#20090=*
-js_parse_errors(#20090,#20088,"Error: Unterminated regular expression","/foo")
-#20091=@"loc,{#10000},8,40,8,40"
-locations_default(#20091,#10000,8,40,8,40)
-hasLocation(#20090,#20091)
-#20092=*
-lines(#20092,#20088,"/foo","")
-#20093=@"loc,{#10000},8,39,8,42"
-locations_default(#20093,#10000,8,39,8,42)
-hasLocation(#20092,#20093)
-numlines(#20088,1,0,0)
-toplevel_parent_xml_node(#20088,#20086)
-#20094=*
-xmlChars(#20094,"
+#20091=@"script;{#10000},8,39"
+toplevels(#20091,4)
+#20092=@"loc,{#10000},8,39,8,39"
+locations_default(#20092,#10000,8,39,8,39)
+hasLocation(#20091,#20092)
+#20093=*
+js_parse_errors(#20093,#20091,"Error: Unterminated regular expression","/foo")
+#20094=@"loc,{#10000},8,40,8,40"
+locations_default(#20094,#10000,8,40,8,40)
+hasLocation(#20093,#20094)
+#20095=*
+lines(#20095,#20091,"/foo","")
+#20096=@"loc,{#10000},8,39,8,42"
+locations_default(#20096,#10000,8,39,8,42)
+hasLocation(#20095,#20096)
+numlines(#20091,1,0,0)
+toplevel_parent_xml_node(#20091,#20089)
+#20097=*
+xmlChars(#20097,"
 ",#10000,0,0,#10000)
-#20095=@"loc,{#10000},1,16,1,16"
-locations_default(#20095,#10000,1,16,1,16)
-xmllocations(#20094,#20095)
-#20096=*
-xmlChars(#20096,"
+#20098=@"loc,{#10000},1,16,1,16"
+locations_default(#20098,#10000,1,16,1,16)
+xmllocations(#20097,#20098)
+#20099=*
+xmlChars(#20099,"
 ",#10000,2,0,#10000)
-#20097=@"loc,{#10000},10,8,10,8"
-locations_default(#20097,#10000,10,8,10,8)
-xmllocations(#20096,#20097)
-#20098=*
-xmlElements(#20098,"html",#10000,1,#10000)
-#20099=@"loc,{#10000},2,1,10,7"
-locations_default(#20099,#10000,2,1,10,7)
-xmllocations(#20098,#20099)
-#20100=*
-xmlChars(#20100,"
-  ",#20098,0,0,#10000)
-#20101=@"loc,{#10000},2,7,3,2"
-locations_default(#20101,#10000,2,7,3,2)
-xmllocations(#20100,#20101)
-#20102=*
-xmlChars(#20102,"
-",#20098,2,0,#10000)
-#20103=@"loc,{#10000},9,10,9,10"
-locations_default(#20103,#10000,9,10,9,10)
-xmllocations(#20102,#20103)
-#20104=*
-xmlElements(#20104,"body",#20098,1,#10000)
-#20105=@"loc,{#10000},3,3,9,9"
-locations_default(#20105,#10000,3,3,9,9)
-xmllocations(#20104,#20105)
-#20106=*
-xmlChars(#20106,"
-    ",#20104,0,0,#10000)
-#20107=@"loc,{#10000},3,9,4,4"
-locations_default(#20107,#10000,3,9,4,4)
-xmllocations(#20106,#20107)
-#20108=*
-xmlChars(#20108,"
-    ",#20104,2,0,#10000)
-#20109=@"loc,{#10000},4,28,5,4"
-locations_default(#20109,#10000,4,28,5,4)
-xmllocations(#20108,#20109)
-#20110=*
-xmlChars(#20110,"
-    ",#20104,4,0,#10000)
-#20111=@"loc,{#10000},5,33,6,4"
-locations_default(#20111,#10000,5,33,6,4)
-xmllocations(#20110,#20111)
-#20112=*
-xmlChars(#20112,"
-    ",#20104,6,0,#10000)
-#20113=@"loc,{#10000},6,32,7,4"
-locations_default(#20113,#10000,6,32,7,4)
-xmllocations(#20112,#20113)
-#20114=*
-xmlChars(#20114,"
-    ",#20104,8,0,#10000)
-#20115=@"loc,{#10000},7,36,8,4"
-locations_default(#20115,#10000,7,36,8,4)
-xmllocations(#20114,#20115)
-#20116=*
-xmlChars(#20116,"
-  ",#20104,10,0,#10000)
-#20117=@"loc,{#10000},8,47,9,2"
-locations_default(#20117,#10000,8,47,9,2)
-xmllocations(#20116,#20117)
-xmlElements(#20061,"div",#20104,9,#10000)
-#20118=@"loc,{#10000},8,5,8,46"
-locations_default(#20118,#10000,8,5,8,46)
-xmllocations(#20061,#20118)
+#20100=@"loc,{#10000},10,8,10,8"
+locations_default(#20100,#10000,10,8,10,8)
+xmllocations(#20099,#20100)
+#20101=*
+xmlElements(#20101,"html",#10000,1,#10000)
+#20102=@"loc,{#10000},2,1,10,7"
+locations_default(#20102,#10000,2,1,10,7)
+xmllocations(#20101,#20102)
+#20103=*
+xmlChars(#20103,"
+  ",#20101,0,0,#10000)
+#20104=@"loc,{#10000},2,7,3,2"
+locations_default(#20104,#10000,2,7,3,2)
+xmllocations(#20103,#20104)
+#20105=*
+xmlChars(#20105,"
+",#20101,2,0,#10000)
+#20106=@"loc,{#10000},9,10,9,10"
+locations_default(#20106,#10000,9,10,9,10)
+xmllocations(#20105,#20106)
+#20107=*
+xmlElements(#20107,"body",#20101,1,#10000)
+#20108=@"loc,{#10000},3,3,9,9"
+locations_default(#20108,#10000,3,3,9,9)
+xmllocations(#20107,#20108)
+#20109=*
+xmlChars(#20109,"
+    ",#20107,0,0,#10000)
+#20110=@"loc,{#10000},3,9,4,4"
+locations_default(#20110,#10000,3,9,4,4)
+xmllocations(#20109,#20110)
+#20111=*
+xmlChars(#20111,"
+    ",#20107,2,0,#10000)
+#20112=@"loc,{#10000},4,28,5,4"
+locations_default(#20112,#10000,4,28,5,4)
+xmllocations(#20111,#20112)
+#20113=*
+xmlChars(#20113,"
+    ",#20107,4,0,#10000)
+#20114=@"loc,{#10000},5,33,6,4"
+locations_default(#20114,#10000,5,33,6,4)
+xmllocations(#20113,#20114)
+#20115=*
+xmlChars(#20115,"
+    ",#20107,6,0,#10000)
+#20116=@"loc,{#10000},6,32,7,4"
+locations_default(#20116,#10000,6,32,7,4)
+xmllocations(#20115,#20116)
+#20117=*
+xmlChars(#20117,"
+    ",#20107,8,0,#10000)
+#20118=@"loc,{#10000},7,36,8,4"
+locations_default(#20118,#10000,7,36,8,4)
+xmllocations(#20117,#20118)
 #20119=*
-xmlElements(#20119,"div",#20104,7,#10000)
-#20120=@"loc,{#10000},7,5,7,35"
-locations_default(#20120,#10000,7,5,7,35)
+xmlChars(#20119,"
+  ",#20107,10,0,#10000)
+#20120=@"loc,{#10000},8,47,9,2"
+locations_default(#20120,#10000,8,47,9,2)
 xmllocations(#20119,#20120)
-#20121=*
-xmlElements(#20121,"div",#20104,5,#10000)
-#20122=@"loc,{#10000},6,5,6,31"
-locations_default(#20122,#10000,6,5,6,31)
-xmllocations(#20121,#20122)
-xmlAttrs(#20042,#20121,"foo","{{#foo}}{{/foo}}/",0,#10000)
-#20123=@"loc,{#10000},6,10,6,30"
-locations_default(#20123,#10000,6,10,6,30)
-xmllocations(#20042,#20123)
+xmlElements(#20063,"div",#20107,9,#10000)
+#20121=@"loc,{#10000},8,5,8,46"
+locations_default(#20121,#10000,8,5,8,46)
+xmllocations(#20063,#20121)
+#20122=*
+xmlElements(#20122,"div",#20107,7,#10000)
+#20123=@"loc,{#10000},7,5,7,35"
+locations_default(#20123,#10000,7,5,7,35)
+xmllocations(#20122,#20123)
 #20124=*
-xmlElements(#20124,"div",#20104,3,#10000)
-#20125=@"loc,{#10000},5,5,5,32"
-locations_default(#20125,#10000,5,5,5,32)
+xmlElements(#20124,"div",#20107,5,#10000)
+#20125=@"loc,{#10000},6,5,6,31"
+locations_default(#20125,#10000,6,5,6,31)
 xmllocations(#20124,#20125)
-xmlAttrs(#20018,#20124,"foo","{{{foo}}}{{/foo}}/",0,#10000)
-#20126=@"loc,{#10000},5,10,5,31"
-locations_default(#20126,#10000,5,10,5,31)
-xmllocations(#20018,#20126)
+xmlAttrs(#20044,#20124,"foo","{{#foo}}{{/foo}}/",0,#10000)
+#20126=@"loc,{#10000},6,10,6,30"
+locations_default(#20126,#10000,6,10,6,30)
+xmllocations(#20044,#20126)
 #20127=*
-xmlElements(#20127,"div",#20104,1,#10000)
-#20128=@"loc,{#10000},4,5,4,27"
-locations_default(#20128,#10000,4,5,4,27)
+xmlElements(#20127,"div",#20107,3,#10000)
+#20128=@"loc,{#10000},5,5,5,32"
+locations_default(#20128,#10000,5,5,5,32)
 xmllocations(#20127,#20128)
-xmlAttrs(#20002,#20127,"foo","{{foo}}",0,#10000)
-#20129=@"loc,{#10000},4,10,4,20"
-locations_default(#20129,#10000,4,10,4,20)
-xmllocations(#20002,#20129)
+xmlAttrs(#20019,#20127,"foo","{{{foo}}}{{/foo}}/",0,#10000)
+#20129=@"loc,{#10000},5,10,5,31"
+locations_default(#20129,#10000,5,10,5,31)
+xmllocations(#20019,#20129)
+#20130=*
+xmlElements(#20130,"div",#20107,1,#10000)
+#20131=@"loc,{#10000},4,5,4,27"
+locations_default(#20131,#10000,4,5,4,27)
+xmllocations(#20130,#20131)
+xmlAttrs(#20002,#20130,"foo","{{foo}}",0,#10000)
+#20132=@"loc,{#10000},4,10,4,20"
+locations_default(#20132,#10000,4,10,4,20)
+xmllocations(#20002,#20132)
 numlines(#10000,10,3,0)
 filetype(#10000,"html")
diff --git a/javascript/extractor/tests/generatedcode/output/trap/ejs.js.trap b/javascript/extractor/tests/generatedcode/output/trap/ejs.js.trap
index ac5756b042e..fd11d70e258 100644
--- a/javascript/extractor/tests/generatedcode/output/trap/ejs.js.trap
+++ b/javascript/extractor/tests/generatedcode/output/trap/ejs.js.trap
@@ -218,193 +218,195 @@ variables(#20079,"data1",#20000)
 variables(#20080,"data2",#20000)
 #20081=@"var;{string};{#20000}"
 variables(#20081,"string",#20000)
-#20082=*
-stmts(#20082,23,#20001,0,"let dat ... ta1 %>;")
-hasLocation(#20082,#20005)
-stmt_containers(#20082,#20001)
+#20082=@"var;{this};{#20000}"
+variables(#20082,"this",#20000)
 #20083=*
-exprs(#20083,64,#20082,0,"data1 = ... ata1 %>")
-#20084=@"loc,{#10000},1,5,1,29"
-locations_default(#20084,#10000,1,5,1,29)
-hasLocation(#20083,#20084)
-enclosing_stmt(#20083,#20082)
-expr_containers(#20083,#20001)
-#20085=*
-exprs(#20085,78,#20083,0,"data1")
-hasLocation(#20085,#20021)
-enclosing_stmt(#20085,#20082)
-expr_containers(#20085,#20001)
-literals("data1","data1",#20085)
-decl(#20085,#20079)
+stmts(#20083,23,#20001,0,"let dat ... ta1 %>;")
+hasLocation(#20083,#20005)
+stmt_containers(#20083,#20001)
+#20084=*
+exprs(#20084,64,#20083,0,"data1 = ... ata1 %>")
+#20085=@"loc,{#10000},1,5,1,29"
+locations_default(#20085,#10000,1,5,1,29)
+hasLocation(#20084,#20085)
+enclosing_stmt(#20084,#20083)
+expr_containers(#20084,#20001)
 #20086=*
-exprs(#20086,120,#20083,1,"<%= user_data1 %>")
-#20087=@"loc,{#10000},1,13,1,29"
-locations_default(#20087,#10000,1,13,1,29)
-hasLocation(#20086,#20087)
-enclosing_stmt(#20086,#20082)
+exprs(#20086,78,#20084,0,"data1")
+hasLocation(#20086,#20021)
+enclosing_stmt(#20086,#20083)
 expr_containers(#20086,#20001)
-expr_contains_template_tag_location(#20086,#20087)
-#20088=*
-stmts(#20088,23,#20001,1,"let dat ... ta2 %>;")
-hasLocation(#20088,#20007)
-stmt_containers(#20088,#20001)
+literals("data1","data1",#20086)
+decl(#20086,#20079)
+#20087=*
+exprs(#20087,120,#20084,1,"<%= user_data1 %>")
+#20088=@"loc,{#10000},1,13,1,29"
+locations_default(#20088,#10000,1,13,1,29)
+hasLocation(#20087,#20088)
+enclosing_stmt(#20087,#20083)
+expr_containers(#20087,#20001)
+expr_contains_template_tag_location(#20087,#20088)
 #20089=*
-exprs(#20089,64,#20088,0,"data2 = ... ata2 %>")
-#20090=@"loc,{#10000},2,5,2,29"
-locations_default(#20090,#10000,2,5,2,29)
-hasLocation(#20089,#20090)
-enclosing_stmt(#20089,#20088)
-expr_containers(#20089,#20001)
-#20091=*
-exprs(#20091,78,#20089,0,"data2")
-hasLocation(#20091,#20031)
-enclosing_stmt(#20091,#20088)
-expr_containers(#20091,#20001)
-literals("data2","data2",#20091)
-decl(#20091,#20080)
+stmts(#20089,23,#20001,1,"let dat ... ta2 %>;")
+hasLocation(#20089,#20007)
+stmt_containers(#20089,#20001)
+#20090=*
+exprs(#20090,64,#20089,0,"data2 = ... ata2 %>")
+#20091=@"loc,{#10000},2,5,2,29"
+locations_default(#20091,#10000,2,5,2,29)
+hasLocation(#20090,#20091)
+enclosing_stmt(#20090,#20089)
+expr_containers(#20090,#20001)
 #20092=*
-exprs(#20092,120,#20089,1,"<%- user_data2 %>")
-#20093=@"loc,{#10000},2,13,2,29"
-locations_default(#20093,#10000,2,13,2,29)
-hasLocation(#20092,#20093)
-enclosing_stmt(#20092,#20088)
+exprs(#20092,78,#20090,0,"data2")
+hasLocation(#20092,#20031)
+enclosing_stmt(#20092,#20089)
 expr_containers(#20092,#20001)
-expr_contains_template_tag_location(#20092,#20093)
-#20094=*
-stmts(#20094,3,#20001,2,"if (<%s ... g%>) {}")
-hasLocation(#20094,#20009)
-stmt_containers(#20094,#20001)
+literals("data2","data2",#20092)
+decl(#20092,#20080)
+#20093=*
+exprs(#20093,120,#20090,1,"<%- user_data2 %>")
+#20094=@"loc,{#10000},2,13,2,29"
+locations_default(#20094,#10000,2,13,2,29)
+hasLocation(#20093,#20094)
+enclosing_stmt(#20093,#20089)
+expr_containers(#20093,#20001)
+expr_contains_template_tag_location(#20093,#20094)
 #20095=*
-exprs(#20095,120,#20094,0,"<%something%>")
-#20096=@"loc,{#10000},3,5,3,17"
-locations_default(#20096,#10000,3,5,3,17)
-hasLocation(#20095,#20096)
-enclosing_stmt(#20095,#20094)
-expr_containers(#20095,#20001)
-expr_contains_template_tag_location(#20095,#20096)
-#20097=*
-stmts(#20097,1,#20094,1,"{}")
-#20098=@"loc,{#10000},3,20,3,21"
-locations_default(#20098,#10000,3,20,3,21)
-hasLocation(#20097,#20098)
-stmt_containers(#20097,#20001)
-#20099=*
-stmts(#20099,2,#20001,3,"foo(<%b ... baz%>);")
-hasLocation(#20099,#20011)
-stmt_containers(#20099,#20001)
+stmts(#20095,3,#20001,2,"if (<%s ... g%>) {}")
+hasLocation(#20095,#20009)
+stmt_containers(#20095,#20001)
+#20096=*
+exprs(#20096,120,#20095,0,"<%something%>")
+#20097=@"loc,{#10000},3,5,3,17"
+locations_default(#20097,#10000,3,5,3,17)
+hasLocation(#20096,#20097)
+enclosing_stmt(#20096,#20095)
+expr_containers(#20096,#20001)
+expr_contains_template_tag_location(#20096,#20097)
+#20098=*
+stmts(#20098,1,#20095,1,"{}")
+#20099=@"loc,{#10000},3,20,3,21"
+locations_default(#20099,#10000,3,20,3,21)
+hasLocation(#20098,#20099)
+stmt_containers(#20098,#20001)
 #20100=*
-exprs(#20100,13,#20099,0,"foo(<%b ... %baz%>)")
-#20101=@"loc,{#10000},4,1,4,21"
-locations_default(#20101,#10000,4,1,4,21)
-hasLocation(#20100,#20101)
-enclosing_stmt(#20100,#20099)
-expr_containers(#20100,#20001)
-#20102=*
-exprs(#20102,79,#20100,-1,"foo")
-hasLocation(#20102,#20051)
-enclosing_stmt(#20102,#20099)
-expr_containers(#20102,#20001)
-literals("foo","foo",#20102)
-#20103=@"var;{foo};{#20000}"
-variables(#20103,"foo",#20000)
-bind(#20102,#20103)
-#20104=*
-exprs(#20104,120,#20100,0,"<%bar%>")
-#20105=@"loc,{#10000},4,5,4,11"
-locations_default(#20105,#10000,4,5,4,11)
-hasLocation(#20104,#20105)
-enclosing_stmt(#20104,#20099)
-expr_containers(#20104,#20001)
-expr_contains_template_tag_location(#20104,#20105)
-#20106=*
-exprs(#20106,120,#20100,1,"<%baz%>")
-#20107=@"loc,{#10000},4,14,4,20"
-locations_default(#20107,#10000,4,14,4,20)
-hasLocation(#20106,#20107)
-enclosing_stmt(#20106,#20099)
-expr_containers(#20106,#20001)
-expr_contains_template_tag_location(#20106,#20107)
-#20108=*
-stmts(#20108,2,#20001,4,"<% generated_code %>")
-hasLocation(#20108,#20015)
-stmt_containers(#20108,#20001)
+stmts(#20100,2,#20001,3,"foo(<%b ... baz%>);")
+hasLocation(#20100,#20011)
+stmt_containers(#20100,#20001)
+#20101=*
+exprs(#20101,13,#20100,0,"foo(<%b ... %baz%>)")
+#20102=@"loc,{#10000},4,1,4,21"
+locations_default(#20102,#10000,4,1,4,21)
+hasLocation(#20101,#20102)
+enclosing_stmt(#20101,#20100)
+expr_containers(#20101,#20001)
+#20103=*
+exprs(#20103,79,#20101,-1,"foo")
+hasLocation(#20103,#20051)
+enclosing_stmt(#20103,#20100)
+expr_containers(#20103,#20001)
+literals("foo","foo",#20103)
+#20104=@"var;{foo};{#20000}"
+variables(#20104,"foo",#20000)
+bind(#20103,#20104)
+#20105=*
+exprs(#20105,120,#20101,0,"<%bar%>")
+#20106=@"loc,{#10000},4,5,4,11"
+locations_default(#20106,#10000,4,5,4,11)
+hasLocation(#20105,#20106)
+enclosing_stmt(#20105,#20100)
+expr_containers(#20105,#20001)
+expr_contains_template_tag_location(#20105,#20106)
+#20107=*
+exprs(#20107,120,#20101,1,"<%baz%>")
+#20108=@"loc,{#10000},4,14,4,20"
+locations_default(#20108,#10000,4,14,4,20)
+hasLocation(#20107,#20108)
+enclosing_stmt(#20107,#20100)
+expr_containers(#20107,#20001)
+expr_contains_template_tag_location(#20107,#20108)
 #20109=*
-exprs(#20109,120,#20108,0,"<% generated_code %>")
+stmts(#20109,2,#20001,4,"<% generated_code %>")
 hasLocation(#20109,#20015)
-enclosing_stmt(#20109,#20108)
-expr_containers(#20109,#20001)
-expr_contains_template_tag_location(#20109,#20015)
+stmt_containers(#20109,#20001)
 #20110=*
-stmts(#20110,23,#20001,5,"let str ... de %>"";")
-#20111=@"loc,{#10000},7,1,7,41"
-locations_default(#20111,#10000,7,1,7,41)
-hasLocation(#20110,#20111)
-stmt_containers(#20110,#20001)
-#20112=*
-exprs(#20112,64,#20110,0,"string  ... ode %>""")
-#20113=@"loc,{#10000},7,5,7,40"
-locations_default(#20113,#10000,7,5,7,40)
-hasLocation(#20112,#20113)
-enclosing_stmt(#20112,#20110)
-expr_containers(#20112,#20001)
-#20114=*
-exprs(#20114,78,#20112,0,"string")
-hasLocation(#20114,#20069)
-enclosing_stmt(#20114,#20110)
-expr_containers(#20114,#20001)
-literals("string","string",#20114)
-decl(#20114,#20081)
+exprs(#20110,120,#20109,0,"<% generated_code %>")
+hasLocation(#20110,#20015)
+enclosing_stmt(#20110,#20109)
+expr_containers(#20110,#20001)
+expr_contains_template_tag_location(#20110,#20015)
+#20111=*
+stmts(#20111,23,#20001,5,"let str ... de %>"";")
+#20112=@"loc,{#10000},7,1,7,41"
+locations_default(#20112,#10000,7,1,7,41)
+hasLocation(#20111,#20112)
+stmt_containers(#20111,#20001)
+#20113=*
+exprs(#20113,64,#20111,0,"string  ... ode %>""")
+#20114=@"loc,{#10000},7,5,7,40"
+locations_default(#20114,#10000,7,5,7,40)
+hasLocation(#20113,#20114)
+enclosing_stmt(#20113,#20111)
+expr_containers(#20113,#20001)
 #20115=*
-exprs(#20115,4,#20112,1,"""<%= no ... ode %>""")
-hasLocation(#20115,#20073)
-enclosing_stmt(#20115,#20110)
+exprs(#20115,78,#20113,0,"string")
+hasLocation(#20115,#20069)
+enclosing_stmt(#20115,#20111)
 expr_containers(#20115,#20001)
-literals("<%= not_generated_code %>","""<%= not_generated_code %>""",#20115)
+literals("string","string",#20115)
+decl(#20115,#20081)
 #20116=*
-regexpterm(#20116,14,#20115,0,"<%= not_generated_code %>")
-#20117=@"loc,{#10000},7,15,7,39"
-locations_default(#20117,#10000,7,15,7,39)
-hasLocation(#20116,#20117)
-regexp_const_value(#20116,"<%= not_generated_code %>")
-#20118=*
-entry_cfg_node(#20118,#20001)
-#20119=@"loc,{#10000},1,1,1,0"
-locations_default(#20119,#10000,1,1,1,0)
-hasLocation(#20118,#20119)
-#20120=*
-exit_cfg_node(#20120,#20001)
-hasLocation(#20120,#20077)
-successor(#20110,#20114)
-successor(#20115,#20112)
-successor(#20114,#20115)
-successor(#20112,#20120)
-successor(#20108,#20109)
-successor(#20109,#20110)
-successor(#20099,#20102)
-successor(#20106,#20100)
-successor(#20104,#20106)
-successor(#20102,#20104)
-successor(#20100,#20108)
-successor(#20094,#20095)
+exprs(#20116,4,#20113,1,"""<%= no ... ode %>""")
+hasLocation(#20116,#20073)
+enclosing_stmt(#20116,#20111)
+expr_containers(#20116,#20001)
+literals("<%= not_generated_code %>","""<%= not_generated_code %>""",#20116)
+#20117=*
+regexpterm(#20117,14,#20116,0,"<%= not_generated_code %>")
+#20118=@"loc,{#10000},7,15,7,39"
+locations_default(#20118,#10000,7,15,7,39)
+hasLocation(#20117,#20118)
+regexp_const_value(#20117,"<%= not_generated_code %>")
+#20119=*
+entry_cfg_node(#20119,#20001)
+#20120=@"loc,{#10000},1,1,1,0"
+locations_default(#20120,#10000,1,1,1,0)
+hasLocation(#20119,#20120)
 #20121=*
-guard_node(#20121,1,#20095)
-hasLocation(#20121,#20096)
-successor(#20121,#20097)
+exit_cfg_node(#20121,#20001)
+hasLocation(#20121,#20077)
+successor(#20111,#20115)
+successor(#20116,#20113)
+successor(#20115,#20116)
+successor(#20113,#20121)
+successor(#20109,#20110)
+successor(#20110,#20111)
+successor(#20100,#20103)
+successor(#20107,#20101)
+successor(#20105,#20107)
+successor(#20103,#20105)
+successor(#20101,#20109)
+successor(#20095,#20096)
 #20122=*
-guard_node(#20122,0,#20095)
-hasLocation(#20122,#20096)
-successor(#20122,#20099)
-successor(#20095,#20121)
-successor(#20095,#20122)
-successor(#20097,#20099)
-successor(#20088,#20091)
-successor(#20092,#20089)
-successor(#20091,#20092)
-successor(#20089,#20094)
-successor(#20082,#20085)
-successor(#20086,#20083)
-successor(#20085,#20086)
-successor(#20083,#20088)
-successor(#20118,#20082)
+guard_node(#20122,1,#20096)
+hasLocation(#20122,#20097)
+successor(#20122,#20098)
+#20123=*
+guard_node(#20123,0,#20096)
+hasLocation(#20123,#20097)
+successor(#20123,#20100)
+successor(#20096,#20122)
+successor(#20096,#20123)
+successor(#20098,#20100)
+successor(#20089,#20092)
+successor(#20093,#20090)
+successor(#20092,#20093)
+successor(#20090,#20095)
+successor(#20083,#20086)
+successor(#20087,#20084)
+successor(#20086,#20087)
+successor(#20084,#20089)
+successor(#20119,#20083)
 numlines(#10000,7,6,1)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/generatedcode/output/trap/test.html.trap b/javascript/extractor/tests/generatedcode/output/trap/test.html.trap
index 2446f220c7e..5127101027d 100644
--- a/javascript/extractor/tests/generatedcode/output/trap/test.html.trap
+++ b/javascript/extractor/tests/generatedcode/output/trap/test.html.trap
@@ -133,905 +133,929 @@ variables(#20046,"data1",#20000)
 variables(#20047,"data2",#20000)
 #20048=@"var;{data3};{#20000}"
 variables(#20048,"data3",#20000)
-#20049=*
-stmts(#20049,18,#20002,0,"var dat ... a1 }}};")
-#20050=@"loc,{#10000},9,7,9,37"
-locations_default(#20050,#10000,9,7,9,37)
-hasLocation(#20049,#20050)
-stmt_containers(#20049,#20002)
-#20051=*
-exprs(#20051,64,#20049,0,"data1 = ... ta1 }}}")
-#20052=@"loc,{#10000},9,11,9,36"
-locations_default(#20052,#10000,9,11,9,36)
-hasLocation(#20051,#20052)
-enclosing_stmt(#20051,#20049)
-expr_containers(#20051,#20002)
-#20053=*
-exprs(#20053,78,#20051,0,"data1")
-hasLocation(#20053,#20016)
-enclosing_stmt(#20053,#20049)
-expr_containers(#20053,#20002)
-literals("data1","data1",#20053)
-decl(#20053,#20046)
+#20049=@"var;{this};{#20000}"
+variables(#20049,"this",#20000)
+#20050=*
+stmts(#20050,18,#20002,0,"var dat ... a1 }}};")
+#20051=@"loc,{#10000},9,7,9,37"
+locations_default(#20051,#10000,9,7,9,37)
+hasLocation(#20050,#20051)
+stmt_containers(#20050,#20002)
+#20052=*
+exprs(#20052,64,#20050,0,"data1 = ... ta1 }}}")
+#20053=@"loc,{#10000},9,11,9,36"
+locations_default(#20053,#10000,9,11,9,36)
+hasLocation(#20052,#20053)
+enclosing_stmt(#20052,#20050)
+expr_containers(#20052,#20002)
 #20054=*
-exprs(#20054,120,#20051,1,"{{{ user_data1 }}}")
-#20055=@"loc,{#10000},9,19,9,36"
-locations_default(#20055,#10000,9,19,9,36)
-hasLocation(#20054,#20055)
-enclosing_stmt(#20054,#20049)
+exprs(#20054,78,#20052,0,"data1")
+hasLocation(#20054,#20016)
+enclosing_stmt(#20054,#20050)
 expr_containers(#20054,#20002)
-expr_contains_template_tag_location(#20054,#20055)
-#20056=*
-stmts(#20056,18,#20002,1,"var dat ... afe }};")
-#20057=@"loc,{#10000},10,7,10,49"
-locations_default(#20057,#10000,10,7,10,49)
-hasLocation(#20056,#20057)
-stmt_containers(#20056,#20002)
-#20058=*
-exprs(#20058,64,#20056,0,"data2 = ... safe }}")
-#20059=@"loc,{#10000},10,11,10,48"
-locations_default(#20059,#10000,10,11,10,48)
-hasLocation(#20058,#20059)
-enclosing_stmt(#20058,#20056)
-expr_containers(#20058,#20002)
-#20060=*
-exprs(#20060,78,#20058,0,"data2")
-hasLocation(#20060,#20026)
-enclosing_stmt(#20060,#20056)
-expr_containers(#20060,#20002)
-literals("data2","data2",#20060)
-decl(#20060,#20047)
+literals("data1","data1",#20054)
+decl(#20054,#20046)
+#20055=*
+exprs(#20055,120,#20052,1,"{{{ user_data1 }}}")
+#20056=@"loc,{#10000},9,19,9,36"
+locations_default(#20056,#10000,9,19,9,36)
+hasLocation(#20055,#20056)
+enclosing_stmt(#20055,#20050)
+expr_containers(#20055,#20002)
+expr_contains_template_tag_location(#20055,#20056)
+#20057=*
+stmts(#20057,18,#20002,1,"var dat ... afe }};")
+#20058=@"loc,{#10000},10,7,10,49"
+locations_default(#20058,#10000,10,7,10,49)
+hasLocation(#20057,#20058)
+stmt_containers(#20057,#20002)
+#20059=*
+exprs(#20059,64,#20057,0,"data2 = ... safe }}")
+#20060=@"loc,{#10000},10,11,10,48"
+locations_default(#20060,#10000,10,11,10,48)
+hasLocation(#20059,#20060)
+enclosing_stmt(#20059,#20057)
+expr_containers(#20059,#20002)
 #20061=*
-exprs(#20061,120,#20058,1,"{{ user ... safe }}")
-#20062=@"loc,{#10000},10,19,10,48"
-locations_default(#20062,#10000,10,19,10,48)
-hasLocation(#20061,#20062)
-enclosing_stmt(#20061,#20056)
+exprs(#20061,78,#20059,0,"data2")
+hasLocation(#20061,#20026)
+enclosing_stmt(#20061,#20057)
 expr_containers(#20061,#20002)
-expr_contains_template_tag_location(#20061,#20062)
-#20063=*
-stmts(#20063,18,#20002,2,"var dat ... ta3 %>;")
-#20064=@"loc,{#10000},11,7,11,36"
-locations_default(#20064,#10000,11,7,11,36)
-hasLocation(#20063,#20064)
-stmt_containers(#20063,#20002)
-#20065=*
-exprs(#20065,64,#20063,0,"data3 = ... ata3 %>")
-#20066=@"loc,{#10000},11,11,11,35"
-locations_default(#20066,#10000,11,11,11,35)
-hasLocation(#20065,#20066)
-enclosing_stmt(#20065,#20063)
-expr_containers(#20065,#20002)
-#20067=*
-exprs(#20067,78,#20065,0,"data3")
-hasLocation(#20067,#20036)
-enclosing_stmt(#20067,#20063)
-expr_containers(#20067,#20002)
-literals("data3","data3",#20067)
-decl(#20067,#20048)
+literals("data2","data2",#20061)
+decl(#20061,#20047)
+#20062=*
+exprs(#20062,120,#20059,1,"{{ user ... safe }}")
+#20063=@"loc,{#10000},10,19,10,48"
+locations_default(#20063,#10000,10,19,10,48)
+hasLocation(#20062,#20063)
+enclosing_stmt(#20062,#20057)
+expr_containers(#20062,#20002)
+expr_contains_template_tag_location(#20062,#20063)
+#20064=*
+stmts(#20064,18,#20002,2,"var dat ... ta3 %>;")
+#20065=@"loc,{#10000},11,7,11,36"
+locations_default(#20065,#10000,11,7,11,36)
+hasLocation(#20064,#20065)
+stmt_containers(#20064,#20002)
+#20066=*
+exprs(#20066,64,#20064,0,"data3 = ... ata3 %>")
+#20067=@"loc,{#10000},11,11,11,35"
+locations_default(#20067,#10000,11,11,11,35)
+hasLocation(#20066,#20067)
+enclosing_stmt(#20066,#20064)
+expr_containers(#20066,#20002)
 #20068=*
-exprs(#20068,120,#20065,1,"<%- user_data3 %>")
-#20069=@"loc,{#10000},11,19,11,35"
-locations_default(#20069,#10000,11,19,11,35)
-hasLocation(#20068,#20069)
-enclosing_stmt(#20068,#20063)
+exprs(#20068,78,#20066,0,"data3")
+hasLocation(#20068,#20036)
+enclosing_stmt(#20068,#20064)
 expr_containers(#20068,#20002)
-expr_contains_template_tag_location(#20068,#20069)
-#20070=*
-entry_cfg_node(#20070,#20002)
-hasLocation(#20070,#20004)
+literals("data3","data3",#20068)
+decl(#20068,#20048)
+#20069=*
+exprs(#20069,120,#20066,1,"<%- user_data3 %>")
+#20070=@"loc,{#10000},11,19,11,35"
+locations_default(#20070,#10000,11,19,11,35)
+hasLocation(#20069,#20070)
+enclosing_stmt(#20069,#20064)
+expr_containers(#20069,#20002)
+expr_contains_template_tag_location(#20069,#20070)
 #20071=*
-exit_cfg_node(#20071,#20002)
-hasLocation(#20071,#20044)
-successor(#20063,#20067)
-successor(#20068,#20065)
-successor(#20067,#20068)
-successor(#20065,#20071)
-successor(#20056,#20060)
-successor(#20061,#20058)
-successor(#20060,#20061)
-successor(#20058,#20063)
-successor(#20049,#20053)
-successor(#20054,#20051)
-successor(#20053,#20054)
-successor(#20051,#20056)
-successor(#20070,#20049)
-toplevel_parent_xml_node(#20002,#20001)
+entry_cfg_node(#20071,#20002)
+hasLocation(#20071,#20004)
 #20072=*
+exit_cfg_node(#20072,#20002)
+hasLocation(#20072,#20044)
+successor(#20064,#20068)
+successor(#20069,#20066)
+successor(#20068,#20069)
+successor(#20066,#20072)
+successor(#20057,#20061)
+successor(#20062,#20059)
+successor(#20061,#20062)
+successor(#20059,#20064)
+successor(#20050,#20054)
+successor(#20055,#20052)
+successor(#20054,#20055)
+successor(#20052,#20057)
+successor(#20071,#20050)
+toplevel_parent_xml_node(#20002,#20001)
 #20073=*
-template_placeholder_tag_info(#20072,#20073,"{{ attr1 }}")
-#20074=@"loc,{#10000},13,14,13,24"
-locations_default(#20074,#10000,13,14,13,24)
-hasLocation(#20072,#20074)
+#20074=*
+template_placeholder_tag_info(#20073,#20074,"{{ attr1 }}")
+#20075=@"loc,{#10000},13,14,13,24"
+locations_default(#20075,#10000,13,14,13,24)
+hasLocation(#20073,#20075)
 scopes(#20000,0)
-#20075=@"script;{#10000},13,16"
-#20076=*
-lines(#20076,#20075," attr1 ","")
-#20077=@"loc,{#10000},13,16,13,22"
-locations_default(#20077,#10000,13,16,13,22)
-hasLocation(#20076,#20077)
+#20076=@"script;{#10000},13,16"
+#20077=*
+lines(#20077,#20076," attr1 ","")
+#20078=@"loc,{#10000},13,16,13,22"
+locations_default(#20078,#10000,13,16,13,22)
+hasLocation(#20077,#20078)
 indentation(#10000,13," ",1)
-numlines(#20075,1,1,0)
-#20078=*
-tokeninfo(#20078,6,#20075,0,"attr1")
-#20079=@"loc,{#10000},13,17,13,21"
-locations_default(#20079,#10000,13,17,13,21)
-hasLocation(#20078,#20079)
-#20080=*
-tokeninfo(#20080,0,#20075,1,"")
-#20081=@"loc,{#10000},13,23,13,22"
-locations_default(#20081,#10000,13,23,13,22)
-hasLocation(#20080,#20081)
-toplevels(#20075,4)
-hasLocation(#20075,#20077)
-#20082=@"module;{#10000},13,16"
-scopes(#20082,3)
-scopenodes(#20075,#20082)
-scopenesting(#20082,#20000)
-is_module(#20075)
-#20083=*
-stmts(#20083,2,#20075,0,"attr1")
-hasLocation(#20083,#20079)
-stmt_containers(#20083,#20075)
-#20084=*
-exprs(#20084,79,#20083,0,"attr1")
-hasLocation(#20084,#20079)
-enclosing_stmt(#20084,#20083)
-expr_containers(#20084,#20075)
-literals("attr1","attr1",#20084)
-#20085=@"var;{attr1};{#20082}"
-variables(#20085,"attr1",#20082)
-bind(#20084,#20085)
+numlines(#20076,1,1,0)
+#20079=*
+tokeninfo(#20079,6,#20076,0,"attr1")
+#20080=@"loc,{#10000},13,17,13,21"
+locations_default(#20080,#10000,13,17,13,21)
+hasLocation(#20079,#20080)
+#20081=*
+tokeninfo(#20081,0,#20076,1,"")
+#20082=@"loc,{#10000},13,23,13,22"
+locations_default(#20082,#10000,13,23,13,22)
+hasLocation(#20081,#20082)
+toplevels(#20076,4)
+hasLocation(#20076,#20078)
+#20083=@"module;{#10000},13,16"
+scopes(#20083,3)
+scopenodes(#20076,#20083)
+scopenesting(#20083,#20000)
+is_module(#20076)
+#20084=@"var;{this};{#20083}"
+variables(#20084,"this",#20083)
+#20085=*
+stmts(#20085,2,#20076,0,"attr1")
+hasLocation(#20085,#20080)
+stmt_containers(#20085,#20076)
 #20086=*
-entry_cfg_node(#20086,#20075)
-#20087=@"loc,{#10000},13,16,13,15"
-locations_default(#20087,#10000,13,16,13,15)
-hasLocation(#20086,#20087)
+exprs(#20086,79,#20085,0,"attr1")
+hasLocation(#20086,#20080)
+enclosing_stmt(#20086,#20085)
+expr_containers(#20086,#20076)
+literals("attr1","attr1",#20086)
+#20087=@"var;{attr1};{#20083}"
+variables(#20087,"attr1",#20083)
+bind(#20086,#20087)
 #20088=*
-exit_cfg_node(#20088,#20075)
-hasLocation(#20088,#20081)
-successor(#20083,#20084)
-successor(#20084,#20088)
-successor(#20086,#20083)
-toplevel_parent_xml_node(#20075,#20072)
-#20089=*
+entry_cfg_node(#20088,#20076)
+#20089=@"loc,{#10000},13,16,13,15"
+locations_default(#20089,#10000,13,16,13,15)
+hasLocation(#20088,#20089)
 #20090=*
-template_placeholder_tag_info(#20089,#20090,"{{{ attr2 }}}")
-#20091=@"loc,{#10000},13,34,13,46"
-locations_default(#20091,#10000,13,34,13,46)
-hasLocation(#20089,#20091)
+exit_cfg_node(#20090,#20076)
+hasLocation(#20090,#20082)
+successor(#20085,#20086)
+successor(#20086,#20090)
+successor(#20088,#20085)
+toplevel_parent_xml_node(#20076,#20073)
+#20091=*
+#20092=*
+template_placeholder_tag_info(#20091,#20092,"{{{ attr2 }}}")
+#20093=@"loc,{#10000},13,34,13,46"
+locations_default(#20093,#10000,13,34,13,46)
+hasLocation(#20091,#20093)
 scopes(#20000,0)
-#20092=@"script;{#10000},13,37"
-#20093=*
-lines(#20093,#20092," attr2 ","")
-#20094=@"loc,{#10000},13,37,13,43"
-locations_default(#20094,#10000,13,37,13,43)
-hasLocation(#20093,#20094)
-indentation(#10000,13," ",1)
-numlines(#20092,1,1,0)
+#20094=@"script;{#10000},13,37"
 #20095=*
-tokeninfo(#20095,6,#20092,0,"attr2")
-#20096=@"loc,{#10000},13,38,13,42"
-locations_default(#20096,#10000,13,38,13,42)
+lines(#20095,#20094," attr2 ","")
+#20096=@"loc,{#10000},13,37,13,43"
+locations_default(#20096,#10000,13,37,13,43)
 hasLocation(#20095,#20096)
-#20097=*
-tokeninfo(#20097,0,#20092,1,"")
-#20098=@"loc,{#10000},13,44,13,43"
-locations_default(#20098,#10000,13,44,13,43)
-hasLocation(#20097,#20098)
-toplevels(#20092,4)
-hasLocation(#20092,#20094)
-#20099=@"module;{#10000},13,37"
-scopes(#20099,3)
-scopenodes(#20092,#20099)
-scopenesting(#20099,#20000)
-is_module(#20092)
-#20100=*
-stmts(#20100,2,#20092,0,"attr2")
-hasLocation(#20100,#20096)
-stmt_containers(#20100,#20092)
-#20101=*
-exprs(#20101,79,#20100,0,"attr2")
-hasLocation(#20101,#20096)
-enclosing_stmt(#20101,#20100)
-expr_containers(#20101,#20092)
-literals("attr2","attr2",#20101)
-#20102=@"var;{attr2};{#20099}"
-variables(#20102,"attr2",#20099)
-bind(#20101,#20102)
-#20103=*
-entry_cfg_node(#20103,#20092)
-#20104=@"loc,{#10000},13,37,13,36"
-locations_default(#20104,#10000,13,37,13,36)
-hasLocation(#20103,#20104)
-#20105=*
-exit_cfg_node(#20105,#20092)
-hasLocation(#20105,#20098)
-successor(#20100,#20101)
-successor(#20101,#20105)
-successor(#20103,#20100)
-toplevel_parent_xml_node(#20092,#20089)
-#20106=*
-#20107=*
-template_placeholder_tag_info(#20106,#20107,"<%- attr3 %>")
-#20108=@"loc,{#10000},13,59,13,70"
-locations_default(#20108,#10000,13,59,13,70)
-hasLocation(#20106,#20108)
-scopes(#20000,0)
-#20109=@"script;{#10000},13,62"
-#20110=*
-lines(#20110,#20109," attr3 ","")
-#20111=@"loc,{#10000},13,62,13,68"
-locations_default(#20111,#10000,13,62,13,68)
-hasLocation(#20110,#20111)
 indentation(#10000,13," ",1)
-numlines(#20109,1,1,0)
-#20112=*
-tokeninfo(#20112,6,#20109,0,"attr3")
-#20113=@"loc,{#10000},13,63,13,67"
-locations_default(#20113,#10000,13,63,13,67)
-hasLocation(#20112,#20113)
-#20114=*
-tokeninfo(#20114,0,#20109,1,"")
-#20115=@"loc,{#10000},13,69,13,68"
-locations_default(#20115,#10000,13,69,13,68)
-hasLocation(#20114,#20115)
-toplevels(#20109,4)
+numlines(#20094,1,1,0)
+#20097=*
+tokeninfo(#20097,6,#20094,0,"attr2")
+#20098=@"loc,{#10000},13,38,13,42"
+locations_default(#20098,#10000,13,38,13,42)
+hasLocation(#20097,#20098)
+#20099=*
+tokeninfo(#20099,0,#20094,1,"")
+#20100=@"loc,{#10000},13,44,13,43"
+locations_default(#20100,#10000,13,44,13,43)
+hasLocation(#20099,#20100)
+toplevels(#20094,4)
+hasLocation(#20094,#20096)
+#20101=@"module;{#10000},13,37"
+scopes(#20101,3)
+scopenodes(#20094,#20101)
+scopenesting(#20101,#20000)
+is_module(#20094)
+#20102=@"var;{this};{#20101}"
+variables(#20102,"this",#20101)
+#20103=*
+stmts(#20103,2,#20094,0,"attr2")
+hasLocation(#20103,#20098)
+stmt_containers(#20103,#20094)
+#20104=*
+exprs(#20104,79,#20103,0,"attr2")
+hasLocation(#20104,#20098)
+enclosing_stmt(#20104,#20103)
+expr_containers(#20104,#20094)
+literals("attr2","attr2",#20104)
+#20105=@"var;{attr2};{#20101}"
+variables(#20105,"attr2",#20101)
+bind(#20104,#20105)
+#20106=*
+entry_cfg_node(#20106,#20094)
+#20107=@"loc,{#10000},13,37,13,36"
+locations_default(#20107,#10000,13,37,13,36)
+hasLocation(#20106,#20107)
+#20108=*
+exit_cfg_node(#20108,#20094)
+hasLocation(#20108,#20100)
+successor(#20103,#20104)
+successor(#20104,#20108)
+successor(#20106,#20103)
+toplevel_parent_xml_node(#20094,#20091)
+#20109=*
+#20110=*
+template_placeholder_tag_info(#20109,#20110,"<%- attr3 %>")
+#20111=@"loc,{#10000},13,59,13,70"
+locations_default(#20111,#10000,13,59,13,70)
 hasLocation(#20109,#20111)
-#20116=@"module;{#10000},13,62"
-scopes(#20116,3)
-scopenodes(#20109,#20116)
-scopenesting(#20116,#20000)
-is_module(#20109)
+scopes(#20000,0)
+#20112=@"script;{#10000},13,62"
+#20113=*
+lines(#20113,#20112," attr3 ","")
+#20114=@"loc,{#10000},13,62,13,68"
+locations_default(#20114,#10000,13,62,13,68)
+hasLocation(#20113,#20114)
+indentation(#10000,13," ",1)
+numlines(#20112,1,1,0)
+#20115=*
+tokeninfo(#20115,6,#20112,0,"attr3")
+#20116=@"loc,{#10000},13,63,13,67"
+locations_default(#20116,#10000,13,63,13,67)
+hasLocation(#20115,#20116)
 #20117=*
-stmts(#20117,2,#20109,0,"attr3")
-hasLocation(#20117,#20113)
-stmt_containers(#20117,#20109)
-#20118=*
-exprs(#20118,79,#20117,0,"attr3")
-hasLocation(#20118,#20113)
-enclosing_stmt(#20118,#20117)
-expr_containers(#20118,#20109)
-literals("attr3","attr3",#20118)
-#20119=@"var;{attr3};{#20116}"
-variables(#20119,"attr3",#20116)
-bind(#20118,#20119)
-#20120=*
-entry_cfg_node(#20120,#20109)
-#20121=@"loc,{#10000},13,62,13,61"
-locations_default(#20121,#10000,13,62,13,61)
-hasLocation(#20120,#20121)
+tokeninfo(#20117,0,#20112,1,"")
+#20118=@"loc,{#10000},13,69,13,68"
+locations_default(#20118,#10000,13,69,13,68)
+hasLocation(#20117,#20118)
+toplevels(#20112,4)
+hasLocation(#20112,#20114)
+#20119=@"module;{#10000},13,62"
+scopes(#20119,3)
+scopenodes(#20112,#20119)
+scopenesting(#20119,#20000)
+is_module(#20112)
+#20120=@"var;{this};{#20119}"
+variables(#20120,"this",#20119)
+#20121=*
+stmts(#20121,2,#20112,0,"attr3")
+hasLocation(#20121,#20116)
+stmt_containers(#20121,#20112)
 #20122=*
-exit_cfg_node(#20122,#20109)
-hasLocation(#20122,#20115)
-successor(#20117,#20118)
-successor(#20118,#20122)
-successor(#20120,#20117)
-toplevel_parent_xml_node(#20109,#20106)
-#20123=*
+exprs(#20122,79,#20121,0,"attr3")
+hasLocation(#20122,#20116)
+enclosing_stmt(#20122,#20121)
+expr_containers(#20122,#20112)
+literals("attr3","attr3",#20122)
+#20123=@"var;{attr3};{#20119}"
+variables(#20123,"attr3",#20119)
+bind(#20122,#20123)
 #20124=*
-template_placeholder_tag_info(#20123,#20124,"{{ attr4 }}")
-#20125=@"loc,{#10000},14,21,14,31"
-locations_default(#20125,#10000,14,21,14,31)
-hasLocation(#20123,#20125)
-scopes(#20000,0)
-#20126=@"script;{#10000},14,23"
+entry_cfg_node(#20124,#20112)
+#20125=@"loc,{#10000},13,62,13,61"
+locations_default(#20125,#10000,13,62,13,61)
+hasLocation(#20124,#20125)
+#20126=*
+exit_cfg_node(#20126,#20112)
+hasLocation(#20126,#20118)
+successor(#20121,#20122)
+successor(#20122,#20126)
+successor(#20124,#20121)
+toplevel_parent_xml_node(#20112,#20109)
 #20127=*
-lines(#20127,#20126," attr4 ","")
-#20128=@"loc,{#10000},14,23,14,29"
-locations_default(#20128,#10000,14,23,14,29)
-hasLocation(#20127,#20128)
-indentation(#10000,14," ",1)
-numlines(#20126,1,1,0)
-#20129=*
-tokeninfo(#20129,6,#20126,0,"attr4")
-#20130=@"loc,{#10000},14,24,14,28"
-locations_default(#20130,#10000,14,24,14,28)
-hasLocation(#20129,#20130)
-#20131=*
-tokeninfo(#20131,0,#20126,1,"")
-#20132=@"loc,{#10000},14,30,14,29"
-locations_default(#20132,#10000,14,30,14,29)
-hasLocation(#20131,#20132)
-toplevels(#20126,4)
-hasLocation(#20126,#20128)
-#20133=@"module;{#10000},14,23"
-scopes(#20133,3)
-scopenodes(#20126,#20133)
-scopenesting(#20133,#20000)
-is_module(#20126)
-#20134=*
-stmts(#20134,2,#20126,0,"attr4")
-hasLocation(#20134,#20130)
-stmt_containers(#20134,#20126)
-#20135=*
-exprs(#20135,79,#20134,0,"attr4")
-hasLocation(#20135,#20130)
-enclosing_stmt(#20135,#20134)
-expr_containers(#20135,#20126)
-literals("attr4","attr4",#20135)
-#20136=@"var;{attr4};{#20133}"
-variables(#20136,"attr4",#20133)
-bind(#20135,#20136)
-#20137=*
-entry_cfg_node(#20137,#20126)
-#20138=@"loc,{#10000},14,23,14,22"
-locations_default(#20138,#10000,14,23,14,22)
-hasLocation(#20137,#20138)
-#20139=*
-exit_cfg_node(#20139,#20126)
-hasLocation(#20139,#20132)
-successor(#20134,#20135)
-successor(#20135,#20139)
-successor(#20137,#20134)
-toplevel_parent_xml_node(#20126,#20123)
-#20140=*
-xmlChars(#20140,"
-",#10000,0,0,#10000)
-#20141=@"loc,{#10000},1,16,1,16"
-locations_default(#20141,#10000,1,16,1,16)
-xmllocations(#20140,#20141)
-#20142=*
-xmlElements(#20142,"html",#10000,1,#10000)
-#20143=@"loc,{#10000},2,1,16,7"
-locations_default(#20143,#10000,2,1,16,7)
-xmllocations(#20142,#20143)
-#20144=*
-xmlChars(#20144,"
-  ",#20142,0,0,#10000)
-#20145=@"loc,{#10000},2,7,3,2"
-locations_default(#20145,#10000,2,7,3,2)
-xmllocations(#20144,#20145)
-#20146=*
-xmlChars(#20146,"
-",#20142,2,0,#10000)
-#20147=@"loc,{#10000},15,10,15,10"
-locations_default(#20147,#10000,15,10,15,10)
-xmllocations(#20146,#20147)
-#20148=*
-xmlElements(#20148,"body",#20142,1,#10000)
-#20149=@"loc,{#10000},3,3,15,9"
-locations_default(#20149,#10000,3,3,15,9)
-xmllocations(#20148,#20149)
-#20150=*
-xmlChars(#20150,"
-    ",#20148,0,0,#10000)
-#20151=@"loc,{#10000},3,9,4,4"
-locations_default(#20151,#10000,3,9,4,4)
-xmllocations(#20150,#20151)
-#20152=*
-template_placeholder_tag_info(#20152,#20148,"{{{subtitle_html}}}")
-#20153=@"loc,{#10000},5,5,5,23"
-locations_default(#20153,#10000,5,5,5,23)
-hasLocation(#20152,#20153)
+#20128=*
+template_placeholder_tag_info(#20127,#20128,"{{ attr4 }}")
+#20129=@"loc,{#10000},14,21,14,31"
+locations_default(#20129,#10000,14,21,14,31)
+hasLocation(#20127,#20129)
 scopes(#20000,0)
-#20154=@"script;{#10000},5,8"
+#20130=@"script;{#10000},14,23"
+#20131=*
+lines(#20131,#20130," attr4 ","")
+#20132=@"loc,{#10000},14,23,14,29"
+locations_default(#20132,#10000,14,23,14,29)
+hasLocation(#20131,#20132)
+indentation(#10000,14," ",1)
+numlines(#20130,1,1,0)
+#20133=*
+tokeninfo(#20133,6,#20130,0,"attr4")
+#20134=@"loc,{#10000},14,24,14,28"
+locations_default(#20134,#10000,14,24,14,28)
+hasLocation(#20133,#20134)
+#20135=*
+tokeninfo(#20135,0,#20130,1,"")
+#20136=@"loc,{#10000},14,30,14,29"
+locations_default(#20136,#10000,14,30,14,29)
+hasLocation(#20135,#20136)
+toplevels(#20130,4)
+hasLocation(#20130,#20132)
+#20137=@"module;{#10000},14,23"
+scopes(#20137,3)
+scopenodes(#20130,#20137)
+scopenesting(#20137,#20000)
+is_module(#20130)
+#20138=@"var;{this};{#20137}"
+variables(#20138,"this",#20137)
+#20139=*
+stmts(#20139,2,#20130,0,"attr4")
+hasLocation(#20139,#20134)
+stmt_containers(#20139,#20130)
+#20140=*
+exprs(#20140,79,#20139,0,"attr4")
+hasLocation(#20140,#20134)
+enclosing_stmt(#20140,#20139)
+expr_containers(#20140,#20130)
+literals("attr4","attr4",#20140)
+#20141=@"var;{attr4};{#20137}"
+variables(#20141,"attr4",#20137)
+bind(#20140,#20141)
+#20142=*
+entry_cfg_node(#20142,#20130)
+#20143=@"loc,{#10000},14,23,14,22"
+locations_default(#20143,#10000,14,23,14,22)
+hasLocation(#20142,#20143)
+#20144=*
+exit_cfg_node(#20144,#20130)
+hasLocation(#20144,#20136)
+successor(#20139,#20140)
+successor(#20140,#20144)
+successor(#20142,#20139)
+toplevel_parent_xml_node(#20130,#20127)
+#20145=*
+xmlChars(#20145,"
+",#10000,0,0,#10000)
+#20146=@"loc,{#10000},1,16,1,16"
+locations_default(#20146,#10000,1,16,1,16)
+xmllocations(#20145,#20146)
+#20147=*
+xmlElements(#20147,"html",#10000,1,#10000)
+#20148=@"loc,{#10000},2,1,16,7"
+locations_default(#20148,#10000,2,1,16,7)
+xmllocations(#20147,#20148)
+#20149=*
+xmlChars(#20149,"
+  ",#20147,0,0,#10000)
+#20150=@"loc,{#10000},2,7,3,2"
+locations_default(#20150,#10000,2,7,3,2)
+xmllocations(#20149,#20150)
+#20151=*
+xmlChars(#20151,"
+",#20147,2,0,#10000)
+#20152=@"loc,{#10000},15,10,15,10"
+locations_default(#20152,#10000,15,10,15,10)
+xmllocations(#20151,#20152)
+#20153=*
+xmlElements(#20153,"body",#20147,1,#10000)
+#20154=@"loc,{#10000},3,3,15,9"
+locations_default(#20154,#10000,3,3,15,9)
+xmllocations(#20153,#20154)
 #20155=*
-lines(#20155,#20154,"subtitle_html","")
-#20156=@"loc,{#10000},5,8,5,20"
-locations_default(#20156,#10000,5,8,5,20)
-hasLocation(#20155,#20156)
-numlines(#20154,1,1,0)
+xmlChars(#20155,"
+    ",#20153,0,0,#10000)
+#20156=@"loc,{#10000},3,9,4,4"
+locations_default(#20156,#10000,3,9,4,4)
+xmllocations(#20155,#20156)
 #20157=*
-tokeninfo(#20157,6,#20154,0,"subtitle_html")
-hasLocation(#20157,#20156)
-#20158=*
-tokeninfo(#20158,0,#20154,1,"")
-#20159=@"loc,{#10000},5,21,5,20"
-locations_default(#20159,#10000,5,21,5,20)
-hasLocation(#20158,#20159)
-toplevels(#20154,4)
-hasLocation(#20154,#20156)
-#20160=@"module;{#10000},5,8"
-scopes(#20160,3)
-scopenodes(#20154,#20160)
-scopenesting(#20160,#20000)
-is_module(#20154)
-#20161=*
-stmts(#20161,2,#20154,0,"subtitle_html")
-hasLocation(#20161,#20156)
-stmt_containers(#20161,#20154)
+template_placeholder_tag_info(#20157,#20153,"{{{subtitle_html}}}")
+#20158=@"loc,{#10000},5,5,5,23"
+locations_default(#20158,#10000,5,5,5,23)
+hasLocation(#20157,#20158)
+scopes(#20000,0)
+#20159=@"script;{#10000},5,8"
+#20160=*
+lines(#20160,#20159,"subtitle_html","")
+#20161=@"loc,{#10000},5,8,5,20"
+locations_default(#20161,#10000,5,8,5,20)
+hasLocation(#20160,#20161)
+numlines(#20159,1,1,0)
 #20162=*
-exprs(#20162,79,#20161,0,"subtitle_html")
-hasLocation(#20162,#20156)
-enclosing_stmt(#20162,#20161)
-expr_containers(#20162,#20154)
-literals("subtitle_html","subtitle_html",#20162)
-#20163=@"var;{subtitle_html};{#20160}"
-variables(#20163,"subtitle_html",#20160)
-bind(#20162,#20163)
-#20164=*
-entry_cfg_node(#20164,#20154)
-#20165=@"loc,{#10000},5,8,5,7"
-locations_default(#20165,#10000,5,8,5,7)
-hasLocation(#20164,#20165)
-#20166=*
-exit_cfg_node(#20166,#20154)
-hasLocation(#20166,#20159)
-successor(#20161,#20162)
-successor(#20162,#20166)
-successor(#20164,#20161)
-toplevel_parent_xml_node(#20154,#20152)
+tokeninfo(#20162,6,#20159,0,"subtitle_html")
+hasLocation(#20162,#20161)
+#20163=*
+tokeninfo(#20163,0,#20159,1,"")
+#20164=@"loc,{#10000},5,21,5,20"
+locations_default(#20164,#10000,5,21,5,20)
+hasLocation(#20163,#20164)
+toplevels(#20159,4)
+hasLocation(#20159,#20161)
+#20165=@"module;{#10000},5,8"
+scopes(#20165,3)
+scopenodes(#20159,#20165)
+scopenesting(#20165,#20000)
+is_module(#20159)
+#20166=@"var;{this};{#20165}"
+variables(#20166,"this",#20165)
 #20167=*
-xmlChars(#20167,"
-    {{{subtitle_html}}}
-    ",#20148,2,0,#10000)
-#20168=@"loc,{#10000},4,23,6,4"
-locations_default(#20168,#10000,4,23,6,4)
-xmllocations(#20167,#20168)
-#20169=*
-xmlChars(#20169,"
-    ",#20148,4,0,#10000)
-#20170=@"loc,{#10000},6,28,7,4"
-locations_default(#20170,#10000,6,28,7,4)
-xmllocations(#20169,#20170)
-#20171=*
-xmlChars(#20171,"
-    ",#20148,6,0,#10000)
-#20172=@"loc,{#10000},7,25,8,4"
-locations_default(#20172,#10000,7,25,8,4)
-xmllocations(#20171,#20172)
+stmts(#20167,2,#20159,0,"subtitle_html")
+hasLocation(#20167,#20161)
+stmt_containers(#20167,#20159)
+#20168=*
+exprs(#20168,79,#20167,0,"subtitle_html")
+hasLocation(#20168,#20161)
+enclosing_stmt(#20168,#20167)
+expr_containers(#20168,#20159)
+literals("subtitle_html","subtitle_html",#20168)
+#20169=@"var;{subtitle_html};{#20165}"
+variables(#20169,"subtitle_html",#20165)
+bind(#20168,#20169)
+#20170=*
+entry_cfg_node(#20170,#20159)
+#20171=@"loc,{#10000},5,8,5,7"
+locations_default(#20171,#10000,5,8,5,7)
+hasLocation(#20170,#20171)
+#20172=*
+exit_cfg_node(#20172,#20159)
+hasLocation(#20172,#20164)
+successor(#20167,#20168)
+successor(#20168,#20172)
+successor(#20170,#20167)
+toplevel_parent_xml_node(#20159,#20157)
 #20173=*
 xmlChars(#20173,"
-    ",#20148,8,0,#10000)
-#20174=@"loc,{#10000},12,14,13,4"
-locations_default(#20174,#10000,12,14,13,4)
+    {{{subtitle_html}}}
+    ",#20153,2,0,#10000)
+#20174=@"loc,{#10000},4,23,6,4"
+locations_default(#20174,#10000,4,23,6,4)
 xmllocations(#20173,#20174)
 #20175=*
 xmlChars(#20175,"
-  ",#20148,10,0,#10000)
-#20176=@"loc,{#10000},14,39,15,2"
-locations_default(#20176,#10000,14,39,15,2)
+    ",#20153,4,0,#10000)
+#20176=@"loc,{#10000},6,28,7,4"
+locations_default(#20176,#10000,6,28,7,4)
 xmllocations(#20175,#20176)
 #20177=*
-xmlElements(#20177,"a",#20148,9,#10000)
-#20178=@"loc,{#10000},13,5,14,38"
-locations_default(#20178,#10000,13,5,14,38)
+xmlChars(#20177,"
+    ",#20153,6,0,#10000)
+#20178=@"loc,{#10000},7,25,8,4"
+locations_default(#20178,#10000,7,25,8,4)
 xmllocations(#20177,#20178)
-xmlAttrs(#20073,#20177,"href","{{ attr1 }}",0,#10000)
-#20179=@"loc,{#10000},13,8,13,25"
-locations_default(#20179,#10000,13,8,13,25)
-xmllocations(#20073,#20179)
-xmlAttrs(#20090,#20177,"title","{{{ attr2 }}}",1,#10000)
-#20180=@"loc,{#10000},13,27,13,47"
-locations_default(#20180,#10000,13,27,13,47)
-xmllocations(#20090,#20180)
-xmlAttrs(#20107,#20177,"data-foo","<%- attr3 %>",2,#10000)
-#20181=@"loc,{#10000},13,49,13,71"
-locations_default(#20181,#10000,13,49,13,71)
-xmllocations(#20107,#20181)
-xmlAttrs(#20124,#20177,"data-bar","   {{ attr4 }} ",3,#10000)
-#20182=@"loc,{#10000},14,8,14,33"
-locations_default(#20182,#10000,14,8,14,33)
-xmllocations(#20124,#20182)
-xmlElements(#20001,"script",#20148,7,#10000)
-#20183=@"loc,{#10000},8,5,12,13"
-locations_default(#20183,#10000,8,5,12,13)
-xmllocations(#20001,#20183)
-#20184=*
-template_placeholder_tag_info(#20184,#20001,"{{{ user_data1 }}}")
-locations_default(#20055,#10000,9,19,9,36)
-hasLocation(#20184,#20055)
-scopes(#20000,0)
-#20185=@"script;{#10000},9,22"
-#20186=*
-lines(#20186,#20185," user_data1 ","")
-#20187=@"loc,{#10000},9,22,9,33"
-locations_default(#20187,#10000,9,22,9,33)
-hasLocation(#20186,#20187)
-indentation(#10000,9," ",1)
-numlines(#20185,1,1,0)
-#20188=*
-tokeninfo(#20188,6,#20185,0,"user_data1")
-#20189=@"loc,{#10000},9,23,9,32"
-locations_default(#20189,#10000,9,23,9,32)
-hasLocation(#20188,#20189)
+#20179=*
+xmlChars(#20179,"
+    ",#20153,8,0,#10000)
+#20180=@"loc,{#10000},12,14,13,4"
+locations_default(#20180,#10000,12,14,13,4)
+xmllocations(#20179,#20180)
+#20181=*
+xmlChars(#20181,"
+  ",#20153,10,0,#10000)
+#20182=@"loc,{#10000},14,39,15,2"
+locations_default(#20182,#10000,14,39,15,2)
+xmllocations(#20181,#20182)
+#20183=*
+xmlElements(#20183,"a",#20153,9,#10000)
+#20184=@"loc,{#10000},13,5,14,38"
+locations_default(#20184,#10000,13,5,14,38)
+xmllocations(#20183,#20184)
+xmlAttrs(#20074,#20183,"href","{{ attr1 }}",0,#10000)
+#20185=@"loc,{#10000},13,8,13,25"
+locations_default(#20185,#10000,13,8,13,25)
+xmllocations(#20074,#20185)
+xmlAttrs(#20092,#20183,"title","{{{ attr2 }}}",1,#10000)
+#20186=@"loc,{#10000},13,27,13,47"
+locations_default(#20186,#10000,13,27,13,47)
+xmllocations(#20092,#20186)
+xmlAttrs(#20110,#20183,"data-foo","<%- attr3 %>",2,#10000)
+#20187=@"loc,{#10000},13,49,13,71"
+locations_default(#20187,#10000,13,49,13,71)
+xmllocations(#20110,#20187)
+xmlAttrs(#20128,#20183,"data-bar","   {{ attr4 }} ",3,#10000)
+#20188=@"loc,{#10000},14,8,14,33"
+locations_default(#20188,#10000,14,8,14,33)
+xmllocations(#20128,#20188)
+xmlElements(#20001,"script",#20153,7,#10000)
+#20189=@"loc,{#10000},8,5,12,13"
+locations_default(#20189,#10000,8,5,12,13)
+xmllocations(#20001,#20189)
 #20190=*
-tokeninfo(#20190,0,#20185,1,"")
-#20191=@"loc,{#10000},9,34,9,33"
-locations_default(#20191,#10000,9,34,9,33)
-hasLocation(#20190,#20191)
-toplevels(#20185,4)
-hasLocation(#20185,#20187)
-#20192=@"module;{#10000},9,22"
-scopes(#20192,3)
-scopenodes(#20185,#20192)
-scopenesting(#20192,#20000)
-is_module(#20185)
-#20193=*
-stmts(#20193,2,#20185,0,"user_data1")
-hasLocation(#20193,#20189)
-stmt_containers(#20193,#20185)
-#20194=*
-exprs(#20194,79,#20193,0,"user_data1")
-hasLocation(#20194,#20189)
-enclosing_stmt(#20194,#20193)
-expr_containers(#20194,#20185)
-literals("user_data1","user_data1",#20194)
-#20195=@"var;{user_data1};{#20192}"
-variables(#20195,"user_data1",#20192)
-bind(#20194,#20195)
-#20196=*
-entry_cfg_node(#20196,#20185)
-#20197=@"loc,{#10000},9,22,9,21"
-locations_default(#20197,#10000,9,22,9,21)
-hasLocation(#20196,#20197)
-#20198=*
-exit_cfg_node(#20198,#20185)
-hasLocation(#20198,#20191)
-successor(#20193,#20194)
-successor(#20194,#20198)
-successor(#20196,#20193)
-toplevel_parent_xml_node(#20185,#20184)
-#20199=*
-template_placeholder_tag_info(#20199,#20001,"{{ user_data2 | json | safe }}")
-locations_default(#20062,#10000,10,19,10,48)
-hasLocation(#20199,#20062)
+template_placeholder_tag_info(#20190,#20001,"{{{ user_data1 }}}")
+locations_default(#20056,#10000,9,19,9,36)
+hasLocation(#20190,#20056)
 scopes(#20000,0)
-#20200=@"script;{#10000},10,21"
+#20191=@"script;{#10000},9,22"
+#20192=*
+lines(#20192,#20191," user_data1 ","")
+#20193=@"loc,{#10000},9,22,9,33"
+locations_default(#20193,#10000,9,22,9,33)
+hasLocation(#20192,#20193)
+indentation(#10000,9," ",1)
+numlines(#20191,1,1,0)
+#20194=*
+tokeninfo(#20194,6,#20191,0,"user_data1")
+#20195=@"loc,{#10000},9,23,9,32"
+locations_default(#20195,#10000,9,23,9,32)
+hasLocation(#20194,#20195)
+#20196=*
+tokeninfo(#20196,0,#20191,1,"")
+#20197=@"loc,{#10000},9,34,9,33"
+locations_default(#20197,#10000,9,34,9,33)
+hasLocation(#20196,#20197)
+toplevels(#20191,4)
+hasLocation(#20191,#20193)
+#20198=@"module;{#10000},9,22"
+scopes(#20198,3)
+scopenodes(#20191,#20198)
+scopenesting(#20198,#20000)
+is_module(#20191)
+#20199=@"var;{this};{#20198}"
+variables(#20199,"this",#20198)
+#20200=*
+stmts(#20200,2,#20191,0,"user_data1")
+hasLocation(#20200,#20195)
+stmt_containers(#20200,#20191)
 #20201=*
-lines(#20201,#20200," user_data2 | json | safe ","")
-#20202=@"loc,{#10000},10,21,10,46"
-locations_default(#20202,#10000,10,21,10,46)
-hasLocation(#20201,#20202)
-indentation(#10000,10," ",1)
-numlines(#20200,1,1,0)
+exprs(#20201,79,#20200,0,"user_data1")
+hasLocation(#20201,#20195)
+enclosing_stmt(#20201,#20200)
+expr_containers(#20201,#20191)
+literals("user_data1","user_data1",#20201)
+#20202=@"var;{user_data1};{#20198}"
+variables(#20202,"user_data1",#20198)
+bind(#20201,#20202)
 #20203=*
-tokeninfo(#20203,6,#20200,0,"user_data2")
-#20204=@"loc,{#10000},10,22,10,31"
-locations_default(#20204,#10000,10,22,10,31)
+entry_cfg_node(#20203,#20191)
+#20204=@"loc,{#10000},9,22,9,21"
+locations_default(#20204,#10000,9,22,9,21)
 hasLocation(#20203,#20204)
 #20205=*
-tokeninfo(#20205,8,#20200,1,"|")
-#20206=@"loc,{#10000},10,33,10,33"
-locations_default(#20206,#10000,10,33,10,33)
-hasLocation(#20205,#20206)
-#20207=*
-tokeninfo(#20207,6,#20200,2,"json")
-#20208=@"loc,{#10000},10,35,10,38"
-locations_default(#20208,#10000,10,35,10,38)
-hasLocation(#20207,#20208)
-#20209=*
-tokeninfo(#20209,8,#20200,3,"|")
-#20210=@"loc,{#10000},10,40,10,40"
-locations_default(#20210,#10000,10,40,10,40)
-hasLocation(#20209,#20210)
-#20211=*
-tokeninfo(#20211,6,#20200,4,"safe")
-#20212=@"loc,{#10000},10,42,10,45"
-locations_default(#20212,#10000,10,42,10,45)
-hasLocation(#20211,#20212)
-#20213=*
-tokeninfo(#20213,0,#20200,5,"")
-#20214=@"loc,{#10000},10,47,10,46"
-locations_default(#20214,#10000,10,47,10,46)
-hasLocation(#20213,#20214)
-toplevels(#20200,4)
-hasLocation(#20200,#20202)
-#20215=@"module;{#10000},10,21"
-scopes(#20215,3)
-scopenodes(#20200,#20215)
-scopenesting(#20215,#20000)
-is_module(#20200)
-#20216=*
-stmts(#20216,2,#20200,0,"user_da ...  | safe")
-#20217=@"loc,{#10000},10,22,10,45"
-locations_default(#20217,#10000,10,22,10,45)
-hasLocation(#20216,#20217)
-stmt_containers(#20216,#20200)
-#20218=*
-exprs(#20218,13,#20216,0,"user_da ...  | safe")
-hasLocation(#20218,#20217)
-enclosing_stmt(#20218,#20216)
-expr_containers(#20218,#20200)
-#20219=*
-exprs(#20219,119,#20218,-1,"safe")
-hasLocation(#20219,#20212)
-enclosing_stmt(#20219,#20216)
-expr_containers(#20219,#20200)
-#20220=*
-exprs(#20220,0,#20219,0,"safe")
-hasLocation(#20220,#20212)
-enclosing_stmt(#20220,#20216)
-expr_containers(#20220,#20200)
-literals("safe","safe",#20220)
-#20221=*
-exprs(#20221,13,#20218,0,"user_data2 | json")
-#20222=@"loc,{#10000},10,22,10,38"
-locations_default(#20222,#10000,10,22,10,38)
-hasLocation(#20221,#20222)
-enclosing_stmt(#20221,#20216)
-expr_containers(#20221,#20200)
-#20223=*
-exprs(#20223,119,#20221,-1,"json")
-hasLocation(#20223,#20208)
-enclosing_stmt(#20223,#20216)
-expr_containers(#20223,#20200)
-#20224=*
-exprs(#20224,0,#20223,0,"json")
-hasLocation(#20224,#20208)
-enclosing_stmt(#20224,#20216)
-expr_containers(#20224,#20200)
-literals("json","json",#20224)
-#20225=*
-exprs(#20225,79,#20221,0,"user_data2")
-hasLocation(#20225,#20204)
-enclosing_stmt(#20225,#20216)
-expr_containers(#20225,#20200)
-literals("user_data2","user_data2",#20225)
-#20226=@"var;{user_data2};{#20215}"
-variables(#20226,"user_data2",#20215)
-bind(#20225,#20226)
-#20227=*
-entry_cfg_node(#20227,#20200)
-#20228=@"loc,{#10000},10,21,10,20"
-locations_default(#20228,#10000,10,21,10,20)
-hasLocation(#20227,#20228)
-#20229=*
-exit_cfg_node(#20229,#20200)
-hasLocation(#20229,#20214)
-successor(#20216,#20219)
-successor(#20225,#20221)
-successor(#20223,#20225)
-successor(#20221,#20218)
-successor(#20219,#20223)
-successor(#20218,#20229)
-successor(#20227,#20216)
-toplevel_parent_xml_node(#20200,#20199)
-#20230=*
-template_placeholder_tag_info(#20230,#20001,"<%- user_data3 %>")
-locations_default(#20069,#10000,11,19,11,35)
-hasLocation(#20230,#20069)
+exit_cfg_node(#20205,#20191)
+hasLocation(#20205,#20197)
+successor(#20200,#20201)
+successor(#20201,#20205)
+successor(#20203,#20200)
+toplevel_parent_xml_node(#20191,#20190)
+#20206=*
+template_placeholder_tag_info(#20206,#20001,"{{ user_data2 | json | safe }}")
+locations_default(#20063,#10000,10,19,10,48)
+hasLocation(#20206,#20063)
 scopes(#20000,0)
-#20231=@"script;{#10000},11,22"
+#20207=@"script;{#10000},10,21"
+#20208=*
+lines(#20208,#20207," user_data2 | json | safe ","")
+#20209=@"loc,{#10000},10,21,10,46"
+locations_default(#20209,#10000,10,21,10,46)
+hasLocation(#20208,#20209)
+indentation(#10000,10," ",1)
+numlines(#20207,1,1,0)
+#20210=*
+tokeninfo(#20210,6,#20207,0,"user_data2")
+#20211=@"loc,{#10000},10,22,10,31"
+locations_default(#20211,#10000,10,22,10,31)
+hasLocation(#20210,#20211)
+#20212=*
+tokeninfo(#20212,8,#20207,1,"|")
+#20213=@"loc,{#10000},10,33,10,33"
+locations_default(#20213,#10000,10,33,10,33)
+hasLocation(#20212,#20213)
+#20214=*
+tokeninfo(#20214,6,#20207,2,"json")
+#20215=@"loc,{#10000},10,35,10,38"
+locations_default(#20215,#10000,10,35,10,38)
+hasLocation(#20214,#20215)
+#20216=*
+tokeninfo(#20216,8,#20207,3,"|")
+#20217=@"loc,{#10000},10,40,10,40"
+locations_default(#20217,#10000,10,40,10,40)
+hasLocation(#20216,#20217)
+#20218=*
+tokeninfo(#20218,6,#20207,4,"safe")
+#20219=@"loc,{#10000},10,42,10,45"
+locations_default(#20219,#10000,10,42,10,45)
+hasLocation(#20218,#20219)
+#20220=*
+tokeninfo(#20220,0,#20207,5,"")
+#20221=@"loc,{#10000},10,47,10,46"
+locations_default(#20221,#10000,10,47,10,46)
+hasLocation(#20220,#20221)
+toplevels(#20207,4)
+hasLocation(#20207,#20209)
+#20222=@"module;{#10000},10,21"
+scopes(#20222,3)
+scopenodes(#20207,#20222)
+scopenesting(#20222,#20000)
+is_module(#20207)
+#20223=@"var;{this};{#20222}"
+variables(#20223,"this",#20222)
+#20224=*
+stmts(#20224,2,#20207,0,"user_da ...  | safe")
+#20225=@"loc,{#10000},10,22,10,45"
+locations_default(#20225,#10000,10,22,10,45)
+hasLocation(#20224,#20225)
+stmt_containers(#20224,#20207)
+#20226=*
+exprs(#20226,13,#20224,0,"user_da ...  | safe")
+hasLocation(#20226,#20225)
+enclosing_stmt(#20226,#20224)
+expr_containers(#20226,#20207)
+#20227=*
+exprs(#20227,119,#20226,-1,"safe")
+hasLocation(#20227,#20219)
+enclosing_stmt(#20227,#20224)
+expr_containers(#20227,#20207)
+#20228=*
+exprs(#20228,0,#20227,0,"safe")
+hasLocation(#20228,#20219)
+enclosing_stmt(#20228,#20224)
+expr_containers(#20228,#20207)
+literals("safe","safe",#20228)
+#20229=*
+exprs(#20229,13,#20226,0,"user_data2 | json")
+#20230=@"loc,{#10000},10,22,10,38"
+locations_default(#20230,#10000,10,22,10,38)
+hasLocation(#20229,#20230)
+enclosing_stmt(#20229,#20224)
+expr_containers(#20229,#20207)
+#20231=*
+exprs(#20231,119,#20229,-1,"json")
+hasLocation(#20231,#20215)
+enclosing_stmt(#20231,#20224)
+expr_containers(#20231,#20207)
 #20232=*
-lines(#20232,#20231," user_data3 ","")
-#20233=@"loc,{#10000},11,22,11,33"
-locations_default(#20233,#10000,11,22,11,33)
-hasLocation(#20232,#20233)
-indentation(#10000,11," ",1)
-numlines(#20231,1,1,0)
-#20234=*
-tokeninfo(#20234,6,#20231,0,"user_data3")
-#20235=@"loc,{#10000},11,23,11,32"
-locations_default(#20235,#10000,11,23,11,32)
-hasLocation(#20234,#20235)
-#20236=*
-tokeninfo(#20236,0,#20231,1,"")
-#20237=@"loc,{#10000},11,34,11,33"
-locations_default(#20237,#10000,11,34,11,33)
-hasLocation(#20236,#20237)
-toplevels(#20231,4)
-hasLocation(#20231,#20233)
-#20238=@"module;{#10000},11,22"
-scopes(#20238,3)
-scopenodes(#20231,#20238)
-scopenesting(#20238,#20000)
-is_module(#20231)
-#20239=*
-stmts(#20239,2,#20231,0,"user_data3")
-hasLocation(#20239,#20235)
-stmt_containers(#20239,#20231)
+exprs(#20232,0,#20231,0,"json")
+hasLocation(#20232,#20215)
+enclosing_stmt(#20232,#20224)
+expr_containers(#20232,#20207)
+literals("json","json",#20232)
+#20233=*
+exprs(#20233,79,#20229,0,"user_data2")
+hasLocation(#20233,#20211)
+enclosing_stmt(#20233,#20224)
+expr_containers(#20233,#20207)
+literals("user_data2","user_data2",#20233)
+#20234=@"var;{user_data2};{#20222}"
+variables(#20234,"user_data2",#20222)
+bind(#20233,#20234)
+#20235=*
+entry_cfg_node(#20235,#20207)
+#20236=@"loc,{#10000},10,21,10,20"
+locations_default(#20236,#10000,10,21,10,20)
+hasLocation(#20235,#20236)
+#20237=*
+exit_cfg_node(#20237,#20207)
+hasLocation(#20237,#20221)
+successor(#20224,#20227)
+successor(#20233,#20229)
+successor(#20231,#20233)
+successor(#20229,#20226)
+successor(#20227,#20231)
+successor(#20226,#20237)
+successor(#20235,#20224)
+toplevel_parent_xml_node(#20207,#20206)
+#20238=*
+template_placeholder_tag_info(#20238,#20001,"<%- user_data3 %>")
+locations_default(#20070,#10000,11,19,11,35)
+hasLocation(#20238,#20070)
+scopes(#20000,0)
+#20239=@"script;{#10000},11,22"
 #20240=*
-exprs(#20240,79,#20239,0,"user_data3")
-hasLocation(#20240,#20235)
-enclosing_stmt(#20240,#20239)
-expr_containers(#20240,#20231)
-literals("user_data3","user_data3",#20240)
-#20241=@"var;{user_data3};{#20238}"
-variables(#20241,"user_data3",#20238)
-bind(#20240,#20241)
+lines(#20240,#20239," user_data3 ","")
+#20241=@"loc,{#10000},11,22,11,33"
+locations_default(#20241,#10000,11,22,11,33)
+hasLocation(#20240,#20241)
+indentation(#10000,11," ",1)
+numlines(#20239,1,1,0)
 #20242=*
-entry_cfg_node(#20242,#20231)
-#20243=@"loc,{#10000},11,22,11,21"
-locations_default(#20243,#10000,11,22,11,21)
+tokeninfo(#20242,6,#20239,0,"user_data3")
+#20243=@"loc,{#10000},11,23,11,32"
+locations_default(#20243,#10000,11,23,11,32)
 hasLocation(#20242,#20243)
 #20244=*
-exit_cfg_node(#20244,#20231)
-hasLocation(#20244,#20237)
-successor(#20239,#20240)
-successor(#20240,#20244)
-successor(#20242,#20239)
-toplevel_parent_xml_node(#20231,#20230)
-#20245=*
-xmlChars(#20245,"
+tokeninfo(#20244,0,#20239,1,"")
+#20245=@"loc,{#10000},11,34,11,33"
+locations_default(#20245,#10000,11,34,11,33)
+hasLocation(#20244,#20245)
+toplevels(#20239,4)
+hasLocation(#20239,#20241)
+#20246=@"module;{#10000},11,22"
+scopes(#20246,3)
+scopenodes(#20239,#20246)
+scopenesting(#20246,#20000)
+is_module(#20239)
+#20247=@"var;{this};{#20246}"
+variables(#20247,"this",#20246)
+#20248=*
+stmts(#20248,2,#20239,0,"user_data3")
+hasLocation(#20248,#20243)
+stmt_containers(#20248,#20239)
+#20249=*
+exprs(#20249,79,#20248,0,"user_data3")
+hasLocation(#20249,#20243)
+enclosing_stmt(#20249,#20248)
+expr_containers(#20249,#20239)
+literals("user_data3","user_data3",#20249)
+#20250=@"var;{user_data3};{#20246}"
+variables(#20250,"user_data3",#20246)
+bind(#20249,#20250)
+#20251=*
+entry_cfg_node(#20251,#20239)
+#20252=@"loc,{#10000},11,22,11,21"
+locations_default(#20252,#10000,11,22,11,21)
+hasLocation(#20251,#20252)
+#20253=*
+exit_cfg_node(#20253,#20239)
+hasLocation(#20253,#20245)
+successor(#20248,#20249)
+successor(#20249,#20253)
+successor(#20251,#20248)
+toplevel_parent_xml_node(#20239,#20238)
+#20254=*
+xmlChars(#20254,"
       var data1 = {{{ user_data1 }}};
       var data2 = {{ user_data2 | json | safe }};
       var data3 = <%- user_data3 %>;
     ",#20001,0,0,#10000)
 locations_default(#20045,#10000,8,13,12,4)
-xmllocations(#20245,#20045)
-#20246=*
-xmlElements(#20246,"p",#20148,5,#10000)
-#20247=@"loc,{#10000},7,5,7,24"
-locations_default(#20247,#10000,7,5,7,24)
-xmllocations(#20246,#20247)
-#20248=*
-template_placeholder_tag_info(#20248,#20246,"<%= footer %>")
-#20249=@"loc,{#10000},7,8,7,20"
-locations_default(#20249,#10000,7,8,7,20)
-hasLocation(#20248,#20249)
-scopes(#20000,0)
-#20250=@"script;{#10000},7,11"
-#20251=*
-lines(#20251,#20250," footer ","")
-#20252=@"loc,{#10000},7,11,7,18"
-locations_default(#20252,#10000,7,11,7,18)
-hasLocation(#20251,#20252)
-indentation(#10000,7," ",1)
-numlines(#20250,1,1,0)
-#20253=*
-tokeninfo(#20253,6,#20250,0,"footer")
-#20254=@"loc,{#10000},7,12,7,17"
-locations_default(#20254,#10000,7,12,7,17)
-hasLocation(#20253,#20254)
+xmllocations(#20254,#20045)
 #20255=*
-tokeninfo(#20255,0,#20250,1,"")
-#20256=@"loc,{#10000},7,19,7,18"
-locations_default(#20256,#10000,7,19,7,18)
-hasLocation(#20255,#20256)
-toplevels(#20250,4)
-hasLocation(#20250,#20252)
-#20257=@"module;{#10000},7,11"
-scopes(#20257,3)
-scopenodes(#20250,#20257)
-scopenesting(#20257,#20000)
-is_module(#20250)
-#20258=*
-stmts(#20258,2,#20250,0,"footer")
-hasLocation(#20258,#20254)
-stmt_containers(#20258,#20250)
-#20259=*
-exprs(#20259,79,#20258,0,"footer")
-hasLocation(#20259,#20254)
-enclosing_stmt(#20259,#20258)
-expr_containers(#20259,#20250)
-literals("footer","footer",#20259)
-#20260=@"var;{footer};{#20257}"
-variables(#20260,"footer",#20257)
-bind(#20259,#20260)
-#20261=*
-entry_cfg_node(#20261,#20250)
-#20262=@"loc,{#10000},7,11,7,10"
-locations_default(#20262,#10000,7,11,7,10)
-hasLocation(#20261,#20262)
-#20263=*
-exit_cfg_node(#20263,#20250)
-hasLocation(#20263,#20256)
-successor(#20258,#20259)
-successor(#20259,#20263)
-successor(#20261,#20258)
-toplevel_parent_xml_node(#20250,#20248)
+xmlElements(#20255,"p",#20153,5,#10000)
+#20256=@"loc,{#10000},7,5,7,24"
+locations_default(#20256,#10000,7,5,7,24)
+xmllocations(#20255,#20256)
+#20257=*
+template_placeholder_tag_info(#20257,#20255,"<%= footer %>")
+#20258=@"loc,{#10000},7,8,7,20"
+locations_default(#20258,#10000,7,8,7,20)
+hasLocation(#20257,#20258)
+scopes(#20000,0)
+#20259=@"script;{#10000},7,11"
+#20260=*
+lines(#20260,#20259," footer ","")
+#20261=@"loc,{#10000},7,11,7,18"
+locations_default(#20261,#10000,7,11,7,18)
+hasLocation(#20260,#20261)
+indentation(#10000,7," ",1)
+numlines(#20259,1,1,0)
+#20262=*
+tokeninfo(#20262,6,#20259,0,"footer")
+#20263=@"loc,{#10000},7,12,7,17"
+locations_default(#20263,#10000,7,12,7,17)
+hasLocation(#20262,#20263)
 #20264=*
-xmlChars(#20264,"<%= footer %>",#20246,0,0,#10000)
-locations_default(#20249,#10000,7,8,7,20)
-xmllocations(#20264,#20249)
-#20265=*
-xmlElements(#20265,"p",#20148,3,#10000)
-#20266=@"loc,{#10000},6,5,6,27"
-locations_default(#20266,#10000,6,5,6,27)
-xmllocations(#20265,#20266)
-#20267=*
-template_placeholder_tag_info(#20267,#20265,"<%- body_html %>")
-#20268=@"loc,{#10000},6,8,6,23"
-locations_default(#20268,#10000,6,8,6,23)
-hasLocation(#20267,#20268)
-scopes(#20000,0)
-#20269=@"script;{#10000},6,11"
-#20270=*
-lines(#20270,#20269," body_html ","")
-#20271=@"loc,{#10000},6,11,6,21"
-locations_default(#20271,#10000,6,11,6,21)
-hasLocation(#20270,#20271)
-indentation(#10000,6," ",1)
-numlines(#20269,1,1,0)
-#20272=*
-tokeninfo(#20272,6,#20269,0,"body_html")
-#20273=@"loc,{#10000},6,12,6,20"
-locations_default(#20273,#10000,6,12,6,20)
-hasLocation(#20272,#20273)
+tokeninfo(#20264,0,#20259,1,"")
+#20265=@"loc,{#10000},7,19,7,18"
+locations_default(#20265,#10000,7,19,7,18)
+hasLocation(#20264,#20265)
+toplevels(#20259,4)
+hasLocation(#20259,#20261)
+#20266=@"module;{#10000},7,11"
+scopes(#20266,3)
+scopenodes(#20259,#20266)
+scopenesting(#20266,#20000)
+is_module(#20259)
+#20267=@"var;{this};{#20266}"
+variables(#20267,"this",#20266)
+#20268=*
+stmts(#20268,2,#20259,0,"footer")
+hasLocation(#20268,#20263)
+stmt_containers(#20268,#20259)
+#20269=*
+exprs(#20269,79,#20268,0,"footer")
+hasLocation(#20269,#20263)
+enclosing_stmt(#20269,#20268)
+expr_containers(#20269,#20259)
+literals("footer","footer",#20269)
+#20270=@"var;{footer};{#20266}"
+variables(#20270,"footer",#20266)
+bind(#20269,#20270)
+#20271=*
+entry_cfg_node(#20271,#20259)
+#20272=@"loc,{#10000},7,11,7,10"
+locations_default(#20272,#10000,7,11,7,10)
+hasLocation(#20271,#20272)
+#20273=*
+exit_cfg_node(#20273,#20259)
+hasLocation(#20273,#20265)
+successor(#20268,#20269)
+successor(#20269,#20273)
+successor(#20271,#20268)
+toplevel_parent_xml_node(#20259,#20257)
 #20274=*
-tokeninfo(#20274,0,#20269,1,"")
-#20275=@"loc,{#10000},6,22,6,21"
-locations_default(#20275,#10000,6,22,6,21)
-hasLocation(#20274,#20275)
-toplevels(#20269,4)
-hasLocation(#20269,#20271)
-#20276=@"module;{#10000},6,11"
-scopes(#20276,3)
-scopenodes(#20269,#20276)
-scopenesting(#20276,#20000)
-is_module(#20269)
+xmlChars(#20274,"<%= footer %>",#20255,0,0,#10000)
+locations_default(#20258,#10000,7,8,7,20)
+xmllocations(#20274,#20258)
+#20275=*
+xmlElements(#20275,"p",#20153,3,#10000)
+#20276=@"loc,{#10000},6,5,6,27"
+locations_default(#20276,#10000,6,5,6,27)
+xmllocations(#20275,#20276)
 #20277=*
-stmts(#20277,2,#20269,0,"body_html")
-hasLocation(#20277,#20273)
-stmt_containers(#20277,#20269)
-#20278=*
-exprs(#20278,79,#20277,0,"body_html")
-hasLocation(#20278,#20273)
-enclosing_stmt(#20278,#20277)
-expr_containers(#20278,#20269)
-literals("body_html","body_html",#20278)
-#20279=@"var;{body_html};{#20276}"
-variables(#20279,"body_html",#20276)
-bind(#20278,#20279)
-#20280=*
-entry_cfg_node(#20280,#20269)
-#20281=@"loc,{#10000},6,11,6,10"
-locations_default(#20281,#10000,6,11,6,10)
-hasLocation(#20280,#20281)
-#20282=*
-exit_cfg_node(#20282,#20269)
-hasLocation(#20282,#20275)
-successor(#20277,#20278)
-successor(#20278,#20282)
-successor(#20280,#20277)
-toplevel_parent_xml_node(#20269,#20267)
-#20283=*
-xmlChars(#20283,"<%- body_html %>",#20265,0,0,#10000)
-locations_default(#20268,#10000,6,8,6,23)
-xmllocations(#20283,#20268)
-#20284=*
-xmlElements(#20284,"h1",#20148,1,#10000)
-#20285=@"loc,{#10000},4,5,4,22"
-locations_default(#20285,#10000,4,5,4,22)
-xmllocations(#20284,#20285)
-#20286=*
-template_placeholder_tag_info(#20286,#20284,"{{title}}")
-#20287=@"loc,{#10000},4,9,4,17"
-locations_default(#20287,#10000,4,9,4,17)
-hasLocation(#20286,#20287)
+template_placeholder_tag_info(#20277,#20275,"<%- body_html %>")
+#20278=@"loc,{#10000},6,8,6,23"
+locations_default(#20278,#10000,6,8,6,23)
+hasLocation(#20277,#20278)
 scopes(#20000,0)
-#20288=@"script;{#10000},4,11"
+#20279=@"script;{#10000},6,11"
+#20280=*
+lines(#20280,#20279," body_html ","")
+#20281=@"loc,{#10000},6,11,6,21"
+locations_default(#20281,#10000,6,11,6,21)
+hasLocation(#20280,#20281)
+indentation(#10000,6," ",1)
+numlines(#20279,1,1,0)
+#20282=*
+tokeninfo(#20282,6,#20279,0,"body_html")
+#20283=@"loc,{#10000},6,12,6,20"
+locations_default(#20283,#10000,6,12,6,20)
+hasLocation(#20282,#20283)
+#20284=*
+tokeninfo(#20284,0,#20279,1,"")
+#20285=@"loc,{#10000},6,22,6,21"
+locations_default(#20285,#10000,6,22,6,21)
+hasLocation(#20284,#20285)
+toplevels(#20279,4)
+hasLocation(#20279,#20281)
+#20286=@"module;{#10000},6,11"
+scopes(#20286,3)
+scopenodes(#20279,#20286)
+scopenesting(#20286,#20000)
+is_module(#20279)
+#20287=@"var;{this};{#20286}"
+variables(#20287,"this",#20286)
+#20288=*
+stmts(#20288,2,#20279,0,"body_html")
+hasLocation(#20288,#20283)
+stmt_containers(#20288,#20279)
 #20289=*
-lines(#20289,#20288,"title","")
-#20290=@"loc,{#10000},4,11,4,15"
-locations_default(#20290,#10000,4,11,4,15)
-hasLocation(#20289,#20290)
-numlines(#20288,1,1,0)
+exprs(#20289,79,#20288,0,"body_html")
+hasLocation(#20289,#20283)
+enclosing_stmt(#20289,#20288)
+expr_containers(#20289,#20279)
+literals("body_html","body_html",#20289)
+#20290=@"var;{body_html};{#20286}"
+variables(#20290,"body_html",#20286)
+bind(#20289,#20290)
 #20291=*
-tokeninfo(#20291,6,#20288,0,"title")
-hasLocation(#20291,#20290)
-#20292=*
-tokeninfo(#20292,0,#20288,1,"")
-#20293=@"loc,{#10000},4,16,4,15"
-locations_default(#20293,#10000,4,16,4,15)
-hasLocation(#20292,#20293)
-toplevels(#20288,4)
-hasLocation(#20288,#20290)
-#20294=@"module;{#10000},4,11"
-scopes(#20294,3)
-scopenodes(#20288,#20294)
-scopenesting(#20294,#20000)
-is_module(#20288)
+entry_cfg_node(#20291,#20279)
+#20292=@"loc,{#10000},6,11,6,10"
+locations_default(#20292,#10000,6,11,6,10)
+hasLocation(#20291,#20292)
+#20293=*
+exit_cfg_node(#20293,#20279)
+hasLocation(#20293,#20285)
+successor(#20288,#20289)
+successor(#20289,#20293)
+successor(#20291,#20288)
+toplevel_parent_xml_node(#20279,#20277)
+#20294=*
+xmlChars(#20294,"<%- body_html %>",#20275,0,0,#10000)
+locations_default(#20278,#10000,6,8,6,23)
+xmllocations(#20294,#20278)
 #20295=*
-stmts(#20295,2,#20288,0,"title")
-hasLocation(#20295,#20290)
-stmt_containers(#20295,#20288)
-#20296=*
-exprs(#20296,79,#20295,0,"title")
-hasLocation(#20296,#20290)
-enclosing_stmt(#20296,#20295)
-expr_containers(#20296,#20288)
-literals("title","title",#20296)
-#20297=@"var;{title};{#20294}"
-variables(#20297,"title",#20294)
-bind(#20296,#20297)
-#20298=*
-entry_cfg_node(#20298,#20288)
-#20299=@"loc,{#10000},4,11,4,10"
-locations_default(#20299,#10000,4,11,4,10)
-hasLocation(#20298,#20299)
+xmlElements(#20295,"h1",#20153,1,#10000)
+#20296=@"loc,{#10000},4,5,4,22"
+locations_default(#20296,#10000,4,5,4,22)
+xmllocations(#20295,#20296)
+#20297=*
+template_placeholder_tag_info(#20297,#20295,"{{title}}")
+#20298=@"loc,{#10000},4,9,4,17"
+locations_default(#20298,#10000,4,9,4,17)
+hasLocation(#20297,#20298)
+scopes(#20000,0)
+#20299=@"script;{#10000},4,11"
 #20300=*
-exit_cfg_node(#20300,#20288)
-hasLocation(#20300,#20293)
-successor(#20295,#20296)
-successor(#20296,#20300)
-successor(#20298,#20295)
-toplevel_parent_xml_node(#20288,#20286)
-#20301=*
-xmlChars(#20301,"{{title}}",#20284,0,0,#10000)
-locations_default(#20287,#10000,4,9,4,17)
-xmllocations(#20301,#20287)
+lines(#20300,#20299,"title","")
+#20301=@"loc,{#10000},4,11,4,15"
+locations_default(#20301,#10000,4,11,4,15)
+hasLocation(#20300,#20301)
+numlines(#20299,1,1,0)
+#20302=*
+tokeninfo(#20302,6,#20299,0,"title")
+hasLocation(#20302,#20301)
+#20303=*
+tokeninfo(#20303,0,#20299,1,"")
+#20304=@"loc,{#10000},4,16,4,15"
+locations_default(#20304,#10000,4,16,4,15)
+hasLocation(#20303,#20304)
+toplevels(#20299,4)
+hasLocation(#20299,#20301)
+#20305=@"module;{#10000},4,11"
+scopes(#20305,3)
+scopenodes(#20299,#20305)
+scopenesting(#20305,#20000)
+is_module(#20299)
+#20306=@"var;{this};{#20305}"
+variables(#20306,"this",#20305)
+#20307=*
+stmts(#20307,2,#20299,0,"title")
+hasLocation(#20307,#20301)
+stmt_containers(#20307,#20299)
+#20308=*
+exprs(#20308,79,#20307,0,"title")
+hasLocation(#20308,#20301)
+enclosing_stmt(#20308,#20307)
+expr_containers(#20308,#20299)
+literals("title","title",#20308)
+#20309=@"var;{title};{#20305}"
+variables(#20309,"title",#20305)
+bind(#20308,#20309)
+#20310=*
+entry_cfg_node(#20310,#20299)
+#20311=@"loc,{#10000},4,11,4,10"
+locations_default(#20311,#10000,4,11,4,10)
+hasLocation(#20310,#20311)
+#20312=*
+exit_cfg_node(#20312,#20299)
+hasLocation(#20312,#20304)
+successor(#20307,#20308)
+successor(#20308,#20312)
+successor(#20310,#20307)
+toplevel_parent_xml_node(#20299,#20297)
+#20313=*
+xmlChars(#20313,"{{title}}",#20295,0,0,#10000)
+locations_default(#20298,#10000,4,9,4,17)
+xmllocations(#20313,#20298)
 numlines(#10000,16,14,0)
 filetype(#10000,"html")
diff --git a/javascript/extractor/tests/generatedcode/output/trap/tst.js.trap b/javascript/extractor/tests/generatedcode/output/trap/tst.js.trap
index cf70d72dc5f..7ac0c0a8985 100644
--- a/javascript/extractor/tests/generatedcode/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/generatedcode/output/trap/tst.js.trap
@@ -373,314 +373,316 @@ variables(#20139,"data1",#20000)
 variables(#20140,"data2",#20000)
 #20141=@"var;{string};{#20000}"
 variables(#20141,"string",#20000)
-#20142=*
-stmts(#20142,23,#20001,0,"let dat ... ta1 }};")
-hasLocation(#20142,#20011)
-stmt_containers(#20142,#20001)
+#20142=@"var;{this};{#20000}"
+variables(#20142,"this",#20000)
 #20143=*
-exprs(#20143,64,#20142,0,"data1 = ... ata1 }}")
-#20144=@"loc,{#10000},1,5,1,28"
-locations_default(#20144,#10000,1,5,1,28)
-hasLocation(#20143,#20144)
-enclosing_stmt(#20143,#20142)
-expr_containers(#20143,#20001)
-#20145=*
-exprs(#20145,78,#20143,0,"data1")
-hasLocation(#20145,#20031)
-enclosing_stmt(#20145,#20142)
-expr_containers(#20145,#20001)
-literals("data1","data1",#20145)
-decl(#20145,#20139)
+stmts(#20143,23,#20001,0,"let dat ... ta1 }};")
+hasLocation(#20143,#20011)
+stmt_containers(#20143,#20001)
+#20144=*
+exprs(#20144,64,#20143,0,"data1 = ... ata1 }}")
+#20145=@"loc,{#10000},1,5,1,28"
+locations_default(#20145,#10000,1,5,1,28)
+hasLocation(#20144,#20145)
+enclosing_stmt(#20144,#20143)
+expr_containers(#20144,#20001)
 #20146=*
-exprs(#20146,120,#20143,1,"{{ user_data1 }}")
-#20147=@"loc,{#10000},1,13,1,28"
-locations_default(#20147,#10000,1,13,1,28)
-hasLocation(#20146,#20147)
-enclosing_stmt(#20146,#20142)
+exprs(#20146,78,#20144,0,"data1")
+hasLocation(#20146,#20031)
+enclosing_stmt(#20146,#20143)
 expr_containers(#20146,#20001)
-expr_contains_template_tag_location(#20146,#20147)
-#20148=*
-stmts(#20148,23,#20001,1,"let dat ... a2 }}};")
-hasLocation(#20148,#20013)
-stmt_containers(#20148,#20001)
+literals("data1","data1",#20146)
+decl(#20146,#20139)
+#20147=*
+exprs(#20147,120,#20144,1,"{{ user_data1 }}")
+#20148=@"loc,{#10000},1,13,1,28"
+locations_default(#20148,#10000,1,13,1,28)
+hasLocation(#20147,#20148)
+enclosing_stmt(#20147,#20143)
+expr_containers(#20147,#20001)
+expr_contains_template_tag_location(#20147,#20148)
 #20149=*
-exprs(#20149,64,#20148,0,"data2 = ... ta2 }}}")
-#20150=@"loc,{#10000},2,5,2,30"
-locations_default(#20150,#10000,2,5,2,30)
-hasLocation(#20149,#20150)
-enclosing_stmt(#20149,#20148)
-expr_containers(#20149,#20001)
-#20151=*
-exprs(#20151,78,#20149,0,"data2")
-hasLocation(#20151,#20041)
-enclosing_stmt(#20151,#20148)
-expr_containers(#20151,#20001)
-literals("data2","data2",#20151)
-decl(#20151,#20140)
+stmts(#20149,23,#20001,1,"let dat ... a2 }}};")
+hasLocation(#20149,#20013)
+stmt_containers(#20149,#20001)
+#20150=*
+exprs(#20150,64,#20149,0,"data2 = ... ta2 }}}")
+#20151=@"loc,{#10000},2,5,2,30"
+locations_default(#20151,#10000,2,5,2,30)
+hasLocation(#20150,#20151)
+enclosing_stmt(#20150,#20149)
+expr_containers(#20150,#20001)
 #20152=*
-exprs(#20152,120,#20149,1,"{{{ user_data2 }}}")
-#20153=@"loc,{#10000},2,13,2,30"
-locations_default(#20153,#10000,2,13,2,30)
-hasLocation(#20152,#20153)
-enclosing_stmt(#20152,#20148)
+exprs(#20152,78,#20150,0,"data2")
+hasLocation(#20152,#20041)
+enclosing_stmt(#20152,#20149)
 expr_containers(#20152,#20001)
-expr_contains_template_tag_location(#20152,#20153)
-#20154=*
-stmts(#20154,3,#20001,2,"if ({{s ... g}}) {}")
-hasLocation(#20154,#20015)
-stmt_containers(#20154,#20001)
+literals("data2","data2",#20152)
+decl(#20152,#20140)
+#20153=*
+exprs(#20153,120,#20150,1,"{{{ user_data2 }}}")
+#20154=@"loc,{#10000},2,13,2,30"
+locations_default(#20154,#10000,2,13,2,30)
+hasLocation(#20153,#20154)
+enclosing_stmt(#20153,#20149)
+expr_containers(#20153,#20001)
+expr_contains_template_tag_location(#20153,#20154)
 #20155=*
-exprs(#20155,120,#20154,0,"{{something}}")
-#20156=@"loc,{#10000},3,5,3,17"
-locations_default(#20156,#10000,3,5,3,17)
-hasLocation(#20155,#20156)
-enclosing_stmt(#20155,#20154)
-expr_containers(#20155,#20001)
-expr_contains_template_tag_location(#20155,#20156)
-#20157=*
-stmts(#20157,1,#20154,1,"{}")
-#20158=@"loc,{#10000},3,20,3,21"
-locations_default(#20158,#10000,3,20,3,21)
-hasLocation(#20157,#20158)
-stmt_containers(#20157,#20001)
-#20159=*
-stmts(#20159,2,#20001,3,"foo({{b ... baz}});")
-hasLocation(#20159,#20017)
-stmt_containers(#20159,#20001)
+stmts(#20155,3,#20001,2,"if ({{s ... g}}) {}")
+hasLocation(#20155,#20015)
+stmt_containers(#20155,#20001)
+#20156=*
+exprs(#20156,120,#20155,0,"{{something}}")
+#20157=@"loc,{#10000},3,5,3,17"
+locations_default(#20157,#10000,3,5,3,17)
+hasLocation(#20156,#20157)
+enclosing_stmt(#20156,#20155)
+expr_containers(#20156,#20001)
+expr_contains_template_tag_location(#20156,#20157)
+#20158=*
+stmts(#20158,1,#20155,1,"{}")
+#20159=@"loc,{#10000},3,20,3,21"
+locations_default(#20159,#10000,3,20,3,21)
+hasLocation(#20158,#20159)
+stmt_containers(#20158,#20001)
 #20160=*
-exprs(#20160,13,#20159,0,"foo({{b ... {baz}})")
-#20161=@"loc,{#10000},4,1,4,21"
-locations_default(#20161,#10000,4,1,4,21)
-hasLocation(#20160,#20161)
-enclosing_stmt(#20160,#20159)
-expr_containers(#20160,#20001)
-#20162=*
-exprs(#20162,79,#20160,-1,"foo")
-hasLocation(#20162,#20061)
-enclosing_stmt(#20162,#20159)
-expr_containers(#20162,#20001)
-literals("foo","foo",#20162)
-#20163=@"var;{foo};{#20000}"
-variables(#20163,"foo",#20000)
-bind(#20162,#20163)
-#20164=*
-exprs(#20164,120,#20160,0,"{{bar}}")
-#20165=@"loc,{#10000},4,5,4,11"
-locations_default(#20165,#10000,4,5,4,11)
-hasLocation(#20164,#20165)
-enclosing_stmt(#20164,#20159)
-expr_containers(#20164,#20001)
-expr_contains_template_tag_location(#20164,#20165)
-#20166=*
-exprs(#20166,120,#20160,1,"{{baz}}")
-#20167=@"loc,{#10000},4,14,4,20"
-locations_default(#20167,#10000,4,14,4,20)
-hasLocation(#20166,#20167)
-enclosing_stmt(#20166,#20159)
-expr_containers(#20166,#20001)
-expr_contains_template_tag_location(#20166,#20167)
-#20168=*
-stmts(#20168,1,#20001,4,"{{not_g ... _code}}")
-#20169=@"loc,{#10000},6,1,6,22"
-locations_default(#20169,#10000,6,1,6,22)
-hasLocation(#20168,#20169)
-stmt_containers(#20168,#20001)
-#20170=*
-stmts(#20170,1,#20168,0,"{not_generated_code}")
-#20171=@"loc,{#10000},6,2,6,21"
-locations_default(#20171,#10000,6,2,6,21)
-hasLocation(#20170,#20171)
-stmt_containers(#20170,#20001)
-#20172=*
-stmts(#20172,2,#20170,0,"not_generated_code")
-hasLocation(#20172,#20079)
-stmt_containers(#20172,#20001)
+stmts(#20160,2,#20001,3,"foo({{b ... baz}});")
+hasLocation(#20160,#20017)
+stmt_containers(#20160,#20001)
+#20161=*
+exprs(#20161,13,#20160,0,"foo({{b ... {baz}})")
+#20162=@"loc,{#10000},4,1,4,21"
+locations_default(#20162,#10000,4,1,4,21)
+hasLocation(#20161,#20162)
+enclosing_stmt(#20161,#20160)
+expr_containers(#20161,#20001)
+#20163=*
+exprs(#20163,79,#20161,-1,"foo")
+hasLocation(#20163,#20061)
+enclosing_stmt(#20163,#20160)
+expr_containers(#20163,#20001)
+literals("foo","foo",#20163)
+#20164=@"var;{foo};{#20000}"
+variables(#20164,"foo",#20000)
+bind(#20163,#20164)
+#20165=*
+exprs(#20165,120,#20161,0,"{{bar}}")
+#20166=@"loc,{#10000},4,5,4,11"
+locations_default(#20166,#10000,4,5,4,11)
+hasLocation(#20165,#20166)
+enclosing_stmt(#20165,#20160)
+expr_containers(#20165,#20001)
+expr_contains_template_tag_location(#20165,#20166)
+#20167=*
+exprs(#20167,120,#20161,1,"{{baz}}")
+#20168=@"loc,{#10000},4,14,4,20"
+locations_default(#20168,#10000,4,14,4,20)
+hasLocation(#20167,#20168)
+enclosing_stmt(#20167,#20160)
+expr_containers(#20167,#20001)
+expr_contains_template_tag_location(#20167,#20168)
+#20169=*
+stmts(#20169,1,#20001,4,"{{not_g ... _code}}")
+#20170=@"loc,{#10000},6,1,6,22"
+locations_default(#20170,#10000,6,1,6,22)
+hasLocation(#20169,#20170)
+stmt_containers(#20169,#20001)
+#20171=*
+stmts(#20171,1,#20169,0,"{not_generated_code}")
+#20172=@"loc,{#10000},6,2,6,21"
+locations_default(#20172,#10000,6,2,6,21)
+hasLocation(#20171,#20172)
+stmt_containers(#20171,#20001)
 #20173=*
-exprs(#20173,79,#20172,0,"not_generated_code")
+stmts(#20173,2,#20171,0,"not_generated_code")
 hasLocation(#20173,#20079)
-enclosing_stmt(#20173,#20172)
-expr_containers(#20173,#20001)
-literals("not_generated_code","not_generated_code",#20173)
-#20174=@"var;{not_generated_code};{#20000}"
-variables(#20174,"not_generated_code",#20000)
-bind(#20173,#20174)
-#20175=*
-stmts(#20175,1,#20001,5,"{{ if ( ...  { } }}")
-#20176=@"loc,{#10000},7,1,7,33"
-locations_default(#20176,#10000,7,1,7,33)
-hasLocation(#20175,#20176)
-stmt_containers(#20175,#20001)
-#20177=*
-stmts(#20177,1,#20175,0,"{ if (n ... ) { } }")
-#20178=@"loc,{#10000},7,2,7,32"
-locations_default(#20178,#10000,7,2,7,32)
-hasLocation(#20177,#20178)
-stmt_containers(#20177,#20001)
-#20179=*
-stmts(#20179,3,#20177,0,"if (not ... de) { }")
-#20180=@"loc,{#10000},7,4,7,30"
-locations_default(#20180,#10000,7,4,7,30)
-hasLocation(#20179,#20180)
-stmt_containers(#20179,#20001)
-#20181=*
-exprs(#20181,79,#20179,0,"not_generated_code")
-hasLocation(#20181,#20093)
-enclosing_stmt(#20181,#20179)
-expr_containers(#20181,#20001)
-literals("not_generated_code","not_generated_code",#20181)
-bind(#20181,#20174)
+stmt_containers(#20173,#20001)
+#20174=*
+exprs(#20174,79,#20173,0,"not_generated_code")
+hasLocation(#20174,#20079)
+enclosing_stmt(#20174,#20173)
+expr_containers(#20174,#20001)
+literals("not_generated_code","not_generated_code",#20174)
+#20175=@"var;{not_generated_code};{#20000}"
+variables(#20175,"not_generated_code",#20000)
+bind(#20174,#20175)
+#20176=*
+stmts(#20176,1,#20001,5,"{{ if ( ...  { } }}")
+#20177=@"loc,{#10000},7,1,7,33"
+locations_default(#20177,#10000,7,1,7,33)
+hasLocation(#20176,#20177)
+stmt_containers(#20176,#20001)
+#20178=*
+stmts(#20178,1,#20176,0,"{ if (n ... ) { } }")
+#20179=@"loc,{#10000},7,2,7,32"
+locations_default(#20179,#10000,7,2,7,32)
+hasLocation(#20178,#20179)
+stmt_containers(#20178,#20001)
+#20180=*
+stmts(#20180,3,#20178,0,"if (not ... de) { }")
+#20181=@"loc,{#10000},7,4,7,30"
+locations_default(#20181,#10000,7,4,7,30)
+hasLocation(#20180,#20181)
+stmt_containers(#20180,#20001)
 #20182=*
-stmts(#20182,1,#20179,1,"{ }")
-#20183=@"loc,{#10000},7,28,7,30"
-locations_default(#20183,#10000,7,28,7,30)
-hasLocation(#20182,#20183)
-stmt_containers(#20182,#20001)
-#20184=*
-stmts(#20184,3,#20001,6,"if (1 = ... _code}}")
-#20185=@"loc,{#10000},8,1,8,34"
-locations_default(#20185,#10000,8,1,8,34)
-hasLocation(#20184,#20185)
-stmt_containers(#20184,#20001)
-#20186=*
-exprs(#20186,23,#20184,0,"1 == 2")
-#20187=@"loc,{#10000},8,5,8,10"
-locations_default(#20187,#10000,8,5,8,10)
-hasLocation(#20186,#20187)
-enclosing_stmt(#20186,#20184)
-expr_containers(#20186,#20001)
-#20188=*
-exprs(#20188,3,#20186,0,"1")
-hasLocation(#20188,#20109)
-enclosing_stmt(#20188,#20184)
-expr_containers(#20188,#20001)
-literals("1","1",#20188)
+exprs(#20182,79,#20180,0,"not_generated_code")
+hasLocation(#20182,#20093)
+enclosing_stmt(#20182,#20180)
+expr_containers(#20182,#20001)
+literals("not_generated_code","not_generated_code",#20182)
+bind(#20182,#20175)
+#20183=*
+stmts(#20183,1,#20180,1,"{ }")
+#20184=@"loc,{#10000},7,28,7,30"
+locations_default(#20184,#10000,7,28,7,30)
+hasLocation(#20183,#20184)
+stmt_containers(#20183,#20001)
+#20185=*
+stmts(#20185,3,#20001,6,"if (1 = ... _code}}")
+#20186=@"loc,{#10000},8,1,8,34"
+locations_default(#20186,#10000,8,1,8,34)
+hasLocation(#20185,#20186)
+stmt_containers(#20185,#20001)
+#20187=*
+exprs(#20187,23,#20185,0,"1 == 2")
+#20188=@"loc,{#10000},8,5,8,10"
+locations_default(#20188,#10000,8,5,8,10)
+hasLocation(#20187,#20188)
+enclosing_stmt(#20187,#20185)
+expr_containers(#20187,#20001)
 #20189=*
-exprs(#20189,3,#20186,1,"2")
-hasLocation(#20189,#20113)
-enclosing_stmt(#20189,#20184)
+exprs(#20189,3,#20187,0,"1")
+hasLocation(#20189,#20109)
+enclosing_stmt(#20189,#20185)
 expr_containers(#20189,#20001)
-literals("2","2",#20189)
+literals("1","1",#20189)
 #20190=*
-stmts(#20190,1,#20184,1,"{{not_g ... _code}}")
-#20191=@"loc,{#10000},8,13,8,34"
-locations_default(#20191,#10000,8,13,8,34)
-hasLocation(#20190,#20191)
-stmt_containers(#20190,#20001)
-#20192=*
-stmts(#20192,1,#20190,0,"{not_generated_code}")
-#20193=@"loc,{#10000},8,14,8,33"
-locations_default(#20193,#10000,8,14,8,33)
-hasLocation(#20192,#20193)
-stmt_containers(#20192,#20001)
-#20194=*
-stmts(#20194,2,#20192,0,"not_generated_code")
-hasLocation(#20194,#20121)
-stmt_containers(#20194,#20001)
+exprs(#20190,3,#20187,1,"2")
+hasLocation(#20190,#20113)
+enclosing_stmt(#20190,#20185)
+expr_containers(#20190,#20001)
+literals("2","2",#20190)
+#20191=*
+stmts(#20191,1,#20185,1,"{{not_g ... _code}}")
+#20192=@"loc,{#10000},8,13,8,34"
+locations_default(#20192,#10000,8,13,8,34)
+hasLocation(#20191,#20192)
+stmt_containers(#20191,#20001)
+#20193=*
+stmts(#20193,1,#20191,0,"{not_generated_code}")
+#20194=@"loc,{#10000},8,14,8,33"
+locations_default(#20194,#10000,8,14,8,33)
+hasLocation(#20193,#20194)
+stmt_containers(#20193,#20001)
 #20195=*
-exprs(#20195,79,#20194,0,"not_generated_code")
+stmts(#20195,2,#20193,0,"not_generated_code")
 hasLocation(#20195,#20121)
-enclosing_stmt(#20195,#20194)
-expr_containers(#20195,#20001)
-literals("not_generated_code","not_generated_code",#20195)
-bind(#20195,#20174)
+stmt_containers(#20195,#20001)
 #20196=*
-stmts(#20196,23,#20001,7,"let str ... de }}"";")
-#20197=@"loc,{#10000},9,1,9,40"
-locations_default(#20197,#10000,9,1,9,40)
-hasLocation(#20196,#20197)
-stmt_containers(#20196,#20001)
-#20198=*
-exprs(#20198,64,#20196,0,"string  ... ode }}""")
-#20199=@"loc,{#10000},9,5,9,39"
-locations_default(#20199,#10000,9,5,9,39)
-hasLocation(#20198,#20199)
-enclosing_stmt(#20198,#20196)
-expr_containers(#20198,#20001)
-#20200=*
-exprs(#20200,78,#20198,0,"string")
-hasLocation(#20200,#20129)
-enclosing_stmt(#20200,#20196)
-expr_containers(#20200,#20001)
-literals("string","string",#20200)
-decl(#20200,#20141)
+exprs(#20196,79,#20195,0,"not_generated_code")
+hasLocation(#20196,#20121)
+enclosing_stmt(#20196,#20195)
+expr_containers(#20196,#20001)
+literals("not_generated_code","not_generated_code",#20196)
+bind(#20196,#20175)
+#20197=*
+stmts(#20197,23,#20001,7,"let str ... de }}"";")
+#20198=@"loc,{#10000},9,1,9,40"
+locations_default(#20198,#10000,9,1,9,40)
+hasLocation(#20197,#20198)
+stmt_containers(#20197,#20001)
+#20199=*
+exprs(#20199,64,#20197,0,"string  ... ode }}""")
+#20200=@"loc,{#10000},9,5,9,39"
+locations_default(#20200,#10000,9,5,9,39)
+hasLocation(#20199,#20200)
+enclosing_stmt(#20199,#20197)
+expr_containers(#20199,#20001)
 #20201=*
-exprs(#20201,4,#20198,1,"""{{ not ... ode }}""")
-hasLocation(#20201,#20133)
-enclosing_stmt(#20201,#20196)
+exprs(#20201,78,#20199,0,"string")
+hasLocation(#20201,#20129)
+enclosing_stmt(#20201,#20197)
 expr_containers(#20201,#20001)
-literals("{{ not_generated_code }}","""{{ not_generated_code }}""",#20201)
+literals("string","string",#20201)
+decl(#20201,#20141)
 #20202=*
-entry_cfg_node(#20202,#20001)
-#20203=@"loc,{#10000},1,1,1,0"
-locations_default(#20203,#10000,1,1,1,0)
-hasLocation(#20202,#20203)
-#20204=*
-exit_cfg_node(#20204,#20001)
-hasLocation(#20204,#20137)
-successor(#20196,#20200)
-successor(#20201,#20198)
-successor(#20200,#20201)
-successor(#20198,#20204)
-successor(#20184,#20188)
-successor(#20189,#20186)
-successor(#20188,#20189)
+exprs(#20202,4,#20199,1,"""{{ not ... ode }}""")
+hasLocation(#20202,#20133)
+enclosing_stmt(#20202,#20197)
+expr_containers(#20202,#20001)
+literals("{{ not_generated_code }}","""{{ not_generated_code }}""",#20202)
+#20203=*
+entry_cfg_node(#20203,#20001)
+#20204=@"loc,{#10000},1,1,1,0"
+locations_default(#20204,#10000,1,1,1,0)
+hasLocation(#20203,#20204)
 #20205=*
-guard_node(#20205,1,#20186)
-hasLocation(#20205,#20187)
-successor(#20205,#20190)
+exit_cfg_node(#20205,#20001)
+hasLocation(#20205,#20137)
+successor(#20197,#20201)
+successor(#20202,#20199)
+successor(#20201,#20202)
+successor(#20199,#20205)
+successor(#20185,#20189)
+successor(#20190,#20187)
+successor(#20189,#20190)
 #20206=*
-guard_node(#20206,0,#20186)
-hasLocation(#20206,#20187)
-successor(#20206,#20196)
-successor(#20186,#20205)
-successor(#20186,#20206)
-successor(#20194,#20195)
-successor(#20195,#20196)
-successor(#20192,#20194)
-successor(#20190,#20192)
-successor(#20179,#20181)
+guard_node(#20206,1,#20187)
+hasLocation(#20206,#20188)
+successor(#20206,#20191)
 #20207=*
-guard_node(#20207,1,#20181)
-hasLocation(#20207,#20093)
-successor(#20207,#20182)
+guard_node(#20207,0,#20187)
+hasLocation(#20207,#20188)
+successor(#20207,#20197)
+successor(#20187,#20206)
+successor(#20187,#20207)
+successor(#20195,#20196)
+successor(#20196,#20197)
+successor(#20193,#20195)
+successor(#20191,#20193)
+successor(#20180,#20182)
 #20208=*
-guard_node(#20208,0,#20181)
+guard_node(#20208,1,#20182)
 hasLocation(#20208,#20093)
-successor(#20208,#20184)
-successor(#20181,#20207)
-successor(#20181,#20208)
-successor(#20182,#20184)
-successor(#20177,#20179)
-successor(#20175,#20177)
-successor(#20172,#20173)
-successor(#20173,#20175)
-successor(#20170,#20172)
-successor(#20168,#20170)
-successor(#20159,#20162)
-successor(#20166,#20160)
-successor(#20164,#20166)
-successor(#20162,#20164)
-successor(#20160,#20168)
-successor(#20154,#20155)
+successor(#20208,#20183)
 #20209=*
-guard_node(#20209,1,#20155)
-hasLocation(#20209,#20156)
-successor(#20209,#20157)
+guard_node(#20209,0,#20182)
+hasLocation(#20209,#20093)
+successor(#20209,#20185)
+successor(#20182,#20208)
+successor(#20182,#20209)
+successor(#20183,#20185)
+successor(#20178,#20180)
+successor(#20176,#20178)
+successor(#20173,#20174)
+successor(#20174,#20176)
+successor(#20171,#20173)
+successor(#20169,#20171)
+successor(#20160,#20163)
+successor(#20167,#20161)
+successor(#20165,#20167)
+successor(#20163,#20165)
+successor(#20161,#20169)
+successor(#20155,#20156)
 #20210=*
-guard_node(#20210,0,#20155)
-hasLocation(#20210,#20156)
-successor(#20210,#20159)
-successor(#20155,#20209)
-successor(#20155,#20210)
-successor(#20157,#20159)
-successor(#20148,#20151)
-successor(#20152,#20149)
-successor(#20151,#20152)
-successor(#20149,#20154)
-successor(#20142,#20145)
-successor(#20146,#20143)
-successor(#20145,#20146)
-successor(#20143,#20148)
-successor(#20202,#20142)
+guard_node(#20210,1,#20156)
+hasLocation(#20210,#20157)
+successor(#20210,#20158)
+#20211=*
+guard_node(#20211,0,#20156)
+hasLocation(#20211,#20157)
+successor(#20211,#20160)
+successor(#20156,#20210)
+successor(#20156,#20211)
+successor(#20158,#20160)
+successor(#20149,#20152)
+successor(#20153,#20150)
+successor(#20152,#20153)
+successor(#20150,#20155)
+successor(#20143,#20146)
+successor(#20147,#20144)
+successor(#20146,#20147)
+successor(#20144,#20149)
+successor(#20203,#20143)
 numlines(#10000,9,8,4)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/helloworld/output/trap/hello.js.trap b/javascript/extractor/tests/helloworld/output/trap/hello.js.trap
index 610ae0392b4..d365e322b10 100644
--- a/javascript/extractor/tests/helloworld/output/trap/hello.js.trap
+++ b/javascript/extractor/tests/helloworld/output/trap/hello.js.trap
@@ -47,50 +47,52 @@ locations_default(#20015,#10000,1,24,1,23)
 hasLocation(#20014,#20015)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20016=*
-stmts(#20016,2,#20001,0,"alert("" ... rld!"");")
-hasLocation(#20016,#20003)
-stmt_containers(#20016,#20001)
+#20016=@"var;{this};{#20000}"
+variables(#20016,"this",#20000)
 #20017=*
-exprs(#20017,13,#20016,0,"alert("" ... orld!"")")
-#20018=@"loc,{#10000},1,1,1,22"
-locations_default(#20018,#10000,1,1,1,22)
-hasLocation(#20017,#20018)
-enclosing_stmt(#20017,#20016)
-expr_containers(#20017,#20001)
-#20019=*
-exprs(#20019,79,#20017,-1,"alert")
-hasLocation(#20019,#20005)
-enclosing_stmt(#20019,#20016)
-expr_containers(#20019,#20001)
-literals("alert","alert",#20019)
-#20020=@"var;{alert};{#20000}"
-variables(#20020,"alert",#20000)
-bind(#20019,#20020)
-#20021=*
-exprs(#20021,4,#20017,0,"""Hello, world!""")
-hasLocation(#20021,#20009)
-enclosing_stmt(#20021,#20016)
-expr_containers(#20021,#20001)
-literals("Hello, world!","""Hello, world!""",#20021)
+stmts(#20017,2,#20001,0,"alert("" ... rld!"");")
+hasLocation(#20017,#20003)
+stmt_containers(#20017,#20001)
+#20018=*
+exprs(#20018,13,#20017,0,"alert("" ... orld!"")")
+#20019=@"loc,{#10000},1,1,1,22"
+locations_default(#20019,#10000,1,1,1,22)
+hasLocation(#20018,#20019)
+enclosing_stmt(#20018,#20017)
+expr_containers(#20018,#20001)
+#20020=*
+exprs(#20020,79,#20018,-1,"alert")
+hasLocation(#20020,#20005)
+enclosing_stmt(#20020,#20017)
+expr_containers(#20020,#20001)
+literals("alert","alert",#20020)
+#20021=@"var;{alert};{#20000}"
+variables(#20021,"alert",#20000)
+bind(#20020,#20021)
 #20022=*
-regexpterm(#20022,14,#20021,0,"Hello, world!")
-#20023=@"loc,{#10000},1,8,1,20"
-locations_default(#20023,#10000,1,8,1,20)
-hasLocation(#20022,#20023)
-regexp_const_value(#20022,"Hello, world!")
-#20024=*
-entry_cfg_node(#20024,#20001)
-#20025=@"loc,{#10000},1,1,1,0"
-locations_default(#20025,#10000,1,1,1,0)
-hasLocation(#20024,#20025)
-#20026=*
-exit_cfg_node(#20026,#20001)
-hasLocation(#20026,#20015)
-successor(#20016,#20019)
-successor(#20021,#20017)
-successor(#20019,#20021)
-successor(#20017,#20026)
-successor(#20024,#20016)
+exprs(#20022,4,#20018,0,"""Hello, world!""")
+hasLocation(#20022,#20009)
+enclosing_stmt(#20022,#20017)
+expr_containers(#20022,#20001)
+literals("Hello, world!","""Hello, world!""",#20022)
+#20023=*
+regexpterm(#20023,14,#20022,0,"Hello, world!")
+#20024=@"loc,{#10000},1,8,1,20"
+locations_default(#20024,#10000,1,8,1,20)
+hasLocation(#20023,#20024)
+regexp_const_value(#20023,"Hello, world!")
+#20025=*
+entry_cfg_node(#20025,#20001)
+#20026=@"loc,{#10000},1,1,1,0"
+locations_default(#20026,#10000,1,1,1,0)
+hasLocation(#20025,#20026)
+#20027=*
+exit_cfg_node(#20027,#20001)
+hasLocation(#20027,#20015)
+successor(#20017,#20020)
+successor(#20022,#20018)
+successor(#20020,#20022)
+successor(#20018,#20027)
+successor(#20025,#20017)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/html/output/trap/entities.html.trap b/javascript/extractor/tests/html/output/trap/entities.html.trap
index 2b1ad973920..794bf948df0 100644
--- a/javascript/extractor/tests/html/output/trap/entities.html.trap
+++ b/javascript/extractor/tests/html/output/trap/entities.html.trap
@@ -58,94 +58,96 @@ locations_default(#20020,#10000,6,49,6,48)
 hasLocation(#20019,#20020)
 toplevels(#20002,3)
 hasLocation(#20002,#20004)
-#20021=*
-stmts(#20021,2,#20002,0,"void(alert(""Nope!""))")
-hasLocation(#20021,#20004)
-stmt_containers(#20021,#20002)
+#20021=@"var;{this};{#20000}"
+variables(#20021,"this",#20000)
 #20022=*
-exprs(#20022,21,#20021,0,"void(alert(""Nope!""))")
+stmts(#20022,2,#20002,0,"void(alert(""Nope!""))")
 hasLocation(#20022,#20004)
-enclosing_stmt(#20022,#20021)
-expr_containers(#20022,#20002)
+stmt_containers(#20022,#20002)
 #20023=*
-exprs(#20023,63,#20022,0,"(alert(""Nope!""))")
-#20024=@"loc,{#10000},6,33,6,48"
-locations_default(#20024,#10000,6,33,6,48)
-hasLocation(#20023,#20024)
-enclosing_stmt(#20023,#20021)
+exprs(#20023,21,#20022,0,"void(alert(""Nope!""))")
+hasLocation(#20023,#20004)
+enclosing_stmt(#20023,#20022)
 expr_containers(#20023,#20002)
-#20025=*
-exprs(#20025,13,#20023,0,"alert(""Nope!"")")
-#20026=@"loc,{#10000},6,34,6,47"
-locations_default(#20026,#10000,6,34,6,47)
-hasLocation(#20025,#20026)
-enclosing_stmt(#20025,#20021)
-expr_containers(#20025,#20002)
-#20027=*
-exprs(#20027,79,#20025,-1,"alert")
-hasLocation(#20027,#20010)
-enclosing_stmt(#20027,#20021)
-expr_containers(#20027,#20002)
-literals("alert","alert",#20027)
-#20028=@"var;{alert};{#20000}"
-variables(#20028,"alert",#20000)
-bind(#20027,#20028)
-#20029=*
-exprs(#20029,4,#20025,0,"""Nope!""")
-hasLocation(#20029,#20014)
-enclosing_stmt(#20029,#20021)
-expr_containers(#20029,#20002)
-literals("Nope!","""Nope!""",#20029)
+#20024=*
+exprs(#20024,63,#20023,0,"(alert(""Nope!""))")
+#20025=@"loc,{#10000},6,33,6,48"
+locations_default(#20025,#10000,6,33,6,48)
+hasLocation(#20024,#20025)
+enclosing_stmt(#20024,#20022)
+expr_containers(#20024,#20002)
+#20026=*
+exprs(#20026,13,#20024,0,"alert(""Nope!"")")
+#20027=@"loc,{#10000},6,34,6,47"
+locations_default(#20027,#10000,6,34,6,47)
+hasLocation(#20026,#20027)
+enclosing_stmt(#20026,#20022)
+expr_containers(#20026,#20002)
+#20028=*
+exprs(#20028,79,#20026,-1,"alert")
+hasLocation(#20028,#20010)
+enclosing_stmt(#20028,#20022)
+expr_containers(#20028,#20002)
+literals("alert","alert",#20028)
+#20029=@"var;{alert};{#20000}"
+variables(#20029,"alert",#20000)
+bind(#20028,#20029)
 #20030=*
-regexpterm(#20030,14,#20029,0,"Nope!")
-#20031=@"loc,{#10000},6,41,6,45"
-locations_default(#20031,#10000,6,41,6,45)
-hasLocation(#20030,#20031)
-regexp_const_value(#20030,"Nope!")
-#20032=*
-entry_cfg_node(#20032,#20002)
-#20033=@"loc,{#10000},6,29,6,28"
-locations_default(#20033,#10000,6,29,6,28)
-hasLocation(#20032,#20033)
-#20034=*
-exit_cfg_node(#20034,#20002)
-hasLocation(#20034,#20020)
-successor(#20021,#20023)
-successor(#20023,#20027)
-successor(#20029,#20025)
-successor(#20027,#20029)
-successor(#20025,#20022)
-successor(#20022,#20034)
-successor(#20032,#20021)
-toplevel_parent_xml_node(#20002,#20001)
+exprs(#20030,4,#20026,0,"""Nope!""")
+hasLocation(#20030,#20014)
+enclosing_stmt(#20030,#20022)
+expr_containers(#20030,#20002)
+literals("Nope!","""Nope!""",#20030)
+#20031=*
+regexpterm(#20031,14,#20030,0,"Nope!")
+#20032=@"loc,{#10000},6,41,6,45"
+locations_default(#20032,#10000,6,41,6,45)
+hasLocation(#20031,#20032)
+regexp_const_value(#20031,"Nope!")
+#20033=*
+entry_cfg_node(#20033,#20002)
+#20034=@"loc,{#10000},6,29,6,28"
+locations_default(#20034,#10000,6,29,6,28)
+hasLocation(#20033,#20034)
 #20035=*
-xmlElements(#20035,"html",#10000,0,#10000)
-#20036=@"loc,{#10000},1,1,8,7"
-locations_default(#20036,#10000,1,1,8,7)
-xmllocations(#20035,#20036)
-#20037=*
-xmlElements(#20037,"body",#20035,1,#10000)
-#20038=@"loc,{#10000},5,5,7,11"
-locations_default(#20038,#10000,5,5,7,11)
-xmllocations(#20037,#20038)
-#20039=*
-xmlElements(#20039,"a",#20037,0,#10000)
-#20040=@"loc,{#10000},6,9,6,80"
-locations_default(#20040,#10000,6,9,6,80)
-xmllocations(#20039,#20040)
-xmlAttrs(#20001,#20039,"href","javascript:void(alert(""Nope!""))",0,#10000)
-#20041=@"loc,{#10000},6,12,6,65"
-locations_default(#20041,#10000,6,12,6,65)
-xmllocations(#20001,#20041)
-#20042=*
-xmlElements(#20042,"head",#20035,0,#10000)
-#20043=@"loc,{#10000},2,5,4,11"
-locations_default(#20043,#10000,2,5,4,11)
-xmllocations(#20042,#20043)
-#20044=*
-xmlElements(#20044,"title",#20042,0,#10000)
-#20045=@"loc,{#10000},3,9,3,32"
-locations_default(#20045,#10000,3,9,3,32)
-xmllocations(#20044,#20045)
+exit_cfg_node(#20035,#20002)
+hasLocation(#20035,#20020)
+successor(#20022,#20024)
+successor(#20024,#20028)
+successor(#20030,#20026)
+successor(#20028,#20030)
+successor(#20026,#20023)
+successor(#20023,#20035)
+successor(#20033,#20022)
+toplevel_parent_xml_node(#20002,#20001)
+#20036=*
+xmlElements(#20036,"html",#10000,0,#10000)
+#20037=@"loc,{#10000},1,1,8,7"
+locations_default(#20037,#10000,1,1,8,7)
+xmllocations(#20036,#20037)
+#20038=*
+xmlElements(#20038,"body",#20036,1,#10000)
+#20039=@"loc,{#10000},5,5,7,11"
+locations_default(#20039,#10000,5,5,7,11)
+xmllocations(#20038,#20039)
+#20040=*
+xmlElements(#20040,"a",#20038,0,#10000)
+#20041=@"loc,{#10000},6,9,6,80"
+locations_default(#20041,#10000,6,9,6,80)
+xmllocations(#20040,#20041)
+xmlAttrs(#20001,#20040,"href","javascript:void(alert(""Nope!""))",0,#10000)
+#20042=@"loc,{#10000},6,12,6,65"
+locations_default(#20042,#10000,6,12,6,65)
+xmllocations(#20001,#20042)
+#20043=*
+xmlElements(#20043,"head",#20036,0,#10000)
+#20044=@"loc,{#10000},2,5,4,11"
+locations_default(#20044,#10000,2,5,4,11)
+xmllocations(#20043,#20044)
+#20045=*
+xmlElements(#20045,"title",#20043,0,#10000)
+#20046=@"loc,{#10000},3,9,3,32"
+locations_default(#20046,#10000,3,9,3,32)
+xmllocations(#20045,#20046)
 numlines(#10000,8,1,0)
 filetype(#10000,"html")
diff --git a/javascript/extractor/tests/html/output/trap/module.html.trap b/javascript/extractor/tests/html/output/trap/module.html.trap
index cb4a5874429..1e8a7ccc104 100644
--- a/javascript/extractor/tests/html/output/trap/module.html.trap
+++ b/javascript/extractor/tests/html/output/trap/module.html.trap
@@ -115,114 +115,116 @@ local_namespace_names(#20039,"foo",#20036)
 variables(#20037,"foo",#20036)
 local_type_names(#20038,"foo",#20036)
 local_namespace_names(#20039,"foo",#20036)
-#20040=*
-stmts(#20040,27,#20002,0,"import  ...  'bar';")
-#20041=@"loc,{#10000},5,13,5,34"
-locations_default(#20041,#10000,5,13,5,34)
-hasLocation(#20040,#20041)
-stmt_containers(#20040,#20002)
-#20042=*
-exprs(#20042,4,#20040,-1,"'bar'")
-hasLocation(#20042,#20018)
-enclosing_stmt(#20042,#20040)
-expr_containers(#20042,#20002)
-literals("bar","'bar'",#20042)
+#20040=@"var;{this};{#20036}"
+variables(#20040,"this",#20036)
+#20041=*
+stmts(#20041,27,#20002,0,"import  ...  'bar';")
+#20042=@"loc,{#10000},5,13,5,34"
+locations_default(#20042,#10000,5,13,5,34)
+hasLocation(#20041,#20042)
+stmt_containers(#20041,#20002)
 #20043=*
-regexpterm(#20043,14,#20042,0,"bar")
-#20044=@"loc,{#10000},5,30,5,32"
-locations_default(#20044,#10000,5,30,5,32)
-hasLocation(#20043,#20044)
-regexp_const_value(#20043,"bar")
-#20045=*
-exprs(#20045,84,#20040,0,"foo")
-hasLocation(#20045,#20014)
-enclosing_stmt(#20045,#20040)
-expr_containers(#20045,#20002)
+exprs(#20043,4,#20041,-1,"'bar'")
+hasLocation(#20043,#20018)
+enclosing_stmt(#20043,#20041)
+expr_containers(#20043,#20002)
+literals("bar","'bar'",#20043)
+#20044=*
+regexpterm(#20044,14,#20043,0,"bar")
+#20045=@"loc,{#10000},5,30,5,32"
+locations_default(#20045,#10000,5,30,5,32)
+hasLocation(#20044,#20045)
+regexp_const_value(#20044,"bar")
 #20046=*
-exprs(#20046,78,#20045,1,"foo")
+exprs(#20046,84,#20041,0,"foo")
 hasLocation(#20046,#20014)
-enclosing_stmt(#20046,#20040)
+enclosing_stmt(#20046,#20041)
 expr_containers(#20046,#20002)
-literals("foo","foo",#20046)
-decl(#20046,#20037)
-typedecl(#20046,#20038)
-namespacedecl(#20046,#20039)
 #20047=*
-stmts(#20047,2,#20002,1,"foo.baz();")
-#20048=@"loc,{#10000},6,13,6,22"
-locations_default(#20048,#10000,6,13,6,22)
-hasLocation(#20047,#20048)
-stmt_containers(#20047,#20002)
-#20049=*
-exprs(#20049,13,#20047,0,"foo.baz()")
-#20050=@"loc,{#10000},6,13,6,21"
-locations_default(#20050,#10000,6,13,6,21)
-hasLocation(#20049,#20050)
-enclosing_stmt(#20049,#20047)
-expr_containers(#20049,#20002)
-#20051=*
-exprs(#20051,14,#20049,-1,"foo.baz")
-#20052=@"loc,{#10000},6,13,6,19"
-locations_default(#20052,#10000,6,13,6,19)
-hasLocation(#20051,#20052)
-enclosing_stmt(#20051,#20047)
-expr_containers(#20051,#20002)
-#20053=*
-exprs(#20053,79,#20051,0,"foo")
-hasLocation(#20053,#20022)
-enclosing_stmt(#20053,#20047)
-expr_containers(#20053,#20002)
-literals("foo","foo",#20053)
-bind(#20053,#20037)
+exprs(#20047,78,#20046,1,"foo")
+hasLocation(#20047,#20014)
+enclosing_stmt(#20047,#20041)
+expr_containers(#20047,#20002)
+literals("foo","foo",#20047)
+decl(#20047,#20037)
+typedecl(#20047,#20038)
+namespacedecl(#20047,#20039)
+#20048=*
+stmts(#20048,2,#20002,1,"foo.baz();")
+#20049=@"loc,{#10000},6,13,6,22"
+locations_default(#20049,#10000,6,13,6,22)
+hasLocation(#20048,#20049)
+stmt_containers(#20048,#20002)
+#20050=*
+exprs(#20050,13,#20048,0,"foo.baz()")
+#20051=@"loc,{#10000},6,13,6,21"
+locations_default(#20051,#10000,6,13,6,21)
+hasLocation(#20050,#20051)
+enclosing_stmt(#20050,#20048)
+expr_containers(#20050,#20002)
+#20052=*
+exprs(#20052,14,#20050,-1,"foo.baz")
+#20053=@"loc,{#10000},6,13,6,19"
+locations_default(#20053,#10000,6,13,6,19)
+hasLocation(#20052,#20053)
+enclosing_stmt(#20052,#20048)
+expr_containers(#20052,#20002)
 #20054=*
-exprs(#20054,0,#20051,1,"baz")
-hasLocation(#20054,#20026)
-enclosing_stmt(#20054,#20047)
+exprs(#20054,79,#20052,0,"foo")
+hasLocation(#20054,#20022)
+enclosing_stmt(#20054,#20048)
 expr_containers(#20054,#20002)
-literals("baz","baz",#20054)
+literals("foo","foo",#20054)
+bind(#20054,#20037)
 #20055=*
-entry_cfg_node(#20055,#20002)
-hasLocation(#20055,#20004)
+exprs(#20055,0,#20052,1,"baz")
+hasLocation(#20055,#20026)
+enclosing_stmt(#20055,#20048)
+expr_containers(#20055,#20002)
+literals("baz","baz",#20055)
 #20056=*
-exit_cfg_node(#20056,#20002)
-hasLocation(#20056,#20034)
-successor(#20047,#20053)
-successor(#20054,#20051)
-successor(#20053,#20054)
-successor(#20051,#20049)
-successor(#20049,#20056)
-successor(#20040,#20047)
-successor(#20045,#20040)
-successor(#20055,#20045)
-toplevel_parent_xml_node(#20002,#20001)
+entry_cfg_node(#20056,#20002)
+hasLocation(#20056,#20004)
 #20057=*
-xmlElements(#20057,"html",#10000,0,#10000)
-#20058=@"loc,{#10000},1,1,11,7"
-locations_default(#20058,#10000,1,1,11,7)
-xmllocations(#20057,#20058)
-#20059=*
-xmlElements(#20059,"body",#20057,1,#10000)
-#20060=@"loc,{#10000},9,5,10,11"
-locations_default(#20060,#10000,9,5,10,11)
-xmllocations(#20059,#20060)
-#20061=*
-xmlElements(#20061,"head",#20057,0,#10000)
-#20062=@"loc,{#10000},2,5,8,11"
-locations_default(#20062,#10000,2,5,8,11)
-xmllocations(#20061,#20062)
-xmlElements(#20001,"script",#20061,1,#10000)
-#20063=@"loc,{#10000},4,9,7,17"
-locations_default(#20063,#10000,4,9,7,17)
-xmllocations(#20001,#20063)
-#20064=*
-xmlAttrs(#20064,#20001,"type","module",0,#10000)
-#20065=@"loc,{#10000},4,17,4,29"
-locations_default(#20065,#10000,4,17,4,29)
-xmllocations(#20064,#20065)
-#20066=*
-xmlElements(#20066,"title",#20061,0,#10000)
-#20067=@"loc,{#10000},3,9,3,32"
-locations_default(#20067,#10000,3,9,3,32)
-xmllocations(#20066,#20067)
+exit_cfg_node(#20057,#20002)
+hasLocation(#20057,#20034)
+successor(#20048,#20054)
+successor(#20055,#20052)
+successor(#20054,#20055)
+successor(#20052,#20050)
+successor(#20050,#20057)
+successor(#20041,#20048)
+successor(#20046,#20041)
+successor(#20056,#20046)
+toplevel_parent_xml_node(#20002,#20001)
+#20058=*
+xmlElements(#20058,"html",#10000,0,#10000)
+#20059=@"loc,{#10000},1,1,11,7"
+locations_default(#20059,#10000,1,1,11,7)
+xmllocations(#20058,#20059)
+#20060=*
+xmlElements(#20060,"body",#20058,1,#10000)
+#20061=@"loc,{#10000},9,5,10,11"
+locations_default(#20061,#10000,9,5,10,11)
+xmllocations(#20060,#20061)
+#20062=*
+xmlElements(#20062,"head",#20058,0,#10000)
+#20063=@"loc,{#10000},2,5,8,11"
+locations_default(#20063,#10000,2,5,8,11)
+xmllocations(#20062,#20063)
+xmlElements(#20001,"script",#20062,1,#10000)
+#20064=@"loc,{#10000},4,9,7,17"
+locations_default(#20064,#10000,4,9,7,17)
+xmllocations(#20001,#20064)
+#20065=*
+xmlAttrs(#20065,#20001,"type","module",0,#10000)
+#20066=@"loc,{#10000},4,17,4,29"
+locations_default(#20066,#10000,4,17,4,29)
+xmllocations(#20065,#20066)
+#20067=*
+xmlElements(#20067,"title",#20062,0,#10000)
+#20068=@"loc,{#10000},3,9,3,32"
+locations_default(#20068,#10000,3,9,3,32)
+xmllocations(#20067,#20068)
 numlines(#10000,11,2,0)
 filetype(#10000,"html")
diff --git a/javascript/extractor/tests/html/output/trap/tst.html.trap b/javascript/extractor/tests/html/output/trap/tst.html.trap
index 369947fc766..522b97260c9 100644
--- a/javascript/extractor/tests/html/output/trap/tst.html.trap
+++ b/javascript/extractor/tests/html/output/trap/tst.html.trap
@@ -63,522 +63,532 @@ toplevels(#20002,1)
 #20021=@"loc,{#10000},5,17,7,8"
 locations_default(#20021,#10000,5,17,7,8)
 hasLocation(#20002,#20021)
-#20022=*
-stmts(#20022,2,#20002,0,"alert("" ... rld!"");")
-#20023=@"loc,{#10000},6,13,6,35"
-locations_default(#20023,#10000,6,13,6,35)
-hasLocation(#20022,#20023)
-stmt_containers(#20022,#20002)
-#20024=*
-exprs(#20024,13,#20022,0,"alert("" ... orld!"")")
-#20025=@"loc,{#10000},6,13,6,34"
-locations_default(#20025,#10000,6,13,6,34)
-hasLocation(#20024,#20025)
-enclosing_stmt(#20024,#20022)
-expr_containers(#20024,#20002)
-#20026=*
-exprs(#20026,79,#20024,-1,"alert")
-hasLocation(#20026,#20010)
-enclosing_stmt(#20026,#20022)
-expr_containers(#20026,#20002)
-literals("alert","alert",#20026)
-#20027=@"var;{alert};{#20000}"
-variables(#20027,"alert",#20000)
-bind(#20026,#20027)
-#20028=*
-exprs(#20028,4,#20024,0,"""Hello, world!""")
-hasLocation(#20028,#20014)
-enclosing_stmt(#20028,#20022)
-expr_containers(#20028,#20002)
-literals("Hello, world!","""Hello, world!""",#20028)
+#20022=@"var;{this};{#20000}"
+variables(#20022,"this",#20000)
+#20023=*
+stmts(#20023,2,#20002,0,"alert("" ... rld!"");")
+#20024=@"loc,{#10000},6,13,6,35"
+locations_default(#20024,#10000,6,13,6,35)
+hasLocation(#20023,#20024)
+stmt_containers(#20023,#20002)
+#20025=*
+exprs(#20025,13,#20023,0,"alert("" ... orld!"")")
+#20026=@"loc,{#10000},6,13,6,34"
+locations_default(#20026,#10000,6,13,6,34)
+hasLocation(#20025,#20026)
+enclosing_stmt(#20025,#20023)
+expr_containers(#20025,#20002)
+#20027=*
+exprs(#20027,79,#20025,-1,"alert")
+hasLocation(#20027,#20010)
+enclosing_stmt(#20027,#20023)
+expr_containers(#20027,#20002)
+literals("alert","alert",#20027)
+#20028=@"var;{alert};{#20000}"
+variables(#20028,"alert",#20000)
+bind(#20027,#20028)
 #20029=*
-regexpterm(#20029,14,#20028,0,"Hello, world!")
-#20030=@"loc,{#10000},6,20,6,32"
-locations_default(#20030,#10000,6,20,6,32)
-hasLocation(#20029,#20030)
-regexp_const_value(#20029,"Hello, world!")
-#20031=*
-entry_cfg_node(#20031,#20002)
-hasLocation(#20031,#20004)
+exprs(#20029,4,#20025,0,"""Hello, world!""")
+hasLocation(#20029,#20014)
+enclosing_stmt(#20029,#20023)
+expr_containers(#20029,#20002)
+literals("Hello, world!","""Hello, world!""",#20029)
+#20030=*
+regexpterm(#20030,14,#20029,0,"Hello, world!")
+#20031=@"loc,{#10000},6,20,6,32"
+locations_default(#20031,#10000,6,20,6,32)
+hasLocation(#20030,#20031)
+regexp_const_value(#20030,"Hello, world!")
 #20032=*
-exit_cfg_node(#20032,#20002)
-hasLocation(#20032,#20020)
-successor(#20022,#20026)
-successor(#20028,#20024)
-successor(#20026,#20028)
-successor(#20024,#20032)
-successor(#20031,#20022)
-toplevel_parent_xml_node(#20002,#20001)
+entry_cfg_node(#20032,#20002)
+hasLocation(#20032,#20004)
 #20033=*
-#20034=@"script;{#10000},8,17"
-#20035=*
-lines(#20035,#20034,";","")
-#20036=@"loc,{#10000},8,17,8,17"
-locations_default(#20036,#10000,8,17,8,17)
-hasLocation(#20035,#20036)
-numlines(#20034,1,1,0)
-#20037=*
-tokeninfo(#20037,8,#20034,0,";")
-hasLocation(#20037,#20036)
+exit_cfg_node(#20033,#20002)
+hasLocation(#20033,#20020)
+successor(#20023,#20027)
+successor(#20029,#20025)
+successor(#20027,#20029)
+successor(#20025,#20033)
+successor(#20032,#20023)
+toplevel_parent_xml_node(#20002,#20001)
+#20034=*
+#20035=@"script;{#10000},8,17"
+#20036=*
+lines(#20036,#20035,";","")
+#20037=@"loc,{#10000},8,17,8,17"
+locations_default(#20037,#10000,8,17,8,17)
+hasLocation(#20036,#20037)
+numlines(#20035,1,1,0)
 #20038=*
-tokeninfo(#20038,0,#20034,1,"")
-#20039=@"loc,{#10000},8,18,8,17"
-locations_default(#20039,#10000,8,18,8,17)
-hasLocation(#20038,#20039)
-toplevels(#20034,1)
-hasLocation(#20034,#20036)
-#20040=*
-stmts(#20040,0,#20034,0,";")
-hasLocation(#20040,#20036)
-stmt_containers(#20040,#20034)
+tokeninfo(#20038,8,#20035,0,";")
+hasLocation(#20038,#20037)
+#20039=*
+tokeninfo(#20039,0,#20035,1,"")
+#20040=@"loc,{#10000},8,18,8,17"
+locations_default(#20040,#10000,8,18,8,17)
+hasLocation(#20039,#20040)
+toplevels(#20035,1)
+hasLocation(#20035,#20037)
+variables(#20022,"this",#20000)
 #20041=*
-entry_cfg_node(#20041,#20034)
-#20042=@"loc,{#10000},8,17,8,16"
-locations_default(#20042,#10000,8,17,8,16)
-hasLocation(#20041,#20042)
-#20043=*
-exit_cfg_node(#20043,#20034)
-hasLocation(#20043,#20039)
-successor(#20040,#20043)
-successor(#20041,#20040)
-toplevel_parent_xml_node(#20034,#20033)
+stmts(#20041,0,#20035,0,";")
+hasLocation(#20041,#20037)
+stmt_containers(#20041,#20035)
+#20042=*
+entry_cfg_node(#20042,#20035)
+#20043=@"loc,{#10000},8,17,8,16"
+locations_default(#20043,#10000,8,17,8,16)
+hasLocation(#20042,#20043)
 #20044=*
-#20045=@"script;{#10000},11,29"
-#20046=*
-lines(#20046,#20045,"void(alert('Nope!'))","")
-#20047=@"loc,{#10000},11,29,11,48"
-locations_default(#20047,#10000,11,29,11,48)
-hasLocation(#20046,#20047)
-numlines(#20045,1,1,0)
-#20048=*
-tokeninfo(#20048,7,#20045,0,"void")
-#20049=@"loc,{#10000},11,29,11,32"
-locations_default(#20049,#10000,11,29,11,32)
-hasLocation(#20048,#20049)
-#20050=*
-tokeninfo(#20050,8,#20045,1,"(")
-#20051=@"loc,{#10000},11,33,11,33"
-locations_default(#20051,#10000,11,33,11,33)
-hasLocation(#20050,#20051)
-#20052=*
-tokeninfo(#20052,6,#20045,2,"alert")
-#20053=@"loc,{#10000},11,34,11,38"
-locations_default(#20053,#10000,11,34,11,38)
-hasLocation(#20052,#20053)
-#20054=*
-tokeninfo(#20054,8,#20045,3,"(")
-#20055=@"loc,{#10000},11,39,11,39"
-locations_default(#20055,#10000,11,39,11,39)
-hasLocation(#20054,#20055)
-#20056=*
-tokeninfo(#20056,4,#20045,4,"'Nope!'")
-#20057=@"loc,{#10000},11,40,11,46"
-locations_default(#20057,#10000,11,40,11,46)
-hasLocation(#20056,#20057)
-#20058=*
-tokeninfo(#20058,8,#20045,5,")")
-#20059=@"loc,{#10000},11,47,11,47"
-locations_default(#20059,#10000,11,47,11,47)
-hasLocation(#20058,#20059)
-#20060=*
-tokeninfo(#20060,8,#20045,6,")")
-#20061=@"loc,{#10000},11,48,11,48"
-locations_default(#20061,#10000,11,48,11,48)
-hasLocation(#20060,#20061)
-#20062=*
-tokeninfo(#20062,0,#20045,7,"")
-#20063=@"loc,{#10000},11,49,11,48"
-locations_default(#20063,#10000,11,49,11,48)
-hasLocation(#20062,#20063)
-toplevels(#20045,3)
-hasLocation(#20045,#20047)
-#20064=*
-stmts(#20064,2,#20045,0,"void(alert('Nope!'))")
-hasLocation(#20064,#20047)
-stmt_containers(#20064,#20045)
+exit_cfg_node(#20044,#20035)
+hasLocation(#20044,#20040)
+successor(#20041,#20044)
+successor(#20042,#20041)
+toplevel_parent_xml_node(#20035,#20034)
+#20045=*
+#20046=@"script;{#10000},11,29"
+#20047=*
+lines(#20047,#20046,"void(alert('Nope!'))","")
+#20048=@"loc,{#10000},11,29,11,48"
+locations_default(#20048,#10000,11,29,11,48)
+hasLocation(#20047,#20048)
+numlines(#20046,1,1,0)
+#20049=*
+tokeninfo(#20049,7,#20046,0,"void")
+#20050=@"loc,{#10000},11,29,11,32"
+locations_default(#20050,#10000,11,29,11,32)
+hasLocation(#20049,#20050)
+#20051=*
+tokeninfo(#20051,8,#20046,1,"(")
+#20052=@"loc,{#10000},11,33,11,33"
+locations_default(#20052,#10000,11,33,11,33)
+hasLocation(#20051,#20052)
+#20053=*
+tokeninfo(#20053,6,#20046,2,"alert")
+#20054=@"loc,{#10000},11,34,11,38"
+locations_default(#20054,#10000,11,34,11,38)
+hasLocation(#20053,#20054)
+#20055=*
+tokeninfo(#20055,8,#20046,3,"(")
+#20056=@"loc,{#10000},11,39,11,39"
+locations_default(#20056,#10000,11,39,11,39)
+hasLocation(#20055,#20056)
+#20057=*
+tokeninfo(#20057,4,#20046,4,"'Nope!'")
+#20058=@"loc,{#10000},11,40,11,46"
+locations_default(#20058,#10000,11,40,11,46)
+hasLocation(#20057,#20058)
+#20059=*
+tokeninfo(#20059,8,#20046,5,")")
+#20060=@"loc,{#10000},11,47,11,47"
+locations_default(#20060,#10000,11,47,11,47)
+hasLocation(#20059,#20060)
+#20061=*
+tokeninfo(#20061,8,#20046,6,")")
+#20062=@"loc,{#10000},11,48,11,48"
+locations_default(#20062,#10000,11,48,11,48)
+hasLocation(#20061,#20062)
+#20063=*
+tokeninfo(#20063,0,#20046,7,"")
+#20064=@"loc,{#10000},11,49,11,48"
+locations_default(#20064,#10000,11,49,11,48)
+hasLocation(#20063,#20064)
+toplevels(#20046,3)
+hasLocation(#20046,#20048)
+variables(#20022,"this",#20000)
 #20065=*
-exprs(#20065,21,#20064,0,"void(alert('Nope!'))")
-hasLocation(#20065,#20047)
-enclosing_stmt(#20065,#20064)
-expr_containers(#20065,#20045)
+stmts(#20065,2,#20046,0,"void(alert('Nope!'))")
+hasLocation(#20065,#20048)
+stmt_containers(#20065,#20046)
 #20066=*
-exprs(#20066,63,#20065,0,"(alert('Nope!'))")
-#20067=@"loc,{#10000},11,33,11,48"
-locations_default(#20067,#10000,11,33,11,48)
-hasLocation(#20066,#20067)
-enclosing_stmt(#20066,#20064)
-expr_containers(#20066,#20045)
-#20068=*
-exprs(#20068,13,#20066,0,"alert('Nope!')")
-#20069=@"loc,{#10000},11,34,11,47"
-locations_default(#20069,#10000,11,34,11,47)
-hasLocation(#20068,#20069)
-enclosing_stmt(#20068,#20064)
-expr_containers(#20068,#20045)
-#20070=*
-exprs(#20070,79,#20068,-1,"alert")
-hasLocation(#20070,#20053)
-enclosing_stmt(#20070,#20064)
-expr_containers(#20070,#20045)
-literals("alert","alert",#20070)
-bind(#20070,#20027)
+exprs(#20066,21,#20065,0,"void(alert('Nope!'))")
+hasLocation(#20066,#20048)
+enclosing_stmt(#20066,#20065)
+expr_containers(#20066,#20046)
+#20067=*
+exprs(#20067,63,#20066,0,"(alert('Nope!'))")
+#20068=@"loc,{#10000},11,33,11,48"
+locations_default(#20068,#10000,11,33,11,48)
+hasLocation(#20067,#20068)
+enclosing_stmt(#20067,#20065)
+expr_containers(#20067,#20046)
+#20069=*
+exprs(#20069,13,#20067,0,"alert('Nope!')")
+#20070=@"loc,{#10000},11,34,11,47"
+locations_default(#20070,#10000,11,34,11,47)
+hasLocation(#20069,#20070)
+enclosing_stmt(#20069,#20065)
+expr_containers(#20069,#20046)
 #20071=*
-exprs(#20071,4,#20068,0,"'Nope!'")
-hasLocation(#20071,#20057)
-enclosing_stmt(#20071,#20064)
-expr_containers(#20071,#20045)
-literals("Nope!","'Nope!'",#20071)
+exprs(#20071,79,#20069,-1,"alert")
+hasLocation(#20071,#20054)
+enclosing_stmt(#20071,#20065)
+expr_containers(#20071,#20046)
+literals("alert","alert",#20071)
+bind(#20071,#20028)
 #20072=*
-regexpterm(#20072,14,#20071,0,"Nope!")
-#20073=@"loc,{#10000},11,41,11,45"
-locations_default(#20073,#10000,11,41,11,45)
-hasLocation(#20072,#20073)
-regexp_const_value(#20072,"Nope!")
-#20074=*
-entry_cfg_node(#20074,#20045)
-#20075=@"loc,{#10000},11,29,11,28"
-locations_default(#20075,#10000,11,29,11,28)
-hasLocation(#20074,#20075)
-#20076=*
-exit_cfg_node(#20076,#20045)
-hasLocation(#20076,#20063)
-successor(#20064,#20066)
-successor(#20066,#20070)
-successor(#20071,#20068)
-successor(#20070,#20071)
-successor(#20068,#20065)
-successor(#20065,#20076)
-successor(#20074,#20064)
-toplevel_parent_xml_node(#20045,#20044)
+exprs(#20072,4,#20069,0,"'Nope!'")
+hasLocation(#20072,#20058)
+enclosing_stmt(#20072,#20065)
+expr_containers(#20072,#20046)
+literals("Nope!","'Nope!'",#20072)
+#20073=*
+regexpterm(#20073,14,#20072,0,"Nope!")
+#20074=@"loc,{#10000},11,41,11,45"
+locations_default(#20074,#10000,11,41,11,45)
+hasLocation(#20073,#20074)
+regexp_const_value(#20073,"Nope!")
+#20075=*
+entry_cfg_node(#20075,#20046)
+#20076=@"loc,{#10000},11,29,11,28"
+locations_default(#20076,#10000,11,29,11,28)
+hasLocation(#20075,#20076)
 #20077=*
-#20078=@"script;{#10000},12,23"
-#20079=*
-lines(#20079,#20078,"alert('I said don\'t click!')","")
-#20080=@"loc,{#10000},12,23,12,51"
-locations_default(#20080,#10000,12,23,12,51)
-hasLocation(#20079,#20080)
-numlines(#20078,1,1,0)
-#20081=*
-tokeninfo(#20081,6,#20078,0,"alert")
-#20082=@"loc,{#10000},12,23,12,27"
-locations_default(#20082,#10000,12,23,12,27)
-hasLocation(#20081,#20082)
-#20083=*
-tokeninfo(#20083,8,#20078,1,"(")
-#20084=@"loc,{#10000},12,28,12,28"
-locations_default(#20084,#10000,12,28,12,28)
-hasLocation(#20083,#20084)
-#20085=*
-tokeninfo(#20085,4,#20078,2,"'I said don\'t click!'")
-#20086=@"loc,{#10000},12,29,12,50"
-locations_default(#20086,#10000,12,29,12,50)
-hasLocation(#20085,#20086)
-#20087=*
-tokeninfo(#20087,8,#20078,3,")")
-#20088=@"loc,{#10000},12,51,12,51"
-locations_default(#20088,#10000,12,51,12,51)
-hasLocation(#20087,#20088)
-#20089=*
-tokeninfo(#20089,0,#20078,4,"")
-#20090=@"loc,{#10000},12,52,12,51"
-locations_default(#20090,#10000,12,52,12,51)
-hasLocation(#20089,#20090)
-toplevels(#20078,2)
-hasLocation(#20078,#20080)
-#20091=*
-stmts(#20091,2,#20078,0,"alert(' ... lick!')")
-hasLocation(#20091,#20080)
-stmt_containers(#20091,#20078)
+exit_cfg_node(#20077,#20046)
+hasLocation(#20077,#20064)
+successor(#20065,#20067)
+successor(#20067,#20071)
+successor(#20072,#20069)
+successor(#20071,#20072)
+successor(#20069,#20066)
+successor(#20066,#20077)
+successor(#20075,#20065)
+toplevel_parent_xml_node(#20046,#20045)
+#20078=*
+#20079=@"script;{#10000},12,23"
+#20080=*
+lines(#20080,#20079,"alert('I said don\'t click!')","")
+#20081=@"loc,{#10000},12,23,12,51"
+locations_default(#20081,#10000,12,23,12,51)
+hasLocation(#20080,#20081)
+numlines(#20079,1,1,0)
+#20082=*
+tokeninfo(#20082,6,#20079,0,"alert")
+#20083=@"loc,{#10000},12,23,12,27"
+locations_default(#20083,#10000,12,23,12,27)
+hasLocation(#20082,#20083)
+#20084=*
+tokeninfo(#20084,8,#20079,1,"(")
+#20085=@"loc,{#10000},12,28,12,28"
+locations_default(#20085,#10000,12,28,12,28)
+hasLocation(#20084,#20085)
+#20086=*
+tokeninfo(#20086,4,#20079,2,"'I said don\'t click!'")
+#20087=@"loc,{#10000},12,29,12,50"
+locations_default(#20087,#10000,12,29,12,50)
+hasLocation(#20086,#20087)
+#20088=*
+tokeninfo(#20088,8,#20079,3,")")
+#20089=@"loc,{#10000},12,51,12,51"
+locations_default(#20089,#10000,12,51,12,51)
+hasLocation(#20088,#20089)
+#20090=*
+tokeninfo(#20090,0,#20079,4,"")
+#20091=@"loc,{#10000},12,52,12,51"
+locations_default(#20091,#10000,12,52,12,51)
+hasLocation(#20090,#20091)
+toplevels(#20079,2)
+hasLocation(#20079,#20081)
+variables(#20022,"this",#20000)
 #20092=*
-exprs(#20092,13,#20091,0,"alert(' ... lick!')")
-hasLocation(#20092,#20080)
-enclosing_stmt(#20092,#20091)
-expr_containers(#20092,#20078)
+stmts(#20092,2,#20079,0,"alert(' ... lick!')")
+hasLocation(#20092,#20081)
+stmt_containers(#20092,#20079)
 #20093=*
-exprs(#20093,79,#20092,-1,"alert")
-hasLocation(#20093,#20082)
-enclosing_stmt(#20093,#20091)
-expr_containers(#20093,#20078)
-literals("alert","alert",#20093)
-bind(#20093,#20027)
+exprs(#20093,13,#20092,0,"alert(' ... lick!')")
+hasLocation(#20093,#20081)
+enclosing_stmt(#20093,#20092)
+expr_containers(#20093,#20079)
 #20094=*
-exprs(#20094,4,#20092,0,"'I said ... click!'")
-hasLocation(#20094,#20086)
-enclosing_stmt(#20094,#20091)
-expr_containers(#20094,#20078)
-literals("I said don't click!","'I said don\'t click!'",#20094)
+exprs(#20094,79,#20093,-1,"alert")
+hasLocation(#20094,#20083)
+enclosing_stmt(#20094,#20092)
+expr_containers(#20094,#20079)
+literals("alert","alert",#20094)
+bind(#20094,#20028)
 #20095=*
-regexpterm(#20095,14,#20094,0,"I said don't click!")
-#20096=@"loc,{#10000},12,30,12,49"
-locations_default(#20096,#10000,12,30,12,49)
-hasLocation(#20095,#20096)
-regexp_const_value(#20095,"I said don't click!")
-#20097=*
-entry_cfg_node(#20097,#20078)
-#20098=@"loc,{#10000},12,23,12,22"
-locations_default(#20098,#10000,12,23,12,22)
-hasLocation(#20097,#20098)
-#20099=*
-exit_cfg_node(#20099,#20078)
-hasLocation(#20099,#20090)
-successor(#20091,#20093)
-successor(#20094,#20092)
-successor(#20093,#20094)
-successor(#20092,#20099)
-successor(#20097,#20091)
-toplevel_parent_xml_node(#20078,#20077)
+exprs(#20095,4,#20093,0,"'I said ... click!'")
+hasLocation(#20095,#20087)
+enclosing_stmt(#20095,#20092)
+expr_containers(#20095,#20079)
+literals("I said don't click!","'I said don\'t click!'",#20095)
+#20096=*
+regexpterm(#20096,14,#20095,0,"I said don't click!")
+#20097=@"loc,{#10000},12,30,12,49"
+locations_default(#20097,#10000,12,30,12,49)
+hasLocation(#20096,#20097)
+regexp_const_value(#20096,"I said don't click!")
+#20098=*
+entry_cfg_node(#20098,#20079)
+#20099=@"loc,{#10000},12,23,12,22"
+locations_default(#20099,#10000,12,23,12,22)
+hasLocation(#20098,#20099)
 #20100=*
-#20101=@"script;{#10000},13,21"
-#20102=*
-lines(#20102,#20101,"return false;","")
-#20103=@"loc,{#10000},13,21,13,33"
-locations_default(#20103,#10000,13,21,13,33)
-hasLocation(#20102,#20103)
-numlines(#20101,1,1,0)
-#20104=*
-tokeninfo(#20104,7,#20101,0,"return")
-#20105=@"loc,{#10000},13,21,13,26"
-locations_default(#20105,#10000,13,21,13,26)
-hasLocation(#20104,#20105)
-#20106=*
-tokeninfo(#20106,2,#20101,1,"false")
-#20107=@"loc,{#10000},13,28,13,32"
-locations_default(#20107,#10000,13,28,13,32)
-hasLocation(#20106,#20107)
-#20108=*
-tokeninfo(#20108,8,#20101,2,";")
-#20109=@"loc,{#10000},13,33,13,33"
-locations_default(#20109,#10000,13,33,13,33)
-hasLocation(#20108,#20109)
-#20110=*
-tokeninfo(#20110,0,#20101,3,"")
-#20111=@"loc,{#10000},13,34,13,33"
-locations_default(#20111,#10000,13,34,13,33)
-hasLocation(#20110,#20111)
-toplevels(#20101,2)
-hasLocation(#20101,#20103)
-#20112=*
-stmts(#20112,9,#20101,0,"return false;")
-hasLocation(#20112,#20103)
-stmt_containers(#20112,#20101)
+exit_cfg_node(#20100,#20079)
+hasLocation(#20100,#20091)
+successor(#20092,#20094)
+successor(#20095,#20093)
+successor(#20094,#20095)
+successor(#20093,#20100)
+successor(#20098,#20092)
+toplevel_parent_xml_node(#20079,#20078)
+#20101=*
+#20102=@"script;{#10000},13,21"
+#20103=*
+lines(#20103,#20102,"return false;","")
+#20104=@"loc,{#10000},13,21,13,33"
+locations_default(#20104,#10000,13,21,13,33)
+hasLocation(#20103,#20104)
+numlines(#20102,1,1,0)
+#20105=*
+tokeninfo(#20105,7,#20102,0,"return")
+#20106=@"loc,{#10000},13,21,13,26"
+locations_default(#20106,#10000,13,21,13,26)
+hasLocation(#20105,#20106)
+#20107=*
+tokeninfo(#20107,2,#20102,1,"false")
+#20108=@"loc,{#10000},13,28,13,32"
+locations_default(#20108,#10000,13,28,13,32)
+hasLocation(#20107,#20108)
+#20109=*
+tokeninfo(#20109,8,#20102,2,";")
+#20110=@"loc,{#10000},13,33,13,33"
+locations_default(#20110,#10000,13,33,13,33)
+hasLocation(#20109,#20110)
+#20111=*
+tokeninfo(#20111,0,#20102,3,"")
+#20112=@"loc,{#10000},13,34,13,33"
+locations_default(#20112,#10000,13,34,13,33)
+hasLocation(#20111,#20112)
+toplevels(#20102,2)
+hasLocation(#20102,#20104)
+variables(#20022,"this",#20000)
 #20113=*
-exprs(#20113,2,#20112,0,"false")
-hasLocation(#20113,#20107)
-enclosing_stmt(#20113,#20112)
-expr_containers(#20113,#20101)
-literals("false","false",#20113)
+stmts(#20113,9,#20102,0,"return false;")
+hasLocation(#20113,#20104)
+stmt_containers(#20113,#20102)
 #20114=*
-entry_cfg_node(#20114,#20101)
-#20115=@"loc,{#10000},13,21,13,20"
-locations_default(#20115,#10000,13,21,13,20)
-hasLocation(#20114,#20115)
-#20116=*
-exit_cfg_node(#20116,#20101)
-hasLocation(#20116,#20111)
-successor(#20113,#20112)
-successor(#20112,#20116)
-successor(#20114,#20113)
-toplevel_parent_xml_node(#20101,#20100)
+exprs(#20114,2,#20113,0,"false")
+hasLocation(#20114,#20108)
+enclosing_stmt(#20114,#20113)
+expr_containers(#20114,#20102)
+literals("false","false",#20114)
+#20115=*
+entry_cfg_node(#20115,#20102)
+#20116=@"loc,{#10000},13,21,13,20"
+locations_default(#20116,#10000,13,21,13,20)
+hasLocation(#20115,#20116)
 #20117=*
-xmlElements(#20117,"html",#10000,0,#10000)
-#20118=@"loc,{#10000},1,1,18,7"
-locations_default(#20118,#10000,1,1,18,7)
-xmllocations(#20117,#20118)
-#20119=*
-xmlElements(#20119,"script",#20117,4,#10000)
-#20120=@"loc,{#10000},17,5,17,29"
-locations_default(#20120,#10000,17,5,17,29)
-xmllocations(#20119,#20120)
-#20121=*
-xmlAttrs(#20121,#20119,"type","",0,#10000)
-#20122=@"loc,{#10000},17,13,17,19"
-locations_default(#20122,#10000,17,13,17,19)
-xmllocations(#20121,#20122)
-#20123=*
-xmlElements(#20123,"script",#20117,3,#10000)
-#20124=@"loc,{#10000},16,5,16,71"
-locations_default(#20124,#10000,16,5,16,71)
-xmllocations(#20123,#20124)
-#20125=*
-xmlAttrs(#20125,#20123,"TYPE","text/x-handlebars-template",0,#10000)
-#20126=@"loc,{#10000},16,13,16,45"
-locations_default(#20126,#10000,16,13,16,45)
-xmllocations(#20125,#20126)
-#20127=*
-template_placeholder_tag_info(#20127,#20123,"{{name}}")
-#20128=@"loc,{#10000},16,54,16,61"
-locations_default(#20128,#10000,16,54,16,61)
-hasLocation(#20127,#20128)
+exit_cfg_node(#20117,#20102)
+hasLocation(#20117,#20112)
+successor(#20114,#20113)
+successor(#20113,#20117)
+successor(#20115,#20114)
+toplevel_parent_xml_node(#20102,#20101)
+#20118=*
+xmlElements(#20118,"html",#10000,0,#10000)
+#20119=@"loc,{#10000},1,1,18,7"
+locations_default(#20119,#10000,1,1,18,7)
+xmllocations(#20118,#20119)
+#20120=*
+xmlElements(#20120,"script",#20118,4,#10000)
+#20121=@"loc,{#10000},17,5,17,29"
+locations_default(#20121,#10000,17,5,17,29)
+xmllocations(#20120,#20121)
+#20122=*
+xmlAttrs(#20122,#20120,"type","",0,#10000)
+#20123=@"loc,{#10000},17,13,17,19"
+locations_default(#20123,#10000,17,13,17,19)
+xmllocations(#20122,#20123)
+#20124=*
+xmlElements(#20124,"script",#20118,3,#10000)
+#20125=@"loc,{#10000},16,5,16,71"
+locations_default(#20125,#10000,16,5,16,71)
+xmllocations(#20124,#20125)
+#20126=*
+xmlAttrs(#20126,#20124,"TYPE","text/x-handlebars-template",0,#10000)
+#20127=@"loc,{#10000},16,13,16,45"
+locations_default(#20127,#10000,16,13,16,45)
+xmllocations(#20126,#20127)
+#20128=*
+template_placeholder_tag_info(#20128,#20124,"{{name}}")
+#20129=@"loc,{#10000},16,54,16,61"
+locations_default(#20129,#10000,16,54,16,61)
+hasLocation(#20128,#20129)
 scopes(#20000,0)
-#20129=@"script;{#10000},16,56"
-#20130=*
-lines(#20130,#20129,"name","")
-#20131=@"loc,{#10000},16,56,16,59"
-locations_default(#20131,#10000,16,56,16,59)
-hasLocation(#20130,#20131)
-numlines(#20129,1,1,0)
-#20132=*
-tokeninfo(#20132,6,#20129,0,"name")
-hasLocation(#20132,#20131)
+#20130=@"script;{#10000},16,56"
+#20131=*
+lines(#20131,#20130,"name","")
+#20132=@"loc,{#10000},16,56,16,59"
+locations_default(#20132,#10000,16,56,16,59)
+hasLocation(#20131,#20132)
+numlines(#20130,1,1,0)
 #20133=*
-tokeninfo(#20133,0,#20129,1,"")
-#20134=@"loc,{#10000},16,60,16,59"
-locations_default(#20134,#10000,16,60,16,59)
-hasLocation(#20133,#20134)
-toplevels(#20129,4)
-hasLocation(#20129,#20131)
-#20135=@"module;{#10000},16,56"
-scopes(#20135,3)
-scopenodes(#20129,#20135)
-scopenesting(#20135,#20000)
-is_module(#20129)
-#20136=*
-stmts(#20136,2,#20129,0,"name")
-hasLocation(#20136,#20131)
-stmt_containers(#20136,#20129)
-#20137=*
-exprs(#20137,79,#20136,0,"name")
-hasLocation(#20137,#20131)
-enclosing_stmt(#20137,#20136)
-expr_containers(#20137,#20129)
-literals("name","name",#20137)
-#20138=@"var;{name};{#20135}"
-variables(#20138,"name",#20135)
-bind(#20137,#20138)
+tokeninfo(#20133,6,#20130,0,"name")
+hasLocation(#20133,#20132)
+#20134=*
+tokeninfo(#20134,0,#20130,1,"")
+#20135=@"loc,{#10000},16,60,16,59"
+locations_default(#20135,#10000,16,60,16,59)
+hasLocation(#20134,#20135)
+toplevels(#20130,4)
+hasLocation(#20130,#20132)
+#20136=@"module;{#10000},16,56"
+scopes(#20136,3)
+scopenodes(#20130,#20136)
+scopenesting(#20136,#20000)
+is_module(#20130)
+#20137=@"var;{this};{#20136}"
+variables(#20137,"this",#20136)
+#20138=*
+stmts(#20138,2,#20130,0,"name")
+hasLocation(#20138,#20132)
+stmt_containers(#20138,#20130)
 #20139=*
-entry_cfg_node(#20139,#20129)
-#20140=@"loc,{#10000},16,56,16,55"
-locations_default(#20140,#10000,16,56,16,55)
-hasLocation(#20139,#20140)
+exprs(#20139,79,#20138,0,"name")
+hasLocation(#20139,#20132)
+enclosing_stmt(#20139,#20138)
+expr_containers(#20139,#20130)
+literals("name","name",#20139)
+#20140=@"var;{name};{#20136}"
+variables(#20140,"name",#20136)
+bind(#20139,#20140)
 #20141=*
-exit_cfg_node(#20141,#20129)
-hasLocation(#20141,#20134)
-successor(#20136,#20137)
-successor(#20137,#20141)
-successor(#20139,#20136)
-toplevel_parent_xml_node(#20129,#20127)
-#20142=*
-xmlElements(#20142,"script",#20117,2,#10000)
-#20143=@"loc,{#10000},15,5,15,71"
-locations_default(#20143,#10000,15,5,15,71)
-xmllocations(#20142,#20143)
+entry_cfg_node(#20141,#20130)
+#20142=@"loc,{#10000},16,56,16,55"
+locations_default(#20142,#10000,16,56,16,55)
+hasLocation(#20141,#20142)
+#20143=*
+exit_cfg_node(#20143,#20130)
+hasLocation(#20143,#20135)
+successor(#20138,#20139)
+successor(#20139,#20143)
+successor(#20141,#20138)
+toplevel_parent_xml_node(#20130,#20128)
 #20144=*
-xmlAttrs(#20144,#20142,"type","text/x-handlebars-template",0,#10000)
-#20145=@"loc,{#10000},15,13,15,45"
-locations_default(#20145,#10000,15,13,15,45)
+xmlElements(#20144,"script",#20118,2,#10000)
+#20145=@"loc,{#10000},15,5,15,71"
+locations_default(#20145,#10000,15,5,15,71)
 xmllocations(#20144,#20145)
 #20146=*
-template_placeholder_tag_info(#20146,#20142,"{{name}}")
-#20147=@"loc,{#10000},15,54,15,61"
-locations_default(#20147,#10000,15,54,15,61)
-hasLocation(#20146,#20147)
+xmlAttrs(#20146,#20144,"type","text/x-handlebars-template",0,#10000)
+#20147=@"loc,{#10000},15,13,15,45"
+locations_default(#20147,#10000,15,13,15,45)
+xmllocations(#20146,#20147)
+#20148=*
+template_placeholder_tag_info(#20148,#20144,"{{name}}")
+#20149=@"loc,{#10000},15,54,15,61"
+locations_default(#20149,#10000,15,54,15,61)
+hasLocation(#20148,#20149)
 scopes(#20000,0)
-#20148=@"script;{#10000},15,56"
-#20149=*
-lines(#20149,#20148,"name","")
-#20150=@"loc,{#10000},15,56,15,59"
-locations_default(#20150,#10000,15,56,15,59)
-hasLocation(#20149,#20150)
-numlines(#20148,1,1,0)
+#20150=@"script;{#10000},15,56"
 #20151=*
-tokeninfo(#20151,6,#20148,0,"name")
-hasLocation(#20151,#20150)
-#20152=*
-tokeninfo(#20152,0,#20148,1,"")
-#20153=@"loc,{#10000},15,60,15,59"
-locations_default(#20153,#10000,15,60,15,59)
-hasLocation(#20152,#20153)
-toplevels(#20148,4)
-hasLocation(#20148,#20150)
-#20154=@"module;{#10000},15,56"
-scopes(#20154,3)
-scopenodes(#20148,#20154)
-scopenesting(#20154,#20000)
-is_module(#20148)
-#20155=*
-stmts(#20155,2,#20148,0,"name")
-hasLocation(#20155,#20150)
-stmt_containers(#20155,#20148)
-#20156=*
-exprs(#20156,79,#20155,0,"name")
-hasLocation(#20156,#20150)
-enclosing_stmt(#20156,#20155)
-expr_containers(#20156,#20148)
-literals("name","name",#20156)
-#20157=@"var;{name};{#20154}"
-variables(#20157,"name",#20154)
-bind(#20156,#20157)
+lines(#20151,#20150,"name","")
+#20152=@"loc,{#10000},15,56,15,59"
+locations_default(#20152,#10000,15,56,15,59)
+hasLocation(#20151,#20152)
+numlines(#20150,1,1,0)
+#20153=*
+tokeninfo(#20153,6,#20150,0,"name")
+hasLocation(#20153,#20152)
+#20154=*
+tokeninfo(#20154,0,#20150,1,"")
+#20155=@"loc,{#10000},15,60,15,59"
+locations_default(#20155,#10000,15,60,15,59)
+hasLocation(#20154,#20155)
+toplevels(#20150,4)
+hasLocation(#20150,#20152)
+#20156=@"module;{#10000},15,56"
+scopes(#20156,3)
+scopenodes(#20150,#20156)
+scopenesting(#20156,#20000)
+is_module(#20150)
+#20157=@"var;{this};{#20156}"
+variables(#20157,"this",#20156)
 #20158=*
-entry_cfg_node(#20158,#20148)
-#20159=@"loc,{#10000},15,56,15,55"
-locations_default(#20159,#10000,15,56,15,55)
-hasLocation(#20158,#20159)
-#20160=*
-exit_cfg_node(#20160,#20148)
-hasLocation(#20160,#20153)
-successor(#20155,#20156)
-successor(#20156,#20160)
-successor(#20158,#20155)
-toplevel_parent_xml_node(#20148,#20146)
+stmts(#20158,2,#20150,0,"name")
+hasLocation(#20158,#20152)
+stmt_containers(#20158,#20150)
+#20159=*
+exprs(#20159,79,#20158,0,"name")
+hasLocation(#20159,#20152)
+enclosing_stmt(#20159,#20158)
+expr_containers(#20159,#20150)
+literals("name","name",#20159)
+#20160=@"var;{name};{#20156}"
+variables(#20160,"name",#20156)
+bind(#20159,#20160)
 #20161=*
-xmlElements(#20161,"body",#20117,1,#10000)
-#20162=@"loc,{#10000},10,5,14,11"
-locations_default(#20162,#10000,10,5,14,11)
-xmllocations(#20161,#20162)
+entry_cfg_node(#20161,#20150)
+#20162=@"loc,{#10000},15,56,15,55"
+locations_default(#20162,#10000,15,56,15,55)
+hasLocation(#20161,#20162)
 #20163=*
-xmlElements(#20163,"a",#20161,2,#10000)
-#20164=@"loc,{#10000},13,9,13,59"
-locations_default(#20164,#10000,13,9,13,59)
-xmllocations(#20163,#20164)
-xmlAttrs(#20100,#20163,"onclick","return false;",0,#10000)
-#20165=@"loc,{#10000},13,12,13,34"
-locations_default(#20165,#10000,13,12,13,34)
-xmllocations(#20100,#20165)
+exit_cfg_node(#20163,#20150)
+hasLocation(#20163,#20155)
+successor(#20158,#20159)
+successor(#20159,#20163)
+successor(#20161,#20158)
+toplevel_parent_xml_node(#20150,#20148)
+#20164=*
+xmlElements(#20164,"body",#20118,1,#10000)
+#20165=@"loc,{#10000},10,5,14,11"
+locations_default(#20165,#10000,10,5,14,11)
+xmllocations(#20164,#20165)
 #20166=*
-xmlElements(#20166,"div",#20161,1,#10000)
-#20167=@"loc,{#10000},12,9,12,75"
-locations_default(#20167,#10000,12,9,12,75)
+xmlElements(#20166,"a",#20164,2,#10000)
+#20167=@"loc,{#10000},13,9,13,59"
+locations_default(#20167,#10000,13,9,13,59)
 xmllocations(#20166,#20167)
-xmlAttrs(#20077,#20166,"onclick","alert('I said don\'t click!')",0,#10000)
-#20168=@"loc,{#10000},12,14,12,52"
-locations_default(#20168,#10000,12,14,12,52)
-xmllocations(#20077,#20168)
+xmlAttrs(#20101,#20166,"onclick","return false;",0,#10000)
+#20168=@"loc,{#10000},13,12,13,34"
+locations_default(#20168,#10000,13,12,13,34)
+xmllocations(#20101,#20168)
 #20169=*
-xmlElements(#20169,"a",#20161,0,#10000)
-#20170=@"loc,{#10000},11,9,11,64"
-locations_default(#20170,#10000,11,9,11,64)
+xmlElements(#20169,"div",#20164,1,#10000)
+#20170=@"loc,{#10000},12,9,12,75"
+locations_default(#20170,#10000,12,9,12,75)
 xmllocations(#20169,#20170)
-xmlAttrs(#20044,#20169,"href","javascript:void(alert('Nope!'))",0,#10000)
-#20171=@"loc,{#10000},11,12,11,49"
-locations_default(#20171,#10000,11,12,11,49)
-xmllocations(#20044,#20171)
+xmlAttrs(#20078,#20169,"onclick","alert('I said don\'t click!')",0,#10000)
+#20171=@"loc,{#10000},12,14,12,52"
+locations_default(#20171,#10000,12,14,12,52)
+xmllocations(#20078,#20171)
 #20172=*
-xmlElements(#20172,"head",#20117,0,#10000)
-#20173=@"loc,{#10000},2,5,9,11"
-locations_default(#20173,#10000,2,5,9,11)
+xmlElements(#20172,"a",#20164,0,#10000)
+#20173=@"loc,{#10000},11,9,11,64"
+locations_default(#20173,#10000,11,9,11,64)
 xmllocations(#20172,#20173)
-xmlElements(#20033,"script",#20172,3,#10000)
-#20174=@"loc,{#10000},8,9,8,26"
-locations_default(#20174,#10000,8,9,8,26)
-xmllocations(#20033,#20174)
-xmlElements(#20001,"script",#20172,2,#10000)
-#20175=@"loc,{#10000},5,9,7,17"
-locations_default(#20175,#10000,5,9,7,17)
-xmllocations(#20001,#20175)
-#20176=*
-xmlElements(#20176,"script",#20172,1,#10000)
-#20177=@"loc,{#10000},4,9,4,43"
-locations_default(#20177,#10000,4,9,4,43)
-xmllocations(#20176,#20177)
-#20178=*
-xmlAttrs(#20178,#20176,"src","external.js",0,#10000)
-#20179=@"loc,{#10000},4,17,4,33"
-locations_default(#20179,#10000,4,17,4,33)
-xmllocations(#20178,#20179)
-#20180=*
-xmlElements(#20180,"title",#20172,0,#10000)
-#20181=@"loc,{#10000},3,9,3,32"
-locations_default(#20181,#10000,3,9,3,32)
-xmllocations(#20180,#20181)
+xmlAttrs(#20045,#20172,"href","javascript:void(alert('Nope!'))",0,#10000)
+#20174=@"loc,{#10000},11,12,11,49"
+locations_default(#20174,#10000,11,12,11,49)
+xmllocations(#20045,#20174)
+#20175=*
+xmlElements(#20175,"head",#20118,0,#10000)
+#20176=@"loc,{#10000},2,5,9,11"
+locations_default(#20176,#10000,2,5,9,11)
+xmllocations(#20175,#20176)
+xmlElements(#20034,"script",#20175,3,#10000)
+#20177=@"loc,{#10000},8,9,8,26"
+locations_default(#20177,#10000,8,9,8,26)
+xmllocations(#20034,#20177)
+xmlElements(#20001,"script",#20175,2,#10000)
+#20178=@"loc,{#10000},5,9,7,17"
+locations_default(#20178,#10000,5,9,7,17)
+xmllocations(#20001,#20178)
+#20179=*
+xmlElements(#20179,"script",#20175,1,#10000)
+#20180=@"loc,{#10000},4,9,4,43"
+locations_default(#20180,#10000,4,9,4,43)
+xmllocations(#20179,#20180)
+#20181=*
+xmlAttrs(#20181,#20179,"src","external.js",0,#10000)
+#20182=@"loc,{#10000},4,17,4,33"
+locations_default(#20182,#10000,4,17,4,33)
+xmllocations(#20181,#20182)
+#20183=*
+xmlElements(#20183,"title",#20175,0,#10000)
+#20184=@"loc,{#10000},3,9,3,32"
+locations_default(#20184,#10000,3,9,3,32)
+xmllocations(#20183,#20184)
 numlines(#10000,18,7,0)
 filetype(#10000,"html")
diff --git a/javascript/extractor/tests/html/output/trap/tst.xhtml.trap b/javascript/extractor/tests/html/output/trap/tst.xhtml.trap
index def8d3b124d..ffee48a246c 100644
--- a/javascript/extractor/tests/html/output/trap/tst.xhtml.trap
+++ b/javascript/extractor/tests/html/output/trap/tst.xhtml.trap
@@ -54,66 +54,68 @@ toplevels(#20002,1)
 #20017=@"loc,{#10000},7,43,10,7"
 locations_default(#20017,#10000,7,43,10,7)
 hasLocation(#20002,#20017)
-#20018=*
-stmts(#20018,2,#20002,0,"42;")
-#20019=@"loc,{#10000},9,5,9,7"
-locations_default(#20019,#10000,9,5,9,7)
-hasLocation(#20018,#20019)
-stmt_containers(#20018,#20002)
-#20020=*
-exprs(#20020,3,#20018,0,"42")
-hasLocation(#20020,#20012)
-enclosing_stmt(#20020,#20018)
-expr_containers(#20020,#20002)
-literals("42","42",#20020)
+#20018=@"var;{this};{#20000}"
+variables(#20018,"this",#20000)
+#20019=*
+stmts(#20019,2,#20002,0,"42;")
+#20020=@"loc,{#10000},9,5,9,7"
+locations_default(#20020,#10000,9,5,9,7)
+hasLocation(#20019,#20020)
+stmt_containers(#20019,#20002)
 #20021=*
-entry_cfg_node(#20021,#20002)
-hasLocation(#20021,#20004)
+exprs(#20021,3,#20019,0,"42")
+hasLocation(#20021,#20012)
+enclosing_stmt(#20021,#20019)
+expr_containers(#20021,#20002)
+literals("42","42",#20021)
 #20022=*
-exit_cfg_node(#20022,#20002)
-hasLocation(#20022,#20016)
-successor(#20018,#20020)
-successor(#20020,#20022)
-successor(#20021,#20018)
-toplevel_parent_xml_node(#20002,#20001)
+entry_cfg_node(#20022,#20002)
+hasLocation(#20022,#20004)
 #20023=*
-xmlElements(#20023,"html",#10000,0,#10000)
-#20024=@"loc,{#10000},2,1,12,7"
-locations_default(#20024,#10000,2,1,12,7)
-xmllocations(#20023,#20024)
-#20025=*
-xmlAttrs(#20025,#20023,"xmlns","http://www.w3.org/1999/xhtml",0,#10000)
-#20026=@"loc,{#10000},2,7,2,42"
-locations_default(#20026,#10000,2,7,2,42)
-xmllocations(#20025,#20026)
-#20027=*
-xmlAttrs(#20027,#20023,"xml:lang","en",1,#10000)
-#20028=@"loc,{#10000},2,44,2,56"
-locations_default(#20028,#10000,2,44,2,56)
-xmllocations(#20027,#20028)
-#20029=*
-xmlElements(#20029,"body",#20023,1,#10000)
-#20030=@"loc,{#10000},6,1,11,7"
-locations_default(#20030,#10000,6,1,11,7)
-xmllocations(#20029,#20030)
-xmlElements(#20001,"script",#20029,0,#10000)
-#20031=@"loc,{#10000},7,5,10,16"
-locations_default(#20031,#10000,7,5,10,16)
-xmllocations(#20001,#20031)
-#20032=*
-xmlAttrs(#20032,#20001,"type","application/javascript",0,#10000)
-#20033=@"loc,{#10000},7,13,7,41"
-locations_default(#20033,#10000,7,13,7,41)
-xmllocations(#20032,#20033)
-#20034=*
-xmlElements(#20034,"head",#20023,0,#10000)
-#20035=@"loc,{#10000},3,1,5,7"
-locations_default(#20035,#10000,3,1,5,7)
-xmllocations(#20034,#20035)
-#20036=*
-xmlElements(#20036,"title",#20034,0,#10000)
-#20037=@"loc,{#10000},4,5,4,31"
-locations_default(#20037,#10000,4,5,4,31)
-xmllocations(#20036,#20037)
+exit_cfg_node(#20023,#20002)
+hasLocation(#20023,#20016)
+successor(#20019,#20021)
+successor(#20021,#20023)
+successor(#20022,#20019)
+toplevel_parent_xml_node(#20002,#20001)
+#20024=*
+xmlElements(#20024,"html",#10000,0,#10000)
+#20025=@"loc,{#10000},2,1,12,7"
+locations_default(#20025,#10000,2,1,12,7)
+xmllocations(#20024,#20025)
+#20026=*
+xmlAttrs(#20026,#20024,"xmlns","http://www.w3.org/1999/xhtml",0,#10000)
+#20027=@"loc,{#10000},2,7,2,42"
+locations_default(#20027,#10000,2,7,2,42)
+xmllocations(#20026,#20027)
+#20028=*
+xmlAttrs(#20028,#20024,"xml:lang","en",1,#10000)
+#20029=@"loc,{#10000},2,44,2,56"
+locations_default(#20029,#10000,2,44,2,56)
+xmllocations(#20028,#20029)
+#20030=*
+xmlElements(#20030,"body",#20024,1,#10000)
+#20031=@"loc,{#10000},6,1,11,7"
+locations_default(#20031,#10000,6,1,11,7)
+xmllocations(#20030,#20031)
+xmlElements(#20001,"script",#20030,0,#10000)
+#20032=@"loc,{#10000},7,5,10,16"
+locations_default(#20032,#10000,7,5,10,16)
+xmllocations(#20001,#20032)
+#20033=*
+xmlAttrs(#20033,#20001,"type","application/javascript",0,#10000)
+#20034=@"loc,{#10000},7,13,7,41"
+locations_default(#20034,#10000,7,13,7,41)
+xmllocations(#20033,#20034)
+#20035=*
+xmlElements(#20035,"head",#20024,0,#10000)
+#20036=@"loc,{#10000},3,1,5,7"
+locations_default(#20036,#10000,3,1,5,7)
+xmllocations(#20035,#20036)
+#20037=*
+xmlElements(#20037,"title",#20035,0,#10000)
+#20038=@"loc,{#10000},4,5,4,31"
+locations_default(#20038,#10000,4,5,4,31)
+xmllocations(#20037,#20038)
 numlines(#10000,12,1,0)
 filetype(#10000,"html")
diff --git a/javascript/extractor/tests/html/output/trap/tst2.html.trap b/javascript/extractor/tests/html/output/trap/tst2.html.trap
index bff75920f0b..60921287f85 100644
--- a/javascript/extractor/tests/html/output/trap/tst2.html.trap
+++ b/javascript/extractor/tests/html/output/trap/tst2.html.trap
@@ -40,335 +40,342 @@ toplevels(#20002,1)
 hasLocation(#20002,#20004)
 #20013=@"var;{hello};{#20000}"
 variables(#20013,"hello",#20000)
-#20014=*
-stmts(#20014,18,#20002,0,"var hello;")
-hasLocation(#20014,#20004)
-stmt_containers(#20014,#20002)
+#20014=@"var;{this};{#20000}"
+variables(#20014,"this",#20000)
 #20015=*
-exprs(#20015,64,#20014,0,"hello")
-hasLocation(#20015,#20008)
-enclosing_stmt(#20015,#20014)
-expr_containers(#20015,#20002)
+stmts(#20015,18,#20002,0,"var hello;")
+hasLocation(#20015,#20004)
+stmt_containers(#20015,#20002)
 #20016=*
-exprs(#20016,78,#20015,0,"hello")
+exprs(#20016,64,#20015,0,"hello")
 hasLocation(#20016,#20008)
-enclosing_stmt(#20016,#20014)
+enclosing_stmt(#20016,#20015)
 expr_containers(#20016,#20002)
-literals("hello","hello",#20016)
-decl(#20016,#20013)
 #20017=*
-entry_cfg_node(#20017,#20002)
-#20018=@"loc,{#10000},2,31,2,30"
-locations_default(#20018,#10000,2,31,2,30)
-hasLocation(#20017,#20018)
-#20019=*
-exit_cfg_node(#20019,#20002)
-hasLocation(#20019,#20012)
-successor(#20014,#20016)
-successor(#20016,#20015)
-successor(#20015,#20019)
-successor(#20017,#20014)
-toplevel_parent_xml_node(#20002,#20001)
+exprs(#20017,78,#20016,0,"hello")
+hasLocation(#20017,#20008)
+enclosing_stmt(#20017,#20015)
+expr_containers(#20017,#20002)
+literals("hello","hello",#20017)
+decl(#20017,#20013)
+#20018=*
+entry_cfg_node(#20018,#20002)
+#20019=@"loc,{#10000},2,31,2,30"
+locations_default(#20019,#10000,2,31,2,30)
+hasLocation(#20018,#20019)
 #20020=*
-#20021=@"script;{#10000},3,29"
-#20022=*
-lines(#20022,#20021,"var world;","")
-#20023=@"loc,{#10000},3,29,3,38"
-locations_default(#20023,#10000,3,29,3,38)
-hasLocation(#20022,#20023)
-numlines(#20021,1,1,0)
-#20024=*
-tokeninfo(#20024,7,#20021,0,"var")
-#20025=@"loc,{#10000},3,29,3,31"
-locations_default(#20025,#10000,3,29,3,31)
-hasLocation(#20024,#20025)
-#20026=*
-tokeninfo(#20026,6,#20021,1,"world")
-#20027=@"loc,{#10000},3,33,3,37"
-locations_default(#20027,#10000,3,33,3,37)
-hasLocation(#20026,#20027)
-#20028=*
-tokeninfo(#20028,8,#20021,2,";")
-#20029=@"loc,{#10000},3,38,3,38"
-locations_default(#20029,#10000,3,38,3,38)
-hasLocation(#20028,#20029)
-#20030=*
-tokeninfo(#20030,0,#20021,3,"")
-#20031=@"loc,{#10000},3,39,3,38"
-locations_default(#20031,#10000,3,39,3,38)
-hasLocation(#20030,#20031)
-toplevels(#20021,1)
-hasLocation(#20021,#20023)
-#20032=@"var;{world};{#20000}"
-variables(#20032,"world",#20000)
-#20033=*
-stmts(#20033,18,#20021,0,"var world;")
-hasLocation(#20033,#20023)
-stmt_containers(#20033,#20021)
+exit_cfg_node(#20020,#20002)
+hasLocation(#20020,#20012)
+successor(#20015,#20017)
+successor(#20017,#20016)
+successor(#20016,#20020)
+successor(#20018,#20015)
+toplevel_parent_xml_node(#20002,#20001)
+#20021=*
+#20022=@"script;{#10000},3,29"
+#20023=*
+lines(#20023,#20022,"var world;","")
+#20024=@"loc,{#10000},3,29,3,38"
+locations_default(#20024,#10000,3,29,3,38)
+hasLocation(#20023,#20024)
+numlines(#20022,1,1,0)
+#20025=*
+tokeninfo(#20025,7,#20022,0,"var")
+#20026=@"loc,{#10000},3,29,3,31"
+locations_default(#20026,#10000,3,29,3,31)
+hasLocation(#20025,#20026)
+#20027=*
+tokeninfo(#20027,6,#20022,1,"world")
+#20028=@"loc,{#10000},3,33,3,37"
+locations_default(#20028,#10000,3,33,3,37)
+hasLocation(#20027,#20028)
+#20029=*
+tokeninfo(#20029,8,#20022,2,";")
+#20030=@"loc,{#10000},3,38,3,38"
+locations_default(#20030,#10000,3,38,3,38)
+hasLocation(#20029,#20030)
+#20031=*
+tokeninfo(#20031,0,#20022,3,"")
+#20032=@"loc,{#10000},3,39,3,38"
+locations_default(#20032,#10000,3,39,3,38)
+hasLocation(#20031,#20032)
+toplevels(#20022,1)
+hasLocation(#20022,#20024)
+#20033=@"var;{world};{#20000}"
+variables(#20033,"world",#20000)
+variables(#20014,"this",#20000)
 #20034=*
-exprs(#20034,64,#20033,0,"world")
-hasLocation(#20034,#20027)
-enclosing_stmt(#20034,#20033)
-expr_containers(#20034,#20021)
+stmts(#20034,18,#20022,0,"var world;")
+hasLocation(#20034,#20024)
+stmt_containers(#20034,#20022)
 #20035=*
-exprs(#20035,78,#20034,0,"world")
-hasLocation(#20035,#20027)
-enclosing_stmt(#20035,#20033)
-expr_containers(#20035,#20021)
-literals("world","world",#20035)
-decl(#20035,#20032)
+exprs(#20035,64,#20034,0,"world")
+hasLocation(#20035,#20028)
+enclosing_stmt(#20035,#20034)
+expr_containers(#20035,#20022)
 #20036=*
-entry_cfg_node(#20036,#20021)
-#20037=@"loc,{#10000},3,29,3,28"
-locations_default(#20037,#10000,3,29,3,28)
-hasLocation(#20036,#20037)
-#20038=*
-exit_cfg_node(#20038,#20021)
-hasLocation(#20038,#20031)
-successor(#20033,#20035)
-successor(#20035,#20034)
-successor(#20034,#20038)
-successor(#20036,#20033)
-toplevel_parent_xml_node(#20021,#20020)
+exprs(#20036,78,#20035,0,"world")
+hasLocation(#20036,#20028)
+enclosing_stmt(#20036,#20034)
+expr_containers(#20036,#20022)
+literals("world","world",#20036)
+decl(#20036,#20033)
+#20037=*
+entry_cfg_node(#20037,#20022)
+#20038=@"loc,{#10000},3,29,3,28"
+locations_default(#20038,#10000,3,29,3,28)
+hasLocation(#20037,#20038)
 #20039=*
-#20040=@"script;{#10000},4,75"
-#20041=*
-lines(#20041,#20040,"","
+exit_cfg_node(#20039,#20022)
+hasLocation(#20039,#20032)
+successor(#20034,#20036)
+successor(#20036,#20035)
+successor(#20035,#20039)
+successor(#20037,#20034)
+toplevel_parent_xml_node(#20022,#20021)
+#20040=*
+#20041=@"script;{#10000},4,75"
+#20042=*
+lines(#20042,#20041,"","
 ")
-#20042=@"loc,{#10000},4,75,4,74"
-locations_default(#20042,#10000,4,75,4,74)
-hasLocation(#20041,#20042)
-#20043=*
-lines(#20043,#20040,"      var inAModule;","
+#20043=@"loc,{#10000},4,75,4,74"
+locations_default(#20043,#10000,4,75,4,74)
+hasLocation(#20042,#20043)
+#20044=*
+lines(#20044,#20041,"      var inAModule;","
 ")
-#20044=@"loc,{#10000},5,1,5,20"
-locations_default(#20044,#10000,5,1,5,20)
-hasLocation(#20043,#20044)
+#20045=@"loc,{#10000},5,1,5,20"
+locations_default(#20045,#10000,5,1,5,20)
+hasLocation(#20044,#20045)
 indentation(#10000,5," ",6)
-#20045=*
-lines(#20045,#20040,"    ","")
-#20046=@"loc,{#10000},6,1,6,4"
-locations_default(#20046,#10000,6,1,6,4)
-hasLocation(#20045,#20046)
-numlines(#20040,3,1,0)
-#20047=*
-tokeninfo(#20047,7,#20040,0,"var")
-#20048=@"loc,{#10000},5,7,5,9"
-locations_default(#20048,#10000,5,7,5,9)
-hasLocation(#20047,#20048)
-#20049=*
-tokeninfo(#20049,6,#20040,1,"inAModule")
-#20050=@"loc,{#10000},5,11,5,19"
-locations_default(#20050,#10000,5,11,5,19)
-hasLocation(#20049,#20050)
-#20051=*
-tokeninfo(#20051,8,#20040,2,";")
-#20052=@"loc,{#10000},5,20,5,20"
-locations_default(#20052,#10000,5,20,5,20)
-hasLocation(#20051,#20052)
-#20053=*
-tokeninfo(#20053,0,#20040,3,"")
-#20054=@"loc,{#10000},6,5,6,4"
-locations_default(#20054,#10000,6,5,6,4)
-hasLocation(#20053,#20054)
-toplevels(#20040,1)
-#20055=@"loc,{#10000},4,75,6,4"
-locations_default(#20055,#10000,4,75,6,4)
-hasLocation(#20040,#20055)
-#20056=@"module;{#10000},4,75"
-scopes(#20056,3)
-scopenodes(#20040,#20056)
-scopenesting(#20056,#20000)
-is_module(#20040)
-is_es2015_module(#20040)
-#20057=@"var;{inAModule};{#20056}"
-variables(#20057,"inAModule",#20056)
-#20058=*
-stmts(#20058,18,#20040,0,"var inAModule;")
-#20059=@"loc,{#10000},5,7,5,20"
-locations_default(#20059,#10000,5,7,5,20)
-hasLocation(#20058,#20059)
-stmt_containers(#20058,#20040)
+#20046=*
+lines(#20046,#20041,"    ","")
+#20047=@"loc,{#10000},6,1,6,4"
+locations_default(#20047,#10000,6,1,6,4)
+hasLocation(#20046,#20047)
+numlines(#20041,3,1,0)
+#20048=*
+tokeninfo(#20048,7,#20041,0,"var")
+#20049=@"loc,{#10000},5,7,5,9"
+locations_default(#20049,#10000,5,7,5,9)
+hasLocation(#20048,#20049)
+#20050=*
+tokeninfo(#20050,6,#20041,1,"inAModule")
+#20051=@"loc,{#10000},5,11,5,19"
+locations_default(#20051,#10000,5,11,5,19)
+hasLocation(#20050,#20051)
+#20052=*
+tokeninfo(#20052,8,#20041,2,";")
+#20053=@"loc,{#10000},5,20,5,20"
+locations_default(#20053,#10000,5,20,5,20)
+hasLocation(#20052,#20053)
+#20054=*
+tokeninfo(#20054,0,#20041,3,"")
+#20055=@"loc,{#10000},6,5,6,4"
+locations_default(#20055,#10000,6,5,6,4)
+hasLocation(#20054,#20055)
+toplevels(#20041,1)
+#20056=@"loc,{#10000},4,75,6,4"
+locations_default(#20056,#10000,4,75,6,4)
+hasLocation(#20041,#20056)
+#20057=@"module;{#10000},4,75"
+scopes(#20057,3)
+scopenodes(#20041,#20057)
+scopenesting(#20057,#20000)
+is_module(#20041)
+is_es2015_module(#20041)
+#20058=@"var;{inAModule};{#20057}"
+variables(#20058,"inAModule",#20057)
+#20059=@"var;{this};{#20057}"
+variables(#20059,"this",#20057)
 #20060=*
-exprs(#20060,64,#20058,0,"inAModule")
-hasLocation(#20060,#20050)
-enclosing_stmt(#20060,#20058)
-expr_containers(#20060,#20040)
-#20061=*
-exprs(#20061,78,#20060,0,"inAModule")
-hasLocation(#20061,#20050)
-enclosing_stmt(#20061,#20058)
-expr_containers(#20061,#20040)
-literals("inAModule","inAModule",#20061)
-decl(#20061,#20057)
+stmts(#20060,18,#20041,0,"var inAModule;")
+#20061=@"loc,{#10000},5,7,5,20"
+locations_default(#20061,#10000,5,7,5,20)
+hasLocation(#20060,#20061)
+stmt_containers(#20060,#20041)
 #20062=*
-entry_cfg_node(#20062,#20040)
-hasLocation(#20062,#20042)
+exprs(#20062,64,#20060,0,"inAModule")
+hasLocation(#20062,#20051)
+enclosing_stmt(#20062,#20060)
+expr_containers(#20062,#20041)
 #20063=*
-exit_cfg_node(#20063,#20040)
-hasLocation(#20063,#20054)
-successor(#20058,#20061)
-successor(#20061,#20060)
-successor(#20060,#20063)
-successor(#20062,#20058)
-toplevel_parent_xml_node(#20040,#20039)
+exprs(#20063,78,#20062,0,"inAModule")
+hasLocation(#20063,#20051)
+enclosing_stmt(#20063,#20060)
+expr_containers(#20063,#20041)
+literals("inAModule","inAModule",#20063)
+decl(#20063,#20058)
 #20064=*
-#20065=@"script;{#10000},7,75"
+entry_cfg_node(#20064,#20041)
+hasLocation(#20064,#20043)
+#20065=*
+exit_cfg_node(#20065,#20041)
+hasLocation(#20065,#20055)
+successor(#20060,#20063)
+successor(#20063,#20062)
+successor(#20062,#20065)
+successor(#20064,#20060)
+toplevel_parent_xml_node(#20041,#20040)
 #20066=*
-lines(#20066,#20065,"","
-")
-#20067=@"loc,{#10000},7,75,7,74"
-locations_default(#20067,#10000,7,75,7,74)
-hasLocation(#20066,#20067)
+#20067=@"script;{#10000},7,75"
 #20068=*
-lines(#20068,#20065,"      import f from ""f""","
+lines(#20068,#20067,"","
 ")
-#20069=@"loc,{#10000},8,1,8,23"
-locations_default(#20069,#10000,8,1,8,23)
+#20069=@"loc,{#10000},7,75,7,74"
+locations_default(#20069,#10000,7,75,7,74)
 hasLocation(#20068,#20069)
-indentation(#10000,8," ",6)
 #20070=*
-lines(#20070,#20065,"    ","")
-#20071=@"loc,{#10000},9,1,9,4"
-locations_default(#20071,#10000,9,1,9,4)
+lines(#20070,#20067,"      import f from ""f""","
+")
+#20071=@"loc,{#10000},8,1,8,23"
+locations_default(#20071,#10000,8,1,8,23)
 hasLocation(#20070,#20071)
-numlines(#20065,3,1,0)
+indentation(#10000,8," ",6)
 #20072=*
-tokeninfo(#20072,7,#20065,0,"import")
-#20073=@"loc,{#10000},8,7,8,12"
-locations_default(#20073,#10000,8,7,8,12)
+lines(#20072,#20067,"    ","")
+#20073=@"loc,{#10000},9,1,9,4"
+locations_default(#20073,#10000,9,1,9,4)
 hasLocation(#20072,#20073)
+numlines(#20067,3,1,0)
 #20074=*
-tokeninfo(#20074,6,#20065,1,"f")
-#20075=@"loc,{#10000},8,14,8,14"
-locations_default(#20075,#10000,8,14,8,14)
+tokeninfo(#20074,7,#20067,0,"import")
+#20075=@"loc,{#10000},8,7,8,12"
+locations_default(#20075,#10000,8,7,8,12)
 hasLocation(#20074,#20075)
 #20076=*
-tokeninfo(#20076,6,#20065,2,"from")
-#20077=@"loc,{#10000},8,16,8,19"
-locations_default(#20077,#10000,8,16,8,19)
+tokeninfo(#20076,6,#20067,1,"f")
+#20077=@"loc,{#10000},8,14,8,14"
+locations_default(#20077,#10000,8,14,8,14)
 hasLocation(#20076,#20077)
 #20078=*
-tokeninfo(#20078,4,#20065,3,"""f""")
-#20079=@"loc,{#10000},8,21,8,23"
-locations_default(#20079,#10000,8,21,8,23)
+tokeninfo(#20078,6,#20067,2,"from")
+#20079=@"loc,{#10000},8,16,8,19"
+locations_default(#20079,#10000,8,16,8,19)
 hasLocation(#20078,#20079)
 #20080=*
-tokeninfo(#20080,0,#20065,4,"")
-#20081=@"loc,{#10000},9,5,9,4"
-locations_default(#20081,#10000,9,5,9,4)
+tokeninfo(#20080,4,#20067,3,"""f""")
+#20081=@"loc,{#10000},8,21,8,23"
+locations_default(#20081,#10000,8,21,8,23)
 hasLocation(#20080,#20081)
-toplevels(#20065,1)
-#20082=@"loc,{#10000},7,75,9,4"
-locations_default(#20082,#10000,7,75,9,4)
-hasLocation(#20065,#20082)
-#20083=@"module;{#10000},7,75"
-scopes(#20083,3)
-scopenodes(#20065,#20083)
-scopenesting(#20083,#20000)
-is_module(#20065)
-is_es2015_module(#20065)
-#20084=@"var;{f};{#20083}"
-variables(#20084,"f",#20083)
-#20085=@"local_type_name;{f};{#20083}"
-local_type_names(#20085,"f",#20083)
-#20086=@"local_namespace_name;{f};{#20083}"
-local_namespace_names(#20086,"f",#20083)
-variables(#20084,"f",#20083)
-local_type_names(#20085,"f",#20083)
-local_namespace_names(#20086,"f",#20083)
-#20087=*
-stmts(#20087,27,#20065,0,"import f from ""f""")
-#20088=@"loc,{#10000},8,7,8,23"
-locations_default(#20088,#10000,8,7,8,23)
-hasLocation(#20087,#20088)
-stmt_containers(#20087,#20065)
-#20089=*
-exprs(#20089,4,#20087,-1,"""f""")
-hasLocation(#20089,#20079)
-enclosing_stmt(#20089,#20087)
-expr_containers(#20089,#20065)
-literals("f","""f""",#20089)
+#20082=*
+tokeninfo(#20082,0,#20067,4,"")
+#20083=@"loc,{#10000},9,5,9,4"
+locations_default(#20083,#10000,9,5,9,4)
+hasLocation(#20082,#20083)
+toplevels(#20067,1)
+#20084=@"loc,{#10000},7,75,9,4"
+locations_default(#20084,#10000,7,75,9,4)
+hasLocation(#20067,#20084)
+#20085=@"module;{#10000},7,75"
+scopes(#20085,3)
+scopenodes(#20067,#20085)
+scopenesting(#20085,#20000)
+is_module(#20067)
+is_es2015_module(#20067)
+#20086=@"var;{f};{#20085}"
+variables(#20086,"f",#20085)
+#20087=@"local_type_name;{f};{#20085}"
+local_type_names(#20087,"f",#20085)
+#20088=@"local_namespace_name;{f};{#20085}"
+local_namespace_names(#20088,"f",#20085)
+variables(#20086,"f",#20085)
+local_type_names(#20087,"f",#20085)
+local_namespace_names(#20088,"f",#20085)
+#20089=@"var;{this};{#20085}"
+variables(#20089,"this",#20085)
 #20090=*
-regexpterm(#20090,14,#20089,0,"f")
-#20091=@"loc,{#10000},8,22,8,22"
-locations_default(#20091,#10000,8,22,8,22)
+stmts(#20090,27,#20067,0,"import f from ""f""")
+#20091=@"loc,{#10000},8,7,8,23"
+locations_default(#20091,#10000,8,7,8,23)
 hasLocation(#20090,#20091)
-regexp_const_value(#20090,"f")
+stmt_containers(#20090,#20067)
 #20092=*
-exprs(#20092,84,#20087,0,"f")
-hasLocation(#20092,#20075)
-enclosing_stmt(#20092,#20087)
-expr_containers(#20092,#20065)
+exprs(#20092,4,#20090,-1,"""f""")
+hasLocation(#20092,#20081)
+enclosing_stmt(#20092,#20090)
+expr_containers(#20092,#20067)
+literals("f","""f""",#20092)
 #20093=*
-exprs(#20093,78,#20092,1,"f")
-hasLocation(#20093,#20075)
-enclosing_stmt(#20093,#20087)
-expr_containers(#20093,#20065)
-literals("f","f",#20093)
-decl(#20093,#20084)
-typedecl(#20093,#20085)
-namespacedecl(#20093,#20086)
-#20094=*
-entry_cfg_node(#20094,#20065)
-hasLocation(#20094,#20067)
+regexpterm(#20093,14,#20092,0,"f")
+#20094=@"loc,{#10000},8,22,8,22"
+locations_default(#20094,#10000,8,22,8,22)
+hasLocation(#20093,#20094)
+regexp_const_value(#20093,"f")
 #20095=*
-exit_cfg_node(#20095,#20065)
-hasLocation(#20095,#20081)
-successor(#20087,#20095)
-successor(#20092,#20087)
-successor(#20094,#20092)
-toplevel_parent_xml_node(#20065,#20064)
+exprs(#20095,84,#20090,0,"f")
+hasLocation(#20095,#20077)
+enclosing_stmt(#20095,#20090)
+expr_containers(#20095,#20067)
 #20096=*
-xmlElements(#20096,"html",#10000,0,#10000)
-#20097=@"loc,{#10000},1,1,10,7"
-locations_default(#20097,#10000,1,1,10,7)
-xmllocations(#20096,#20097)
-xmlElements(#20064,"script",#20096,3,#10000)
-#20098=@"loc,{#10000},7,5,9,13"
-locations_default(#20098,#10000,7,5,9,13)
-xmllocations(#20064,#20098)
+exprs(#20096,78,#20095,1,"f")
+hasLocation(#20096,#20077)
+enclosing_stmt(#20096,#20090)
+expr_containers(#20096,#20067)
+literals("f","f",#20096)
+decl(#20096,#20086)
+typedecl(#20096,#20087)
+namespacedecl(#20096,#20088)
+#20097=*
+entry_cfg_node(#20097,#20067)
+hasLocation(#20097,#20069)
+#20098=*
+exit_cfg_node(#20098,#20067)
+hasLocation(#20098,#20083)
+successor(#20090,#20098)
+successor(#20095,#20090)
+successor(#20097,#20095)
+toplevel_parent_xml_node(#20067,#20066)
 #20099=*
-xmlAttrs(#20099,#20064,"type","text/babel",0,#10000)
-#20100=@"loc,{#10000},7,13,7,29"
-locations_default(#20100,#10000,7,13,7,29)
+xmlElements(#20099,"html",#10000,0,#10000)
+#20100=@"loc,{#10000},1,1,10,7"
+locations_default(#20100,#10000,1,1,10,7)
 xmllocations(#20099,#20100)
-#20101=*
-xmlAttrs(#20101,#20064,"data-plugins","transform-es2015-modules-umd",1,#10000)
-#20102=@"loc,{#10000},7,31,7,73"
-locations_default(#20102,#10000,7,31,7,73)
-xmllocations(#20101,#20102)
-xmlElements(#20039,"script",#20096,2,#10000)
-#20103=@"loc,{#10000},4,5,6,13"
-locations_default(#20103,#10000,4,5,6,13)
-xmllocations(#20039,#20103)
+xmlElements(#20066,"script",#20099,3,#10000)
+#20101=@"loc,{#10000},7,5,9,13"
+locations_default(#20101,#10000,7,5,9,13)
+xmllocations(#20066,#20101)
+#20102=*
+xmlAttrs(#20102,#20066,"type","text/babel",0,#10000)
+#20103=@"loc,{#10000},7,13,7,29"
+locations_default(#20103,#10000,7,13,7,29)
+xmllocations(#20102,#20103)
 #20104=*
-xmlAttrs(#20104,#20039,"type","text/babel",0,#10000)
-#20105=@"loc,{#10000},4,13,4,29"
-locations_default(#20105,#10000,4,13,4,29)
+xmlAttrs(#20104,#20066,"data-plugins","transform-es2015-modules-umd",1,#10000)
+#20105=@"loc,{#10000},7,31,7,73"
+locations_default(#20105,#10000,7,31,7,73)
 xmllocations(#20104,#20105)
-#20106=*
-xmlAttrs(#20106,#20039,"data-plugins","transform-es2015-modules-umd",1,#10000)
-#20107=@"loc,{#10000},4,31,4,73"
-locations_default(#20107,#10000,4,31,4,73)
-xmllocations(#20106,#20107)
-xmlElements(#20020,"script",#20096,1,#10000)
-#20108=@"loc,{#10000},3,5,3,47"
-locations_default(#20108,#10000,3,5,3,47)
-xmllocations(#20020,#20108)
+xmlElements(#20040,"script",#20099,2,#10000)
+#20106=@"loc,{#10000},4,5,6,13"
+locations_default(#20106,#10000,4,5,6,13)
+xmllocations(#20040,#20106)
+#20107=*
+xmlAttrs(#20107,#20040,"type","text/babel",0,#10000)
+#20108=@"loc,{#10000},4,13,4,29"
+locations_default(#20108,#10000,4,13,4,29)
+xmllocations(#20107,#20108)
 #20109=*
-xmlAttrs(#20109,#20020,"type","text/jsx",0,#10000)
-#20110=@"loc,{#10000},3,13,3,27"
-locations_default(#20110,#10000,3,13,3,27)
+xmlAttrs(#20109,#20040,"data-plugins","transform-es2015-modules-umd",1,#10000)
+#20110=@"loc,{#10000},4,31,4,73"
+locations_default(#20110,#10000,4,31,4,73)
 xmllocations(#20109,#20110)
-xmlElements(#20001,"script",#20096,0,#10000)
-#20111=@"loc,{#10000},2,5,2,49"
-locations_default(#20111,#10000,2,5,2,49)
-xmllocations(#20001,#20111)
+xmlElements(#20021,"script",#20099,1,#10000)
+#20111=@"loc,{#10000},3,5,3,47"
+locations_default(#20111,#10000,3,5,3,47)
+xmllocations(#20021,#20111)
 #20112=*
-xmlAttrs(#20112,#20001,"type","text/babel",0,#10000)
-#20113=@"loc,{#10000},2,13,2,29"
-locations_default(#20113,#10000,2,13,2,29)
+xmlAttrs(#20112,#20021,"type","text/jsx",0,#10000)
+#20113=@"loc,{#10000},3,13,3,27"
+locations_default(#20113,#10000,3,13,3,27)
 xmllocations(#20112,#20113)
+xmlElements(#20001,"script",#20099,0,#10000)
+#20114=@"loc,{#10000},2,5,2,49"
+locations_default(#20114,#10000,2,5,2,49)
+xmllocations(#20001,#20114)
+#20115=*
+xmlAttrs(#20115,#20001,"type","text/babel",0,#10000)
+#20116=@"loc,{#10000},2,13,2,29"
+locations_default(#20116,#10000,2,13,2,29)
+xmllocations(#20115,#20116)
 numlines(#10000,10,4,0)
 filetype(#10000,"html")
diff --git a/javascript/extractor/tests/jscript/output/trap/tst.js.trap b/javascript/extractor/tests/jscript/output/trap/tst.js.trap
index 91510d288bb..dec05f02911 100644
--- a/javascript/extractor/tests/jscript/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/jscript/output/trap/tst.js.trap
@@ -77,104 +77,108 @@ locations_default(#20027,#10000,1,53,1,52)
 hasLocation(#20026,#20027)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20028=*
-stmts(#20028,2,#20001,0,"functio ... es) { }")
-hasLocation(#20028,#20003)
-stmt_containers(#20028,#20001)
+#20028=@"var;{this};{#20000}"
+variables(#20028,"this",#20000)
 #20029=*
-exprs(#20029,47,#20028,0,"functio ... es) { }")
+stmts(#20029,2,#20001,0,"functio ... es) { }")
 hasLocation(#20029,#20003)
-enclosing_stmt(#20029,#20028)
-expr_containers(#20029,#20001)
+stmt_containers(#20029,#20001)
 #20030=*
-exprs(#20030,14,#20029,0,"ISMTPOn ... Arrival")
-#20031=@"loc,{#10000},1,10,1,34"
-locations_default(#20031,#10000,1,10,1,34)
-hasLocation(#20030,#20031)
-enclosing_stmt(#20030,#20028)
+exprs(#20030,47,#20029,0,"functio ... es) { }")
+hasLocation(#20030,#20003)
+enclosing_stmt(#20030,#20029)
 expr_containers(#20030,#20001)
-#20032=*
-exprs(#20032,79,#20030,0,"ISMTPOnArrival")
-hasLocation(#20032,#20007)
-enclosing_stmt(#20032,#20028)
-expr_containers(#20032,#20001)
-literals("ISMTPOnArrival","ISMTPOnArrival",#20032)
-#20033=@"var;{ISMTPOnArrival};{#20000}"
-variables(#20033,"ISMTPOnArrival",#20000)
-bind(#20032,#20033)
-#20034=*
-exprs(#20034,0,#20030,1,"OnArrival")
-hasLocation(#20034,#20011)
-enclosing_stmt(#20034,#20028)
-expr_containers(#20034,#20001)
-literals("OnArrival","OnArrival",#20034)
+#20031=*
+exprs(#20031,14,#20030,0,"ISMTPOn ... Arrival")
+#20032=@"loc,{#10000},1,10,1,34"
+locations_default(#20032,#10000,1,10,1,34)
+hasLocation(#20031,#20032)
+enclosing_stmt(#20031,#20029)
+expr_containers(#20031,#20001)
+#20033=*
+exprs(#20033,79,#20031,0,"ISMTPOnArrival")
+hasLocation(#20033,#20007)
+enclosing_stmt(#20033,#20029)
+expr_containers(#20033,#20001)
+literals("ISMTPOnArrival","ISMTPOnArrival",#20033)
+#20034=@"var;{ISMTPOnArrival};{#20000}"
+variables(#20034,"ISMTPOnArrival",#20000)
+bind(#20033,#20034)
 #20035=*
-exprs(#20035,9,#20029,1,"functio ... es) { }")
-hasLocation(#20035,#20003)
-enclosing_stmt(#20035,#20028)
+exprs(#20035,0,#20031,1,"OnArrival")
+hasLocation(#20035,#20011)
+enclosing_stmt(#20035,#20029)
 expr_containers(#20035,#20001)
+literals("OnArrival","OnArrival",#20035)
 #20036=*
-scopes(#20036,1)
-scopenodes(#20035,#20036)
-scopenesting(#20036,#20000)
-#20037=@"var;{OnArrival};{#20036}"
-variables(#20037,"OnArrival",#20036)
-#20038=*
-exprs(#20038,78,#20035,-1,"OnArrival")
-hasLocation(#20038,#20011)
-expr_containers(#20038,#20035)
-literals("OnArrival","OnArrival",#20038)
-decl(#20038,#20037)
-#20039=@"var;{Msg};{#20036}"
-variables(#20039,"Msg",#20036)
+exprs(#20036,9,#20030,1,"functio ... es) { }")
+hasLocation(#20036,#20003)
+enclosing_stmt(#20036,#20029)
+expr_containers(#20036,#20001)
+#20037=*
+scopes(#20037,1)
+scopenodes(#20036,#20037)
+scopenesting(#20037,#20000)
+#20038=@"var;{this};{#20037}"
+variables(#20038,"this",#20037)
+#20039=@"var;{OnArrival};{#20037}"
+variables(#20039,"OnArrival",#20037)
 #20040=*
-exprs(#20040,78,#20035,0,"Msg")
-hasLocation(#20040,#20015)
-expr_containers(#20040,#20035)
-literals("Msg","Msg",#20040)
+exprs(#20040,78,#20036,-1,"OnArrival")
+hasLocation(#20040,#20011)
+expr_containers(#20040,#20036)
+literals("OnArrival","OnArrival",#20040)
 decl(#20040,#20039)
-#20041=@"var;{States};{#20036}"
-variables(#20041,"States",#20036)
+#20041=@"var;{Msg};{#20037}"
+variables(#20041,"Msg",#20037)
 #20042=*
-exprs(#20042,78,#20035,1,"States")
-hasLocation(#20042,#20019)
-expr_containers(#20042,#20035)
-literals("States","States",#20042)
+exprs(#20042,78,#20036,0,"Msg")
+hasLocation(#20042,#20015)
+expr_containers(#20042,#20036)
+literals("Msg","Msg",#20042)
 decl(#20042,#20041)
-#20043=@"var;{arguments};{#20036}"
-variables(#20043,"arguments",#20036)
-is_arguments_object(#20043)
+#20043=@"var;{States};{#20037}"
+variables(#20043,"States",#20037)
 #20044=*
-stmts(#20044,1,#20035,-2,"{ }")
-#20045=@"loc,{#10000},1,50,1,52"
-locations_default(#20045,#10000,1,50,1,52)
-hasLocation(#20044,#20045)
-stmt_containers(#20044,#20035)
+exprs(#20044,78,#20036,1,"States")
+hasLocation(#20044,#20019)
+expr_containers(#20044,#20036)
+literals("States","States",#20044)
+decl(#20044,#20043)
+#20045=@"var;{arguments};{#20037}"
+variables(#20045,"arguments",#20037)
+is_arguments_object(#20045)
 #20046=*
-entry_cfg_node(#20046,#20001)
-#20047=@"loc,{#10000},1,1,1,0"
-locations_default(#20047,#10000,1,1,1,0)
+stmts(#20046,1,#20036,-2,"{ }")
+#20047=@"loc,{#10000},1,50,1,52"
+locations_default(#20047,#10000,1,50,1,52)
 hasLocation(#20046,#20047)
+stmt_containers(#20046,#20036)
 #20048=*
-exit_cfg_node(#20048,#20001)
-hasLocation(#20048,#20027)
-successor(#20028,#20032)
-successor(#20035,#20029)
-#20049=*
-entry_cfg_node(#20049,#20035)
-hasLocation(#20049,#20047)
+entry_cfg_node(#20048,#20001)
+#20049=@"loc,{#10000},1,1,1,0"
+locations_default(#20049,#10000,1,1,1,0)
+hasLocation(#20048,#20049)
 #20050=*
-exit_cfg_node(#20050,#20035)
+exit_cfg_node(#20050,#20001)
 hasLocation(#20050,#20027)
-successor(#20044,#20050)
+successor(#20029,#20033)
+successor(#20036,#20030)
+#20051=*
+entry_cfg_node(#20051,#20036)
+hasLocation(#20051,#20049)
+#20052=*
+exit_cfg_node(#20052,#20036)
+hasLocation(#20052,#20027)
+successor(#20046,#20052)
+successor(#20044,#20046)
 successor(#20042,#20044)
 successor(#20040,#20042)
-successor(#20038,#20040)
-successor(#20049,#20038)
-successor(#20034,#20030)
-successor(#20032,#20034)
-successor(#20030,#20035)
-successor(#20029,#20048)
-successor(#20046,#20028)
+successor(#20051,#20040)
+successor(#20035,#20031)
+successor(#20033,#20035)
+successor(#20031,#20036)
+successor(#20030,#20050)
+successor(#20048,#20029)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/jsx/output/trap/repro1.jsx.trap b/javascript/extractor/tests/jsx/output/trap/repro1.jsx.trap
index 387b6e4d0ad..a6a3e63def7 100644
--- a/javascript/extractor/tests/jsx/output/trap/repro1.jsx.trap
+++ b/javascript/extractor/tests/jsx/output/trap/repro1.jsx.trap
@@ -200,186 +200,190 @@ locations_default(#20073,#10000,1,1,5,0)
 hasLocation(#20001,#20073)
 #20074=@"var;{foo};{#20000}"
 variables(#20074,"foo",#20000)
-#20075=*
-stmts(#20075,17,#20001,0,"functio ...  { };\n}")
-#20076=@"loc,{#10000},1,1,4,1"
-locations_default(#20076,#10000,1,1,4,1)
-hasLocation(#20075,#20076)
-stmt_containers(#20075,#20001)
-#20077=*
-exprs(#20077,78,#20075,-1,"foo")
-hasLocation(#20077,#20013)
-expr_containers(#20077,#20075)
-literals("foo","foo",#20077)
-decl(#20077,#20074)
+#20075=@"var;{this};{#20000}"
+variables(#20075,"this",#20000)
+#20076=*
+stmts(#20076,17,#20001,0,"functio ...  { };\n}")
+#20077=@"loc,{#10000},1,1,4,1"
+locations_default(#20077,#10000,1,1,4,1)
+hasLocation(#20076,#20077)
+stmt_containers(#20076,#20001)
 #20078=*
-scopes(#20078,1)
-scopenodes(#20075,#20078)
-scopenesting(#20078,#20000)
-#20079=@"var;{arguments};{#20078}"
-variables(#20079,"arguments",#20078)
-is_arguments_object(#20079)
-#20080=*
-stmts(#20080,1,#20075,-2,"{\n    l ...  { };\n}")
-#20081=@"loc,{#10000},1,16,4,1"
-locations_default(#20081,#10000,1,16,4,1)
-hasLocation(#20080,#20081)
-stmt_containers(#20080,#20075)
+exprs(#20078,78,#20076,-1,"foo")
+hasLocation(#20078,#20013)
+expr_containers(#20078,#20076)
+literals("foo","foo",#20078)
+decl(#20078,#20074)
+#20079=*
+scopes(#20079,1)
+scopenodes(#20076,#20079)
+scopenesting(#20079,#20000)
+#20080=@"var;{this};{#20079}"
+variables(#20080,"this",#20079)
+#20081=@"var;{arguments};{#20079}"
+variables(#20081,"arguments",#20079)
+is_arguments_object(#20081)
 #20082=*
-scopes(#20082,4)
-scopenodes(#20080,#20082)
-scopenesting(#20082,#20078)
-#20083=@"var;{x};{#20082}"
-variables(#20083,"x",#20082)
+stmts(#20082,1,#20076,-2,"{\n    l ...  { };\n}")
+#20083=@"loc,{#10000},1,16,4,1"
+locations_default(#20083,#10000,1,16,4,1)
+hasLocation(#20082,#20083)
+stmt_containers(#20082,#20076)
 #20084=*
-stmts(#20084,23,#20080,0,"let x = <div></div>;")
-#20085=@"loc,{#10000},2,5,2,24"
-locations_default(#20085,#10000,2,5,2,24)
-hasLocation(#20084,#20085)
-stmt_containers(#20084,#20075)
+scopes(#20084,4)
+scopenodes(#20082,#20084)
+scopenesting(#20084,#20079)
+#20085=@"var;{x};{#20084}"
+variables(#20085,"x",#20084)
 #20086=*
-exprs(#20086,64,#20084,0,"x = <div></div>")
-#20087=@"loc,{#10000},2,9,2,23"
-locations_default(#20087,#10000,2,9,2,23)
+stmts(#20086,23,#20082,0,"let x = <div></div>;")
+#20087=@"loc,{#10000},2,5,2,24"
+locations_default(#20087,#10000,2,5,2,24)
 hasLocation(#20086,#20087)
-enclosing_stmt(#20086,#20084)
-expr_containers(#20086,#20075)
+stmt_containers(#20086,#20076)
 #20088=*
-exprs(#20088,78,#20086,0,"x")
-hasLocation(#20088,#20023)
-enclosing_stmt(#20088,#20084)
-expr_containers(#20088,#20075)
-literals("x","x",#20088)
-decl(#20088,#20083)
-#20089=*
-exprs(#20089,89,#20086,1,"<div></div>")
-#20090=@"loc,{#10000},2,13,2,23"
-locations_default(#20090,#10000,2,13,2,23)
-hasLocation(#20089,#20090)
-enclosing_stmt(#20089,#20084)
-expr_containers(#20089,#20075)
+exprs(#20088,64,#20086,0,"x = <div></div>")
+#20089=@"loc,{#10000},2,9,2,23"
+locations_default(#20089,#10000,2,9,2,23)
+hasLocation(#20088,#20089)
+enclosing_stmt(#20088,#20086)
+expr_containers(#20088,#20076)
+#20090=*
+exprs(#20090,78,#20088,0,"x")
+hasLocation(#20090,#20023)
+enclosing_stmt(#20090,#20086)
+expr_containers(#20090,#20076)
+literals("x","x",#20090)
+decl(#20090,#20085)
 #20091=*
-exprs(#20091,0,#20089,-1,"div")
-hasLocation(#20091,#20029)
-enclosing_stmt(#20091,#20084)
-expr_containers(#20091,#20075)
-literals("div","div",#20091)
-#20092=*
-stmts(#20092,9,#20080,1,"return  ... => { };")
-#20093=@"loc,{#10000},3,5,3,42"
-locations_default(#20093,#10000,3,5,3,42)
-hasLocation(#20092,#20093)
-stmt_containers(#20092,#20075)
+exprs(#20091,89,#20088,1,"<div></div>")
+#20092=@"loc,{#10000},2,13,2,23"
+locations_default(#20092,#10000,2,13,2,23)
+hasLocation(#20091,#20092)
+enclosing_stmt(#20091,#20086)
+expr_containers(#20091,#20076)
+#20093=*
+exprs(#20093,0,#20091,-1,"div")
+hasLocation(#20093,#20029)
+enclosing_stmt(#20093,#20086)
+expr_containers(#20093,#20076)
+literals("div","div",#20093)
 #20094=*
-exprs(#20094,11,#20092,0,"true ?  ...  => { }")
-#20095=@"loc,{#10000},3,12,3,41"
-locations_default(#20095,#10000,3,12,3,41)
+stmts(#20094,9,#20082,1,"return  ... => { };")
+#20095=@"loc,{#10000},3,5,3,42"
+locations_default(#20095,#10000,3,5,3,42)
 hasLocation(#20094,#20095)
-enclosing_stmt(#20094,#20092)
-expr_containers(#20094,#20075)
+stmt_containers(#20094,#20076)
 #20096=*
-exprs(#20096,2,#20094,0,"true")
-hasLocation(#20096,#20045)
-enclosing_stmt(#20096,#20092)
-expr_containers(#20096,#20075)
-literals("true","true",#20096)
-#20097=*
-exprs(#20097,63,#20094,1,"(null, null)")
-#20098=@"loc,{#10000},3,19,3,30"
-locations_default(#20098,#10000,3,19,3,30)
-hasLocation(#20097,#20098)
-enclosing_stmt(#20097,#20092)
-expr_containers(#20097,#20075)
+exprs(#20096,11,#20094,0,"true ?  ...  => { }")
+#20097=@"loc,{#10000},3,12,3,41"
+locations_default(#20097,#10000,3,12,3,41)
+hasLocation(#20096,#20097)
+enclosing_stmt(#20096,#20094)
+expr_containers(#20096,#20076)
+#20098=*
+exprs(#20098,2,#20096,0,"true")
+hasLocation(#20098,#20045)
+enclosing_stmt(#20098,#20094)
+expr_containers(#20098,#20076)
+literals("true","true",#20098)
 #20099=*
-exprs(#20099,10,#20097,0,"null, null")
-#20100=@"loc,{#10000},3,20,3,29"
-locations_default(#20100,#10000,3,20,3,29)
+exprs(#20099,63,#20096,1,"(null, null)")
+#20100=@"loc,{#10000},3,19,3,30"
+locations_default(#20100,#10000,3,19,3,30)
 hasLocation(#20099,#20100)
-enclosing_stmt(#20099,#20092)
-expr_containers(#20099,#20075)
+enclosing_stmt(#20099,#20094)
+expr_containers(#20099,#20076)
 #20101=*
-exprs(#20101,1,#20099,0,"null")
-hasLocation(#20101,#20051)
-enclosing_stmt(#20101,#20092)
-expr_containers(#20101,#20075)
-literals("null","null",#20101)
-#20102=*
-exprs(#20102,1,#20099,1,"null")
-hasLocation(#20102,#20055)
-enclosing_stmt(#20102,#20092)
-expr_containers(#20102,#20075)
-literals("null","null",#20102)
+exprs(#20101,10,#20099,0,"null, null")
+#20102=@"loc,{#10000},3,20,3,29"
+locations_default(#20102,#10000,3,20,3,29)
+hasLocation(#20101,#20102)
+enclosing_stmt(#20101,#20094)
+expr_containers(#20101,#20076)
 #20103=*
-exprs(#20103,65,#20094,2,"e => { }")
-#20104=@"loc,{#10000},3,34,3,41"
-locations_default(#20104,#10000,3,34,3,41)
-hasLocation(#20103,#20104)
-enclosing_stmt(#20103,#20092)
-expr_containers(#20103,#20075)
+exprs(#20103,1,#20101,0,"null")
+hasLocation(#20103,#20051)
+enclosing_stmt(#20103,#20094)
+expr_containers(#20103,#20076)
+literals("null","null",#20103)
+#20104=*
+exprs(#20104,1,#20101,1,"null")
+hasLocation(#20104,#20055)
+enclosing_stmt(#20104,#20094)
+expr_containers(#20104,#20076)
+literals("null","null",#20104)
 #20105=*
-scopes(#20105,1)
-scopenodes(#20103,#20105)
-scopenesting(#20105,#20082)
-#20106=@"var;{e};{#20105}"
-variables(#20106,"e",#20105)
+exprs(#20105,65,#20096,2,"e => { }")
+#20106=@"loc,{#10000},3,34,3,41"
+locations_default(#20106,#10000,3,34,3,41)
+hasLocation(#20105,#20106)
+enclosing_stmt(#20105,#20094)
+expr_containers(#20105,#20076)
 #20107=*
-exprs(#20107,78,#20103,0,"e")
-hasLocation(#20107,#20061)
-expr_containers(#20107,#20103)
-literals("e","e",#20107)
-decl(#20107,#20106)
-#20108=*
-stmts(#20108,1,#20103,-2,"{ }")
-#20109=@"loc,{#10000},3,39,3,41"
-locations_default(#20109,#10000,3,39,3,41)
-hasLocation(#20108,#20109)
-stmt_containers(#20108,#20103)
+scopes(#20107,1)
+scopenodes(#20105,#20107)
+scopenesting(#20107,#20084)
+#20108=@"var;{e};{#20107}"
+variables(#20108,"e",#20107)
+#20109=*
+exprs(#20109,78,#20105,0,"e")
+hasLocation(#20109,#20061)
+expr_containers(#20109,#20105)
+literals("e","e",#20109)
+decl(#20109,#20108)
 #20110=*
-entry_cfg_node(#20110,#20001)
-#20111=@"loc,{#10000},1,1,1,0"
-locations_default(#20111,#10000,1,1,1,0)
+stmts(#20110,1,#20105,-2,"{ }")
+#20111=@"loc,{#10000},3,39,3,41"
+locations_default(#20111,#10000,3,39,3,41)
 hasLocation(#20110,#20111)
+stmt_containers(#20110,#20105)
 #20112=*
-exit_cfg_node(#20112,#20001)
-hasLocation(#20112,#20072)
-successor(#20075,#20112)
-#20113=*
-entry_cfg_node(#20113,#20075)
-hasLocation(#20113,#20111)
+entry_cfg_node(#20112,#20001)
+#20113=@"loc,{#10000},1,1,1,0"
+locations_default(#20113,#10000,1,1,1,0)
+hasLocation(#20112,#20113)
 #20114=*
-exit_cfg_node(#20114,#20075)
-#20115=@"loc,{#10000},4,2,4,1"
-locations_default(#20115,#10000,4,2,4,1)
-hasLocation(#20114,#20115)
-successor(#20094,#20096)
-successor(#20096,#20097)
-successor(#20097,#20099)
-successor(#20099,#20101)
-successor(#20102,#20092)
-successor(#20101,#20102)
-successor(#20103,#20092)
+exit_cfg_node(#20114,#20001)
+hasLocation(#20114,#20072)
+successor(#20076,#20114)
+#20115=*
+entry_cfg_node(#20115,#20076)
+hasLocation(#20115,#20113)
 #20116=*
-entry_cfg_node(#20116,#20103)
-#20117=@"loc,{#10000},3,34,3,33"
-locations_default(#20117,#10000,3,34,3,33)
+exit_cfg_node(#20116,#20076)
+#20117=@"loc,{#10000},4,2,4,1"
+locations_default(#20117,#10000,4,2,4,1)
 hasLocation(#20116,#20117)
+successor(#20096,#20098)
+successor(#20098,#20099)
+successor(#20099,#20101)
+successor(#20101,#20103)
+successor(#20104,#20094)
+successor(#20103,#20104)
+successor(#20105,#20094)
 #20118=*
-exit_cfg_node(#20118,#20103)
-#20119=@"loc,{#10000},3,42,3,41"
-locations_default(#20119,#10000,3,42,3,41)
+entry_cfg_node(#20118,#20105)
+#20119=@"loc,{#10000},3,34,3,33"
+locations_default(#20119,#10000,3,34,3,33)
 hasLocation(#20118,#20119)
-successor(#20108,#20118)
-successor(#20107,#20108)
-successor(#20116,#20107)
-successor(#20092,#20114)
-successor(#20084,#20088)
-successor(#20091,#20089)
-successor(#20089,#20086)
-successor(#20088,#20091)
-successor(#20086,#20094)
-successor(#20080,#20084)
-successor(#20113,#20080)
-successor(#20077,#20075)
-successor(#20110,#20077)
+#20120=*
+exit_cfg_node(#20120,#20105)
+#20121=@"loc,{#10000},3,42,3,41"
+locations_default(#20121,#10000,3,42,3,41)
+hasLocation(#20120,#20121)
+successor(#20110,#20120)
+successor(#20109,#20110)
+successor(#20118,#20109)
+successor(#20094,#20116)
+successor(#20086,#20090)
+successor(#20093,#20091)
+successor(#20091,#20088)
+successor(#20090,#20093)
+successor(#20088,#20096)
+successor(#20082,#20086)
+successor(#20115,#20082)
+successor(#20078,#20076)
+successor(#20112,#20078)
 numlines(#10000,4,4,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/jsx/output/trap/tst.js.trap b/javascript/extractor/tests/jsx/output/trap/tst.js.trap
index 2a2bfa4689f..13ea33ba396 100644
--- a/javascript/extractor/tests/jsx/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/jsx/output/trap/tst.js.trap
@@ -424,341 +424,343 @@ toplevels(#20001,0)
 #20164=@"loc,{#10000},1,1,6,0"
 locations_default(#20164,#10000,1,1,6,0)
 hasLocation(#20001,#20164)
-#20165=*
-stmts(#20165,2,#20001,0,"<a/>;")
-hasLocation(#20165,#20003)
-stmt_containers(#20165,#20001)
+#20165=@"var;{this};{#20000}"
+variables(#20165,"this",#20000)
 #20166=*
-exprs(#20166,89,#20165,0,"<a/>")
-#20167=@"loc,{#10000},1,1,1,4"
-locations_default(#20167,#10000,1,1,1,4)
-hasLocation(#20166,#20167)
-enclosing_stmt(#20166,#20165)
-expr_containers(#20166,#20001)
-#20168=*
-exprs(#20168,0,#20166,-1,"a")
-hasLocation(#20168,#20015)
-enclosing_stmt(#20168,#20165)
-expr_containers(#20168,#20001)
-literals("a","a",#20168)
+stmts(#20166,2,#20001,0,"<a/>;")
+hasLocation(#20166,#20003)
+stmt_containers(#20166,#20001)
+#20167=*
+exprs(#20167,89,#20166,0,"<a/>")
+#20168=@"loc,{#10000},1,1,1,4"
+locations_default(#20168,#10000,1,1,1,4)
+hasLocation(#20167,#20168)
+enclosing_stmt(#20167,#20166)
+expr_containers(#20167,#20001)
 #20169=*
-stmts(#20169,2,#20001,1,"<b:c d:e/>;")
-hasLocation(#20169,#20005)
-stmt_containers(#20169,#20001)
+exprs(#20169,0,#20167,-1,"a")
+hasLocation(#20169,#20015)
+enclosing_stmt(#20169,#20166)
+expr_containers(#20169,#20001)
+literals("a","a",#20169)
 #20170=*
-exprs(#20170,89,#20169,0,"<b:c d:e/>")
-#20171=@"loc,{#10000},2,1,2,10"
-locations_default(#20171,#10000,2,1,2,10)
-hasLocation(#20170,#20171)
-enclosing_stmt(#20170,#20169)
-expr_containers(#20170,#20001)
-#20172=*
-exprs(#20172,90,#20170,-1,"b:c")
-#20173=@"loc,{#10000},2,2,2,4"
-locations_default(#20173,#10000,2,2,2,4)
-hasLocation(#20172,#20173)
-enclosing_stmt(#20172,#20169)
-expr_containers(#20172,#20001)
-#20174=*
-exprs(#20174,0,#20172,0,"b")
-hasLocation(#20174,#20025)
-enclosing_stmt(#20174,#20169)
-expr_containers(#20174,#20001)
-literals("b","b",#20174)
+stmts(#20170,2,#20001,1,"<b:c d:e/>;")
+hasLocation(#20170,#20005)
+stmt_containers(#20170,#20001)
+#20171=*
+exprs(#20171,89,#20170,0,"<b:c d:e/>")
+#20172=@"loc,{#10000},2,1,2,10"
+locations_default(#20172,#10000,2,1,2,10)
+hasLocation(#20171,#20172)
+enclosing_stmt(#20171,#20170)
+expr_containers(#20171,#20001)
+#20173=*
+exprs(#20173,90,#20171,-1,"b:c")
+#20174=@"loc,{#10000},2,2,2,4"
+locations_default(#20174,#10000,2,2,2,4)
+hasLocation(#20173,#20174)
+enclosing_stmt(#20173,#20170)
+expr_containers(#20173,#20001)
 #20175=*
-exprs(#20175,0,#20172,1,"c")
-hasLocation(#20175,#20029)
-enclosing_stmt(#20175,#20169)
+exprs(#20175,0,#20173,0,"b")
+hasLocation(#20175,#20025)
+enclosing_stmt(#20175,#20170)
 expr_containers(#20175,#20001)
-literals("c","c",#20175)
+literals("b","b",#20175)
 #20176=*
-properties(#20176,#20170,0,3,"d:e")
-#20177=@"loc,{#10000},2,6,2,8"
-locations_default(#20177,#10000,2,6,2,8)
-hasLocation(#20176,#20177)
-#20178=*
-exprs(#20178,90,#20176,0,"d:e")
-hasLocation(#20178,#20177)
-enclosing_stmt(#20178,#20169)
-expr_containers(#20178,#20001)
+exprs(#20176,0,#20173,1,"c")
+hasLocation(#20176,#20029)
+enclosing_stmt(#20176,#20170)
+expr_containers(#20176,#20001)
+literals("c","c",#20176)
+#20177=*
+properties(#20177,#20171,0,3,"d:e")
+#20178=@"loc,{#10000},2,6,2,8"
+locations_default(#20178,#10000,2,6,2,8)
+hasLocation(#20177,#20178)
 #20179=*
-exprs(#20179,0,#20178,0,"d")
-hasLocation(#20179,#20031)
-enclosing_stmt(#20179,#20169)
+exprs(#20179,90,#20177,0,"d:e")
+hasLocation(#20179,#20178)
+enclosing_stmt(#20179,#20170)
 expr_containers(#20179,#20001)
-literals("d","d",#20179)
 #20180=*
-exprs(#20180,0,#20178,1,"e")
-hasLocation(#20180,#20035)
-enclosing_stmt(#20180,#20169)
+exprs(#20180,0,#20179,0,"d")
+hasLocation(#20180,#20031)
+enclosing_stmt(#20180,#20170)
 expr_containers(#20180,#20001)
-literals("e","e",#20180)
+literals("d","d",#20180)
 #20181=*
-stmts(#20181,2,#20001,2,"<f g:h= ... l></f>;")
-hasLocation(#20181,#20007)
-stmt_containers(#20181,#20001)
+exprs(#20181,0,#20179,1,"e")
+hasLocation(#20181,#20035)
+enclosing_stmt(#20181,#20170)
+expr_containers(#20181,#20001)
+literals("e","e",#20181)
 #20182=*
-exprs(#20182,89,#20181,0,"<f g:h= ... .l></f>")
-#20183=@"loc,{#10000},3,1,3,51"
-locations_default(#20183,#10000,3,1,3,51)
-hasLocation(#20182,#20183)
-enclosing_stmt(#20182,#20181)
-expr_containers(#20182,#20001)
-#20184=*
-exprs(#20184,0,#20182,-1,"f")
-hasLocation(#20184,#20045)
-enclosing_stmt(#20184,#20181)
-expr_containers(#20184,#20001)
-literals("f","f",#20184)
+stmts(#20182,2,#20001,2,"<f g:h= ... l></f>;")
+hasLocation(#20182,#20007)
+stmt_containers(#20182,#20001)
+#20183=*
+exprs(#20183,89,#20182,0,"<f g:h= ... .l></f>")
+#20184=@"loc,{#10000},3,1,3,51"
+locations_default(#20184,#10000,3,1,3,51)
+hasLocation(#20183,#20184)
+enclosing_stmt(#20183,#20182)
+expr_containers(#20183,#20001)
 #20185=*
-properties(#20185,#20182,0,3,"g:h=""b&amp;r""")
-#20186=@"loc,{#10000},3,4,3,16"
-locations_default(#20186,#10000,3,4,3,16)
-hasLocation(#20185,#20186)
-#20187=*
-exprs(#20187,90,#20185,0,"g:h")
-#20188=@"loc,{#10000},3,4,3,6"
-locations_default(#20188,#10000,3,4,3,6)
-hasLocation(#20187,#20188)
-enclosing_stmt(#20187,#20181)
-expr_containers(#20187,#20001)
-#20189=*
-exprs(#20189,0,#20187,0,"g")
-hasLocation(#20189,#20047)
-enclosing_stmt(#20189,#20181)
-expr_containers(#20189,#20001)
-literals("g","g",#20189)
+exprs(#20185,0,#20183,-1,"f")
+hasLocation(#20185,#20045)
+enclosing_stmt(#20185,#20182)
+expr_containers(#20185,#20001)
+literals("f","f",#20185)
+#20186=*
+properties(#20186,#20183,0,3,"g:h=""b&amp;r""")
+#20187=@"loc,{#10000},3,4,3,16"
+locations_default(#20187,#10000,3,4,3,16)
+hasLocation(#20186,#20187)
+#20188=*
+exprs(#20188,90,#20186,0,"g:h")
+#20189=@"loc,{#10000},3,4,3,6"
+locations_default(#20189,#10000,3,4,3,6)
+hasLocation(#20188,#20189)
+enclosing_stmt(#20188,#20182)
+expr_containers(#20188,#20001)
 #20190=*
-exprs(#20190,0,#20187,1,"h")
-hasLocation(#20190,#20051)
-enclosing_stmt(#20190,#20181)
+exprs(#20190,0,#20188,0,"g")
+hasLocation(#20190,#20047)
+enclosing_stmt(#20190,#20182)
 expr_containers(#20190,#20001)
-literals("h","h",#20190)
+literals("g","g",#20190)
 #20191=*
-exprs(#20191,4,#20185,1,"""b&amp;r""")
-hasLocation(#20191,#20055)
-enclosing_stmt(#20191,#20181)
+exprs(#20191,0,#20188,1,"h")
+hasLocation(#20191,#20051)
+enclosing_stmt(#20191,#20182)
 expr_containers(#20191,#20001)
-literals("b&r","""b&amp;r""",#20191)
+literals("h","h",#20191)
 #20192=*
-regexpterm(#20192,14,#20191,0,"b&r")
-#20193=@"loc,{#10000},3,9,3,11"
-locations_default(#20193,#10000,3,9,3,11)
-hasLocation(#20192,#20193)
-regexp_const_value(#20192,"b&r")
-#20194=*
-properties(#20194,#20182,1,3,"i={""a""+""b""}")
-#20195=@"loc,{#10000},3,18,3,28"
-locations_default(#20195,#10000,3,18,3,28)
-hasLocation(#20194,#20195)
-#20196=*
-exprs(#20196,0,#20194,0,"i")
-hasLocation(#20196,#20057)
-enclosing_stmt(#20196,#20181)
-expr_containers(#20196,#20001)
-literals("i","i",#20196)
+exprs(#20192,4,#20186,1,"""b&amp;r""")
+hasLocation(#20192,#20055)
+enclosing_stmt(#20192,#20182)
+expr_containers(#20192,#20001)
+literals("b&r","""b&amp;r""",#20192)
+#20193=*
+regexpterm(#20193,14,#20192,0,"b&r")
+#20194=@"loc,{#10000},3,9,3,11"
+locations_default(#20194,#10000,3,9,3,11)
+hasLocation(#20193,#20194)
+regexp_const_value(#20193,"b&r")
+#20195=*
+properties(#20195,#20183,1,3,"i={""a""+""b""}")
+#20196=@"loc,{#10000},3,18,3,28"
+locations_default(#20196,#10000,3,18,3,28)
+hasLocation(#20195,#20196)
 #20197=*
-exprs(#20197,34,#20194,1,"""a""+""b""")
-#20198=@"loc,{#10000},3,21,3,27"
-locations_default(#20198,#10000,3,21,3,27)
-hasLocation(#20197,#20198)
-enclosing_stmt(#20197,#20181)
+exprs(#20197,0,#20195,0,"i")
+hasLocation(#20197,#20057)
+enclosing_stmt(#20197,#20182)
 expr_containers(#20197,#20001)
-#20199=*
-exprs(#20199,4,#20197,0,"""a""")
-hasLocation(#20199,#20063)
-enclosing_stmt(#20199,#20181)
-expr_containers(#20199,#20001)
-literals("a","""a""",#20199)
+literals("i","i",#20197)
+#20198=*
+exprs(#20198,34,#20195,1,"""a""+""b""")
+#20199=@"loc,{#10000},3,21,3,27"
+locations_default(#20199,#10000,3,21,3,27)
+hasLocation(#20198,#20199)
+enclosing_stmt(#20198,#20182)
+expr_containers(#20198,#20001)
 #20200=*
-exprs(#20200,4,#20197,1,"""b""")
-hasLocation(#20200,#20067)
-enclosing_stmt(#20200,#20181)
+exprs(#20200,4,#20198,0,"""a""")
+hasLocation(#20200,#20063)
+enclosing_stmt(#20200,#20182)
 expr_containers(#20200,#20001)
-literals("b","""b""",#20200)
+literals("a","""a""",#20200)
 #20201=*
-regexpterm(#20201,14,#20197,0,"ab")
-#20202=@"loc,{#10000},3,22,3,26"
-locations_default(#20202,#10000,3,22,3,26)
-hasLocation(#20201,#20202)
-regexp_const_value(#20201,"ab")
-#20203=*
-exprs(#20203,79,#20182,-2,"j")
-hasLocation(#20203,#20075)
-enclosing_stmt(#20203,#20181)
-expr_containers(#20203,#20001)
-literals("j","j",#20203)
-#20204=@"var;{j};{#20000}"
-variables(#20204,"j",#20000)
-bind(#20203,#20204)
-#20205=*
-exprs(#20205,89,#20182,-3,"<k.l><M/></k.l>")
-#20206=@"loc,{#10000},3,33,3,47"
-locations_default(#20206,#10000,3,33,3,47)
-hasLocation(#20205,#20206)
-enclosing_stmt(#20205,#20181)
-expr_containers(#20205,#20001)
-#20207=*
-exprs(#20207,14,#20205,-1,"k.l")
-#20208=@"loc,{#10000},3,34,3,36"
-locations_default(#20208,#10000,3,34,3,36)
-hasLocation(#20207,#20208)
-enclosing_stmt(#20207,#20181)
-expr_containers(#20207,#20001)
-#20209=*
-exprs(#20209,79,#20207,0,"k")
-hasLocation(#20209,#20081)
-enclosing_stmt(#20209,#20181)
-expr_containers(#20209,#20001)
-literals("k","k",#20209)
-#20210=@"var;{k};{#20000}"
-variables(#20210,"k",#20000)
-bind(#20209,#20210)
-#20211=*
-exprs(#20211,0,#20207,1,"l")
-hasLocation(#20211,#20085)
-enclosing_stmt(#20211,#20181)
-expr_containers(#20211,#20001)
-literals("l","l",#20211)
+exprs(#20201,4,#20198,1,"""b""")
+hasLocation(#20201,#20067)
+enclosing_stmt(#20201,#20182)
+expr_containers(#20201,#20001)
+literals("b","""b""",#20201)
+#20202=*
+regexpterm(#20202,14,#20198,0,"ab")
+#20203=@"loc,{#10000},3,22,3,26"
+locations_default(#20203,#10000,3,22,3,26)
+hasLocation(#20202,#20203)
+regexp_const_value(#20202,"ab")
+#20204=*
+exprs(#20204,79,#20183,-2,"j")
+hasLocation(#20204,#20075)
+enclosing_stmt(#20204,#20182)
+expr_containers(#20204,#20001)
+literals("j","j",#20204)
+#20205=@"var;{j};{#20000}"
+variables(#20205,"j",#20000)
+bind(#20204,#20205)
+#20206=*
+exprs(#20206,89,#20183,-3,"<k.l><M/></k.l>")
+#20207=@"loc,{#10000},3,33,3,47"
+locations_default(#20207,#10000,3,33,3,47)
+hasLocation(#20206,#20207)
+enclosing_stmt(#20206,#20182)
+expr_containers(#20206,#20001)
+#20208=*
+exprs(#20208,14,#20206,-1,"k.l")
+#20209=@"loc,{#10000},3,34,3,36"
+locations_default(#20209,#10000,3,34,3,36)
+hasLocation(#20208,#20209)
+enclosing_stmt(#20208,#20182)
+expr_containers(#20208,#20001)
+#20210=*
+exprs(#20210,79,#20208,0,"k")
+hasLocation(#20210,#20081)
+enclosing_stmt(#20210,#20182)
+expr_containers(#20210,#20001)
+literals("k","k",#20210)
+#20211=@"var;{k};{#20000}"
+variables(#20211,"k",#20000)
+bind(#20210,#20211)
 #20212=*
-exprs(#20212,89,#20205,-2,"<M/>")
-#20213=@"loc,{#10000},3,38,3,41"
-locations_default(#20213,#10000,3,38,3,41)
-hasLocation(#20212,#20213)
-enclosing_stmt(#20212,#20181)
+exprs(#20212,0,#20208,1,"l")
+hasLocation(#20212,#20085)
+enclosing_stmt(#20212,#20182)
 expr_containers(#20212,#20001)
-#20214=*
-exprs(#20214,79,#20212,-1,"M")
-hasLocation(#20214,#20091)
-enclosing_stmt(#20214,#20181)
-expr_containers(#20214,#20001)
-literals("M","M",#20214)
-#20215=@"var;{M};{#20000}"
-variables(#20215,"M",#20000)
-bind(#20214,#20215)
-#20216=*
-stmts(#20216,2,#20001,3,"<n {...props}/>;")
-hasLocation(#20216,#20009)
-stmt_containers(#20216,#20001)
+literals("l","l",#20212)
+#20213=*
+exprs(#20213,89,#20206,-2,"<M/>")
+#20214=@"loc,{#10000},3,38,3,41"
+locations_default(#20214,#10000,3,38,3,41)
+hasLocation(#20213,#20214)
+enclosing_stmt(#20213,#20182)
+expr_containers(#20213,#20001)
+#20215=*
+exprs(#20215,79,#20213,-1,"M")
+hasLocation(#20215,#20091)
+enclosing_stmt(#20215,#20182)
+expr_containers(#20215,#20001)
+literals("M","M",#20215)
+#20216=@"var;{M};{#20000}"
+variables(#20216,"M",#20000)
+bind(#20215,#20216)
 #20217=*
-exprs(#20217,89,#20216,0,"<n {...props}/>")
-#20218=@"loc,{#10000},4,1,4,15"
-locations_default(#20218,#10000,4,1,4,15)
-hasLocation(#20217,#20218)
-enclosing_stmt(#20217,#20216)
-expr_containers(#20217,#20001)
-#20219=*
-exprs(#20219,0,#20217,-1,"n")
-hasLocation(#20219,#20121)
-enclosing_stmt(#20219,#20216)
-expr_containers(#20219,#20001)
-literals("n","n",#20219)
+stmts(#20217,2,#20001,3,"<n {...props}/>;")
+hasLocation(#20217,#20009)
+stmt_containers(#20217,#20001)
+#20218=*
+exprs(#20218,89,#20217,0,"<n {...props}/>")
+#20219=@"loc,{#10000},4,1,4,15"
+locations_default(#20219,#10000,4,1,4,15)
+hasLocation(#20218,#20219)
+enclosing_stmt(#20218,#20217)
+expr_containers(#20218,#20001)
 #20220=*
-properties(#20220,#20217,0,3,"{...props}")
-#20221=@"loc,{#10000},4,4,4,13"
-locations_default(#20221,#10000,4,4,4,13)
-hasLocation(#20220,#20221)
-#20222=*
-exprs(#20222,66,#20220,1,"...props")
-hasLocation(#20222,#20221)
-enclosing_stmt(#20222,#20216)
-expr_containers(#20222,#20001)
+exprs(#20220,0,#20218,-1,"n")
+hasLocation(#20220,#20121)
+enclosing_stmt(#20220,#20217)
+expr_containers(#20220,#20001)
+literals("n","n",#20220)
+#20221=*
+properties(#20221,#20218,0,3,"{...props}")
+#20222=@"loc,{#10000},4,4,4,13"
+locations_default(#20222,#10000,4,4,4,13)
+hasLocation(#20221,#20222)
 #20223=*
-exprs(#20223,79,#20222,0,"props")
-hasLocation(#20223,#20127)
-enclosing_stmt(#20223,#20216)
+exprs(#20223,66,#20221,1,"...props")
+hasLocation(#20223,#20222)
+enclosing_stmt(#20223,#20217)
 expr_containers(#20223,#20001)
-literals("props","props",#20223)
-#20224=@"var;{props};{#20000}"
-variables(#20224,"props",#20000)
-bind(#20223,#20224)
-#20225=*
-stmts(#20225,2,#20001,4,"<><a/><b/></>")
-hasLocation(#20225,#20011)
-stmt_containers(#20225,#20001)
+#20224=*
+exprs(#20224,79,#20223,0,"props")
+hasLocation(#20224,#20127)
+enclosing_stmt(#20224,#20217)
+expr_containers(#20224,#20001)
+literals("props","props",#20224)
+#20225=@"var;{props};{#20000}"
+variables(#20225,"props",#20000)
+bind(#20224,#20225)
 #20226=*
-exprs(#20226,89,#20225,0,"<><a/><b/></>")
+stmts(#20226,2,#20001,4,"<><a/><b/></>")
 hasLocation(#20226,#20011)
-enclosing_stmt(#20226,#20225)
-expr_containers(#20226,#20001)
+stmt_containers(#20226,#20001)
 #20227=*
-exprs(#20227,89,#20226,-2,"<a/>")
-#20228=@"loc,{#10000},5,3,5,6"
-locations_default(#20228,#10000,5,3,5,6)
-hasLocation(#20227,#20228)
-enclosing_stmt(#20227,#20225)
+exprs(#20227,89,#20226,0,"<><a/><b/></>")
+hasLocation(#20227,#20011)
+enclosing_stmt(#20227,#20226)
 expr_containers(#20227,#20001)
-#20229=*
-exprs(#20229,0,#20227,-1,"a")
-hasLocation(#20229,#20143)
-enclosing_stmt(#20229,#20225)
-expr_containers(#20229,#20001)
-literals("a","a",#20229)
+#20228=*
+exprs(#20228,89,#20227,-2,"<a/>")
+#20229=@"loc,{#10000},5,3,5,6"
+locations_default(#20229,#10000,5,3,5,6)
+hasLocation(#20228,#20229)
+enclosing_stmt(#20228,#20226)
+expr_containers(#20228,#20001)
 #20230=*
-exprs(#20230,89,#20226,-3,"<b/>")
-#20231=@"loc,{#10000},5,7,5,10"
-locations_default(#20231,#10000,5,7,5,10)
-hasLocation(#20230,#20231)
-enclosing_stmt(#20230,#20225)
+exprs(#20230,0,#20228,-1,"a")
+hasLocation(#20230,#20143)
+enclosing_stmt(#20230,#20226)
 expr_containers(#20230,#20001)
-#20232=*
-exprs(#20232,0,#20230,-1,"b")
-hasLocation(#20232,#20151)
-enclosing_stmt(#20232,#20225)
-expr_containers(#20232,#20001)
-literals("b","b",#20232)
+literals("a","a",#20230)
+#20231=*
+exprs(#20231,89,#20227,-3,"<b/>")
+#20232=@"loc,{#10000},5,7,5,10"
+locations_default(#20232,#10000,5,7,5,10)
+hasLocation(#20231,#20232)
+enclosing_stmt(#20231,#20226)
+expr_containers(#20231,#20001)
 #20233=*
-entry_cfg_node(#20233,#20001)
-#20234=@"loc,{#10000},1,1,1,0"
-locations_default(#20234,#10000,1,1,1,0)
-hasLocation(#20233,#20234)
-#20235=*
-exit_cfg_node(#20235,#20001)
-hasLocation(#20235,#20163)
-successor(#20225,#20229)
-successor(#20232,#20230)
-successor(#20230,#20226)
-successor(#20229,#20227)
-successor(#20227,#20232)
-successor(#20226,#20235)
-successor(#20216,#20219)
-successor(#20223,#20222)
-successor(#20222,#20220)
-successor(#20220,#20217)
-successor(#20219,#20223)
-successor(#20217,#20225)
-successor(#20181,#20184)
-successor(#20214,#20212)
-successor(#20212,#20205)
-successor(#20211,#20207)
-successor(#20209,#20211)
-successor(#20207,#20214)
-successor(#20205,#20182)
-successor(#20203,#20209)
-successor(#20200,#20197)
-successor(#20199,#20200)
-successor(#20197,#20194)
-successor(#20196,#20199)
-successor(#20194,#20203)
-successor(#20191,#20185)
-successor(#20190,#20187)
-successor(#20189,#20190)
-successor(#20187,#20191)
-successor(#20185,#20196)
-successor(#20184,#20189)
-successor(#20182,#20216)
-successor(#20169,#20174)
-successor(#20180,#20178)
-successor(#20179,#20180)
-successor(#20178,#20176)
-successor(#20176,#20170)
-successor(#20175,#20172)
-successor(#20174,#20175)
-successor(#20172,#20179)
-successor(#20170,#20181)
-successor(#20165,#20168)
-successor(#20168,#20166)
+exprs(#20233,0,#20231,-1,"b")
+hasLocation(#20233,#20151)
+enclosing_stmt(#20233,#20226)
+expr_containers(#20233,#20001)
+literals("b","b",#20233)
+#20234=*
+entry_cfg_node(#20234,#20001)
+#20235=@"loc,{#10000},1,1,1,0"
+locations_default(#20235,#10000,1,1,1,0)
+hasLocation(#20234,#20235)
+#20236=*
+exit_cfg_node(#20236,#20001)
+hasLocation(#20236,#20163)
+successor(#20226,#20230)
+successor(#20233,#20231)
+successor(#20231,#20227)
+successor(#20230,#20228)
+successor(#20228,#20233)
+successor(#20227,#20236)
+successor(#20217,#20220)
+successor(#20224,#20223)
+successor(#20223,#20221)
+successor(#20221,#20218)
+successor(#20220,#20224)
+successor(#20218,#20226)
+successor(#20182,#20185)
+successor(#20215,#20213)
+successor(#20213,#20206)
+successor(#20212,#20208)
+successor(#20210,#20212)
+successor(#20208,#20215)
+successor(#20206,#20183)
+successor(#20204,#20210)
+successor(#20201,#20198)
+successor(#20200,#20201)
+successor(#20198,#20195)
+successor(#20197,#20200)
+successor(#20195,#20204)
+successor(#20192,#20186)
+successor(#20191,#20188)
+successor(#20190,#20191)
+successor(#20188,#20192)
+successor(#20186,#20197)
+successor(#20185,#20190)
+successor(#20183,#20217)
+successor(#20170,#20175)
+successor(#20181,#20179)
+successor(#20180,#20181)
+successor(#20179,#20177)
+successor(#20177,#20171)
+successor(#20176,#20173)
+successor(#20175,#20176)
+successor(#20173,#20180)
+successor(#20171,#20182)
 successor(#20166,#20169)
-successor(#20233,#20165)
+successor(#20169,#20167)
+successor(#20167,#20170)
+successor(#20234,#20166)
 numlines(#10000,5,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/jsx/output/trap/tst.jsx.trap b/javascript/extractor/tests/jsx/output/trap/tst.jsx.trap
index 2f5d17f2332..2ee59b797f5 100644
--- a/javascript/extractor/tests/jsx/output/trap/tst.jsx.trap
+++ b/javascript/extractor/tests/jsx/output/trap/tst.jsx.trap
@@ -17,12 +17,14 @@ locations_default(#20003,#10000,1,1,1,0)
 hasLocation(#20002,#20003)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20004=*
-entry_cfg_node(#20004,#20001)
-hasLocation(#20004,#20003)
+#20004=@"var;{this};{#20000}"
+variables(#20004,"this",#20000)
 #20005=*
-exit_cfg_node(#20005,#20001)
+entry_cfg_node(#20005,#20001)
 hasLocation(#20005,#20003)
-successor(#20004,#20005)
+#20006=*
+exit_cfg_node(#20006,#20001)
+hasLocation(#20006,#20003)
+successor(#20005,#20006)
 numlines(#10000,0,0,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/jsx/output/trap/tst2.js.trap b/javascript/extractor/tests/jsx/output/trap/tst2.js.trap
index 48e8891b95d..34336290385 100644
--- a/javascript/extractor/tests/jsx/output/trap/tst2.js.trap
+++ b/javascript/extractor/tests/jsx/output/trap/tst2.js.trap
@@ -62,39 +62,41 @@ locations_default(#20021,#10000,1,14,1,13)
 hasLocation(#20020,#20021)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20022=*
-stmts(#20022,2,#20001,0,"<a>/b&gt;</a>")
-hasLocation(#20022,#20003)
-stmt_containers(#20022,#20001)
+#20022=@"var;{this};{#20000}"
+variables(#20022,"this",#20000)
 #20023=*
-exprs(#20023,89,#20022,0,"<a>/b&gt;</a>")
+stmts(#20023,2,#20001,0,"<a>/b&gt;</a>")
 hasLocation(#20023,#20003)
-enclosing_stmt(#20023,#20022)
-expr_containers(#20023,#20001)
+stmt_containers(#20023,#20001)
 #20024=*
-exprs(#20024,0,#20023,-1,"a")
-hasLocation(#20024,#20007)
-enclosing_stmt(#20024,#20022)
+exprs(#20024,89,#20023,0,"<a>/b&gt;</a>")
+hasLocation(#20024,#20003)
+enclosing_stmt(#20024,#20023)
 expr_containers(#20024,#20001)
-literals("a","a",#20024)
 #20025=*
-exprs(#20025,4,#20023,-2,"/b&gt;")
-hasLocation(#20025,#20011)
-enclosing_stmt(#20025,#20022)
+exprs(#20025,0,#20024,-1,"a")
+hasLocation(#20025,#20007)
+enclosing_stmt(#20025,#20023)
 expr_containers(#20025,#20001)
-literals("/b>","/b&gt;",#20025)
+literals("a","a",#20025)
 #20026=*
-entry_cfg_node(#20026,#20001)
-#20027=@"loc,{#10000},1,1,1,0"
-locations_default(#20027,#10000,1,1,1,0)
-hasLocation(#20026,#20027)
-#20028=*
-exit_cfg_node(#20028,#20001)
-hasLocation(#20028,#20021)
-successor(#20022,#20024)
-successor(#20025,#20023)
-successor(#20024,#20025)
-successor(#20023,#20028)
-successor(#20026,#20022)
+exprs(#20026,4,#20024,-2,"/b&gt;")
+hasLocation(#20026,#20011)
+enclosing_stmt(#20026,#20023)
+expr_containers(#20026,#20001)
+literals("/b>","/b&gt;",#20026)
+#20027=*
+entry_cfg_node(#20027,#20001)
+#20028=@"loc,{#10000},1,1,1,0"
+locations_default(#20028,#10000,1,1,1,0)
+hasLocation(#20027,#20028)
+#20029=*
+exit_cfg_node(#20029,#20001)
+hasLocation(#20029,#20021)
+successor(#20023,#20025)
+successor(#20026,#20024)
+successor(#20025,#20026)
+successor(#20024,#20029)
+successor(#20027,#20023)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/keywords/output/trap/tst.js.trap b/javascript/extractor/tests/keywords/output/trap/tst.js.trap
index 9526d353d8f..b3d158dfed1 100644
--- a/javascript/extractor/tests/keywords/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/keywords/output/trap/tst.js.trap
@@ -129,145 +129,147 @@ toplevels(#20001,0)
 #20047=@"loc,{#10000},1,1,3,0"
 locations_default(#20047,#10000,1,1,3,0)
 hasLocation(#20001,#20047)
-#20048=*
-stmts(#20048,14,#20001,0,"for (le ... ++) {\n}")
-#20049=@"loc,{#10000},1,1,2,1"
-locations_default(#20049,#10000,1,1,2,1)
-hasLocation(#20048,#20049)
-stmt_containers(#20048,#20001)
-#20050=*
-scopes(#20050,5)
-scopenodes(#20048,#20050)
-scopenesting(#20050,#20000)
-#20051=@"var;{i};{#20050}"
-variables(#20051,"i",#20050)
-#20052=*
-exprs(#20052,27,#20048,1,"i < spe ... .length")
-#20053=@"loc,{#10000},1,17,1,38"
-locations_default(#20053,#10000,1,17,1,38)
-hasLocation(#20052,#20053)
-enclosing_stmt(#20052,#20048)
-expr_containers(#20052,#20001)
-#20054=*
-exprs(#20054,79,#20052,0,"i")
-hasLocation(#20054,#20021)
-enclosing_stmt(#20054,#20048)
-expr_containers(#20054,#20001)
-literals("i","i",#20054)
-bind(#20054,#20051)
+#20048=@"var;{this};{#20000}"
+variables(#20048,"this",#20000)
+#20049=*
+stmts(#20049,14,#20001,0,"for (le ... ++) {\n}")
+#20050=@"loc,{#10000},1,1,2,1"
+locations_default(#20050,#10000,1,1,2,1)
+hasLocation(#20049,#20050)
+stmt_containers(#20049,#20001)
+#20051=*
+scopes(#20051,5)
+scopenodes(#20049,#20051)
+scopenesting(#20051,#20000)
+#20052=@"var;{i};{#20051}"
+variables(#20052,"i",#20051)
+#20053=*
+exprs(#20053,27,#20049,1,"i < spe ... .length")
+#20054=@"loc,{#10000},1,17,1,38"
+locations_default(#20054,#10000,1,17,1,38)
+hasLocation(#20053,#20054)
+enclosing_stmt(#20053,#20049)
+expr_containers(#20053,#20001)
 #20055=*
-exprs(#20055,14,#20052,1,"spec.switch.length")
-#20056=@"loc,{#10000},1,21,1,38"
-locations_default(#20056,#10000,1,21,1,38)
-hasLocation(#20055,#20056)
-enclosing_stmt(#20055,#20048)
+exprs(#20055,79,#20053,0,"i")
+hasLocation(#20055,#20021)
+enclosing_stmt(#20055,#20049)
 expr_containers(#20055,#20001)
-#20057=*
-exprs(#20057,14,#20055,0,"spec.switch")
-#20058=@"loc,{#10000},1,21,1,31"
-locations_default(#20058,#10000,1,21,1,31)
-hasLocation(#20057,#20058)
-enclosing_stmt(#20057,#20048)
-expr_containers(#20057,#20001)
-#20059=*
-exprs(#20059,79,#20057,0,"spec")
-hasLocation(#20059,#20025)
-enclosing_stmt(#20059,#20048)
-expr_containers(#20059,#20001)
-literals("spec","spec",#20059)
-#20060=@"var;{spec};{#20000}"
-variables(#20060,"spec",#20000)
-bind(#20059,#20060)
-#20061=*
-exprs(#20061,0,#20057,1,"switch")
-hasLocation(#20061,#20029)
-enclosing_stmt(#20061,#20048)
-expr_containers(#20061,#20001)
-literals("switch","switch",#20061)
+literals("i","i",#20055)
+bind(#20055,#20052)
+#20056=*
+exprs(#20056,14,#20053,1,"spec.switch.length")
+#20057=@"loc,{#10000},1,21,1,38"
+locations_default(#20057,#10000,1,21,1,38)
+hasLocation(#20056,#20057)
+enclosing_stmt(#20056,#20049)
+expr_containers(#20056,#20001)
+#20058=*
+exprs(#20058,14,#20056,0,"spec.switch")
+#20059=@"loc,{#10000},1,21,1,31"
+locations_default(#20059,#10000,1,21,1,31)
+hasLocation(#20058,#20059)
+enclosing_stmt(#20058,#20049)
+expr_containers(#20058,#20001)
+#20060=*
+exprs(#20060,79,#20058,0,"spec")
+hasLocation(#20060,#20025)
+enclosing_stmt(#20060,#20049)
+expr_containers(#20060,#20001)
+literals("spec","spec",#20060)
+#20061=@"var;{spec};{#20000}"
+variables(#20061,"spec",#20000)
+bind(#20060,#20061)
 #20062=*
-exprs(#20062,0,#20055,1,"length")
-hasLocation(#20062,#20033)
-enclosing_stmt(#20062,#20048)
+exprs(#20062,0,#20058,1,"switch")
+hasLocation(#20062,#20029)
+enclosing_stmt(#20062,#20049)
 expr_containers(#20062,#20001)
-literals("length","length",#20062)
+literals("switch","switch",#20062)
 #20063=*
-exprs(#20063,60,#20048,2,"i++")
-#20064=@"loc,{#10000},1,41,1,43"
-locations_default(#20064,#10000,1,41,1,43)
-hasLocation(#20063,#20064)
-enclosing_stmt(#20063,#20048)
+exprs(#20063,0,#20056,1,"length")
+hasLocation(#20063,#20033)
+enclosing_stmt(#20063,#20049)
 expr_containers(#20063,#20001)
-#20065=*
-exprs(#20065,79,#20063,0,"i")
-hasLocation(#20065,#20037)
-enclosing_stmt(#20065,#20048)
-expr_containers(#20065,#20001)
-literals("i","i",#20065)
-bind(#20065,#20051)
+literals("length","length",#20063)
+#20064=*
+exprs(#20064,60,#20049,2,"i++")
+#20065=@"loc,{#10000},1,41,1,43"
+locations_default(#20065,#10000,1,41,1,43)
+hasLocation(#20064,#20065)
+enclosing_stmt(#20064,#20049)
+expr_containers(#20064,#20001)
 #20066=*
-stmts(#20066,23,#20048,0,"let i = 0")
-#20067=@"loc,{#10000},1,6,1,14"
-locations_default(#20067,#10000,1,6,1,14)
-hasLocation(#20066,#20067)
-stmt_containers(#20066,#20001)
-#20068=*
-exprs(#20068,64,#20066,0,"i = 0")
-#20069=@"loc,{#10000},1,10,1,14"
-locations_default(#20069,#10000,1,10,1,14)
-hasLocation(#20068,#20069)
-enclosing_stmt(#20068,#20066)
-expr_containers(#20068,#20001)
-#20070=*
-exprs(#20070,78,#20068,0,"i")
-hasLocation(#20070,#20013)
-enclosing_stmt(#20070,#20066)
-expr_containers(#20070,#20001)
-literals("i","i",#20070)
-decl(#20070,#20051)
+exprs(#20066,79,#20064,0,"i")
+hasLocation(#20066,#20037)
+enclosing_stmt(#20066,#20049)
+expr_containers(#20066,#20001)
+literals("i","i",#20066)
+bind(#20066,#20052)
+#20067=*
+stmts(#20067,23,#20049,0,"let i = 0")
+#20068=@"loc,{#10000},1,6,1,14"
+locations_default(#20068,#10000,1,6,1,14)
+hasLocation(#20067,#20068)
+stmt_containers(#20067,#20001)
+#20069=*
+exprs(#20069,64,#20067,0,"i = 0")
+#20070=@"loc,{#10000},1,10,1,14"
+locations_default(#20070,#10000,1,10,1,14)
+hasLocation(#20069,#20070)
+enclosing_stmt(#20069,#20067)
+expr_containers(#20069,#20001)
 #20071=*
-exprs(#20071,3,#20068,1,"0")
-hasLocation(#20071,#20017)
-enclosing_stmt(#20071,#20066)
+exprs(#20071,78,#20069,0,"i")
+hasLocation(#20071,#20013)
+enclosing_stmt(#20071,#20067)
 expr_containers(#20071,#20001)
-literals("0","0",#20071)
+literals("i","i",#20071)
+decl(#20071,#20052)
 #20072=*
-stmts(#20072,1,#20048,3,"{\n}")
-#20073=@"loc,{#10000},1,46,2,1"
-locations_default(#20073,#10000,1,46,2,1)
-hasLocation(#20072,#20073)
-stmt_containers(#20072,#20001)
-#20074=*
-entry_cfg_node(#20074,#20001)
-#20075=@"loc,{#10000},1,1,1,0"
-locations_default(#20075,#10000,1,1,1,0)
-hasLocation(#20074,#20075)
-#20076=*
-exit_cfg_node(#20076,#20001)
-hasLocation(#20076,#20046)
-successor(#20048,#20066)
-successor(#20066,#20070)
-successor(#20071,#20068)
-successor(#20070,#20071)
-successor(#20068,#20054)
-successor(#20062,#20055)
-successor(#20061,#20057)
-successor(#20059,#20061)
-successor(#20057,#20062)
-successor(#20055,#20052)
-successor(#20054,#20059)
+exprs(#20072,3,#20069,1,"0")
+hasLocation(#20072,#20017)
+enclosing_stmt(#20072,#20067)
+expr_containers(#20072,#20001)
+literals("0","0",#20072)
+#20073=*
+stmts(#20073,1,#20049,3,"{\n}")
+#20074=@"loc,{#10000},1,46,2,1"
+locations_default(#20074,#10000,1,46,2,1)
+hasLocation(#20073,#20074)
+stmt_containers(#20073,#20001)
+#20075=*
+entry_cfg_node(#20075,#20001)
+#20076=@"loc,{#10000},1,1,1,0"
+locations_default(#20076,#10000,1,1,1,0)
+hasLocation(#20075,#20076)
 #20077=*
-guard_node(#20077,1,#20052)
-hasLocation(#20077,#20053)
-successor(#20077,#20072)
+exit_cfg_node(#20077,#20001)
+hasLocation(#20077,#20046)
+successor(#20049,#20067)
+successor(#20067,#20071)
+successor(#20072,#20069)
+successor(#20071,#20072)
+successor(#20069,#20055)
+successor(#20063,#20056)
+successor(#20062,#20058)
+successor(#20060,#20062)
+successor(#20058,#20063)
+successor(#20056,#20053)
+successor(#20055,#20060)
 #20078=*
-guard_node(#20078,0,#20052)
-hasLocation(#20078,#20053)
-successor(#20078,#20076)
-successor(#20052,#20077)
-successor(#20052,#20078)
-successor(#20065,#20063)
-successor(#20063,#20054)
-successor(#20072,#20065)
-successor(#20074,#20048)
+guard_node(#20078,1,#20053)
+hasLocation(#20078,#20054)
+successor(#20078,#20073)
+#20079=*
+guard_node(#20079,0,#20053)
+hasLocation(#20079,#20054)
+successor(#20079,#20077)
+successor(#20053,#20078)
+successor(#20053,#20079)
+successor(#20066,#20064)
+successor(#20064,#20055)
+successor(#20073,#20066)
+successor(#20075,#20049)
 numlines(#10000,2,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/moduleTypes1/output/trap/tst.js.trap b/javascript/extractor/tests/moduleTypes1/output/trap/tst.js.trap
index 1896ecff4b3..7f03b082cd6 100644
--- a/javascript/extractor/tests/moduleTypes1/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/moduleTypes1/output/trap/tst.js.trap
@@ -17,12 +17,14 @@ locations_default(#20003,#10000,1,1,1,0)
 hasLocation(#20002,#20003)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20004=*
-entry_cfg_node(#20004,#20001)
-hasLocation(#20004,#20003)
+#20004=@"var;{this};{#20000}"
+variables(#20004,"this",#20000)
 #20005=*
-exit_cfg_node(#20005,#20001)
+entry_cfg_node(#20005,#20001)
 hasLocation(#20005,#20003)
-successor(#20004,#20005)
+#20006=*
+exit_cfg_node(#20006,#20001)
+hasLocation(#20006,#20003)
+successor(#20005,#20006)
 numlines(#10000,0,0,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/moduleTypes2/output/trap/tst2.js.trap b/javascript/extractor/tests/moduleTypes2/output/trap/tst2.js.trap
index 84299e50279..cacbeb0a264 100644
--- a/javascript/extractor/tests/moduleTypes2/output/trap/tst2.js.trap
+++ b/javascript/extractor/tests/moduleTypes2/output/trap/tst2.js.trap
@@ -17,12 +17,14 @@ locations_default(#20003,#10000,1,1,1,0)
 hasLocation(#20002,#20003)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20004=*
-entry_cfg_node(#20004,#20001)
-hasLocation(#20004,#20003)
+#20004=@"var;{this};{#20000}"
+variables(#20004,"this",#20000)
 #20005=*
-exit_cfg_node(#20005,#20001)
+entry_cfg_node(#20005,#20001)
 hasLocation(#20005,#20003)
-successor(#20004,#20005)
+#20006=*
+exit_cfg_node(#20006,#20001)
+hasLocation(#20006,#20003)
+successor(#20005,#20006)
 numlines(#10000,0,0,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/moduleTypes3/output/trap/tst.js.trap b/javascript/extractor/tests/moduleTypes3/output/trap/tst.js.trap
index 1896ecff4b3..7f03b082cd6 100644
--- a/javascript/extractor/tests/moduleTypes3/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/moduleTypes3/output/trap/tst.js.trap
@@ -17,12 +17,14 @@ locations_default(#20003,#10000,1,1,1,0)
 hasLocation(#20002,#20003)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20004=*
-entry_cfg_node(#20004,#20001)
-hasLocation(#20004,#20003)
+#20004=@"var;{this};{#20000}"
+variables(#20004,"this",#20000)
 #20005=*
-exit_cfg_node(#20005,#20001)
+entry_cfg_node(#20005,#20001)
 hasLocation(#20005,#20003)
-successor(#20004,#20005)
+#20006=*
+exit_cfg_node(#20006,#20001)
+hasLocation(#20006,#20003)
+successor(#20005,#20006)
 numlines(#10000,0,0,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/mozilla/output/trap/array_comprehensions.js.trap b/javascript/extractor/tests/mozilla/output/trap/array_comprehensions.js.trap
index ab2e9e4a1ab..a59ecc64e82 100644
--- a/javascript/extractor/tests/mozilla/output/trap/array_comprehensions.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/array_comprehensions.js.trap
@@ -404,413 +404,415 @@ toplevels(#20001,0)
 #20156=@"loc,{#10000},1,1,6,0"
 locations_default(#20156,#10000,1,1,6,0)
 hasLocation(#20001,#20156)
-#20157=*
-stmts(#20157,2,#20001,0,"[for (y ...  year];")
-hasLocation(#20157,#20003)
-stmt_containers(#20157,#20001)
+#20157=@"var;{this};{#20000}"
+variables(#20157,"this",#20000)
 #20158=*
-exprs(#20158,73,#20157,0,"[for (y ... ) year]")
-#20159=@"loc,{#10000},1,1,1,43"
-locations_default(#20159,#10000,1,1,1,43)
-hasLocation(#20158,#20159)
-enclosing_stmt(#20158,#20157)
-expr_containers(#20158,#20001)
-#20160=*
-exprs(#20160,76,#20158,1,"for (year of years)")
-#20161=@"loc,{#10000},1,2,1,20"
-locations_default(#20161,#10000,1,2,1,20)
-hasLocation(#20160,#20161)
-enclosing_stmt(#20160,#20157)
-expr_containers(#20160,#20001)
-#20162=*
-scopes(#20162,7)
-scopenodes(#20160,#20162)
-scopenesting(#20162,#20000)
-#20163=@"var;{year};{#20162}"
-variables(#20163,"year",#20162)
-#20164=*
-exprs(#20164,78,#20160,0,"year")
-hasLocation(#20164,#20019)
-enclosing_stmt(#20164,#20157)
-expr_containers(#20164,#20001)
-literals("year","year",#20164)
-decl(#20164,#20163)
+stmts(#20158,2,#20001,0,"[for (y ...  year];")
+hasLocation(#20158,#20003)
+stmt_containers(#20158,#20001)
+#20159=*
+exprs(#20159,73,#20158,0,"[for (y ... ) year]")
+#20160=@"loc,{#10000},1,1,1,43"
+locations_default(#20160,#10000,1,1,1,43)
+hasLocation(#20159,#20160)
+enclosing_stmt(#20159,#20158)
+expr_containers(#20159,#20001)
+#20161=*
+exprs(#20161,76,#20159,1,"for (year of years)")
+#20162=@"loc,{#10000},1,2,1,20"
+locations_default(#20162,#10000,1,2,1,20)
+hasLocation(#20161,#20162)
+enclosing_stmt(#20161,#20158)
+expr_containers(#20161,#20001)
+#20163=*
+scopes(#20163,7)
+scopenodes(#20161,#20163)
+scopenesting(#20163,#20000)
+#20164=@"var;{year};{#20163}"
+variables(#20164,"year",#20163)
 #20165=*
-exprs(#20165,79,#20160,1,"years")
-hasLocation(#20165,#20023)
-enclosing_stmt(#20165,#20157)
+exprs(#20165,78,#20161,0,"year")
+hasLocation(#20165,#20019)
+enclosing_stmt(#20165,#20158)
 expr_containers(#20165,#20001)
-literals("years","years",#20165)
-#20166=@"var;{years};{#20000}"
-variables(#20166,"years",#20000)
-bind(#20165,#20166)
-#20167=*
-exprs(#20167,29,#20158,-1,"year > 2000")
-#20168=@"loc,{#10000},1,26,1,36"
-locations_default(#20168,#10000,1,26,1,36)
-hasLocation(#20167,#20168)
-enclosing_stmt(#20167,#20157)
-expr_containers(#20167,#20001)
-#20169=*
-exprs(#20169,79,#20167,0,"year")
-hasLocation(#20169,#20031)
-enclosing_stmt(#20169,#20157)
-expr_containers(#20169,#20001)
-literals("year","year",#20169)
-bind(#20169,#20163)
+literals("year","year",#20165)
+decl(#20165,#20164)
+#20166=*
+exprs(#20166,79,#20161,1,"years")
+hasLocation(#20166,#20023)
+enclosing_stmt(#20166,#20158)
+expr_containers(#20166,#20001)
+literals("years","years",#20166)
+#20167=@"var;{years};{#20000}"
+variables(#20167,"years",#20000)
+bind(#20166,#20167)
+#20168=*
+exprs(#20168,29,#20159,-1,"year > 2000")
+#20169=@"loc,{#10000},1,26,1,36"
+locations_default(#20169,#10000,1,26,1,36)
+hasLocation(#20168,#20169)
+enclosing_stmt(#20168,#20158)
+expr_containers(#20168,#20001)
 #20170=*
-exprs(#20170,3,#20167,1,"2000")
-hasLocation(#20170,#20035)
-enclosing_stmt(#20170,#20157)
+exprs(#20170,79,#20168,0,"year")
+hasLocation(#20170,#20031)
+enclosing_stmt(#20170,#20158)
 expr_containers(#20170,#20001)
-literals("2000","2000",#20170)
+literals("year","year",#20170)
+bind(#20170,#20164)
 #20171=*
-exprs(#20171,79,#20158,0,"year")
-hasLocation(#20171,#20039)
-enclosing_stmt(#20171,#20157)
+exprs(#20171,3,#20168,1,"2000")
+hasLocation(#20171,#20035)
+enclosing_stmt(#20171,#20158)
 expr_containers(#20171,#20001)
-literals("year","year",#20171)
-bind(#20171,#20163)
+literals("2000","2000",#20171)
 #20172=*
-stmts(#20172,2,#20001,1,"year;")
-hasLocation(#20172,#20005)
-stmt_containers(#20172,#20001)
+exprs(#20172,79,#20159,0,"year")
+hasLocation(#20172,#20039)
+enclosing_stmt(#20172,#20158)
+expr_containers(#20172,#20001)
+literals("year","year",#20172)
+bind(#20172,#20164)
 #20173=*
-exprs(#20173,79,#20172,0,"year")
-hasLocation(#20173,#20045)
-enclosing_stmt(#20173,#20172)
-expr_containers(#20173,#20001)
-literals("year","year",#20173)
-#20174=@"var;{year};{#20000}"
-variables(#20174,"year",#20000)
-bind(#20173,#20174)
-#20175=*
-stmts(#20175,2,#20001,2,"[for (i ... ) i+j];")
-hasLocation(#20175,#20007)
-stmt_containers(#20175,#20001)
+stmts(#20173,2,#20001,1,"year;")
+hasLocation(#20173,#20005)
+stmt_containers(#20173,#20001)
+#20174=*
+exprs(#20174,79,#20173,0,"year")
+hasLocation(#20174,#20045)
+enclosing_stmt(#20174,#20173)
+expr_containers(#20174,#20001)
+literals("year","year",#20174)
+#20175=@"var;{year};{#20000}"
+variables(#20175,"year",#20000)
+bind(#20174,#20175)
 #20176=*
-exprs(#20176,73,#20175,0,"[for (i ... s) i+j]")
-#20177=@"loc,{#10000},3,1,3,43"
-locations_default(#20177,#10000,3,1,3,43)
-hasLocation(#20176,#20177)
-enclosing_stmt(#20176,#20175)
-expr_containers(#20176,#20001)
-#20178=*
-exprs(#20178,76,#20176,1,"for (i of numbers)")
-#20179=@"loc,{#10000},3,2,3,19"
-locations_default(#20179,#10000,3,2,3,19)
-hasLocation(#20178,#20179)
-enclosing_stmt(#20178,#20175)
-expr_containers(#20178,#20001)
-#20180=*
-scopes(#20180,7)
-scopenodes(#20178,#20180)
-scopenesting(#20180,#20000)
-#20181=@"var;{i};{#20180}"
-variables(#20181,"i",#20180)
-#20182=*
-exprs(#20182,78,#20178,0,"i")
-hasLocation(#20182,#20055)
-enclosing_stmt(#20182,#20175)
-expr_containers(#20182,#20001)
-literals("i","i",#20182)
-decl(#20182,#20181)
+stmts(#20176,2,#20001,2,"[for (i ... ) i+j];")
+hasLocation(#20176,#20007)
+stmt_containers(#20176,#20001)
+#20177=*
+exprs(#20177,73,#20176,0,"[for (i ... s) i+j]")
+#20178=@"loc,{#10000},3,1,3,43"
+locations_default(#20178,#10000,3,1,3,43)
+hasLocation(#20177,#20178)
+enclosing_stmt(#20177,#20176)
+expr_containers(#20177,#20001)
+#20179=*
+exprs(#20179,76,#20177,1,"for (i of numbers)")
+#20180=@"loc,{#10000},3,2,3,19"
+locations_default(#20180,#10000,3,2,3,19)
+hasLocation(#20179,#20180)
+enclosing_stmt(#20179,#20176)
+expr_containers(#20179,#20001)
+#20181=*
+scopes(#20181,7)
+scopenodes(#20179,#20181)
+scopenesting(#20181,#20000)
+#20182=@"var;{i};{#20181}"
+variables(#20182,"i",#20181)
 #20183=*
-exprs(#20183,79,#20178,1,"numbers")
-hasLocation(#20183,#20059)
-enclosing_stmt(#20183,#20175)
+exprs(#20183,78,#20179,0,"i")
+hasLocation(#20183,#20055)
+enclosing_stmt(#20183,#20176)
 expr_containers(#20183,#20001)
-literals("numbers","numbers",#20183)
-#20184=@"var;{numbers};{#20000}"
-variables(#20184,"numbers",#20000)
-bind(#20183,#20184)
-#20185=*
-exprs(#20185,76,#20176,2,"for (j of letters)")
-#20186=@"loc,{#10000},3,21,3,38"
-locations_default(#20186,#10000,3,21,3,38)
-hasLocation(#20185,#20186)
-enclosing_stmt(#20185,#20175)
-expr_containers(#20185,#20001)
-#20187=*
-scopes(#20187,7)
-scopenodes(#20185,#20187)
-scopenesting(#20187,#20180)
-#20188=@"var;{j};{#20187}"
-variables(#20188,"j",#20187)
-#20189=*
-exprs(#20189,78,#20185,0,"j")
-hasLocation(#20189,#20067)
-enclosing_stmt(#20189,#20175)
-expr_containers(#20189,#20001)
-literals("j","j",#20189)
-decl(#20189,#20188)
+literals("i","i",#20183)
+decl(#20183,#20182)
+#20184=*
+exprs(#20184,79,#20179,1,"numbers")
+hasLocation(#20184,#20059)
+enclosing_stmt(#20184,#20176)
+expr_containers(#20184,#20001)
+literals("numbers","numbers",#20184)
+#20185=@"var;{numbers};{#20000}"
+variables(#20185,"numbers",#20000)
+bind(#20184,#20185)
+#20186=*
+exprs(#20186,76,#20177,2,"for (j of letters)")
+#20187=@"loc,{#10000},3,21,3,38"
+locations_default(#20187,#10000,3,21,3,38)
+hasLocation(#20186,#20187)
+enclosing_stmt(#20186,#20176)
+expr_containers(#20186,#20001)
+#20188=*
+scopes(#20188,7)
+scopenodes(#20186,#20188)
+scopenesting(#20188,#20181)
+#20189=@"var;{j};{#20188}"
+variables(#20189,"j",#20188)
 #20190=*
-exprs(#20190,79,#20185,1,"letters")
-hasLocation(#20190,#20071)
-enclosing_stmt(#20190,#20175)
+exprs(#20190,78,#20186,0,"j")
+hasLocation(#20190,#20067)
+enclosing_stmt(#20190,#20176)
 expr_containers(#20190,#20001)
-literals("letters","letters",#20190)
-#20191=@"var;{letters};{#20000}"
-variables(#20191,"letters",#20000)
-bind(#20190,#20191)
-#20192=*
-exprs(#20192,34,#20176,0,"i+j")
-#20193=@"loc,{#10000},3,40,3,42"
-locations_default(#20193,#10000,3,40,3,42)
-hasLocation(#20192,#20193)
-enclosing_stmt(#20192,#20175)
-expr_containers(#20192,#20001)
-#20194=*
-exprs(#20194,79,#20192,0,"i")
-hasLocation(#20194,#20075)
-enclosing_stmt(#20194,#20175)
-expr_containers(#20194,#20001)
-literals("i","i",#20194)
-bind(#20194,#20181)
+literals("j","j",#20190)
+decl(#20190,#20189)
+#20191=*
+exprs(#20191,79,#20186,1,"letters")
+hasLocation(#20191,#20071)
+enclosing_stmt(#20191,#20176)
+expr_containers(#20191,#20001)
+literals("letters","letters",#20191)
+#20192=@"var;{letters};{#20000}"
+variables(#20192,"letters",#20000)
+bind(#20191,#20192)
+#20193=*
+exprs(#20193,34,#20177,0,"i+j")
+#20194=@"loc,{#10000},3,40,3,42"
+locations_default(#20194,#10000,3,40,3,42)
+hasLocation(#20193,#20194)
+enclosing_stmt(#20193,#20176)
+expr_containers(#20193,#20001)
 #20195=*
-exprs(#20195,79,#20192,1,"j")
-hasLocation(#20195,#20079)
-enclosing_stmt(#20195,#20175)
+exprs(#20195,79,#20193,0,"i")
+hasLocation(#20195,#20075)
+enclosing_stmt(#20195,#20176)
 expr_containers(#20195,#20001)
-literals("j","j",#20195)
-bind(#20195,#20188)
+literals("i","i",#20195)
+bind(#20195,#20182)
 #20196=*
-stmts(#20196,2,#20001,3,"[for (i ... ) i+j];")
-hasLocation(#20196,#20009)
-stmt_containers(#20196,#20001)
+exprs(#20196,79,#20193,1,"j")
+hasLocation(#20196,#20079)
+enclosing_stmt(#20196,#20176)
+expr_containers(#20196,#20001)
+literals("j","j",#20196)
+bind(#20196,#20189)
 #20197=*
-exprs(#20197,73,#20196,0,"[for (i ... j) i+j]")
-#20198=@"loc,{#10000},4,1,4,52"
-locations_default(#20198,#10000,4,1,4,52)
-hasLocation(#20197,#20198)
-enclosing_stmt(#20197,#20196)
-expr_containers(#20197,#20001)
-#20199=*
-exprs(#20199,76,#20197,1,"for (i of numbers)")
-#20200=@"loc,{#10000},4,2,4,19"
-locations_default(#20200,#10000,4,2,4,19)
-hasLocation(#20199,#20200)
-enclosing_stmt(#20199,#20196)
-expr_containers(#20199,#20001)
-#20201=*
-scopes(#20201,7)
-scopenodes(#20199,#20201)
-scopenesting(#20201,#20000)
-#20202=@"var;{i};{#20201}"
-variables(#20202,"i",#20201)
-#20203=*
-exprs(#20203,78,#20199,0,"i")
-hasLocation(#20203,#20091)
-enclosing_stmt(#20203,#20196)
-expr_containers(#20203,#20001)
-literals("i","i",#20203)
-decl(#20203,#20202)
+stmts(#20197,2,#20001,3,"[for (i ... ) i+j];")
+hasLocation(#20197,#20009)
+stmt_containers(#20197,#20001)
+#20198=*
+exprs(#20198,73,#20197,0,"[for (i ... j) i+j]")
+#20199=@"loc,{#10000},4,1,4,52"
+locations_default(#20199,#10000,4,1,4,52)
+hasLocation(#20198,#20199)
+enclosing_stmt(#20198,#20197)
+expr_containers(#20198,#20001)
+#20200=*
+exprs(#20200,76,#20198,1,"for (i of numbers)")
+#20201=@"loc,{#10000},4,2,4,19"
+locations_default(#20201,#10000,4,2,4,19)
+hasLocation(#20200,#20201)
+enclosing_stmt(#20200,#20197)
+expr_containers(#20200,#20001)
+#20202=*
+scopes(#20202,7)
+scopenodes(#20200,#20202)
+scopenesting(#20202,#20000)
+#20203=@"var;{i};{#20202}"
+variables(#20203,"i",#20202)
 #20204=*
-exprs(#20204,79,#20199,1,"numbers")
-hasLocation(#20204,#20095)
-enclosing_stmt(#20204,#20196)
+exprs(#20204,78,#20200,0,"i")
+hasLocation(#20204,#20091)
+enclosing_stmt(#20204,#20197)
 expr_containers(#20204,#20001)
-literals("numbers","numbers",#20204)
-bind(#20204,#20184)
+literals("i","i",#20204)
+decl(#20204,#20203)
 #20205=*
-exprs(#20205,76,#20197,2,"for (j of letters)")
-#20206=@"loc,{#10000},4,21,4,38"
-locations_default(#20206,#10000,4,21,4,38)
-hasLocation(#20205,#20206)
-enclosing_stmt(#20205,#20196)
+exprs(#20205,79,#20200,1,"numbers")
+hasLocation(#20205,#20095)
+enclosing_stmt(#20205,#20197)
 expr_containers(#20205,#20001)
-#20207=*
-scopes(#20207,7)
-scopenodes(#20205,#20207)
-scopenesting(#20207,#20201)
-#20208=@"var;{j};{#20207}"
-variables(#20208,"j",#20207)
-#20209=*
-exprs(#20209,78,#20205,0,"j")
-hasLocation(#20209,#20103)
-enclosing_stmt(#20209,#20196)
-expr_containers(#20209,#20001)
-literals("j","j",#20209)
-decl(#20209,#20208)
+literals("numbers","numbers",#20205)
+bind(#20205,#20185)
+#20206=*
+exprs(#20206,76,#20198,2,"for (j of letters)")
+#20207=@"loc,{#10000},4,21,4,38"
+locations_default(#20207,#10000,4,21,4,38)
+hasLocation(#20206,#20207)
+enclosing_stmt(#20206,#20197)
+expr_containers(#20206,#20001)
+#20208=*
+scopes(#20208,7)
+scopenodes(#20206,#20208)
+scopenesting(#20208,#20202)
+#20209=@"var;{j};{#20208}"
+variables(#20209,"j",#20208)
 #20210=*
-exprs(#20210,79,#20205,1,"letters")
-hasLocation(#20210,#20107)
-enclosing_stmt(#20210,#20196)
+exprs(#20210,78,#20206,0,"j")
+hasLocation(#20210,#20103)
+enclosing_stmt(#20210,#20197)
 expr_containers(#20210,#20001)
-literals("letters","letters",#20210)
-bind(#20210,#20191)
+literals("j","j",#20210)
+decl(#20210,#20209)
 #20211=*
-exprs(#20211,27,#20197,-1,"i<j")
-#20212=@"loc,{#10000},4,44,4,46"
-locations_default(#20212,#10000,4,44,4,46)
-hasLocation(#20211,#20212)
-enclosing_stmt(#20211,#20196)
+exprs(#20211,79,#20206,1,"letters")
+hasLocation(#20211,#20107)
+enclosing_stmt(#20211,#20197)
 expr_containers(#20211,#20001)
-#20213=*
-exprs(#20213,79,#20211,0,"i")
-hasLocation(#20213,#20115)
-enclosing_stmt(#20213,#20196)
-expr_containers(#20213,#20001)
-literals("i","i",#20213)
-bind(#20213,#20202)
+literals("letters","letters",#20211)
+bind(#20211,#20192)
+#20212=*
+exprs(#20212,27,#20198,-1,"i<j")
+#20213=@"loc,{#10000},4,44,4,46"
+locations_default(#20213,#10000,4,44,4,46)
+hasLocation(#20212,#20213)
+enclosing_stmt(#20212,#20197)
+expr_containers(#20212,#20001)
 #20214=*
-exprs(#20214,79,#20211,1,"j")
-hasLocation(#20214,#20119)
-enclosing_stmt(#20214,#20196)
+exprs(#20214,79,#20212,0,"i")
+hasLocation(#20214,#20115)
+enclosing_stmt(#20214,#20197)
 expr_containers(#20214,#20001)
-literals("j","j",#20214)
-bind(#20214,#20208)
+literals("i","i",#20214)
+bind(#20214,#20203)
 #20215=*
-exprs(#20215,34,#20197,0,"i+j")
-#20216=@"loc,{#10000},4,49,4,51"
-locations_default(#20216,#10000,4,49,4,51)
-hasLocation(#20215,#20216)
-enclosing_stmt(#20215,#20196)
+exprs(#20215,79,#20212,1,"j")
+hasLocation(#20215,#20119)
+enclosing_stmt(#20215,#20197)
 expr_containers(#20215,#20001)
-#20217=*
-exprs(#20217,79,#20215,0,"i")
-hasLocation(#20217,#20123)
-enclosing_stmt(#20217,#20196)
-expr_containers(#20217,#20001)
-literals("i","i",#20217)
-bind(#20217,#20202)
+literals("j","j",#20215)
+bind(#20215,#20209)
+#20216=*
+exprs(#20216,34,#20198,0,"i+j")
+#20217=@"loc,{#10000},4,49,4,51"
+locations_default(#20217,#10000,4,49,4,51)
+hasLocation(#20216,#20217)
+enclosing_stmt(#20216,#20197)
+expr_containers(#20216,#20001)
 #20218=*
-exprs(#20218,79,#20215,1,"j")
-hasLocation(#20218,#20127)
-enclosing_stmt(#20218,#20196)
+exprs(#20218,79,#20216,0,"i")
+hasLocation(#20218,#20123)
+enclosing_stmt(#20218,#20197)
 expr_containers(#20218,#20001)
-literals("j","j",#20218)
-bind(#20218,#20208)
+literals("i","i",#20218)
+bind(#20218,#20203)
 #20219=*
-stmts(#20219,2,#20001,4,"[for ea ... rs) i];")
-hasLocation(#20219,#20011)
-stmt_containers(#20219,#20001)
+exprs(#20219,79,#20216,1,"j")
+hasLocation(#20219,#20127)
+enclosing_stmt(#20219,#20197)
+expr_containers(#20219,#20001)
+literals("j","j",#20219)
+bind(#20219,#20209)
 #20220=*
-exprs(#20220,73,#20219,0,"[for ea ... ers) i]")
-#20221=@"loc,{#10000},5,1,5,27"
-locations_default(#20221,#10000,5,1,5,27)
-hasLocation(#20220,#20221)
-enclosing_stmt(#20220,#20219)
-expr_containers(#20220,#20001)
-#20222=*
-exprs(#20222,76,#20220,1,"for eac ... umbers)")
-#20223=@"loc,{#10000},5,2,5,24"
-locations_default(#20223,#10000,5,2,5,24)
-hasLocation(#20222,#20223)
-enclosing_stmt(#20222,#20219)
-expr_containers(#20222,#20001)
-#20224=*
-scopes(#20224,7)
-scopenodes(#20222,#20224)
-scopenesting(#20224,#20000)
-#20225=@"var;{i};{#20224}"
-variables(#20225,"i",#20224)
-#20226=*
-exprs(#20226,78,#20222,0,"i")
-hasLocation(#20226,#20141)
-enclosing_stmt(#20226,#20219)
-expr_containers(#20226,#20001)
-literals("i","i",#20226)
-decl(#20226,#20225)
+stmts(#20220,2,#20001,4,"[for ea ... rs) i];")
+hasLocation(#20220,#20011)
+stmt_containers(#20220,#20001)
+#20221=*
+exprs(#20221,73,#20220,0,"[for ea ... ers) i]")
+#20222=@"loc,{#10000},5,1,5,27"
+locations_default(#20222,#10000,5,1,5,27)
+hasLocation(#20221,#20222)
+enclosing_stmt(#20221,#20220)
+expr_containers(#20221,#20001)
+#20223=*
+exprs(#20223,76,#20221,1,"for eac ... umbers)")
+#20224=@"loc,{#10000},5,2,5,24"
+locations_default(#20224,#10000,5,2,5,24)
+hasLocation(#20223,#20224)
+enclosing_stmt(#20223,#20220)
+expr_containers(#20223,#20001)
+#20225=*
+scopes(#20225,7)
+scopenodes(#20223,#20225)
+scopenesting(#20225,#20000)
+#20226=@"var;{i};{#20225}"
+variables(#20226,"i",#20225)
 #20227=*
-exprs(#20227,79,#20222,1,"numbers")
-hasLocation(#20227,#20145)
-enclosing_stmt(#20227,#20219)
+exprs(#20227,78,#20223,0,"i")
+hasLocation(#20227,#20141)
+enclosing_stmt(#20227,#20220)
 expr_containers(#20227,#20001)
-literals("numbers","numbers",#20227)
-bind(#20227,#20184)
+literals("i","i",#20227)
+decl(#20227,#20226)
 #20228=*
-exprs(#20228,79,#20220,0,"i")
-hasLocation(#20228,#20149)
-enclosing_stmt(#20228,#20219)
+exprs(#20228,79,#20223,1,"numbers")
+hasLocation(#20228,#20145)
+enclosing_stmt(#20228,#20220)
 expr_containers(#20228,#20001)
-literals("i","i",#20228)
-bind(#20228,#20225)
+literals("numbers","numbers",#20228)
+bind(#20228,#20185)
 #20229=*
-entry_cfg_node(#20229,#20001)
-#20230=@"loc,{#10000},1,1,1,0"
-locations_default(#20230,#10000,1,1,1,0)
-hasLocation(#20229,#20230)
-#20231=*
-exit_cfg_node(#20231,#20001)
-hasLocation(#20231,#20155)
-successor(#20219,#20220)
-successor(#20222,#20227)
-successor(#20227,#20226)
-successor(#20227,#20231)
-successor(#20228,#20226)
-successor(#20228,#20231)
-successor(#20226,#20228)
-successor(#20220,#20222)
-successor(#20196,#20197)
-successor(#20199,#20204)
-successor(#20204,#20203)
-successor(#20204,#20219)
-successor(#20205,#20210)
-successor(#20210,#20209)
-successor(#20210,#20203)
-successor(#20210,#20219)
-successor(#20218,#20215)
-successor(#20217,#20218)
-successor(#20215,#20209)
-successor(#20215,#20203)
-successor(#20215,#20219)
-successor(#20214,#20211)
-successor(#20213,#20214)
+exprs(#20229,79,#20221,0,"i")
+hasLocation(#20229,#20149)
+enclosing_stmt(#20229,#20220)
+expr_containers(#20229,#20001)
+literals("i","i",#20229)
+bind(#20229,#20226)
+#20230=*
+entry_cfg_node(#20230,#20001)
+#20231=@"loc,{#10000},1,1,1,0"
+locations_default(#20231,#10000,1,1,1,0)
+hasLocation(#20230,#20231)
 #20232=*
-guard_node(#20232,1,#20211)
-hasLocation(#20232,#20212)
-successor(#20232,#20217)
+exit_cfg_node(#20232,#20001)
+hasLocation(#20232,#20155)
+successor(#20220,#20221)
+successor(#20223,#20228)
+successor(#20228,#20227)
+successor(#20228,#20232)
+successor(#20229,#20227)
+successor(#20229,#20232)
+successor(#20227,#20229)
+successor(#20221,#20223)
+successor(#20197,#20198)
+successor(#20200,#20205)
+successor(#20205,#20204)
+successor(#20205,#20220)
+successor(#20206,#20211)
+successor(#20211,#20210)
+successor(#20211,#20204)
+successor(#20211,#20220)
+successor(#20219,#20216)
+successor(#20218,#20219)
+successor(#20216,#20210)
+successor(#20216,#20204)
+successor(#20216,#20220)
+successor(#20215,#20212)
+successor(#20214,#20215)
 #20233=*
-guard_node(#20233,0,#20211)
-hasLocation(#20233,#20212)
-successor(#20233,#20209)
-successor(#20233,#20203)
-successor(#20233,#20219)
-successor(#20211,#20232)
-successor(#20211,#20233)
-successor(#20209,#20213)
-successor(#20203,#20205)
-successor(#20197,#20199)
-successor(#20175,#20176)
-successor(#20178,#20183)
-successor(#20183,#20182)
-successor(#20183,#20196)
-successor(#20185,#20190)
-successor(#20190,#20189)
-successor(#20190,#20182)
-successor(#20190,#20196)
-successor(#20195,#20192)
-successor(#20194,#20195)
-successor(#20192,#20189)
-successor(#20192,#20182)
-successor(#20192,#20196)
-successor(#20189,#20194)
-successor(#20182,#20185)
-successor(#20176,#20178)
-successor(#20172,#20173)
-successor(#20173,#20175)
-successor(#20157,#20158)
-successor(#20160,#20165)
-successor(#20165,#20164)
-successor(#20165,#20172)
-successor(#20171,#20164)
-successor(#20171,#20172)
-successor(#20170,#20167)
-successor(#20169,#20170)
+guard_node(#20233,1,#20212)
+hasLocation(#20233,#20213)
+successor(#20233,#20218)
 #20234=*
-guard_node(#20234,1,#20167)
-hasLocation(#20234,#20168)
-successor(#20234,#20171)
+guard_node(#20234,0,#20212)
+hasLocation(#20234,#20213)
+successor(#20234,#20210)
+successor(#20234,#20204)
+successor(#20234,#20220)
+successor(#20212,#20233)
+successor(#20212,#20234)
+successor(#20210,#20214)
+successor(#20204,#20206)
+successor(#20198,#20200)
+successor(#20176,#20177)
+successor(#20179,#20184)
+successor(#20184,#20183)
+successor(#20184,#20197)
+successor(#20186,#20191)
+successor(#20191,#20190)
+successor(#20191,#20183)
+successor(#20191,#20197)
+successor(#20196,#20193)
+successor(#20195,#20196)
+successor(#20193,#20190)
+successor(#20193,#20183)
+successor(#20193,#20197)
+successor(#20190,#20195)
+successor(#20183,#20186)
+successor(#20177,#20179)
+successor(#20173,#20174)
+successor(#20174,#20176)
+successor(#20158,#20159)
+successor(#20161,#20166)
+successor(#20166,#20165)
+successor(#20166,#20173)
+successor(#20172,#20165)
+successor(#20172,#20173)
+successor(#20171,#20168)
+successor(#20170,#20171)
 #20235=*
-guard_node(#20235,0,#20167)
-hasLocation(#20235,#20168)
-successor(#20235,#20164)
+guard_node(#20235,1,#20168)
+hasLocation(#20235,#20169)
 successor(#20235,#20172)
-successor(#20167,#20234)
-successor(#20167,#20235)
-successor(#20164,#20169)
-successor(#20158,#20160)
-successor(#20229,#20157)
+#20236=*
+guard_node(#20236,0,#20168)
+hasLocation(#20236,#20169)
+successor(#20236,#20165)
+successor(#20236,#20173)
+successor(#20168,#20235)
+successor(#20168,#20236)
+successor(#20165,#20170)
+successor(#20159,#20161)
+successor(#20230,#20158)
 numlines(#10000,5,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap b/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap
index 8d67fe56cd0..4be04a1455e 100644
--- a/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/exprfns.js.trap
@@ -204,246 +204,254 @@ locations_default(#20073,#10000,1,1,8,0)
 hasLocation(#20001,#20073)
 #20074=@"var;{f};{#20000}"
 variables(#20074,"f",#20000)
-#20075=*
-stmts(#20075,17,#20001,0,"functio ... esult"")")
-hasLocation(#20075,#20003)
-stmt_containers(#20075,#20001)
+#20075=@"var;{this};{#20000}"
+variables(#20075,"this",#20000)
 #20076=*
-exprs(#20076,78,#20075,-1,"f")
-hasLocation(#20076,#20019)
-expr_containers(#20076,#20075)
-literals("f","f",#20076)
-decl(#20076,#20074)
+stmts(#20076,17,#20001,0,"functio ... esult"")")
+hasLocation(#20076,#20003)
+stmt_containers(#20076,#20001)
 #20077=*
-scopes(#20077,1)
-scopenodes(#20075,#20077)
-scopenesting(#20077,#20000)
-#20078=@"var;{x};{#20077}"
-variables(#20078,"x",#20077)
-#20079=*
-exprs(#20079,78,#20075,0,"x")
-hasLocation(#20079,#20023)
-expr_containers(#20079,#20075)
-literals("x","x",#20079)
-decl(#20079,#20078)
-#20080=@"var;{arguments};{#20077}"
-variables(#20080,"arguments",#20077)
-is_arguments_object(#20080)
+exprs(#20077,78,#20076,-1,"f")
+hasLocation(#20077,#20019)
+expr_containers(#20077,#20076)
+literals("f","f",#20077)
+decl(#20077,#20074)
+#20078=*
+scopes(#20078,1)
+scopenodes(#20076,#20078)
+scopenesting(#20078,#20000)
+#20079=@"var;{this};{#20078}"
+variables(#20079,"this",#20078)
+#20080=@"var;{x};{#20078}"
+variables(#20080,"x",#20078)
 #20081=*
-exprs(#20081,63,#20075,-2,"(""result"")")
-#20082=@"loc,{#10000},1,14,1,23"
-locations_default(#20082,#10000,1,14,1,23)
-hasLocation(#20081,#20082)
-expr_containers(#20081,#20075)
+exprs(#20081,78,#20076,0,"x")
+hasLocation(#20081,#20023)
+expr_containers(#20081,#20076)
+literals("x","x",#20081)
+decl(#20081,#20080)
+#20082=@"var;{arguments};{#20078}"
+variables(#20082,"arguments",#20078)
+is_arguments_object(#20082)
 #20083=*
-exprs(#20083,4,#20081,0,"""result""")
-hasLocation(#20083,#20029)
-expr_containers(#20083,#20075)
-literals("result","""result""",#20083)
-#20084=*
-regexpterm(#20084,14,#20083,0,"result")
-#20085=@"loc,{#10000},1,16,1,21"
-locations_default(#20085,#10000,1,16,1,21)
-hasLocation(#20084,#20085)
-regexp_const_value(#20084,"result")
+exprs(#20083,63,#20076,-2,"(""result"")")
+#20084=@"loc,{#10000},1,14,1,23"
+locations_default(#20084,#10000,1,14,1,23)
+hasLocation(#20083,#20084)
+expr_containers(#20083,#20076)
+#20085=*
+exprs(#20085,4,#20083,0,"""result""")
+hasLocation(#20085,#20029)
+expr_containers(#20085,#20076)
+literals("result","""result""",#20085)
 #20086=*
-stmts(#20086,2,#20001,1,"functio ... )\n  }\n}")
-#20087=@"loc,{#10000},3,1,7,1"
-locations_default(#20087,#10000,3,1,7,1)
+regexpterm(#20086,14,#20085,0,"result")
+#20087=@"loc,{#10000},1,16,1,21"
+locations_default(#20087,#10000,1,16,1,21)
 hasLocation(#20086,#20087)
-stmt_containers(#20086,#20001)
+regexp_const_value(#20086,"result")
 #20088=*
-exprs(#20088,9,#20086,0,"functio ... )\n  }\n}")
-hasLocation(#20088,#20087)
-enclosing_stmt(#20088,#20086)
-expr_containers(#20088,#20001)
-#20089=*
-scopes(#20089,1)
-scopenodes(#20088,#20089)
-scopenesting(#20089,#20000)
-#20090=@"var;{g};{#20089}"
-variables(#20090,"g",#20089)
-#20091=@"var;{b};{#20089}"
-variables(#20091,"b",#20089)
-#20092=*
-exprs(#20092,78,#20088,0,"b")
-hasLocation(#20092,#20037)
-expr_containers(#20092,#20088)
-literals("b","b",#20092)
-decl(#20092,#20091)
-#20093=@"var;{arguments};{#20089}"
-variables(#20093,"arguments",#20089)
-is_arguments_object(#20093)
-#20094=*
-stmts(#20094,1,#20088,-2,"{\n  if  ... )\n  }\n}")
-#20095=@"loc,{#10000},3,13,7,1"
-locations_default(#20095,#10000,3,13,7,1)
-hasLocation(#20094,#20095)
-stmt_containers(#20094,#20088)
-#20096=*
-stmts(#20096,3,#20094,0,"if (b)  ... t"")\n  }")
-#20097=@"loc,{#10000},4,3,6,3"
-locations_default(#20097,#10000,4,3,6,3)
-hasLocation(#20096,#20097)
-stmt_containers(#20096,#20088)
-#20098=*
-exprs(#20098,79,#20096,0,"b")
-hasLocation(#20098,#20047)
-enclosing_stmt(#20098,#20096)
-expr_containers(#20098,#20088)
-literals("b","b",#20098)
-bind(#20098,#20091)
+stmts(#20088,2,#20001,1,"functio ... )\n  }\n}")
+#20089=@"loc,{#10000},3,1,7,1"
+locations_default(#20089,#10000,3,1,7,1)
+hasLocation(#20088,#20089)
+stmt_containers(#20088,#20001)
+#20090=*
+exprs(#20090,9,#20088,0,"functio ... )\n  }\n}")
+hasLocation(#20090,#20089)
+enclosing_stmt(#20090,#20088)
+expr_containers(#20090,#20001)
+#20091=*
+scopes(#20091,1)
+scopenodes(#20090,#20091)
+scopenesting(#20091,#20000)
+#20092=@"var;{g};{#20091}"
+variables(#20092,"g",#20091)
+#20093=@"var;{this};{#20091}"
+variables(#20093,"this",#20091)
+#20094=@"var;{b};{#20091}"
+variables(#20094,"b",#20091)
+#20095=*
+exprs(#20095,78,#20090,0,"b")
+hasLocation(#20095,#20037)
+expr_containers(#20095,#20090)
+literals("b","b",#20095)
+decl(#20095,#20094)
+#20096=@"var;{arguments};{#20091}"
+variables(#20096,"arguments",#20091)
+is_arguments_object(#20096)
+#20097=*
+stmts(#20097,1,#20090,-2,"{\n  if  ... )\n  }\n}")
+#20098=@"loc,{#10000},3,13,7,1"
+locations_default(#20098,#10000,3,13,7,1)
+hasLocation(#20097,#20098)
+stmt_containers(#20097,#20090)
 #20099=*
-stmts(#20099,1,#20096,1,"{\n    f ... t"")\n  }")
-#20100=@"loc,{#10000},4,10,6,3"
-locations_default(#20100,#10000,4,10,6,3)
+stmts(#20099,3,#20097,0,"if (b)  ... t"")\n  }")
+#20100=@"loc,{#10000},4,3,6,3"
+locations_default(#20100,#10000,4,3,6,3)
 hasLocation(#20099,#20100)
-stmt_containers(#20099,#20088)
+stmt_containers(#20099,#20090)
 #20101=*
-stmts(#20101,17,#20099,0,"functio ... esult"")")
-#20102=@"loc,{#10000},5,5,5,33"
-locations_default(#20102,#10000,5,5,5,33)
-hasLocation(#20101,#20102)
-stmt_containers(#20101,#20088)
-#20103=*
-exprs(#20103,78,#20101,-1,"g")
-hasLocation(#20103,#20055)
-expr_containers(#20103,#20101)
-literals("g","g",#20103)
-decl(#20103,#20090)
+exprs(#20101,79,#20099,0,"b")
+hasLocation(#20101,#20047)
+enclosing_stmt(#20101,#20099)
+expr_containers(#20101,#20090)
+literals("b","b",#20101)
+bind(#20101,#20094)
+#20102=*
+stmts(#20102,1,#20099,1,"{\n    f ... t"")\n  }")
+#20103=@"loc,{#10000},4,10,6,3"
+locations_default(#20103,#10000,4,10,6,3)
+hasLocation(#20102,#20103)
+stmt_containers(#20102,#20090)
 #20104=*
-scopes(#20104,1)
-scopenodes(#20101,#20104)
-scopenesting(#20104,#20089)
-#20105=@"var;{y};{#20104}"
-variables(#20105,"y",#20104)
+stmts(#20104,17,#20102,0,"functio ... esult"")")
+#20105=@"loc,{#10000},5,5,5,33"
+locations_default(#20105,#10000,5,5,5,33)
+hasLocation(#20104,#20105)
+stmt_containers(#20104,#20090)
 #20106=*
-exprs(#20106,78,#20101,0,"y")
-hasLocation(#20106,#20059)
-expr_containers(#20106,#20101)
-literals("y","y",#20106)
-decl(#20106,#20105)
-#20107=@"var;{arguments};{#20104}"
-variables(#20107,"arguments",#20104)
-is_arguments_object(#20107)
-#20108=*
-exprs(#20108,63,#20101,-2,"(""other result"")")
-#20109=@"loc,{#10000},5,18,5,33"
-locations_default(#20109,#10000,5,18,5,33)
-hasLocation(#20108,#20109)
-expr_containers(#20108,#20101)
+exprs(#20106,78,#20104,-1,"g")
+hasLocation(#20106,#20055)
+expr_containers(#20106,#20104)
+literals("g","g",#20106)
+decl(#20106,#20092)
+#20107=*
+scopes(#20107,1)
+scopenodes(#20104,#20107)
+scopenesting(#20107,#20091)
+#20108=@"var;{this};{#20107}"
+variables(#20108,"this",#20107)
+#20109=@"var;{y};{#20107}"
+variables(#20109,"y",#20107)
 #20110=*
-exprs(#20110,4,#20108,0,"""other result""")
-hasLocation(#20110,#20065)
-expr_containers(#20110,#20101)
-literals("other result","""other result""",#20110)
-#20111=*
-regexpterm(#20111,14,#20110,0,"other result")
-#20112=@"loc,{#10000},5,20,5,31"
-locations_default(#20112,#10000,5,20,5,31)
-hasLocation(#20111,#20112)
-regexp_const_value(#20111,"other result")
-#20113=*
-entry_cfg_node(#20113,#20001)
-#20114=@"loc,{#10000},1,1,1,0"
-locations_default(#20114,#10000,1,1,1,0)
-hasLocation(#20113,#20114)
+exprs(#20110,78,#20104,0,"y")
+hasLocation(#20110,#20059)
+expr_containers(#20110,#20104)
+literals("y","y",#20110)
+decl(#20110,#20109)
+#20111=@"var;{arguments};{#20107}"
+variables(#20111,"arguments",#20107)
+is_arguments_object(#20111)
+#20112=*
+exprs(#20112,63,#20104,-2,"(""other result"")")
+#20113=@"loc,{#10000},5,18,5,33"
+locations_default(#20113,#10000,5,18,5,33)
+hasLocation(#20112,#20113)
+expr_containers(#20112,#20104)
+#20114=*
+exprs(#20114,4,#20112,0,"""other result""")
+hasLocation(#20114,#20065)
+expr_containers(#20114,#20104)
+literals("other result","""other result""",#20114)
 #20115=*
-exit_cfg_node(#20115,#20001)
-hasLocation(#20115,#20072)
-successor(#20086,#20088)
-successor(#20088,#20115)
-#20116=*
-entry_cfg_node(#20116,#20088)
-#20117=@"loc,{#10000},3,1,3,0"
-locations_default(#20117,#10000,3,1,3,0)
-hasLocation(#20116,#20117)
-#20118=*
-exit_cfg_node(#20118,#20088)
-#20119=@"loc,{#10000},7,2,7,1"
-locations_default(#20119,#10000,7,2,7,1)
-hasLocation(#20118,#20119)
-successor(#20096,#20098)
+regexpterm(#20115,14,#20114,0,"other result")
+#20116=@"loc,{#10000},5,20,5,31"
+locations_default(#20116,#10000,5,20,5,31)
+hasLocation(#20115,#20116)
+regexp_const_value(#20115,"other result")
+#20117=*
+entry_cfg_node(#20117,#20001)
+#20118=@"loc,{#10000},1,1,1,0"
+locations_default(#20118,#10000,1,1,1,0)
+hasLocation(#20117,#20118)
+#20119=*
+exit_cfg_node(#20119,#20001)
+hasLocation(#20119,#20072)
+successor(#20088,#20090)
+successor(#20090,#20119)
 #20120=*
-guard_node(#20120,1,#20098)
-hasLocation(#20120,#20047)
-successor(#20120,#20099)
-#20121=*
-guard_node(#20121,0,#20098)
-hasLocation(#20121,#20047)
-successor(#20121,#20118)
-successor(#20098,#20120)
-successor(#20098,#20121)
-successor(#20101,#20118)
+entry_cfg_node(#20120,#20090)
+#20121=@"loc,{#10000},3,1,3,0"
+locations_default(#20121,#10000,3,1,3,0)
+hasLocation(#20120,#20121)
 #20122=*
-entry_cfg_node(#20122,#20101)
-#20123=@"loc,{#10000},5,5,5,4"
-locations_default(#20123,#10000,5,5,5,4)
+exit_cfg_node(#20122,#20090)
+#20123=@"loc,{#10000},7,2,7,1"
+locations_default(#20123,#10000,7,2,7,1)
 hasLocation(#20122,#20123)
+successor(#20099,#20101)
 #20124=*
-exit_cfg_node(#20124,#20101)
-#20125=@"loc,{#10000},5,34,5,33"
-locations_default(#20125,#10000,5,34,5,33)
-hasLocation(#20124,#20125)
-successor(#20108,#20110)
-successor(#20110,#20124)
-successor(#20106,#20108)
-successor(#20122,#20106)
-successor(#20103,#20101)
-successor(#20099,#20103)
-successor(#20094,#20096)
-successor(#20092,#20094)
-successor(#20116,#20092)
-successor(#20075,#20086)
+guard_node(#20124,1,#20101)
+hasLocation(#20124,#20047)
+successor(#20124,#20102)
+#20125=*
+guard_node(#20125,0,#20101)
+hasLocation(#20125,#20047)
+successor(#20125,#20122)
+successor(#20101,#20124)
+successor(#20101,#20125)
+successor(#20104,#20122)
 #20126=*
-entry_cfg_node(#20126,#20075)
-hasLocation(#20126,#20114)
-#20127=*
-exit_cfg_node(#20127,#20075)
-#20128=@"loc,{#10000},1,24,1,23"
-locations_default(#20128,#10000,1,24,1,23)
-hasLocation(#20127,#20128)
-successor(#20081,#20083)
-successor(#20083,#20127)
-successor(#20079,#20081)
-successor(#20126,#20079)
-successor(#20076,#20075)
-successor(#20113,#20076)
-#20129=*
-js_parse_errors(#20129,#20001,"Error: Missing function name","function(b) {
-")
-hasLocation(#20129,#20035)
+entry_cfg_node(#20126,#20104)
+#20127=@"loc,{#10000},5,5,5,4"
+locations_default(#20127,#10000,5,5,5,4)
+hasLocation(#20126,#20127)
+#20128=*
+exit_cfg_node(#20128,#20104)
+#20129=@"loc,{#10000},5,34,5,33"
+locations_default(#20129,#10000,5,34,5,33)
+hasLocation(#20128,#20129)
+successor(#20112,#20114)
+successor(#20114,#20128)
+successor(#20110,#20112)
+successor(#20126,#20110)
+successor(#20106,#20104)
+successor(#20102,#20106)
+successor(#20097,#20099)
+successor(#20095,#20097)
+successor(#20120,#20095)
+successor(#20076,#20088)
 #20130=*
-lines(#20130,#20001,"function f(x)(""result"")","
-")
-hasLocation(#20130,#20003)
+entry_cfg_node(#20130,#20076)
+hasLocation(#20130,#20118)
 #20131=*
-lines(#20131,#20001,"","
-")
-hasLocation(#20131,#20005)
-#20132=*
-lines(#20132,#20001,"function(b) {","
-")
-hasLocation(#20132,#20007)
+exit_cfg_node(#20131,#20076)
+#20132=@"loc,{#10000},1,24,1,23"
+locations_default(#20132,#10000,1,24,1,23)
+hasLocation(#20131,#20132)
+successor(#20083,#20085)
+successor(#20085,#20131)
+successor(#20081,#20083)
+successor(#20130,#20081)
+successor(#20077,#20076)
+successor(#20117,#20077)
 #20133=*
-lines(#20133,#20001,"  if (b) {","
+js_parse_errors(#20133,#20001,"Error: Missing function name","function(b) {
 ")
-hasLocation(#20133,#20009)
-indentation(#10000,4," ",2)
+hasLocation(#20133,#20035)
 #20134=*
-lines(#20134,#20001,"    function g(y)(""other result"")","
+lines(#20134,#20001,"function f(x)(""result"")","
 ")
-hasLocation(#20134,#20011)
-indentation(#10000,5," ",4)
+hasLocation(#20134,#20003)
 #20135=*
-lines(#20135,#20001,"  }","
+lines(#20135,#20001,"","
 ")
-hasLocation(#20135,#20013)
-indentation(#10000,6," ",2)
+hasLocation(#20135,#20005)
 #20136=*
-lines(#20136,#20001,"}","
+lines(#20136,#20001,"function(b) {","
 ")
-hasLocation(#20136,#20015)
+hasLocation(#20136,#20007)
+#20137=*
+lines(#20137,#20001,"  if (b) {","
+")
+hasLocation(#20137,#20009)
+indentation(#10000,4," ",2)
+#20138=*
+lines(#20138,#20001,"    function g(y)(""other result"")","
+")
+hasLocation(#20138,#20011)
+indentation(#10000,5," ",4)
+#20139=*
+lines(#20139,#20001,"  }","
+")
+hasLocation(#20139,#20013)
+indentation(#10000,6," ",2)
+#20140=*
+lines(#20140,#20001,"}","
+")
+hasLocation(#20140,#20015)
 numlines(#20001,7,0,0)
 numlines(#10000,7,6,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/mozilla/output/trap/foreach.js.trap b/javascript/extractor/tests/mozilla/output/trap/foreach.js.trap
index cecedc6e9b0..3050bf98ddc 100644
--- a/javascript/extractor/tests/mozilla/output/trap/foreach.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/foreach.js.trap
@@ -293,254 +293,256 @@ variables(#20108,"sum",#20000)
 variables(#20109,"obj",#20000)
 #20110=@"var;{item};{#20000}"
 variables(#20110,"item",#20000)
-#20111=*
-stmts(#20111,18,#20001,0,"var sum = 0;")
-hasLocation(#20111,#20005)
-stmt_containers(#20111,#20001)
+#20111=@"var;{this};{#20000}"
+variables(#20111,"this",#20000)
 #20112=*
-exprs(#20112,64,#20111,0,"sum = 0")
-#20113=@"loc,{#10000},1,5,1,11"
-locations_default(#20113,#10000,1,5,1,11)
-hasLocation(#20112,#20113)
-enclosing_stmt(#20112,#20111)
-expr_containers(#20112,#20001)
-#20114=*
-exprs(#20114,78,#20112,0,"sum")
-hasLocation(#20114,#20023)
-enclosing_stmt(#20114,#20111)
-expr_containers(#20114,#20001)
-literals("sum","sum",#20114)
-decl(#20114,#20108)
+stmts(#20112,18,#20001,0,"var sum = 0;")
+hasLocation(#20112,#20005)
+stmt_containers(#20112,#20001)
+#20113=*
+exprs(#20113,64,#20112,0,"sum = 0")
+#20114=@"loc,{#10000},1,5,1,11"
+locations_default(#20114,#10000,1,5,1,11)
+hasLocation(#20113,#20114)
+enclosing_stmt(#20113,#20112)
+expr_containers(#20113,#20001)
 #20115=*
-exprs(#20115,3,#20112,1,"0")
-hasLocation(#20115,#20027)
-enclosing_stmt(#20115,#20111)
+exprs(#20115,78,#20113,0,"sum")
+hasLocation(#20115,#20023)
+enclosing_stmt(#20115,#20112)
 expr_containers(#20115,#20001)
-literals("0","0",#20115)
+literals("sum","sum",#20115)
+decl(#20115,#20108)
 #20116=*
-stmts(#20116,18,#20001,1,"var obj ... p3: 8};")
-hasLocation(#20116,#20007)
-stmt_containers(#20116,#20001)
+exprs(#20116,3,#20113,1,"0")
+hasLocation(#20116,#20027)
+enclosing_stmt(#20116,#20112)
+expr_containers(#20116,#20001)
+literals("0","0",#20116)
 #20117=*
-exprs(#20117,64,#20116,0,"obj = { ... op3: 8}")
-#20118=@"loc,{#10000},2,5,2,41"
-locations_default(#20118,#10000,2,5,2,41)
-hasLocation(#20117,#20118)
-enclosing_stmt(#20117,#20116)
-expr_containers(#20117,#20001)
-#20119=*
-exprs(#20119,78,#20117,0,"obj")
-hasLocation(#20119,#20033)
-enclosing_stmt(#20119,#20116)
-expr_containers(#20119,#20001)
-literals("obj","obj",#20119)
-decl(#20119,#20109)
+stmts(#20117,18,#20001,1,"var obj ... p3: 8};")
+hasLocation(#20117,#20007)
+stmt_containers(#20117,#20001)
+#20118=*
+exprs(#20118,64,#20117,0,"obj = { ... op3: 8}")
+#20119=@"loc,{#10000},2,5,2,41"
+locations_default(#20119,#10000,2,5,2,41)
+hasLocation(#20118,#20119)
+enclosing_stmt(#20118,#20117)
+expr_containers(#20118,#20001)
 #20120=*
-exprs(#20120,8,#20117,1,"{prop1: ... op3: 8}")
-#20121=@"loc,{#10000},2,11,2,41"
-locations_default(#20121,#10000,2,11,2,41)
-hasLocation(#20120,#20121)
-enclosing_stmt(#20120,#20116)
+exprs(#20120,78,#20118,0,"obj")
+hasLocation(#20120,#20033)
+enclosing_stmt(#20120,#20117)
 expr_containers(#20120,#20001)
-#20122=*
-properties(#20122,#20120,0,0,"prop1: 5")
-#20123=@"loc,{#10000},2,12,2,19"
-locations_default(#20123,#10000,2,12,2,19)
-hasLocation(#20122,#20123)
-#20124=*
-exprs(#20124,0,#20122,0,"prop1")
-hasLocation(#20124,#20039)
-enclosing_stmt(#20124,#20116)
-expr_containers(#20124,#20001)
-literals("prop1","prop1",#20124)
+literals("obj","obj",#20120)
+decl(#20120,#20109)
+#20121=*
+exprs(#20121,8,#20118,1,"{prop1: ... op3: 8}")
+#20122=@"loc,{#10000},2,11,2,41"
+locations_default(#20122,#10000,2,11,2,41)
+hasLocation(#20121,#20122)
+enclosing_stmt(#20121,#20117)
+expr_containers(#20121,#20001)
+#20123=*
+properties(#20123,#20121,0,0,"prop1: 5")
+#20124=@"loc,{#10000},2,12,2,19"
+locations_default(#20124,#10000,2,12,2,19)
+hasLocation(#20123,#20124)
 #20125=*
-exprs(#20125,3,#20122,1,"5")
-hasLocation(#20125,#20043)
-enclosing_stmt(#20125,#20116)
+exprs(#20125,0,#20123,0,"prop1")
+hasLocation(#20125,#20039)
+enclosing_stmt(#20125,#20117)
 expr_containers(#20125,#20001)
-literals("5","5",#20125)
+literals("prop1","prop1",#20125)
 #20126=*
-properties(#20126,#20120,1,0,"prop2: 13")
-#20127=@"loc,{#10000},2,22,2,30"
-locations_default(#20127,#10000,2,22,2,30)
-hasLocation(#20126,#20127)
-#20128=*
-exprs(#20128,0,#20126,0,"prop2")
-hasLocation(#20128,#20047)
-enclosing_stmt(#20128,#20116)
-expr_containers(#20128,#20001)
-literals("prop2","prop2",#20128)
+exprs(#20126,3,#20123,1,"5")
+hasLocation(#20126,#20043)
+enclosing_stmt(#20126,#20117)
+expr_containers(#20126,#20001)
+literals("5","5",#20126)
+#20127=*
+properties(#20127,#20121,1,0,"prop2: 13")
+#20128=@"loc,{#10000},2,22,2,30"
+locations_default(#20128,#10000,2,22,2,30)
+hasLocation(#20127,#20128)
 #20129=*
-exprs(#20129,3,#20126,1,"13")
-hasLocation(#20129,#20051)
-enclosing_stmt(#20129,#20116)
+exprs(#20129,0,#20127,0,"prop2")
+hasLocation(#20129,#20047)
+enclosing_stmt(#20129,#20117)
 expr_containers(#20129,#20001)
-literals("13","13",#20129)
+literals("prop2","prop2",#20129)
 #20130=*
-properties(#20130,#20120,2,0,"prop3: 8")
-#20131=@"loc,{#10000},2,33,2,40"
-locations_default(#20131,#10000,2,33,2,40)
-hasLocation(#20130,#20131)
-#20132=*
-exprs(#20132,0,#20130,0,"prop3")
-hasLocation(#20132,#20055)
-enclosing_stmt(#20132,#20116)
-expr_containers(#20132,#20001)
-literals("prop3","prop3",#20132)
+exprs(#20130,3,#20127,1,"13")
+hasLocation(#20130,#20051)
+enclosing_stmt(#20130,#20117)
+expr_containers(#20130,#20001)
+literals("13","13",#20130)
+#20131=*
+properties(#20131,#20121,2,0,"prop3: 8")
+#20132=@"loc,{#10000},2,33,2,40"
+locations_default(#20132,#10000,2,33,2,40)
+hasLocation(#20131,#20132)
 #20133=*
-exprs(#20133,3,#20130,1,"8")
-hasLocation(#20133,#20059)
-enclosing_stmt(#20133,#20116)
+exprs(#20133,0,#20131,0,"prop3")
+hasLocation(#20133,#20055)
+enclosing_stmt(#20133,#20117)
 expr_containers(#20133,#20001)
-literals("8","8",#20133)
+literals("prop3","prop3",#20133)
 #20134=*
-stmts(#20134,25,#20001,2,"for eac ... item;\n}")
-#20135=@"loc,{#10000},4,1,6,1"
-locations_default(#20135,#10000,4,1,6,1)
-hasLocation(#20134,#20135)
-stmt_containers(#20134,#20001)
-#20136=*
-exprs(#20136,79,#20134,1,"obj")
-hasLocation(#20136,#20077)
-enclosing_stmt(#20136,#20134)
-expr_containers(#20136,#20001)
-literals("obj","obj",#20136)
-bind(#20136,#20109)
+exprs(#20134,3,#20131,1,"8")
+hasLocation(#20134,#20059)
+enclosing_stmt(#20134,#20117)
+expr_containers(#20134,#20001)
+literals("8","8",#20134)
+#20135=*
+stmts(#20135,25,#20001,2,"for eac ... item;\n}")
+#20136=@"loc,{#10000},4,1,6,1"
+locations_default(#20136,#10000,4,1,6,1)
+hasLocation(#20135,#20136)
+stmt_containers(#20135,#20001)
 #20137=*
-stmts(#20137,18,#20134,0,"var item")
-#20138=@"loc,{#10000},4,11,4,18"
-locations_default(#20138,#10000,4,11,4,18)
-hasLocation(#20137,#20138)
-stmt_containers(#20137,#20001)
-#20139=*
-exprs(#20139,64,#20137,0,"item")
-hasLocation(#20139,#20073)
-enclosing_stmt(#20139,#20137)
-expr_containers(#20139,#20001)
+exprs(#20137,79,#20135,1,"obj")
+hasLocation(#20137,#20077)
+enclosing_stmt(#20137,#20135)
+expr_containers(#20137,#20001)
+literals("obj","obj",#20137)
+bind(#20137,#20109)
+#20138=*
+stmts(#20138,18,#20135,0,"var item")
+#20139=@"loc,{#10000},4,11,4,18"
+locations_default(#20139,#10000,4,11,4,18)
+hasLocation(#20138,#20139)
+stmt_containers(#20138,#20001)
 #20140=*
-exprs(#20140,78,#20139,0,"item")
+exprs(#20140,64,#20138,0,"item")
 hasLocation(#20140,#20073)
-enclosing_stmt(#20140,#20137)
+enclosing_stmt(#20140,#20138)
 expr_containers(#20140,#20001)
-literals("item","item",#20140)
-decl(#20140,#20110)
 #20141=*
-stmts(#20141,1,#20134,2,"{\n  sum += item;\n}")
-#20142=@"loc,{#10000},4,28,6,1"
-locations_default(#20142,#10000,4,28,6,1)
-hasLocation(#20141,#20142)
-stmt_containers(#20141,#20001)
-#20143=*
-stmts(#20143,2,#20141,0,"sum += item;")
-#20144=@"loc,{#10000},5,3,5,14"
-locations_default(#20144,#10000,5,3,5,14)
-hasLocation(#20143,#20144)
-stmt_containers(#20143,#20001)
-#20145=*
-exprs(#20145,48,#20143,0,"sum += item")
-#20146=@"loc,{#10000},5,3,5,13"
-locations_default(#20146,#10000,5,3,5,13)
-hasLocation(#20145,#20146)
-enclosing_stmt(#20145,#20143)
-expr_containers(#20145,#20001)
-#20147=*
-exprs(#20147,79,#20145,0,"sum")
-hasLocation(#20147,#20083)
-enclosing_stmt(#20147,#20143)
-expr_containers(#20147,#20001)
-literals("sum","sum",#20147)
-bind(#20147,#20108)
+exprs(#20141,78,#20140,0,"item")
+hasLocation(#20141,#20073)
+enclosing_stmt(#20141,#20138)
+expr_containers(#20141,#20001)
+literals("item","item",#20141)
+decl(#20141,#20110)
+#20142=*
+stmts(#20142,1,#20135,2,"{\n  sum += item;\n}")
+#20143=@"loc,{#10000},4,28,6,1"
+locations_default(#20143,#10000,4,28,6,1)
+hasLocation(#20142,#20143)
+stmt_containers(#20142,#20001)
+#20144=*
+stmts(#20144,2,#20142,0,"sum += item;")
+#20145=@"loc,{#10000},5,3,5,14"
+locations_default(#20145,#10000,5,3,5,14)
+hasLocation(#20144,#20145)
+stmt_containers(#20144,#20001)
+#20146=*
+exprs(#20146,48,#20144,0,"sum += item")
+#20147=@"loc,{#10000},5,3,5,13"
+locations_default(#20147,#10000,5,3,5,13)
+hasLocation(#20146,#20147)
+enclosing_stmt(#20146,#20144)
+expr_containers(#20146,#20001)
 #20148=*
-exprs(#20148,79,#20145,1,"item")
-hasLocation(#20148,#20087)
-enclosing_stmt(#20148,#20143)
+exprs(#20148,79,#20146,0,"sum")
+hasLocation(#20148,#20083)
+enclosing_stmt(#20148,#20144)
 expr_containers(#20148,#20001)
-literals("item","item",#20148)
-bind(#20148,#20110)
+literals("sum","sum",#20148)
+bind(#20148,#20108)
 #20149=*
-stmts(#20149,2,#20001,3,"console.log(sum);")
-#20150=@"loc,{#10000},8,1,8,17"
-locations_default(#20150,#10000,8,1,8,17)
-hasLocation(#20149,#20150)
-stmt_containers(#20149,#20001)
-#20151=*
-exprs(#20151,13,#20149,0,"console.log(sum)")
-#20152=@"loc,{#10000},8,1,8,16"
-locations_default(#20152,#10000,8,1,8,16)
-hasLocation(#20151,#20152)
-enclosing_stmt(#20151,#20149)
-expr_containers(#20151,#20001)
-#20153=*
-exprs(#20153,14,#20151,-1,"console.log")
-#20154=@"loc,{#10000},8,1,8,11"
-locations_default(#20154,#10000,8,1,8,11)
-hasLocation(#20153,#20154)
-enclosing_stmt(#20153,#20149)
-expr_containers(#20153,#20001)
-#20155=*
-exprs(#20155,79,#20153,0,"console")
-hasLocation(#20155,#20092)
-enclosing_stmt(#20155,#20149)
-expr_containers(#20155,#20001)
-literals("console","console",#20155)
-#20156=@"var;{console};{#20000}"
-variables(#20156,"console",#20000)
-bind(#20155,#20156)
-#20157=*
-exprs(#20157,0,#20153,1,"log")
-hasLocation(#20157,#20096)
-enclosing_stmt(#20157,#20149)
-expr_containers(#20157,#20001)
-literals("log","log",#20157)
+exprs(#20149,79,#20146,1,"item")
+hasLocation(#20149,#20087)
+enclosing_stmt(#20149,#20144)
+expr_containers(#20149,#20001)
+literals("item","item",#20149)
+bind(#20149,#20110)
+#20150=*
+stmts(#20150,2,#20001,3,"console.log(sum);")
+#20151=@"loc,{#10000},8,1,8,17"
+locations_default(#20151,#10000,8,1,8,17)
+hasLocation(#20150,#20151)
+stmt_containers(#20150,#20001)
+#20152=*
+exprs(#20152,13,#20150,0,"console.log(sum)")
+#20153=@"loc,{#10000},8,1,8,16"
+locations_default(#20153,#10000,8,1,8,16)
+hasLocation(#20152,#20153)
+enclosing_stmt(#20152,#20150)
+expr_containers(#20152,#20001)
+#20154=*
+exprs(#20154,14,#20152,-1,"console.log")
+#20155=@"loc,{#10000},8,1,8,11"
+locations_default(#20155,#10000,8,1,8,11)
+hasLocation(#20154,#20155)
+enclosing_stmt(#20154,#20150)
+expr_containers(#20154,#20001)
+#20156=*
+exprs(#20156,79,#20154,0,"console")
+hasLocation(#20156,#20092)
+enclosing_stmt(#20156,#20150)
+expr_containers(#20156,#20001)
+literals("console","console",#20156)
+#20157=@"var;{console};{#20000}"
+variables(#20157,"console",#20000)
+bind(#20156,#20157)
 #20158=*
-exprs(#20158,79,#20151,0,"sum")
-hasLocation(#20158,#20100)
-enclosing_stmt(#20158,#20149)
+exprs(#20158,0,#20154,1,"log")
+hasLocation(#20158,#20096)
+enclosing_stmt(#20158,#20150)
 expr_containers(#20158,#20001)
-literals("sum","sum",#20158)
-bind(#20158,#20108)
+literals("log","log",#20158)
 #20159=*
-entry_cfg_node(#20159,#20001)
-#20160=@"loc,{#10000},1,1,1,0"
-locations_default(#20160,#10000,1,1,1,0)
-hasLocation(#20159,#20160)
-#20161=*
-exit_cfg_node(#20161,#20001)
-hasLocation(#20161,#20106)
-successor(#20149,#20155)
-successor(#20158,#20151)
-successor(#20157,#20153)
-successor(#20155,#20157)
-successor(#20153,#20158)
-successor(#20151,#20161)
-successor(#20136,#20134)
-successor(#20134,#20137)
-successor(#20134,#20149)
-successor(#20143,#20147)
-successor(#20148,#20145)
-successor(#20147,#20148)
-successor(#20145,#20134)
-successor(#20141,#20143)
-successor(#20137,#20140)
-successor(#20140,#20139)
-successor(#20139,#20141)
-successor(#20116,#20119)
-successor(#20120,#20124)
-successor(#20133,#20130)
-successor(#20132,#20133)
-successor(#20130,#20117)
-successor(#20129,#20126)
-successor(#20128,#20129)
-successor(#20126,#20132)
-successor(#20125,#20122)
-successor(#20124,#20125)
-successor(#20122,#20128)
-successor(#20119,#20120)
-successor(#20117,#20136)
-successor(#20111,#20114)
-successor(#20115,#20112)
-successor(#20114,#20115)
-successor(#20112,#20116)
-successor(#20159,#20111)
+exprs(#20159,79,#20152,0,"sum")
+hasLocation(#20159,#20100)
+enclosing_stmt(#20159,#20150)
+expr_containers(#20159,#20001)
+literals("sum","sum",#20159)
+bind(#20159,#20108)
+#20160=*
+entry_cfg_node(#20160,#20001)
+#20161=@"loc,{#10000},1,1,1,0"
+locations_default(#20161,#10000,1,1,1,0)
+hasLocation(#20160,#20161)
+#20162=*
+exit_cfg_node(#20162,#20001)
+hasLocation(#20162,#20106)
+successor(#20150,#20156)
+successor(#20159,#20152)
+successor(#20158,#20154)
+successor(#20156,#20158)
+successor(#20154,#20159)
+successor(#20152,#20162)
+successor(#20137,#20135)
+successor(#20135,#20138)
+successor(#20135,#20150)
+successor(#20144,#20148)
+successor(#20149,#20146)
+successor(#20148,#20149)
+successor(#20146,#20135)
+successor(#20142,#20144)
+successor(#20138,#20141)
+successor(#20141,#20140)
+successor(#20140,#20142)
+successor(#20117,#20120)
+successor(#20121,#20125)
+successor(#20134,#20131)
+successor(#20133,#20134)
+successor(#20131,#20118)
+successor(#20130,#20127)
+successor(#20129,#20130)
+successor(#20127,#20133)
+successor(#20126,#20123)
+successor(#20125,#20126)
+successor(#20123,#20129)
+successor(#20120,#20121)
+successor(#20118,#20137)
+successor(#20112,#20115)
+successor(#20116,#20113)
+successor(#20115,#20116)
+successor(#20113,#20117)
+successor(#20160,#20112)
 numlines(#10000,8,6,1)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/mozilla/output/trap/generator_expressions.js.trap b/javascript/extractor/tests/mozilla/output/trap/generator_expressions.js.trap
index e1abfa519c7..1d89063d3dd 100644
--- a/javascript/extractor/tests/mozilla/output/trap/generator_expressions.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/generator_expressions.js.trap
@@ -480,498 +480,500 @@ toplevels(#20001,0)
 #20186=@"loc,{#10000},1,1,7,0"
 locations_default(#20186,#10000,1,1,7,0)
 hasLocation(#20001,#20186)
-#20187=*
-stmts(#20187,2,#20001,0,"(for (y ...  year);")
-hasLocation(#20187,#20003)
-stmt_containers(#20187,#20001)
+#20187=@"var;{this};{#20000}"
+variables(#20187,"this",#20000)
 #20188=*
-exprs(#20188,74,#20187,0,"(for (y ... ) year)")
-#20189=@"loc,{#10000},1,1,1,43"
-locations_default(#20189,#10000,1,1,1,43)
-hasLocation(#20188,#20189)
-enclosing_stmt(#20188,#20187)
-expr_containers(#20188,#20001)
-#20190=*
-exprs(#20190,76,#20188,1,"for (year of years)")
-#20191=@"loc,{#10000},1,2,1,20"
-locations_default(#20191,#10000,1,2,1,20)
-hasLocation(#20190,#20191)
-enclosing_stmt(#20190,#20187)
-expr_containers(#20190,#20001)
-#20192=*
-scopes(#20192,7)
-scopenodes(#20190,#20192)
-scopenesting(#20192,#20000)
-#20193=@"var;{year};{#20192}"
-variables(#20193,"year",#20192)
-#20194=*
-exprs(#20194,78,#20190,0,"year")
-hasLocation(#20194,#20021)
-enclosing_stmt(#20194,#20187)
-expr_containers(#20194,#20001)
-literals("year","year",#20194)
-decl(#20194,#20193)
+stmts(#20188,2,#20001,0,"(for (y ...  year);")
+hasLocation(#20188,#20003)
+stmt_containers(#20188,#20001)
+#20189=*
+exprs(#20189,74,#20188,0,"(for (y ... ) year)")
+#20190=@"loc,{#10000},1,1,1,43"
+locations_default(#20190,#10000,1,1,1,43)
+hasLocation(#20189,#20190)
+enclosing_stmt(#20189,#20188)
+expr_containers(#20189,#20001)
+#20191=*
+exprs(#20191,76,#20189,1,"for (year of years)")
+#20192=@"loc,{#10000},1,2,1,20"
+locations_default(#20192,#10000,1,2,1,20)
+hasLocation(#20191,#20192)
+enclosing_stmt(#20191,#20188)
+expr_containers(#20191,#20001)
+#20193=*
+scopes(#20193,7)
+scopenodes(#20191,#20193)
+scopenesting(#20193,#20000)
+#20194=@"var;{year};{#20193}"
+variables(#20194,"year",#20193)
 #20195=*
-exprs(#20195,79,#20190,1,"years")
-hasLocation(#20195,#20025)
-enclosing_stmt(#20195,#20187)
+exprs(#20195,78,#20191,0,"year")
+hasLocation(#20195,#20021)
+enclosing_stmt(#20195,#20188)
 expr_containers(#20195,#20001)
-literals("years","years",#20195)
-#20196=@"var;{years};{#20000}"
-variables(#20196,"years",#20000)
-bind(#20195,#20196)
-#20197=*
-exprs(#20197,29,#20188,-1,"year > 2000")
-#20198=@"loc,{#10000},1,26,1,36"
-locations_default(#20198,#10000,1,26,1,36)
-hasLocation(#20197,#20198)
-enclosing_stmt(#20197,#20187)
-expr_containers(#20197,#20001)
-#20199=*
-exprs(#20199,79,#20197,0,"year")
-hasLocation(#20199,#20033)
-enclosing_stmt(#20199,#20187)
-expr_containers(#20199,#20001)
-literals("year","year",#20199)
-bind(#20199,#20193)
+literals("year","year",#20195)
+decl(#20195,#20194)
+#20196=*
+exprs(#20196,79,#20191,1,"years")
+hasLocation(#20196,#20025)
+enclosing_stmt(#20196,#20188)
+expr_containers(#20196,#20001)
+literals("years","years",#20196)
+#20197=@"var;{years};{#20000}"
+variables(#20197,"years",#20000)
+bind(#20196,#20197)
+#20198=*
+exprs(#20198,29,#20189,-1,"year > 2000")
+#20199=@"loc,{#10000},1,26,1,36"
+locations_default(#20199,#10000,1,26,1,36)
+hasLocation(#20198,#20199)
+enclosing_stmt(#20198,#20188)
+expr_containers(#20198,#20001)
 #20200=*
-exprs(#20200,3,#20197,1,"2000")
-hasLocation(#20200,#20037)
-enclosing_stmt(#20200,#20187)
+exprs(#20200,79,#20198,0,"year")
+hasLocation(#20200,#20033)
+enclosing_stmt(#20200,#20188)
 expr_containers(#20200,#20001)
-literals("2000","2000",#20200)
+literals("year","year",#20200)
+bind(#20200,#20194)
 #20201=*
-exprs(#20201,79,#20188,0,"year")
-hasLocation(#20201,#20041)
-enclosing_stmt(#20201,#20187)
+exprs(#20201,3,#20198,1,"2000")
+hasLocation(#20201,#20037)
+enclosing_stmt(#20201,#20188)
 expr_containers(#20201,#20001)
-literals("year","year",#20201)
-bind(#20201,#20193)
+literals("2000","2000",#20201)
 #20202=*
-stmts(#20202,2,#20001,1,"year;")
-hasLocation(#20202,#20005)
-stmt_containers(#20202,#20001)
+exprs(#20202,79,#20189,0,"year")
+hasLocation(#20202,#20041)
+enclosing_stmt(#20202,#20188)
+expr_containers(#20202,#20001)
+literals("year","year",#20202)
+bind(#20202,#20194)
 #20203=*
-exprs(#20203,79,#20202,0,"year")
-hasLocation(#20203,#20047)
-enclosing_stmt(#20203,#20202)
-expr_containers(#20203,#20001)
-literals("year","year",#20203)
-#20204=@"var;{year};{#20000}"
-variables(#20204,"year",#20000)
-bind(#20203,#20204)
-#20205=*
-stmts(#20205,2,#20001,2,"(for (i ... ) i+j);")
-hasLocation(#20205,#20007)
-stmt_containers(#20205,#20001)
+stmts(#20203,2,#20001,1,"year;")
+hasLocation(#20203,#20005)
+stmt_containers(#20203,#20001)
+#20204=*
+exprs(#20204,79,#20203,0,"year")
+hasLocation(#20204,#20047)
+enclosing_stmt(#20204,#20203)
+expr_containers(#20204,#20001)
+literals("year","year",#20204)
+#20205=@"var;{year};{#20000}"
+variables(#20205,"year",#20000)
+bind(#20204,#20205)
 #20206=*
-exprs(#20206,74,#20205,0,"(for (i ... s) i+j)")
-#20207=@"loc,{#10000},3,1,3,43"
-locations_default(#20207,#10000,3,1,3,43)
-hasLocation(#20206,#20207)
-enclosing_stmt(#20206,#20205)
-expr_containers(#20206,#20001)
-#20208=*
-exprs(#20208,76,#20206,1,"for (i of numbers)")
-#20209=@"loc,{#10000},3,2,3,19"
-locations_default(#20209,#10000,3,2,3,19)
-hasLocation(#20208,#20209)
-enclosing_stmt(#20208,#20205)
-expr_containers(#20208,#20001)
-#20210=*
-scopes(#20210,7)
-scopenodes(#20208,#20210)
-scopenesting(#20210,#20000)
-#20211=@"var;{i};{#20210}"
-variables(#20211,"i",#20210)
-#20212=*
-exprs(#20212,78,#20208,0,"i")
-hasLocation(#20212,#20057)
-enclosing_stmt(#20212,#20205)
-expr_containers(#20212,#20001)
-literals("i","i",#20212)
-decl(#20212,#20211)
+stmts(#20206,2,#20001,2,"(for (i ... ) i+j);")
+hasLocation(#20206,#20007)
+stmt_containers(#20206,#20001)
+#20207=*
+exprs(#20207,74,#20206,0,"(for (i ... s) i+j)")
+#20208=@"loc,{#10000},3,1,3,43"
+locations_default(#20208,#10000,3,1,3,43)
+hasLocation(#20207,#20208)
+enclosing_stmt(#20207,#20206)
+expr_containers(#20207,#20001)
+#20209=*
+exprs(#20209,76,#20207,1,"for (i of numbers)")
+#20210=@"loc,{#10000},3,2,3,19"
+locations_default(#20210,#10000,3,2,3,19)
+hasLocation(#20209,#20210)
+enclosing_stmt(#20209,#20206)
+expr_containers(#20209,#20001)
+#20211=*
+scopes(#20211,7)
+scopenodes(#20209,#20211)
+scopenesting(#20211,#20000)
+#20212=@"var;{i};{#20211}"
+variables(#20212,"i",#20211)
 #20213=*
-exprs(#20213,79,#20208,1,"numbers")
-hasLocation(#20213,#20061)
-enclosing_stmt(#20213,#20205)
+exprs(#20213,78,#20209,0,"i")
+hasLocation(#20213,#20057)
+enclosing_stmt(#20213,#20206)
 expr_containers(#20213,#20001)
-literals("numbers","numbers",#20213)
-#20214=@"var;{numbers};{#20000}"
-variables(#20214,"numbers",#20000)
-bind(#20213,#20214)
-#20215=*
-exprs(#20215,76,#20206,2,"for (j of letters)")
-#20216=@"loc,{#10000},3,21,3,38"
-locations_default(#20216,#10000,3,21,3,38)
-hasLocation(#20215,#20216)
-enclosing_stmt(#20215,#20205)
-expr_containers(#20215,#20001)
-#20217=*
-scopes(#20217,7)
-scopenodes(#20215,#20217)
-scopenesting(#20217,#20210)
-#20218=@"var;{j};{#20217}"
-variables(#20218,"j",#20217)
-#20219=*
-exprs(#20219,78,#20215,0,"j")
-hasLocation(#20219,#20069)
-enclosing_stmt(#20219,#20205)
-expr_containers(#20219,#20001)
-literals("j","j",#20219)
-decl(#20219,#20218)
+literals("i","i",#20213)
+decl(#20213,#20212)
+#20214=*
+exprs(#20214,79,#20209,1,"numbers")
+hasLocation(#20214,#20061)
+enclosing_stmt(#20214,#20206)
+expr_containers(#20214,#20001)
+literals("numbers","numbers",#20214)
+#20215=@"var;{numbers};{#20000}"
+variables(#20215,"numbers",#20000)
+bind(#20214,#20215)
+#20216=*
+exprs(#20216,76,#20207,2,"for (j of letters)")
+#20217=@"loc,{#10000},3,21,3,38"
+locations_default(#20217,#10000,3,21,3,38)
+hasLocation(#20216,#20217)
+enclosing_stmt(#20216,#20206)
+expr_containers(#20216,#20001)
+#20218=*
+scopes(#20218,7)
+scopenodes(#20216,#20218)
+scopenesting(#20218,#20211)
+#20219=@"var;{j};{#20218}"
+variables(#20219,"j",#20218)
 #20220=*
-exprs(#20220,79,#20215,1,"letters")
-hasLocation(#20220,#20073)
-enclosing_stmt(#20220,#20205)
+exprs(#20220,78,#20216,0,"j")
+hasLocation(#20220,#20069)
+enclosing_stmt(#20220,#20206)
 expr_containers(#20220,#20001)
-literals("letters","letters",#20220)
-#20221=@"var;{letters};{#20000}"
-variables(#20221,"letters",#20000)
-bind(#20220,#20221)
-#20222=*
-exprs(#20222,34,#20206,0,"i+j")
-#20223=@"loc,{#10000},3,40,3,42"
-locations_default(#20223,#10000,3,40,3,42)
-hasLocation(#20222,#20223)
-enclosing_stmt(#20222,#20205)
-expr_containers(#20222,#20001)
-#20224=*
-exprs(#20224,79,#20222,0,"i")
-hasLocation(#20224,#20077)
-enclosing_stmt(#20224,#20205)
-expr_containers(#20224,#20001)
-literals("i","i",#20224)
-bind(#20224,#20211)
+literals("j","j",#20220)
+decl(#20220,#20219)
+#20221=*
+exprs(#20221,79,#20216,1,"letters")
+hasLocation(#20221,#20073)
+enclosing_stmt(#20221,#20206)
+expr_containers(#20221,#20001)
+literals("letters","letters",#20221)
+#20222=@"var;{letters};{#20000}"
+variables(#20222,"letters",#20000)
+bind(#20221,#20222)
+#20223=*
+exprs(#20223,34,#20207,0,"i+j")
+#20224=@"loc,{#10000},3,40,3,42"
+locations_default(#20224,#10000,3,40,3,42)
+hasLocation(#20223,#20224)
+enclosing_stmt(#20223,#20206)
+expr_containers(#20223,#20001)
 #20225=*
-exprs(#20225,79,#20222,1,"j")
-hasLocation(#20225,#20081)
-enclosing_stmt(#20225,#20205)
+exprs(#20225,79,#20223,0,"i")
+hasLocation(#20225,#20077)
+enclosing_stmt(#20225,#20206)
 expr_containers(#20225,#20001)
-literals("j","j",#20225)
-bind(#20225,#20218)
+literals("i","i",#20225)
+bind(#20225,#20212)
 #20226=*
-stmts(#20226,2,#20001,3,"(for (i ... ) i+j);")
-hasLocation(#20226,#20009)
-stmt_containers(#20226,#20001)
+exprs(#20226,79,#20223,1,"j")
+hasLocation(#20226,#20081)
+enclosing_stmt(#20226,#20206)
+expr_containers(#20226,#20001)
+literals("j","j",#20226)
+bind(#20226,#20219)
 #20227=*
-exprs(#20227,74,#20226,0,"(for (i ... j) i+j)")
-#20228=@"loc,{#10000},4,1,4,52"
-locations_default(#20228,#10000,4,1,4,52)
-hasLocation(#20227,#20228)
-enclosing_stmt(#20227,#20226)
-expr_containers(#20227,#20001)
-#20229=*
-exprs(#20229,76,#20227,1,"for (i of numbers)")
-#20230=@"loc,{#10000},4,2,4,19"
-locations_default(#20230,#10000,4,2,4,19)
-hasLocation(#20229,#20230)
-enclosing_stmt(#20229,#20226)
-expr_containers(#20229,#20001)
-#20231=*
-scopes(#20231,7)
-scopenodes(#20229,#20231)
-scopenesting(#20231,#20000)
-#20232=@"var;{i};{#20231}"
-variables(#20232,"i",#20231)
-#20233=*
-exprs(#20233,78,#20229,0,"i")
-hasLocation(#20233,#20093)
-enclosing_stmt(#20233,#20226)
-expr_containers(#20233,#20001)
-literals("i","i",#20233)
-decl(#20233,#20232)
+stmts(#20227,2,#20001,3,"(for (i ... ) i+j);")
+hasLocation(#20227,#20009)
+stmt_containers(#20227,#20001)
+#20228=*
+exprs(#20228,74,#20227,0,"(for (i ... j) i+j)")
+#20229=@"loc,{#10000},4,1,4,52"
+locations_default(#20229,#10000,4,1,4,52)
+hasLocation(#20228,#20229)
+enclosing_stmt(#20228,#20227)
+expr_containers(#20228,#20001)
+#20230=*
+exprs(#20230,76,#20228,1,"for (i of numbers)")
+#20231=@"loc,{#10000},4,2,4,19"
+locations_default(#20231,#10000,4,2,4,19)
+hasLocation(#20230,#20231)
+enclosing_stmt(#20230,#20227)
+expr_containers(#20230,#20001)
+#20232=*
+scopes(#20232,7)
+scopenodes(#20230,#20232)
+scopenesting(#20232,#20000)
+#20233=@"var;{i};{#20232}"
+variables(#20233,"i",#20232)
 #20234=*
-exprs(#20234,79,#20229,1,"numbers")
-hasLocation(#20234,#20097)
-enclosing_stmt(#20234,#20226)
+exprs(#20234,78,#20230,0,"i")
+hasLocation(#20234,#20093)
+enclosing_stmt(#20234,#20227)
 expr_containers(#20234,#20001)
-literals("numbers","numbers",#20234)
-bind(#20234,#20214)
+literals("i","i",#20234)
+decl(#20234,#20233)
 #20235=*
-exprs(#20235,76,#20227,2,"for (j of letters)")
-#20236=@"loc,{#10000},4,21,4,38"
-locations_default(#20236,#10000,4,21,4,38)
-hasLocation(#20235,#20236)
-enclosing_stmt(#20235,#20226)
+exprs(#20235,79,#20230,1,"numbers")
+hasLocation(#20235,#20097)
+enclosing_stmt(#20235,#20227)
 expr_containers(#20235,#20001)
-#20237=*
-scopes(#20237,7)
-scopenodes(#20235,#20237)
-scopenesting(#20237,#20231)
-#20238=@"var;{j};{#20237}"
-variables(#20238,"j",#20237)
-#20239=*
-exprs(#20239,78,#20235,0,"j")
-hasLocation(#20239,#20105)
-enclosing_stmt(#20239,#20226)
-expr_containers(#20239,#20001)
-literals("j","j",#20239)
-decl(#20239,#20238)
+literals("numbers","numbers",#20235)
+bind(#20235,#20215)
+#20236=*
+exprs(#20236,76,#20228,2,"for (j of letters)")
+#20237=@"loc,{#10000},4,21,4,38"
+locations_default(#20237,#10000,4,21,4,38)
+hasLocation(#20236,#20237)
+enclosing_stmt(#20236,#20227)
+expr_containers(#20236,#20001)
+#20238=*
+scopes(#20238,7)
+scopenodes(#20236,#20238)
+scopenesting(#20238,#20232)
+#20239=@"var;{j};{#20238}"
+variables(#20239,"j",#20238)
 #20240=*
-exprs(#20240,79,#20235,1,"letters")
-hasLocation(#20240,#20109)
-enclosing_stmt(#20240,#20226)
+exprs(#20240,78,#20236,0,"j")
+hasLocation(#20240,#20105)
+enclosing_stmt(#20240,#20227)
 expr_containers(#20240,#20001)
-literals("letters","letters",#20240)
-bind(#20240,#20221)
+literals("j","j",#20240)
+decl(#20240,#20239)
 #20241=*
-exprs(#20241,27,#20227,-1,"i<j")
-#20242=@"loc,{#10000},4,44,4,46"
-locations_default(#20242,#10000,4,44,4,46)
-hasLocation(#20241,#20242)
-enclosing_stmt(#20241,#20226)
+exprs(#20241,79,#20236,1,"letters")
+hasLocation(#20241,#20109)
+enclosing_stmt(#20241,#20227)
 expr_containers(#20241,#20001)
-#20243=*
-exprs(#20243,79,#20241,0,"i")
-hasLocation(#20243,#20117)
-enclosing_stmt(#20243,#20226)
-expr_containers(#20243,#20001)
-literals("i","i",#20243)
-bind(#20243,#20232)
+literals("letters","letters",#20241)
+bind(#20241,#20222)
+#20242=*
+exprs(#20242,27,#20228,-1,"i<j")
+#20243=@"loc,{#10000},4,44,4,46"
+locations_default(#20243,#10000,4,44,4,46)
+hasLocation(#20242,#20243)
+enclosing_stmt(#20242,#20227)
+expr_containers(#20242,#20001)
 #20244=*
-exprs(#20244,79,#20241,1,"j")
-hasLocation(#20244,#20121)
-enclosing_stmt(#20244,#20226)
+exprs(#20244,79,#20242,0,"i")
+hasLocation(#20244,#20117)
+enclosing_stmt(#20244,#20227)
 expr_containers(#20244,#20001)
-literals("j","j",#20244)
-bind(#20244,#20238)
+literals("i","i",#20244)
+bind(#20244,#20233)
 #20245=*
-exprs(#20245,34,#20227,0,"i+j")
-#20246=@"loc,{#10000},4,49,4,51"
-locations_default(#20246,#10000,4,49,4,51)
-hasLocation(#20245,#20246)
-enclosing_stmt(#20245,#20226)
+exprs(#20245,79,#20242,1,"j")
+hasLocation(#20245,#20121)
+enclosing_stmt(#20245,#20227)
 expr_containers(#20245,#20001)
-#20247=*
-exprs(#20247,79,#20245,0,"i")
-hasLocation(#20247,#20125)
-enclosing_stmt(#20247,#20226)
-expr_containers(#20247,#20001)
-literals("i","i",#20247)
-bind(#20247,#20232)
+literals("j","j",#20245)
+bind(#20245,#20239)
+#20246=*
+exprs(#20246,34,#20228,0,"i+j")
+#20247=@"loc,{#10000},4,49,4,51"
+locations_default(#20247,#10000,4,49,4,51)
+hasLocation(#20246,#20247)
+enclosing_stmt(#20246,#20227)
+expr_containers(#20246,#20001)
 #20248=*
-exprs(#20248,79,#20245,1,"j")
-hasLocation(#20248,#20129)
-enclosing_stmt(#20248,#20226)
+exprs(#20248,79,#20246,0,"i")
+hasLocation(#20248,#20125)
+enclosing_stmt(#20248,#20227)
 expr_containers(#20248,#20001)
-literals("j","j",#20248)
-bind(#20248,#20238)
+literals("i","i",#20248)
+bind(#20248,#20233)
 #20249=*
-stmts(#20249,2,#20001,4,"(x.p for (x in xs));")
-hasLocation(#20249,#20011)
-stmt_containers(#20249,#20001)
+exprs(#20249,79,#20246,1,"j")
+hasLocation(#20249,#20129)
+enclosing_stmt(#20249,#20227)
+expr_containers(#20249,#20001)
+literals("j","j",#20249)
+bind(#20249,#20239)
 #20250=*
-exprs(#20250,74,#20249,0,"(x.p for (x in xs))")
-#20251=@"loc,{#10000},5,1,5,19"
-locations_default(#20251,#10000,5,1,5,19)
-hasLocation(#20250,#20251)
-enclosing_stmt(#20250,#20249)
-expr_containers(#20250,#20001)
-#20252=*
-exprs(#20252,75,#20250,1,"for (x in xs)")
-#20253=@"loc,{#10000},5,6,5,18"
-locations_default(#20253,#10000,5,6,5,18)
-hasLocation(#20252,#20253)
-enclosing_stmt(#20252,#20249)
-expr_containers(#20252,#20001)
-#20254=*
-scopes(#20254,7)
-scopenodes(#20252,#20254)
-scopenesting(#20254,#20000)
-#20255=@"var;{x};{#20254}"
-variables(#20255,"x",#20254)
-#20256=*
-exprs(#20256,78,#20252,0,"x")
-hasLocation(#20256,#20147)
-enclosing_stmt(#20256,#20249)
-expr_containers(#20256,#20001)
-literals("x","x",#20256)
-decl(#20256,#20255)
+stmts(#20250,2,#20001,4,"(x.p for (x in xs));")
+hasLocation(#20250,#20011)
+stmt_containers(#20250,#20001)
+#20251=*
+exprs(#20251,74,#20250,0,"(x.p for (x in xs))")
+#20252=@"loc,{#10000},5,1,5,19"
+locations_default(#20252,#10000,5,1,5,19)
+hasLocation(#20251,#20252)
+enclosing_stmt(#20251,#20250)
+expr_containers(#20251,#20001)
+#20253=*
+exprs(#20253,75,#20251,1,"for (x in xs)")
+#20254=@"loc,{#10000},5,6,5,18"
+locations_default(#20254,#10000,5,6,5,18)
+hasLocation(#20253,#20254)
+enclosing_stmt(#20253,#20250)
+expr_containers(#20253,#20001)
+#20255=*
+scopes(#20255,7)
+scopenodes(#20253,#20255)
+scopenesting(#20255,#20000)
+#20256=@"var;{x};{#20255}"
+variables(#20256,"x",#20255)
 #20257=*
-exprs(#20257,79,#20252,1,"xs")
-hasLocation(#20257,#20151)
-enclosing_stmt(#20257,#20249)
+exprs(#20257,78,#20253,0,"x")
+hasLocation(#20257,#20147)
+enclosing_stmt(#20257,#20250)
 expr_containers(#20257,#20001)
-literals("xs","xs",#20257)
-#20258=@"var;{xs};{#20000}"
-variables(#20258,"xs",#20000)
-bind(#20257,#20258)
-#20259=*
-exprs(#20259,14,#20250,0,"x.p")
-#20260=@"loc,{#10000},5,2,5,4"
-locations_default(#20260,#10000,5,2,5,4)
-hasLocation(#20259,#20260)
-enclosing_stmt(#20259,#20249)
-expr_containers(#20259,#20001)
-#20261=*
-exprs(#20261,79,#20259,0,"x")
-hasLocation(#20261,#20137)
-enclosing_stmt(#20261,#20249)
-expr_containers(#20261,#20001)
-literals("x","x",#20261)
-bind(#20261,#20255)
+literals("x","x",#20257)
+decl(#20257,#20256)
+#20258=*
+exprs(#20258,79,#20253,1,"xs")
+hasLocation(#20258,#20151)
+enclosing_stmt(#20258,#20250)
+expr_containers(#20258,#20001)
+literals("xs","xs",#20258)
+#20259=@"var;{xs};{#20000}"
+variables(#20259,"xs",#20000)
+bind(#20258,#20259)
+#20260=*
+exprs(#20260,14,#20251,0,"x.p")
+#20261=@"loc,{#10000},5,2,5,4"
+locations_default(#20261,#10000,5,2,5,4)
+hasLocation(#20260,#20261)
+enclosing_stmt(#20260,#20250)
+expr_containers(#20260,#20001)
 #20262=*
-exprs(#20262,0,#20259,1,"p")
-hasLocation(#20262,#20141)
-enclosing_stmt(#20262,#20249)
+exprs(#20262,79,#20260,0,"x")
+hasLocation(#20262,#20137)
+enclosing_stmt(#20262,#20250)
 expr_containers(#20262,#20001)
-literals("p","p",#20262)
+literals("x","x",#20262)
+bind(#20262,#20256)
 #20263=*
-stmts(#20263,2,#20001,5,"(x.p fo ... n xs));")
-hasLocation(#20263,#20013)
-stmt_containers(#20263,#20001)
+exprs(#20263,0,#20260,1,"p")
+hasLocation(#20263,#20141)
+enclosing_stmt(#20263,#20250)
+expr_containers(#20263,#20001)
+literals("p","p",#20263)
 #20264=*
-exprs(#20264,74,#20263,0,"(x.p fo ... in xs))")
-#20265=@"loc,{#10000},6,1,6,24"
-locations_default(#20265,#10000,6,1,6,24)
-hasLocation(#20264,#20265)
-enclosing_stmt(#20264,#20263)
-expr_containers(#20264,#20001)
-#20266=*
-exprs(#20266,76,#20264,1,"for each (x in xs)")
-#20267=@"loc,{#10000},6,6,6,23"
-locations_default(#20267,#10000,6,6,6,23)
-hasLocation(#20266,#20267)
-enclosing_stmt(#20266,#20263)
-expr_containers(#20266,#20001)
-#20268=*
-scopes(#20268,7)
-scopenodes(#20266,#20268)
-scopenesting(#20268,#20000)
-#20269=@"var;{x};{#20268}"
-variables(#20269,"x",#20268)
-#20270=*
-exprs(#20270,78,#20266,0,"x")
-hasLocation(#20270,#20173)
-enclosing_stmt(#20270,#20263)
-expr_containers(#20270,#20001)
-literals("x","x",#20270)
-decl(#20270,#20269)
+stmts(#20264,2,#20001,5,"(x.p fo ... n xs));")
+hasLocation(#20264,#20013)
+stmt_containers(#20264,#20001)
+#20265=*
+exprs(#20265,74,#20264,0,"(x.p fo ... in xs))")
+#20266=@"loc,{#10000},6,1,6,24"
+locations_default(#20266,#10000,6,1,6,24)
+hasLocation(#20265,#20266)
+enclosing_stmt(#20265,#20264)
+expr_containers(#20265,#20001)
+#20267=*
+exprs(#20267,76,#20265,1,"for each (x in xs)")
+#20268=@"loc,{#10000},6,6,6,23"
+locations_default(#20268,#10000,6,6,6,23)
+hasLocation(#20267,#20268)
+enclosing_stmt(#20267,#20264)
+expr_containers(#20267,#20001)
+#20269=*
+scopes(#20269,7)
+scopenodes(#20267,#20269)
+scopenesting(#20269,#20000)
+#20270=@"var;{x};{#20269}"
+variables(#20270,"x",#20269)
 #20271=*
-exprs(#20271,79,#20266,1,"xs")
-hasLocation(#20271,#20177)
-enclosing_stmt(#20271,#20263)
+exprs(#20271,78,#20267,0,"x")
+hasLocation(#20271,#20173)
+enclosing_stmt(#20271,#20264)
 expr_containers(#20271,#20001)
-literals("xs","xs",#20271)
-bind(#20271,#20258)
+literals("x","x",#20271)
+decl(#20271,#20270)
 #20272=*
-exprs(#20272,14,#20264,0,"x.p")
-#20273=@"loc,{#10000},6,2,6,4"
-locations_default(#20273,#10000,6,2,6,4)
-hasLocation(#20272,#20273)
-enclosing_stmt(#20272,#20263)
+exprs(#20272,79,#20267,1,"xs")
+hasLocation(#20272,#20177)
+enclosing_stmt(#20272,#20264)
 expr_containers(#20272,#20001)
-#20274=*
-exprs(#20274,79,#20272,0,"x")
-hasLocation(#20274,#20161)
-enclosing_stmt(#20274,#20263)
-expr_containers(#20274,#20001)
-literals("x","x",#20274)
-bind(#20274,#20269)
+literals("xs","xs",#20272)
+bind(#20272,#20259)
+#20273=*
+exprs(#20273,14,#20265,0,"x.p")
+#20274=@"loc,{#10000},6,2,6,4"
+locations_default(#20274,#10000,6,2,6,4)
+hasLocation(#20273,#20274)
+enclosing_stmt(#20273,#20264)
+expr_containers(#20273,#20001)
 #20275=*
-exprs(#20275,0,#20272,1,"p")
-hasLocation(#20275,#20165)
-enclosing_stmt(#20275,#20263)
+exprs(#20275,79,#20273,0,"x")
+hasLocation(#20275,#20161)
+enclosing_stmt(#20275,#20264)
 expr_containers(#20275,#20001)
-literals("p","p",#20275)
+literals("x","x",#20275)
+bind(#20275,#20270)
 #20276=*
-entry_cfg_node(#20276,#20001)
-#20277=@"loc,{#10000},1,1,1,0"
-locations_default(#20277,#10000,1,1,1,0)
-hasLocation(#20276,#20277)
-#20278=*
-exit_cfg_node(#20278,#20001)
-hasLocation(#20278,#20185)
-successor(#20263,#20264)
-successor(#20266,#20271)
-successor(#20271,#20270)
-successor(#20271,#20278)
-successor(#20275,#20272)
-successor(#20274,#20275)
-successor(#20272,#20270)
-successor(#20272,#20278)
-successor(#20270,#20274)
-successor(#20264,#20266)
-successor(#20249,#20250)
-successor(#20252,#20257)
-successor(#20257,#20256)
-successor(#20257,#20263)
-successor(#20262,#20259)
-successor(#20261,#20262)
-successor(#20259,#20256)
-successor(#20259,#20263)
-successor(#20256,#20261)
-successor(#20250,#20252)
-successor(#20226,#20227)
-successor(#20229,#20234)
-successor(#20234,#20233)
-successor(#20234,#20249)
-successor(#20235,#20240)
-successor(#20240,#20239)
-successor(#20240,#20233)
-successor(#20240,#20249)
-successor(#20248,#20245)
-successor(#20247,#20248)
-successor(#20245,#20239)
-successor(#20245,#20233)
-successor(#20245,#20249)
-successor(#20244,#20241)
-successor(#20243,#20244)
+exprs(#20276,0,#20273,1,"p")
+hasLocation(#20276,#20165)
+enclosing_stmt(#20276,#20264)
+expr_containers(#20276,#20001)
+literals("p","p",#20276)
+#20277=*
+entry_cfg_node(#20277,#20001)
+#20278=@"loc,{#10000},1,1,1,0"
+locations_default(#20278,#10000,1,1,1,0)
+hasLocation(#20277,#20278)
 #20279=*
-guard_node(#20279,1,#20241)
-hasLocation(#20279,#20242)
-successor(#20279,#20247)
+exit_cfg_node(#20279,#20001)
+hasLocation(#20279,#20185)
+successor(#20264,#20265)
+successor(#20267,#20272)
+successor(#20272,#20271)
+successor(#20272,#20279)
+successor(#20276,#20273)
+successor(#20275,#20276)
+successor(#20273,#20271)
+successor(#20273,#20279)
+successor(#20271,#20275)
+successor(#20265,#20267)
+successor(#20250,#20251)
+successor(#20253,#20258)
+successor(#20258,#20257)
+successor(#20258,#20264)
+successor(#20263,#20260)
+successor(#20262,#20263)
+successor(#20260,#20257)
+successor(#20260,#20264)
+successor(#20257,#20262)
+successor(#20251,#20253)
+successor(#20227,#20228)
+successor(#20230,#20235)
+successor(#20235,#20234)
+successor(#20235,#20250)
+successor(#20236,#20241)
+successor(#20241,#20240)
+successor(#20241,#20234)
+successor(#20241,#20250)
+successor(#20249,#20246)
+successor(#20248,#20249)
+successor(#20246,#20240)
+successor(#20246,#20234)
+successor(#20246,#20250)
+successor(#20245,#20242)
+successor(#20244,#20245)
 #20280=*
-guard_node(#20280,0,#20241)
-hasLocation(#20280,#20242)
-successor(#20280,#20239)
-successor(#20280,#20233)
-successor(#20280,#20249)
-successor(#20241,#20279)
-successor(#20241,#20280)
-successor(#20239,#20243)
-successor(#20233,#20235)
-successor(#20227,#20229)
-successor(#20205,#20206)
-successor(#20208,#20213)
-successor(#20213,#20212)
-successor(#20213,#20226)
-successor(#20215,#20220)
-successor(#20220,#20219)
-successor(#20220,#20212)
-successor(#20220,#20226)
-successor(#20225,#20222)
-successor(#20224,#20225)
-successor(#20222,#20219)
-successor(#20222,#20212)
-successor(#20222,#20226)
-successor(#20219,#20224)
-successor(#20212,#20215)
-successor(#20206,#20208)
-successor(#20202,#20203)
-successor(#20203,#20205)
-successor(#20187,#20188)
-successor(#20190,#20195)
-successor(#20195,#20194)
-successor(#20195,#20202)
-successor(#20201,#20194)
-successor(#20201,#20202)
-successor(#20200,#20197)
-successor(#20199,#20200)
+guard_node(#20280,1,#20242)
+hasLocation(#20280,#20243)
+successor(#20280,#20248)
 #20281=*
-guard_node(#20281,1,#20197)
-hasLocation(#20281,#20198)
-successor(#20281,#20201)
+guard_node(#20281,0,#20242)
+hasLocation(#20281,#20243)
+successor(#20281,#20240)
+successor(#20281,#20234)
+successor(#20281,#20250)
+successor(#20242,#20280)
+successor(#20242,#20281)
+successor(#20240,#20244)
+successor(#20234,#20236)
+successor(#20228,#20230)
+successor(#20206,#20207)
+successor(#20209,#20214)
+successor(#20214,#20213)
+successor(#20214,#20227)
+successor(#20216,#20221)
+successor(#20221,#20220)
+successor(#20221,#20213)
+successor(#20221,#20227)
+successor(#20226,#20223)
+successor(#20225,#20226)
+successor(#20223,#20220)
+successor(#20223,#20213)
+successor(#20223,#20227)
+successor(#20220,#20225)
+successor(#20213,#20216)
+successor(#20207,#20209)
+successor(#20203,#20204)
+successor(#20204,#20206)
+successor(#20188,#20189)
+successor(#20191,#20196)
+successor(#20196,#20195)
+successor(#20196,#20203)
+successor(#20202,#20195)
+successor(#20202,#20203)
+successor(#20201,#20198)
+successor(#20200,#20201)
 #20282=*
-guard_node(#20282,0,#20197)
-hasLocation(#20282,#20198)
-successor(#20282,#20194)
+guard_node(#20282,1,#20198)
+hasLocation(#20282,#20199)
 successor(#20282,#20202)
-successor(#20197,#20281)
-successor(#20197,#20282)
-successor(#20194,#20199)
-successor(#20188,#20190)
-successor(#20276,#20187)
+#20283=*
+guard_node(#20283,0,#20198)
+hasLocation(#20283,#20199)
+successor(#20283,#20195)
+successor(#20283,#20203)
+successor(#20198,#20282)
+successor(#20198,#20283)
+successor(#20195,#20200)
+successor(#20189,#20191)
+successor(#20277,#20188)
 numlines(#10000,6,6,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/mozilla/output/trap/guardedCatch.js.trap b/javascript/extractor/tests/mozilla/output/trap/guardedCatch.js.trap
index c4ff04cd290..fc757570b1b 100644
--- a/javascript/extractor/tests/mozilla/output/trap/guardedCatch.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/guardedCatch.js.trap
@@ -299,281 +299,285 @@ locations_default(#20109,#10000,1,1,9,1)
 hasLocation(#20001,#20109)
 #20110=@"var;{f};{#20000}"
 variables(#20110,"f",#20000)
-#20111=*
-stmts(#20111,17,#20001,0,"functio ... );\n\t}\n}")
-hasLocation(#20111,#20109)
-stmt_containers(#20111,#20001)
+#20111=@"var;{this};{#20000}"
+variables(#20111,"this",#20000)
 #20112=*
-exprs(#20112,78,#20111,-1,"f")
-hasLocation(#20112,#20023)
-expr_containers(#20112,#20111)
-literals("f","f",#20112)
-decl(#20112,#20110)
+stmts(#20112,17,#20001,0,"functio ... );\n\t}\n}")
+hasLocation(#20112,#20109)
+stmt_containers(#20112,#20001)
 #20113=*
-scopes(#20113,1)
-scopenodes(#20111,#20113)
-scopenesting(#20113,#20000)
-#20114=@"var;{g};{#20113}"
-variables(#20114,"g",#20113)
-#20115=*
-exprs(#20115,78,#20111,0,"g")
-hasLocation(#20115,#20027)
-expr_containers(#20115,#20111)
-literals("g","g",#20115)
-decl(#20115,#20114)
-#20116=@"var;{arguments};{#20113}"
-variables(#20116,"arguments",#20113)
-is_arguments_object(#20116)
+exprs(#20113,78,#20112,-1,"f")
+hasLocation(#20113,#20023)
+expr_containers(#20113,#20112)
+literals("f","f",#20113)
+decl(#20113,#20110)
+#20114=*
+scopes(#20114,1)
+scopenodes(#20112,#20114)
+scopenesting(#20114,#20000)
+#20115=@"var;{this};{#20114}"
+variables(#20115,"this",#20114)
+#20116=@"var;{g};{#20114}"
+variables(#20116,"g",#20114)
 #20117=*
-stmts(#20117,1,#20111,-2,"{\n\ttry  ... );\n\t}\n}")
-#20118=@"loc,{#10000},1,15,9,1"
-locations_default(#20118,#10000,1,15,9,1)
-hasLocation(#20117,#20118)
-stmt_containers(#20117,#20111)
+exprs(#20117,78,#20112,0,"g")
+hasLocation(#20117,#20027)
+expr_containers(#20117,#20112)
+literals("g","g",#20117)
+decl(#20117,#20116)
+#20118=@"var;{arguments};{#20114}"
+variables(#20118,"arguments",#20114)
+is_arguments_object(#20118)
 #20119=*
-stmts(#20119,11,#20117,0,"try {\n\t ... !"");\n\t}")
-#20120=@"loc,{#10000},2,2,8,2"
-locations_default(#20120,#10000,2,2,8,2)
+stmts(#20119,1,#20112,-2,"{\n\ttry  ... );\n\t}\n}")
+#20120=@"loc,{#10000},1,15,9,1"
+locations_default(#20120,#10000,1,15,9,1)
 hasLocation(#20119,#20120)
-stmt_containers(#20119,#20111)
+stmt_containers(#20119,#20112)
 #20121=*
-stmts(#20121,1,#20119,0,"{\n\t\tg();\n\t}")
-#20122=@"loc,{#10000},2,6,4,2"
-locations_default(#20122,#10000,2,6,4,2)
+stmts(#20121,11,#20119,0,"try {\n\t ... !"");\n\t}")
+#20122=@"loc,{#10000},2,2,8,2"
+locations_default(#20122,#10000,2,2,8,2)
 hasLocation(#20121,#20122)
-stmt_containers(#20121,#20111)
+stmt_containers(#20121,#20112)
 #20123=*
-stmts(#20123,2,#20121,0,"g();")
-#20124=@"loc,{#10000},3,3,3,6"
-locations_default(#20124,#10000,3,3,3,6)
+stmts(#20123,1,#20121,0,"{\n\t\tg();\n\t}")
+#20124=@"loc,{#10000},2,6,4,2"
+locations_default(#20124,#10000,2,6,4,2)
 hasLocation(#20123,#20124)
-stmt_containers(#20123,#20111)
+stmt_containers(#20123,#20112)
 #20125=*
-exprs(#20125,13,#20123,0,"g()")
-#20126=@"loc,{#10000},3,3,3,5"
-locations_default(#20126,#10000,3,3,3,5)
+stmts(#20125,2,#20123,0,"g();")
+#20126=@"loc,{#10000},3,3,3,6"
+locations_default(#20126,#10000,3,3,3,6)
 hasLocation(#20125,#20126)
-enclosing_stmt(#20125,#20123)
-expr_containers(#20125,#20111)
+stmt_containers(#20125,#20112)
 #20127=*
-exprs(#20127,79,#20125,-1,"g")
-hasLocation(#20127,#20037)
-enclosing_stmt(#20127,#20123)
-expr_containers(#20127,#20111)
-literals("g","g",#20127)
-bind(#20127,#20114)
-#20128=*
-stmts(#20128,20,#20119,1,"catch ( ... !"");\n\t}")
-#20129=@"loc,{#10000},4,4,6,2"
-locations_default(#20129,#10000,4,4,6,2)
-hasLocation(#20128,#20129)
-stmt_containers(#20128,#20111)
+exprs(#20127,13,#20125,0,"g()")
+#20128=@"loc,{#10000},3,3,3,5"
+locations_default(#20128,#10000,3,3,3,5)
+hasLocation(#20127,#20128)
+enclosing_stmt(#20127,#20125)
+expr_containers(#20127,#20112)
+#20129=*
+exprs(#20129,79,#20127,-1,"g")
+hasLocation(#20129,#20037)
+enclosing_stmt(#20129,#20125)
+expr_containers(#20129,#20112)
+literals("g","g",#20129)
+bind(#20129,#20116)
 #20130=*
-scopes(#20130,2)
-scopenodes(#20128,#20130)
-scopenesting(#20130,#20113)
-#20131=@"var;{e};{#20130}"
-variables(#20131,"e",#20130)
+stmts(#20130,20,#20121,1,"catch ( ... !"");\n\t}")
+#20131=@"loc,{#10000},4,4,6,2"
+locations_default(#20131,#10000,4,4,6,2)
+hasLocation(#20130,#20131)
+stmt_containers(#20130,#20112)
 #20132=*
-exprs(#20132,78,#20128,0,"e")
-hasLocation(#20132,#20051)
-enclosing_stmt(#20132,#20128)
-expr_containers(#20132,#20111)
-literals("e","e",#20132)
-decl(#20132,#20131)
-#20133=*
-exprs(#20133,43,#20128,2,"e instanceof Error")
-#20134=@"loc,{#10000},4,16,4,33"
-locations_default(#20134,#10000,4,16,4,33)
-hasLocation(#20133,#20134)
-enclosing_stmt(#20133,#20128)
-expr_containers(#20133,#20111)
+scopes(#20132,2)
+scopenodes(#20130,#20132)
+scopenesting(#20132,#20114)
+#20133=@"var;{e};{#20132}"
+variables(#20133,"e",#20132)
+#20134=*
+exprs(#20134,78,#20130,0,"e")
+hasLocation(#20134,#20051)
+enclosing_stmt(#20134,#20130)
+expr_containers(#20134,#20112)
+literals("e","e",#20134)
+decl(#20134,#20133)
 #20135=*
-exprs(#20135,79,#20133,0,"e")
-hasLocation(#20135,#20055)
-enclosing_stmt(#20135,#20128)
-expr_containers(#20135,#20111)
-literals("e","e",#20135)
-bind(#20135,#20131)
-#20136=*
-exprs(#20136,79,#20133,1,"Error")
-hasLocation(#20136,#20059)
-enclosing_stmt(#20136,#20128)
-expr_containers(#20136,#20111)
-literals("Error","Error",#20136)
-#20137=@"var;{Error};{#20000}"
-variables(#20137,"Error",#20000)
-bind(#20136,#20137)
+exprs(#20135,43,#20130,2,"e instanceof Error")
+#20136=@"loc,{#10000},4,16,4,33"
+locations_default(#20136,#10000,4,16,4,33)
+hasLocation(#20135,#20136)
+enclosing_stmt(#20135,#20130)
+expr_containers(#20135,#20112)
+#20137=*
+exprs(#20137,79,#20135,0,"e")
+hasLocation(#20137,#20055)
+enclosing_stmt(#20137,#20130)
+expr_containers(#20137,#20112)
+literals("e","e",#20137)
+bind(#20137,#20133)
 #20138=*
-stmts(#20138,1,#20128,1,"{\n\t\tcon ... !"");\n\t}")
-#20139=@"loc,{#10000},4,36,6,2"
-locations_default(#20139,#10000,4,36,6,2)
-hasLocation(#20138,#20139)
-stmt_containers(#20138,#20111)
+exprs(#20138,79,#20135,1,"Error")
+hasLocation(#20138,#20059)
+enclosing_stmt(#20138,#20130)
+expr_containers(#20138,#20112)
+literals("Error","Error",#20138)
+#20139=@"var;{Error};{#20000}"
+variables(#20139,"Error",#20000)
+bind(#20138,#20139)
 #20140=*
-stmts(#20140,2,#20138,0,"console ... ror!"");")
-#20141=@"loc,{#10000},5,3,5,24"
-locations_default(#20141,#10000,5,3,5,24)
+stmts(#20140,1,#20130,1,"{\n\t\tcon ... !"");\n\t}")
+#20141=@"loc,{#10000},4,36,6,2"
+locations_default(#20141,#10000,4,36,6,2)
 hasLocation(#20140,#20141)
-stmt_containers(#20140,#20111)
+stmt_containers(#20140,#20112)
 #20142=*
-exprs(#20142,13,#20140,0,"console ... rror!"")")
-#20143=@"loc,{#10000},5,3,5,23"
-locations_default(#20143,#10000,5,3,5,23)
+stmts(#20142,2,#20140,0,"console ... ror!"");")
+#20143=@"loc,{#10000},5,3,5,24"
+locations_default(#20143,#10000,5,3,5,24)
 hasLocation(#20142,#20143)
-enclosing_stmt(#20142,#20140)
-expr_containers(#20142,#20111)
+stmt_containers(#20142,#20112)
 #20144=*
-exprs(#20144,14,#20142,-1,"console.log")
-#20145=@"loc,{#10000},5,3,5,13"
-locations_default(#20145,#10000,5,3,5,13)
+exprs(#20144,13,#20142,0,"console ... rror!"")")
+#20145=@"loc,{#10000},5,3,5,23"
+locations_default(#20145,#10000,5,3,5,23)
 hasLocation(#20144,#20145)
-enclosing_stmt(#20144,#20140)
-expr_containers(#20144,#20111)
+enclosing_stmt(#20144,#20142)
+expr_containers(#20144,#20112)
 #20146=*
-exprs(#20146,79,#20144,0,"console")
-hasLocation(#20146,#20065)
-enclosing_stmt(#20146,#20140)
-expr_containers(#20146,#20111)
-literals("console","console",#20146)
-#20147=@"var;{console};{#20000}"
-variables(#20147,"console",#20000)
-bind(#20146,#20147)
+exprs(#20146,14,#20144,-1,"console.log")
+#20147=@"loc,{#10000},5,3,5,13"
+locations_default(#20147,#10000,5,3,5,13)
+hasLocation(#20146,#20147)
+enclosing_stmt(#20146,#20142)
+expr_containers(#20146,#20112)
 #20148=*
-exprs(#20148,0,#20144,1,"log")
-hasLocation(#20148,#20069)
-enclosing_stmt(#20148,#20140)
-expr_containers(#20148,#20111)
-literals("log","log",#20148)
-#20149=*
-exprs(#20149,4,#20142,0,"""error!""")
-hasLocation(#20149,#20073)
-enclosing_stmt(#20149,#20140)
-expr_containers(#20149,#20111)
-literals("error!","""error!""",#20149)
+exprs(#20148,79,#20146,0,"console")
+hasLocation(#20148,#20065)
+enclosing_stmt(#20148,#20142)
+expr_containers(#20148,#20112)
+literals("console","console",#20148)
+#20149=@"var;{console};{#20000}"
+variables(#20149,"console",#20000)
+bind(#20148,#20149)
 #20150=*
-regexpterm(#20150,14,#20149,0,"error!")
-#20151=@"loc,{#10000},5,16,5,21"
-locations_default(#20151,#10000,5,16,5,21)
-hasLocation(#20150,#20151)
-regexp_const_value(#20150,"error!")
+exprs(#20150,0,#20146,1,"log")
+hasLocation(#20150,#20069)
+enclosing_stmt(#20150,#20142)
+expr_containers(#20150,#20112)
+literals("log","log",#20150)
+#20151=*
+exprs(#20151,4,#20144,0,"""error!""")
+hasLocation(#20151,#20073)
+enclosing_stmt(#20151,#20142)
+expr_containers(#20151,#20112)
+literals("error!","""error!""",#20151)
 #20152=*
-stmts(#20152,20,#20119,2,"catch ( ... !"");\n\t}")
-#20153=@"loc,{#10000},6,4,8,2"
-locations_default(#20153,#10000,6,4,8,2)
+regexpterm(#20152,14,#20151,0,"error!")
+#20153=@"loc,{#10000},5,16,5,21"
+locations_default(#20153,#10000,5,16,5,21)
 hasLocation(#20152,#20153)
-stmt_containers(#20152,#20111)
+regexp_const_value(#20152,"error!")
 #20154=*
-scopes(#20154,2)
-scopenodes(#20152,#20154)
-scopenesting(#20154,#20113)
-#20155=@"var;{e};{#20154}"
-variables(#20155,"e",#20154)
+stmts(#20154,20,#20121,2,"catch ( ... !"");\n\t}")
+#20155=@"loc,{#10000},6,4,8,2"
+locations_default(#20155,#10000,6,4,8,2)
+hasLocation(#20154,#20155)
+stmt_containers(#20154,#20112)
 #20156=*
-exprs(#20156,78,#20152,0,"e")
-hasLocation(#20156,#20085)
-enclosing_stmt(#20156,#20152)
-expr_containers(#20156,#20111)
-literals("e","e",#20156)
-decl(#20156,#20155)
-#20157=*
-stmts(#20157,1,#20152,1,"{\n\t\tcon ... !"");\n\t}")
-#20158=@"loc,{#10000},6,14,8,2"
-locations_default(#20158,#10000,6,14,8,2)
-hasLocation(#20157,#20158)
-stmt_containers(#20157,#20111)
+scopes(#20156,2)
+scopenodes(#20154,#20156)
+scopenesting(#20156,#20114)
+#20157=@"var;{e};{#20156}"
+variables(#20157,"e",#20156)
+#20158=*
+exprs(#20158,78,#20154,0,"e")
+hasLocation(#20158,#20085)
+enclosing_stmt(#20158,#20154)
+expr_containers(#20158,#20112)
+literals("e","e",#20158)
+decl(#20158,#20157)
 #20159=*
-stmts(#20159,2,#20157,0,"console ... lse!"");")
-#20160=@"loc,{#10000},7,3,7,33"
-locations_default(#20160,#10000,7,3,7,33)
+stmts(#20159,1,#20154,1,"{\n\t\tcon ... !"");\n\t}")
+#20160=@"loc,{#10000},6,14,8,2"
+locations_default(#20160,#10000,6,14,8,2)
 hasLocation(#20159,#20160)
-stmt_containers(#20159,#20111)
+stmt_containers(#20159,#20112)
 #20161=*
-exprs(#20161,13,#20159,0,"console ... else!"")")
-#20162=@"loc,{#10000},7,3,7,32"
-locations_default(#20162,#10000,7,3,7,32)
+stmts(#20161,2,#20159,0,"console ... lse!"");")
+#20162=@"loc,{#10000},7,3,7,33"
+locations_default(#20162,#10000,7,3,7,33)
 hasLocation(#20161,#20162)
-enclosing_stmt(#20161,#20159)
-expr_containers(#20161,#20111)
+stmt_containers(#20161,#20112)
 #20163=*
-exprs(#20163,14,#20161,-1,"console.log")
-#20164=@"loc,{#10000},7,3,7,13"
-locations_default(#20164,#10000,7,3,7,13)
+exprs(#20163,13,#20161,0,"console ... else!"")")
+#20164=@"loc,{#10000},7,3,7,32"
+locations_default(#20164,#10000,7,3,7,32)
 hasLocation(#20163,#20164)
-enclosing_stmt(#20163,#20159)
-expr_containers(#20163,#20111)
+enclosing_stmt(#20163,#20161)
+expr_containers(#20163,#20112)
 #20165=*
-exprs(#20165,79,#20163,0,"console")
-hasLocation(#20165,#20091)
-enclosing_stmt(#20165,#20159)
-expr_containers(#20165,#20111)
-literals("console","console",#20165)
-bind(#20165,#20147)
-#20166=*
-exprs(#20166,0,#20163,1,"log")
-hasLocation(#20166,#20095)
-enclosing_stmt(#20166,#20159)
-expr_containers(#20166,#20111)
-literals("log","log",#20166)
+exprs(#20165,14,#20163,-1,"console.log")
+#20166=@"loc,{#10000},7,3,7,13"
+locations_default(#20166,#10000,7,3,7,13)
+hasLocation(#20165,#20166)
+enclosing_stmt(#20165,#20161)
+expr_containers(#20165,#20112)
 #20167=*
-exprs(#20167,4,#20161,0,"""something else!""")
-hasLocation(#20167,#20099)
-enclosing_stmt(#20167,#20159)
-expr_containers(#20167,#20111)
-literals("something else!","""something else!""",#20167)
+exprs(#20167,79,#20165,0,"console")
+hasLocation(#20167,#20091)
+enclosing_stmt(#20167,#20161)
+expr_containers(#20167,#20112)
+literals("console","console",#20167)
+bind(#20167,#20149)
 #20168=*
-regexpterm(#20168,14,#20167,0,"something else!")
-#20169=@"loc,{#10000},7,16,7,30"
-locations_default(#20169,#10000,7,16,7,30)
-hasLocation(#20168,#20169)
-regexp_const_value(#20168,"something else!")
+exprs(#20168,0,#20165,1,"log")
+hasLocation(#20168,#20095)
+enclosing_stmt(#20168,#20161)
+expr_containers(#20168,#20112)
+literals("log","log",#20168)
+#20169=*
+exprs(#20169,4,#20163,0,"""something else!""")
+hasLocation(#20169,#20099)
+enclosing_stmt(#20169,#20161)
+expr_containers(#20169,#20112)
+literals("something else!","""something else!""",#20169)
 #20170=*
-entry_cfg_node(#20170,#20001)
-#20171=@"loc,{#10000},1,1,1,0"
-locations_default(#20171,#10000,1,1,1,0)
+regexpterm(#20170,14,#20169,0,"something else!")
+#20171=@"loc,{#10000},7,16,7,30"
+locations_default(#20171,#10000,7,16,7,30)
 hasLocation(#20170,#20171)
+regexp_const_value(#20170,"something else!")
 #20172=*
-exit_cfg_node(#20172,#20001)
-hasLocation(#20172,#20108)
-successor(#20111,#20172)
-#20173=*
-entry_cfg_node(#20173,#20111)
-hasLocation(#20173,#20171)
+entry_cfg_node(#20172,#20001)
+#20173=@"loc,{#10000},1,1,1,0"
+locations_default(#20173,#10000,1,1,1,0)
+hasLocation(#20172,#20173)
 #20174=*
-exit_cfg_node(#20174,#20111)
+exit_cfg_node(#20174,#20001)
 hasLocation(#20174,#20108)
-successor(#20119,#20121)
-successor(#20123,#20127)
-successor(#20127,#20125)
-successor(#20125,#20128)
-successor(#20125,#20174)
+successor(#20112,#20174)
+#20175=*
+entry_cfg_node(#20175,#20112)
+hasLocation(#20175,#20173)
+#20176=*
+exit_cfg_node(#20176,#20112)
+hasLocation(#20176,#20108)
 successor(#20121,#20123)
-successor(#20128,#20132)
-successor(#20136,#20133)
-successor(#20135,#20136)
-successor(#20133,#20138)
-successor(#20133,#20152)
-successor(#20132,#20135)
-successor(#20140,#20146)
-successor(#20149,#20142)
-successor(#20148,#20144)
-successor(#20146,#20148)
-successor(#20144,#20149)
-successor(#20142,#20174)
-successor(#20138,#20140)
-successor(#20152,#20156)
-successor(#20159,#20165)
-successor(#20167,#20161)
-successor(#20166,#20163)
-successor(#20165,#20166)
-successor(#20163,#20167)
-successor(#20161,#20174)
-successor(#20157,#20159)
-successor(#20156,#20157)
+successor(#20125,#20129)
+successor(#20129,#20127)
+successor(#20127,#20130)
+successor(#20127,#20176)
+successor(#20123,#20125)
+successor(#20130,#20134)
+successor(#20138,#20135)
+successor(#20137,#20138)
+successor(#20135,#20140)
+successor(#20135,#20154)
+successor(#20134,#20137)
+successor(#20142,#20148)
+successor(#20151,#20144)
+successor(#20150,#20146)
+successor(#20148,#20150)
+successor(#20146,#20151)
+successor(#20144,#20176)
+successor(#20140,#20142)
+successor(#20154,#20158)
+successor(#20161,#20167)
+successor(#20169,#20163)
+successor(#20168,#20165)
+successor(#20167,#20168)
+successor(#20165,#20169)
+successor(#20163,#20176)
+successor(#20159,#20161)
+successor(#20158,#20159)
+successor(#20119,#20121)
 successor(#20117,#20119)
-successor(#20115,#20117)
-successor(#20173,#20115)
-successor(#20112,#20111)
-successor(#20170,#20112)
+successor(#20175,#20117)
+successor(#20113,#20112)
+successor(#20172,#20113)
 numlines(#10000,9,9,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/mozilla/output/trap/letExpr.js.trap b/javascript/extractor/tests/mozilla/output/trap/letExpr.js.trap
index 28e3fd45bf9..5537270258b 100644
--- a/javascript/extractor/tests/mozilla/output/trap/letExpr.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/letExpr.js.trap
@@ -375,399 +375,401 @@ hasLocation(#20001,#20142)
 variables(#20143,"x",#20000)
 #20144=@"var;{y};{#20000}"
 variables(#20144,"y",#20000)
-#20145=*
-stmts(#20145,18,#20001,0,"var x = 42, y = 19;")
-hasLocation(#20145,#20003)
-stmt_containers(#20145,#20001)
+#20145=@"var;{this};{#20000}"
+variables(#20145,"this",#20000)
 #20146=*
-exprs(#20146,64,#20145,0,"x = 42")
-#20147=@"loc,{#10000},1,5,1,10"
-locations_default(#20147,#10000,1,5,1,10)
-hasLocation(#20146,#20147)
-enclosing_stmt(#20146,#20145)
-expr_containers(#20146,#20001)
-#20148=*
-exprs(#20148,78,#20146,0,"x")
-hasLocation(#20148,#20019)
-enclosing_stmt(#20148,#20145)
-expr_containers(#20148,#20001)
-literals("x","x",#20148)
-decl(#20148,#20143)
+stmts(#20146,18,#20001,0,"var x = 42, y = 19;")
+hasLocation(#20146,#20003)
+stmt_containers(#20146,#20001)
+#20147=*
+exprs(#20147,64,#20146,0,"x = 42")
+#20148=@"loc,{#10000},1,5,1,10"
+locations_default(#20148,#10000,1,5,1,10)
+hasLocation(#20147,#20148)
+enclosing_stmt(#20147,#20146)
+expr_containers(#20147,#20001)
 #20149=*
-exprs(#20149,3,#20146,1,"42")
-hasLocation(#20149,#20023)
-enclosing_stmt(#20149,#20145)
+exprs(#20149,78,#20147,0,"x")
+hasLocation(#20149,#20019)
+enclosing_stmt(#20149,#20146)
 expr_containers(#20149,#20001)
-literals("42","42",#20149)
+literals("x","x",#20149)
+decl(#20149,#20143)
 #20150=*
-exprs(#20150,64,#20145,1,"y = 19")
-#20151=@"loc,{#10000},1,13,1,18"
-locations_default(#20151,#10000,1,13,1,18)
-hasLocation(#20150,#20151)
-enclosing_stmt(#20150,#20145)
+exprs(#20150,3,#20147,1,"42")
+hasLocation(#20150,#20023)
+enclosing_stmt(#20150,#20146)
 expr_containers(#20150,#20001)
-#20152=*
-exprs(#20152,78,#20150,0,"y")
-hasLocation(#20152,#20027)
-enclosing_stmt(#20152,#20145)
-expr_containers(#20152,#20001)
-literals("y","y",#20152)
-decl(#20152,#20144)
+literals("42","42",#20150)
+#20151=*
+exprs(#20151,64,#20146,1,"y = 19")
+#20152=@"loc,{#10000},1,13,1,18"
+locations_default(#20152,#10000,1,13,1,18)
+hasLocation(#20151,#20152)
+enclosing_stmt(#20151,#20146)
+expr_containers(#20151,#20001)
 #20153=*
-exprs(#20153,3,#20150,1,"19")
-hasLocation(#20153,#20031)
-enclosing_stmt(#20153,#20145)
+exprs(#20153,78,#20151,0,"y")
+hasLocation(#20153,#20027)
+enclosing_stmt(#20153,#20146)
 expr_containers(#20153,#20001)
-literals("19","19",#20153)
+literals("y","y",#20153)
+decl(#20153,#20144)
 #20154=*
-stmts(#20154,2,#20001,1,"console ... x + y);")
-hasLocation(#20154,#20007)
-stmt_containers(#20154,#20001)
+exprs(#20154,3,#20151,1,"19")
+hasLocation(#20154,#20031)
+enclosing_stmt(#20154,#20146)
+expr_containers(#20154,#20001)
+literals("19","19",#20154)
 #20155=*
-exprs(#20155,13,#20154,0,"console ...  x + y)")
-#20156=@"loc,{#10000},3,1,3,39"
-locations_default(#20156,#10000,3,1,3,39)
-hasLocation(#20155,#20156)
-enclosing_stmt(#20155,#20154)
-expr_containers(#20155,#20001)
-#20157=*
-exprs(#20157,14,#20155,-1,"console.log")
-#20158=@"loc,{#10000},3,1,3,11"
-locations_default(#20158,#10000,3,1,3,11)
-hasLocation(#20157,#20158)
-enclosing_stmt(#20157,#20154)
-expr_containers(#20157,#20001)
-#20159=*
-exprs(#20159,79,#20157,0,"console")
-hasLocation(#20159,#20035)
-enclosing_stmt(#20159,#20154)
-expr_containers(#20159,#20001)
-literals("console","console",#20159)
-#20160=@"var;{console};{#20000}"
-variables(#20160,"console",#20000)
-bind(#20159,#20160)
-#20161=*
-exprs(#20161,0,#20157,1,"log")
-hasLocation(#20161,#20039)
-enclosing_stmt(#20161,#20154)
-expr_containers(#20161,#20001)
-literals("log","log",#20161)
+stmts(#20155,2,#20001,1,"console ... x + y);")
+hasLocation(#20155,#20007)
+stmt_containers(#20155,#20001)
+#20156=*
+exprs(#20156,13,#20155,0,"console ...  x + y)")
+#20157=@"loc,{#10000},3,1,3,39"
+locations_default(#20157,#10000,3,1,3,39)
+hasLocation(#20156,#20157)
+enclosing_stmt(#20156,#20155)
+expr_containers(#20156,#20001)
+#20158=*
+exprs(#20158,14,#20156,-1,"console.log")
+#20159=@"loc,{#10000},3,1,3,11"
+locations_default(#20159,#10000,3,1,3,11)
+hasLocation(#20158,#20159)
+enclosing_stmt(#20158,#20155)
+expr_containers(#20158,#20001)
+#20160=*
+exprs(#20160,79,#20158,0,"console")
+hasLocation(#20160,#20035)
+enclosing_stmt(#20160,#20155)
+expr_containers(#20160,#20001)
+literals("console","console",#20160)
+#20161=@"var;{console};{#20000}"
+variables(#20161,"console",#20000)
+bind(#20160,#20161)
 #20162=*
-exprs(#20162,77,#20155,0,"let (x  ... ) x + y")
-#20163=@"loc,{#10000},3,13,3,38"
-locations_default(#20163,#10000,3,13,3,38)
-hasLocation(#20162,#20163)
-enclosing_stmt(#20162,#20154)
+exprs(#20162,0,#20158,1,"log")
+hasLocation(#20162,#20039)
+enclosing_stmt(#20162,#20155)
 expr_containers(#20162,#20001)
-#20164=*
-scopes(#20164,4)
-scopenodes(#20162,#20164)
-scopenesting(#20164,#20000)
-#20165=@"var;{x};{#20164}"
-variables(#20165,"x",#20164)
-#20166=@"var;{y};{#20164}"
-variables(#20166,"y",#20164)
-#20167=*
-exprs(#20167,64,#20162,0,"x = 23")
-#20168=@"loc,{#10000},3,18,3,23"
-locations_default(#20168,#10000,3,18,3,23)
-hasLocation(#20167,#20168)
-enclosing_stmt(#20167,#20154)
-expr_containers(#20167,#20001)
-#20169=*
-exprs(#20169,78,#20167,0,"x")
-hasLocation(#20169,#20047)
-enclosing_stmt(#20169,#20154)
-expr_containers(#20169,#20001)
-literals("x","x",#20169)
-decl(#20169,#20165)
+literals("log","log",#20162)
+#20163=*
+exprs(#20163,77,#20156,0,"let (x  ... ) x + y")
+#20164=@"loc,{#10000},3,13,3,38"
+locations_default(#20164,#10000,3,13,3,38)
+hasLocation(#20163,#20164)
+enclosing_stmt(#20163,#20155)
+expr_containers(#20163,#20001)
+#20165=*
+scopes(#20165,4)
+scopenodes(#20163,#20165)
+scopenesting(#20165,#20000)
+#20166=@"var;{x};{#20165}"
+variables(#20166,"x",#20165)
+#20167=@"var;{y};{#20165}"
+variables(#20167,"y",#20165)
+#20168=*
+exprs(#20168,64,#20163,0,"x = 23")
+#20169=@"loc,{#10000},3,18,3,23"
+locations_default(#20169,#10000,3,18,3,23)
+hasLocation(#20168,#20169)
+enclosing_stmt(#20168,#20155)
+expr_containers(#20168,#20001)
 #20170=*
-exprs(#20170,3,#20167,1,"23")
-hasLocation(#20170,#20051)
-enclosing_stmt(#20170,#20154)
+exprs(#20170,78,#20168,0,"x")
+hasLocation(#20170,#20047)
+enclosing_stmt(#20170,#20155)
 expr_containers(#20170,#20001)
-literals("23","23",#20170)
+literals("x","x",#20170)
+decl(#20170,#20166)
 #20171=*
-exprs(#20171,64,#20162,1,"y = 19")
-#20172=@"loc,{#10000},3,26,3,31"
-locations_default(#20172,#10000,3,26,3,31)
-hasLocation(#20171,#20172)
-enclosing_stmt(#20171,#20154)
+exprs(#20171,3,#20168,1,"23")
+hasLocation(#20171,#20051)
+enclosing_stmt(#20171,#20155)
 expr_containers(#20171,#20001)
-#20173=*
-exprs(#20173,78,#20171,0,"y")
-hasLocation(#20173,#20055)
-enclosing_stmt(#20173,#20154)
-expr_containers(#20173,#20001)
-literals("y","y",#20173)
-decl(#20173,#20166)
+literals("23","23",#20171)
+#20172=*
+exprs(#20172,64,#20163,1,"y = 19")
+#20173=@"loc,{#10000},3,26,3,31"
+locations_default(#20173,#10000,3,26,3,31)
+hasLocation(#20172,#20173)
+enclosing_stmt(#20172,#20155)
+expr_containers(#20172,#20001)
 #20174=*
-exprs(#20174,3,#20171,1,"19")
-hasLocation(#20174,#20059)
-enclosing_stmt(#20174,#20154)
+exprs(#20174,78,#20172,0,"y")
+hasLocation(#20174,#20055)
+enclosing_stmt(#20174,#20155)
 expr_containers(#20174,#20001)
-literals("19","19",#20174)
+literals("y","y",#20174)
+decl(#20174,#20167)
 #20175=*
-exprs(#20175,34,#20162,-1,"x + y")
-#20176=@"loc,{#10000},3,34,3,38"
-locations_default(#20176,#10000,3,34,3,38)
-hasLocation(#20175,#20176)
-enclosing_stmt(#20175,#20154)
+exprs(#20175,3,#20172,1,"19")
+hasLocation(#20175,#20059)
+enclosing_stmt(#20175,#20155)
 expr_containers(#20175,#20001)
-#20177=*
-exprs(#20177,79,#20175,0,"x")
-hasLocation(#20177,#20063)
-enclosing_stmt(#20177,#20154)
-expr_containers(#20177,#20001)
-literals("x","x",#20177)
-bind(#20177,#20165)
+literals("19","19",#20175)
+#20176=*
+exprs(#20176,34,#20163,-1,"x + y")
+#20177=@"loc,{#10000},3,34,3,38"
+locations_default(#20177,#10000,3,34,3,38)
+hasLocation(#20176,#20177)
+enclosing_stmt(#20176,#20155)
+expr_containers(#20176,#20001)
 #20178=*
-exprs(#20178,79,#20175,1,"y")
-hasLocation(#20178,#20067)
-enclosing_stmt(#20178,#20154)
+exprs(#20178,79,#20176,0,"x")
+hasLocation(#20178,#20063)
+enclosing_stmt(#20178,#20155)
 expr_containers(#20178,#20001)
-literals("y","y",#20178)
+literals("x","x",#20178)
 bind(#20178,#20166)
 #20179=*
-stmts(#20179,2,#20001,2,"console.log(x - y);")
-hasLocation(#20179,#20011)
-stmt_containers(#20179,#20001)
+exprs(#20179,79,#20176,1,"y")
+hasLocation(#20179,#20067)
+enclosing_stmt(#20179,#20155)
+expr_containers(#20179,#20001)
+literals("y","y",#20179)
+bind(#20179,#20167)
 #20180=*
-exprs(#20180,13,#20179,0,"console.log(x - y)")
-#20181=@"loc,{#10000},5,1,5,18"
-locations_default(#20181,#10000,5,1,5,18)
-hasLocation(#20180,#20181)
-enclosing_stmt(#20180,#20179)
-expr_containers(#20180,#20001)
-#20182=*
-exprs(#20182,14,#20180,-1,"console.log")
-#20183=@"loc,{#10000},5,1,5,11"
-locations_default(#20183,#10000,5,1,5,11)
-hasLocation(#20182,#20183)
-enclosing_stmt(#20182,#20179)
-expr_containers(#20182,#20001)
-#20184=*
-exprs(#20184,79,#20182,0,"console")
-hasLocation(#20184,#20073)
-enclosing_stmt(#20184,#20179)
-expr_containers(#20184,#20001)
-literals("console","console",#20184)
-bind(#20184,#20160)
+stmts(#20180,2,#20001,2,"console.log(x - y);")
+hasLocation(#20180,#20011)
+stmt_containers(#20180,#20001)
+#20181=*
+exprs(#20181,13,#20180,0,"console.log(x - y)")
+#20182=@"loc,{#10000},5,1,5,18"
+locations_default(#20182,#10000,5,1,5,18)
+hasLocation(#20181,#20182)
+enclosing_stmt(#20181,#20180)
+expr_containers(#20181,#20001)
+#20183=*
+exprs(#20183,14,#20181,-1,"console.log")
+#20184=@"loc,{#10000},5,1,5,11"
+locations_default(#20184,#10000,5,1,5,11)
+hasLocation(#20183,#20184)
+enclosing_stmt(#20183,#20180)
+expr_containers(#20183,#20001)
 #20185=*
-exprs(#20185,0,#20182,1,"log")
-hasLocation(#20185,#20077)
-enclosing_stmt(#20185,#20179)
+exprs(#20185,79,#20183,0,"console")
+hasLocation(#20185,#20073)
+enclosing_stmt(#20185,#20180)
 expr_containers(#20185,#20001)
-literals("log","log",#20185)
+literals("console","console",#20185)
+bind(#20185,#20161)
 #20186=*
-exprs(#20186,35,#20180,0,"x - y")
-#20187=@"loc,{#10000},5,13,5,17"
-locations_default(#20187,#10000,5,13,5,17)
-hasLocation(#20186,#20187)
-enclosing_stmt(#20186,#20179)
+exprs(#20186,0,#20183,1,"log")
+hasLocation(#20186,#20077)
+enclosing_stmt(#20186,#20180)
 expr_containers(#20186,#20001)
-#20188=*
-exprs(#20188,79,#20186,0,"x")
-hasLocation(#20188,#20081)
-enclosing_stmt(#20188,#20179)
-expr_containers(#20188,#20001)
-literals("x","x",#20188)
-bind(#20188,#20143)
+literals("log","log",#20186)
+#20187=*
+exprs(#20187,35,#20181,0,"x - y")
+#20188=@"loc,{#10000},5,13,5,17"
+locations_default(#20188,#10000,5,13,5,17)
+hasLocation(#20187,#20188)
+enclosing_stmt(#20187,#20180)
+expr_containers(#20187,#20001)
 #20189=*
-exprs(#20189,79,#20186,1,"y")
-hasLocation(#20189,#20085)
-enclosing_stmt(#20189,#20179)
+exprs(#20189,79,#20187,0,"x")
+hasLocation(#20189,#20081)
+enclosing_stmt(#20189,#20180)
 expr_containers(#20189,#20001)
-literals("y","y",#20189)
-bind(#20189,#20144)
+literals("x","x",#20189)
+bind(#20189,#20143)
 #20190=*
-stmts(#20190,2,#20001,3,"JSON.st ... y: y});")
-hasLocation(#20190,#20015)
-stmt_containers(#20190,#20001)
+exprs(#20190,79,#20187,1,"y")
+hasLocation(#20190,#20085)
+enclosing_stmt(#20190,#20180)
+expr_containers(#20190,#20001)
+literals("y","y",#20190)
+bind(#20190,#20144)
 #20191=*
-exprs(#20191,13,#20190,0,"JSON.st ...  y: y})")
-#20192=@"loc,{#10000},7,1,7,50"
-locations_default(#20192,#10000,7,1,7,50)
-hasLocation(#20191,#20192)
-enclosing_stmt(#20191,#20190)
-expr_containers(#20191,#20001)
-#20193=*
-exprs(#20193,14,#20191,-1,"JSON.stringify")
-#20194=@"loc,{#10000},7,1,7,14"
-locations_default(#20194,#10000,7,1,7,14)
-hasLocation(#20193,#20194)
-enclosing_stmt(#20193,#20190)
-expr_containers(#20193,#20001)
-#20195=*
-exprs(#20195,79,#20193,0,"JSON")
-hasLocation(#20195,#20091)
-enclosing_stmt(#20195,#20190)
-expr_containers(#20195,#20001)
-literals("JSON","JSON",#20195)
-#20196=@"var;{JSON};{#20000}"
-variables(#20196,"JSON",#20000)
-bind(#20195,#20196)
-#20197=*
-exprs(#20197,0,#20193,1,"stringify")
-hasLocation(#20197,#20095)
-enclosing_stmt(#20197,#20190)
-expr_containers(#20197,#20001)
-literals("stringify","stringify",#20197)
+stmts(#20191,2,#20001,3,"JSON.st ... y: y});")
+hasLocation(#20191,#20015)
+stmt_containers(#20191,#20001)
+#20192=*
+exprs(#20192,13,#20191,0,"JSON.st ...  y: y})")
+#20193=@"loc,{#10000},7,1,7,50"
+locations_default(#20193,#10000,7,1,7,50)
+hasLocation(#20192,#20193)
+enclosing_stmt(#20192,#20191)
+expr_containers(#20192,#20001)
+#20194=*
+exprs(#20194,14,#20192,-1,"JSON.stringify")
+#20195=@"loc,{#10000},7,1,7,14"
+locations_default(#20195,#10000,7,1,7,14)
+hasLocation(#20194,#20195)
+enclosing_stmt(#20194,#20191)
+expr_containers(#20194,#20001)
+#20196=*
+exprs(#20196,79,#20194,0,"JSON")
+hasLocation(#20196,#20091)
+enclosing_stmt(#20196,#20191)
+expr_containers(#20196,#20001)
+literals("JSON","JSON",#20196)
+#20197=@"var;{JSON};{#20000}"
+variables(#20197,"JSON",#20000)
+bind(#20196,#20197)
 #20198=*
-exprs(#20198,77,#20191,0,"let (x  ... , y: y}")
-#20199=@"loc,{#10000},7,16,7,49"
-locations_default(#20199,#10000,7,16,7,49)
-hasLocation(#20198,#20199)
-enclosing_stmt(#20198,#20190)
+exprs(#20198,0,#20194,1,"stringify")
+hasLocation(#20198,#20095)
+enclosing_stmt(#20198,#20191)
 expr_containers(#20198,#20001)
-#20200=*
-scopes(#20200,4)
-scopenodes(#20198,#20200)
-scopenesting(#20200,#20000)
-#20201=@"var;{x};{#20200}"
-variables(#20201,"x",#20200)
-#20202=@"var;{y};{#20200}"
-variables(#20202,"y",#20200)
-#20203=*
-exprs(#20203,64,#20198,0,"x = 23")
-#20204=@"loc,{#10000},7,21,7,26"
-locations_default(#20204,#10000,7,21,7,26)
-hasLocation(#20203,#20204)
-enclosing_stmt(#20203,#20190)
-expr_containers(#20203,#20001)
-#20205=*
-exprs(#20205,78,#20203,0,"x")
-hasLocation(#20205,#20103)
-enclosing_stmt(#20205,#20190)
-expr_containers(#20205,#20001)
-literals("x","x",#20205)
-decl(#20205,#20201)
+literals("stringify","stringify",#20198)
+#20199=*
+exprs(#20199,77,#20192,0,"let (x  ... , y: y}")
+#20200=@"loc,{#10000},7,16,7,49"
+locations_default(#20200,#10000,7,16,7,49)
+hasLocation(#20199,#20200)
+enclosing_stmt(#20199,#20191)
+expr_containers(#20199,#20001)
+#20201=*
+scopes(#20201,4)
+scopenodes(#20199,#20201)
+scopenesting(#20201,#20000)
+#20202=@"var;{x};{#20201}"
+variables(#20202,"x",#20201)
+#20203=@"var;{y};{#20201}"
+variables(#20203,"y",#20201)
+#20204=*
+exprs(#20204,64,#20199,0,"x = 23")
+#20205=@"loc,{#10000},7,21,7,26"
+locations_default(#20205,#10000,7,21,7,26)
+hasLocation(#20204,#20205)
+enclosing_stmt(#20204,#20191)
+expr_containers(#20204,#20001)
 #20206=*
-exprs(#20206,3,#20203,1,"23")
-hasLocation(#20206,#20107)
-enclosing_stmt(#20206,#20190)
+exprs(#20206,78,#20204,0,"x")
+hasLocation(#20206,#20103)
+enclosing_stmt(#20206,#20191)
 expr_containers(#20206,#20001)
-literals("23","23",#20206)
+literals("x","x",#20206)
+decl(#20206,#20202)
 #20207=*
-exprs(#20207,64,#20198,1,"y = 19")
-#20208=@"loc,{#10000},7,29,7,34"
-locations_default(#20208,#10000,7,29,7,34)
-hasLocation(#20207,#20208)
-enclosing_stmt(#20207,#20190)
+exprs(#20207,3,#20204,1,"23")
+hasLocation(#20207,#20107)
+enclosing_stmt(#20207,#20191)
 expr_containers(#20207,#20001)
-#20209=*
-exprs(#20209,78,#20207,0,"y")
-hasLocation(#20209,#20111)
-enclosing_stmt(#20209,#20190)
-expr_containers(#20209,#20001)
-literals("y","y",#20209)
-decl(#20209,#20202)
+literals("23","23",#20207)
+#20208=*
+exprs(#20208,64,#20199,1,"y = 19")
+#20209=@"loc,{#10000},7,29,7,34"
+locations_default(#20209,#10000,7,29,7,34)
+hasLocation(#20208,#20209)
+enclosing_stmt(#20208,#20191)
+expr_containers(#20208,#20001)
 #20210=*
-exprs(#20210,3,#20207,1,"19")
-hasLocation(#20210,#20115)
-enclosing_stmt(#20210,#20190)
+exprs(#20210,78,#20208,0,"y")
+hasLocation(#20210,#20111)
+enclosing_stmt(#20210,#20191)
 expr_containers(#20210,#20001)
-literals("19","19",#20210)
+literals("y","y",#20210)
+decl(#20210,#20203)
 #20211=*
-exprs(#20211,8,#20198,-1,"{ x: x, y: y}")
-#20212=@"loc,{#10000},7,37,7,49"
-locations_default(#20212,#10000,7,37,7,49)
-hasLocation(#20211,#20212)
-enclosing_stmt(#20211,#20190)
+exprs(#20211,3,#20208,1,"19")
+hasLocation(#20211,#20115)
+enclosing_stmt(#20211,#20191)
 expr_containers(#20211,#20001)
-#20213=*
-properties(#20213,#20211,0,0,"x: x")
-#20214=@"loc,{#10000},7,39,7,42"
-locations_default(#20214,#10000,7,39,7,42)
-hasLocation(#20213,#20214)
-#20215=*
-exprs(#20215,0,#20213,0,"x")
-hasLocation(#20215,#20121)
-enclosing_stmt(#20215,#20190)
-expr_containers(#20215,#20001)
-literals("x","x",#20215)
+literals("19","19",#20211)
+#20212=*
+exprs(#20212,8,#20199,-1,"{ x: x, y: y}")
+#20213=@"loc,{#10000},7,37,7,49"
+locations_default(#20213,#10000,7,37,7,49)
+hasLocation(#20212,#20213)
+enclosing_stmt(#20212,#20191)
+expr_containers(#20212,#20001)
+#20214=*
+properties(#20214,#20212,0,0,"x: x")
+#20215=@"loc,{#10000},7,39,7,42"
+locations_default(#20215,#10000,7,39,7,42)
+hasLocation(#20214,#20215)
 #20216=*
-exprs(#20216,79,#20213,1,"x")
-hasLocation(#20216,#20125)
-enclosing_stmt(#20216,#20190)
+exprs(#20216,0,#20214,0,"x")
+hasLocation(#20216,#20121)
+enclosing_stmt(#20216,#20191)
 expr_containers(#20216,#20001)
 literals("x","x",#20216)
-bind(#20216,#20201)
 #20217=*
-properties(#20217,#20211,1,0,"y: y")
-#20218=@"loc,{#10000},7,45,7,48"
-locations_default(#20218,#10000,7,45,7,48)
-hasLocation(#20217,#20218)
-#20219=*
-exprs(#20219,0,#20217,0,"y")
-hasLocation(#20219,#20129)
-enclosing_stmt(#20219,#20190)
-expr_containers(#20219,#20001)
-literals("y","y",#20219)
+exprs(#20217,79,#20214,1,"x")
+hasLocation(#20217,#20125)
+enclosing_stmt(#20217,#20191)
+expr_containers(#20217,#20001)
+literals("x","x",#20217)
+bind(#20217,#20202)
+#20218=*
+properties(#20218,#20212,1,0,"y: y")
+#20219=@"loc,{#10000},7,45,7,48"
+locations_default(#20219,#10000,7,45,7,48)
+hasLocation(#20218,#20219)
 #20220=*
-exprs(#20220,79,#20217,1,"y")
-hasLocation(#20220,#20133)
-enclosing_stmt(#20220,#20190)
+exprs(#20220,0,#20218,0,"y")
+hasLocation(#20220,#20129)
+enclosing_stmt(#20220,#20191)
 expr_containers(#20220,#20001)
 literals("y","y",#20220)
-bind(#20220,#20202)
 #20221=*
-entry_cfg_node(#20221,#20001)
-#20222=@"loc,{#10000},1,1,1,0"
-locations_default(#20222,#10000,1,1,1,0)
-hasLocation(#20221,#20222)
-#20223=*
-exit_cfg_node(#20223,#20001)
-hasLocation(#20223,#20141)
-successor(#20190,#20195)
-successor(#20198,#20205)
-successor(#20211,#20215)
-successor(#20220,#20217)
-successor(#20219,#20220)
-successor(#20217,#20191)
-successor(#20216,#20213)
-successor(#20215,#20216)
-successor(#20213,#20219)
-successor(#20210,#20207)
-successor(#20209,#20210)
-successor(#20207,#20211)
-successor(#20206,#20203)
-successor(#20205,#20206)
-successor(#20203,#20209)
-successor(#20197,#20193)
-successor(#20195,#20197)
-successor(#20193,#20198)
-successor(#20191,#20223)
-successor(#20179,#20184)
-successor(#20189,#20186)
-successor(#20188,#20189)
-successor(#20186,#20180)
-successor(#20185,#20182)
-successor(#20184,#20185)
-successor(#20182,#20188)
-successor(#20180,#20190)
-successor(#20154,#20159)
-successor(#20162,#20169)
-successor(#20178,#20175)
-successor(#20177,#20178)
-successor(#20175,#20155)
-successor(#20174,#20171)
-successor(#20173,#20174)
-successor(#20171,#20177)
-successor(#20170,#20167)
-successor(#20169,#20170)
-successor(#20167,#20173)
-successor(#20161,#20157)
-successor(#20159,#20161)
-successor(#20157,#20162)
-successor(#20155,#20179)
-successor(#20145,#20148)
-successor(#20153,#20150)
-successor(#20152,#20153)
-successor(#20150,#20154)
-successor(#20149,#20146)
-successor(#20148,#20149)
-successor(#20146,#20152)
-successor(#20221,#20145)
+exprs(#20221,79,#20218,1,"y")
+hasLocation(#20221,#20133)
+enclosing_stmt(#20221,#20191)
+expr_containers(#20221,#20001)
+literals("y","y",#20221)
+bind(#20221,#20203)
+#20222=*
+entry_cfg_node(#20222,#20001)
+#20223=@"loc,{#10000},1,1,1,0"
+locations_default(#20223,#10000,1,1,1,0)
+hasLocation(#20222,#20223)
+#20224=*
+exit_cfg_node(#20224,#20001)
+hasLocation(#20224,#20141)
+successor(#20191,#20196)
+successor(#20199,#20206)
+successor(#20212,#20216)
+successor(#20221,#20218)
+successor(#20220,#20221)
+successor(#20218,#20192)
+successor(#20217,#20214)
+successor(#20216,#20217)
+successor(#20214,#20220)
+successor(#20211,#20208)
+successor(#20210,#20211)
+successor(#20208,#20212)
+successor(#20207,#20204)
+successor(#20206,#20207)
+successor(#20204,#20210)
+successor(#20198,#20194)
+successor(#20196,#20198)
+successor(#20194,#20199)
+successor(#20192,#20224)
+successor(#20180,#20185)
+successor(#20190,#20187)
+successor(#20189,#20190)
+successor(#20187,#20181)
+successor(#20186,#20183)
+successor(#20185,#20186)
+successor(#20183,#20189)
+successor(#20181,#20191)
+successor(#20155,#20160)
+successor(#20163,#20170)
+successor(#20179,#20176)
+successor(#20178,#20179)
+successor(#20176,#20156)
+successor(#20175,#20172)
+successor(#20174,#20175)
+successor(#20172,#20178)
+successor(#20171,#20168)
+successor(#20170,#20171)
+successor(#20168,#20174)
+successor(#20162,#20158)
+successor(#20160,#20162)
+successor(#20158,#20163)
+successor(#20156,#20180)
+successor(#20146,#20149)
+successor(#20154,#20151)
+successor(#20153,#20154)
+successor(#20151,#20155)
+successor(#20150,#20147)
+successor(#20149,#20150)
+successor(#20147,#20153)
+successor(#20222,#20146)
 numlines(#10000,7,4,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/mozilla/output/trap/letStmt.js.trap b/javascript/extractor/tests/mozilla/output/trap/letStmt.js.trap
index 24050b29d6c..1f1854b1afe 100644
--- a/javascript/extractor/tests/mozilla/output/trap/letStmt.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/letStmt.js.trap
@@ -260,257 +260,259 @@ variables(#20096,"x",#20000)
 variables(#20097,"y",#20000)
 variables(#20096,"x",#20000)
 variables(#20097,"y",#20000)
-#20098=*
-stmts(#20098,18,#20001,0,"var x = 42, y = 19;")
-hasLocation(#20098,#20003)
-stmt_containers(#20098,#20001)
+#20098=@"var;{this};{#20000}"
+variables(#20098,"this",#20000)
 #20099=*
-exprs(#20099,64,#20098,0,"x = 42")
-#20100=@"loc,{#10000},1,5,1,10"
-locations_default(#20100,#10000,1,5,1,10)
-hasLocation(#20099,#20100)
-enclosing_stmt(#20099,#20098)
-expr_containers(#20099,#20001)
-#20101=*
-exprs(#20101,78,#20099,0,"x")
-hasLocation(#20101,#20019)
-enclosing_stmt(#20101,#20098)
-expr_containers(#20101,#20001)
-literals("x","x",#20101)
-decl(#20101,#20096)
+stmts(#20099,18,#20001,0,"var x = 42, y = 19;")
+hasLocation(#20099,#20003)
+stmt_containers(#20099,#20001)
+#20100=*
+exprs(#20100,64,#20099,0,"x = 42")
+#20101=@"loc,{#10000},1,5,1,10"
+locations_default(#20101,#10000,1,5,1,10)
+hasLocation(#20100,#20101)
+enclosing_stmt(#20100,#20099)
+expr_containers(#20100,#20001)
 #20102=*
-exprs(#20102,3,#20099,1,"42")
-hasLocation(#20102,#20023)
-enclosing_stmt(#20102,#20098)
+exprs(#20102,78,#20100,0,"x")
+hasLocation(#20102,#20019)
+enclosing_stmt(#20102,#20099)
 expr_containers(#20102,#20001)
-literals("42","42",#20102)
+literals("x","x",#20102)
+decl(#20102,#20096)
 #20103=*
-exprs(#20103,64,#20098,1,"y = 19")
-#20104=@"loc,{#10000},1,13,1,18"
-locations_default(#20104,#10000,1,13,1,18)
-hasLocation(#20103,#20104)
-enclosing_stmt(#20103,#20098)
+exprs(#20103,3,#20100,1,"42")
+hasLocation(#20103,#20023)
+enclosing_stmt(#20103,#20099)
 expr_containers(#20103,#20001)
-#20105=*
-exprs(#20105,78,#20103,0,"y")
-hasLocation(#20105,#20027)
-enclosing_stmt(#20105,#20098)
-expr_containers(#20105,#20001)
-literals("y","y",#20105)
-decl(#20105,#20097)
+literals("42","42",#20103)
+#20104=*
+exprs(#20104,64,#20099,1,"y = 19")
+#20105=@"loc,{#10000},1,13,1,18"
+locations_default(#20105,#10000,1,13,1,18)
+hasLocation(#20104,#20105)
+enclosing_stmt(#20104,#20099)
+expr_containers(#20104,#20001)
 #20106=*
-exprs(#20106,3,#20103,1,"19")
-hasLocation(#20106,#20031)
-enclosing_stmt(#20106,#20098)
+exprs(#20106,78,#20104,0,"y")
+hasLocation(#20106,#20027)
+enclosing_stmt(#20106,#20099)
 expr_containers(#20106,#20001)
-literals("19","19",#20106)
+literals("y","y",#20106)
+decl(#20106,#20097)
 #20107=*
-stmts(#20107,24,#20001,1,"let (x  ... + y);\n}")
-#20108=@"loc,{#10000},3,1,5,1"
-locations_default(#20108,#10000,3,1,5,1)
-hasLocation(#20107,#20108)
-stmt_containers(#20107,#20001)
-#20109=*
-scopes(#20109,4)
-scopenodes(#20107,#20109)
-scopenesting(#20109,#20000)
-#20110=@"var;{x};{#20109}"
-variables(#20110,"x",#20109)
-#20111=@"var;{y};{#20109}"
-variables(#20111,"y",#20109)
-#20112=*
-exprs(#20112,64,#20107,0,"x = 23")
-#20113=@"loc,{#10000},3,6,3,11"
-locations_default(#20113,#10000,3,6,3,11)
-hasLocation(#20112,#20113)
-enclosing_stmt(#20112,#20107)
-expr_containers(#20112,#20001)
-#20114=*
-exprs(#20114,78,#20112,0,"x")
-hasLocation(#20114,#20039)
-enclosing_stmt(#20114,#20107)
-expr_containers(#20114,#20001)
-literals("x","x",#20114)
-decl(#20114,#20110)
+exprs(#20107,3,#20104,1,"19")
+hasLocation(#20107,#20031)
+enclosing_stmt(#20107,#20099)
+expr_containers(#20107,#20001)
+literals("19","19",#20107)
+#20108=*
+stmts(#20108,24,#20001,1,"let (x  ... + y);\n}")
+#20109=@"loc,{#10000},3,1,5,1"
+locations_default(#20109,#10000,3,1,5,1)
+hasLocation(#20108,#20109)
+stmt_containers(#20108,#20001)
+#20110=*
+scopes(#20110,4)
+scopenodes(#20108,#20110)
+scopenesting(#20110,#20000)
+#20111=@"var;{x};{#20110}"
+variables(#20111,"x",#20110)
+#20112=@"var;{y};{#20110}"
+variables(#20112,"y",#20110)
+#20113=*
+exprs(#20113,64,#20108,0,"x = 23")
+#20114=@"loc,{#10000},3,6,3,11"
+locations_default(#20114,#10000,3,6,3,11)
+hasLocation(#20113,#20114)
+enclosing_stmt(#20113,#20108)
+expr_containers(#20113,#20001)
 #20115=*
-exprs(#20115,3,#20112,1,"23")
-hasLocation(#20115,#20043)
-enclosing_stmt(#20115,#20107)
+exprs(#20115,78,#20113,0,"x")
+hasLocation(#20115,#20039)
+enclosing_stmt(#20115,#20108)
 expr_containers(#20115,#20001)
-literals("23","23",#20115)
+literals("x","x",#20115)
+decl(#20115,#20111)
 #20116=*
-exprs(#20116,64,#20107,1,"y = 19")
-#20117=@"loc,{#10000},3,14,3,19"
-locations_default(#20117,#10000,3,14,3,19)
-hasLocation(#20116,#20117)
-enclosing_stmt(#20116,#20107)
+exprs(#20116,3,#20113,1,"23")
+hasLocation(#20116,#20043)
+enclosing_stmt(#20116,#20108)
 expr_containers(#20116,#20001)
-#20118=*
-exprs(#20118,78,#20116,0,"y")
-hasLocation(#20118,#20047)
-enclosing_stmt(#20118,#20107)
-expr_containers(#20118,#20001)
-literals("y","y",#20118)
-decl(#20118,#20111)
+literals("23","23",#20116)
+#20117=*
+exprs(#20117,64,#20108,1,"y = 19")
+#20118=@"loc,{#10000},3,14,3,19"
+locations_default(#20118,#10000,3,14,3,19)
+hasLocation(#20117,#20118)
+enclosing_stmt(#20117,#20108)
+expr_containers(#20117,#20001)
 #20119=*
-exprs(#20119,3,#20116,1,"19")
-hasLocation(#20119,#20051)
-enclosing_stmt(#20119,#20107)
+exprs(#20119,78,#20117,0,"y")
+hasLocation(#20119,#20047)
+enclosing_stmt(#20119,#20108)
 expr_containers(#20119,#20001)
-literals("19","19",#20119)
+literals("y","y",#20119)
+decl(#20119,#20112)
 #20120=*
-stmts(#20120,1,#20107,-1,"{\n  con ... + y);\n}")
-#20121=@"loc,{#10000},3,22,5,1"
-locations_default(#20121,#10000,3,22,5,1)
-hasLocation(#20120,#20121)
-stmt_containers(#20120,#20001)
-#20122=*
-stmts(#20122,2,#20120,0,"console.log(x + y);")
-#20123=@"loc,{#10000},4,3,4,21"
-locations_default(#20123,#10000,4,3,4,21)
-hasLocation(#20122,#20123)
-stmt_containers(#20122,#20001)
-#20124=*
-exprs(#20124,13,#20122,0,"console.log(x + y)")
-#20125=@"loc,{#10000},4,3,4,20"
-locations_default(#20125,#10000,4,3,4,20)
-hasLocation(#20124,#20125)
-enclosing_stmt(#20124,#20122)
-expr_containers(#20124,#20001)
-#20126=*
-exprs(#20126,14,#20124,-1,"console.log")
-#20127=@"loc,{#10000},4,3,4,13"
-locations_default(#20127,#10000,4,3,4,13)
-hasLocation(#20126,#20127)
-enclosing_stmt(#20126,#20122)
-expr_containers(#20126,#20001)
-#20128=*
-exprs(#20128,79,#20126,0,"console")
-hasLocation(#20128,#20057)
-enclosing_stmt(#20128,#20122)
-expr_containers(#20128,#20001)
-literals("console","console",#20128)
-#20129=@"var;{console};{#20000}"
-variables(#20129,"console",#20000)
-bind(#20128,#20129)
-#20130=*
-exprs(#20130,0,#20126,1,"log")
-hasLocation(#20130,#20061)
-enclosing_stmt(#20130,#20122)
-expr_containers(#20130,#20001)
-literals("log","log",#20130)
+exprs(#20120,3,#20117,1,"19")
+hasLocation(#20120,#20051)
+enclosing_stmt(#20120,#20108)
+expr_containers(#20120,#20001)
+literals("19","19",#20120)
+#20121=*
+stmts(#20121,1,#20108,-1,"{\n  con ... + y);\n}")
+#20122=@"loc,{#10000},3,22,5,1"
+locations_default(#20122,#10000,3,22,5,1)
+hasLocation(#20121,#20122)
+stmt_containers(#20121,#20001)
+#20123=*
+stmts(#20123,2,#20121,0,"console.log(x + y);")
+#20124=@"loc,{#10000},4,3,4,21"
+locations_default(#20124,#10000,4,3,4,21)
+hasLocation(#20123,#20124)
+stmt_containers(#20123,#20001)
+#20125=*
+exprs(#20125,13,#20123,0,"console.log(x + y)")
+#20126=@"loc,{#10000},4,3,4,20"
+locations_default(#20126,#10000,4,3,4,20)
+hasLocation(#20125,#20126)
+enclosing_stmt(#20125,#20123)
+expr_containers(#20125,#20001)
+#20127=*
+exprs(#20127,14,#20125,-1,"console.log")
+#20128=@"loc,{#10000},4,3,4,13"
+locations_default(#20128,#10000,4,3,4,13)
+hasLocation(#20127,#20128)
+enclosing_stmt(#20127,#20123)
+expr_containers(#20127,#20001)
+#20129=*
+exprs(#20129,79,#20127,0,"console")
+hasLocation(#20129,#20057)
+enclosing_stmt(#20129,#20123)
+expr_containers(#20129,#20001)
+literals("console","console",#20129)
+#20130=@"var;{console};{#20000}"
+variables(#20130,"console",#20000)
+bind(#20129,#20130)
 #20131=*
-exprs(#20131,34,#20124,0,"x + y")
-#20132=@"loc,{#10000},4,15,4,19"
-locations_default(#20132,#10000,4,15,4,19)
-hasLocation(#20131,#20132)
-enclosing_stmt(#20131,#20122)
+exprs(#20131,0,#20127,1,"log")
+hasLocation(#20131,#20061)
+enclosing_stmt(#20131,#20123)
 expr_containers(#20131,#20001)
-#20133=*
-exprs(#20133,79,#20131,0,"x")
-hasLocation(#20133,#20065)
-enclosing_stmt(#20133,#20122)
-expr_containers(#20133,#20001)
-literals("x","x",#20133)
-bind(#20133,#20110)
+literals("log","log",#20131)
+#20132=*
+exprs(#20132,34,#20125,0,"x + y")
+#20133=@"loc,{#10000},4,15,4,19"
+locations_default(#20133,#10000,4,15,4,19)
+hasLocation(#20132,#20133)
+enclosing_stmt(#20132,#20123)
+expr_containers(#20132,#20001)
 #20134=*
-exprs(#20134,79,#20131,1,"y")
-hasLocation(#20134,#20069)
-enclosing_stmt(#20134,#20122)
+exprs(#20134,79,#20132,0,"x")
+hasLocation(#20134,#20065)
+enclosing_stmt(#20134,#20123)
 expr_containers(#20134,#20001)
-literals("y","y",#20134)
+literals("x","x",#20134)
 bind(#20134,#20111)
 #20135=*
-stmts(#20135,2,#20001,2,"console.log(x - y);")
-hasLocation(#20135,#20015)
-stmt_containers(#20135,#20001)
+exprs(#20135,79,#20132,1,"y")
+hasLocation(#20135,#20069)
+enclosing_stmt(#20135,#20123)
+expr_containers(#20135,#20001)
+literals("y","y",#20135)
+bind(#20135,#20112)
 #20136=*
-exprs(#20136,13,#20135,0,"console.log(x - y)")
-#20137=@"loc,{#10000},7,1,7,18"
-locations_default(#20137,#10000,7,1,7,18)
-hasLocation(#20136,#20137)
-enclosing_stmt(#20136,#20135)
-expr_containers(#20136,#20001)
-#20138=*
-exprs(#20138,14,#20136,-1,"console.log")
-#20139=@"loc,{#10000},7,1,7,11"
-locations_default(#20139,#10000,7,1,7,11)
-hasLocation(#20138,#20139)
-enclosing_stmt(#20138,#20135)
-expr_containers(#20138,#20001)
-#20140=*
-exprs(#20140,79,#20138,0,"console")
-hasLocation(#20140,#20076)
-enclosing_stmt(#20140,#20135)
-expr_containers(#20140,#20001)
-literals("console","console",#20140)
-bind(#20140,#20129)
+stmts(#20136,2,#20001,2,"console.log(x - y);")
+hasLocation(#20136,#20015)
+stmt_containers(#20136,#20001)
+#20137=*
+exprs(#20137,13,#20136,0,"console.log(x - y)")
+#20138=@"loc,{#10000},7,1,7,18"
+locations_default(#20138,#10000,7,1,7,18)
+hasLocation(#20137,#20138)
+enclosing_stmt(#20137,#20136)
+expr_containers(#20137,#20001)
+#20139=*
+exprs(#20139,14,#20137,-1,"console.log")
+#20140=@"loc,{#10000},7,1,7,11"
+locations_default(#20140,#10000,7,1,7,11)
+hasLocation(#20139,#20140)
+enclosing_stmt(#20139,#20136)
+expr_containers(#20139,#20001)
 #20141=*
-exprs(#20141,0,#20138,1,"log")
-hasLocation(#20141,#20080)
-enclosing_stmt(#20141,#20135)
+exprs(#20141,79,#20139,0,"console")
+hasLocation(#20141,#20076)
+enclosing_stmt(#20141,#20136)
 expr_containers(#20141,#20001)
-literals("log","log",#20141)
+literals("console","console",#20141)
+bind(#20141,#20130)
 #20142=*
-exprs(#20142,35,#20136,0,"x - y")
-#20143=@"loc,{#10000},7,13,7,17"
-locations_default(#20143,#10000,7,13,7,17)
-hasLocation(#20142,#20143)
-enclosing_stmt(#20142,#20135)
+exprs(#20142,0,#20139,1,"log")
+hasLocation(#20142,#20080)
+enclosing_stmt(#20142,#20136)
 expr_containers(#20142,#20001)
-#20144=*
-exprs(#20144,79,#20142,0,"x")
-hasLocation(#20144,#20084)
-enclosing_stmt(#20144,#20135)
-expr_containers(#20144,#20001)
-literals("x","x",#20144)
-bind(#20144,#20096)
+literals("log","log",#20142)
+#20143=*
+exprs(#20143,35,#20137,0,"x - y")
+#20144=@"loc,{#10000},7,13,7,17"
+locations_default(#20144,#10000,7,13,7,17)
+hasLocation(#20143,#20144)
+enclosing_stmt(#20143,#20136)
+expr_containers(#20143,#20001)
 #20145=*
-exprs(#20145,79,#20142,1,"y")
-hasLocation(#20145,#20088)
-enclosing_stmt(#20145,#20135)
+exprs(#20145,79,#20143,0,"x")
+hasLocation(#20145,#20084)
+enclosing_stmt(#20145,#20136)
 expr_containers(#20145,#20001)
-literals("y","y",#20145)
-bind(#20145,#20097)
+literals("x","x",#20145)
+bind(#20145,#20096)
 #20146=*
-entry_cfg_node(#20146,#20001)
-#20147=@"loc,{#10000},1,1,1,0"
-locations_default(#20147,#10000,1,1,1,0)
-hasLocation(#20146,#20147)
-#20148=*
-exit_cfg_node(#20148,#20001)
-hasLocation(#20148,#20094)
-successor(#20135,#20140)
-successor(#20145,#20142)
-successor(#20144,#20145)
-successor(#20142,#20136)
-successor(#20141,#20138)
-successor(#20140,#20141)
-successor(#20138,#20144)
-successor(#20136,#20148)
-successor(#20107,#20114)
-successor(#20122,#20128)
-successor(#20134,#20131)
-successor(#20133,#20134)
-successor(#20131,#20124)
-successor(#20130,#20126)
-successor(#20128,#20130)
-successor(#20126,#20133)
-successor(#20124,#20135)
-successor(#20120,#20122)
-successor(#20119,#20116)
-successor(#20118,#20119)
-successor(#20116,#20120)
-successor(#20115,#20112)
-successor(#20114,#20115)
-successor(#20112,#20118)
-successor(#20098,#20101)
-successor(#20106,#20103)
-successor(#20105,#20106)
-successor(#20103,#20107)
-successor(#20102,#20099)
-successor(#20101,#20102)
-successor(#20099,#20105)
-successor(#20146,#20098)
+exprs(#20146,79,#20143,1,"y")
+hasLocation(#20146,#20088)
+enclosing_stmt(#20146,#20136)
+expr_containers(#20146,#20001)
+literals("y","y",#20146)
+bind(#20146,#20097)
+#20147=*
+entry_cfg_node(#20147,#20001)
+#20148=@"loc,{#10000},1,1,1,0"
+locations_default(#20148,#10000,1,1,1,0)
+hasLocation(#20147,#20148)
+#20149=*
+exit_cfg_node(#20149,#20001)
+hasLocation(#20149,#20094)
+successor(#20136,#20141)
+successor(#20146,#20143)
+successor(#20145,#20146)
+successor(#20143,#20137)
+successor(#20142,#20139)
+successor(#20141,#20142)
+successor(#20139,#20145)
+successor(#20137,#20149)
+successor(#20108,#20115)
+successor(#20123,#20129)
+successor(#20135,#20132)
+successor(#20134,#20135)
+successor(#20132,#20125)
+successor(#20131,#20127)
+successor(#20129,#20131)
+successor(#20127,#20134)
+successor(#20125,#20136)
+successor(#20121,#20123)
+successor(#20120,#20117)
+successor(#20119,#20120)
+successor(#20117,#20121)
+successor(#20116,#20113)
+successor(#20115,#20116)
+successor(#20113,#20119)
+successor(#20099,#20102)
+successor(#20107,#20104)
+successor(#20106,#20107)
+successor(#20104,#20108)
+successor(#20103,#20100)
+successor(#20102,#20103)
+successor(#20100,#20106)
+successor(#20147,#20099)
 numlines(#10000,7,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/mozilla/output/trap/letStmt2.js.trap b/javascript/extractor/tests/mozilla/output/trap/letStmt2.js.trap
index d81fb77a243..6a42e573b22 100644
--- a/javascript/extractor/tests/mozilla/output/trap/letStmt2.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/letStmt2.js.trap
@@ -62,60 +62,62 @@ locations_default(#20020,#10000,1,1,2,0)
 hasLocation(#20001,#20020)
 #20021=@"var;{x};{#20000}"
 variables(#20021,"x",#20000)
-#20022=*
-stmts(#20022,24,#20001,0,"let (x = 0) 1")
-hasLocation(#20022,#20003)
-stmt_containers(#20022,#20001)
+#20022=@"var;{this};{#20000}"
+variables(#20022,"this",#20000)
 #20023=*
-scopes(#20023,4)
-scopenodes(#20022,#20023)
-scopenesting(#20023,#20000)
-#20024=@"var;{x};{#20023}"
-variables(#20024,"x",#20023)
-#20025=*
-exprs(#20025,64,#20022,0,"x = 0")
-#20026=@"loc,{#10000},1,6,1,10"
-locations_default(#20026,#10000,1,6,1,10)
-hasLocation(#20025,#20026)
-enclosing_stmt(#20025,#20022)
-expr_containers(#20025,#20001)
-#20027=*
-exprs(#20027,78,#20025,0,"x")
-hasLocation(#20027,#20009)
-enclosing_stmt(#20027,#20022)
-expr_containers(#20027,#20001)
-literals("x","x",#20027)
-decl(#20027,#20024)
+stmts(#20023,24,#20001,0,"let (x = 0) 1")
+hasLocation(#20023,#20003)
+stmt_containers(#20023,#20001)
+#20024=*
+scopes(#20024,4)
+scopenodes(#20023,#20024)
+scopenesting(#20024,#20000)
+#20025=@"var;{x};{#20024}"
+variables(#20025,"x",#20024)
+#20026=*
+exprs(#20026,64,#20023,0,"x = 0")
+#20027=@"loc,{#10000},1,6,1,10"
+locations_default(#20027,#10000,1,6,1,10)
+hasLocation(#20026,#20027)
+enclosing_stmt(#20026,#20023)
+expr_containers(#20026,#20001)
 #20028=*
-exprs(#20028,3,#20025,1,"0")
-hasLocation(#20028,#20013)
-enclosing_stmt(#20028,#20022)
+exprs(#20028,78,#20026,0,"x")
+hasLocation(#20028,#20009)
+enclosing_stmt(#20028,#20023)
 expr_containers(#20028,#20001)
-literals("0","0",#20028)
+literals("x","x",#20028)
+decl(#20028,#20025)
 #20029=*
-stmts(#20029,2,#20022,-1,"1")
-hasLocation(#20029,#20017)
-stmt_containers(#20029,#20001)
+exprs(#20029,3,#20026,1,"0")
+hasLocation(#20029,#20013)
+enclosing_stmt(#20029,#20023)
+expr_containers(#20029,#20001)
+literals("0","0",#20029)
 #20030=*
-exprs(#20030,3,#20029,0,"1")
+stmts(#20030,2,#20023,-1,"1")
 hasLocation(#20030,#20017)
-enclosing_stmt(#20030,#20029)
-expr_containers(#20030,#20001)
-literals("1","1",#20030)
+stmt_containers(#20030,#20001)
 #20031=*
-entry_cfg_node(#20031,#20001)
-#20032=@"loc,{#10000},1,1,1,0"
-locations_default(#20032,#10000,1,1,1,0)
-hasLocation(#20031,#20032)
-#20033=*
-exit_cfg_node(#20033,#20001)
-hasLocation(#20033,#20019)
-successor(#20022,#20027)
-successor(#20029,#20030)
-successor(#20030,#20033)
-successor(#20028,#20025)
-successor(#20027,#20028)
-successor(#20025,#20029)
-successor(#20031,#20022)
+exprs(#20031,3,#20030,0,"1")
+hasLocation(#20031,#20017)
+enclosing_stmt(#20031,#20030)
+expr_containers(#20031,#20001)
+literals("1","1",#20031)
+#20032=*
+entry_cfg_node(#20032,#20001)
+#20033=@"loc,{#10000},1,1,1,0"
+locations_default(#20033,#10000,1,1,1,0)
+hasLocation(#20032,#20033)
+#20034=*
+exit_cfg_node(#20034,#20001)
+hasLocation(#20034,#20019)
+successor(#20023,#20028)
+successor(#20030,#20031)
+successor(#20031,#20034)
+successor(#20029,#20026)
+successor(#20028,#20029)
+successor(#20026,#20030)
+successor(#20032,#20023)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/mozilla/output/trap/new-with-trailing-arg.js.trap b/javascript/extractor/tests/mozilla/output/trap/new-with-trailing-arg.js.trap
index a2a88241cd2..d8b5cc155c7 100644
--- a/javascript/extractor/tests/mozilla/output/trap/new-with-trailing-arg.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/new-with-trailing-arg.js.trap
@@ -137,93 +137,95 @@ toplevels(#20001,0)
 #20048=@"loc,{#10000},1,1,6,2"
 locations_default(#20048,#10000,1,1,6,2)
 hasLocation(#20001,#20048)
-#20049=*
-stmts(#20049,2,#20001,0,"new A() ... ""bar"" }")
-hasLocation(#20049,#20008)
-stmt_containers(#20049,#20001)
+#20049=@"var;{this};{#20000}"
+variables(#20049,"this",#20000)
 #20050=*
-exprs(#20050,12,#20049,0,"new A() ... ""bar"" }")
+stmts(#20050,2,#20001,0,"new A() ... ""bar"" }")
 hasLocation(#20050,#20008)
-enclosing_stmt(#20050,#20049)
-expr_containers(#20050,#20001)
+stmt_containers(#20050,#20001)
 #20051=*
-exprs(#20051,79,#20050,-1,"A")
-hasLocation(#20051,#20019)
-enclosing_stmt(#20051,#20049)
+exprs(#20051,12,#20050,0,"new A() ... ""bar"" }")
+hasLocation(#20051,#20008)
+enclosing_stmt(#20051,#20050)
 expr_containers(#20051,#20001)
-literals("A","A",#20051)
-#20052=@"var;{A};{#20000}"
-variables(#20052,"A",#20000)
-bind(#20051,#20052)
-#20053=*
-exprs(#20053,8,#20050,0,"{ foo: ""bar"" }")
-#20054=@"loc,{#10000},2,9,2,22"
-locations_default(#20054,#10000,2,9,2,22)
-hasLocation(#20053,#20054)
-enclosing_stmt(#20053,#20049)
-expr_containers(#20053,#20001)
-#20055=*
-properties(#20055,#20053,0,0,"foo: ""bar""")
-#20056=@"loc,{#10000},2,11,2,20"
-locations_default(#20056,#10000,2,11,2,20)
-hasLocation(#20055,#20056)
-#20057=*
-exprs(#20057,0,#20055,0,"foo")
-hasLocation(#20057,#20027)
-enclosing_stmt(#20057,#20049)
-expr_containers(#20057,#20001)
-literals("foo","foo",#20057)
+#20052=*
+exprs(#20052,79,#20051,-1,"A")
+hasLocation(#20052,#20019)
+enclosing_stmt(#20052,#20050)
+expr_containers(#20052,#20001)
+literals("A","A",#20052)
+#20053=@"var;{A};{#20000}"
+variables(#20053,"A",#20000)
+bind(#20052,#20053)
+#20054=*
+exprs(#20054,8,#20051,0,"{ foo: ""bar"" }")
+#20055=@"loc,{#10000},2,9,2,22"
+locations_default(#20055,#10000,2,9,2,22)
+hasLocation(#20054,#20055)
+enclosing_stmt(#20054,#20050)
+expr_containers(#20054,#20001)
+#20056=*
+properties(#20056,#20054,0,0,"foo: ""bar""")
+#20057=@"loc,{#10000},2,11,2,20"
+locations_default(#20057,#10000,2,11,2,20)
+hasLocation(#20056,#20057)
 #20058=*
-exprs(#20058,4,#20055,1,"""bar""")
-hasLocation(#20058,#20031)
-enclosing_stmt(#20058,#20049)
+exprs(#20058,0,#20056,0,"foo")
+hasLocation(#20058,#20027)
+enclosing_stmt(#20058,#20050)
 expr_containers(#20058,#20001)
-literals("bar","""bar""",#20058)
+literals("foo","foo",#20058)
 #20059=*
-regexpterm(#20059,14,#20058,0,"bar")
-#20060=@"loc,{#10000},2,17,2,19"
-locations_default(#20060,#10000,2,17,2,19)
-hasLocation(#20059,#20060)
-regexp_const_value(#20059,"bar")
-#20061=*
-stmts(#20061,2,#20001,1,"new A()")
-hasLocation(#20061,#20013)
-stmt_containers(#20061,#20001)
+exprs(#20059,4,#20056,1,"""bar""")
+hasLocation(#20059,#20031)
+enclosing_stmt(#20059,#20050)
+expr_containers(#20059,#20001)
+literals("bar","""bar""",#20059)
+#20060=*
+regexpterm(#20060,14,#20059,0,"bar")
+#20061=@"loc,{#10000},2,17,2,19"
+locations_default(#20061,#10000,2,17,2,19)
+hasLocation(#20060,#20061)
+regexp_const_value(#20060,"bar")
 #20062=*
-exprs(#20062,12,#20061,0,"new A()")
+stmts(#20062,2,#20001,1,"new A()")
 hasLocation(#20062,#20013)
-enclosing_stmt(#20062,#20061)
-expr_containers(#20062,#20001)
+stmt_containers(#20062,#20001)
 #20063=*
-exprs(#20063,79,#20062,-1,"A")
-hasLocation(#20063,#20037)
-enclosing_stmt(#20063,#20061)
+exprs(#20063,12,#20062,0,"new A()")
+hasLocation(#20063,#20013)
+enclosing_stmt(#20063,#20062)
 expr_containers(#20063,#20001)
-literals("A","A",#20063)
-bind(#20063,#20052)
 #20064=*
-stmts(#20064,1,#20001,2,"{}")
-hasLocation(#20064,#20015)
-stmt_containers(#20064,#20001)
+exprs(#20064,79,#20063,-1,"A")
+hasLocation(#20064,#20037)
+enclosing_stmt(#20064,#20062)
+expr_containers(#20064,#20001)
+literals("A","A",#20064)
+bind(#20064,#20053)
 #20065=*
-entry_cfg_node(#20065,#20001)
-#20066=@"loc,{#10000},1,1,1,0"
-locations_default(#20066,#10000,1,1,1,0)
-hasLocation(#20065,#20066)
-#20067=*
-exit_cfg_node(#20067,#20001)
-hasLocation(#20067,#20047)
-successor(#20064,#20067)
-successor(#20061,#20063)
-successor(#20063,#20062)
+stmts(#20065,1,#20001,2,"{}")
+hasLocation(#20065,#20015)
+stmt_containers(#20065,#20001)
+#20066=*
+entry_cfg_node(#20066,#20001)
+#20067=@"loc,{#10000},1,1,1,0"
+locations_default(#20067,#10000,1,1,1,0)
+hasLocation(#20066,#20067)
+#20068=*
+exit_cfg_node(#20068,#20001)
+hasLocation(#20068,#20047)
+successor(#20065,#20068)
 successor(#20062,#20064)
-successor(#20049,#20051)
-successor(#20053,#20057)
-successor(#20058,#20055)
-successor(#20057,#20058)
-successor(#20055,#20050)
-successor(#20051,#20053)
-successor(#20050,#20061)
-successor(#20065,#20049)
+successor(#20064,#20063)
+successor(#20063,#20065)
+successor(#20050,#20052)
+successor(#20054,#20058)
+successor(#20059,#20056)
+successor(#20058,#20059)
+successor(#20056,#20051)
+successor(#20052,#20054)
+successor(#20051,#20062)
+successor(#20066,#20050)
 numlines(#10000,6,3,2)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/mozilla/output/trap/odasa-2593.js.trap b/javascript/extractor/tests/mozilla/output/trap/odasa-2593.js.trap
index 7cc4e9be221..899b4a77071 100644
--- a/javascript/extractor/tests/mozilla/output/trap/odasa-2593.js.trap
+++ b/javascript/extractor/tests/mozilla/output/trap/odasa-2593.js.trap
@@ -109,95 +109,99 @@ locations_default(#20037,#10000,1,1,4,1)
 hasLocation(#20001,#20037)
 #20038=@"var;{test};{#20000}"
 variables(#20038,"test",#20000)
-#20039=*
-stmts(#20039,17,#20001,0,"functio ... nts);\n}")
-hasLocation(#20039,#20037)
-stmt_containers(#20039,#20001)
+#20039=@"var;{this};{#20000}"
+variables(#20039,"this",#20000)
 #20040=*
-exprs(#20040,78,#20039,-1,"test")
-hasLocation(#20040,#20013)
-expr_containers(#20040,#20039)
-literals("test","test",#20040)
-decl(#20040,#20038)
+stmts(#20040,17,#20001,0,"functio ... nts);\n}")
+hasLocation(#20040,#20037)
+stmt_containers(#20040,#20001)
 #20041=*
-scopes(#20041,1)
-scopenodes(#20039,#20041)
-scopenesting(#20041,#20000)
-#20042=@"var;{arguments};{#20041}"
-variables(#20042,"arguments",#20041)
-is_arguments_object(#20042)
-#20043=*
-stmts(#20043,1,#20039,-2,"{\n    a ... nts);\n}")
-#20044=@"loc,{#10000},1,17,4,1"
-locations_default(#20044,#10000,1,17,4,1)
-hasLocation(#20043,#20044)
-stmt_containers(#20043,#20039)
+exprs(#20041,78,#20040,-1,"test")
+hasLocation(#20041,#20013)
+expr_containers(#20041,#20040)
+literals("test","test",#20041)
+decl(#20041,#20038)
+#20042=*
+scopes(#20042,1)
+scopenodes(#20040,#20042)
+scopenesting(#20042,#20000)
+#20043=@"var;{this};{#20042}"
+variables(#20043,"this",#20042)
+#20044=@"var;{arguments};{#20042}"
+variables(#20044,"arguments",#20042)
+is_arguments_object(#20044)
 #20045=*
-stmts(#20045,2,#20043,0,"arguments;")
-#20046=@"loc,{#10000},2,5,2,14"
-locations_default(#20046,#10000,2,5,2,14)
+stmts(#20045,1,#20040,-2,"{\n    a ... nts);\n}")
+#20046=@"loc,{#10000},1,17,4,1"
+locations_default(#20046,#10000,1,17,4,1)
 hasLocation(#20045,#20046)
-stmt_containers(#20045,#20039)
+stmt_containers(#20045,#20040)
 #20047=*
-exprs(#20047,79,#20045,0,"arguments")
-hasLocation(#20047,#20021)
-enclosing_stmt(#20047,#20045)
-expr_containers(#20047,#20039)
-literals("arguments","arguments",#20047)
-bind(#20047,#20042)
-#20048=*
-stmts(#20048,2,#20043,1,"let (arguments);")
-#20049=@"loc,{#10000},3,5,3,20"
-locations_default(#20049,#10000,3,5,3,20)
-hasLocation(#20048,#20049)
-stmt_containers(#20048,#20039)
+stmts(#20047,2,#20045,0,"arguments;")
+#20048=@"loc,{#10000},2,5,2,14"
+locations_default(#20048,#10000,2,5,2,14)
+hasLocation(#20047,#20048)
+stmt_containers(#20047,#20040)
+#20049=*
+exprs(#20049,79,#20047,0,"arguments")
+hasLocation(#20049,#20021)
+enclosing_stmt(#20049,#20047)
+expr_containers(#20049,#20040)
+literals("arguments","arguments",#20049)
+bind(#20049,#20044)
 #20050=*
-exprs(#20050,13,#20048,0,"let (arguments)")
-#20051=@"loc,{#10000},3,5,3,19"
-locations_default(#20051,#10000,3,5,3,19)
+stmts(#20050,2,#20045,1,"let (arguments);")
+#20051=@"loc,{#10000},3,5,3,20"
+locations_default(#20051,#10000,3,5,3,20)
 hasLocation(#20050,#20051)
-enclosing_stmt(#20050,#20048)
-expr_containers(#20050,#20039)
+stmt_containers(#20050,#20040)
 #20052=*
-exprs(#20052,79,#20050,-1,"let")
-hasLocation(#20052,#20025)
-enclosing_stmt(#20052,#20048)
-expr_containers(#20052,#20039)
-literals("let","let",#20052)
-#20053=@"var;{let};{#20000}"
-variables(#20053,"let",#20000)
-bind(#20052,#20053)
+exprs(#20052,13,#20050,0,"let (arguments)")
+#20053=@"loc,{#10000},3,5,3,19"
+locations_default(#20053,#10000,3,5,3,19)
+hasLocation(#20052,#20053)
+enclosing_stmt(#20052,#20050)
+expr_containers(#20052,#20040)
 #20054=*
-exprs(#20054,79,#20050,0,"arguments")
-hasLocation(#20054,#20029)
-enclosing_stmt(#20054,#20048)
-expr_containers(#20054,#20039)
-literals("arguments","arguments",#20054)
-bind(#20054,#20042)
-#20055=*
-entry_cfg_node(#20055,#20001)
-#20056=@"loc,{#10000},1,1,1,0"
-locations_default(#20056,#10000,1,1,1,0)
-hasLocation(#20055,#20056)
+exprs(#20054,79,#20052,-1,"let")
+hasLocation(#20054,#20025)
+enclosing_stmt(#20054,#20050)
+expr_containers(#20054,#20040)
+literals("let","let",#20054)
+#20055=@"var;{let};{#20000}"
+variables(#20055,"let",#20000)
+bind(#20054,#20055)
+#20056=*
+exprs(#20056,79,#20052,0,"arguments")
+hasLocation(#20056,#20029)
+enclosing_stmt(#20056,#20050)
+expr_containers(#20056,#20040)
+literals("arguments","arguments",#20056)
+bind(#20056,#20044)
 #20057=*
-exit_cfg_node(#20057,#20001)
-hasLocation(#20057,#20036)
-successor(#20039,#20057)
-#20058=*
-entry_cfg_node(#20058,#20039)
-hasLocation(#20058,#20056)
+entry_cfg_node(#20057,#20001)
+#20058=@"loc,{#10000},1,1,1,0"
+locations_default(#20058,#10000,1,1,1,0)
+hasLocation(#20057,#20058)
 #20059=*
-exit_cfg_node(#20059,#20039)
+exit_cfg_node(#20059,#20001)
 hasLocation(#20059,#20036)
-successor(#20048,#20052)
-successor(#20054,#20050)
-successor(#20052,#20054)
-successor(#20050,#20059)
+successor(#20040,#20059)
+#20060=*
+entry_cfg_node(#20060,#20040)
+hasLocation(#20060,#20058)
+#20061=*
+exit_cfg_node(#20061,#20040)
+hasLocation(#20061,#20036)
+successor(#20050,#20054)
+successor(#20056,#20052)
+successor(#20054,#20056)
+successor(#20052,#20061)
+successor(#20047,#20049)
+successor(#20049,#20050)
 successor(#20045,#20047)
-successor(#20047,#20048)
-successor(#20043,#20045)
-successor(#20058,#20043)
-successor(#20040,#20039)
-successor(#20055,#20040)
+successor(#20060,#20045)
+successor(#20041,#20040)
+successor(#20057,#20041)
 numlines(#10000,4,4,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/ng-templates/output/trap/component.js.trap b/javascript/extractor/tests/ng-templates/output/trap/component.js.trap
index 3f03793bcc2..6fd46954eb1 100644
--- a/javascript/extractor/tests/ng-templates/output/trap/component.js.trap
+++ b/javascript/extractor/tests/ng-templates/output/trap/component.js.trap
@@ -222,103 +222,105 @@ local_type_names(#20073,"Component",#20071)
 #20076=@"local_type_name;{MyComponent};{#20071}"
 local_type_names(#20076,"MyComponent",#20071)
 local_namespace_names(#20074,"Component",#20071)
-#20077=*
-stmts(#20077,27,#20001,0,"import  ... /core"";")
-hasLocation(#20077,#20003)
-stmt_containers(#20077,#20001)
+#20077=@"var;{this};{#20071}"
+variables(#20077,"this",#20071)
 #20078=*
-exprs(#20078,4,#20077,-1,"""@angular/core""")
-hasLocation(#20078,#20033)
-enclosing_stmt(#20078,#20077)
-expr_containers(#20078,#20001)
-literals("@angular/core","""@angular/core""",#20078)
+stmts(#20078,27,#20001,0,"import  ... /core"";")
+hasLocation(#20078,#20003)
+stmt_containers(#20078,#20001)
 #20079=*
-regexpterm(#20079,14,#20078,0,"@angular/core")
-#20080=@"loc,{#10000},1,28,1,40"
-locations_default(#20080,#10000,1,28,1,40)
-hasLocation(#20079,#20080)
-regexp_const_value(#20079,"@angular/core")
-#20081=*
-exprs(#20081,83,#20077,0,"Component")
-hasLocation(#20081,#20027)
-enclosing_stmt(#20081,#20077)
-expr_containers(#20081,#20001)
+exprs(#20079,4,#20078,-1,"""@angular/core""")
+hasLocation(#20079,#20033)
+enclosing_stmt(#20079,#20078)
+expr_containers(#20079,#20001)
+literals("@angular/core","""@angular/core""",#20079)
+#20080=*
+regexpterm(#20080,14,#20079,0,"@angular/core")
+#20081=@"loc,{#10000},1,28,1,40"
+locations_default(#20081,#10000,1,28,1,40)
+hasLocation(#20080,#20081)
+regexp_const_value(#20080,"@angular/core")
 #20082=*
-exprs(#20082,0,#20081,0,"Component")
+exprs(#20082,83,#20078,0,"Component")
 hasLocation(#20082,#20027)
-enclosing_stmt(#20082,#20077)
+enclosing_stmt(#20082,#20078)
 expr_containers(#20082,#20001)
-literals("Component","Component",#20082)
 #20083=*
-exprs(#20083,78,#20081,1,"Component")
+exprs(#20083,0,#20082,0,"Component")
 hasLocation(#20083,#20027)
-enclosing_stmt(#20083,#20077)
+enclosing_stmt(#20083,#20078)
 expr_containers(#20083,#20001)
 literals("Component","Component",#20083)
-decl(#20083,#20072)
-typedecl(#20083,#20073)
-namespacedecl(#20083,#20074)
 #20084=*
-stmts(#20084,30,#20001,1,"export  ... nent {}")
-hasLocation(#20084,#20021)
-stmt_containers(#20084,#20001)
+exprs(#20084,78,#20082,1,"Component")
+hasLocation(#20084,#20027)
+enclosing_stmt(#20084,#20078)
+expr_containers(#20084,#20001)
+literals("Component","Component",#20084)
+decl(#20084,#20072)
+typedecl(#20084,#20073)
+namespacedecl(#20084,#20074)
 #20085=*
-stmts(#20085,26,#20084,-1,"class MyComponent {}")
-#20086=@"loc,{#10000},10,8,10,27"
-locations_default(#20086,#10000,10,8,10,27)
-hasLocation(#20085,#20086)
+stmts(#20085,30,#20001,1,"export  ... nent {}")
+hasLocation(#20085,#20021)
 stmt_containers(#20085,#20001)
-#20087=*
-exprs(#20087,94,#20085,-2,"@Compon ... >\n\t`\n})")
-#20088=@"loc,{#10000},3,1,9,2"
-locations_default(#20088,#10000,3,1,9,2)
-hasLocation(#20087,#20088)
-enclosing_stmt(#20087,#20085)
-expr_containers(#20087,#20001)
-#20089=*
-exprs(#20089,13,#20087,0,"Compone ... >\n\t`\n})")
-#20090=@"loc,{#10000},3,2,9,2"
-locations_default(#20090,#10000,3,2,9,2)
-hasLocation(#20089,#20090)
-enclosing_stmt(#20089,#20085)
-expr_containers(#20089,#20001)
-#20091=*
-exprs(#20091,79,#20089,-1,"Component")
-hasLocation(#20091,#20039)
-enclosing_stmt(#20091,#20085)
-expr_containers(#20091,#20001)
-literals("Component","Component",#20091)
-bind(#20091,#20072)
+#20086=*
+stmts(#20086,26,#20085,-1,"class MyComponent {}")
+#20087=@"loc,{#10000},10,8,10,27"
+locations_default(#20087,#10000,10,8,10,27)
+hasLocation(#20086,#20087)
+stmt_containers(#20086,#20001)
+#20088=*
+exprs(#20088,94,#20086,-2,"@Compon ... >\n\t`\n})")
+#20089=@"loc,{#10000},3,1,9,2"
+locations_default(#20089,#10000,3,1,9,2)
+hasLocation(#20088,#20089)
+enclosing_stmt(#20088,#20086)
+expr_containers(#20088,#20001)
+#20090=*
+exprs(#20090,13,#20088,0,"Compone ... >\n\t`\n})")
+#20091=@"loc,{#10000},3,2,9,2"
+locations_default(#20091,#10000,3,2,9,2)
+hasLocation(#20090,#20091)
+enclosing_stmt(#20090,#20086)
+expr_containers(#20090,#20001)
 #20092=*
-exprs(#20092,8,#20089,0,"{\n\ttemp ... />\n\t`\n}")
-#20093=@"loc,{#10000},3,12,9,1"
-locations_default(#20093,#10000,3,12,9,1)
-hasLocation(#20092,#20093)
-enclosing_stmt(#20092,#20085)
+exprs(#20092,79,#20090,-1,"Component")
+hasLocation(#20092,#20039)
+enclosing_stmt(#20092,#20086)
 expr_containers(#20092,#20001)
-#20094=*
-properties(#20094,#20092,0,0,"templat ... "" />\n\t`")
-#20095=@"loc,{#10000},4,2,8,2"
-locations_default(#20095,#10000,4,2,8,2)
-hasLocation(#20094,#20095)
-#20096=*
-exprs(#20096,0,#20094,0,"template")
-hasLocation(#20096,#20045)
-enclosing_stmt(#20096,#20085)
-expr_containers(#20096,#20001)
-literals("template","template",#20096)
+literals("Component","Component",#20092)
+bind(#20092,#20072)
+#20093=*
+exprs(#20093,8,#20090,0,"{\n\ttemp ... />\n\t`\n}")
+#20094=@"loc,{#10000},3,12,9,1"
+locations_default(#20094,#10000,3,12,9,1)
+hasLocation(#20093,#20094)
+enclosing_stmt(#20093,#20086)
+expr_containers(#20093,#20001)
+#20095=*
+properties(#20095,#20093,0,0,"templat ... "" />\n\t`")
+#20096=@"loc,{#10000},4,2,8,2"
+locations_default(#20096,#10000,4,2,8,2)
+hasLocation(#20095,#20096)
 #20097=*
-exprs(#20097,71,#20094,1,"`\n\t<foo ... "" />\n\t`")
-#20098=@"loc,{#10000},4,12,8,2"
-locations_default(#20098,#10000,4,12,8,2)
-hasLocation(#20097,#20098)
-enclosing_stmt(#20097,#20085)
+exprs(#20097,0,#20095,0,"template")
+hasLocation(#20097,#20045)
+enclosing_stmt(#20097,#20086)
 expr_containers(#20097,#20001)
-#20099=*
-exprs(#20099,72,#20097,0,"\n\t<foo  ... r"" />\n\t")
-hasLocation(#20099,#20051)
-enclosing_stmt(#20099,#20085)
-expr_containers(#20099,#20001)
+literals("template","template",#20097)
+#20098=*
+exprs(#20098,71,#20095,1,"`\n\t<foo ... "" />\n\t`")
+#20099=@"loc,{#10000},4,12,8,2"
+locations_default(#20099,#10000,4,12,8,2)
+hasLocation(#20098,#20099)
+enclosing_stmt(#20098,#20086)
+expr_containers(#20098,#20001)
+#20100=*
+exprs(#20100,72,#20098,0,"\n\t<foo  ... r"" />\n\t")
+hasLocation(#20100,#20051)
+enclosing_stmt(#20100,#20086)
+expr_containers(#20100,#20001)
 literals("
 	<foo [prop]=""expr + expr""/>
 	<foo [baz]=""expr!"" />
@@ -327,344 +329,354 @@ literals("
 	<foo [prop]=""expr + expr""/>
 	<foo [baz]=""expr!"" />
 	<foo [baz]=""expr?.bar"" />
-	",#20099)
+	",#20100)
 scopes(#20000,0)
-#20100=*
-#20101=@"script;{#10000},5,15"
-#20102=*
-lines(#20102,#20101,"expr + expr","")
-#20103=@"loc,{#10000},5,15,5,25"
-locations_default(#20103,#10000,5,15,5,25)
-hasLocation(#20102,#20103)
-numlines(#20101,1,1,0)
-#20104=*
-tokeninfo(#20104,6,#20101,0,"expr")
-#20105=@"loc,{#10000},5,15,5,18"
-locations_default(#20105,#10000,5,15,5,18)
-hasLocation(#20104,#20105)
-#20106=*
-tokeninfo(#20106,8,#20101,1,"+")
-#20107=@"loc,{#10000},5,20,5,20"
-locations_default(#20107,#10000,5,20,5,20)
-hasLocation(#20106,#20107)
-#20108=*
-tokeninfo(#20108,6,#20101,2,"expr")
-#20109=@"loc,{#10000},5,22,5,25"
-locations_default(#20109,#10000,5,22,5,25)
-hasLocation(#20108,#20109)
-#20110=*
-tokeninfo(#20110,0,#20101,3,"")
-#20111=@"loc,{#10000},5,26,5,25"
-locations_default(#20111,#10000,5,26,5,25)
-hasLocation(#20110,#20111)
-toplevels(#20101,4)
-hasLocation(#20101,#20103)
-#20112=@"module;{#10000},5,15"
-scopes(#20112,3)
-scopenodes(#20101,#20112)
-scopenesting(#20112,#20000)
-is_module(#20101)
-#20113=*
-stmts(#20113,2,#20101,0,"expr + expr")
-hasLocation(#20113,#20103)
-stmt_containers(#20113,#20101)
-#20114=*
-exprs(#20114,34,#20113,0,"expr + expr")
-hasLocation(#20114,#20103)
-enclosing_stmt(#20114,#20113)
-expr_containers(#20114,#20101)
+#20101=*
+#20102=@"script;{#10000},5,15"
+#20103=*
+lines(#20103,#20102,"expr + expr","")
+#20104=@"loc,{#10000},5,15,5,25"
+locations_default(#20104,#10000,5,15,5,25)
+hasLocation(#20103,#20104)
+numlines(#20102,1,1,0)
+#20105=*
+tokeninfo(#20105,6,#20102,0,"expr")
+#20106=@"loc,{#10000},5,15,5,18"
+locations_default(#20106,#10000,5,15,5,18)
+hasLocation(#20105,#20106)
+#20107=*
+tokeninfo(#20107,8,#20102,1,"+")
+#20108=@"loc,{#10000},5,20,5,20"
+locations_default(#20108,#10000,5,20,5,20)
+hasLocation(#20107,#20108)
+#20109=*
+tokeninfo(#20109,6,#20102,2,"expr")
+#20110=@"loc,{#10000},5,22,5,25"
+locations_default(#20110,#10000,5,22,5,25)
+hasLocation(#20109,#20110)
+#20111=*
+tokeninfo(#20111,0,#20102,3,"")
+#20112=@"loc,{#10000},5,26,5,25"
+locations_default(#20112,#10000,5,26,5,25)
+hasLocation(#20111,#20112)
+toplevels(#20102,4)
+hasLocation(#20102,#20104)
+#20113=@"module;{#10000},5,15"
+scopes(#20113,3)
+scopenodes(#20102,#20113)
+scopenesting(#20113,#20000)
+is_module(#20102)
+#20114=@"var;{this};{#20113}"
+variables(#20114,"this",#20113)
 #20115=*
-exprs(#20115,79,#20114,0,"expr")
-hasLocation(#20115,#20105)
-enclosing_stmt(#20115,#20113)
-expr_containers(#20115,#20101)
-literals("expr","expr",#20115)
-#20116=@"var;{expr};{#20112}"
-variables(#20116,"expr",#20112)
-bind(#20115,#20116)
+stmts(#20115,2,#20102,0,"expr + expr")
+hasLocation(#20115,#20104)
+stmt_containers(#20115,#20102)
+#20116=*
+exprs(#20116,34,#20115,0,"expr + expr")
+hasLocation(#20116,#20104)
+enclosing_stmt(#20116,#20115)
+expr_containers(#20116,#20102)
 #20117=*
-exprs(#20117,79,#20114,1,"expr")
-hasLocation(#20117,#20109)
-enclosing_stmt(#20117,#20113)
-expr_containers(#20117,#20101)
+exprs(#20117,79,#20116,0,"expr")
+hasLocation(#20117,#20106)
+enclosing_stmt(#20117,#20115)
+expr_containers(#20117,#20102)
 literals("expr","expr",#20117)
-bind(#20117,#20116)
-#20118=*
-entry_cfg_node(#20118,#20101)
-#20119=@"loc,{#10000},5,15,5,14"
-locations_default(#20119,#10000,5,15,5,14)
-hasLocation(#20118,#20119)
+#20118=@"var;{expr};{#20113}"
+variables(#20118,"expr",#20113)
+bind(#20117,#20118)
+#20119=*
+exprs(#20119,79,#20116,1,"expr")
+hasLocation(#20119,#20110)
+enclosing_stmt(#20119,#20115)
+expr_containers(#20119,#20102)
+literals("expr","expr",#20119)
+bind(#20119,#20118)
 #20120=*
-exit_cfg_node(#20120,#20101)
-hasLocation(#20120,#20111)
-successor(#20113,#20115)
-successor(#20117,#20114)
+entry_cfg_node(#20120,#20102)
+#20121=@"loc,{#10000},5,15,5,14"
+locations_default(#20121,#10000,5,15,5,14)
+hasLocation(#20120,#20121)
+#20122=*
+exit_cfg_node(#20122,#20102)
+hasLocation(#20122,#20112)
 successor(#20115,#20117)
-successor(#20114,#20120)
-successor(#20118,#20113)
-toplevel_parent_xml_node(#20101,#20100)
-#20121=*
-#20122=@"script;{#10000},6,14"
+successor(#20119,#20116)
+successor(#20117,#20119)
+successor(#20116,#20122)
+successor(#20120,#20115)
+toplevel_parent_xml_node(#20102,#20101)
 #20123=*
-lines(#20123,#20122,"expr!","")
-#20124=@"loc,{#10000},6,14,6,18"
-locations_default(#20124,#10000,6,14,6,18)
-hasLocation(#20123,#20124)
-numlines(#20122,1,1,0)
+#20124=@"script;{#10000},6,14"
 #20125=*
-tokeninfo(#20125,6,#20122,0,"expr")
-#20126=@"loc,{#10000},6,14,6,17"
-locations_default(#20126,#10000,6,14,6,17)
+lines(#20125,#20124,"expr!","")
+#20126=@"loc,{#10000},6,14,6,18"
+locations_default(#20126,#10000,6,14,6,18)
 hasLocation(#20125,#20126)
+numlines(#20124,1,1,0)
 #20127=*
-tokeninfo(#20127,8,#20122,1,"!")
-#20128=@"loc,{#10000},6,18,6,18"
-locations_default(#20128,#10000,6,18,6,18)
+tokeninfo(#20127,6,#20124,0,"expr")
+#20128=@"loc,{#10000},6,14,6,17"
+locations_default(#20128,#10000,6,14,6,17)
 hasLocation(#20127,#20128)
 #20129=*
-tokeninfo(#20129,0,#20122,2,"")
-#20130=@"loc,{#10000},6,19,6,18"
-locations_default(#20130,#10000,6,19,6,18)
+tokeninfo(#20129,8,#20124,1,"!")
+#20130=@"loc,{#10000},6,18,6,18"
+locations_default(#20130,#10000,6,18,6,18)
 hasLocation(#20129,#20130)
-toplevels(#20122,4)
-hasLocation(#20122,#20124)
-#20131=@"module;{#10000},6,14"
-scopes(#20131,3)
-scopenodes(#20122,#20131)
-scopenesting(#20131,#20000)
-is_module(#20122)
-#20132=*
-stmts(#20132,2,#20122,0,"expr!")
-hasLocation(#20132,#20124)
-stmt_containers(#20132,#20122)
-#20133=*
-exprs(#20133,105,#20132,0,"expr!")
-hasLocation(#20133,#20124)
-enclosing_stmt(#20133,#20132)
-expr_containers(#20133,#20122)
-#20134=*
-exprs(#20134,79,#20133,0,"expr")
-hasLocation(#20134,#20126)
-enclosing_stmt(#20134,#20132)
-expr_containers(#20134,#20122)
-literals("expr","expr",#20134)
-#20135=@"var;{expr};{#20131}"
-variables(#20135,"expr",#20131)
-bind(#20134,#20135)
+#20131=*
+tokeninfo(#20131,0,#20124,2,"")
+#20132=@"loc,{#10000},6,19,6,18"
+locations_default(#20132,#10000,6,19,6,18)
+hasLocation(#20131,#20132)
+toplevels(#20124,4)
+hasLocation(#20124,#20126)
+#20133=@"module;{#10000},6,14"
+scopes(#20133,3)
+scopenodes(#20124,#20133)
+scopenesting(#20133,#20000)
+is_module(#20124)
+#20134=@"var;{this};{#20133}"
+variables(#20134,"this",#20133)
+#20135=*
+stmts(#20135,2,#20124,0,"expr!")
+hasLocation(#20135,#20126)
+stmt_containers(#20135,#20124)
 #20136=*
-entry_cfg_node(#20136,#20122)
-#20137=@"loc,{#10000},6,14,6,13"
-locations_default(#20137,#10000,6,14,6,13)
-hasLocation(#20136,#20137)
-#20138=*
-exit_cfg_node(#20138,#20122)
-hasLocation(#20138,#20130)
-successor(#20132,#20134)
-successor(#20134,#20133)
-successor(#20133,#20138)
-successor(#20136,#20132)
-toplevel_parent_xml_node(#20122,#20121)
+exprs(#20136,105,#20135,0,"expr!")
+hasLocation(#20136,#20126)
+enclosing_stmt(#20136,#20135)
+expr_containers(#20136,#20124)
+#20137=*
+exprs(#20137,79,#20136,0,"expr")
+hasLocation(#20137,#20128)
+enclosing_stmt(#20137,#20135)
+expr_containers(#20137,#20124)
+literals("expr","expr",#20137)
+#20138=@"var;{expr};{#20133}"
+variables(#20138,"expr",#20133)
+bind(#20137,#20138)
 #20139=*
-#20140=@"script;{#10000},7,14"
+entry_cfg_node(#20139,#20124)
+#20140=@"loc,{#10000},6,14,6,13"
+locations_default(#20140,#10000,6,14,6,13)
+hasLocation(#20139,#20140)
 #20141=*
-lines(#20141,#20140,"expr?.bar","")
-#20142=@"loc,{#10000},7,14,7,22"
-locations_default(#20142,#10000,7,14,7,22)
-hasLocation(#20141,#20142)
-numlines(#20140,1,1,0)
-#20143=*
-tokeninfo(#20143,6,#20140,0,"expr")
-#20144=@"loc,{#10000},7,14,7,17"
-locations_default(#20144,#10000,7,14,7,17)
-hasLocation(#20143,#20144)
-#20145=*
-tokeninfo(#20145,8,#20140,1,"?.")
-#20146=@"loc,{#10000},7,18,7,19"
-locations_default(#20146,#10000,7,18,7,19)
-hasLocation(#20145,#20146)
-#20147=*
-tokeninfo(#20147,6,#20140,2,"bar")
-#20148=@"loc,{#10000},7,20,7,22"
-locations_default(#20148,#10000,7,20,7,22)
-hasLocation(#20147,#20148)
-#20149=*
-tokeninfo(#20149,0,#20140,3,"")
-#20150=@"loc,{#10000},7,23,7,22"
-locations_default(#20150,#10000,7,23,7,22)
-hasLocation(#20149,#20150)
-toplevels(#20140,4)
-hasLocation(#20140,#20142)
-#20151=@"module;{#10000},7,14"
-scopes(#20151,3)
-scopenodes(#20140,#20151)
-scopenesting(#20151,#20000)
-is_module(#20140)
+exit_cfg_node(#20141,#20124)
+hasLocation(#20141,#20132)
+successor(#20135,#20137)
+successor(#20137,#20136)
+successor(#20136,#20141)
+successor(#20139,#20135)
+toplevel_parent_xml_node(#20124,#20123)
+#20142=*
+#20143=@"script;{#10000},7,14"
+#20144=*
+lines(#20144,#20143,"expr?.bar","")
+#20145=@"loc,{#10000},7,14,7,22"
+locations_default(#20145,#10000,7,14,7,22)
+hasLocation(#20144,#20145)
+numlines(#20143,1,1,0)
+#20146=*
+tokeninfo(#20146,6,#20143,0,"expr")
+#20147=@"loc,{#10000},7,14,7,17"
+locations_default(#20147,#10000,7,14,7,17)
+hasLocation(#20146,#20147)
+#20148=*
+tokeninfo(#20148,8,#20143,1,"?.")
+#20149=@"loc,{#10000},7,18,7,19"
+locations_default(#20149,#10000,7,18,7,19)
+hasLocation(#20148,#20149)
+#20150=*
+tokeninfo(#20150,6,#20143,2,"bar")
+#20151=@"loc,{#10000},7,20,7,22"
+locations_default(#20151,#10000,7,20,7,22)
+hasLocation(#20150,#20151)
 #20152=*
-stmts(#20152,2,#20140,0,"expr?.bar")
-hasLocation(#20152,#20142)
-stmt_containers(#20152,#20140)
-#20153=*
-exprs(#20153,14,#20152,0,"expr?.bar")
-hasLocation(#20153,#20142)
-enclosing_stmt(#20153,#20152)
-expr_containers(#20153,#20140)
-#20154=*
-exprs(#20154,79,#20153,0,"expr")
-hasLocation(#20154,#20144)
-enclosing_stmt(#20154,#20152)
-expr_containers(#20154,#20140)
-literals("expr","expr",#20154)
-#20155=@"var;{expr};{#20151}"
-variables(#20155,"expr",#20151)
-bind(#20154,#20155)
+tokeninfo(#20152,0,#20143,3,"")
+#20153=@"loc,{#10000},7,23,7,22"
+locations_default(#20153,#10000,7,23,7,22)
+hasLocation(#20152,#20153)
+toplevels(#20143,4)
+hasLocation(#20143,#20145)
+#20154=@"module;{#10000},7,14"
+scopes(#20154,3)
+scopenodes(#20143,#20154)
+scopenesting(#20154,#20000)
+is_module(#20143)
+#20155=@"var;{this};{#20154}"
+variables(#20155,"this",#20154)
 #20156=*
-exprs(#20156,0,#20153,1,"bar")
-hasLocation(#20156,#20148)
-enclosing_stmt(#20156,#20152)
-expr_containers(#20156,#20140)
-literals("bar","bar",#20156)
-isOptionalChaining(#20153)
+stmts(#20156,2,#20143,0,"expr?.bar")
+hasLocation(#20156,#20145)
+stmt_containers(#20156,#20143)
 #20157=*
-entry_cfg_node(#20157,#20140)
-#20158=@"loc,{#10000},7,14,7,13"
-locations_default(#20158,#10000,7,14,7,13)
-hasLocation(#20157,#20158)
-#20159=*
-exit_cfg_node(#20159,#20140)
-hasLocation(#20159,#20150)
-successor(#20152,#20154)
-successor(#20156,#20153)
-successor(#20154,#20156)
-successor(#20153,#20159)
-successor(#20154,#20159)
-successor(#20157,#20152)
-toplevel_parent_xml_node(#20140,#20139)
+exprs(#20157,14,#20156,0,"expr?.bar")
+hasLocation(#20157,#20145)
+enclosing_stmt(#20157,#20156)
+expr_containers(#20157,#20143)
+#20158=*
+exprs(#20158,79,#20157,0,"expr")
+hasLocation(#20158,#20147)
+enclosing_stmt(#20158,#20156)
+expr_containers(#20158,#20143)
+literals("expr","expr",#20158)
+#20159=@"var;{expr};{#20154}"
+variables(#20159,"expr",#20154)
+bind(#20158,#20159)
 #20160=*
-xmlChars(#20160,"
-	",#10000,0,0,#10000)
-#20161=@"loc,{#10000},4,13,5,1"
-locations_default(#20161,#10000,4,13,5,1)
-xmllocations(#20160,#20161)
-#20162=*
-xmlChars(#20162,"
-	",#10000,2,0,#10000)
-#20163=@"loc,{#10000},5,29,6,1"
-locations_default(#20163,#10000,5,29,6,1)
-xmllocations(#20162,#20163)
+exprs(#20160,0,#20157,1,"bar")
+hasLocation(#20160,#20151)
+enclosing_stmt(#20160,#20156)
+expr_containers(#20160,#20143)
+literals("bar","bar",#20160)
+isOptionalChaining(#20157)
+#20161=*
+entry_cfg_node(#20161,#20143)
+#20162=@"loc,{#10000},7,14,7,13"
+locations_default(#20162,#10000,7,14,7,13)
+hasLocation(#20161,#20162)
+#20163=*
+exit_cfg_node(#20163,#20143)
+hasLocation(#20163,#20153)
+successor(#20156,#20158)
+successor(#20160,#20157)
+successor(#20158,#20160)
+successor(#20157,#20163)
+successor(#20158,#20163)
+successor(#20161,#20156)
+toplevel_parent_xml_node(#20143,#20142)
 #20164=*
 xmlChars(#20164,"
-	",#10000,4,0,#10000)
-#20165=@"loc,{#10000},6,23,7,1"
-locations_default(#20165,#10000,6,23,7,1)
+	",#10000,0,0,#10000)
+#20165=@"loc,{#10000},4,13,5,1"
+locations_default(#20165,#10000,4,13,5,1)
 xmllocations(#20164,#20165)
 #20166=*
 xmlChars(#20166,"
-	",#10000,6,0,#10000)
-#20167=@"loc,{#10000},7,27,8,1"
-locations_default(#20167,#10000,7,27,8,1)
+	",#10000,2,0,#10000)
+#20167=@"loc,{#10000},5,29,6,1"
+locations_default(#20167,#10000,5,29,6,1)
 xmllocations(#20166,#20167)
 #20168=*
-xmlElements(#20168,"foo",#10000,5,#10000)
-#20169=@"loc,{#10000},7,2,7,26"
-locations_default(#20169,#10000,7,2,7,26)
+xmlChars(#20168,"
+	",#10000,4,0,#10000)
+#20169=@"loc,{#10000},6,23,7,1"
+locations_default(#20169,#10000,6,23,7,1)
 xmllocations(#20168,#20169)
-xmlAttrs(#20139,#20168,"[baz]","expr?.bar",0,#10000)
-#20170=@"loc,{#10000},7,7,7,23"
-locations_default(#20170,#10000,7,7,7,23)
-xmllocations(#20139,#20170)
-#20171=*
-xmlElements(#20171,"foo",#10000,3,#10000)
-#20172=@"loc,{#10000},6,2,6,22"
-locations_default(#20172,#10000,6,2,6,22)
-xmllocations(#20171,#20172)
-xmlAttrs(#20121,#20171,"[baz]","expr!",0,#10000)
-#20173=@"loc,{#10000},6,7,6,19"
-locations_default(#20173,#10000,6,7,6,19)
-xmllocations(#20121,#20173)
-#20174=*
-xmlElements(#20174,"foo",#10000,1,#10000)
-#20175=@"loc,{#10000},5,2,5,28"
-locations_default(#20175,#10000,5,2,5,28)
-xmllocations(#20174,#20175)
-xmlAttrs(#20100,#20174,"[prop]","expr + expr",0,#10000)
-#20176=@"loc,{#10000},5,7,5,26"
-locations_default(#20176,#10000,5,7,5,26)
-xmllocations(#20100,#20176)
-xml_element_parent_expression(#20174,#20097,0)
-xml_element_parent_expression(#20171,#20097,1)
-xml_element_parent_expression(#20168,#20097,2)
-#20177=*
-exprs(#20177,78,#20085,0,"MyComponent")
-hasLocation(#20177,#20063)
-enclosing_stmt(#20177,#20085)
-expr_containers(#20177,#20001)
-literals("MyComponent","MyComponent",#20177)
-decl(#20177,#20075)
-typedecl(#20177,#20076)
+#20170=*
+xmlChars(#20170,"
+	",#10000,6,0,#10000)
+#20171=@"loc,{#10000},7,27,8,1"
+locations_default(#20171,#10000,7,27,8,1)
+xmllocations(#20170,#20171)
+#20172=*
+xmlElements(#20172,"foo",#10000,5,#10000)
+#20173=@"loc,{#10000},7,2,7,26"
+locations_default(#20173,#10000,7,2,7,26)
+xmllocations(#20172,#20173)
+xmlAttrs(#20142,#20172,"[baz]","expr?.bar",0,#10000)
+#20174=@"loc,{#10000},7,7,7,23"
+locations_default(#20174,#10000,7,7,7,23)
+xmllocations(#20142,#20174)
+#20175=*
+xmlElements(#20175,"foo",#10000,3,#10000)
+#20176=@"loc,{#10000},6,2,6,22"
+locations_default(#20176,#10000,6,2,6,22)
+xmllocations(#20175,#20176)
+xmlAttrs(#20123,#20175,"[baz]","expr!",0,#10000)
+#20177=@"loc,{#10000},6,7,6,19"
+locations_default(#20177,#10000,6,7,6,19)
+xmllocations(#20123,#20177)
 #20178=*
-scopes(#20178,10)
-scopenodes(#20085,#20178)
-scopenesting(#20178,#20071)
-#20179=*
-properties(#20179,#20085,2,0,"constructor() {}")
-#20180=@"loc,{#10000},10,26,10,25"
-locations_default(#20180,#10000,10,26,10,25)
-hasLocation(#20179,#20180)
+xmlElements(#20178,"foo",#10000,1,#10000)
+#20179=@"loc,{#10000},5,2,5,28"
+locations_default(#20179,#10000,5,2,5,28)
+xmllocations(#20178,#20179)
+xmlAttrs(#20101,#20178,"[prop]","expr + expr",0,#10000)
+#20180=@"loc,{#10000},5,7,5,26"
+locations_default(#20180,#10000,5,7,5,26)
+xmllocations(#20101,#20180)
+xml_element_parent_expression(#20178,#20098,0)
+xml_element_parent_expression(#20175,#20098,1)
+xml_element_parent_expression(#20172,#20098,2)
 #20181=*
-exprs(#20181,0,#20179,0,"constructor")
-hasLocation(#20181,#20180)
-enclosing_stmt(#20181,#20085)
+exprs(#20181,78,#20086,0,"MyComponent")
+hasLocation(#20181,#20063)
+enclosing_stmt(#20181,#20086)
 expr_containers(#20181,#20001)
-literals("constructor","constructor",#20181)
+literals("MyComponent","MyComponent",#20181)
+decl(#20181,#20075)
+typedecl(#20181,#20076)
 #20182=*
-exprs(#20182,9,#20179,1,"() {}")
-hasLocation(#20182,#20180)
-enclosing_stmt(#20182,#20085)
-expr_containers(#20182,#20001)
-#20183=*
-scopes(#20183,1)
-scopenodes(#20182,#20183)
-scopenesting(#20183,#20178)
-#20184=@"var;{arguments};{#20183}"
-variables(#20184,"arguments",#20183)
-is_arguments_object(#20184)
-#20185=*
-stmts(#20185,1,#20182,-2,"{}")
-hasLocation(#20185,#20180)
-stmt_containers(#20185,#20182)
-is_method(#20179)
+scopes(#20182,10)
+scopenodes(#20086,#20182)
+scopenesting(#20182,#20071)
+#20183=@"var;{this};{#20182}"
+variables(#20183,"this",#20182)
+#20184=*
+properties(#20184,#20086,2,0,"constructor() {}")
+#20185=@"loc,{#10000},10,26,10,25"
+locations_default(#20185,#10000,10,26,10,25)
+hasLocation(#20184,#20185)
 #20186=*
-entry_cfg_node(#20186,#20001)
-#20187=@"loc,{#10000},1,1,1,0"
-locations_default(#20187,#10000,1,1,1,0)
-hasLocation(#20186,#20187)
+exprs(#20186,0,#20184,0,"constructor")
+hasLocation(#20186,#20185)
+enclosing_stmt(#20186,#20086)
+expr_containers(#20186,#20001)
+literals("constructor","constructor",#20186)
+#20187=*
+exprs(#20187,9,#20184,1,"() {}")
+hasLocation(#20187,#20185)
+enclosing_stmt(#20187,#20086)
+expr_containers(#20187,#20001)
 #20188=*
-exit_cfg_node(#20188,#20001)
-hasLocation(#20188,#20069)
-successor(#20084,#20177)
-successor(#20182,#20179)
-#20189=*
-entry_cfg_node(#20189,#20182)
-hasLocation(#20189,#20180)
-#20190=*
-exit_cfg_node(#20190,#20182)
-hasLocation(#20190,#20180)
-successor(#20185,#20190)
-successor(#20189,#20185)
-successor(#20181,#20182)
-successor(#20179,#20085)
-successor(#20177,#20181)
-successor(#20092,#20096)
-successor(#20097,#20099)
-successor(#20099,#20094)
-successor(#20096,#20097)
-successor(#20094,#20089)
-successor(#20091,#20092)
-successor(#20089,#20087)
-successor(#20087,#20188)
-successor(#20085,#20091)
-successor(#20077,#20084)
-successor(#20081,#20077)
-successor(#20186,#20081)
+scopes(#20188,1)
+scopenodes(#20187,#20188)
+scopenesting(#20188,#20182)
+#20189=@"var;{this};{#20188}"
+variables(#20189,"this",#20188)
+#20190=@"var;{arguments};{#20188}"
+variables(#20190,"arguments",#20188)
+is_arguments_object(#20190)
+#20191=*
+stmts(#20191,1,#20187,-2,"{}")
+hasLocation(#20191,#20185)
+stmt_containers(#20191,#20187)
+is_method(#20184)
+#20192=*
+entry_cfg_node(#20192,#20001)
+#20193=@"loc,{#10000},1,1,1,0"
+locations_default(#20193,#10000,1,1,1,0)
+hasLocation(#20192,#20193)
+#20194=*
+exit_cfg_node(#20194,#20001)
+hasLocation(#20194,#20069)
+successor(#20085,#20181)
+successor(#20187,#20184)
+#20195=*
+entry_cfg_node(#20195,#20187)
+hasLocation(#20195,#20185)
+#20196=*
+exit_cfg_node(#20196,#20187)
+hasLocation(#20196,#20185)
+successor(#20191,#20196)
+successor(#20195,#20191)
+successor(#20186,#20187)
+successor(#20184,#20086)
+successor(#20181,#20186)
+successor(#20093,#20097)
+successor(#20098,#20100)
+successor(#20100,#20095)
+successor(#20097,#20098)
+successor(#20095,#20090)
+successor(#20092,#20093)
+successor(#20090,#20088)
+successor(#20088,#20194)
+successor(#20086,#20092)
+successor(#20078,#20085)
+successor(#20082,#20078)
+successor(#20192,#20082)
 numlines(#10000,10,9,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/node/output/trap/constlet.js.trap b/javascript/extractor/tests/node/output/trap/constlet.js.trap
index c7080134983..07cb90ee5ca 100644
--- a/javascript/extractor/tests/node/output/trap/constlet.js.trap
+++ b/javascript/extractor/tests/node/output/trap/constlet.js.trap
@@ -109,71 +109,73 @@ is_module(#20001)
 variables(#20040,"x",#20033)
 #20041=@"var;{y};{#20033}"
 variables(#20041,"y",#20033)
-#20042=*
-stmts(#20042,22,#20001,0,"const x = 23;")
-hasLocation(#20042,#20003)
-stmt_containers(#20042,#20001)
+#20042=@"var;{this};{#20033}"
+variables(#20042,"this",#20033)
 #20043=*
-exprs(#20043,64,#20042,0,"x = 23")
-#20044=@"loc,{#10000},1,7,1,12"
-locations_default(#20044,#10000,1,7,1,12)
-hasLocation(#20043,#20044)
-enclosing_stmt(#20043,#20042)
-expr_containers(#20043,#20001)
-#20045=*
-exprs(#20045,78,#20043,0,"x")
-hasLocation(#20045,#20009)
-enclosing_stmt(#20045,#20042)
-expr_containers(#20045,#20001)
-literals("x","x",#20045)
-decl(#20045,#20040)
+stmts(#20043,22,#20001,0,"const x = 23;")
+hasLocation(#20043,#20003)
+stmt_containers(#20043,#20001)
+#20044=*
+exprs(#20044,64,#20043,0,"x = 23")
+#20045=@"loc,{#10000},1,7,1,12"
+locations_default(#20045,#10000,1,7,1,12)
+hasLocation(#20044,#20045)
+enclosing_stmt(#20044,#20043)
+expr_containers(#20044,#20001)
 #20046=*
-exprs(#20046,3,#20043,1,"23")
-hasLocation(#20046,#20013)
-enclosing_stmt(#20046,#20042)
+exprs(#20046,78,#20044,0,"x")
+hasLocation(#20046,#20009)
+enclosing_stmt(#20046,#20043)
 expr_containers(#20046,#20001)
-literals("23","23",#20046)
+literals("x","x",#20046)
+decl(#20046,#20040)
 #20047=*
-stmts(#20047,23,#20001,1,"let y = 42;")
-hasLocation(#20047,#20005)
-stmt_containers(#20047,#20001)
+exprs(#20047,3,#20044,1,"23")
+hasLocation(#20047,#20013)
+enclosing_stmt(#20047,#20043)
+expr_containers(#20047,#20001)
+literals("23","23",#20047)
 #20048=*
-exprs(#20048,64,#20047,0,"y = 42")
-#20049=@"loc,{#10000},2,5,2,10"
-locations_default(#20049,#10000,2,5,2,10)
-hasLocation(#20048,#20049)
-enclosing_stmt(#20048,#20047)
-expr_containers(#20048,#20001)
-#20050=*
-exprs(#20050,78,#20048,0,"y")
-hasLocation(#20050,#20019)
-enclosing_stmt(#20050,#20047)
-expr_containers(#20050,#20001)
-literals("y","y",#20050)
-decl(#20050,#20041)
+stmts(#20048,23,#20001,1,"let y = 42;")
+hasLocation(#20048,#20005)
+stmt_containers(#20048,#20001)
+#20049=*
+exprs(#20049,64,#20048,0,"y = 42")
+#20050=@"loc,{#10000},2,5,2,10"
+locations_default(#20050,#10000,2,5,2,10)
+hasLocation(#20049,#20050)
+enclosing_stmt(#20049,#20048)
+expr_containers(#20049,#20001)
 #20051=*
-exprs(#20051,3,#20048,1,"42")
-hasLocation(#20051,#20023)
-enclosing_stmt(#20051,#20047)
+exprs(#20051,78,#20049,0,"y")
+hasLocation(#20051,#20019)
+enclosing_stmt(#20051,#20048)
 expr_containers(#20051,#20001)
-literals("42","42",#20051)
+literals("y","y",#20051)
+decl(#20051,#20041)
 #20052=*
-entry_cfg_node(#20052,#20001)
-#20053=@"loc,{#10000},1,1,1,0"
-locations_default(#20053,#10000,1,1,1,0)
-hasLocation(#20052,#20053)
-#20054=*
-exit_cfg_node(#20054,#20001)
-hasLocation(#20054,#20027)
-successor(#20047,#20050)
-successor(#20051,#20048)
-successor(#20050,#20051)
-successor(#20048,#20054)
-successor(#20042,#20045)
-successor(#20046,#20043)
-successor(#20045,#20046)
-successor(#20043,#20047)
-successor(#20052,#20042)
+exprs(#20052,3,#20049,1,"42")
+hasLocation(#20052,#20023)
+enclosing_stmt(#20052,#20048)
+expr_containers(#20052,#20001)
+literals("42","42",#20052)
+#20053=*
+entry_cfg_node(#20053,#20001)
+#20054=@"loc,{#10000},1,1,1,0"
+locations_default(#20054,#10000,1,1,1,0)
+hasLocation(#20053,#20054)
+#20055=*
+exit_cfg_node(#20055,#20001)
+hasLocation(#20055,#20027)
+successor(#20048,#20051)
+successor(#20052,#20049)
+successor(#20051,#20052)
+successor(#20049,#20055)
+successor(#20043,#20046)
+successor(#20047,#20044)
+successor(#20046,#20047)
+successor(#20044,#20048)
+successor(#20053,#20043)
 is_nodejs(#20001)
 numlines(#10000,2,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/node/output/trap/detection.js.trap b/javascript/extractor/tests/node/output/trap/detection.js.trap
index 81e56c20609..7006e50342e 100644
--- a/javascript/extractor/tests/node/output/trap/detection.js.trap
+++ b/javascript/extractor/tests/node/output/trap/detection.js.trap
@@ -139,65 +139,67 @@ variables(#20047,"arguments",#20041)
 is_module(#20001)
 #20048=@"var;{fs};{#20041}"
 variables(#20048,"fs",#20041)
-#20049=*
-stmts(#20049,22,#20001,0,"const f ... ('fs');")
-hasLocation(#20049,#20017)
-stmt_containers(#20049,#20001)
+#20049=@"var;{this};{#20041}"
+variables(#20049,"this",#20041)
 #20050=*
-exprs(#20050,64,#20049,0,"fs = require('fs')")
-#20051=@"loc,{#10000},6,7,6,24"
-locations_default(#20051,#10000,6,7,6,24)
-hasLocation(#20050,#20051)
-enclosing_stmt(#20050,#20049)
-expr_containers(#20050,#20001)
-#20052=*
-exprs(#20052,78,#20050,0,"fs")
-hasLocation(#20052,#20021)
-enclosing_stmt(#20052,#20049)
-expr_containers(#20052,#20001)
-literals("fs","fs",#20052)
-decl(#20052,#20048)
+stmts(#20050,22,#20001,0,"const f ... ('fs');")
+hasLocation(#20050,#20017)
+stmt_containers(#20050,#20001)
+#20051=*
+exprs(#20051,64,#20050,0,"fs = require('fs')")
+#20052=@"loc,{#10000},6,7,6,24"
+locations_default(#20052,#10000,6,7,6,24)
+hasLocation(#20051,#20052)
+enclosing_stmt(#20051,#20050)
+expr_containers(#20051,#20001)
 #20053=*
-exprs(#20053,13,#20050,1,"require('fs')")
-#20054=@"loc,{#10000},6,12,6,24"
-locations_default(#20054,#10000,6,12,6,24)
-hasLocation(#20053,#20054)
-enclosing_stmt(#20053,#20049)
+exprs(#20053,78,#20051,0,"fs")
+hasLocation(#20053,#20021)
+enclosing_stmt(#20053,#20050)
 expr_containers(#20053,#20001)
-#20055=*
-exprs(#20055,79,#20053,-1,"require")
-hasLocation(#20055,#20025)
-enclosing_stmt(#20055,#20049)
-expr_containers(#20055,#20001)
-literals("require","require",#20055)
-bind(#20055,#20042)
+literals("fs","fs",#20053)
+decl(#20053,#20048)
+#20054=*
+exprs(#20054,13,#20051,1,"require('fs')")
+#20055=@"loc,{#10000},6,12,6,24"
+locations_default(#20055,#10000,6,12,6,24)
+hasLocation(#20054,#20055)
+enclosing_stmt(#20054,#20050)
+expr_containers(#20054,#20001)
 #20056=*
-exprs(#20056,4,#20053,0,"'fs'")
-hasLocation(#20056,#20029)
-enclosing_stmt(#20056,#20049)
+exprs(#20056,79,#20054,-1,"require")
+hasLocation(#20056,#20025)
+enclosing_stmt(#20056,#20050)
 expr_containers(#20056,#20001)
-literals("fs","'fs'",#20056)
+literals("require","require",#20056)
+bind(#20056,#20042)
 #20057=*
-regexpterm(#20057,14,#20056,0,"fs")
-#20058=@"loc,{#10000},6,21,6,22"
-locations_default(#20058,#10000,6,21,6,22)
-hasLocation(#20057,#20058)
-regexp_const_value(#20057,"fs")
-#20059=*
-entry_cfg_node(#20059,#20001)
-#20060=@"loc,{#10000},1,1,1,0"
-locations_default(#20060,#10000,1,1,1,0)
-hasLocation(#20059,#20060)
-#20061=*
-exit_cfg_node(#20061,#20001)
-hasLocation(#20061,#20035)
-successor(#20049,#20052)
-successor(#20056,#20053)
-successor(#20055,#20056)
-successor(#20053,#20050)
-successor(#20052,#20055)
-successor(#20050,#20061)
-successor(#20059,#20049)
+exprs(#20057,4,#20054,0,"'fs'")
+hasLocation(#20057,#20029)
+enclosing_stmt(#20057,#20050)
+expr_containers(#20057,#20001)
+literals("fs","'fs'",#20057)
+#20058=*
+regexpterm(#20058,14,#20057,0,"fs")
+#20059=@"loc,{#10000},6,21,6,22"
+locations_default(#20059,#10000,6,21,6,22)
+hasLocation(#20058,#20059)
+regexp_const_value(#20058,"fs")
+#20060=*
+entry_cfg_node(#20060,#20001)
+#20061=@"loc,{#10000},1,1,1,0"
+locations_default(#20061,#10000,1,1,1,0)
+hasLocation(#20060,#20061)
+#20062=*
+exit_cfg_node(#20062,#20001)
+hasLocation(#20062,#20035)
+successor(#20050,#20053)
+successor(#20057,#20054)
+successor(#20056,#20057)
+successor(#20054,#20051)
+successor(#20053,#20056)
+successor(#20051,#20062)
+successor(#20060,#20050)
 is_nodejs(#20001)
 numlines(#10000,6,1,5)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/node/output/trap/hello.trap b/javascript/extractor/tests/node/output/trap/hello.trap
index 8c083879437..08bade526f1 100644
--- a/javascript/extractor/tests/node/output/trap/hello.trap
+++ b/javascript/extractor/tests/node/output/trap/hello.trap
@@ -85,70 +85,72 @@ variables(#20029,"__dirname",#20024)
 #20030=@"var;{arguments};{#20024}"
 variables(#20030,"arguments",#20024)
 is_module(#20001)
-#20031=*
-stmts(#20031,2,#20001,0,"console ... rld!"");")
-hasLocation(#20031,#20003)
-stmt_containers(#20031,#20001)
+#20031=@"var;{this};{#20024}"
+variables(#20031,"this",#20024)
 #20032=*
-exprs(#20032,13,#20031,0,"console ... orld!"")")
-#20033=@"loc,{#10000},2,1,2,28"
-locations_default(#20033,#10000,2,1,2,28)
-hasLocation(#20032,#20033)
-enclosing_stmt(#20032,#20031)
-expr_containers(#20032,#20001)
-#20034=*
-exprs(#20034,14,#20032,-1,"console.log")
-#20035=@"loc,{#10000},2,1,2,11"
-locations_default(#20035,#10000,2,1,2,11)
-hasLocation(#20034,#20035)
-enclosing_stmt(#20034,#20031)
-expr_containers(#20034,#20001)
-#20036=*
-exprs(#20036,79,#20034,0,"console")
-hasLocation(#20036,#20005)
-enclosing_stmt(#20036,#20031)
-expr_containers(#20036,#20001)
-literals("console","console",#20036)
-bind(#20036,#20022)
+stmts(#20032,2,#20001,0,"console ... rld!"");")
+hasLocation(#20032,#20003)
+stmt_containers(#20032,#20001)
+#20033=*
+exprs(#20033,13,#20032,0,"console ... orld!"")")
+#20034=@"loc,{#10000},2,1,2,28"
+locations_default(#20034,#10000,2,1,2,28)
+hasLocation(#20033,#20034)
+enclosing_stmt(#20033,#20032)
+expr_containers(#20033,#20001)
+#20035=*
+exprs(#20035,14,#20033,-1,"console.log")
+#20036=@"loc,{#10000},2,1,2,11"
+locations_default(#20036,#10000,2,1,2,11)
+hasLocation(#20035,#20036)
+enclosing_stmt(#20035,#20032)
+expr_containers(#20035,#20001)
 #20037=*
-exprs(#20037,0,#20034,1,"log")
-hasLocation(#20037,#20009)
-enclosing_stmt(#20037,#20031)
+exprs(#20037,79,#20035,0,"console")
+hasLocation(#20037,#20005)
+enclosing_stmt(#20037,#20032)
 expr_containers(#20037,#20001)
-literals("log","log",#20037)
+literals("console","console",#20037)
+bind(#20037,#20022)
 #20038=*
-exprs(#20038,4,#20032,0,"""Hello, world!""")
-hasLocation(#20038,#20013)
-enclosing_stmt(#20038,#20031)
+exprs(#20038,0,#20035,1,"log")
+hasLocation(#20038,#20009)
+enclosing_stmt(#20038,#20032)
 expr_containers(#20038,#20001)
-literals("Hello, world!","""Hello, world!""",#20038)
+literals("log","log",#20038)
 #20039=*
-regexpterm(#20039,14,#20038,0,"Hello, world!")
-#20040=@"loc,{#10000},2,14,2,26"
-locations_default(#20040,#10000,2,14,2,26)
-hasLocation(#20039,#20040)
-regexp_const_value(#20039,"Hello, world!")
-#20041=*
-entry_cfg_node(#20041,#20001)
-#20042=@"loc,{#10000},2,1,2,0"
-locations_default(#20042,#10000,2,1,2,0)
-hasLocation(#20041,#20042)
-#20043=*
-exit_cfg_node(#20043,#20001)
-hasLocation(#20043,#20019)
-successor(#20031,#20036)
-successor(#20038,#20032)
-successor(#20037,#20034)
-successor(#20036,#20037)
-successor(#20034,#20038)
-successor(#20032,#20043)
-successor(#20041,#20031)
-is_nodejs(#20001)
+exprs(#20039,4,#20033,0,"""Hello, world!""")
+hasLocation(#20039,#20013)
+enclosing_stmt(#20039,#20032)
+expr_containers(#20039,#20001)
+literals("Hello, world!","""Hello, world!""",#20039)
+#20040=*
+regexpterm(#20040,14,#20039,0,"Hello, world!")
+#20041=@"loc,{#10000},2,14,2,26"
+locations_default(#20041,#10000,2,14,2,26)
+hasLocation(#20040,#20041)
+regexp_const_value(#20040,"Hello, world!")
+#20042=*
+entry_cfg_node(#20042,#20001)
+#20043=@"loc,{#10000},2,1,2,0"
+locations_default(#20043,#10000,2,1,2,0)
+hasLocation(#20042,#20043)
 #20044=*
-lines(#20044,#20001,"#!/usr/bin/env node","
+exit_cfg_node(#20044,#20001)
+hasLocation(#20044,#20019)
+successor(#20032,#20037)
+successor(#20039,#20033)
+successor(#20038,#20035)
+successor(#20037,#20038)
+successor(#20035,#20039)
+successor(#20033,#20044)
+successor(#20042,#20032)
+is_nodejs(#20001)
+#20045=*
+lines(#20045,#20001,"#!/usr/bin/env node","
 ")
-#20045=@"loc,{#10000},1,1,1,19"
-locations_default(#20045,#10000,1,1,1,19)
-hasLocation(#20044,#20045)
+#20046=@"loc,{#10000},1,1,1,19"
+locations_default(#20046,#10000,1,1,1,19)
+hasLocation(#20045,#20046)
 numlines(#10000,2,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/node/output/trap/tst.html.trap b/javascript/extractor/tests/node/output/trap/tst.html.trap
index 56817f8f03a..ea6d7e94de4 100644
--- a/javascript/extractor/tests/node/output/trap/tst.html.trap
+++ b/javascript/extractor/tests/node/output/trap/tst.html.trap
@@ -50,72 +50,74 @@ toplevels(#20002,2)
 hasLocation(#20002,#20004)
 #20017=@"var;{x};{#20000}"
 variables(#20017,"x",#20000)
-#20018=*
-stmts(#20018,18,#20002,0,"var x = 42;")
-hasLocation(#20018,#20004)
-stmt_containers(#20018,#20002)
+#20018=@"var;{this};{#20000}"
+variables(#20018,"this",#20000)
 #20019=*
-exprs(#20019,64,#20018,0,"x = 42")
-#20020=@"loc,{#10000},6,17,6,22"
-locations_default(#20020,#10000,6,17,6,22)
-hasLocation(#20019,#20020)
-enclosing_stmt(#20019,#20018)
-expr_containers(#20019,#20002)
-#20021=*
-exprs(#20021,78,#20019,0,"x")
-hasLocation(#20021,#20008)
-enclosing_stmt(#20021,#20018)
-expr_containers(#20021,#20002)
-literals("x","x",#20021)
-decl(#20021,#20017)
+stmts(#20019,18,#20002,0,"var x = 42;")
+hasLocation(#20019,#20004)
+stmt_containers(#20019,#20002)
+#20020=*
+exprs(#20020,64,#20019,0,"x = 42")
+#20021=@"loc,{#10000},6,17,6,22"
+locations_default(#20021,#10000,6,17,6,22)
+hasLocation(#20020,#20021)
+enclosing_stmt(#20020,#20019)
+expr_containers(#20020,#20002)
 #20022=*
-exprs(#20022,3,#20019,1,"42")
-hasLocation(#20022,#20012)
-enclosing_stmt(#20022,#20018)
+exprs(#20022,78,#20020,0,"x")
+hasLocation(#20022,#20008)
+enclosing_stmt(#20022,#20019)
 expr_containers(#20022,#20002)
-literals("42","42",#20022)
+literals("x","x",#20022)
+decl(#20022,#20017)
 #20023=*
-entry_cfg_node(#20023,#20002)
-#20024=@"loc,{#10000},6,13,6,12"
-locations_default(#20024,#10000,6,13,6,12)
-hasLocation(#20023,#20024)
-#20025=*
-exit_cfg_node(#20025,#20002)
-hasLocation(#20025,#20016)
-successor(#20018,#20021)
-successor(#20022,#20019)
-successor(#20021,#20022)
-successor(#20019,#20025)
-successor(#20023,#20018)
-toplevel_parent_xml_node(#20002,#20001)
+exprs(#20023,3,#20020,1,"42")
+hasLocation(#20023,#20012)
+enclosing_stmt(#20023,#20019)
+expr_containers(#20023,#20002)
+literals("42","42",#20023)
+#20024=*
+entry_cfg_node(#20024,#20002)
+#20025=@"loc,{#10000},6,13,6,12"
+locations_default(#20025,#10000,6,13,6,12)
+hasLocation(#20024,#20025)
 #20026=*
-xmlElements(#20026,"html",#10000,0,#10000)
-#20027=@"loc,{#10000},1,1,8,7"
-locations_default(#20027,#10000,1,1,8,7)
-xmllocations(#20026,#20027)
-#20028=*
-xmlElements(#20028,"body",#20026,1,#10000)
-#20029=@"loc,{#10000},5,1,7,7"
-locations_default(#20029,#10000,5,1,7,7)
-xmllocations(#20028,#20029)
-#20030=*
-xmlElements(#20030,"a",#20028,0,#10000)
-#20031=@"loc,{#10000},6,1,6,29"
-locations_default(#20031,#10000,6,1,6,29)
-xmllocations(#20030,#20031)
-xmlAttrs(#20001,#20030,"onclick","var x = 42;",0,#10000)
-#20032=@"loc,{#10000},6,4,6,24"
-locations_default(#20032,#10000,6,4,6,24)
-xmllocations(#20001,#20032)
-#20033=*
-xmlElements(#20033,"head",#20026,0,#10000)
-#20034=@"loc,{#10000},2,1,4,7"
-locations_default(#20034,#10000,2,1,4,7)
-xmllocations(#20033,#20034)
-#20035=*
-xmlElements(#20035,"title",#20033,0,#10000)
-#20036=@"loc,{#10000},3,1,3,15"
-locations_default(#20036,#10000,3,1,3,15)
-xmllocations(#20035,#20036)
+exit_cfg_node(#20026,#20002)
+hasLocation(#20026,#20016)
+successor(#20019,#20022)
+successor(#20023,#20020)
+successor(#20022,#20023)
+successor(#20020,#20026)
+successor(#20024,#20019)
+toplevel_parent_xml_node(#20002,#20001)
+#20027=*
+xmlElements(#20027,"html",#10000,0,#10000)
+#20028=@"loc,{#10000},1,1,8,7"
+locations_default(#20028,#10000,1,1,8,7)
+xmllocations(#20027,#20028)
+#20029=*
+xmlElements(#20029,"body",#20027,1,#10000)
+#20030=@"loc,{#10000},5,1,7,7"
+locations_default(#20030,#10000,5,1,7,7)
+xmllocations(#20029,#20030)
+#20031=*
+xmlElements(#20031,"a",#20029,0,#10000)
+#20032=@"loc,{#10000},6,1,6,29"
+locations_default(#20032,#10000,6,1,6,29)
+xmllocations(#20031,#20032)
+xmlAttrs(#20001,#20031,"onclick","var x = 42;",0,#10000)
+#20033=@"loc,{#10000},6,4,6,24"
+locations_default(#20033,#10000,6,4,6,24)
+xmllocations(#20001,#20033)
+#20034=*
+xmlElements(#20034,"head",#20027,0,#10000)
+#20035=@"loc,{#10000},2,1,4,7"
+locations_default(#20035,#10000,2,1,4,7)
+xmllocations(#20034,#20035)
+#20036=*
+xmlElements(#20036,"title",#20034,0,#10000)
+#20037=@"loc,{#10000},3,1,3,15"
+locations_default(#20037,#10000,3,1,3,15)
+xmllocations(#20036,#20037)
 numlines(#10000,8,1,0)
 filetype(#10000,"html")
diff --git a/javascript/extractor/tests/node/output/trap/tst.js.trap b/javascript/extractor/tests/node/output/trap/tst.js.trap
index 58f71f4717b..7617be96cc0 100644
--- a/javascript/extractor/tests/node/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/node/output/trap/tst.js.trap
@@ -194,167 +194,169 @@ variables(#20073,"arguments",#20067)
 is_module(#20001)
 #20074=@"var;{fs};{#20067}"
 variables(#20074,"fs",#20067)
-#20075=*
-stmts(#20075,18,#20001,0,"var fs  ... ('fs');")
-hasLocation(#20075,#20003)
-stmt_containers(#20075,#20001)
+#20075=@"var;{this};{#20067}"
+variables(#20075,"this",#20067)
 #20076=*
-exprs(#20076,64,#20075,0,"fs = require('fs')")
-#20077=@"loc,{#10000},1,5,1,22"
-locations_default(#20077,#10000,1,5,1,22)
-hasLocation(#20076,#20077)
-enclosing_stmt(#20076,#20075)
-expr_containers(#20076,#20001)
-#20078=*
-exprs(#20078,78,#20076,0,"fs")
-hasLocation(#20078,#20013)
-enclosing_stmt(#20078,#20075)
-expr_containers(#20078,#20001)
-literals("fs","fs",#20078)
-decl(#20078,#20074)
+stmts(#20076,18,#20001,0,"var fs  ... ('fs');")
+hasLocation(#20076,#20003)
+stmt_containers(#20076,#20001)
+#20077=*
+exprs(#20077,64,#20076,0,"fs = require('fs')")
+#20078=@"loc,{#10000},1,5,1,22"
+locations_default(#20078,#10000,1,5,1,22)
+hasLocation(#20077,#20078)
+enclosing_stmt(#20077,#20076)
+expr_containers(#20077,#20001)
 #20079=*
-exprs(#20079,13,#20076,1,"require('fs')")
-#20080=@"loc,{#10000},1,10,1,22"
-locations_default(#20080,#10000,1,10,1,22)
-hasLocation(#20079,#20080)
-enclosing_stmt(#20079,#20075)
+exprs(#20079,78,#20077,0,"fs")
+hasLocation(#20079,#20013)
+enclosing_stmt(#20079,#20076)
 expr_containers(#20079,#20001)
-#20081=*
-exprs(#20081,79,#20079,-1,"require")
-hasLocation(#20081,#20017)
-enclosing_stmt(#20081,#20075)
-expr_containers(#20081,#20001)
-literals("require","require",#20081)
-bind(#20081,#20068)
+literals("fs","fs",#20079)
+decl(#20079,#20074)
+#20080=*
+exprs(#20080,13,#20077,1,"require('fs')")
+#20081=@"loc,{#10000},1,10,1,22"
+locations_default(#20081,#10000,1,10,1,22)
+hasLocation(#20080,#20081)
+enclosing_stmt(#20080,#20076)
+expr_containers(#20080,#20001)
 #20082=*
-exprs(#20082,4,#20079,0,"'fs'")
-hasLocation(#20082,#20021)
-enclosing_stmt(#20082,#20075)
+exprs(#20082,79,#20080,-1,"require")
+hasLocation(#20082,#20017)
+enclosing_stmt(#20082,#20076)
 expr_containers(#20082,#20001)
-literals("fs","'fs'",#20082)
+literals("require","require",#20082)
+bind(#20082,#20068)
 #20083=*
-regexpterm(#20083,14,#20082,0,"fs")
-#20084=@"loc,{#10000},1,19,1,20"
-locations_default(#20084,#10000,1,19,1,20)
-hasLocation(#20083,#20084)
-regexp_const_value(#20083,"fs")
-#20085=*
-stmts(#20085,2,#20001,1,"y = 42;")
-hasLocation(#20085,#20005)
-stmt_containers(#20085,#20001)
+exprs(#20083,4,#20080,0,"'fs'")
+hasLocation(#20083,#20021)
+enclosing_stmt(#20083,#20076)
+expr_containers(#20083,#20001)
+literals("fs","'fs'",#20083)
+#20084=*
+regexpterm(#20084,14,#20083,0,"fs")
+#20085=@"loc,{#10000},1,19,1,20"
+locations_default(#20085,#10000,1,19,1,20)
+hasLocation(#20084,#20085)
+regexp_const_value(#20084,"fs")
 #20086=*
-exprs(#20086,47,#20085,0,"y = 42")
-#20087=@"loc,{#10000},2,1,2,6"
-locations_default(#20087,#10000,2,1,2,6)
-hasLocation(#20086,#20087)
-enclosing_stmt(#20086,#20085)
-expr_containers(#20086,#20001)
-#20088=*
-exprs(#20088,79,#20086,0,"y")
-hasLocation(#20088,#20027)
-enclosing_stmt(#20088,#20085)
-expr_containers(#20088,#20001)
-literals("y","y",#20088)
-#20089=@"var;{y};{#20000}"
-variables(#20089,"y",#20000)
-bind(#20088,#20089)
-#20090=*
-exprs(#20090,3,#20086,1,"42")
-hasLocation(#20090,#20031)
-enclosing_stmt(#20090,#20085)
-expr_containers(#20090,#20001)
-literals("42","42",#20090)
+stmts(#20086,2,#20001,1,"y = 42;")
+hasLocation(#20086,#20005)
+stmt_containers(#20086,#20001)
+#20087=*
+exprs(#20087,47,#20086,0,"y = 42")
+#20088=@"loc,{#10000},2,1,2,6"
+locations_default(#20088,#10000,2,1,2,6)
+hasLocation(#20087,#20088)
+enclosing_stmt(#20087,#20086)
+expr_containers(#20087,#20001)
+#20089=*
+exprs(#20089,79,#20087,0,"y")
+hasLocation(#20089,#20027)
+enclosing_stmt(#20089,#20086)
+expr_containers(#20089,#20001)
+literals("y","y",#20089)
+#20090=@"var;{y};{#20000}"
+variables(#20090,"y",#20000)
+bind(#20089,#20090)
 #20091=*
-stmts(#20091,2,#20001,2,"console ... ename);")
-hasLocation(#20091,#20007)
-stmt_containers(#20091,#20001)
+exprs(#20091,3,#20087,1,"42")
+hasLocation(#20091,#20031)
+enclosing_stmt(#20091,#20086)
+expr_containers(#20091,#20001)
+literals("42","42",#20091)
 #20092=*
-exprs(#20092,13,#20091,0,"console ... lename)")
-#20093=@"loc,{#10000},3,1,3,23"
-locations_default(#20093,#10000,3,1,3,23)
-hasLocation(#20092,#20093)
-enclosing_stmt(#20092,#20091)
-expr_containers(#20092,#20001)
-#20094=*
-exprs(#20094,14,#20092,-1,"console.log")
-#20095=@"loc,{#10000},3,1,3,11"
-locations_default(#20095,#10000,3,1,3,11)
-hasLocation(#20094,#20095)
-enclosing_stmt(#20094,#20091)
-expr_containers(#20094,#20001)
-#20096=*
-exprs(#20096,79,#20094,0,"console")
-hasLocation(#20096,#20035)
-enclosing_stmt(#20096,#20091)
-expr_containers(#20096,#20001)
-literals("console","console",#20096)
-bind(#20096,#20065)
+stmts(#20092,2,#20001,2,"console ... ename);")
+hasLocation(#20092,#20007)
+stmt_containers(#20092,#20001)
+#20093=*
+exprs(#20093,13,#20092,0,"console ... lename)")
+#20094=@"loc,{#10000},3,1,3,23"
+locations_default(#20094,#10000,3,1,3,23)
+hasLocation(#20093,#20094)
+enclosing_stmt(#20093,#20092)
+expr_containers(#20093,#20001)
+#20095=*
+exprs(#20095,14,#20093,-1,"console.log")
+#20096=@"loc,{#10000},3,1,3,11"
+locations_default(#20096,#10000,3,1,3,11)
+hasLocation(#20095,#20096)
+enclosing_stmt(#20095,#20092)
+expr_containers(#20095,#20001)
 #20097=*
-exprs(#20097,0,#20094,1,"log")
-hasLocation(#20097,#20039)
-enclosing_stmt(#20097,#20091)
+exprs(#20097,79,#20095,0,"console")
+hasLocation(#20097,#20035)
+enclosing_stmt(#20097,#20092)
 expr_containers(#20097,#20001)
-literals("log","log",#20097)
+literals("console","console",#20097)
+bind(#20097,#20065)
 #20098=*
-exprs(#20098,79,#20092,0,"__filename")
-hasLocation(#20098,#20043)
-enclosing_stmt(#20098,#20091)
+exprs(#20098,0,#20095,1,"log")
+hasLocation(#20098,#20039)
+enclosing_stmt(#20098,#20092)
 expr_containers(#20098,#20001)
-literals("__filename","__filename",#20098)
-bind(#20098,#20071)
+literals("log","log",#20098)
 #20099=*
-stmts(#20099,9,#20001,3,"return arguments[0];")
-hasLocation(#20099,#20009)
-stmt_containers(#20099,#20001)
+exprs(#20099,79,#20093,0,"__filename")
+hasLocation(#20099,#20043)
+enclosing_stmt(#20099,#20092)
+expr_containers(#20099,#20001)
+literals("__filename","__filename",#20099)
+bind(#20099,#20071)
 #20100=*
-exprs(#20100,15,#20099,0,"arguments[0]")
-#20101=@"loc,{#10000},4,8,4,19"
-locations_default(#20101,#10000,4,8,4,19)
-hasLocation(#20100,#20101)
-enclosing_stmt(#20100,#20099)
-expr_containers(#20100,#20001)
-#20102=*
-exprs(#20102,79,#20100,0,"arguments")
-hasLocation(#20102,#20051)
-enclosing_stmt(#20102,#20099)
-expr_containers(#20102,#20001)
-literals("arguments","arguments",#20102)
-bind(#20102,#20073)
+stmts(#20100,9,#20001,3,"return arguments[0];")
+hasLocation(#20100,#20009)
+stmt_containers(#20100,#20001)
+#20101=*
+exprs(#20101,15,#20100,0,"arguments[0]")
+#20102=@"loc,{#10000},4,8,4,19"
+locations_default(#20102,#10000,4,8,4,19)
+hasLocation(#20101,#20102)
+enclosing_stmt(#20101,#20100)
+expr_containers(#20101,#20001)
 #20103=*
-exprs(#20103,3,#20100,1,"0")
-hasLocation(#20103,#20055)
-enclosing_stmt(#20103,#20099)
+exprs(#20103,79,#20101,0,"arguments")
+hasLocation(#20103,#20051)
+enclosing_stmt(#20103,#20100)
 expr_containers(#20103,#20001)
-literals("0","0",#20103)
+literals("arguments","arguments",#20103)
+bind(#20103,#20073)
 #20104=*
-entry_cfg_node(#20104,#20001)
-#20105=@"loc,{#10000},1,1,1,0"
-locations_default(#20105,#10000,1,1,1,0)
-hasLocation(#20104,#20105)
-#20106=*
-exit_cfg_node(#20106,#20001)
-hasLocation(#20106,#20061)
-successor(#20103,#20100)
-successor(#20102,#20103)
-successor(#20100,#20099)
-successor(#20099,#20106)
-successor(#20091,#20096)
-successor(#20098,#20092)
-successor(#20097,#20094)
-successor(#20096,#20097)
-successor(#20094,#20098)
-successor(#20092,#20102)
-successor(#20085,#20088)
-successor(#20090,#20086)
-successor(#20088,#20090)
-successor(#20086,#20091)
-successor(#20075,#20078)
-successor(#20082,#20079)
-successor(#20081,#20082)
-successor(#20079,#20076)
-successor(#20078,#20081)
-successor(#20076,#20085)
-successor(#20104,#20075)
+exprs(#20104,3,#20101,1,"0")
+hasLocation(#20104,#20055)
+enclosing_stmt(#20104,#20100)
+expr_containers(#20104,#20001)
+literals("0","0",#20104)
+#20105=*
+entry_cfg_node(#20105,#20001)
+#20106=@"loc,{#10000},1,1,1,0"
+locations_default(#20106,#10000,1,1,1,0)
+hasLocation(#20105,#20106)
+#20107=*
+exit_cfg_node(#20107,#20001)
+hasLocation(#20107,#20061)
+successor(#20104,#20101)
+successor(#20103,#20104)
+successor(#20101,#20100)
+successor(#20100,#20107)
+successor(#20092,#20097)
+successor(#20099,#20093)
+successor(#20098,#20095)
+successor(#20097,#20098)
+successor(#20095,#20099)
+successor(#20093,#20103)
+successor(#20086,#20089)
+successor(#20091,#20087)
+successor(#20089,#20091)
+successor(#20087,#20092)
+successor(#20076,#20079)
+successor(#20083,#20080)
+successor(#20082,#20083)
+successor(#20080,#20077)
+successor(#20079,#20082)
+successor(#20077,#20086)
+successor(#20105,#20076)
 is_nodejs(#20001)
 numlines(#10000,4,4,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/node/output/trap/tst.mjs.trap b/javascript/extractor/tests/node/output/trap/tst.mjs.trap
index f097709a21a..c1c2041402f 100644
--- a/javascript/extractor/tests/node/output/trap/tst.mjs.trap
+++ b/javascript/extractor/tests/node/output/trap/tst.mjs.trap
@@ -53,33 +53,35 @@ is_module(#20001)
 is_es2015_module(#20001)
 #20017=@"var;{x};{#20016}"
 variables(#20017,"x",#20016)
-#20018=*
-stmts(#20018,18,#20001,0,"var x;")
-hasLocation(#20018,#20003)
-stmt_containers(#20018,#20001)
+#20018=@"var;{this};{#20016}"
+variables(#20018,"this",#20016)
 #20019=*
-exprs(#20019,64,#20018,0,"x")
-hasLocation(#20019,#20007)
-enclosing_stmt(#20019,#20018)
-expr_containers(#20019,#20001)
+stmts(#20019,18,#20001,0,"var x;")
+hasLocation(#20019,#20003)
+stmt_containers(#20019,#20001)
 #20020=*
-exprs(#20020,78,#20019,0,"x")
+exprs(#20020,64,#20019,0,"x")
 hasLocation(#20020,#20007)
-enclosing_stmt(#20020,#20018)
+enclosing_stmt(#20020,#20019)
 expr_containers(#20020,#20001)
-literals("x","x",#20020)
-decl(#20020,#20017)
 #20021=*
-entry_cfg_node(#20021,#20001)
-#20022=@"loc,{#10000},1,1,1,0"
-locations_default(#20022,#10000,1,1,1,0)
-hasLocation(#20021,#20022)
-#20023=*
-exit_cfg_node(#20023,#20001)
-hasLocation(#20023,#20011)
-successor(#20018,#20020)
-successor(#20020,#20019)
-successor(#20019,#20023)
-successor(#20021,#20018)
+exprs(#20021,78,#20020,0,"x")
+hasLocation(#20021,#20007)
+enclosing_stmt(#20021,#20019)
+expr_containers(#20021,#20001)
+literals("x","x",#20021)
+decl(#20021,#20017)
+#20022=*
+entry_cfg_node(#20022,#20001)
+#20023=@"loc,{#10000},1,1,1,0"
+locations_default(#20023,#10000,1,1,1,0)
+hasLocation(#20022,#20023)
+#20024=*
+exit_cfg_node(#20024,#20001)
+hasLocation(#20024,#20011)
+successor(#20019,#20021)
+successor(#20021,#20020)
+successor(#20020,#20024)
+successor(#20022,#20019)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/regexp/output/trap/es2018.js.trap b/javascript/extractor/tests/regexp/output/trap/es2018.js.trap
index 0e4dbc5d3aa..606e4e66bfd 100644
--- a/javascript/extractor/tests/regexp/output/trap/es2018.js.trap
+++ b/javascript/extractor/tests/regexp/output/trap/es2018.js.trap
@@ -115,187 +115,189 @@ toplevels(#20001,0)
 #20040=@"loc,{#10000},1,1,7,0"
 locations_default(#20040,#10000,1,1,7,0)
 hasLocation(#20001,#20040)
-#20041=*
-stmts(#20041,2,#20001,0,"/^(?<ws ... <ws>$/;")
-hasLocation(#20041,#20003)
-stmt_containers(#20041,#20001)
+#20041=@"var;{this};{#20000}"
+variables(#20041,"this",#20000)
 #20042=*
-exprs(#20042,5,#20041,0,"/^(?<ws ... k<ws>$/")
-hasLocation(#20042,#20015)
-enclosing_stmt(#20042,#20041)
-expr_containers(#20042,#20001)
-literals("/^(?<ws>\s+)\w+\k<ws>$/","/^(?<ws>\s+)\w+\k<ws>$/",#20042)
+stmts(#20042,2,#20001,0,"/^(?<ws ... <ws>$/;")
+hasLocation(#20042,#20003)
+stmt_containers(#20042,#20001)
 #20043=*
-regexpterm(#20043,1,#20042,0,"^(?<ws>\s+)\w+\k<ws>$")
-#20044=@"loc,{#10000},1,2,1,22"
-locations_default(#20044,#10000,1,2,1,22)
-hasLocation(#20043,#20044)
-#20045=*
-regexpterm(#20045,2,#20043,0,"^")
-#20046=@"loc,{#10000},1,2,1,2"
-locations_default(#20046,#10000,1,2,1,2)
-hasLocation(#20045,#20046)
-#20047=*
-regexpterm(#20047,13,#20043,1,"(?<ws>\s+)")
-#20048=@"loc,{#10000},1,3,1,12"
-locations_default(#20048,#10000,1,3,1,12)
-hasLocation(#20047,#20048)
-is_capture(#20047,1)
-is_named_capture(#20047,"ws")
-#20049=*
-regexpterm(#20049,9,#20047,0,"\s+")
-#20050=@"loc,{#10000},1,9,1,11"
-locations_default(#20050,#10000,1,9,1,11)
-hasLocation(#20049,#20050)
-is_greedy(#20049)
-#20051=*
-regexpterm(#20051,20,#20049,0,"\s")
-#20052=@"loc,{#10000},1,9,1,10"
-locations_default(#20052,#10000,1,9,1,10)
-hasLocation(#20051,#20052)
-char_class_escape(#20051,"s")
-#20053=*
-regexpterm(#20053,9,#20043,2,"\w+")
-#20054=@"loc,{#10000},1,13,1,15"
-locations_default(#20054,#10000,1,13,1,15)
-hasLocation(#20053,#20054)
-is_greedy(#20053)
-#20055=*
-regexpterm(#20055,20,#20053,0,"\w")
-#20056=@"loc,{#10000},1,13,1,14"
-locations_default(#20056,#10000,1,13,1,14)
-hasLocation(#20055,#20056)
-char_class_escape(#20055,"w")
-#20057=*
-regexpterm(#20057,22,#20043,3,"\k<ws>")
-#20058=@"loc,{#10000},1,16,1,21"
-locations_default(#20058,#10000,1,16,1,21)
-hasLocation(#20057,#20058)
-named_backref(#20057,"ws")
-#20059=*
-regexpterm(#20059,3,#20043,4,"$")
-#20060=@"loc,{#10000},1,22,1,22"
-locations_default(#20060,#10000,1,22,1,22)
-hasLocation(#20059,#20060)
-#20061=*
-stmts(#20061,2,#20001,1,"/(?<=.)/;")
-hasLocation(#20061,#20005)
-stmt_containers(#20061,#20001)
+exprs(#20043,5,#20042,0,"/^(?<ws ... k<ws>$/")
+hasLocation(#20043,#20015)
+enclosing_stmt(#20043,#20042)
+expr_containers(#20043,#20001)
+literals("/^(?<ws>\s+)\w+\k<ws>$/","/^(?<ws>\s+)\w+\k<ws>$/",#20043)
+#20044=*
+regexpterm(#20044,1,#20043,0,"^(?<ws>\s+)\w+\k<ws>$")
+#20045=@"loc,{#10000},1,2,1,22"
+locations_default(#20045,#10000,1,2,1,22)
+hasLocation(#20044,#20045)
+#20046=*
+regexpterm(#20046,2,#20044,0,"^")
+#20047=@"loc,{#10000},1,2,1,2"
+locations_default(#20047,#10000,1,2,1,2)
+hasLocation(#20046,#20047)
+#20048=*
+regexpterm(#20048,13,#20044,1,"(?<ws>\s+)")
+#20049=@"loc,{#10000},1,3,1,12"
+locations_default(#20049,#10000,1,3,1,12)
+hasLocation(#20048,#20049)
+is_capture(#20048,1)
+is_named_capture(#20048,"ws")
+#20050=*
+regexpterm(#20050,9,#20048,0,"\s+")
+#20051=@"loc,{#10000},1,9,1,11"
+locations_default(#20051,#10000,1,9,1,11)
+hasLocation(#20050,#20051)
+is_greedy(#20050)
+#20052=*
+regexpterm(#20052,20,#20050,0,"\s")
+#20053=@"loc,{#10000},1,9,1,10"
+locations_default(#20053,#10000,1,9,1,10)
+hasLocation(#20052,#20053)
+char_class_escape(#20052,"s")
+#20054=*
+regexpterm(#20054,9,#20044,2,"\w+")
+#20055=@"loc,{#10000},1,13,1,15"
+locations_default(#20055,#10000,1,13,1,15)
+hasLocation(#20054,#20055)
+is_greedy(#20054)
+#20056=*
+regexpterm(#20056,20,#20054,0,"\w")
+#20057=@"loc,{#10000},1,13,1,14"
+locations_default(#20057,#10000,1,13,1,14)
+hasLocation(#20056,#20057)
+char_class_escape(#20056,"w")
+#20058=*
+regexpterm(#20058,22,#20044,3,"\k<ws>")
+#20059=@"loc,{#10000},1,16,1,21"
+locations_default(#20059,#10000,1,16,1,21)
+hasLocation(#20058,#20059)
+named_backref(#20058,"ws")
+#20060=*
+regexpterm(#20060,3,#20044,4,"$")
+#20061=@"loc,{#10000},1,22,1,22"
+locations_default(#20061,#10000,1,22,1,22)
+hasLocation(#20060,#20061)
 #20062=*
-exprs(#20062,5,#20061,0,"/(?<=.)/")
-hasLocation(#20062,#20019)
-enclosing_stmt(#20062,#20061)
-expr_containers(#20062,#20001)
-literals("/(?<=.)/","/(?<=.)/",#20062)
+stmts(#20062,2,#20001,1,"/(?<=.)/;")
+hasLocation(#20062,#20005)
+stmt_containers(#20062,#20001)
 #20063=*
-regexpterm(#20063,25,#20062,0,"(?<=.)")
-#20064=@"loc,{#10000},2,2,2,7"
-locations_default(#20064,#10000,2,2,2,7)
-hasLocation(#20063,#20064)
-#20065=*
-regexpterm(#20065,12,#20063,0,".")
-#20066=@"loc,{#10000},2,6,2,6"
-locations_default(#20066,#10000,2,6,2,6)
-hasLocation(#20065,#20066)
-#20067=*
-stmts(#20067,2,#20001,2,"/(?<!.)/;")
-hasLocation(#20067,#20007)
-stmt_containers(#20067,#20001)
+exprs(#20063,5,#20062,0,"/(?<=.)/")
+hasLocation(#20063,#20019)
+enclosing_stmt(#20063,#20062)
+expr_containers(#20063,#20001)
+literals("/(?<=.)/","/(?<=.)/",#20063)
+#20064=*
+regexpterm(#20064,25,#20063,0,"(?<=.)")
+#20065=@"loc,{#10000},2,2,2,7"
+locations_default(#20065,#10000,2,2,2,7)
+hasLocation(#20064,#20065)
+#20066=*
+regexpterm(#20066,12,#20064,0,".")
+#20067=@"loc,{#10000},2,6,2,6"
+locations_default(#20067,#10000,2,6,2,6)
+hasLocation(#20066,#20067)
 #20068=*
-exprs(#20068,5,#20067,0,"/(?<!.)/")
-hasLocation(#20068,#20023)
-enclosing_stmt(#20068,#20067)
-expr_containers(#20068,#20001)
-literals("/(?<!.)/","/(?<!.)/",#20068)
+stmts(#20068,2,#20001,2,"/(?<!.)/;")
+hasLocation(#20068,#20007)
+stmt_containers(#20068,#20001)
 #20069=*
-regexpterm(#20069,26,#20068,0,"(?<!.)")
-#20070=@"loc,{#10000},3,2,3,7"
-locations_default(#20070,#10000,3,2,3,7)
-hasLocation(#20069,#20070)
-#20071=*
-regexpterm(#20071,12,#20069,0,".")
-#20072=@"loc,{#10000},3,6,3,6"
-locations_default(#20072,#10000,3,6,3,6)
-hasLocation(#20071,#20072)
-#20073=*
-stmts(#20073,2,#20001,3,"/\p{Number}/u;")
-hasLocation(#20073,#20009)
-stmt_containers(#20073,#20001)
+exprs(#20069,5,#20068,0,"/(?<!.)/")
+hasLocation(#20069,#20023)
+enclosing_stmt(#20069,#20068)
+expr_containers(#20069,#20001)
+literals("/(?<!.)/","/(?<!.)/",#20069)
+#20070=*
+regexpterm(#20070,26,#20069,0,"(?<!.)")
+#20071=@"loc,{#10000},3,2,3,7"
+locations_default(#20071,#10000,3,2,3,7)
+hasLocation(#20070,#20071)
+#20072=*
+regexpterm(#20072,12,#20070,0,".")
+#20073=@"loc,{#10000},3,6,3,6"
+locations_default(#20073,#10000,3,6,3,6)
+hasLocation(#20072,#20073)
 #20074=*
-exprs(#20074,5,#20073,0,"/\p{Number}/u")
-hasLocation(#20074,#20027)
-enclosing_stmt(#20074,#20073)
-expr_containers(#20074,#20001)
-literals("/\p{Number}/u","/\p{Number}/u",#20074)
+stmts(#20074,2,#20001,3,"/\p{Number}/u;")
+hasLocation(#20074,#20009)
+stmt_containers(#20074,#20001)
 #20075=*
-regexpterm(#20075,27,#20074,0,"\p{Number}")
-#20076=@"loc,{#10000},4,2,4,11"
-locations_default(#20076,#10000,4,2,4,11)
-hasLocation(#20075,#20076)
-unicode_property_escapename(#20075,"Number")
-#20077=*
-stmts(#20077,2,#20001,4,"/\P{Script=Greek}/u;")
-hasLocation(#20077,#20011)
-stmt_containers(#20077,#20001)
+exprs(#20075,5,#20074,0,"/\p{Number}/u")
+hasLocation(#20075,#20027)
+enclosing_stmt(#20075,#20074)
+expr_containers(#20075,#20001)
+literals("/\p{Number}/u","/\p{Number}/u",#20075)
+#20076=*
+regexpterm(#20076,27,#20075,0,"\p{Number}")
+#20077=@"loc,{#10000},4,2,4,11"
+locations_default(#20077,#10000,4,2,4,11)
+hasLocation(#20076,#20077)
+unicode_property_escapename(#20076,"Number")
 #20078=*
-exprs(#20078,5,#20077,0,"/\P{Script=Greek}/u")
-hasLocation(#20078,#20031)
-enclosing_stmt(#20078,#20077)
-expr_containers(#20078,#20001)
-literals("/\P{Script=Greek}/u","/\P{Script=Greek}/u",#20078)
+stmts(#20078,2,#20001,4,"/\P{Script=Greek}/u;")
+hasLocation(#20078,#20011)
+stmt_containers(#20078,#20001)
 #20079=*
-regexpterm(#20079,27,#20078,0,"\P{Script=Greek}")
-#20080=@"loc,{#10000},5,2,5,17"
-locations_default(#20080,#10000,5,2,5,17)
-hasLocation(#20079,#20080)
-unicode_property_escapename(#20079,"Script")
-unicode_property_escapevalue(#20079,"Greek")
-#20081=*
-stmts(#20081,2,#20001,5,"/\k</;")
-hasLocation(#20081,#20013)
-stmt_containers(#20081,#20001)
+exprs(#20079,5,#20078,0,"/\P{Script=Greek}/u")
+hasLocation(#20079,#20031)
+enclosing_stmt(#20079,#20078)
+expr_containers(#20079,#20001)
+literals("/\P{Script=Greek}/u","/\P{Script=Greek}/u",#20079)
+#20080=*
+regexpterm(#20080,27,#20079,0,"\P{Script=Greek}")
+#20081=@"loc,{#10000},5,2,5,17"
+locations_default(#20081,#10000,5,2,5,17)
+hasLocation(#20080,#20081)
+unicode_property_escapename(#20080,"Script")
+unicode_property_escapevalue(#20080,"Greek")
 #20082=*
-exprs(#20082,5,#20081,0,"/\k</")
-hasLocation(#20082,#20035)
-enclosing_stmt(#20082,#20081)
-expr_containers(#20082,#20001)
-literals("/\k</","/\k</",#20082)
+stmts(#20082,2,#20001,5,"/\k</;")
+hasLocation(#20082,#20013)
+stmt_containers(#20082,#20001)
 #20083=*
-regexpterm(#20083,22,#20082,0,"\k<")
-#20084=@"loc,{#10000},6,2,6,4"
-locations_default(#20084,#10000,6,2,6,4)
-hasLocation(#20083,#20084)
-named_backref(#20083,"")
-#20085=*
-regexp_parse_errors(#20085,#20083,"expected identifier")
-#20086=@"loc,{#10000},6,5,6,5"
-locations_default(#20086,#10000,6,5,6,5)
-hasLocation(#20085,#20086)
-#20087=*
-regexp_parse_errors(#20087,#20083,"expected '>'")
-#20088=@"loc,{#10000},6,4,6,4"
-locations_default(#20088,#10000,6,4,6,4)
-hasLocation(#20087,#20088)
-#20089=*
-entry_cfg_node(#20089,#20001)
-#20090=@"loc,{#10000},1,1,1,0"
-locations_default(#20090,#10000,1,1,1,0)
-hasLocation(#20089,#20090)
-#20091=*
-exit_cfg_node(#20091,#20001)
-hasLocation(#20091,#20039)
-successor(#20081,#20082)
-successor(#20082,#20091)
-successor(#20077,#20078)
-successor(#20078,#20081)
-successor(#20073,#20074)
-successor(#20074,#20077)
-successor(#20067,#20068)
-successor(#20068,#20073)
-successor(#20061,#20062)
-successor(#20062,#20067)
-successor(#20041,#20042)
-successor(#20042,#20061)
-successor(#20089,#20041)
+exprs(#20083,5,#20082,0,"/\k</")
+hasLocation(#20083,#20035)
+enclosing_stmt(#20083,#20082)
+expr_containers(#20083,#20001)
+literals("/\k</","/\k</",#20083)
+#20084=*
+regexpterm(#20084,22,#20083,0,"\k<")
+#20085=@"loc,{#10000},6,2,6,4"
+locations_default(#20085,#10000,6,2,6,4)
+hasLocation(#20084,#20085)
+named_backref(#20084,"")
+#20086=*
+regexp_parse_errors(#20086,#20084,"expected identifier")
+#20087=@"loc,{#10000},6,5,6,5"
+locations_default(#20087,#10000,6,5,6,5)
+hasLocation(#20086,#20087)
+#20088=*
+regexp_parse_errors(#20088,#20084,"expected '>'")
+#20089=@"loc,{#10000},6,4,6,4"
+locations_default(#20089,#10000,6,4,6,4)
+hasLocation(#20088,#20089)
+#20090=*
+entry_cfg_node(#20090,#20001)
+#20091=@"loc,{#10000},1,1,1,0"
+locations_default(#20091,#10000,1,1,1,0)
+hasLocation(#20090,#20091)
+#20092=*
+exit_cfg_node(#20092,#20001)
+hasLocation(#20092,#20039)
+successor(#20082,#20083)
+successor(#20083,#20092)
+successor(#20078,#20079)
+successor(#20079,#20082)
+successor(#20074,#20075)
+successor(#20075,#20078)
+successor(#20068,#20069)
+successor(#20069,#20074)
+successor(#20062,#20063)
+successor(#20063,#20068)
+successor(#20042,#20043)
+successor(#20043,#20062)
+successor(#20090,#20042)
 numlines(#10000,6,6,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/regexp/output/trap/multipart.js.trap b/javascript/extractor/tests/regexp/output/trap/multipart.js.trap
index 4039d782b26..a63c883c8a0 100644
--- a/javascript/extractor/tests/regexp/output/trap/multipart.js.trap
+++ b/javascript/extractor/tests/regexp/output/trap/multipart.js.trap
@@ -689,774 +689,776 @@ variables(#20253,"bad95",#20000)
 variables(#20254,"bad96",#20000)
 #20255=@"var;{bad97};{#20000}"
 variables(#20255,"bad97",#20000)
-#20256=*
-stmts(#20256,18,#20001,0,"var reg ... ""bar"");")
-hasLocation(#20256,#20003)
-stmt_containers(#20256,#20001)
+#20256=@"var;{this};{#20000}"
+variables(#20256,"this",#20000)
 #20257=*
-exprs(#20257,64,#20256,0,"reg = n ...  ""bar"")")
-#20258=@"loc,{#10000},1,5,1,35"
-locations_default(#20258,#10000,1,5,1,35)
-hasLocation(#20257,#20258)
-enclosing_stmt(#20257,#20256)
-expr_containers(#20257,#20001)
-#20259=*
-exprs(#20259,78,#20257,0,"reg")
-hasLocation(#20259,#20067)
-enclosing_stmt(#20259,#20256)
-expr_containers(#20259,#20001)
-literals("reg","reg",#20259)
-decl(#20259,#20249)
+stmts(#20257,18,#20001,0,"var reg ... ""bar"");")
+hasLocation(#20257,#20003)
+stmt_containers(#20257,#20001)
+#20258=*
+exprs(#20258,64,#20257,0,"reg = n ...  ""bar"")")
+#20259=@"loc,{#10000},1,5,1,35"
+locations_default(#20259,#10000,1,5,1,35)
+hasLocation(#20258,#20259)
+enclosing_stmt(#20258,#20257)
+expr_containers(#20258,#20001)
 #20260=*
-exprs(#20260,12,#20257,1,"new Reg ...  ""bar"")")
-#20261=@"loc,{#10000},1,11,1,35"
-locations_default(#20261,#10000,1,11,1,35)
-hasLocation(#20260,#20261)
-enclosing_stmt(#20260,#20256)
+exprs(#20260,78,#20258,0,"reg")
+hasLocation(#20260,#20067)
+enclosing_stmt(#20260,#20257)
 expr_containers(#20260,#20001)
-#20262=*
-exprs(#20262,79,#20260,-1,"RegExp")
-hasLocation(#20262,#20073)
-enclosing_stmt(#20262,#20256)
-expr_containers(#20262,#20001)
-literals("RegExp","RegExp",#20262)
-#20263=@"var;{RegExp};{#20000}"
-variables(#20263,"RegExp",#20000)
-bind(#20262,#20263)
-#20264=*
-exprs(#20264,34,#20260,0,"""foo"" + ""bar""")
-#20265=@"loc,{#10000},1,22,1,34"
-locations_default(#20265,#10000,1,22,1,34)
-hasLocation(#20264,#20265)
-enclosing_stmt(#20264,#20256)
-expr_containers(#20264,#20001)
-#20266=*
-exprs(#20266,4,#20264,0,"""foo""")
-hasLocation(#20266,#20077)
-enclosing_stmt(#20266,#20256)
-expr_containers(#20266,#20001)
-literals("foo","""foo""",#20266)
+literals("reg","reg",#20260)
+decl(#20260,#20249)
+#20261=*
+exprs(#20261,12,#20258,1,"new Reg ...  ""bar"")")
+#20262=@"loc,{#10000},1,11,1,35"
+locations_default(#20262,#10000,1,11,1,35)
+hasLocation(#20261,#20262)
+enclosing_stmt(#20261,#20257)
+expr_containers(#20261,#20001)
+#20263=*
+exprs(#20263,79,#20261,-1,"RegExp")
+hasLocation(#20263,#20073)
+enclosing_stmt(#20263,#20257)
+expr_containers(#20263,#20001)
+literals("RegExp","RegExp",#20263)
+#20264=@"var;{RegExp};{#20000}"
+variables(#20264,"RegExp",#20000)
+bind(#20263,#20264)
+#20265=*
+exprs(#20265,34,#20261,0,"""foo"" + ""bar""")
+#20266=@"loc,{#10000},1,22,1,34"
+locations_default(#20266,#10000,1,22,1,34)
+hasLocation(#20265,#20266)
+enclosing_stmt(#20265,#20257)
+expr_containers(#20265,#20001)
 #20267=*
-exprs(#20267,4,#20264,1,"""bar""")
-hasLocation(#20267,#20081)
-enclosing_stmt(#20267,#20256)
+exprs(#20267,4,#20265,0,"""foo""")
+hasLocation(#20267,#20077)
+enclosing_stmt(#20267,#20257)
 expr_containers(#20267,#20001)
-literals("bar","""bar""",#20267)
+literals("foo","""foo""",#20267)
 #20268=*
-regexpterm(#20268,14,#20264,0,"foobar")
-#20269=@"loc,{#10000},1,23,1,33"
-locations_default(#20269,#10000,1,23,1,33)
-hasLocation(#20268,#20269)
-regexp_const_value(#20268,"foobar")
-#20270=*
-stmts(#20270,18,#20001,1,"var reg ... ""bar"");")
-#20271=@"loc,{#10000},3,1,4,13"
-locations_default(#20271,#10000,3,1,4,13)
-hasLocation(#20270,#20271)
-stmt_containers(#20270,#20001)
-#20272=*
-exprs(#20272,64,#20270,0,"reg2 =  ...  ""bar"")")
-#20273=@"loc,{#10000},3,5,4,12"
-locations_default(#20273,#10000,3,5,4,12)
-hasLocation(#20272,#20273)
-enclosing_stmt(#20272,#20270)
-expr_containers(#20272,#20001)
-#20274=*
-exprs(#20274,78,#20272,0,"reg2")
-hasLocation(#20274,#20089)
-enclosing_stmt(#20274,#20270)
-expr_containers(#20274,#20001)
-literals("reg2","reg2",#20274)
-decl(#20274,#20250)
+exprs(#20268,4,#20265,1,"""bar""")
+hasLocation(#20268,#20081)
+enclosing_stmt(#20268,#20257)
+expr_containers(#20268,#20001)
+literals("bar","""bar""",#20268)
+#20269=*
+regexpterm(#20269,14,#20265,0,"foobar")
+#20270=@"loc,{#10000},1,23,1,33"
+locations_default(#20270,#10000,1,23,1,33)
+hasLocation(#20269,#20270)
+regexp_const_value(#20269,"foobar")
+#20271=*
+stmts(#20271,18,#20001,1,"var reg ... ""bar"");")
+#20272=@"loc,{#10000},3,1,4,13"
+locations_default(#20272,#10000,3,1,4,13)
+hasLocation(#20271,#20272)
+stmt_containers(#20271,#20001)
+#20273=*
+exprs(#20273,64,#20271,0,"reg2 =  ...  ""bar"")")
+#20274=@"loc,{#10000},3,5,4,12"
+locations_default(#20274,#10000,3,5,4,12)
+hasLocation(#20273,#20274)
+enclosing_stmt(#20273,#20271)
+expr_containers(#20273,#20001)
 #20275=*
-exprs(#20275,12,#20272,1,"new Reg ...  ""bar"")")
-#20276=@"loc,{#10000},3,12,4,12"
-locations_default(#20276,#10000,3,12,4,12)
-hasLocation(#20275,#20276)
-enclosing_stmt(#20275,#20270)
+exprs(#20275,78,#20273,0,"reg2")
+hasLocation(#20275,#20089)
+enclosing_stmt(#20275,#20271)
 expr_containers(#20275,#20001)
-#20277=*
-exprs(#20277,79,#20275,-1,"RegExp")
-hasLocation(#20277,#20095)
-enclosing_stmt(#20277,#20270)
-expr_containers(#20277,#20001)
-literals("RegExp","RegExp",#20277)
-bind(#20277,#20263)
+literals("reg2","reg2",#20275)
+decl(#20275,#20250)
+#20276=*
+exprs(#20276,12,#20273,1,"new Reg ...  ""bar"")")
+#20277=@"loc,{#10000},3,12,4,12"
+locations_default(#20277,#10000,3,12,4,12)
+hasLocation(#20276,#20277)
+enclosing_stmt(#20276,#20271)
+expr_containers(#20276,#20001)
 #20278=*
-exprs(#20278,34,#20275,0,"""foo""\n    + ""bar""")
-#20279=@"loc,{#10000},3,23,4,11"
-locations_default(#20279,#10000,3,23,4,11)
-hasLocation(#20278,#20279)
-enclosing_stmt(#20278,#20270)
+exprs(#20278,79,#20276,-1,"RegExp")
+hasLocation(#20278,#20095)
+enclosing_stmt(#20278,#20271)
 expr_containers(#20278,#20001)
-#20280=*
-exprs(#20280,4,#20278,0,"""foo""")
-hasLocation(#20280,#20099)
-enclosing_stmt(#20280,#20270)
-expr_containers(#20280,#20001)
-literals("foo","""foo""",#20280)
+literals("RegExp","RegExp",#20278)
+bind(#20278,#20264)
+#20279=*
+exprs(#20279,34,#20276,0,"""foo""\n    + ""bar""")
+#20280=@"loc,{#10000},3,23,4,11"
+locations_default(#20280,#10000,3,23,4,11)
+hasLocation(#20279,#20280)
+enclosing_stmt(#20279,#20271)
+expr_containers(#20279,#20001)
 #20281=*
-exprs(#20281,4,#20278,1,"""bar""")
-hasLocation(#20281,#20103)
-enclosing_stmt(#20281,#20270)
+exprs(#20281,4,#20279,0,"""foo""")
+hasLocation(#20281,#20099)
+enclosing_stmt(#20281,#20271)
 expr_containers(#20281,#20001)
-literals("bar","""bar""",#20281)
+literals("foo","""foo""",#20281)
 #20282=*
-regexpterm(#20282,14,#20278,0,"foobar")
-#20283=@"loc,{#10000},3,24,4,10"
-locations_default(#20283,#10000,3,24,4,10)
-hasLocation(#20282,#20283)
-regexp_const_value(#20282,"foobar")
-#20284=*
-stmts(#20284,18,#20001,2,"var reg ... ""bar"");")
-#20285=@"loc,{#10000},6,1,7,19"
-locations_default(#20285,#10000,6,1,7,19)
-hasLocation(#20284,#20285)
-stmt_containers(#20284,#20001)
-#20286=*
-exprs(#20286,64,#20284,0,"reg3 =  ...  ""bar"")")
-#20287=@"loc,{#10000},6,5,7,18"
-locations_default(#20287,#10000,6,5,7,18)
-hasLocation(#20286,#20287)
-enclosing_stmt(#20286,#20284)
-expr_containers(#20286,#20001)
-#20288=*
-exprs(#20288,78,#20286,0,"reg3")
-hasLocation(#20288,#20111)
-enclosing_stmt(#20288,#20284)
-expr_containers(#20288,#20001)
-literals("reg3","reg3",#20288)
-decl(#20288,#20251)
+exprs(#20282,4,#20279,1,"""bar""")
+hasLocation(#20282,#20103)
+enclosing_stmt(#20282,#20271)
+expr_containers(#20282,#20001)
+literals("bar","""bar""",#20282)
+#20283=*
+regexpterm(#20283,14,#20279,0,"foobar")
+#20284=@"loc,{#10000},3,24,4,10"
+locations_default(#20284,#10000,3,24,4,10)
+hasLocation(#20283,#20284)
+regexp_const_value(#20283,"foobar")
+#20285=*
+stmts(#20285,18,#20001,2,"var reg ... ""bar"");")
+#20286=@"loc,{#10000},6,1,7,19"
+locations_default(#20286,#10000,6,1,7,19)
+hasLocation(#20285,#20286)
+stmt_containers(#20285,#20001)
+#20287=*
+exprs(#20287,64,#20285,0,"reg3 =  ...  ""bar"")")
+#20288=@"loc,{#10000},6,5,7,18"
+locations_default(#20288,#10000,6,5,7,18)
+hasLocation(#20287,#20288)
+enclosing_stmt(#20287,#20285)
+expr_containers(#20287,#20001)
 #20289=*
-exprs(#20289,12,#20286,1,"new Reg ...  ""bar"")")
-#20290=@"loc,{#10000},6,12,7,18"
-locations_default(#20290,#10000,6,12,7,18)
-hasLocation(#20289,#20290)
-enclosing_stmt(#20289,#20284)
+exprs(#20289,78,#20287,0,"reg3")
+hasLocation(#20289,#20111)
+enclosing_stmt(#20289,#20285)
 expr_containers(#20289,#20001)
-#20291=*
-exprs(#20291,79,#20289,-1,"RegExp")
-hasLocation(#20291,#20117)
-enclosing_stmt(#20291,#20284)
-expr_containers(#20291,#20001)
-literals("RegExp","RegExp",#20291)
-bind(#20291,#20263)
+literals("reg3","reg3",#20289)
+decl(#20289,#20251)
+#20290=*
+exprs(#20290,12,#20287,1,"new Reg ...  ""bar"")")
+#20291=@"loc,{#10000},6,12,7,18"
+locations_default(#20291,#10000,6,12,7,18)
+hasLocation(#20290,#20291)
+enclosing_stmt(#20290,#20285)
+expr_containers(#20290,#20001)
 #20292=*
-exprs(#20292,34,#20289,0,"""foo"" + ""bar""")
-#20293=@"loc,{#10000},7,5,7,17"
-locations_default(#20293,#10000,7,5,7,17)
-hasLocation(#20292,#20293)
-enclosing_stmt(#20292,#20284)
+exprs(#20292,79,#20290,-1,"RegExp")
+hasLocation(#20292,#20117)
+enclosing_stmt(#20292,#20285)
 expr_containers(#20292,#20001)
-#20294=*
-exprs(#20294,4,#20292,0,"""foo""")
-hasLocation(#20294,#20121)
-enclosing_stmt(#20294,#20284)
-expr_containers(#20294,#20001)
-literals("foo","""foo""",#20294)
+literals("RegExp","RegExp",#20292)
+bind(#20292,#20264)
+#20293=*
+exprs(#20293,34,#20290,0,"""foo"" + ""bar""")
+#20294=@"loc,{#10000},7,5,7,17"
+locations_default(#20294,#10000,7,5,7,17)
+hasLocation(#20293,#20294)
+enclosing_stmt(#20293,#20285)
+expr_containers(#20293,#20001)
 #20295=*
-exprs(#20295,4,#20292,1,"""bar""")
-hasLocation(#20295,#20125)
-enclosing_stmt(#20295,#20284)
+exprs(#20295,4,#20293,0,"""foo""")
+hasLocation(#20295,#20121)
+enclosing_stmt(#20295,#20285)
 expr_containers(#20295,#20001)
-literals("bar","""bar""",#20295)
+literals("foo","""foo""",#20295)
 #20296=*
-regexpterm(#20296,14,#20292,0,"foobar")
-#20297=@"loc,{#10000},7,6,7,16"
-locations_default(#20297,#10000,7,6,7,16)
-hasLocation(#20296,#20297)
-regexp_const_value(#20296,"foobar")
-#20298=*
-stmts(#20298,18,#20001,3,"var reg ... qux""\n);")
-#20299=@"loc,{#10000},9,1,14,2"
-locations_default(#20299,#10000,9,1,14,2)
-hasLocation(#20298,#20299)
-stmt_containers(#20298,#20001)
-#20300=*
-exprs(#20300,64,#20298,0,"reg4 =  ... ""qux""\n)")
-#20301=@"loc,{#10000},9,5,14,1"
-locations_default(#20301,#10000,9,5,14,1)
-hasLocation(#20300,#20301)
-enclosing_stmt(#20300,#20298)
-expr_containers(#20300,#20001)
-#20302=*
-exprs(#20302,78,#20300,0,"reg4")
-hasLocation(#20302,#20133)
-enclosing_stmt(#20302,#20298)
-expr_containers(#20302,#20001)
-literals("reg4","reg4",#20302)
-decl(#20302,#20252)
+exprs(#20296,4,#20293,1,"""bar""")
+hasLocation(#20296,#20125)
+enclosing_stmt(#20296,#20285)
+expr_containers(#20296,#20001)
+literals("bar","""bar""",#20296)
+#20297=*
+regexpterm(#20297,14,#20293,0,"foobar")
+#20298=@"loc,{#10000},7,6,7,16"
+locations_default(#20298,#10000,7,6,7,16)
+hasLocation(#20297,#20298)
+regexp_const_value(#20297,"foobar")
+#20299=*
+stmts(#20299,18,#20001,3,"var reg ... qux""\n);")
+#20300=@"loc,{#10000},9,1,14,2"
+locations_default(#20300,#10000,9,1,14,2)
+hasLocation(#20299,#20300)
+stmt_containers(#20299,#20001)
+#20301=*
+exprs(#20301,64,#20299,0,"reg4 =  ... ""qux""\n)")
+#20302=@"loc,{#10000},9,5,14,1"
+locations_default(#20302,#10000,9,5,14,1)
+hasLocation(#20301,#20302)
+enclosing_stmt(#20301,#20299)
+expr_containers(#20301,#20001)
 #20303=*
-exprs(#20303,12,#20300,1,"new Reg ... ""qux""\n)")
-#20304=@"loc,{#10000},9,12,14,1"
-locations_default(#20304,#10000,9,12,14,1)
-hasLocation(#20303,#20304)
-enclosing_stmt(#20303,#20298)
+exprs(#20303,78,#20301,0,"reg4")
+hasLocation(#20303,#20133)
+enclosing_stmt(#20303,#20299)
 expr_containers(#20303,#20001)
-#20305=*
-exprs(#20305,79,#20303,-1,"RegExp")
-hasLocation(#20305,#20139)
-enclosing_stmt(#20305,#20298)
-expr_containers(#20305,#20001)
-literals("RegExp","RegExp",#20305)
-bind(#20305,#20263)
+literals("reg4","reg4",#20303)
+decl(#20303,#20252)
+#20304=*
+exprs(#20304,12,#20301,1,"new Reg ... ""qux""\n)")
+#20305=@"loc,{#10000},9,12,14,1"
+locations_default(#20305,#10000,9,12,14,1)
+hasLocation(#20304,#20305)
+enclosing_stmt(#20304,#20299)
+expr_containers(#20304,#20001)
 #20306=*
-exprs(#20306,34,#20303,0,"""foo"" + ...   ""qux""")
-#20307=@"loc,{#10000},10,5,13,9"
-locations_default(#20307,#10000,10,5,13,9)
-hasLocation(#20306,#20307)
-enclosing_stmt(#20306,#20298)
+exprs(#20306,79,#20304,-1,"RegExp")
+hasLocation(#20306,#20139)
+enclosing_stmt(#20306,#20299)
 expr_containers(#20306,#20001)
-#20308=*
-exprs(#20308,34,#20306,0,"""foo"" + ...   ""baz""")
-#20309=@"loc,{#10000},10,5,12,9"
-locations_default(#20309,#10000,10,5,12,9)
-hasLocation(#20308,#20309)
-enclosing_stmt(#20308,#20298)
-expr_containers(#20308,#20001)
-#20310=*
-exprs(#20310,34,#20308,0,"""foo"" + \n    ""bar""")
-#20311=@"loc,{#10000},10,5,11,9"
-locations_default(#20311,#10000,10,5,11,9)
-hasLocation(#20310,#20311)
-enclosing_stmt(#20310,#20298)
-expr_containers(#20310,#20001)
-#20312=*
-exprs(#20312,4,#20310,0,"""foo""")
-hasLocation(#20312,#20143)
-enclosing_stmt(#20312,#20298)
-expr_containers(#20312,#20001)
-literals("foo","""foo""",#20312)
+literals("RegExp","RegExp",#20306)
+bind(#20306,#20264)
+#20307=*
+exprs(#20307,34,#20304,0,"""foo"" + ...   ""qux""")
+#20308=@"loc,{#10000},10,5,13,9"
+locations_default(#20308,#10000,10,5,13,9)
+hasLocation(#20307,#20308)
+enclosing_stmt(#20307,#20299)
+expr_containers(#20307,#20001)
+#20309=*
+exprs(#20309,34,#20307,0,"""foo"" + ...   ""baz""")
+#20310=@"loc,{#10000},10,5,12,9"
+locations_default(#20310,#10000,10,5,12,9)
+hasLocation(#20309,#20310)
+enclosing_stmt(#20309,#20299)
+expr_containers(#20309,#20001)
+#20311=*
+exprs(#20311,34,#20309,0,"""foo"" + \n    ""bar""")
+#20312=@"loc,{#10000},10,5,11,9"
+locations_default(#20312,#10000,10,5,11,9)
+hasLocation(#20311,#20312)
+enclosing_stmt(#20311,#20299)
+expr_containers(#20311,#20001)
 #20313=*
-exprs(#20313,4,#20310,1,"""bar""")
-hasLocation(#20313,#20147)
-enclosing_stmt(#20313,#20298)
+exprs(#20313,4,#20311,0,"""foo""")
+hasLocation(#20313,#20143)
+enclosing_stmt(#20313,#20299)
 expr_containers(#20313,#20001)
-literals("bar","""bar""",#20313)
+literals("foo","""foo""",#20313)
 #20314=*
-exprs(#20314,4,#20308,1,"""baz""")
-hasLocation(#20314,#20151)
-enclosing_stmt(#20314,#20298)
+exprs(#20314,4,#20311,1,"""bar""")
+hasLocation(#20314,#20147)
+enclosing_stmt(#20314,#20299)
 expr_containers(#20314,#20001)
-literals("baz","""baz""",#20314)
+literals("bar","""bar""",#20314)
 #20315=*
-exprs(#20315,4,#20306,1,"""qux""")
-hasLocation(#20315,#20155)
-enclosing_stmt(#20315,#20298)
+exprs(#20315,4,#20309,1,"""baz""")
+hasLocation(#20315,#20151)
+enclosing_stmt(#20315,#20299)
 expr_containers(#20315,#20001)
-literals("qux","""qux""",#20315)
+literals("baz","""baz""",#20315)
 #20316=*
-regexpterm(#20316,14,#20306,0,"foobarbazqux")
-#20317=@"loc,{#10000},10,6,13,8"
-locations_default(#20317,#10000,10,6,13,8)
-hasLocation(#20316,#20317)
-regexp_const_value(#20316,"foobarbazqux")
-#20318=*
-stmts(#20318,18,#20001,4,"var bad ... ""b$""\n);")
-#20319=@"loc,{#10000},16,1,21,2"
-locations_default(#20319,#10000,16,1,21,2)
-hasLocation(#20318,#20319)
-stmt_containers(#20318,#20001)
-#20320=*
-exprs(#20320,64,#20318,0,"bad95 = ...  ""b$""\n)")
-#20321=@"loc,{#10000},16,5,21,1"
-locations_default(#20321,#10000,16,5,21,1)
-hasLocation(#20320,#20321)
-enclosing_stmt(#20320,#20318)
-expr_containers(#20320,#20001)
-#20322=*
-exprs(#20322,78,#20320,0,"bad95")
-hasLocation(#20322,#20163)
-enclosing_stmt(#20322,#20318)
-expr_containers(#20322,#20001)
-literals("bad95","bad95",#20322)
-decl(#20322,#20253)
+exprs(#20316,4,#20307,1,"""qux""")
+hasLocation(#20316,#20155)
+enclosing_stmt(#20316,#20299)
+expr_containers(#20316,#20001)
+literals("qux","""qux""",#20316)
+#20317=*
+regexpterm(#20317,14,#20307,0,"foobarbazqux")
+#20318=@"loc,{#10000},10,6,13,8"
+locations_default(#20318,#10000,10,6,13,8)
+hasLocation(#20317,#20318)
+regexp_const_value(#20317,"foobarbazqux")
+#20319=*
+stmts(#20319,18,#20001,4,"var bad ... ""b$""\n);")
+#20320=@"loc,{#10000},16,1,21,2"
+locations_default(#20320,#10000,16,1,21,2)
+hasLocation(#20319,#20320)
+stmt_containers(#20319,#20001)
+#20321=*
+exprs(#20321,64,#20319,0,"bad95 = ...  ""b$""\n)")
+#20322=@"loc,{#10000},16,5,21,1"
+locations_default(#20322,#10000,16,5,21,1)
+hasLocation(#20321,#20322)
+enclosing_stmt(#20321,#20319)
+expr_containers(#20321,#20001)
 #20323=*
-exprs(#20323,12,#20320,1,"new Reg ...  ""b$""\n)")
-#20324=@"loc,{#10000},16,13,21,1"
-locations_default(#20324,#10000,16,13,21,1)
-hasLocation(#20323,#20324)
-enclosing_stmt(#20323,#20318)
+exprs(#20323,78,#20321,0,"bad95")
+hasLocation(#20323,#20163)
+enclosing_stmt(#20323,#20319)
 expr_containers(#20323,#20001)
-#20325=*
-exprs(#20325,79,#20323,-1,"RegExp")
-hasLocation(#20325,#20169)
-enclosing_stmt(#20325,#20318)
-expr_containers(#20325,#20001)
-literals("RegExp","RegExp",#20325)
-bind(#20325,#20263)
+literals("bad95","bad95",#20323)
+decl(#20323,#20253)
+#20324=*
+exprs(#20324,12,#20321,1,"new Reg ...  ""b$""\n)")
+#20325=@"loc,{#10000},16,13,21,1"
+locations_default(#20325,#10000,16,13,21,1)
+hasLocation(#20324,#20325)
+enclosing_stmt(#20324,#20319)
+expr_containers(#20324,#20001)
 #20326=*
-exprs(#20326,34,#20323,0,"""(a"" +  ...    ""b$""")
-#20327=@"loc,{#10000},17,5,20,8"
-locations_default(#20327,#10000,17,5,20,8)
-hasLocation(#20326,#20327)
-enclosing_stmt(#20326,#20318)
+exprs(#20326,79,#20324,-1,"RegExp")
+hasLocation(#20326,#20169)
+enclosing_stmt(#20326,#20319)
 expr_containers(#20326,#20001)
-#20328=*
-exprs(#20328,34,#20326,0,"""(a"" +  ...  ""aa)*""")
-#20329=@"loc,{#10000},17,5,19,10"
-locations_default(#20329,#10000,17,5,19,10)
-hasLocation(#20328,#20329)
-enclosing_stmt(#20328,#20318)
-expr_containers(#20328,#20001)
-#20330=*
-exprs(#20330,34,#20328,0,"""(a"" + \n    ""|""")
-#20331=@"loc,{#10000},17,5,18,7"
-locations_default(#20331,#10000,17,5,18,7)
-hasLocation(#20330,#20331)
-enclosing_stmt(#20330,#20318)
-expr_containers(#20330,#20001)
-#20332=*
-exprs(#20332,4,#20330,0,"""(a""")
-hasLocation(#20332,#20173)
-enclosing_stmt(#20332,#20318)
-expr_containers(#20332,#20001)
-literals("(a","""(a""",#20332)
+literals("RegExp","RegExp",#20326)
+bind(#20326,#20264)
+#20327=*
+exprs(#20327,34,#20324,0,"""(a"" +  ...    ""b$""")
+#20328=@"loc,{#10000},17,5,20,8"
+locations_default(#20328,#10000,17,5,20,8)
+hasLocation(#20327,#20328)
+enclosing_stmt(#20327,#20319)
+expr_containers(#20327,#20001)
+#20329=*
+exprs(#20329,34,#20327,0,"""(a"" +  ...  ""aa)*""")
+#20330=@"loc,{#10000},17,5,19,10"
+locations_default(#20330,#10000,17,5,19,10)
+hasLocation(#20329,#20330)
+enclosing_stmt(#20329,#20319)
+expr_containers(#20329,#20001)
+#20331=*
+exprs(#20331,34,#20329,0,"""(a"" + \n    ""|""")
+#20332=@"loc,{#10000},17,5,18,7"
+locations_default(#20332,#10000,17,5,18,7)
+hasLocation(#20331,#20332)
+enclosing_stmt(#20331,#20319)
+expr_containers(#20331,#20001)
 #20333=*
-exprs(#20333,4,#20330,1,"""|""")
-hasLocation(#20333,#20177)
-enclosing_stmt(#20333,#20318)
+exprs(#20333,4,#20331,0,"""(a""")
+hasLocation(#20333,#20173)
+enclosing_stmt(#20333,#20319)
 expr_containers(#20333,#20001)
-literals("|","""|""",#20333)
+literals("(a","""(a""",#20333)
 #20334=*
-exprs(#20334,4,#20328,1,"""aa)*""")
-hasLocation(#20334,#20181)
-enclosing_stmt(#20334,#20318)
+exprs(#20334,4,#20331,1,"""|""")
+hasLocation(#20334,#20177)
+enclosing_stmt(#20334,#20319)
 expr_containers(#20334,#20001)
-literals("aa)*","""aa)*""",#20334)
+literals("|","""|""",#20334)
 #20335=*
-exprs(#20335,4,#20326,1,"""b$""")
-hasLocation(#20335,#20185)
-enclosing_stmt(#20335,#20318)
+exprs(#20335,4,#20329,1,"""aa)*""")
+hasLocation(#20335,#20181)
+enclosing_stmt(#20335,#20319)
 expr_containers(#20335,#20001)
-literals("b$","""b$""",#20335)
+literals("aa)*","""aa)*""",#20335)
 #20336=*
-regexpterm(#20336,1,#20326,0,"(a|aa)*b$")
-#20337=@"loc,{#10000},17,6,20,7"
-locations_default(#20337,#10000,17,6,20,7)
-hasLocation(#20336,#20337)
-#20338=*
-regexpterm(#20338,8,#20336,0,"(a|aa)*")
-#20339=@"loc,{#10000},17,6,20,5"
-locations_default(#20339,#10000,17,6,20,5)
-hasLocation(#20338,#20339)
-is_greedy(#20338)
-#20340=*
-regexpterm(#20340,13,#20338,0,"(a|aa)")
-#20341=@"loc,{#10000},17,6,19,8"
-locations_default(#20341,#10000,17,6,19,8)
-hasLocation(#20340,#20341)
-is_capture(#20340,1)
-#20342=*
-regexpterm(#20342,0,#20340,0,"a|aa")
-#20343=@"loc,{#10000},17,7,19,7"
-locations_default(#20343,#10000,17,7,19,7)
-hasLocation(#20342,#20343)
-#20344=*
-regexpterm(#20344,14,#20342,0,"a")
-#20345=@"loc,{#10000},17,7,18,5"
-locations_default(#20345,#10000,17,7,18,5)
-hasLocation(#20344,#20345)
-regexp_const_value(#20344,"a")
-#20346=*
-regexpterm(#20346,14,#20342,1,"aa")
-#20347=@"loc,{#10000},19,6,19,7"
-locations_default(#20347,#10000,19,6,19,7)
-hasLocation(#20346,#20347)
-regexp_const_value(#20346,"aa")
-#20348=*
-regexpterm(#20348,14,#20336,1,"b")
-#20349=@"loc,{#10000},20,6,20,6"
-locations_default(#20349,#10000,20,6,20,6)
-hasLocation(#20348,#20349)
-regexp_const_value(#20348,"b")
-#20350=*
-regexpterm(#20350,3,#20336,2,"$")
-#20351=@"loc,{#10000},20,7,20,7"
-locations_default(#20351,#10000,20,7,20,7)
-hasLocation(#20350,#20351)
-#20352=*
-stmts(#20352,18,#20001,5,"var bad ... "")f$"");")
-#20353=@"loc,{#10000},23,1,27,7"
-locations_default(#20353,#10000,23,1,27,7)
-hasLocation(#20352,#20353)
-stmt_containers(#20352,#20001)
-#20354=*
-exprs(#20354,64,#20352,0,"bad96 = ... \n"")f$"")")
-#20355=@"loc,{#10000},23,5,27,6"
-locations_default(#20355,#10000,23,5,27,6)
-hasLocation(#20354,#20355)
-enclosing_stmt(#20354,#20352)
-expr_containers(#20354,#20001)
-#20356=*
-exprs(#20356,78,#20354,0,"bad96")
-hasLocation(#20356,#20193)
-enclosing_stmt(#20356,#20352)
-expr_containers(#20356,#20001)
-literals("bad96","bad96",#20356)
-decl(#20356,#20254)
+exprs(#20336,4,#20327,1,"""b$""")
+hasLocation(#20336,#20185)
+enclosing_stmt(#20336,#20319)
+expr_containers(#20336,#20001)
+literals("b$","""b$""",#20336)
+#20337=*
+regexpterm(#20337,1,#20327,0,"(a|aa)*b$")
+#20338=@"loc,{#10000},17,6,20,7"
+locations_default(#20338,#10000,17,6,20,7)
+hasLocation(#20337,#20338)
+#20339=*
+regexpterm(#20339,8,#20337,0,"(a|aa)*")
+#20340=@"loc,{#10000},17,6,20,5"
+locations_default(#20340,#10000,17,6,20,5)
+hasLocation(#20339,#20340)
+is_greedy(#20339)
+#20341=*
+regexpterm(#20341,13,#20339,0,"(a|aa)")
+#20342=@"loc,{#10000},17,6,19,8"
+locations_default(#20342,#10000,17,6,19,8)
+hasLocation(#20341,#20342)
+is_capture(#20341,1)
+#20343=*
+regexpterm(#20343,0,#20341,0,"a|aa")
+#20344=@"loc,{#10000},17,7,19,7"
+locations_default(#20344,#10000,17,7,19,7)
+hasLocation(#20343,#20344)
+#20345=*
+regexpterm(#20345,14,#20343,0,"a")
+#20346=@"loc,{#10000},17,7,18,5"
+locations_default(#20346,#10000,17,7,18,5)
+hasLocation(#20345,#20346)
+regexp_const_value(#20345,"a")
+#20347=*
+regexpterm(#20347,14,#20343,1,"aa")
+#20348=@"loc,{#10000},19,6,19,7"
+locations_default(#20348,#10000,19,6,19,7)
+hasLocation(#20347,#20348)
+regexp_const_value(#20347,"aa")
+#20349=*
+regexpterm(#20349,14,#20337,1,"b")
+#20350=@"loc,{#10000},20,6,20,6"
+locations_default(#20350,#10000,20,6,20,6)
+hasLocation(#20349,#20350)
+regexp_const_value(#20349,"b")
+#20351=*
+regexpterm(#20351,3,#20337,2,"$")
+#20352=@"loc,{#10000},20,7,20,7"
+locations_default(#20352,#10000,20,7,20,7)
+hasLocation(#20351,#20352)
+#20353=*
+stmts(#20353,18,#20001,5,"var bad ... "")f$"");")
+#20354=@"loc,{#10000},23,1,27,7"
+locations_default(#20354,#10000,23,1,27,7)
+hasLocation(#20353,#20354)
+stmt_containers(#20353,#20001)
+#20355=*
+exprs(#20355,64,#20353,0,"bad96 = ... \n"")f$"")")
+#20356=@"loc,{#10000},23,5,27,6"
+locations_default(#20356,#10000,23,5,27,6)
+hasLocation(#20355,#20356)
+enclosing_stmt(#20355,#20353)
+expr_containers(#20355,#20001)
 #20357=*
-exprs(#20357,12,#20354,1,"new Reg ... \n"")f$"")")
-#20358=@"loc,{#10000},23,13,27,6"
-locations_default(#20358,#10000,23,13,27,6)
-hasLocation(#20357,#20358)
-enclosing_stmt(#20357,#20352)
+exprs(#20357,78,#20355,0,"bad96")
+hasLocation(#20357,#20193)
+enclosing_stmt(#20357,#20353)
 expr_containers(#20357,#20001)
-#20359=*
-exprs(#20359,79,#20357,-1,"RegExp")
-hasLocation(#20359,#20199)
-enclosing_stmt(#20359,#20352)
-expr_containers(#20359,#20001)
-literals("RegExp","RegExp",#20359)
-bind(#20359,#20263)
+literals("bad96","bad96",#20357)
+decl(#20357,#20254)
+#20358=*
+exprs(#20358,12,#20355,1,"new Reg ... \n"")f$"")")
+#20359=@"loc,{#10000},23,13,27,6"
+locations_default(#20359,#10000,23,13,27,6)
+hasLocation(#20358,#20359)
+enclosing_stmt(#20358,#20353)
+expr_containers(#20358,#20001)
 #20360=*
-exprs(#20360,34,#20357,0,"""("" + \n ... +\n"")f$""")
-#20361=@"loc,{#10000},23,24,27,5"
-locations_default(#20361,#10000,23,24,27,5)
-hasLocation(#20360,#20361)
-enclosing_stmt(#20360,#20352)
+exprs(#20360,79,#20358,-1,"RegExp")
+hasLocation(#20360,#20199)
+enclosing_stmt(#20360,#20353)
 expr_containers(#20360,#20001)
-#20362=*
-exprs(#20362,34,#20360,0,"""("" + \n ... e|ee)*""")
-#20363=@"loc,{#10000},23,24,26,13"
-locations_default(#20363,#10000,23,24,26,13)
-hasLocation(#20362,#20363)
-enclosing_stmt(#20362,#20352)
-expr_containers(#20362,#20001)
-#20364=*
-exprs(#20364,34,#20362,0,"""("" + \n ... |dd)*|""")
-#20365=@"loc,{#10000},23,24,25,14"
-locations_default(#20365,#10000,23,24,25,14)
-hasLocation(#20364,#20365)
-enclosing_stmt(#20364,#20352)
-expr_containers(#20364,#20001)
-#20366=*
-exprs(#20366,34,#20364,0,"""("" + \n ... |cc)*|""")
-#20367=@"loc,{#10000},23,24,24,14"
-locations_default(#20367,#10000,23,24,24,14)
-hasLocation(#20366,#20367)
-enclosing_stmt(#20366,#20352)
-expr_containers(#20366,#20001)
-#20368=*
-exprs(#20368,4,#20366,0,"""(""")
-hasLocation(#20368,#20203)
-enclosing_stmt(#20368,#20352)
-expr_containers(#20368,#20001)
-literals("(","""(""",#20368)
+literals("RegExp","RegExp",#20360)
+bind(#20360,#20264)
+#20361=*
+exprs(#20361,34,#20358,0,"""("" + \n ... +\n"")f$""")
+#20362=@"loc,{#10000},23,24,27,5"
+locations_default(#20362,#10000,23,24,27,5)
+hasLocation(#20361,#20362)
+enclosing_stmt(#20361,#20353)
+expr_containers(#20361,#20001)
+#20363=*
+exprs(#20363,34,#20361,0,"""("" + \n ... e|ee)*""")
+#20364=@"loc,{#10000},23,24,26,13"
+locations_default(#20364,#10000,23,24,26,13)
+hasLocation(#20363,#20364)
+enclosing_stmt(#20363,#20353)
+expr_containers(#20363,#20001)
+#20365=*
+exprs(#20365,34,#20363,0,"""("" + \n ... |dd)*|""")
+#20366=@"loc,{#10000},23,24,25,14"
+locations_default(#20366,#10000,23,24,25,14)
+hasLocation(#20365,#20366)
+enclosing_stmt(#20365,#20353)
+expr_containers(#20365,#20001)
+#20367=*
+exprs(#20367,34,#20365,0,"""("" + \n ... |cc)*|""")
+#20368=@"loc,{#10000},23,24,24,14"
+locations_default(#20368,#10000,23,24,24,14)
+hasLocation(#20367,#20368)
+enclosing_stmt(#20367,#20353)
+expr_containers(#20367,#20001)
 #20369=*
-exprs(#20369,4,#20366,1,"""(c|cc)*|""")
-hasLocation(#20369,#20207)
-enclosing_stmt(#20369,#20352)
+exprs(#20369,4,#20367,0,"""(""")
+hasLocation(#20369,#20203)
+enclosing_stmt(#20369,#20353)
 expr_containers(#20369,#20001)
-literals("(c|cc)*|","""(c|cc)*|""",#20369)
+literals("(","""(""",#20369)
 #20370=*
-exprs(#20370,4,#20364,1,"""(d|dd)*|""")
-hasLocation(#20370,#20211)
-enclosing_stmt(#20370,#20352)
+exprs(#20370,4,#20367,1,"""(c|cc)*|""")
+hasLocation(#20370,#20207)
+enclosing_stmt(#20370,#20353)
 expr_containers(#20370,#20001)
-literals("(d|dd)*|","""(d|dd)*|""",#20370)
+literals("(c|cc)*|","""(c|cc)*|""",#20370)
 #20371=*
-exprs(#20371,4,#20362,1,"""(e|ee)*""")
-hasLocation(#20371,#20215)
-enclosing_stmt(#20371,#20352)
+exprs(#20371,4,#20365,1,"""(d|dd)*|""")
+hasLocation(#20371,#20211)
+enclosing_stmt(#20371,#20353)
 expr_containers(#20371,#20001)
-literals("(e|ee)*","""(e|ee)*""",#20371)
+literals("(d|dd)*|","""(d|dd)*|""",#20371)
 #20372=*
-exprs(#20372,4,#20360,1,""")f$""")
-hasLocation(#20372,#20219)
-enclosing_stmt(#20372,#20352)
+exprs(#20372,4,#20363,1,"""(e|ee)*""")
+hasLocation(#20372,#20215)
+enclosing_stmt(#20372,#20353)
 expr_containers(#20372,#20001)
-literals(")f$",""")f$""",#20372)
+literals("(e|ee)*","""(e|ee)*""",#20372)
 #20373=*
-regexpterm(#20373,1,#20360,0,"((c|cc)*|(d|dd)*|(e|ee)*)f$")
-#20374=@"loc,{#10000},23,25,27,4"
-locations_default(#20374,#10000,23,25,27,4)
-hasLocation(#20373,#20374)
-#20375=*
-regexpterm(#20375,13,#20373,0,"((c|cc)*|(d|dd)*|(e|ee)*)")
-#20376=@"loc,{#10000},23,25,27,2"
-locations_default(#20376,#10000,23,25,27,2)
-hasLocation(#20375,#20376)
-is_capture(#20375,1)
-#20377=*
-regexpterm(#20377,0,#20375,0,"(c|cc)*|(d|dd)*|(e|ee)*")
-#20378=@"loc,{#10000},24,6,27,1"
-locations_default(#20378,#10000,24,6,27,1)
-hasLocation(#20377,#20378)
-#20379=*
-regexpterm(#20379,8,#20377,0,"(c|cc)*")
-#20380=@"loc,{#10000},24,6,24,12"
-locations_default(#20380,#10000,24,6,24,12)
-hasLocation(#20379,#20380)
-is_greedy(#20379)
-#20381=*
-regexpterm(#20381,13,#20379,0,"(c|cc)")
-#20382=@"loc,{#10000},24,6,24,11"
-locations_default(#20382,#10000,24,6,24,11)
-hasLocation(#20381,#20382)
-is_capture(#20381,2)
-#20383=*
-regexpterm(#20383,0,#20381,0,"c|cc")
-#20384=@"loc,{#10000},24,7,24,10"
-locations_default(#20384,#10000,24,7,24,10)
-hasLocation(#20383,#20384)
-#20385=*
-regexpterm(#20385,14,#20383,0,"c")
-#20386=@"loc,{#10000},24,7,24,7"
-locations_default(#20386,#10000,24,7,24,7)
-hasLocation(#20385,#20386)
-regexp_const_value(#20385,"c")
-#20387=*
-regexpterm(#20387,14,#20383,1,"cc")
-#20388=@"loc,{#10000},24,9,24,10"
-locations_default(#20388,#10000,24,9,24,10)
-hasLocation(#20387,#20388)
-regexp_const_value(#20387,"cc")
-#20389=*
-regexpterm(#20389,8,#20377,1,"(d|dd)*")
-#20390=@"loc,{#10000},25,6,25,12"
-locations_default(#20390,#10000,25,6,25,12)
-hasLocation(#20389,#20390)
-is_greedy(#20389)
-#20391=*
-regexpterm(#20391,13,#20389,0,"(d|dd)")
-#20392=@"loc,{#10000},25,6,25,11"
-locations_default(#20392,#10000,25,6,25,11)
-hasLocation(#20391,#20392)
-is_capture(#20391,3)
-#20393=*
-regexpterm(#20393,0,#20391,0,"d|dd")
-#20394=@"loc,{#10000},25,7,25,10"
-locations_default(#20394,#10000,25,7,25,10)
-hasLocation(#20393,#20394)
-#20395=*
-regexpterm(#20395,14,#20393,0,"d")
-#20396=@"loc,{#10000},25,7,25,7"
-locations_default(#20396,#10000,25,7,25,7)
-hasLocation(#20395,#20396)
-regexp_const_value(#20395,"d")
-#20397=*
-regexpterm(#20397,14,#20393,1,"dd")
-#20398=@"loc,{#10000},25,9,25,10"
-locations_default(#20398,#10000,25,9,25,10)
-hasLocation(#20397,#20398)
-regexp_const_value(#20397,"dd")
-#20399=*
-regexpterm(#20399,8,#20377,2,"(e|ee)*")
-#20400=@"loc,{#10000},26,6,27,1"
-locations_default(#20400,#10000,26,6,27,1)
-hasLocation(#20399,#20400)
-is_greedy(#20399)
-#20401=*
-regexpterm(#20401,13,#20399,0,"(e|ee)")
-#20402=@"loc,{#10000},26,6,26,11"
-locations_default(#20402,#10000,26,6,26,11)
-hasLocation(#20401,#20402)
-is_capture(#20401,4)
-#20403=*
-regexpterm(#20403,0,#20401,0,"e|ee")
-#20404=@"loc,{#10000},26,7,26,10"
-locations_default(#20404,#10000,26,7,26,10)
-hasLocation(#20403,#20404)
-#20405=*
-regexpterm(#20405,14,#20403,0,"e")
-#20406=@"loc,{#10000},26,7,26,7"
-locations_default(#20406,#10000,26,7,26,7)
-hasLocation(#20405,#20406)
-regexp_const_value(#20405,"e")
-#20407=*
-regexpterm(#20407,14,#20403,1,"ee")
-#20408=@"loc,{#10000},26,9,26,10"
-locations_default(#20408,#10000,26,9,26,10)
-hasLocation(#20407,#20408)
-regexp_const_value(#20407,"ee")
-#20409=*
-regexpterm(#20409,14,#20373,1,"f")
-#20410=@"loc,{#10000},27,3,27,3"
-locations_default(#20410,#10000,27,3,27,3)
-hasLocation(#20409,#20410)
-regexp_const_value(#20409,"f")
-#20411=*
-regexpterm(#20411,3,#20373,2,"$")
-#20412=@"loc,{#10000},27,4,27,4"
-locations_default(#20412,#10000,27,4,27,4)
-hasLocation(#20411,#20412)
-#20413=*
-stmts(#20413,18,#20001,6,"var bad ... )*h$"");")
-#20414=@"loc,{#10000},29,1,31,12"
-locations_default(#20414,#10000,29,1,31,12)
-hasLocation(#20413,#20414)
-stmt_containers(#20413,#20001)
-#20415=*
-exprs(#20415,64,#20413,0,"bad97 = ... "")*h$"")")
-#20416=@"loc,{#10000},29,5,31,11"
-locations_default(#20416,#10000,29,5,31,11)
-hasLocation(#20415,#20416)
-enclosing_stmt(#20415,#20413)
-expr_containers(#20415,#20001)
-#20417=*
-exprs(#20417,78,#20415,0,"bad97")
-hasLocation(#20417,#20227)
-enclosing_stmt(#20417,#20413)
-expr_containers(#20417,#20001)
-literals("bad97","bad97",#20417)
-decl(#20417,#20255)
+exprs(#20373,4,#20361,1,""")f$""")
+hasLocation(#20373,#20219)
+enclosing_stmt(#20373,#20353)
+expr_containers(#20373,#20001)
+literals(")f$",""")f$""",#20373)
+#20374=*
+regexpterm(#20374,1,#20361,0,"((c|cc)*|(d|dd)*|(e|ee)*)f$")
+#20375=@"loc,{#10000},23,25,27,4"
+locations_default(#20375,#10000,23,25,27,4)
+hasLocation(#20374,#20375)
+#20376=*
+regexpterm(#20376,13,#20374,0,"((c|cc)*|(d|dd)*|(e|ee)*)")
+#20377=@"loc,{#10000},23,25,27,2"
+locations_default(#20377,#10000,23,25,27,2)
+hasLocation(#20376,#20377)
+is_capture(#20376,1)
+#20378=*
+regexpterm(#20378,0,#20376,0,"(c|cc)*|(d|dd)*|(e|ee)*")
+#20379=@"loc,{#10000},24,6,27,1"
+locations_default(#20379,#10000,24,6,27,1)
+hasLocation(#20378,#20379)
+#20380=*
+regexpterm(#20380,8,#20378,0,"(c|cc)*")
+#20381=@"loc,{#10000},24,6,24,12"
+locations_default(#20381,#10000,24,6,24,12)
+hasLocation(#20380,#20381)
+is_greedy(#20380)
+#20382=*
+regexpterm(#20382,13,#20380,0,"(c|cc)")
+#20383=@"loc,{#10000},24,6,24,11"
+locations_default(#20383,#10000,24,6,24,11)
+hasLocation(#20382,#20383)
+is_capture(#20382,2)
+#20384=*
+regexpterm(#20384,0,#20382,0,"c|cc")
+#20385=@"loc,{#10000},24,7,24,10"
+locations_default(#20385,#10000,24,7,24,10)
+hasLocation(#20384,#20385)
+#20386=*
+regexpterm(#20386,14,#20384,0,"c")
+#20387=@"loc,{#10000},24,7,24,7"
+locations_default(#20387,#10000,24,7,24,7)
+hasLocation(#20386,#20387)
+regexp_const_value(#20386,"c")
+#20388=*
+regexpterm(#20388,14,#20384,1,"cc")
+#20389=@"loc,{#10000},24,9,24,10"
+locations_default(#20389,#10000,24,9,24,10)
+hasLocation(#20388,#20389)
+regexp_const_value(#20388,"cc")
+#20390=*
+regexpterm(#20390,8,#20378,1,"(d|dd)*")
+#20391=@"loc,{#10000},25,6,25,12"
+locations_default(#20391,#10000,25,6,25,12)
+hasLocation(#20390,#20391)
+is_greedy(#20390)
+#20392=*
+regexpterm(#20392,13,#20390,0,"(d|dd)")
+#20393=@"loc,{#10000},25,6,25,11"
+locations_default(#20393,#10000,25,6,25,11)
+hasLocation(#20392,#20393)
+is_capture(#20392,3)
+#20394=*
+regexpterm(#20394,0,#20392,0,"d|dd")
+#20395=@"loc,{#10000},25,7,25,10"
+locations_default(#20395,#10000,25,7,25,10)
+hasLocation(#20394,#20395)
+#20396=*
+regexpterm(#20396,14,#20394,0,"d")
+#20397=@"loc,{#10000},25,7,25,7"
+locations_default(#20397,#10000,25,7,25,7)
+hasLocation(#20396,#20397)
+regexp_const_value(#20396,"d")
+#20398=*
+regexpterm(#20398,14,#20394,1,"dd")
+#20399=@"loc,{#10000},25,9,25,10"
+locations_default(#20399,#10000,25,9,25,10)
+hasLocation(#20398,#20399)
+regexp_const_value(#20398,"dd")
+#20400=*
+regexpterm(#20400,8,#20378,2,"(e|ee)*")
+#20401=@"loc,{#10000},26,6,27,1"
+locations_default(#20401,#10000,26,6,27,1)
+hasLocation(#20400,#20401)
+is_greedy(#20400)
+#20402=*
+regexpterm(#20402,13,#20400,0,"(e|ee)")
+#20403=@"loc,{#10000},26,6,26,11"
+locations_default(#20403,#10000,26,6,26,11)
+hasLocation(#20402,#20403)
+is_capture(#20402,4)
+#20404=*
+regexpterm(#20404,0,#20402,0,"e|ee")
+#20405=@"loc,{#10000},26,7,26,10"
+locations_default(#20405,#10000,26,7,26,10)
+hasLocation(#20404,#20405)
+#20406=*
+regexpterm(#20406,14,#20404,0,"e")
+#20407=@"loc,{#10000},26,7,26,7"
+locations_default(#20407,#10000,26,7,26,7)
+hasLocation(#20406,#20407)
+regexp_const_value(#20406,"e")
+#20408=*
+regexpterm(#20408,14,#20404,1,"ee")
+#20409=@"loc,{#10000},26,9,26,10"
+locations_default(#20409,#10000,26,9,26,10)
+hasLocation(#20408,#20409)
+regexp_const_value(#20408,"ee")
+#20410=*
+regexpterm(#20410,14,#20374,1,"f")
+#20411=@"loc,{#10000},27,3,27,3"
+locations_default(#20411,#10000,27,3,27,3)
+hasLocation(#20410,#20411)
+regexp_const_value(#20410,"f")
+#20412=*
+regexpterm(#20412,3,#20374,2,"$")
+#20413=@"loc,{#10000},27,4,27,4"
+locations_default(#20413,#10000,27,4,27,4)
+hasLocation(#20412,#20413)
+#20414=*
+stmts(#20414,18,#20001,6,"var bad ... )*h$"");")
+#20415=@"loc,{#10000},29,1,31,12"
+locations_default(#20415,#10000,29,1,31,12)
+hasLocation(#20414,#20415)
+stmt_containers(#20414,#20001)
+#20416=*
+exprs(#20416,64,#20414,0,"bad97 = ... "")*h$"")")
+#20417=@"loc,{#10000},29,5,31,11"
+locations_default(#20417,#10000,29,5,31,11)
+hasLocation(#20416,#20417)
+enclosing_stmt(#20416,#20414)
+expr_containers(#20416,#20001)
 #20418=*
-exprs(#20418,12,#20415,1,"new Reg ... "")*h$"")")
-#20419=@"loc,{#10000},29,13,31,11"
-locations_default(#20419,#10000,29,13,31,11)
-hasLocation(#20418,#20419)
-enclosing_stmt(#20418,#20413)
+exprs(#20418,78,#20416,0,"bad97")
+hasLocation(#20418,#20227)
+enclosing_stmt(#20418,#20414)
 expr_containers(#20418,#20001)
-#20420=*
-exprs(#20420,79,#20418,-1,"RegExp")
-hasLocation(#20420,#20233)
-enclosing_stmt(#20420,#20413)
-expr_containers(#20420,#20001)
-literals("RegExp","RegExp",#20420)
-bind(#20420,#20263)
+literals("bad97","bad97",#20418)
+decl(#20418,#20255)
+#20419=*
+exprs(#20419,12,#20416,1,"new Reg ... "")*h$"")")
+#20420=@"loc,{#10000},29,13,31,11"
+locations_default(#20420,#10000,29,13,31,11)
+hasLocation(#20419,#20420)
+enclosing_stmt(#20419,#20414)
+expr_containers(#20419,#20001)
 #20421=*
-exprs(#20421,34,#20418,0,"""(g|gg"" ...  "")*h$""")
-#20422=@"loc,{#10000},30,5,31,10"
-locations_default(#20422,#10000,30,5,31,10)
-hasLocation(#20421,#20422)
-enclosing_stmt(#20421,#20413)
+exprs(#20421,79,#20419,-1,"RegExp")
+hasLocation(#20421,#20233)
+enclosing_stmt(#20421,#20414)
 expr_containers(#20421,#20001)
-#20423=*
-exprs(#20423,4,#20421,0,"""(g|gg""")
-hasLocation(#20423,#20237)
-enclosing_stmt(#20423,#20413)
-expr_containers(#20423,#20001)
-literals("(g|gg","""(g|gg""",#20423)
+literals("RegExp","RegExp",#20421)
+bind(#20421,#20264)
+#20422=*
+exprs(#20422,34,#20419,0,"""(g|gg"" ...  "")*h$""")
+#20423=@"loc,{#10000},30,5,31,10"
+locations_default(#20423,#10000,30,5,31,10)
+hasLocation(#20422,#20423)
+enclosing_stmt(#20422,#20414)
+expr_containers(#20422,#20001)
 #20424=*
-exprs(#20424,4,#20421,1,""")*h$""")
-hasLocation(#20424,#20241)
-enclosing_stmt(#20424,#20413)
+exprs(#20424,4,#20422,0,"""(g|gg""")
+hasLocation(#20424,#20237)
+enclosing_stmt(#20424,#20414)
 expr_containers(#20424,#20001)
-literals(")*h$",""")*h$""",#20424)
+literals("(g|gg","""(g|gg""",#20424)
 #20425=*
-regexpterm(#20425,1,#20421,0,"(g|gg)*h$")
-#20426=@"loc,{#10000},30,6,31,9"
-locations_default(#20426,#10000,30,6,31,9)
-hasLocation(#20425,#20426)
-#20427=*
-regexpterm(#20427,8,#20425,0,"(g|gg)*")
-#20428=@"loc,{#10000},30,6,31,7"
-locations_default(#20428,#10000,30,6,31,7)
-hasLocation(#20427,#20428)
-is_greedy(#20427)
-#20429=*
-regexpterm(#20429,13,#20427,0,"(g|gg)")
-#20430=@"loc,{#10000},30,6,31,6"
-locations_default(#20430,#10000,30,6,31,6)
-hasLocation(#20429,#20430)
-is_capture(#20429,1)
-#20431=*
-regexpterm(#20431,0,#20429,0,"g|gg")
-#20432=@"loc,{#10000},30,7,31,5"
-locations_default(#20432,#10000,30,7,31,5)
-hasLocation(#20431,#20432)
-#20433=*
-regexpterm(#20433,14,#20431,0,"g")
-#20434=@"loc,{#10000},30,7,30,7"
-locations_default(#20434,#10000,30,7,30,7)
-hasLocation(#20433,#20434)
-regexp_const_value(#20433,"g")
-#20435=*
-regexpterm(#20435,14,#20431,1,"gg")
-#20436=@"loc,{#10000},30,9,31,5"
-locations_default(#20436,#10000,30,9,31,5)
-hasLocation(#20435,#20436)
-regexp_const_value(#20435,"gg")
-#20437=*
-regexpterm(#20437,14,#20425,1,"h")
-#20438=@"loc,{#10000},31,8,31,8"
-locations_default(#20438,#10000,31,8,31,8)
-hasLocation(#20437,#20438)
-regexp_const_value(#20437,"h")
-#20439=*
-regexpterm(#20439,3,#20425,2,"$")
-#20440=@"loc,{#10000},31,9,31,9"
-locations_default(#20440,#10000,31,9,31,9)
-hasLocation(#20439,#20440)
-#20441=*
-entry_cfg_node(#20441,#20001)
-#20442=@"loc,{#10000},1,1,1,0"
-locations_default(#20442,#10000,1,1,1,0)
-hasLocation(#20441,#20442)
-#20443=*
-exit_cfg_node(#20443,#20001)
-hasLocation(#20443,#20247)
-successor(#20413,#20417)
-successor(#20424,#20421)
-successor(#20423,#20424)
-successor(#20421,#20418)
-successor(#20420,#20423)
-successor(#20418,#20415)
-successor(#20417,#20420)
-successor(#20415,#20443)
-successor(#20352,#20356)
-successor(#20372,#20360)
-successor(#20371,#20362)
-successor(#20370,#20364)
-successor(#20369,#20366)
-successor(#20368,#20369)
-successor(#20366,#20370)
-successor(#20364,#20371)
-successor(#20362,#20372)
-successor(#20360,#20357)
-successor(#20359,#20368)
-successor(#20357,#20354)
-successor(#20356,#20359)
-successor(#20354,#20413)
-successor(#20318,#20322)
-successor(#20335,#20326)
-successor(#20334,#20328)
-successor(#20333,#20330)
-successor(#20332,#20333)
-successor(#20330,#20334)
-successor(#20328,#20335)
-successor(#20326,#20323)
-successor(#20325,#20332)
-successor(#20323,#20320)
-successor(#20322,#20325)
-successor(#20320,#20352)
-successor(#20298,#20302)
-successor(#20315,#20306)
-successor(#20314,#20308)
-successor(#20313,#20310)
-successor(#20312,#20313)
-successor(#20310,#20314)
-successor(#20308,#20315)
-successor(#20306,#20303)
-successor(#20305,#20312)
-successor(#20303,#20300)
-successor(#20302,#20305)
-successor(#20300,#20318)
-successor(#20284,#20288)
-successor(#20295,#20292)
-successor(#20294,#20295)
-successor(#20292,#20289)
-successor(#20291,#20294)
-successor(#20289,#20286)
-successor(#20288,#20291)
-successor(#20286,#20298)
-successor(#20270,#20274)
-successor(#20281,#20278)
-successor(#20280,#20281)
-successor(#20278,#20275)
-successor(#20277,#20280)
-successor(#20275,#20272)
-successor(#20274,#20277)
-successor(#20272,#20284)
-successor(#20256,#20259)
-successor(#20267,#20264)
-successor(#20266,#20267)
-successor(#20264,#20260)
-successor(#20262,#20266)
-successor(#20260,#20257)
-successor(#20259,#20262)
-successor(#20257,#20270)
-successor(#20441,#20256)
+exprs(#20425,4,#20422,1,""")*h$""")
+hasLocation(#20425,#20241)
+enclosing_stmt(#20425,#20414)
+expr_containers(#20425,#20001)
+literals(")*h$",""")*h$""",#20425)
+#20426=*
+regexpterm(#20426,1,#20422,0,"(g|gg)*h$")
+#20427=@"loc,{#10000},30,6,31,9"
+locations_default(#20427,#10000,30,6,31,9)
+hasLocation(#20426,#20427)
+#20428=*
+regexpterm(#20428,8,#20426,0,"(g|gg)*")
+#20429=@"loc,{#10000},30,6,31,7"
+locations_default(#20429,#10000,30,6,31,7)
+hasLocation(#20428,#20429)
+is_greedy(#20428)
+#20430=*
+regexpterm(#20430,13,#20428,0,"(g|gg)")
+#20431=@"loc,{#10000},30,6,31,6"
+locations_default(#20431,#10000,30,6,31,6)
+hasLocation(#20430,#20431)
+is_capture(#20430,1)
+#20432=*
+regexpterm(#20432,0,#20430,0,"g|gg")
+#20433=@"loc,{#10000},30,7,31,5"
+locations_default(#20433,#10000,30,7,31,5)
+hasLocation(#20432,#20433)
+#20434=*
+regexpterm(#20434,14,#20432,0,"g")
+#20435=@"loc,{#10000},30,7,30,7"
+locations_default(#20435,#10000,30,7,30,7)
+hasLocation(#20434,#20435)
+regexp_const_value(#20434,"g")
+#20436=*
+regexpterm(#20436,14,#20432,1,"gg")
+#20437=@"loc,{#10000},30,9,31,5"
+locations_default(#20437,#10000,30,9,31,5)
+hasLocation(#20436,#20437)
+regexp_const_value(#20436,"gg")
+#20438=*
+regexpterm(#20438,14,#20426,1,"h")
+#20439=@"loc,{#10000},31,8,31,8"
+locations_default(#20439,#10000,31,8,31,8)
+hasLocation(#20438,#20439)
+regexp_const_value(#20438,"h")
+#20440=*
+regexpterm(#20440,3,#20426,2,"$")
+#20441=@"loc,{#10000},31,9,31,9"
+locations_default(#20441,#10000,31,9,31,9)
+hasLocation(#20440,#20441)
+#20442=*
+entry_cfg_node(#20442,#20001)
+#20443=@"loc,{#10000},1,1,1,0"
+locations_default(#20443,#10000,1,1,1,0)
+hasLocation(#20442,#20443)
+#20444=*
+exit_cfg_node(#20444,#20001)
+hasLocation(#20444,#20247)
+successor(#20414,#20418)
+successor(#20425,#20422)
+successor(#20424,#20425)
+successor(#20422,#20419)
+successor(#20421,#20424)
+successor(#20419,#20416)
+successor(#20418,#20421)
+successor(#20416,#20444)
+successor(#20353,#20357)
+successor(#20373,#20361)
+successor(#20372,#20363)
+successor(#20371,#20365)
+successor(#20370,#20367)
+successor(#20369,#20370)
+successor(#20367,#20371)
+successor(#20365,#20372)
+successor(#20363,#20373)
+successor(#20361,#20358)
+successor(#20360,#20369)
+successor(#20358,#20355)
+successor(#20357,#20360)
+successor(#20355,#20414)
+successor(#20319,#20323)
+successor(#20336,#20327)
+successor(#20335,#20329)
+successor(#20334,#20331)
+successor(#20333,#20334)
+successor(#20331,#20335)
+successor(#20329,#20336)
+successor(#20327,#20324)
+successor(#20326,#20333)
+successor(#20324,#20321)
+successor(#20323,#20326)
+successor(#20321,#20353)
+successor(#20299,#20303)
+successor(#20316,#20307)
+successor(#20315,#20309)
+successor(#20314,#20311)
+successor(#20313,#20314)
+successor(#20311,#20315)
+successor(#20309,#20316)
+successor(#20307,#20304)
+successor(#20306,#20313)
+successor(#20304,#20301)
+successor(#20303,#20306)
+successor(#20301,#20319)
+successor(#20285,#20289)
+successor(#20296,#20293)
+successor(#20295,#20296)
+successor(#20293,#20290)
+successor(#20292,#20295)
+successor(#20290,#20287)
+successor(#20289,#20292)
+successor(#20287,#20299)
+successor(#20271,#20275)
+successor(#20282,#20279)
+successor(#20281,#20282)
+successor(#20279,#20276)
+successor(#20278,#20281)
+successor(#20276,#20273)
+successor(#20275,#20278)
+successor(#20273,#20285)
+successor(#20257,#20260)
+successor(#20268,#20265)
+successor(#20267,#20268)
+successor(#20265,#20261)
+successor(#20263,#20267)
+successor(#20261,#20258)
+successor(#20260,#20263)
+successor(#20258,#20271)
+successor(#20442,#20257)
 numlines(#10000,31,25,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/regexp/output/trap/nonstandard.js.trap b/javascript/extractor/tests/regexp/output/trap/nonstandard.js.trap
index e0b648118d9..12dcbb8c9a4 100644
--- a/javascript/extractor/tests/regexp/output/trap/nonstandard.js.trap
+++ b/javascript/extractor/tests/regexp/output/trap/nonstandard.js.trap
@@ -32,32 +32,34 @@ locations_default(#20009,#10000,1,9,1,8)
 hasLocation(#20008,#20009)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20010=*
-stmts(#20010,2,#20001,0,"/dice/y;")
-hasLocation(#20010,#20003)
-stmt_containers(#20010,#20001)
+#20010=@"var;{this};{#20000}"
+variables(#20010,"this",#20000)
 #20011=*
-exprs(#20011,5,#20010,0,"/dice/y")
-hasLocation(#20011,#20005)
-enclosing_stmt(#20011,#20010)
-expr_containers(#20011,#20001)
-literals("/dice/y","/dice/y",#20011)
+stmts(#20011,2,#20001,0,"/dice/y;")
+hasLocation(#20011,#20003)
+stmt_containers(#20011,#20001)
 #20012=*
-regexpterm(#20012,14,#20011,0,"dice")
-#20013=@"loc,{#10000},1,2,1,5"
-locations_default(#20013,#10000,1,2,1,5)
-hasLocation(#20012,#20013)
-regexp_const_value(#20012,"dice")
-#20014=*
-entry_cfg_node(#20014,#20001)
-#20015=@"loc,{#10000},1,1,1,0"
-locations_default(#20015,#10000,1,1,1,0)
-hasLocation(#20014,#20015)
-#20016=*
-exit_cfg_node(#20016,#20001)
-hasLocation(#20016,#20009)
-successor(#20010,#20011)
-successor(#20011,#20016)
-successor(#20014,#20010)
+exprs(#20012,5,#20011,0,"/dice/y")
+hasLocation(#20012,#20005)
+enclosing_stmt(#20012,#20011)
+expr_containers(#20012,#20001)
+literals("/dice/y","/dice/y",#20012)
+#20013=*
+regexpterm(#20013,14,#20012,0,"dice")
+#20014=@"loc,{#10000},1,2,1,5"
+locations_default(#20014,#10000,1,2,1,5)
+hasLocation(#20013,#20014)
+regexp_const_value(#20013,"dice")
+#20015=*
+entry_cfg_node(#20015,#20001)
+#20016=@"loc,{#10000},1,1,1,0"
+locations_default(#20016,#10000,1,1,1,0)
+hasLocation(#20015,#20016)
+#20017=*
+exit_cfg_node(#20017,#20001)
+hasLocation(#20017,#20009)
+successor(#20011,#20012)
+successor(#20012,#20017)
+successor(#20015,#20011)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/regexp/output/trap/odasa-1934.js.trap b/javascript/extractor/tests/regexp/output/trap/odasa-1934.js.trap
index 6e90c62e6a6..195fa8ff0c0 100644
--- a/javascript/extractor/tests/regexp/output/trap/odasa-1934.js.trap
+++ b/javascript/extractor/tests/regexp/output/trap/odasa-1934.js.trap
@@ -195,216 +195,218 @@ locations_default(#20070,#10000,1,1,7,2)
 hasLocation(#20001,#20070)
 #20071=@"var;{r};{#20000}"
 variables(#20071,"r",#20000)
-#20072=*
-stmts(#20072,18,#20001,0,"var r;")
-hasLocation(#20072,#20003)
-stmt_containers(#20072,#20001)
+#20072=@"var;{this};{#20000}"
+variables(#20072,"this",#20000)
 #20073=*
-exprs(#20073,64,#20072,0,"r")
-hasLocation(#20073,#20019)
-enclosing_stmt(#20073,#20072)
-expr_containers(#20073,#20001)
+stmts(#20073,18,#20001,0,"var r;")
+hasLocation(#20073,#20003)
+stmt_containers(#20073,#20001)
 #20074=*
-exprs(#20074,78,#20073,0,"r")
+exprs(#20074,64,#20073,0,"r")
 hasLocation(#20074,#20019)
-enclosing_stmt(#20074,#20072)
+enclosing_stmt(#20074,#20073)
 expr_containers(#20074,#20001)
-literals("r","r",#20074)
-decl(#20074,#20071)
 #20075=*
-stmts(#20075,2,#20001,1,"reportC ... n 1""\n);")
-#20076=@"loc,{#10000},3,1,7,2"
-locations_default(#20076,#10000,3,1,7,2)
-hasLocation(#20075,#20076)
-stmt_containers(#20075,#20001)
-#20077=*
-exprs(#20077,13,#20075,0,"reportC ... on 1""\n)")
-#20078=@"loc,{#10000},3,1,7,1"
-locations_default(#20078,#10000,3,1,7,1)
-hasLocation(#20077,#20078)
-enclosing_stmt(#20077,#20075)
-expr_containers(#20077,#20001)
-#20079=*
-exprs(#20079,79,#20077,-1,"reportCompare")
-hasLocation(#20079,#20023)
-enclosing_stmt(#20079,#20075)
-expr_containers(#20079,#20001)
-literals("reportCompare","reportCompare",#20079)
-#20080=@"var;{reportCompare};{#20000}"
-variables(#20080,"reportCompare",#20000)
-bind(#20079,#20080)
-#20081=*
-exprs(#20081,4,#20077,0,"""x""")
-hasLocation(#20081,#20027)
-enclosing_stmt(#20081,#20075)
-expr_containers(#20081,#20001)
-literals("x","""x""",#20081)
+exprs(#20075,78,#20074,0,"r")
+hasLocation(#20075,#20019)
+enclosing_stmt(#20075,#20073)
+expr_containers(#20075,#20001)
+literals("r","r",#20075)
+decl(#20075,#20071)
+#20076=*
+stmts(#20076,2,#20001,1,"reportC ... n 1""\n);")
+#20077=@"loc,{#10000},3,1,7,2"
+locations_default(#20077,#10000,3,1,7,2)
+hasLocation(#20076,#20077)
+stmt_containers(#20076,#20001)
+#20078=*
+exprs(#20078,13,#20076,0,"reportC ... on 1""\n)")
+#20079=@"loc,{#10000},3,1,7,1"
+locations_default(#20079,#10000,3,1,7,1)
+hasLocation(#20078,#20079)
+enclosing_stmt(#20078,#20076)
+expr_containers(#20078,#20001)
+#20080=*
+exprs(#20080,79,#20078,-1,"reportCompare")
+hasLocation(#20080,#20023)
+enclosing_stmt(#20080,#20076)
+expr_containers(#20080,#20001)
+literals("reportCompare","reportCompare",#20080)
+#20081=@"var;{reportCompare};{#20000}"
+variables(#20081,"reportCompare",#20000)
+bind(#20080,#20081)
 #20082=*
-regexpterm(#20082,14,#20081,0,"x")
-#20083=@"loc,{#10000},4,4,4,4"
-locations_default(#20083,#10000,4,4,4,4)
-hasLocation(#20082,#20083)
-regexp_const_value(#20082,"x")
-#20084=*
-exprs(#20084,44,#20077,1,"(r = /[ ... && r[0]")
-#20085=@"loc,{#10000},5,3,5,33"
-locations_default(#20085,#10000,5,3,5,33)
-hasLocation(#20084,#20085)
-enclosing_stmt(#20084,#20075)
-expr_containers(#20084,#20001)
-#20086=*
-exprs(#20086,63,#20084,0,"(r = /[ ... c(""x""))")
-#20087=@"loc,{#10000},5,3,5,25"
-locations_default(#20087,#10000,5,3,5,25)
-hasLocation(#20086,#20087)
-enclosing_stmt(#20086,#20075)
-expr_containers(#20086,#20001)
-#20088=*
-exprs(#20088,47,#20086,0,"r = /[\ ... ec(""x"")")
-#20089=@"loc,{#10000},5,4,5,24"
-locations_default(#20089,#10000,5,4,5,24)
-hasLocation(#20088,#20089)
-enclosing_stmt(#20088,#20075)
-expr_containers(#20088,#20001)
-#20090=*
-exprs(#20090,79,#20088,0,"r")
-hasLocation(#20090,#20033)
-enclosing_stmt(#20090,#20075)
-expr_containers(#20090,#20001)
-literals("r","r",#20090)
-bind(#20090,#20071)
+exprs(#20082,4,#20078,0,"""x""")
+hasLocation(#20082,#20027)
+enclosing_stmt(#20082,#20076)
+expr_containers(#20082,#20001)
+literals("x","""x""",#20082)
+#20083=*
+regexpterm(#20083,14,#20082,0,"x")
+#20084=@"loc,{#10000},4,4,4,4"
+locations_default(#20084,#10000,4,4,4,4)
+hasLocation(#20083,#20084)
+regexp_const_value(#20083,"x")
+#20085=*
+exprs(#20085,44,#20078,1,"(r = /[ ... && r[0]")
+#20086=@"loc,{#10000},5,3,5,33"
+locations_default(#20086,#10000,5,3,5,33)
+hasLocation(#20085,#20086)
+enclosing_stmt(#20085,#20076)
+expr_containers(#20085,#20001)
+#20087=*
+exprs(#20087,63,#20085,0,"(r = /[ ... c(""x""))")
+#20088=@"loc,{#10000},5,3,5,25"
+locations_default(#20088,#10000,5,3,5,25)
+hasLocation(#20087,#20088)
+enclosing_stmt(#20087,#20076)
+expr_containers(#20087,#20001)
+#20089=*
+exprs(#20089,47,#20087,0,"r = /[\ ... ec(""x"")")
+#20090=@"loc,{#10000},5,4,5,24"
+locations_default(#20090,#10000,5,4,5,24)
+hasLocation(#20089,#20090)
+enclosing_stmt(#20089,#20076)
+expr_containers(#20089,#20001)
 #20091=*
-exprs(#20091,13,#20088,1,"/[\x]+/.exec(""x"")")
-#20092=@"loc,{#10000},5,8,5,24"
-locations_default(#20092,#10000,5,8,5,24)
-hasLocation(#20091,#20092)
-enclosing_stmt(#20091,#20075)
+exprs(#20091,79,#20089,0,"r")
+hasLocation(#20091,#20033)
+enclosing_stmt(#20091,#20076)
 expr_containers(#20091,#20001)
-#20093=*
-exprs(#20093,14,#20091,-1,"/[\x]+/.exec")
-#20094=@"loc,{#10000},5,8,5,19"
-locations_default(#20094,#10000,5,8,5,19)
-hasLocation(#20093,#20094)
-enclosing_stmt(#20093,#20075)
-expr_containers(#20093,#20001)
-#20095=*
-exprs(#20095,5,#20093,0,"/[\x]+/")
-hasLocation(#20095,#20037)
-enclosing_stmt(#20095,#20075)
-expr_containers(#20095,#20001)
-literals("/[\x]+/","/[\x]+/",#20095)
+literals("r","r",#20091)
+bind(#20091,#20071)
+#20092=*
+exprs(#20092,13,#20089,1,"/[\x]+/.exec(""x"")")
+#20093=@"loc,{#10000},5,8,5,24"
+locations_default(#20093,#10000,5,8,5,24)
+hasLocation(#20092,#20093)
+enclosing_stmt(#20092,#20076)
+expr_containers(#20092,#20001)
+#20094=*
+exprs(#20094,14,#20092,-1,"/[\x]+/.exec")
+#20095=@"loc,{#10000},5,8,5,19"
+locations_default(#20095,#10000,5,8,5,19)
+hasLocation(#20094,#20095)
+enclosing_stmt(#20094,#20076)
+expr_containers(#20094,#20001)
 #20096=*
-regexpterm(#20096,9,#20095,0,"[\x]+")
-#20097=@"loc,{#10000},5,9,5,13"
-locations_default(#20097,#10000,5,9,5,13)
-hasLocation(#20096,#20097)
-is_greedy(#20096)
-#20098=*
-regexpterm(#20098,23,#20096,0,"[\x]")
-#20099=@"loc,{#10000},5,9,5,12"
-locations_default(#20099,#10000,5,9,5,12)
-hasLocation(#20098,#20099)
-#20100=*
-regexpterm(#20100,15,#20098,0,"\x")
-#20101=@"loc,{#10000},5,10,5,11"
-locations_default(#20101,#10000,5,10,5,11)
-hasLocation(#20100,#20101)
-regexp_const_value(#20100,"")
-#20102=*
-regexp_parse_errors(#20102,#20096,"expected hexadecimal digit")
-#20103=@"loc,{#10000},5,12,5,12"
-locations_default(#20103,#10000,5,12,5,12)
-hasLocation(#20102,#20103)
-#20104=*
-regexp_parse_errors(#20104,#20096,"expected hexadecimal digit")
-hasLocation(#20104,#20103)
+exprs(#20096,5,#20094,0,"/[\x]+/")
+hasLocation(#20096,#20037)
+enclosing_stmt(#20096,#20076)
+expr_containers(#20096,#20001)
+literals("/[\x]+/","/[\x]+/",#20096)
+#20097=*
+regexpterm(#20097,9,#20096,0,"[\x]+")
+#20098=@"loc,{#10000},5,9,5,13"
+locations_default(#20098,#10000,5,9,5,13)
+hasLocation(#20097,#20098)
+is_greedy(#20097)
+#20099=*
+regexpterm(#20099,23,#20097,0,"[\x]")
+#20100=@"loc,{#10000},5,9,5,12"
+locations_default(#20100,#10000,5,9,5,12)
+hasLocation(#20099,#20100)
+#20101=*
+regexpterm(#20101,15,#20099,0,"\x")
+#20102=@"loc,{#10000},5,10,5,11"
+locations_default(#20102,#10000,5,10,5,11)
+hasLocation(#20101,#20102)
+regexp_const_value(#20101,"")
+#20103=*
+regexp_parse_errors(#20103,#20097,"expected hexadecimal digit")
+#20104=@"loc,{#10000},5,12,5,12"
+locations_default(#20104,#10000,5,12,5,12)
+hasLocation(#20103,#20104)
 #20105=*
-exprs(#20105,0,#20093,1,"exec")
-hasLocation(#20105,#20041)
-enclosing_stmt(#20105,#20075)
-expr_containers(#20105,#20001)
-literals("exec","exec",#20105)
+regexp_parse_errors(#20105,#20097,"expected hexadecimal digit")
+hasLocation(#20105,#20104)
 #20106=*
-exprs(#20106,4,#20091,0,"""x""")
-hasLocation(#20106,#20045)
-enclosing_stmt(#20106,#20075)
+exprs(#20106,0,#20094,1,"exec")
+hasLocation(#20106,#20041)
+enclosing_stmt(#20106,#20076)
 expr_containers(#20106,#20001)
-literals("x","""x""",#20106)
+literals("exec","exec",#20106)
 #20107=*
-regexpterm(#20107,14,#20106,0,"x")
-#20108=@"loc,{#10000},5,22,5,22"
-locations_default(#20108,#10000,5,22,5,22)
-hasLocation(#20107,#20108)
-regexp_const_value(#20107,"x")
-#20109=*
-exprs(#20109,15,#20084,1,"r[0]")
-#20110=@"loc,{#10000},5,30,5,33"
-locations_default(#20110,#10000,5,30,5,33)
-hasLocation(#20109,#20110)
-enclosing_stmt(#20109,#20075)
-expr_containers(#20109,#20001)
-#20111=*
-exprs(#20111,79,#20109,0,"r")
-hasLocation(#20111,#20053)
-enclosing_stmt(#20111,#20075)
-expr_containers(#20111,#20001)
-literals("r","r",#20111)
-bind(#20111,#20071)
+exprs(#20107,4,#20092,0,"""x""")
+hasLocation(#20107,#20045)
+enclosing_stmt(#20107,#20076)
+expr_containers(#20107,#20001)
+literals("x","""x""",#20107)
+#20108=*
+regexpterm(#20108,14,#20107,0,"x")
+#20109=@"loc,{#10000},5,22,5,22"
+locations_default(#20109,#10000,5,22,5,22)
+hasLocation(#20108,#20109)
+regexp_const_value(#20108,"x")
+#20110=*
+exprs(#20110,15,#20085,1,"r[0]")
+#20111=@"loc,{#10000},5,30,5,33"
+locations_default(#20111,#10000,5,30,5,33)
+hasLocation(#20110,#20111)
+enclosing_stmt(#20110,#20076)
+expr_containers(#20110,#20001)
 #20112=*
-exprs(#20112,3,#20109,1,"0")
-hasLocation(#20112,#20057)
-enclosing_stmt(#20112,#20075)
+exprs(#20112,79,#20110,0,"r")
+hasLocation(#20112,#20053)
+enclosing_stmt(#20112,#20076)
 expr_containers(#20112,#20001)
-literals("0","0",#20112)
+literals("r","r",#20112)
+bind(#20112,#20071)
 #20113=*
-exprs(#20113,4,#20077,2,"""Section 1""")
-hasLocation(#20113,#20063)
-enclosing_stmt(#20113,#20075)
+exprs(#20113,3,#20110,1,"0")
+hasLocation(#20113,#20057)
+enclosing_stmt(#20113,#20076)
 expr_containers(#20113,#20001)
-literals("Section 1","""Section 1""",#20113)
+literals("0","0",#20113)
 #20114=*
-regexpterm(#20114,14,#20113,0,"Section 1")
-#20115=@"loc,{#10000},6,4,6,12"
-locations_default(#20115,#10000,6,4,6,12)
-hasLocation(#20114,#20115)
-regexp_const_value(#20114,"Section 1")
-#20116=*
-entry_cfg_node(#20116,#20001)
-#20117=@"loc,{#10000},1,1,1,0"
-locations_default(#20117,#10000,1,1,1,0)
-hasLocation(#20116,#20117)
-#20118=*
-exit_cfg_node(#20118,#20001)
-hasLocation(#20118,#20069)
-successor(#20075,#20079)
-successor(#20113,#20077)
-successor(#20084,#20086)
-successor(#20086,#20090)
-successor(#20106,#20091)
-successor(#20105,#20093)
-successor(#20095,#20105)
-successor(#20093,#20106)
-successor(#20091,#20088)
-successor(#20090,#20095)
+exprs(#20114,4,#20078,2,"""Section 1""")
+hasLocation(#20114,#20063)
+enclosing_stmt(#20114,#20076)
+expr_containers(#20114,#20001)
+literals("Section 1","""Section 1""",#20114)
+#20115=*
+regexpterm(#20115,14,#20114,0,"Section 1")
+#20116=@"loc,{#10000},6,4,6,12"
+locations_default(#20116,#10000,6,4,6,12)
+hasLocation(#20115,#20116)
+regexp_const_value(#20115,"Section 1")
+#20117=*
+entry_cfg_node(#20117,#20001)
+#20118=@"loc,{#10000},1,1,1,0"
+locations_default(#20118,#10000,1,1,1,0)
+hasLocation(#20117,#20118)
 #20119=*
-guard_node(#20119,1,#20088)
-hasLocation(#20119,#20089)
-successor(#20119,#20111)
+exit_cfg_node(#20119,#20001)
+hasLocation(#20119,#20069)
+successor(#20076,#20080)
+successor(#20114,#20078)
+successor(#20085,#20087)
+successor(#20087,#20091)
+successor(#20107,#20092)
+successor(#20106,#20094)
+successor(#20096,#20106)
+successor(#20094,#20107)
+successor(#20092,#20089)
+successor(#20091,#20096)
 #20120=*
-guard_node(#20120,0,#20088)
-hasLocation(#20120,#20089)
-successor(#20120,#20113)
-successor(#20088,#20119)
-successor(#20088,#20120)
-successor(#20112,#20109)
-successor(#20111,#20112)
-successor(#20109,#20113)
-successor(#20081,#20084)
-successor(#20079,#20081)
-successor(#20077,#20118)
-successor(#20072,#20074)
-successor(#20074,#20073)
+guard_node(#20120,1,#20089)
+hasLocation(#20120,#20090)
+successor(#20120,#20112)
+#20121=*
+guard_node(#20121,0,#20089)
+hasLocation(#20121,#20090)
+successor(#20121,#20114)
+successor(#20089,#20120)
+successor(#20089,#20121)
+successor(#20113,#20110)
+successor(#20112,#20113)
+successor(#20110,#20114)
+successor(#20082,#20085)
+successor(#20080,#20082)
+successor(#20078,#20119)
 successor(#20073,#20075)
-successor(#20116,#20072)
+successor(#20075,#20074)
+successor(#20074,#20076)
+successor(#20117,#20073)
 numlines(#10000,7,6,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/regexp/output/trap/tst.js.trap b/javascript/extractor/tests/regexp/output/trap/tst.js.trap
index 80ab7ab1ed7..6d8934e9809 100644
Binary files a/javascript/extractor/tests/regexp/output/trap/tst.js.trap and b/javascript/extractor/tests/regexp/output/trap/tst.js.trap differ
diff --git a/javascript/extractor/tests/restprops/output/trap/tst.js.trap b/javascript/extractor/tests/restprops/output/trap/tst.js.trap
index afa92ddc8b5..82a23145824 100644
--- a/javascript/extractor/tests/restprops/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/restprops/output/trap/tst.js.trap
@@ -92,81 +92,83 @@ locations_default(#20032,#10000,1,1,2,0)
 hasLocation(#20001,#20032)
 #20033=@"var;{f};{#20000}"
 variables(#20033,"f",#20000)
-#20034=*
-stmts(#20034,18,#20001,0,"var f = ...  => {};")
-hasLocation(#20034,#20003)
-stmt_containers(#20034,#20001)
+#20034=@"var;{this};{#20000}"
+variables(#20034,"this",#20000)
 #20035=*
-exprs(#20035,64,#20034,0,"f = ({...p}) => {}")
-#20036=@"loc,{#10000},1,5,1,22"
-locations_default(#20036,#10000,1,5,1,22)
-hasLocation(#20035,#20036)
-enclosing_stmt(#20035,#20034)
-expr_containers(#20035,#20001)
-#20037=*
-exprs(#20037,78,#20035,0,"f")
-hasLocation(#20037,#20007)
-enclosing_stmt(#20037,#20034)
-expr_containers(#20037,#20001)
-literals("f","f",#20037)
-decl(#20037,#20033)
+stmts(#20035,18,#20001,0,"var f = ...  => {};")
+hasLocation(#20035,#20003)
+stmt_containers(#20035,#20001)
+#20036=*
+exprs(#20036,64,#20035,0,"f = ({...p}) => {}")
+#20037=@"loc,{#10000},1,5,1,22"
+locations_default(#20037,#10000,1,5,1,22)
+hasLocation(#20036,#20037)
+enclosing_stmt(#20036,#20035)
+expr_containers(#20036,#20001)
 #20038=*
-exprs(#20038,65,#20035,1,"({...p}) => {}")
-#20039=@"loc,{#10000},1,9,1,22"
-locations_default(#20039,#10000,1,9,1,22)
-hasLocation(#20038,#20039)
-enclosing_stmt(#20038,#20034)
+exprs(#20038,78,#20036,0,"f")
+hasLocation(#20038,#20007)
+enclosing_stmt(#20038,#20035)
 expr_containers(#20038,#20001)
-#20040=*
-scopes(#20040,1)
-scopenodes(#20038,#20040)
-scopenesting(#20040,#20000)
-#20041=@"var;{p};{#20040}"
-variables(#20041,"p",#20040)
-#20042=*
-exprs(#20042,68,#20038,0,"{...p}")
-#20043=@"loc,{#10000},1,10,1,15"
-locations_default(#20043,#10000,1,10,1,15)
-hasLocation(#20042,#20043)
-expr_containers(#20042,#20038)
-#20044=*
-exprs(#20044,78,#20042,-1,"p")
-hasLocation(#20044,#20017)
-expr_containers(#20044,#20038)
-literals("p","p",#20044)
-decl(#20044,#20041)
+literals("f","f",#20038)
+decl(#20038,#20033)
+#20039=*
+exprs(#20039,65,#20036,1,"({...p}) => {}")
+#20040=@"loc,{#10000},1,9,1,22"
+locations_default(#20040,#10000,1,9,1,22)
+hasLocation(#20039,#20040)
+enclosing_stmt(#20039,#20035)
+expr_containers(#20039,#20001)
+#20041=*
+scopes(#20041,1)
+scopenodes(#20039,#20041)
+scopenesting(#20041,#20000)
+#20042=@"var;{p};{#20041}"
+variables(#20042,"p",#20041)
+#20043=*
+exprs(#20043,68,#20039,0,"{...p}")
+#20044=@"loc,{#10000},1,10,1,15"
+locations_default(#20044,#10000,1,10,1,15)
+hasLocation(#20043,#20044)
+expr_containers(#20043,#20039)
 #20045=*
-stmts(#20045,1,#20038,-2,"{}")
-#20046=@"loc,{#10000},1,21,1,22"
-locations_default(#20046,#10000,1,21,1,22)
-hasLocation(#20045,#20046)
-stmt_containers(#20045,#20038)
-#20047=*
-entry_cfg_node(#20047,#20001)
-#20048=@"loc,{#10000},1,1,1,0"
-locations_default(#20048,#10000,1,1,1,0)
-hasLocation(#20047,#20048)
-#20049=*
-exit_cfg_node(#20049,#20001)
-hasLocation(#20049,#20031)
-successor(#20034,#20037)
-successor(#20038,#20035)
+exprs(#20045,78,#20043,-1,"p")
+hasLocation(#20045,#20017)
+expr_containers(#20045,#20039)
+literals("p","p",#20045)
+decl(#20045,#20042)
+#20046=*
+stmts(#20046,1,#20039,-2,"{}")
+#20047=@"loc,{#10000},1,21,1,22"
+locations_default(#20047,#10000,1,21,1,22)
+hasLocation(#20046,#20047)
+stmt_containers(#20046,#20039)
+#20048=*
+entry_cfg_node(#20048,#20001)
+#20049=@"loc,{#10000},1,1,1,0"
+locations_default(#20049,#10000,1,1,1,0)
+hasLocation(#20048,#20049)
 #20050=*
-entry_cfg_node(#20050,#20038)
-#20051=@"loc,{#10000},1,9,1,8"
-locations_default(#20051,#10000,1,9,1,8)
-hasLocation(#20050,#20051)
-#20052=*
-exit_cfg_node(#20052,#20038)
-#20053=@"loc,{#10000},1,23,1,22"
-locations_default(#20053,#10000,1,23,1,22)
-hasLocation(#20052,#20053)
-successor(#20045,#20052)
-successor(#20042,#20044)
-successor(#20044,#20045)
-successor(#20050,#20042)
-successor(#20037,#20038)
-successor(#20035,#20049)
-successor(#20047,#20034)
+exit_cfg_node(#20050,#20001)
+hasLocation(#20050,#20031)
+successor(#20035,#20038)
+successor(#20039,#20036)
+#20051=*
+entry_cfg_node(#20051,#20039)
+#20052=@"loc,{#10000},1,9,1,8"
+locations_default(#20052,#10000,1,9,1,8)
+hasLocation(#20051,#20052)
+#20053=*
+exit_cfg_node(#20053,#20039)
+#20054=@"loc,{#10000},1,23,1,22"
+locations_default(#20054,#10000,1,23,1,22)
+hasLocation(#20053,#20054)
+successor(#20046,#20053)
+successor(#20043,#20045)
+successor(#20045,#20046)
+successor(#20051,#20043)
+successor(#20038,#20039)
+successor(#20036,#20050)
+successor(#20048,#20035)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/shebang/output/trap/tst.js.trap b/javascript/extractor/tests/shebang/output/trap/tst.js.trap
index 59f7c049bfe..2844e91d4c5 100644
--- a/javascript/extractor/tests/shebang/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/shebang/output/trap/tst.js.trap
@@ -72,57 +72,59 @@ variables(#20025,"__dirname",#20020)
 #20026=@"var;{arguments};{#20020}"
 variables(#20026,"arguments",#20020)
 is_module(#20001)
-#20027=*
-stmts(#20027,2,#20001,0,"alert(""Hi!"");")
-hasLocation(#20027,#20003)
-stmt_containers(#20027,#20001)
+#20027=@"var;{this};{#20020}"
+variables(#20027,"this",#20020)
 #20028=*
-exprs(#20028,13,#20027,0,"alert(""Hi!"")")
-#20029=@"loc,{#10000},2,1,2,12"
-locations_default(#20029,#10000,2,1,2,12)
-hasLocation(#20028,#20029)
-enclosing_stmt(#20028,#20027)
-expr_containers(#20028,#20001)
-#20030=*
-exprs(#20030,79,#20028,-1,"alert")
-hasLocation(#20030,#20005)
-enclosing_stmt(#20030,#20027)
-expr_containers(#20030,#20001)
-literals("alert","alert",#20030)
-#20031=@"var;{alert};{#20000}"
-variables(#20031,"alert",#20000)
-bind(#20030,#20031)
-#20032=*
-exprs(#20032,4,#20028,0,"""Hi!""")
-hasLocation(#20032,#20009)
-enclosing_stmt(#20032,#20027)
-expr_containers(#20032,#20001)
-literals("Hi!","""Hi!""",#20032)
+stmts(#20028,2,#20001,0,"alert(""Hi!"");")
+hasLocation(#20028,#20003)
+stmt_containers(#20028,#20001)
+#20029=*
+exprs(#20029,13,#20028,0,"alert(""Hi!"")")
+#20030=@"loc,{#10000},2,1,2,12"
+locations_default(#20030,#10000,2,1,2,12)
+hasLocation(#20029,#20030)
+enclosing_stmt(#20029,#20028)
+expr_containers(#20029,#20001)
+#20031=*
+exprs(#20031,79,#20029,-1,"alert")
+hasLocation(#20031,#20005)
+enclosing_stmt(#20031,#20028)
+expr_containers(#20031,#20001)
+literals("alert","alert",#20031)
+#20032=@"var;{alert};{#20000}"
+variables(#20032,"alert",#20000)
+bind(#20031,#20032)
 #20033=*
-regexpterm(#20033,14,#20032,0,"Hi!")
-#20034=@"loc,{#10000},2,8,2,10"
-locations_default(#20034,#10000,2,8,2,10)
-hasLocation(#20033,#20034)
-regexp_const_value(#20033,"Hi!")
-#20035=*
-entry_cfg_node(#20035,#20001)
-#20036=@"loc,{#10000},2,1,2,0"
-locations_default(#20036,#10000,2,1,2,0)
-hasLocation(#20035,#20036)
-#20037=*
-exit_cfg_node(#20037,#20001)
-hasLocation(#20037,#20015)
-successor(#20027,#20030)
-successor(#20032,#20028)
-successor(#20030,#20032)
-successor(#20028,#20037)
-successor(#20035,#20027)
-is_nodejs(#20001)
+exprs(#20033,4,#20029,0,"""Hi!""")
+hasLocation(#20033,#20009)
+enclosing_stmt(#20033,#20028)
+expr_containers(#20033,#20001)
+literals("Hi!","""Hi!""",#20033)
+#20034=*
+regexpterm(#20034,14,#20033,0,"Hi!")
+#20035=@"loc,{#10000},2,8,2,10"
+locations_default(#20035,#10000,2,8,2,10)
+hasLocation(#20034,#20035)
+regexp_const_value(#20034,"Hi!")
+#20036=*
+entry_cfg_node(#20036,#20001)
+#20037=@"loc,{#10000},2,1,2,0"
+locations_default(#20037,#10000,2,1,2,0)
+hasLocation(#20036,#20037)
 #20038=*
-lines(#20038,#20001,"#!/usr/bin/node","
+exit_cfg_node(#20038,#20001)
+hasLocation(#20038,#20015)
+successor(#20028,#20031)
+successor(#20033,#20029)
+successor(#20031,#20033)
+successor(#20029,#20038)
+successor(#20036,#20028)
+is_nodejs(#20001)
+#20039=*
+lines(#20039,#20001,"#!/usr/bin/node","
 ")
-#20039=@"loc,{#10000},1,1,1,15"
-locations_default(#20039,#10000,1,1,1,15)
-hasLocation(#20038,#20039)
+#20040=@"loc,{#10000},1,1,1,15"
+locations_default(#20040,#10000,1,1,1,15)
+hasLocation(#20039,#20040)
 numlines(#10000,2,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/shebang/output/trap/typescript-with-shebang.ts.trap b/javascript/extractor/tests/shebang/output/trap/typescript-with-shebang.ts.trap
index 82ba041bb8b..ab56529a5c7 100644
--- a/javascript/extractor/tests/shebang/output/trap/typescript-with-shebang.ts.trap
+++ b/javascript/extractor/tests/shebang/output/trap/typescript-with-shebang.ts.trap
@@ -84,46 +84,48 @@ locations_default(#20027,#10000,1,1,5,0)
 hasLocation(#20001,#20027)
 #20028=@"local_type_name;{Foo};{#20000}"
 local_type_names(#20028,"Foo",#20000)
-#20029=*
-stmts(#20029,34,#20001,0,"#!/usr/ ... mber;\n}")
-#20030=@"loc,{#10000},1,1,4,1"
-locations_default(#20030,#10000,1,1,4,1)
-hasLocation(#20029,#20030)
-stmt_containers(#20029,#20001)
-#20031=*
-typeexprs(#20031,1,#20029,0,"Foo")
-hasLocation(#20031,#20013)
-enclosing_stmt(#20031,#20029)
-expr_containers(#20031,#20001)
-literals("Foo","Foo",#20031)
-typedecl(#20031,#20028)
+#20029=@"var;{this};{#20000}"
+variables(#20029,"this",#20000)
+#20030=*
+stmts(#20030,34,#20001,0,"#!/usr/ ... mber;\n}")
+#20031=@"loc,{#10000},1,1,4,1"
+locations_default(#20031,#10000,1,1,4,1)
+hasLocation(#20030,#20031)
+stmt_containers(#20030,#20001)
 #20032=*
-properties(#20032,#20029,2,8,"x: number;")
-#20033=@"loc,{#10000},3,3,3,12"
-locations_default(#20033,#10000,3,3,3,12)
-hasLocation(#20032,#20033)
-#20034=*
-exprs(#20034,0,#20032,0,"x")
-hasLocation(#20034,#20017)
-enclosing_stmt(#20034,#20029)
-expr_containers(#20034,#20001)
-literals("x","x",#20034)
-is_abstract_member(#20032)
+typeexprs(#20032,1,#20030,0,"Foo")
+hasLocation(#20032,#20013)
+enclosing_stmt(#20032,#20030)
+expr_containers(#20032,#20001)
+literals("Foo","Foo",#20032)
+typedecl(#20032,#20028)
+#20033=*
+properties(#20033,#20030,2,8,"x: number;")
+#20034=@"loc,{#10000},3,3,3,12"
+locations_default(#20034,#10000,3,3,3,12)
+hasLocation(#20033,#20034)
 #20035=*
-typeexprs(#20035,2,#20032,2,"number")
-hasLocation(#20035,#20021)
-enclosing_stmt(#20035,#20029)
+exprs(#20035,0,#20033,0,"x")
+hasLocation(#20035,#20017)
+enclosing_stmt(#20035,#20030)
 expr_containers(#20035,#20001)
-literals("number","number",#20035)
+literals("x","x",#20035)
+is_abstract_member(#20033)
 #20036=*
-entry_cfg_node(#20036,#20001)
-#20037=@"loc,{#10000},1,1,1,0"
-locations_default(#20037,#10000,1,1,1,0)
-hasLocation(#20036,#20037)
-#20038=*
-exit_cfg_node(#20038,#20001)
-hasLocation(#20038,#20026)
-successor(#20029,#20038)
-successor(#20036,#20029)
+typeexprs(#20036,2,#20033,2,"number")
+hasLocation(#20036,#20021)
+enclosing_stmt(#20036,#20030)
+expr_containers(#20036,#20001)
+literals("number","number",#20036)
+#20037=*
+entry_cfg_node(#20037,#20001)
+#20038=@"loc,{#10000},1,1,1,0"
+locations_default(#20038,#10000,1,1,1,0)
+hasLocation(#20037,#20038)
+#20039=*
+exit_cfg_node(#20039,#20001)
+hasLocation(#20039,#20026)
+successor(#20030,#20039)
+successor(#20037,#20030)
 numlines(#10000,4,3,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/shebang/output/trap/typescript.ts.trap b/javascript/extractor/tests/shebang/output/trap/typescript.ts.trap
index ea81b8525ee..79f0870f517 100644
--- a/javascript/extractor/tests/shebang/output/trap/typescript.ts.trap
+++ b/javascript/extractor/tests/shebang/output/trap/typescript.ts.trap
@@ -78,46 +78,48 @@ locations_default(#20025,#10000,1,1,4,0)
 hasLocation(#20001,#20025)
 #20026=@"local_type_name;{Foo};{#20000}"
 local_type_names(#20026,"Foo",#20000)
-#20027=*
-stmts(#20027,34,#20001,0,"interfa ... mber;\n}")
-#20028=@"loc,{#10000},1,1,3,1"
-locations_default(#20028,#10000,1,1,3,1)
-hasLocation(#20027,#20028)
-stmt_containers(#20027,#20001)
-#20029=*
-typeexprs(#20029,1,#20027,0,"Foo")
-hasLocation(#20029,#20011)
-enclosing_stmt(#20029,#20027)
-expr_containers(#20029,#20001)
-literals("Foo","Foo",#20029)
-typedecl(#20029,#20026)
+#20027=@"var;{this};{#20000}"
+variables(#20027,"this",#20000)
+#20028=*
+stmts(#20028,34,#20001,0,"interfa ... mber;\n}")
+#20029=@"loc,{#10000},1,1,3,1"
+locations_default(#20029,#10000,1,1,3,1)
+hasLocation(#20028,#20029)
+stmt_containers(#20028,#20001)
 #20030=*
-properties(#20030,#20027,2,8,"x: number;")
-#20031=@"loc,{#10000},2,3,2,12"
-locations_default(#20031,#10000,2,3,2,12)
-hasLocation(#20030,#20031)
-#20032=*
-exprs(#20032,0,#20030,0,"x")
-hasLocation(#20032,#20015)
-enclosing_stmt(#20032,#20027)
-expr_containers(#20032,#20001)
-literals("x","x",#20032)
-is_abstract_member(#20030)
+typeexprs(#20030,1,#20028,0,"Foo")
+hasLocation(#20030,#20011)
+enclosing_stmt(#20030,#20028)
+expr_containers(#20030,#20001)
+literals("Foo","Foo",#20030)
+typedecl(#20030,#20026)
+#20031=*
+properties(#20031,#20028,2,8,"x: number;")
+#20032=@"loc,{#10000},2,3,2,12"
+locations_default(#20032,#10000,2,3,2,12)
+hasLocation(#20031,#20032)
 #20033=*
-typeexprs(#20033,2,#20030,2,"number")
-hasLocation(#20033,#20019)
-enclosing_stmt(#20033,#20027)
+exprs(#20033,0,#20031,0,"x")
+hasLocation(#20033,#20015)
+enclosing_stmt(#20033,#20028)
 expr_containers(#20033,#20001)
-literals("number","number",#20033)
+literals("x","x",#20033)
+is_abstract_member(#20031)
 #20034=*
-entry_cfg_node(#20034,#20001)
-#20035=@"loc,{#10000},1,1,1,0"
-locations_default(#20035,#10000,1,1,1,0)
-hasLocation(#20034,#20035)
-#20036=*
-exit_cfg_node(#20036,#20001)
-hasLocation(#20036,#20024)
-successor(#20027,#20036)
-successor(#20034,#20027)
+typeexprs(#20034,2,#20031,2,"number")
+hasLocation(#20034,#20019)
+enclosing_stmt(#20034,#20028)
+expr_containers(#20034,#20001)
+literals("number","number",#20034)
+#20035=*
+entry_cfg_node(#20035,#20001)
+#20036=@"loc,{#10000},1,1,1,0"
+locations_default(#20036,#10000,1,1,1,0)
+hasLocation(#20035,#20036)
+#20037=*
+exit_cfg_node(#20037,#20001)
+hasLocation(#20037,#20024)
+successor(#20028,#20037)
+successor(#20035,#20028)
 numlines(#10000,3,3,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/stmts/output/trap/conditionals.js.trap b/javascript/extractor/tests/stmts/output/trap/conditionals.js.trap
index 9e96f57790e..7418ee19832 100644
--- a/javascript/extractor/tests/stmts/output/trap/conditionals.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/conditionals.js.trap
@@ -230,127 +230,129 @@ toplevels(#20001,0)
 #20082=@"loc,{#10000},1,1,12,1"
 locations_default(#20082,#10000,1,1,12,1)
 hasLocation(#20001,#20082)
-#20083=*
-stmts(#20083,3,#20001,0,"if (true)\n    ;")
-#20084=@"loc,{#10000},1,1,2,5"
-locations_default(#20084,#10000,1,1,2,5)
-hasLocation(#20083,#20084)
-stmt_containers(#20083,#20001)
-#20085=*
-exprs(#20085,2,#20083,0,"true")
-hasLocation(#20085,#20031)
-enclosing_stmt(#20085,#20083)
-expr_containers(#20085,#20001)
-literals("true","true",#20085)
+#20083=@"var;{this};{#20000}"
+variables(#20083,"this",#20000)
+#20084=*
+stmts(#20084,3,#20001,0,"if (true)\n    ;")
+#20085=@"loc,{#10000},1,1,2,5"
+locations_default(#20085,#10000,1,1,2,5)
+hasLocation(#20084,#20085)
+stmt_containers(#20084,#20001)
 #20086=*
-stmts(#20086,0,#20083,1,";")
-hasLocation(#20086,#20035)
-stmt_containers(#20086,#20001)
+exprs(#20086,2,#20084,0,"true")
+hasLocation(#20086,#20031)
+enclosing_stmt(#20086,#20084)
+expr_containers(#20086,#20001)
+literals("true","true",#20086)
 #20087=*
-stmts(#20087,3,#20001,1,"if (b)\n ... e\n    ;")
-#20088=@"loc,{#10000},3,1,6,5"
-locations_default(#20088,#10000,3,1,6,5)
-hasLocation(#20087,#20088)
+stmts(#20087,0,#20084,1,";")
+hasLocation(#20087,#20035)
 stmt_containers(#20087,#20001)
-#20089=*
-exprs(#20089,79,#20087,0,"b")
-hasLocation(#20089,#20041)
-enclosing_stmt(#20089,#20087)
-expr_containers(#20089,#20001)
-literals("b","b",#20089)
-#20090=@"var;{b};{#20000}"
-variables(#20090,"b",#20000)
-bind(#20089,#20090)
-#20091=*
-stmts(#20091,0,#20087,1,";")
-hasLocation(#20091,#20045)
-stmt_containers(#20091,#20001)
+#20088=*
+stmts(#20088,3,#20001,1,"if (b)\n ... e\n    ;")
+#20089=@"loc,{#10000},3,1,6,5"
+locations_default(#20089,#10000,3,1,6,5)
+hasLocation(#20088,#20089)
+stmt_containers(#20088,#20001)
+#20090=*
+exprs(#20090,79,#20088,0,"b")
+hasLocation(#20090,#20041)
+enclosing_stmt(#20090,#20088)
+expr_containers(#20090,#20001)
+literals("b","b",#20090)
+#20091=@"var;{b};{#20000}"
+variables(#20091,"b",#20000)
+bind(#20090,#20091)
 #20092=*
-stmts(#20092,0,#20087,2,";")
-hasLocation(#20092,#20048)
+stmts(#20092,0,#20088,1,";")
+hasLocation(#20092,#20045)
 stmt_containers(#20092,#20001)
 #20093=*
-stmts(#20093,8,#20001,2,"switch  ... ault:\n}")
-#20094=@"loc,{#10000},7,1,12,1"
-locations_default(#20094,#10000,7,1,12,1)
-hasLocation(#20093,#20094)
+stmts(#20093,0,#20088,2,";")
+hasLocation(#20093,#20048)
 stmt_containers(#20093,#20001)
-#20095=*
-exprs(#20095,79,#20093,-1,"b")
-hasLocation(#20095,#20054)
-enclosing_stmt(#20095,#20093)
-expr_containers(#20095,#20001)
-literals("b","b",#20095)
-bind(#20095,#20090)
+#20094=*
+stmts(#20094,8,#20001,2,"switch  ... ault:\n}")
+#20095=@"loc,{#10000},7,1,12,1"
+locations_default(#20095,#10000,7,1,12,1)
+hasLocation(#20094,#20095)
+stmt_containers(#20094,#20001)
 #20096=*
-stmts(#20096,19,#20093,0,"case 23:")
-hasLocation(#20096,#20017)
-stmt_containers(#20096,#20001)
+exprs(#20096,79,#20094,-1,"b")
+hasLocation(#20096,#20054)
+enclosing_stmt(#20096,#20094)
+expr_containers(#20096,#20001)
+literals("b","b",#20096)
+bind(#20096,#20091)
 #20097=*
-exprs(#20097,3,#20096,-1,"23")
-hasLocation(#20097,#20062)
-enclosing_stmt(#20097,#20096)
-expr_containers(#20097,#20001)
-literals("23","23",#20097)
+stmts(#20097,19,#20094,0,"case 23:")
+hasLocation(#20097,#20017)
+stmt_containers(#20097,#20001)
 #20098=*
-stmts(#20098,19,#20093,1,"case c:\n    break;")
-#20099=@"loc,{#10000},9,1,10,10"
-locations_default(#20099,#10000,9,1,10,10)
-hasLocation(#20098,#20099)
-stmt_containers(#20098,#20001)
-#20100=*
-exprs(#20100,79,#20098,-1,"c")
-hasLocation(#20100,#20068)
-enclosing_stmt(#20100,#20098)
-expr_containers(#20100,#20001)
-literals("c","c",#20100)
-#20101=@"var;{c};{#20000}"
-variables(#20101,"c",#20000)
-bind(#20100,#20101)
-#20102=*
-stmts(#20102,5,#20098,0,"break;")
-#20103=@"loc,{#10000},10,5,10,10"
-locations_default(#20103,#10000,10,5,10,10)
-hasLocation(#20102,#20103)
-stmt_containers(#20102,#20001)
-jump_targets(#20102,#20093)
-#20104=*
-stmts(#20104,19,#20093,2,"default:")
-hasLocation(#20104,#20023)
-stmt_containers(#20104,#20001)
+exprs(#20098,3,#20097,-1,"23")
+hasLocation(#20098,#20062)
+enclosing_stmt(#20098,#20097)
+expr_containers(#20098,#20001)
+literals("23","23",#20098)
+#20099=*
+stmts(#20099,19,#20094,1,"case c:\n    break;")
+#20100=@"loc,{#10000},9,1,10,10"
+locations_default(#20100,#10000,9,1,10,10)
+hasLocation(#20099,#20100)
+stmt_containers(#20099,#20001)
+#20101=*
+exprs(#20101,79,#20099,-1,"c")
+hasLocation(#20101,#20068)
+enclosing_stmt(#20101,#20099)
+expr_containers(#20101,#20001)
+literals("c","c",#20101)
+#20102=@"var;{c};{#20000}"
+variables(#20102,"c",#20000)
+bind(#20101,#20102)
+#20103=*
+stmts(#20103,5,#20099,0,"break;")
+#20104=@"loc,{#10000},10,5,10,10"
+locations_default(#20104,#10000,10,5,10,10)
+hasLocation(#20103,#20104)
+stmt_containers(#20103,#20001)
+jump_targets(#20103,#20094)
 #20105=*
-entry_cfg_node(#20105,#20001)
-#20106=@"loc,{#10000},1,1,1,0"
-locations_default(#20106,#10000,1,1,1,0)
-hasLocation(#20105,#20106)
-#20107=*
-exit_cfg_node(#20107,#20001)
-hasLocation(#20107,#20081)
-successor(#20093,#20095)
-successor(#20095,#20096)
-successor(#20104,#20107)
-successor(#20098,#20100)
-successor(#20100,#20102)
-successor(#20100,#20104)
-successor(#20102,#20107)
-successor(#20096,#20097)
-successor(#20097,#20098)
-successor(#20087,#20089)
+stmts(#20105,19,#20094,2,"default:")
+hasLocation(#20105,#20023)
+stmt_containers(#20105,#20001)
+#20106=*
+entry_cfg_node(#20106,#20001)
+#20107=@"loc,{#10000},1,1,1,0"
+locations_default(#20107,#10000,1,1,1,0)
+hasLocation(#20106,#20107)
 #20108=*
-guard_node(#20108,1,#20089)
-hasLocation(#20108,#20041)
-successor(#20108,#20091)
+exit_cfg_node(#20108,#20001)
+hasLocation(#20108,#20081)
+successor(#20094,#20096)
+successor(#20096,#20097)
+successor(#20105,#20108)
+successor(#20099,#20101)
+successor(#20101,#20103)
+successor(#20101,#20105)
+successor(#20103,#20108)
+successor(#20097,#20098)
+successor(#20098,#20099)
+successor(#20088,#20090)
 #20109=*
-guard_node(#20109,0,#20089)
+guard_node(#20109,1,#20090)
 hasLocation(#20109,#20041)
 successor(#20109,#20092)
-successor(#20089,#20108)
-successor(#20089,#20109)
-successor(#20091,#20093)
-successor(#20092,#20093)
-successor(#20083,#20085)
-successor(#20085,#20086)
+#20110=*
+guard_node(#20110,0,#20090)
+hasLocation(#20110,#20041)
+successor(#20110,#20093)
+successor(#20090,#20109)
+successor(#20090,#20110)
+successor(#20092,#20094)
+successor(#20093,#20094)
+successor(#20084,#20086)
 successor(#20086,#20087)
-successor(#20105,#20083)
+successor(#20087,#20088)
+successor(#20106,#20084)
 numlines(#10000,12,12,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/stmts/output/trap/forvardefault.js.trap b/javascript/extractor/tests/stmts/output/trap/forvardefault.js.trap
index 1e676b70d98..31f00163803 100644
--- a/javascript/extractor/tests/stmts/output/trap/forvardefault.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/forvardefault.js.trap
@@ -156,130 +156,132 @@ toplevels(#20001,0)
 #20058=@"loc,{#10000},1,1,3,21"
 locations_default(#20058,#10000,1,1,3,21)
 hasLocation(#20001,#20058)
-#20059=*
-stmts(#20059,15,#20001,0,"for (a  ... b) f();")
-hasLocation(#20059,#20003)
-stmt_containers(#20059,#20001)
+#20059=@"var;{this};{#20000}"
+variables(#20059,"this",#20000)
 #20060=*
-exprs(#20060,79,#20059,1,"b")
-hasLocation(#20060,#20021)
-enclosing_stmt(#20060,#20059)
-expr_containers(#20060,#20001)
-literals("b","b",#20060)
-#20061=@"var;{b};{#20000}"
-variables(#20061,"b",#20000)
-bind(#20060,#20061)
-#20062=*
-exprs(#20062,79,#20059,0,"a")
-hasLocation(#20062,#20013)
-enclosing_stmt(#20062,#20059)
-expr_containers(#20062,#20001)
-literals("a","a",#20062)
-#20063=@"var;{a};{#20000}"
-variables(#20063,"a",#20000)
-bind(#20062,#20063)
-#20064=*
-exprs(#20064,3,#20059,-1,"1")
-hasLocation(#20064,#20017)
-enclosing_stmt(#20064,#20059)
-expr_containers(#20064,#20001)
-literals("1","1",#20064)
+stmts(#20060,15,#20001,0,"for (a  ... b) f();")
+hasLocation(#20060,#20003)
+stmt_containers(#20060,#20001)
+#20061=*
+exprs(#20061,79,#20060,1,"b")
+hasLocation(#20061,#20021)
+enclosing_stmt(#20061,#20060)
+expr_containers(#20061,#20001)
+literals("b","b",#20061)
+#20062=@"var;{b};{#20000}"
+variables(#20062,"b",#20000)
+bind(#20061,#20062)
+#20063=*
+exprs(#20063,79,#20060,0,"a")
+hasLocation(#20063,#20013)
+enclosing_stmt(#20063,#20060)
+expr_containers(#20063,#20001)
+literals("a","a",#20063)
+#20064=@"var;{a};{#20000}"
+variables(#20064,"a",#20000)
+bind(#20063,#20064)
 #20065=*
-stmts(#20065,2,#20059,2,"f();")
-#20066=@"loc,{#10000},1,18,1,21"
-locations_default(#20066,#10000,1,18,1,21)
-hasLocation(#20065,#20066)
-stmt_containers(#20065,#20001)
-#20067=*
-exprs(#20067,13,#20065,0,"f()")
-#20068=@"loc,{#10000},1,18,1,20"
-locations_default(#20068,#10000,1,18,1,20)
-hasLocation(#20067,#20068)
-enclosing_stmt(#20067,#20065)
-expr_containers(#20067,#20001)
-#20069=*
-exprs(#20069,79,#20067,-1,"f")
-hasLocation(#20069,#20025)
-enclosing_stmt(#20069,#20065)
-expr_containers(#20069,#20001)
-literals("f","f",#20069)
-#20070=@"var;{f};{#20000}"
-variables(#20070,"f",#20000)
-bind(#20069,#20070)
-#20071=*
-stmts(#20071,21,#20001,1,"for (c  ... d) g();")
-hasLocation(#20071,#20007)
-stmt_containers(#20071,#20001)
+exprs(#20065,3,#20060,-1,"1")
+hasLocation(#20065,#20017)
+enclosing_stmt(#20065,#20060)
+expr_containers(#20065,#20001)
+literals("1","1",#20065)
+#20066=*
+stmts(#20066,2,#20060,2,"f();")
+#20067=@"loc,{#10000},1,18,1,21"
+locations_default(#20067,#10000,1,18,1,21)
+hasLocation(#20066,#20067)
+stmt_containers(#20066,#20001)
+#20068=*
+exprs(#20068,13,#20066,0,"f()")
+#20069=@"loc,{#10000},1,18,1,20"
+locations_default(#20069,#10000,1,18,1,20)
+hasLocation(#20068,#20069)
+enclosing_stmt(#20068,#20066)
+expr_containers(#20068,#20001)
+#20070=*
+exprs(#20070,79,#20068,-1,"f")
+hasLocation(#20070,#20025)
+enclosing_stmt(#20070,#20066)
+expr_containers(#20070,#20001)
+literals("f","f",#20070)
+#20071=@"var;{f};{#20000}"
+variables(#20071,"f",#20000)
+bind(#20070,#20071)
 #20072=*
-exprs(#20072,79,#20071,1,"d")
-hasLocation(#20072,#20045)
-enclosing_stmt(#20072,#20071)
-expr_containers(#20072,#20001)
-literals("d","d",#20072)
-#20073=@"var;{d};{#20000}"
-variables(#20073,"d",#20000)
-bind(#20072,#20073)
-#20074=*
-exprs(#20074,79,#20071,0,"c")
-hasLocation(#20074,#20037)
-enclosing_stmt(#20074,#20071)
-expr_containers(#20074,#20001)
-literals("c","c",#20074)
-#20075=@"var;{c};{#20000}"
-variables(#20075,"c",#20000)
-bind(#20074,#20075)
-#20076=*
-exprs(#20076,3,#20071,-1,"0")
-hasLocation(#20076,#20041)
-enclosing_stmt(#20076,#20071)
-expr_containers(#20076,#20001)
-literals("0","0",#20076)
+stmts(#20072,21,#20001,1,"for (c  ... d) g();")
+hasLocation(#20072,#20007)
+stmt_containers(#20072,#20001)
+#20073=*
+exprs(#20073,79,#20072,1,"d")
+hasLocation(#20073,#20045)
+enclosing_stmt(#20073,#20072)
+expr_containers(#20073,#20001)
+literals("d","d",#20073)
+#20074=@"var;{d};{#20000}"
+variables(#20074,"d",#20000)
+bind(#20073,#20074)
+#20075=*
+exprs(#20075,79,#20072,0,"c")
+hasLocation(#20075,#20037)
+enclosing_stmt(#20075,#20072)
+expr_containers(#20075,#20001)
+literals("c","c",#20075)
+#20076=@"var;{c};{#20000}"
+variables(#20076,"c",#20000)
+bind(#20075,#20076)
 #20077=*
-stmts(#20077,2,#20071,2,"g();")
-#20078=@"loc,{#10000},3,18,3,21"
-locations_default(#20078,#10000,3,18,3,21)
-hasLocation(#20077,#20078)
-stmt_containers(#20077,#20001)
-#20079=*
-exprs(#20079,13,#20077,0,"g()")
-#20080=@"loc,{#10000},3,18,3,20"
-locations_default(#20080,#10000,3,18,3,20)
-hasLocation(#20079,#20080)
-enclosing_stmt(#20079,#20077)
-expr_containers(#20079,#20001)
-#20081=*
-exprs(#20081,79,#20079,-1,"g")
-hasLocation(#20081,#20049)
-enclosing_stmt(#20081,#20077)
-expr_containers(#20081,#20001)
-literals("g","g",#20081)
-#20082=@"var;{g};{#20000}"
-variables(#20082,"g",#20000)
-bind(#20081,#20082)
-#20083=*
-entry_cfg_node(#20083,#20001)
-#20084=@"loc,{#10000},1,1,1,0"
-locations_default(#20084,#10000,1,1,1,0)
-hasLocation(#20083,#20084)
-#20085=*
-exit_cfg_node(#20085,#20001)
-hasLocation(#20085,#20057)
-successor(#20072,#20071)
-successor(#20071,#20074)
-successor(#20071,#20085)
-successor(#20077,#20081)
-successor(#20081,#20079)
-successor(#20079,#20071)
-successor(#20076,#20077)
-successor(#20074,#20076)
-successor(#20060,#20059)
-successor(#20059,#20062)
-successor(#20059,#20072)
-successor(#20065,#20069)
-successor(#20069,#20067)
-successor(#20067,#20059)
-successor(#20064,#20065)
-successor(#20062,#20064)
-successor(#20083,#20060)
+exprs(#20077,3,#20072,-1,"0")
+hasLocation(#20077,#20041)
+enclosing_stmt(#20077,#20072)
+expr_containers(#20077,#20001)
+literals("0","0",#20077)
+#20078=*
+stmts(#20078,2,#20072,2,"g();")
+#20079=@"loc,{#10000},3,18,3,21"
+locations_default(#20079,#10000,3,18,3,21)
+hasLocation(#20078,#20079)
+stmt_containers(#20078,#20001)
+#20080=*
+exprs(#20080,13,#20078,0,"g()")
+#20081=@"loc,{#10000},3,18,3,20"
+locations_default(#20081,#10000,3,18,3,20)
+hasLocation(#20080,#20081)
+enclosing_stmt(#20080,#20078)
+expr_containers(#20080,#20001)
+#20082=*
+exprs(#20082,79,#20080,-1,"g")
+hasLocation(#20082,#20049)
+enclosing_stmt(#20082,#20078)
+expr_containers(#20082,#20001)
+literals("g","g",#20082)
+#20083=@"var;{g};{#20000}"
+variables(#20083,"g",#20000)
+bind(#20082,#20083)
+#20084=*
+entry_cfg_node(#20084,#20001)
+#20085=@"loc,{#10000},1,1,1,0"
+locations_default(#20085,#10000,1,1,1,0)
+hasLocation(#20084,#20085)
+#20086=*
+exit_cfg_node(#20086,#20001)
+hasLocation(#20086,#20057)
+successor(#20073,#20072)
+successor(#20072,#20075)
+successor(#20072,#20086)
+successor(#20078,#20082)
+successor(#20082,#20080)
+successor(#20080,#20072)
+successor(#20077,#20078)
+successor(#20075,#20077)
+successor(#20061,#20060)
+successor(#20060,#20063)
+successor(#20060,#20073)
+successor(#20066,#20070)
+successor(#20070,#20068)
+successor(#20068,#20060)
+successor(#20065,#20066)
+successor(#20063,#20065)
+successor(#20084,#20061)
 numlines(#10000,3,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/stmts/output/trap/functions.js.trap b/javascript/extractor/tests/stmts/output/trap/functions.js.trap
index f89ba7e8cc7..8eee0d83d50 100644
--- a/javascript/extractor/tests/stmts/output/trap/functions.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/functions.js.trap
@@ -309,358 +309,370 @@ hasLocation(#20001,#20112)
 variables(#20113,"g",#20000)
 #20114=@"var;{h};{#20000}"
 variables(#20114,"h",#20000)
-#20115=*
-stmts(#20115,17,#20001,0,"functio ...  x+y;\n}")
-#20116=@"loc,{#10000},1,1,3,1"
-locations_default(#20116,#10000,1,1,3,1)
-hasLocation(#20115,#20116)
-stmt_containers(#20115,#20001)
-#20117=*
-exprs(#20117,78,#20115,-1,"g")
-hasLocation(#20117,#20031)
-expr_containers(#20117,#20115)
-literals("g","g",#20117)
-decl(#20117,#20113)
+#20115=@"var;{this};{#20000}"
+variables(#20115,"this",#20000)
+#20116=*
+stmts(#20116,17,#20001,0,"functio ...  x+y;\n}")
+#20117=@"loc,{#10000},1,1,3,1"
+locations_default(#20117,#10000,1,1,3,1)
+hasLocation(#20116,#20117)
+stmt_containers(#20116,#20001)
 #20118=*
-scopes(#20118,1)
-scopenodes(#20115,#20118)
-scopenesting(#20118,#20000)
-#20119=@"var;{x};{#20118}"
-variables(#20119,"x",#20118)
-#20120=*
-exprs(#20120,78,#20115,0,"x")
-hasLocation(#20120,#20035)
-expr_containers(#20120,#20115)
-literals("x","x",#20120)
-decl(#20120,#20119)
-#20121=@"var;{y};{#20118}"
-variables(#20121,"y",#20118)
+exprs(#20118,78,#20116,-1,"g")
+hasLocation(#20118,#20031)
+expr_containers(#20118,#20116)
+literals("g","g",#20118)
+decl(#20118,#20113)
+#20119=*
+scopes(#20119,1)
+scopenodes(#20116,#20119)
+scopenesting(#20119,#20000)
+#20120=@"var;{this};{#20119}"
+variables(#20120,"this",#20119)
+#20121=@"var;{x};{#20119}"
+variables(#20121,"x",#20119)
 #20122=*
-exprs(#20122,78,#20115,1,"y")
-hasLocation(#20122,#20039)
-expr_containers(#20122,#20115)
-literals("y","y",#20122)
+exprs(#20122,78,#20116,0,"x")
+hasLocation(#20122,#20035)
+expr_containers(#20122,#20116)
+literals("x","x",#20122)
 decl(#20122,#20121)
-#20123=@"var;{arguments};{#20118}"
-variables(#20123,"arguments",#20118)
-is_arguments_object(#20123)
+#20123=@"var;{y};{#20119}"
+variables(#20123,"y",#20119)
 #20124=*
-stmts(#20124,1,#20115,-2,"{\n    return x+y;\n}")
-#20125=@"loc,{#10000},1,18,3,1"
-locations_default(#20125,#10000,1,18,3,1)
-hasLocation(#20124,#20125)
-stmt_containers(#20124,#20115)
+exprs(#20124,78,#20116,1,"y")
+hasLocation(#20124,#20039)
+expr_containers(#20124,#20116)
+literals("y","y",#20124)
+decl(#20124,#20123)
+#20125=@"var;{arguments};{#20119}"
+variables(#20125,"arguments",#20119)
+is_arguments_object(#20125)
 #20126=*
-stmts(#20126,9,#20124,0,"return x+y;")
-#20127=@"loc,{#10000},2,5,2,15"
-locations_default(#20127,#10000,2,5,2,15)
+stmts(#20126,1,#20116,-2,"{\n    return x+y;\n}")
+#20127=@"loc,{#10000},1,18,3,1"
+locations_default(#20127,#10000,1,18,3,1)
 hasLocation(#20126,#20127)
-stmt_containers(#20126,#20115)
+stmt_containers(#20126,#20116)
 #20128=*
-exprs(#20128,34,#20126,0,"x+y")
-#20129=@"loc,{#10000},2,12,2,14"
-locations_default(#20129,#10000,2,12,2,14)
+stmts(#20128,9,#20126,0,"return x+y;")
+#20129=@"loc,{#10000},2,5,2,15"
+locations_default(#20129,#10000,2,5,2,15)
 hasLocation(#20128,#20129)
-enclosing_stmt(#20128,#20126)
-expr_containers(#20128,#20115)
+stmt_containers(#20128,#20116)
 #20130=*
-exprs(#20130,79,#20128,0,"x")
-hasLocation(#20130,#20047)
-enclosing_stmt(#20130,#20126)
-expr_containers(#20130,#20115)
-literals("x","x",#20130)
-bind(#20130,#20119)
-#20131=*
-exprs(#20131,79,#20128,1,"y")
-hasLocation(#20131,#20051)
-enclosing_stmt(#20131,#20126)
-expr_containers(#20131,#20115)
-literals("y","y",#20131)
-bind(#20131,#20121)
+exprs(#20130,34,#20128,0,"x+y")
+#20131=@"loc,{#10000},2,12,2,14"
+locations_default(#20131,#10000,2,12,2,14)
+hasLocation(#20130,#20131)
+enclosing_stmt(#20130,#20128)
+expr_containers(#20130,#20116)
 #20132=*
-stmts(#20132,17,#20001,1,"function h() {}")
-hasLocation(#20132,#20011)
-stmt_containers(#20132,#20001)
+exprs(#20132,79,#20130,0,"x")
+hasLocation(#20132,#20047)
+enclosing_stmt(#20132,#20128)
+expr_containers(#20132,#20116)
+literals("x","x",#20132)
+bind(#20132,#20121)
 #20133=*
-exprs(#20133,78,#20132,-1,"h")
-hasLocation(#20133,#20058)
-expr_containers(#20133,#20132)
-literals("h","h",#20133)
-decl(#20133,#20114)
+exprs(#20133,79,#20130,1,"y")
+hasLocation(#20133,#20051)
+enclosing_stmt(#20133,#20128)
+expr_containers(#20133,#20116)
+literals("y","y",#20133)
+bind(#20133,#20123)
 #20134=*
-scopes(#20134,1)
-scopenodes(#20132,#20134)
-scopenesting(#20134,#20000)
-#20135=@"var;{arguments};{#20134}"
-variables(#20135,"arguments",#20134)
-is_arguments_object(#20135)
+stmts(#20134,17,#20001,1,"function h() {}")
+hasLocation(#20134,#20011)
+stmt_containers(#20134,#20001)
+#20135=*
+exprs(#20135,78,#20134,-1,"h")
+hasLocation(#20135,#20058)
+expr_containers(#20135,#20134)
+literals("h","h",#20135)
+decl(#20135,#20114)
 #20136=*
-stmts(#20136,1,#20132,-2,"{}")
-#20137=@"loc,{#10000},5,14,5,15"
-locations_default(#20137,#10000,5,14,5,15)
-hasLocation(#20136,#20137)
-stmt_containers(#20136,#20132)
-#20138=*
-stmts(#20138,2,#20001,2,"k = fun ... turn;\n}")
-#20139=@"loc,{#10000},7,1,9,1"
-locations_default(#20139,#10000,7,1,9,1)
-hasLocation(#20138,#20139)
-stmt_containers(#20138,#20001)
-#20140=*
-exprs(#20140,47,#20138,0,"k = fun ... turn;\n}")
-hasLocation(#20140,#20139)
-enclosing_stmt(#20140,#20138)
-expr_containers(#20140,#20001)
+scopes(#20136,1)
+scopenodes(#20134,#20136)
+scopenesting(#20136,#20000)
+#20137=@"var;{this};{#20136}"
+variables(#20137,"this",#20136)
+#20138=@"var;{arguments};{#20136}"
+variables(#20138,"arguments",#20136)
+is_arguments_object(#20138)
+#20139=*
+stmts(#20139,1,#20134,-2,"{}")
+#20140=@"loc,{#10000},5,14,5,15"
+locations_default(#20140,#10000,5,14,5,15)
+hasLocation(#20139,#20140)
+stmt_containers(#20139,#20134)
 #20141=*
-exprs(#20141,79,#20140,0,"k")
-hasLocation(#20141,#20068)
-enclosing_stmt(#20141,#20138)
-expr_containers(#20141,#20001)
-literals("k","k",#20141)
-#20142=@"var;{k};{#20000}"
-variables(#20142,"k",#20000)
-bind(#20141,#20142)
+stmts(#20141,2,#20001,2,"k = fun ... turn;\n}")
+#20142=@"loc,{#10000},7,1,9,1"
+locations_default(#20142,#10000,7,1,9,1)
+hasLocation(#20141,#20142)
+stmt_containers(#20141,#20001)
 #20143=*
-exprs(#20143,9,#20140,1,"functio ... turn;\n}")
-#20144=@"loc,{#10000},7,5,9,1"
-locations_default(#20144,#10000,7,5,9,1)
-hasLocation(#20143,#20144)
-enclosing_stmt(#20143,#20138)
+exprs(#20143,47,#20141,0,"k = fun ... turn;\n}")
+hasLocation(#20143,#20142)
+enclosing_stmt(#20143,#20141)
 expr_containers(#20143,#20001)
-#20145=*
-scopes(#20145,1)
-scopenodes(#20143,#20145)
-scopenesting(#20145,#20000)
-#20146=@"var;{arguments};{#20145}"
-variables(#20146,"arguments",#20145)
-is_arguments_object(#20146)
-#20147=*
-stmts(#20147,1,#20143,-2,"{\n    return;\n}")
-#20148=@"loc,{#10000},7,16,9,1"
-locations_default(#20148,#10000,7,16,9,1)
-hasLocation(#20147,#20148)
-stmt_containers(#20147,#20143)
-#20149=*
-stmts(#20149,9,#20147,0,"return;")
-#20150=@"loc,{#10000},8,5,8,11"
-locations_default(#20150,#10000,8,5,8,11)
-hasLocation(#20149,#20150)
-stmt_containers(#20149,#20143)
+#20144=*
+exprs(#20144,79,#20143,0,"k")
+hasLocation(#20144,#20068)
+enclosing_stmt(#20144,#20141)
+expr_containers(#20144,#20001)
+literals("k","k",#20144)
+#20145=@"var;{k};{#20000}"
+variables(#20145,"k",#20000)
+bind(#20144,#20145)
+#20146=*
+exprs(#20146,9,#20143,1,"functio ... turn;\n}")
+#20147=@"loc,{#10000},7,5,9,1"
+locations_default(#20147,#10000,7,5,9,1)
+hasLocation(#20146,#20147)
+enclosing_stmt(#20146,#20141)
+expr_containers(#20146,#20001)
+#20148=*
+scopes(#20148,1)
+scopenodes(#20146,#20148)
+scopenesting(#20148,#20000)
+#20149=@"var;{this};{#20148}"
+variables(#20149,"this",#20148)
+#20150=@"var;{arguments};{#20148}"
+variables(#20150,"arguments",#20148)
+is_arguments_object(#20150)
 #20151=*
-stmts(#20151,2,#20001,3,"l = function f() {}")
-hasLocation(#20151,#20023)
-stmt_containers(#20151,#20001)
-#20152=*
-exprs(#20152,47,#20151,0,"l = function f() {}")
-hasLocation(#20152,#20023)
-enclosing_stmt(#20152,#20151)
-expr_containers(#20152,#20001)
+stmts(#20151,1,#20146,-2,"{\n    return;\n}")
+#20152=@"loc,{#10000},7,16,9,1"
+locations_default(#20152,#10000,7,16,9,1)
+hasLocation(#20151,#20152)
+stmt_containers(#20151,#20146)
 #20153=*
-exprs(#20153,79,#20152,0,"l")
-hasLocation(#20153,#20085)
-enclosing_stmt(#20153,#20151)
-expr_containers(#20153,#20001)
-literals("l","l",#20153)
-#20154=@"var;{l};{#20000}"
-variables(#20154,"l",#20000)
-bind(#20153,#20154)
+stmts(#20153,9,#20151,0,"return;")
+#20154=@"loc,{#10000},8,5,8,11"
+locations_default(#20154,#10000,8,5,8,11)
+hasLocation(#20153,#20154)
+stmt_containers(#20153,#20146)
 #20155=*
-exprs(#20155,9,#20152,1,"function f() {}")
-#20156=@"loc,{#10000},11,5,11,19"
-locations_default(#20156,#10000,11,5,11,19)
-hasLocation(#20155,#20156)
-enclosing_stmt(#20155,#20151)
-expr_containers(#20155,#20001)
+stmts(#20155,2,#20001,3,"l = function f() {}")
+hasLocation(#20155,#20023)
+stmt_containers(#20155,#20001)
+#20156=*
+exprs(#20156,47,#20155,0,"l = function f() {}")
+hasLocation(#20156,#20023)
+enclosing_stmt(#20156,#20155)
+expr_containers(#20156,#20001)
 #20157=*
-scopes(#20157,1)
-scopenodes(#20155,#20157)
-scopenesting(#20157,#20000)
-#20158=@"var;{f};{#20157}"
-variables(#20158,"f",#20157)
+exprs(#20157,79,#20156,0,"l")
+hasLocation(#20157,#20085)
+enclosing_stmt(#20157,#20155)
+expr_containers(#20157,#20001)
+literals("l","l",#20157)
+#20158=@"var;{l};{#20000}"
+variables(#20158,"l",#20000)
+bind(#20157,#20158)
 #20159=*
-exprs(#20159,78,#20155,-1,"f")
-hasLocation(#20159,#20091)
-expr_containers(#20159,#20155)
-literals("f","f",#20159)
-decl(#20159,#20158)
-#20160=@"var;{arguments};{#20157}"
-variables(#20160,"arguments",#20157)
-is_arguments_object(#20160)
+exprs(#20159,9,#20156,1,"function f() {}")
+#20160=@"loc,{#10000},11,5,11,19"
+locations_default(#20160,#10000,11,5,11,19)
+hasLocation(#20159,#20160)
+enclosing_stmt(#20159,#20155)
+expr_containers(#20159,#20001)
 #20161=*
-stmts(#20161,1,#20155,-2,"{}")
-#20162=@"loc,{#10000},11,18,11,19"
-locations_default(#20162,#10000,11,18,11,19)
-hasLocation(#20161,#20162)
-stmt_containers(#20161,#20155)
-#20163=*
-stmts(#20163,2,#20001,4,"function() {}")
-hasLocation(#20163,#20027)
-stmt_containers(#20163,#20001)
+scopes(#20161,1)
+scopenodes(#20159,#20161)
+scopenesting(#20161,#20000)
+#20162=@"var;{this};{#20161}"
+variables(#20162,"this",#20161)
+#20163=@"var;{f};{#20161}"
+variables(#20163,"f",#20161)
 #20164=*
-exprs(#20164,9,#20163,0,"function() {}")
-hasLocation(#20164,#20027)
-enclosing_stmt(#20164,#20163)
-expr_containers(#20164,#20001)
-#20165=*
-scopes(#20165,1)
-scopenodes(#20164,#20165)
-scopenesting(#20165,#20000)
-#20166=@"var;{arguments};{#20165}"
-variables(#20166,"arguments",#20165)
-is_arguments_object(#20166)
-#20167=*
-stmts(#20167,1,#20164,-2,"{}")
-#20168=@"loc,{#10000},13,12,13,13"
-locations_default(#20168,#10000,13,12,13,13)
-hasLocation(#20167,#20168)
-stmt_containers(#20167,#20164)
+exprs(#20164,78,#20159,-1,"f")
+hasLocation(#20164,#20091)
+expr_containers(#20164,#20159)
+literals("f","f",#20164)
+decl(#20164,#20163)
+#20165=@"var;{arguments};{#20161}"
+variables(#20165,"arguments",#20161)
+is_arguments_object(#20165)
+#20166=*
+stmts(#20166,1,#20159,-2,"{}")
+#20167=@"loc,{#10000},11,18,11,19"
+locations_default(#20167,#10000,11,18,11,19)
+hasLocation(#20166,#20167)
+stmt_containers(#20166,#20159)
+#20168=*
+stmts(#20168,2,#20001,4,"function() {}")
+hasLocation(#20168,#20027)
+stmt_containers(#20168,#20001)
 #20169=*
-entry_cfg_node(#20169,#20001)
-#20170=@"loc,{#10000},1,1,1,0"
-locations_default(#20170,#10000,1,1,1,0)
-hasLocation(#20169,#20170)
-#20171=*
-exit_cfg_node(#20171,#20001)
-hasLocation(#20171,#20111)
-successor(#20163,#20164)
-successor(#20164,#20171)
-#20172=*
-entry_cfg_node(#20172,#20164)
-#20173=@"loc,{#10000},13,1,13,0"
-locations_default(#20173,#10000,13,1,13,0)
-hasLocation(#20172,#20173)
-#20174=*
-exit_cfg_node(#20174,#20164)
-#20175=@"loc,{#10000},13,14,13,13"
-locations_default(#20175,#10000,13,14,13,13)
-hasLocation(#20174,#20175)
-successor(#20167,#20174)
-successor(#20172,#20167)
-successor(#20151,#20153)
-successor(#20155,#20152)
-#20176=*
-entry_cfg_node(#20176,#20155)
-#20177=@"loc,{#10000},11,5,11,4"
-locations_default(#20177,#10000,11,5,11,4)
-hasLocation(#20176,#20177)
+exprs(#20169,9,#20168,0,"function() {}")
+hasLocation(#20169,#20027)
+enclosing_stmt(#20169,#20168)
+expr_containers(#20169,#20001)
+#20170=*
+scopes(#20170,1)
+scopenodes(#20169,#20170)
+scopenesting(#20170,#20000)
+#20171=@"var;{this};{#20170}"
+variables(#20171,"this",#20170)
+#20172=@"var;{arguments};{#20170}"
+variables(#20172,"arguments",#20170)
+is_arguments_object(#20172)
+#20173=*
+stmts(#20173,1,#20169,-2,"{}")
+#20174=@"loc,{#10000},13,12,13,13"
+locations_default(#20174,#10000,13,12,13,13)
+hasLocation(#20173,#20174)
+stmt_containers(#20173,#20169)
+#20175=*
+entry_cfg_node(#20175,#20001)
+#20176=@"loc,{#10000},1,1,1,0"
+locations_default(#20176,#10000,1,1,1,0)
+hasLocation(#20175,#20176)
+#20177=*
+exit_cfg_node(#20177,#20001)
+hasLocation(#20177,#20111)
+successor(#20168,#20169)
+successor(#20169,#20177)
 #20178=*
-exit_cfg_node(#20178,#20155)
-#20179=@"loc,{#10000},11,20,11,19"
-locations_default(#20179,#10000,11,20,11,19)
+entry_cfg_node(#20178,#20169)
+#20179=@"loc,{#10000},13,1,13,0"
+locations_default(#20179,#10000,13,1,13,0)
 hasLocation(#20178,#20179)
-successor(#20161,#20178)
-successor(#20159,#20161)
-successor(#20176,#20159)
-successor(#20153,#20155)
-successor(#20152,#20163)
-successor(#20138,#20141)
-successor(#20143,#20140)
 #20180=*
-entry_cfg_node(#20180,#20143)
-#20181=@"loc,{#10000},7,5,7,4"
-locations_default(#20181,#10000,7,5,7,4)
+exit_cfg_node(#20180,#20169)
+#20181=@"loc,{#10000},13,14,13,13"
+locations_default(#20181,#10000,13,14,13,13)
 hasLocation(#20180,#20181)
+successor(#20173,#20180)
+successor(#20178,#20173)
+successor(#20155,#20157)
+successor(#20159,#20156)
 #20182=*
-exit_cfg_node(#20182,#20143)
-#20183=@"loc,{#10000},9,2,9,1"
-locations_default(#20183,#10000,9,2,9,1)
+entry_cfg_node(#20182,#20159)
+#20183=@"loc,{#10000},11,5,11,4"
+locations_default(#20183,#10000,11,5,11,4)
 hasLocation(#20182,#20183)
-successor(#20149,#20182)
-successor(#20147,#20149)
-successor(#20180,#20147)
-successor(#20141,#20143)
-successor(#20140,#20151)
-successor(#20132,#20138)
 #20184=*
-entry_cfg_node(#20184,#20132)
-#20185=@"loc,{#10000},5,1,5,0"
-locations_default(#20185,#10000,5,1,5,0)
+exit_cfg_node(#20184,#20159)
+#20185=@"loc,{#10000},11,20,11,19"
+locations_default(#20185,#10000,11,20,11,19)
 hasLocation(#20184,#20185)
+successor(#20166,#20184)
+successor(#20164,#20166)
+successor(#20182,#20164)
+successor(#20157,#20159)
+successor(#20156,#20168)
+successor(#20141,#20144)
+successor(#20146,#20143)
 #20186=*
-exit_cfg_node(#20186,#20132)
-#20187=@"loc,{#10000},5,16,5,15"
-locations_default(#20187,#10000,5,16,5,15)
+entry_cfg_node(#20186,#20146)
+#20187=@"loc,{#10000},7,5,7,4"
+locations_default(#20187,#10000,7,5,7,4)
 hasLocation(#20186,#20187)
-successor(#20136,#20186)
-successor(#20184,#20136)
-successor(#20115,#20132)
 #20188=*
-entry_cfg_node(#20188,#20115)
-hasLocation(#20188,#20170)
-#20189=*
-exit_cfg_node(#20189,#20115)
-#20190=@"loc,{#10000},3,2,3,1"
-locations_default(#20190,#10000,3,2,3,1)
-hasLocation(#20189,#20190)
-successor(#20131,#20128)
-successor(#20130,#20131)
-successor(#20128,#20126)
-successor(#20126,#20189)
-successor(#20124,#20130)
-successor(#20122,#20124)
-successor(#20120,#20122)
-successor(#20188,#20120)
-successor(#20133,#20115)
-successor(#20117,#20133)
-successor(#20169,#20117)
-#20191=*
-js_parse_errors(#20191,#20001,"Error: Missing function name","function() {}
-")
-hasLocation(#20191,#20103)
+exit_cfg_node(#20188,#20146)
+#20189=@"loc,{#10000},9,2,9,1"
+locations_default(#20189,#10000,9,2,9,1)
+hasLocation(#20188,#20189)
+successor(#20153,#20188)
+successor(#20151,#20153)
+successor(#20186,#20151)
+successor(#20144,#20146)
+successor(#20143,#20155)
+successor(#20134,#20141)
+#20190=*
+entry_cfg_node(#20190,#20134)
+#20191=@"loc,{#10000},5,1,5,0"
+locations_default(#20191,#10000,5,1,5,0)
+hasLocation(#20190,#20191)
 #20192=*
-lines(#20192,#20001,"function g(x, y) {","
-")
-hasLocation(#20192,#20003)
-#20193=*
-lines(#20193,#20001,"    return x+y;","
-")
-hasLocation(#20193,#20005)
-indentation(#10000,2," ",4)
+exit_cfg_node(#20192,#20134)
+#20193=@"loc,{#10000},5,16,5,15"
+locations_default(#20193,#10000,5,16,5,15)
+hasLocation(#20192,#20193)
+successor(#20139,#20192)
+successor(#20190,#20139)
+successor(#20116,#20134)
 #20194=*
-lines(#20194,#20001,"}","
-")
-hasLocation(#20194,#20007)
+entry_cfg_node(#20194,#20116)
+hasLocation(#20194,#20176)
 #20195=*
-lines(#20195,#20001,"","
-")
-hasLocation(#20195,#20009)
-#20196=*
-lines(#20196,#20001,"function h() {}","
-")
-hasLocation(#20196,#20011)
+exit_cfg_node(#20195,#20116)
+#20196=@"loc,{#10000},3,2,3,1"
+locations_default(#20196,#10000,3,2,3,1)
+hasLocation(#20195,#20196)
+successor(#20133,#20130)
+successor(#20132,#20133)
+successor(#20130,#20128)
+successor(#20128,#20195)
+successor(#20126,#20132)
+successor(#20124,#20126)
+successor(#20122,#20124)
+successor(#20194,#20122)
+successor(#20135,#20116)
+successor(#20118,#20135)
+successor(#20175,#20118)
 #20197=*
-lines(#20197,#20001,"","
+js_parse_errors(#20197,#20001,"Error: Missing function name","function() {}
 ")
-hasLocation(#20197,#20013)
+hasLocation(#20197,#20103)
 #20198=*
-lines(#20198,#20001,"k = function() {","
+lines(#20198,#20001,"function g(x, y) {","
 ")
-hasLocation(#20198,#20015)
+hasLocation(#20198,#20003)
 #20199=*
-lines(#20199,#20001,"    return;","
+lines(#20199,#20001,"    return x+y;","
 ")
-hasLocation(#20199,#20017)
-indentation(#10000,8," ",4)
+hasLocation(#20199,#20005)
+indentation(#10000,2," ",4)
 #20200=*
 lines(#20200,#20001,"}","
 ")
-hasLocation(#20200,#20019)
+hasLocation(#20200,#20007)
 #20201=*
 lines(#20201,#20001,"","
 ")
-hasLocation(#20201,#20021)
+hasLocation(#20201,#20009)
 #20202=*
-lines(#20202,#20001,"l = function f() {}","
+lines(#20202,#20001,"function h() {}","
 ")
-hasLocation(#20202,#20023)
+hasLocation(#20202,#20011)
 #20203=*
 lines(#20203,#20001,"","
 ")
-hasLocation(#20203,#20025)
+hasLocation(#20203,#20013)
 #20204=*
-lines(#20204,#20001,"function() {}","
+lines(#20204,#20001,"k = function() {","
 ")
-hasLocation(#20204,#20027)
+hasLocation(#20204,#20015)
+#20205=*
+lines(#20205,#20001,"    return;","
+")
+hasLocation(#20205,#20017)
+indentation(#10000,8," ",4)
+#20206=*
+lines(#20206,#20001,"}","
+")
+hasLocation(#20206,#20019)
+#20207=*
+lines(#20207,#20001,"","
+")
+hasLocation(#20207,#20021)
+#20208=*
+lines(#20208,#20001,"l = function f() {}","
+")
+hasLocation(#20208,#20023)
+#20209=*
+lines(#20209,#20001,"","
+")
+hasLocation(#20209,#20025)
+#20210=*
+lines(#20210,#20001,"function() {}","
+")
+hasLocation(#20210,#20027)
 numlines(#20001,13,0,0)
 numlines(#10000,13,9,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/stmts/output/trap/loops.js.trap b/javascript/extractor/tests/stmts/output/trap/loops.js.trap
index 2adac2bb41c..f68ae65e23b 100644
--- a/javascript/extractor/tests/stmts/output/trap/loops.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/loops.js.trap
@@ -618,453 +618,455 @@ variables(#20230,"i",#20000)
 variables(#20231,"n",#20000)
 #20232=@"var;{x};{#20000}"
 variables(#20232,"x",#20000)
-#20233=*
-stmts(#20233,12,#20001,0,"while(true)\n    ;")
-#20234=@"loc,{#10000},1,1,2,5"
-locations_default(#20234,#10000,1,1,2,5)
-hasLocation(#20233,#20234)
-stmt_containers(#20233,#20001)
-#20235=*
-exprs(#20235,2,#20233,0,"true")
-hasLocation(#20235,#20049)
-enclosing_stmt(#20235,#20233)
-expr_containers(#20235,#20001)
-literals("true","true",#20235)
+#20233=@"var;{this};{#20000}"
+variables(#20233,"this",#20000)
+#20234=*
+stmts(#20234,12,#20001,0,"while(true)\n    ;")
+#20235=@"loc,{#10000},1,1,2,5"
+locations_default(#20235,#10000,1,1,2,5)
+hasLocation(#20234,#20235)
+stmt_containers(#20234,#20001)
 #20236=*
-stmts(#20236,0,#20233,1,";")
-hasLocation(#20236,#20053)
-stmt_containers(#20236,#20001)
+exprs(#20236,2,#20234,0,"true")
+hasLocation(#20236,#20049)
+enclosing_stmt(#20236,#20234)
+expr_containers(#20236,#20001)
+literals("true","true",#20236)
 #20237=*
-stmts(#20237,4,#20001,1,"outer:  ... inue;\n}")
-#20238=@"loc,{#10000},3,1,11,1"
-locations_default(#20238,#10000,3,1,11,1)
-hasLocation(#20237,#20238)
+stmts(#20237,0,#20234,1,";")
+hasLocation(#20237,#20053)
 stmt_containers(#20237,#20001)
-#20239=*
-exprs(#20239,0,#20237,0,"outer")
-hasLocation(#20239,#20055)
-enclosing_stmt(#20239,#20237)
-expr_containers(#20239,#20001)
-literals("outer","outer",#20239)
+#20238=*
+stmts(#20238,4,#20001,1,"outer:  ... inue;\n}")
+#20239=@"loc,{#10000},3,1,11,1"
+locations_default(#20239,#10000,3,1,11,1)
+hasLocation(#20238,#20239)
+stmt_containers(#20238,#20001)
 #20240=*
-stmts(#20240,14,#20237,1,"for(a;  ... inue;\n}")
-#20241=@"loc,{#10000},3,8,11,1"
-locations_default(#20241,#10000,3,8,11,1)
-hasLocation(#20240,#20241)
-stmt_containers(#20240,#20001)
-#20242=*
-exprs(#20242,79,#20240,1,"b")
-hasLocation(#20242,#20067)
-enclosing_stmt(#20242,#20240)
-expr_containers(#20242,#20001)
-literals("b","b",#20242)
-#20243=@"var;{b};{#20000}"
-variables(#20243,"b",#20000)
-bind(#20242,#20243)
-#20244=*
-exprs(#20244,79,#20240,2,"c")
-hasLocation(#20244,#20071)
-enclosing_stmt(#20244,#20240)
-expr_containers(#20244,#20001)
-literals("c","c",#20244)
-#20245=@"var;{c};{#20000}"
-variables(#20245,"c",#20000)
-bind(#20244,#20245)
-#20246=*
-exprs(#20246,79,#20240,0,"a")
-hasLocation(#20246,#20063)
-enclosing_stmt(#20246,#20240)
-expr_containers(#20246,#20001)
-literals("a","a",#20246)
-#20247=@"var;{a};{#20000}"
-variables(#20247,"a",#20000)
-bind(#20246,#20247)
-#20248=*
-stmts(#20248,1,#20240,3,"{\n    f ... inue;\n}")
-#20249=@"loc,{#10000},3,21,11,1"
-locations_default(#20249,#10000,3,21,11,1)
-hasLocation(#20248,#20249)
-stmt_containers(#20248,#20001)
-#20250=*
-stmts(#20250,14,#20248,0,"for(;;) ... ntinue;")
-#20251=@"loc,{#10000},4,5,10,21"
-locations_default(#20251,#10000,4,5,10,21)
-hasLocation(#20250,#20251)
-stmt_containers(#20250,#20001)
-#20252=*
-stmts(#20252,3,#20250,3,"if (d)\n ... ntinue;")
-#20253=@"loc,{#10000},5,9,10,21"
-locations_default(#20253,#10000,5,9,10,21)
-hasLocation(#20252,#20253)
-stmt_containers(#20252,#20001)
-#20254=*
-exprs(#20254,79,#20252,0,"d")
-hasLocation(#20254,#20091)
-enclosing_stmt(#20254,#20252)
-expr_containers(#20254,#20001)
-literals("d","d",#20254)
-#20255=@"var;{d};{#20000}"
-variables(#20255,"d",#20000)
-bind(#20254,#20255)
-#20256=*
-stmts(#20256,6,#20252,1,"continue outer;")
-#20257=@"loc,{#10000},6,13,6,27"
-locations_default(#20257,#10000,6,13,6,27)
-hasLocation(#20256,#20257)
-stmt_containers(#20256,#20001)
-#20258=*
-exprs(#20258,0,#20256,0,"outer")
-hasLocation(#20258,#20097)
-enclosing_stmt(#20258,#20256)
-expr_containers(#20258,#20001)
-literals("outer","outer",#20258)
-jump_targets(#20256,#20237)
+exprs(#20240,0,#20238,0,"outer")
+hasLocation(#20240,#20055)
+enclosing_stmt(#20240,#20238)
+expr_containers(#20240,#20001)
+literals("outer","outer",#20240)
+#20241=*
+stmts(#20241,14,#20238,1,"for(a;  ... inue;\n}")
+#20242=@"loc,{#10000},3,8,11,1"
+locations_default(#20242,#10000,3,8,11,1)
+hasLocation(#20241,#20242)
+stmt_containers(#20241,#20001)
+#20243=*
+exprs(#20243,79,#20241,1,"b")
+hasLocation(#20243,#20067)
+enclosing_stmt(#20243,#20241)
+expr_containers(#20243,#20001)
+literals("b","b",#20243)
+#20244=@"var;{b};{#20000}"
+variables(#20244,"b",#20000)
+bind(#20243,#20244)
+#20245=*
+exprs(#20245,79,#20241,2,"c")
+hasLocation(#20245,#20071)
+enclosing_stmt(#20245,#20241)
+expr_containers(#20245,#20001)
+literals("c","c",#20245)
+#20246=@"var;{c};{#20000}"
+variables(#20246,"c",#20000)
+bind(#20245,#20246)
+#20247=*
+exprs(#20247,79,#20241,0,"a")
+hasLocation(#20247,#20063)
+enclosing_stmt(#20247,#20241)
+expr_containers(#20247,#20001)
+literals("a","a",#20247)
+#20248=@"var;{a};{#20000}"
+variables(#20248,"a",#20000)
+bind(#20247,#20248)
+#20249=*
+stmts(#20249,1,#20241,3,"{\n    f ... inue;\n}")
+#20250=@"loc,{#10000},3,21,11,1"
+locations_default(#20250,#10000,3,21,11,1)
+hasLocation(#20249,#20250)
+stmt_containers(#20249,#20001)
+#20251=*
+stmts(#20251,14,#20249,0,"for(;;) ... ntinue;")
+#20252=@"loc,{#10000},4,5,10,21"
+locations_default(#20252,#10000,4,5,10,21)
+hasLocation(#20251,#20252)
+stmt_containers(#20251,#20001)
+#20253=*
+stmts(#20253,3,#20251,3,"if (d)\n ... ntinue;")
+#20254=@"loc,{#10000},5,9,10,21"
+locations_default(#20254,#10000,5,9,10,21)
+hasLocation(#20253,#20254)
+stmt_containers(#20253,#20001)
+#20255=*
+exprs(#20255,79,#20253,0,"d")
+hasLocation(#20255,#20091)
+enclosing_stmt(#20255,#20253)
+expr_containers(#20255,#20001)
+literals("d","d",#20255)
+#20256=@"var;{d};{#20000}"
+variables(#20256,"d",#20000)
+bind(#20255,#20256)
+#20257=*
+stmts(#20257,6,#20253,1,"continue outer;")
+#20258=@"loc,{#10000},6,13,6,27"
+locations_default(#20258,#10000,6,13,6,27)
+hasLocation(#20257,#20258)
+stmt_containers(#20257,#20001)
 #20259=*
-stmts(#20259,3,#20252,2,"if (e)\n ... ntinue;")
-#20260=@"loc,{#10000},7,14,10,21"
-locations_default(#20260,#10000,7,14,10,21)
-hasLocation(#20259,#20260)
-stmt_containers(#20259,#20001)
-#20261=*
-exprs(#20261,79,#20259,0,"e")
-hasLocation(#20261,#20107)
-enclosing_stmt(#20261,#20259)
-expr_containers(#20261,#20001)
-literals("e","e",#20261)
-#20262=@"var;{e};{#20000}"
-variables(#20262,"e",#20000)
-bind(#20261,#20262)
-#20263=*
-stmts(#20263,5,#20259,1,"break outer;")
-#20264=@"loc,{#10000},8,13,8,24"
-locations_default(#20264,#10000,8,13,8,24)
-hasLocation(#20263,#20264)
-stmt_containers(#20263,#20001)
-#20265=*
-exprs(#20265,0,#20263,0,"outer")
-hasLocation(#20265,#20113)
-enclosing_stmt(#20265,#20263)
-expr_containers(#20265,#20001)
-literals("outer","outer",#20265)
-jump_targets(#20263,#20237)
+exprs(#20259,0,#20257,0,"outer")
+hasLocation(#20259,#20097)
+enclosing_stmt(#20259,#20257)
+expr_containers(#20259,#20001)
+literals("outer","outer",#20259)
+jump_targets(#20257,#20238)
+#20260=*
+stmts(#20260,3,#20253,2,"if (e)\n ... ntinue;")
+#20261=@"loc,{#10000},7,14,10,21"
+locations_default(#20261,#10000,7,14,10,21)
+hasLocation(#20260,#20261)
+stmt_containers(#20260,#20001)
+#20262=*
+exprs(#20262,79,#20260,0,"e")
+hasLocation(#20262,#20107)
+enclosing_stmt(#20262,#20260)
+expr_containers(#20262,#20001)
+literals("e","e",#20262)
+#20263=@"var;{e};{#20000}"
+variables(#20263,"e",#20000)
+bind(#20262,#20263)
+#20264=*
+stmts(#20264,5,#20260,1,"break outer;")
+#20265=@"loc,{#10000},8,13,8,24"
+locations_default(#20265,#10000,8,13,8,24)
+hasLocation(#20264,#20265)
+stmt_containers(#20264,#20001)
 #20266=*
-stmts(#20266,6,#20259,2,"continue;")
-#20267=@"loc,{#10000},10,13,10,21"
-locations_default(#20267,#10000,10,13,10,21)
-hasLocation(#20266,#20267)
-stmt_containers(#20266,#20001)
-jump_targets(#20266,#20250)
-#20268=*
-stmts(#20268,13,#20001,2,"do {\n   ... ile(a);")
-#20269=@"loc,{#10000},13,1,15,11"
-locations_default(#20269,#10000,13,1,15,11)
-hasLocation(#20268,#20269)
-stmt_containers(#20268,#20001)
-#20270=*
-exprs(#20270,79,#20268,1,"a")
-hasLocation(#20270,#20136)
-enclosing_stmt(#20270,#20268)
-expr_containers(#20270,#20001)
-literals("a","a",#20270)
-bind(#20270,#20247)
+exprs(#20266,0,#20264,0,"outer")
+hasLocation(#20266,#20113)
+enclosing_stmt(#20266,#20264)
+expr_containers(#20266,#20001)
+literals("outer","outer",#20266)
+jump_targets(#20264,#20238)
+#20267=*
+stmts(#20267,6,#20260,2,"continue;")
+#20268=@"loc,{#10000},10,13,10,21"
+locations_default(#20268,#10000,10,13,10,21)
+hasLocation(#20267,#20268)
+stmt_containers(#20267,#20001)
+jump_targets(#20267,#20251)
+#20269=*
+stmts(#20269,13,#20001,2,"do {\n   ... ile(a);")
+#20270=@"loc,{#10000},13,1,15,11"
+locations_default(#20270,#10000,13,1,15,11)
+hasLocation(#20269,#20270)
+stmt_containers(#20269,#20001)
 #20271=*
-stmts(#20271,1,#20268,0,"{\n    ;\n}")
-#20272=@"loc,{#10000},13,4,15,1"
-locations_default(#20272,#10000,13,4,15,1)
-hasLocation(#20271,#20272)
-stmt_containers(#20271,#20001)
-#20273=*
-stmts(#20273,0,#20271,0,";")
-hasLocation(#20273,#20128)
-stmt_containers(#20273,#20001)
+exprs(#20271,79,#20269,1,"a")
+hasLocation(#20271,#20136)
+enclosing_stmt(#20271,#20269)
+expr_containers(#20271,#20001)
+literals("a","a",#20271)
+bind(#20271,#20248)
+#20272=*
+stmts(#20272,1,#20269,0,"{\n    ;\n}")
+#20273=@"loc,{#10000},13,4,15,1"
+locations_default(#20273,#10000,13,4,15,1)
+hasLocation(#20272,#20273)
+stmt_containers(#20272,#20001)
 #20274=*
-stmts(#20274,14,#20001,3,"for (va ... ; ++i);")
-hasLocation(#20274,#20035)
+stmts(#20274,0,#20272,0,";")
+hasLocation(#20274,#20128)
 stmt_containers(#20274,#20001)
 #20275=*
-exprs(#20275,27,#20274,1,"i<n")
-#20276=@"loc,{#10000},17,20,17,22"
-locations_default(#20276,#10000,17,20,17,22)
-hasLocation(#20275,#20276)
-enclosing_stmt(#20275,#20274)
-expr_containers(#20275,#20001)
-#20277=*
-exprs(#20277,79,#20275,0,"i")
-hasLocation(#20277,#20164)
-enclosing_stmt(#20277,#20274)
-expr_containers(#20277,#20001)
-literals("i","i",#20277)
-bind(#20277,#20230)
+stmts(#20275,14,#20001,3,"for (va ... ; ++i);")
+hasLocation(#20275,#20035)
+stmt_containers(#20275,#20001)
+#20276=*
+exprs(#20276,27,#20275,1,"i<n")
+#20277=@"loc,{#10000},17,20,17,22"
+locations_default(#20277,#10000,17,20,17,22)
+hasLocation(#20276,#20277)
+enclosing_stmt(#20276,#20275)
+expr_containers(#20276,#20001)
 #20278=*
-exprs(#20278,79,#20275,1,"n")
-hasLocation(#20278,#20168)
-enclosing_stmt(#20278,#20274)
+exprs(#20278,79,#20276,0,"i")
+hasLocation(#20278,#20164)
+enclosing_stmt(#20278,#20275)
 expr_containers(#20278,#20001)
-literals("n","n",#20278)
-bind(#20278,#20231)
+literals("i","i",#20278)
+bind(#20278,#20230)
 #20279=*
-exprs(#20279,59,#20274,2,"++i")
-#20280=@"loc,{#10000},17,25,17,27"
-locations_default(#20280,#10000,17,25,17,27)
-hasLocation(#20279,#20280)
-enclosing_stmt(#20279,#20274)
+exprs(#20279,79,#20276,1,"n")
+hasLocation(#20279,#20168)
+enclosing_stmt(#20279,#20275)
 expr_containers(#20279,#20001)
-#20281=*
-exprs(#20281,79,#20279,0,"i")
-hasLocation(#20281,#20174)
-enclosing_stmt(#20281,#20274)
-expr_containers(#20281,#20001)
-literals("i","i",#20281)
-bind(#20281,#20230)
+literals("n","n",#20279)
+bind(#20279,#20231)
+#20280=*
+exprs(#20280,59,#20275,2,"++i")
+#20281=@"loc,{#10000},17,25,17,27"
+locations_default(#20281,#10000,17,25,17,27)
+hasLocation(#20280,#20281)
+enclosing_stmt(#20280,#20275)
+expr_containers(#20280,#20001)
 #20282=*
-stmts(#20282,18,#20274,0,"var i=0,n=10")
-#20283=@"loc,{#10000},17,6,17,17"
-locations_default(#20283,#10000,17,6,17,17)
-hasLocation(#20282,#20283)
-stmt_containers(#20282,#20001)
-#20284=*
-exprs(#20284,64,#20282,0,"i=0")
-#20285=@"loc,{#10000},17,10,17,12"
-locations_default(#20285,#10000,17,10,17,12)
-hasLocation(#20284,#20285)
-enclosing_stmt(#20284,#20282)
-expr_containers(#20284,#20001)
-#20286=*
-exprs(#20286,78,#20284,0,"i")
-hasLocation(#20286,#20148)
-enclosing_stmt(#20286,#20282)
-expr_containers(#20286,#20001)
-literals("i","i",#20286)
-decl(#20286,#20230)
+exprs(#20282,79,#20280,0,"i")
+hasLocation(#20282,#20174)
+enclosing_stmt(#20282,#20275)
+expr_containers(#20282,#20001)
+literals("i","i",#20282)
+bind(#20282,#20230)
+#20283=*
+stmts(#20283,18,#20275,0,"var i=0,n=10")
+#20284=@"loc,{#10000},17,6,17,17"
+locations_default(#20284,#10000,17,6,17,17)
+hasLocation(#20283,#20284)
+stmt_containers(#20283,#20001)
+#20285=*
+exprs(#20285,64,#20283,0,"i=0")
+#20286=@"loc,{#10000},17,10,17,12"
+locations_default(#20286,#10000,17,10,17,12)
+hasLocation(#20285,#20286)
+enclosing_stmt(#20285,#20283)
+expr_containers(#20285,#20001)
 #20287=*
-exprs(#20287,3,#20284,1,"0")
-hasLocation(#20287,#20152)
-enclosing_stmt(#20287,#20282)
+exprs(#20287,78,#20285,0,"i")
+hasLocation(#20287,#20148)
+enclosing_stmt(#20287,#20283)
 expr_containers(#20287,#20001)
-literals("0","0",#20287)
+literals("i","i",#20287)
+decl(#20287,#20230)
 #20288=*
-exprs(#20288,64,#20282,1,"n=10")
-#20289=@"loc,{#10000},17,14,17,17"
-locations_default(#20289,#10000,17,14,17,17)
-hasLocation(#20288,#20289)
-enclosing_stmt(#20288,#20282)
+exprs(#20288,3,#20285,1,"0")
+hasLocation(#20288,#20152)
+enclosing_stmt(#20288,#20283)
 expr_containers(#20288,#20001)
-#20290=*
-exprs(#20290,78,#20288,0,"n")
-hasLocation(#20290,#20156)
-enclosing_stmt(#20290,#20282)
-expr_containers(#20290,#20001)
-literals("n","n",#20290)
-decl(#20290,#20231)
+literals("0","0",#20288)
+#20289=*
+exprs(#20289,64,#20283,1,"n=10")
+#20290=@"loc,{#10000},17,14,17,17"
+locations_default(#20290,#10000,17,14,17,17)
+hasLocation(#20289,#20290)
+enclosing_stmt(#20289,#20283)
+expr_containers(#20289,#20001)
 #20291=*
-exprs(#20291,3,#20288,1,"10")
-hasLocation(#20291,#20160)
-enclosing_stmt(#20291,#20282)
+exprs(#20291,78,#20289,0,"n")
+hasLocation(#20291,#20156)
+enclosing_stmt(#20291,#20283)
 expr_containers(#20291,#20001)
-literals("10","10",#20291)
+literals("n","n",#20291)
+decl(#20291,#20231)
 #20292=*
-stmts(#20292,0,#20274,3,";")
-hasLocation(#20292,#20178)
-stmt_containers(#20292,#20001)
+exprs(#20292,3,#20289,1,"10")
+hasLocation(#20292,#20160)
+enclosing_stmt(#20292,#20283)
+expr_containers(#20292,#20001)
+literals("10","10",#20292)
 #20293=*
-stmts(#20293,15,#20001,4,"for (var x in xs);")
-hasLocation(#20293,#20039)
+stmts(#20293,0,#20275,3,";")
+hasLocation(#20293,#20178)
 stmt_containers(#20293,#20001)
 #20294=*
-exprs(#20294,79,#20293,1,"xs")
-hasLocation(#20294,#20190)
-enclosing_stmt(#20294,#20293)
-expr_containers(#20294,#20001)
-literals("xs","xs",#20294)
-#20295=@"var;{xs};{#20000}"
-variables(#20295,"xs",#20000)
-bind(#20294,#20295)
-#20296=*
-stmts(#20296,18,#20293,0,"var x")
-#20297=@"loc,{#10000},19,6,19,10"
-locations_default(#20297,#10000,19,6,19,10)
-hasLocation(#20296,#20297)
-stmt_containers(#20296,#20001)
-#20298=*
-exprs(#20298,64,#20296,0,"x")
-hasLocation(#20298,#20186)
-enclosing_stmt(#20298,#20296)
-expr_containers(#20298,#20001)
+stmts(#20294,15,#20001,4,"for (var x in xs);")
+hasLocation(#20294,#20039)
+stmt_containers(#20294,#20001)
+#20295=*
+exprs(#20295,79,#20294,1,"xs")
+hasLocation(#20295,#20190)
+enclosing_stmt(#20295,#20294)
+expr_containers(#20295,#20001)
+literals("xs","xs",#20295)
+#20296=@"var;{xs};{#20000}"
+variables(#20296,"xs",#20000)
+bind(#20295,#20296)
+#20297=*
+stmts(#20297,18,#20294,0,"var x")
+#20298=@"loc,{#10000},19,6,19,10"
+locations_default(#20298,#10000,19,6,19,10)
+hasLocation(#20297,#20298)
+stmt_containers(#20297,#20001)
 #20299=*
-exprs(#20299,78,#20298,0,"x")
+exprs(#20299,64,#20297,0,"x")
 hasLocation(#20299,#20186)
-enclosing_stmt(#20299,#20296)
+enclosing_stmt(#20299,#20297)
 expr_containers(#20299,#20001)
-literals("x","x",#20299)
-decl(#20299,#20232)
 #20300=*
-stmts(#20300,0,#20293,2,";")
-hasLocation(#20300,#20194)
-stmt_containers(#20300,#20001)
+exprs(#20300,78,#20299,0,"x")
+hasLocation(#20300,#20186)
+enclosing_stmt(#20300,#20297)
+expr_containers(#20300,#20001)
+literals("x","x",#20300)
+decl(#20300,#20232)
 #20301=*
-stmts(#20301,15,#20001,5,"for (x in xs);")
-hasLocation(#20301,#20041)
+stmts(#20301,0,#20294,2,";")
+hasLocation(#20301,#20194)
 stmt_containers(#20301,#20001)
 #20302=*
-exprs(#20302,79,#20301,1,"xs")
-hasLocation(#20302,#20204)
-enclosing_stmt(#20302,#20301)
-expr_containers(#20302,#20001)
-literals("xs","xs",#20302)
-bind(#20302,#20295)
+stmts(#20302,15,#20001,5,"for (x in xs);")
+hasLocation(#20302,#20041)
+stmt_containers(#20302,#20001)
 #20303=*
-exprs(#20303,79,#20301,0,"x")
-hasLocation(#20303,#20200)
-enclosing_stmt(#20303,#20301)
+exprs(#20303,79,#20302,1,"xs")
+hasLocation(#20303,#20204)
+enclosing_stmt(#20303,#20302)
 expr_containers(#20303,#20001)
-literals("x","x",#20303)
-bind(#20303,#20232)
+literals("xs","xs",#20303)
+bind(#20303,#20296)
 #20304=*
-stmts(#20304,0,#20301,2,";")
-hasLocation(#20304,#20208)
-stmt_containers(#20304,#20001)
+exprs(#20304,79,#20302,0,"x")
+hasLocation(#20304,#20200)
+enclosing_stmt(#20304,#20302)
+expr_containers(#20304,#20001)
+literals("x","x",#20304)
+bind(#20304,#20232)
 #20305=*
-stmts(#20305,15,#20001,6,"for (x.f in xs);")
-hasLocation(#20305,#20043)
+stmts(#20305,0,#20302,2,";")
+hasLocation(#20305,#20208)
 stmt_containers(#20305,#20001)
 #20306=*
-exprs(#20306,79,#20305,1,"xs")
-hasLocation(#20306,#20222)
-enclosing_stmt(#20306,#20305)
-expr_containers(#20306,#20001)
-literals("xs","xs",#20306)
-bind(#20306,#20295)
+stmts(#20306,15,#20001,6,"for (x.f in xs);")
+hasLocation(#20306,#20043)
+stmt_containers(#20306,#20001)
 #20307=*
-exprs(#20307,14,#20305,0,"x.f")
-#20308=@"loc,{#10000},21,6,21,8"
-locations_default(#20308,#10000,21,6,21,8)
-hasLocation(#20307,#20308)
-enclosing_stmt(#20307,#20305)
+exprs(#20307,79,#20306,1,"xs")
+hasLocation(#20307,#20222)
+enclosing_stmt(#20307,#20306)
 expr_containers(#20307,#20001)
-#20309=*
-exprs(#20309,79,#20307,0,"x")
-hasLocation(#20309,#20214)
-enclosing_stmt(#20309,#20305)
-expr_containers(#20309,#20001)
-literals("x","x",#20309)
-bind(#20309,#20232)
+literals("xs","xs",#20307)
+bind(#20307,#20296)
+#20308=*
+exprs(#20308,14,#20306,0,"x.f")
+#20309=@"loc,{#10000},21,6,21,8"
+locations_default(#20309,#10000,21,6,21,8)
+hasLocation(#20308,#20309)
+enclosing_stmt(#20308,#20306)
+expr_containers(#20308,#20001)
 #20310=*
-exprs(#20310,0,#20307,1,"f")
-hasLocation(#20310,#20218)
-enclosing_stmt(#20310,#20305)
+exprs(#20310,79,#20308,0,"x")
+hasLocation(#20310,#20214)
+enclosing_stmt(#20310,#20306)
 expr_containers(#20310,#20001)
-literals("f","f",#20310)
+literals("x","x",#20310)
+bind(#20310,#20232)
 #20311=*
-stmts(#20311,0,#20305,2,";")
-hasLocation(#20311,#20226)
-stmt_containers(#20311,#20001)
+exprs(#20311,0,#20308,1,"f")
+hasLocation(#20311,#20218)
+enclosing_stmt(#20311,#20306)
+expr_containers(#20311,#20001)
+literals("f","f",#20311)
 #20312=*
-entry_cfg_node(#20312,#20001)
-#20313=@"loc,{#10000},1,1,1,0"
-locations_default(#20313,#10000,1,1,1,0)
-hasLocation(#20312,#20313)
-#20314=*
-exit_cfg_node(#20314,#20001)
-hasLocation(#20314,#20228)
-successor(#20306,#20305)
-successor(#20305,#20309)
-successor(#20305,#20314)
-successor(#20311,#20305)
-successor(#20310,#20307)
-successor(#20309,#20310)
-successor(#20307,#20311)
-successor(#20302,#20301)
-successor(#20301,#20303)
-successor(#20301,#20306)
-successor(#20304,#20301)
-successor(#20303,#20304)
-successor(#20294,#20293)
-successor(#20293,#20296)
-successor(#20293,#20302)
-successor(#20300,#20293)
-successor(#20296,#20299)
-successor(#20299,#20298)
-successor(#20298,#20300)
-successor(#20274,#20282)
-successor(#20282,#20286)
-successor(#20291,#20288)
-successor(#20290,#20291)
-successor(#20288,#20277)
-successor(#20287,#20284)
-successor(#20286,#20287)
-successor(#20284,#20290)
-successor(#20278,#20275)
-successor(#20277,#20278)
+stmts(#20312,0,#20306,2,";")
+hasLocation(#20312,#20226)
+stmt_containers(#20312,#20001)
+#20313=*
+entry_cfg_node(#20313,#20001)
+#20314=@"loc,{#10000},1,1,1,0"
+locations_default(#20314,#10000,1,1,1,0)
+hasLocation(#20313,#20314)
 #20315=*
-guard_node(#20315,1,#20275)
-hasLocation(#20315,#20276)
-successor(#20315,#20292)
+exit_cfg_node(#20315,#20001)
+hasLocation(#20315,#20228)
+successor(#20307,#20306)
+successor(#20306,#20310)
+successor(#20306,#20315)
+successor(#20312,#20306)
+successor(#20311,#20308)
+successor(#20310,#20311)
+successor(#20308,#20312)
+successor(#20303,#20302)
+successor(#20302,#20304)
+successor(#20302,#20307)
+successor(#20305,#20302)
+successor(#20304,#20305)
+successor(#20295,#20294)
+successor(#20294,#20297)
+successor(#20294,#20303)
+successor(#20301,#20294)
+successor(#20297,#20300)
+successor(#20300,#20299)
+successor(#20299,#20301)
+successor(#20275,#20283)
+successor(#20283,#20287)
+successor(#20292,#20289)
+successor(#20291,#20292)
+successor(#20289,#20278)
+successor(#20288,#20285)
+successor(#20287,#20288)
+successor(#20285,#20291)
+successor(#20279,#20276)
+successor(#20278,#20279)
 #20316=*
-guard_node(#20316,0,#20275)
-hasLocation(#20316,#20276)
-successor(#20316,#20294)
-successor(#20275,#20315)
-successor(#20275,#20316)
-successor(#20281,#20279)
-successor(#20279,#20277)
-successor(#20292,#20281)
-successor(#20268,#20271)
-successor(#20273,#20270)
-successor(#20271,#20273)
+guard_node(#20316,1,#20276)
+hasLocation(#20316,#20277)
+successor(#20316,#20293)
 #20317=*
-guard_node(#20317,1,#20270)
-hasLocation(#20317,#20136)
-successor(#20317,#20271)
+guard_node(#20317,0,#20276)
+hasLocation(#20317,#20277)
+successor(#20317,#20295)
+successor(#20276,#20316)
+successor(#20276,#20317)
+successor(#20282,#20280)
+successor(#20280,#20278)
+successor(#20293,#20282)
+successor(#20269,#20272)
+successor(#20274,#20271)
+successor(#20272,#20274)
 #20318=*
-guard_node(#20318,0,#20270)
+guard_node(#20318,1,#20271)
 hasLocation(#20318,#20136)
-successor(#20318,#20274)
-successor(#20270,#20317)
-successor(#20270,#20318)
-successor(#20237,#20240)
-successor(#20240,#20246)
-successor(#20246,#20242)
+successor(#20318,#20272)
 #20319=*
-guard_node(#20319,1,#20242)
-hasLocation(#20319,#20067)
-successor(#20319,#20248)
+guard_node(#20319,0,#20271)
+hasLocation(#20319,#20136)
+successor(#20319,#20275)
+successor(#20271,#20318)
+successor(#20271,#20319)
+successor(#20238,#20241)
+successor(#20241,#20247)
+successor(#20247,#20243)
 #20320=*
-guard_node(#20320,0,#20242)
+guard_node(#20320,1,#20243)
 hasLocation(#20320,#20067)
-successor(#20320,#20268)
-successor(#20242,#20319)
-successor(#20242,#20320)
-successor(#20244,#20242)
-successor(#20250,#20252)
-successor(#20252,#20254)
+successor(#20320,#20249)
 #20321=*
-guard_node(#20321,1,#20254)
-hasLocation(#20321,#20091)
-successor(#20321,#20256)
+guard_node(#20321,0,#20243)
+hasLocation(#20321,#20067)
+successor(#20321,#20269)
+successor(#20243,#20320)
+successor(#20243,#20321)
+successor(#20245,#20243)
+successor(#20251,#20253)
+successor(#20253,#20255)
 #20322=*
-guard_node(#20322,0,#20254)
+guard_node(#20322,1,#20255)
 hasLocation(#20322,#20091)
-successor(#20322,#20259)
-successor(#20254,#20321)
-successor(#20254,#20322)
-successor(#20256,#20244)
-successor(#20259,#20261)
+successor(#20322,#20257)
 #20323=*
-guard_node(#20323,1,#20261)
-hasLocation(#20323,#20107)
-successor(#20323,#20263)
+guard_node(#20323,0,#20255)
+hasLocation(#20323,#20091)
+successor(#20323,#20260)
+successor(#20255,#20322)
+successor(#20255,#20323)
+successor(#20257,#20245)
+successor(#20260,#20262)
 #20324=*
-guard_node(#20324,0,#20261)
+guard_node(#20324,1,#20262)
 hasLocation(#20324,#20107)
-successor(#20324,#20266)
-successor(#20261,#20323)
-successor(#20261,#20324)
-successor(#20263,#20268)
-successor(#20266,#20252)
-successor(#20248,#20250)
-successor(#20233,#20235)
-successor(#20236,#20235)
-successor(#20235,#20236)
-successor(#20312,#20233)
+successor(#20324,#20264)
+#20325=*
+guard_node(#20325,0,#20262)
+hasLocation(#20325,#20107)
+successor(#20325,#20267)
+successor(#20262,#20324)
+successor(#20262,#20325)
+successor(#20264,#20269)
+successor(#20267,#20253)
+successor(#20249,#20251)
+successor(#20234,#20236)
+successor(#20237,#20236)
+successor(#20236,#20237)
+successor(#20313,#20234)
 numlines(#10000,21,18,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/stmts/output/trap/others.js.trap b/javascript/extractor/tests/stmts/output/trap/others.js.trap
index cbb132ca1b2..a8547d0e56d 100644
--- a/javascript/extractor/tests/stmts/output/trap/others.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/others.js.trap
@@ -119,85 +119,87 @@ hasLocation(#20001,#20041)
 variables(#20042,"x",#20000)
 #20043=@"var;{y};{#20000}"
 variables(#20043,"y",#20000)
-#20044=*
-stmts(#20044,7,#20001,0,"with(a) {\n}")
-#20045=@"loc,{#10000},1,1,2,1"
-locations_default(#20045,#10000,1,1,2,1)
-hasLocation(#20044,#20045)
-stmt_containers(#20044,#20001)
-#20046=*
-exprs(#20046,79,#20044,0,"a")
-hasLocation(#20046,#20015)
-enclosing_stmt(#20046,#20044)
-expr_containers(#20046,#20001)
-literals("a","a",#20046)
-#20047=@"var;{a};{#20000}"
-variables(#20047,"a",#20000)
-bind(#20046,#20047)
-#20048=*
-stmts(#20048,1,#20044,1,"{\n}")
-#20049=@"loc,{#10000},1,9,2,1"
-locations_default(#20049,#10000,1,9,2,1)
-hasLocation(#20048,#20049)
-stmt_containers(#20048,#20001)
-#20050=*
-stmts(#20050,16,#20001,1,"debugger;")
-hasLocation(#20050,#20007)
-stmt_containers(#20050,#20001)
+#20044=@"var;{this};{#20000}"
+variables(#20044,"this",#20000)
+#20045=*
+stmts(#20045,7,#20001,0,"with(a) {\n}")
+#20046=@"loc,{#10000},1,1,2,1"
+locations_default(#20046,#10000,1,1,2,1)
+hasLocation(#20045,#20046)
+stmt_containers(#20045,#20001)
+#20047=*
+exprs(#20047,79,#20045,0,"a")
+hasLocation(#20047,#20015)
+enclosing_stmt(#20047,#20045)
+expr_containers(#20047,#20001)
+literals("a","a",#20047)
+#20048=@"var;{a};{#20000}"
+variables(#20048,"a",#20000)
+bind(#20047,#20048)
+#20049=*
+stmts(#20049,1,#20045,1,"{\n}")
+#20050=@"loc,{#10000},1,9,2,1"
+locations_default(#20050,#10000,1,9,2,1)
+hasLocation(#20049,#20050)
+stmt_containers(#20049,#20001)
 #20051=*
-stmts(#20051,18,#20001,2,"var x = 23, y;")
-hasLocation(#20051,#20009)
+stmts(#20051,16,#20001,1,"debugger;")
+hasLocation(#20051,#20007)
 stmt_containers(#20051,#20001)
 #20052=*
-exprs(#20052,64,#20051,0,"x = 23")
-#20053=@"loc,{#10000},4,5,4,10"
-locations_default(#20053,#10000,4,5,4,10)
-hasLocation(#20052,#20053)
-enclosing_stmt(#20052,#20051)
-expr_containers(#20052,#20001)
-#20054=*
-exprs(#20054,78,#20052,0,"x")
-hasLocation(#20054,#20028)
-enclosing_stmt(#20054,#20051)
-expr_containers(#20054,#20001)
-literals("x","x",#20054)
-decl(#20054,#20042)
+stmts(#20052,18,#20001,2,"var x = 23, y;")
+hasLocation(#20052,#20009)
+stmt_containers(#20052,#20001)
+#20053=*
+exprs(#20053,64,#20052,0,"x = 23")
+#20054=@"loc,{#10000},4,5,4,10"
+locations_default(#20054,#10000,4,5,4,10)
+hasLocation(#20053,#20054)
+enclosing_stmt(#20053,#20052)
+expr_containers(#20053,#20001)
 #20055=*
-exprs(#20055,3,#20052,1,"23")
-hasLocation(#20055,#20032)
-enclosing_stmt(#20055,#20051)
+exprs(#20055,78,#20053,0,"x")
+hasLocation(#20055,#20028)
+enclosing_stmt(#20055,#20052)
 expr_containers(#20055,#20001)
-literals("23","23",#20055)
+literals("x","x",#20055)
+decl(#20055,#20042)
 #20056=*
-exprs(#20056,64,#20051,1,"y")
-hasLocation(#20056,#20036)
-enclosing_stmt(#20056,#20051)
+exprs(#20056,3,#20053,1,"23")
+hasLocation(#20056,#20032)
+enclosing_stmt(#20056,#20052)
 expr_containers(#20056,#20001)
+literals("23","23",#20056)
 #20057=*
-exprs(#20057,78,#20056,0,"y")
+exprs(#20057,64,#20052,1,"y")
 hasLocation(#20057,#20036)
-enclosing_stmt(#20057,#20051)
+enclosing_stmt(#20057,#20052)
 expr_containers(#20057,#20001)
-literals("y","y",#20057)
-decl(#20057,#20043)
 #20058=*
-entry_cfg_node(#20058,#20001)
-#20059=@"loc,{#10000},1,1,1,0"
-locations_default(#20059,#10000,1,1,1,0)
-hasLocation(#20058,#20059)
-#20060=*
-exit_cfg_node(#20060,#20001)
-hasLocation(#20060,#20040)
-successor(#20051,#20054)
-successor(#20057,#20056)
-successor(#20056,#20060)
-successor(#20055,#20052)
-successor(#20054,#20055)
-successor(#20052,#20057)
-successor(#20050,#20051)
-successor(#20044,#20046)
-successor(#20048,#20050)
-successor(#20046,#20048)
-successor(#20058,#20044)
+exprs(#20058,78,#20057,0,"y")
+hasLocation(#20058,#20036)
+enclosing_stmt(#20058,#20052)
+expr_containers(#20058,#20001)
+literals("y","y",#20058)
+decl(#20058,#20043)
+#20059=*
+entry_cfg_node(#20059,#20001)
+#20060=@"loc,{#10000},1,1,1,0"
+locations_default(#20060,#10000,1,1,1,0)
+hasLocation(#20059,#20060)
+#20061=*
+exit_cfg_node(#20061,#20001)
+hasLocation(#20061,#20040)
+successor(#20052,#20055)
+successor(#20058,#20057)
+successor(#20057,#20061)
+successor(#20056,#20053)
+successor(#20055,#20056)
+successor(#20053,#20058)
+successor(#20051,#20052)
+successor(#20045,#20047)
+successor(#20049,#20051)
+successor(#20047,#20049)
+successor(#20059,#20045)
 numlines(#10000,4,4,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/stmts/output/trap/switch.js.trap b/javascript/extractor/tests/stmts/output/trap/switch.js.trap
index ab4566ccb98..fc6154d35ff 100644
--- a/javascript/extractor/tests/stmts/output/trap/switch.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/switch.js.trap
@@ -359,224 +359,228 @@ locations_default(#20128,#10000,1,1,18,0)
 hasLocation(#20001,#20128)
 #20129=@"var;{f};{#20000}"
 variables(#20129,"f",#20000)
-#20130=*
-stmts(#20130,8,#20001,0,"switch  ... = 19;\n}")
-#20131=@"loc,{#10000},1,1,6,1"
-locations_default(#20131,#10000,1,1,6,1)
-hasLocation(#20130,#20131)
-stmt_containers(#20130,#20001)
-#20132=*
-exprs(#20132,79,#20130,-1,"x")
-hasLocation(#20132,#20041)
-enclosing_stmt(#20132,#20130)
-expr_containers(#20132,#20001)
-literals("x","x",#20132)
-#20133=@"var;{x};{#20000}"
-variables(#20133,"x",#20000)
-bind(#20132,#20133)
-#20134=*
-stmts(#20134,19,#20130,0,"default:\n    break;")
-#20135=@"loc,{#10000},2,1,3,10"
-locations_default(#20135,#10000,2,1,3,10)
-hasLocation(#20134,#20135)
-stmt_containers(#20134,#20001)
-#20136=*
-stmts(#20136,5,#20134,0,"break;")
-#20137=@"loc,{#10000},3,5,3,10"
-locations_default(#20137,#10000,3,5,3,10)
-hasLocation(#20136,#20137)
-stmt_containers(#20136,#20001)
-jump_targets(#20136,#20130)
-#20138=*
-stmts(#20138,19,#20130,1,"case 23 ...  += 19;")
-#20139=@"loc,{#10000},4,1,5,12"
-locations_default(#20139,#10000,4,1,5,12)
-hasLocation(#20138,#20139)
-stmt_containers(#20138,#20001)
-#20140=*
-exprs(#20140,3,#20138,-1,"23")
-hasLocation(#20140,#20057)
-enclosing_stmt(#20140,#20138)
-expr_containers(#20140,#20001)
-literals("23","23",#20140)
+#20130=@"var;{this};{#20000}"
+variables(#20130,"this",#20000)
+#20131=*
+stmts(#20131,8,#20001,0,"switch  ... = 19;\n}")
+#20132=@"loc,{#10000},1,1,6,1"
+locations_default(#20132,#10000,1,1,6,1)
+hasLocation(#20131,#20132)
+stmt_containers(#20131,#20001)
+#20133=*
+exprs(#20133,79,#20131,-1,"x")
+hasLocation(#20133,#20041)
+enclosing_stmt(#20133,#20131)
+expr_containers(#20133,#20001)
+literals("x","x",#20133)
+#20134=@"var;{x};{#20000}"
+variables(#20134,"x",#20000)
+bind(#20133,#20134)
+#20135=*
+stmts(#20135,19,#20131,0,"default:\n    break;")
+#20136=@"loc,{#10000},2,1,3,10"
+locations_default(#20136,#10000,2,1,3,10)
+hasLocation(#20135,#20136)
+stmt_containers(#20135,#20001)
+#20137=*
+stmts(#20137,5,#20135,0,"break;")
+#20138=@"loc,{#10000},3,5,3,10"
+locations_default(#20138,#10000,3,5,3,10)
+hasLocation(#20137,#20138)
+stmt_containers(#20137,#20001)
+jump_targets(#20137,#20131)
+#20139=*
+stmts(#20139,19,#20131,1,"case 23 ...  += 19;")
+#20140=@"loc,{#10000},4,1,5,12"
+locations_default(#20140,#10000,4,1,5,12)
+hasLocation(#20139,#20140)
+stmt_containers(#20139,#20001)
 #20141=*
-stmts(#20141,2,#20138,0,"x += 19;")
-#20142=@"loc,{#10000},5,5,5,12"
-locations_default(#20142,#10000,5,5,5,12)
-hasLocation(#20141,#20142)
-stmt_containers(#20141,#20001)
-#20143=*
-exprs(#20143,48,#20141,0,"x += 19")
-#20144=@"loc,{#10000},5,5,5,11"
-locations_default(#20144,#10000,5,5,5,11)
-hasLocation(#20143,#20144)
-enclosing_stmt(#20143,#20141)
-expr_containers(#20143,#20001)
-#20145=*
-exprs(#20145,79,#20143,0,"x")
-hasLocation(#20145,#20061)
-enclosing_stmt(#20145,#20141)
-expr_containers(#20145,#20001)
-literals("x","x",#20145)
-bind(#20145,#20133)
+exprs(#20141,3,#20139,-1,"23")
+hasLocation(#20141,#20057)
+enclosing_stmt(#20141,#20139)
+expr_containers(#20141,#20001)
+literals("23","23",#20141)
+#20142=*
+stmts(#20142,2,#20139,0,"x += 19;")
+#20143=@"loc,{#10000},5,5,5,12"
+locations_default(#20143,#10000,5,5,5,12)
+hasLocation(#20142,#20143)
+stmt_containers(#20142,#20001)
+#20144=*
+exprs(#20144,48,#20142,0,"x += 19")
+#20145=@"loc,{#10000},5,5,5,11"
+locations_default(#20145,#10000,5,5,5,11)
+hasLocation(#20144,#20145)
+enclosing_stmt(#20144,#20142)
+expr_containers(#20144,#20001)
 #20146=*
-exprs(#20146,3,#20143,1,"19")
-hasLocation(#20146,#20065)
-enclosing_stmt(#20146,#20141)
+exprs(#20146,79,#20144,0,"x")
+hasLocation(#20146,#20061)
+enclosing_stmt(#20146,#20142)
 expr_containers(#20146,#20001)
-literals("19","19",#20146)
+literals("x","x",#20146)
+bind(#20146,#20134)
 #20147=*
-stmts(#20147,17,#20001,1,"functio ...     }\n}")
-#20148=@"loc,{#10000},8,1,17,1"
-locations_default(#20148,#10000,8,1,17,1)
-hasLocation(#20147,#20148)
-stmt_containers(#20147,#20001)
-#20149=*
-exprs(#20149,78,#20147,-1,"f")
-hasLocation(#20149,#20072)
-expr_containers(#20149,#20147)
-literals("f","f",#20149)
-decl(#20149,#20129)
+exprs(#20147,3,#20144,1,"19")
+hasLocation(#20147,#20065)
+enclosing_stmt(#20147,#20142)
+expr_containers(#20147,#20001)
+literals("19","19",#20147)
+#20148=*
+stmts(#20148,17,#20001,1,"functio ...     }\n}")
+#20149=@"loc,{#10000},8,1,17,1"
+locations_default(#20149,#10000,8,1,17,1)
+hasLocation(#20148,#20149)
+stmt_containers(#20148,#20001)
 #20150=*
-scopes(#20150,1)
-scopenodes(#20147,#20150)
-scopenesting(#20150,#20000)
-#20151=@"var;{arguments};{#20150}"
-variables(#20151,"arguments",#20150)
-is_arguments_object(#20151)
-#20152=*
-stmts(#20152,1,#20147,-2,"{\n    s ...     }\n}")
-#20153=@"loc,{#10000},8,14,17,1"
-locations_default(#20153,#10000,8,14,17,1)
-hasLocation(#20152,#20153)
-stmt_containers(#20152,#20147)
+exprs(#20150,78,#20148,-1,"f")
+hasLocation(#20150,#20072)
+expr_containers(#20150,#20148)
+literals("f","f",#20150)
+decl(#20150,#20129)
+#20151=*
+scopes(#20151,1)
+scopenodes(#20148,#20151)
+scopenesting(#20151,#20000)
+#20152=@"var;{this};{#20151}"
+variables(#20152,"this",#20151)
+#20153=@"var;{arguments};{#20151}"
+variables(#20153,"arguments",#20151)
+is_arguments_object(#20153)
 #20154=*
-stmts(#20154,8,#20152,0,"switch( ... ;\n    }")
-#20155=@"loc,{#10000},9,5,16,5"
-locations_default(#20155,#10000,9,5,16,5)
+stmts(#20154,1,#20148,-2,"{\n    s ...     }\n}")
+#20155=@"loc,{#10000},8,14,17,1"
+locations_default(#20155,#10000,8,14,17,1)
 hasLocation(#20154,#20155)
-stmt_containers(#20154,#20147)
+stmt_containers(#20154,#20148)
 #20156=*
-exprs(#20156,79,#20154,-1,"x")
-hasLocation(#20156,#20084)
-enclosing_stmt(#20156,#20154)
-expr_containers(#20156,#20147)
-literals("x","x",#20156)
-bind(#20156,#20133)
-#20157=*
-stmts(#20157,19,#20154,0,"case 0: ... urn 23;")
-#20158=@"loc,{#10000},10,5,11,18"
-locations_default(#20158,#10000,10,5,11,18)
-hasLocation(#20157,#20158)
-stmt_containers(#20157,#20147)
+stmts(#20156,8,#20154,0,"switch( ... ;\n    }")
+#20157=@"loc,{#10000},9,5,16,5"
+locations_default(#20157,#10000,9,5,16,5)
+hasLocation(#20156,#20157)
+stmt_containers(#20156,#20148)
+#20158=*
+exprs(#20158,79,#20156,-1,"x")
+hasLocation(#20158,#20084)
+enclosing_stmt(#20158,#20156)
+expr_containers(#20158,#20148)
+literals("x","x",#20158)
+bind(#20158,#20134)
 #20159=*
-exprs(#20159,3,#20157,-1,"0")
-hasLocation(#20159,#20092)
-enclosing_stmt(#20159,#20157)
-expr_containers(#20159,#20147)
-literals("0","0",#20159)
-#20160=*
-stmts(#20160,9,#20157,0,"return 23;")
-#20161=@"loc,{#10000},11,9,11,18"
-locations_default(#20161,#10000,11,9,11,18)
-hasLocation(#20160,#20161)
-stmt_containers(#20160,#20147)
+stmts(#20159,19,#20156,0,"case 0: ... urn 23;")
+#20160=@"loc,{#10000},10,5,11,18"
+locations_default(#20160,#10000,10,5,11,18)
+hasLocation(#20159,#20160)
+stmt_containers(#20159,#20148)
+#20161=*
+exprs(#20161,3,#20159,-1,"0")
+hasLocation(#20161,#20092)
+enclosing_stmt(#20161,#20159)
+expr_containers(#20161,#20148)
+literals("0","0",#20161)
 #20162=*
-exprs(#20162,3,#20160,0,"23")
-hasLocation(#20162,#20098)
-enclosing_stmt(#20162,#20160)
-expr_containers(#20162,#20147)
-literals("23","23",#20162)
-#20163=*
-stmts(#20163,19,#20154,1,"default ... urn 42;")
-#20164=@"loc,{#10000},12,5,13,18"
-locations_default(#20164,#10000,12,5,13,18)
-hasLocation(#20163,#20164)
-stmt_containers(#20163,#20147)
+stmts(#20162,9,#20159,0,"return 23;")
+#20163=@"loc,{#10000},11,9,11,18"
+locations_default(#20163,#10000,11,9,11,18)
+hasLocation(#20162,#20163)
+stmt_containers(#20162,#20148)
+#20164=*
+exprs(#20164,3,#20162,0,"23")
+hasLocation(#20164,#20098)
+enclosing_stmt(#20164,#20162)
+expr_containers(#20164,#20148)
+literals("23","23",#20164)
 #20165=*
-stmts(#20165,9,#20163,0,"return 42;")
-#20166=@"loc,{#10000},13,9,13,18"
-locations_default(#20166,#10000,13,9,13,18)
+stmts(#20165,19,#20156,1,"default ... urn 42;")
+#20166=@"loc,{#10000},12,5,13,18"
+locations_default(#20166,#10000,12,5,13,18)
 hasLocation(#20165,#20166)
-stmt_containers(#20165,#20147)
+stmt_containers(#20165,#20148)
 #20167=*
-exprs(#20167,3,#20165,0,"42")
-hasLocation(#20167,#20108)
-enclosing_stmt(#20167,#20165)
-expr_containers(#20167,#20147)
-literals("42","42",#20167)
-#20168=*
-stmts(#20168,19,#20154,2,"case 1: ... urn 56;")
-#20169=@"loc,{#10000},14,5,15,18"
-locations_default(#20169,#10000,14,5,15,18)
-hasLocation(#20168,#20169)
-stmt_containers(#20168,#20147)
+stmts(#20167,9,#20165,0,"return 42;")
+#20168=@"loc,{#10000},13,9,13,18"
+locations_default(#20168,#10000,13,9,13,18)
+hasLocation(#20167,#20168)
+stmt_containers(#20167,#20148)
+#20169=*
+exprs(#20169,3,#20167,0,"42")
+hasLocation(#20169,#20108)
+enclosing_stmt(#20169,#20167)
+expr_containers(#20169,#20148)
+literals("42","42",#20169)
 #20170=*
-exprs(#20170,3,#20168,-1,"1")
-hasLocation(#20170,#20114)
-enclosing_stmt(#20170,#20168)
-expr_containers(#20170,#20147)
-literals("1","1",#20170)
-#20171=*
-stmts(#20171,9,#20168,0,"return 56;")
-#20172=@"loc,{#10000},15,9,15,18"
-locations_default(#20172,#10000,15,9,15,18)
-hasLocation(#20171,#20172)
-stmt_containers(#20171,#20147)
+stmts(#20170,19,#20156,2,"case 1: ... urn 56;")
+#20171=@"loc,{#10000},14,5,15,18"
+locations_default(#20171,#10000,14,5,15,18)
+hasLocation(#20170,#20171)
+stmt_containers(#20170,#20148)
+#20172=*
+exprs(#20172,3,#20170,-1,"1")
+hasLocation(#20172,#20114)
+enclosing_stmt(#20172,#20170)
+expr_containers(#20172,#20148)
+literals("1","1",#20172)
 #20173=*
-exprs(#20173,3,#20171,0,"56")
-hasLocation(#20173,#20120)
-enclosing_stmt(#20173,#20171)
-expr_containers(#20173,#20147)
-literals("56","56",#20173)
-#20174=*
-entry_cfg_node(#20174,#20001)
-#20175=@"loc,{#10000},1,1,1,0"
-locations_default(#20175,#10000,1,1,1,0)
-hasLocation(#20174,#20175)
+stmts(#20173,9,#20170,0,"return 56;")
+#20174=@"loc,{#10000},15,9,15,18"
+locations_default(#20174,#10000,15,9,15,18)
+hasLocation(#20173,#20174)
+stmt_containers(#20173,#20148)
+#20175=*
+exprs(#20175,3,#20173,0,"56")
+hasLocation(#20175,#20120)
+enclosing_stmt(#20175,#20173)
+expr_containers(#20175,#20148)
+literals("56","56",#20175)
 #20176=*
-exit_cfg_node(#20176,#20001)
-hasLocation(#20176,#20127)
-successor(#20147,#20176)
-#20177=*
-entry_cfg_node(#20177,#20147)
-#20178=@"loc,{#10000},8,1,8,0"
-locations_default(#20178,#10000,8,1,8,0)
-hasLocation(#20177,#20178)
+entry_cfg_node(#20176,#20001)
+#20177=@"loc,{#10000},1,1,1,0"
+locations_default(#20177,#10000,1,1,1,0)
+hasLocation(#20176,#20177)
+#20178=*
+exit_cfg_node(#20178,#20001)
+hasLocation(#20178,#20127)
+successor(#20148,#20178)
 #20179=*
-exit_cfg_node(#20179,#20147)
-#20180=@"loc,{#10000},17,2,17,1"
-locations_default(#20180,#10000,17,2,17,1)
+entry_cfg_node(#20179,#20148)
+#20180=@"loc,{#10000},8,1,8,0"
+locations_default(#20180,#10000,8,1,8,0)
 hasLocation(#20179,#20180)
+#20181=*
+exit_cfg_node(#20181,#20148)
+#20182=@"loc,{#10000},17,2,17,1"
+locations_default(#20182,#10000,17,2,17,1)
+hasLocation(#20181,#20182)
+successor(#20156,#20158)
+successor(#20158,#20159)
+successor(#20170,#20172)
+successor(#20172,#20175)
+successor(#20172,#20165)
+successor(#20175,#20173)
+successor(#20173,#20181)
+successor(#20165,#20169)
+successor(#20169,#20167)
+successor(#20167,#20181)
+successor(#20159,#20161)
+successor(#20161,#20164)
+successor(#20161,#20170)
+successor(#20164,#20162)
+successor(#20162,#20181)
 successor(#20154,#20156)
-successor(#20156,#20157)
-successor(#20168,#20170)
-successor(#20170,#20173)
-successor(#20170,#20163)
-successor(#20173,#20171)
-successor(#20171,#20179)
-successor(#20163,#20167)
-successor(#20167,#20165)
-successor(#20165,#20179)
-successor(#20157,#20159)
-successor(#20159,#20162)
-successor(#20159,#20168)
-successor(#20162,#20160)
-successor(#20160,#20179)
-successor(#20152,#20154)
-successor(#20177,#20152)
-successor(#20130,#20132)
-successor(#20132,#20138)
-successor(#20138,#20140)
-successor(#20140,#20141)
-successor(#20140,#20134)
-successor(#20141,#20145)
-successor(#20146,#20143)
-successor(#20145,#20146)
-successor(#20143,#20147)
-successor(#20134,#20136)
-successor(#20136,#20147)
-successor(#20149,#20130)
-successor(#20174,#20149)
+successor(#20179,#20154)
+successor(#20131,#20133)
+successor(#20133,#20139)
+successor(#20139,#20141)
+successor(#20141,#20142)
+successor(#20141,#20135)
+successor(#20142,#20146)
+successor(#20147,#20144)
+successor(#20146,#20147)
+successor(#20144,#20148)
+successor(#20135,#20137)
+successor(#20137,#20148)
+successor(#20150,#20131)
+successor(#20176,#20150)
 numlines(#10000,17,16,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/stmts/output/trap/switch2.js.trap b/javascript/extractor/tests/stmts/output/trap/switch2.js.trap
index d753eebe3a9..c69155833e4 100644
--- a/javascript/extractor/tests/stmts/output/trap/switch2.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/switch2.js.trap
@@ -210,133 +210,137 @@ locations_default(#20073,#10000,1,1,10,0)
 hasLocation(#20001,#20073)
 #20074=@"var;{f};{#20000}"
 variables(#20074,"f",#20000)
-#20075=*
-stmts(#20075,17,#20001,0,"functio ...     }\n}")
-#20076=@"loc,{#10000},1,1,9,1"
-locations_default(#20076,#10000,1,1,9,1)
-hasLocation(#20075,#20076)
-stmt_containers(#20075,#20001)
-#20077=*
-exprs(#20077,78,#20075,-1,"f")
-hasLocation(#20077,#20023)
-expr_containers(#20077,#20075)
-literals("f","f",#20077)
-decl(#20077,#20074)
+#20075=@"var;{this};{#20000}"
+variables(#20075,"this",#20000)
+#20076=*
+stmts(#20076,17,#20001,0,"functio ...     }\n}")
+#20077=@"loc,{#10000},1,1,9,1"
+locations_default(#20077,#10000,1,1,9,1)
+hasLocation(#20076,#20077)
+stmt_containers(#20076,#20001)
 #20078=*
-scopes(#20078,1)
-scopenodes(#20075,#20078)
-scopenesting(#20078,#20000)
-#20079=@"var;{arguments};{#20078}"
-variables(#20079,"arguments",#20078)
-is_arguments_object(#20079)
-#20080=*
-stmts(#20080,1,#20075,-2,"{\n    s ...     }\n}")
-#20081=@"loc,{#10000},1,14,9,1"
-locations_default(#20081,#10000,1,14,9,1)
-hasLocation(#20080,#20081)
-stmt_containers(#20080,#20075)
+exprs(#20078,78,#20076,-1,"f")
+hasLocation(#20078,#20023)
+expr_containers(#20078,#20076)
+literals("f","f",#20078)
+decl(#20078,#20074)
+#20079=*
+scopes(#20079,1)
+scopenodes(#20076,#20079)
+scopenesting(#20079,#20000)
+#20080=@"var;{this};{#20079}"
+variables(#20080,"this",#20079)
+#20081=@"var;{arguments};{#20079}"
+variables(#20081,"arguments",#20079)
+is_arguments_object(#20081)
 #20082=*
-stmts(#20082,8,#20080,0,"switch( ... ;\n    }")
-#20083=@"loc,{#10000},2,5,8,5"
-locations_default(#20083,#10000,2,5,8,5)
+stmts(#20082,1,#20076,-2,"{\n    s ...     }\n}")
+#20083=@"loc,{#10000},1,14,9,1"
+locations_default(#20083,#10000,1,14,9,1)
 hasLocation(#20082,#20083)
-stmt_containers(#20082,#20075)
+stmt_containers(#20082,#20076)
 #20084=*
-exprs(#20084,79,#20082,-1,"x")
-hasLocation(#20084,#20035)
-enclosing_stmt(#20084,#20082)
-expr_containers(#20084,#20075)
-literals("x","x",#20084)
-#20085=@"var;{x};{#20000}"
-variables(#20085,"x",#20000)
-bind(#20084,#20085)
+stmts(#20084,8,#20082,0,"switch( ... ;\n    }")
+#20085=@"loc,{#10000},2,5,8,5"
+locations_default(#20085,#10000,2,5,8,5)
+hasLocation(#20084,#20085)
+stmt_containers(#20084,#20076)
 #20086=*
-stmts(#20086,19,#20082,0,"case 0:")
-#20087=@"loc,{#10000},3,5,3,11"
-locations_default(#20087,#10000,3,5,3,11)
-hasLocation(#20086,#20087)
-stmt_containers(#20086,#20075)
+exprs(#20086,79,#20084,-1,"x")
+hasLocation(#20086,#20035)
+enclosing_stmt(#20086,#20084)
+expr_containers(#20086,#20076)
+literals("x","x",#20086)
+#20087=@"var;{x};{#20000}"
+variables(#20087,"x",#20000)
+bind(#20086,#20087)
 #20088=*
-exprs(#20088,3,#20086,-1,"0")
-hasLocation(#20088,#20043)
-enclosing_stmt(#20088,#20086)
-expr_containers(#20088,#20075)
-literals("0","0",#20088)
-#20089=*
-stmts(#20089,19,#20082,1,"default ... urn 42;")
-#20090=@"loc,{#10000},4,5,5,18"
-locations_default(#20090,#10000,4,5,5,18)
-hasLocation(#20089,#20090)
-stmt_containers(#20089,#20075)
+stmts(#20088,19,#20084,0,"case 0:")
+#20089=@"loc,{#10000},3,5,3,11"
+locations_default(#20089,#10000,3,5,3,11)
+hasLocation(#20088,#20089)
+stmt_containers(#20088,#20076)
+#20090=*
+exprs(#20090,3,#20088,-1,"0")
+hasLocation(#20090,#20043)
+enclosing_stmt(#20090,#20088)
+expr_containers(#20090,#20076)
+literals("0","0",#20090)
 #20091=*
-stmts(#20091,9,#20089,0,"return 42;")
-#20092=@"loc,{#10000},5,9,5,18"
-locations_default(#20092,#10000,5,9,5,18)
+stmts(#20091,19,#20084,1,"default ... urn 42;")
+#20092=@"loc,{#10000},4,5,5,18"
+locations_default(#20092,#10000,4,5,5,18)
 hasLocation(#20091,#20092)
-stmt_containers(#20091,#20075)
+stmt_containers(#20091,#20076)
 #20093=*
-exprs(#20093,3,#20091,0,"42")
-hasLocation(#20093,#20053)
-enclosing_stmt(#20093,#20091)
-expr_containers(#20093,#20075)
-literals("42","42",#20093)
-#20094=*
-stmts(#20094,19,#20082,2,"case 1: ... urn 56;")
-#20095=@"loc,{#10000},6,5,7,18"
-locations_default(#20095,#10000,6,5,7,18)
-hasLocation(#20094,#20095)
-stmt_containers(#20094,#20075)
+stmts(#20093,9,#20091,0,"return 42;")
+#20094=@"loc,{#10000},5,9,5,18"
+locations_default(#20094,#10000,5,9,5,18)
+hasLocation(#20093,#20094)
+stmt_containers(#20093,#20076)
+#20095=*
+exprs(#20095,3,#20093,0,"42")
+hasLocation(#20095,#20053)
+enclosing_stmt(#20095,#20093)
+expr_containers(#20095,#20076)
+literals("42","42",#20095)
 #20096=*
-exprs(#20096,3,#20094,-1,"1")
-hasLocation(#20096,#20059)
-enclosing_stmt(#20096,#20094)
-expr_containers(#20096,#20075)
-literals("1","1",#20096)
-#20097=*
-stmts(#20097,9,#20094,0,"return 56;")
-#20098=@"loc,{#10000},7,9,7,18"
-locations_default(#20098,#10000,7,9,7,18)
-hasLocation(#20097,#20098)
-stmt_containers(#20097,#20075)
+stmts(#20096,19,#20084,2,"case 1: ... urn 56;")
+#20097=@"loc,{#10000},6,5,7,18"
+locations_default(#20097,#10000,6,5,7,18)
+hasLocation(#20096,#20097)
+stmt_containers(#20096,#20076)
+#20098=*
+exprs(#20098,3,#20096,-1,"1")
+hasLocation(#20098,#20059)
+enclosing_stmt(#20098,#20096)
+expr_containers(#20098,#20076)
+literals("1","1",#20098)
 #20099=*
-exprs(#20099,3,#20097,0,"56")
-hasLocation(#20099,#20065)
-enclosing_stmt(#20099,#20097)
-expr_containers(#20099,#20075)
-literals("56","56",#20099)
-#20100=*
-entry_cfg_node(#20100,#20001)
-#20101=@"loc,{#10000},1,1,1,0"
-locations_default(#20101,#10000,1,1,1,0)
-hasLocation(#20100,#20101)
+stmts(#20099,9,#20096,0,"return 56;")
+#20100=@"loc,{#10000},7,9,7,18"
+locations_default(#20100,#10000,7,9,7,18)
+hasLocation(#20099,#20100)
+stmt_containers(#20099,#20076)
+#20101=*
+exprs(#20101,3,#20099,0,"56")
+hasLocation(#20101,#20065)
+enclosing_stmt(#20101,#20099)
+expr_containers(#20101,#20076)
+literals("56","56",#20101)
 #20102=*
-exit_cfg_node(#20102,#20001)
-hasLocation(#20102,#20072)
-successor(#20075,#20102)
-#20103=*
-entry_cfg_node(#20103,#20075)
-hasLocation(#20103,#20101)
+entry_cfg_node(#20102,#20001)
+#20103=@"loc,{#10000},1,1,1,0"
+locations_default(#20103,#10000,1,1,1,0)
+hasLocation(#20102,#20103)
 #20104=*
-exit_cfg_node(#20104,#20075)
-#20105=@"loc,{#10000},9,2,9,1"
-locations_default(#20105,#10000,9,2,9,1)
-hasLocation(#20104,#20105)
-successor(#20082,#20084)
+exit_cfg_node(#20104,#20001)
+hasLocation(#20104,#20072)
+successor(#20076,#20104)
+#20105=*
+entry_cfg_node(#20105,#20076)
+hasLocation(#20105,#20103)
+#20106=*
+exit_cfg_node(#20106,#20076)
+#20107=@"loc,{#10000},9,2,9,1"
+locations_default(#20107,#10000,9,2,9,1)
+hasLocation(#20106,#20107)
 successor(#20084,#20086)
-successor(#20094,#20096)
-successor(#20096,#20099)
-successor(#20096,#20089)
-successor(#20099,#20097)
-successor(#20097,#20104)
-successor(#20089,#20093)
-successor(#20093,#20091)
-successor(#20091,#20104)
 successor(#20086,#20088)
-successor(#20088,#20089)
-successor(#20088,#20094)
-successor(#20080,#20082)
-successor(#20103,#20080)
-successor(#20077,#20075)
-successor(#20100,#20077)
+successor(#20096,#20098)
+successor(#20098,#20101)
+successor(#20098,#20091)
+successor(#20101,#20099)
+successor(#20099,#20106)
+successor(#20091,#20095)
+successor(#20095,#20093)
+successor(#20093,#20106)
+successor(#20088,#20090)
+successor(#20090,#20091)
+successor(#20090,#20096)
+successor(#20082,#20084)
+successor(#20105,#20082)
+successor(#20078,#20076)
+successor(#20102,#20078)
 numlines(#10000,9,9,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/stmts/output/trap/trivial-switch.js.trap b/javascript/extractor/tests/stmts/output/trap/trivial-switch.js.trap
index 5eda7dbc53d..c89cc19dec9 100644
--- a/javascript/extractor/tests/stmts/output/trap/trivial-switch.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/trivial-switch.js.trap
@@ -55,29 +55,31 @@ toplevels(#20001,0)
 #20018=@"loc,{#10000},1,1,2,0"
 locations_default(#20018,#10000,1,1,2,0)
 hasLocation(#20001,#20018)
-#20019=*
-stmts(#20019,8,#20001,0,"switch(x){}")
-hasLocation(#20019,#20003)
-stmt_containers(#20019,#20001)
+#20019=@"var;{this};{#20000}"
+variables(#20019,"this",#20000)
 #20020=*
-exprs(#20020,79,#20019,-1,"x")
-hasLocation(#20020,#20009)
-enclosing_stmt(#20020,#20019)
-expr_containers(#20020,#20001)
-literals("x","x",#20020)
-#20021=@"var;{x};{#20000}"
-variables(#20021,"x",#20000)
-bind(#20020,#20021)
-#20022=*
-entry_cfg_node(#20022,#20001)
-#20023=@"loc,{#10000},1,1,1,0"
-locations_default(#20023,#10000,1,1,1,0)
-hasLocation(#20022,#20023)
-#20024=*
-exit_cfg_node(#20024,#20001)
-hasLocation(#20024,#20017)
-successor(#20019,#20020)
-successor(#20020,#20024)
-successor(#20022,#20019)
+stmts(#20020,8,#20001,0,"switch(x){}")
+hasLocation(#20020,#20003)
+stmt_containers(#20020,#20001)
+#20021=*
+exprs(#20021,79,#20020,-1,"x")
+hasLocation(#20021,#20009)
+enclosing_stmt(#20021,#20020)
+expr_containers(#20021,#20001)
+literals("x","x",#20021)
+#20022=@"var;{x};{#20000}"
+variables(#20022,"x",#20000)
+bind(#20021,#20022)
+#20023=*
+entry_cfg_node(#20023,#20001)
+#20024=@"loc,{#10000},1,1,1,0"
+locations_default(#20024,#10000,1,1,1,0)
+hasLocation(#20023,#20024)
+#20025=*
+exit_cfg_node(#20025,#20001)
+hasLocation(#20025,#20017)
+successor(#20020,#20021)
+successor(#20021,#20025)
+successor(#20023,#20020)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/stmts/output/trap/try.js.trap b/javascript/extractor/tests/stmts/output/trap/try.js.trap
index f364be587d2..aed08f14f7e 100644
--- a/javascript/extractor/tests/stmts/output/trap/try.js.trap
+++ b/javascript/extractor/tests/stmts/output/trap/try.js.trap
@@ -209,152 +209,154 @@ toplevels(#20001,0)
 #20078=@"loc,{#10000},1,1,5,29"
 locations_default(#20078,#10000,1,1,5,29)
 hasLocation(#20001,#20078)
-#20079=*
-stmts(#20079,11,#20001,0,"try {\n  ... ) { ; }")
-#20080=@"loc,{#10000},1,1,3,16"
-locations_default(#20080,#10000,1,1,3,16)
-hasLocation(#20079,#20080)
-stmt_containers(#20079,#20001)
-#20081=*
-stmts(#20081,1,#20079,0,"{\n    throw ""!"";\n}")
-#20082=@"loc,{#10000},1,5,3,1"
-locations_default(#20082,#10000,1,5,3,1)
-hasLocation(#20081,#20082)
-stmt_containers(#20081,#20001)
-#20083=*
-stmts(#20083,10,#20081,0,"throw ""!"";")
-#20084=@"loc,{#10000},2,5,2,14"
-locations_default(#20084,#10000,2,5,2,14)
-hasLocation(#20083,#20084)
-stmt_containers(#20083,#20001)
-#20085=*
-exprs(#20085,4,#20083,0,"""!""")
-hasLocation(#20085,#20019)
-enclosing_stmt(#20085,#20083)
-expr_containers(#20085,#20001)
-literals("!","""!""",#20085)
+#20079=@"var;{this};{#20000}"
+variables(#20079,"this",#20000)
+#20080=*
+stmts(#20080,11,#20001,0,"try {\n  ... ) { ; }")
+#20081=@"loc,{#10000},1,1,3,16"
+locations_default(#20081,#10000,1,1,3,16)
+hasLocation(#20080,#20081)
+stmt_containers(#20080,#20001)
+#20082=*
+stmts(#20082,1,#20080,0,"{\n    throw ""!"";\n}")
+#20083=@"loc,{#10000},1,5,3,1"
+locations_default(#20083,#10000,1,5,3,1)
+hasLocation(#20082,#20083)
+stmt_containers(#20082,#20001)
+#20084=*
+stmts(#20084,10,#20082,0,"throw ""!"";")
+#20085=@"loc,{#10000},2,5,2,14"
+locations_default(#20085,#10000,2,5,2,14)
+hasLocation(#20084,#20085)
+stmt_containers(#20084,#20001)
 #20086=*
-regexpterm(#20086,14,#20085,0,"!")
-#20087=@"loc,{#10000},2,12,2,12"
-locations_default(#20087,#10000,2,12,2,12)
-hasLocation(#20086,#20087)
-regexp_const_value(#20086,"!")
-#20088=*
-stmts(#20088,20,#20079,1,"catch(x) { ; }")
-#20089=@"loc,{#10000},3,3,3,16"
-locations_default(#20089,#10000,3,3,3,16)
-hasLocation(#20088,#20089)
-stmt_containers(#20088,#20001)
-#20090=*
-scopes(#20090,2)
-scopenodes(#20088,#20090)
-scopenesting(#20090,#20000)
-#20091=@"var;{x};{#20090}"
-variables(#20091,"x",#20090)
-#20092=*
-exprs(#20092,78,#20088,0,"x")
-hasLocation(#20092,#20029)
-enclosing_stmt(#20092,#20088)
-expr_containers(#20092,#20001)
-literals("x","x",#20092)
-decl(#20092,#20091)
+exprs(#20086,4,#20084,0,"""!""")
+hasLocation(#20086,#20019)
+enclosing_stmt(#20086,#20084)
+expr_containers(#20086,#20001)
+literals("!","""!""",#20086)
+#20087=*
+regexpterm(#20087,14,#20086,0,"!")
+#20088=@"loc,{#10000},2,12,2,12"
+locations_default(#20088,#10000,2,12,2,12)
+hasLocation(#20087,#20088)
+regexp_const_value(#20087,"!")
+#20089=*
+stmts(#20089,20,#20080,1,"catch(x) { ; }")
+#20090=@"loc,{#10000},3,3,3,16"
+locations_default(#20090,#10000,3,3,3,16)
+hasLocation(#20089,#20090)
+stmt_containers(#20089,#20001)
+#20091=*
+scopes(#20091,2)
+scopenodes(#20089,#20091)
+scopenesting(#20091,#20000)
+#20092=@"var;{x};{#20091}"
+variables(#20092,"x",#20091)
 #20093=*
-stmts(#20093,1,#20088,1,"{ ; }")
-#20094=@"loc,{#10000},3,12,3,16"
-locations_default(#20094,#10000,3,12,3,16)
-hasLocation(#20093,#20094)
-stmt_containers(#20093,#20001)
-#20095=*
-stmts(#20095,0,#20093,0,";")
-hasLocation(#20095,#20035)
-stmt_containers(#20095,#20001)
+exprs(#20093,78,#20089,0,"x")
+hasLocation(#20093,#20029)
+enclosing_stmt(#20093,#20089)
+expr_containers(#20093,#20001)
+literals("x","x",#20093)
+decl(#20093,#20092)
+#20094=*
+stmts(#20094,1,#20089,1,"{ ; }")
+#20095=@"loc,{#10000},3,12,3,16"
+locations_default(#20095,#10000,3,12,3,16)
+hasLocation(#20094,#20095)
+stmt_containers(#20094,#20001)
 #20096=*
-stmts(#20096,11,#20001,1,"try {} finally { ; }")
-hasLocation(#20096,#20009)
+stmts(#20096,0,#20094,0,";")
+hasLocation(#20096,#20035)
 stmt_containers(#20096,#20001)
 #20097=*
-stmts(#20097,1,#20096,0,"{}")
-#20098=@"loc,{#10000},4,5,4,6"
-locations_default(#20098,#10000,4,5,4,6)
-hasLocation(#20097,#20098)
+stmts(#20097,11,#20001,1,"try {} finally { ; }")
+hasLocation(#20097,#20009)
 stmt_containers(#20097,#20001)
-#20099=*
-stmts(#20099,1,#20096,-1,"{ ; }")
-#20100=@"loc,{#10000},4,16,4,20"
-locations_default(#20100,#10000,4,16,4,20)
-hasLocation(#20099,#20100)
-stmt_containers(#20099,#20001)
-#20101=*
-stmts(#20101,0,#20099,0,";")
-hasLocation(#20101,#20049)
-stmt_containers(#20101,#20001)
+#20098=*
+stmts(#20098,1,#20097,0,"{}")
+#20099=@"loc,{#10000},4,5,4,6"
+locations_default(#20099,#10000,4,5,4,6)
+hasLocation(#20098,#20099)
+stmt_containers(#20098,#20001)
+#20100=*
+stmts(#20100,1,#20097,-1,"{ ; }")
+#20101=@"loc,{#10000},4,16,4,20"
+locations_default(#20101,#10000,4,16,4,20)
+hasLocation(#20100,#20101)
+stmt_containers(#20100,#20001)
 #20102=*
-stmts(#20102,11,#20001,2,"try {}  ... ally {}")
-hasLocation(#20102,#20011)
+stmts(#20102,0,#20100,0,";")
+hasLocation(#20102,#20049)
 stmt_containers(#20102,#20001)
 #20103=*
-stmts(#20103,1,#20102,0,"{}")
-#20104=@"loc,{#10000},5,5,5,6"
-locations_default(#20104,#10000,5,5,5,6)
-hasLocation(#20103,#20104)
+stmts(#20103,11,#20001,2,"try {}  ... ally {}")
+hasLocation(#20103,#20011)
 stmt_containers(#20103,#20001)
-#20105=*
-stmts(#20105,20,#20102,1,"catch(x) {}")
-#20106=@"loc,{#10000},5,8,5,18"
-locations_default(#20106,#10000,5,8,5,18)
-hasLocation(#20105,#20106)
-stmt_containers(#20105,#20001)
-#20107=*
-scopes(#20107,2)
-scopenodes(#20105,#20107)
-scopenesting(#20107,#20000)
-#20108=@"var;{x};{#20107}"
-variables(#20108,"x",#20107)
-#20109=*
-exprs(#20109,78,#20105,0,"x")
-hasLocation(#20109,#20063)
-enclosing_stmt(#20109,#20105)
-expr_containers(#20109,#20001)
-literals("x","x",#20109)
-decl(#20109,#20108)
+#20104=*
+stmts(#20104,1,#20103,0,"{}")
+#20105=@"loc,{#10000},5,5,5,6"
+locations_default(#20105,#10000,5,5,5,6)
+hasLocation(#20104,#20105)
+stmt_containers(#20104,#20001)
+#20106=*
+stmts(#20106,20,#20103,1,"catch(x) {}")
+#20107=@"loc,{#10000},5,8,5,18"
+locations_default(#20107,#10000,5,8,5,18)
+hasLocation(#20106,#20107)
+stmt_containers(#20106,#20001)
+#20108=*
+scopes(#20108,2)
+scopenodes(#20106,#20108)
+scopenesting(#20108,#20000)
+#20109=@"var;{x};{#20108}"
+variables(#20109,"x",#20108)
 #20110=*
-stmts(#20110,1,#20105,1,"{}")
-#20111=@"loc,{#10000},5,17,5,18"
-locations_default(#20111,#10000,5,17,5,18)
-hasLocation(#20110,#20111)
-stmt_containers(#20110,#20001)
-#20112=*
-stmts(#20112,1,#20102,-1,"{}")
-#20113=@"loc,{#10000},5,28,5,29"
-locations_default(#20113,#10000,5,28,5,29)
-hasLocation(#20112,#20113)
-stmt_containers(#20112,#20001)
-#20114=*
-entry_cfg_node(#20114,#20001)
-#20115=@"loc,{#10000},1,1,1,0"
-locations_default(#20115,#10000,1,1,1,0)
-hasLocation(#20114,#20115)
-#20116=*
-exit_cfg_node(#20116,#20001)
-hasLocation(#20116,#20077)
+exprs(#20110,78,#20106,0,"x")
+hasLocation(#20110,#20063)
+enclosing_stmt(#20110,#20106)
+expr_containers(#20110,#20001)
+literals("x","x",#20110)
+decl(#20110,#20109)
+#20111=*
+stmts(#20111,1,#20106,1,"{}")
+#20112=@"loc,{#10000},5,17,5,18"
+locations_default(#20112,#10000,5,17,5,18)
+hasLocation(#20111,#20112)
+stmt_containers(#20111,#20001)
+#20113=*
+stmts(#20113,1,#20103,-1,"{}")
+#20114=@"loc,{#10000},5,28,5,29"
+locations_default(#20114,#10000,5,28,5,29)
+hasLocation(#20113,#20114)
+stmt_containers(#20113,#20001)
+#20115=*
+entry_cfg_node(#20115,#20001)
+#20116=@"loc,{#10000},1,1,1,0"
+locations_default(#20116,#10000,1,1,1,0)
+hasLocation(#20115,#20116)
+#20117=*
+exit_cfg_node(#20117,#20001)
+hasLocation(#20117,#20077)
+successor(#20103,#20104)
+successor(#20104,#20113)
+successor(#20106,#20110)
+successor(#20111,#20113)
+successor(#20110,#20111)
+successor(#20113,#20117)
+successor(#20097,#20098)
+successor(#20098,#20100)
 successor(#20102,#20103)
-successor(#20103,#20112)
-successor(#20105,#20109)
-successor(#20110,#20112)
-successor(#20109,#20110)
-successor(#20112,#20116)
+successor(#20100,#20102)
+successor(#20080,#20082)
+successor(#20086,#20084)
+successor(#20084,#20089)
+successor(#20082,#20086)
+successor(#20089,#20093)
 successor(#20096,#20097)
-successor(#20097,#20099)
-successor(#20101,#20102)
-successor(#20099,#20101)
-successor(#20079,#20081)
-successor(#20085,#20083)
-successor(#20083,#20088)
-successor(#20081,#20085)
-successor(#20088,#20092)
-successor(#20095,#20096)
-successor(#20093,#20095)
-successor(#20092,#20093)
-successor(#20114,#20079)
+successor(#20094,#20096)
+successor(#20093,#20094)
+successor(#20115,#20080)
 numlines(#10000,5,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/strictmode/output/trap/assignargs.js.trap b/javascript/extractor/tests/strictmode/output/trap/assignargs.js.trap
index 5f4e3f939b0..3571b3f1232 100644
--- a/javascript/extractor/tests/strictmode/output/trap/assignargs.js.trap
+++ b/javascript/extractor/tests/strictmode/output/trap/assignargs.js.trap
@@ -104,97 +104,101 @@ locations_default(#20035,#10000,1,1,4,1)
 hasLocation(#20001,#20035)
 #20036=@"var;{f};{#20000}"
 variables(#20036,"f",#20000)
-#20037=*
-stmts(#20037,17,#20001,0,"functio ... = 42;\n}")
-hasLocation(#20037,#20035)
-stmt_containers(#20037,#20001)
+#20037=@"var;{this};{#20000}"
+variables(#20037,"this",#20000)
 #20038=*
-exprs(#20038,78,#20037,-1,"f")
-hasLocation(#20038,#20013)
-expr_containers(#20038,#20037)
-literals("f","f",#20038)
-decl(#20038,#20036)
+stmts(#20038,17,#20001,0,"functio ... = 42;\n}")
+hasLocation(#20038,#20035)
+stmt_containers(#20038,#20001)
 #20039=*
-scopes(#20039,1)
-scopenodes(#20037,#20039)
-scopenesting(#20039,#20000)
-#20040=@"var;{arguments};{#20039}"
-variables(#20040,"arguments",#20039)
-is_arguments_object(#20040)
-#20041=*
-stmts(#20041,1,#20037,-2,"{\n  'us ... = 42;\n}")
-#20042=@"loc,{#10000},1,14,4,1"
-locations_default(#20042,#10000,1,14,4,1)
-hasLocation(#20041,#20042)
-stmt_containers(#20041,#20037)
+exprs(#20039,78,#20038,-1,"f")
+hasLocation(#20039,#20013)
+expr_containers(#20039,#20038)
+literals("f","f",#20039)
+decl(#20039,#20036)
+#20040=*
+scopes(#20040,1)
+scopenodes(#20038,#20040)
+scopenesting(#20040,#20000)
+#20041=@"var;{this};{#20040}"
+variables(#20041,"this",#20040)
+#20042=@"var;{arguments};{#20040}"
+variables(#20042,"arguments",#20040)
+is_arguments_object(#20042)
 #20043=*
-stmts(#20043,2,#20041,0,"'use strict';")
-#20044=@"loc,{#10000},2,3,2,15"
-locations_default(#20044,#10000,2,3,2,15)
+stmts(#20043,1,#20038,-2,"{\n  'us ... = 42;\n}")
+#20044=@"loc,{#10000},1,14,4,1"
+locations_default(#20044,#10000,1,14,4,1)
 hasLocation(#20043,#20044)
-stmt_containers(#20043,#20037)
+stmt_containers(#20043,#20038)
 #20045=*
-exprs(#20045,4,#20043,0,"'use strict'")
-hasLocation(#20045,#20021)
-enclosing_stmt(#20045,#20043)
-expr_containers(#20045,#20037)
-literals("use strict","'use strict'",#20045)
-#20046=*
-regexpterm(#20046,14,#20045,0,"use strict")
-#20047=@"loc,{#10000},2,4,2,13"
-locations_default(#20047,#10000,2,4,2,13)
-hasLocation(#20046,#20047)
-regexp_const_value(#20046,"use strict")
+stmts(#20045,2,#20043,0,"'use strict';")
+#20046=@"loc,{#10000},2,3,2,15"
+locations_default(#20046,#10000,2,3,2,15)
+hasLocation(#20045,#20046)
+stmt_containers(#20045,#20038)
+#20047=*
+exprs(#20047,4,#20045,0,"'use strict'")
+hasLocation(#20047,#20021)
+enclosing_stmt(#20047,#20045)
+expr_containers(#20047,#20038)
+literals("use strict","'use strict'",#20047)
 #20048=*
-stmts(#20048,2,#20041,1,"arguments = 42;")
-#20049=@"loc,{#10000},3,3,3,17"
-locations_default(#20049,#10000,3,3,3,17)
+regexpterm(#20048,14,#20047,0,"use strict")
+#20049=@"loc,{#10000},2,4,2,13"
+locations_default(#20049,#10000,2,4,2,13)
 hasLocation(#20048,#20049)
-stmt_containers(#20048,#20037)
+regexp_const_value(#20048,"use strict")
 #20050=*
-exprs(#20050,47,#20048,0,"arguments = 42")
-#20051=@"loc,{#10000},3,3,3,16"
-locations_default(#20051,#10000,3,3,3,16)
+stmts(#20050,2,#20043,1,"arguments = 42;")
+#20051=@"loc,{#10000},3,3,3,17"
+locations_default(#20051,#10000,3,3,3,17)
 hasLocation(#20050,#20051)
-enclosing_stmt(#20050,#20048)
-expr_containers(#20050,#20037)
+stmt_containers(#20050,#20038)
 #20052=*
-exprs(#20052,79,#20050,0,"arguments")
-hasLocation(#20052,#20025)
-enclosing_stmt(#20052,#20048)
-expr_containers(#20052,#20037)
-literals("arguments","arguments",#20052)
-bind(#20052,#20040)
-#20053=*
-exprs(#20053,3,#20050,1,"42")
-hasLocation(#20053,#20029)
-enclosing_stmt(#20053,#20048)
-expr_containers(#20053,#20037)
-literals("42","42",#20053)
+exprs(#20052,47,#20050,0,"arguments = 42")
+#20053=@"loc,{#10000},3,3,3,16"
+locations_default(#20053,#10000,3,3,3,16)
+hasLocation(#20052,#20053)
+enclosing_stmt(#20052,#20050)
+expr_containers(#20052,#20038)
 #20054=*
-entry_cfg_node(#20054,#20001)
-#20055=@"loc,{#10000},1,1,1,0"
-locations_default(#20055,#10000,1,1,1,0)
-hasLocation(#20054,#20055)
+exprs(#20054,79,#20052,0,"arguments")
+hasLocation(#20054,#20025)
+enclosing_stmt(#20054,#20050)
+expr_containers(#20054,#20038)
+literals("arguments","arguments",#20054)
+bind(#20054,#20042)
+#20055=*
+exprs(#20055,3,#20052,1,"42")
+hasLocation(#20055,#20029)
+enclosing_stmt(#20055,#20050)
+expr_containers(#20055,#20038)
+literals("42","42",#20055)
 #20056=*
-exit_cfg_node(#20056,#20001)
-hasLocation(#20056,#20034)
-successor(#20037,#20056)
-#20057=*
-entry_cfg_node(#20057,#20037)
-hasLocation(#20057,#20055)
+entry_cfg_node(#20056,#20001)
+#20057=@"loc,{#10000},1,1,1,0"
+locations_default(#20057,#10000,1,1,1,0)
+hasLocation(#20056,#20057)
 #20058=*
-exit_cfg_node(#20058,#20037)
+exit_cfg_node(#20058,#20001)
 hasLocation(#20058,#20034)
-successor(#20048,#20052)
-successor(#20053,#20050)
-successor(#20052,#20053)
-successor(#20050,#20058)
+successor(#20038,#20058)
+#20059=*
+entry_cfg_node(#20059,#20038)
+hasLocation(#20059,#20057)
+#20060=*
+exit_cfg_node(#20060,#20038)
+hasLocation(#20060,#20034)
+successor(#20050,#20054)
+successor(#20055,#20052)
+successor(#20054,#20055)
+successor(#20052,#20060)
+successor(#20045,#20047)
+successor(#20047,#20050)
 successor(#20043,#20045)
-successor(#20045,#20048)
-successor(#20041,#20043)
-successor(#20057,#20041)
-successor(#20038,#20037)
-successor(#20054,#20038)
+successor(#20059,#20043)
+successor(#20039,#20038)
+successor(#20056,#20039)
 numlines(#10000,4,4,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/strictmode/output/trap/tst.js.trap b/javascript/extractor/tests/strictmode/output/trap/tst.js.trap
index ac5f9e60cdb..d107dfcaea5 100644
--- a/javascript/extractor/tests/strictmode/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/strictmode/output/trap/tst.js.trap
@@ -43,37 +43,39 @@ toplevels(#20001,0)
 #20013=@"loc,{#10000},1,1,2,1"
 locations_default(#20013,#10000,1,1,2,1)
 hasLocation(#20001,#20013)
-#20014=*
-stmts(#20014,2,#20001,0,"'use strict';")
-hasLocation(#20014,#20003)
-stmt_containers(#20014,#20001)
+#20014=@"var;{this};{#20000}"
+variables(#20014,"this",#20000)
 #20015=*
-exprs(#20015,4,#20014,0,"'use strict'")
-hasLocation(#20015,#20007)
-enclosing_stmt(#20015,#20014)
-expr_containers(#20015,#20001)
-literals("use strict","'use strict'",#20015)
+stmts(#20015,2,#20001,0,"'use strict';")
+hasLocation(#20015,#20003)
+stmt_containers(#20015,#20001)
 #20016=*
-regexpterm(#20016,14,#20015,0,"use strict")
-#20017=@"loc,{#10000},1,2,1,11"
-locations_default(#20017,#10000,1,2,1,11)
-hasLocation(#20016,#20017)
-regexp_const_value(#20016,"use strict")
-#20018=*
-stmts(#20018,0,#20001,1,";")
-hasLocation(#20018,#20005)
-stmt_containers(#20018,#20001)
+exprs(#20016,4,#20015,0,"'use strict'")
+hasLocation(#20016,#20007)
+enclosing_stmt(#20016,#20015)
+expr_containers(#20016,#20001)
+literals("use strict","'use strict'",#20016)
+#20017=*
+regexpterm(#20017,14,#20016,0,"use strict")
+#20018=@"loc,{#10000},1,2,1,11"
+locations_default(#20018,#10000,1,2,1,11)
+hasLocation(#20017,#20018)
+regexp_const_value(#20017,"use strict")
 #20019=*
-entry_cfg_node(#20019,#20001)
-#20020=@"loc,{#10000},1,1,1,0"
-locations_default(#20020,#10000,1,1,1,0)
-hasLocation(#20019,#20020)
-#20021=*
-exit_cfg_node(#20021,#20001)
-hasLocation(#20021,#20012)
-successor(#20018,#20021)
-successor(#20014,#20015)
-successor(#20015,#20018)
-successor(#20019,#20014)
+stmts(#20019,0,#20001,1,";")
+hasLocation(#20019,#20005)
+stmt_containers(#20019,#20001)
+#20020=*
+entry_cfg_node(#20020,#20001)
+#20021=@"loc,{#10000},1,1,1,0"
+locations_default(#20021,#10000,1,1,1,0)
+hasLocation(#20020,#20021)
+#20022=*
+exit_cfg_node(#20022,#20001)
+hasLocation(#20022,#20012)
+successor(#20019,#20022)
+successor(#20015,#20016)
+successor(#20016,#20019)
+successor(#20020,#20015)
 numlines(#10000,2,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/ts/output/trap/arrayBindingPattern.ts.trap b/javascript/extractor/tests/ts/output/trap/arrayBindingPattern.ts.trap
index dfd38cc13c4..e516dc377b0 100644
--- a/javascript/extractor/tests/ts/output/trap/arrayBindingPattern.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/arrayBindingPattern.ts.trap
@@ -89,75 +89,77 @@ hasLocation(#20001,#20030)
 variables(#20031,"x",#20000)
 #20032=@"var;{y};{#20000}"
 variables(#20032,"y",#20000)
-#20033=*
-stmts(#20033,23,#20001,0,"let [x,y] = [1,2]")
-hasLocation(#20033,#20003)
-stmt_containers(#20033,#20001)
+#20033=@"var;{this};{#20000}"
+variables(#20033,"this",#20000)
 #20034=*
-exprs(#20034,64,#20033,0,"[x,y] = [1,2]")
-#20035=@"loc,{#10000},1,5,1,17"
-locations_default(#20035,#10000,1,5,1,17)
-hasLocation(#20034,#20035)
-enclosing_stmt(#20034,#20033)
-expr_containers(#20034,#20001)
-#20036=*
-exprs(#20036,67,#20034,0,"[x,y]")
-#20037=@"loc,{#10000},1,5,1,9"
-locations_default(#20037,#10000,1,5,1,9)
-hasLocation(#20036,#20037)
-enclosing_stmt(#20036,#20033)
-expr_containers(#20036,#20001)
-#20038=*
-exprs(#20038,78,#20036,0,"x")
-hasLocation(#20038,#20009)
-enclosing_stmt(#20038,#20033)
-expr_containers(#20038,#20001)
-literals("x","x",#20038)
-decl(#20038,#20031)
+stmts(#20034,23,#20001,0,"let [x,y] = [1,2]")
+hasLocation(#20034,#20003)
+stmt_containers(#20034,#20001)
+#20035=*
+exprs(#20035,64,#20034,0,"[x,y] = [1,2]")
+#20036=@"loc,{#10000},1,5,1,17"
+locations_default(#20036,#10000,1,5,1,17)
+hasLocation(#20035,#20036)
+enclosing_stmt(#20035,#20034)
+expr_containers(#20035,#20001)
+#20037=*
+exprs(#20037,67,#20035,0,"[x,y]")
+#20038=@"loc,{#10000},1,5,1,9"
+locations_default(#20038,#10000,1,5,1,9)
+hasLocation(#20037,#20038)
+enclosing_stmt(#20037,#20034)
+expr_containers(#20037,#20001)
 #20039=*
-exprs(#20039,78,#20036,1,"y")
-hasLocation(#20039,#20013)
-enclosing_stmt(#20039,#20033)
+exprs(#20039,78,#20037,0,"x")
+hasLocation(#20039,#20009)
+enclosing_stmt(#20039,#20034)
 expr_containers(#20039,#20001)
-literals("y","y",#20039)
-decl(#20039,#20032)
-array_size(#20036,2)
+literals("x","x",#20039)
+decl(#20039,#20031)
 #20040=*
-exprs(#20040,7,#20034,1,"[1,2]")
-#20041=@"loc,{#10000},1,13,1,17"
-locations_default(#20041,#10000,1,13,1,17)
-hasLocation(#20040,#20041)
-enclosing_stmt(#20040,#20033)
+exprs(#20040,78,#20037,1,"y")
+hasLocation(#20040,#20013)
+enclosing_stmt(#20040,#20034)
 expr_containers(#20040,#20001)
-#20042=*
-exprs(#20042,3,#20040,0,"1")
-hasLocation(#20042,#20021)
-enclosing_stmt(#20042,#20033)
-expr_containers(#20042,#20001)
-literals("1","1",#20042)
+literals("y","y",#20040)
+decl(#20040,#20032)
+array_size(#20037,2)
+#20041=*
+exprs(#20041,7,#20035,1,"[1,2]")
+#20042=@"loc,{#10000},1,13,1,17"
+locations_default(#20042,#10000,1,13,1,17)
+hasLocation(#20041,#20042)
+enclosing_stmt(#20041,#20034)
+expr_containers(#20041,#20001)
 #20043=*
-exprs(#20043,3,#20040,1,"2")
-hasLocation(#20043,#20025)
-enclosing_stmt(#20043,#20033)
+exprs(#20043,3,#20041,0,"1")
+hasLocation(#20043,#20021)
+enclosing_stmt(#20043,#20034)
 expr_containers(#20043,#20001)
-literals("2","2",#20043)
-array_size(#20040,2)
+literals("1","1",#20043)
 #20044=*
-entry_cfg_node(#20044,#20001)
-#20045=@"loc,{#10000},1,1,1,0"
-locations_default(#20045,#10000,1,1,1,0)
-hasLocation(#20044,#20045)
-#20046=*
-exit_cfg_node(#20046,#20001)
-hasLocation(#20046,#20029)
-successor(#20033,#20040)
-successor(#20036,#20038)
-successor(#20039,#20034)
-successor(#20038,#20039)
-successor(#20040,#20042)
-successor(#20043,#20036)
-successor(#20042,#20043)
-successor(#20034,#20046)
-successor(#20044,#20033)
+exprs(#20044,3,#20041,1,"2")
+hasLocation(#20044,#20025)
+enclosing_stmt(#20044,#20034)
+expr_containers(#20044,#20001)
+literals("2","2",#20044)
+array_size(#20041,2)
+#20045=*
+entry_cfg_node(#20045,#20001)
+#20046=@"loc,{#10000},1,1,1,0"
+locations_default(#20046,#10000,1,1,1,0)
+hasLocation(#20045,#20046)
+#20047=*
+exit_cfg_node(#20047,#20001)
+hasLocation(#20047,#20029)
+successor(#20034,#20041)
+successor(#20037,#20039)
+successor(#20040,#20035)
+successor(#20039,#20040)
+successor(#20041,#20043)
+successor(#20044,#20037)
+successor(#20043,#20044)
+successor(#20035,#20047)
+successor(#20045,#20034)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/bindingpattern.ts.trap b/javascript/extractor/tests/ts/output/trap/bindingpattern.ts.trap
index b0b28377295..f026de55552 100644
--- a/javascript/extractor/tests/ts/output/trap/bindingpattern.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/bindingpattern.ts.trap
@@ -82,94 +82,98 @@ locations_default(#20028,#10000,1,1,2,0)
 hasLocation(#20001,#20028)
 #20029=@"var;{foo};{#20000}"
 variables(#20029,"foo",#20000)
-#20030=*
-stmts(#20030,17,#20001,0,"functio ...  y}) {}")
-hasLocation(#20030,#20003)
-stmt_containers(#20030,#20001)
+#20030=@"var;{this};{#20000}"
+variables(#20030,"this",#20000)
 #20031=*
-exprs(#20031,78,#20030,-1,"foo")
-hasLocation(#20031,#20007)
-expr_containers(#20031,#20030)
-literals("foo","foo",#20031)
-decl(#20031,#20029)
+stmts(#20031,17,#20001,0,"functio ...  y}) {}")
+hasLocation(#20031,#20003)
+stmt_containers(#20031,#20001)
 #20032=*
-scopes(#20032,1)
-scopenodes(#20030,#20032)
-scopenesting(#20032,#20000)
-#20033=@"var;{x};{#20032}"
-variables(#20033,"x",#20032)
-#20034=@"var;{y};{#20032}"
-variables(#20034,"y",#20032)
-#20035=*
-exprs(#20035,68,#20030,0,"{x, y}")
-#20036=@"loc,{#10000},1,14,1,19"
-locations_default(#20036,#10000,1,14,1,19)
-hasLocation(#20035,#20036)
-expr_containers(#20035,#20030)
+exprs(#20032,78,#20031,-1,"foo")
+hasLocation(#20032,#20007)
+expr_containers(#20032,#20031)
+literals("foo","foo",#20032)
+decl(#20032,#20029)
+#20033=*
+scopes(#20033,1)
+scopenodes(#20031,#20033)
+scopenesting(#20033,#20000)
+#20034=@"var;{this};{#20033}"
+variables(#20034,"this",#20033)
+#20035=@"var;{x};{#20033}"
+variables(#20035,"x",#20033)
+#20036=@"var;{y};{#20033}"
+variables(#20036,"y",#20033)
 #20037=*
-properties(#20037,#20035,0,0,"x")
-hasLocation(#20037,#20013)
-#20038=*
-exprs(#20038,0,#20037,0,"x")
-hasLocation(#20038,#20013)
-expr_containers(#20038,#20030)
-literals("x","x",#20038)
+exprs(#20037,68,#20031,0,"{x, y}")
+#20038=@"loc,{#10000},1,14,1,19"
+locations_default(#20038,#10000,1,14,1,19)
+hasLocation(#20037,#20038)
+expr_containers(#20037,#20031)
 #20039=*
-exprs(#20039,78,#20037,1,"x")
+properties(#20039,#20037,0,0,"x")
 hasLocation(#20039,#20013)
-expr_containers(#20039,#20030)
-literals("x","x",#20039)
-decl(#20039,#20033)
 #20040=*
-properties(#20040,#20035,1,0,"y")
-hasLocation(#20040,#20017)
+exprs(#20040,0,#20039,0,"x")
+hasLocation(#20040,#20013)
+expr_containers(#20040,#20031)
+literals("x","x",#20040)
 #20041=*
-exprs(#20041,0,#20040,0,"y")
-hasLocation(#20041,#20017)
-expr_containers(#20041,#20030)
-literals("y","y",#20041)
+exprs(#20041,78,#20039,1,"x")
+hasLocation(#20041,#20013)
+expr_containers(#20041,#20031)
+literals("x","x",#20041)
+decl(#20041,#20035)
 #20042=*
-exprs(#20042,78,#20040,1,"y")
+properties(#20042,#20037,1,0,"y")
 hasLocation(#20042,#20017)
-expr_containers(#20042,#20030)
-literals("y","y",#20042)
-decl(#20042,#20034)
-#20043=@"var;{arguments};{#20032}"
-variables(#20043,"arguments",#20032)
-is_arguments_object(#20043)
+#20043=*
+exprs(#20043,0,#20042,0,"y")
+hasLocation(#20043,#20017)
+expr_containers(#20043,#20031)
+literals("y","y",#20043)
 #20044=*
-stmts(#20044,1,#20030,-2,"{}")
-#20045=@"loc,{#10000},1,22,1,23"
-locations_default(#20045,#10000,1,22,1,23)
-hasLocation(#20044,#20045)
-stmt_containers(#20044,#20030)
+exprs(#20044,78,#20042,1,"y")
+hasLocation(#20044,#20017)
+expr_containers(#20044,#20031)
+literals("y","y",#20044)
+decl(#20044,#20036)
+#20045=@"var;{arguments};{#20033}"
+variables(#20045,"arguments",#20033)
+is_arguments_object(#20045)
 #20046=*
-entry_cfg_node(#20046,#20001)
-#20047=@"loc,{#10000},1,1,1,0"
-locations_default(#20047,#10000,1,1,1,0)
+stmts(#20046,1,#20031,-2,"{}")
+#20047=@"loc,{#10000},1,22,1,23"
+locations_default(#20047,#10000,1,22,1,23)
 hasLocation(#20046,#20047)
+stmt_containers(#20046,#20031)
 #20048=*
-exit_cfg_node(#20048,#20001)
-hasLocation(#20048,#20027)
-successor(#20030,#20048)
-#20049=*
-entry_cfg_node(#20049,#20030)
-hasLocation(#20049,#20047)
+entry_cfg_node(#20048,#20001)
+#20049=@"loc,{#10000},1,1,1,0"
+locations_default(#20049,#10000,1,1,1,0)
+hasLocation(#20048,#20049)
 #20050=*
-exit_cfg_node(#20050,#20030)
-#20051=@"loc,{#10000},1,24,1,23"
-locations_default(#20051,#10000,1,24,1,23)
-hasLocation(#20050,#20051)
-successor(#20044,#20050)
-successor(#20035,#20038)
-successor(#20042,#20040)
-successor(#20041,#20042)
-successor(#20040,#20044)
-successor(#20039,#20037)
-successor(#20038,#20039)
-successor(#20037,#20041)
-successor(#20049,#20035)
-successor(#20031,#20030)
-successor(#20046,#20031)
+exit_cfg_node(#20050,#20001)
+hasLocation(#20050,#20027)
+successor(#20031,#20050)
+#20051=*
+entry_cfg_node(#20051,#20031)
+hasLocation(#20051,#20049)
+#20052=*
+exit_cfg_node(#20052,#20031)
+#20053=@"loc,{#10000},1,24,1,23"
+locations_default(#20053,#10000,1,24,1,23)
+hasLocation(#20052,#20053)
+successor(#20046,#20052)
+successor(#20037,#20040)
+successor(#20044,#20042)
+successor(#20043,#20044)
+successor(#20042,#20046)
+successor(#20041,#20039)
+successor(#20040,#20041)
+successor(#20039,#20043)
+successor(#20051,#20037)
+successor(#20032,#20031)
+successor(#20048,#20032)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/bom.ts.trap b/javascript/extractor/tests/ts/output/trap/bom.ts.trap
index 3049dd9aa91..08154bd9a9f 100644
--- a/javascript/extractor/tests/ts/output/trap/bom.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/bom.ts.trap
@@ -28,26 +28,28 @@ toplevels(#20001,0)
 #20007=@"loc,{#10000},1,1,2,0"
 locations_default(#20007,#10000,1,1,2,0)
 hasLocation(#20001,#20007)
-#20008=*
-stmts(#20008,2,#20001,0,"42")
-hasLocation(#20008,#20003)
-stmt_containers(#20008,#20001)
+#20008=@"var;{this};{#20000}"
+variables(#20008,"this",#20000)
 #20009=*
-exprs(#20009,3,#20008,0,"42")
+stmts(#20009,2,#20001,0,"42")
 hasLocation(#20009,#20003)
-enclosing_stmt(#20009,#20008)
-expr_containers(#20009,#20001)
-literals("42","42",#20009)
+stmt_containers(#20009,#20001)
 #20010=*
-entry_cfg_node(#20010,#20001)
-#20011=@"loc,{#10000},1,1,1,0"
-locations_default(#20011,#10000,1,1,1,0)
-hasLocation(#20010,#20011)
-#20012=*
-exit_cfg_node(#20012,#20001)
-hasLocation(#20012,#20006)
-successor(#20008,#20009)
-successor(#20009,#20012)
-successor(#20010,#20008)
+exprs(#20010,3,#20009,0,"42")
+hasLocation(#20010,#20003)
+enclosing_stmt(#20010,#20009)
+expr_containers(#20010,#20001)
+literals("42","42",#20010)
+#20011=*
+entry_cfg_node(#20011,#20001)
+#20012=@"loc,{#10000},1,1,1,0"
+locations_default(#20012,#10000,1,1,1,0)
+hasLocation(#20011,#20012)
+#20013=*
+exit_cfg_node(#20013,#20001)
+hasLocation(#20013,#20006)
+successor(#20009,#20010)
+successor(#20010,#20013)
+successor(#20011,#20009)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/classes.ts.trap b/javascript/extractor/tests/ts/output/trap/classes.ts.trap
index aec7713d4e3..b2310e87b64 100644
--- a/javascript/extractor/tests/ts/output/trap/classes.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/classes.ts.trap
@@ -101,144 +101,150 @@ hasLocation(#20001,#20034)
 variables(#20035,"C",#20000)
 #20036=@"local_type_name;{C};{#20000}"
 local_type_names(#20036,"C",#20000)
-#20037=*
-stmts(#20037,26,#20001,0,"abstrac ... F>\n  {}")
-#20038=@"loc,{#10000},1,1,2,4"
-locations_default(#20038,#10000,1,1,2,4)
-hasLocation(#20037,#20038)
-stmt_containers(#20037,#20001)
-is_abstract_class(#20037)
-#20039=*
-exprs(#20039,78,#20037,0,"C")
-hasLocation(#20039,#20011)
-enclosing_stmt(#20039,#20037)
-expr_containers(#20039,#20001)
-literals("C","C",#20039)
-decl(#20039,#20035)
-typedecl(#20039,#20036)
+#20037=@"var;{this};{#20000}"
+variables(#20037,"this",#20000)
+#20038=*
+stmts(#20038,26,#20001,0,"abstrac ... F>\n  {}")
+#20039=@"loc,{#10000},1,1,2,4"
+locations_default(#20039,#10000,1,1,2,4)
+hasLocation(#20038,#20039)
+stmt_containers(#20038,#20001)
+is_abstract_class(#20038)
 #20040=*
-scopes(#20040,10)
-scopenodes(#20037,#20040)
-scopenesting(#20040,#20000)
+exprs(#20040,78,#20038,0,"C")
+hasLocation(#20040,#20011)
+enclosing_stmt(#20040,#20038)
+expr_containers(#20040,#20001)
+literals("C","C",#20040)
+decl(#20040,#20035)
+typedecl(#20040,#20036)
 #20041=*
-typeexprs(#20041,14,#20037,-1,"E<F>")
-#20042=@"loc,{#10000},1,40,1,43"
-locations_default(#20042,#10000,1,40,1,43)
-hasLocation(#20041,#20042)
-enclosing_stmt(#20041,#20037)
-expr_containers(#20041,#20001)
+scopes(#20041,10)
+scopenodes(#20038,#20041)
+scopenesting(#20041,#20000)
+#20042=@"var;{this};{#20041}"
+variables(#20042,"this",#20041)
 #20043=*
-typeexprs(#20043,0,#20041,-1,"E")
-hasLocation(#20043,#20021)
-enclosing_stmt(#20043,#20037)
+typeexprs(#20043,14,#20038,-1,"E<F>")
+#20044=@"loc,{#10000},1,40,1,43"
+locations_default(#20044,#10000,1,40,1,43)
+hasLocation(#20043,#20044)
+enclosing_stmt(#20043,#20038)
 expr_containers(#20043,#20001)
-literals("E","E",#20043)
-#20044=*
-typeexprs(#20044,0,#20041,0,"F")
-hasLocation(#20044,#20025)
-enclosing_stmt(#20044,#20037)
-expr_containers(#20044,#20001)
-literals("F","F",#20044)
 #20045=*
-exprs(#20045,79,#20037,1,"D")
-hasLocation(#20045,#20015)
-enclosing_stmt(#20045,#20037)
+typeexprs(#20045,0,#20043,-1,"E")
+hasLocation(#20045,#20021)
+enclosing_stmt(#20045,#20038)
 expr_containers(#20045,#20001)
-literals("D","D",#20045)
-#20046=@"var;{D};{#20000}"
-variables(#20046,"D",#20000)
-bind(#20045,#20046)
+literals("E","E",#20045)
+#20046=*
+typeexprs(#20046,0,#20043,0,"F")
+hasLocation(#20046,#20025)
+enclosing_stmt(#20046,#20038)
+expr_containers(#20046,#20001)
+literals("F","F",#20046)
 #20047=*
-properties(#20047,#20037,2,0,"constru ... rgs); }")
-#20048=@"loc,{#10000},2,3,2,2"
-locations_default(#20048,#10000,2,3,2,2)
-hasLocation(#20047,#20048)
+exprs(#20047,79,#20038,1,"D")
+hasLocation(#20047,#20015)
+enclosing_stmt(#20047,#20038)
+expr_containers(#20047,#20001)
+literals("D","D",#20047)
+#20048=@"var;{D};{#20000}"
+variables(#20048,"D",#20000)
+bind(#20047,#20048)
 #20049=*
-exprs(#20049,0,#20047,0,"constructor")
-hasLocation(#20049,#20048)
-enclosing_stmt(#20049,#20037)
-expr_containers(#20049,#20001)
-literals("constructor","constructor",#20049)
-#20050=*
-exprs(#20050,9,#20047,1,"(...arg ... rgs); }")
-hasLocation(#20050,#20048)
-enclosing_stmt(#20050,#20037)
-expr_containers(#20050,#20001)
+properties(#20049,#20038,2,0,"constru ... rgs); }")
+#20050=@"loc,{#10000},2,3,2,2"
+locations_default(#20050,#10000,2,3,2,2)
+hasLocation(#20049,#20050)
 #20051=*
-scopes(#20051,1)
-scopenodes(#20050,#20051)
-scopenesting(#20051,#20040)
-#20052=@"var;{args};{#20051}"
-variables(#20052,"args",#20051)
+exprs(#20051,0,#20049,0,"constructor")
+hasLocation(#20051,#20050)
+enclosing_stmt(#20051,#20038)
+expr_containers(#20051,#20001)
+literals("constructor","constructor",#20051)
+#20052=*
+exprs(#20052,9,#20049,1,"(...arg ... rgs); }")
+hasLocation(#20052,#20050)
+enclosing_stmt(#20052,#20038)
+expr_containers(#20052,#20001)
 #20053=*
-exprs(#20053,78,#20050,0,"args")
-hasLocation(#20053,#20048)
-expr_containers(#20053,#20050)
-literals("args","args",#20053)
-decl(#20053,#20052)
-#20054=@"var;{arguments};{#20051}"
-variables(#20054,"arguments",#20051)
-is_arguments_object(#20054)
-has_rest_parameter(#20050)
-#20055=*
-stmts(#20055,1,#20050,-2,"{ super(...args); }")
-hasLocation(#20055,#20048)
-stmt_containers(#20055,#20050)
+scopes(#20053,1)
+scopenodes(#20052,#20053)
+scopenesting(#20053,#20041)
+#20054=@"var;{this};{#20053}"
+variables(#20054,"this",#20053)
+#20055=@"var;{args};{#20053}"
+variables(#20055,"args",#20053)
 #20056=*
-stmts(#20056,2,#20055,0,"super(...args);")
-hasLocation(#20056,#20048)
-stmt_containers(#20056,#20050)
-#20057=*
-exprs(#20057,13,#20056,0,"super(...args)")
-hasLocation(#20057,#20048)
-enclosing_stmt(#20057,#20056)
-expr_containers(#20057,#20050)
+exprs(#20056,78,#20052,0,"args")
+hasLocation(#20056,#20050)
+expr_containers(#20056,#20052)
+literals("args","args",#20056)
+decl(#20056,#20055)
+#20057=@"var;{arguments};{#20053}"
+variables(#20057,"arguments",#20053)
+is_arguments_object(#20057)
+has_rest_parameter(#20052)
 #20058=*
-exprs(#20058,81,#20057,-1,"super")
-hasLocation(#20058,#20048)
-enclosing_stmt(#20058,#20056)
-expr_containers(#20058,#20050)
+stmts(#20058,1,#20052,-2,"{ super(...args); }")
+hasLocation(#20058,#20050)
+stmt_containers(#20058,#20052)
 #20059=*
-exprs(#20059,66,#20057,0,"...args")
-hasLocation(#20059,#20048)
-enclosing_stmt(#20059,#20056)
-expr_containers(#20059,#20050)
+stmts(#20059,2,#20058,0,"super(...args);")
+hasLocation(#20059,#20050)
+stmt_containers(#20059,#20052)
 #20060=*
-exprs(#20060,79,#20059,0,"args")
-hasLocation(#20060,#20048)
-enclosing_stmt(#20060,#20056)
-expr_containers(#20060,#20050)
-literals("args","args",#20060)
-bind(#20060,#20052)
-is_method(#20047)
+exprs(#20060,13,#20059,0,"super(...args)")
+hasLocation(#20060,#20050)
+enclosing_stmt(#20060,#20059)
+expr_containers(#20060,#20052)
 #20061=*
-entry_cfg_node(#20061,#20001)
-#20062=@"loc,{#10000},1,1,1,0"
-locations_default(#20062,#10000,1,1,1,0)
-hasLocation(#20061,#20062)
+exprs(#20061,81,#20060,-1,"super")
+hasLocation(#20061,#20050)
+enclosing_stmt(#20061,#20059)
+expr_containers(#20061,#20052)
+#20062=*
+exprs(#20062,66,#20060,0,"...args")
+hasLocation(#20062,#20050)
+enclosing_stmt(#20062,#20059)
+expr_containers(#20062,#20052)
 #20063=*
-exit_cfg_node(#20063,#20001)
-hasLocation(#20063,#20033)
-successor(#20050,#20047)
+exprs(#20063,79,#20062,0,"args")
+hasLocation(#20063,#20050)
+enclosing_stmt(#20063,#20059)
+expr_containers(#20063,#20052)
+literals("args","args",#20063)
+bind(#20063,#20055)
+is_method(#20049)
 #20064=*
-entry_cfg_node(#20064,#20050)
-hasLocation(#20064,#20048)
-#20065=*
-exit_cfg_node(#20065,#20050)
-hasLocation(#20065,#20048)
+entry_cfg_node(#20064,#20001)
+#20065=@"loc,{#10000},1,1,1,0"
+locations_default(#20065,#10000,1,1,1,0)
+hasLocation(#20064,#20065)
+#20066=*
+exit_cfg_node(#20066,#20001)
+hasLocation(#20066,#20033)
+successor(#20052,#20049)
+#20067=*
+entry_cfg_node(#20067,#20052)
+hasLocation(#20067,#20050)
+#20068=*
+exit_cfg_node(#20068,#20052)
+hasLocation(#20068,#20050)
+successor(#20059,#20061)
+successor(#20063,#20062)
+successor(#20062,#20060)
+successor(#20061,#20063)
+successor(#20060,#20068)
+successor(#20058,#20059)
 successor(#20056,#20058)
-successor(#20060,#20059)
-successor(#20059,#20057)
-successor(#20058,#20060)
-successor(#20057,#20065)
-successor(#20055,#20056)
-successor(#20053,#20055)
-successor(#20064,#20053)
-successor(#20049,#20050)
-successor(#20047,#20037)
-successor(#20045,#20049)
-successor(#20039,#20045)
-successor(#20037,#20063)
-successor(#20061,#20039)
+successor(#20067,#20056)
+successor(#20051,#20052)
+successor(#20049,#20038)
+successor(#20047,#20051)
+successor(#20040,#20047)
+successor(#20038,#20066)
+successor(#20064,#20040)
 numlines(#10000,2,2,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/comments.ts.trap b/javascript/extractor/tests/ts/output/trap/comments.ts.trap
index 4898c710e95..e772a2f8d23 100644
--- a/javascript/extractor/tests/ts/output/trap/comments.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/comments.ts.trap
@@ -81,47 +81,49 @@ toplevels(#20001,0)
 #20025=@"loc,{#10000},2,1,4,4"
 locations_default(#20025,#10000,2,1,4,4)
 hasLocation(#20001,#20025)
-#20026=*
-stmts(#20026,2,#20001,0,"a /* b */ + c")
-#20027=@"loc,{#10000},2,1,2,13"
-locations_default(#20027,#10000,2,1,2,13)
-hasLocation(#20026,#20027)
-stmt_containers(#20026,#20001)
-#20028=*
-exprs(#20028,34,#20026,0,"a /* b */ + c")
-hasLocation(#20028,#20027)
-enclosing_stmt(#20028,#20026)
-expr_containers(#20028,#20001)
+#20026=@"var;{this};{#20000}"
+variables(#20026,"this",#20000)
+#20027=*
+stmts(#20027,2,#20001,0,"a /* b */ + c")
+#20028=@"loc,{#10000},2,1,2,13"
+locations_default(#20028,#10000,2,1,2,13)
+hasLocation(#20027,#20028)
+stmt_containers(#20027,#20001)
 #20029=*
-exprs(#20029,79,#20028,0,"a")
-hasLocation(#20029,#20018)
-enclosing_stmt(#20029,#20026)
+exprs(#20029,34,#20027,0,"a /* b */ + c")
+hasLocation(#20029,#20028)
+enclosing_stmt(#20029,#20027)
 expr_containers(#20029,#20001)
-literals("a","a",#20029)
-#20030=@"var;{a};{#20000}"
-variables(#20030,"a",#20000)
-bind(#20029,#20030)
-#20031=*
-exprs(#20031,79,#20028,1,"c")
-hasLocation(#20031,#20022)
-enclosing_stmt(#20031,#20026)
-expr_containers(#20031,#20001)
-literals("c","c",#20031)
-#20032=@"var;{c};{#20000}"
-variables(#20032,"c",#20000)
-bind(#20031,#20032)
-#20033=*
-entry_cfg_node(#20033,#20001)
-#20034=@"loc,{#10000},2,1,2,0"
-locations_default(#20034,#10000,2,1,2,0)
-hasLocation(#20033,#20034)
-#20035=*
-exit_cfg_node(#20035,#20001)
-hasLocation(#20035,#20024)
-successor(#20026,#20029)
-successor(#20031,#20028)
-successor(#20029,#20031)
-successor(#20028,#20035)
-successor(#20033,#20026)
+#20030=*
+exprs(#20030,79,#20029,0,"a")
+hasLocation(#20030,#20018)
+enclosing_stmt(#20030,#20027)
+expr_containers(#20030,#20001)
+literals("a","a",#20030)
+#20031=@"var;{a};{#20000}"
+variables(#20031,"a",#20000)
+bind(#20030,#20031)
+#20032=*
+exprs(#20032,79,#20029,1,"c")
+hasLocation(#20032,#20022)
+enclosing_stmt(#20032,#20027)
+expr_containers(#20032,#20001)
+literals("c","c",#20032)
+#20033=@"var;{c};{#20000}"
+variables(#20033,"c",#20000)
+bind(#20032,#20033)
+#20034=*
+entry_cfg_node(#20034,#20001)
+#20035=@"loc,{#10000},2,1,2,0"
+locations_default(#20035,#10000,2,1,2,0)
+hasLocation(#20034,#20035)
+#20036=*
+exit_cfg_node(#20036,#20001)
+hasLocation(#20036,#20024)
+successor(#20027,#20030)
+successor(#20032,#20029)
+successor(#20030,#20032)
+successor(#20029,#20036)
+successor(#20034,#20027)
 numlines(#10000,4,1,4)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap b/javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap
index 2a1c0efbd44..49b5f3716a6 100644
--- a/javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap
@@ -5678,4507 +5678,4551 @@ variables(#22180,"ConditionalTypes2",#20000)
 local_namespace_names(#22181,"ConditionalTypes1",#20000)
 #22182=@"local_namespace_name;{ConditionalTypes2};{#20000}"
 local_namespace_names(#22182,"ConditionalTypes2",#20000)
-#22183=*
-stmts(#22183,31,#20001,0,"namespa ...  any;\n}")
-#22184=@"loc,{#10000},1,1,70,1"
-locations_default(#22184,#10000,1,1,70,1)
-hasLocation(#22183,#22184)
-stmt_containers(#22183,#20001)
-#22185=*
-exprs(#22185,78,#22183,-1,"ConditionalTypes1")
-hasLocation(#22185,#20285)
-enclosing_stmt(#22185,#22183)
-expr_containers(#22185,#20001)
-literals("ConditionalTypes1","ConditionalTypes1",#22185)
-decl(#22185,#22179)
-namespacedecl(#22185,#22181)
+#22183=@"var;{this};{#20000}"
+variables(#22183,"this",#20000)
+#22184=*
+stmts(#22184,31,#20001,0,"namespa ...  any;\n}")
+#22185=@"loc,{#10000},1,1,70,1"
+locations_default(#22185,#10000,1,1,70,1)
+hasLocation(#22184,#22185)
+stmt_containers(#22184,#20001)
 #22186=*
-scopes(#22186,9)
-scopenodes(#22183,#22186)
-scopenesting(#22186,#20000)
-#22187=@"var;{f1};{#22186}"
-variables(#22187,"f1",#22186)
-#22188=@"var;{f2};{#22186}"
-variables(#22188,"f2",#22186)
-#22189=@"local_type_name;{TypeName};{#22186}"
-local_type_names(#22189,"TypeName",#22186)
-#22190=@"local_type_name;{T0};{#22186}"
-local_type_names(#22190,"T0",#22186)
-#22191=@"local_type_name;{T1};{#22186}"
-local_type_names(#22191,"T1",#22186)
-#22192=@"local_type_name;{T2};{#22186}"
-local_type_names(#22192,"T2",#22186)
-#22193=@"local_type_name;{T3};{#22186}"
-local_type_names(#22193,"T3",#22186)
-#22194=@"local_type_name;{T4};{#22186}"
-local_type_names(#22194,"T4",#22186)
-#22195=@"local_type_name;{T10};{#22186}"
-local_type_names(#22195,"T10",#22186)
-#22196=@"local_type_name;{T12};{#22186}"
-local_type_names(#22196,"T12",#22186)
-#22197=@"local_type_name;{T11};{#22186}"
-local_type_names(#22197,"T11",#22186)
-#22198=@"local_type_name;{BoxedValue};{#22186}"
-local_type_names(#22198,"BoxedValue",#22186)
-#22199=@"local_type_name;{BoxedArray};{#22186}"
-local_type_names(#22199,"BoxedArray",#22186)
-#22200=@"local_type_name;{Boxed};{#22186}"
-local_type_names(#22200,"Boxed",#22186)
-#22201=@"local_type_name;{T20};{#22186}"
-local_type_names(#22201,"T20",#22186)
-#22202=@"local_type_name;{T21};{#22186}"
-local_type_names(#22202,"T21",#22186)
-#22203=@"local_type_name;{T22};{#22186}"
-local_type_names(#22203,"T22",#22186)
-#22204=@"local_type_name;{Diff};{#22186}"
-local_type_names(#22204,"Diff",#22186)
-#22205=@"local_type_name;{Filter};{#22186}"
-local_type_names(#22205,"Filter",#22186)
-#22206=@"local_type_name;{T30};{#22186}"
-local_type_names(#22206,"T30",#22186)
-#22207=@"local_type_name;{T31};{#22186}"
-local_type_names(#22207,"T31",#22186)
-#22208=@"local_type_name;{T32};{#22186}"
-local_type_names(#22208,"T32",#22186)
-#22209=@"local_type_name;{T33};{#22186}"
-local_type_names(#22209,"T33",#22186)
-#22210=@"local_type_name;{NonNullable};{#22186}"
-local_type_names(#22210,"NonNullable",#22186)
-#22211=@"local_type_name;{T34};{#22186}"
-local_type_names(#22211,"T34",#22186)
-#22212=@"local_type_name;{T35};{#22186}"
-local_type_names(#22212,"T35",#22186)
-#22213=@"local_type_name;{FunctionPropertyNames};{#22186}"
-local_type_names(#22213,"FunctionPropertyNames",#22186)
-#22214=@"local_type_name;{FunctionProperties};{#22186}"
-local_type_names(#22214,"FunctionProperties",#22186)
-#22215=@"local_type_name;{NonFunctionPropertyNames};{#22186}"
-local_type_names(#22215,"NonFunctionPropertyNames",#22186)
-#22216=@"local_type_name;{NonFunctionProperties};{#22186}"
-local_type_names(#22216,"NonFunctionProperties",#22186)
-#22217=@"local_type_name;{Part};{#22186}"
-local_type_names(#22217,"Part",#22186)
-#22218=@"local_type_name;{T40};{#22186}"
-local_type_names(#22218,"T40",#22186)
-#22219=@"local_type_name;{T41};{#22186}"
-local_type_names(#22219,"T41",#22186)
-#22220=@"local_type_name;{T42};{#22186}"
-local_type_names(#22220,"T42",#22186)
-#22221=@"local_type_name;{T43};{#22186}"
-local_type_names(#22221,"T43",#22186)
-#22222=@"local_type_name;{ReturnType};{#22186}"
-local_type_names(#22222,"ReturnType",#22186)
-#22223=*
-stmts(#22223,35,#22183,0,"type Ty ... bject"";")
-#22224=@"loc,{#10000},2,3,8,15"
-locations_default(#22224,#10000,2,3,8,15)
-hasLocation(#22223,#22224)
-stmt_containers(#22223,#22183)
-#22225=*
-typeexprs(#22225,1,#22223,0,"TypeName")
-hasLocation(#22225,#20291)
-enclosing_stmt(#22225,#22223)
-expr_containers(#22225,#22183)
-literals("TypeName","TypeName",#22225)
-typedecl(#22225,#22189)
+exprs(#22186,78,#22184,-1,"ConditionalTypes1")
+hasLocation(#22186,#20285)
+enclosing_stmt(#22186,#22184)
+expr_containers(#22186,#20001)
+literals("ConditionalTypes1","ConditionalTypes1",#22186)
+decl(#22186,#22179)
+namespacedecl(#22186,#22181)
+#22187=*
+scopes(#22187,9)
+scopenodes(#22184,#22187)
+scopenesting(#22187,#20000)
+#22188=@"var;{f1};{#22187}"
+variables(#22188,"f1",#22187)
+#22189=@"var;{f2};{#22187}"
+variables(#22189,"f2",#22187)
+#22190=@"local_type_name;{TypeName};{#22187}"
+local_type_names(#22190,"TypeName",#22187)
+#22191=@"local_type_name;{T0};{#22187}"
+local_type_names(#22191,"T0",#22187)
+#22192=@"local_type_name;{T1};{#22187}"
+local_type_names(#22192,"T1",#22187)
+#22193=@"local_type_name;{T2};{#22187}"
+local_type_names(#22193,"T2",#22187)
+#22194=@"local_type_name;{T3};{#22187}"
+local_type_names(#22194,"T3",#22187)
+#22195=@"local_type_name;{T4};{#22187}"
+local_type_names(#22195,"T4",#22187)
+#22196=@"local_type_name;{T10};{#22187}"
+local_type_names(#22196,"T10",#22187)
+#22197=@"local_type_name;{T12};{#22187}"
+local_type_names(#22197,"T12",#22187)
+#22198=@"local_type_name;{T11};{#22187}"
+local_type_names(#22198,"T11",#22187)
+#22199=@"local_type_name;{BoxedValue};{#22187}"
+local_type_names(#22199,"BoxedValue",#22187)
+#22200=@"local_type_name;{BoxedArray};{#22187}"
+local_type_names(#22200,"BoxedArray",#22187)
+#22201=@"local_type_name;{Boxed};{#22187}"
+local_type_names(#22201,"Boxed",#22187)
+#22202=@"local_type_name;{T20};{#22187}"
+local_type_names(#22202,"T20",#22187)
+#22203=@"local_type_name;{T21};{#22187}"
+local_type_names(#22203,"T21",#22187)
+#22204=@"local_type_name;{T22};{#22187}"
+local_type_names(#22204,"T22",#22187)
+#22205=@"local_type_name;{Diff};{#22187}"
+local_type_names(#22205,"Diff",#22187)
+#22206=@"local_type_name;{Filter};{#22187}"
+local_type_names(#22206,"Filter",#22187)
+#22207=@"local_type_name;{T30};{#22187}"
+local_type_names(#22207,"T30",#22187)
+#22208=@"local_type_name;{T31};{#22187}"
+local_type_names(#22208,"T31",#22187)
+#22209=@"local_type_name;{T32};{#22187}"
+local_type_names(#22209,"T32",#22187)
+#22210=@"local_type_name;{T33};{#22187}"
+local_type_names(#22210,"T33",#22187)
+#22211=@"local_type_name;{NonNullable};{#22187}"
+local_type_names(#22211,"NonNullable",#22187)
+#22212=@"local_type_name;{T34};{#22187}"
+local_type_names(#22212,"T34",#22187)
+#22213=@"local_type_name;{T35};{#22187}"
+local_type_names(#22213,"T35",#22187)
+#22214=@"local_type_name;{FunctionPropertyNames};{#22187}"
+local_type_names(#22214,"FunctionPropertyNames",#22187)
+#22215=@"local_type_name;{FunctionProperties};{#22187}"
+local_type_names(#22215,"FunctionProperties",#22187)
+#22216=@"local_type_name;{NonFunctionPropertyNames};{#22187}"
+local_type_names(#22216,"NonFunctionPropertyNames",#22187)
+#22217=@"local_type_name;{NonFunctionProperties};{#22187}"
+local_type_names(#22217,"NonFunctionProperties",#22187)
+#22218=@"local_type_name;{Part};{#22187}"
+local_type_names(#22218,"Part",#22187)
+#22219=@"local_type_name;{T40};{#22187}"
+local_type_names(#22219,"T40",#22187)
+#22220=@"local_type_name;{T41};{#22187}"
+local_type_names(#22220,"T41",#22187)
+#22221=@"local_type_name;{T42};{#22187}"
+local_type_names(#22221,"T42",#22187)
+#22222=@"local_type_name;{T43};{#22187}"
+local_type_names(#22222,"T43",#22187)
+#22223=@"local_type_name;{ReturnType};{#22187}"
+local_type_names(#22223,"ReturnType",#22187)
+#22224=*
+stmts(#22224,35,#22184,0,"type Ty ... bject"";")
+#22225=@"loc,{#10000},2,3,8,15"
+locations_default(#22225,#10000,2,3,8,15)
+hasLocation(#22224,#22225)
+stmt_containers(#22224,#22184)
 #22226=*
-scopes(#22226,12)
-scopenodes(#22223,#22226)
-scopenesting(#22226,#22186)
-#22227=@"local_type_name;{T};{#22226}"
-local_type_names(#22227,"T",#22226)
-#22228=*
-typeexprs(#22228,22,#22223,2,"T")
-hasLocation(#22228,#20295)
-enclosing_stmt(#22228,#22223)
-expr_containers(#22228,#22183)
+typeexprs(#22226,1,#22224,0,"TypeName")
+hasLocation(#22226,#20291)
+enclosing_stmt(#22226,#22224)
+expr_containers(#22226,#22184)
+literals("TypeName","TypeName",#22226)
+typedecl(#22226,#22190)
+#22227=*
+scopes(#22227,12)
+scopenodes(#22224,#22227)
+scopenesting(#22227,#22187)
+#22228=@"local_type_name;{T};{#22227}"
+local_type_names(#22228,"T",#22227)
 #22229=*
-typeexprs(#22229,1,#22228,0,"T")
+typeexprs(#22229,22,#22224,2,"T")
 hasLocation(#22229,#20295)
-enclosing_stmt(#22229,#22223)
-expr_containers(#22229,#22183)
-literals("T","T",#22229)
-typedecl(#22229,#22227)
+enclosing_stmt(#22229,#22224)
+expr_containers(#22229,#22184)
 #22230=*
-typeexprs(#22230,28,#22223,1,"T exten ... object""")
-#22231=@"loc,{#10000},3,7,8,14"
-locations_default(#22231,#10000,3,7,8,14)
-hasLocation(#22230,#22231)
-enclosing_stmt(#22230,#22223)
-expr_containers(#22230,#22183)
-#22232=*
-typeexprs(#22232,0,#22230,0,"T")
-hasLocation(#22232,#20301)
-enclosing_stmt(#22232,#22223)
-expr_containers(#22232,#22183)
-literals("T","T",#22232)
-typebind(#22232,#22227)
+typeexprs(#22230,1,#22229,0,"T")
+hasLocation(#22230,#20295)
+enclosing_stmt(#22230,#22224)
+expr_containers(#22230,#22184)
+literals("T","T",#22230)
+typedecl(#22230,#22228)
+#22231=*
+typeexprs(#22231,28,#22224,1,"T exten ... object""")
+#22232=@"loc,{#10000},3,7,8,14"
+locations_default(#22232,#10000,3,7,8,14)
+hasLocation(#22231,#22232)
+enclosing_stmt(#22231,#22224)
+expr_containers(#22231,#22184)
 #22233=*
-typeexprs(#22233,2,#22230,1,"string")
-hasLocation(#22233,#20305)
-enclosing_stmt(#22233,#22223)
-expr_containers(#22233,#22183)
-literals("string","string",#22233)
+typeexprs(#22233,0,#22231,0,"T")
+hasLocation(#22233,#20301)
+enclosing_stmt(#22233,#22224)
+expr_containers(#22233,#22184)
+literals("T","T",#22233)
+typebind(#22233,#22228)
 #22234=*
-typeexprs(#22234,3,#22230,2,"""string""")
-hasLocation(#22234,#20309)
-enclosing_stmt(#22234,#22223)
-expr_containers(#22234,#22183)
-literals("string","""string""",#22234)
+typeexprs(#22234,2,#22231,1,"string")
+hasLocation(#22234,#20305)
+enclosing_stmt(#22234,#22224)
+expr_containers(#22234,#22184)
+literals("string","string",#22234)
 #22235=*
-typeexprs(#22235,28,#22230,3,"T exten ... object""")
-#22236=@"loc,{#10000},4,7,8,14"
-locations_default(#22236,#10000,4,7,8,14)
-hasLocation(#22235,#22236)
-enclosing_stmt(#22235,#22223)
-expr_containers(#22235,#22183)
-#22237=*
-typeexprs(#22237,0,#22235,0,"T")
-hasLocation(#22237,#20313)
-enclosing_stmt(#22237,#22223)
-expr_containers(#22237,#22183)
-literals("T","T",#22237)
-typebind(#22237,#22227)
+typeexprs(#22235,3,#22231,2,"""string""")
+hasLocation(#22235,#20309)
+enclosing_stmt(#22235,#22224)
+expr_containers(#22235,#22184)
+literals("string","""string""",#22235)
+#22236=*
+typeexprs(#22236,28,#22231,3,"T exten ... object""")
+#22237=@"loc,{#10000},4,7,8,14"
+locations_default(#22237,#10000,4,7,8,14)
+hasLocation(#22236,#22237)
+enclosing_stmt(#22236,#22224)
+expr_containers(#22236,#22184)
 #22238=*
-typeexprs(#22238,2,#22235,1,"number")
-hasLocation(#22238,#20317)
-enclosing_stmt(#22238,#22223)
-expr_containers(#22238,#22183)
-literals("number","number",#22238)
+typeexprs(#22238,0,#22236,0,"T")
+hasLocation(#22238,#20313)
+enclosing_stmt(#22238,#22224)
+expr_containers(#22238,#22184)
+literals("T","T",#22238)
+typebind(#22238,#22228)
 #22239=*
-typeexprs(#22239,3,#22235,2,"""number""")
-hasLocation(#22239,#20321)
-enclosing_stmt(#22239,#22223)
-expr_containers(#22239,#22183)
-literals("number","""number""",#22239)
+typeexprs(#22239,2,#22236,1,"number")
+hasLocation(#22239,#20317)
+enclosing_stmt(#22239,#22224)
+expr_containers(#22239,#22184)
+literals("number","number",#22239)
 #22240=*
-typeexprs(#22240,28,#22235,3,"T exten ... object""")
-#22241=@"loc,{#10000},5,7,8,14"
-locations_default(#22241,#10000,5,7,8,14)
-hasLocation(#22240,#22241)
-enclosing_stmt(#22240,#22223)
-expr_containers(#22240,#22183)
-#22242=*
-typeexprs(#22242,0,#22240,0,"T")
-hasLocation(#22242,#20325)
-enclosing_stmt(#22242,#22223)
-expr_containers(#22242,#22183)
-literals("T","T",#22242)
-typebind(#22242,#22227)
+typeexprs(#22240,3,#22236,2,"""number""")
+hasLocation(#22240,#20321)
+enclosing_stmt(#22240,#22224)
+expr_containers(#22240,#22184)
+literals("number","""number""",#22240)
+#22241=*
+typeexprs(#22241,28,#22236,3,"T exten ... object""")
+#22242=@"loc,{#10000},5,7,8,14"
+locations_default(#22242,#10000,5,7,8,14)
+hasLocation(#22241,#22242)
+enclosing_stmt(#22241,#22224)
+expr_containers(#22241,#22184)
 #22243=*
-typeexprs(#22243,2,#22240,1,"boolean")
-hasLocation(#22243,#20329)
-enclosing_stmt(#22243,#22223)
-expr_containers(#22243,#22183)
-literals("boolean","boolean",#22243)
+typeexprs(#22243,0,#22241,0,"T")
+hasLocation(#22243,#20325)
+enclosing_stmt(#22243,#22224)
+expr_containers(#22243,#22184)
+literals("T","T",#22243)
+typebind(#22243,#22228)
 #22244=*
-typeexprs(#22244,3,#22240,2,"""boolean""")
-hasLocation(#22244,#20333)
-enclosing_stmt(#22244,#22223)
-expr_containers(#22244,#22183)
-literals("boolean","""boolean""",#22244)
+typeexprs(#22244,2,#22241,1,"boolean")
+hasLocation(#22244,#20329)
+enclosing_stmt(#22244,#22224)
+expr_containers(#22244,#22184)
+literals("boolean","boolean",#22244)
 #22245=*
-typeexprs(#22245,28,#22240,3,"T exten ... object""")
-#22246=@"loc,{#10000},6,7,8,14"
-locations_default(#22246,#10000,6,7,8,14)
-hasLocation(#22245,#22246)
-enclosing_stmt(#22245,#22223)
-expr_containers(#22245,#22183)
-#22247=*
-typeexprs(#22247,0,#22245,0,"T")
-hasLocation(#22247,#20337)
-enclosing_stmt(#22247,#22223)
-expr_containers(#22247,#22183)
-literals("T","T",#22247)
-typebind(#22247,#22227)
+typeexprs(#22245,3,#22241,2,"""boolean""")
+hasLocation(#22245,#20333)
+enclosing_stmt(#22245,#22224)
+expr_containers(#22245,#22184)
+literals("boolean","""boolean""",#22245)
+#22246=*
+typeexprs(#22246,28,#22241,3,"T exten ... object""")
+#22247=@"loc,{#10000},6,7,8,14"
+locations_default(#22247,#10000,6,7,8,14)
+hasLocation(#22246,#22247)
+enclosing_stmt(#22246,#22224)
+expr_containers(#22246,#22184)
 #22248=*
-typeexprs(#22248,2,#22245,1,"undefined")
-hasLocation(#22248,#20341)
-enclosing_stmt(#22248,#22223)
-expr_containers(#22248,#22183)
-literals("undefined","undefined",#22248)
+typeexprs(#22248,0,#22246,0,"T")
+hasLocation(#22248,#20337)
+enclosing_stmt(#22248,#22224)
+expr_containers(#22248,#22184)
+literals("T","T",#22248)
+typebind(#22248,#22228)
 #22249=*
-typeexprs(#22249,3,#22245,2,"""undefined""")
-hasLocation(#22249,#20345)
-enclosing_stmt(#22249,#22223)
-expr_containers(#22249,#22183)
-literals("undefined","""undefined""",#22249)
+typeexprs(#22249,2,#22246,1,"undefined")
+hasLocation(#22249,#20341)
+enclosing_stmt(#22249,#22224)
+expr_containers(#22249,#22184)
+literals("undefined","undefined",#22249)
 #22250=*
-typeexprs(#22250,28,#22245,3,"T exten ... object""")
-#22251=@"loc,{#10000},7,7,8,14"
-locations_default(#22251,#10000,7,7,8,14)
-hasLocation(#22250,#22251)
-enclosing_stmt(#22250,#22223)
-expr_containers(#22250,#22183)
-#22252=*
-typeexprs(#22252,0,#22250,0,"T")
-hasLocation(#22252,#20349)
-enclosing_stmt(#22252,#22223)
-expr_containers(#22252,#22183)
-literals("T","T",#22252)
-typebind(#22252,#22227)
+typeexprs(#22250,3,#22246,2,"""undefined""")
+hasLocation(#22250,#20345)
+enclosing_stmt(#22250,#22224)
+expr_containers(#22250,#22184)
+literals("undefined","""undefined""",#22250)
+#22251=*
+typeexprs(#22251,28,#22246,3,"T exten ... object""")
+#22252=@"loc,{#10000},7,7,8,14"
+locations_default(#22252,#10000,7,7,8,14)
+hasLocation(#22251,#22252)
+enclosing_stmt(#22251,#22224)
+expr_containers(#22251,#22184)
 #22253=*
-typeexprs(#22253,0,#22250,1,"Function")
-hasLocation(#22253,#20353)
-enclosing_stmt(#22253,#22223)
-expr_containers(#22253,#22183)
-literals("Function","Function",#22253)
+typeexprs(#22253,0,#22251,0,"T")
+hasLocation(#22253,#20349)
+enclosing_stmt(#22253,#22224)
+expr_containers(#22253,#22184)
+literals("T","T",#22253)
+typebind(#22253,#22228)
 #22254=*
-typeexprs(#22254,3,#22250,2,"""function""")
-hasLocation(#22254,#20357)
-enclosing_stmt(#22254,#22223)
-expr_containers(#22254,#22183)
-literals("function","""function""",#22254)
+typeexprs(#22254,0,#22251,1,"Function")
+hasLocation(#22254,#20353)
+enclosing_stmt(#22254,#22224)
+expr_containers(#22254,#22184)
+literals("Function","Function",#22254)
 #22255=*
-typeexprs(#22255,3,#22250,3,"""object""")
-hasLocation(#22255,#20361)
-enclosing_stmt(#22255,#22223)
-expr_containers(#22255,#22183)
-literals("object","""object""",#22255)
+typeexprs(#22255,3,#22251,2,"""function""")
+hasLocation(#22255,#20357)
+enclosing_stmt(#22255,#22224)
+expr_containers(#22255,#22184)
+literals("function","""function""",#22255)
 #22256=*
-stmts(#22256,35,#22183,1,"type T0 ... tring>;")
-#22257=@"loc,{#10000},10,3,10,29"
-locations_default(#22257,#10000,10,3,10,29)
-hasLocation(#22256,#22257)
-stmt_containers(#22256,#22183)
-#22258=*
-typeexprs(#22258,1,#22256,0,"T0")
-hasLocation(#22258,#20367)
-enclosing_stmt(#22258,#22256)
-expr_containers(#22258,#22183)
-literals("T0","T0",#22258)
-typedecl(#22258,#22190)
+typeexprs(#22256,3,#22251,3,"""object""")
+hasLocation(#22256,#20361)
+enclosing_stmt(#22256,#22224)
+expr_containers(#22256,#22184)
+literals("object","""object""",#22256)
+#22257=*
+stmts(#22257,35,#22184,1,"type T0 ... tring>;")
+#22258=@"loc,{#10000},10,3,10,29"
+locations_default(#22258,#10000,10,3,10,29)
+hasLocation(#22257,#22258)
+stmt_containers(#22257,#22184)
 #22259=*
-typeexprs(#22259,14,#22256,1,"TypeName<string>")
-#22260=@"loc,{#10000},10,13,10,28"
-locations_default(#22260,#10000,10,13,10,28)
-hasLocation(#22259,#22260)
-enclosing_stmt(#22259,#22256)
-expr_containers(#22259,#22183)
-#22261=*
-typeexprs(#22261,0,#22259,-1,"TypeName")
-hasLocation(#22261,#20371)
-enclosing_stmt(#22261,#22256)
-expr_containers(#22261,#22183)
-literals("TypeName","TypeName",#22261)
-typebind(#22261,#22189)
+typeexprs(#22259,1,#22257,0,"T0")
+hasLocation(#22259,#20367)
+enclosing_stmt(#22259,#22257)
+expr_containers(#22259,#22184)
+literals("T0","T0",#22259)
+typedecl(#22259,#22191)
+#22260=*
+typeexprs(#22260,14,#22257,1,"TypeName<string>")
+#22261=@"loc,{#10000},10,13,10,28"
+locations_default(#22261,#10000,10,13,10,28)
+hasLocation(#22260,#22261)
+enclosing_stmt(#22260,#22257)
+expr_containers(#22260,#22184)
 #22262=*
-typeexprs(#22262,2,#22259,0,"string")
-hasLocation(#22262,#20375)
-enclosing_stmt(#22262,#22256)
-expr_containers(#22262,#22183)
-literals("string","string",#22262)
+typeexprs(#22262,0,#22260,-1,"TypeName")
+hasLocation(#22262,#20371)
+enclosing_stmt(#22262,#22257)
+expr_containers(#22262,#22184)
+literals("TypeName","TypeName",#22262)
+typebind(#22262,#22190)
 #22263=*
-stmts(#22263,35,#22183,2,"type T1 ... e<""a"">;")
-#22264=@"loc,{#10000},11,3,11,26"
-locations_default(#22264,#10000,11,3,11,26)
-hasLocation(#22263,#22264)
-stmt_containers(#22263,#22183)
-#22265=*
-typeexprs(#22265,1,#22263,0,"T1")
-hasLocation(#22265,#20383)
-enclosing_stmt(#22265,#22263)
-expr_containers(#22265,#22183)
-literals("T1","T1",#22265)
-typedecl(#22265,#22191)
+typeexprs(#22263,2,#22260,0,"string")
+hasLocation(#22263,#20375)
+enclosing_stmt(#22263,#22257)
+expr_containers(#22263,#22184)
+literals("string","string",#22263)
+#22264=*
+stmts(#22264,35,#22184,2,"type T1 ... e<""a"">;")
+#22265=@"loc,{#10000},11,3,11,26"
+locations_default(#22265,#10000,11,3,11,26)
+hasLocation(#22264,#22265)
+stmt_containers(#22264,#22184)
 #22266=*
-typeexprs(#22266,14,#22263,1,"TypeName<""a"">")
-#22267=@"loc,{#10000},11,13,11,25"
-locations_default(#22267,#10000,11,13,11,25)
-hasLocation(#22266,#22267)
-enclosing_stmt(#22266,#22263)
-expr_containers(#22266,#22183)
-#22268=*
-typeexprs(#22268,0,#22266,-1,"TypeName")
-hasLocation(#22268,#20387)
-enclosing_stmt(#22268,#22263)
-expr_containers(#22268,#22183)
-literals("TypeName","TypeName",#22268)
-typebind(#22268,#22189)
+typeexprs(#22266,1,#22264,0,"T1")
+hasLocation(#22266,#20383)
+enclosing_stmt(#22266,#22264)
+expr_containers(#22266,#22184)
+literals("T1","T1",#22266)
+typedecl(#22266,#22192)
+#22267=*
+typeexprs(#22267,14,#22264,1,"TypeName<""a"">")
+#22268=@"loc,{#10000},11,13,11,25"
+locations_default(#22268,#10000,11,13,11,25)
+hasLocation(#22267,#22268)
+enclosing_stmt(#22267,#22264)
+expr_containers(#22267,#22184)
 #22269=*
-typeexprs(#22269,3,#22266,0,"""a""")
-hasLocation(#22269,#20391)
-enclosing_stmt(#22269,#22263)
-expr_containers(#22269,#22183)
-literals("a","""a""",#22269)
+typeexprs(#22269,0,#22267,-1,"TypeName")
+hasLocation(#22269,#20387)
+enclosing_stmt(#22269,#22264)
+expr_containers(#22269,#22184)
+literals("TypeName","TypeName",#22269)
+typebind(#22269,#22190)
 #22270=*
-stmts(#22270,35,#22183,3,"type T2 ... <true>;")
-#22271=@"loc,{#10000},12,3,12,27"
-locations_default(#22271,#10000,12,3,12,27)
-hasLocation(#22270,#22271)
-stmt_containers(#22270,#22183)
-#22272=*
-typeexprs(#22272,1,#22270,0,"T2")
-hasLocation(#22272,#20399)
-enclosing_stmt(#22272,#22270)
-expr_containers(#22272,#22183)
-literals("T2","T2",#22272)
-typedecl(#22272,#22192)
+typeexprs(#22270,3,#22267,0,"""a""")
+hasLocation(#22270,#20391)
+enclosing_stmt(#22270,#22264)
+expr_containers(#22270,#22184)
+literals("a","""a""",#22270)
+#22271=*
+stmts(#22271,35,#22184,3,"type T2 ... <true>;")
+#22272=@"loc,{#10000},12,3,12,27"
+locations_default(#22272,#10000,12,3,12,27)
+hasLocation(#22271,#22272)
+stmt_containers(#22271,#22184)
 #22273=*
-typeexprs(#22273,14,#22270,1,"TypeName<true>")
-#22274=@"loc,{#10000},12,13,12,26"
-locations_default(#22274,#10000,12,13,12,26)
-hasLocation(#22273,#22274)
-enclosing_stmt(#22273,#22270)
-expr_containers(#22273,#22183)
-#22275=*
-typeexprs(#22275,0,#22273,-1,"TypeName")
-hasLocation(#22275,#20403)
-enclosing_stmt(#22275,#22270)
-expr_containers(#22275,#22183)
-literals("TypeName","TypeName",#22275)
-typebind(#22275,#22189)
+typeexprs(#22273,1,#22271,0,"T2")
+hasLocation(#22273,#20399)
+enclosing_stmt(#22273,#22271)
+expr_containers(#22273,#22184)
+literals("T2","T2",#22273)
+typedecl(#22273,#22193)
+#22274=*
+typeexprs(#22274,14,#22271,1,"TypeName<true>")
+#22275=@"loc,{#10000},12,13,12,26"
+locations_default(#22275,#10000,12,13,12,26)
+hasLocation(#22274,#22275)
+enclosing_stmt(#22274,#22271)
+expr_containers(#22274,#22184)
 #22276=*
-typeexprs(#22276,5,#22273,0,"true")
-hasLocation(#22276,#20407)
-enclosing_stmt(#22276,#22270)
-expr_containers(#22276,#22183)
-literals("true","true",#22276)
+typeexprs(#22276,0,#22274,-1,"TypeName")
+hasLocation(#22276,#20403)
+enclosing_stmt(#22276,#22271)
+expr_containers(#22276,#22184)
+literals("TypeName","TypeName",#22276)
+typebind(#22276,#22190)
 #22277=*
-stmts(#22277,35,#22183,4,"type T3 ...  void>;")
-#22278=@"loc,{#10000},13,3,13,33"
-locations_default(#22278,#10000,13,3,13,33)
-hasLocation(#22277,#22278)
-stmt_containers(#22277,#22183)
-#22279=*
-typeexprs(#22279,1,#22277,0,"T3")
-hasLocation(#22279,#20415)
-enclosing_stmt(#22279,#22277)
-expr_containers(#22279,#22183)
-literals("T3","T3",#22279)
-typedecl(#22279,#22193)
+typeexprs(#22277,5,#22274,0,"true")
+hasLocation(#22277,#20407)
+enclosing_stmt(#22277,#22271)
+expr_containers(#22277,#22184)
+literals("true","true",#22277)
+#22278=*
+stmts(#22278,35,#22184,4,"type T3 ...  void>;")
+#22279=@"loc,{#10000},13,3,13,33"
+locations_default(#22279,#10000,13,3,13,33)
+hasLocation(#22278,#22279)
+stmt_containers(#22278,#22184)
 #22280=*
-typeexprs(#22280,14,#22277,1,"TypeName<() => void>")
-#22281=@"loc,{#10000},13,13,13,32"
-locations_default(#22281,#10000,13,13,13,32)
-hasLocation(#22280,#22281)
-enclosing_stmt(#22280,#22277)
-expr_containers(#22280,#22183)
-#22282=*
-typeexprs(#22282,0,#22280,-1,"TypeName")
-hasLocation(#22282,#20419)
-enclosing_stmt(#22282,#22277)
-expr_containers(#22282,#22183)
-literals("TypeName","TypeName",#22282)
-typebind(#22282,#22189)
+typeexprs(#22280,1,#22278,0,"T3")
+hasLocation(#22280,#20415)
+enclosing_stmt(#22280,#22278)
+expr_containers(#22280,#22184)
+literals("T3","T3",#22280)
+typedecl(#22280,#22194)
+#22281=*
+typeexprs(#22281,14,#22278,1,"TypeName<() => void>")
+#22282=@"loc,{#10000},13,13,13,32"
+locations_default(#22282,#10000,13,13,13,32)
+hasLocation(#22281,#22282)
+enclosing_stmt(#22281,#22278)
+expr_containers(#22281,#22184)
 #22283=*
-typeexprs(#22283,23,#22280,0,"() => void")
-#22284=@"loc,{#10000},13,22,13,31"
-locations_default(#22284,#10000,13,22,13,31)
-hasLocation(#22283,#22284)
-enclosing_stmt(#22283,#22277)
-expr_containers(#22283,#22183)
-#22285=*
-exprs(#22285,9,#22283,0,"() => void")
-hasLocation(#22285,#22284)
-enclosing_stmt(#22285,#22277)
-expr_containers(#22285,#22183)
+typeexprs(#22283,0,#22281,-1,"TypeName")
+hasLocation(#22283,#20419)
+enclosing_stmt(#22283,#22278)
+expr_containers(#22283,#22184)
+literals("TypeName","TypeName",#22283)
+typebind(#22283,#22190)
+#22284=*
+typeexprs(#22284,23,#22281,0,"() => void")
+#22285=@"loc,{#10000},13,22,13,31"
+locations_default(#22285,#10000,13,22,13,31)
+hasLocation(#22284,#22285)
+enclosing_stmt(#22284,#22278)
+expr_containers(#22284,#22184)
 #22286=*
-scopes(#22286,1)
-scopenodes(#22285,#22286)
-scopenesting(#22286,#22186)
-#22287=@"var;{arguments};{#22286}"
-variables(#22287,"arguments",#22286)
-is_arguments_object(#22287)
-#22288=*
-typeexprs(#22288,2,#22285,-3,"void")
-hasLocation(#22288,#20429)
-expr_containers(#22288,#22285)
-literals("void","void",#22288)
-#22289=*
-stmts(#22289,35,#22183,5,"type T4 ... ing[]>;")
-#22290=@"loc,{#10000},14,3,14,31"
-locations_default(#22290,#10000,14,3,14,31)
-hasLocation(#22289,#22290)
-stmt_containers(#22289,#22183)
+exprs(#22286,9,#22284,0,"() => void")
+hasLocation(#22286,#22285)
+enclosing_stmt(#22286,#22278)
+expr_containers(#22286,#22184)
+#22287=*
+scopes(#22287,1)
+scopenodes(#22286,#22287)
+scopenesting(#22287,#22187)
+#22288=@"var;{this};{#22287}"
+variables(#22288,"this",#22287)
+#22289=@"var;{arguments};{#22287}"
+variables(#22289,"arguments",#22287)
+is_arguments_object(#22289)
+#22290=*
+typeexprs(#22290,2,#22286,-3,"void")
+hasLocation(#22290,#20429)
+expr_containers(#22290,#22286)
+literals("void","void",#22290)
 #22291=*
-typeexprs(#22291,1,#22289,0,"T4")
-hasLocation(#22291,#20437)
-enclosing_stmt(#22291,#22289)
-expr_containers(#22291,#22183)
-literals("T4","T4",#22291)
-typedecl(#22291,#22194)
-#22292=*
-typeexprs(#22292,14,#22289,1,"TypeName<string[]>")
-#22293=@"loc,{#10000},14,13,14,30"
-locations_default(#22293,#10000,14,13,14,30)
-hasLocation(#22292,#22293)
-enclosing_stmt(#22292,#22289)
-expr_containers(#22292,#22183)
+stmts(#22291,35,#22184,5,"type T4 ... ing[]>;")
+#22292=@"loc,{#10000},14,3,14,31"
+locations_default(#22292,#10000,14,3,14,31)
+hasLocation(#22291,#22292)
+stmt_containers(#22291,#22184)
+#22293=*
+typeexprs(#22293,1,#22291,0,"T4")
+hasLocation(#22293,#20437)
+enclosing_stmt(#22293,#22291)
+expr_containers(#22293,#22184)
+literals("T4","T4",#22293)
+typedecl(#22293,#22195)
 #22294=*
-typeexprs(#22294,0,#22292,-1,"TypeName")
-hasLocation(#22294,#20441)
-enclosing_stmt(#22294,#22289)
-expr_containers(#22294,#22183)
-literals("TypeName","TypeName",#22294)
-typebind(#22294,#22189)
-#22295=*
-typeexprs(#22295,6,#22292,0,"string[]")
-#22296=@"loc,{#10000},14,22,14,29"
-locations_default(#22296,#10000,14,22,14,29)
-hasLocation(#22295,#22296)
-enclosing_stmt(#22295,#22289)
-expr_containers(#22295,#22183)
+typeexprs(#22294,14,#22291,1,"TypeName<string[]>")
+#22295=@"loc,{#10000},14,13,14,30"
+locations_default(#22295,#10000,14,13,14,30)
+hasLocation(#22294,#22295)
+enclosing_stmt(#22294,#22291)
+expr_containers(#22294,#22184)
+#22296=*
+typeexprs(#22296,0,#22294,-1,"TypeName")
+hasLocation(#22296,#20441)
+enclosing_stmt(#22296,#22291)
+expr_containers(#22296,#22184)
+literals("TypeName","TypeName",#22296)
+typebind(#22296,#22190)
 #22297=*
-typeexprs(#22297,2,#22295,0,"string")
-hasLocation(#22297,#20445)
-enclosing_stmt(#22297,#22289)
-expr_containers(#22297,#22183)
-literals("string","string",#22297)
-#22298=*
-stmts(#22298,35,#22183,6,"type T1 ... void)>;")
-#22299=@"loc,{#10000},17,3,17,45"
-locations_default(#22299,#10000,17,3,17,45)
-hasLocation(#22298,#22299)
-stmt_containers(#22298,#22183)
+typeexprs(#22297,6,#22294,0,"string[]")
+#22298=@"loc,{#10000},14,22,14,29"
+locations_default(#22298,#10000,14,22,14,29)
+hasLocation(#22297,#22298)
+enclosing_stmt(#22297,#22291)
+expr_containers(#22297,#22184)
+#22299=*
+typeexprs(#22299,2,#22297,0,"string")
+hasLocation(#22299,#20445)
+enclosing_stmt(#22299,#22291)
+expr_containers(#22299,#22184)
+literals("string","string",#22299)
 #22300=*
-typeexprs(#22300,1,#22298,0,"T10")
-hasLocation(#22300,#20457)
-enclosing_stmt(#22300,#22298)
-expr_containers(#22300,#22183)
-literals("T10","T10",#22300)
-typedecl(#22300,#22195)
-#22301=*
-typeexprs(#22301,14,#22298,1,"TypeNam ...  void)>")
-#22302=@"loc,{#10000},17,14,17,44"
-locations_default(#22302,#10000,17,14,17,44)
-hasLocation(#22301,#22302)
-enclosing_stmt(#22301,#22298)
-expr_containers(#22301,#22183)
+stmts(#22300,35,#22184,6,"type T1 ... void)>;")
+#22301=@"loc,{#10000},17,3,17,45"
+locations_default(#22301,#10000,17,3,17,45)
+hasLocation(#22300,#22301)
+stmt_containers(#22300,#22184)
+#22302=*
+typeexprs(#22302,1,#22300,0,"T10")
+hasLocation(#22302,#20457)
+enclosing_stmt(#22302,#22300)
+expr_containers(#22302,#22184)
+literals("T10","T10",#22302)
+typedecl(#22302,#22196)
 #22303=*
-typeexprs(#22303,0,#22301,-1,"TypeName")
-hasLocation(#22303,#20461)
-enclosing_stmt(#22303,#22298)
-expr_containers(#22303,#22183)
-literals("TypeName","TypeName",#22303)
-typebind(#22303,#22189)
-#22304=*
-typeexprs(#22304,7,#22301,0,"string  ... > void)")
-#22305=@"loc,{#10000},17,23,17,43"
-locations_default(#22305,#10000,17,23,17,43)
-hasLocation(#22304,#22305)
-enclosing_stmt(#22304,#22298)
-expr_containers(#22304,#22183)
+typeexprs(#22303,14,#22300,1,"TypeNam ...  void)>")
+#22304=@"loc,{#10000},17,14,17,44"
+locations_default(#22304,#10000,17,14,17,44)
+hasLocation(#22303,#22304)
+enclosing_stmt(#22303,#22300)
+expr_containers(#22303,#22184)
+#22305=*
+typeexprs(#22305,0,#22303,-1,"TypeName")
+hasLocation(#22305,#20461)
+enclosing_stmt(#22305,#22300)
+expr_containers(#22305,#22184)
+literals("TypeName","TypeName",#22305)
+typebind(#22305,#22190)
 #22306=*
-typeexprs(#22306,2,#22304,0,"string")
-hasLocation(#22306,#20465)
-enclosing_stmt(#22306,#22298)
-expr_containers(#22306,#22183)
-literals("string","string",#22306)
-#22307=*
-typeexprs(#22307,10,#22304,1,"(() => void)")
-#22308=@"loc,{#10000},17,32,17,43"
-locations_default(#22308,#10000,17,32,17,43)
-hasLocation(#22307,#22308)
-enclosing_stmt(#22307,#22298)
-expr_containers(#22307,#22183)
+typeexprs(#22306,7,#22303,0,"string  ... > void)")
+#22307=@"loc,{#10000},17,23,17,43"
+locations_default(#22307,#10000,17,23,17,43)
+hasLocation(#22306,#22307)
+enclosing_stmt(#22306,#22300)
+expr_containers(#22306,#22184)
+#22308=*
+typeexprs(#22308,2,#22306,0,"string")
+hasLocation(#22308,#20465)
+enclosing_stmt(#22308,#22300)
+expr_containers(#22308,#22184)
+literals("string","string",#22308)
 #22309=*
-typeexprs(#22309,23,#22307,0,"() => void")
-#22310=@"loc,{#10000},17,33,17,42"
-locations_default(#22310,#10000,17,33,17,42)
+typeexprs(#22309,10,#22306,1,"(() => void)")
+#22310=@"loc,{#10000},17,32,17,43"
+locations_default(#22310,#10000,17,32,17,43)
 hasLocation(#22309,#22310)
-enclosing_stmt(#22309,#22298)
-expr_containers(#22309,#22183)
+enclosing_stmt(#22309,#22300)
+expr_containers(#22309,#22184)
 #22311=*
-exprs(#22311,9,#22309,0,"() => void")
-hasLocation(#22311,#22310)
-enclosing_stmt(#22311,#22298)
-expr_containers(#22311,#22183)
-#22312=*
-scopes(#22312,1)
-scopenodes(#22311,#22312)
-scopenesting(#22312,#22186)
-#22313=@"var;{arguments};{#22312}"
-variables(#22313,"arguments",#22312)
-is_arguments_object(#22313)
+typeexprs(#22311,23,#22309,0,"() => void")
+#22312=@"loc,{#10000},17,33,17,42"
+locations_default(#22312,#10000,17,33,17,42)
+hasLocation(#22311,#22312)
+enclosing_stmt(#22311,#22300)
+expr_containers(#22311,#22184)
+#22313=*
+exprs(#22313,9,#22311,0,"() => void")
+hasLocation(#22313,#22312)
+enclosing_stmt(#22313,#22300)
+expr_containers(#22313,#22184)
 #22314=*
-typeexprs(#22314,2,#22311,-3,"void")
-hasLocation(#22314,#20477)
-expr_containers(#22314,#22311)
-literals("void","void",#22314)
-#22315=*
-stmts(#22315,35,#22183,7,"type T1 ... fined>;")
-#22316=@"loc,{#10000},18,3,18,53"
-locations_default(#22316,#10000,18,3,18,53)
-hasLocation(#22315,#22316)
-stmt_containers(#22315,#22183)
+scopes(#22314,1)
+scopenodes(#22313,#22314)
+scopenesting(#22314,#22187)
+#22315=@"var;{this};{#22314}"
+variables(#22315,"this",#22314)
+#22316=@"var;{arguments};{#22314}"
+variables(#22316,"arguments",#22314)
+is_arguments_object(#22316)
 #22317=*
-typeexprs(#22317,1,#22315,0,"T12")
-hasLocation(#22317,#20487)
-enclosing_stmt(#22317,#22315)
-expr_containers(#22317,#22183)
-literals("T12","T12",#22317)
-typedecl(#22317,#22196)
+typeexprs(#22317,2,#22313,-3,"void")
+hasLocation(#22317,#20477)
+expr_containers(#22317,#22313)
+literals("void","void",#22317)
 #22318=*
-typeexprs(#22318,14,#22315,1,"TypeNam ... efined>")
-#22319=@"loc,{#10000},18,14,18,52"
-locations_default(#22319,#10000,18,14,18,52)
+stmts(#22318,35,#22184,7,"type T1 ... fined>;")
+#22319=@"loc,{#10000},18,3,18,53"
+locations_default(#22319,#10000,18,3,18,53)
 hasLocation(#22318,#22319)
-enclosing_stmt(#22318,#22315)
-expr_containers(#22318,#22183)
+stmt_containers(#22318,#22184)
 #22320=*
-typeexprs(#22320,0,#22318,-1,"TypeName")
-hasLocation(#22320,#20491)
-enclosing_stmt(#22320,#22315)
-expr_containers(#22320,#22183)
-literals("TypeName","TypeName",#22320)
-typebind(#22320,#22189)
+typeexprs(#22320,1,#22318,0,"T12")
+hasLocation(#22320,#20487)
+enclosing_stmt(#22320,#22318)
+expr_containers(#22320,#22184)
+literals("T12","T12",#22320)
+typedecl(#22320,#22197)
 #22321=*
-typeexprs(#22321,7,#22318,0,"string  ... defined")
-#22322=@"loc,{#10000},18,23,18,51"
-locations_default(#22322,#10000,18,23,18,51)
+typeexprs(#22321,14,#22318,1,"TypeNam ... efined>")
+#22322=@"loc,{#10000},18,14,18,52"
+locations_default(#22322,#10000,18,14,18,52)
 hasLocation(#22321,#22322)
-enclosing_stmt(#22321,#22315)
-expr_containers(#22321,#22183)
+enclosing_stmt(#22321,#22318)
+expr_containers(#22321,#22184)
 #22323=*
-typeexprs(#22323,2,#22321,0,"string")
-hasLocation(#22323,#20495)
-enclosing_stmt(#22323,#22315)
-expr_containers(#22323,#22183)
-literals("string","string",#22323)
+typeexprs(#22323,0,#22321,-1,"TypeName")
+hasLocation(#22323,#20491)
+enclosing_stmt(#22323,#22318)
+expr_containers(#22323,#22184)
+literals("TypeName","TypeName",#22323)
+typebind(#22323,#22190)
 #22324=*
-typeexprs(#22324,6,#22321,1,"string[]")
-#22325=@"loc,{#10000},18,32,18,39"
-locations_default(#22325,#10000,18,32,18,39)
+typeexprs(#22324,7,#22321,0,"string  ... defined")
+#22325=@"loc,{#10000},18,23,18,51"
+locations_default(#22325,#10000,18,23,18,51)
 hasLocation(#22324,#22325)
-enclosing_stmt(#22324,#22315)
-expr_containers(#22324,#22183)
+enclosing_stmt(#22324,#22318)
+expr_containers(#22324,#22184)
 #22326=*
 typeexprs(#22326,2,#22324,0,"string")
-hasLocation(#22326,#20499)
-enclosing_stmt(#22326,#22315)
-expr_containers(#22326,#22183)
+hasLocation(#22326,#20495)
+enclosing_stmt(#22326,#22318)
+expr_containers(#22326,#22184)
 literals("string","string",#22326)
 #22327=*
-typeexprs(#22327,2,#22321,2,"undefined")
-hasLocation(#22327,#20507)
-enclosing_stmt(#22327,#22315)
-expr_containers(#22327,#22183)
-literals("undefined","undefined",#22327)
-#22328=*
-stmts(#22328,35,#22183,8,"type T1 ... ber[]>;")
-#22329=@"loc,{#10000},19,3,19,43"
-locations_default(#22329,#10000,19,3,19,43)
-hasLocation(#22328,#22329)
-stmt_containers(#22328,#22183)
+typeexprs(#22327,6,#22324,1,"string[]")
+#22328=@"loc,{#10000},18,32,18,39"
+locations_default(#22328,#10000,18,32,18,39)
+hasLocation(#22327,#22328)
+enclosing_stmt(#22327,#22318)
+expr_containers(#22327,#22184)
+#22329=*
+typeexprs(#22329,2,#22327,0,"string")
+hasLocation(#22329,#20499)
+enclosing_stmt(#22329,#22318)
+expr_containers(#22329,#22184)
+literals("string","string",#22329)
 #22330=*
-typeexprs(#22330,1,#22328,0,"T11")
-hasLocation(#22330,#20515)
-enclosing_stmt(#22330,#22328)
-expr_containers(#22330,#22183)
-literals("T11","T11",#22330)
-typedecl(#22330,#22197)
+typeexprs(#22330,2,#22324,2,"undefined")
+hasLocation(#22330,#20507)
+enclosing_stmt(#22330,#22318)
+expr_containers(#22330,#22184)
+literals("undefined","undefined",#22330)
 #22331=*
-typeexprs(#22331,14,#22328,1,"TypeNam ... mber[]>")
-#22332=@"loc,{#10000},19,14,19,42"
-locations_default(#22332,#10000,19,14,19,42)
+stmts(#22331,35,#22184,8,"type T1 ... ber[]>;")
+#22332=@"loc,{#10000},19,3,19,43"
+locations_default(#22332,#10000,19,3,19,43)
 hasLocation(#22331,#22332)
-enclosing_stmt(#22331,#22328)
-expr_containers(#22331,#22183)
+stmt_containers(#22331,#22184)
 #22333=*
-typeexprs(#22333,0,#22331,-1,"TypeName")
-hasLocation(#22333,#20519)
-enclosing_stmt(#22333,#22328)
-expr_containers(#22333,#22183)
-literals("TypeName","TypeName",#22333)
-typebind(#22333,#22189)
+typeexprs(#22333,1,#22331,0,"T11")
+hasLocation(#22333,#20515)
+enclosing_stmt(#22333,#22331)
+expr_containers(#22333,#22184)
+literals("T11","T11",#22333)
+typedecl(#22333,#22198)
 #22334=*
-typeexprs(#22334,7,#22331,0,"string[] | number[]")
-#22335=@"loc,{#10000},19,23,19,41"
-locations_default(#22335,#10000,19,23,19,41)
+typeexprs(#22334,14,#22331,1,"TypeNam ... mber[]>")
+#22335=@"loc,{#10000},19,14,19,42"
+locations_default(#22335,#10000,19,14,19,42)
 hasLocation(#22334,#22335)
-enclosing_stmt(#22334,#22328)
-expr_containers(#22334,#22183)
+enclosing_stmt(#22334,#22331)
+expr_containers(#22334,#22184)
 #22336=*
-typeexprs(#22336,6,#22334,0,"string[]")
-#22337=@"loc,{#10000},19,23,19,30"
-locations_default(#22337,#10000,19,23,19,30)
-hasLocation(#22336,#22337)
-enclosing_stmt(#22336,#22328)
-expr_containers(#22336,#22183)
-#22338=*
-typeexprs(#22338,2,#22336,0,"string")
-hasLocation(#22338,#20523)
-enclosing_stmt(#22338,#22328)
-expr_containers(#22338,#22183)
-literals("string","string",#22338)
+typeexprs(#22336,0,#22334,-1,"TypeName")
+hasLocation(#22336,#20519)
+enclosing_stmt(#22336,#22331)
+expr_containers(#22336,#22184)
+literals("TypeName","TypeName",#22336)
+typebind(#22336,#22190)
+#22337=*
+typeexprs(#22337,7,#22334,0,"string[] | number[]")
+#22338=@"loc,{#10000},19,23,19,41"
+locations_default(#22338,#10000,19,23,19,41)
+hasLocation(#22337,#22338)
+enclosing_stmt(#22337,#22331)
+expr_containers(#22337,#22184)
 #22339=*
-typeexprs(#22339,6,#22334,1,"number[]")
-#22340=@"loc,{#10000},19,34,19,41"
-locations_default(#22340,#10000,19,34,19,41)
+typeexprs(#22339,6,#22337,0,"string[]")
+#22340=@"loc,{#10000},19,23,19,30"
+locations_default(#22340,#10000,19,23,19,30)
 hasLocation(#22339,#22340)
-enclosing_stmt(#22339,#22328)
-expr_containers(#22339,#22183)
+enclosing_stmt(#22339,#22331)
+expr_containers(#22339,#22184)
 #22341=*
-typeexprs(#22341,2,#22339,0,"number")
-hasLocation(#22341,#20531)
-enclosing_stmt(#22341,#22328)
-expr_containers(#22341,#22183)
-literals("number","number",#22341)
+typeexprs(#22341,2,#22339,0,"string")
+hasLocation(#22341,#20523)
+enclosing_stmt(#22341,#22331)
+expr_containers(#22341,#22184)
+literals("string","string",#22341)
 #22342=*
-stmts(#22342,35,#22183,9,"type Bo ... e: T };")
-#22343=@"loc,{#10000},21,3,21,36"
-locations_default(#22343,#10000,21,3,21,36)
+typeexprs(#22342,6,#22337,1,"number[]")
+#22343=@"loc,{#10000},19,34,19,41"
+locations_default(#22343,#10000,19,34,19,41)
 hasLocation(#22342,#22343)
-stmt_containers(#22342,#22183)
+enclosing_stmt(#22342,#22331)
+expr_containers(#22342,#22184)
 #22344=*
-typeexprs(#22344,1,#22342,0,"BoxedValue")
-hasLocation(#22344,#20543)
-enclosing_stmt(#22344,#22342)
-expr_containers(#22344,#22183)
-literals("BoxedValue","BoxedValue",#22344)
-typedecl(#22344,#22198)
+typeexprs(#22344,2,#22342,0,"number")
+hasLocation(#22344,#20531)
+enclosing_stmt(#22344,#22331)
+expr_containers(#22344,#22184)
+literals("number","number",#22344)
 #22345=*
-scopes(#22345,12)
-scopenodes(#22342,#22345)
-scopenesting(#22345,#22186)
-#22346=@"local_type_name;{T};{#22345}"
-local_type_names(#22346,"T",#22345)
+stmts(#22345,35,#22184,9,"type Bo ... e: T };")
+#22346=@"loc,{#10000},21,3,21,36"
+locations_default(#22346,#10000,21,3,21,36)
+hasLocation(#22345,#22346)
+stmt_containers(#22345,#22184)
 #22347=*
-typeexprs(#22347,22,#22342,2,"T")
-hasLocation(#22347,#20547)
-enclosing_stmt(#22347,#22342)
-expr_containers(#22347,#22183)
+typeexprs(#22347,1,#22345,0,"BoxedValue")
+hasLocation(#22347,#20543)
+enclosing_stmt(#22347,#22345)
+expr_containers(#22347,#22184)
+literals("BoxedValue","BoxedValue",#22347)
+typedecl(#22347,#22199)
 #22348=*
-typeexprs(#22348,1,#22347,0,"T")
-hasLocation(#22348,#20547)
-enclosing_stmt(#22348,#22342)
-expr_containers(#22348,#22183)
-literals("T","T",#22348)
-typedecl(#22348,#22346)
-#22349=*
-typeexprs(#22349,21,#22342,1,"{ value: T }")
-#22350=@"loc,{#10000},21,24,21,35"
-locations_default(#22350,#10000,21,24,21,35)
-hasLocation(#22349,#22350)
-enclosing_stmt(#22349,#22342)
-expr_containers(#22349,#22183)
+scopes(#22348,12)
+scopenodes(#22345,#22348)
+scopenesting(#22348,#22187)
+#22349=@"local_type_name;{T};{#22348}"
+local_type_names(#22349,"T",#22348)
+#22350=*
+typeexprs(#22350,22,#22345,2,"T")
+hasLocation(#22350,#20547)
+enclosing_stmt(#22350,#22345)
+expr_containers(#22350,#22184)
 #22351=*
-properties(#22351,#22349,0,8,"value: T")
-#22352=@"loc,{#10000},21,26,21,33"
-locations_default(#22352,#10000,21,26,21,33)
-hasLocation(#22351,#22352)
-#22353=*
-exprs(#22353,0,#22351,0,"value")
-hasLocation(#22353,#20555)
-enclosing_stmt(#22353,#22342)
-expr_containers(#22353,#22183)
-literals("value","value",#22353)
-is_abstract_member(#22351)
+typeexprs(#22351,1,#22350,0,"T")
+hasLocation(#22351,#20547)
+enclosing_stmt(#22351,#22345)
+expr_containers(#22351,#22184)
+literals("T","T",#22351)
+typedecl(#22351,#22349)
+#22352=*
+typeexprs(#22352,21,#22345,1,"{ value: T }")
+#22353=@"loc,{#10000},21,24,21,35"
+locations_default(#22353,#10000,21,24,21,35)
+hasLocation(#22352,#22353)
+enclosing_stmt(#22352,#22345)
+expr_containers(#22352,#22184)
 #22354=*
-typeexprs(#22354,0,#22351,2,"T")
-hasLocation(#22354,#20559)
-enclosing_stmt(#22354,#22342)
-expr_containers(#22354,#22183)
-literals("T","T",#22354)
-typebind(#22354,#22346)
-#22355=*
-stmts(#22355,35,#22183,10,"type Bo ...  T[] };")
-#22356=@"loc,{#10000},22,3,22,38"
-locations_default(#22356,#10000,22,3,22,38)
-hasLocation(#22355,#22356)
-stmt_containers(#22355,#22183)
+properties(#22354,#22352,0,8,"value: T")
+#22355=@"loc,{#10000},21,26,21,33"
+locations_default(#22355,#10000,21,26,21,33)
+hasLocation(#22354,#22355)
+#22356=*
+exprs(#22356,0,#22354,0,"value")
+hasLocation(#22356,#20555)
+enclosing_stmt(#22356,#22345)
+expr_containers(#22356,#22184)
+literals("value","value",#22356)
+is_abstract_member(#22354)
 #22357=*
-typeexprs(#22357,1,#22355,0,"BoxedArray")
-hasLocation(#22357,#20567)
-enclosing_stmt(#22357,#22355)
-expr_containers(#22357,#22183)
-literals("BoxedArray","BoxedArray",#22357)
-typedecl(#22357,#22199)
+typeexprs(#22357,0,#22354,2,"T")
+hasLocation(#22357,#20559)
+enclosing_stmt(#22357,#22345)
+expr_containers(#22357,#22184)
+literals("T","T",#22357)
+typebind(#22357,#22349)
 #22358=*
-scopes(#22358,12)
-scopenodes(#22355,#22358)
-scopenesting(#22358,#22186)
-#22359=@"local_type_name;{T};{#22358}"
-local_type_names(#22359,"T",#22358)
+stmts(#22358,35,#22184,10,"type Bo ...  T[] };")
+#22359=@"loc,{#10000},22,3,22,38"
+locations_default(#22359,#10000,22,3,22,38)
+hasLocation(#22358,#22359)
+stmt_containers(#22358,#22184)
 #22360=*
-typeexprs(#22360,22,#22355,2,"T")
-hasLocation(#22360,#20571)
-enclosing_stmt(#22360,#22355)
-expr_containers(#22360,#22183)
+typeexprs(#22360,1,#22358,0,"BoxedArray")
+hasLocation(#22360,#20567)
+enclosing_stmt(#22360,#22358)
+expr_containers(#22360,#22184)
+literals("BoxedArray","BoxedArray",#22360)
+typedecl(#22360,#22200)
 #22361=*
-typeexprs(#22361,1,#22360,0,"T")
-hasLocation(#22361,#20571)
-enclosing_stmt(#22361,#22355)
-expr_containers(#22361,#22183)
-literals("T","T",#22361)
-typedecl(#22361,#22359)
-#22362=*
-typeexprs(#22362,21,#22355,1,"{ array: T[] }")
-#22363=@"loc,{#10000},22,24,22,37"
-locations_default(#22363,#10000,22,24,22,37)
-hasLocation(#22362,#22363)
-enclosing_stmt(#22362,#22355)
-expr_containers(#22362,#22183)
+scopes(#22361,12)
+scopenodes(#22358,#22361)
+scopenesting(#22361,#22187)
+#22362=@"local_type_name;{T};{#22361}"
+local_type_names(#22362,"T",#22361)
+#22363=*
+typeexprs(#22363,22,#22358,2,"T")
+hasLocation(#22363,#20571)
+enclosing_stmt(#22363,#22358)
+expr_containers(#22363,#22184)
 #22364=*
-properties(#22364,#22362,0,8,"array: T[]")
-#22365=@"loc,{#10000},22,26,22,35"
-locations_default(#22365,#10000,22,26,22,35)
-hasLocation(#22364,#22365)
-#22366=*
-exprs(#22366,0,#22364,0,"array")
-hasLocation(#22366,#20579)
-enclosing_stmt(#22366,#22355)
-expr_containers(#22366,#22183)
-literals("array","array",#22366)
-is_abstract_member(#22364)
+typeexprs(#22364,1,#22363,0,"T")
+hasLocation(#22364,#20571)
+enclosing_stmt(#22364,#22358)
+expr_containers(#22364,#22184)
+literals("T","T",#22364)
+typedecl(#22364,#22362)
+#22365=*
+typeexprs(#22365,21,#22358,1,"{ array: T[] }")
+#22366=@"loc,{#10000},22,24,22,37"
+locations_default(#22366,#10000,22,24,22,37)
+hasLocation(#22365,#22366)
+enclosing_stmt(#22365,#22358)
+expr_containers(#22365,#22184)
 #22367=*
-typeexprs(#22367,6,#22364,2,"T[]")
-#22368=@"loc,{#10000},22,33,22,35"
-locations_default(#22368,#10000,22,33,22,35)
+properties(#22367,#22365,0,8,"array: T[]")
+#22368=@"loc,{#10000},22,26,22,35"
+locations_default(#22368,#10000,22,26,22,35)
 hasLocation(#22367,#22368)
-enclosing_stmt(#22367,#22355)
-expr_containers(#22367,#22183)
 #22369=*
-typeexprs(#22369,0,#22367,0,"T")
-hasLocation(#22369,#20583)
-enclosing_stmt(#22369,#22355)
-expr_containers(#22369,#22183)
-literals("T","T",#22369)
-typebind(#22369,#22359)
+exprs(#22369,0,#22367,0,"array")
+hasLocation(#22369,#20579)
+enclosing_stmt(#22369,#22358)
+expr_containers(#22369,#22184)
+literals("array","array",#22369)
+is_abstract_member(#22367)
 #22370=*
-stmts(#22370,35,#22183,11,"type Bo ... lue<T>;")
-#22371=@"loc,{#10000},23,3,23,74"
-locations_default(#22371,#10000,23,3,23,74)
+typeexprs(#22370,6,#22367,2,"T[]")
+#22371=@"loc,{#10000},22,33,22,35"
+locations_default(#22371,#10000,22,33,22,35)
 hasLocation(#22370,#22371)
-stmt_containers(#22370,#22183)
+enclosing_stmt(#22370,#22358)
+expr_containers(#22370,#22184)
 #22372=*
-typeexprs(#22372,1,#22370,0,"Boxed")
-hasLocation(#22372,#20595)
-enclosing_stmt(#22372,#22370)
-expr_containers(#22372,#22183)
-literals("Boxed","Boxed",#22372)
-typedecl(#22372,#22200)
+typeexprs(#22372,0,#22370,0,"T")
+hasLocation(#22372,#20583)
+enclosing_stmt(#22372,#22358)
+expr_containers(#22372,#22184)
+literals("T","T",#22372)
+typebind(#22372,#22362)
 #22373=*
-scopes(#22373,12)
-scopenodes(#22370,#22373)
-scopenesting(#22373,#22186)
-#22374=@"local_type_name;{T};{#22373}"
-local_type_names(#22374,"T",#22373)
+stmts(#22373,35,#22184,11,"type Bo ... lue<T>;")
+#22374=@"loc,{#10000},23,3,23,74"
+locations_default(#22374,#10000,23,3,23,74)
+hasLocation(#22373,#22374)
+stmt_containers(#22373,#22184)
 #22375=*
-typeexprs(#22375,22,#22370,2,"T")
-hasLocation(#22375,#20599)
-enclosing_stmt(#22375,#22370)
-expr_containers(#22375,#22183)
+typeexprs(#22375,1,#22373,0,"Boxed")
+hasLocation(#22375,#20595)
+enclosing_stmt(#22375,#22373)
+expr_containers(#22375,#22184)
+literals("Boxed","Boxed",#22375)
+typedecl(#22375,#22201)
 #22376=*
-typeexprs(#22376,1,#22375,0,"T")
-hasLocation(#22376,#20599)
-enclosing_stmt(#22376,#22370)
-expr_containers(#22376,#22183)
-literals("T","T",#22376)
-typedecl(#22376,#22374)
-#22377=*
-typeexprs(#22377,28,#22370,1,"T exten ... alue<T>")
-#22378=@"loc,{#10000},23,19,23,73"
-locations_default(#22378,#10000,23,19,23,73)
-hasLocation(#22377,#22378)
-enclosing_stmt(#22377,#22370)
-expr_containers(#22377,#22183)
+scopes(#22376,12)
+scopenodes(#22373,#22376)
+scopenesting(#22376,#22187)
+#22377=@"local_type_name;{T};{#22376}"
+local_type_names(#22377,"T",#22376)
+#22378=*
+typeexprs(#22378,22,#22373,2,"T")
+hasLocation(#22378,#20599)
+enclosing_stmt(#22378,#22373)
+expr_containers(#22378,#22184)
 #22379=*
-typeexprs(#22379,0,#22377,0,"T")
-hasLocation(#22379,#20605)
-enclosing_stmt(#22379,#22370)
-expr_containers(#22379,#22183)
+typeexprs(#22379,1,#22378,0,"T")
+hasLocation(#22379,#20599)
+enclosing_stmt(#22379,#22373)
+expr_containers(#22379,#22184)
 literals("T","T",#22379)
-typebind(#22379,#22374)
+typedecl(#22379,#22377)
 #22380=*
-typeexprs(#22380,6,#22377,1,"any[]")
-#22381=@"loc,{#10000},23,29,23,33"
-locations_default(#22381,#10000,23,29,23,33)
+typeexprs(#22380,28,#22373,1,"T exten ... alue<T>")
+#22381=@"loc,{#10000},23,19,23,73"
+locations_default(#22381,#10000,23,19,23,73)
 hasLocation(#22380,#22381)
-enclosing_stmt(#22380,#22370)
-expr_containers(#22380,#22183)
+enclosing_stmt(#22380,#22373)
+expr_containers(#22380,#22184)
 #22382=*
-typeexprs(#22382,2,#22380,0,"any")
-hasLocation(#22382,#20609)
-enclosing_stmt(#22382,#22370)
-expr_containers(#22382,#22183)
-literals("any","any",#22382)
+typeexprs(#22382,0,#22380,0,"T")
+hasLocation(#22382,#20605)
+enclosing_stmt(#22382,#22373)
+expr_containers(#22382,#22184)
+literals("T","T",#22382)
+typebind(#22382,#22377)
 #22383=*
-typeexprs(#22383,14,#22377,2,"BoxedAr ... umber]>")
-#22384=@"loc,{#10000},23,37,23,57"
-locations_default(#22384,#10000,23,37,23,57)
+typeexprs(#22383,6,#22380,1,"any[]")
+#22384=@"loc,{#10000},23,29,23,33"
+locations_default(#22384,#10000,23,29,23,33)
 hasLocation(#22383,#22384)
-enclosing_stmt(#22383,#22370)
-expr_containers(#22383,#22183)
+enclosing_stmt(#22383,#22373)
+expr_containers(#22383,#22184)
 #22385=*
-typeexprs(#22385,0,#22383,-1,"BoxedArray")
-hasLocation(#22385,#20617)
-enclosing_stmt(#22385,#22370)
-expr_containers(#22385,#22183)
-literals("BoxedArray","BoxedArray",#22385)
-typebind(#22385,#22199)
+typeexprs(#22385,2,#22383,0,"any")
+hasLocation(#22385,#20609)
+enclosing_stmt(#22385,#22373)
+expr_containers(#22385,#22184)
+literals("any","any",#22385)
 #22386=*
-typeexprs(#22386,8,#22383,0,"T[number]")
-#22387=@"loc,{#10000},23,48,23,56"
-locations_default(#22387,#10000,23,48,23,56)
+typeexprs(#22386,14,#22380,2,"BoxedAr ... umber]>")
+#22387=@"loc,{#10000},23,37,23,57"
+locations_default(#22387,#10000,23,37,23,57)
 hasLocation(#22386,#22387)
-enclosing_stmt(#22386,#22370)
-expr_containers(#22386,#22183)
+enclosing_stmt(#22386,#22373)
+expr_containers(#22386,#22184)
 #22388=*
-typeexprs(#22388,0,#22386,0,"T")
-hasLocation(#22388,#20621)
-enclosing_stmt(#22388,#22370)
-expr_containers(#22388,#22183)
-literals("T","T",#22388)
-typebind(#22388,#22374)
+typeexprs(#22388,0,#22386,-1,"BoxedArray")
+hasLocation(#22388,#20617)
+enclosing_stmt(#22388,#22373)
+expr_containers(#22388,#22184)
+literals("BoxedArray","BoxedArray",#22388)
+typebind(#22388,#22200)
 #22389=*
-typeexprs(#22389,2,#22386,1,"number")
-hasLocation(#22389,#20625)
-enclosing_stmt(#22389,#22370)
-expr_containers(#22389,#22183)
-literals("number","number",#22389)
-#22390=*
-typeexprs(#22390,14,#22377,3,"BoxedValue<T>")
-#22391=@"loc,{#10000},23,61,23,73"
-locations_default(#22391,#10000,23,61,23,73)
-hasLocation(#22390,#22391)
-enclosing_stmt(#22390,#22370)
-expr_containers(#22390,#22183)
+typeexprs(#22389,8,#22386,0,"T[number]")
+#22390=@"loc,{#10000},23,48,23,56"
+locations_default(#22390,#10000,23,48,23,56)
+hasLocation(#22389,#22390)
+enclosing_stmt(#22389,#22373)
+expr_containers(#22389,#22184)
+#22391=*
+typeexprs(#22391,0,#22389,0,"T")
+hasLocation(#22391,#20621)
+enclosing_stmt(#22391,#22373)
+expr_containers(#22391,#22184)
+literals("T","T",#22391)
+typebind(#22391,#22377)
 #22392=*
-typeexprs(#22392,0,#22390,-1,"BoxedValue")
-hasLocation(#22392,#20633)
-enclosing_stmt(#22392,#22370)
-expr_containers(#22392,#22183)
-literals("BoxedValue","BoxedValue",#22392)
-typebind(#22392,#22198)
+typeexprs(#22392,2,#22389,1,"number")
+hasLocation(#22392,#20625)
+enclosing_stmt(#22392,#22373)
+expr_containers(#22392,#22184)
+literals("number","number",#22392)
 #22393=*
-typeexprs(#22393,0,#22390,0,"T")
-hasLocation(#22393,#20637)
-enclosing_stmt(#22393,#22370)
-expr_containers(#22393,#22183)
-literals("T","T",#22393)
-typebind(#22393,#22374)
-#22394=*
-stmts(#22394,35,#22183,12,"type T2 ... tring>;")
-#22395=@"loc,{#10000},25,3,25,27"
-locations_default(#22395,#10000,25,3,25,27)
-hasLocation(#22394,#22395)
-stmt_containers(#22394,#22183)
+typeexprs(#22393,14,#22380,3,"BoxedValue<T>")
+#22394=@"loc,{#10000},23,61,23,73"
+locations_default(#22394,#10000,23,61,23,73)
+hasLocation(#22393,#22394)
+enclosing_stmt(#22393,#22373)
+expr_containers(#22393,#22184)
+#22395=*
+typeexprs(#22395,0,#22393,-1,"BoxedValue")
+hasLocation(#22395,#20633)
+enclosing_stmt(#22395,#22373)
+expr_containers(#22395,#22184)
+literals("BoxedValue","BoxedValue",#22395)
+typebind(#22395,#22199)
 #22396=*
-typeexprs(#22396,1,#22394,0,"T20")
-hasLocation(#22396,#20645)
-enclosing_stmt(#22396,#22394)
-expr_containers(#22396,#22183)
-literals("T20","T20",#22396)
-typedecl(#22396,#22201)
+typeexprs(#22396,0,#22393,0,"T")
+hasLocation(#22396,#20637)
+enclosing_stmt(#22396,#22373)
+expr_containers(#22396,#22184)
+literals("T","T",#22396)
+typebind(#22396,#22377)
 #22397=*
-typeexprs(#22397,14,#22394,1,"Boxed<string>")
-#22398=@"loc,{#10000},25,14,25,26"
-locations_default(#22398,#10000,25,14,25,26)
+stmts(#22397,35,#22184,12,"type T2 ... tring>;")
+#22398=@"loc,{#10000},25,3,25,27"
+locations_default(#22398,#10000,25,3,25,27)
 hasLocation(#22397,#22398)
-enclosing_stmt(#22397,#22394)
-expr_containers(#22397,#22183)
+stmt_containers(#22397,#22184)
 #22399=*
-typeexprs(#22399,0,#22397,-1,"Boxed")
-hasLocation(#22399,#20649)
-enclosing_stmt(#22399,#22394)
-expr_containers(#22399,#22183)
-literals("Boxed","Boxed",#22399)
-typebind(#22399,#22200)
+typeexprs(#22399,1,#22397,0,"T20")
+hasLocation(#22399,#20645)
+enclosing_stmt(#22399,#22397)
+expr_containers(#22399,#22184)
+literals("T20","T20",#22399)
+typedecl(#22399,#22202)
 #22400=*
-typeexprs(#22400,2,#22397,0,"string")
-hasLocation(#22400,#20653)
-enclosing_stmt(#22400,#22394)
-expr_containers(#22400,#22183)
-literals("string","string",#22400)
-#22401=*
-stmts(#22401,35,#22183,13,"type T2 ... ber[]>;")
-#22402=@"loc,{#10000},26,3,26,29"
-locations_default(#22402,#10000,26,3,26,29)
-hasLocation(#22401,#22402)
-stmt_containers(#22401,#22183)
+typeexprs(#22400,14,#22397,1,"Boxed<string>")
+#22401=@"loc,{#10000},25,14,25,26"
+locations_default(#22401,#10000,25,14,25,26)
+hasLocation(#22400,#22401)
+enclosing_stmt(#22400,#22397)
+expr_containers(#22400,#22184)
+#22402=*
+typeexprs(#22402,0,#22400,-1,"Boxed")
+hasLocation(#22402,#20649)
+enclosing_stmt(#22402,#22397)
+expr_containers(#22402,#22184)
+literals("Boxed","Boxed",#22402)
+typebind(#22402,#22201)
 #22403=*
-typeexprs(#22403,1,#22401,0,"T21")
-hasLocation(#22403,#20661)
-enclosing_stmt(#22403,#22401)
-expr_containers(#22403,#22183)
-literals("T21","T21",#22403)
-typedecl(#22403,#22202)
+typeexprs(#22403,2,#22400,0,"string")
+hasLocation(#22403,#20653)
+enclosing_stmt(#22403,#22397)
+expr_containers(#22403,#22184)
+literals("string","string",#22403)
 #22404=*
-typeexprs(#22404,14,#22401,1,"Boxed<number[]>")
-#22405=@"loc,{#10000},26,14,26,28"
-locations_default(#22405,#10000,26,14,26,28)
+stmts(#22404,35,#22184,13,"type T2 ... ber[]>;")
+#22405=@"loc,{#10000},26,3,26,29"
+locations_default(#22405,#10000,26,3,26,29)
 hasLocation(#22404,#22405)
-enclosing_stmt(#22404,#22401)
-expr_containers(#22404,#22183)
+stmt_containers(#22404,#22184)
 #22406=*
-typeexprs(#22406,0,#22404,-1,"Boxed")
-hasLocation(#22406,#20665)
-enclosing_stmt(#22406,#22401)
-expr_containers(#22406,#22183)
-literals("Boxed","Boxed",#22406)
-typebind(#22406,#22200)
+typeexprs(#22406,1,#22404,0,"T21")
+hasLocation(#22406,#20661)
+enclosing_stmt(#22406,#22404)
+expr_containers(#22406,#22184)
+literals("T21","T21",#22406)
+typedecl(#22406,#22203)
 #22407=*
-typeexprs(#22407,6,#22404,0,"number[]")
-#22408=@"loc,{#10000},26,20,26,27"
-locations_default(#22408,#10000,26,20,26,27)
+typeexprs(#22407,14,#22404,1,"Boxed<number[]>")
+#22408=@"loc,{#10000},26,14,26,28"
+locations_default(#22408,#10000,26,14,26,28)
 hasLocation(#22407,#22408)
-enclosing_stmt(#22407,#22401)
-expr_containers(#22407,#22183)
+enclosing_stmt(#22407,#22404)
+expr_containers(#22407,#22184)
 #22409=*
-typeexprs(#22409,2,#22407,0,"number")
-hasLocation(#22409,#20669)
-enclosing_stmt(#22409,#22401)
-expr_containers(#22409,#22183)
-literals("number","number",#22409)
+typeexprs(#22409,0,#22407,-1,"Boxed")
+hasLocation(#22409,#20665)
+enclosing_stmt(#22409,#22404)
+expr_containers(#22409,#22184)
+literals("Boxed","Boxed",#22409)
+typebind(#22409,#22201)
 #22410=*
-stmts(#22410,35,#22183,14,"type T2 ... ber[]>;")
-#22411=@"loc,{#10000},27,3,27,38"
-locations_default(#22411,#10000,27,3,27,38)
+typeexprs(#22410,6,#22407,0,"number[]")
+#22411=@"loc,{#10000},26,20,26,27"
+locations_default(#22411,#10000,26,20,26,27)
 hasLocation(#22410,#22411)
-stmt_containers(#22410,#22183)
+enclosing_stmt(#22410,#22404)
+expr_containers(#22410,#22184)
 #22412=*
-typeexprs(#22412,1,#22410,0,"T22")
-hasLocation(#22412,#20681)
-enclosing_stmt(#22412,#22410)
-expr_containers(#22412,#22183)
-literals("T22","T22",#22412)
-typedecl(#22412,#22203)
+typeexprs(#22412,2,#22410,0,"number")
+hasLocation(#22412,#20669)
+enclosing_stmt(#22412,#22404)
+expr_containers(#22412,#22184)
+literals("number","number",#22412)
 #22413=*
-typeexprs(#22413,14,#22410,1,"Boxed<s ... mber[]>")
-#22414=@"loc,{#10000},27,14,27,37"
-locations_default(#22414,#10000,27,14,27,37)
+stmts(#22413,35,#22184,14,"type T2 ... ber[]>;")
+#22414=@"loc,{#10000},27,3,27,38"
+locations_default(#22414,#10000,27,3,27,38)
 hasLocation(#22413,#22414)
-enclosing_stmt(#22413,#22410)
-expr_containers(#22413,#22183)
+stmt_containers(#22413,#22184)
 #22415=*
-typeexprs(#22415,0,#22413,-1,"Boxed")
-hasLocation(#22415,#20685)
-enclosing_stmt(#22415,#22410)
-expr_containers(#22415,#22183)
-literals("Boxed","Boxed",#22415)
-typebind(#22415,#22200)
+typeexprs(#22415,1,#22413,0,"T22")
+hasLocation(#22415,#20681)
+enclosing_stmt(#22415,#22413)
+expr_containers(#22415,#22184)
+literals("T22","T22",#22415)
+typedecl(#22415,#22204)
 #22416=*
-typeexprs(#22416,7,#22413,0,"string | number[]")
-#22417=@"loc,{#10000},27,20,27,36"
-locations_default(#22417,#10000,27,20,27,36)
+typeexprs(#22416,14,#22413,1,"Boxed<s ... mber[]>")
+#22417=@"loc,{#10000},27,14,27,37"
+locations_default(#22417,#10000,27,14,27,37)
 hasLocation(#22416,#22417)
-enclosing_stmt(#22416,#22410)
-expr_containers(#22416,#22183)
+enclosing_stmt(#22416,#22413)
+expr_containers(#22416,#22184)
 #22418=*
-typeexprs(#22418,2,#22416,0,"string")
-hasLocation(#22418,#20689)
-enclosing_stmt(#22418,#22410)
-expr_containers(#22418,#22183)
-literals("string","string",#22418)
+typeexprs(#22418,0,#22416,-1,"Boxed")
+hasLocation(#22418,#20685)
+enclosing_stmt(#22418,#22413)
+expr_containers(#22418,#22184)
+literals("Boxed","Boxed",#22418)
+typebind(#22418,#22201)
 #22419=*
-typeexprs(#22419,6,#22416,1,"number[]")
-#22420=@"loc,{#10000},27,29,27,36"
-locations_default(#22420,#10000,27,29,27,36)
+typeexprs(#22419,7,#22416,0,"string | number[]")
+#22420=@"loc,{#10000},27,20,27,36"
+locations_default(#22420,#10000,27,20,27,36)
 hasLocation(#22419,#22420)
-enclosing_stmt(#22419,#22410)
-expr_containers(#22419,#22183)
+enclosing_stmt(#22419,#22413)
+expr_containers(#22419,#22184)
 #22421=*
-typeexprs(#22421,2,#22419,0,"number")
-hasLocation(#22421,#20693)
-enclosing_stmt(#22421,#22410)
-expr_containers(#22421,#22183)
-literals("number","number",#22421)
+typeexprs(#22421,2,#22419,0,"string")
+hasLocation(#22421,#20689)
+enclosing_stmt(#22421,#22413)
+expr_containers(#22421,#22184)
+literals("string","string",#22421)
 #22422=*
-stmts(#22422,35,#22183,15,"type Di ... er : T;")
-#22423=@"loc,{#10000},29,3,29,44"
-locations_default(#22423,#10000,29,3,29,44)
+typeexprs(#22422,6,#22419,1,"number[]")
+#22423=@"loc,{#10000},27,29,27,36"
+locations_default(#22423,#10000,27,29,27,36)
 hasLocation(#22422,#22423)
-stmt_containers(#22422,#22183)
+enclosing_stmt(#22422,#22413)
+expr_containers(#22422,#22184)
 #22424=*
-typeexprs(#22424,1,#22422,0,"Diff")
-hasLocation(#22424,#20705)
-enclosing_stmt(#22424,#22422)
-expr_containers(#22424,#22183)
-literals("Diff","Diff",#22424)
-typedecl(#22424,#22204)
+typeexprs(#22424,2,#22422,0,"number")
+hasLocation(#22424,#20693)
+enclosing_stmt(#22424,#22413)
+expr_containers(#22424,#22184)
+literals("number","number",#22424)
 #22425=*
-scopes(#22425,12)
-scopenodes(#22422,#22425)
-scopenesting(#22425,#22186)
-#22426=@"local_type_name;{T};{#22425}"
-local_type_names(#22426,"T",#22425)
-#22427=@"local_type_name;{U};{#22425}"
-local_type_names(#22427,"U",#22425)
+stmts(#22425,35,#22184,15,"type Di ... er : T;")
+#22426=@"loc,{#10000},29,3,29,44"
+locations_default(#22426,#10000,29,3,29,44)
+hasLocation(#22425,#22426)
+stmt_containers(#22425,#22184)
+#22427=*
+typeexprs(#22427,1,#22425,0,"Diff")
+hasLocation(#22427,#20705)
+enclosing_stmt(#22427,#22425)
+expr_containers(#22427,#22184)
+literals("Diff","Diff",#22427)
+typedecl(#22427,#22205)
 #22428=*
-typeexprs(#22428,22,#22422,2,"T")
-hasLocation(#22428,#20709)
-enclosing_stmt(#22428,#22422)
-expr_containers(#22428,#22183)
-#22429=*
-typeexprs(#22429,1,#22428,0,"T")
-hasLocation(#22429,#20709)
-enclosing_stmt(#22429,#22422)
-expr_containers(#22429,#22183)
-literals("T","T",#22429)
-typedecl(#22429,#22426)
-#22430=*
-typeexprs(#22430,22,#22422,3,"U")
-hasLocation(#22430,#20713)
-enclosing_stmt(#22430,#22422)
-expr_containers(#22430,#22183)
+scopes(#22428,12)
+scopenodes(#22425,#22428)
+scopenesting(#22428,#22187)
+#22429=@"local_type_name;{T};{#22428}"
+local_type_names(#22429,"T",#22428)
+#22430=@"local_type_name;{U};{#22428}"
+local_type_names(#22430,"U",#22428)
 #22431=*
-typeexprs(#22431,1,#22430,0,"U")
-hasLocation(#22431,#20713)
-enclosing_stmt(#22431,#22422)
-expr_containers(#22431,#22183)
-literals("U","U",#22431)
-typedecl(#22431,#22427)
+typeexprs(#22431,22,#22425,2,"T")
+hasLocation(#22431,#20709)
+enclosing_stmt(#22431,#22425)
+expr_containers(#22431,#22184)
 #22432=*
-typeexprs(#22432,28,#22422,1,"T exten ... ver : T")
-#22433=@"loc,{#10000},29,21,29,43"
-locations_default(#22433,#10000,29,21,29,43)
-hasLocation(#22432,#22433)
-enclosing_stmt(#22432,#22422)
-expr_containers(#22432,#22183)
+typeexprs(#22432,1,#22431,0,"T")
+hasLocation(#22432,#20709)
+enclosing_stmt(#22432,#22425)
+expr_containers(#22432,#22184)
+literals("T","T",#22432)
+typedecl(#22432,#22429)
+#22433=*
+typeexprs(#22433,22,#22425,3,"U")
+hasLocation(#22433,#20713)
+enclosing_stmt(#22433,#22425)
+expr_containers(#22433,#22184)
 #22434=*
-typeexprs(#22434,0,#22432,0,"T")
-hasLocation(#22434,#20719)
-enclosing_stmt(#22434,#22422)
-expr_containers(#22434,#22183)
-literals("T","T",#22434)
-typebind(#22434,#22426)
+typeexprs(#22434,1,#22433,0,"U")
+hasLocation(#22434,#20713)
+enclosing_stmt(#22434,#22425)
+expr_containers(#22434,#22184)
+literals("U","U",#22434)
+typedecl(#22434,#22430)
 #22435=*
-typeexprs(#22435,0,#22432,1,"U")
-hasLocation(#22435,#20723)
-enclosing_stmt(#22435,#22422)
-expr_containers(#22435,#22183)
-literals("U","U",#22435)
-typebind(#22435,#22427)
-#22436=*
-typeexprs(#22436,2,#22432,2,"never")
-hasLocation(#22436,#20727)
-enclosing_stmt(#22436,#22422)
-expr_containers(#22436,#22183)
-literals("never","never",#22436)
+typeexprs(#22435,28,#22425,1,"T exten ... ver : T")
+#22436=@"loc,{#10000},29,21,29,43"
+locations_default(#22436,#10000,29,21,29,43)
+hasLocation(#22435,#22436)
+enclosing_stmt(#22435,#22425)
+expr_containers(#22435,#22184)
 #22437=*
-typeexprs(#22437,0,#22432,3,"T")
-hasLocation(#22437,#20731)
-enclosing_stmt(#22437,#22422)
-expr_containers(#22437,#22183)
+typeexprs(#22437,0,#22435,0,"T")
+hasLocation(#22437,#20719)
+enclosing_stmt(#22437,#22425)
+expr_containers(#22437,#22184)
 literals("T","T",#22437)
-typebind(#22437,#22426)
+typebind(#22437,#22429)
 #22438=*
-stmts(#22438,35,#22183,16,"type Fi ...  never;")
-#22439=@"loc,{#10000},30,3,30,46"
-locations_default(#22439,#10000,30,3,30,46)
-hasLocation(#22438,#22439)
-stmt_containers(#22438,#22183)
+typeexprs(#22438,0,#22435,1,"U")
+hasLocation(#22438,#20723)
+enclosing_stmt(#22438,#22425)
+expr_containers(#22438,#22184)
+literals("U","U",#22438)
+typebind(#22438,#22430)
+#22439=*
+typeexprs(#22439,2,#22435,2,"never")
+hasLocation(#22439,#20727)
+enclosing_stmt(#22439,#22425)
+expr_containers(#22439,#22184)
+literals("never","never",#22439)
 #22440=*
-typeexprs(#22440,1,#22438,0,"Filter")
-hasLocation(#22440,#20737)
-enclosing_stmt(#22440,#22438)
-expr_containers(#22440,#22183)
-literals("Filter","Filter",#22440)
-typedecl(#22440,#22205)
+typeexprs(#22440,0,#22435,3,"T")
+hasLocation(#22440,#20731)
+enclosing_stmt(#22440,#22425)
+expr_containers(#22440,#22184)
+literals("T","T",#22440)
+typebind(#22440,#22429)
 #22441=*
-scopes(#22441,12)
-scopenodes(#22438,#22441)
-scopenesting(#22441,#22186)
-#22442=@"local_type_name;{T};{#22441}"
-local_type_names(#22442,"T",#22441)
-#22443=@"local_type_name;{U};{#22441}"
-local_type_names(#22443,"U",#22441)
+stmts(#22441,35,#22184,16,"type Fi ...  never;")
+#22442=@"loc,{#10000},30,3,30,46"
+locations_default(#22442,#10000,30,3,30,46)
+hasLocation(#22441,#22442)
+stmt_containers(#22441,#22184)
+#22443=*
+typeexprs(#22443,1,#22441,0,"Filter")
+hasLocation(#22443,#20737)
+enclosing_stmt(#22443,#22441)
+expr_containers(#22443,#22184)
+literals("Filter","Filter",#22443)
+typedecl(#22443,#22206)
 #22444=*
-typeexprs(#22444,22,#22438,2,"T")
-hasLocation(#22444,#20741)
-enclosing_stmt(#22444,#22438)
-expr_containers(#22444,#22183)
-#22445=*
-typeexprs(#22445,1,#22444,0,"T")
-hasLocation(#22445,#20741)
-enclosing_stmt(#22445,#22438)
-expr_containers(#22445,#22183)
-literals("T","T",#22445)
-typedecl(#22445,#22442)
-#22446=*
-typeexprs(#22446,22,#22438,3,"U")
-hasLocation(#22446,#20745)
-enclosing_stmt(#22446,#22438)
-expr_containers(#22446,#22183)
+scopes(#22444,12)
+scopenodes(#22441,#22444)
+scopenesting(#22444,#22187)
+#22445=@"local_type_name;{T};{#22444}"
+local_type_names(#22445,"T",#22444)
+#22446=@"local_type_name;{U};{#22444}"
+local_type_names(#22446,"U",#22444)
 #22447=*
-typeexprs(#22447,1,#22446,0,"U")
-hasLocation(#22447,#20745)
-enclosing_stmt(#22447,#22438)
-expr_containers(#22447,#22183)
-literals("U","U",#22447)
-typedecl(#22447,#22443)
+typeexprs(#22447,22,#22441,2,"T")
+hasLocation(#22447,#20741)
+enclosing_stmt(#22447,#22441)
+expr_containers(#22447,#22184)
 #22448=*
-typeexprs(#22448,28,#22438,1,"T exten ... : never")
-#22449=@"loc,{#10000},30,23,30,45"
-locations_default(#22449,#10000,30,23,30,45)
-hasLocation(#22448,#22449)
-enclosing_stmt(#22448,#22438)
-expr_containers(#22448,#22183)
+typeexprs(#22448,1,#22447,0,"T")
+hasLocation(#22448,#20741)
+enclosing_stmt(#22448,#22441)
+expr_containers(#22448,#22184)
+literals("T","T",#22448)
+typedecl(#22448,#22445)
+#22449=*
+typeexprs(#22449,22,#22441,3,"U")
+hasLocation(#22449,#20745)
+enclosing_stmt(#22449,#22441)
+expr_containers(#22449,#22184)
 #22450=*
-typeexprs(#22450,0,#22448,0,"T")
-hasLocation(#22450,#20751)
-enclosing_stmt(#22450,#22438)
-expr_containers(#22450,#22183)
-literals("T","T",#22450)
-typebind(#22450,#22442)
+typeexprs(#22450,1,#22449,0,"U")
+hasLocation(#22450,#20745)
+enclosing_stmt(#22450,#22441)
+expr_containers(#22450,#22184)
+literals("U","U",#22450)
+typedecl(#22450,#22446)
 #22451=*
-typeexprs(#22451,0,#22448,1,"U")
-hasLocation(#22451,#20755)
-enclosing_stmt(#22451,#22438)
-expr_containers(#22451,#22183)
-literals("U","U",#22451)
-typebind(#22451,#22443)
-#22452=*
-typeexprs(#22452,0,#22448,2,"T")
-hasLocation(#22452,#20759)
-enclosing_stmt(#22452,#22438)
-expr_containers(#22452,#22183)
-literals("T","T",#22452)
-typebind(#22452,#22442)
+typeexprs(#22451,28,#22441,1,"T exten ... : never")
+#22452=@"loc,{#10000},30,23,30,45"
+locations_default(#22452,#10000,30,23,30,45)
+hasLocation(#22451,#22452)
+enclosing_stmt(#22451,#22441)
+expr_containers(#22451,#22184)
 #22453=*
-typeexprs(#22453,2,#22448,3,"never")
-hasLocation(#22453,#20763)
-enclosing_stmt(#22453,#22438)
-expr_containers(#22453,#22183)
-literals("never","never",#22453)
+typeexprs(#22453,0,#22451,0,"T")
+hasLocation(#22453,#20751)
+enclosing_stmt(#22453,#22441)
+expr_containers(#22453,#22184)
+literals("T","T",#22453)
+typebind(#22453,#22445)
 #22454=*
-stmts(#22454,35,#22183,17,"type T3 ... | ""f"">;")
-#22455=@"loc,{#10000},32,3,32,58"
-locations_default(#22455,#10000,32,3,32,58)
-hasLocation(#22454,#22455)
-stmt_containers(#22454,#22183)
+typeexprs(#22454,0,#22451,1,"U")
+hasLocation(#22454,#20755)
+enclosing_stmt(#22454,#22441)
+expr_containers(#22454,#22184)
+literals("U","U",#22454)
+typebind(#22454,#22446)
+#22455=*
+typeexprs(#22455,0,#22451,2,"T")
+hasLocation(#22455,#20759)
+enclosing_stmt(#22455,#22441)
+expr_containers(#22455,#22184)
+literals("T","T",#22455)
+typebind(#22455,#22445)
 #22456=*
-typeexprs(#22456,1,#22454,0,"T30")
-hasLocation(#22456,#20769)
-enclosing_stmt(#22456,#22454)
-expr_containers(#22456,#22183)
-literals("T30","T30",#22456)
-typedecl(#22456,#22206)
+typeexprs(#22456,2,#22451,3,"never")
+hasLocation(#22456,#20763)
+enclosing_stmt(#22456,#22441)
+expr_containers(#22456,#22184)
+literals("never","never",#22456)
 #22457=*
-typeexprs(#22457,14,#22454,1,"Diff<""a ...  | ""f"">")
-#22458=@"loc,{#10000},32,14,32,57"
-locations_default(#22458,#10000,32,14,32,57)
+stmts(#22457,35,#22184,17,"type T3 ... | ""f"">;")
+#22458=@"loc,{#10000},32,3,32,58"
+locations_default(#22458,#10000,32,3,32,58)
 hasLocation(#22457,#22458)
-enclosing_stmt(#22457,#22454)
-expr_containers(#22457,#22183)
+stmt_containers(#22457,#22184)
 #22459=*
-typeexprs(#22459,0,#22457,-1,"Diff")
-hasLocation(#22459,#20773)
-enclosing_stmt(#22459,#22454)
-expr_containers(#22459,#22183)
-literals("Diff","Diff",#22459)
-typebind(#22459,#22204)
+typeexprs(#22459,1,#22457,0,"T30")
+hasLocation(#22459,#20769)
+enclosing_stmt(#22459,#22457)
+expr_containers(#22459,#22184)
+literals("T30","T30",#22459)
+typedecl(#22459,#22207)
 #22460=*
-typeexprs(#22460,7,#22457,0,"""a"" | "" ... "" | ""d""")
-#22461=@"loc,{#10000},32,19,32,39"
-locations_default(#22461,#10000,32,19,32,39)
+typeexprs(#22460,14,#22457,1,"Diff<""a ...  | ""f"">")
+#22461=@"loc,{#10000},32,14,32,57"
+locations_default(#22461,#10000,32,14,32,57)
 hasLocation(#22460,#22461)
-enclosing_stmt(#22460,#22454)
-expr_containers(#22460,#22183)
+enclosing_stmt(#22460,#22457)
+expr_containers(#22460,#22184)
 #22462=*
-typeexprs(#22462,3,#22460,0,"""a""")
-hasLocation(#22462,#20777)
-enclosing_stmt(#22462,#22454)
-expr_containers(#22462,#22183)
-literals("a","""a""",#22462)
+typeexprs(#22462,0,#22460,-1,"Diff")
+hasLocation(#22462,#20773)
+enclosing_stmt(#22462,#22457)
+expr_containers(#22462,#22184)
+literals("Diff","Diff",#22462)
+typebind(#22462,#22205)
 #22463=*
-typeexprs(#22463,3,#22460,1,"""b""")
-hasLocation(#22463,#20781)
-enclosing_stmt(#22463,#22454)
-expr_containers(#22463,#22183)
-literals("b","""b""",#22463)
-#22464=*
-typeexprs(#22464,3,#22460,2,"""c""")
-hasLocation(#22464,#20785)
-enclosing_stmt(#22464,#22454)
-expr_containers(#22464,#22183)
-literals("c","""c""",#22464)
+typeexprs(#22463,7,#22460,0,"""a"" | "" ... "" | ""d""")
+#22464=@"loc,{#10000},32,19,32,39"
+locations_default(#22464,#10000,32,19,32,39)
+hasLocation(#22463,#22464)
+enclosing_stmt(#22463,#22457)
+expr_containers(#22463,#22184)
 #22465=*
-typeexprs(#22465,3,#22460,3,"""d""")
-hasLocation(#22465,#20789)
-enclosing_stmt(#22465,#22454)
-expr_containers(#22465,#22183)
-literals("d","""d""",#22465)
+typeexprs(#22465,3,#22463,0,"""a""")
+hasLocation(#22465,#20777)
+enclosing_stmt(#22465,#22457)
+expr_containers(#22465,#22184)
+literals("a","""a""",#22465)
 #22466=*
-typeexprs(#22466,7,#22457,1,"""a"" | ""c"" | ""f""")
-#22467=@"loc,{#10000},32,42,32,56"
-locations_default(#22467,#10000,32,42,32,56)
-hasLocation(#22466,#22467)
-enclosing_stmt(#22466,#22454)
-expr_containers(#22466,#22183)
+typeexprs(#22466,3,#22463,1,"""b""")
+hasLocation(#22466,#20781)
+enclosing_stmt(#22466,#22457)
+expr_containers(#22466,#22184)
+literals("b","""b""",#22466)
+#22467=*
+typeexprs(#22467,3,#22463,2,"""c""")
+hasLocation(#22467,#20785)
+enclosing_stmt(#22467,#22457)
+expr_containers(#22467,#22184)
+literals("c","""c""",#22467)
 #22468=*
-typeexprs(#22468,3,#22466,0,"""a""")
-hasLocation(#22468,#20793)
-enclosing_stmt(#22468,#22454)
-expr_containers(#22468,#22183)
-literals("a","""a""",#22468)
+typeexprs(#22468,3,#22463,3,"""d""")
+hasLocation(#22468,#20789)
+enclosing_stmt(#22468,#22457)
+expr_containers(#22468,#22184)
+literals("d","""d""",#22468)
 #22469=*
-typeexprs(#22469,3,#22466,1,"""c""")
-hasLocation(#22469,#20797)
-enclosing_stmt(#22469,#22454)
-expr_containers(#22469,#22183)
-literals("c","""c""",#22469)
-#22470=*
-typeexprs(#22470,3,#22466,2,"""f""")
-hasLocation(#22470,#20801)
-enclosing_stmt(#22470,#22454)
-expr_containers(#22470,#22183)
-literals("f","""f""",#22470)
+typeexprs(#22469,7,#22460,1,"""a"" | ""c"" | ""f""")
+#22470=@"loc,{#10000},32,42,32,56"
+locations_default(#22470,#10000,32,42,32,56)
+hasLocation(#22469,#22470)
+enclosing_stmt(#22469,#22457)
+expr_containers(#22469,#22184)
 #22471=*
-stmts(#22471,35,#22183,18,"type T3 ... | ""f"">;")
-#22472=@"loc,{#10000},33,3,33,60"
-locations_default(#22472,#10000,33,3,33,60)
-hasLocation(#22471,#22472)
-stmt_containers(#22471,#22183)
+typeexprs(#22471,3,#22469,0,"""a""")
+hasLocation(#22471,#20793)
+enclosing_stmt(#22471,#22457)
+expr_containers(#22471,#22184)
+literals("a","""a""",#22471)
+#22472=*
+typeexprs(#22472,3,#22469,1,"""c""")
+hasLocation(#22472,#20797)
+enclosing_stmt(#22472,#22457)
+expr_containers(#22472,#22184)
+literals("c","""c""",#22472)
 #22473=*
-typeexprs(#22473,1,#22471,0,"T31")
-hasLocation(#22473,#20809)
-enclosing_stmt(#22473,#22471)
-expr_containers(#22473,#22183)
-literals("T31","T31",#22473)
-typedecl(#22473,#22207)
+typeexprs(#22473,3,#22469,2,"""f""")
+hasLocation(#22473,#20801)
+enclosing_stmt(#22473,#22457)
+expr_containers(#22473,#22184)
+literals("f","""f""",#22473)
 #22474=*
-typeexprs(#22474,14,#22471,1,"Filter< ...  | ""f"">")
-#22475=@"loc,{#10000},33,14,33,59"
-locations_default(#22475,#10000,33,14,33,59)
+stmts(#22474,35,#22184,18,"type T3 ... | ""f"">;")
+#22475=@"loc,{#10000},33,3,33,60"
+locations_default(#22475,#10000,33,3,33,60)
 hasLocation(#22474,#22475)
-enclosing_stmt(#22474,#22471)
-expr_containers(#22474,#22183)
+stmt_containers(#22474,#22184)
 #22476=*
-typeexprs(#22476,0,#22474,-1,"Filter")
-hasLocation(#22476,#20813)
-enclosing_stmt(#22476,#22471)
-expr_containers(#22476,#22183)
-literals("Filter","Filter",#22476)
-typebind(#22476,#22205)
+typeexprs(#22476,1,#22474,0,"T31")
+hasLocation(#22476,#20809)
+enclosing_stmt(#22476,#22474)
+expr_containers(#22476,#22184)
+literals("T31","T31",#22476)
+typedecl(#22476,#22208)
 #22477=*
-typeexprs(#22477,7,#22474,0,"""a"" | "" ... "" | ""d""")
-#22478=@"loc,{#10000},33,21,33,41"
-locations_default(#22478,#10000,33,21,33,41)
+typeexprs(#22477,14,#22474,1,"Filter< ...  | ""f"">")
+#22478=@"loc,{#10000},33,14,33,59"
+locations_default(#22478,#10000,33,14,33,59)
 hasLocation(#22477,#22478)
-enclosing_stmt(#22477,#22471)
-expr_containers(#22477,#22183)
+enclosing_stmt(#22477,#22474)
+expr_containers(#22477,#22184)
 #22479=*
-typeexprs(#22479,3,#22477,0,"""a""")
-hasLocation(#22479,#20817)
-enclosing_stmt(#22479,#22471)
-expr_containers(#22479,#22183)
-literals("a","""a""",#22479)
+typeexprs(#22479,0,#22477,-1,"Filter")
+hasLocation(#22479,#20813)
+enclosing_stmt(#22479,#22474)
+expr_containers(#22479,#22184)
+literals("Filter","Filter",#22479)
+typebind(#22479,#22206)
 #22480=*
-typeexprs(#22480,3,#22477,1,"""b""")
-hasLocation(#22480,#20821)
-enclosing_stmt(#22480,#22471)
-expr_containers(#22480,#22183)
-literals("b","""b""",#22480)
-#22481=*
-typeexprs(#22481,3,#22477,2,"""c""")
-hasLocation(#22481,#20825)
-enclosing_stmt(#22481,#22471)
-expr_containers(#22481,#22183)
-literals("c","""c""",#22481)
+typeexprs(#22480,7,#22477,0,"""a"" | "" ... "" | ""d""")
+#22481=@"loc,{#10000},33,21,33,41"
+locations_default(#22481,#10000,33,21,33,41)
+hasLocation(#22480,#22481)
+enclosing_stmt(#22480,#22474)
+expr_containers(#22480,#22184)
 #22482=*
-typeexprs(#22482,3,#22477,3,"""d""")
-hasLocation(#22482,#20829)
-enclosing_stmt(#22482,#22471)
-expr_containers(#22482,#22183)
-literals("d","""d""",#22482)
+typeexprs(#22482,3,#22480,0,"""a""")
+hasLocation(#22482,#20817)
+enclosing_stmt(#22482,#22474)
+expr_containers(#22482,#22184)
+literals("a","""a""",#22482)
 #22483=*
-typeexprs(#22483,7,#22474,1,"""a"" | ""c"" | ""f""")
-#22484=@"loc,{#10000},33,44,33,58"
-locations_default(#22484,#10000,33,44,33,58)
-hasLocation(#22483,#22484)
-enclosing_stmt(#22483,#22471)
-expr_containers(#22483,#22183)
+typeexprs(#22483,3,#22480,1,"""b""")
+hasLocation(#22483,#20821)
+enclosing_stmt(#22483,#22474)
+expr_containers(#22483,#22184)
+literals("b","""b""",#22483)
+#22484=*
+typeexprs(#22484,3,#22480,2,"""c""")
+hasLocation(#22484,#20825)
+enclosing_stmt(#22484,#22474)
+expr_containers(#22484,#22184)
+literals("c","""c""",#22484)
 #22485=*
-typeexprs(#22485,3,#22483,0,"""a""")
-hasLocation(#22485,#20833)
-enclosing_stmt(#22485,#22471)
-expr_containers(#22485,#22183)
-literals("a","""a""",#22485)
+typeexprs(#22485,3,#22480,3,"""d""")
+hasLocation(#22485,#20829)
+enclosing_stmt(#22485,#22474)
+expr_containers(#22485,#22184)
+literals("d","""d""",#22485)
 #22486=*
-typeexprs(#22486,3,#22483,1,"""c""")
-hasLocation(#22486,#20837)
-enclosing_stmt(#22486,#22471)
-expr_containers(#22486,#22183)
-literals("c","""c""",#22486)
-#22487=*
-typeexprs(#22487,3,#22483,2,"""f""")
-hasLocation(#22487,#20841)
-enclosing_stmt(#22487,#22471)
-expr_containers(#22487,#22183)
-literals("f","""f""",#22487)
+typeexprs(#22486,7,#22477,1,"""a"" | ""c"" | ""f""")
+#22487=@"loc,{#10000},33,44,33,58"
+locations_default(#22487,#10000,33,44,33,58)
+hasLocation(#22486,#22487)
+enclosing_stmt(#22486,#22474)
+expr_containers(#22486,#22184)
 #22488=*
-stmts(#22488,35,#22183,19,"type T3 ... ction>;")
-#22489=@"loc,{#10000},34,3,34,60"
-locations_default(#22489,#10000,34,3,34,60)
-hasLocation(#22488,#22489)
-stmt_containers(#22488,#22183)
+typeexprs(#22488,3,#22486,0,"""a""")
+hasLocation(#22488,#20833)
+enclosing_stmt(#22488,#22474)
+expr_containers(#22488,#22184)
+literals("a","""a""",#22488)
+#22489=*
+typeexprs(#22489,3,#22486,1,"""c""")
+hasLocation(#22489,#20837)
+enclosing_stmt(#22489,#22474)
+expr_containers(#22489,#22184)
+literals("c","""c""",#22489)
 #22490=*
-typeexprs(#22490,1,#22488,0,"T32")
-hasLocation(#22490,#20849)
-enclosing_stmt(#22490,#22488)
-expr_containers(#22490,#22183)
-literals("T32","T32",#22490)
-typedecl(#22490,#22208)
+typeexprs(#22490,3,#22486,2,"""f""")
+hasLocation(#22490,#20841)
+enclosing_stmt(#22490,#22474)
+expr_containers(#22490,#22184)
+literals("f","""f""",#22490)
 #22491=*
-typeexprs(#22491,14,#22488,1,"Diff<st ... nction>")
-#22492=@"loc,{#10000},34,14,34,59"
-locations_default(#22492,#10000,34,14,34,59)
+stmts(#22491,35,#22184,19,"type T3 ... ction>;")
+#22492=@"loc,{#10000},34,3,34,60"
+locations_default(#22492,#10000,34,3,34,60)
 hasLocation(#22491,#22492)
-enclosing_stmt(#22491,#22488)
-expr_containers(#22491,#22183)
+stmt_containers(#22491,#22184)
 #22493=*
-typeexprs(#22493,0,#22491,-1,"Diff")
-hasLocation(#22493,#20853)
-enclosing_stmt(#22493,#22488)
-expr_containers(#22493,#22183)
-literals("Diff","Diff",#22493)
-typebind(#22493,#22204)
+typeexprs(#22493,1,#22491,0,"T32")
+hasLocation(#22493,#20849)
+enclosing_stmt(#22493,#22491)
+expr_containers(#22493,#22184)
+literals("T32","T32",#22493)
+typedecl(#22493,#22209)
 #22494=*
-typeexprs(#22494,7,#22491,0,"string  ... > void)")
-#22495=@"loc,{#10000},34,19,34,48"
-locations_default(#22495,#10000,34,19,34,48)
+typeexprs(#22494,14,#22491,1,"Diff<st ... nction>")
+#22495=@"loc,{#10000},34,14,34,59"
+locations_default(#22495,#10000,34,14,34,59)
 hasLocation(#22494,#22495)
-enclosing_stmt(#22494,#22488)
-expr_containers(#22494,#22183)
+enclosing_stmt(#22494,#22491)
+expr_containers(#22494,#22184)
 #22496=*
-typeexprs(#22496,2,#22494,0,"string")
-hasLocation(#22496,#20857)
-enclosing_stmt(#22496,#22488)
-expr_containers(#22496,#22183)
-literals("string","string",#22496)
+typeexprs(#22496,0,#22494,-1,"Diff")
+hasLocation(#22496,#20853)
+enclosing_stmt(#22496,#22491)
+expr_containers(#22496,#22184)
+literals("Diff","Diff",#22496)
+typebind(#22496,#22205)
 #22497=*
-typeexprs(#22497,2,#22494,1,"number")
-hasLocation(#22497,#20861)
-enclosing_stmt(#22497,#22488)
-expr_containers(#22497,#22183)
-literals("number","number",#22497)
-#22498=*
-typeexprs(#22498,10,#22494,2,"(() => void)")
-#22499=@"loc,{#10000},34,37,34,48"
-locations_default(#22499,#10000,34,37,34,48)
-hasLocation(#22498,#22499)
-enclosing_stmt(#22498,#22488)
-expr_containers(#22498,#22183)
+typeexprs(#22497,7,#22494,0,"string  ... > void)")
+#22498=@"loc,{#10000},34,19,34,48"
+locations_default(#22498,#10000,34,19,34,48)
+hasLocation(#22497,#22498)
+enclosing_stmt(#22497,#22491)
+expr_containers(#22497,#22184)
+#22499=*
+typeexprs(#22499,2,#22497,0,"string")
+hasLocation(#22499,#20857)
+enclosing_stmt(#22499,#22491)
+expr_containers(#22499,#22184)
+literals("string","string",#22499)
 #22500=*
-typeexprs(#22500,23,#22498,0,"() => void")
-#22501=@"loc,{#10000},34,38,34,47"
-locations_default(#22501,#10000,34,38,34,47)
-hasLocation(#22500,#22501)
-enclosing_stmt(#22500,#22488)
-expr_containers(#22500,#22183)
-#22502=*
-exprs(#22502,9,#22500,0,"() => void")
-hasLocation(#22502,#22501)
-enclosing_stmt(#22502,#22488)
-expr_containers(#22502,#22183)
+typeexprs(#22500,2,#22497,1,"number")
+hasLocation(#22500,#20861)
+enclosing_stmt(#22500,#22491)
+expr_containers(#22500,#22184)
+literals("number","number",#22500)
+#22501=*
+typeexprs(#22501,10,#22497,2,"(() => void)")
+#22502=@"loc,{#10000},34,37,34,48"
+locations_default(#22502,#10000,34,37,34,48)
+hasLocation(#22501,#22502)
+enclosing_stmt(#22501,#22491)
+expr_containers(#22501,#22184)
 #22503=*
-scopes(#22503,1)
-scopenodes(#22502,#22503)
-scopenesting(#22503,#22186)
-#22504=@"var;{arguments};{#22503}"
-variables(#22504,"arguments",#22503)
-is_arguments_object(#22504)
+typeexprs(#22503,23,#22501,0,"() => void")
+#22504=@"loc,{#10000},34,38,34,47"
+locations_default(#22504,#10000,34,38,34,47)
+hasLocation(#22503,#22504)
+enclosing_stmt(#22503,#22491)
+expr_containers(#22503,#22184)
 #22505=*
-typeexprs(#22505,2,#22502,-3,"void")
-hasLocation(#22505,#20873)
-expr_containers(#22505,#22502)
-literals("void","void",#22505)
+exprs(#22505,9,#22503,0,"() => void")
+hasLocation(#22505,#22504)
+enclosing_stmt(#22505,#22491)
+expr_containers(#22505,#22184)
 #22506=*
-typeexprs(#22506,0,#22491,1,"Function")
-hasLocation(#22506,#20879)
-enclosing_stmt(#22506,#22488)
-expr_containers(#22506,#22183)
-literals("Function","Function",#22506)
-#22507=*
-stmts(#22507,35,#22183,20,"type T3 ... ction>;")
-#22508=@"loc,{#10000},35,3,35,62"
-locations_default(#22508,#10000,35,3,35,62)
-hasLocation(#22507,#22508)
-stmt_containers(#22507,#22183)
+scopes(#22506,1)
+scopenodes(#22505,#22506)
+scopenesting(#22506,#22187)
+#22507=@"var;{this};{#22506}"
+variables(#22507,"this",#22506)
+#22508=@"var;{arguments};{#22506}"
+variables(#22508,"arguments",#22506)
+is_arguments_object(#22508)
 #22509=*
-typeexprs(#22509,1,#22507,0,"T33")
-hasLocation(#22509,#20887)
-enclosing_stmt(#22509,#22507)
-expr_containers(#22509,#22183)
-literals("T33","T33",#22509)
-typedecl(#22509,#22209)
+typeexprs(#22509,2,#22505,-3,"void")
+hasLocation(#22509,#20873)
+expr_containers(#22509,#22505)
+literals("void","void",#22509)
 #22510=*
-typeexprs(#22510,14,#22507,1,"Filter< ... nction>")
-#22511=@"loc,{#10000},35,14,35,61"
-locations_default(#22511,#10000,35,14,35,61)
-hasLocation(#22510,#22511)
-enclosing_stmt(#22510,#22507)
-expr_containers(#22510,#22183)
-#22512=*
-typeexprs(#22512,0,#22510,-1,"Filter")
-hasLocation(#22512,#20891)
-enclosing_stmt(#22512,#22507)
-expr_containers(#22512,#22183)
-literals("Filter","Filter",#22512)
-typebind(#22512,#22205)
+typeexprs(#22510,0,#22494,1,"Function")
+hasLocation(#22510,#20879)
+enclosing_stmt(#22510,#22491)
+expr_containers(#22510,#22184)
+literals("Function","Function",#22510)
+#22511=*
+stmts(#22511,35,#22184,20,"type T3 ... ction>;")
+#22512=@"loc,{#10000},35,3,35,62"
+locations_default(#22512,#10000,35,3,35,62)
+hasLocation(#22511,#22512)
+stmt_containers(#22511,#22184)
 #22513=*
-typeexprs(#22513,7,#22510,0,"string  ... > void)")
-#22514=@"loc,{#10000},35,21,35,50"
-locations_default(#22514,#10000,35,21,35,50)
-hasLocation(#22513,#22514)
-enclosing_stmt(#22513,#22507)
-expr_containers(#22513,#22183)
-#22515=*
-typeexprs(#22515,2,#22513,0,"string")
-hasLocation(#22515,#20895)
-enclosing_stmt(#22515,#22507)
-expr_containers(#22515,#22183)
-literals("string","string",#22515)
+typeexprs(#22513,1,#22511,0,"T33")
+hasLocation(#22513,#20887)
+enclosing_stmt(#22513,#22511)
+expr_containers(#22513,#22184)
+literals("T33","T33",#22513)
+typedecl(#22513,#22210)
+#22514=*
+typeexprs(#22514,14,#22511,1,"Filter< ... nction>")
+#22515=@"loc,{#10000},35,14,35,61"
+locations_default(#22515,#10000,35,14,35,61)
+hasLocation(#22514,#22515)
+enclosing_stmt(#22514,#22511)
+expr_containers(#22514,#22184)
 #22516=*
-typeexprs(#22516,2,#22513,1,"number")
-hasLocation(#22516,#20899)
-enclosing_stmt(#22516,#22507)
-expr_containers(#22516,#22183)
-literals("number","number",#22516)
+typeexprs(#22516,0,#22514,-1,"Filter")
+hasLocation(#22516,#20891)
+enclosing_stmt(#22516,#22511)
+expr_containers(#22516,#22184)
+literals("Filter","Filter",#22516)
+typebind(#22516,#22206)
 #22517=*
-typeexprs(#22517,10,#22513,2,"(() => void)")
-#22518=@"loc,{#10000},35,39,35,50"
-locations_default(#22518,#10000,35,39,35,50)
+typeexprs(#22517,7,#22514,0,"string  ... > void)")
+#22518=@"loc,{#10000},35,21,35,50"
+locations_default(#22518,#10000,35,21,35,50)
 hasLocation(#22517,#22518)
-enclosing_stmt(#22517,#22507)
-expr_containers(#22517,#22183)
+enclosing_stmt(#22517,#22511)
+expr_containers(#22517,#22184)
 #22519=*
-typeexprs(#22519,23,#22517,0,"() => void")
-#22520=@"loc,{#10000},35,40,35,49"
-locations_default(#22520,#10000,35,40,35,49)
-hasLocation(#22519,#22520)
-enclosing_stmt(#22519,#22507)
-expr_containers(#22519,#22183)
+typeexprs(#22519,2,#22517,0,"string")
+hasLocation(#22519,#20895)
+enclosing_stmt(#22519,#22511)
+expr_containers(#22519,#22184)
+literals("string","string",#22519)
+#22520=*
+typeexprs(#22520,2,#22517,1,"number")
+hasLocation(#22520,#20899)
+enclosing_stmt(#22520,#22511)
+expr_containers(#22520,#22184)
+literals("number","number",#22520)
 #22521=*
-exprs(#22521,9,#22519,0,"() => void")
-hasLocation(#22521,#22520)
-enclosing_stmt(#22521,#22507)
-expr_containers(#22521,#22183)
-#22522=*
-scopes(#22522,1)
-scopenodes(#22521,#22522)
-scopenesting(#22522,#22186)
-#22523=@"var;{arguments};{#22522}"
-variables(#22523,"arguments",#22522)
-is_arguments_object(#22523)
-#22524=*
-typeexprs(#22524,2,#22521,-3,"void")
-hasLocation(#22524,#20911)
-expr_containers(#22524,#22521)
-literals("void","void",#22524)
+typeexprs(#22521,10,#22517,2,"(() => void)")
+#22522=@"loc,{#10000},35,39,35,50"
+locations_default(#22522,#10000,35,39,35,50)
+hasLocation(#22521,#22522)
+enclosing_stmt(#22521,#22511)
+expr_containers(#22521,#22184)
+#22523=*
+typeexprs(#22523,23,#22521,0,"() => void")
+#22524=@"loc,{#10000},35,40,35,49"
+locations_default(#22524,#10000,35,40,35,49)
+hasLocation(#22523,#22524)
+enclosing_stmt(#22523,#22511)
+expr_containers(#22523,#22184)
 #22525=*
-typeexprs(#22525,0,#22510,1,"Function")
-hasLocation(#22525,#20917)
-enclosing_stmt(#22525,#22507)
-expr_containers(#22525,#22183)
-literals("Function","Function",#22525)
+exprs(#22525,9,#22523,0,"() => void")
+hasLocation(#22525,#22524)
+enclosing_stmt(#22525,#22511)
+expr_containers(#22525,#22184)
 #22526=*
-stmts(#22526,35,#22183,21,"type No ... fined>;")
-#22527=@"loc,{#10000},37,3,37,50"
-locations_default(#22527,#10000,37,3,37,50)
-hasLocation(#22526,#22527)
-stmt_containers(#22526,#22183)
-#22528=*
-typeexprs(#22528,1,#22526,0,"NonNullable")
-hasLocation(#22528,#20925)
-enclosing_stmt(#22528,#22526)
-expr_containers(#22528,#22183)
-literals("NonNullable","NonNullable",#22528)
-typedecl(#22528,#22210)
+scopes(#22526,1)
+scopenodes(#22525,#22526)
+scopenesting(#22526,#22187)
+#22527=@"var;{this};{#22526}"
+variables(#22527,"this",#22526)
+#22528=@"var;{arguments};{#22526}"
+variables(#22528,"arguments",#22526)
+is_arguments_object(#22528)
 #22529=*
-scopes(#22529,12)
-scopenodes(#22526,#22529)
-scopenesting(#22529,#22186)
-#22530=@"local_type_name;{T};{#22529}"
-local_type_names(#22530,"T",#22529)
+typeexprs(#22529,2,#22525,-3,"void")
+hasLocation(#22529,#20911)
+expr_containers(#22529,#22525)
+literals("void","void",#22529)
+#22530=*
+typeexprs(#22530,0,#22514,1,"Function")
+hasLocation(#22530,#20917)
+enclosing_stmt(#22530,#22511)
+expr_containers(#22530,#22184)
+literals("Function","Function",#22530)
 #22531=*
-typeexprs(#22531,22,#22526,2,"T")
-hasLocation(#22531,#20929)
-enclosing_stmt(#22531,#22526)
-expr_containers(#22531,#22183)
-#22532=*
-typeexprs(#22532,1,#22531,0,"T")
-hasLocation(#22532,#20929)
-enclosing_stmt(#22532,#22526)
-expr_containers(#22532,#22183)
-literals("T","T",#22532)
-typedecl(#22532,#22530)
+stmts(#22531,35,#22184,21,"type No ... fined>;")
+#22532=@"loc,{#10000},37,3,37,50"
+locations_default(#22532,#10000,37,3,37,50)
+hasLocation(#22531,#22532)
+stmt_containers(#22531,#22184)
 #22533=*
-typeexprs(#22533,14,#22526,1,"Diff<T, ... efined>")
-#22534=@"loc,{#10000},37,25,37,49"
-locations_default(#22534,#10000,37,25,37,49)
-hasLocation(#22533,#22534)
-enclosing_stmt(#22533,#22526)
-expr_containers(#22533,#22183)
-#22535=*
-typeexprs(#22535,0,#22533,-1,"Diff")
-hasLocation(#22535,#20935)
-enclosing_stmt(#22535,#22526)
-expr_containers(#22535,#22183)
-literals("Diff","Diff",#22535)
-typebind(#22535,#22204)
+typeexprs(#22533,1,#22531,0,"NonNullable")
+hasLocation(#22533,#20925)
+enclosing_stmt(#22533,#22531)
+expr_containers(#22533,#22184)
+literals("NonNullable","NonNullable",#22533)
+typedecl(#22533,#22211)
+#22534=*
+scopes(#22534,12)
+scopenodes(#22531,#22534)
+scopenesting(#22534,#22187)
+#22535=@"local_type_name;{T};{#22534}"
+local_type_names(#22535,"T",#22534)
 #22536=*
-typeexprs(#22536,0,#22533,0,"T")
-hasLocation(#22536,#20939)
-enclosing_stmt(#22536,#22526)
-expr_containers(#22536,#22183)
-literals("T","T",#22536)
-typebind(#22536,#22530)
+typeexprs(#22536,22,#22531,2,"T")
+hasLocation(#22536,#20929)
+enclosing_stmt(#22536,#22531)
+expr_containers(#22536,#22184)
 #22537=*
-typeexprs(#22537,7,#22533,1,"null | undefined")
-#22538=@"loc,{#10000},37,33,37,48"
-locations_default(#22538,#10000,37,33,37,48)
-hasLocation(#22537,#22538)
-enclosing_stmt(#22537,#22526)
-expr_containers(#22537,#22183)
-#22539=*
-typeexprs(#22539,2,#22537,0,"null")
-hasLocation(#22539,#20943)
-enclosing_stmt(#22539,#22526)
-expr_containers(#22539,#22183)
-literals("null","null",#22539)
+typeexprs(#22537,1,#22536,0,"T")
+hasLocation(#22537,#20929)
+enclosing_stmt(#22537,#22531)
+expr_containers(#22537,#22184)
+literals("T","T",#22537)
+typedecl(#22537,#22535)
+#22538=*
+typeexprs(#22538,14,#22531,1,"Diff<T, ... efined>")
+#22539=@"loc,{#10000},37,25,37,49"
+locations_default(#22539,#10000,37,25,37,49)
+hasLocation(#22538,#22539)
+enclosing_stmt(#22538,#22531)
+expr_containers(#22538,#22184)
 #22540=*
-typeexprs(#22540,2,#22537,1,"undefined")
-hasLocation(#22540,#20947)
-enclosing_stmt(#22540,#22526)
-expr_containers(#22540,#22183)
-literals("undefined","undefined",#22540)
+typeexprs(#22540,0,#22538,-1,"Diff")
+hasLocation(#22540,#20935)
+enclosing_stmt(#22540,#22531)
+expr_containers(#22540,#22184)
+literals("Diff","Diff",#22540)
+typebind(#22540,#22205)
 #22541=*
-stmts(#22541,35,#22183,22,"type T3 ... fined>;")
-#22542=@"loc,{#10000},39,3,39,54"
-locations_default(#22542,#10000,39,3,39,54)
-hasLocation(#22541,#22542)
-stmt_containers(#22541,#22183)
-#22543=*
-typeexprs(#22543,1,#22541,0,"T34")
-hasLocation(#22543,#20955)
-enclosing_stmt(#22543,#22541)
-expr_containers(#22543,#22183)
-literals("T34","T34",#22543)
-typedecl(#22543,#22211)
+typeexprs(#22541,0,#22538,0,"T")
+hasLocation(#22541,#20939)
+enclosing_stmt(#22541,#22531)
+expr_containers(#22541,#22184)
+literals("T","T",#22541)
+typebind(#22541,#22535)
+#22542=*
+typeexprs(#22542,7,#22538,1,"null | undefined")
+#22543=@"loc,{#10000},37,33,37,48"
+locations_default(#22543,#10000,37,33,37,48)
+hasLocation(#22542,#22543)
+enclosing_stmt(#22542,#22531)
+expr_containers(#22542,#22184)
 #22544=*
-typeexprs(#22544,14,#22541,1,"NonNull ... efined>")
-#22545=@"loc,{#10000},39,14,39,53"
-locations_default(#22545,#10000,39,14,39,53)
-hasLocation(#22544,#22545)
-enclosing_stmt(#22544,#22541)
-expr_containers(#22544,#22183)
+typeexprs(#22544,2,#22542,0,"null")
+hasLocation(#22544,#20943)
+enclosing_stmt(#22544,#22531)
+expr_containers(#22544,#22184)
+literals("null","null",#22544)
+#22545=*
+typeexprs(#22545,2,#22542,1,"undefined")
+hasLocation(#22545,#20947)
+enclosing_stmt(#22545,#22531)
+expr_containers(#22545,#22184)
+literals("undefined","undefined",#22545)
 #22546=*
-typeexprs(#22546,0,#22544,-1,"NonNullable")
-hasLocation(#22546,#20959)
-enclosing_stmt(#22546,#22541)
-expr_containers(#22546,#22183)
-literals("NonNullable","NonNullable",#22546)
-typebind(#22546,#22210)
-#22547=*
-typeexprs(#22547,7,#22544,0,"string  ... defined")
-#22548=@"loc,{#10000},39,26,39,52"
-locations_default(#22548,#10000,39,26,39,52)
-hasLocation(#22547,#22548)
-enclosing_stmt(#22547,#22541)
-expr_containers(#22547,#22183)
+stmts(#22546,35,#22184,22,"type T3 ... fined>;")
+#22547=@"loc,{#10000},39,3,39,54"
+locations_default(#22547,#10000,39,3,39,54)
+hasLocation(#22546,#22547)
+stmt_containers(#22546,#22184)
+#22548=*
+typeexprs(#22548,1,#22546,0,"T34")
+hasLocation(#22548,#20955)
+enclosing_stmt(#22548,#22546)
+expr_containers(#22548,#22184)
+literals("T34","T34",#22548)
+typedecl(#22548,#22212)
 #22549=*
-typeexprs(#22549,2,#22547,0,"string")
-hasLocation(#22549,#20963)
-enclosing_stmt(#22549,#22541)
-expr_containers(#22549,#22183)
-literals("string","string",#22549)
-#22550=*
-typeexprs(#22550,2,#22547,1,"number")
-hasLocation(#22550,#20967)
-enclosing_stmt(#22550,#22541)
-expr_containers(#22550,#22183)
-literals("number","number",#22550)
+typeexprs(#22549,14,#22546,1,"NonNull ... efined>")
+#22550=@"loc,{#10000},39,14,39,53"
+locations_default(#22550,#10000,39,14,39,53)
+hasLocation(#22549,#22550)
+enclosing_stmt(#22549,#22546)
+expr_containers(#22549,#22184)
 #22551=*
-typeexprs(#22551,2,#22547,2,"undefined")
-hasLocation(#22551,#20971)
-enclosing_stmt(#22551,#22541)
-expr_containers(#22551,#22183)
-literals("undefined","undefined",#22551)
+typeexprs(#22551,0,#22549,-1,"NonNullable")
+hasLocation(#22551,#20959)
+enclosing_stmt(#22551,#22546)
+expr_containers(#22551,#22184)
+literals("NonNullable","NonNullable",#22551)
+typebind(#22551,#22211)
 #22552=*
-stmts(#22552,35,#22183,23,"type T3 ... fined>;")
-#22553=@"loc,{#10000},40,3,40,63"
-locations_default(#22553,#10000,40,3,40,63)
+typeexprs(#22552,7,#22549,0,"string  ... defined")
+#22553=@"loc,{#10000},39,26,39,52"
+locations_default(#22553,#10000,39,26,39,52)
 hasLocation(#22552,#22553)
-stmt_containers(#22552,#22183)
+enclosing_stmt(#22552,#22546)
+expr_containers(#22552,#22184)
 #22554=*
-typeexprs(#22554,1,#22552,0,"T35")
-hasLocation(#22554,#20979)
-enclosing_stmt(#22554,#22552)
-expr_containers(#22554,#22183)
-literals("T35","T35",#22554)
-typedecl(#22554,#22212)
+typeexprs(#22554,2,#22552,0,"string")
+hasLocation(#22554,#20963)
+enclosing_stmt(#22554,#22546)
+expr_containers(#22554,#22184)
+literals("string","string",#22554)
 #22555=*
-typeexprs(#22555,14,#22552,1,"NonNull ... efined>")
-#22556=@"loc,{#10000},40,14,40,62"
-locations_default(#22556,#10000,40,14,40,62)
-hasLocation(#22555,#22556)
-enclosing_stmt(#22555,#22552)
-expr_containers(#22555,#22183)
+typeexprs(#22555,2,#22552,1,"number")
+hasLocation(#22555,#20967)
+enclosing_stmt(#22555,#22546)
+expr_containers(#22555,#22184)
+literals("number","number",#22555)
+#22556=*
+typeexprs(#22556,2,#22552,2,"undefined")
+hasLocation(#22556,#20971)
+enclosing_stmt(#22556,#22546)
+expr_containers(#22556,#22184)
+literals("undefined","undefined",#22556)
 #22557=*
-typeexprs(#22557,0,#22555,-1,"NonNullable")
-hasLocation(#22557,#20983)
-enclosing_stmt(#22557,#22552)
-expr_containers(#22557,#22183)
-literals("NonNullable","NonNullable",#22557)
-typebind(#22557,#22210)
-#22558=*
-typeexprs(#22558,7,#22555,0,"string  ... defined")
-#22559=@"loc,{#10000},40,26,40,61"
-locations_default(#22559,#10000,40,26,40,61)
-hasLocation(#22558,#22559)
-enclosing_stmt(#22558,#22552)
-expr_containers(#22558,#22183)
+stmts(#22557,35,#22184,23,"type T3 ... fined>;")
+#22558=@"loc,{#10000},40,3,40,63"
+locations_default(#22558,#10000,40,3,40,63)
+hasLocation(#22557,#22558)
+stmt_containers(#22557,#22184)
+#22559=*
+typeexprs(#22559,1,#22557,0,"T35")
+hasLocation(#22559,#20979)
+enclosing_stmt(#22559,#22557)
+expr_containers(#22559,#22184)
+literals("T35","T35",#22559)
+typedecl(#22559,#22213)
 #22560=*
-typeexprs(#22560,2,#22558,0,"string")
-hasLocation(#22560,#20987)
-enclosing_stmt(#22560,#22552)
-expr_containers(#22560,#22183)
-literals("string","string",#22560)
-#22561=*
-typeexprs(#22561,6,#22558,1,"string[]")
-#22562=@"loc,{#10000},40,35,40,42"
-locations_default(#22562,#10000,40,35,40,42)
-hasLocation(#22561,#22562)
-enclosing_stmt(#22561,#22552)
-expr_containers(#22561,#22183)
+typeexprs(#22560,14,#22557,1,"NonNull ... efined>")
+#22561=@"loc,{#10000},40,14,40,62"
+locations_default(#22561,#10000,40,14,40,62)
+hasLocation(#22560,#22561)
+enclosing_stmt(#22560,#22557)
+expr_containers(#22560,#22184)
+#22562=*
+typeexprs(#22562,0,#22560,-1,"NonNullable")
+hasLocation(#22562,#20983)
+enclosing_stmt(#22562,#22557)
+expr_containers(#22562,#22184)
+literals("NonNullable","NonNullable",#22562)
+typebind(#22562,#22211)
 #22563=*
-typeexprs(#22563,2,#22561,0,"string")
-hasLocation(#22563,#20991)
-enclosing_stmt(#22563,#22552)
-expr_containers(#22563,#22183)
-literals("string","string",#22563)
-#22564=*
-typeexprs(#22564,2,#22558,2,"null")
-hasLocation(#22564,#20999)
-enclosing_stmt(#22564,#22552)
-expr_containers(#22564,#22183)
-literals("null","null",#22564)
+typeexprs(#22563,7,#22560,0,"string  ... defined")
+#22564=@"loc,{#10000},40,26,40,61"
+locations_default(#22564,#10000,40,26,40,61)
+hasLocation(#22563,#22564)
+enclosing_stmt(#22563,#22557)
+expr_containers(#22563,#22184)
 #22565=*
-typeexprs(#22565,2,#22558,3,"undefined")
-hasLocation(#22565,#21003)
-enclosing_stmt(#22565,#22552)
-expr_containers(#22565,#22183)
-literals("undefined","undefined",#22565)
+typeexprs(#22565,2,#22563,0,"string")
+hasLocation(#22565,#20987)
+enclosing_stmt(#22565,#22557)
+expr_containers(#22565,#22184)
+literals("string","string",#22565)
 #22566=*
-stmts(#22566,17,#22183,24,"functio ...  Ok\n  }")
-#22567=@"loc,{#10000},42,3,44,3"
-locations_default(#22567,#10000,42,3,44,3)
+typeexprs(#22566,6,#22563,1,"string[]")
+#22567=@"loc,{#10000},40,35,40,42"
+locations_default(#22567,#10000,40,35,40,42)
 hasLocation(#22566,#22567)
-stmt_containers(#22566,#22183)
+enclosing_stmt(#22566,#22557)
+expr_containers(#22566,#22184)
 #22568=*
-exprs(#22568,78,#22566,-1,"f1")
-hasLocation(#22568,#21011)
-expr_containers(#22568,#22566)
-literals("f1","f1",#22568)
-decl(#22568,#22187)
+typeexprs(#22568,2,#22566,0,"string")
+hasLocation(#22568,#20991)
+enclosing_stmt(#22568,#22557)
+expr_containers(#22568,#22184)
+literals("string","string",#22568)
 #22569=*
-scopes(#22569,1)
-scopenodes(#22566,#22569)
-scopenesting(#22569,#22186)
-#22570=@"local_type_name;{T};{#22569}"
-local_type_names(#22570,"T",#22569)
-#22571=@"var;{x};{#22569}"
-variables(#22571,"x",#22569)
-#22572=*
-exprs(#22572,78,#22566,0,"x")
-hasLocation(#22572,#21021)
-expr_containers(#22572,#22566)
-literals("x","x",#22572)
-decl(#22572,#22571)
-#22573=@"var;{y};{#22569}"
-variables(#22573,"y",#22569)
+typeexprs(#22569,2,#22563,2,"null")
+hasLocation(#22569,#20999)
+enclosing_stmt(#22569,#22557)
+expr_containers(#22569,#22184)
+literals("null","null",#22569)
+#22570=*
+typeexprs(#22570,2,#22563,3,"undefined")
+hasLocation(#22570,#21003)
+enclosing_stmt(#22570,#22557)
+expr_containers(#22570,#22184)
+literals("undefined","undefined",#22570)
+#22571=*
+stmts(#22571,17,#22184,24,"functio ...  Ok\n  }")
+#22572=@"loc,{#10000},42,3,44,3"
+locations_default(#22572,#10000,42,3,44,3)
+hasLocation(#22571,#22572)
+stmt_containers(#22571,#22184)
+#22573=*
+exprs(#22573,78,#22571,-1,"f1")
+hasLocation(#22573,#21011)
+expr_containers(#22573,#22571)
+literals("f1","f1",#22573)
+decl(#22573,#22188)
 #22574=*
-exprs(#22574,78,#22566,1,"y")
-hasLocation(#22574,#21029)
-expr_containers(#22574,#22566)
-literals("y","y",#22574)
-decl(#22574,#22573)
-#22575=@"var;{arguments};{#22569}"
-variables(#22575,"arguments",#22569)
-is_arguments_object(#22575)
-#22576=*
-typeexprs(#22576,0,#22566,-6,"T")
-hasLocation(#22576,#21025)
-expr_containers(#22576,#22566)
-literals("T","T",#22576)
-typebind(#22576,#22570)
-#22577=*
-typeexprs(#22577,14,#22566,-10,"NonNullable<T>")
-#22578=@"loc,{#10000},42,27,42,40"
-locations_default(#22578,#10000,42,27,42,40)
-hasLocation(#22577,#22578)
-expr_containers(#22577,#22566)
-#22579=*
-typeexprs(#22579,0,#22577,-1,"NonNullable")
-hasLocation(#22579,#21033)
-expr_containers(#22579,#22566)
-literals("NonNullable","NonNullable",#22579)
-typebind(#22579,#22210)
+scopes(#22574,1)
+scopenodes(#22571,#22574)
+scopenesting(#22574,#22187)
+#22575=@"var;{this};{#22574}"
+variables(#22575,"this",#22574)
+#22576=@"local_type_name;{T};{#22574}"
+local_type_names(#22576,"T",#22574)
+#22577=@"var;{x};{#22574}"
+variables(#22577,"x",#22574)
+#22578=*
+exprs(#22578,78,#22571,0,"x")
+hasLocation(#22578,#21021)
+expr_containers(#22578,#22571)
+literals("x","x",#22578)
+decl(#22578,#22577)
+#22579=@"var;{y};{#22574}"
+variables(#22579,"y",#22574)
 #22580=*
-typeexprs(#22580,0,#22577,0,"T")
-hasLocation(#22580,#21037)
-expr_containers(#22580,#22566)
-literals("T","T",#22580)
-typebind(#22580,#22570)
-#22581=*
-typeexprs(#22581,22,#22566,-7,"T")
-hasLocation(#22581,#21015)
-expr_containers(#22581,#22566)
+exprs(#22580,78,#22571,1,"y")
+hasLocation(#22580,#21029)
+expr_containers(#22580,#22571)
+literals("y","y",#22580)
+decl(#22580,#22579)
+#22581=@"var;{arguments};{#22574}"
+variables(#22581,"arguments",#22574)
+is_arguments_object(#22581)
 #22582=*
-typeexprs(#22582,1,#22581,0,"T")
-hasLocation(#22582,#21015)
-expr_containers(#22582,#22566)
+typeexprs(#22582,0,#22571,-6,"T")
+hasLocation(#22582,#21025)
+expr_containers(#22582,#22571)
 literals("T","T",#22582)
-typedecl(#22582,#22570)
+typebind(#22582,#22576)
 #22583=*
-stmts(#22583,1,#22566,-2,"{\n      ...  Ok\n  }")
-#22584=@"loc,{#10000},42,43,44,3"
-locations_default(#22584,#10000,42,43,44,3)
+typeexprs(#22583,14,#22571,-10,"NonNullable<T>")
+#22584=@"loc,{#10000},42,27,42,40"
+locations_default(#22584,#10000,42,27,42,40)
 hasLocation(#22583,#22584)
-stmt_containers(#22583,#22566)
+expr_containers(#22583,#22571)
 #22585=*
-stmts(#22585,2,#22583,0,"x = y;")
-#22586=@"loc,{#10000},43,7,43,12"
-locations_default(#22586,#10000,43,7,43,12)
-hasLocation(#22585,#22586)
-stmt_containers(#22585,#22566)
+typeexprs(#22585,0,#22583,-1,"NonNullable")
+hasLocation(#22585,#21033)
+expr_containers(#22585,#22571)
+literals("NonNullable","NonNullable",#22585)
+typebind(#22585,#22211)
+#22586=*
+typeexprs(#22586,0,#22583,0,"T")
+hasLocation(#22586,#21037)
+expr_containers(#22586,#22571)
+literals("T","T",#22586)
+typebind(#22586,#22576)
 #22587=*
-exprs(#22587,47,#22585,0,"x = y")
-#22588=@"loc,{#10000},43,7,43,11"
-locations_default(#22588,#10000,43,7,43,11)
-hasLocation(#22587,#22588)
-enclosing_stmt(#22587,#22585)
-expr_containers(#22587,#22566)
+typeexprs(#22587,22,#22571,-7,"T")
+hasLocation(#22587,#21015)
+expr_containers(#22587,#22571)
+#22588=*
+typeexprs(#22588,1,#22587,0,"T")
+hasLocation(#22588,#21015)
+expr_containers(#22588,#22571)
+literals("T","T",#22588)
+typedecl(#22588,#22576)
 #22589=*
-exprs(#22589,79,#22587,0,"x")
-hasLocation(#22589,#21045)
-enclosing_stmt(#22589,#22585)
-expr_containers(#22589,#22566)
-literals("x","x",#22589)
-bind(#22589,#22571)
-#22590=*
-exprs(#22590,79,#22587,1,"y")
-hasLocation(#22590,#21049)
-enclosing_stmt(#22590,#22585)
-expr_containers(#22590,#22566)
-literals("y","y",#22590)
-bind(#22590,#22573)
+stmts(#22589,1,#22571,-2,"{\n      ...  Ok\n  }")
+#22590=@"loc,{#10000},42,43,44,3"
+locations_default(#22590,#10000,42,43,44,3)
+hasLocation(#22589,#22590)
+stmt_containers(#22589,#22571)
 #22591=*
-stmts(#22591,17,#22183,25,"functio ...  Ok\n  }")
-#22592=@"loc,{#10000},46,3,49,3"
-locations_default(#22592,#10000,46,3,49,3)
+stmts(#22591,2,#22589,0,"x = y;")
+#22592=@"loc,{#10000},43,7,43,12"
+locations_default(#22592,#10000,43,7,43,12)
 hasLocation(#22591,#22592)
-stmt_containers(#22591,#22183)
+stmt_containers(#22591,#22571)
 #22593=*
-exprs(#22593,78,#22591,-1,"f2")
-hasLocation(#22593,#21057)
-expr_containers(#22593,#22591)
-literals("f2","f2",#22593)
-decl(#22593,#22188)
-#22594=*
-scopes(#22594,1)
-scopenodes(#22591,#22594)
-scopenesting(#22594,#22186)
-#22595=@"local_type_name;{T};{#22594}"
-local_type_names(#22595,"T",#22594)
-#22596=@"var;{x};{#22594}"
-variables(#22596,"x",#22594)
+exprs(#22593,47,#22591,0,"x = y")
+#22594=@"loc,{#10000},43,7,43,11"
+locations_default(#22594,#10000,43,7,43,11)
+hasLocation(#22593,#22594)
+enclosing_stmt(#22593,#22591)
+expr_containers(#22593,#22571)
+#22595=*
+exprs(#22595,79,#22593,0,"x")
+hasLocation(#22595,#21045)
+enclosing_stmt(#22595,#22591)
+expr_containers(#22595,#22571)
+literals("x","x",#22595)
+bind(#22595,#22577)
+#22596=*
+exprs(#22596,79,#22593,1,"y")
+hasLocation(#22596,#21049)
+enclosing_stmt(#22596,#22591)
+expr_containers(#22596,#22571)
+literals("y","y",#22596)
+bind(#22596,#22579)
 #22597=*
-exprs(#22597,78,#22591,0,"x")
-hasLocation(#22597,#21075)
-expr_containers(#22597,#22591)
-literals("x","x",#22597)
-decl(#22597,#22596)
-#22598=@"var;{y};{#22594}"
-variables(#22598,"y",#22594)
+stmts(#22597,17,#22184,25,"functio ...  Ok\n  }")
+#22598=@"loc,{#10000},46,3,49,3"
+locations_default(#22598,#10000,46,3,49,3)
+hasLocation(#22597,#22598)
+stmt_containers(#22597,#22184)
 #22599=*
-exprs(#22599,78,#22591,1,"y")
-hasLocation(#22599,#21083)
-expr_containers(#22599,#22591)
-literals("y","y",#22599)
-decl(#22599,#22598)
-#22600=@"var;{arguments};{#22594}"
-variables(#22600,"arguments",#22594)
-is_arguments_object(#22600)
-#22601=*
-typeexprs(#22601,0,#22591,-6,"T")
-hasLocation(#22601,#21079)
-expr_containers(#22601,#22591)
-literals("T","T",#22601)
-typebind(#22601,#22595)
-#22602=*
-typeexprs(#22602,14,#22591,-10,"NonNullable<T>")
-#22603=@"loc,{#10000},46,54,46,67"
-locations_default(#22603,#10000,46,54,46,67)
-hasLocation(#22602,#22603)
-expr_containers(#22602,#22591)
+exprs(#22599,78,#22597,-1,"f2")
+hasLocation(#22599,#21057)
+expr_containers(#22599,#22597)
+literals("f2","f2",#22599)
+decl(#22599,#22189)
+#22600=*
+scopes(#22600,1)
+scopenodes(#22597,#22600)
+scopenesting(#22600,#22187)
+#22601=@"var;{this};{#22600}"
+variables(#22601,"this",#22600)
+#22602=@"local_type_name;{T};{#22600}"
+local_type_names(#22602,"T",#22600)
+#22603=@"var;{x};{#22600}"
+variables(#22603,"x",#22600)
 #22604=*
-typeexprs(#22604,0,#22602,-1,"NonNullable")
-hasLocation(#22604,#21087)
-expr_containers(#22604,#22591)
-literals("NonNullable","NonNullable",#22604)
-typebind(#22604,#22210)
-#22605=*
-typeexprs(#22605,0,#22602,0,"T")
-hasLocation(#22605,#21091)
-expr_containers(#22605,#22591)
-literals("T","T",#22605)
-typebind(#22605,#22595)
+exprs(#22604,78,#22597,0,"x")
+hasLocation(#22604,#21075)
+expr_containers(#22604,#22597)
+literals("x","x",#22604)
+decl(#22604,#22603)
+#22605=@"var;{y};{#22600}"
+variables(#22605,"y",#22600)
 #22606=*
-typeexprs(#22606,22,#22591,-7,"T exten ... defined")
-#22607=@"loc,{#10000},46,15,46,42"
-locations_default(#22607,#10000,46,15,46,42)
-hasLocation(#22606,#22607)
-expr_containers(#22606,#22591)
+exprs(#22606,78,#22597,1,"y")
+hasLocation(#22606,#21083)
+expr_containers(#22606,#22597)
+literals("y","y",#22606)
+decl(#22606,#22605)
+#22607=@"var;{arguments};{#22600}"
+variables(#22607,"arguments",#22600)
+is_arguments_object(#22607)
 #22608=*
-typeexprs(#22608,1,#22606,0,"T")
-hasLocation(#22608,#21061)
-expr_containers(#22608,#22591)
+typeexprs(#22608,0,#22597,-6,"T")
+hasLocation(#22608,#21079)
+expr_containers(#22608,#22597)
 literals("T","T",#22608)
-typedecl(#22608,#22595)
+typebind(#22608,#22602)
 #22609=*
-typeexprs(#22609,7,#22606,1,"string | undefined")
-#22610=@"loc,{#10000},46,25,46,42"
-locations_default(#22610,#10000,46,25,46,42)
+typeexprs(#22609,14,#22597,-10,"NonNullable<T>")
+#22610=@"loc,{#10000},46,54,46,67"
+locations_default(#22610,#10000,46,54,46,67)
 hasLocation(#22609,#22610)
-expr_containers(#22609,#22591)
+expr_containers(#22609,#22597)
 #22611=*
-typeexprs(#22611,2,#22609,0,"string")
-hasLocation(#22611,#21065)
-expr_containers(#22611,#22591)
-literals("string","string",#22611)
+typeexprs(#22611,0,#22609,-1,"NonNullable")
+hasLocation(#22611,#21087)
+expr_containers(#22611,#22597)
+literals("NonNullable","NonNullable",#22611)
+typebind(#22611,#22211)
 #22612=*
-typeexprs(#22612,2,#22609,1,"undefined")
-hasLocation(#22612,#21069)
-expr_containers(#22612,#22591)
-literals("undefined","undefined",#22612)
+typeexprs(#22612,0,#22609,0,"T")
+hasLocation(#22612,#21091)
+expr_containers(#22612,#22597)
+literals("T","T",#22612)
+typebind(#22612,#22602)
 #22613=*
-stmts(#22613,1,#22591,-2,"{\n      ...  Ok\n  }")
-#22614=@"loc,{#10000},46,70,49,3"
-locations_default(#22614,#10000,46,70,49,3)
+typeexprs(#22613,22,#22597,-7,"T exten ... defined")
+#22614=@"loc,{#10000},46,15,46,42"
+locations_default(#22614,#10000,46,15,46,42)
 hasLocation(#22613,#22614)
-stmt_containers(#22613,#22591)
+expr_containers(#22613,#22597)
 #22615=*
-scopes(#22615,4)
-scopenodes(#22613,#22615)
-scopenesting(#22615,#22594)
-#22616=@"var;{s2};{#22615}"
-variables(#22616,"s2",#22615)
-#22617=*
-stmts(#22617,2,#22613,0,"x = y;")
-#22618=@"loc,{#10000},47,7,47,12"
-locations_default(#22618,#10000,47,7,47,12)
-hasLocation(#22617,#22618)
-stmt_containers(#22617,#22591)
+typeexprs(#22615,1,#22613,0,"T")
+hasLocation(#22615,#21061)
+expr_containers(#22615,#22597)
+literals("T","T",#22615)
+typedecl(#22615,#22602)
+#22616=*
+typeexprs(#22616,7,#22613,1,"string | undefined")
+#22617=@"loc,{#10000},46,25,46,42"
+locations_default(#22617,#10000,46,25,46,42)
+hasLocation(#22616,#22617)
+expr_containers(#22616,#22597)
+#22618=*
+typeexprs(#22618,2,#22616,0,"string")
+hasLocation(#22618,#21065)
+expr_containers(#22618,#22597)
+literals("string","string",#22618)
 #22619=*
-exprs(#22619,47,#22617,0,"x = y")
-#22620=@"loc,{#10000},47,7,47,11"
-locations_default(#22620,#10000,47,7,47,11)
-hasLocation(#22619,#22620)
-enclosing_stmt(#22619,#22617)
-expr_containers(#22619,#22591)
-#22621=*
-exprs(#22621,79,#22619,0,"x")
-hasLocation(#22621,#21099)
-enclosing_stmt(#22621,#22617)
-expr_containers(#22621,#22591)
-literals("x","x",#22621)
-bind(#22621,#22596)
+typeexprs(#22619,2,#22616,1,"undefined")
+hasLocation(#22619,#21069)
+expr_containers(#22619,#22597)
+literals("undefined","undefined",#22619)
+#22620=*
+stmts(#22620,1,#22597,-2,"{\n      ...  Ok\n  }")
+#22621=@"loc,{#10000},46,70,49,3"
+locations_default(#22621,#10000,46,70,49,3)
+hasLocation(#22620,#22621)
+stmt_containers(#22620,#22597)
 #22622=*
-exprs(#22622,79,#22619,1,"y")
-hasLocation(#22622,#21103)
-enclosing_stmt(#22622,#22617)
-expr_containers(#22622,#22591)
-literals("y","y",#22622)
-bind(#22622,#22598)
-#22623=*
-stmts(#22623,23,#22613,1,"let s2: string = y;")
-#22624=@"loc,{#10000},48,7,48,25"
-locations_default(#22624,#10000,48,7,48,25)
-hasLocation(#22623,#22624)
-stmt_containers(#22623,#22591)
-#22625=*
-exprs(#22625,64,#22623,0,"s2: string = y")
-#22626=@"loc,{#10000},48,11,48,24"
-locations_default(#22626,#10000,48,11,48,24)
-hasLocation(#22625,#22626)
-enclosing_stmt(#22625,#22623)
-expr_containers(#22625,#22591)
-#22627=*
-exprs(#22627,78,#22625,0,"s2")
-hasLocation(#22627,#21109)
-enclosing_stmt(#22627,#22623)
-expr_containers(#22627,#22591)
-literals("s2","s2",#22627)
-decl(#22627,#22616)
+scopes(#22622,4)
+scopenodes(#22620,#22622)
+scopenesting(#22622,#22600)
+#22623=@"var;{s2};{#22622}"
+variables(#22623,"s2",#22622)
+#22624=*
+stmts(#22624,2,#22620,0,"x = y;")
+#22625=@"loc,{#10000},47,7,47,12"
+locations_default(#22625,#10000,47,7,47,12)
+hasLocation(#22624,#22625)
+stmt_containers(#22624,#22597)
+#22626=*
+exprs(#22626,47,#22624,0,"x = y")
+#22627=@"loc,{#10000},47,7,47,11"
+locations_default(#22627,#10000,47,7,47,11)
+hasLocation(#22626,#22627)
+enclosing_stmt(#22626,#22624)
+expr_containers(#22626,#22597)
 #22628=*
-exprs(#22628,79,#22625,1,"y")
-hasLocation(#22628,#21117)
-enclosing_stmt(#22628,#22623)
-expr_containers(#22628,#22591)
-literals("y","y",#22628)
-bind(#22628,#22598)
+exprs(#22628,79,#22626,0,"x")
+hasLocation(#22628,#21099)
+enclosing_stmt(#22628,#22624)
+expr_containers(#22628,#22597)
+literals("x","x",#22628)
+bind(#22628,#22603)
 #22629=*
-typeexprs(#22629,2,#22625,2,"string")
-hasLocation(#22629,#21113)
-enclosing_stmt(#22629,#22623)
-expr_containers(#22629,#22591)
-literals("string","string",#22629)
+exprs(#22629,79,#22626,1,"y")
+hasLocation(#22629,#21103)
+enclosing_stmt(#22629,#22624)
+expr_containers(#22629,#22597)
+literals("y","y",#22629)
+bind(#22629,#22605)
 #22630=*
-stmts(#22630,35,#22183,26,"type Fu ... yof T];")
-#22631=@"loc,{#10000},51,3,51,97"
-locations_default(#22631,#10000,51,3,51,97)
+stmts(#22630,23,#22620,1,"let s2: string = y;")
+#22631=@"loc,{#10000},48,7,48,25"
+locations_default(#22631,#10000,48,7,48,25)
 hasLocation(#22630,#22631)
-stmt_containers(#22630,#22183)
+stmt_containers(#22630,#22597)
 #22632=*
-typeexprs(#22632,1,#22630,0,"Functio ... tyNames")
-hasLocation(#22632,#21125)
+exprs(#22632,64,#22630,0,"s2: string = y")
+#22633=@"loc,{#10000},48,11,48,24"
+locations_default(#22633,#10000,48,11,48,24)
+hasLocation(#22632,#22633)
 enclosing_stmt(#22632,#22630)
-expr_containers(#22632,#22183)
-literals("FunctionPropertyNames","FunctionPropertyNames",#22632)
-typedecl(#22632,#22213)
-#22633=*
-scopes(#22633,12)
-scopenodes(#22630,#22633)
-scopenesting(#22633,#22186)
-#22634=@"local_type_name;{T};{#22633}"
-local_type_names(#22634,"T",#22633)
+expr_containers(#22632,#22597)
+#22634=*
+exprs(#22634,78,#22632,0,"s2")
+hasLocation(#22634,#21109)
+enclosing_stmt(#22634,#22630)
+expr_containers(#22634,#22597)
+literals("s2","s2",#22634)
+decl(#22634,#22623)
 #22635=*
-typeexprs(#22635,22,#22630,2,"T")
-hasLocation(#22635,#21129)
+exprs(#22635,79,#22632,1,"y")
+hasLocation(#22635,#21117)
 enclosing_stmt(#22635,#22630)
-expr_containers(#22635,#22183)
+expr_containers(#22635,#22597)
+literals("y","y",#22635)
+bind(#22635,#22605)
 #22636=*
-typeexprs(#22636,1,#22635,0,"T")
-hasLocation(#22636,#21129)
+typeexprs(#22636,2,#22632,2,"string")
+hasLocation(#22636,#21113)
 enclosing_stmt(#22636,#22630)
-expr_containers(#22636,#22183)
-literals("T","T",#22636)
-typedecl(#22636,#22634)
+expr_containers(#22636,#22597)
+literals("string","string",#22636)
 #22637=*
-typeexprs(#22637,8,#22630,1,"{ [K in ... eyof T]")
-#22638=@"loc,{#10000},51,35,51,96"
-locations_default(#22638,#10000,51,35,51,96)
+stmts(#22637,35,#22184,26,"type Fu ... yof T];")
+#22638=@"loc,{#10000},51,3,51,97"
+locations_default(#22638,#10000,51,3,51,97)
 hasLocation(#22637,#22638)
-enclosing_stmt(#22637,#22630)
-expr_containers(#22637,#22183)
+stmt_containers(#22637,#22184)
 #22639=*
-typeexprs(#22639,27,#22637,0,"{ [K in ... never }")
-#22640=@"loc,{#10000},51,35,51,87"
-locations_default(#22640,#10000,51,35,51,87)
-hasLocation(#22639,#22640)
-enclosing_stmt(#22639,#22630)
-expr_containers(#22639,#22183)
-#22641=*
-scopes(#22641,13)
-scopenodes(#22639,#22641)
-scopenesting(#22641,#22633)
-#22642=@"local_type_name;{K};{#22641}"
-local_type_names(#22642,"K",#22641)
+typeexprs(#22639,1,#22637,0,"Functio ... tyNames")
+hasLocation(#22639,#21125)
+enclosing_stmt(#22639,#22637)
+expr_containers(#22639,#22184)
+literals("FunctionPropertyNames","FunctionPropertyNames",#22639)
+typedecl(#22639,#22214)
+#22640=*
+scopes(#22640,12)
+scopenodes(#22637,#22640)
+scopenesting(#22640,#22187)
+#22641=@"local_type_name;{T};{#22640}"
+local_type_names(#22641,"T",#22640)
+#22642=*
+typeexprs(#22642,22,#22637,2,"T")
+hasLocation(#22642,#21129)
+enclosing_stmt(#22642,#22637)
+expr_containers(#22642,#22184)
 #22643=*
-typeexprs(#22643,22,#22639,0,"K in keyof T")
-#22644=@"loc,{#10000},51,38,51,49"
-locations_default(#22644,#10000,51,38,51,49)
-hasLocation(#22643,#22644)
-enclosing_stmt(#22643,#22630)
-expr_containers(#22643,#22183)
-#22645=*
-typeexprs(#22645,1,#22643,0,"K")
-hasLocation(#22645,#21139)
-enclosing_stmt(#22645,#22630)
-expr_containers(#22645,#22183)
-literals("K","K",#22645)
-typedecl(#22645,#22642)
+typeexprs(#22643,1,#22642,0,"T")
+hasLocation(#22643,#21129)
+enclosing_stmt(#22643,#22637)
+expr_containers(#22643,#22184)
+literals("T","T",#22643)
+typedecl(#22643,#22641)
+#22644=*
+typeexprs(#22644,8,#22637,1,"{ [K in ... eyof T]")
+#22645=@"loc,{#10000},51,35,51,96"
+locations_default(#22645,#10000,51,35,51,96)
+hasLocation(#22644,#22645)
+enclosing_stmt(#22644,#22637)
+expr_containers(#22644,#22184)
 #22646=*
-typeexprs(#22646,12,#22643,1,"keyof T")
-#22647=@"loc,{#10000},51,43,51,49"
-locations_default(#22647,#10000,51,43,51,49)
+typeexprs(#22646,27,#22644,0,"{ [K in ... never }")
+#22647=@"loc,{#10000},51,35,51,87"
+locations_default(#22647,#10000,51,35,51,87)
 hasLocation(#22646,#22647)
-enclosing_stmt(#22646,#22630)
-expr_containers(#22646,#22183)
+enclosing_stmt(#22646,#22637)
+expr_containers(#22646,#22184)
 #22648=*
-typeexprs(#22648,0,#22646,0,"T")
-hasLocation(#22648,#21145)
-enclosing_stmt(#22648,#22630)
-expr_containers(#22648,#22183)
-literals("T","T",#22648)
-typebind(#22648,#22634)
-#22649=*
-typeexprs(#22649,28,#22639,1,"T[K] ex ... : never")
-#22650=@"loc,{#10000},51,53,51,85"
-locations_default(#22650,#10000,51,53,51,85)
-hasLocation(#22649,#22650)
-enclosing_stmt(#22649,#22630)
-expr_containers(#22649,#22183)
-#22651=*
-typeexprs(#22651,8,#22649,0,"T[K]")
-#22652=@"loc,{#10000},51,53,51,56"
-locations_default(#22652,#10000,51,53,51,56)
-hasLocation(#22651,#22652)
-enclosing_stmt(#22651,#22630)
-expr_containers(#22651,#22183)
+scopes(#22648,13)
+scopenodes(#22646,#22648)
+scopenesting(#22648,#22640)
+#22649=@"local_type_name;{K};{#22648}"
+local_type_names(#22649,"K",#22648)
+#22650=*
+typeexprs(#22650,22,#22646,0,"K in keyof T")
+#22651=@"loc,{#10000},51,38,51,49"
+locations_default(#22651,#10000,51,38,51,49)
+hasLocation(#22650,#22651)
+enclosing_stmt(#22650,#22637)
+expr_containers(#22650,#22184)
+#22652=*
+typeexprs(#22652,1,#22650,0,"K")
+hasLocation(#22652,#21139)
+enclosing_stmt(#22652,#22637)
+expr_containers(#22652,#22184)
+literals("K","K",#22652)
+typedecl(#22652,#22649)
 #22653=*
-typeexprs(#22653,0,#22651,0,"T")
-hasLocation(#22653,#21151)
-enclosing_stmt(#22653,#22630)
-expr_containers(#22653,#22183)
-literals("T","T",#22653)
-typebind(#22653,#22634)
-#22654=*
-typeexprs(#22654,0,#22651,1,"K")
-hasLocation(#22654,#21155)
-enclosing_stmt(#22654,#22630)
-expr_containers(#22654,#22183)
-literals("K","K",#22654)
-typebind(#22654,#22642)
+typeexprs(#22653,12,#22650,1,"keyof T")
+#22654=@"loc,{#10000},51,43,51,49"
+locations_default(#22654,#10000,51,43,51,49)
+hasLocation(#22653,#22654)
+enclosing_stmt(#22653,#22637)
+expr_containers(#22653,#22184)
 #22655=*
-typeexprs(#22655,0,#22649,1,"Function")
-hasLocation(#22655,#21161)
-enclosing_stmt(#22655,#22630)
-expr_containers(#22655,#22183)
-literals("Function","Function",#22655)
+typeexprs(#22655,0,#22653,0,"T")
+hasLocation(#22655,#21145)
+enclosing_stmt(#22655,#22637)
+expr_containers(#22655,#22184)
+literals("T","T",#22655)
+typebind(#22655,#22641)
 #22656=*
-typeexprs(#22656,0,#22649,2,"K")
-hasLocation(#22656,#21165)
-enclosing_stmt(#22656,#22630)
-expr_containers(#22656,#22183)
-literals("K","K",#22656)
-typebind(#22656,#22642)
-#22657=*
-typeexprs(#22657,2,#22649,3,"never")
-hasLocation(#22657,#21169)
-enclosing_stmt(#22657,#22630)
-expr_containers(#22657,#22183)
-literals("never","never",#22657)
+typeexprs(#22656,28,#22646,1,"T[K] ex ... : never")
+#22657=@"loc,{#10000},51,53,51,85"
+locations_default(#22657,#10000,51,53,51,85)
+hasLocation(#22656,#22657)
+enclosing_stmt(#22656,#22637)
+expr_containers(#22656,#22184)
 #22658=*
-typeexprs(#22658,12,#22637,1,"keyof T")
-#22659=@"loc,{#10000},51,89,51,95"
-locations_default(#22659,#10000,51,89,51,95)
+typeexprs(#22658,8,#22656,0,"T[K]")
+#22659=@"loc,{#10000},51,53,51,56"
+locations_default(#22659,#10000,51,53,51,56)
 hasLocation(#22658,#22659)
-enclosing_stmt(#22658,#22630)
-expr_containers(#22658,#22183)
+enclosing_stmt(#22658,#22637)
+expr_containers(#22658,#22184)
 #22660=*
 typeexprs(#22660,0,#22658,0,"T")
-hasLocation(#22660,#21177)
-enclosing_stmt(#22660,#22630)
-expr_containers(#22660,#22183)
+hasLocation(#22660,#21151)
+enclosing_stmt(#22660,#22637)
+expr_containers(#22660,#22184)
 literals("T","T",#22660)
-typebind(#22660,#22634)
+typebind(#22660,#22641)
 #22661=*
-stmts(#22661,35,#22183,27,"type Fu ... es<T>>;")
-#22662=@"loc,{#10000},52,3,52,65"
-locations_default(#22662,#10000,52,3,52,65)
-hasLocation(#22661,#22662)
-stmt_containers(#22661,#22183)
+typeexprs(#22661,0,#22658,1,"K")
+hasLocation(#22661,#21155)
+enclosing_stmt(#22661,#22637)
+expr_containers(#22661,#22184)
+literals("K","K",#22661)
+typebind(#22661,#22649)
+#22662=*
+typeexprs(#22662,0,#22656,1,"Function")
+hasLocation(#22662,#21161)
+enclosing_stmt(#22662,#22637)
+expr_containers(#22662,#22184)
+literals("Function","Function",#22662)
 #22663=*
-typeexprs(#22663,1,#22661,0,"FunctionProperties")
-hasLocation(#22663,#21185)
-enclosing_stmt(#22663,#22661)
-expr_containers(#22663,#22183)
-literals("FunctionProperties","FunctionProperties",#22663)
-typedecl(#22663,#22214)
+typeexprs(#22663,0,#22656,2,"K")
+hasLocation(#22663,#21165)
+enclosing_stmt(#22663,#22637)
+expr_containers(#22663,#22184)
+literals("K","K",#22663)
+typebind(#22663,#22649)
 #22664=*
-scopes(#22664,12)
-scopenodes(#22661,#22664)
-scopenesting(#22664,#22186)
-#22665=@"local_type_name;{T};{#22664}"
-local_type_names(#22665,"T",#22664)
-#22666=*
-typeexprs(#22666,22,#22661,2,"T")
-hasLocation(#22666,#21189)
-enclosing_stmt(#22666,#22661)
-expr_containers(#22666,#22183)
+typeexprs(#22664,2,#22656,3,"never")
+hasLocation(#22664,#21169)
+enclosing_stmt(#22664,#22637)
+expr_containers(#22664,#22184)
+literals("never","never",#22664)
+#22665=*
+typeexprs(#22665,12,#22644,1,"keyof T")
+#22666=@"loc,{#10000},51,89,51,95"
+locations_default(#22666,#10000,51,89,51,95)
+hasLocation(#22665,#22666)
+enclosing_stmt(#22665,#22637)
+expr_containers(#22665,#22184)
 #22667=*
-typeexprs(#22667,1,#22666,0,"T")
-hasLocation(#22667,#21189)
-enclosing_stmt(#22667,#22661)
-expr_containers(#22667,#22183)
+typeexprs(#22667,0,#22665,0,"T")
+hasLocation(#22667,#21177)
+enclosing_stmt(#22667,#22637)
+expr_containers(#22667,#22184)
 literals("T","T",#22667)
-typedecl(#22667,#22665)
+typebind(#22667,#22641)
 #22668=*
-typeexprs(#22668,14,#22661,1,"Pick<T, ... mes<T>>")
-#22669=@"loc,{#10000},52,32,52,64"
-locations_default(#22669,#10000,52,32,52,64)
+stmts(#22668,35,#22184,27,"type Fu ... es<T>>;")
+#22669=@"loc,{#10000},52,3,52,65"
+locations_default(#22669,#10000,52,3,52,65)
 hasLocation(#22668,#22669)
-enclosing_stmt(#22668,#22661)
-expr_containers(#22668,#22183)
+stmt_containers(#22668,#22184)
 #22670=*
-typeexprs(#22670,0,#22668,-1,"Pick")
-hasLocation(#22670,#21195)
-enclosing_stmt(#22670,#22661)
-expr_containers(#22670,#22183)
-literals("Pick","Pick",#22670)
+typeexprs(#22670,1,#22668,0,"FunctionProperties")
+hasLocation(#22670,#21185)
+enclosing_stmt(#22670,#22668)
+expr_containers(#22670,#22184)
+literals("FunctionProperties","FunctionProperties",#22670)
+typedecl(#22670,#22215)
 #22671=*
-typeexprs(#22671,0,#22668,0,"T")
-hasLocation(#22671,#21199)
-enclosing_stmt(#22671,#22661)
-expr_containers(#22671,#22183)
-literals("T","T",#22671)
-typebind(#22671,#22665)
-#22672=*
-typeexprs(#22672,14,#22668,1,"Functio ... ames<T>")
-#22673=@"loc,{#10000},52,40,52,63"
-locations_default(#22673,#10000,52,40,52,63)
-hasLocation(#22672,#22673)
-enclosing_stmt(#22672,#22661)
-expr_containers(#22672,#22183)
+scopes(#22671,12)
+scopenodes(#22668,#22671)
+scopenesting(#22671,#22187)
+#22672=@"local_type_name;{T};{#22671}"
+local_type_names(#22672,"T",#22671)
+#22673=*
+typeexprs(#22673,22,#22668,2,"T")
+hasLocation(#22673,#21189)
+enclosing_stmt(#22673,#22668)
+expr_containers(#22673,#22184)
 #22674=*
-typeexprs(#22674,0,#22672,-1,"Functio ... tyNames")
-hasLocation(#22674,#21203)
-enclosing_stmt(#22674,#22661)
-expr_containers(#22674,#22183)
-literals("FunctionPropertyNames","FunctionPropertyNames",#22674)
-typebind(#22674,#22213)
+typeexprs(#22674,1,#22673,0,"T")
+hasLocation(#22674,#21189)
+enclosing_stmt(#22674,#22668)
+expr_containers(#22674,#22184)
+literals("T","T",#22674)
+typedecl(#22674,#22672)
 #22675=*
-typeexprs(#22675,0,#22672,0,"T")
-hasLocation(#22675,#21207)
-enclosing_stmt(#22675,#22661)
-expr_containers(#22675,#22183)
-literals("T","T",#22675)
-typebind(#22675,#22665)
-#22676=*
-stmts(#22676,35,#22183,28,"type No ... yof T];")
-#22677=@"loc,{#10000},54,3,54,100"
-locations_default(#22677,#10000,54,3,54,100)
-hasLocation(#22676,#22677)
-stmt_containers(#22676,#22183)
+typeexprs(#22675,14,#22668,1,"Pick<T, ... mes<T>>")
+#22676=@"loc,{#10000},52,32,52,64"
+locations_default(#22676,#10000,52,32,52,64)
+hasLocation(#22675,#22676)
+enclosing_stmt(#22675,#22668)
+expr_containers(#22675,#22184)
+#22677=*
+typeexprs(#22677,0,#22675,-1,"Pick")
+hasLocation(#22677,#21195)
+enclosing_stmt(#22677,#22668)
+expr_containers(#22677,#22184)
+literals("Pick","Pick",#22677)
 #22678=*
-typeexprs(#22678,1,#22676,0,"NonFunc ... tyNames")
-hasLocation(#22678,#21217)
-enclosing_stmt(#22678,#22676)
-expr_containers(#22678,#22183)
-literals("NonFunctionPropertyNames","NonFunctionPropertyNames",#22678)
-typedecl(#22678,#22215)
+typeexprs(#22678,0,#22675,0,"T")
+hasLocation(#22678,#21199)
+enclosing_stmt(#22678,#22668)
+expr_containers(#22678,#22184)
+literals("T","T",#22678)
+typebind(#22678,#22672)
 #22679=*
-scopes(#22679,12)
-scopenodes(#22676,#22679)
-scopenesting(#22679,#22186)
-#22680=@"local_type_name;{T};{#22679}"
-local_type_names(#22680,"T",#22679)
+typeexprs(#22679,14,#22675,1,"Functio ... ames<T>")
+#22680=@"loc,{#10000},52,40,52,63"
+locations_default(#22680,#10000,52,40,52,63)
+hasLocation(#22679,#22680)
+enclosing_stmt(#22679,#22668)
+expr_containers(#22679,#22184)
 #22681=*
-typeexprs(#22681,22,#22676,2,"T")
-hasLocation(#22681,#21221)
-enclosing_stmt(#22681,#22676)
-expr_containers(#22681,#22183)
+typeexprs(#22681,0,#22679,-1,"Functio ... tyNames")
+hasLocation(#22681,#21203)
+enclosing_stmt(#22681,#22668)
+expr_containers(#22681,#22184)
+literals("FunctionPropertyNames","FunctionPropertyNames",#22681)
+typebind(#22681,#22214)
 #22682=*
-typeexprs(#22682,1,#22681,0,"T")
-hasLocation(#22682,#21221)
-enclosing_stmt(#22682,#22676)
-expr_containers(#22682,#22183)
+typeexprs(#22682,0,#22679,0,"T")
+hasLocation(#22682,#21207)
+enclosing_stmt(#22682,#22668)
+expr_containers(#22682,#22184)
 literals("T","T",#22682)
-typedecl(#22682,#22680)
+typebind(#22682,#22672)
 #22683=*
-typeexprs(#22683,8,#22676,1,"{ [K in ... eyof T]")
-#22684=@"loc,{#10000},54,38,54,99"
-locations_default(#22684,#10000,54,38,54,99)
+stmts(#22683,35,#22184,28,"type No ... yof T];")
+#22684=@"loc,{#10000},54,3,54,100"
+locations_default(#22684,#10000,54,3,54,100)
 hasLocation(#22683,#22684)
-enclosing_stmt(#22683,#22676)
-expr_containers(#22683,#22183)
+stmt_containers(#22683,#22184)
 #22685=*
-typeexprs(#22685,27,#22683,0,"{ [K in ... r : K }")
-#22686=@"loc,{#10000},54,38,54,90"
-locations_default(#22686,#10000,54,38,54,90)
-hasLocation(#22685,#22686)
-enclosing_stmt(#22685,#22676)
-expr_containers(#22685,#22183)
-#22687=*
-scopes(#22687,13)
-scopenodes(#22685,#22687)
-scopenesting(#22687,#22679)
-#22688=@"local_type_name;{K};{#22687}"
-local_type_names(#22688,"K",#22687)
+typeexprs(#22685,1,#22683,0,"NonFunc ... tyNames")
+hasLocation(#22685,#21217)
+enclosing_stmt(#22685,#22683)
+expr_containers(#22685,#22184)
+literals("NonFunctionPropertyNames","NonFunctionPropertyNames",#22685)
+typedecl(#22685,#22216)
+#22686=*
+scopes(#22686,12)
+scopenodes(#22683,#22686)
+scopenesting(#22686,#22187)
+#22687=@"local_type_name;{T};{#22686}"
+local_type_names(#22687,"T",#22686)
+#22688=*
+typeexprs(#22688,22,#22683,2,"T")
+hasLocation(#22688,#21221)
+enclosing_stmt(#22688,#22683)
+expr_containers(#22688,#22184)
 #22689=*
-typeexprs(#22689,22,#22685,0,"K in keyof T")
-#22690=@"loc,{#10000},54,41,54,52"
-locations_default(#22690,#10000,54,41,54,52)
-hasLocation(#22689,#22690)
-enclosing_stmt(#22689,#22676)
-expr_containers(#22689,#22183)
-#22691=*
-typeexprs(#22691,1,#22689,0,"K")
-hasLocation(#22691,#21231)
-enclosing_stmt(#22691,#22676)
-expr_containers(#22691,#22183)
-literals("K","K",#22691)
-typedecl(#22691,#22688)
+typeexprs(#22689,1,#22688,0,"T")
+hasLocation(#22689,#21221)
+enclosing_stmt(#22689,#22683)
+expr_containers(#22689,#22184)
+literals("T","T",#22689)
+typedecl(#22689,#22687)
+#22690=*
+typeexprs(#22690,8,#22683,1,"{ [K in ... eyof T]")
+#22691=@"loc,{#10000},54,38,54,99"
+locations_default(#22691,#10000,54,38,54,99)
+hasLocation(#22690,#22691)
+enclosing_stmt(#22690,#22683)
+expr_containers(#22690,#22184)
 #22692=*
-typeexprs(#22692,12,#22689,1,"keyof T")
-#22693=@"loc,{#10000},54,46,54,52"
-locations_default(#22693,#10000,54,46,54,52)
+typeexprs(#22692,27,#22690,0,"{ [K in ... r : K }")
+#22693=@"loc,{#10000},54,38,54,90"
+locations_default(#22693,#10000,54,38,54,90)
 hasLocation(#22692,#22693)
-enclosing_stmt(#22692,#22676)
-expr_containers(#22692,#22183)
+enclosing_stmt(#22692,#22683)
+expr_containers(#22692,#22184)
 #22694=*
-typeexprs(#22694,0,#22692,0,"T")
-hasLocation(#22694,#21237)
-enclosing_stmt(#22694,#22676)
-expr_containers(#22694,#22183)
-literals("T","T",#22694)
-typebind(#22694,#22680)
-#22695=*
-typeexprs(#22695,28,#22685,1,"T[K] ex ... ver : K")
-#22696=@"loc,{#10000},54,56,54,88"
-locations_default(#22696,#10000,54,56,54,88)
-hasLocation(#22695,#22696)
-enclosing_stmt(#22695,#22676)
-expr_containers(#22695,#22183)
-#22697=*
-typeexprs(#22697,8,#22695,0,"T[K]")
-#22698=@"loc,{#10000},54,56,54,59"
-locations_default(#22698,#10000,54,56,54,59)
-hasLocation(#22697,#22698)
-enclosing_stmt(#22697,#22676)
-expr_containers(#22697,#22183)
+scopes(#22694,13)
+scopenodes(#22692,#22694)
+scopenesting(#22694,#22686)
+#22695=@"local_type_name;{K};{#22694}"
+local_type_names(#22695,"K",#22694)
+#22696=*
+typeexprs(#22696,22,#22692,0,"K in keyof T")
+#22697=@"loc,{#10000},54,41,54,52"
+locations_default(#22697,#10000,54,41,54,52)
+hasLocation(#22696,#22697)
+enclosing_stmt(#22696,#22683)
+expr_containers(#22696,#22184)
+#22698=*
+typeexprs(#22698,1,#22696,0,"K")
+hasLocation(#22698,#21231)
+enclosing_stmt(#22698,#22683)
+expr_containers(#22698,#22184)
+literals("K","K",#22698)
+typedecl(#22698,#22695)
 #22699=*
-typeexprs(#22699,0,#22697,0,"T")
-hasLocation(#22699,#21243)
-enclosing_stmt(#22699,#22676)
-expr_containers(#22699,#22183)
-literals("T","T",#22699)
-typebind(#22699,#22680)
-#22700=*
-typeexprs(#22700,0,#22697,1,"K")
-hasLocation(#22700,#21247)
-enclosing_stmt(#22700,#22676)
-expr_containers(#22700,#22183)
-literals("K","K",#22700)
-typebind(#22700,#22688)
+typeexprs(#22699,12,#22696,1,"keyof T")
+#22700=@"loc,{#10000},54,46,54,52"
+locations_default(#22700,#10000,54,46,54,52)
+hasLocation(#22699,#22700)
+enclosing_stmt(#22699,#22683)
+expr_containers(#22699,#22184)
 #22701=*
-typeexprs(#22701,0,#22695,1,"Function")
-hasLocation(#22701,#21253)
-enclosing_stmt(#22701,#22676)
-expr_containers(#22701,#22183)
-literals("Function","Function",#22701)
+typeexprs(#22701,0,#22699,0,"T")
+hasLocation(#22701,#21237)
+enclosing_stmt(#22701,#22683)
+expr_containers(#22701,#22184)
+literals("T","T",#22701)
+typebind(#22701,#22687)
 #22702=*
-typeexprs(#22702,2,#22695,2,"never")
-hasLocation(#22702,#21257)
-enclosing_stmt(#22702,#22676)
-expr_containers(#22702,#22183)
-literals("never","never",#22702)
-#22703=*
-typeexprs(#22703,0,#22695,3,"K")
-hasLocation(#22703,#21261)
-enclosing_stmt(#22703,#22676)
-expr_containers(#22703,#22183)
-literals("K","K",#22703)
-typebind(#22703,#22688)
+typeexprs(#22702,28,#22692,1,"T[K] ex ... ver : K")
+#22703=@"loc,{#10000},54,56,54,88"
+locations_default(#22703,#10000,54,56,54,88)
+hasLocation(#22702,#22703)
+enclosing_stmt(#22702,#22683)
+expr_containers(#22702,#22184)
 #22704=*
-typeexprs(#22704,12,#22683,1,"keyof T")
-#22705=@"loc,{#10000},54,92,54,98"
-locations_default(#22705,#10000,54,92,54,98)
+typeexprs(#22704,8,#22702,0,"T[K]")
+#22705=@"loc,{#10000},54,56,54,59"
+locations_default(#22705,#10000,54,56,54,59)
 hasLocation(#22704,#22705)
-enclosing_stmt(#22704,#22676)
-expr_containers(#22704,#22183)
+enclosing_stmt(#22704,#22683)
+expr_containers(#22704,#22184)
 #22706=*
 typeexprs(#22706,0,#22704,0,"T")
-hasLocation(#22706,#21269)
-enclosing_stmt(#22706,#22676)
-expr_containers(#22706,#22183)
+hasLocation(#22706,#21243)
+enclosing_stmt(#22706,#22683)
+expr_containers(#22706,#22184)
 literals("T","T",#22706)
-typebind(#22706,#22680)
+typebind(#22706,#22687)
 #22707=*
-stmts(#22707,35,#22183,29,"type No ... es<T>>;")
-#22708=@"loc,{#10000},55,3,55,71"
-locations_default(#22708,#10000,55,3,55,71)
-hasLocation(#22707,#22708)
-stmt_containers(#22707,#22183)
+typeexprs(#22707,0,#22704,1,"K")
+hasLocation(#22707,#21247)
+enclosing_stmt(#22707,#22683)
+expr_containers(#22707,#22184)
+literals("K","K",#22707)
+typebind(#22707,#22695)
+#22708=*
+typeexprs(#22708,0,#22702,1,"Function")
+hasLocation(#22708,#21253)
+enclosing_stmt(#22708,#22683)
+expr_containers(#22708,#22184)
+literals("Function","Function",#22708)
 #22709=*
-typeexprs(#22709,1,#22707,0,"NonFunc ... perties")
-hasLocation(#22709,#21277)
-enclosing_stmt(#22709,#22707)
-expr_containers(#22709,#22183)
-literals("NonFunctionProperties","NonFunctionProperties",#22709)
-typedecl(#22709,#22216)
+typeexprs(#22709,2,#22702,2,"never")
+hasLocation(#22709,#21257)
+enclosing_stmt(#22709,#22683)
+expr_containers(#22709,#22184)
+literals("never","never",#22709)
 #22710=*
-scopes(#22710,12)
-scopenodes(#22707,#22710)
-scopenesting(#22710,#22186)
-#22711=@"local_type_name;{T};{#22710}"
-local_type_names(#22711,"T",#22710)
-#22712=*
-typeexprs(#22712,22,#22707,2,"T")
-hasLocation(#22712,#21281)
-enclosing_stmt(#22712,#22707)
-expr_containers(#22712,#22183)
+typeexprs(#22710,0,#22702,3,"K")
+hasLocation(#22710,#21261)
+enclosing_stmt(#22710,#22683)
+expr_containers(#22710,#22184)
+literals("K","K",#22710)
+typebind(#22710,#22695)
+#22711=*
+typeexprs(#22711,12,#22690,1,"keyof T")
+#22712=@"loc,{#10000},54,92,54,98"
+locations_default(#22712,#10000,54,92,54,98)
+hasLocation(#22711,#22712)
+enclosing_stmt(#22711,#22683)
+expr_containers(#22711,#22184)
 #22713=*
-typeexprs(#22713,1,#22712,0,"T")
-hasLocation(#22713,#21281)
-enclosing_stmt(#22713,#22707)
-expr_containers(#22713,#22183)
+typeexprs(#22713,0,#22711,0,"T")
+hasLocation(#22713,#21269)
+enclosing_stmt(#22713,#22683)
+expr_containers(#22713,#22184)
 literals("T","T",#22713)
-typedecl(#22713,#22711)
+typebind(#22713,#22687)
 #22714=*
-typeexprs(#22714,14,#22707,1,"Pick<T, ... mes<T>>")
-#22715=@"loc,{#10000},55,35,55,70"
-locations_default(#22715,#10000,55,35,55,70)
+stmts(#22714,35,#22184,29,"type No ... es<T>>;")
+#22715=@"loc,{#10000},55,3,55,71"
+locations_default(#22715,#10000,55,3,55,71)
 hasLocation(#22714,#22715)
-enclosing_stmt(#22714,#22707)
-expr_containers(#22714,#22183)
+stmt_containers(#22714,#22184)
 #22716=*
-typeexprs(#22716,0,#22714,-1,"Pick")
-hasLocation(#22716,#21287)
-enclosing_stmt(#22716,#22707)
-expr_containers(#22716,#22183)
-literals("Pick","Pick",#22716)
+typeexprs(#22716,1,#22714,0,"NonFunc ... perties")
+hasLocation(#22716,#21277)
+enclosing_stmt(#22716,#22714)
+expr_containers(#22716,#22184)
+literals("NonFunctionProperties","NonFunctionProperties",#22716)
+typedecl(#22716,#22217)
 #22717=*
-typeexprs(#22717,0,#22714,0,"T")
-hasLocation(#22717,#21291)
-enclosing_stmt(#22717,#22707)
-expr_containers(#22717,#22183)
-literals("T","T",#22717)
-typebind(#22717,#22711)
-#22718=*
-typeexprs(#22718,14,#22714,1,"NonFunc ... ames<T>")
-#22719=@"loc,{#10000},55,43,55,69"
-locations_default(#22719,#10000,55,43,55,69)
-hasLocation(#22718,#22719)
-enclosing_stmt(#22718,#22707)
-expr_containers(#22718,#22183)
+scopes(#22717,12)
+scopenodes(#22714,#22717)
+scopenesting(#22717,#22187)
+#22718=@"local_type_name;{T};{#22717}"
+local_type_names(#22718,"T",#22717)
+#22719=*
+typeexprs(#22719,22,#22714,2,"T")
+hasLocation(#22719,#21281)
+enclosing_stmt(#22719,#22714)
+expr_containers(#22719,#22184)
 #22720=*
-typeexprs(#22720,0,#22718,-1,"NonFunc ... tyNames")
-hasLocation(#22720,#21295)
-enclosing_stmt(#22720,#22707)
-expr_containers(#22720,#22183)
-literals("NonFunctionPropertyNames","NonFunctionPropertyNames",#22720)
-typebind(#22720,#22215)
+typeexprs(#22720,1,#22719,0,"T")
+hasLocation(#22720,#21281)
+enclosing_stmt(#22720,#22714)
+expr_containers(#22720,#22184)
+literals("T","T",#22720)
+typedecl(#22720,#22718)
 #22721=*
-typeexprs(#22721,0,#22718,0,"T")
-hasLocation(#22721,#21299)
-enclosing_stmt(#22721,#22707)
-expr_containers(#22721,#22183)
-literals("T","T",#22721)
-typebind(#22721,#22711)
-#22722=*
-stmts(#22722,34,#22183,30,"interfa ... id;\n  }")
-#22723=@"loc,{#10000},57,3,62,3"
-locations_default(#22723,#10000,57,3,62,3)
-hasLocation(#22722,#22723)
-stmt_containers(#22722,#22183)
+typeexprs(#22721,14,#22714,1,"Pick<T, ... mes<T>>")
+#22722=@"loc,{#10000},55,35,55,70"
+locations_default(#22722,#10000,55,35,55,70)
+hasLocation(#22721,#22722)
+enclosing_stmt(#22721,#22714)
+expr_containers(#22721,#22184)
+#22723=*
+typeexprs(#22723,0,#22721,-1,"Pick")
+hasLocation(#22723,#21287)
+enclosing_stmt(#22723,#22714)
+expr_containers(#22723,#22184)
+literals("Pick","Pick",#22723)
 #22724=*
-typeexprs(#22724,1,#22722,0,"Part")
-hasLocation(#22724,#21309)
-enclosing_stmt(#22724,#22722)
-expr_containers(#22724,#22183)
-literals("Part","Part",#22724)
-typedecl(#22724,#22217)
+typeexprs(#22724,0,#22721,0,"T")
+hasLocation(#22724,#21291)
+enclosing_stmt(#22724,#22714)
+expr_containers(#22724,#22184)
+literals("T","T",#22724)
+typebind(#22724,#22718)
 #22725=*
-properties(#22725,#22722,2,8,"id: number;")
-#22726=@"loc,{#10000},58,7,58,17"
-locations_default(#22726,#10000,58,7,58,17)
+typeexprs(#22725,14,#22721,1,"NonFunc ... ames<T>")
+#22726=@"loc,{#10000},55,43,55,69"
+locations_default(#22726,#10000,55,43,55,69)
 hasLocation(#22725,#22726)
+enclosing_stmt(#22725,#22714)
+expr_containers(#22725,#22184)
 #22727=*
-exprs(#22727,0,#22725,0,"id")
-hasLocation(#22727,#21313)
-enclosing_stmt(#22727,#22722)
-expr_containers(#22727,#22183)
-literals("id","id",#22727)
-is_abstract_member(#22725)
+typeexprs(#22727,0,#22725,-1,"NonFunc ... tyNames")
+hasLocation(#22727,#21295)
+enclosing_stmt(#22727,#22714)
+expr_containers(#22727,#22184)
+literals("NonFunctionPropertyNames","NonFunctionPropertyNames",#22727)
+typebind(#22727,#22216)
 #22728=*
-typeexprs(#22728,2,#22725,2,"number")
-hasLocation(#22728,#21317)
-enclosing_stmt(#22728,#22722)
-expr_containers(#22728,#22183)
-literals("number","number",#22728)
+typeexprs(#22728,0,#22725,0,"T")
+hasLocation(#22728,#21299)
+enclosing_stmt(#22728,#22714)
+expr_containers(#22728,#22184)
+literals("T","T",#22728)
+typebind(#22728,#22718)
 #22729=*
-properties(#22729,#22722,3,8,"name: string;")
-#22730=@"loc,{#10000},59,7,59,19"
-locations_default(#22730,#10000,59,7,59,19)
+stmts(#22729,34,#22184,30,"interfa ... id;\n  }")
+#22730=@"loc,{#10000},57,3,62,3"
+locations_default(#22730,#10000,57,3,62,3)
 hasLocation(#22729,#22730)
+stmt_containers(#22729,#22184)
 #22731=*
-exprs(#22731,0,#22729,0,"name")
-hasLocation(#22731,#21321)
-enclosing_stmt(#22731,#22722)
-expr_containers(#22731,#22183)
-literals("name","name",#22731)
-is_abstract_member(#22729)
+typeexprs(#22731,1,#22729,0,"Part")
+hasLocation(#22731,#21309)
+enclosing_stmt(#22731,#22729)
+expr_containers(#22731,#22184)
+literals("Part","Part",#22731)
+typedecl(#22731,#22218)
 #22732=*
-typeexprs(#22732,2,#22729,2,"string")
-hasLocation(#22732,#21325)
-enclosing_stmt(#22732,#22722)
-expr_containers(#22732,#22183)
-literals("string","string",#22732)
-#22733=*
-properties(#22733,#22722,4,8,"subparts: Part[];")
-#22734=@"loc,{#10000},60,7,60,23"
-locations_default(#22734,#10000,60,7,60,23)
-hasLocation(#22733,#22734)
+properties(#22732,#22729,2,8,"id: number;")
+#22733=@"loc,{#10000},58,7,58,17"
+locations_default(#22733,#10000,58,7,58,17)
+hasLocation(#22732,#22733)
+#22734=*
+exprs(#22734,0,#22732,0,"id")
+hasLocation(#22734,#21313)
+enclosing_stmt(#22734,#22729)
+expr_containers(#22734,#22184)
+literals("id","id",#22734)
+is_abstract_member(#22732)
 #22735=*
-exprs(#22735,0,#22733,0,"subparts")
-hasLocation(#22735,#21329)
-enclosing_stmt(#22735,#22722)
-expr_containers(#22735,#22183)
-literals("subparts","subparts",#22735)
-is_abstract_member(#22733)
+typeexprs(#22735,2,#22732,2,"number")
+hasLocation(#22735,#21317)
+enclosing_stmt(#22735,#22729)
+expr_containers(#22735,#22184)
+literals("number","number",#22735)
 #22736=*
-typeexprs(#22736,6,#22733,2,"Part[]")
-#22737=@"loc,{#10000},60,17,60,22"
-locations_default(#22737,#10000,60,17,60,22)
+properties(#22736,#22729,3,8,"name: string;")
+#22737=@"loc,{#10000},59,7,59,19"
+locations_default(#22737,#10000,59,7,59,19)
 hasLocation(#22736,#22737)
-enclosing_stmt(#22736,#22722)
-expr_containers(#22736,#22183)
 #22738=*
-typeexprs(#22738,0,#22736,0,"Part")
-hasLocation(#22738,#21333)
-enclosing_stmt(#22738,#22722)
-expr_containers(#22738,#22183)
-literals("Part","Part",#22738)
-typebind(#22738,#22217)
+exprs(#22738,0,#22736,0,"name")
+hasLocation(#22738,#21321)
+enclosing_stmt(#22738,#22729)
+expr_containers(#22738,#22184)
+literals("name","name",#22738)
+is_abstract_member(#22736)
 #22739=*
-properties(#22739,#22722,5,0,"updateP ... : void;")
-#22740=@"loc,{#10000},61,7,61,40"
-locations_default(#22740,#10000,61,7,61,40)
-hasLocation(#22739,#22740)
-#22741=*
-exprs(#22741,0,#22739,0,"updatePart")
-hasLocation(#22741,#21341)
-enclosing_stmt(#22741,#22722)
-expr_containers(#22741,#22183)
-literals("updatePart","updatePart",#22741)
+typeexprs(#22739,2,#22736,2,"string")
+hasLocation(#22739,#21325)
+enclosing_stmt(#22739,#22729)
+expr_containers(#22739,#22184)
+literals("string","string",#22739)
+#22740=*
+properties(#22740,#22729,4,8,"subparts: Part[];")
+#22741=@"loc,{#10000},60,7,60,23"
+locations_default(#22741,#10000,60,7,60,23)
+hasLocation(#22740,#22741)
 #22742=*
-exprs(#22742,9,#22739,1,"updateP ... : void;")
-hasLocation(#22742,#22740)
-enclosing_stmt(#22742,#22722)
-expr_containers(#22742,#22183)
+exprs(#22742,0,#22740,0,"subparts")
+hasLocation(#22742,#21329)
+enclosing_stmt(#22742,#22729)
+expr_containers(#22742,#22184)
+literals("subparts","subparts",#22742)
+is_abstract_member(#22740)
 #22743=*
-scopes(#22743,1)
-scopenodes(#22742,#22743)
-scopenesting(#22743,#22186)
-#22744=@"var;{newName};{#22743}"
-variables(#22744,"newName",#22743)
+typeexprs(#22743,6,#22740,2,"Part[]")
+#22744=@"loc,{#10000},60,17,60,22"
+locations_default(#22744,#10000,60,17,60,22)
+hasLocation(#22743,#22744)
+enclosing_stmt(#22743,#22729)
+expr_containers(#22743,#22184)
 #22745=*
-exprs(#22745,78,#22742,0,"newName")
-hasLocation(#22745,#21345)
-expr_containers(#22745,#22742)
-literals("newName","newName",#22745)
-decl(#22745,#22744)
-#22746=@"var;{arguments};{#22743}"
-variables(#22746,"arguments",#22743)
-is_arguments_object(#22746)
-#22747=*
-typeexprs(#22747,2,#22742,-3,"void")
-hasLocation(#22747,#21355)
-expr_containers(#22747,#22742)
-literals("void","void",#22747)
+typeexprs(#22745,0,#22743,0,"Part")
+hasLocation(#22745,#21333)
+enclosing_stmt(#22745,#22729)
+expr_containers(#22745,#22184)
+literals("Part","Part",#22745)
+typebind(#22745,#22218)
+#22746=*
+properties(#22746,#22729,5,0,"updateP ... : void;")
+#22747=@"loc,{#10000},61,7,61,40"
+locations_default(#22747,#10000,61,7,61,40)
+hasLocation(#22746,#22747)
 #22748=*
-typeexprs(#22748,2,#22742,-6,"string")
-hasLocation(#22748,#21349)
-expr_containers(#22748,#22742)
-literals("string","string",#22748)
-is_method(#22739)
-is_abstract_member(#22739)
+exprs(#22748,0,#22746,0,"updatePart")
+hasLocation(#22748,#21341)
+enclosing_stmt(#22748,#22729)
+expr_containers(#22748,#22184)
+literals("updatePart","updatePart",#22748)
 #22749=*
-stmts(#22749,35,#22183,31,"type T4 ... <Part>;")
-#22750=@"loc,{#10000},64,3,64,41"
-locations_default(#22750,#10000,64,3,64,41)
-hasLocation(#22749,#22750)
-stmt_containers(#22749,#22183)
-#22751=*
-typeexprs(#22751,1,#22749,0,"T40")
-hasLocation(#22751,#21363)
-enclosing_stmt(#22751,#22749)
-expr_containers(#22751,#22183)
-literals("T40","T40",#22751)
-typedecl(#22751,#22218)
-#22752=*
-typeexprs(#22752,14,#22749,1,"Functio ... s<Part>")
-#22753=@"loc,{#10000},64,14,64,40"
-locations_default(#22753,#10000,64,14,64,40)
-hasLocation(#22752,#22753)
-enclosing_stmt(#22752,#22749)
-expr_containers(#22752,#22183)
-#22754=*
-typeexprs(#22754,0,#22752,-1,"Functio ... tyNames")
-hasLocation(#22754,#21367)
-enclosing_stmt(#22754,#22749)
-expr_containers(#22754,#22183)
-literals("FunctionPropertyNames","FunctionPropertyNames",#22754)
-typebind(#22754,#22213)
+exprs(#22749,9,#22746,1,"updateP ... : void;")
+hasLocation(#22749,#22747)
+enclosing_stmt(#22749,#22729)
+expr_containers(#22749,#22184)
+#22750=*
+scopes(#22750,1)
+scopenodes(#22749,#22750)
+scopenesting(#22750,#22187)
+#22751=@"var;{this};{#22750}"
+variables(#22751,"this",#22750)
+#22752=@"var;{newName};{#22750}"
+variables(#22752,"newName",#22750)
+#22753=*
+exprs(#22753,78,#22749,0,"newName")
+hasLocation(#22753,#21345)
+expr_containers(#22753,#22749)
+literals("newName","newName",#22753)
+decl(#22753,#22752)
+#22754=@"var;{arguments};{#22750}"
+variables(#22754,"arguments",#22750)
+is_arguments_object(#22754)
 #22755=*
-typeexprs(#22755,0,#22752,0,"Part")
-hasLocation(#22755,#21371)
-enclosing_stmt(#22755,#22749)
-expr_containers(#22755,#22183)
-literals("Part","Part",#22755)
-typebind(#22755,#22217)
+typeexprs(#22755,2,#22749,-3,"void")
+hasLocation(#22755,#21355)
+expr_containers(#22755,#22749)
+literals("void","void",#22755)
 #22756=*
-stmts(#22756,35,#22183,32,"type T4 ... <Part>;")
-#22757=@"loc,{#10000},65,3,65,44"
-locations_default(#22757,#10000,65,3,65,44)
-hasLocation(#22756,#22757)
-stmt_containers(#22756,#22183)
-#22758=*
-typeexprs(#22758,1,#22756,0,"T41")
-hasLocation(#22758,#21379)
-enclosing_stmt(#22758,#22756)
-expr_containers(#22758,#22183)
-literals("T41","T41",#22758)
-typedecl(#22758,#22219)
+typeexprs(#22756,2,#22749,-6,"string")
+hasLocation(#22756,#21349)
+expr_containers(#22756,#22749)
+literals("string","string",#22756)
+is_method(#22746)
+is_abstract_member(#22746)
+#22757=*
+stmts(#22757,35,#22184,31,"type T4 ... <Part>;")
+#22758=@"loc,{#10000},64,3,64,41"
+locations_default(#22758,#10000,64,3,64,41)
+hasLocation(#22757,#22758)
+stmt_containers(#22757,#22184)
 #22759=*
-typeexprs(#22759,14,#22756,1,"NonFunc ... s<Part>")
-#22760=@"loc,{#10000},65,14,65,43"
-locations_default(#22760,#10000,65,14,65,43)
-hasLocation(#22759,#22760)
-enclosing_stmt(#22759,#22756)
-expr_containers(#22759,#22183)
-#22761=*
-typeexprs(#22761,0,#22759,-1,"NonFunc ... tyNames")
-hasLocation(#22761,#21383)
-enclosing_stmt(#22761,#22756)
-expr_containers(#22761,#22183)
-literals("NonFunctionPropertyNames","NonFunctionPropertyNames",#22761)
-typebind(#22761,#22215)
+typeexprs(#22759,1,#22757,0,"T40")
+hasLocation(#22759,#21363)
+enclosing_stmt(#22759,#22757)
+expr_containers(#22759,#22184)
+literals("T40","T40",#22759)
+typedecl(#22759,#22219)
+#22760=*
+typeexprs(#22760,14,#22757,1,"Functio ... s<Part>")
+#22761=@"loc,{#10000},64,14,64,40"
+locations_default(#22761,#10000,64,14,64,40)
+hasLocation(#22760,#22761)
+enclosing_stmt(#22760,#22757)
+expr_containers(#22760,#22184)
 #22762=*
-typeexprs(#22762,0,#22759,0,"Part")
-hasLocation(#22762,#21387)
-enclosing_stmt(#22762,#22756)
-expr_containers(#22762,#22183)
-literals("Part","Part",#22762)
-typebind(#22762,#22217)
+typeexprs(#22762,0,#22760,-1,"Functio ... tyNames")
+hasLocation(#22762,#21367)
+enclosing_stmt(#22762,#22757)
+expr_containers(#22762,#22184)
+literals("FunctionPropertyNames","FunctionPropertyNames",#22762)
+typebind(#22762,#22214)
 #22763=*
-stmts(#22763,35,#22183,33,"type T4 ... <Part>;")
-#22764=@"loc,{#10000},66,3,66,38"
-locations_default(#22764,#10000,66,3,66,38)
-hasLocation(#22763,#22764)
-stmt_containers(#22763,#22183)
-#22765=*
-typeexprs(#22765,1,#22763,0,"T42")
-hasLocation(#22765,#21395)
-enclosing_stmt(#22765,#22763)
-expr_containers(#22765,#22183)
-literals("T42","T42",#22765)
-typedecl(#22765,#22220)
+typeexprs(#22763,0,#22760,0,"Part")
+hasLocation(#22763,#21371)
+enclosing_stmt(#22763,#22757)
+expr_containers(#22763,#22184)
+literals("Part","Part",#22763)
+typebind(#22763,#22218)
+#22764=*
+stmts(#22764,35,#22184,32,"type T4 ... <Part>;")
+#22765=@"loc,{#10000},65,3,65,44"
+locations_default(#22765,#10000,65,3,65,44)
+hasLocation(#22764,#22765)
+stmt_containers(#22764,#22184)
 #22766=*
-typeexprs(#22766,14,#22763,1,"Functio ... s<Part>")
-#22767=@"loc,{#10000},66,14,66,37"
-locations_default(#22767,#10000,66,14,66,37)
-hasLocation(#22766,#22767)
-enclosing_stmt(#22766,#22763)
-expr_containers(#22766,#22183)
-#22768=*
-typeexprs(#22768,0,#22766,-1,"FunctionProperties")
-hasLocation(#22768,#21399)
-enclosing_stmt(#22768,#22763)
-expr_containers(#22768,#22183)
-literals("FunctionProperties","FunctionProperties",#22768)
-typebind(#22768,#22214)
+typeexprs(#22766,1,#22764,0,"T41")
+hasLocation(#22766,#21379)
+enclosing_stmt(#22766,#22764)
+expr_containers(#22766,#22184)
+literals("T41","T41",#22766)
+typedecl(#22766,#22220)
+#22767=*
+typeexprs(#22767,14,#22764,1,"NonFunc ... s<Part>")
+#22768=@"loc,{#10000},65,14,65,43"
+locations_default(#22768,#10000,65,14,65,43)
+hasLocation(#22767,#22768)
+enclosing_stmt(#22767,#22764)
+expr_containers(#22767,#22184)
 #22769=*
-typeexprs(#22769,0,#22766,0,"Part")
-hasLocation(#22769,#21403)
-enclosing_stmt(#22769,#22763)
-expr_containers(#22769,#22183)
-literals("Part","Part",#22769)
-typebind(#22769,#22217)
+typeexprs(#22769,0,#22767,-1,"NonFunc ... tyNames")
+hasLocation(#22769,#21383)
+enclosing_stmt(#22769,#22764)
+expr_containers(#22769,#22184)
+literals("NonFunctionPropertyNames","NonFunctionPropertyNames",#22769)
+typebind(#22769,#22216)
 #22770=*
-stmts(#22770,35,#22183,34,"type T4 ... <Part>;")
-#22771=@"loc,{#10000},67,3,67,41"
-locations_default(#22771,#10000,67,3,67,41)
-hasLocation(#22770,#22771)
-stmt_containers(#22770,#22183)
-#22772=*
-typeexprs(#22772,1,#22770,0,"T43")
-hasLocation(#22772,#21411)
-enclosing_stmt(#22772,#22770)
-expr_containers(#22772,#22183)
-literals("T43","T43",#22772)
-typedecl(#22772,#22221)
+typeexprs(#22770,0,#22767,0,"Part")
+hasLocation(#22770,#21387)
+enclosing_stmt(#22770,#22764)
+expr_containers(#22770,#22184)
+literals("Part","Part",#22770)
+typebind(#22770,#22218)
+#22771=*
+stmts(#22771,35,#22184,33,"type T4 ... <Part>;")
+#22772=@"loc,{#10000},66,3,66,38"
+locations_default(#22772,#10000,66,3,66,38)
+hasLocation(#22771,#22772)
+stmt_containers(#22771,#22184)
 #22773=*
-typeexprs(#22773,14,#22770,1,"NonFunc ... s<Part>")
-#22774=@"loc,{#10000},67,14,67,40"
-locations_default(#22774,#10000,67,14,67,40)
-hasLocation(#22773,#22774)
-enclosing_stmt(#22773,#22770)
-expr_containers(#22773,#22183)
-#22775=*
-typeexprs(#22775,0,#22773,-1,"NonFunc ... perties")
-hasLocation(#22775,#21415)
-enclosing_stmt(#22775,#22770)
-expr_containers(#22775,#22183)
-literals("NonFunctionProperties","NonFunctionProperties",#22775)
-typebind(#22775,#22216)
+typeexprs(#22773,1,#22771,0,"T42")
+hasLocation(#22773,#21395)
+enclosing_stmt(#22773,#22771)
+expr_containers(#22773,#22184)
+literals("T42","T42",#22773)
+typedecl(#22773,#22221)
+#22774=*
+typeexprs(#22774,14,#22771,1,"Functio ... s<Part>")
+#22775=@"loc,{#10000},66,14,66,37"
+locations_default(#22775,#10000,66,14,66,37)
+hasLocation(#22774,#22775)
+enclosing_stmt(#22774,#22771)
+expr_containers(#22774,#22184)
 #22776=*
-typeexprs(#22776,0,#22773,0,"Part")
-hasLocation(#22776,#21419)
-enclosing_stmt(#22776,#22770)
-expr_containers(#22776,#22183)
-literals("Part","Part",#22776)
-typebind(#22776,#22217)
+typeexprs(#22776,0,#22774,-1,"FunctionProperties")
+hasLocation(#22776,#21399)
+enclosing_stmt(#22776,#22771)
+expr_containers(#22776,#22184)
+literals("FunctionProperties","FunctionProperties",#22776)
+typebind(#22776,#22215)
 #22777=*
-stmts(#22777,35,#22183,35,"type Re ...  : any;")
-#22778=@"loc,{#10000},69,3,69,71"
-locations_default(#22778,#10000,69,3,69,71)
-hasLocation(#22777,#22778)
-stmt_containers(#22777,#22183)
-#22779=*
-typeexprs(#22779,1,#22777,0,"ReturnType")
-hasLocation(#22779,#21427)
-enclosing_stmt(#22779,#22777)
-expr_containers(#22779,#22183)
-literals("ReturnType","ReturnType",#22779)
-typedecl(#22779,#22222)
+typeexprs(#22777,0,#22774,0,"Part")
+hasLocation(#22777,#21403)
+enclosing_stmt(#22777,#22771)
+expr_containers(#22777,#22184)
+literals("Part","Part",#22777)
+typebind(#22777,#22218)
+#22778=*
+stmts(#22778,35,#22184,34,"type T4 ... <Part>;")
+#22779=@"loc,{#10000},67,3,67,41"
+locations_default(#22779,#10000,67,3,67,41)
+hasLocation(#22778,#22779)
+stmt_containers(#22778,#22184)
 #22780=*
-scopes(#22780,12)
-scopenodes(#22777,#22780)
-scopenesting(#22780,#22186)
-#22781=@"local_type_name;{T};{#22780}"
-local_type_names(#22781,"T",#22780)
-#22782=*
-typeexprs(#22782,22,#22777,2,"T")
-hasLocation(#22782,#21431)
-enclosing_stmt(#22782,#22777)
-expr_containers(#22782,#22183)
+typeexprs(#22780,1,#22778,0,"T43")
+hasLocation(#22780,#21411)
+enclosing_stmt(#22780,#22778)
+expr_containers(#22780,#22184)
+literals("T43","T43",#22780)
+typedecl(#22780,#22222)
+#22781=*
+typeexprs(#22781,14,#22778,1,"NonFunc ... s<Part>")
+#22782=@"loc,{#10000},67,14,67,40"
+locations_default(#22782,#10000,67,14,67,40)
+hasLocation(#22781,#22782)
+enclosing_stmt(#22781,#22778)
+expr_containers(#22781,#22184)
 #22783=*
-typeexprs(#22783,1,#22782,0,"T")
-hasLocation(#22783,#21431)
-enclosing_stmt(#22783,#22777)
-expr_containers(#22783,#22183)
-literals("T","T",#22783)
-typedecl(#22783,#22781)
+typeexprs(#22783,0,#22781,-1,"NonFunc ... perties")
+hasLocation(#22783,#21415)
+enclosing_stmt(#22783,#22778)
+expr_containers(#22783,#22184)
+literals("NonFunctionProperties","NonFunctionProperties",#22783)
+typebind(#22783,#22217)
 #22784=*
-typeexprs(#22784,28,#22777,1,"T exten ... R : any")
-#22785=@"loc,{#10000},69,24,69,70"
-locations_default(#22785,#10000,69,24,69,70)
-hasLocation(#22784,#22785)
-enclosing_stmt(#22784,#22777)
-expr_containers(#22784,#22183)
-#22786=*
-typeexprs(#22786,0,#22784,0,"T")
-hasLocation(#22786,#21437)
-enclosing_stmt(#22786,#22777)
-expr_containers(#22786,#22183)
-literals("T","T",#22786)
-typebind(#22786,#22781)
+typeexprs(#22784,0,#22781,0,"Part")
+hasLocation(#22784,#21419)
+enclosing_stmt(#22784,#22778)
+expr_containers(#22784,#22184)
+literals("Part","Part",#22784)
+typebind(#22784,#22218)
+#22785=*
+stmts(#22785,35,#22184,35,"type Re ...  : any;")
+#22786=@"loc,{#10000},69,3,69,71"
+locations_default(#22786,#10000,69,3,69,71)
+hasLocation(#22785,#22786)
+stmt_containers(#22785,#22184)
 #22787=*
-scopes(#22787,16)
-scopenodes(#22784,#22787)
-scopenesting(#22787,#22780)
-#22788=@"local_type_name;{R};{#22787}"
-local_type_names(#22788,"R",#22787)
-#22789=*
-typeexprs(#22789,23,#22784,1,"(...arg ... infer R")
-#22790=@"loc,{#10000},69,34,69,60"
-locations_default(#22790,#10000,69,34,69,60)
-hasLocation(#22789,#22790)
-enclosing_stmt(#22789,#22777)
-expr_containers(#22789,#22183)
+typeexprs(#22787,1,#22785,0,"ReturnType")
+hasLocation(#22787,#21427)
+enclosing_stmt(#22787,#22785)
+expr_containers(#22787,#22184)
+literals("ReturnType","ReturnType",#22787)
+typedecl(#22787,#22223)
+#22788=*
+scopes(#22788,12)
+scopenodes(#22785,#22788)
+scopenesting(#22788,#22187)
+#22789=@"local_type_name;{T};{#22788}"
+local_type_names(#22789,"T",#22788)
+#22790=*
+typeexprs(#22790,22,#22785,2,"T")
+hasLocation(#22790,#21431)
+enclosing_stmt(#22790,#22785)
+expr_containers(#22790,#22184)
 #22791=*
-exprs(#22791,9,#22789,0,"(...arg ... infer R")
-hasLocation(#22791,#22790)
-enclosing_stmt(#22791,#22777)
-expr_containers(#22791,#22183)
+typeexprs(#22791,1,#22790,0,"T")
+hasLocation(#22791,#21431)
+enclosing_stmt(#22791,#22785)
+expr_containers(#22791,#22184)
+literals("T","T",#22791)
+typedecl(#22791,#22789)
 #22792=*
-scopes(#22792,1)
-scopenodes(#22791,#22792)
-scopenesting(#22792,#22787)
-#22793=@"var;{args};{#22792}"
-variables(#22793,"args",#22792)
+typeexprs(#22792,28,#22785,1,"T exten ... R : any")
+#22793=@"loc,{#10000},69,24,69,70"
+locations_default(#22793,#10000,69,24,69,70)
+hasLocation(#22792,#22793)
+enclosing_stmt(#22792,#22785)
+expr_containers(#22792,#22184)
 #22794=*
-exprs(#22794,78,#22791,0,"args")
-hasLocation(#22794,#21445)
-expr_containers(#22794,#22791)
-literals("args","args",#22794)
-decl(#22794,#22793)
-#22795=@"var;{arguments};{#22792}"
-variables(#22795,"arguments",#22792)
-is_arguments_object(#22795)
-#22796=*
-typeexprs(#22796,29,#22791,-3,"infer R")
-#22797=@"loc,{#10000},69,54,69,60"
-locations_default(#22797,#10000,69,54,69,60)
-hasLocation(#22796,#22797)
-expr_containers(#22796,#22791)
-#22798=*
-typeexprs(#22798,22,#22796,0,"R")
-hasLocation(#22798,#21461)
-expr_containers(#22798,#22791)
+typeexprs(#22794,0,#22792,0,"T")
+hasLocation(#22794,#21437)
+enclosing_stmt(#22794,#22785)
+expr_containers(#22794,#22184)
+literals("T","T",#22794)
+typebind(#22794,#22789)
+#22795=*
+scopes(#22795,16)
+scopenodes(#22792,#22795)
+scopenesting(#22795,#22788)
+#22796=@"local_type_name;{R};{#22795}"
+local_type_names(#22796,"R",#22795)
+#22797=*
+typeexprs(#22797,23,#22792,1,"(...arg ... infer R")
+#22798=@"loc,{#10000},69,34,69,60"
+locations_default(#22798,#10000,69,34,69,60)
+hasLocation(#22797,#22798)
+enclosing_stmt(#22797,#22785)
+expr_containers(#22797,#22184)
 #22799=*
-typeexprs(#22799,1,#22798,0,"R")
-hasLocation(#22799,#21461)
-expr_containers(#22799,#22791)
-literals("R","R",#22799)
-typedecl(#22799,#22788)
+exprs(#22799,9,#22797,0,"(...arg ... infer R")
+hasLocation(#22799,#22798)
+enclosing_stmt(#22799,#22785)
+expr_containers(#22799,#22184)
 #22800=*
-typeexprs(#22800,6,#22791,-6,"any[]")
-#22801=@"loc,{#10000},69,44,69,48"
-locations_default(#22801,#10000,69,44,69,48)
-hasLocation(#22800,#22801)
-expr_containers(#22800,#22791)
-#22802=*
-typeexprs(#22802,2,#22800,0,"any")
-hasLocation(#22802,#21449)
-expr_containers(#22802,#22791)
-literals("any","any",#22802)
-has_rest_parameter(#22791)
+scopes(#22800,1)
+scopenodes(#22799,#22800)
+scopenesting(#22800,#22795)
+#22801=@"var;{this};{#22800}"
+variables(#22801,"this",#22800)
+#22802=@"var;{args};{#22800}"
+variables(#22802,"args",#22800)
 #22803=*
-typeexprs(#22803,0,#22784,2,"R")
-hasLocation(#22803,#21465)
-enclosing_stmt(#22803,#22777)
-expr_containers(#22803,#22183)
-literals("R","R",#22803)
-typebind(#22803,#22788)
-#22804=*
-typeexprs(#22804,2,#22784,3,"any")
-hasLocation(#22804,#21469)
-enclosing_stmt(#22804,#22777)
-expr_containers(#22804,#22183)
-literals("any","any",#22804)
-is_instantiated(#22183)
+exprs(#22803,78,#22799,0,"args")
+hasLocation(#22803,#21445)
+expr_containers(#22803,#22799)
+literals("args","args",#22803)
+decl(#22803,#22802)
+#22804=@"var;{arguments};{#22800}"
+variables(#22804,"arguments",#22800)
+is_arguments_object(#22804)
 #22805=*
-stmts(#22805,31,#20001,1,"namespa ...  any;\n}")
-#22806=@"loc,{#10000},72,1,101,1"
-locations_default(#22806,#10000,72,1,101,1)
+typeexprs(#22805,29,#22799,-3,"infer R")
+#22806=@"loc,{#10000},69,54,69,60"
+locations_default(#22806,#10000,69,54,69,60)
 hasLocation(#22805,#22806)
-stmt_containers(#22805,#20001)
+expr_containers(#22805,#22799)
 #22807=*
-exprs(#22807,78,#22805,-1,"ConditionalTypes2")
-hasLocation(#22807,#21476)
-enclosing_stmt(#22807,#22805)
-expr_containers(#22807,#20001)
-literals("ConditionalTypes2","ConditionalTypes2",#22807)
-decl(#22807,#22180)
-namespacedecl(#22807,#22182)
+typeexprs(#22807,22,#22805,0,"R")
+hasLocation(#22807,#21461)
+expr_containers(#22807,#22799)
 #22808=*
-scopes(#22808,9)
-scopenodes(#22805,#22808)
-scopenesting(#22808,#20000)
-#22809=@"var;{foo};{#22808}"
-variables(#22809,"foo",#22808)
-#22810=@"local_type_name;{Unpacked};{#22808}"
-local_type_names(#22810,"Unpacked",#22808)
-#22811=@"local_type_name;{T0};{#22808}"
-local_type_names(#22811,"T0",#22808)
-#22812=@"local_type_name;{T1};{#22808}"
-local_type_names(#22812,"T1",#22808)
-#22813=@"local_type_name;{T2};{#22808}"
-local_type_names(#22813,"T2",#22808)
-#22814=@"local_type_name;{T3};{#22808}"
-local_type_names(#22814,"T3",#22808)
-#22815=@"local_type_name;{T4};{#22808}"
-local_type_names(#22815,"T4",#22808)
-#22816=@"local_type_name;{T5};{#22808}"
-local_type_names(#22816,"T5",#22808)
-#22817=@"local_type_name;{Foo};{#22808}"
-local_type_names(#22817,"Foo",#22808)
-#22818=@"local_type_name;{T10};{#22808}"
-local_type_names(#22818,"T10",#22808)
-#22819=@"local_type_name;{T11};{#22808}"
-local_type_names(#22819,"T11",#22808)
-#22820=@"local_type_name;{Bar};{#22808}"
-local_type_names(#22820,"Bar",#22808)
-#22821=@"local_type_name;{T20};{#22808}"
-local_type_names(#22821,"T20",#22808)
-#22822=@"local_type_name;{T21};{#22808}"
-local_type_names(#22822,"T21",#22808)
-#22823=@"local_type_name;{T30};{#22808}"
-local_type_names(#22823,"T30",#22808)
-#22824=@"local_type_name;{AnyFunction};{#22808}"
-local_type_names(#22824,"AnyFunction",#22808)
-#22825=@"local_type_name;{ReturnType};{#22808}"
-local_type_names(#22825,"ReturnType",#22808)
-#22826=*
-stmts(#22826,35,#22805,0,"type Un ... \n    T;")
-#22827=@"loc,{#10000},73,3,77,6"
-locations_default(#22827,#10000,73,3,77,6)
-hasLocation(#22826,#22827)
-stmt_containers(#22826,#22805)
-#22828=*
-typeexprs(#22828,1,#22826,0,"Unpacked")
-hasLocation(#22828,#21482)
-enclosing_stmt(#22828,#22826)
-expr_containers(#22828,#22805)
-literals("Unpacked","Unpacked",#22828)
-typedecl(#22828,#22810)
-#22829=*
-scopes(#22829,12)
-scopenodes(#22826,#22829)
-scopenesting(#22829,#22808)
-#22830=@"local_type_name;{T};{#22829}"
-local_type_names(#22830,"T",#22829)
-#22831=*
-typeexprs(#22831,22,#22826,2,"T")
-hasLocation(#22831,#21486)
-enclosing_stmt(#22831,#22826)
-expr_containers(#22831,#22805)
-#22832=*
-typeexprs(#22832,1,#22831,0,"T")
-hasLocation(#22832,#21486)
-enclosing_stmt(#22832,#22826)
-expr_containers(#22832,#22805)
-literals("T","T",#22832)
-typedecl(#22832,#22830)
-#22833=*
-typeexprs(#22833,28,#22826,1,"T exten ... :\n    T")
-#22834=@"loc,{#10000},74,5,77,5"
-locations_default(#22834,#10000,74,5,77,5)
-hasLocation(#22833,#22834)
-enclosing_stmt(#22833,#22826)
-expr_containers(#22833,#22805)
+typeexprs(#22808,1,#22807,0,"R")
+hasLocation(#22808,#21461)
+expr_containers(#22808,#22799)
+literals("R","R",#22808)
+typedecl(#22808,#22796)
+#22809=*
+typeexprs(#22809,6,#22799,-6,"any[]")
+#22810=@"loc,{#10000},69,44,69,48"
+locations_default(#22810,#10000,69,44,69,48)
+hasLocation(#22809,#22810)
+expr_containers(#22809,#22799)
+#22811=*
+typeexprs(#22811,2,#22809,0,"any")
+hasLocation(#22811,#21449)
+expr_containers(#22811,#22799)
+literals("any","any",#22811)
+has_rest_parameter(#22799)
+#22812=*
+typeexprs(#22812,0,#22792,2,"R")
+hasLocation(#22812,#21465)
+enclosing_stmt(#22812,#22785)
+expr_containers(#22812,#22184)
+literals("R","R",#22812)
+typebind(#22812,#22796)
+#22813=*
+typeexprs(#22813,2,#22792,3,"any")
+hasLocation(#22813,#21469)
+enclosing_stmt(#22813,#22785)
+expr_containers(#22813,#22184)
+literals("any","any",#22813)
+is_instantiated(#22184)
+#22814=*
+stmts(#22814,31,#20001,1,"namespa ...  any;\n}")
+#22815=@"loc,{#10000},72,1,101,1"
+locations_default(#22815,#10000,72,1,101,1)
+hasLocation(#22814,#22815)
+stmt_containers(#22814,#20001)
+#22816=*
+exprs(#22816,78,#22814,-1,"ConditionalTypes2")
+hasLocation(#22816,#21476)
+enclosing_stmt(#22816,#22814)
+expr_containers(#22816,#20001)
+literals("ConditionalTypes2","ConditionalTypes2",#22816)
+decl(#22816,#22180)
+namespacedecl(#22816,#22182)
+#22817=*
+scopes(#22817,9)
+scopenodes(#22814,#22817)
+scopenesting(#22817,#20000)
+#22818=@"var;{foo};{#22817}"
+variables(#22818,"foo",#22817)
+#22819=@"local_type_name;{Unpacked};{#22817}"
+local_type_names(#22819,"Unpacked",#22817)
+#22820=@"local_type_name;{T0};{#22817}"
+local_type_names(#22820,"T0",#22817)
+#22821=@"local_type_name;{T1};{#22817}"
+local_type_names(#22821,"T1",#22817)
+#22822=@"local_type_name;{T2};{#22817}"
+local_type_names(#22822,"T2",#22817)
+#22823=@"local_type_name;{T3};{#22817}"
+local_type_names(#22823,"T3",#22817)
+#22824=@"local_type_name;{T4};{#22817}"
+local_type_names(#22824,"T4",#22817)
+#22825=@"local_type_name;{T5};{#22817}"
+local_type_names(#22825,"T5",#22817)
+#22826=@"local_type_name;{Foo};{#22817}"
+local_type_names(#22826,"Foo",#22817)
+#22827=@"local_type_name;{T10};{#22817}"
+local_type_names(#22827,"T10",#22817)
+#22828=@"local_type_name;{T11};{#22817}"
+local_type_names(#22828,"T11",#22817)
+#22829=@"local_type_name;{Bar};{#22817}"
+local_type_names(#22829,"Bar",#22817)
+#22830=@"local_type_name;{T20};{#22817}"
+local_type_names(#22830,"T20",#22817)
+#22831=@"local_type_name;{T21};{#22817}"
+local_type_names(#22831,"T21",#22817)
+#22832=@"local_type_name;{T30};{#22817}"
+local_type_names(#22832,"T30",#22817)
+#22833=@"local_type_name;{AnyFunction};{#22817}"
+local_type_names(#22833,"AnyFunction",#22817)
+#22834=@"local_type_name;{ReturnType};{#22817}"
+local_type_names(#22834,"ReturnType",#22817)
 #22835=*
-typeexprs(#22835,0,#22833,0,"T")
-hasLocation(#22835,#21492)
-enclosing_stmt(#22835,#22826)
-expr_containers(#22835,#22805)
-literals("T","T",#22835)
-typebind(#22835,#22830)
-#22836=*
-scopes(#22836,16)
-scopenodes(#22833,#22836)
-scopenesting(#22836,#22829)
-#22837=@"local_type_name;{U};{#22836}"
-local_type_names(#22837,"U",#22836)
+stmts(#22835,35,#22814,0,"type Un ... \n    T;")
+#22836=@"loc,{#10000},73,3,77,6"
+locations_default(#22836,#10000,73,3,77,6)
+hasLocation(#22835,#22836)
+stmt_containers(#22835,#22814)
+#22837=*
+typeexprs(#22837,1,#22835,0,"Unpacked")
+hasLocation(#22837,#21482)
+enclosing_stmt(#22837,#22835)
+expr_containers(#22837,#22814)
+literals("Unpacked","Unpacked",#22837)
+typedecl(#22837,#22819)
 #22838=*
-typeexprs(#22838,6,#22833,1,"(infer U)[]")
-#22839=@"loc,{#10000},74,15,74,25"
-locations_default(#22839,#10000,74,15,74,25)
-hasLocation(#22838,#22839)
-enclosing_stmt(#22838,#22826)
-expr_containers(#22838,#22805)
+scopes(#22838,12)
+scopenodes(#22835,#22838)
+scopenesting(#22838,#22817)
+#22839=@"local_type_name;{T};{#22838}"
+local_type_names(#22839,"T",#22838)
 #22840=*
-typeexprs(#22840,10,#22838,0,"(infer U)")
-#22841=@"loc,{#10000},74,15,74,23"
-locations_default(#22841,#10000,74,15,74,23)
-hasLocation(#22840,#22841)
-enclosing_stmt(#22840,#22826)
-expr_containers(#22840,#22805)
+typeexprs(#22840,22,#22835,2,"T")
+hasLocation(#22840,#21486)
+enclosing_stmt(#22840,#22835)
+expr_containers(#22840,#22814)
+#22841=*
+typeexprs(#22841,1,#22840,0,"T")
+hasLocation(#22841,#21486)
+enclosing_stmt(#22841,#22835)
+expr_containers(#22841,#22814)
+literals("T","T",#22841)
+typedecl(#22841,#22839)
 #22842=*
-typeexprs(#22842,29,#22840,0,"infer U")
-#22843=@"loc,{#10000},74,16,74,22"
-locations_default(#22843,#10000,74,16,74,22)
+typeexprs(#22842,28,#22835,1,"T exten ... :\n    T")
+#22843=@"loc,{#10000},74,5,77,5"
+locations_default(#22843,#10000,74,5,77,5)
 hasLocation(#22842,#22843)
-enclosing_stmt(#22842,#22826)
-expr_containers(#22842,#22805)
+enclosing_stmt(#22842,#22835)
+expr_containers(#22842,#22814)
 #22844=*
-typeexprs(#22844,22,#22842,0,"U")
-hasLocation(#22844,#21500)
-enclosing_stmt(#22844,#22826)
-expr_containers(#22844,#22805)
+typeexprs(#22844,0,#22842,0,"T")
+hasLocation(#22844,#21492)
+enclosing_stmt(#22844,#22835)
+expr_containers(#22844,#22814)
+literals("T","T",#22844)
+typebind(#22844,#22839)
 #22845=*
-typeexprs(#22845,1,#22844,0,"U")
-hasLocation(#22845,#21500)
-enclosing_stmt(#22845,#22826)
-expr_containers(#22845,#22805)
-literals("U","U",#22845)
-typedecl(#22845,#22837)
-#22846=*
-typeexprs(#22846,0,#22833,2,"U")
-hasLocation(#22846,#21510)
-enclosing_stmt(#22846,#22826)
-expr_containers(#22846,#22805)
-literals("U","U",#22846)
-typebind(#22846,#22837)
+scopes(#22845,16)
+scopenodes(#22842,#22845)
+scopenesting(#22845,#22838)
+#22846=@"local_type_name;{U};{#22845}"
+local_type_names(#22846,"U",#22845)
 #22847=*
-typeexprs(#22847,28,#22833,3,"T exten ... :\n    T")
-#22848=@"loc,{#10000},75,5,77,5"
-locations_default(#22848,#10000,75,5,77,5)
+typeexprs(#22847,6,#22842,1,"(infer U)[]")
+#22848=@"loc,{#10000},74,15,74,25"
+locations_default(#22848,#10000,74,15,74,25)
 hasLocation(#22847,#22848)
-enclosing_stmt(#22847,#22826)
-expr_containers(#22847,#22805)
+enclosing_stmt(#22847,#22835)
+expr_containers(#22847,#22814)
 #22849=*
-typeexprs(#22849,0,#22847,0,"T")
-hasLocation(#22849,#21514)
-enclosing_stmt(#22849,#22826)
-expr_containers(#22849,#22805)
-literals("T","T",#22849)
-typebind(#22849,#22830)
-#22850=*
-scopes(#22850,16)
-scopenodes(#22847,#22850)
-scopenesting(#22850,#22829)
-#22851=@"local_type_name;{U};{#22850}"
-local_type_names(#22851,"U",#22850)
-#22852=*
-typeexprs(#22852,23,#22847,1,"(...arg ... infer U")
-#22853=@"loc,{#10000},75,15,75,41"
-locations_default(#22853,#10000,75,15,75,41)
-hasLocation(#22852,#22853)
-enclosing_stmt(#22852,#22826)
-expr_containers(#22852,#22805)
+typeexprs(#22849,10,#22847,0,"(infer U)")
+#22850=@"loc,{#10000},74,15,74,23"
+locations_default(#22850,#10000,74,15,74,23)
+hasLocation(#22849,#22850)
+enclosing_stmt(#22849,#22835)
+expr_containers(#22849,#22814)
+#22851=*
+typeexprs(#22851,29,#22849,0,"infer U")
+#22852=@"loc,{#10000},74,16,74,22"
+locations_default(#22852,#10000,74,16,74,22)
+hasLocation(#22851,#22852)
+enclosing_stmt(#22851,#22835)
+expr_containers(#22851,#22814)
+#22853=*
+typeexprs(#22853,22,#22851,0,"U")
+hasLocation(#22853,#21500)
+enclosing_stmt(#22853,#22835)
+expr_containers(#22853,#22814)
 #22854=*
-exprs(#22854,9,#22852,0,"(...arg ... infer U")
-hasLocation(#22854,#22853)
-enclosing_stmt(#22854,#22826)
-expr_containers(#22854,#22805)
+typeexprs(#22854,1,#22853,0,"U")
+hasLocation(#22854,#21500)
+enclosing_stmt(#22854,#22835)
+expr_containers(#22854,#22814)
+literals("U","U",#22854)
+typedecl(#22854,#22846)
 #22855=*
-scopes(#22855,1)
-scopenodes(#22854,#22855)
-scopenesting(#22855,#22850)
-#22856=@"var;{args};{#22855}"
-variables(#22856,"args",#22855)
-#22857=*
-exprs(#22857,78,#22854,0,"args")
-hasLocation(#22857,#21522)
-expr_containers(#22857,#22854)
-literals("args","args",#22857)
-decl(#22857,#22856)
-#22858=@"var;{arguments};{#22855}"
-variables(#22858,"arguments",#22855)
-is_arguments_object(#22858)
+typeexprs(#22855,0,#22842,2,"U")
+hasLocation(#22855,#21510)
+enclosing_stmt(#22855,#22835)
+expr_containers(#22855,#22814)
+literals("U","U",#22855)
+typebind(#22855,#22846)
+#22856=*
+typeexprs(#22856,28,#22842,3,"T exten ... :\n    T")
+#22857=@"loc,{#10000},75,5,77,5"
+locations_default(#22857,#10000,75,5,77,5)
+hasLocation(#22856,#22857)
+enclosing_stmt(#22856,#22835)
+expr_containers(#22856,#22814)
+#22858=*
+typeexprs(#22858,0,#22856,0,"T")
+hasLocation(#22858,#21514)
+enclosing_stmt(#22858,#22835)
+expr_containers(#22858,#22814)
+literals("T","T",#22858)
+typebind(#22858,#22839)
 #22859=*
-typeexprs(#22859,29,#22854,-3,"infer U")
-#22860=@"loc,{#10000},75,35,75,41"
-locations_default(#22860,#10000,75,35,75,41)
-hasLocation(#22859,#22860)
-expr_containers(#22859,#22854)
+scopes(#22859,16)
+scopenodes(#22856,#22859)
+scopenesting(#22859,#22838)
+#22860=@"local_type_name;{U};{#22859}"
+local_type_names(#22860,"U",#22859)
 #22861=*
-typeexprs(#22861,22,#22859,0,"U")
-hasLocation(#22861,#21538)
-expr_containers(#22861,#22854)
-#22862=*
-typeexprs(#22862,1,#22861,0,"U")
-hasLocation(#22862,#21538)
-expr_containers(#22862,#22854)
-literals("U","U",#22862)
-typedecl(#22862,#22851)
+typeexprs(#22861,23,#22856,1,"(...arg ... infer U")
+#22862=@"loc,{#10000},75,15,75,41"
+locations_default(#22862,#10000,75,15,75,41)
+hasLocation(#22861,#22862)
+enclosing_stmt(#22861,#22835)
+expr_containers(#22861,#22814)
 #22863=*
-typeexprs(#22863,6,#22854,-6,"any[]")
-#22864=@"loc,{#10000},75,25,75,29"
-locations_default(#22864,#10000,75,25,75,29)
-hasLocation(#22863,#22864)
-expr_containers(#22863,#22854)
-#22865=*
-typeexprs(#22865,2,#22863,0,"any")
-hasLocation(#22865,#21526)
-expr_containers(#22865,#22854)
-literals("any","any",#22865)
-has_rest_parameter(#22854)
-#22866=*
-typeexprs(#22866,0,#22847,2,"U")
-hasLocation(#22866,#21542)
-enclosing_stmt(#22866,#22826)
-expr_containers(#22866,#22805)
-literals("U","U",#22866)
-typebind(#22866,#22851)
+exprs(#22863,9,#22861,0,"(...arg ... infer U")
+hasLocation(#22863,#22862)
+enclosing_stmt(#22863,#22835)
+expr_containers(#22863,#22814)
+#22864=*
+scopes(#22864,1)
+scopenodes(#22863,#22864)
+scopenesting(#22864,#22859)
+#22865=@"var;{this};{#22864}"
+variables(#22865,"this",#22864)
+#22866=@"var;{args};{#22864}"
+variables(#22866,"args",#22864)
 #22867=*
-typeexprs(#22867,28,#22847,3,"T exten ... :\n    T")
-#22868=@"loc,{#10000},76,5,77,5"
-locations_default(#22868,#10000,76,5,77,5)
-hasLocation(#22867,#22868)
-enclosing_stmt(#22867,#22826)
-expr_containers(#22867,#22805)
+exprs(#22867,78,#22863,0,"args")
+hasLocation(#22867,#21522)
+expr_containers(#22867,#22863)
+literals("args","args",#22867)
+decl(#22867,#22866)
+#22868=@"var;{arguments};{#22864}"
+variables(#22868,"arguments",#22864)
+is_arguments_object(#22868)
 #22869=*
-typeexprs(#22869,0,#22867,0,"T")
-hasLocation(#22869,#21546)
-enclosing_stmt(#22869,#22826)
-expr_containers(#22869,#22805)
-literals("T","T",#22869)
-typebind(#22869,#22830)
-#22870=*
-scopes(#22870,16)
-scopenodes(#22867,#22870)
-scopenesting(#22870,#22829)
-#22871=@"local_type_name;{U};{#22870}"
-local_type_names(#22871,"U",#22870)
+typeexprs(#22869,29,#22863,-3,"infer U")
+#22870=@"loc,{#10000},75,35,75,41"
+locations_default(#22870,#10000,75,35,75,41)
+hasLocation(#22869,#22870)
+expr_containers(#22869,#22863)
+#22871=*
+typeexprs(#22871,22,#22869,0,"U")
+hasLocation(#22871,#21538)
+expr_containers(#22871,#22863)
 #22872=*
-typeexprs(#22872,14,#22867,1,"Promise<infer U>")
-#22873=@"loc,{#10000},76,15,76,30"
-locations_default(#22873,#10000,76,15,76,30)
-hasLocation(#22872,#22873)
-enclosing_stmt(#22872,#22826)
-expr_containers(#22872,#22805)
-#22874=*
-typeexprs(#22874,0,#22872,-1,"Promise")
-hasLocation(#22874,#21550)
-enclosing_stmt(#22874,#22826)
-expr_containers(#22874,#22805)
-literals("Promise","Promise",#22874)
+typeexprs(#22872,1,#22871,0,"U")
+hasLocation(#22872,#21538)
+expr_containers(#22872,#22863)
+literals("U","U",#22872)
+typedecl(#22872,#22860)
+#22873=*
+typeexprs(#22873,6,#22863,-6,"any[]")
+#22874=@"loc,{#10000},75,25,75,29"
+locations_default(#22874,#10000,75,25,75,29)
+hasLocation(#22873,#22874)
+expr_containers(#22873,#22863)
 #22875=*
-typeexprs(#22875,29,#22872,0,"infer U")
-#22876=@"loc,{#10000},76,23,76,29"
-locations_default(#22876,#10000,76,23,76,29)
-hasLocation(#22875,#22876)
-enclosing_stmt(#22875,#22826)
-expr_containers(#22875,#22805)
+typeexprs(#22875,2,#22873,0,"any")
+hasLocation(#22875,#21526)
+expr_containers(#22875,#22863)
+literals("any","any",#22875)
+has_rest_parameter(#22863)
+#22876=*
+typeexprs(#22876,0,#22856,2,"U")
+hasLocation(#22876,#21542)
+enclosing_stmt(#22876,#22835)
+expr_containers(#22876,#22814)
+literals("U","U",#22876)
+typebind(#22876,#22860)
 #22877=*
-typeexprs(#22877,22,#22875,0,"U")
-hasLocation(#22877,#21556)
-enclosing_stmt(#22877,#22826)
-expr_containers(#22877,#22805)
-#22878=*
-typeexprs(#22878,1,#22877,0,"U")
-hasLocation(#22878,#21556)
-enclosing_stmt(#22878,#22826)
-expr_containers(#22878,#22805)
-literals("U","U",#22878)
-typedecl(#22878,#22871)
+typeexprs(#22877,28,#22856,3,"T exten ... :\n    T")
+#22878=@"loc,{#10000},76,5,77,5"
+locations_default(#22878,#10000,76,5,77,5)
+hasLocation(#22877,#22878)
+enclosing_stmt(#22877,#22835)
+expr_containers(#22877,#22814)
 #22879=*
-typeexprs(#22879,0,#22867,2,"U")
-hasLocation(#22879,#21562)
-enclosing_stmt(#22879,#22826)
-expr_containers(#22879,#22805)
-literals("U","U",#22879)
-typebind(#22879,#22871)
+typeexprs(#22879,0,#22877,0,"T")
+hasLocation(#22879,#21546)
+enclosing_stmt(#22879,#22835)
+expr_containers(#22879,#22814)
+literals("T","T",#22879)
+typebind(#22879,#22839)
 #22880=*
-typeexprs(#22880,0,#22867,3,"T")
-hasLocation(#22880,#21566)
-enclosing_stmt(#22880,#22826)
-expr_containers(#22880,#22805)
-literals("T","T",#22880)
-typebind(#22880,#22830)
-#22881=*
-stmts(#22881,35,#22805,1,"type T0 ... tring>;")
-#22882=@"loc,{#10000},79,3,79,29"
-locations_default(#22882,#10000,79,3,79,29)
-hasLocation(#22881,#22882)
-stmt_containers(#22881,#22805)
-#22883=*
-typeexprs(#22883,1,#22881,0,"T0")
-hasLocation(#22883,#21572)
-enclosing_stmt(#22883,#22881)
-expr_containers(#22883,#22805)
-literals("T0","T0",#22883)
-typedecl(#22883,#22811)
+scopes(#22880,16)
+scopenodes(#22877,#22880)
+scopenesting(#22880,#22838)
+#22881=@"local_type_name;{U};{#22880}"
+local_type_names(#22881,"U",#22880)
+#22882=*
+typeexprs(#22882,14,#22877,1,"Promise<infer U>")
+#22883=@"loc,{#10000},76,15,76,30"
+locations_default(#22883,#10000,76,15,76,30)
+hasLocation(#22882,#22883)
+enclosing_stmt(#22882,#22835)
+expr_containers(#22882,#22814)
 #22884=*
-typeexprs(#22884,14,#22881,1,"Unpacked<string>")
-#22885=@"loc,{#10000},79,13,79,28"
-locations_default(#22885,#10000,79,13,79,28)
-hasLocation(#22884,#22885)
-enclosing_stmt(#22884,#22881)
-expr_containers(#22884,#22805)
-#22886=*
-typeexprs(#22886,0,#22884,-1,"Unpacked")
-hasLocation(#22886,#21576)
-enclosing_stmt(#22886,#22881)
-expr_containers(#22886,#22805)
-literals("Unpacked","Unpacked",#22886)
-typebind(#22886,#22810)
+typeexprs(#22884,0,#22882,-1,"Promise")
+hasLocation(#22884,#21550)
+enclosing_stmt(#22884,#22835)
+expr_containers(#22884,#22814)
+literals("Promise","Promise",#22884)
+#22885=*
+typeexprs(#22885,29,#22882,0,"infer U")
+#22886=@"loc,{#10000},76,23,76,29"
+locations_default(#22886,#10000,76,23,76,29)
+hasLocation(#22885,#22886)
+enclosing_stmt(#22885,#22835)
+expr_containers(#22885,#22814)
 #22887=*
-typeexprs(#22887,2,#22884,0,"string")
-hasLocation(#22887,#21580)
-enclosing_stmt(#22887,#22881)
-expr_containers(#22887,#22805)
-literals("string","string",#22887)
+typeexprs(#22887,22,#22885,0,"U")
+hasLocation(#22887,#21556)
+enclosing_stmt(#22887,#22835)
+expr_containers(#22887,#22814)
 #22888=*
-stmts(#22888,35,#22805,2,"type T1 ... ing[]>;")
-#22889=@"loc,{#10000},80,3,80,31"
-locations_default(#22889,#10000,80,3,80,31)
-hasLocation(#22888,#22889)
-stmt_containers(#22888,#22805)
+typeexprs(#22888,1,#22887,0,"U")
+hasLocation(#22888,#21556)
+enclosing_stmt(#22888,#22835)
+expr_containers(#22888,#22814)
+literals("U","U",#22888)
+typedecl(#22888,#22881)
+#22889=*
+typeexprs(#22889,0,#22877,2,"U")
+hasLocation(#22889,#21562)
+enclosing_stmt(#22889,#22835)
+expr_containers(#22889,#22814)
+literals("U","U",#22889)
+typebind(#22889,#22881)
 #22890=*
-typeexprs(#22890,1,#22888,0,"T1")
-hasLocation(#22890,#21588)
-enclosing_stmt(#22890,#22888)
-expr_containers(#22890,#22805)
-literals("T1","T1",#22890)
-typedecl(#22890,#22812)
+typeexprs(#22890,0,#22877,3,"T")
+hasLocation(#22890,#21566)
+enclosing_stmt(#22890,#22835)
+expr_containers(#22890,#22814)
+literals("T","T",#22890)
+typebind(#22890,#22839)
 #22891=*
-typeexprs(#22891,14,#22888,1,"Unpacked<string[]>")
-#22892=@"loc,{#10000},80,13,80,30"
-locations_default(#22892,#10000,80,13,80,30)
+stmts(#22891,35,#22814,1,"type T0 ... tring>;")
+#22892=@"loc,{#10000},79,3,79,29"
+locations_default(#22892,#10000,79,3,79,29)
 hasLocation(#22891,#22892)
-enclosing_stmt(#22891,#22888)
-expr_containers(#22891,#22805)
+stmt_containers(#22891,#22814)
 #22893=*
-typeexprs(#22893,0,#22891,-1,"Unpacked")
-hasLocation(#22893,#21592)
-enclosing_stmt(#22893,#22888)
-expr_containers(#22893,#22805)
-literals("Unpacked","Unpacked",#22893)
-typebind(#22893,#22810)
+typeexprs(#22893,1,#22891,0,"T0")
+hasLocation(#22893,#21572)
+enclosing_stmt(#22893,#22891)
+expr_containers(#22893,#22814)
+literals("T0","T0",#22893)
+typedecl(#22893,#22820)
 #22894=*
-typeexprs(#22894,6,#22891,0,"string[]")
-#22895=@"loc,{#10000},80,22,80,29"
-locations_default(#22895,#10000,80,22,80,29)
+typeexprs(#22894,14,#22891,1,"Unpacked<string>")
+#22895=@"loc,{#10000},79,13,79,28"
+locations_default(#22895,#10000,79,13,79,28)
 hasLocation(#22894,#22895)
-enclosing_stmt(#22894,#22888)
-expr_containers(#22894,#22805)
+enclosing_stmt(#22894,#22891)
+expr_containers(#22894,#22814)
 #22896=*
-typeexprs(#22896,2,#22894,0,"string")
-hasLocation(#22896,#21596)
-enclosing_stmt(#22896,#22888)
-expr_containers(#22896,#22805)
-literals("string","string",#22896)
+typeexprs(#22896,0,#22894,-1,"Unpacked")
+hasLocation(#22896,#21576)
+enclosing_stmt(#22896,#22891)
+expr_containers(#22896,#22814)
+literals("Unpacked","Unpacked",#22896)
+typebind(#22896,#22819)
 #22897=*
-stmts(#22897,35,#22805,3,"type T2 ... tring>;")
-#22898=@"loc,{#10000},81,3,81,35"
-locations_default(#22898,#10000,81,3,81,35)
-hasLocation(#22897,#22898)
-stmt_containers(#22897,#22805)
-#22899=*
-typeexprs(#22899,1,#22897,0,"T2")
-hasLocation(#22899,#21608)
-enclosing_stmt(#22899,#22897)
-expr_containers(#22899,#22805)
-literals("T2","T2",#22899)
-typedecl(#22899,#22813)
+typeexprs(#22897,2,#22894,0,"string")
+hasLocation(#22897,#21580)
+enclosing_stmt(#22897,#22891)
+expr_containers(#22897,#22814)
+literals("string","string",#22897)
+#22898=*
+stmts(#22898,35,#22814,2,"type T1 ... ing[]>;")
+#22899=@"loc,{#10000},80,3,80,31"
+locations_default(#22899,#10000,80,3,80,31)
+hasLocation(#22898,#22899)
+stmt_containers(#22898,#22814)
 #22900=*
-typeexprs(#22900,14,#22897,1,"Unpacke ... string>")
-#22901=@"loc,{#10000},81,13,81,34"
-locations_default(#22901,#10000,81,13,81,34)
-hasLocation(#22900,#22901)
-enclosing_stmt(#22900,#22897)
-expr_containers(#22900,#22805)
-#22902=*
-typeexprs(#22902,0,#22900,-1,"Unpacked")
-hasLocation(#22902,#21612)
-enclosing_stmt(#22902,#22897)
-expr_containers(#22902,#22805)
-literals("Unpacked","Unpacked",#22902)
-typebind(#22902,#22810)
+typeexprs(#22900,1,#22898,0,"T1")
+hasLocation(#22900,#21588)
+enclosing_stmt(#22900,#22898)
+expr_containers(#22900,#22814)
+literals("T1","T1",#22900)
+typedecl(#22900,#22821)
+#22901=*
+typeexprs(#22901,14,#22898,1,"Unpacked<string[]>")
+#22902=@"loc,{#10000},80,13,80,30"
+locations_default(#22902,#10000,80,13,80,30)
+hasLocation(#22901,#22902)
+enclosing_stmt(#22901,#22898)
+expr_containers(#22901,#22814)
 #22903=*
-typeexprs(#22903,23,#22900,0,"() => string")
-#22904=@"loc,{#10000},81,22,81,33"
-locations_default(#22904,#10000,81,22,81,33)
-hasLocation(#22903,#22904)
-enclosing_stmt(#22903,#22897)
-expr_containers(#22903,#22805)
-#22905=*
-exprs(#22905,9,#22903,0,"() => string")
-hasLocation(#22905,#22904)
-enclosing_stmt(#22905,#22897)
-expr_containers(#22905,#22805)
+typeexprs(#22903,0,#22901,-1,"Unpacked")
+hasLocation(#22903,#21592)
+enclosing_stmt(#22903,#22898)
+expr_containers(#22903,#22814)
+literals("Unpacked","Unpacked",#22903)
+typebind(#22903,#22819)
+#22904=*
+typeexprs(#22904,6,#22901,0,"string[]")
+#22905=@"loc,{#10000},80,22,80,29"
+locations_default(#22905,#10000,80,22,80,29)
+hasLocation(#22904,#22905)
+enclosing_stmt(#22904,#22898)
+expr_containers(#22904,#22814)
 #22906=*
-scopes(#22906,1)
-scopenodes(#22905,#22906)
-scopenesting(#22906,#22808)
-#22907=@"var;{arguments};{#22906}"
-variables(#22907,"arguments",#22906)
-is_arguments_object(#22907)
-#22908=*
-typeexprs(#22908,2,#22905,-3,"string")
-hasLocation(#22908,#21622)
-expr_containers(#22908,#22905)
-literals("string","string",#22908)
+typeexprs(#22906,2,#22904,0,"string")
+hasLocation(#22906,#21596)
+enclosing_stmt(#22906,#22898)
+expr_containers(#22906,#22814)
+literals("string","string",#22906)
+#22907=*
+stmts(#22907,35,#22814,3,"type T2 ... tring>;")
+#22908=@"loc,{#10000},81,3,81,35"
+locations_default(#22908,#10000,81,3,81,35)
+hasLocation(#22907,#22908)
+stmt_containers(#22907,#22814)
 #22909=*
-stmts(#22909,35,#22805,4,"type T3 ... ring>>;")
-#22910=@"loc,{#10000},82,3,82,38"
-locations_default(#22910,#10000,82,3,82,38)
-hasLocation(#22909,#22910)
-stmt_containers(#22909,#22805)
-#22911=*
-typeexprs(#22911,1,#22909,0,"T3")
-hasLocation(#22911,#21630)
-enclosing_stmt(#22911,#22909)
-expr_containers(#22911,#22805)
-literals("T3","T3",#22911)
-typedecl(#22911,#22814)
+typeexprs(#22909,1,#22907,0,"T2")
+hasLocation(#22909,#21608)
+enclosing_stmt(#22909,#22907)
+expr_containers(#22909,#22814)
+literals("T2","T2",#22909)
+typedecl(#22909,#22822)
+#22910=*
+typeexprs(#22910,14,#22907,1,"Unpacke ... string>")
+#22911=@"loc,{#10000},81,13,81,34"
+locations_default(#22911,#10000,81,13,81,34)
+hasLocation(#22910,#22911)
+enclosing_stmt(#22910,#22907)
+expr_containers(#22910,#22814)
 #22912=*
-typeexprs(#22912,14,#22909,1,"Unpacke ... tring>>")
-#22913=@"loc,{#10000},82,13,82,37"
-locations_default(#22913,#10000,82,13,82,37)
-hasLocation(#22912,#22913)
-enclosing_stmt(#22912,#22909)
-expr_containers(#22912,#22805)
-#22914=*
-typeexprs(#22914,0,#22912,-1,"Unpacked")
-hasLocation(#22914,#21634)
-enclosing_stmt(#22914,#22909)
-expr_containers(#22914,#22805)
-literals("Unpacked","Unpacked",#22914)
-typebind(#22914,#22810)
+typeexprs(#22912,0,#22910,-1,"Unpacked")
+hasLocation(#22912,#21612)
+enclosing_stmt(#22912,#22907)
+expr_containers(#22912,#22814)
+literals("Unpacked","Unpacked",#22912)
+typebind(#22912,#22819)
+#22913=*
+typeexprs(#22913,23,#22910,0,"() => string")
+#22914=@"loc,{#10000},81,22,81,33"
+locations_default(#22914,#10000,81,22,81,33)
+hasLocation(#22913,#22914)
+enclosing_stmt(#22913,#22907)
+expr_containers(#22913,#22814)
 #22915=*
-typeexprs(#22915,14,#22912,0,"Promise<string>")
-#22916=@"loc,{#10000},82,22,82,36"
-locations_default(#22916,#10000,82,22,82,36)
-hasLocation(#22915,#22916)
-enclosing_stmt(#22915,#22909)
-expr_containers(#22915,#22805)
-#22917=*
-typeexprs(#22917,0,#22915,-1,"Promise")
-hasLocation(#22917,#21638)
-enclosing_stmt(#22917,#22909)
-expr_containers(#22917,#22805)
-literals("Promise","Promise",#22917)
-#22918=*
-typeexprs(#22918,2,#22915,0,"string")
-hasLocation(#22918,#21642)
-enclosing_stmt(#22918,#22909)
-expr_containers(#22918,#22805)
-literals("string","string",#22918)
+exprs(#22915,9,#22913,0,"() => string")
+hasLocation(#22915,#22914)
+enclosing_stmt(#22915,#22907)
+expr_containers(#22915,#22814)
+#22916=*
+scopes(#22916,1)
+scopenodes(#22915,#22916)
+scopenesting(#22916,#22817)
+#22917=@"var;{this};{#22916}"
+variables(#22917,"this",#22916)
+#22918=@"var;{arguments};{#22916}"
+variables(#22918,"arguments",#22916)
+is_arguments_object(#22918)
 #22919=*
-stmts(#22919,35,#22805,5,"type T4 ... ng>[]>;")
-#22920=@"loc,{#10000},83,3,83,40"
-locations_default(#22920,#10000,83,3,83,40)
-hasLocation(#22919,#22920)
-stmt_containers(#22919,#22805)
-#22921=*
-typeexprs(#22921,1,#22919,0,"T4")
-hasLocation(#22921,#21652)
-enclosing_stmt(#22921,#22919)
-expr_containers(#22921,#22805)
-literals("T4","T4",#22921)
-typedecl(#22921,#22815)
+typeexprs(#22919,2,#22915,-3,"string")
+hasLocation(#22919,#21622)
+expr_containers(#22919,#22915)
+literals("string","string",#22919)
+#22920=*
+stmts(#22920,35,#22814,4,"type T3 ... ring>>;")
+#22921=@"loc,{#10000},82,3,82,38"
+locations_default(#22921,#10000,82,3,82,38)
+hasLocation(#22920,#22921)
+stmt_containers(#22920,#22814)
 #22922=*
-typeexprs(#22922,14,#22919,1,"Unpacke ... ing>[]>")
-#22923=@"loc,{#10000},83,13,83,39"
-locations_default(#22923,#10000,83,13,83,39)
-hasLocation(#22922,#22923)
-enclosing_stmt(#22922,#22919)
-expr_containers(#22922,#22805)
-#22924=*
-typeexprs(#22924,0,#22922,-1,"Unpacked")
-hasLocation(#22924,#21656)
-enclosing_stmt(#22924,#22919)
-expr_containers(#22924,#22805)
-literals("Unpacked","Unpacked",#22924)
-typebind(#22924,#22810)
+typeexprs(#22922,1,#22920,0,"T3")
+hasLocation(#22922,#21630)
+enclosing_stmt(#22922,#22920)
+expr_containers(#22922,#22814)
+literals("T3","T3",#22922)
+typedecl(#22922,#22823)
+#22923=*
+typeexprs(#22923,14,#22920,1,"Unpacke ... tring>>")
+#22924=@"loc,{#10000},82,13,82,37"
+locations_default(#22924,#10000,82,13,82,37)
+hasLocation(#22923,#22924)
+enclosing_stmt(#22923,#22920)
+expr_containers(#22923,#22814)
 #22925=*
-typeexprs(#22925,6,#22922,0,"Promise<string>[]")
-#22926=@"loc,{#10000},83,22,83,38"
-locations_default(#22926,#10000,83,22,83,38)
-hasLocation(#22925,#22926)
-enclosing_stmt(#22925,#22919)
-expr_containers(#22925,#22805)
-#22927=*
-typeexprs(#22927,14,#22925,0,"Promise<string>")
-#22928=@"loc,{#10000},83,22,83,36"
-locations_default(#22928,#10000,83,22,83,36)
-hasLocation(#22927,#22928)
-enclosing_stmt(#22927,#22919)
-expr_containers(#22927,#22805)
+typeexprs(#22925,0,#22923,-1,"Unpacked")
+hasLocation(#22925,#21634)
+enclosing_stmt(#22925,#22920)
+expr_containers(#22925,#22814)
+literals("Unpacked","Unpacked",#22925)
+typebind(#22925,#22819)
+#22926=*
+typeexprs(#22926,14,#22923,0,"Promise<string>")
+#22927=@"loc,{#10000},82,22,82,36"
+locations_default(#22927,#10000,82,22,82,36)
+hasLocation(#22926,#22927)
+enclosing_stmt(#22926,#22920)
+expr_containers(#22926,#22814)
+#22928=*
+typeexprs(#22928,0,#22926,-1,"Promise")
+hasLocation(#22928,#21638)
+enclosing_stmt(#22928,#22920)
+expr_containers(#22928,#22814)
+literals("Promise","Promise",#22928)
 #22929=*
-typeexprs(#22929,0,#22927,-1,"Promise")
-hasLocation(#22929,#21660)
-enclosing_stmt(#22929,#22919)
-expr_containers(#22929,#22805)
-literals("Promise","Promise",#22929)
+typeexprs(#22929,2,#22926,0,"string")
+hasLocation(#22929,#21642)
+enclosing_stmt(#22929,#22920)
+expr_containers(#22929,#22814)
+literals("string","string",#22929)
 #22930=*
-typeexprs(#22930,2,#22927,0,"string")
-hasLocation(#22930,#21664)
-enclosing_stmt(#22930,#22919)
-expr_containers(#22930,#22805)
-literals("string","string",#22930)
-#22931=*
-stmts(#22931,35,#22805,6,"type T5 ... g>[]>>;")
-#22932=@"loc,{#10000},84,3,84,50"
-locations_default(#22932,#10000,84,3,84,50)
-hasLocation(#22931,#22932)
-stmt_containers(#22931,#22805)
+stmts(#22930,35,#22814,5,"type T4 ... ng>[]>;")
+#22931=@"loc,{#10000},83,3,83,40"
+locations_default(#22931,#10000,83,3,83,40)
+hasLocation(#22930,#22931)
+stmt_containers(#22930,#22814)
+#22932=*
+typeexprs(#22932,1,#22930,0,"T4")
+hasLocation(#22932,#21652)
+enclosing_stmt(#22932,#22930)
+expr_containers(#22932,#22814)
+literals("T4","T4",#22932)
+typedecl(#22932,#22824)
 #22933=*
-typeexprs(#22933,1,#22931,0,"T5")
-hasLocation(#22933,#21678)
-enclosing_stmt(#22933,#22931)
-expr_containers(#22933,#22805)
-literals("T5","T5",#22933)
-typedecl(#22933,#22816)
-#22934=*
-typeexprs(#22934,14,#22931,1,"Unpacke ... ng>[]>>")
-#22935=@"loc,{#10000},84,13,84,49"
-locations_default(#22935,#10000,84,13,84,49)
-hasLocation(#22934,#22935)
-enclosing_stmt(#22934,#22931)
-expr_containers(#22934,#22805)
+typeexprs(#22933,14,#22930,1,"Unpacke ... ing>[]>")
+#22934=@"loc,{#10000},83,13,83,39"
+locations_default(#22934,#10000,83,13,83,39)
+hasLocation(#22933,#22934)
+enclosing_stmt(#22933,#22930)
+expr_containers(#22933,#22814)
+#22935=*
+typeexprs(#22935,0,#22933,-1,"Unpacked")
+hasLocation(#22935,#21656)
+enclosing_stmt(#22935,#22930)
+expr_containers(#22935,#22814)
+literals("Unpacked","Unpacked",#22935)
+typebind(#22935,#22819)
 #22936=*
-typeexprs(#22936,0,#22934,-1,"Unpacked")
-hasLocation(#22936,#21682)
-enclosing_stmt(#22936,#22931)
-expr_containers(#22936,#22805)
-literals("Unpacked","Unpacked",#22936)
-typebind(#22936,#22810)
-#22937=*
-typeexprs(#22937,14,#22934,0,"Unpacke ... ing>[]>")
-#22938=@"loc,{#10000},84,22,84,48"
-locations_default(#22938,#10000,84,22,84,48)
-hasLocation(#22937,#22938)
-enclosing_stmt(#22937,#22931)
-expr_containers(#22937,#22805)
-#22939=*
-typeexprs(#22939,0,#22937,-1,"Unpacked")
-hasLocation(#22939,#21686)
-enclosing_stmt(#22939,#22931)
-expr_containers(#22939,#22805)
-literals("Unpacked","Unpacked",#22939)
-typebind(#22939,#22810)
+typeexprs(#22936,6,#22933,0,"Promise<string>[]")
+#22937=@"loc,{#10000},83,22,83,38"
+locations_default(#22937,#10000,83,22,83,38)
+hasLocation(#22936,#22937)
+enclosing_stmt(#22936,#22930)
+expr_containers(#22936,#22814)
+#22938=*
+typeexprs(#22938,14,#22936,0,"Promise<string>")
+#22939=@"loc,{#10000},83,22,83,36"
+locations_default(#22939,#10000,83,22,83,36)
+hasLocation(#22938,#22939)
+enclosing_stmt(#22938,#22930)
+expr_containers(#22938,#22814)
 #22940=*
-typeexprs(#22940,6,#22937,0,"Promise<string>[]")
-#22941=@"loc,{#10000},84,31,84,47"
-locations_default(#22941,#10000,84,31,84,47)
-hasLocation(#22940,#22941)
-enclosing_stmt(#22940,#22931)
-expr_containers(#22940,#22805)
+typeexprs(#22940,0,#22938,-1,"Promise")
+hasLocation(#22940,#21660)
+enclosing_stmt(#22940,#22930)
+expr_containers(#22940,#22814)
+literals("Promise","Promise",#22940)
+#22941=*
+typeexprs(#22941,2,#22938,0,"string")
+hasLocation(#22941,#21664)
+enclosing_stmt(#22941,#22930)
+expr_containers(#22941,#22814)
+literals("string","string",#22941)
 #22942=*
-typeexprs(#22942,14,#22940,0,"Promise<string>")
-#22943=@"loc,{#10000},84,31,84,45"
-locations_default(#22943,#10000,84,31,84,45)
+stmts(#22942,35,#22814,6,"type T5 ... g>[]>>;")
+#22943=@"loc,{#10000},84,3,84,50"
+locations_default(#22943,#10000,84,3,84,50)
 hasLocation(#22942,#22943)
-enclosing_stmt(#22942,#22931)
-expr_containers(#22942,#22805)
+stmt_containers(#22942,#22814)
 #22944=*
-typeexprs(#22944,0,#22942,-1,"Promise")
-hasLocation(#22944,#21690)
-enclosing_stmt(#22944,#22931)
-expr_containers(#22944,#22805)
-literals("Promise","Promise",#22944)
+typeexprs(#22944,1,#22942,0,"T5")
+hasLocation(#22944,#21678)
+enclosing_stmt(#22944,#22942)
+expr_containers(#22944,#22814)
+literals("T5","T5",#22944)
+typedecl(#22944,#22825)
 #22945=*
-typeexprs(#22945,2,#22942,0,"string")
-hasLocation(#22945,#21694)
-enclosing_stmt(#22945,#22931)
-expr_containers(#22945,#22805)
-literals("string","string",#22945)
-#22946=*
-stmts(#22946,35,#22805,7,"type Fo ...  never;")
-#22947=@"loc,{#10000},86,3,86,65"
-locations_default(#22947,#10000,86,3,86,65)
-hasLocation(#22946,#22947)
-stmt_containers(#22946,#22805)
+typeexprs(#22945,14,#22942,1,"Unpacke ... ng>[]>>")
+#22946=@"loc,{#10000},84,13,84,49"
+locations_default(#22946,#10000,84,13,84,49)
+hasLocation(#22945,#22946)
+enclosing_stmt(#22945,#22942)
+expr_containers(#22945,#22814)
+#22947=*
+typeexprs(#22947,0,#22945,-1,"Unpacked")
+hasLocation(#22947,#21682)
+enclosing_stmt(#22947,#22942)
+expr_containers(#22947,#22814)
+literals("Unpacked","Unpacked",#22947)
+typebind(#22947,#22819)
 #22948=*
-typeexprs(#22948,1,#22946,0,"Foo")
-hasLocation(#22948,#21710)
-enclosing_stmt(#22948,#22946)
-expr_containers(#22948,#22805)
-literals("Foo","Foo",#22948)
-typedecl(#22948,#22817)
-#22949=*
-scopes(#22949,12)
-scopenodes(#22946,#22949)
-scopenesting(#22949,#22808)
-#22950=@"local_type_name;{T};{#22949}"
-local_type_names(#22950,"T",#22949)
+typeexprs(#22948,14,#22945,0,"Unpacke ... ing>[]>")
+#22949=@"loc,{#10000},84,22,84,48"
+locations_default(#22949,#10000,84,22,84,48)
+hasLocation(#22948,#22949)
+enclosing_stmt(#22948,#22942)
+expr_containers(#22948,#22814)
+#22950=*
+typeexprs(#22950,0,#22948,-1,"Unpacked")
+hasLocation(#22950,#21686)
+enclosing_stmt(#22950,#22942)
+expr_containers(#22950,#22814)
+literals("Unpacked","Unpacked",#22950)
+typebind(#22950,#22819)
 #22951=*
-typeexprs(#22951,22,#22946,2,"T")
-hasLocation(#22951,#21714)
-enclosing_stmt(#22951,#22946)
-expr_containers(#22951,#22805)
-#22952=*
-typeexprs(#22952,1,#22951,0,"T")
-hasLocation(#22952,#21714)
-enclosing_stmt(#22952,#22946)
-expr_containers(#22952,#22805)
-literals("T","T",#22952)
-typedecl(#22952,#22950)
+typeexprs(#22951,6,#22948,0,"Promise<string>[]")
+#22952=@"loc,{#10000},84,31,84,47"
+locations_default(#22952,#10000,84,31,84,47)
+hasLocation(#22951,#22952)
+enclosing_stmt(#22951,#22942)
+expr_containers(#22951,#22814)
 #22953=*
-typeexprs(#22953,28,#22946,1,"T exten ... : never")
-#22954=@"loc,{#10000},86,17,86,64"
-locations_default(#22954,#10000,86,17,86,64)
+typeexprs(#22953,14,#22951,0,"Promise<string>")
+#22954=@"loc,{#10000},84,31,84,45"
+locations_default(#22954,#10000,84,31,84,45)
 hasLocation(#22953,#22954)
-enclosing_stmt(#22953,#22946)
-expr_containers(#22953,#22805)
+enclosing_stmt(#22953,#22942)
+expr_containers(#22953,#22814)
 #22955=*
-typeexprs(#22955,0,#22953,0,"T")
-hasLocation(#22955,#21720)
-enclosing_stmt(#22955,#22946)
-expr_containers(#22955,#22805)
-literals("T","T",#22955)
-typebind(#22955,#22950)
+typeexprs(#22955,0,#22953,-1,"Promise")
+hasLocation(#22955,#21690)
+enclosing_stmt(#22955,#22942)
+expr_containers(#22955,#22814)
+literals("Promise","Promise",#22955)
 #22956=*
-typeexprs(#22956,21,#22953,1,"{ a: in ... fer U }")
-#22957=@"loc,{#10000},86,27,86,52"
-locations_default(#22957,#10000,86,27,86,52)
-hasLocation(#22956,#22957)
-enclosing_stmt(#22956,#22946)
-expr_containers(#22956,#22805)
-#22958=*
-properties(#22958,#22956,0,8,"a: infer U,")
-#22959=@"loc,{#10000},86,29,86,39"
-locations_default(#22959,#10000,86,29,86,39)
-hasLocation(#22958,#22959)
+typeexprs(#22956,2,#22953,0,"string")
+hasLocation(#22956,#21694)
+enclosing_stmt(#22956,#22942)
+expr_containers(#22956,#22814)
+literals("string","string",#22956)
+#22957=*
+stmts(#22957,35,#22814,7,"type Fo ...  never;")
+#22958=@"loc,{#10000},86,3,86,65"
+locations_default(#22958,#10000,86,3,86,65)
+hasLocation(#22957,#22958)
+stmt_containers(#22957,#22814)
+#22959=*
+typeexprs(#22959,1,#22957,0,"Foo")
+hasLocation(#22959,#21710)
+enclosing_stmt(#22959,#22957)
+expr_containers(#22959,#22814)
+literals("Foo","Foo",#22959)
+typedecl(#22959,#22826)
 #22960=*
-exprs(#22960,0,#22958,0,"a")
-hasLocation(#22960,#21726)
-enclosing_stmt(#22960,#22946)
-expr_containers(#22960,#22805)
-literals("a","a",#22960)
-is_abstract_member(#22958)
-#22961=*
-typeexprs(#22961,29,#22958,2,"infer U")
-#22962=@"loc,{#10000},86,32,86,38"
-locations_default(#22962,#10000,86,32,86,38)
-hasLocation(#22961,#22962)
-enclosing_stmt(#22961,#22946)
-expr_containers(#22961,#22805)
+scopes(#22960,12)
+scopenodes(#22957,#22960)
+scopenesting(#22960,#22817)
+#22961=@"local_type_name;{T};{#22960}"
+local_type_names(#22961,"T",#22960)
+#22962=*
+typeexprs(#22962,22,#22957,2,"T")
+hasLocation(#22962,#21714)
+enclosing_stmt(#22962,#22957)
+expr_containers(#22962,#22814)
 #22963=*
-typeexprs(#22963,22,#22961,0,"U")
-hasLocation(#22963,#21732)
-enclosing_stmt(#22963,#22946)
-expr_containers(#22963,#22805)
+typeexprs(#22963,1,#22962,0,"T")
+hasLocation(#22963,#21714)
+enclosing_stmt(#22963,#22957)
+expr_containers(#22963,#22814)
+literals("T","T",#22963)
+typedecl(#22963,#22961)
 #22964=*
-typeexprs(#22964,1,#22963,0,"U")
-hasLocation(#22964,#21732)
-enclosing_stmt(#22964,#22946)
-expr_containers(#22964,#22805)
-literals("U","U",#22964)
-#22965=*
-properties(#22965,#22956,1,8,"b: infer U")
-#22966=@"loc,{#10000},86,41,86,50"
-locations_default(#22966,#10000,86,41,86,50)
-hasLocation(#22965,#22966)
+typeexprs(#22964,28,#22957,1,"T exten ... : never")
+#22965=@"loc,{#10000},86,17,86,64"
+locations_default(#22965,#10000,86,17,86,64)
+hasLocation(#22964,#22965)
+enclosing_stmt(#22964,#22957)
+expr_containers(#22964,#22814)
+#22966=*
+typeexprs(#22966,0,#22964,0,"T")
+hasLocation(#22966,#21720)
+enclosing_stmt(#22966,#22957)
+expr_containers(#22966,#22814)
+literals("T","T",#22966)
+typebind(#22966,#22961)
 #22967=*
-exprs(#22967,0,#22965,0,"b")
-hasLocation(#22967,#21736)
-enclosing_stmt(#22967,#22946)
-expr_containers(#22967,#22805)
-literals("b","b",#22967)
-is_abstract_member(#22965)
-#22968=*
-typeexprs(#22968,29,#22965,2,"infer U")
-#22969=@"loc,{#10000},86,44,86,50"
-locations_default(#22969,#10000,86,44,86,50)
-hasLocation(#22968,#22969)
-enclosing_stmt(#22968,#22946)
-expr_containers(#22968,#22805)
-#22970=*
-typeexprs(#22970,22,#22968,0,"U")
-hasLocation(#22970,#21742)
-enclosing_stmt(#22970,#22946)
-expr_containers(#22970,#22805)
+typeexprs(#22967,21,#22964,1,"{ a: in ... fer U }")
+#22968=@"loc,{#10000},86,27,86,52"
+locations_default(#22968,#10000,86,27,86,52)
+hasLocation(#22967,#22968)
+enclosing_stmt(#22967,#22957)
+expr_containers(#22967,#22814)
+#22969=*
+properties(#22969,#22967,0,8,"a: infer U,")
+#22970=@"loc,{#10000},86,29,86,39"
+locations_default(#22970,#10000,86,29,86,39)
+hasLocation(#22969,#22970)
 #22971=*
-typeexprs(#22971,1,#22970,0,"U")
-hasLocation(#22971,#21742)
-enclosing_stmt(#22971,#22946)
-expr_containers(#22971,#22805)
-literals("U","U",#22971)
+exprs(#22971,0,#22969,0,"a")
+hasLocation(#22971,#21726)
+enclosing_stmt(#22971,#22957)
+expr_containers(#22971,#22814)
+literals("a","a",#22971)
+is_abstract_member(#22969)
 #22972=*
-typeexprs(#22972,0,#22953,2,"U")
-hasLocation(#22972,#21748)
-enclosing_stmt(#22972,#22946)
-expr_containers(#22972,#22805)
-literals("U","U",#22972)
-#22973=*
-typeexprs(#22973,2,#22953,3,"never")
-hasLocation(#22973,#21752)
-enclosing_stmt(#22973,#22946)
-expr_containers(#22973,#22805)
-literals("never","never",#22973)
+typeexprs(#22972,29,#22969,2,"infer U")
+#22973=@"loc,{#10000},86,32,86,38"
+locations_default(#22973,#10000,86,32,86,38)
+hasLocation(#22972,#22973)
+enclosing_stmt(#22972,#22957)
+expr_containers(#22972,#22814)
 #22974=*
-stmts(#22974,35,#22805,8,"type T1 ... ing }>;")
-#22975=@"loc,{#10000},87,3,87,43"
-locations_default(#22975,#10000,87,3,87,43)
-hasLocation(#22974,#22975)
-stmt_containers(#22974,#22805)
+typeexprs(#22974,22,#22972,0,"U")
+hasLocation(#22974,#21732)
+enclosing_stmt(#22974,#22957)
+expr_containers(#22974,#22814)
+#22975=*
+typeexprs(#22975,1,#22974,0,"U")
+hasLocation(#22975,#21732)
+enclosing_stmt(#22975,#22957)
+expr_containers(#22975,#22814)
+literals("U","U",#22975)
 #22976=*
-typeexprs(#22976,1,#22974,0,"T10")
-hasLocation(#22976,#21758)
-enclosing_stmt(#22976,#22974)
-expr_containers(#22976,#22805)
-literals("T10","T10",#22976)
-typedecl(#22976,#22818)
-#22977=*
-typeexprs(#22977,14,#22974,1,"Foo<{ a ... ring }>")
-#22978=@"loc,{#10000},87,14,87,42"
-locations_default(#22978,#10000,87,14,87,42)
-hasLocation(#22977,#22978)
-enclosing_stmt(#22977,#22974)
-expr_containers(#22977,#22805)
+properties(#22976,#22967,1,8,"b: infer U")
+#22977=@"loc,{#10000},86,41,86,50"
+locations_default(#22977,#10000,86,41,86,50)
+hasLocation(#22976,#22977)
+#22978=*
+exprs(#22978,0,#22976,0,"b")
+hasLocation(#22978,#21736)
+enclosing_stmt(#22978,#22957)
+expr_containers(#22978,#22814)
+literals("b","b",#22978)
+is_abstract_member(#22976)
 #22979=*
-typeexprs(#22979,0,#22977,-1,"Foo")
-hasLocation(#22979,#21762)
-enclosing_stmt(#22979,#22974)
-expr_containers(#22979,#22805)
-literals("Foo","Foo",#22979)
-typebind(#22979,#22817)
-#22980=*
-typeexprs(#22980,21,#22977,0,"{ a: st ... tring }")
-#22981=@"loc,{#10000},87,18,87,41"
-locations_default(#22981,#10000,87,18,87,41)
-hasLocation(#22980,#22981)
-enclosing_stmt(#22980,#22974)
-expr_containers(#22980,#22805)
+typeexprs(#22979,29,#22976,2,"infer U")
+#22980=@"loc,{#10000},86,44,86,50"
+locations_default(#22980,#10000,86,44,86,50)
+hasLocation(#22979,#22980)
+enclosing_stmt(#22979,#22957)
+expr_containers(#22979,#22814)
+#22981=*
+typeexprs(#22981,22,#22979,0,"U")
+hasLocation(#22981,#21742)
+enclosing_stmt(#22981,#22957)
+expr_containers(#22981,#22814)
 #22982=*
-properties(#22982,#22980,0,8,"a: string,")
-#22983=@"loc,{#10000},87,20,87,29"
-locations_default(#22983,#10000,87,20,87,29)
-hasLocation(#22982,#22983)
+typeexprs(#22982,1,#22981,0,"U")
+hasLocation(#22982,#21742)
+enclosing_stmt(#22982,#22957)
+expr_containers(#22982,#22814)
+literals("U","U",#22982)
+#22983=*
+typeexprs(#22983,0,#22964,2,"U")
+hasLocation(#22983,#21748)
+enclosing_stmt(#22983,#22957)
+expr_containers(#22983,#22814)
+literals("U","U",#22983)
 #22984=*
-exprs(#22984,0,#22982,0,"a")
-hasLocation(#22984,#21768)
-enclosing_stmt(#22984,#22974)
-expr_containers(#22984,#22805)
-literals("a","a",#22984)
-is_abstract_member(#22982)
+typeexprs(#22984,2,#22964,3,"never")
+hasLocation(#22984,#21752)
+enclosing_stmt(#22984,#22957)
+expr_containers(#22984,#22814)
+literals("never","never",#22984)
 #22985=*
-typeexprs(#22985,2,#22982,2,"string")
-hasLocation(#22985,#21772)
-enclosing_stmt(#22985,#22974)
-expr_containers(#22985,#22805)
-literals("string","string",#22985)
-#22986=*
-properties(#22986,#22980,1,8,"b: string")
-#22987=@"loc,{#10000},87,31,87,39"
-locations_default(#22987,#10000,87,31,87,39)
-hasLocation(#22986,#22987)
+stmts(#22985,35,#22814,8,"type T1 ... ing }>;")
+#22986=@"loc,{#10000},87,3,87,43"
+locations_default(#22986,#10000,87,3,87,43)
+hasLocation(#22985,#22986)
+stmt_containers(#22985,#22814)
+#22987=*
+typeexprs(#22987,1,#22985,0,"T10")
+hasLocation(#22987,#21758)
+enclosing_stmt(#22987,#22985)
+expr_containers(#22987,#22814)
+literals("T10","T10",#22987)
+typedecl(#22987,#22827)
 #22988=*
-exprs(#22988,0,#22986,0,"b")
-hasLocation(#22988,#21776)
-enclosing_stmt(#22988,#22974)
-expr_containers(#22988,#22805)
-literals("b","b",#22988)
-is_abstract_member(#22986)
-#22989=*
-typeexprs(#22989,2,#22986,2,"string")
-hasLocation(#22989,#21780)
-enclosing_stmt(#22989,#22974)
-expr_containers(#22989,#22805)
-literals("string","string",#22989)
+typeexprs(#22988,14,#22985,1,"Foo<{ a ... ring }>")
+#22989=@"loc,{#10000},87,14,87,42"
+locations_default(#22989,#10000,87,14,87,42)
+hasLocation(#22988,#22989)
+enclosing_stmt(#22988,#22985)
+expr_containers(#22988,#22814)
 #22990=*
-stmts(#22990,35,#22805,9,"type T1 ... ber }>;")
-#22991=@"loc,{#10000},88,3,88,43"
-locations_default(#22991,#10000,88,3,88,43)
-hasLocation(#22990,#22991)
-stmt_containers(#22990,#22805)
-#22992=*
-typeexprs(#22992,1,#22990,0,"T11")
-hasLocation(#22992,#21790)
-enclosing_stmt(#22992,#22990)
-expr_containers(#22992,#22805)
-literals("T11","T11",#22992)
-typedecl(#22992,#22819)
+typeexprs(#22990,0,#22988,-1,"Foo")
+hasLocation(#22990,#21762)
+enclosing_stmt(#22990,#22985)
+expr_containers(#22990,#22814)
+literals("Foo","Foo",#22990)
+typebind(#22990,#22826)
+#22991=*
+typeexprs(#22991,21,#22988,0,"{ a: st ... tring }")
+#22992=@"loc,{#10000},87,18,87,41"
+locations_default(#22992,#10000,87,18,87,41)
+hasLocation(#22991,#22992)
+enclosing_stmt(#22991,#22985)
+expr_containers(#22991,#22814)
 #22993=*
-typeexprs(#22993,14,#22990,1,"Foo<{ a ... mber }>")
-#22994=@"loc,{#10000},88,14,88,42"
-locations_default(#22994,#10000,88,14,88,42)
+properties(#22993,#22991,0,8,"a: string,")
+#22994=@"loc,{#10000},87,20,87,29"
+locations_default(#22994,#10000,87,20,87,29)
 hasLocation(#22993,#22994)
-enclosing_stmt(#22993,#22990)
-expr_containers(#22993,#22805)
 #22995=*
-typeexprs(#22995,0,#22993,-1,"Foo")
-hasLocation(#22995,#21794)
-enclosing_stmt(#22995,#22990)
-expr_containers(#22995,#22805)
-literals("Foo","Foo",#22995)
-typebind(#22995,#22817)
+exprs(#22995,0,#22993,0,"a")
+hasLocation(#22995,#21768)
+enclosing_stmt(#22995,#22985)
+expr_containers(#22995,#22814)
+literals("a","a",#22995)
+is_abstract_member(#22993)
 #22996=*
-typeexprs(#22996,21,#22993,0,"{ a: st ... umber }")
-#22997=@"loc,{#10000},88,18,88,41"
-locations_default(#22997,#10000,88,18,88,41)
-hasLocation(#22996,#22997)
-enclosing_stmt(#22996,#22990)
-expr_containers(#22996,#22805)
-#22998=*
-properties(#22998,#22996,0,8,"a: string,")
-#22999=@"loc,{#10000},88,20,88,29"
-locations_default(#22999,#10000,88,20,88,29)
-hasLocation(#22998,#22999)
+typeexprs(#22996,2,#22993,2,"string")
+hasLocation(#22996,#21772)
+enclosing_stmt(#22996,#22985)
+expr_containers(#22996,#22814)
+literals("string","string",#22996)
+#22997=*
+properties(#22997,#22991,1,8,"b: string")
+#22998=@"loc,{#10000},87,31,87,39"
+locations_default(#22998,#10000,87,31,87,39)
+hasLocation(#22997,#22998)
+#22999=*
+exprs(#22999,0,#22997,0,"b")
+hasLocation(#22999,#21776)
+enclosing_stmt(#22999,#22985)
+expr_containers(#22999,#22814)
+literals("b","b",#22999)
+is_abstract_member(#22997)
 #23000=*
-exprs(#23000,0,#22998,0,"a")
-hasLocation(#23000,#21800)
-enclosing_stmt(#23000,#22990)
-expr_containers(#23000,#22805)
-literals("a","a",#23000)
-is_abstract_member(#22998)
+typeexprs(#23000,2,#22997,2,"string")
+hasLocation(#23000,#21780)
+enclosing_stmt(#23000,#22985)
+expr_containers(#23000,#22814)
+literals("string","string",#23000)
 #23001=*
-typeexprs(#23001,2,#22998,2,"string")
-hasLocation(#23001,#21804)
-enclosing_stmt(#23001,#22990)
-expr_containers(#23001,#22805)
-literals("string","string",#23001)
-#23002=*
-properties(#23002,#22996,1,8,"b: number")
-#23003=@"loc,{#10000},88,31,88,39"
-locations_default(#23003,#10000,88,31,88,39)
-hasLocation(#23002,#23003)
+stmts(#23001,35,#22814,9,"type T1 ... ber }>;")
+#23002=@"loc,{#10000},88,3,88,43"
+locations_default(#23002,#10000,88,3,88,43)
+hasLocation(#23001,#23002)
+stmt_containers(#23001,#22814)
+#23003=*
+typeexprs(#23003,1,#23001,0,"T11")
+hasLocation(#23003,#21790)
+enclosing_stmt(#23003,#23001)
+expr_containers(#23003,#22814)
+literals("T11","T11",#23003)
+typedecl(#23003,#22828)
 #23004=*
-exprs(#23004,0,#23002,0,"b")
-hasLocation(#23004,#21808)
-enclosing_stmt(#23004,#22990)
-expr_containers(#23004,#22805)
-literals("b","b",#23004)
-is_abstract_member(#23002)
-#23005=*
-typeexprs(#23005,2,#23002,2,"number")
-hasLocation(#23005,#21812)
-enclosing_stmt(#23005,#22990)
-expr_containers(#23005,#22805)
-literals("number","number",#23005)
+typeexprs(#23004,14,#23001,1,"Foo<{ a ... mber }>")
+#23005=@"loc,{#10000},88,14,88,42"
+locations_default(#23005,#10000,88,14,88,42)
+hasLocation(#23004,#23005)
+enclosing_stmt(#23004,#23001)
+expr_containers(#23004,#22814)
 #23006=*
-stmts(#23006,35,#22805,10,"type Ba ...  never;")
-#23007=@"loc,{#10000},90,3,90,91"
-locations_default(#23007,#10000,90,3,90,91)
-hasLocation(#23006,#23007)
-stmt_containers(#23006,#22805)
-#23008=*
-typeexprs(#23008,1,#23006,0,"Bar")
-hasLocation(#23008,#21822)
-enclosing_stmt(#23008,#23006)
-expr_containers(#23008,#22805)
-literals("Bar","Bar",#23008)
-typedecl(#23008,#22820)
+typeexprs(#23006,0,#23004,-1,"Foo")
+hasLocation(#23006,#21794)
+enclosing_stmt(#23006,#23001)
+expr_containers(#23006,#22814)
+literals("Foo","Foo",#23006)
+typebind(#23006,#22826)
+#23007=*
+typeexprs(#23007,21,#23004,0,"{ a: st ... umber }")
+#23008=@"loc,{#10000},88,18,88,41"
+locations_default(#23008,#10000,88,18,88,41)
+hasLocation(#23007,#23008)
+enclosing_stmt(#23007,#23001)
+expr_containers(#23007,#22814)
 #23009=*
-scopes(#23009,12)
-scopenodes(#23006,#23009)
-scopenesting(#23009,#22808)
-#23010=@"local_type_name;{T};{#23009}"
-local_type_names(#23010,"T",#23009)
+properties(#23009,#23007,0,8,"a: string,")
+#23010=@"loc,{#10000},88,20,88,29"
+locations_default(#23010,#10000,88,20,88,29)
+hasLocation(#23009,#23010)
 #23011=*
-typeexprs(#23011,22,#23006,2,"T")
-hasLocation(#23011,#21826)
-enclosing_stmt(#23011,#23006)
-expr_containers(#23011,#22805)
+exprs(#23011,0,#23009,0,"a")
+hasLocation(#23011,#21800)
+enclosing_stmt(#23011,#23001)
+expr_containers(#23011,#22814)
+literals("a","a",#23011)
+is_abstract_member(#23009)
 #23012=*
-typeexprs(#23012,1,#23011,0,"T")
-hasLocation(#23012,#21826)
-enclosing_stmt(#23012,#23006)
-expr_containers(#23012,#22805)
-literals("T","T",#23012)
-typedecl(#23012,#23010)
+typeexprs(#23012,2,#23009,2,"string")
+hasLocation(#23012,#21804)
+enclosing_stmt(#23012,#23001)
+expr_containers(#23012,#22814)
+literals("string","string",#23012)
 #23013=*
-typeexprs(#23013,28,#23006,1,"T exten ... : never")
-#23014=@"loc,{#10000},90,17,90,90"
-locations_default(#23014,#10000,90,17,90,90)
+properties(#23013,#23007,1,8,"b: number")
+#23014=@"loc,{#10000},88,31,88,39"
+locations_default(#23014,#10000,88,31,88,39)
 hasLocation(#23013,#23014)
-enclosing_stmt(#23013,#23006)
-expr_containers(#23013,#22805)
 #23015=*
-typeexprs(#23015,0,#23013,0,"T")
-hasLocation(#23015,#21832)
-enclosing_stmt(#23015,#23006)
-expr_containers(#23015,#22805)
-literals("T","T",#23015)
-typebind(#23015,#23010)
+exprs(#23015,0,#23013,0,"b")
+hasLocation(#23015,#21808)
+enclosing_stmt(#23015,#23001)
+expr_containers(#23015,#22814)
+literals("b","b",#23015)
+is_abstract_member(#23013)
 #23016=*
-typeexprs(#23016,21,#23013,1,"{ a: (x ...  void }")
-#23017=@"loc,{#10000},90,27,90,78"
-locations_default(#23017,#10000,90,27,90,78)
-hasLocation(#23016,#23017)
-enclosing_stmt(#23016,#23006)
-expr_containers(#23016,#22805)
-#23018=*
-properties(#23018,#23016,0,8,"a: (x:  ... > void,")
-#23019=@"loc,{#10000},90,29,90,52"
-locations_default(#23019,#10000,90,29,90,52)
-hasLocation(#23018,#23019)
+typeexprs(#23016,2,#23013,2,"number")
+hasLocation(#23016,#21812)
+enclosing_stmt(#23016,#23001)
+expr_containers(#23016,#22814)
+literals("number","number",#23016)
+#23017=*
+stmts(#23017,35,#22814,10,"type Ba ...  never;")
+#23018=@"loc,{#10000},90,3,90,91"
+locations_default(#23018,#10000,90,3,90,91)
+hasLocation(#23017,#23018)
+stmt_containers(#23017,#22814)
+#23019=*
+typeexprs(#23019,1,#23017,0,"Bar")
+hasLocation(#23019,#21822)
+enclosing_stmt(#23019,#23017)
+expr_containers(#23019,#22814)
+literals("Bar","Bar",#23019)
+typedecl(#23019,#22829)
 #23020=*
-exprs(#23020,0,#23018,0,"a")
-hasLocation(#23020,#21838)
-enclosing_stmt(#23020,#23006)
-expr_containers(#23020,#22805)
-literals("a","a",#23020)
-is_abstract_member(#23018)
-#23021=*
-typeexprs(#23021,23,#23018,2,"(x: infer U) => void")
-#23022=@"loc,{#10000},90,32,90,51"
-locations_default(#23022,#10000,90,32,90,51)
-hasLocation(#23021,#23022)
-enclosing_stmt(#23021,#23006)
-expr_containers(#23021,#22805)
+scopes(#23020,12)
+scopenodes(#23017,#23020)
+scopenesting(#23020,#22817)
+#23021=@"local_type_name;{T};{#23020}"
+local_type_names(#23021,"T",#23020)
+#23022=*
+typeexprs(#23022,22,#23017,2,"T")
+hasLocation(#23022,#21826)
+enclosing_stmt(#23022,#23017)
+expr_containers(#23022,#22814)
 #23023=*
-exprs(#23023,9,#23021,0,"(x: infer U) => void")
-hasLocation(#23023,#23022)
-enclosing_stmt(#23023,#23006)
-expr_containers(#23023,#22805)
+typeexprs(#23023,1,#23022,0,"T")
+hasLocation(#23023,#21826)
+enclosing_stmt(#23023,#23017)
+expr_containers(#23023,#22814)
+literals("T","T",#23023)
+typedecl(#23023,#23021)
 #23024=*
-scopes(#23024,1)
-scopenodes(#23023,#23024)
-scopenesting(#23024,#23009)
-#23025=@"var;{x};{#23024}"
-variables(#23025,"x",#23024)
+typeexprs(#23024,28,#23017,1,"T exten ... : never")
+#23025=@"loc,{#10000},90,17,90,90"
+locations_default(#23025,#10000,90,17,90,90)
+hasLocation(#23024,#23025)
+enclosing_stmt(#23024,#23017)
+expr_containers(#23024,#22814)
 #23026=*
-exprs(#23026,78,#23023,0,"x")
-hasLocation(#23026,#21844)
-expr_containers(#23026,#23023)
-literals("x","x",#23026)
-decl(#23026,#23025)
-#23027=@"var;{arguments};{#23024}"
-variables(#23027,"arguments",#23024)
-is_arguments_object(#23027)
-#23028=*
-typeexprs(#23028,2,#23023,-3,"void")
-hasLocation(#23028,#21856)
-expr_containers(#23028,#23023)
-literals("void","void",#23028)
+typeexprs(#23026,0,#23024,0,"T")
+hasLocation(#23026,#21832)
+enclosing_stmt(#23026,#23017)
+expr_containers(#23026,#22814)
+literals("T","T",#23026)
+typebind(#23026,#23021)
+#23027=*
+typeexprs(#23027,21,#23024,1,"{ a: (x ...  void }")
+#23028=@"loc,{#10000},90,27,90,78"
+locations_default(#23028,#10000,90,27,90,78)
+hasLocation(#23027,#23028)
+enclosing_stmt(#23027,#23017)
+expr_containers(#23027,#22814)
 #23029=*
-typeexprs(#23029,29,#23023,-6,"infer U")
-#23030=@"loc,{#10000},90,36,90,42"
-locations_default(#23030,#10000,90,36,90,42)
+properties(#23029,#23027,0,8,"a: (x:  ... > void,")
+#23030=@"loc,{#10000},90,29,90,52"
+locations_default(#23030,#10000,90,29,90,52)
 hasLocation(#23029,#23030)
-expr_containers(#23029,#23023)
 #23031=*
-typeexprs(#23031,22,#23029,0,"U")
-hasLocation(#23031,#21850)
-expr_containers(#23031,#23023)
+exprs(#23031,0,#23029,0,"a")
+hasLocation(#23031,#21838)
+enclosing_stmt(#23031,#23017)
+expr_containers(#23031,#22814)
+literals("a","a",#23031)
+is_abstract_member(#23029)
 #23032=*
-typeexprs(#23032,1,#23031,0,"U")
-hasLocation(#23032,#21850)
-expr_containers(#23032,#23023)
-literals("U","U",#23032)
-#23033=*
-properties(#23033,#23016,1,8,"b: (x:  ... => void")
-#23034=@"loc,{#10000},90,54,90,76"
-locations_default(#23034,#10000,90,54,90,76)
-hasLocation(#23033,#23034)
+typeexprs(#23032,23,#23029,2,"(x: infer U) => void")
+#23033=@"loc,{#10000},90,32,90,51"
+locations_default(#23033,#10000,90,32,90,51)
+hasLocation(#23032,#23033)
+enclosing_stmt(#23032,#23017)
+expr_containers(#23032,#22814)
+#23034=*
+exprs(#23034,9,#23032,0,"(x: infer U) => void")
+hasLocation(#23034,#23033)
+enclosing_stmt(#23034,#23017)
+expr_containers(#23034,#22814)
 #23035=*
-exprs(#23035,0,#23033,0,"b")
-hasLocation(#23035,#21860)
-enclosing_stmt(#23035,#23006)
-expr_containers(#23035,#22805)
-literals("b","b",#23035)
-is_abstract_member(#23033)
-#23036=*
-typeexprs(#23036,23,#23033,2,"(x: infer U) => void")
-#23037=@"loc,{#10000},90,57,90,76"
-locations_default(#23037,#10000,90,57,90,76)
-hasLocation(#23036,#23037)
-enclosing_stmt(#23036,#23006)
-expr_containers(#23036,#22805)
+scopes(#23035,1)
+scopenodes(#23034,#23035)
+scopenesting(#23035,#23020)
+#23036=@"var;{this};{#23035}"
+variables(#23036,"this",#23035)
+#23037=@"var;{x};{#23035}"
+variables(#23037,"x",#23035)
 #23038=*
-exprs(#23038,9,#23036,0,"(x: infer U) => void")
-hasLocation(#23038,#23037)
-enclosing_stmt(#23038,#23006)
-expr_containers(#23038,#22805)
-#23039=*
-scopes(#23039,1)
-scopenodes(#23038,#23039)
-scopenesting(#23039,#23009)
-#23040=@"var;{x};{#23039}"
-variables(#23040,"x",#23039)
+exprs(#23038,78,#23034,0,"x")
+hasLocation(#23038,#21844)
+expr_containers(#23038,#23034)
+literals("x","x",#23038)
+decl(#23038,#23037)
+#23039=@"var;{arguments};{#23035}"
+variables(#23039,"arguments",#23035)
+is_arguments_object(#23039)
+#23040=*
+typeexprs(#23040,2,#23034,-3,"void")
+hasLocation(#23040,#21856)
+expr_containers(#23040,#23034)
+literals("void","void",#23040)
 #23041=*
-exprs(#23041,78,#23038,0,"x")
-hasLocation(#23041,#21866)
-expr_containers(#23041,#23038)
-literals("x","x",#23041)
-decl(#23041,#23040)
-#23042=@"var;{arguments};{#23039}"
-variables(#23042,"arguments",#23039)
-is_arguments_object(#23042)
+typeexprs(#23041,29,#23034,-6,"infer U")
+#23042=@"loc,{#10000},90,36,90,42"
+locations_default(#23042,#10000,90,36,90,42)
+hasLocation(#23041,#23042)
+expr_containers(#23041,#23034)
 #23043=*
-typeexprs(#23043,2,#23038,-3,"void")
-hasLocation(#23043,#21878)
-expr_containers(#23043,#23038)
-literals("void","void",#23043)
+typeexprs(#23043,22,#23041,0,"U")
+hasLocation(#23043,#21850)
+expr_containers(#23043,#23034)
 #23044=*
-typeexprs(#23044,29,#23038,-6,"infer U")
-#23045=@"loc,{#10000},90,61,90,67"
-locations_default(#23045,#10000,90,61,90,67)
-hasLocation(#23044,#23045)
-expr_containers(#23044,#23038)
-#23046=*
-typeexprs(#23046,22,#23044,0,"U")
-hasLocation(#23046,#21872)
-expr_containers(#23046,#23038)
+typeexprs(#23044,1,#23043,0,"U")
+hasLocation(#23044,#21850)
+expr_containers(#23044,#23034)
+literals("U","U",#23044)
+#23045=*
+properties(#23045,#23027,1,8,"b: (x:  ... => void")
+#23046=@"loc,{#10000},90,54,90,76"
+locations_default(#23046,#10000,90,54,90,76)
+hasLocation(#23045,#23046)
 #23047=*
-typeexprs(#23047,1,#23046,0,"U")
-hasLocation(#23047,#21872)
-expr_containers(#23047,#23038)
-literals("U","U",#23047)
+exprs(#23047,0,#23045,0,"b")
+hasLocation(#23047,#21860)
+enclosing_stmt(#23047,#23017)
+expr_containers(#23047,#22814)
+literals("b","b",#23047)
+is_abstract_member(#23045)
 #23048=*
-typeexprs(#23048,0,#23013,2,"U")
-hasLocation(#23048,#21884)
-enclosing_stmt(#23048,#23006)
-expr_containers(#23048,#22805)
-literals("U","U",#23048)
-#23049=*
-typeexprs(#23049,2,#23013,3,"never")
-hasLocation(#23049,#21888)
-enclosing_stmt(#23049,#23006)
-expr_containers(#23049,#22805)
-literals("never","never",#23049)
+typeexprs(#23048,23,#23045,2,"(x: infer U) => void")
+#23049=@"loc,{#10000},90,57,90,76"
+locations_default(#23049,#10000,90,57,90,76)
+hasLocation(#23048,#23049)
+enclosing_stmt(#23048,#23017)
+expr_containers(#23048,#22814)
 #23050=*
-stmts(#23050,35,#22805,11,"type T2 ... oid }>;")
-#23051=@"loc,{#10000},91,3,91,69"
-locations_default(#23051,#10000,91,3,91,69)
-hasLocation(#23050,#23051)
-stmt_containers(#23050,#22805)
-#23052=*
-typeexprs(#23052,1,#23050,0,"T20")
-hasLocation(#23052,#21894)
-enclosing_stmt(#23052,#23050)
-expr_containers(#23052,#22805)
-literals("T20","T20",#23052)
-typedecl(#23052,#22821)
-#23053=*
-typeexprs(#23053,14,#23050,1,"Bar<{ a ... void }>")
-#23054=@"loc,{#10000},91,14,91,68"
-locations_default(#23054,#10000,91,14,91,68)
-hasLocation(#23053,#23054)
-enclosing_stmt(#23053,#23050)
-expr_containers(#23053,#22805)
-#23055=*
-typeexprs(#23055,0,#23053,-1,"Bar")
-hasLocation(#23055,#21898)
-enclosing_stmt(#23055,#23050)
-expr_containers(#23055,#22805)
-literals("Bar","Bar",#23055)
-typebind(#23055,#22820)
+exprs(#23050,9,#23048,0,"(x: infer U) => void")
+hasLocation(#23050,#23049)
+enclosing_stmt(#23050,#23017)
+expr_containers(#23050,#22814)
+#23051=*
+scopes(#23051,1)
+scopenodes(#23050,#23051)
+scopenesting(#23051,#23020)
+#23052=@"var;{this};{#23051}"
+variables(#23052,"this",#23051)
+#23053=@"var;{x};{#23051}"
+variables(#23053,"x",#23051)
+#23054=*
+exprs(#23054,78,#23050,0,"x")
+hasLocation(#23054,#21866)
+expr_containers(#23054,#23050)
+literals("x","x",#23054)
+decl(#23054,#23053)
+#23055=@"var;{arguments};{#23051}"
+variables(#23055,"arguments",#23051)
+is_arguments_object(#23055)
 #23056=*
-typeexprs(#23056,21,#23053,0,"{ a: (x ...  void }")
-#23057=@"loc,{#10000},91,18,91,67"
-locations_default(#23057,#10000,91,18,91,67)
-hasLocation(#23056,#23057)
-enclosing_stmt(#23056,#23050)
-expr_containers(#23056,#22805)
-#23058=*
-properties(#23058,#23056,0,8,"a: (x:  ... > void,")
-#23059=@"loc,{#10000},91,20,91,42"
-locations_default(#23059,#10000,91,20,91,42)
-hasLocation(#23058,#23059)
+typeexprs(#23056,2,#23050,-3,"void")
+hasLocation(#23056,#21878)
+expr_containers(#23056,#23050)
+literals("void","void",#23056)
+#23057=*
+typeexprs(#23057,29,#23050,-6,"infer U")
+#23058=@"loc,{#10000},90,61,90,67"
+locations_default(#23058,#10000,90,61,90,67)
+hasLocation(#23057,#23058)
+expr_containers(#23057,#23050)
+#23059=*
+typeexprs(#23059,22,#23057,0,"U")
+hasLocation(#23059,#21872)
+expr_containers(#23059,#23050)
 #23060=*
-exprs(#23060,0,#23058,0,"a")
-hasLocation(#23060,#21904)
-enclosing_stmt(#23060,#23050)
-expr_containers(#23060,#22805)
-literals("a","a",#23060)
-is_abstract_member(#23058)
+typeexprs(#23060,1,#23059,0,"U")
+hasLocation(#23060,#21872)
+expr_containers(#23060,#23050)
+literals("U","U",#23060)
 #23061=*
-typeexprs(#23061,23,#23058,2,"(x: string) => void")
-#23062=@"loc,{#10000},91,23,91,41"
-locations_default(#23062,#10000,91,23,91,41)
-hasLocation(#23061,#23062)
-enclosing_stmt(#23061,#23050)
-expr_containers(#23061,#22805)
+typeexprs(#23061,0,#23024,2,"U")
+hasLocation(#23061,#21884)
+enclosing_stmt(#23061,#23017)
+expr_containers(#23061,#22814)
+literals("U","U",#23061)
+#23062=*
+typeexprs(#23062,2,#23024,3,"never")
+hasLocation(#23062,#21888)
+enclosing_stmt(#23062,#23017)
+expr_containers(#23062,#22814)
+literals("never","never",#23062)
 #23063=*
-exprs(#23063,9,#23061,0,"(x: string) => void")
-hasLocation(#23063,#23062)
-enclosing_stmt(#23063,#23050)
-expr_containers(#23063,#22805)
-#23064=*
-scopes(#23064,1)
-scopenodes(#23063,#23064)
-scopenesting(#23064,#22808)
-#23065=@"var;{x};{#23064}"
-variables(#23065,"x",#23064)
+stmts(#23063,35,#22814,11,"type T2 ... oid }>;")
+#23064=@"loc,{#10000},91,3,91,69"
+locations_default(#23064,#10000,91,3,91,69)
+hasLocation(#23063,#23064)
+stmt_containers(#23063,#22814)
+#23065=*
+typeexprs(#23065,1,#23063,0,"T20")
+hasLocation(#23065,#21894)
+enclosing_stmt(#23065,#23063)
+expr_containers(#23065,#22814)
+literals("T20","T20",#23065)
+typedecl(#23065,#22830)
 #23066=*
-exprs(#23066,78,#23063,0,"x")
-hasLocation(#23066,#21910)
-expr_containers(#23066,#23063)
-literals("x","x",#23066)
-decl(#23066,#23065)
-#23067=@"var;{arguments};{#23064}"
-variables(#23067,"arguments",#23064)
-is_arguments_object(#23067)
+typeexprs(#23066,14,#23063,1,"Bar<{ a ... void }>")
+#23067=@"loc,{#10000},91,14,91,68"
+locations_default(#23067,#10000,91,14,91,68)
+hasLocation(#23066,#23067)
+enclosing_stmt(#23066,#23063)
+expr_containers(#23066,#22814)
 #23068=*
-typeexprs(#23068,2,#23063,-3,"void")
-hasLocation(#23068,#21920)
-expr_containers(#23068,#23063)
-literals("void","void",#23068)
+typeexprs(#23068,0,#23066,-1,"Bar")
+hasLocation(#23068,#21898)
+enclosing_stmt(#23068,#23063)
+expr_containers(#23068,#22814)
+literals("Bar","Bar",#23068)
+typebind(#23068,#22829)
 #23069=*
-typeexprs(#23069,2,#23063,-6,"string")
-hasLocation(#23069,#21914)
-expr_containers(#23069,#23063)
-literals("string","string",#23069)
-#23070=*
-properties(#23070,#23056,1,8,"b: (x:  ... => void")
-#23071=@"loc,{#10000},91,44,91,65"
-locations_default(#23071,#10000,91,44,91,65)
-hasLocation(#23070,#23071)
-#23072=*
-exprs(#23072,0,#23070,0,"b")
-hasLocation(#23072,#21924)
-enclosing_stmt(#23072,#23050)
-expr_containers(#23072,#22805)
-literals("b","b",#23072)
-is_abstract_member(#23070)
+typeexprs(#23069,21,#23066,0,"{ a: (x ...  void }")
+#23070=@"loc,{#10000},91,18,91,67"
+locations_default(#23070,#10000,91,18,91,67)
+hasLocation(#23069,#23070)
+enclosing_stmt(#23069,#23063)
+expr_containers(#23069,#22814)
+#23071=*
+properties(#23071,#23069,0,8,"a: (x:  ... > void,")
+#23072=@"loc,{#10000},91,20,91,42"
+locations_default(#23072,#10000,91,20,91,42)
+hasLocation(#23071,#23072)
 #23073=*
-typeexprs(#23073,23,#23070,2,"(x: string) => void")
-#23074=@"loc,{#10000},91,47,91,65"
-locations_default(#23074,#10000,91,47,91,65)
-hasLocation(#23073,#23074)
-enclosing_stmt(#23073,#23050)
-expr_containers(#23073,#22805)
-#23075=*
-exprs(#23075,9,#23073,0,"(x: string) => void")
-hasLocation(#23075,#23074)
-enclosing_stmt(#23075,#23050)
-expr_containers(#23075,#22805)
+exprs(#23073,0,#23071,0,"a")
+hasLocation(#23073,#21904)
+enclosing_stmt(#23073,#23063)
+expr_containers(#23073,#22814)
+literals("a","a",#23073)
+is_abstract_member(#23071)
+#23074=*
+typeexprs(#23074,23,#23071,2,"(x: string) => void")
+#23075=@"loc,{#10000},91,23,91,41"
+locations_default(#23075,#10000,91,23,91,41)
+hasLocation(#23074,#23075)
+enclosing_stmt(#23074,#23063)
+expr_containers(#23074,#22814)
 #23076=*
-scopes(#23076,1)
-scopenodes(#23075,#23076)
-scopenesting(#23076,#22808)
-#23077=@"var;{x};{#23076}"
-variables(#23077,"x",#23076)
-#23078=*
-exprs(#23078,78,#23075,0,"x")
-hasLocation(#23078,#21930)
-expr_containers(#23078,#23075)
-literals("x","x",#23078)
-decl(#23078,#23077)
-#23079=@"var;{arguments};{#23076}"
-variables(#23079,"arguments",#23076)
-is_arguments_object(#23079)
+exprs(#23076,9,#23074,0,"(x: string) => void")
+hasLocation(#23076,#23075)
+enclosing_stmt(#23076,#23063)
+expr_containers(#23076,#22814)
+#23077=*
+scopes(#23077,1)
+scopenodes(#23076,#23077)
+scopenesting(#23077,#22817)
+#23078=@"var;{this};{#23077}"
+variables(#23078,"this",#23077)
+#23079=@"var;{x};{#23077}"
+variables(#23079,"x",#23077)
 #23080=*
-typeexprs(#23080,2,#23075,-3,"void")
-hasLocation(#23080,#21940)
-expr_containers(#23080,#23075)
-literals("void","void",#23080)
-#23081=*
-typeexprs(#23081,2,#23075,-6,"string")
-hasLocation(#23081,#21934)
-expr_containers(#23081,#23075)
-literals("string","string",#23081)
+exprs(#23080,78,#23076,0,"x")
+hasLocation(#23080,#21910)
+expr_containers(#23080,#23076)
+literals("x","x",#23080)
+decl(#23080,#23079)
+#23081=@"var;{arguments};{#23077}"
+variables(#23081,"arguments",#23077)
+is_arguments_object(#23081)
 #23082=*
-stmts(#23082,35,#22805,12,"type T2 ... oid }>;")
-#23083=@"loc,{#10000},92,3,92,69"
-locations_default(#23083,#10000,92,3,92,69)
-hasLocation(#23082,#23083)
-stmt_containers(#23082,#22805)
+typeexprs(#23082,2,#23076,-3,"void")
+hasLocation(#23082,#21920)
+expr_containers(#23082,#23076)
+literals("void","void",#23082)
+#23083=*
+typeexprs(#23083,2,#23076,-6,"string")
+hasLocation(#23083,#21914)
+expr_containers(#23083,#23076)
+literals("string","string",#23083)
 #23084=*
-typeexprs(#23084,1,#23082,0,"T21")
-hasLocation(#23084,#21950)
-enclosing_stmt(#23084,#23082)
-expr_containers(#23084,#22805)
-literals("T21","T21",#23084)
-typedecl(#23084,#22822)
-#23085=*
-typeexprs(#23085,14,#23082,1,"Bar<{ a ... void }>")
-#23086=@"loc,{#10000},92,14,92,68"
-locations_default(#23086,#10000,92,14,92,68)
-hasLocation(#23085,#23086)
-enclosing_stmt(#23085,#23082)
-expr_containers(#23085,#22805)
+properties(#23084,#23069,1,8,"b: (x:  ... => void")
+#23085=@"loc,{#10000},91,44,91,65"
+locations_default(#23085,#10000,91,44,91,65)
+hasLocation(#23084,#23085)
+#23086=*
+exprs(#23086,0,#23084,0,"b")
+hasLocation(#23086,#21924)
+enclosing_stmt(#23086,#23063)
+expr_containers(#23086,#22814)
+literals("b","b",#23086)
+is_abstract_member(#23084)
 #23087=*
-typeexprs(#23087,0,#23085,-1,"Bar")
-hasLocation(#23087,#21954)
-enclosing_stmt(#23087,#23082)
-expr_containers(#23087,#22805)
-literals("Bar","Bar",#23087)
-typebind(#23087,#22820)
-#23088=*
-typeexprs(#23088,21,#23085,0,"{ a: (x ...  void }")
-#23089=@"loc,{#10000},92,18,92,67"
-locations_default(#23089,#10000,92,18,92,67)
-hasLocation(#23088,#23089)
-enclosing_stmt(#23088,#23082)
-expr_containers(#23088,#22805)
+typeexprs(#23087,23,#23084,2,"(x: string) => void")
+#23088=@"loc,{#10000},91,47,91,65"
+locations_default(#23088,#10000,91,47,91,65)
+hasLocation(#23087,#23088)
+enclosing_stmt(#23087,#23063)
+expr_containers(#23087,#22814)
+#23089=*
+exprs(#23089,9,#23087,0,"(x: string) => void")
+hasLocation(#23089,#23088)
+enclosing_stmt(#23089,#23063)
+expr_containers(#23089,#22814)
 #23090=*
-properties(#23090,#23088,0,8,"a: (x:  ... > void,")
-#23091=@"loc,{#10000},92,20,92,42"
-locations_default(#23091,#10000,92,20,92,42)
-hasLocation(#23090,#23091)
-#23092=*
-exprs(#23092,0,#23090,0,"a")
-hasLocation(#23092,#21960)
-enclosing_stmt(#23092,#23082)
-expr_containers(#23092,#22805)
-literals("a","a",#23092)
-is_abstract_member(#23090)
+scopes(#23090,1)
+scopenodes(#23089,#23090)
+scopenesting(#23090,#22817)
+#23091=@"var;{this};{#23090}"
+variables(#23091,"this",#23090)
+#23092=@"var;{x};{#23090}"
+variables(#23092,"x",#23090)
 #23093=*
-typeexprs(#23093,23,#23090,2,"(x: string) => void")
-#23094=@"loc,{#10000},92,23,92,41"
-locations_default(#23094,#10000,92,23,92,41)
-hasLocation(#23093,#23094)
-enclosing_stmt(#23093,#23082)
-expr_containers(#23093,#22805)
+exprs(#23093,78,#23089,0,"x")
+hasLocation(#23093,#21930)
+expr_containers(#23093,#23089)
+literals("x","x",#23093)
+decl(#23093,#23092)
+#23094=@"var;{arguments};{#23090}"
+variables(#23094,"arguments",#23090)
+is_arguments_object(#23094)
 #23095=*
-exprs(#23095,9,#23093,0,"(x: string) => void")
-hasLocation(#23095,#23094)
-enclosing_stmt(#23095,#23082)
-expr_containers(#23095,#22805)
+typeexprs(#23095,2,#23089,-3,"void")
+hasLocation(#23095,#21940)
+expr_containers(#23095,#23089)
+literals("void","void",#23095)
 #23096=*
-scopes(#23096,1)
-scopenodes(#23095,#23096)
-scopenesting(#23096,#22808)
-#23097=@"var;{x};{#23096}"
-variables(#23097,"x",#23096)
-#23098=*
-exprs(#23098,78,#23095,0,"x")
-hasLocation(#23098,#21966)
-expr_containers(#23098,#23095)
-literals("x","x",#23098)
-decl(#23098,#23097)
-#23099=@"var;{arguments};{#23096}"
-variables(#23099,"arguments",#23096)
-is_arguments_object(#23099)
+typeexprs(#23096,2,#23089,-6,"string")
+hasLocation(#23096,#21934)
+expr_containers(#23096,#23089)
+literals("string","string",#23096)
+#23097=*
+stmts(#23097,35,#22814,12,"type T2 ... oid }>;")
+#23098=@"loc,{#10000},92,3,92,69"
+locations_default(#23098,#10000,92,3,92,69)
+hasLocation(#23097,#23098)
+stmt_containers(#23097,#22814)
+#23099=*
+typeexprs(#23099,1,#23097,0,"T21")
+hasLocation(#23099,#21950)
+enclosing_stmt(#23099,#23097)
+expr_containers(#23099,#22814)
+literals("T21","T21",#23099)
+typedecl(#23099,#22831)
 #23100=*
-typeexprs(#23100,2,#23095,-3,"void")
-hasLocation(#23100,#21976)
-expr_containers(#23100,#23095)
-literals("void","void",#23100)
-#23101=*
-typeexprs(#23101,2,#23095,-6,"string")
-hasLocation(#23101,#21970)
-expr_containers(#23101,#23095)
-literals("string","string",#23101)
+typeexprs(#23100,14,#23097,1,"Bar<{ a ... void }>")
+#23101=@"loc,{#10000},92,14,92,68"
+locations_default(#23101,#10000,92,14,92,68)
+hasLocation(#23100,#23101)
+enclosing_stmt(#23100,#23097)
+expr_containers(#23100,#22814)
 #23102=*
-properties(#23102,#23088,1,8,"b: (x:  ... => void")
-#23103=@"loc,{#10000},92,44,92,65"
-locations_default(#23103,#10000,92,44,92,65)
-hasLocation(#23102,#23103)
-#23104=*
-exprs(#23104,0,#23102,0,"b")
-hasLocation(#23104,#21980)
-enclosing_stmt(#23104,#23082)
-expr_containers(#23104,#22805)
-literals("b","b",#23104)
-is_abstract_member(#23102)
+typeexprs(#23102,0,#23100,-1,"Bar")
+hasLocation(#23102,#21954)
+enclosing_stmt(#23102,#23097)
+expr_containers(#23102,#22814)
+literals("Bar","Bar",#23102)
+typebind(#23102,#22829)
+#23103=*
+typeexprs(#23103,21,#23100,0,"{ a: (x ...  void }")
+#23104=@"loc,{#10000},92,18,92,67"
+locations_default(#23104,#10000,92,18,92,67)
+hasLocation(#23103,#23104)
+enclosing_stmt(#23103,#23097)
+expr_containers(#23103,#22814)
 #23105=*
-typeexprs(#23105,23,#23102,2,"(x: number) => void")
-#23106=@"loc,{#10000},92,47,92,65"
-locations_default(#23106,#10000,92,47,92,65)
+properties(#23105,#23103,0,8,"a: (x:  ... > void,")
+#23106=@"loc,{#10000},92,20,92,42"
+locations_default(#23106,#10000,92,20,92,42)
 hasLocation(#23105,#23106)
-enclosing_stmt(#23105,#23082)
-expr_containers(#23105,#22805)
 #23107=*
-exprs(#23107,9,#23105,0,"(x: number) => void")
-hasLocation(#23107,#23106)
-enclosing_stmt(#23107,#23082)
-expr_containers(#23107,#22805)
+exprs(#23107,0,#23105,0,"a")
+hasLocation(#23107,#21960)
+enclosing_stmt(#23107,#23097)
+expr_containers(#23107,#22814)
+literals("a","a",#23107)
+is_abstract_member(#23105)
 #23108=*
-scopes(#23108,1)
-scopenodes(#23107,#23108)
-scopenesting(#23108,#22808)
-#23109=@"var;{x};{#23108}"
-variables(#23109,"x",#23108)
+typeexprs(#23108,23,#23105,2,"(x: string) => void")
+#23109=@"loc,{#10000},92,23,92,41"
+locations_default(#23109,#10000,92,23,92,41)
+hasLocation(#23108,#23109)
+enclosing_stmt(#23108,#23097)
+expr_containers(#23108,#22814)
 #23110=*
-exprs(#23110,78,#23107,0,"x")
-hasLocation(#23110,#21986)
-expr_containers(#23110,#23107)
-literals("x","x",#23110)
-decl(#23110,#23109)
-#23111=@"var;{arguments};{#23108}"
-variables(#23111,"arguments",#23108)
-is_arguments_object(#23111)
-#23112=*
-typeexprs(#23112,2,#23107,-3,"void")
-hasLocation(#23112,#21996)
-expr_containers(#23112,#23107)
-literals("void","void",#23112)
-#23113=*
-typeexprs(#23113,2,#23107,-6,"number")
-hasLocation(#23113,#21990)
-expr_containers(#23113,#23107)
-literals("number","number",#23113)
+exprs(#23110,9,#23108,0,"(x: string) => void")
+hasLocation(#23110,#23109)
+enclosing_stmt(#23110,#23097)
+expr_containers(#23110,#22814)
+#23111=*
+scopes(#23111,1)
+scopenodes(#23110,#23111)
+scopenesting(#23111,#22817)
+#23112=@"var;{this};{#23111}"
+variables(#23112,"this",#23111)
+#23113=@"var;{x};{#23111}"
+variables(#23113,"x",#23111)
 #23114=*
-stmts(#23114,17,#22805,13,"declare ... number;")
-#23115=@"loc,{#10000},94,3,94,42"
-locations_default(#23115,#10000,94,3,94,42)
-hasLocation(#23114,#23115)
-stmt_containers(#23114,#22805)
-has_declare_keyword(#23114)
+exprs(#23114,78,#23110,0,"x")
+hasLocation(#23114,#21966)
+expr_containers(#23114,#23110)
+literals("x","x",#23114)
+decl(#23114,#23113)
+#23115=@"var;{arguments};{#23111}"
+variables(#23115,"arguments",#23111)
+is_arguments_object(#23115)
 #23116=*
-exprs(#23116,78,#23114,-1,"foo")
-hasLocation(#23116,#22008)
-expr_containers(#23116,#23114)
-literals("foo","foo",#23116)
-decl(#23116,#22809)
+typeexprs(#23116,2,#23110,-3,"void")
+hasLocation(#23116,#21976)
+expr_containers(#23116,#23110)
+literals("void","void",#23116)
 #23117=*
-scopes(#23117,1)
-scopenodes(#23114,#23117)
-scopenesting(#23117,#22808)
-#23118=@"var;{x};{#23117}"
-variables(#23118,"x",#23117)
-#23119=*
-exprs(#23119,78,#23114,0,"x")
-hasLocation(#23119,#22012)
-expr_containers(#23119,#23114)
-literals("x","x",#23119)
-decl(#23119,#23118)
-#23120=@"var;{arguments};{#23117}"
-variables(#23120,"arguments",#23117)
-is_arguments_object(#23120)
+typeexprs(#23117,2,#23110,-6,"string")
+hasLocation(#23117,#21970)
+expr_containers(#23117,#23110)
+literals("string","string",#23117)
+#23118=*
+properties(#23118,#23103,1,8,"b: (x:  ... => void")
+#23119=@"loc,{#10000},92,44,92,65"
+locations_default(#23119,#10000,92,44,92,65)
+hasLocation(#23118,#23119)
+#23120=*
+exprs(#23120,0,#23118,0,"b")
+hasLocation(#23120,#21980)
+enclosing_stmt(#23120,#23097)
+expr_containers(#23120,#22814)
+literals("b","b",#23120)
+is_abstract_member(#23118)
 #23121=*
-typeexprs(#23121,2,#23114,-3,"number")
-hasLocation(#23121,#22022)
-expr_containers(#23121,#23114)
-literals("number","number",#23121)
-#23122=*
-typeexprs(#23122,2,#23114,-6,"string")
-hasLocation(#23122,#22016)
-expr_containers(#23122,#23114)
-literals("string","string",#23122)
+typeexprs(#23121,23,#23118,2,"(x: number) => void")
+#23122=@"loc,{#10000},92,47,92,65"
+locations_default(#23122,#10000,92,47,92,65)
+hasLocation(#23121,#23122)
+enclosing_stmt(#23121,#23097)
+expr_containers(#23121,#22814)
 #23123=*
-stmts(#23123,17,#22805,14,"declare ... string;")
-#23124=@"loc,{#10000},95,3,95,42"
-locations_default(#23124,#10000,95,3,95,42)
-hasLocation(#23123,#23124)
-stmt_containers(#23123,#22805)
-has_declare_keyword(#23123)
-#23125=*
-exprs(#23125,78,#23123,-1,"foo")
-hasLocation(#23125,#22030)
-expr_containers(#23125,#23123)
-literals("foo","foo",#23125)
-decl(#23125,#22809)
-#23126=*
-scopes(#23126,1)
-scopenodes(#23123,#23126)
-scopenesting(#23126,#22808)
-#23127=@"var;{x};{#23126}"
-variables(#23127,"x",#23126)
-#23128=*
-exprs(#23128,78,#23123,0,"x")
-hasLocation(#23128,#22034)
-expr_containers(#23128,#23123)
-literals("x","x",#23128)
-decl(#23128,#23127)
-#23129=@"var;{arguments};{#23126}"
-variables(#23129,"arguments",#23126)
-is_arguments_object(#23129)
+exprs(#23123,9,#23121,0,"(x: number) => void")
+hasLocation(#23123,#23122)
+enclosing_stmt(#23123,#23097)
+expr_containers(#23123,#22814)
+#23124=*
+scopes(#23124,1)
+scopenodes(#23123,#23124)
+scopenesting(#23124,#22817)
+#23125=@"var;{this};{#23124}"
+variables(#23125,"this",#23124)
+#23126=@"var;{x};{#23124}"
+variables(#23126,"x",#23124)
+#23127=*
+exprs(#23127,78,#23123,0,"x")
+hasLocation(#23127,#21986)
+expr_containers(#23127,#23123)
+literals("x","x",#23127)
+decl(#23127,#23126)
+#23128=@"var;{arguments};{#23124}"
+variables(#23128,"arguments",#23124)
+is_arguments_object(#23128)
+#23129=*
+typeexprs(#23129,2,#23123,-3,"void")
+hasLocation(#23129,#21996)
+expr_containers(#23129,#23123)
+literals("void","void",#23129)
 #23130=*
-typeexprs(#23130,2,#23123,-3,"string")
-hasLocation(#23130,#22044)
+typeexprs(#23130,2,#23123,-6,"number")
+hasLocation(#23130,#21990)
 expr_containers(#23130,#23123)
-literals("string","string",#23130)
+literals("number","number",#23130)
 #23131=*
-typeexprs(#23131,2,#23123,-6,"number")
-hasLocation(#23131,#22038)
-expr_containers(#23131,#23123)
-literals("number","number",#23131)
-#23132=*
-stmts(#23132,17,#22805,15,"declare ... number;")
-#23133=@"loc,{#10000},96,3,96,60"
-locations_default(#23133,#10000,96,3,96,60)
-hasLocation(#23132,#23133)
-stmt_containers(#23132,#22805)
-has_declare_keyword(#23132)
+stmts(#23131,17,#22814,13,"declare ... number;")
+#23132=@"loc,{#10000},94,3,94,42"
+locations_default(#23132,#10000,94,3,94,42)
+hasLocation(#23131,#23132)
+stmt_containers(#23131,#22814)
+has_declare_keyword(#23131)
+#23133=*
+exprs(#23133,78,#23131,-1,"foo")
+hasLocation(#23133,#22008)
+expr_containers(#23133,#23131)
+literals("foo","foo",#23133)
+decl(#23133,#22818)
 #23134=*
-exprs(#23134,78,#23132,-1,"foo")
-hasLocation(#23134,#22052)
-expr_containers(#23134,#23132)
-literals("foo","foo",#23134)
-decl(#23134,#22809)
-#23135=*
-scopes(#23135,1)
-scopenodes(#23132,#23135)
-scopenesting(#23135,#22808)
-#23136=@"var;{x};{#23135}"
-variables(#23136,"x",#23135)
+scopes(#23134,1)
+scopenodes(#23131,#23134)
+scopenesting(#23134,#22817)
+#23135=@"var;{this};{#23134}"
+variables(#23135,"this",#23134)
+#23136=@"var;{x};{#23134}"
+variables(#23136,"x",#23134)
 #23137=*
-exprs(#23137,78,#23132,0,"x")
-hasLocation(#23137,#22056)
-expr_containers(#23137,#23132)
+exprs(#23137,78,#23131,0,"x")
+hasLocation(#23137,#22012)
+expr_containers(#23137,#23131)
 literals("x","x",#23137)
 decl(#23137,#23136)
-#23138=@"var;{arguments};{#23135}"
-variables(#23138,"arguments",#23135)
+#23138=@"var;{arguments};{#23134}"
+variables(#23138,"arguments",#23134)
 is_arguments_object(#23138)
 #23139=*
-typeexprs(#23139,7,#23132,-3,"string | number")
-#23140=@"loc,{#10000},96,45,96,59"
-locations_default(#23140,#10000,96,45,96,59)
-hasLocation(#23139,#23140)
-expr_containers(#23139,#23132)
+typeexprs(#23139,2,#23131,-3,"number")
+hasLocation(#23139,#22022)
+expr_containers(#23139,#23131)
+literals("number","number",#23139)
+#23140=*
+typeexprs(#23140,2,#23131,-6,"string")
+hasLocation(#23140,#22016)
+expr_containers(#23140,#23131)
+literals("string","string",#23140)
 #23141=*
-typeexprs(#23141,2,#23139,0,"string")
-hasLocation(#23141,#22070)
-expr_containers(#23141,#23132)
-literals("string","string",#23141)
-#23142=*
-typeexprs(#23142,2,#23139,1,"number")
-hasLocation(#23142,#22074)
-expr_containers(#23142,#23132)
-literals("number","number",#23142)
+stmts(#23141,17,#22814,14,"declare ... string;")
+#23142=@"loc,{#10000},95,3,95,42"
+locations_default(#23142,#10000,95,3,95,42)
+hasLocation(#23141,#23142)
+stmt_containers(#23141,#22814)
+has_declare_keyword(#23141)
 #23143=*
-typeexprs(#23143,7,#23132,-6,"string | number")
-#23144=@"loc,{#10000},96,27,96,41"
-locations_default(#23144,#10000,96,27,96,41)
-hasLocation(#23143,#23144)
-expr_containers(#23143,#23132)
-#23145=*
-typeexprs(#23145,2,#23143,0,"string")
-hasLocation(#23145,#22060)
-expr_containers(#23145,#23132)
-literals("string","string",#23145)
-#23146=*
-typeexprs(#23146,2,#23143,1,"number")
-hasLocation(#23146,#22064)
-expr_containers(#23146,#23132)
-literals("number","number",#23146)
+exprs(#23143,78,#23141,-1,"foo")
+hasLocation(#23143,#22030)
+expr_containers(#23143,#23141)
+literals("foo","foo",#23143)
+decl(#23143,#22818)
+#23144=*
+scopes(#23144,1)
+scopenodes(#23141,#23144)
+scopenesting(#23144,#22817)
+#23145=@"var;{this};{#23144}"
+variables(#23145,"this",#23144)
+#23146=@"var;{x};{#23144}"
+variables(#23146,"x",#23144)
 #23147=*
-stmts(#23147,35,#22805,16,"type T3 ... f foo>;")
-#23148=@"loc,{#10000},97,3,97,36"
-locations_default(#23148,#10000,97,3,97,36)
-hasLocation(#23147,#23148)
-stmt_containers(#23147,#22805)
+exprs(#23147,78,#23141,0,"x")
+hasLocation(#23147,#22034)
+expr_containers(#23147,#23141)
+literals("x","x",#23147)
+decl(#23147,#23146)
+#23148=@"var;{arguments};{#23144}"
+variables(#23148,"arguments",#23144)
+is_arguments_object(#23148)
 #23149=*
-typeexprs(#23149,1,#23147,0,"T30")
-hasLocation(#23149,#22080)
-enclosing_stmt(#23149,#23147)
-expr_containers(#23149,#22805)
-literals("T30","T30",#23149)
-typedecl(#23149,#22823)
+typeexprs(#23149,2,#23141,-3,"string")
+hasLocation(#23149,#22044)
+expr_containers(#23149,#23141)
+literals("string","string",#23149)
 #23150=*
-typeexprs(#23150,14,#23147,1,"ReturnT ... of foo>")
-#23151=@"loc,{#10000},97,14,97,35"
-locations_default(#23151,#10000,97,14,97,35)
-hasLocation(#23150,#23151)
-enclosing_stmt(#23150,#23147)
-expr_containers(#23150,#22805)
-#23152=*
-typeexprs(#23152,0,#23150,-1,"ReturnType")
-hasLocation(#23152,#22084)
-enclosing_stmt(#23152,#23147)
-expr_containers(#23152,#22805)
-literals("ReturnType","ReturnType",#23152)
-typebind(#23152,#22825)
+typeexprs(#23150,2,#23141,-6,"number")
+hasLocation(#23150,#22038)
+expr_containers(#23150,#23141)
+literals("number","number",#23150)
+#23151=*
+stmts(#23151,17,#22814,15,"declare ... number;")
+#23152=@"loc,{#10000},96,3,96,60"
+locations_default(#23152,#10000,96,3,96,60)
+hasLocation(#23151,#23152)
+stmt_containers(#23151,#22814)
+has_declare_keyword(#23151)
 #23153=*
-typeexprs(#23153,16,#23150,0,"typeof foo")
-#23154=@"loc,{#10000},97,25,97,34"
-locations_default(#23154,#10000,97,25,97,34)
-hasLocation(#23153,#23154)
-enclosing_stmt(#23153,#23147)
-expr_containers(#23153,#22805)
-#23155=*
-typeexprs(#23155,17,#23153,0,"foo")
-hasLocation(#23155,#22090)
-enclosing_stmt(#23155,#23147)
-expr_containers(#23155,#22805)
-literals("foo","foo",#23155)
-bind(#23155,#22809)
-#23156=*
-stmts(#23156,35,#22805,17,"type An ... => any;")
-#23157=@"loc,{#10000},99,3,99,45"
-locations_default(#23157,#10000,99,3,99,45)
-hasLocation(#23156,#23157)
-stmt_containers(#23156,#22805)
-#23158=*
-typeexprs(#23158,1,#23156,0,"AnyFunction")
-hasLocation(#23158,#22098)
-enclosing_stmt(#23158,#23156)
-expr_containers(#23158,#22805)
-literals("AnyFunction","AnyFunction",#23158)
-typedecl(#23158,#22824)
+exprs(#23153,78,#23151,-1,"foo")
+hasLocation(#23153,#22052)
+expr_containers(#23153,#23151)
+literals("foo","foo",#23153)
+decl(#23153,#22818)
+#23154=*
+scopes(#23154,1)
+scopenodes(#23151,#23154)
+scopenesting(#23154,#22817)
+#23155=@"var;{this};{#23154}"
+variables(#23155,"this",#23154)
+#23156=@"var;{x};{#23154}"
+variables(#23156,"x",#23154)
+#23157=*
+exprs(#23157,78,#23151,0,"x")
+hasLocation(#23157,#22056)
+expr_containers(#23157,#23151)
+literals("x","x",#23157)
+decl(#23157,#23156)
+#23158=@"var;{arguments};{#23154}"
+variables(#23158,"arguments",#23154)
+is_arguments_object(#23158)
 #23159=*
-typeexprs(#23159,23,#23156,1,"(...arg ...  => any")
-#23160=@"loc,{#10000},99,22,99,44"
-locations_default(#23160,#10000,99,22,99,44)
+typeexprs(#23159,7,#23151,-3,"string | number")
+#23160=@"loc,{#10000},96,45,96,59"
+locations_default(#23160,#10000,96,45,96,59)
 hasLocation(#23159,#23160)
-enclosing_stmt(#23159,#23156)
-expr_containers(#23159,#22805)
+expr_containers(#23159,#23151)
 #23161=*
-exprs(#23161,9,#23159,0,"(...arg ...  => any")
-hasLocation(#23161,#23160)
-enclosing_stmt(#23161,#23156)
-expr_containers(#23161,#22805)
+typeexprs(#23161,2,#23159,0,"string")
+hasLocation(#23161,#22070)
+expr_containers(#23161,#23151)
+literals("string","string",#23161)
 #23162=*
-scopes(#23162,1)
-scopenodes(#23161,#23162)
-scopenesting(#23162,#22808)
-#23163=@"var;{args};{#23162}"
-variables(#23163,"args",#23162)
-#23164=*
-exprs(#23164,78,#23161,0,"args")
-hasLocation(#23164,#22106)
-expr_containers(#23164,#23161)
-literals("args","args",#23164)
-decl(#23164,#23163)
-#23165=@"var;{arguments};{#23162}"
-variables(#23165,"arguments",#23162)
-is_arguments_object(#23165)
+typeexprs(#23162,2,#23159,1,"number")
+hasLocation(#23162,#22074)
+expr_containers(#23162,#23151)
+literals("number","number",#23162)
+#23163=*
+typeexprs(#23163,7,#23151,-6,"string | number")
+#23164=@"loc,{#10000},96,27,96,41"
+locations_default(#23164,#10000,96,27,96,41)
+hasLocation(#23163,#23164)
+expr_containers(#23163,#23151)
+#23165=*
+typeexprs(#23165,2,#23163,0,"string")
+hasLocation(#23165,#22060)
+expr_containers(#23165,#23151)
+literals("string","string",#23165)
 #23166=*
-typeexprs(#23166,2,#23161,-3,"any")
-hasLocation(#23166,#22120)
-expr_containers(#23166,#23161)
-literals("any","any",#23166)
+typeexprs(#23166,2,#23163,1,"number")
+hasLocation(#23166,#22064)
+expr_containers(#23166,#23151)
+literals("number","number",#23166)
 #23167=*
-typeexprs(#23167,6,#23161,-6,"any[]")
-#23168=@"loc,{#10000},99,32,99,36"
-locations_default(#23168,#10000,99,32,99,36)
+stmts(#23167,35,#22814,16,"type T3 ... f foo>;")
+#23168=@"loc,{#10000},97,3,97,36"
+locations_default(#23168,#10000,97,3,97,36)
 hasLocation(#23167,#23168)
-expr_containers(#23167,#23161)
+stmt_containers(#23167,#22814)
 #23169=*
-typeexprs(#23169,2,#23167,0,"any")
-hasLocation(#23169,#22110)
-expr_containers(#23169,#23161)
-literals("any","any",#23169)
-has_rest_parameter(#23161)
+typeexprs(#23169,1,#23167,0,"T30")
+hasLocation(#23169,#22080)
+enclosing_stmt(#23169,#23167)
+expr_containers(#23169,#22814)
+literals("T30","T30",#23169)
+typedecl(#23169,#22832)
 #23170=*
-stmts(#23170,35,#22805,18,"type Re ...  : any;")
-#23171=@"loc,{#10000},100,3,100,91"
-locations_default(#23171,#10000,100,3,100,91)
+typeexprs(#23170,14,#23167,1,"ReturnT ... of foo>")
+#23171=@"loc,{#10000},97,14,97,35"
+locations_default(#23171,#10000,97,14,97,35)
 hasLocation(#23170,#23171)
-stmt_containers(#23170,#22805)
+enclosing_stmt(#23170,#23167)
+expr_containers(#23170,#22814)
 #23172=*
-typeexprs(#23172,1,#23170,0,"ReturnType")
-hasLocation(#23172,#22126)
-enclosing_stmt(#23172,#23170)
-expr_containers(#23172,#22805)
+typeexprs(#23172,0,#23170,-1,"ReturnType")
+hasLocation(#23172,#22084)
+enclosing_stmt(#23172,#23167)
+expr_containers(#23172,#22814)
 literals("ReturnType","ReturnType",#23172)
-typedecl(#23172,#22825)
+typebind(#23172,#22834)
 #23173=*
-scopes(#23173,12)
-scopenodes(#23170,#23173)
-scopenesting(#23173,#22808)
-#23174=@"local_type_name;{T};{#23173}"
-local_type_names(#23174,"T",#23173)
+typeexprs(#23173,16,#23170,0,"typeof foo")
+#23174=@"loc,{#10000},97,25,97,34"
+locations_default(#23174,#10000,97,25,97,34)
+hasLocation(#23173,#23174)
+enclosing_stmt(#23173,#23167)
+expr_containers(#23173,#22814)
 #23175=*
-typeexprs(#23175,22,#23170,2,"T exten ... unction")
-#23176=@"loc,{#10000},100,19,100,39"
-locations_default(#23176,#10000,100,19,100,39)
-hasLocation(#23175,#23176)
-enclosing_stmt(#23175,#23170)
-expr_containers(#23175,#22805)
-#23177=*
-typeexprs(#23177,1,#23175,0,"T")
-hasLocation(#23177,#22130)
-enclosing_stmt(#23177,#23170)
-expr_containers(#23177,#22805)
-literals("T","T",#23177)
-typedecl(#23177,#23174)
+typeexprs(#23175,17,#23173,0,"foo")
+hasLocation(#23175,#22090)
+enclosing_stmt(#23175,#23167)
+expr_containers(#23175,#22814)
+literals("foo","foo",#23175)
+bind(#23175,#22818)
+#23176=*
+stmts(#23176,35,#22814,17,"type An ... => any;")
+#23177=@"loc,{#10000},99,3,99,45"
+locations_default(#23177,#10000,99,3,99,45)
+hasLocation(#23176,#23177)
+stmt_containers(#23176,#22814)
 #23178=*
-typeexprs(#23178,0,#23175,1,"AnyFunction")
-hasLocation(#23178,#22134)
-enclosing_stmt(#23178,#23170)
-expr_containers(#23178,#22805)
+typeexprs(#23178,1,#23176,0,"AnyFunction")
+hasLocation(#23178,#22098)
+enclosing_stmt(#23178,#23176)
+expr_containers(#23178,#22814)
 literals("AnyFunction","AnyFunction",#23178)
-typebind(#23178,#22824)
+typedecl(#23178,#22833)
 #23179=*
-typeexprs(#23179,28,#23170,1,"T exten ... R : any")
-#23180=@"loc,{#10000},100,44,100,90"
-locations_default(#23180,#10000,100,44,100,90)
+typeexprs(#23179,23,#23176,1,"(...arg ...  => any")
+#23180=@"loc,{#10000},99,22,99,44"
+locations_default(#23180,#10000,99,22,99,44)
 hasLocation(#23179,#23180)
-enclosing_stmt(#23179,#23170)
-expr_containers(#23179,#22805)
+enclosing_stmt(#23179,#23176)
+expr_containers(#23179,#22814)
 #23181=*
-typeexprs(#23181,0,#23179,0,"T")
-hasLocation(#23181,#22140)
-enclosing_stmt(#23181,#23170)
-expr_containers(#23181,#22805)
-literals("T","T",#23181)
-typebind(#23181,#23174)
+exprs(#23181,9,#23179,0,"(...arg ...  => any")
+hasLocation(#23181,#23180)
+enclosing_stmt(#23181,#23176)
+expr_containers(#23181,#22814)
 #23182=*
-scopes(#23182,16)
-scopenodes(#23179,#23182)
-scopenesting(#23182,#23173)
-#23183=@"local_type_name;{R};{#23182}"
-local_type_names(#23183,"R",#23182)
-#23184=*
-typeexprs(#23184,23,#23179,1,"(...arg ... infer R")
-#23185=@"loc,{#10000},100,54,100,80"
-locations_default(#23185,#10000,100,54,100,80)
-hasLocation(#23184,#23185)
-enclosing_stmt(#23184,#23170)
-expr_containers(#23184,#22805)
-#23186=*
-exprs(#23186,9,#23184,0,"(...arg ... infer R")
-hasLocation(#23186,#23185)
-enclosing_stmt(#23186,#23170)
-expr_containers(#23186,#22805)
+scopes(#23182,1)
+scopenodes(#23181,#23182)
+scopenesting(#23182,#22817)
+#23183=@"var;{this};{#23182}"
+variables(#23183,"this",#23182)
+#23184=@"var;{args};{#23182}"
+variables(#23184,"args",#23182)
+#23185=*
+exprs(#23185,78,#23181,0,"args")
+hasLocation(#23185,#22106)
+expr_containers(#23185,#23181)
+literals("args","args",#23185)
+decl(#23185,#23184)
+#23186=@"var;{arguments};{#23182}"
+variables(#23186,"arguments",#23182)
+is_arguments_object(#23186)
 #23187=*
-scopes(#23187,1)
-scopenodes(#23186,#23187)
-scopenesting(#23187,#23182)
-#23188=@"var;{args};{#23187}"
-variables(#23188,"args",#23187)
-#23189=*
-exprs(#23189,78,#23186,0,"args")
-hasLocation(#23189,#22148)
-expr_containers(#23189,#23186)
-literals("args","args",#23189)
-decl(#23189,#23188)
-#23190=@"var;{arguments};{#23187}"
-variables(#23190,"arguments",#23187)
-is_arguments_object(#23190)
+typeexprs(#23187,2,#23181,-3,"any")
+hasLocation(#23187,#22120)
+expr_containers(#23187,#23181)
+literals("any","any",#23187)
+#23188=*
+typeexprs(#23188,6,#23181,-6,"any[]")
+#23189=@"loc,{#10000},99,32,99,36"
+locations_default(#23189,#10000,99,32,99,36)
+hasLocation(#23188,#23189)
+expr_containers(#23188,#23181)
+#23190=*
+typeexprs(#23190,2,#23188,0,"any")
+hasLocation(#23190,#22110)
+expr_containers(#23190,#23181)
+literals("any","any",#23190)
+has_rest_parameter(#23181)
 #23191=*
-typeexprs(#23191,29,#23186,-3,"infer R")
-#23192=@"loc,{#10000},100,74,100,80"
-locations_default(#23192,#10000,100,74,100,80)
+stmts(#23191,35,#22814,18,"type Re ...  : any;")
+#23192=@"loc,{#10000},100,3,100,91"
+locations_default(#23192,#10000,100,3,100,91)
 hasLocation(#23191,#23192)
-expr_containers(#23191,#23186)
+stmt_containers(#23191,#22814)
 #23193=*
-typeexprs(#23193,22,#23191,0,"R")
-hasLocation(#23193,#22164)
-expr_containers(#23193,#23186)
+typeexprs(#23193,1,#23191,0,"ReturnType")
+hasLocation(#23193,#22126)
+enclosing_stmt(#23193,#23191)
+expr_containers(#23193,#22814)
+literals("ReturnType","ReturnType",#23193)
+typedecl(#23193,#22834)
 #23194=*
-typeexprs(#23194,1,#23193,0,"R")
-hasLocation(#23194,#22164)
-expr_containers(#23194,#23186)
-literals("R","R",#23194)
-typedecl(#23194,#23183)
-#23195=*
-typeexprs(#23195,6,#23186,-6,"any[]")
-#23196=@"loc,{#10000},100,64,100,68"
-locations_default(#23196,#10000,100,64,100,68)
-hasLocation(#23195,#23196)
-expr_containers(#23195,#23186)
-#23197=*
-typeexprs(#23197,2,#23195,0,"any")
-hasLocation(#23197,#22152)
-expr_containers(#23197,#23186)
-literals("any","any",#23197)
-has_rest_parameter(#23186)
+scopes(#23194,12)
+scopenodes(#23191,#23194)
+scopenesting(#23194,#22817)
+#23195=@"local_type_name;{T};{#23194}"
+local_type_names(#23195,"T",#23194)
+#23196=*
+typeexprs(#23196,22,#23191,2,"T exten ... unction")
+#23197=@"loc,{#10000},100,19,100,39"
+locations_default(#23197,#10000,100,19,100,39)
+hasLocation(#23196,#23197)
+enclosing_stmt(#23196,#23191)
+expr_containers(#23196,#22814)
 #23198=*
-typeexprs(#23198,0,#23179,2,"R")
-hasLocation(#23198,#22168)
-enclosing_stmt(#23198,#23170)
-expr_containers(#23198,#22805)
-literals("R","R",#23198)
-typebind(#23198,#23183)
+typeexprs(#23198,1,#23196,0,"T")
+hasLocation(#23198,#22130)
+enclosing_stmt(#23198,#23191)
+expr_containers(#23198,#22814)
+literals("T","T",#23198)
+typedecl(#23198,#23195)
 #23199=*
-typeexprs(#23199,2,#23179,3,"any")
-hasLocation(#23199,#22172)
-enclosing_stmt(#23199,#23170)
-expr_containers(#23199,#22805)
-literals("any","any",#23199)
-is_instantiated(#22805)
+typeexprs(#23199,0,#23196,1,"AnyFunction")
+hasLocation(#23199,#22134)
+enclosing_stmt(#23199,#23191)
+expr_containers(#23199,#22814)
+literals("AnyFunction","AnyFunction",#23199)
+typebind(#23199,#22833)
 #23200=*
-entry_cfg_node(#23200,#20001)
-#23201=@"loc,{#10000},1,1,1,0"
-locations_default(#23201,#10000,1,1,1,0)
+typeexprs(#23200,28,#23191,1,"T exten ... R : any")
+#23201=@"loc,{#10000},100,44,100,90"
+locations_default(#23201,#10000,100,44,100,90)
 hasLocation(#23200,#23201)
+enclosing_stmt(#23200,#23191)
+expr_containers(#23200,#22814)
 #23202=*
-exit_cfg_node(#23202,#20001)
-hasLocation(#23202,#22177)
-successor(#22807,#22805)
-successor(#23170,#23202)
-successor(#23156,#23170)
-successor(#23147,#23156)
-successor(#23132,#23147)
-successor(#23123,#23132)
-successor(#23114,#23123)
-successor(#23082,#23114)
-successor(#23050,#23082)
-successor(#23006,#23050)
-successor(#22990,#23006)
-successor(#22974,#22990)
-successor(#22946,#22974)
-successor(#22931,#22946)
-successor(#22919,#22931)
-successor(#22909,#22919)
-successor(#22897,#22909)
-successor(#22888,#22897)
-successor(#22881,#22888)
-successor(#22826,#22881)
-successor(#22805,#22826)
-successor(#22185,#22183)
-successor(#22777,#22807)
-successor(#22770,#22777)
-successor(#22763,#22770)
-successor(#22756,#22763)
-successor(#22749,#22756)
-successor(#22722,#22749)
-successor(#22707,#22722)
-successor(#22676,#22707)
-successor(#22661,#22676)
-successor(#22630,#22661)
-successor(#22591,#22630)
+typeexprs(#23202,0,#23200,0,"T")
+hasLocation(#23202,#22140)
+enclosing_stmt(#23202,#23191)
+expr_containers(#23202,#22814)
+literals("T","T",#23202)
+typebind(#23202,#23195)
 #23203=*
-entry_cfg_node(#23203,#22591)
-#23204=@"loc,{#10000},46,3,46,2"
-locations_default(#23204,#10000,46,3,46,2)
-hasLocation(#23203,#23204)
+scopes(#23203,16)
+scopenodes(#23200,#23203)
+scopenesting(#23203,#23194)
+#23204=@"local_type_name;{R};{#23203}"
+local_type_names(#23204,"R",#23203)
 #23205=*
-exit_cfg_node(#23205,#22591)
-#23206=@"loc,{#10000},49,4,49,3"
-locations_default(#23206,#10000,49,4,49,3)
+typeexprs(#23205,23,#23200,1,"(...arg ... infer R")
+#23206=@"loc,{#10000},100,54,100,80"
+locations_default(#23206,#10000,100,54,100,80)
 hasLocation(#23205,#23206)
-successor(#22623,#22627)
-successor(#22628,#22625)
-successor(#22627,#22628)
-successor(#22625,#23205)
-successor(#22617,#22621)
-successor(#22622,#22619)
-successor(#22621,#22622)
-successor(#22619,#22623)
-successor(#22613,#22617)
-successor(#22599,#22613)
-successor(#22597,#22599)
-successor(#23203,#22597)
-successor(#22566,#22591)
+enclosing_stmt(#23205,#23191)
+expr_containers(#23205,#22814)
 #23207=*
-entry_cfg_node(#23207,#22566)
-#23208=@"loc,{#10000},42,3,42,2"
-locations_default(#23208,#10000,42,3,42,2)
-hasLocation(#23207,#23208)
-#23209=*
-exit_cfg_node(#23209,#22566)
-#23210=@"loc,{#10000},44,4,44,3"
-locations_default(#23210,#10000,44,4,44,3)
-hasLocation(#23209,#23210)
-successor(#22585,#22589)
-successor(#22590,#22587)
-successor(#22589,#22590)
-successor(#22587,#23209)
-successor(#22583,#22585)
-successor(#22574,#22583)
-successor(#22572,#22574)
-successor(#23207,#22572)
-successor(#22552,#22566)
-successor(#22541,#22552)
-successor(#22526,#22541)
-successor(#22507,#22526)
-successor(#22488,#22507)
-successor(#22471,#22488)
-successor(#22454,#22471)
-successor(#22438,#22454)
-successor(#22422,#22438)
-successor(#22410,#22422)
-successor(#22401,#22410)
-successor(#22394,#22401)
-successor(#22370,#22394)
-successor(#22355,#22370)
-successor(#22342,#22355)
-successor(#22328,#22342)
-successor(#22315,#22328)
-successor(#22298,#22315)
-successor(#22289,#22298)
-successor(#22277,#22289)
-successor(#22270,#22277)
-successor(#22263,#22270)
-successor(#22256,#22263)
-successor(#22223,#22256)
-successor(#22593,#22223)
-successor(#22568,#22593)
-successor(#22183,#22568)
-successor(#23200,#22185)
+exprs(#23207,9,#23205,0,"(...arg ... infer R")
+hasLocation(#23207,#23206)
+enclosing_stmt(#23207,#23191)
+expr_containers(#23207,#22814)
+#23208=*
+scopes(#23208,1)
+scopenodes(#23207,#23208)
+scopenesting(#23208,#23203)
+#23209=@"var;{this};{#23208}"
+variables(#23209,"this",#23208)
+#23210=@"var;{args};{#23208}"
+variables(#23210,"args",#23208)
+#23211=*
+exprs(#23211,78,#23207,0,"args")
+hasLocation(#23211,#22148)
+expr_containers(#23211,#23207)
+literals("args","args",#23211)
+decl(#23211,#23210)
+#23212=@"var;{arguments};{#23208}"
+variables(#23212,"arguments",#23208)
+is_arguments_object(#23212)
+#23213=*
+typeexprs(#23213,29,#23207,-3,"infer R")
+#23214=@"loc,{#10000},100,74,100,80"
+locations_default(#23214,#10000,100,74,100,80)
+hasLocation(#23213,#23214)
+expr_containers(#23213,#23207)
+#23215=*
+typeexprs(#23215,22,#23213,0,"R")
+hasLocation(#23215,#22164)
+expr_containers(#23215,#23207)
+#23216=*
+typeexprs(#23216,1,#23215,0,"R")
+hasLocation(#23216,#22164)
+expr_containers(#23216,#23207)
+literals("R","R",#23216)
+typedecl(#23216,#23204)
+#23217=*
+typeexprs(#23217,6,#23207,-6,"any[]")
+#23218=@"loc,{#10000},100,64,100,68"
+locations_default(#23218,#10000,100,64,100,68)
+hasLocation(#23217,#23218)
+expr_containers(#23217,#23207)
+#23219=*
+typeexprs(#23219,2,#23217,0,"any")
+hasLocation(#23219,#22152)
+expr_containers(#23219,#23207)
+literals("any","any",#23219)
+has_rest_parameter(#23207)
+#23220=*
+typeexprs(#23220,0,#23200,2,"R")
+hasLocation(#23220,#22168)
+enclosing_stmt(#23220,#23191)
+expr_containers(#23220,#22814)
+literals("R","R",#23220)
+typebind(#23220,#23204)
+#23221=*
+typeexprs(#23221,2,#23200,3,"any")
+hasLocation(#23221,#22172)
+enclosing_stmt(#23221,#23191)
+expr_containers(#23221,#22814)
+literals("any","any",#23221)
+is_instantiated(#22814)
+#23222=*
+entry_cfg_node(#23222,#20001)
+#23223=@"loc,{#10000},1,1,1,0"
+locations_default(#23223,#10000,1,1,1,0)
+hasLocation(#23222,#23223)
+#23224=*
+exit_cfg_node(#23224,#20001)
+hasLocation(#23224,#22177)
+successor(#22816,#22814)
+successor(#23191,#23224)
+successor(#23176,#23191)
+successor(#23167,#23176)
+successor(#23151,#23167)
+successor(#23141,#23151)
+successor(#23131,#23141)
+successor(#23097,#23131)
+successor(#23063,#23097)
+successor(#23017,#23063)
+successor(#23001,#23017)
+successor(#22985,#23001)
+successor(#22957,#22985)
+successor(#22942,#22957)
+successor(#22930,#22942)
+successor(#22920,#22930)
+successor(#22907,#22920)
+successor(#22898,#22907)
+successor(#22891,#22898)
+successor(#22835,#22891)
+successor(#22814,#22835)
+successor(#22186,#22184)
+successor(#22785,#22816)
+successor(#22778,#22785)
+successor(#22771,#22778)
+successor(#22764,#22771)
+successor(#22757,#22764)
+successor(#22729,#22757)
+successor(#22714,#22729)
+successor(#22683,#22714)
+successor(#22668,#22683)
+successor(#22637,#22668)
+successor(#22597,#22637)
+#23225=*
+entry_cfg_node(#23225,#22597)
+#23226=@"loc,{#10000},46,3,46,2"
+locations_default(#23226,#10000,46,3,46,2)
+hasLocation(#23225,#23226)
+#23227=*
+exit_cfg_node(#23227,#22597)
+#23228=@"loc,{#10000},49,4,49,3"
+locations_default(#23228,#10000,49,4,49,3)
+hasLocation(#23227,#23228)
+successor(#22630,#22634)
+successor(#22635,#22632)
+successor(#22634,#22635)
+successor(#22632,#23227)
+successor(#22624,#22628)
+successor(#22629,#22626)
+successor(#22628,#22629)
+successor(#22626,#22630)
+successor(#22620,#22624)
+successor(#22606,#22620)
+successor(#22604,#22606)
+successor(#23225,#22604)
+successor(#22571,#22597)
+#23229=*
+entry_cfg_node(#23229,#22571)
+#23230=@"loc,{#10000},42,3,42,2"
+locations_default(#23230,#10000,42,3,42,2)
+hasLocation(#23229,#23230)
+#23231=*
+exit_cfg_node(#23231,#22571)
+#23232=@"loc,{#10000},44,4,44,3"
+locations_default(#23232,#10000,44,4,44,3)
+hasLocation(#23231,#23232)
+successor(#22591,#22595)
+successor(#22596,#22593)
+successor(#22595,#22596)
+successor(#22593,#23231)
+successor(#22589,#22591)
+successor(#22580,#22589)
+successor(#22578,#22580)
+successor(#23229,#22578)
+successor(#22557,#22571)
+successor(#22546,#22557)
+successor(#22531,#22546)
+successor(#22511,#22531)
+successor(#22491,#22511)
+successor(#22474,#22491)
+successor(#22457,#22474)
+successor(#22441,#22457)
+successor(#22425,#22441)
+successor(#22413,#22425)
+successor(#22404,#22413)
+successor(#22397,#22404)
+successor(#22373,#22397)
+successor(#22358,#22373)
+successor(#22345,#22358)
+successor(#22331,#22345)
+successor(#22318,#22331)
+successor(#22300,#22318)
+successor(#22291,#22300)
+successor(#22278,#22291)
+successor(#22271,#22278)
+successor(#22264,#22271)
+successor(#22257,#22264)
+successor(#22224,#22257)
+successor(#22599,#22224)
+successor(#22573,#22599)
+successor(#22184,#22573)
+successor(#23222,#22186)
 numlines(#10000,102,79,38)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/ctordecl.ts.trap b/javascript/extractor/tests/ts/output/trap/ctordecl.ts.trap
index 9653669e31f..d0d40695fcb 100644
--- a/javascript/extractor/tests/ts/output/trap/ctordecl.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/ctordecl.ts.trap
@@ -168,147 +168,155 @@ hasLocation(#20001,#20059)
 variables(#20060,"A",#20000)
 #20061=@"local_type_name;{A};{#20000}"
 local_type_names(#20061,"A",#20000)
-#20062=*
-stmts(#20062,26,#20001,0,"class A ... y) {}\n}")
-hasLocation(#20062,#20059)
-stmt_containers(#20062,#20001)
+#20062=@"var;{this};{#20000}"
+variables(#20062,"this",#20000)
 #20063=*
-exprs(#20063,78,#20062,0,"A")
-hasLocation(#20063,#20015)
-enclosing_stmt(#20063,#20062)
-expr_containers(#20063,#20001)
-literals("A","A",#20063)
-decl(#20063,#20060)
-typedecl(#20063,#20061)
+stmts(#20063,26,#20001,0,"class A ... y) {}\n}")
+hasLocation(#20063,#20059)
+stmt_containers(#20063,#20001)
 #20064=*
-scopes(#20064,10)
-scopenodes(#20062,#20064)
-scopenesting(#20064,#20000)
+exprs(#20064,78,#20063,0,"A")
+hasLocation(#20064,#20015)
+enclosing_stmt(#20064,#20063)
+expr_containers(#20064,#20001)
+literals("A","A",#20064)
+decl(#20064,#20060)
+typedecl(#20064,#20061)
 #20065=*
-properties(#20065,#20062,2,8,"y = 42;")
-#20066=@"loc,{#10000},2,3,2,9"
-locations_default(#20066,#10000,2,3,2,9)
-hasLocation(#20065,#20066)
+scopes(#20065,10)
+scopenodes(#20063,#20065)
+scopenesting(#20065,#20000)
+#20066=@"var;{this};{#20065}"
+variables(#20066,"this",#20065)
 #20067=*
-#20068=*
-exprs(#20068,0,#20065,0,"y")
-hasLocation(#20068,#20019)
-expr_containers(#20068,#20067)
-literals("y","y",#20068)
+properties(#20067,#20063,2,8,"y = 42;")
+#20068=@"loc,{#10000},2,3,2,9"
+locations_default(#20068,#10000,2,3,2,9)
+hasLocation(#20067,#20068)
 #20069=*
-exprs(#20069,3,#20065,1,"42")
-hasLocation(#20069,#20023)
-expr_containers(#20069,#20067)
-literals("42","42",#20069)
 #20070=*
-properties(#20070,#20062,3,0,"constru ... tring);")
-#20071=@"loc,{#10000},3,3,3,24"
-locations_default(#20071,#10000,3,3,3,24)
-hasLocation(#20070,#20071)
+exprs(#20070,0,#20067,0,"y")
+hasLocation(#20070,#20019)
+expr_containers(#20070,#20069)
+literals("y","y",#20070)
+#20071=*
+exprs(#20071,3,#20067,1,"42")
+hasLocation(#20071,#20023)
+expr_containers(#20071,#20069)
+literals("42","42",#20071)
 #20072=*
-exprs(#20072,0,#20070,0,"constru ... tring);")
-hasLocation(#20072,#20071)
-enclosing_stmt(#20072,#20062)
-expr_containers(#20072,#20001)
-literals("constructor","constructor",#20072)
-exprs(#20067,9,#20070,1,"constru ... tring);")
-hasLocation(#20067,#20071)
-enclosing_stmt(#20067,#20062)
-expr_containers(#20067,#20001)
-#20073=*
-scopes(#20073,1)
-scopenodes(#20067,#20073)
-scopenesting(#20073,#20064)
-#20074=@"var;{x};{#20073}"
-variables(#20074,"x",#20073)
+properties(#20072,#20063,3,0,"constru ... tring);")
+#20073=@"loc,{#10000},3,3,3,24"
+locations_default(#20073,#10000,3,3,3,24)
+hasLocation(#20072,#20073)
+#20074=*
+exprs(#20074,0,#20072,0,"constru ... tring);")
+hasLocation(#20074,#20073)
+enclosing_stmt(#20074,#20063)
+expr_containers(#20074,#20001)
+literals("constructor","constructor",#20074)
+exprs(#20069,9,#20072,1,"constru ... tring);")
+hasLocation(#20069,#20073)
+enclosing_stmt(#20069,#20063)
+expr_containers(#20069,#20001)
 #20075=*
-exprs(#20075,78,#20067,0,"x")
-hasLocation(#20075,#20031)
-expr_containers(#20075,#20067)
-literals("x","x",#20075)
-decl(#20075,#20074)
-#20076=@"var;{arguments};{#20073}"
-variables(#20076,"arguments",#20073)
-is_arguments_object(#20076)
-#20077=*
-typeexprs(#20077,2,#20067,-6,"string")
-hasLocation(#20077,#20035)
-expr_containers(#20077,#20067)
-literals("string","string",#20077)
-is_method(#20070)
+scopes(#20075,1)
+scopenodes(#20069,#20075)
+scopenesting(#20075,#20065)
+#20076=@"var;{this};{#20075}"
+variables(#20076,"this",#20075)
+#20077=@"var;{x};{#20075}"
+variables(#20077,"x",#20075)
 #20078=*
-properties(#20078,#20062,4,0,"constru ... any) {}")
-#20079=@"loc,{#10000},4,3,4,23"
-locations_default(#20079,#10000,4,3,4,23)
-hasLocation(#20078,#20079)
+exprs(#20078,78,#20069,0,"x")
+hasLocation(#20078,#20031)
+expr_containers(#20078,#20069)
+literals("x","x",#20078)
+decl(#20078,#20077)
+#20079=@"var;{arguments};{#20075}"
+variables(#20079,"arguments",#20075)
+is_arguments_object(#20079)
 #20080=*
-exprs(#20080,0,#20078,0,"constru ... any) {}")
-hasLocation(#20080,#20079)
-enclosing_stmt(#20080,#20062)
-expr_containers(#20080,#20001)
-literals("constructor","constructor",#20080)
+typeexprs(#20080,2,#20069,-6,"string")
+hasLocation(#20080,#20035)
+expr_containers(#20080,#20069)
+literals("string","string",#20080)
+is_method(#20072)
 #20081=*
-exprs(#20081,9,#20078,1,"constru ... any) {}")
-hasLocation(#20081,#20079)
-enclosing_stmt(#20081,#20062)
-expr_containers(#20081,#20001)
-#20082=*
-scopes(#20082,1)
-scopenodes(#20081,#20082)
-scopenesting(#20082,#20064)
-#20083=@"var;{x};{#20082}"
-variables(#20083,"x",#20082)
+properties(#20081,#20063,4,0,"constru ... any) {}")
+#20082=@"loc,{#10000},4,3,4,23"
+locations_default(#20082,#10000,4,3,4,23)
+hasLocation(#20081,#20082)
+#20083=*
+exprs(#20083,0,#20081,0,"constru ... any) {}")
+hasLocation(#20083,#20082)
+enclosing_stmt(#20083,#20063)
+expr_containers(#20083,#20001)
+literals("constructor","constructor",#20083)
 #20084=*
-exprs(#20084,78,#20081,0,"x")
-hasLocation(#20084,#20045)
-expr_containers(#20084,#20081)
-literals("x","x",#20084)
-decl(#20084,#20083)
-#20085=@"var;{arguments};{#20082}"
-variables(#20085,"arguments",#20082)
-is_arguments_object(#20085)
-#20086=*
-typeexprs(#20086,2,#20081,-6,"any")
-hasLocation(#20086,#20049)
-expr_containers(#20086,#20081)
-literals("any","any",#20086)
-#20087=*
-stmts(#20087,1,#20081,-2,"{}")
-#20088=@"loc,{#10000},4,22,4,23"
-locations_default(#20088,#10000,4,22,4,23)
-hasLocation(#20087,#20088)
-stmt_containers(#20087,#20081)
-is_method(#20078)
-#20089=*
-entry_cfg_node(#20089,#20001)
-#20090=@"loc,{#10000},1,1,1,0"
-locations_default(#20090,#10000,1,1,1,0)
-hasLocation(#20089,#20090)
+exprs(#20084,9,#20081,1,"constru ... any) {}")
+hasLocation(#20084,#20082)
+enclosing_stmt(#20084,#20063)
+expr_containers(#20084,#20001)
+#20085=*
+scopes(#20085,1)
+scopenodes(#20084,#20085)
+scopenesting(#20085,#20065)
+#20086=@"var;{this};{#20085}"
+variables(#20086,"this",#20085)
+#20087=@"var;{x};{#20085}"
+variables(#20087,"x",#20085)
+#20088=*
+exprs(#20088,78,#20084,0,"x")
+hasLocation(#20088,#20045)
+expr_containers(#20088,#20084)
+literals("x","x",#20088)
+decl(#20088,#20087)
+#20089=@"var;{arguments};{#20085}"
+variables(#20089,"arguments",#20085)
+is_arguments_object(#20089)
+#20090=*
+typeexprs(#20090,2,#20084,-6,"any")
+hasLocation(#20090,#20049)
+expr_containers(#20090,#20084)
+literals("any","any",#20090)
 #20091=*
-exit_cfg_node(#20091,#20001)
-hasLocation(#20091,#20058)
-successor(#20069,#20065)
-successor(#20068,#20069)
-successor(#20081,#20078)
-#20092=*
-entry_cfg_node(#20092,#20081)
-#20093=@"loc,{#10000},4,3,4,2"
-locations_default(#20093,#10000,4,3,4,2)
-hasLocation(#20092,#20093)
-successor(#20065,#20087)
-#20094=*
-exit_cfg_node(#20094,#20081)
-#20095=@"loc,{#10000},4,24,4,23"
-locations_default(#20095,#10000,4,24,4,23)
-hasLocation(#20094,#20095)
-successor(#20087,#20094)
-successor(#20084,#20068)
-successor(#20092,#20084)
-successor(#20080,#20081)
-successor(#20078,#20062)
-successor(#20070,#20080)
-successor(#20063,#20070)
-successor(#20062,#20091)
-successor(#20089,#20063)
+stmts(#20091,1,#20084,-2,"{}")
+#20092=@"loc,{#10000},4,22,4,23"
+locations_default(#20092,#10000,4,22,4,23)
+hasLocation(#20091,#20092)
+stmt_containers(#20091,#20084)
+is_method(#20081)
+#20093=*
+entry_cfg_node(#20093,#20001)
+#20094=@"loc,{#10000},1,1,1,0"
+locations_default(#20094,#10000,1,1,1,0)
+hasLocation(#20093,#20094)
+#20095=*
+exit_cfg_node(#20095,#20001)
+hasLocation(#20095,#20058)
+successor(#20071,#20067)
+successor(#20070,#20071)
+successor(#20084,#20081)
+#20096=*
+entry_cfg_node(#20096,#20084)
+#20097=@"loc,{#10000},4,3,4,2"
+locations_default(#20097,#10000,4,3,4,2)
+hasLocation(#20096,#20097)
+successor(#20067,#20091)
+#20098=*
+exit_cfg_node(#20098,#20084)
+#20099=@"loc,{#10000},4,24,4,23"
+locations_default(#20099,#10000,4,24,4,23)
+hasLocation(#20098,#20099)
+successor(#20091,#20098)
+successor(#20088,#20070)
+successor(#20096,#20088)
+successor(#20083,#20084)
+successor(#20081,#20063)
+successor(#20072,#20083)
+successor(#20064,#20072)
+successor(#20063,#20095)
+successor(#20093,#20064)
 numlines(#10000,5,5,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/declareClass.ts.trap b/javascript/extractor/tests/ts/output/trap/declareClass.ts.trap
index 83ada22ef89..043ef7e5433 100644
--- a/javascript/extractor/tests/ts/output/trap/declareClass.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/declareClass.ts.trap
@@ -54,60 +54,66 @@ hasLocation(#20001,#20016)
 variables(#20017,"C",#20000)
 #20018=@"local_type_name;{C};{#20000}"
 local_type_names(#20018,"C",#20000)
-#20019=*
-stmts(#20019,26,#20001,0,"declare class C {}")
-hasLocation(#20019,#20003)
-stmt_containers(#20019,#20001)
-has_declare_keyword(#20019)
+#20019=@"var;{this};{#20000}"
+variables(#20019,"this",#20000)
 #20020=*
-exprs(#20020,78,#20019,0,"C")
-hasLocation(#20020,#20009)
-enclosing_stmt(#20020,#20019)
-expr_containers(#20020,#20001)
-literals("C","C",#20020)
-decl(#20020,#20017)
-typedecl(#20020,#20018)
+stmts(#20020,26,#20001,0,"declare class C {}")
+hasLocation(#20020,#20003)
+stmt_containers(#20020,#20001)
+has_declare_keyword(#20020)
 #20021=*
-scopes(#20021,10)
-scopenodes(#20019,#20021)
-scopenesting(#20021,#20000)
+exprs(#20021,78,#20020,0,"C")
+hasLocation(#20021,#20009)
+enclosing_stmt(#20021,#20020)
+expr_containers(#20021,#20001)
+literals("C","C",#20021)
+decl(#20021,#20017)
+typedecl(#20021,#20018)
 #20022=*
-properties(#20022,#20019,2,0,"constructor() {}")
-#20023=@"loc,{#10000},1,17,1,16"
-locations_default(#20023,#10000,1,17,1,16)
-hasLocation(#20022,#20023)
+scopes(#20022,10)
+scopenodes(#20020,#20022)
+scopenesting(#20022,#20000)
+#20023=@"var;{this};{#20022}"
+variables(#20023,"this",#20022)
 #20024=*
-exprs(#20024,0,#20022,0,"constructor")
-hasLocation(#20024,#20023)
-enclosing_stmt(#20024,#20019)
-expr_containers(#20024,#20001)
-literals("constructor","constructor",#20024)
-#20025=*
-exprs(#20025,9,#20022,1,"() {}")
-hasLocation(#20025,#20023)
-enclosing_stmt(#20025,#20019)
-expr_containers(#20025,#20001)
+properties(#20024,#20020,2,0,"constructor() {}")
+#20025=@"loc,{#10000},1,17,1,16"
+locations_default(#20025,#10000,1,17,1,16)
+hasLocation(#20024,#20025)
 #20026=*
-scopes(#20026,1)
-scopenodes(#20025,#20026)
-scopenesting(#20026,#20021)
-#20027=@"var;{arguments};{#20026}"
-variables(#20027,"arguments",#20026)
-is_arguments_object(#20027)
+exprs(#20026,0,#20024,0,"constructor")
+hasLocation(#20026,#20025)
+enclosing_stmt(#20026,#20020)
+expr_containers(#20026,#20001)
+literals("constructor","constructor",#20026)
+#20027=*
+exprs(#20027,9,#20024,1,"() {}")
+hasLocation(#20027,#20025)
+enclosing_stmt(#20027,#20020)
+expr_containers(#20027,#20001)
 #20028=*
-stmts(#20028,1,#20025,-2,"{}")
-hasLocation(#20028,#20023)
-stmt_containers(#20028,#20025)
-is_method(#20022)
-#20029=*
-entry_cfg_node(#20029,#20001)
-#20030=@"loc,{#10000},1,1,1,0"
-locations_default(#20030,#10000,1,1,1,0)
-hasLocation(#20029,#20030)
+scopes(#20028,1)
+scopenodes(#20027,#20028)
+scopenesting(#20028,#20022)
+#20029=@"var;{this};{#20028}"
+variables(#20029,"this",#20028)
+#20030=@"var;{arguments};{#20028}"
+variables(#20030,"arguments",#20028)
+is_arguments_object(#20030)
 #20031=*
-exit_cfg_node(#20031,#20001)
-hasLocation(#20031,#20015)
-successor(#20019,#20031)
-successor(#20029,#20019)
+stmts(#20031,1,#20027,-2,"{}")
+hasLocation(#20031,#20025)
+stmt_containers(#20031,#20027)
+is_method(#20024)
+#20032=*
+entry_cfg_node(#20032,#20001)
+#20033=@"loc,{#10000},1,1,1,0"
+locations_default(#20033,#10000,1,1,1,0)
+hasLocation(#20032,#20033)
+#20034=*
+exit_cfg_node(#20034,#20001)
+hasLocation(#20034,#20015)
+successor(#20020,#20034)
+successor(#20032,#20020)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/decorators.ts.trap b/javascript/extractor/tests/ts/output/trap/decorators.ts.trap
index 4a29c482a69..9932a6ee4a1 100644
--- a/javascript/extractor/tests/ts/output/trap/decorators.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/decorators.ts.trap
@@ -321,340 +321,355 @@ variables(#20115,"Class2",#20112)
 local_type_names(#20116,"Class",#20112)
 #20117=@"local_type_name;{Class2};{#20112}"
 local_type_names(#20117,"Class2",#20112)
-#20118=*
-stmts(#20118,26,#20001,0,"class C ... mber;\n}")
-#20119=@"loc,{#10000},2,1,8,1"
-locations_default(#20119,#10000,2,1,8,1)
-hasLocation(#20118,#20119)
-stmt_containers(#20118,#20001)
-#20120=*
-exprs(#20120,94,#20118,-2,"@classDecorator")
-hasLocation(#20120,#20003)
-enclosing_stmt(#20120,#20118)
-expr_containers(#20120,#20001)
+#20118=@"var;{this};{#20112}"
+variables(#20118,"this",#20112)
+#20119=*
+stmts(#20119,26,#20001,0,"class C ... mber;\n}")
+#20120=@"loc,{#10000},2,1,8,1"
+locations_default(#20120,#10000,2,1,8,1)
+hasLocation(#20119,#20120)
+stmt_containers(#20119,#20001)
 #20121=*
-exprs(#20121,79,#20120,0,"classDecorator")
-hasLocation(#20121,#20033)
-enclosing_stmt(#20121,#20118)
+exprs(#20121,94,#20119,-2,"@classDecorator")
+hasLocation(#20121,#20003)
+enclosing_stmt(#20121,#20119)
 expr_containers(#20121,#20001)
-literals("classDecorator","classDecorator",#20121)
-#20122=@"var;{classDecorator};{#20000}"
-variables(#20122,"classDecorator",#20000)
-bind(#20121,#20122)
-#20123=*
-exprs(#20123,78,#20118,0,"Class")
-hasLocation(#20123,#20037)
-enclosing_stmt(#20123,#20118)
-expr_containers(#20123,#20001)
-literals("Class","Class",#20123)
-decl(#20123,#20113)
-typedecl(#20123,#20116)
+#20122=*
+exprs(#20122,79,#20121,0,"classDecorator")
+hasLocation(#20122,#20033)
+enclosing_stmt(#20122,#20119)
+expr_containers(#20122,#20001)
+literals("classDecorator","classDecorator",#20122)
+#20123=@"var;{classDecorator};{#20000}"
+variables(#20123,"classDecorator",#20000)
+bind(#20122,#20123)
 #20124=*
-scopes(#20124,10)
-scopenodes(#20118,#20124)
-scopenesting(#20124,#20112)
+exprs(#20124,78,#20119,0,"Class")
+hasLocation(#20124,#20037)
+enclosing_stmt(#20124,#20119)
+expr_containers(#20124,#20001)
+literals("Class","Class",#20124)
+decl(#20124,#20113)
+typedecl(#20124,#20116)
 #20125=*
-properties(#20125,#20118,2,0,"method( ... field }")
-#20126=@"loc,{#10000},4,3,4,40"
-locations_default(#20126,#10000,4,3,4,40)
-hasLocation(#20125,#20126)
+scopes(#20125,10)
+scopenodes(#20119,#20125)
+scopenesting(#20125,#20112)
+#20126=@"var;{this};{#20125}"
+variables(#20126,"this",#20125)
 #20127=*
-exprs(#20127,94,#20125,-1,"@methodDecorator")
-#20128=@"loc,{#10000},3,3,3,18"
-locations_default(#20128,#10000,3,3,3,18)
+properties(#20127,#20119,2,0,"method( ... field }")
+#20128=@"loc,{#10000},4,3,4,40"
+locations_default(#20128,#10000,4,3,4,40)
 hasLocation(#20127,#20128)
-enclosing_stmt(#20127,#20118)
-expr_containers(#20127,#20001)
 #20129=*
-exprs(#20129,79,#20127,0,"methodDecorator")
-hasLocation(#20129,#20043)
-enclosing_stmt(#20129,#20118)
+exprs(#20129,94,#20127,-1,"@methodDecorator")
+#20130=@"loc,{#10000},3,3,3,18"
+locations_default(#20130,#10000,3,3,3,18)
+hasLocation(#20129,#20130)
+enclosing_stmt(#20129,#20119)
 expr_containers(#20129,#20001)
-literals("methodDecorator","methodDecorator",#20129)
-#20130=@"var;{methodDecorator};{#20000}"
-variables(#20130,"methodDecorator",#20000)
-bind(#20129,#20130)
 #20131=*
-exprs(#20131,0,#20125,0,"method")
-hasLocation(#20131,#20045)
-enclosing_stmt(#20131,#20118)
+exprs(#20131,79,#20129,0,"methodDecorator")
+hasLocation(#20131,#20043)
+enclosing_stmt(#20131,#20119)
 expr_containers(#20131,#20001)
-literals("method","method",#20131)
-#20132=*
-exprs(#20132,9,#20125,1,"method( ... field }")
-hasLocation(#20132,#20126)
-enclosing_stmt(#20132,#20118)
-expr_containers(#20132,#20001)
+literals("methodDecorator","methodDecorator",#20131)
+#20132=@"var;{methodDecorator};{#20000}"
+variables(#20132,"methodDecorator",#20000)
+bind(#20131,#20132)
 #20133=*
-scopes(#20133,1)
-scopenodes(#20132,#20133)
-scopenesting(#20133,#20124)
-#20134=@"var;{arguments};{#20133}"
-variables(#20134,"arguments",#20133)
-is_arguments_object(#20134)
+exprs(#20133,0,#20127,0,"method")
+hasLocation(#20133,#20045)
+enclosing_stmt(#20133,#20119)
+expr_containers(#20133,#20001)
+literals("method","method",#20133)
+#20134=*
+exprs(#20134,9,#20127,1,"method( ... field }")
+hasLocation(#20134,#20128)
+enclosing_stmt(#20134,#20119)
+expr_containers(#20134,#20001)
 #20135=*
-typeexprs(#20135,2,#20132,-3,"number")
-hasLocation(#20135,#20053)
-expr_containers(#20135,#20132)
-literals("number","number",#20135)
-#20136=*
-stmts(#20136,1,#20132,-2,"{ retur ... field }")
-#20137=@"loc,{#10000},4,20,4,40"
-locations_default(#20137,#10000,4,20,4,40)
-hasLocation(#20136,#20137)
-stmt_containers(#20136,#20132)
+scopes(#20135,1)
+scopenodes(#20134,#20135)
+scopenesting(#20135,#20125)
+#20136=@"var;{this};{#20135}"
+variables(#20136,"this",#20135)
+#20137=@"var;{arguments};{#20135}"
+variables(#20137,"arguments",#20135)
+is_arguments_object(#20137)
 #20138=*
-stmts(#20138,9,#20136,0,"return this.field")
-#20139=@"loc,{#10000},4,22,4,38"
-locations_default(#20139,#10000,4,22,4,38)
-hasLocation(#20138,#20139)
-stmt_containers(#20138,#20132)
-#20140=*
-exprs(#20140,14,#20138,0,"this.field")
-#20141=@"loc,{#10000},4,29,4,38"
-locations_default(#20141,#10000,4,29,4,38)
-hasLocation(#20140,#20141)
-enclosing_stmt(#20140,#20138)
-expr_containers(#20140,#20132)
-#20142=*
-exprs(#20142,6,#20140,0,"this")
-hasLocation(#20142,#20059)
-enclosing_stmt(#20142,#20138)
-expr_containers(#20142,#20132)
+typeexprs(#20138,2,#20134,-3,"number")
+hasLocation(#20138,#20053)
+expr_containers(#20138,#20134)
+literals("number","number",#20138)
+#20139=*
+stmts(#20139,1,#20134,-2,"{ retur ... field }")
+#20140=@"loc,{#10000},4,20,4,40"
+locations_default(#20140,#10000,4,20,4,40)
+hasLocation(#20139,#20140)
+stmt_containers(#20139,#20134)
+#20141=*
+stmts(#20141,9,#20139,0,"return this.field")
+#20142=@"loc,{#10000},4,22,4,38"
+locations_default(#20142,#10000,4,22,4,38)
+hasLocation(#20141,#20142)
+stmt_containers(#20141,#20134)
 #20143=*
-exprs(#20143,0,#20140,1,"field")
-hasLocation(#20143,#20063)
-enclosing_stmt(#20143,#20138)
-expr_containers(#20143,#20132)
-literals("field","field",#20143)
-is_method(#20125)
-#20144=*
-properties(#20144,#20118,3,8,"field: number;")
-#20145=@"loc,{#10000},7,3,7,16"
-locations_default(#20145,#10000,7,3,7,16)
-hasLocation(#20144,#20145)
+exprs(#20143,14,#20141,0,"this.field")
+#20144=@"loc,{#10000},4,29,4,38"
+locations_default(#20144,#10000,4,29,4,38)
+hasLocation(#20143,#20144)
+enclosing_stmt(#20143,#20141)
+expr_containers(#20143,#20134)
+#20145=*
+exprs(#20145,6,#20143,0,"this")
+hasLocation(#20145,#20059)
+enclosing_stmt(#20145,#20141)
+expr_containers(#20145,#20134)
+bind(#20145,#20136)
 #20146=*
-exprs(#20146,94,#20144,-1,"@fieldDecorator")
-#20147=@"loc,{#10000},6,3,6,17"
-locations_default(#20147,#10000,6,3,6,17)
-hasLocation(#20146,#20147)
-enclosing_stmt(#20146,#20118)
-expr_containers(#20146,#20001)
-#20148=*
-exprs(#20148,79,#20146,0,"fieldDecorator")
-hasLocation(#20148,#20069)
-enclosing_stmt(#20148,#20118)
-expr_containers(#20148,#20001)
-literals("fieldDecorator","fieldDecorator",#20148)
-#20149=@"var;{fieldDecorator};{#20000}"
-variables(#20149,"fieldDecorator",#20000)
-bind(#20148,#20149)
-#20150=*
+exprs(#20146,0,#20143,1,"field")
+hasLocation(#20146,#20063)
+enclosing_stmt(#20146,#20141)
+expr_containers(#20146,#20134)
+literals("field","field",#20146)
+is_method(#20127)
+#20147=*
+properties(#20147,#20119,3,8,"field: number;")
+#20148=@"loc,{#10000},7,3,7,16"
+locations_default(#20148,#10000,7,3,7,16)
+hasLocation(#20147,#20148)
+#20149=*
+exprs(#20149,94,#20147,-1,"@fieldDecorator")
+#20150=@"loc,{#10000},6,3,6,17"
+locations_default(#20150,#10000,6,3,6,17)
+hasLocation(#20149,#20150)
+enclosing_stmt(#20149,#20119)
+expr_containers(#20149,#20001)
 #20151=*
-exprs(#20151,0,#20144,0,"field")
-hasLocation(#20151,#20071)
-expr_containers(#20151,#20150)
-literals("field","field",#20151)
-#20152=*
-typeexprs(#20152,2,#20144,2,"number")
-hasLocation(#20152,#20075)
-enclosing_stmt(#20152,#20118)
-expr_containers(#20152,#20001)
-literals("number","number",#20152)
+exprs(#20151,79,#20149,0,"fieldDecorator")
+hasLocation(#20151,#20069)
+enclosing_stmt(#20151,#20119)
+expr_containers(#20151,#20001)
+literals("fieldDecorator","fieldDecorator",#20151)
+#20152=@"var;{fieldDecorator};{#20000}"
+variables(#20152,"fieldDecorator",#20000)
+bind(#20151,#20152)
 #20153=*
-properties(#20153,#20118,4,0,"constructor() {}")
-#20154=@"loc,{#10000},2,13,2,12"
-locations_default(#20154,#10000,2,13,2,12)
-hasLocation(#20153,#20154)
+#20154=*
+exprs(#20154,0,#20147,0,"field")
+hasLocation(#20154,#20071)
+expr_containers(#20154,#20153)
+literals("field","field",#20154)
 #20155=*
-exprs(#20155,0,#20153,0,"constructor")
-hasLocation(#20155,#20154)
-enclosing_stmt(#20155,#20118)
+typeexprs(#20155,2,#20147,2,"number")
+hasLocation(#20155,#20075)
+enclosing_stmt(#20155,#20119)
 expr_containers(#20155,#20001)
-literals("constructor","constructor",#20155)
-exprs(#20150,9,#20153,1,"() {}")
-hasLocation(#20150,#20154)
-enclosing_stmt(#20150,#20118)
-expr_containers(#20150,#20001)
+literals("number","number",#20155)
 #20156=*
-scopes(#20156,1)
-scopenodes(#20150,#20156)
-scopenesting(#20156,#20124)
-#20157=@"var;{arguments};{#20156}"
-variables(#20157,"arguments",#20156)
-is_arguments_object(#20157)
+properties(#20156,#20119,4,0,"constructor() {}")
+#20157=@"loc,{#10000},2,13,2,12"
+locations_default(#20157,#10000,2,13,2,12)
+hasLocation(#20156,#20157)
 #20158=*
-stmts(#20158,1,#20150,-2,"{}")
-hasLocation(#20158,#20154)
-stmt_containers(#20158,#20150)
-is_method(#20153)
+exprs(#20158,0,#20156,0,"constructor")
+hasLocation(#20158,#20157)
+enclosing_stmt(#20158,#20119)
+expr_containers(#20158,#20001)
+literals("constructor","constructor",#20158)
+exprs(#20153,9,#20156,1,"() {}")
+hasLocation(#20153,#20157)
+enclosing_stmt(#20153,#20119)
+expr_containers(#20153,#20001)
 #20159=*
-stmts(#20159,17,#20001,1,"@functi ... un() {}")
-#20160=@"loc,{#10000},10,1,11,17"
-locations_default(#20160,#10000,10,1,11,17)
-hasLocation(#20159,#20160)
-stmt_containers(#20159,#20001)
-#20161=*
-exprs(#20161,78,#20159,-1,"fun")
-hasLocation(#20161,#20086)
-expr_containers(#20161,#20159)
-literals("fun","fun",#20161)
-decl(#20161,#20114)
+scopes(#20159,1)
+scopenodes(#20153,#20159)
+scopenesting(#20159,#20125)
+#20160=@"var;{this};{#20159}"
+variables(#20160,"this",#20159)
+#20161=@"var;{arguments};{#20159}"
+variables(#20161,"arguments",#20159)
+is_arguments_object(#20161)
 #20162=*
-scopes(#20162,1)
-scopenodes(#20159,#20162)
-scopenesting(#20162,#20112)
-#20163=@"var;{arguments};{#20162}"
-variables(#20163,"arguments",#20162)
-is_arguments_object(#20163)
-#20164=*
-stmts(#20164,1,#20159,-2,"{}")
-#20165=@"loc,{#10000},11,16,11,17"
-locations_default(#20165,#10000,11,16,11,17)
-hasLocation(#20164,#20165)
-stmt_containers(#20164,#20159)
+stmts(#20162,1,#20153,-2,"{}")
+hasLocation(#20162,#20157)
+stmt_containers(#20162,#20153)
+is_method(#20156)
+#20163=*
+stmts(#20163,17,#20001,1,"@functi ... un() {}")
+#20164=@"loc,{#10000},10,1,11,17"
+locations_default(#20164,#10000,10,1,11,17)
+hasLocation(#20163,#20164)
+stmt_containers(#20163,#20001)
+#20165=*
+exprs(#20165,78,#20163,-1,"fun")
+hasLocation(#20165,#20086)
+expr_containers(#20165,#20163)
+literals("fun","fun",#20165)
+decl(#20165,#20114)
 #20166=*
-stmts(#20166,30,#20001,2,"export  ... ass2 {}")
-hasLocation(#20166,#20029)
-stmt_containers(#20166,#20001)
-#20167=*
-stmts(#20167,26,#20166,-1,"class Class2 {}")
-#20168=@"loc,{#10000},14,8,14,22"
-locations_default(#20168,#10000,14,8,14,22)
-hasLocation(#20167,#20168)
-stmt_containers(#20167,#20001)
+scopes(#20166,1)
+scopenodes(#20163,#20166)
+scopenesting(#20166,#20112)
+#20167=@"var;{this};{#20166}"
+variables(#20167,"this",#20166)
+#20168=@"var;{arguments};{#20166}"
+variables(#20168,"arguments",#20166)
+is_arguments_object(#20168)
 #20169=*
-exprs(#20169,94,#20167,-2,"@classDecorator2")
-hasLocation(#20169,#20027)
-enclosing_stmt(#20169,#20167)
-expr_containers(#20169,#20001)
-#20170=*
-exprs(#20170,79,#20169,0,"classDecorator2")
-hasLocation(#20170,#20098)
-enclosing_stmt(#20170,#20167)
-expr_containers(#20170,#20001)
-literals("classDecorator2","classDecorator2",#20170)
-#20171=@"var;{classDecorator2};{#20000}"
-variables(#20171,"classDecorator2",#20000)
-bind(#20170,#20171)
+stmts(#20169,1,#20163,-2,"{}")
+#20170=@"loc,{#10000},11,16,11,17"
+locations_default(#20170,#10000,11,16,11,17)
+hasLocation(#20169,#20170)
+stmt_containers(#20169,#20163)
+#20171=*
+stmts(#20171,30,#20001,2,"export  ... ass2 {}")
+hasLocation(#20171,#20029)
+stmt_containers(#20171,#20001)
 #20172=*
-exprs(#20172,78,#20167,0,"Class2")
-hasLocation(#20172,#20104)
-enclosing_stmt(#20172,#20167)
-expr_containers(#20172,#20001)
-literals("Class2","Class2",#20172)
-decl(#20172,#20115)
-typedecl(#20172,#20117)
-#20173=*
-scopes(#20173,10)
-scopenodes(#20167,#20173)
-scopenesting(#20173,#20112)
+stmts(#20172,26,#20171,-1,"class Class2 {}")
+#20173=@"loc,{#10000},14,8,14,22"
+locations_default(#20173,#10000,14,8,14,22)
+hasLocation(#20172,#20173)
+stmt_containers(#20172,#20001)
 #20174=*
-properties(#20174,#20167,2,0,"constructor() {}")
-#20175=@"loc,{#10000},14,21,14,20"
-locations_default(#20175,#10000,14,21,14,20)
-hasLocation(#20174,#20175)
-#20176=*
-exprs(#20176,0,#20174,0,"constructor")
-hasLocation(#20176,#20175)
-enclosing_stmt(#20176,#20167)
-expr_containers(#20176,#20001)
-literals("constructor","constructor",#20176)
+exprs(#20174,94,#20172,-2,"@classDecorator2")
+hasLocation(#20174,#20027)
+enclosing_stmt(#20174,#20172)
+expr_containers(#20174,#20001)
+#20175=*
+exprs(#20175,79,#20174,0,"classDecorator2")
+hasLocation(#20175,#20098)
+enclosing_stmt(#20175,#20172)
+expr_containers(#20175,#20001)
+literals("classDecorator2","classDecorator2",#20175)
+#20176=@"var;{classDecorator2};{#20000}"
+variables(#20176,"classDecorator2",#20000)
+bind(#20175,#20176)
 #20177=*
-exprs(#20177,9,#20174,1,"() {}")
-hasLocation(#20177,#20175)
-enclosing_stmt(#20177,#20167)
+exprs(#20177,78,#20172,0,"Class2")
+hasLocation(#20177,#20104)
+enclosing_stmt(#20177,#20172)
 expr_containers(#20177,#20001)
+literals("Class2","Class2",#20177)
+decl(#20177,#20115)
+typedecl(#20177,#20117)
 #20178=*
-scopes(#20178,1)
-scopenodes(#20177,#20178)
-scopenesting(#20178,#20173)
-#20179=@"var;{arguments};{#20178}"
-variables(#20179,"arguments",#20178)
-is_arguments_object(#20179)
+scopes(#20178,10)
+scopenodes(#20172,#20178)
+scopenesting(#20178,#20112)
+#20179=@"var;{this};{#20178}"
+variables(#20179,"this",#20178)
 #20180=*
-stmts(#20180,1,#20177,-2,"{}")
-hasLocation(#20180,#20175)
-stmt_containers(#20180,#20177)
-is_method(#20174)
-#20181=*
-entry_cfg_node(#20181,#20001)
-#20182=@"loc,{#10000},1,1,1,0"
-locations_default(#20182,#10000,1,1,1,0)
-hasLocation(#20181,#20182)
+properties(#20180,#20172,2,0,"constructor() {}")
+#20181=@"loc,{#10000},14,21,14,20"
+locations_default(#20181,#10000,14,21,14,20)
+hasLocation(#20180,#20181)
+#20182=*
+exprs(#20182,0,#20180,0,"constructor")
+hasLocation(#20182,#20181)
+enclosing_stmt(#20182,#20172)
+expr_containers(#20182,#20001)
+literals("constructor","constructor",#20182)
 #20183=*
-exit_cfg_node(#20183,#20001)
-hasLocation(#20183,#20110)
-successor(#20166,#20172)
-successor(#20177,#20174)
+exprs(#20183,9,#20180,1,"() {}")
+hasLocation(#20183,#20181)
+enclosing_stmt(#20183,#20172)
+expr_containers(#20183,#20001)
 #20184=*
-entry_cfg_node(#20184,#20177)
-hasLocation(#20184,#20175)
-#20185=*
-exit_cfg_node(#20185,#20177)
-hasLocation(#20185,#20175)
-successor(#20180,#20185)
-successor(#20184,#20180)
-successor(#20176,#20177)
-successor(#20174,#20167)
-successor(#20172,#20176)
-successor(#20170,#20169)
-successor(#20169,#20183)
-successor(#20167,#20170)
-successor(#20159,#20166)
-#20186=*
-entry_cfg_node(#20186,#20159)
-#20187=@"loc,{#10000},10,1,10,0"
-locations_default(#20187,#10000,10,1,10,0)
-hasLocation(#20186,#20187)
+scopes(#20184,1)
+scopenodes(#20183,#20184)
+scopenesting(#20184,#20178)
+#20185=@"var;{this};{#20184}"
+variables(#20185,"this",#20184)
+#20186=@"var;{arguments};{#20184}"
+variables(#20186,"arguments",#20184)
+is_arguments_object(#20186)
+#20187=*
+stmts(#20187,1,#20183,-2,"{}")
+hasLocation(#20187,#20181)
+stmt_containers(#20187,#20183)
+is_method(#20180)
 #20188=*
-exit_cfg_node(#20188,#20159)
-#20189=@"loc,{#10000},11,18,11,17"
-locations_default(#20189,#10000,11,18,11,17)
+entry_cfg_node(#20188,#20001)
+#20189=@"loc,{#10000},1,1,1,0"
+locations_default(#20189,#10000,1,1,1,0)
 hasLocation(#20188,#20189)
-successor(#20164,#20188)
-successor(#20186,#20164)
-successor(#20151,#20144)
-successor(#20150,#20153)
 #20190=*
-entry_cfg_node(#20190,#20150)
-hasLocation(#20190,#20154)
-successor(#20144,#20158)
+exit_cfg_node(#20190,#20001)
+hasLocation(#20190,#20110)
+successor(#20171,#20177)
+successor(#20183,#20180)
 #20191=*
-exit_cfg_node(#20191,#20150)
-hasLocation(#20191,#20154)
-successor(#20158,#20191)
-successor(#20190,#20151)
-successor(#20155,#20150)
-successor(#20153,#20118)
-successor(#20132,#20125)
+entry_cfg_node(#20191,#20183)
+hasLocation(#20191,#20181)
 #20192=*
-entry_cfg_node(#20192,#20132)
-#20193=@"loc,{#10000},4,3,4,2"
-locations_default(#20193,#10000,4,3,4,2)
-hasLocation(#20192,#20193)
-#20194=*
-exit_cfg_node(#20194,#20132)
-#20195=@"loc,{#10000},4,41,4,40"
-locations_default(#20195,#10000,4,41,4,40)
-hasLocation(#20194,#20195)
-successor(#20143,#20140)
-successor(#20142,#20143)
-successor(#20140,#20138)
-successor(#20138,#20194)
-successor(#20136,#20142)
-successor(#20192,#20136)
-successor(#20131,#20132)
-successor(#20125,#20155)
-successor(#20123,#20131)
-successor(#20121,#20120)
-successor(#20120,#20159)
-successor(#20148,#20146)
-successor(#20146,#20121)
-successor(#20129,#20127)
-successor(#20127,#20148)
-successor(#20118,#20129)
-successor(#20161,#20123)
-successor(#20181,#20161)
+exit_cfg_node(#20192,#20183)
+hasLocation(#20192,#20181)
+successor(#20187,#20192)
+successor(#20191,#20187)
+successor(#20182,#20183)
+successor(#20180,#20172)
+successor(#20177,#20182)
+successor(#20175,#20174)
+successor(#20174,#20190)
+successor(#20172,#20175)
+successor(#20163,#20171)
+#20193=*
+entry_cfg_node(#20193,#20163)
+#20194=@"loc,{#10000},10,1,10,0"
+locations_default(#20194,#10000,10,1,10,0)
+hasLocation(#20193,#20194)
+#20195=*
+exit_cfg_node(#20195,#20163)
+#20196=@"loc,{#10000},11,18,11,17"
+locations_default(#20196,#10000,11,18,11,17)
+hasLocation(#20195,#20196)
+successor(#20169,#20195)
+successor(#20193,#20169)
+successor(#20154,#20147)
+successor(#20153,#20156)
+#20197=*
+entry_cfg_node(#20197,#20153)
+hasLocation(#20197,#20157)
+successor(#20147,#20162)
+#20198=*
+exit_cfg_node(#20198,#20153)
+hasLocation(#20198,#20157)
+successor(#20162,#20198)
+successor(#20197,#20154)
+successor(#20158,#20153)
+successor(#20156,#20119)
+successor(#20134,#20127)
+#20199=*
+entry_cfg_node(#20199,#20134)
+#20200=@"loc,{#10000},4,3,4,2"
+locations_default(#20200,#10000,4,3,4,2)
+hasLocation(#20199,#20200)
+#20201=*
+exit_cfg_node(#20201,#20134)
+#20202=@"loc,{#10000},4,41,4,40"
+locations_default(#20202,#10000,4,41,4,40)
+hasLocation(#20201,#20202)
+successor(#20146,#20143)
+successor(#20145,#20146)
+successor(#20143,#20141)
+successor(#20141,#20201)
+successor(#20139,#20145)
+successor(#20199,#20139)
+successor(#20133,#20134)
+successor(#20127,#20158)
+successor(#20124,#20133)
+successor(#20122,#20121)
+successor(#20121,#20163)
+successor(#20151,#20149)
+successor(#20149,#20122)
+successor(#20131,#20129)
+successor(#20129,#20151)
+successor(#20119,#20131)
+successor(#20165,#20124)
+successor(#20188,#20165)
 numlines(#10000,14,11,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/dynamic-type.ts.trap b/javascript/extractor/tests/ts/output/trap/dynamic-type.ts.trap
index 71410d093cc..50a8d2155db 100644
--- a/javascript/extractor/tests/ts/output/trap/dynamic-type.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/dynamic-type.ts.trap
@@ -82,58 +82,60 @@ locations_default(#20028,#10000,1,1,2,0)
 hasLocation(#20001,#20028)
 #20029=@"local_type_name;{Foo};{#20000}"
 local_type_names(#20029,"Foo",#20000)
-#20030=*
-stmts(#20030,34,#20001,0,"interfa ... .Bar {}")
-hasLocation(#20030,#20003)
-stmt_containers(#20030,#20001)
+#20030=@"var;{this};{#20000}"
+variables(#20030,"this",#20000)
 #20031=*
-typeexprs(#20031,13,#20030,-1,"import(""foo"").Bar")
-#20032=@"loc,{#10000},1,23,1,39"
-locations_default(#20032,#10000,1,23,1,39)
-hasLocation(#20031,#20032)
-enclosing_stmt(#20031,#20030)
-expr_containers(#20031,#20001)
-#20033=*
-typeexprs(#20033,31,#20031,0,"import(""foo"")")
-#20034=@"loc,{#10000},1,23,1,35"
-locations_default(#20034,#10000,1,23,1,35)
-hasLocation(#20033,#20034)
-enclosing_stmt(#20033,#20030)
-expr_containers(#20033,#20001)
-#20035=*
-exprs(#20035,4,#20033,0,"""foo""")
-hasLocation(#20035,#20015)
-enclosing_stmt(#20035,#20030)
-expr_containers(#20035,#20001)
-literals("foo","""foo""",#20035)
+stmts(#20031,34,#20001,0,"interfa ... .Bar {}")
+hasLocation(#20031,#20003)
+stmt_containers(#20031,#20001)
+#20032=*
+typeexprs(#20032,13,#20031,-1,"import(""foo"").Bar")
+#20033=@"loc,{#10000},1,23,1,39"
+locations_default(#20033,#10000,1,23,1,39)
+hasLocation(#20032,#20033)
+enclosing_stmt(#20032,#20031)
+expr_containers(#20032,#20001)
+#20034=*
+typeexprs(#20034,31,#20032,0,"import(""foo"")")
+#20035=@"loc,{#10000},1,23,1,35"
+locations_default(#20035,#10000,1,23,1,35)
+hasLocation(#20034,#20035)
+enclosing_stmt(#20034,#20031)
+expr_containers(#20034,#20001)
 #20036=*
-regexpterm(#20036,14,#20035,0,"foo")
-#20037=@"loc,{#10000},1,31,1,33"
-locations_default(#20037,#10000,1,31,1,33)
-hasLocation(#20036,#20037)
-regexp_const_value(#20036,"foo")
-#20038=*
-typeexprs(#20038,15,#20031,1,"Bar")
-hasLocation(#20038,#20021)
-enclosing_stmt(#20038,#20030)
-expr_containers(#20038,#20001)
-literals("Bar","Bar",#20038)
+exprs(#20036,4,#20034,0,"""foo""")
+hasLocation(#20036,#20015)
+enclosing_stmt(#20036,#20031)
+expr_containers(#20036,#20001)
+literals("foo","""foo""",#20036)
+#20037=*
+regexpterm(#20037,14,#20036,0,"foo")
+#20038=@"loc,{#10000},1,31,1,33"
+locations_default(#20038,#10000,1,31,1,33)
+hasLocation(#20037,#20038)
+regexp_const_value(#20037,"foo")
 #20039=*
-typeexprs(#20039,1,#20030,0,"Foo")
-hasLocation(#20039,#20007)
-enclosing_stmt(#20039,#20030)
+typeexprs(#20039,15,#20032,1,"Bar")
+hasLocation(#20039,#20021)
+enclosing_stmt(#20039,#20031)
 expr_containers(#20039,#20001)
-literals("Foo","Foo",#20039)
-typedecl(#20039,#20029)
+literals("Bar","Bar",#20039)
 #20040=*
-entry_cfg_node(#20040,#20001)
-#20041=@"loc,{#10000},1,1,1,0"
-locations_default(#20041,#10000,1,1,1,0)
-hasLocation(#20040,#20041)
-#20042=*
-exit_cfg_node(#20042,#20001)
-hasLocation(#20042,#20027)
-successor(#20030,#20042)
-successor(#20040,#20030)
+typeexprs(#20040,1,#20031,0,"Foo")
+hasLocation(#20040,#20007)
+enclosing_stmt(#20040,#20031)
+expr_containers(#20040,#20001)
+literals("Foo","Foo",#20040)
+typedecl(#20040,#20029)
+#20041=*
+entry_cfg_node(#20041,#20001)
+#20042=@"loc,{#10000},1,1,1,0"
+locations_default(#20042,#10000,1,1,1,0)
+hasLocation(#20041,#20042)
+#20043=*
+exit_cfg_node(#20043,#20001)
+hasLocation(#20043,#20027)
+successor(#20031,#20043)
+successor(#20041,#20031)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/enum.ts.trap b/javascript/extractor/tests/ts/output/trap/enum.ts.trap
index c6a36ea1cc0..2c5ee0fbd42 100644
--- a/javascript/extractor/tests/ts/output/trap/enum.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/enum.ts.trap
@@ -571,541 +571,545 @@ local_namespace_names(#20218,"DeclaredConstEnum",#20000)
 local_namespace_names(#20219,"ComplexInitializer",#20000)
 #20220=@"local_namespace_name;{StringLiteralEnumMember};{#20000}"
 local_namespace_names(#20220,"StringLiteralEnumMember",#20000)
-#20221=*
-stmts(#20221,36,#20001,0,"enum Co ...  blue }")
-hasLocation(#20221,#20003)
-stmt_containers(#20221,#20001)
+#20221=@"var;{this};{#20000}"
+variables(#20221,"this",#20000)
 #20222=*
-exprs(#20222,78,#20221,0,"Color")
-hasLocation(#20222,#20041)
-enclosing_stmt(#20222,#20221)
-expr_containers(#20222,#20001)
-literals("Color","Color",#20222)
-decl(#20222,#20203)
-typedecl(#20222,#20209)
-namespacedecl(#20222,#20215)
+stmts(#20222,36,#20001,0,"enum Co ...  blue }")
+hasLocation(#20222,#20003)
+stmt_containers(#20222,#20001)
 #20223=*
-scopes(#20223,14)
-scopenodes(#20221,#20223)
-scopenesting(#20223,#20000)
-#20224=@"var;{red};{#20223}"
-variables(#20224,"red",#20223)
-#20225=@"local_type_name;{red};{#20223}"
-local_type_names(#20225,"red",#20223)
-#20226=@"var;{green};{#20223}"
-variables(#20226,"green",#20223)
-#20227=@"local_type_name;{green};{#20223}"
-local_type_names(#20227,"green",#20223)
-#20228=@"var;{blue};{#20223}"
-variables(#20228,"blue",#20223)
-#20229=@"local_type_name;{blue};{#20223}"
-local_type_names(#20229,"blue",#20223)
-#20230=*
-properties(#20230,#20221,1,7,"red = 1")
-#20231=@"loc,{#10000},1,14,1,20"
-locations_default(#20231,#10000,1,14,1,20)
-hasLocation(#20230,#20231)
-#20232=*
-exprs(#20232,78,#20230,0,"red")
-hasLocation(#20232,#20045)
-enclosing_stmt(#20232,#20221)
-expr_containers(#20232,#20001)
-literals("red","red",#20232)
-decl(#20232,#20224)
-typedecl(#20232,#20225)
+exprs(#20223,78,#20222,0,"Color")
+hasLocation(#20223,#20041)
+enclosing_stmt(#20223,#20222)
+expr_containers(#20223,#20001)
+literals("Color","Color",#20223)
+decl(#20223,#20203)
+typedecl(#20223,#20209)
+namespacedecl(#20223,#20215)
+#20224=*
+scopes(#20224,14)
+scopenodes(#20222,#20224)
+scopenesting(#20224,#20000)
+#20225=@"var;{red};{#20224}"
+variables(#20225,"red",#20224)
+#20226=@"local_type_name;{red};{#20224}"
+local_type_names(#20226,"red",#20224)
+#20227=@"var;{green};{#20224}"
+variables(#20227,"green",#20224)
+#20228=@"local_type_name;{green};{#20224}"
+local_type_names(#20228,"green",#20224)
+#20229=@"var;{blue};{#20224}"
+variables(#20229,"blue",#20224)
+#20230=@"local_type_name;{blue};{#20224}"
+local_type_names(#20230,"blue",#20224)
+#20231=*
+properties(#20231,#20222,1,7,"red = 1")
+#20232=@"loc,{#10000},1,14,1,20"
+locations_default(#20232,#10000,1,14,1,20)
+hasLocation(#20231,#20232)
 #20233=*
-exprs(#20233,3,#20230,1,"1")
-hasLocation(#20233,#20049)
-enclosing_stmt(#20233,#20221)
+exprs(#20233,78,#20231,0,"red")
+hasLocation(#20233,#20045)
+enclosing_stmt(#20233,#20222)
 expr_containers(#20233,#20001)
-literals("1","1",#20233)
+literals("red","red",#20233)
+decl(#20233,#20225)
+typedecl(#20233,#20226)
 #20234=*
-properties(#20234,#20221,2,7,"green")
-hasLocation(#20234,#20053)
+exprs(#20234,3,#20231,1,"1")
+hasLocation(#20234,#20049)
+enclosing_stmt(#20234,#20222)
+expr_containers(#20234,#20001)
+literals("1","1",#20234)
 #20235=*
-exprs(#20235,78,#20234,0,"green")
+properties(#20235,#20222,2,7,"green")
 hasLocation(#20235,#20053)
-enclosing_stmt(#20235,#20221)
-expr_containers(#20235,#20001)
-literals("green","green",#20235)
-decl(#20235,#20226)
-typedecl(#20235,#20227)
 #20236=*
-properties(#20236,#20221,3,7,"blue")
-hasLocation(#20236,#20057)
+exprs(#20236,78,#20235,0,"green")
+hasLocation(#20236,#20053)
+enclosing_stmt(#20236,#20222)
+expr_containers(#20236,#20001)
+literals("green","green",#20236)
+decl(#20236,#20227)
+typedecl(#20236,#20228)
 #20237=*
-exprs(#20237,78,#20236,0,"blue")
+properties(#20237,#20222,3,7,"blue")
 hasLocation(#20237,#20057)
-enclosing_stmt(#20237,#20221)
-expr_containers(#20237,#20001)
-literals("blue","blue",#20237)
-decl(#20237,#20228)
-typedecl(#20237,#20229)
 #20238=*
-stmts(#20238,36,#20001,1,"declare ...  a, b }")
-hasLocation(#20238,#20007)
-stmt_containers(#20238,#20001)
+exprs(#20238,78,#20237,0,"blue")
+hasLocation(#20238,#20057)
+enclosing_stmt(#20238,#20222)
+expr_containers(#20238,#20001)
+literals("blue","blue",#20238)
+decl(#20238,#20229)
+typedecl(#20238,#20230)
 #20239=*
-exprs(#20239,78,#20238,0,"DeclaredEnum")
-hasLocation(#20239,#20065)
-enclosing_stmt(#20239,#20238)
-expr_containers(#20239,#20001)
-literals("DeclaredEnum","DeclaredEnum",#20239)
-decl(#20239,#20204)
-typedecl(#20239,#20210)
-namespacedecl(#20239,#20216)
+stmts(#20239,36,#20001,1,"declare ...  a, b }")
+hasLocation(#20239,#20007)
+stmt_containers(#20239,#20001)
 #20240=*
-scopes(#20240,14)
-scopenodes(#20238,#20240)
-scopenesting(#20240,#20000)
-#20241=@"var;{a};{#20240}"
-variables(#20241,"a",#20240)
-#20242=@"local_type_name;{a};{#20240}"
-local_type_names(#20242,"a",#20240)
-#20243=@"var;{b};{#20240}"
-variables(#20243,"b",#20240)
-#20244=@"local_type_name;{b};{#20240}"
-local_type_names(#20244,"b",#20240)
-#20245=*
-properties(#20245,#20238,1,7,"a")
-hasLocation(#20245,#20069)
+exprs(#20240,78,#20239,0,"DeclaredEnum")
+hasLocation(#20240,#20065)
+enclosing_stmt(#20240,#20239)
+expr_containers(#20240,#20001)
+literals("DeclaredEnum","DeclaredEnum",#20240)
+decl(#20240,#20204)
+typedecl(#20240,#20210)
+namespacedecl(#20240,#20216)
+#20241=*
+scopes(#20241,14)
+scopenodes(#20239,#20241)
+scopenesting(#20241,#20000)
+#20242=@"var;{a};{#20241}"
+variables(#20242,"a",#20241)
+#20243=@"local_type_name;{a};{#20241}"
+local_type_names(#20243,"a",#20241)
+#20244=@"var;{b};{#20241}"
+variables(#20244,"b",#20241)
+#20245=@"local_type_name;{b};{#20241}"
+local_type_names(#20245,"b",#20241)
 #20246=*
-exprs(#20246,78,#20245,0,"a")
+properties(#20246,#20239,1,7,"a")
 hasLocation(#20246,#20069)
-enclosing_stmt(#20246,#20238)
-expr_containers(#20246,#20001)
-literals("a","a",#20246)
-decl(#20246,#20241)
-typedecl(#20246,#20242)
 #20247=*
-properties(#20247,#20238,2,7,"b")
-hasLocation(#20247,#20073)
+exprs(#20247,78,#20246,0,"a")
+hasLocation(#20247,#20069)
+enclosing_stmt(#20247,#20239)
+expr_containers(#20247,#20001)
+literals("a","a",#20247)
+decl(#20247,#20242)
+typedecl(#20247,#20243)
 #20248=*
-exprs(#20248,78,#20247,0,"b")
+properties(#20248,#20239,2,7,"b")
 hasLocation(#20248,#20073)
-enclosing_stmt(#20248,#20238)
-expr_containers(#20248,#20001)
-literals("b","b",#20248)
-decl(#20248,#20243)
-typedecl(#20248,#20244)
-has_declare_keyword(#20238)
 #20249=*
-stmts(#20249,36,#20001,2,"const e ... +2, b }")
-hasLocation(#20249,#20009)
-stmt_containers(#20249,#20001)
+exprs(#20249,78,#20248,0,"b")
+hasLocation(#20249,#20073)
+enclosing_stmt(#20249,#20239)
+expr_containers(#20249,#20001)
+literals("b","b",#20249)
+decl(#20249,#20244)
+typedecl(#20249,#20245)
+has_declare_keyword(#20239)
 #20250=*
-exprs(#20250,78,#20249,0,"ConstEnum")
-hasLocation(#20250,#20081)
-enclosing_stmt(#20250,#20249)
-expr_containers(#20250,#20001)
-literals("ConstEnum","ConstEnum",#20250)
-decl(#20250,#20205)
-typedecl(#20250,#20211)
-namespacedecl(#20250,#20217)
+stmts(#20250,36,#20001,2,"const e ... +2, b }")
+hasLocation(#20250,#20009)
+stmt_containers(#20250,#20001)
 #20251=*
-scopes(#20251,14)
-scopenodes(#20249,#20251)
-scopenesting(#20251,#20000)
-#20252=@"var;{a};{#20251}"
-variables(#20252,"a",#20251)
-#20253=@"local_type_name;{a};{#20251}"
-local_type_names(#20253,"a",#20251)
-#20254=@"var;{b};{#20251}"
-variables(#20254,"b",#20251)
-#20255=@"local_type_name;{b};{#20251}"
-local_type_names(#20255,"b",#20251)
-#20256=*
-properties(#20256,#20249,1,7,"a = 1+2")
-#20257=@"loc,{#10000},4,24,4,30"
-locations_default(#20257,#10000,4,24,4,30)
-hasLocation(#20256,#20257)
-#20258=*
-exprs(#20258,78,#20256,0,"a")
-hasLocation(#20258,#20085)
-enclosing_stmt(#20258,#20249)
-expr_containers(#20258,#20001)
-literals("a","a",#20258)
-decl(#20258,#20252)
-typedecl(#20258,#20253)
+exprs(#20251,78,#20250,0,"ConstEnum")
+hasLocation(#20251,#20081)
+enclosing_stmt(#20251,#20250)
+expr_containers(#20251,#20001)
+literals("ConstEnum","ConstEnum",#20251)
+decl(#20251,#20205)
+typedecl(#20251,#20211)
+namespacedecl(#20251,#20217)
+#20252=*
+scopes(#20252,14)
+scopenodes(#20250,#20252)
+scopenesting(#20252,#20000)
+#20253=@"var;{a};{#20252}"
+variables(#20253,"a",#20252)
+#20254=@"local_type_name;{a};{#20252}"
+local_type_names(#20254,"a",#20252)
+#20255=@"var;{b};{#20252}"
+variables(#20255,"b",#20252)
+#20256=@"local_type_name;{b};{#20252}"
+local_type_names(#20256,"b",#20252)
+#20257=*
+properties(#20257,#20250,1,7,"a = 1+2")
+#20258=@"loc,{#10000},4,24,4,30"
+locations_default(#20258,#10000,4,24,4,30)
+hasLocation(#20257,#20258)
 #20259=*
-exprs(#20259,34,#20256,1,"1+2")
-#20260=@"loc,{#10000},4,28,4,30"
-locations_default(#20260,#10000,4,28,4,30)
-hasLocation(#20259,#20260)
-enclosing_stmt(#20259,#20249)
+exprs(#20259,78,#20257,0,"a")
+hasLocation(#20259,#20085)
+enclosing_stmt(#20259,#20250)
 expr_containers(#20259,#20001)
-#20261=*
-exprs(#20261,3,#20259,0,"1")
-hasLocation(#20261,#20089)
-enclosing_stmt(#20261,#20249)
-expr_containers(#20261,#20001)
-literals("1","1",#20261)
+literals("a","a",#20259)
+decl(#20259,#20253)
+typedecl(#20259,#20254)
+#20260=*
+exprs(#20260,34,#20257,1,"1+2")
+#20261=@"loc,{#10000},4,28,4,30"
+locations_default(#20261,#10000,4,28,4,30)
+hasLocation(#20260,#20261)
+enclosing_stmt(#20260,#20250)
+expr_containers(#20260,#20001)
 #20262=*
-exprs(#20262,3,#20259,1,"2")
-hasLocation(#20262,#20093)
-enclosing_stmt(#20262,#20249)
+exprs(#20262,3,#20260,0,"1")
+hasLocation(#20262,#20089)
+enclosing_stmt(#20262,#20250)
 expr_containers(#20262,#20001)
-literals("2","2",#20262)
+literals("1","1",#20262)
 #20263=*
-properties(#20263,#20249,2,7,"b")
-hasLocation(#20263,#20097)
+exprs(#20263,3,#20260,1,"2")
+hasLocation(#20263,#20093)
+enclosing_stmt(#20263,#20250)
+expr_containers(#20263,#20001)
+literals("2","2",#20263)
 #20264=*
-exprs(#20264,78,#20263,0,"b")
+properties(#20264,#20250,2,7,"b")
 hasLocation(#20264,#20097)
-enclosing_stmt(#20264,#20249)
-expr_containers(#20264,#20001)
-literals("b","b",#20264)
-decl(#20264,#20254)
-typedecl(#20264,#20255)
-is_const_enum(#20249)
 #20265=*
-stmts(#20265,36,#20001,3,"declare ...  a, b }")
-hasLocation(#20265,#20011)
-stmt_containers(#20265,#20001)
+exprs(#20265,78,#20264,0,"b")
+hasLocation(#20265,#20097)
+enclosing_stmt(#20265,#20250)
+expr_containers(#20265,#20001)
+literals("b","b",#20265)
+decl(#20265,#20255)
+typedecl(#20265,#20256)
+is_const_enum(#20250)
 #20266=*
-exprs(#20266,78,#20265,0,"DeclaredConstEnum")
-hasLocation(#20266,#20107)
-enclosing_stmt(#20266,#20265)
-expr_containers(#20266,#20001)
-literals("DeclaredConstEnum","DeclaredConstEnum",#20266)
-decl(#20266,#20206)
-typedecl(#20266,#20212)
-namespacedecl(#20266,#20218)
+stmts(#20266,36,#20001,3,"declare ...  a, b }")
+hasLocation(#20266,#20011)
+stmt_containers(#20266,#20001)
 #20267=*
-scopes(#20267,14)
-scopenodes(#20265,#20267)
-scopenesting(#20267,#20000)
-#20268=@"var;{a};{#20267}"
-variables(#20268,"a",#20267)
-#20269=@"local_type_name;{a};{#20267}"
-local_type_names(#20269,"a",#20267)
-#20270=@"var;{b};{#20267}"
-variables(#20270,"b",#20267)
-#20271=@"local_type_name;{b};{#20267}"
-local_type_names(#20271,"b",#20267)
-#20272=*
-properties(#20272,#20265,1,7,"a")
-hasLocation(#20272,#20111)
+exprs(#20267,78,#20266,0,"DeclaredConstEnum")
+hasLocation(#20267,#20107)
+enclosing_stmt(#20267,#20266)
+expr_containers(#20267,#20001)
+literals("DeclaredConstEnum","DeclaredConstEnum",#20267)
+decl(#20267,#20206)
+typedecl(#20267,#20212)
+namespacedecl(#20267,#20218)
+#20268=*
+scopes(#20268,14)
+scopenodes(#20266,#20268)
+scopenesting(#20268,#20000)
+#20269=@"var;{a};{#20268}"
+variables(#20269,"a",#20268)
+#20270=@"local_type_name;{a};{#20268}"
+local_type_names(#20270,"a",#20268)
+#20271=@"var;{b};{#20268}"
+variables(#20271,"b",#20268)
+#20272=@"local_type_name;{b};{#20268}"
+local_type_names(#20272,"b",#20268)
 #20273=*
-exprs(#20273,78,#20272,0,"a")
+properties(#20273,#20266,1,7,"a")
 hasLocation(#20273,#20111)
-enclosing_stmt(#20273,#20265)
-expr_containers(#20273,#20001)
-literals("a","a",#20273)
-decl(#20273,#20268)
-typedecl(#20273,#20269)
 #20274=*
-properties(#20274,#20265,2,7,"b")
-hasLocation(#20274,#20115)
+exprs(#20274,78,#20273,0,"a")
+hasLocation(#20274,#20111)
+enclosing_stmt(#20274,#20266)
+expr_containers(#20274,#20001)
+literals("a","a",#20274)
+decl(#20274,#20269)
+typedecl(#20274,#20270)
 #20275=*
-exprs(#20275,78,#20274,0,"b")
+properties(#20275,#20266,2,7,"b")
 hasLocation(#20275,#20115)
-enclosing_stmt(#20275,#20265)
-expr_containers(#20275,#20001)
-literals("b","b",#20275)
-decl(#20275,#20270)
-typedecl(#20275,#20271)
-is_const_enum(#20265)
-has_declare_keyword(#20265)
 #20276=*
-stmts(#20276,17,#20001,4,"functio ... rn x; }")
-hasLocation(#20276,#20015)
-stmt_containers(#20276,#20001)
+exprs(#20276,78,#20275,0,"b")
+hasLocation(#20276,#20115)
+enclosing_stmt(#20276,#20266)
+expr_containers(#20276,#20001)
+literals("b","b",#20276)
+decl(#20276,#20271)
+typedecl(#20276,#20272)
+is_const_enum(#20266)
+has_declare_keyword(#20266)
 #20277=*
-exprs(#20277,78,#20276,-1,"foo")
-hasLocation(#20277,#20121)
-expr_containers(#20277,#20276)
-literals("foo","foo",#20277)
-decl(#20277,#20201)
+stmts(#20277,17,#20001,4,"functio ... rn x; }")
+hasLocation(#20277,#20015)
+stmt_containers(#20277,#20001)
 #20278=*
-scopes(#20278,1)
-scopenodes(#20276,#20278)
-scopenesting(#20278,#20000)
-#20279=@"var;{x};{#20278}"
-variables(#20279,"x",#20278)
-#20280=*
-exprs(#20280,78,#20276,0,"x")
-hasLocation(#20280,#20125)
-expr_containers(#20280,#20276)
-literals("x","x",#20280)
-decl(#20280,#20279)
-#20281=@"var;{arguments};{#20278}"
-variables(#20281,"arguments",#20278)
-is_arguments_object(#20281)
+exprs(#20278,78,#20277,-1,"foo")
+hasLocation(#20278,#20121)
+expr_containers(#20278,#20277)
+literals("foo","foo",#20278)
+decl(#20278,#20201)
+#20279=*
+scopes(#20279,1)
+scopenodes(#20277,#20279)
+scopenesting(#20279,#20000)
+#20280=@"var;{this};{#20279}"
+variables(#20280,"this",#20279)
+#20281=@"var;{x};{#20279}"
+variables(#20281,"x",#20279)
 #20282=*
-stmts(#20282,1,#20276,-2,"{ return x; }")
-#20283=@"loc,{#10000},7,17,7,29"
-locations_default(#20283,#10000,7,17,7,29)
-hasLocation(#20282,#20283)
-stmt_containers(#20282,#20276)
+exprs(#20282,78,#20277,0,"x")
+hasLocation(#20282,#20125)
+expr_containers(#20282,#20277)
+literals("x","x",#20282)
+decl(#20282,#20281)
+#20283=@"var;{arguments};{#20279}"
+variables(#20283,"arguments",#20279)
+is_arguments_object(#20283)
 #20284=*
-stmts(#20284,9,#20282,0,"return x;")
-#20285=@"loc,{#10000},7,19,7,27"
-locations_default(#20285,#10000,7,19,7,27)
+stmts(#20284,1,#20277,-2,"{ return x; }")
+#20285=@"loc,{#10000},7,17,7,29"
+locations_default(#20285,#10000,7,17,7,29)
 hasLocation(#20284,#20285)
-stmt_containers(#20284,#20276)
+stmt_containers(#20284,#20277)
 #20286=*
-exprs(#20286,79,#20284,0,"x")
-hasLocation(#20286,#20133)
-enclosing_stmt(#20286,#20284)
-expr_containers(#20286,#20276)
-literals("x","x",#20286)
-bind(#20286,#20279)
-#20287=*
-stmts(#20287,36,#20001,5,"enum Co ...  + 2)\n}")
-#20288=@"loc,{#10000},9,1,11,1"
-locations_default(#20288,#10000,9,1,11,1)
-hasLocation(#20287,#20288)
-stmt_containers(#20287,#20001)
+stmts(#20286,9,#20284,0,"return x;")
+#20287=@"loc,{#10000},7,19,7,27"
+locations_default(#20287,#10000,7,19,7,27)
+hasLocation(#20286,#20287)
+stmt_containers(#20286,#20277)
+#20288=*
+exprs(#20288,79,#20286,0,"x")
+hasLocation(#20288,#20133)
+enclosing_stmt(#20288,#20286)
+expr_containers(#20288,#20277)
+literals("x","x",#20288)
+bind(#20288,#20281)
 #20289=*
-exprs(#20289,78,#20287,0,"ComplexInitializer")
-hasLocation(#20289,#20141)
-enclosing_stmt(#20289,#20287)
-expr_containers(#20289,#20001)
-literals("ComplexInitializer","ComplexInitializer",#20289)
-decl(#20289,#20207)
-typedecl(#20289,#20213)
-namespacedecl(#20289,#20219)
-#20290=*
-scopes(#20290,14)
-scopenodes(#20287,#20290)
-scopenesting(#20290,#20000)
-#20291=@"var;{a};{#20290}"
-variables(#20291,"a",#20290)
-#20292=@"local_type_name;{a};{#20290}"
-local_type_names(#20292,"a",#20290)
-#20293=*
-properties(#20293,#20287,1,7,"a = foo(1 + 2)")
-#20294=@"loc,{#10000},10,3,10,16"
-locations_default(#20294,#10000,10,3,10,16)
-hasLocation(#20293,#20294)
+stmts(#20289,36,#20001,5,"enum Co ...  + 2)\n}")
+#20290=@"loc,{#10000},9,1,11,1"
+locations_default(#20290,#10000,9,1,11,1)
+hasLocation(#20289,#20290)
+stmt_containers(#20289,#20001)
+#20291=*
+exprs(#20291,78,#20289,0,"ComplexInitializer")
+hasLocation(#20291,#20141)
+enclosing_stmt(#20291,#20289)
+expr_containers(#20291,#20001)
+literals("ComplexInitializer","ComplexInitializer",#20291)
+decl(#20291,#20207)
+typedecl(#20291,#20213)
+namespacedecl(#20291,#20219)
+#20292=*
+scopes(#20292,14)
+scopenodes(#20289,#20292)
+scopenesting(#20292,#20000)
+#20293=@"var;{a};{#20292}"
+variables(#20293,"a",#20292)
+#20294=@"local_type_name;{a};{#20292}"
+local_type_names(#20294,"a",#20292)
 #20295=*
-exprs(#20295,78,#20293,0,"a")
-hasLocation(#20295,#20145)
-enclosing_stmt(#20295,#20287)
-expr_containers(#20295,#20001)
-literals("a","a",#20295)
-decl(#20295,#20291)
-typedecl(#20295,#20292)
-#20296=*
-exprs(#20296,13,#20293,1,"foo(1 + 2)")
-#20297=@"loc,{#10000},10,7,10,16"
-locations_default(#20297,#10000,10,7,10,16)
-hasLocation(#20296,#20297)
-enclosing_stmt(#20296,#20287)
-expr_containers(#20296,#20001)
+properties(#20295,#20289,1,7,"a = foo(1 + 2)")
+#20296=@"loc,{#10000},10,3,10,16"
+locations_default(#20296,#10000,10,3,10,16)
+hasLocation(#20295,#20296)
+#20297=*
+exprs(#20297,78,#20295,0,"a")
+hasLocation(#20297,#20145)
+enclosing_stmt(#20297,#20289)
+expr_containers(#20297,#20001)
+literals("a","a",#20297)
+decl(#20297,#20293)
+typedecl(#20297,#20294)
 #20298=*
-exprs(#20298,79,#20296,-1,"foo")
-hasLocation(#20298,#20149)
-enclosing_stmt(#20298,#20287)
+exprs(#20298,13,#20295,1,"foo(1 + 2)")
+#20299=@"loc,{#10000},10,7,10,16"
+locations_default(#20299,#10000,10,7,10,16)
+hasLocation(#20298,#20299)
+enclosing_stmt(#20298,#20289)
 expr_containers(#20298,#20001)
-literals("foo","foo",#20298)
-bind(#20298,#20201)
-#20299=*
-exprs(#20299,34,#20296,0,"1 + 2")
-#20300=@"loc,{#10000},10,11,10,15"
-locations_default(#20300,#10000,10,11,10,15)
-hasLocation(#20299,#20300)
-enclosing_stmt(#20299,#20287)
-expr_containers(#20299,#20001)
+#20300=*
+exprs(#20300,79,#20298,-1,"foo")
+hasLocation(#20300,#20149)
+enclosing_stmt(#20300,#20289)
+expr_containers(#20300,#20001)
+literals("foo","foo",#20300)
+bind(#20300,#20201)
 #20301=*
-exprs(#20301,3,#20299,0,"1")
-hasLocation(#20301,#20153)
-enclosing_stmt(#20301,#20287)
+exprs(#20301,34,#20298,0,"1 + 2")
+#20302=@"loc,{#10000},10,11,10,15"
+locations_default(#20302,#10000,10,11,10,15)
+hasLocation(#20301,#20302)
+enclosing_stmt(#20301,#20289)
 expr_containers(#20301,#20001)
-literals("1","1",#20301)
-#20302=*
-exprs(#20302,3,#20299,1,"2")
-hasLocation(#20302,#20157)
-enclosing_stmt(#20302,#20287)
-expr_containers(#20302,#20001)
-literals("2","2",#20302)
 #20303=*
-stmts(#20303,36,#20001,6,"enum St ... b = a\n}")
-#20304=@"loc,{#10000},13,1,16,1"
-locations_default(#20304,#10000,13,1,16,1)
-hasLocation(#20303,#20304)
-stmt_containers(#20303,#20001)
+exprs(#20303,3,#20301,0,"1")
+hasLocation(#20303,#20153)
+enclosing_stmt(#20303,#20289)
+expr_containers(#20303,#20001)
+literals("1","1",#20303)
+#20304=*
+exprs(#20304,3,#20301,1,"2")
+hasLocation(#20304,#20157)
+enclosing_stmt(#20304,#20289)
+expr_containers(#20304,#20001)
+literals("2","2",#20304)
 #20305=*
-exprs(#20305,78,#20303,0,"StringL ... mMember")
-hasLocation(#20305,#20164)
-enclosing_stmt(#20305,#20303)
-expr_containers(#20305,#20001)
-literals("StringLiteralEnumMember","StringLiteralEnumMember",#20305)
-decl(#20305,#20208)
-typedecl(#20305,#20214)
-namespacedecl(#20305,#20220)
-#20306=*
-scopes(#20306,14)
-scopenodes(#20303,#20306)
-scopenesting(#20306,#20000)
-#20307=@"var;{a};{#20306}"
-variables(#20307,"a",#20306)
-#20308=@"local_type_name;{a};{#20306}"
-local_type_names(#20308,"a",#20306)
-#20309=@"var;{b};{#20306}"
-variables(#20309,"b",#20306)
-#20310=@"local_type_name;{b};{#20306}"
-local_type_names(#20310,"b",#20306)
-#20311=*
-properties(#20311,#20303,1,7,"""a"" = 2")
-#20312=@"loc,{#10000},14,3,14,9"
-locations_default(#20312,#10000,14,3,14,9)
-hasLocation(#20311,#20312)
+stmts(#20305,36,#20001,6,"enum St ... b = a\n}")
+#20306=@"loc,{#10000},13,1,16,1"
+locations_default(#20306,#10000,13,1,16,1)
+hasLocation(#20305,#20306)
+stmt_containers(#20305,#20001)
+#20307=*
+exprs(#20307,78,#20305,0,"StringL ... mMember")
+hasLocation(#20307,#20164)
+enclosing_stmt(#20307,#20305)
+expr_containers(#20307,#20001)
+literals("StringLiteralEnumMember","StringLiteralEnumMember",#20307)
+decl(#20307,#20208)
+typedecl(#20307,#20214)
+namespacedecl(#20307,#20220)
+#20308=*
+scopes(#20308,14)
+scopenodes(#20305,#20308)
+scopenesting(#20308,#20000)
+#20309=@"var;{a};{#20308}"
+variables(#20309,"a",#20308)
+#20310=@"local_type_name;{a};{#20308}"
+local_type_names(#20310,"a",#20308)
+#20311=@"var;{b};{#20308}"
+variables(#20311,"b",#20308)
+#20312=@"local_type_name;{b};{#20308}"
+local_type_names(#20312,"b",#20308)
 #20313=*
-exprs(#20313,78,#20311,0,"""a""")
-hasLocation(#20313,#20168)
-enclosing_stmt(#20313,#20303)
-expr_containers(#20313,#20001)
-literals("a","a",#20313)
-decl(#20313,#20307)
-typedecl(#20313,#20308)
-#20314=*
-exprs(#20314,3,#20311,1,"2")
-hasLocation(#20314,#20172)
-enclosing_stmt(#20314,#20303)
-expr_containers(#20314,#20001)
-literals("2","2",#20314)
+properties(#20313,#20305,1,7,"""a"" = 2")
+#20314=@"loc,{#10000},14,3,14,9"
+locations_default(#20314,#10000,14,3,14,9)
+hasLocation(#20313,#20314)
 #20315=*
-properties(#20315,#20303,2,7,"b = a")
-#20316=@"loc,{#10000},15,3,15,7"
-locations_default(#20316,#10000,15,3,15,7)
-hasLocation(#20315,#20316)
+exprs(#20315,78,#20313,0,"""a""")
+hasLocation(#20315,#20168)
+enclosing_stmt(#20315,#20305)
+expr_containers(#20315,#20001)
+literals("a","a",#20315)
+decl(#20315,#20309)
+typedecl(#20315,#20310)
+#20316=*
+exprs(#20316,3,#20313,1,"2")
+hasLocation(#20316,#20172)
+enclosing_stmt(#20316,#20305)
+expr_containers(#20316,#20001)
+literals("2","2",#20316)
 #20317=*
-exprs(#20317,78,#20315,0,"b")
-hasLocation(#20317,#20176)
-enclosing_stmt(#20317,#20303)
-expr_containers(#20317,#20001)
-literals("b","b",#20317)
-decl(#20317,#20309)
-typedecl(#20317,#20310)
-#20318=*
-exprs(#20318,79,#20315,1,"a")
-hasLocation(#20318,#20180)
-enclosing_stmt(#20318,#20303)
-expr_containers(#20318,#20001)
-literals("a","a",#20318)
-bind(#20318,#20307)
+properties(#20317,#20305,2,7,"b = a")
+#20318=@"loc,{#10000},15,3,15,7"
+locations_default(#20318,#10000,15,3,15,7)
+hasLocation(#20317,#20318)
 #20319=*
-stmts(#20319,18,#20001,7,"var x : ... r.a = 2")
-hasLocation(#20319,#20037)
-stmt_containers(#20319,#20001)
+exprs(#20319,78,#20317,0,"b")
+hasLocation(#20319,#20176)
+enclosing_stmt(#20319,#20305)
+expr_containers(#20319,#20001)
+literals("b","b",#20319)
+decl(#20319,#20311)
+typedecl(#20319,#20312)
 #20320=*
-exprs(#20320,64,#20319,0,"x : Str ... r.a = 2")
-#20321=@"loc,{#10000},18,5,18,37"
-locations_default(#20321,#10000,18,5,18,37)
-hasLocation(#20320,#20321)
-enclosing_stmt(#20320,#20319)
+exprs(#20320,79,#20317,1,"a")
+hasLocation(#20320,#20180)
+enclosing_stmt(#20320,#20305)
 expr_containers(#20320,#20001)
+literals("a","a",#20320)
+bind(#20320,#20309)
+#20321=*
+stmts(#20321,18,#20001,7,"var x : ... r.a = 2")
+hasLocation(#20321,#20037)
+stmt_containers(#20321,#20001)
 #20322=*
-exprs(#20322,78,#20320,0,"x")
-hasLocation(#20322,#20185)
-enclosing_stmt(#20322,#20319)
+exprs(#20322,64,#20321,0,"x : Str ... r.a = 2")
+#20323=@"loc,{#10000},18,5,18,37"
+locations_default(#20323,#10000,18,5,18,37)
+hasLocation(#20322,#20323)
+enclosing_stmt(#20322,#20321)
 expr_containers(#20322,#20001)
-literals("x","x",#20322)
-decl(#20322,#20202)
-#20323=*
-exprs(#20323,3,#20320,1,"2")
-hasLocation(#20323,#20197)
-enclosing_stmt(#20323,#20319)
-expr_containers(#20323,#20001)
-literals("2","2",#20323)
 #20324=*
-typeexprs(#20324,13,#20320,2,"StringL ... ember.a")
-#20325=@"loc,{#10000},18,9,18,33"
-locations_default(#20325,#10000,18,9,18,33)
-hasLocation(#20324,#20325)
-enclosing_stmt(#20324,#20319)
+exprs(#20324,78,#20322,0,"x")
+hasLocation(#20324,#20185)
+enclosing_stmt(#20324,#20321)
 expr_containers(#20324,#20001)
+literals("x","x",#20324)
+decl(#20324,#20202)
+#20325=*
+exprs(#20325,3,#20322,1,"2")
+hasLocation(#20325,#20197)
+enclosing_stmt(#20325,#20321)
+expr_containers(#20325,#20001)
+literals("2","2",#20325)
 #20326=*
-typeexprs(#20326,25,#20324,0,"StringL ... mMember")
-hasLocation(#20326,#20189)
-enclosing_stmt(#20326,#20319)
+typeexprs(#20326,13,#20322,2,"StringL ... ember.a")
+#20327=@"loc,{#10000},18,9,18,33"
+locations_default(#20327,#10000,18,9,18,33)
+hasLocation(#20326,#20327)
+enclosing_stmt(#20326,#20321)
 expr_containers(#20326,#20001)
-literals("StringLiteralEnumMember","StringLiteralEnumMember",#20326)
-namespacebind(#20326,#20220)
-#20327=*
-typeexprs(#20327,15,#20324,1,"a")
-hasLocation(#20327,#20193)
-enclosing_stmt(#20327,#20319)
-expr_containers(#20327,#20001)
-literals("a","a",#20327)
 #20328=*
-entry_cfg_node(#20328,#20001)
-#20329=@"loc,{#10000},1,1,1,0"
-locations_default(#20329,#10000,1,1,1,0)
-hasLocation(#20328,#20329)
+typeexprs(#20328,25,#20326,0,"StringL ... mMember")
+hasLocation(#20328,#20189)
+enclosing_stmt(#20328,#20321)
+expr_containers(#20328,#20001)
+literals("StringLiteralEnumMember","StringLiteralEnumMember",#20328)
+namespacebind(#20328,#20220)
+#20329=*
+typeexprs(#20329,15,#20326,1,"a")
+hasLocation(#20329,#20193)
+enclosing_stmt(#20329,#20321)
+expr_containers(#20329,#20001)
+literals("a","a",#20329)
 #20330=*
-exit_cfg_node(#20330,#20001)
-hasLocation(#20330,#20199)
-successor(#20319,#20322)
-successor(#20323,#20320)
-successor(#20322,#20323)
-successor(#20320,#20330)
-successor(#20318,#20315)
-successor(#20317,#20318)
-successor(#20315,#20303)
-successor(#20314,#20311)
-successor(#20313,#20314)
-successor(#20311,#20317)
-successor(#20305,#20313)
-successor(#20303,#20319)
-successor(#20302,#20299)
-successor(#20301,#20302)
-successor(#20299,#20296)
-successor(#20298,#20301)
-successor(#20296,#20293)
-successor(#20295,#20298)
-successor(#20293,#20287)
-successor(#20289,#20295)
-successor(#20287,#20305)
-successor(#20276,#20289)
-#20331=*
-entry_cfg_node(#20331,#20276)
-#20332=@"loc,{#10000},7,1,7,0"
-locations_default(#20332,#10000,7,1,7,0)
-hasLocation(#20331,#20332)
+entry_cfg_node(#20330,#20001)
+#20331=@"loc,{#10000},1,1,1,0"
+locations_default(#20331,#10000,1,1,1,0)
+hasLocation(#20330,#20331)
+#20332=*
+exit_cfg_node(#20332,#20001)
+hasLocation(#20332,#20199)
+successor(#20321,#20324)
+successor(#20325,#20322)
+successor(#20324,#20325)
+successor(#20322,#20332)
+successor(#20320,#20317)
+successor(#20319,#20320)
+successor(#20317,#20305)
+successor(#20316,#20313)
+successor(#20315,#20316)
+successor(#20313,#20319)
+successor(#20307,#20315)
+successor(#20305,#20321)
+successor(#20304,#20301)
+successor(#20303,#20304)
+successor(#20301,#20298)
+successor(#20300,#20303)
+successor(#20298,#20295)
+successor(#20297,#20300)
+successor(#20295,#20289)
+successor(#20291,#20297)
+successor(#20289,#20307)
+successor(#20277,#20291)
 #20333=*
-exit_cfg_node(#20333,#20276)
-#20334=@"loc,{#10000},7,30,7,29"
-locations_default(#20334,#10000,7,30,7,29)
+entry_cfg_node(#20333,#20277)
+#20334=@"loc,{#10000},7,1,7,0"
+locations_default(#20334,#10000,7,1,7,0)
 hasLocation(#20333,#20334)
-successor(#20286,#20284)
-successor(#20284,#20333)
-successor(#20282,#20286)
-successor(#20280,#20282)
-successor(#20331,#20280)
-successor(#20275,#20274)
-successor(#20274,#20265)
-successor(#20273,#20272)
-successor(#20272,#20275)
-successor(#20266,#20273)
-successor(#20265,#20276)
-successor(#20264,#20263)
-successor(#20263,#20249)
-successor(#20262,#20259)
-successor(#20261,#20262)
-successor(#20259,#20256)
-successor(#20258,#20261)
-successor(#20256,#20264)
-successor(#20250,#20258)
-successor(#20249,#20266)
-successor(#20248,#20247)
-successor(#20247,#20238)
-successor(#20246,#20245)
-successor(#20245,#20248)
-successor(#20239,#20246)
-successor(#20238,#20250)
-successor(#20237,#20236)
-successor(#20236,#20221)
-successor(#20235,#20234)
-successor(#20234,#20237)
-successor(#20233,#20230)
-successor(#20232,#20233)
-successor(#20230,#20235)
-successor(#20222,#20232)
-successor(#20221,#20239)
-successor(#20277,#20222)
-successor(#20328,#20277)
+#20335=*
+exit_cfg_node(#20335,#20277)
+#20336=@"loc,{#10000},7,30,7,29"
+locations_default(#20336,#10000,7,30,7,29)
+hasLocation(#20335,#20336)
+successor(#20288,#20286)
+successor(#20286,#20335)
+successor(#20284,#20288)
+successor(#20282,#20284)
+successor(#20333,#20282)
+successor(#20276,#20275)
+successor(#20275,#20266)
+successor(#20274,#20273)
+successor(#20273,#20276)
+successor(#20267,#20274)
+successor(#20266,#20277)
+successor(#20265,#20264)
+successor(#20264,#20250)
+successor(#20263,#20260)
+successor(#20262,#20263)
+successor(#20260,#20257)
+successor(#20259,#20262)
+successor(#20257,#20265)
+successor(#20251,#20259)
+successor(#20250,#20267)
+successor(#20249,#20248)
+successor(#20248,#20239)
+successor(#20247,#20246)
+successor(#20246,#20249)
+successor(#20240,#20247)
+successor(#20239,#20251)
+successor(#20238,#20237)
+successor(#20237,#20222)
+successor(#20236,#20235)
+successor(#20235,#20238)
+successor(#20234,#20231)
+successor(#20233,#20234)
+successor(#20231,#20236)
+successor(#20223,#20233)
+successor(#20222,#20240)
+successor(#20278,#20223)
+successor(#20330,#20278)
 numlines(#10000,18,13,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/export.ts.trap b/javascript/extractor/tests/ts/output/trap/export.ts.trap
index 18fdbb8f7c2..eb8ca7f4cd1 100644
--- a/javascript/extractor/tests/ts/output/trap/export.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/export.ts.trap
@@ -163,164 +163,172 @@ variables(#20057,"C",#20055)
 variables(#20058,"f",#20055)
 #20059=@"local_type_name;{C};{#20055}"
 local_type_names(#20059,"C",#20055)
-#20060=*
-stmts(#20060,30,#20001,0,"export  ... o = 42;")
-hasLocation(#20060,#20003)
-stmt_containers(#20060,#20001)
+#20060=@"var;{this};{#20055}"
+variables(#20060,"this",#20055)
 #20061=*
-stmts(#20061,22,#20060,-1,"const foo = 42;")
-#20062=@"loc,{#10000},1,8,1,22"
-locations_default(#20062,#10000,1,8,1,22)
-hasLocation(#20061,#20062)
+stmts(#20061,30,#20001,0,"export  ... o = 42;")
+hasLocation(#20061,#20003)
 stmt_containers(#20061,#20001)
-#20063=*
-exprs(#20063,64,#20061,0,"foo = 42")
-#20064=@"loc,{#10000},1,14,1,21"
-locations_default(#20064,#10000,1,14,1,21)
-hasLocation(#20063,#20064)
-enclosing_stmt(#20063,#20061)
-expr_containers(#20063,#20001)
-#20065=*
-exprs(#20065,78,#20063,0,"foo")
-hasLocation(#20065,#20017)
-enclosing_stmt(#20065,#20061)
-expr_containers(#20065,#20001)
-literals("foo","foo",#20065)
-decl(#20065,#20056)
+#20062=*
+stmts(#20062,22,#20061,-1,"const foo = 42;")
+#20063=@"loc,{#10000},1,8,1,22"
+locations_default(#20063,#10000,1,8,1,22)
+hasLocation(#20062,#20063)
+stmt_containers(#20062,#20001)
+#20064=*
+exprs(#20064,64,#20062,0,"foo = 42")
+#20065=@"loc,{#10000},1,14,1,21"
+locations_default(#20065,#10000,1,14,1,21)
+hasLocation(#20064,#20065)
+enclosing_stmt(#20064,#20062)
+expr_containers(#20064,#20001)
 #20066=*
-exprs(#20066,3,#20063,1,"42")
-hasLocation(#20066,#20021)
-enclosing_stmt(#20066,#20061)
+exprs(#20066,78,#20064,0,"foo")
+hasLocation(#20066,#20017)
+enclosing_stmt(#20066,#20062)
 expr_containers(#20066,#20001)
-literals("42","42",#20066)
+literals("foo","foo",#20066)
+decl(#20066,#20056)
 #20067=*
-stmts(#20067,30,#20001,1,"export class C {}")
-hasLocation(#20067,#20007)
-stmt_containers(#20067,#20001)
+exprs(#20067,3,#20064,1,"42")
+hasLocation(#20067,#20021)
+enclosing_stmt(#20067,#20062)
+expr_containers(#20067,#20001)
+literals("42","42",#20067)
 #20068=*
-stmts(#20068,26,#20067,-1,"class C {}")
-#20069=@"loc,{#10000},3,8,3,17"
-locations_default(#20069,#10000,3,8,3,17)
-hasLocation(#20068,#20069)
+stmts(#20068,30,#20001,1,"export class C {}")
+hasLocation(#20068,#20007)
 stmt_containers(#20068,#20001)
-#20070=*
-exprs(#20070,78,#20068,0,"C")
-hasLocation(#20070,#20029)
-enclosing_stmt(#20070,#20068)
-expr_containers(#20070,#20001)
-literals("C","C",#20070)
-decl(#20070,#20057)
-typedecl(#20070,#20059)
+#20069=*
+stmts(#20069,26,#20068,-1,"class C {}")
+#20070=@"loc,{#10000},3,8,3,17"
+locations_default(#20070,#10000,3,8,3,17)
+hasLocation(#20069,#20070)
+stmt_containers(#20069,#20001)
 #20071=*
-scopes(#20071,10)
-scopenodes(#20068,#20071)
-scopenesting(#20071,#20055)
+exprs(#20071,78,#20069,0,"C")
+hasLocation(#20071,#20029)
+enclosing_stmt(#20071,#20069)
+expr_containers(#20071,#20001)
+literals("C","C",#20071)
+decl(#20071,#20057)
+typedecl(#20071,#20059)
 #20072=*
-properties(#20072,#20068,2,0,"constructor() {}")
-#20073=@"loc,{#10000},3,16,3,15"
-locations_default(#20073,#10000,3,16,3,15)
-hasLocation(#20072,#20073)
+scopes(#20072,10)
+scopenodes(#20069,#20072)
+scopenesting(#20072,#20055)
+#20073=@"var;{this};{#20072}"
+variables(#20073,"this",#20072)
 #20074=*
-exprs(#20074,0,#20072,0,"constructor")
-hasLocation(#20074,#20073)
-enclosing_stmt(#20074,#20068)
-expr_containers(#20074,#20001)
-literals("constructor","constructor",#20074)
-#20075=*
-exprs(#20075,9,#20072,1,"() {}")
-hasLocation(#20075,#20073)
-enclosing_stmt(#20075,#20068)
-expr_containers(#20075,#20001)
+properties(#20074,#20069,2,0,"constructor() {}")
+#20075=@"loc,{#10000},3,16,3,15"
+locations_default(#20075,#10000,3,16,3,15)
+hasLocation(#20074,#20075)
 #20076=*
-scopes(#20076,1)
-scopenodes(#20075,#20076)
-scopenesting(#20076,#20071)
-#20077=@"var;{arguments};{#20076}"
-variables(#20077,"arguments",#20076)
-is_arguments_object(#20077)
+exprs(#20076,0,#20074,0,"constructor")
+hasLocation(#20076,#20075)
+enclosing_stmt(#20076,#20069)
+expr_containers(#20076,#20001)
+literals("constructor","constructor",#20076)
+#20077=*
+exprs(#20077,9,#20074,1,"() {}")
+hasLocation(#20077,#20075)
+enclosing_stmt(#20077,#20069)
+expr_containers(#20077,#20001)
 #20078=*
-stmts(#20078,1,#20075,-2,"{}")
-hasLocation(#20078,#20073)
-stmt_containers(#20078,#20075)
-is_method(#20072)
-#20079=*
-stmts(#20079,29,#20001,2,"export  ...  f() {}")
-#20080=@"loc,{#10000},5,1,5,30"
-locations_default(#20080,#10000,5,1,5,30)
-hasLocation(#20079,#20080)
-stmt_containers(#20079,#20001)
+scopes(#20078,1)
+scopenodes(#20077,#20078)
+scopenesting(#20078,#20072)
+#20079=@"var;{this};{#20078}"
+variables(#20079,"this",#20078)
+#20080=@"var;{arguments};{#20078}"
+variables(#20080,"arguments",#20078)
+is_arguments_object(#20080)
 #20081=*
-stmts(#20081,17,#20079,0,"function f() {}")
-#20082=@"loc,{#10000},5,16,5,30"
-locations_default(#20082,#10000,5,16,5,30)
-hasLocation(#20081,#20082)
-stmt_containers(#20081,#20001)
-#20083=*
-exprs(#20083,78,#20081,-1,"f")
-hasLocation(#20083,#20041)
-expr_containers(#20083,#20081)
-literals("f","f",#20083)
-decl(#20083,#20058)
+stmts(#20081,1,#20077,-2,"{}")
+hasLocation(#20081,#20075)
+stmt_containers(#20081,#20077)
+is_method(#20074)
+#20082=*
+stmts(#20082,29,#20001,2,"export  ...  f() {}")
+#20083=@"loc,{#10000},5,1,5,30"
+locations_default(#20083,#10000,5,1,5,30)
+hasLocation(#20082,#20083)
+stmt_containers(#20082,#20001)
 #20084=*
-scopes(#20084,1)
-scopenodes(#20081,#20084)
-scopenesting(#20084,#20055)
-#20085=@"var;{arguments};{#20084}"
-variables(#20085,"arguments",#20084)
-is_arguments_object(#20085)
+stmts(#20084,17,#20082,0,"function f() {}")
+#20085=@"loc,{#10000},5,16,5,30"
+locations_default(#20085,#10000,5,16,5,30)
+hasLocation(#20084,#20085)
+stmt_containers(#20084,#20001)
 #20086=*
-stmts(#20086,1,#20081,-2,"{}")
-#20087=@"loc,{#10000},5,29,5,30"
-locations_default(#20087,#10000,5,29,5,30)
-hasLocation(#20086,#20087)
-stmt_containers(#20086,#20081)
-#20088=*
-stmts(#20088,0,#20001,3,";")
-hasLocation(#20088,#20051)
-stmt_containers(#20088,#20001)
-#20089=*
-entry_cfg_node(#20089,#20001)
-#20090=@"loc,{#10000},1,1,1,0"
-locations_default(#20090,#10000,1,1,1,0)
-hasLocation(#20089,#20090)
-#20091=*
-exit_cfg_node(#20091,#20001)
-hasLocation(#20091,#20053)
-successor(#20088,#20091)
-successor(#20079,#20081)
-successor(#20081,#20088)
+exprs(#20086,78,#20084,-1,"f")
+hasLocation(#20086,#20041)
+expr_containers(#20086,#20084)
+literals("f","f",#20086)
+decl(#20086,#20058)
+#20087=*
+scopes(#20087,1)
+scopenodes(#20084,#20087)
+scopenesting(#20087,#20055)
+#20088=@"var;{this};{#20087}"
+variables(#20088,"this",#20087)
+#20089=@"var;{arguments};{#20087}"
+variables(#20089,"arguments",#20087)
+is_arguments_object(#20089)
+#20090=*
+stmts(#20090,1,#20084,-2,"{}")
+#20091=@"loc,{#10000},5,29,5,30"
+locations_default(#20091,#10000,5,29,5,30)
+hasLocation(#20090,#20091)
+stmt_containers(#20090,#20084)
 #20092=*
-entry_cfg_node(#20092,#20081)
-#20093=@"loc,{#10000},5,16,5,15"
-locations_default(#20093,#10000,5,16,5,15)
-hasLocation(#20092,#20093)
-#20094=*
-exit_cfg_node(#20094,#20081)
-#20095=@"loc,{#10000},5,31,5,30"
-locations_default(#20095,#10000,5,31,5,30)
-hasLocation(#20094,#20095)
-successor(#20086,#20094)
-successor(#20092,#20086)
-successor(#20067,#20070)
-successor(#20075,#20072)
+stmts(#20092,0,#20001,3,";")
+hasLocation(#20092,#20051)
+stmt_containers(#20092,#20001)
+#20093=*
+entry_cfg_node(#20093,#20001)
+#20094=@"loc,{#10000},1,1,1,0"
+locations_default(#20094,#10000,1,1,1,0)
+hasLocation(#20093,#20094)
+#20095=*
+exit_cfg_node(#20095,#20001)
+hasLocation(#20095,#20053)
+successor(#20092,#20095)
+successor(#20082,#20084)
+successor(#20084,#20092)
 #20096=*
-entry_cfg_node(#20096,#20075)
-hasLocation(#20096,#20073)
-#20097=*
-exit_cfg_node(#20097,#20075)
-hasLocation(#20097,#20073)
-successor(#20078,#20097)
-successor(#20096,#20078)
-successor(#20074,#20075)
-successor(#20072,#20068)
-successor(#20070,#20074)
-successor(#20068,#20079)
-successor(#20060,#20061)
-successor(#20061,#20065)
-successor(#20066,#20063)
-successor(#20065,#20066)
-successor(#20063,#20067)
-successor(#20083,#20060)
-successor(#20089,#20083)
+entry_cfg_node(#20096,#20084)
+#20097=@"loc,{#10000},5,16,5,15"
+locations_default(#20097,#10000,5,16,5,15)
+hasLocation(#20096,#20097)
+#20098=*
+exit_cfg_node(#20098,#20084)
+#20099=@"loc,{#10000},5,31,5,30"
+locations_default(#20099,#10000,5,31,5,30)
+hasLocation(#20098,#20099)
+successor(#20090,#20098)
+successor(#20096,#20090)
+successor(#20068,#20071)
+successor(#20077,#20074)
+#20100=*
+entry_cfg_node(#20100,#20077)
+hasLocation(#20100,#20075)
+#20101=*
+exit_cfg_node(#20101,#20077)
+hasLocation(#20101,#20075)
+successor(#20081,#20101)
+successor(#20100,#20081)
+successor(#20076,#20077)
+successor(#20074,#20069)
+successor(#20071,#20076)
+successor(#20069,#20082)
+successor(#20061,#20062)
+successor(#20062,#20066)
+successor(#20067,#20064)
+successor(#20066,#20067)
+successor(#20064,#20068)
+successor(#20086,#20061)
+successor(#20093,#20086)
 numlines(#10000,5,3,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/export2.ts.trap b/javascript/extractor/tests/ts/output/trap/export2.ts.trap
index 7b433d0d1d3..31d4e768f89 100644
--- a/javascript/extractor/tests/ts/output/trap/export2.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/export2.ts.trap
@@ -51,26 +51,28 @@ scopenodes(#20001,#20015)
 scopenesting(#20015,#20000)
 is_module(#20001)
 is_es2015_module(#20001)
-#20016=*
-stmts(#20016,29,#20001,0,"export default 42;")
-hasLocation(#20016,#20003)
-stmt_containers(#20016,#20001)
+#20016=@"var;{this};{#20015}"
+variables(#20016,"this",#20015)
 #20017=*
-exprs(#20017,3,#20016,0,"42")
-hasLocation(#20017,#20009)
-enclosing_stmt(#20017,#20016)
-expr_containers(#20017,#20001)
-literals("42","42",#20017)
+stmts(#20017,29,#20001,0,"export default 42;")
+hasLocation(#20017,#20003)
+stmt_containers(#20017,#20001)
 #20018=*
-entry_cfg_node(#20018,#20001)
-#20019=@"loc,{#10000},1,1,1,0"
-locations_default(#20019,#10000,1,1,1,0)
-hasLocation(#20018,#20019)
-#20020=*
-exit_cfg_node(#20020,#20001)
-hasLocation(#20020,#20013)
-successor(#20016,#20017)
-successor(#20017,#20020)
-successor(#20018,#20016)
+exprs(#20018,3,#20017,0,"42")
+hasLocation(#20018,#20009)
+enclosing_stmt(#20018,#20017)
+expr_containers(#20018,#20001)
+literals("42","42",#20018)
+#20019=*
+entry_cfg_node(#20019,#20001)
+#20020=@"loc,{#10000},1,1,1,0"
+locations_default(#20020,#10000,1,1,1,0)
+hasLocation(#20019,#20020)
+#20021=*
+exit_cfg_node(#20021,#20001)
+hasLocation(#20021,#20013)
+successor(#20017,#20018)
+successor(#20018,#20021)
+successor(#20019,#20017)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/exportasnamespace.d.ts.trap b/javascript/extractor/tests/ts/output/trap/exportasnamespace.d.ts.trap
index 2dcb1426943..477782d62c5 100644
--- a/javascript/extractor/tests/ts/output/trap/exportasnamespace.d.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/exportasnamespace.d.ts.trap
@@ -99,51 +99,55 @@ is_module(#20001)
 is_es2015_module(#20001)
 #20034=@"var;{foo};{#20033}"
 variables(#20034,"foo",#20033)
-#20035=*
-stmts(#20035,30,#20001,0,"export  ...  foo();")
-hasLocation(#20035,#20003)
-stmt_containers(#20035,#20001)
+#20035=@"var;{this};{#20033}"
+variables(#20035,"this",#20033)
 #20036=*
-stmts(#20036,17,#20035,-1,"declare ...  foo();")
-#20037=@"loc,{#10000},1,8,1,30"
-locations_default(#20037,#10000,1,8,1,30)
-hasLocation(#20036,#20037)
+stmts(#20036,30,#20001,0,"export  ...  foo();")
+hasLocation(#20036,#20003)
 stmt_containers(#20036,#20001)
-has_declare_keyword(#20036)
-#20038=*
-exprs(#20038,78,#20036,-1,"foo")
-hasLocation(#20038,#20013)
-expr_containers(#20038,#20036)
-literals("foo","foo",#20038)
-decl(#20038,#20034)
+#20037=*
+stmts(#20037,17,#20036,-1,"declare ...  foo();")
+#20038=@"loc,{#10000},1,8,1,30"
+locations_default(#20038,#10000,1,8,1,30)
+hasLocation(#20037,#20038)
+stmt_containers(#20037,#20001)
+has_declare_keyword(#20037)
 #20039=*
-scopes(#20039,1)
-scopenodes(#20036,#20039)
-scopenesting(#20039,#20033)
-#20040=@"var;{arguments};{#20039}"
-variables(#20040,"arguments",#20039)
-is_arguments_object(#20040)
-#20041=*
-stmts(#20041,38,#20001,1,"export  ... ce bar;")
-hasLocation(#20041,#20005)
-stmt_containers(#20041,#20001)
-#20042=*
-exprs(#20042,0,#20041,0,"bar")
-hasLocation(#20042,#20027)
-enclosing_stmt(#20042,#20041)
-expr_containers(#20042,#20001)
-literals("bar","bar",#20042)
+exprs(#20039,78,#20037,-1,"foo")
+hasLocation(#20039,#20013)
+expr_containers(#20039,#20037)
+literals("foo","foo",#20039)
+decl(#20039,#20034)
+#20040=*
+scopes(#20040,1)
+scopenodes(#20037,#20040)
+scopenesting(#20040,#20033)
+#20041=@"var;{this};{#20040}"
+variables(#20041,"this",#20040)
+#20042=@"var;{arguments};{#20040}"
+variables(#20042,"arguments",#20040)
+is_arguments_object(#20042)
 #20043=*
-entry_cfg_node(#20043,#20001)
-#20044=@"loc,{#10000},1,1,1,0"
-locations_default(#20044,#10000,1,1,1,0)
-hasLocation(#20043,#20044)
+stmts(#20043,38,#20001,1,"export  ... ce bar;")
+hasLocation(#20043,#20005)
+stmt_containers(#20043,#20001)
+#20044=*
+exprs(#20044,0,#20043,0,"bar")
+hasLocation(#20044,#20027)
+enclosing_stmt(#20044,#20043)
+expr_containers(#20044,#20001)
+literals("bar","bar",#20044)
 #20045=*
-exit_cfg_node(#20045,#20001)
-hasLocation(#20045,#20031)
-successor(#20041,#20045)
-successor(#20035,#20036)
-successor(#20036,#20041)
-successor(#20043,#20035)
+entry_cfg_node(#20045,#20001)
+#20046=@"loc,{#10000},1,1,1,0"
+locations_default(#20046,#10000,1,1,1,0)
+hasLocation(#20045,#20046)
+#20047=*
+exit_cfg_node(#20047,#20001)
+hasLocation(#20047,#20031)
+successor(#20043,#20047)
+successor(#20036,#20037)
+successor(#20037,#20043)
+successor(#20045,#20036)
 numlines(#10000,2,2,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/exportassign.ts.trap b/javascript/extractor/tests/ts/output/trap/exportassign.ts.trap
index 792efab2932..202a2af163d 100644
--- a/javascript/extractor/tests/ts/output/trap/exportassign.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/exportassign.ts.trap
@@ -51,26 +51,28 @@ scopenodes(#20001,#20015)
 scopenesting(#20015,#20000)
 is_module(#20001)
 is_es2015_module(#20001)
-#20016=*
-stmts(#20016,33,#20001,0,"export = 42;")
-hasLocation(#20016,#20003)
-stmt_containers(#20016,#20001)
+#20016=@"var;{this};{#20015}"
+variables(#20016,"this",#20015)
 #20017=*
-exprs(#20017,3,#20016,0,"42")
-hasLocation(#20017,#20009)
-enclosing_stmt(#20017,#20016)
-expr_containers(#20017,#20001)
-literals("42","42",#20017)
+stmts(#20017,33,#20001,0,"export = 42;")
+hasLocation(#20017,#20003)
+stmt_containers(#20017,#20001)
 #20018=*
-entry_cfg_node(#20018,#20001)
-#20019=@"loc,{#10000},1,1,1,0"
-locations_default(#20019,#10000,1,1,1,0)
-hasLocation(#20018,#20019)
-#20020=*
-exit_cfg_node(#20020,#20001)
-hasLocation(#20020,#20013)
-successor(#20016,#20017)
-successor(#20017,#20020)
-successor(#20018,#20016)
+exprs(#20018,3,#20017,0,"42")
+hasLocation(#20018,#20009)
+enclosing_stmt(#20018,#20017)
+expr_containers(#20018,#20001)
+literals("42","42",#20018)
+#20019=*
+entry_cfg_node(#20019,#20001)
+#20020=@"loc,{#10000},1,1,1,0"
+locations_default(#20020,#10000,1,1,1,0)
+hasLocation(#20019,#20020)
+#20021=*
+exit_cfg_node(#20021,#20001)
+hasLocation(#20021,#20013)
+successor(#20017,#20018)
+successor(#20018,#20021)
+successor(#20019,#20017)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/exportclass.ts.trap b/javascript/extractor/tests/ts/output/trap/exportclass.ts.trap
index 7c8bd5baf2d..0196615e2b1 100644
--- a/javascript/extractor/tests/ts/output/trap/exportclass.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/exportclass.ts.trap
@@ -51,64 +51,74 @@ scopenodes(#20001,#20015)
 scopenesting(#20015,#20000)
 is_module(#20001)
 is_es2015_module(#20001)
-#20016=*
-stmts(#20016,30,#20001,0,"export class {}")
-hasLocation(#20016,#20003)
-stmt_containers(#20016,#20001)
+#20016=@"var;{this};{#20015}"
+variables(#20016,"this",#20015)
 #20017=*
-stmts(#20017,26,#20016,-1,"class {}")
-#20018=@"loc,{#10000},1,8,1,15"
-locations_default(#20018,#10000,1,8,1,15)
-hasLocation(#20017,#20018)
+stmts(#20017,30,#20001,0,"export class {}")
+hasLocation(#20017,#20003)
 stmt_containers(#20017,#20001)
-#20019=*
-properties(#20019,#20017,2,0,"constructor() {}")
-#20020=@"loc,{#10000},1,6,1,5"
-locations_default(#20020,#10000,1,6,1,5)
-hasLocation(#20019,#20020)
-#20021=*
-exprs(#20021,0,#20019,0,"constructor")
-hasLocation(#20021,#20020)
-enclosing_stmt(#20021,#20017)
-expr_containers(#20021,#20001)
-literals("constructor","constructor",#20021)
+#20018=*
+stmts(#20018,26,#20017,-1,"class {}")
+#20019=@"loc,{#10000},1,8,1,15"
+locations_default(#20019,#10000,1,8,1,15)
+hasLocation(#20018,#20019)
+stmt_containers(#20018,#20001)
+#20020=*
+scopes(#20020,10)
+scopenodes(#20018,#20020)
+scopenesting(#20020,#20015)
+#20021=@"var;{this};{#20020}"
+variables(#20021,"this",#20020)
 #20022=*
-exprs(#20022,9,#20019,1,"() {}")
-hasLocation(#20022,#20020)
-enclosing_stmt(#20022,#20017)
-expr_containers(#20022,#20001)
-#20023=*
-scopes(#20023,1)
-scopenodes(#20022,#20023)
-scopenesting(#20023,#20015)
-#20024=@"var;{arguments};{#20023}"
-variables(#20024,"arguments",#20023)
-is_arguments_object(#20024)
+properties(#20022,#20018,2,0,"constructor() {}")
+#20023=@"loc,{#10000},1,6,1,5"
+locations_default(#20023,#10000,1,6,1,5)
+hasLocation(#20022,#20023)
+#20024=*
+exprs(#20024,0,#20022,0,"constructor")
+hasLocation(#20024,#20023)
+enclosing_stmt(#20024,#20018)
+expr_containers(#20024,#20001)
+literals("constructor","constructor",#20024)
 #20025=*
-stmts(#20025,1,#20022,-2,"{}")
-hasLocation(#20025,#20020)
-stmt_containers(#20025,#20022)
-is_method(#20019)
+exprs(#20025,9,#20022,1,"() {}")
+hasLocation(#20025,#20023)
+enclosing_stmt(#20025,#20018)
+expr_containers(#20025,#20001)
 #20026=*
-entry_cfg_node(#20026,#20001)
-#20027=@"loc,{#10000},1,1,1,0"
-locations_default(#20027,#10000,1,1,1,0)
-hasLocation(#20026,#20027)
-#20028=*
-exit_cfg_node(#20028,#20001)
-hasLocation(#20028,#20013)
-successor(#20022,#20019)
+scopes(#20026,1)
+scopenodes(#20025,#20026)
+scopenesting(#20026,#20020)
+#20027=@"var;{this};{#20026}"
+variables(#20027,"this",#20026)
+#20028=@"var;{arguments};{#20026}"
+variables(#20028,"arguments",#20026)
+is_arguments_object(#20028)
 #20029=*
-entry_cfg_node(#20029,#20022)
-hasLocation(#20029,#20020)
+stmts(#20029,1,#20025,-2,"{}")
+hasLocation(#20029,#20023)
+stmt_containers(#20029,#20025)
+is_method(#20022)
 #20030=*
-exit_cfg_node(#20030,#20022)
-hasLocation(#20030,#20020)
-successor(#20025,#20030)
-successor(#20029,#20025)
-successor(#20021,#20022)
-successor(#20019,#20017)
-successor(#20017,#20028)
-successor(#20026,#20016)
+entry_cfg_node(#20030,#20001)
+#20031=@"loc,{#10000},1,1,1,0"
+locations_default(#20031,#10000,1,1,1,0)
+hasLocation(#20030,#20031)
+#20032=*
+exit_cfg_node(#20032,#20001)
+hasLocation(#20032,#20013)
+successor(#20025,#20022)
+#20033=*
+entry_cfg_node(#20033,#20025)
+hasLocation(#20033,#20023)
+#20034=*
+exit_cfg_node(#20034,#20025)
+hasLocation(#20034,#20023)
+successor(#20029,#20034)
+successor(#20033,#20029)
+successor(#20024,#20025)
+successor(#20022,#20018)
+successor(#20018,#20032)
+successor(#20030,#20017)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/exprs.ts.trap b/javascript/extractor/tests/ts/output/trap/exprs.ts.trap
index 02fe28fbb60..5f6452e3871 100644
--- a/javascript/extractor/tests/ts/output/trap/exprs.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/exprs.ts.trap
@@ -171,178 +171,182 @@ locations_default(#20061,#10000,1,1,5,1)
 hasLocation(#20001,#20061)
 #20062=@"var;{f};{#20000}"
 variables(#20062,"f",#20000)
-#20063=*
-stmts(#20063,17,#20001,0,"functio ...  = z;\n}")
-hasLocation(#20063,#20061)
-stmt_containers(#20063,#20001)
+#20063=@"var;{this};{#20000}"
+variables(#20063,"this",#20000)
 #20064=*
-exprs(#20064,78,#20063,-1,"f")
-hasLocation(#20064,#20015)
-expr_containers(#20064,#20063)
-literals("f","f",#20064)
-decl(#20064,#20062)
+stmts(#20064,17,#20001,0,"functio ...  = z;\n}")
+hasLocation(#20064,#20061)
+stmt_containers(#20064,#20001)
 #20065=*
-scopes(#20065,1)
-scopenodes(#20063,#20065)
-scopenesting(#20065,#20000)
-#20066=@"var;{z};{#20065}"
-variables(#20066,"z",#20065)
-#20067=*
-exprs(#20067,78,#20063,0,"z")
-hasLocation(#20067,#20019)
-expr_containers(#20067,#20063)
-literals("z","z",#20067)
-decl(#20067,#20066)
-#20068=@"var;{arguments};{#20065}"
-variables(#20068,"arguments",#20065)
-is_arguments_object(#20068)
+exprs(#20065,78,#20064,-1,"f")
+hasLocation(#20065,#20015)
+expr_containers(#20065,#20064)
+literals("f","f",#20065)
+decl(#20065,#20062)
+#20066=*
+scopes(#20066,1)
+scopenodes(#20064,#20066)
+scopenesting(#20066,#20000)
+#20067=@"var;{this};{#20066}"
+variables(#20067,"this",#20066)
+#20068=@"var;{z};{#20066}"
+variables(#20068,"z",#20066)
 #20069=*
-stmts(#20069,1,#20063,-2,"{\n  let ...  = z;\n}")
-#20070=@"loc,{#10000},1,15,5,1"
-locations_default(#20070,#10000,1,15,5,1)
-hasLocation(#20069,#20070)
-stmt_containers(#20069,#20063)
+exprs(#20069,78,#20064,0,"z")
+hasLocation(#20069,#20019)
+expr_containers(#20069,#20064)
+literals("z","z",#20069)
+decl(#20069,#20068)
+#20070=@"var;{arguments};{#20066}"
+variables(#20070,"arguments",#20066)
+is_arguments_object(#20070)
 #20071=*
-scopes(#20071,4)
-scopenodes(#20069,#20071)
-scopenesting(#20071,#20065)
-#20072=@"var;{x};{#20071}"
-variables(#20072,"x",#20071)
-#20073=@"var;{y};{#20071}"
-variables(#20073,"y",#20071)
-#20074=*
-stmts(#20074,23,#20069,0,"let x, y;")
-#20075=@"loc,{#10000},2,3,2,11"
-locations_default(#20075,#10000,2,3,2,11)
-hasLocation(#20074,#20075)
-stmt_containers(#20074,#20063)
+stmts(#20071,1,#20064,-2,"{\n  let ...  = z;\n}")
+#20072=@"loc,{#10000},1,15,5,1"
+locations_default(#20072,#10000,1,15,5,1)
+hasLocation(#20071,#20072)
+stmt_containers(#20071,#20064)
+#20073=*
+scopes(#20073,4)
+scopenodes(#20071,#20073)
+scopenesting(#20073,#20066)
+#20074=@"var;{x};{#20073}"
+variables(#20074,"x",#20073)
+#20075=@"var;{y};{#20073}"
+variables(#20075,"y",#20073)
 #20076=*
-exprs(#20076,64,#20074,0,"x")
-hasLocation(#20076,#20027)
-enclosing_stmt(#20076,#20074)
-expr_containers(#20076,#20063)
-#20077=*
-exprs(#20077,78,#20076,0,"x")
-hasLocation(#20077,#20027)
-enclosing_stmt(#20077,#20074)
-expr_containers(#20077,#20063)
-literals("x","x",#20077)
-decl(#20077,#20072)
+stmts(#20076,23,#20071,0,"let x, y;")
+#20077=@"loc,{#10000},2,3,2,11"
+locations_default(#20077,#10000,2,3,2,11)
+hasLocation(#20076,#20077)
+stmt_containers(#20076,#20064)
 #20078=*
-exprs(#20078,64,#20074,1,"y")
-hasLocation(#20078,#20031)
-enclosing_stmt(#20078,#20074)
-expr_containers(#20078,#20063)
+exprs(#20078,64,#20076,0,"x")
+hasLocation(#20078,#20027)
+enclosing_stmt(#20078,#20076)
+expr_containers(#20078,#20064)
 #20079=*
-exprs(#20079,78,#20078,0,"y")
-hasLocation(#20079,#20031)
-enclosing_stmt(#20079,#20074)
-expr_containers(#20079,#20063)
-literals("y","y",#20079)
-decl(#20079,#20073)
+exprs(#20079,78,#20078,0,"x")
+hasLocation(#20079,#20027)
+enclosing_stmt(#20079,#20076)
+expr_containers(#20079,#20064)
+literals("x","x",#20079)
+decl(#20079,#20074)
 #20080=*
-stmts(#20080,2,#20069,1,"x, y;")
-#20081=@"loc,{#10000},3,3,3,7"
-locations_default(#20081,#10000,3,3,3,7)
-hasLocation(#20080,#20081)
-stmt_containers(#20080,#20063)
+exprs(#20080,64,#20076,1,"y")
+hasLocation(#20080,#20031)
+enclosing_stmt(#20080,#20076)
+expr_containers(#20080,#20064)
+#20081=*
+exprs(#20081,78,#20080,0,"y")
+hasLocation(#20081,#20031)
+enclosing_stmt(#20081,#20076)
+expr_containers(#20081,#20064)
+literals("y","y",#20081)
+decl(#20081,#20075)
 #20082=*
-exprs(#20082,10,#20080,0,"x, y")
-#20083=@"loc,{#10000},3,3,3,6"
-locations_default(#20083,#10000,3,3,3,6)
+stmts(#20082,2,#20071,1,"x, y;")
+#20083=@"loc,{#10000},3,3,3,7"
+locations_default(#20083,#10000,3,3,3,7)
 hasLocation(#20082,#20083)
-enclosing_stmt(#20082,#20080)
-expr_containers(#20082,#20063)
+stmt_containers(#20082,#20064)
 #20084=*
-exprs(#20084,79,#20082,0,"x")
-hasLocation(#20084,#20035)
-enclosing_stmt(#20084,#20080)
-expr_containers(#20084,#20063)
-literals("x","x",#20084)
-bind(#20084,#20072)
-#20085=*
-exprs(#20085,79,#20082,1,"y")
-hasLocation(#20085,#20039)
-enclosing_stmt(#20085,#20080)
-expr_containers(#20085,#20063)
-literals("y","y",#20085)
-bind(#20085,#20073)
+exprs(#20084,10,#20082,0,"x, y")
+#20085=@"loc,{#10000},3,3,3,6"
+locations_default(#20085,#10000,3,3,3,6)
+hasLocation(#20084,#20085)
+enclosing_stmt(#20084,#20082)
+expr_containers(#20084,#20064)
 #20086=*
-stmts(#20086,2,#20069,2,"[x, y] = z;")
-#20087=@"loc,{#10000},4,3,4,13"
-locations_default(#20087,#10000,4,3,4,13)
-hasLocation(#20086,#20087)
-stmt_containers(#20086,#20063)
+exprs(#20086,79,#20084,0,"x")
+hasLocation(#20086,#20035)
+enclosing_stmt(#20086,#20082)
+expr_containers(#20086,#20064)
+literals("x","x",#20086)
+bind(#20086,#20074)
+#20087=*
+exprs(#20087,79,#20084,1,"y")
+hasLocation(#20087,#20039)
+enclosing_stmt(#20087,#20082)
+expr_containers(#20087,#20064)
+literals("y","y",#20087)
+bind(#20087,#20075)
 #20088=*
-exprs(#20088,47,#20086,0,"[x, y] = z")
-#20089=@"loc,{#10000},4,3,4,12"
-locations_default(#20089,#10000,4,3,4,12)
+stmts(#20088,2,#20071,2,"[x, y] = z;")
+#20089=@"loc,{#10000},4,3,4,13"
+locations_default(#20089,#10000,4,3,4,13)
 hasLocation(#20088,#20089)
-enclosing_stmt(#20088,#20086)
-expr_containers(#20088,#20063)
+stmt_containers(#20088,#20064)
 #20090=*
-exprs(#20090,67,#20088,0,"[x, y]")
-#20091=@"loc,{#10000},4,3,4,8"
-locations_default(#20091,#10000,4,3,4,8)
+exprs(#20090,47,#20088,0,"[x, y] = z")
+#20091=@"loc,{#10000},4,3,4,12"
+locations_default(#20091,#10000,4,3,4,12)
 hasLocation(#20090,#20091)
-enclosing_stmt(#20090,#20086)
-expr_containers(#20090,#20063)
+enclosing_stmt(#20090,#20088)
+expr_containers(#20090,#20064)
 #20092=*
-exprs(#20092,79,#20090,0,"x")
-hasLocation(#20092,#20045)
-enclosing_stmt(#20092,#20086)
-expr_containers(#20092,#20063)
-literals("x","x",#20092)
-bind(#20092,#20072)
-#20093=*
-exprs(#20093,79,#20090,1,"y")
-hasLocation(#20093,#20049)
-enclosing_stmt(#20093,#20086)
-expr_containers(#20093,#20063)
-literals("y","y",#20093)
-bind(#20093,#20073)
-array_size(#20090,2)
+exprs(#20092,67,#20090,0,"[x, y]")
+#20093=@"loc,{#10000},4,3,4,8"
+locations_default(#20093,#10000,4,3,4,8)
+hasLocation(#20092,#20093)
+enclosing_stmt(#20092,#20088)
+expr_containers(#20092,#20064)
 #20094=*
-exprs(#20094,79,#20088,1,"z")
-hasLocation(#20094,#20055)
-enclosing_stmt(#20094,#20086)
-expr_containers(#20094,#20063)
-literals("z","z",#20094)
-bind(#20094,#20066)
+exprs(#20094,79,#20092,0,"x")
+hasLocation(#20094,#20045)
+enclosing_stmt(#20094,#20088)
+expr_containers(#20094,#20064)
+literals("x","x",#20094)
+bind(#20094,#20074)
 #20095=*
-entry_cfg_node(#20095,#20001)
-#20096=@"loc,{#10000},1,1,1,0"
-locations_default(#20096,#10000,1,1,1,0)
-hasLocation(#20095,#20096)
+exprs(#20095,79,#20092,1,"y")
+hasLocation(#20095,#20049)
+enclosing_stmt(#20095,#20088)
+expr_containers(#20095,#20064)
+literals("y","y",#20095)
+bind(#20095,#20075)
+array_size(#20092,2)
+#20096=*
+exprs(#20096,79,#20090,1,"z")
+hasLocation(#20096,#20055)
+enclosing_stmt(#20096,#20088)
+expr_containers(#20096,#20064)
+literals("z","z",#20096)
+bind(#20096,#20068)
 #20097=*
-exit_cfg_node(#20097,#20001)
-hasLocation(#20097,#20060)
-successor(#20063,#20097)
-#20098=*
-entry_cfg_node(#20098,#20063)
-hasLocation(#20098,#20096)
+entry_cfg_node(#20097,#20001)
+#20098=@"loc,{#10000},1,1,1,0"
+locations_default(#20098,#10000,1,1,1,0)
+hasLocation(#20097,#20098)
 #20099=*
-exit_cfg_node(#20099,#20063)
+exit_cfg_node(#20099,#20001)
 hasLocation(#20099,#20060)
-successor(#20086,#20094)
-successor(#20090,#20092)
-successor(#20093,#20088)
-successor(#20092,#20093)
-successor(#20094,#20090)
-successor(#20088,#20099)
-successor(#20080,#20082)
+successor(#20064,#20099)
+#20100=*
+entry_cfg_node(#20100,#20064)
+hasLocation(#20100,#20098)
+#20101=*
+exit_cfg_node(#20101,#20064)
+hasLocation(#20101,#20060)
+successor(#20088,#20096)
+successor(#20092,#20094)
+successor(#20095,#20090)
+successor(#20094,#20095)
+successor(#20096,#20092)
+successor(#20090,#20101)
 successor(#20082,#20084)
-successor(#20085,#20086)
-successor(#20084,#20085)
-successor(#20074,#20077)
-successor(#20079,#20078)
-successor(#20078,#20080)
-successor(#20077,#20076)
+successor(#20084,#20086)
+successor(#20087,#20088)
+successor(#20086,#20087)
 successor(#20076,#20079)
-successor(#20069,#20074)
-successor(#20067,#20069)
-successor(#20098,#20067)
-successor(#20064,#20063)
-successor(#20095,#20064)
+successor(#20081,#20080)
+successor(#20080,#20082)
+successor(#20079,#20078)
+successor(#20078,#20081)
+successor(#20071,#20076)
+successor(#20069,#20071)
+successor(#20100,#20069)
+successor(#20065,#20064)
+successor(#20097,#20065)
 numlines(#10000,5,5,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/externalmodule.ts.trap b/javascript/extractor/tests/ts/output/trap/externalmodule.ts.trap
index 0c2d918cd91..c9e120662a3 100644
--- a/javascript/extractor/tests/ts/output/trap/externalmodule.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/externalmodule.ts.trap
@@ -228,149 +228,153 @@ toplevels(#20001,0)
 #20081=@"loc,{#10000},1,1,10,0"
 locations_default(#20081,#10000,1,1,10,0)
 hasLocation(#20001,#20081)
-#20082=*
-stmts(#20082,37,#20001,0,"declare ...  = M;\n}")
-#20083=@"loc,{#10000},1,1,9,1"
-locations_default(#20083,#10000,1,1,9,1)
-hasLocation(#20082,#20083)
-stmt_containers(#20082,#20001)
-has_declare_keyword(#20082)
-#20084=*
-exprs(#20084,4,#20082,-1,"""X""")
-hasLocation(#20084,#20025)
-enclosing_stmt(#20084,#20082)
-expr_containers(#20084,#20001)
-literals("X","""X""",#20084)
+#20082=@"var;{this};{#20000}"
+variables(#20082,"this",#20000)
+#20083=*
+stmts(#20083,37,#20001,0,"declare ...  = M;\n}")
+#20084=@"loc,{#10000},1,1,9,1"
+locations_default(#20084,#10000,1,1,9,1)
+hasLocation(#20083,#20084)
+stmt_containers(#20083,#20001)
+has_declare_keyword(#20083)
 #20085=*
-regexpterm(#20085,14,#20084,0,"X")
-#20086=@"loc,{#10000},1,17,1,17"
-locations_default(#20086,#10000,1,17,1,17)
-hasLocation(#20085,#20086)
-regexp_const_value(#20085,"X")
-#20087=*
-scopes(#20087,15)
-scopenodes(#20082,#20087)
-scopenesting(#20087,#20000)
-#20088=@"local_namespace_name;{M};{#20087}"
-local_namespace_names(#20088,"M",#20087)
-#20089=@"local_type_name;{M};{#20087}"
-local_type_names(#20089,"M",#20087)
-#20090=*
-stmts(#20090,31,#20082,0,"module  ...  {}\n  }")
-#20091=@"loc,{#10000},2,3,4,3"
-locations_default(#20091,#10000,2,3,4,3)
-hasLocation(#20090,#20091)
-stmt_containers(#20090,#20082)
-#20092=*
-exprs(#20092,78,#20090,-1,"M")
-hasLocation(#20092,#20031)
-enclosing_stmt(#20092,#20090)
-expr_containers(#20092,#20082)
-literals("M","M",#20092)
-namespacedecl(#20092,#20088)
+exprs(#20085,4,#20083,-1,"""X""")
+hasLocation(#20085,#20025)
+enclosing_stmt(#20085,#20083)
+expr_containers(#20085,#20001)
+literals("X","""X""",#20085)
+#20086=*
+regexpterm(#20086,14,#20085,0,"X")
+#20087=@"loc,{#10000},1,17,1,17"
+locations_default(#20087,#10000,1,17,1,17)
+hasLocation(#20086,#20087)
+regexp_const_value(#20086,"X")
+#20088=*
+scopes(#20088,15)
+scopenodes(#20083,#20088)
+scopenesting(#20088,#20000)
+#20089=@"local_namespace_name;{M};{#20088}"
+local_namespace_names(#20089,"M",#20088)
+#20090=@"local_type_name;{M};{#20088}"
+local_type_names(#20090,"M",#20088)
+#20091=*
+stmts(#20091,31,#20083,0,"module  ...  {}\n  }")
+#20092=@"loc,{#10000},2,3,4,3"
+locations_default(#20092,#10000,2,3,4,3)
+hasLocation(#20091,#20092)
+stmt_containers(#20091,#20083)
 #20093=*
-scopes(#20093,9)
-scopenodes(#20090,#20093)
-scopenesting(#20093,#20087)
-#20094=@"local_type_name;{I};{#20093}"
-local_type_names(#20094,"I",#20093)
-#20095=*
-stmts(#20095,30,#20090,0,"export  ... ce I {}")
-#20096=@"loc,{#10000},3,5,3,25"
-locations_default(#20096,#10000,3,5,3,25)
-hasLocation(#20095,#20096)
-stmt_containers(#20095,#20090)
-#20097=*
-stmts(#20097,34,#20095,-1,"interface I {}")
-#20098=@"loc,{#10000},3,12,3,25"
-locations_default(#20098,#10000,3,12,3,25)
-hasLocation(#20097,#20098)
-stmt_containers(#20097,#20090)
-#20099=*
-typeexprs(#20099,1,#20097,0,"I")
-hasLocation(#20099,#20039)
-enclosing_stmt(#20099,#20097)
-expr_containers(#20099,#20090)
-literals("I","I",#20099)
-typedecl(#20099,#20094)
+exprs(#20093,78,#20091,-1,"M")
+hasLocation(#20093,#20031)
+enclosing_stmt(#20093,#20091)
+expr_containers(#20093,#20083)
+literals("M","M",#20093)
+namespacedecl(#20093,#20089)
+#20094=*
+scopes(#20094,9)
+scopenodes(#20091,#20094)
+scopenesting(#20094,#20088)
+#20095=@"local_type_name;{I};{#20094}"
+local_type_names(#20095,"I",#20094)
+#20096=*
+stmts(#20096,30,#20091,0,"export  ... ce I {}")
+#20097=@"loc,{#10000},3,5,3,25"
+locations_default(#20097,#10000,3,5,3,25)
+hasLocation(#20096,#20097)
+stmt_containers(#20096,#20091)
+#20098=*
+stmts(#20098,34,#20096,-1,"interface I {}")
+#20099=@"loc,{#10000},3,12,3,25"
+locations_default(#20099,#10000,3,12,3,25)
+hasLocation(#20098,#20099)
+stmt_containers(#20098,#20091)
 #20100=*
-stmts(#20100,34,#20082,1,"interfa ... .I;\n  }")
-#20101=@"loc,{#10000},5,3,7,3"
-locations_default(#20101,#10000,5,3,7,3)
-hasLocation(#20100,#20101)
-stmt_containers(#20100,#20082)
-#20102=*
-typeexprs(#20102,1,#20100,0,"M")
-hasLocation(#20102,#20049)
-enclosing_stmt(#20102,#20100)
-expr_containers(#20102,#20082)
-literals("M","M",#20102)
-typedecl(#20102,#20089)
+typeexprs(#20100,1,#20098,0,"I")
+hasLocation(#20100,#20039)
+enclosing_stmt(#20100,#20098)
+expr_containers(#20100,#20091)
+literals("I","I",#20100)
+typedecl(#20100,#20095)
+#20101=*
+stmts(#20101,34,#20083,1,"interfa ... .I;\n  }")
+#20102=@"loc,{#10000},5,3,7,3"
+locations_default(#20102,#10000,5,3,7,3)
+hasLocation(#20101,#20102)
+stmt_containers(#20101,#20083)
 #20103=*
-properties(#20103,#20100,2,0,"method(): M.I;")
-#20104=@"loc,{#10000},6,5,6,18"
-locations_default(#20104,#10000,6,5,6,18)
-hasLocation(#20103,#20104)
-#20105=*
-exprs(#20105,0,#20103,0,"method")
-hasLocation(#20105,#20053)
-enclosing_stmt(#20105,#20100)
-expr_containers(#20105,#20082)
-literals("method","method",#20105)
+typeexprs(#20103,1,#20101,0,"M")
+hasLocation(#20103,#20049)
+enclosing_stmt(#20103,#20101)
+expr_containers(#20103,#20083)
+literals("M","M",#20103)
+typedecl(#20103,#20090)
+#20104=*
+properties(#20104,#20101,2,0,"method(): M.I;")
+#20105=@"loc,{#10000},6,5,6,18"
+locations_default(#20105,#10000,6,5,6,18)
+hasLocation(#20104,#20105)
 #20106=*
-exprs(#20106,9,#20103,1,"method(): M.I;")
-hasLocation(#20106,#20104)
-enclosing_stmt(#20106,#20100)
-expr_containers(#20106,#20082)
+exprs(#20106,0,#20104,0,"method")
+hasLocation(#20106,#20053)
+enclosing_stmt(#20106,#20101)
+expr_containers(#20106,#20083)
+literals("method","method",#20106)
 #20107=*
-scopes(#20107,1)
-scopenodes(#20106,#20107)
-scopenesting(#20107,#20087)
-#20108=@"var;{arguments};{#20107}"
-variables(#20108,"arguments",#20107)
-is_arguments_object(#20108)
-#20109=*
-typeexprs(#20109,13,#20106,-3,"M.I")
-#20110=@"loc,{#10000},6,15,6,17"
-locations_default(#20110,#10000,6,15,6,17)
-hasLocation(#20109,#20110)
-expr_containers(#20109,#20106)
+exprs(#20107,9,#20104,1,"method(): M.I;")
+hasLocation(#20107,#20105)
+enclosing_stmt(#20107,#20101)
+expr_containers(#20107,#20083)
+#20108=*
+scopes(#20108,1)
+scopenodes(#20107,#20108)
+scopenesting(#20108,#20088)
+#20109=@"var;{this};{#20108}"
+variables(#20109,"this",#20108)
+#20110=@"var;{arguments};{#20108}"
+variables(#20110,"arguments",#20108)
+is_arguments_object(#20110)
 #20111=*
-typeexprs(#20111,25,#20109,0,"M")
-hasLocation(#20111,#20061)
-expr_containers(#20111,#20106)
-literals("M","M",#20111)
-namespacebind(#20111,#20088)
-#20112=*
-typeexprs(#20112,15,#20109,1,"I")
-hasLocation(#20112,#20065)
-expr_containers(#20112,#20106)
-literals("I","I",#20112)
-is_method(#20103)
-is_abstract_member(#20103)
+typeexprs(#20111,13,#20107,-3,"M.I")
+#20112=@"loc,{#10000},6,15,6,17"
+locations_default(#20112,#10000,6,15,6,17)
+hasLocation(#20111,#20112)
+expr_containers(#20111,#20107)
 #20113=*
-stmts(#20113,33,#20082,2,"export = M;")
-#20114=@"loc,{#10000},8,3,8,13"
-locations_default(#20114,#10000,8,3,8,13)
-hasLocation(#20113,#20114)
-stmt_containers(#20113,#20082)
+typeexprs(#20113,25,#20111,0,"M")
+hasLocation(#20113,#20061)
+expr_containers(#20113,#20107)
+literals("M","M",#20113)
+namespacebind(#20113,#20089)
+#20114=*
+typeexprs(#20114,15,#20111,1,"I")
+hasLocation(#20114,#20065)
+expr_containers(#20114,#20107)
+literals("I","I",#20114)
+is_method(#20104)
+is_abstract_member(#20104)
 #20115=*
-exprs(#20115,103,#20113,0,"M")
-hasLocation(#20115,#20075)
-enclosing_stmt(#20115,#20113)
-expr_containers(#20115,#20082)
-literals("M","M",#20115)
-typebind(#20115,#20089)
-namespacebind(#20115,#20088)
-#20116=*
-entry_cfg_node(#20116,#20001)
-#20117=@"loc,{#10000},1,1,1,0"
-locations_default(#20117,#10000,1,1,1,0)
-hasLocation(#20116,#20117)
+stmts(#20115,33,#20083,2,"export = M;")
+#20116=@"loc,{#10000},8,3,8,13"
+locations_default(#20116,#10000,8,3,8,13)
+hasLocation(#20115,#20116)
+stmt_containers(#20115,#20083)
+#20117=*
+exprs(#20117,103,#20115,0,"M")
+hasLocation(#20117,#20075)
+enclosing_stmt(#20117,#20115)
+expr_containers(#20117,#20083)
+literals("M","M",#20117)
+typebind(#20117,#20090)
+namespacebind(#20117,#20089)
 #20118=*
-exit_cfg_node(#20118,#20001)
-hasLocation(#20118,#20080)
-successor(#20082,#20118)
-successor(#20116,#20082)
+entry_cfg_node(#20118,#20001)
+#20119=@"loc,{#10000},1,1,1,0"
+locations_default(#20119,#10000,1,1,1,0)
+hasLocation(#20118,#20119)
+#20120=*
+exit_cfg_node(#20120,#20001)
+hasLocation(#20120,#20080)
+successor(#20083,#20120)
+successor(#20118,#20083)
 numlines(#10000,9,9,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/functiondecorators.ts.trap b/javascript/extractor/tests/ts/output/trap/functiondecorators.ts.trap
index 00276bb6464..00577ab98e7 100644
--- a/javascript/extractor/tests/ts/output/trap/functiondecorators.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/functiondecorators.ts.trap
@@ -593,765 +593,785 @@ variables(#20224,"C",#20000)
 variables(#20224,"C",#20000)
 #20225=@"local_type_name;{C};{#20000}"
 local_type_names(#20225,"C",#20000)
-#20226=*
-stmts(#20226,18,#20001,0,"declare var A : any;")
-hasLocation(#20226,#20003)
-stmt_containers(#20226,#20001)
-has_declare_keyword(#20226)
+#20226=@"var;{this};{#20000}"
+variables(#20226,"this",#20000)
 #20227=*
-exprs(#20227,64,#20226,0,"A : any")
-#20228=@"loc,{#10000},1,13,1,19"
-locations_default(#20228,#10000,1,13,1,19)
-hasLocation(#20227,#20228)
-enclosing_stmt(#20227,#20226)
-expr_containers(#20227,#20001)
-#20229=*
-exprs(#20229,78,#20227,0,"A")
-hasLocation(#20229,#20037)
-enclosing_stmt(#20229,#20226)
-expr_containers(#20229,#20001)
-literals("A","A",#20229)
-decl(#20229,#20222)
+stmts(#20227,18,#20001,0,"declare var A : any;")
+hasLocation(#20227,#20003)
+stmt_containers(#20227,#20001)
+has_declare_keyword(#20227)
+#20228=*
+exprs(#20228,64,#20227,0,"A : any")
+#20229=@"loc,{#10000},1,13,1,19"
+locations_default(#20229,#10000,1,13,1,19)
+hasLocation(#20228,#20229)
+enclosing_stmt(#20228,#20227)
+expr_containers(#20228,#20001)
 #20230=*
-typeexprs(#20230,2,#20227,2,"any")
-hasLocation(#20230,#20041)
-enclosing_stmt(#20230,#20226)
+exprs(#20230,78,#20228,0,"A")
+hasLocation(#20230,#20037)
+enclosing_stmt(#20230,#20227)
 expr_containers(#20230,#20001)
-literals("any","any",#20230)
+literals("A","A",#20230)
+decl(#20230,#20222)
 #20231=*
-stmts(#20231,18,#20001,1,"declare var B : any;")
-hasLocation(#20231,#20005)
-stmt_containers(#20231,#20001)
-has_declare_keyword(#20231)
+typeexprs(#20231,2,#20228,2,"any")
+hasLocation(#20231,#20041)
+enclosing_stmt(#20231,#20227)
+expr_containers(#20231,#20001)
+literals("any","any",#20231)
 #20232=*
-exprs(#20232,64,#20231,0,"B : any")
-#20233=@"loc,{#10000},2,13,2,19"
-locations_default(#20233,#10000,2,13,2,19)
-hasLocation(#20232,#20233)
-enclosing_stmt(#20232,#20231)
-expr_containers(#20232,#20001)
-#20234=*
-exprs(#20234,78,#20232,0,"B")
-hasLocation(#20234,#20049)
-enclosing_stmt(#20234,#20231)
-expr_containers(#20234,#20001)
-literals("B","B",#20234)
-decl(#20234,#20223)
+stmts(#20232,18,#20001,1,"declare var B : any;")
+hasLocation(#20232,#20005)
+stmt_containers(#20232,#20001)
+has_declare_keyword(#20232)
+#20233=*
+exprs(#20233,64,#20232,0,"B : any")
+#20234=@"loc,{#10000},2,13,2,19"
+locations_default(#20234,#10000,2,13,2,19)
+hasLocation(#20233,#20234)
+enclosing_stmt(#20233,#20232)
+expr_containers(#20233,#20001)
 #20235=*
-typeexprs(#20235,2,#20232,2,"any")
-hasLocation(#20235,#20053)
-enclosing_stmt(#20235,#20231)
+exprs(#20235,78,#20233,0,"B")
+hasLocation(#20235,#20049)
+enclosing_stmt(#20235,#20232)
 expr_containers(#20235,#20001)
-literals("any","any",#20235)
+literals("B","B",#20235)
+decl(#20235,#20223)
 #20236=*
-stmts(#20236,18,#20001,2,"declare var C : any;")
-hasLocation(#20236,#20007)
-stmt_containers(#20236,#20001)
-has_declare_keyword(#20236)
+typeexprs(#20236,2,#20233,2,"any")
+hasLocation(#20236,#20053)
+enclosing_stmt(#20236,#20232)
+expr_containers(#20236,#20001)
+literals("any","any",#20236)
 #20237=*
-exprs(#20237,64,#20236,0,"C : any")
-#20238=@"loc,{#10000},3,13,3,19"
-locations_default(#20238,#10000,3,13,3,19)
-hasLocation(#20237,#20238)
-enclosing_stmt(#20237,#20236)
-expr_containers(#20237,#20001)
-#20239=*
-exprs(#20239,78,#20237,0,"C")
-hasLocation(#20239,#20061)
-enclosing_stmt(#20239,#20236)
-expr_containers(#20239,#20001)
-literals("C","C",#20239)
-decl(#20239,#20224)
+stmts(#20237,18,#20001,2,"declare var C : any;")
+hasLocation(#20237,#20007)
+stmt_containers(#20237,#20001)
+has_declare_keyword(#20237)
+#20238=*
+exprs(#20238,64,#20237,0,"C : any")
+#20239=@"loc,{#10000},3,13,3,19"
+locations_default(#20239,#10000,3,13,3,19)
+hasLocation(#20238,#20239)
+enclosing_stmt(#20238,#20237)
+expr_containers(#20238,#20001)
 #20240=*
-typeexprs(#20240,2,#20237,2,"any")
-hasLocation(#20240,#20065)
-enclosing_stmt(#20240,#20236)
+exprs(#20240,78,#20238,0,"C")
+hasLocation(#20240,#20061)
+enclosing_stmt(#20240,#20237)
 expr_containers(#20240,#20001)
-literals("any","any",#20240)
+literals("C","C",#20240)
+decl(#20240,#20224)
 #20241=*
-stmts(#20241,26,#20001,3,"class C ... c) {}\n}")
-#20242=@"loc,{#10000},5,1,15,1"
-locations_default(#20242,#10000,5,1,15,1)
-hasLocation(#20241,#20242)
-stmt_containers(#20241,#20001)
-#20243=*
-exprs(#20243,78,#20241,0,"C")
-hasLocation(#20243,#20071)
-enclosing_stmt(#20243,#20241)
-expr_containers(#20243,#20001)
-literals("C","C",#20243)
-decl(#20243,#20224)
-typedecl(#20243,#20225)
+typeexprs(#20241,2,#20238,2,"any")
+hasLocation(#20241,#20065)
+enclosing_stmt(#20241,#20237)
+expr_containers(#20241,#20001)
+literals("any","any",#20241)
+#20242=*
+stmts(#20242,26,#20001,3,"class C ... c) {}\n}")
+#20243=@"loc,{#10000},5,1,15,1"
+locations_default(#20243,#10000,5,1,15,1)
+hasLocation(#20242,#20243)
+stmt_containers(#20242,#20001)
 #20244=*
-scopes(#20244,10)
-scopenodes(#20241,#20244)
-scopenesting(#20244,#20000)
+exprs(#20244,78,#20242,0,"C")
+hasLocation(#20244,#20071)
+enclosing_stmt(#20244,#20242)
+expr_containers(#20244,#20001)
+literals("C","C",#20244)
+decl(#20244,#20224)
+typedecl(#20244,#20225)
 #20245=*
-properties(#20245,#20241,2,0,"m1(none) {}")
-#20246=@"loc,{#10000},6,3,6,13"
-locations_default(#20246,#10000,6,3,6,13)
-hasLocation(#20245,#20246)
+scopes(#20245,10)
+scopenodes(#20242,#20245)
+scopenesting(#20245,#20000)
+#20246=@"var;{this};{#20245}"
+variables(#20246,"this",#20245)
 #20247=*
-exprs(#20247,0,#20245,0,"m1")
-hasLocation(#20247,#20075)
-enclosing_stmt(#20247,#20241)
-expr_containers(#20247,#20001)
-literals("m1","m1",#20247)
-#20248=*
-exprs(#20248,9,#20245,1,"m1(none) {}")
-hasLocation(#20248,#20246)
-enclosing_stmt(#20248,#20241)
-expr_containers(#20248,#20001)
+properties(#20247,#20242,2,0,"m1(none) {}")
+#20248=@"loc,{#10000},6,3,6,13"
+locations_default(#20248,#10000,6,3,6,13)
+hasLocation(#20247,#20248)
 #20249=*
-scopes(#20249,1)
-scopenodes(#20248,#20249)
-scopenesting(#20249,#20244)
-#20250=@"var;{none};{#20249}"
-variables(#20250,"none",#20249)
+exprs(#20249,0,#20247,0,"m1")
+hasLocation(#20249,#20075)
+enclosing_stmt(#20249,#20242)
+expr_containers(#20249,#20001)
+literals("m1","m1",#20249)
+#20250=*
+exprs(#20250,9,#20247,1,"m1(none) {}")
+hasLocation(#20250,#20248)
+enclosing_stmt(#20250,#20242)
+expr_containers(#20250,#20001)
 #20251=*
-exprs(#20251,78,#20248,0,"none")
-hasLocation(#20251,#20079)
-expr_containers(#20251,#20248)
-literals("none","none",#20251)
-decl(#20251,#20250)
-#20252=@"var;{arguments};{#20249}"
-variables(#20252,"arguments",#20249)
-is_arguments_object(#20252)
-#20253=*
-stmts(#20253,1,#20248,-2,"{}")
-#20254=@"loc,{#10000},6,12,6,13"
-locations_default(#20254,#10000,6,12,6,13)
-hasLocation(#20253,#20254)
-stmt_containers(#20253,#20248)
-is_method(#20245)
-#20255=*
-properties(#20255,#20241,3,0,"m2(@A a) {}")
-#20256=@"loc,{#10000},7,3,7,13"
-locations_default(#20256,#10000,7,3,7,13)
-hasLocation(#20255,#20256)
-#20257=*
-exprs(#20257,0,#20255,0,"m2")
-hasLocation(#20257,#20087)
-enclosing_stmt(#20257,#20241)
-expr_containers(#20257,#20001)
-literals("m2","m2",#20257)
+scopes(#20251,1)
+scopenodes(#20250,#20251)
+scopenesting(#20251,#20245)
+#20252=@"var;{this};{#20251}"
+variables(#20252,"this",#20251)
+#20253=@"var;{none};{#20251}"
+variables(#20253,"none",#20251)
+#20254=*
+exprs(#20254,78,#20250,0,"none")
+hasLocation(#20254,#20079)
+expr_containers(#20254,#20250)
+literals("none","none",#20254)
+decl(#20254,#20253)
+#20255=@"var;{arguments};{#20251}"
+variables(#20255,"arguments",#20251)
+is_arguments_object(#20255)
+#20256=*
+stmts(#20256,1,#20250,-2,"{}")
+#20257=@"loc,{#10000},6,12,6,13"
+locations_default(#20257,#10000,6,12,6,13)
+hasLocation(#20256,#20257)
+stmt_containers(#20256,#20250)
+is_method(#20247)
 #20258=*
-exprs(#20258,9,#20255,1,"m2(@A a) {}")
-hasLocation(#20258,#20256)
-enclosing_stmt(#20258,#20241)
-expr_containers(#20258,#20001)
-#20259=*
-scopes(#20259,1)
-scopenodes(#20258,#20259)
-scopenesting(#20259,#20244)
-#20260=@"var;{a};{#20259}"
-variables(#20260,"a",#20259)
+properties(#20258,#20242,3,0,"m2(@A a) {}")
+#20259=@"loc,{#10000},7,3,7,13"
+locations_default(#20259,#10000,7,3,7,13)
+hasLocation(#20258,#20259)
+#20260=*
+exprs(#20260,0,#20258,0,"m2")
+hasLocation(#20260,#20087)
+enclosing_stmt(#20260,#20242)
+expr_containers(#20260,#20001)
+literals("m2","m2",#20260)
 #20261=*
-exprs(#20261,78,#20258,0,"a")
-hasLocation(#20261,#20095)
-expr_containers(#20261,#20258)
-literals("a","a",#20261)
-decl(#20261,#20260)
-#20262=@"var;{arguments};{#20259}"
-variables(#20262,"arguments",#20259)
-is_arguments_object(#20262)
-#20263=*
-exprs(#20263,104,#20258,-8,"@A")
-#20264=@"loc,{#10000},7,6,7,7"
-locations_default(#20264,#10000,7,6,7,7)
-hasLocation(#20263,#20264)
-expr_containers(#20263,#20258)
+exprs(#20261,9,#20258,1,"m2(@A a) {}")
+hasLocation(#20261,#20259)
+enclosing_stmt(#20261,#20242)
+expr_containers(#20261,#20001)
+#20262=*
+scopes(#20262,1)
+scopenodes(#20261,#20262)
+scopenesting(#20262,#20245)
+#20263=@"var;{this};{#20262}"
+variables(#20263,"this",#20262)
+#20264=@"var;{a};{#20262}"
+variables(#20264,"a",#20262)
 #20265=*
-exprs(#20265,94,#20263,0,"@A")
-hasLocation(#20265,#20264)
-expr_containers(#20265,#20258)
-#20266=*
-exprs(#20266,79,#20265,0,"A")
-hasLocation(#20266,#20093)
-expr_containers(#20266,#20258)
-literals("A","A",#20266)
-bind(#20266,#20222)
+exprs(#20265,78,#20261,0,"a")
+hasLocation(#20265,#20095)
+expr_containers(#20265,#20261)
+literals("a","a",#20265)
+decl(#20265,#20264)
+#20266=@"var;{arguments};{#20262}"
+variables(#20266,"arguments",#20262)
+is_arguments_object(#20266)
 #20267=*
-stmts(#20267,1,#20258,-2,"{}")
-#20268=@"loc,{#10000},7,12,7,13"
-locations_default(#20268,#10000,7,12,7,13)
+exprs(#20267,104,#20261,-8,"@A")
+#20268=@"loc,{#10000},7,6,7,7"
+locations_default(#20268,#10000,7,6,7,7)
 hasLocation(#20267,#20268)
-stmt_containers(#20267,#20258)
-is_method(#20255)
+expr_containers(#20267,#20261)
 #20269=*
-properties(#20269,#20241,4,0,"m3(@A @B ab) {}")
-#20270=@"loc,{#10000},8,3,8,17"
-locations_default(#20270,#10000,8,3,8,17)
-hasLocation(#20269,#20270)
+exprs(#20269,94,#20267,0,"@A")
+hasLocation(#20269,#20268)
+expr_containers(#20269,#20261)
+#20270=*
+exprs(#20270,79,#20269,0,"A")
+hasLocation(#20270,#20093)
+expr_containers(#20270,#20261)
+literals("A","A",#20270)
+bind(#20270,#20222)
 #20271=*
-exprs(#20271,0,#20269,0,"m3")
-hasLocation(#20271,#20103)
-enclosing_stmt(#20271,#20241)
-expr_containers(#20271,#20001)
-literals("m3","m3",#20271)
-#20272=*
-exprs(#20272,9,#20269,1,"m3(@A @B ab) {}")
-hasLocation(#20272,#20270)
-enclosing_stmt(#20272,#20241)
-expr_containers(#20272,#20001)
+stmts(#20271,1,#20261,-2,"{}")
+#20272=@"loc,{#10000},7,12,7,13"
+locations_default(#20272,#10000,7,12,7,13)
+hasLocation(#20271,#20272)
+stmt_containers(#20271,#20261)
+is_method(#20258)
 #20273=*
-scopes(#20273,1)
-scopenodes(#20272,#20273)
-scopenesting(#20273,#20244)
-#20274=@"var;{ab};{#20273}"
-variables(#20274,"ab",#20273)
+properties(#20273,#20242,4,0,"m3(@A @B ab) {}")
+#20274=@"loc,{#10000},8,3,8,17"
+locations_default(#20274,#10000,8,3,8,17)
+hasLocation(#20273,#20274)
 #20275=*
-exprs(#20275,78,#20272,0,"ab")
-hasLocation(#20275,#20115)
-expr_containers(#20275,#20272)
-literals("ab","ab",#20275)
-decl(#20275,#20274)
-#20276=@"var;{arguments};{#20273}"
-variables(#20276,"arguments",#20273)
-is_arguments_object(#20276)
+exprs(#20275,0,#20273,0,"m3")
+hasLocation(#20275,#20103)
+enclosing_stmt(#20275,#20242)
+expr_containers(#20275,#20001)
+literals("m3","m3",#20275)
+#20276=*
+exprs(#20276,9,#20273,1,"m3(@A @B ab) {}")
+hasLocation(#20276,#20274)
+enclosing_stmt(#20276,#20242)
+expr_containers(#20276,#20001)
 #20277=*
-exprs(#20277,104,#20272,-8,"@A @B")
-#20278=@"loc,{#10000},8,6,8,10"
-locations_default(#20278,#10000,8,6,8,10)
-hasLocation(#20277,#20278)
-expr_containers(#20277,#20272)
-#20279=*
-exprs(#20279,94,#20277,0,"@A")
-#20280=@"loc,{#10000},8,6,8,7"
-locations_default(#20280,#10000,8,6,8,7)
-hasLocation(#20279,#20280)
-expr_containers(#20279,#20272)
-#20281=*
-exprs(#20281,79,#20279,0,"A")
-hasLocation(#20281,#20109)
-expr_containers(#20281,#20272)
-literals("A","A",#20281)
-bind(#20281,#20222)
+scopes(#20277,1)
+scopenodes(#20276,#20277)
+scopenesting(#20277,#20245)
+#20278=@"var;{this};{#20277}"
+variables(#20278,"this",#20277)
+#20279=@"var;{ab};{#20277}"
+variables(#20279,"ab",#20277)
+#20280=*
+exprs(#20280,78,#20276,0,"ab")
+hasLocation(#20280,#20115)
+expr_containers(#20280,#20276)
+literals("ab","ab",#20280)
+decl(#20280,#20279)
+#20281=@"var;{arguments};{#20277}"
+variables(#20281,"arguments",#20277)
+is_arguments_object(#20281)
 #20282=*
-exprs(#20282,94,#20277,1,"@B")
-#20283=@"loc,{#10000},8,9,8,10"
-locations_default(#20283,#10000,8,9,8,10)
+exprs(#20282,104,#20276,-8,"@A @B")
+#20283=@"loc,{#10000},8,6,8,10"
+locations_default(#20283,#10000,8,6,8,10)
 hasLocation(#20282,#20283)
-expr_containers(#20282,#20272)
+expr_containers(#20282,#20276)
 #20284=*
-exprs(#20284,79,#20282,0,"B")
-hasLocation(#20284,#20113)
-expr_containers(#20284,#20272)
-literals("B","B",#20284)
-bind(#20284,#20223)
-#20285=*
-stmts(#20285,1,#20272,-2,"{}")
-#20286=@"loc,{#10000},8,16,8,17"
-locations_default(#20286,#10000,8,16,8,17)
-hasLocation(#20285,#20286)
-stmt_containers(#20285,#20272)
-is_method(#20269)
+exprs(#20284,94,#20282,0,"@A")
+#20285=@"loc,{#10000},8,6,8,7"
+locations_default(#20285,#10000,8,6,8,7)
+hasLocation(#20284,#20285)
+expr_containers(#20284,#20276)
+#20286=*
+exprs(#20286,79,#20284,0,"A")
+hasLocation(#20286,#20109)
+expr_containers(#20286,#20276)
+literals("A","A",#20286)
+bind(#20286,#20222)
 #20287=*
-properties(#20287,#20241,5,0,"m4(none, @A a) {}")
-#20288=@"loc,{#10000},10,3,10,19"
-locations_default(#20288,#10000,10,3,10,19)
+exprs(#20287,94,#20282,1,"@B")
+#20288=@"loc,{#10000},8,9,8,10"
+locations_default(#20288,#10000,8,9,8,10)
 hasLocation(#20287,#20288)
+expr_containers(#20287,#20276)
 #20289=*
-exprs(#20289,0,#20287,0,"m4")
-hasLocation(#20289,#20123)
-enclosing_stmt(#20289,#20241)
-expr_containers(#20289,#20001)
-literals("m4","m4",#20289)
+exprs(#20289,79,#20287,0,"B")
+hasLocation(#20289,#20113)
+expr_containers(#20289,#20276)
+literals("B","B",#20289)
+bind(#20289,#20223)
 #20290=*
-exprs(#20290,9,#20287,1,"m4(none, @A a) {}")
-hasLocation(#20290,#20288)
-enclosing_stmt(#20290,#20241)
-expr_containers(#20290,#20001)
-#20291=*
-scopes(#20291,1)
-scopenodes(#20290,#20291)
-scopenesting(#20291,#20244)
-#20292=@"var;{none};{#20291}"
-variables(#20292,"none",#20291)
-#20293=*
-exprs(#20293,78,#20290,0,"none")
-hasLocation(#20293,#20127)
-expr_containers(#20293,#20290)
-literals("none","none",#20293)
-decl(#20293,#20292)
-#20294=@"var;{a};{#20291}"
-variables(#20294,"a",#20291)
+stmts(#20290,1,#20276,-2,"{}")
+#20291=@"loc,{#10000},8,16,8,17"
+locations_default(#20291,#10000,8,16,8,17)
+hasLocation(#20290,#20291)
+stmt_containers(#20290,#20276)
+is_method(#20273)
+#20292=*
+properties(#20292,#20242,5,0,"m4(none, @A a) {}")
+#20293=@"loc,{#10000},10,3,10,19"
+locations_default(#20293,#10000,10,3,10,19)
+hasLocation(#20292,#20293)
+#20294=*
+exprs(#20294,0,#20292,0,"m4")
+hasLocation(#20294,#20123)
+enclosing_stmt(#20294,#20242)
+expr_containers(#20294,#20001)
+literals("m4","m4",#20294)
 #20295=*
-exprs(#20295,78,#20290,1,"a")
-hasLocation(#20295,#20135)
-expr_containers(#20295,#20290)
-literals("a","a",#20295)
-decl(#20295,#20294)
-#20296=@"var;{arguments};{#20291}"
-variables(#20296,"arguments",#20291)
-is_arguments_object(#20296)
-#20297=*
-exprs(#20297,104,#20290,-12,"@A")
-#20298=@"loc,{#10000},10,12,10,13"
-locations_default(#20298,#10000,10,12,10,13)
-hasLocation(#20297,#20298)
-expr_containers(#20297,#20290)
+exprs(#20295,9,#20292,1,"m4(none, @A a) {}")
+hasLocation(#20295,#20293)
+enclosing_stmt(#20295,#20242)
+expr_containers(#20295,#20001)
+#20296=*
+scopes(#20296,1)
+scopenodes(#20295,#20296)
+scopenesting(#20296,#20245)
+#20297=@"var;{this};{#20296}"
+variables(#20297,"this",#20296)
+#20298=@"var;{none};{#20296}"
+variables(#20298,"none",#20296)
 #20299=*
-exprs(#20299,94,#20297,0,"@A")
-hasLocation(#20299,#20298)
-expr_containers(#20299,#20290)
-#20300=*
-exprs(#20300,79,#20299,0,"A")
-hasLocation(#20300,#20133)
-expr_containers(#20300,#20290)
-literals("A","A",#20300)
-bind(#20300,#20222)
+exprs(#20299,78,#20295,0,"none")
+hasLocation(#20299,#20127)
+expr_containers(#20299,#20295)
+literals("none","none",#20299)
+decl(#20299,#20298)
+#20300=@"var;{a};{#20296}"
+variables(#20300,"a",#20296)
 #20301=*
-stmts(#20301,1,#20290,-2,"{}")
-#20302=@"loc,{#10000},10,18,10,19"
-locations_default(#20302,#10000,10,18,10,19)
-hasLocation(#20301,#20302)
-stmt_containers(#20301,#20290)
-is_method(#20287)
+exprs(#20301,78,#20295,1,"a")
+hasLocation(#20301,#20135)
+expr_containers(#20301,#20295)
+literals("a","a",#20301)
+decl(#20301,#20300)
+#20302=@"var;{arguments};{#20296}"
+variables(#20302,"arguments",#20296)
+is_arguments_object(#20302)
 #20303=*
-properties(#20303,#20241,6,0,"m5(none ...  ab) {}")
-#20304=@"loc,{#10000},11,3,11,23"
-locations_default(#20304,#10000,11,3,11,23)
+exprs(#20303,104,#20295,-12,"@A")
+#20304=@"loc,{#10000},10,12,10,13"
+locations_default(#20304,#10000,10,12,10,13)
 hasLocation(#20303,#20304)
+expr_containers(#20303,#20295)
 #20305=*
-exprs(#20305,0,#20303,0,"m5")
-hasLocation(#20305,#20143)
-enclosing_stmt(#20305,#20241)
-expr_containers(#20305,#20001)
-literals("m5","m5",#20305)
+exprs(#20305,94,#20303,0,"@A")
+hasLocation(#20305,#20304)
+expr_containers(#20305,#20295)
 #20306=*
-exprs(#20306,9,#20303,1,"m5(none ...  ab) {}")
-hasLocation(#20306,#20304)
-enclosing_stmt(#20306,#20241)
-expr_containers(#20306,#20001)
+exprs(#20306,79,#20305,0,"A")
+hasLocation(#20306,#20133)
+expr_containers(#20306,#20295)
+literals("A","A",#20306)
+bind(#20306,#20222)
 #20307=*
-scopes(#20307,1)
-scopenodes(#20306,#20307)
-scopenesting(#20307,#20244)
-#20308=@"var;{none};{#20307}"
-variables(#20308,"none",#20307)
+stmts(#20307,1,#20295,-2,"{}")
+#20308=@"loc,{#10000},10,18,10,19"
+locations_default(#20308,#10000,10,18,10,19)
+hasLocation(#20307,#20308)
+stmt_containers(#20307,#20295)
+is_method(#20292)
 #20309=*
-exprs(#20309,78,#20306,0,"none")
-hasLocation(#20309,#20147)
-expr_containers(#20309,#20306)
-literals("none","none",#20309)
-decl(#20309,#20308)
-#20310=@"var;{ab};{#20307}"
-variables(#20310,"ab",#20307)
+properties(#20309,#20242,6,0,"m5(none ...  ab) {}")
+#20310=@"loc,{#10000},11,3,11,23"
+locations_default(#20310,#10000,11,3,11,23)
+hasLocation(#20309,#20310)
 #20311=*
-exprs(#20311,78,#20306,1,"ab")
-hasLocation(#20311,#20159)
-expr_containers(#20311,#20306)
-literals("ab","ab",#20311)
-decl(#20311,#20310)
-#20312=@"var;{arguments};{#20307}"
-variables(#20312,"arguments",#20307)
-is_arguments_object(#20312)
+exprs(#20311,0,#20309,0,"m5")
+hasLocation(#20311,#20143)
+enclosing_stmt(#20311,#20242)
+expr_containers(#20311,#20001)
+literals("m5","m5",#20311)
+#20312=*
+exprs(#20312,9,#20309,1,"m5(none ...  ab) {}")
+hasLocation(#20312,#20310)
+enclosing_stmt(#20312,#20242)
+expr_containers(#20312,#20001)
 #20313=*
-exprs(#20313,104,#20306,-12,"@A @B")
-#20314=@"loc,{#10000},11,12,11,16"
-locations_default(#20314,#10000,11,12,11,16)
-hasLocation(#20313,#20314)
-expr_containers(#20313,#20306)
-#20315=*
-exprs(#20315,94,#20313,0,"@A")
-#20316=@"loc,{#10000},11,12,11,13"
-locations_default(#20316,#10000,11,12,11,13)
-hasLocation(#20315,#20316)
-expr_containers(#20315,#20306)
-#20317=*
-exprs(#20317,79,#20315,0,"A")
-hasLocation(#20317,#20153)
-expr_containers(#20317,#20306)
-literals("A","A",#20317)
-bind(#20317,#20222)
+scopes(#20313,1)
+scopenodes(#20312,#20313)
+scopenesting(#20313,#20245)
+#20314=@"var;{this};{#20313}"
+variables(#20314,"this",#20313)
+#20315=@"var;{none};{#20313}"
+variables(#20315,"none",#20313)
+#20316=*
+exprs(#20316,78,#20312,0,"none")
+hasLocation(#20316,#20147)
+expr_containers(#20316,#20312)
+literals("none","none",#20316)
+decl(#20316,#20315)
+#20317=@"var;{ab};{#20313}"
+variables(#20317,"ab",#20313)
 #20318=*
-exprs(#20318,94,#20313,1,"@B")
-#20319=@"loc,{#10000},11,15,11,16"
-locations_default(#20319,#10000,11,15,11,16)
-hasLocation(#20318,#20319)
-expr_containers(#20318,#20306)
+exprs(#20318,78,#20312,1,"ab")
+hasLocation(#20318,#20159)
+expr_containers(#20318,#20312)
+literals("ab","ab",#20318)
+decl(#20318,#20317)
+#20319=@"var;{arguments};{#20313}"
+variables(#20319,"arguments",#20313)
+is_arguments_object(#20319)
 #20320=*
-exprs(#20320,79,#20318,0,"B")
-hasLocation(#20320,#20157)
-expr_containers(#20320,#20306)
-literals("B","B",#20320)
-bind(#20320,#20223)
-#20321=*
-stmts(#20321,1,#20306,-2,"{}")
-#20322=@"loc,{#10000},11,22,11,23"
-locations_default(#20322,#10000,11,22,11,23)
-hasLocation(#20321,#20322)
-stmt_containers(#20321,#20306)
-is_method(#20303)
-#20323=*
-properties(#20323,#20241,7,0,"m6(@A a, @B b) {}")
-#20324=@"loc,{#10000},13,3,13,19"
-locations_default(#20324,#10000,13,3,13,19)
-hasLocation(#20323,#20324)
+exprs(#20320,104,#20312,-12,"@A @B")
+#20321=@"loc,{#10000},11,12,11,16"
+locations_default(#20321,#10000,11,12,11,16)
+hasLocation(#20320,#20321)
+expr_containers(#20320,#20312)
+#20322=*
+exprs(#20322,94,#20320,0,"@A")
+#20323=@"loc,{#10000},11,12,11,13"
+locations_default(#20323,#10000,11,12,11,13)
+hasLocation(#20322,#20323)
+expr_containers(#20322,#20312)
+#20324=*
+exprs(#20324,79,#20322,0,"A")
+hasLocation(#20324,#20153)
+expr_containers(#20324,#20312)
+literals("A","A",#20324)
+bind(#20324,#20222)
 #20325=*
-exprs(#20325,0,#20323,0,"m6")
-hasLocation(#20325,#20167)
-enclosing_stmt(#20325,#20241)
-expr_containers(#20325,#20001)
-literals("m6","m6",#20325)
-#20326=*
-exprs(#20326,9,#20323,1,"m6(@A a, @B b) {}")
-hasLocation(#20326,#20324)
-enclosing_stmt(#20326,#20241)
-expr_containers(#20326,#20001)
+exprs(#20325,94,#20320,1,"@B")
+#20326=@"loc,{#10000},11,15,11,16"
+locations_default(#20326,#10000,11,15,11,16)
+hasLocation(#20325,#20326)
+expr_containers(#20325,#20312)
 #20327=*
-scopes(#20327,1)
-scopenodes(#20326,#20327)
-scopenesting(#20327,#20244)
-#20328=@"var;{a};{#20327}"
-variables(#20328,"a",#20327)
-#20329=*
-exprs(#20329,78,#20326,0,"a")
-hasLocation(#20329,#20175)
-expr_containers(#20329,#20326)
-literals("a","a",#20329)
-decl(#20329,#20328)
-#20330=@"var;{b};{#20327}"
-variables(#20330,"b",#20327)
-#20331=*
-exprs(#20331,78,#20326,1,"b")
-hasLocation(#20331,#20183)
-expr_containers(#20331,#20326)
-literals("b","b",#20331)
-decl(#20331,#20330)
-#20332=@"var;{arguments};{#20327}"
-variables(#20332,"arguments",#20327)
-is_arguments_object(#20332)
+exprs(#20327,79,#20325,0,"B")
+hasLocation(#20327,#20157)
+expr_containers(#20327,#20312)
+literals("B","B",#20327)
+bind(#20327,#20223)
+#20328=*
+stmts(#20328,1,#20312,-2,"{}")
+#20329=@"loc,{#10000},11,22,11,23"
+locations_default(#20329,#10000,11,22,11,23)
+hasLocation(#20328,#20329)
+stmt_containers(#20328,#20312)
+is_method(#20309)
+#20330=*
+properties(#20330,#20242,7,0,"m6(@A a, @B b) {}")
+#20331=@"loc,{#10000},13,3,13,19"
+locations_default(#20331,#10000,13,3,13,19)
+hasLocation(#20330,#20331)
+#20332=*
+exprs(#20332,0,#20330,0,"m6")
+hasLocation(#20332,#20167)
+enclosing_stmt(#20332,#20242)
+expr_containers(#20332,#20001)
+literals("m6","m6",#20332)
 #20333=*
-exprs(#20333,104,#20326,-8,"@A")
-#20334=@"loc,{#10000},13,6,13,7"
-locations_default(#20334,#10000,13,6,13,7)
-hasLocation(#20333,#20334)
-expr_containers(#20333,#20326)
-#20335=*
-exprs(#20335,94,#20333,0,"@A")
-hasLocation(#20335,#20334)
-expr_containers(#20335,#20326)
-#20336=*
-exprs(#20336,79,#20335,0,"A")
-hasLocation(#20336,#20173)
-expr_containers(#20336,#20326)
-literals("A","A",#20336)
-bind(#20336,#20222)
+exprs(#20333,9,#20330,1,"m6(@A a, @B b) {}")
+hasLocation(#20333,#20331)
+enclosing_stmt(#20333,#20242)
+expr_containers(#20333,#20001)
+#20334=*
+scopes(#20334,1)
+scopenodes(#20333,#20334)
+scopenesting(#20334,#20245)
+#20335=@"var;{this};{#20334}"
+variables(#20335,"this",#20334)
+#20336=@"var;{a};{#20334}"
+variables(#20336,"a",#20334)
 #20337=*
-exprs(#20337,104,#20326,-12,"@B")
-#20338=@"loc,{#10000},13,12,13,13"
-locations_default(#20338,#10000,13,12,13,13)
-hasLocation(#20337,#20338)
-expr_containers(#20337,#20326)
+exprs(#20337,78,#20333,0,"a")
+hasLocation(#20337,#20175)
+expr_containers(#20337,#20333)
+literals("a","a",#20337)
+decl(#20337,#20336)
+#20338=@"var;{b};{#20334}"
+variables(#20338,"b",#20334)
 #20339=*
-exprs(#20339,94,#20337,0,"@B")
-hasLocation(#20339,#20338)
-expr_containers(#20339,#20326)
-#20340=*
-exprs(#20340,79,#20339,0,"B")
-hasLocation(#20340,#20181)
-expr_containers(#20340,#20326)
-literals("B","B",#20340)
-bind(#20340,#20223)
+exprs(#20339,78,#20333,1,"b")
+hasLocation(#20339,#20183)
+expr_containers(#20339,#20333)
+literals("b","b",#20339)
+decl(#20339,#20338)
+#20340=@"var;{arguments};{#20334}"
+variables(#20340,"arguments",#20334)
+is_arguments_object(#20340)
 #20341=*
-stmts(#20341,1,#20326,-2,"{}")
-#20342=@"loc,{#10000},13,18,13,19"
-locations_default(#20342,#10000,13,18,13,19)
+exprs(#20341,104,#20333,-8,"@A")
+#20342=@"loc,{#10000},13,6,13,7"
+locations_default(#20342,#10000,13,6,13,7)
 hasLocation(#20341,#20342)
-stmt_containers(#20341,#20326)
-is_method(#20323)
+expr_containers(#20341,#20333)
 #20343=*
-properties(#20343,#20241,8,0,"m7(@A a ...  bc) {}")
-#20344=@"loc,{#10000},14,3,14,23"
-locations_default(#20344,#10000,14,3,14,23)
-hasLocation(#20343,#20344)
+exprs(#20343,94,#20341,0,"@A")
+hasLocation(#20343,#20342)
+expr_containers(#20343,#20333)
+#20344=*
+exprs(#20344,79,#20343,0,"A")
+hasLocation(#20344,#20173)
+expr_containers(#20344,#20333)
+literals("A","A",#20344)
+bind(#20344,#20222)
 #20345=*
-exprs(#20345,0,#20343,0,"m7")
-hasLocation(#20345,#20191)
-enclosing_stmt(#20345,#20241)
-expr_containers(#20345,#20001)
-literals("m7","m7",#20345)
-#20346=*
-exprs(#20346,9,#20343,1,"m7(@A a ...  bc) {}")
-hasLocation(#20346,#20344)
-enclosing_stmt(#20346,#20241)
-expr_containers(#20346,#20001)
+exprs(#20345,104,#20333,-12,"@B")
+#20346=@"loc,{#10000},13,12,13,13"
+locations_default(#20346,#10000,13,12,13,13)
+hasLocation(#20345,#20346)
+expr_containers(#20345,#20333)
 #20347=*
-scopes(#20347,1)
-scopenodes(#20346,#20347)
-scopenesting(#20347,#20244)
-#20348=@"var;{a};{#20347}"
-variables(#20348,"a",#20347)
+exprs(#20347,94,#20345,0,"@B")
+hasLocation(#20347,#20346)
+expr_containers(#20347,#20333)
+#20348=*
+exprs(#20348,79,#20347,0,"B")
+hasLocation(#20348,#20181)
+expr_containers(#20348,#20333)
+literals("B","B",#20348)
+bind(#20348,#20223)
 #20349=*
-exprs(#20349,78,#20346,0,"a")
-hasLocation(#20349,#20199)
-expr_containers(#20349,#20346)
-literals("a","a",#20349)
-decl(#20349,#20348)
-#20350=@"var;{bc};{#20347}"
-variables(#20350,"bc",#20347)
+stmts(#20349,1,#20333,-2,"{}")
+#20350=@"loc,{#10000},13,18,13,19"
+locations_default(#20350,#10000,13,18,13,19)
+hasLocation(#20349,#20350)
+stmt_containers(#20349,#20333)
+is_method(#20330)
 #20351=*
-exprs(#20351,78,#20346,1,"bc")
-hasLocation(#20351,#20211)
-expr_containers(#20351,#20346)
-literals("bc","bc",#20351)
-decl(#20351,#20350)
-#20352=@"var;{arguments};{#20347}"
-variables(#20352,"arguments",#20347)
-is_arguments_object(#20352)
+properties(#20351,#20242,8,0,"m7(@A a ...  bc) {}")
+#20352=@"loc,{#10000},14,3,14,23"
+locations_default(#20352,#10000,14,3,14,23)
+hasLocation(#20351,#20352)
 #20353=*
-exprs(#20353,104,#20346,-8,"@A")
-#20354=@"loc,{#10000},14,6,14,7"
-locations_default(#20354,#10000,14,6,14,7)
-hasLocation(#20353,#20354)
-expr_containers(#20353,#20346)
+exprs(#20353,0,#20351,0,"m7")
+hasLocation(#20353,#20191)
+enclosing_stmt(#20353,#20242)
+expr_containers(#20353,#20001)
+literals("m7","m7",#20353)
+#20354=*
+exprs(#20354,9,#20351,1,"m7(@A a ...  bc) {}")
+hasLocation(#20354,#20352)
+enclosing_stmt(#20354,#20242)
+expr_containers(#20354,#20001)
 #20355=*
-exprs(#20355,94,#20353,0,"@A")
-hasLocation(#20355,#20354)
-expr_containers(#20355,#20346)
-#20356=*
-exprs(#20356,79,#20355,0,"A")
-hasLocation(#20356,#20197)
-expr_containers(#20356,#20346)
-literals("A","A",#20356)
-bind(#20356,#20222)
-#20357=*
-exprs(#20357,104,#20346,-12,"@B @C")
-#20358=@"loc,{#10000},14,12,14,16"
-locations_default(#20358,#10000,14,12,14,16)
-hasLocation(#20357,#20358)
-expr_containers(#20357,#20346)
-#20359=*
-exprs(#20359,94,#20357,0,"@B")
-#20360=@"loc,{#10000},14,12,14,13"
-locations_default(#20360,#10000,14,12,14,13)
-hasLocation(#20359,#20360)
-expr_containers(#20359,#20346)
-#20361=*
-exprs(#20361,79,#20359,0,"B")
-hasLocation(#20361,#20205)
-expr_containers(#20361,#20346)
-literals("B","B",#20361)
-bind(#20361,#20223)
+scopes(#20355,1)
+scopenodes(#20354,#20355)
+scopenesting(#20355,#20245)
+#20356=@"var;{this};{#20355}"
+variables(#20356,"this",#20355)
+#20357=@"var;{a};{#20355}"
+variables(#20357,"a",#20355)
+#20358=*
+exprs(#20358,78,#20354,0,"a")
+hasLocation(#20358,#20199)
+expr_containers(#20358,#20354)
+literals("a","a",#20358)
+decl(#20358,#20357)
+#20359=@"var;{bc};{#20355}"
+variables(#20359,"bc",#20355)
+#20360=*
+exprs(#20360,78,#20354,1,"bc")
+hasLocation(#20360,#20211)
+expr_containers(#20360,#20354)
+literals("bc","bc",#20360)
+decl(#20360,#20359)
+#20361=@"var;{arguments};{#20355}"
+variables(#20361,"arguments",#20355)
+is_arguments_object(#20361)
 #20362=*
-exprs(#20362,94,#20357,1,"@C")
-#20363=@"loc,{#10000},14,15,14,16"
-locations_default(#20363,#10000,14,15,14,16)
+exprs(#20362,104,#20354,-8,"@A")
+#20363=@"loc,{#10000},14,6,14,7"
+locations_default(#20363,#10000,14,6,14,7)
 hasLocation(#20362,#20363)
-expr_containers(#20362,#20346)
+expr_containers(#20362,#20354)
 #20364=*
-exprs(#20364,79,#20362,0,"C")
-hasLocation(#20364,#20209)
-expr_containers(#20364,#20346)
-literals("C","C",#20364)
-bind(#20364,#20224)
+exprs(#20364,94,#20362,0,"@A")
+hasLocation(#20364,#20363)
+expr_containers(#20364,#20354)
 #20365=*
-stmts(#20365,1,#20346,-2,"{}")
-#20366=@"loc,{#10000},14,22,14,23"
-locations_default(#20366,#10000,14,22,14,23)
-hasLocation(#20365,#20366)
-stmt_containers(#20365,#20346)
-is_method(#20343)
-#20367=*
-properties(#20367,#20241,9,0,"constructor() {}")
-#20368=@"loc,{#10000},5,9,5,8"
-locations_default(#20368,#10000,5,9,5,8)
-hasLocation(#20367,#20368)
-#20369=*
-exprs(#20369,0,#20367,0,"constructor")
-hasLocation(#20369,#20368)
-enclosing_stmt(#20369,#20241)
-expr_containers(#20369,#20001)
-literals("constructor","constructor",#20369)
+exprs(#20365,79,#20364,0,"A")
+hasLocation(#20365,#20197)
+expr_containers(#20365,#20354)
+literals("A","A",#20365)
+bind(#20365,#20222)
+#20366=*
+exprs(#20366,104,#20354,-12,"@B @C")
+#20367=@"loc,{#10000},14,12,14,16"
+locations_default(#20367,#10000,14,12,14,16)
+hasLocation(#20366,#20367)
+expr_containers(#20366,#20354)
+#20368=*
+exprs(#20368,94,#20366,0,"@B")
+#20369=@"loc,{#10000},14,12,14,13"
+locations_default(#20369,#10000,14,12,14,13)
+hasLocation(#20368,#20369)
+expr_containers(#20368,#20354)
 #20370=*
-exprs(#20370,9,#20367,1,"() {}")
-hasLocation(#20370,#20368)
-enclosing_stmt(#20370,#20241)
-expr_containers(#20370,#20001)
+exprs(#20370,79,#20368,0,"B")
+hasLocation(#20370,#20205)
+expr_containers(#20370,#20354)
+literals("B","B",#20370)
+bind(#20370,#20223)
 #20371=*
-scopes(#20371,1)
-scopenodes(#20370,#20371)
-scopenesting(#20371,#20244)
-#20372=@"var;{arguments};{#20371}"
-variables(#20372,"arguments",#20371)
-is_arguments_object(#20372)
+exprs(#20371,94,#20366,1,"@C")
+#20372=@"loc,{#10000},14,15,14,16"
+locations_default(#20372,#10000,14,15,14,16)
+hasLocation(#20371,#20372)
+expr_containers(#20371,#20354)
 #20373=*
-stmts(#20373,1,#20370,-2,"{}")
-hasLocation(#20373,#20368)
-stmt_containers(#20373,#20370)
-is_method(#20367)
+exprs(#20373,79,#20371,0,"C")
+hasLocation(#20373,#20209)
+expr_containers(#20373,#20354)
+literals("C","C",#20373)
+bind(#20373,#20224)
 #20374=*
-entry_cfg_node(#20374,#20001)
-#20375=@"loc,{#10000},1,1,1,0"
-locations_default(#20375,#10000,1,1,1,0)
+stmts(#20374,1,#20354,-2,"{}")
+#20375=@"loc,{#10000},14,22,14,23"
+locations_default(#20375,#10000,14,22,14,23)
 hasLocation(#20374,#20375)
+stmt_containers(#20374,#20354)
+is_method(#20351)
 #20376=*
-exit_cfg_node(#20376,#20001)
-hasLocation(#20376,#20220)
-successor(#20370,#20367)
-#20377=*
-entry_cfg_node(#20377,#20370)
-hasLocation(#20377,#20368)
+properties(#20376,#20242,9,0,"constructor() {}")
+#20377=@"loc,{#10000},5,9,5,8"
+locations_default(#20377,#10000,5,9,5,8)
+hasLocation(#20376,#20377)
 #20378=*
-exit_cfg_node(#20378,#20370)
-hasLocation(#20378,#20368)
-successor(#20373,#20378)
-successor(#20377,#20373)
-successor(#20369,#20370)
-successor(#20367,#20241)
-successor(#20346,#20343)
+exprs(#20378,0,#20376,0,"constructor")
+hasLocation(#20378,#20377)
+enclosing_stmt(#20378,#20242)
+expr_containers(#20378,#20001)
+literals("constructor","constructor",#20378)
 #20379=*
-entry_cfg_node(#20379,#20346)
-#20380=@"loc,{#10000},14,3,14,2"
-locations_default(#20380,#10000,14,3,14,2)
-hasLocation(#20379,#20380)
-#20381=*
-exit_cfg_node(#20381,#20346)
-#20382=@"loc,{#10000},14,24,14,23"
-locations_default(#20382,#10000,14,24,14,23)
-hasLocation(#20381,#20382)
-successor(#20365,#20381)
-successor(#20351,#20365)
-successor(#20349,#20351)
-successor(#20379,#20349)
-successor(#20345,#20346)
-successor(#20343,#20369)
-successor(#20326,#20323)
+exprs(#20379,9,#20376,1,"() {}")
+hasLocation(#20379,#20377)
+enclosing_stmt(#20379,#20242)
+expr_containers(#20379,#20001)
+#20380=*
+scopes(#20380,1)
+scopenodes(#20379,#20380)
+scopenesting(#20380,#20245)
+#20381=@"var;{this};{#20380}"
+variables(#20381,"this",#20380)
+#20382=@"var;{arguments};{#20380}"
+variables(#20382,"arguments",#20380)
+is_arguments_object(#20382)
 #20383=*
-entry_cfg_node(#20383,#20326)
-#20384=@"loc,{#10000},13,3,13,2"
-locations_default(#20384,#10000,13,3,13,2)
-hasLocation(#20383,#20384)
-#20385=*
-exit_cfg_node(#20385,#20326)
-#20386=@"loc,{#10000},13,20,13,19"
-locations_default(#20386,#10000,13,20,13,19)
-hasLocation(#20385,#20386)
-successor(#20341,#20385)
-successor(#20331,#20341)
-successor(#20329,#20331)
-successor(#20383,#20329)
-successor(#20325,#20326)
-successor(#20323,#20345)
-successor(#20306,#20303)
+stmts(#20383,1,#20379,-2,"{}")
+hasLocation(#20383,#20377)
+stmt_containers(#20383,#20379)
+is_method(#20376)
+#20384=*
+entry_cfg_node(#20384,#20001)
+#20385=@"loc,{#10000},1,1,1,0"
+locations_default(#20385,#10000,1,1,1,0)
+hasLocation(#20384,#20385)
+#20386=*
+exit_cfg_node(#20386,#20001)
+hasLocation(#20386,#20220)
+successor(#20379,#20376)
 #20387=*
-entry_cfg_node(#20387,#20306)
-#20388=@"loc,{#10000},11,3,11,2"
-locations_default(#20388,#10000,11,3,11,2)
-hasLocation(#20387,#20388)
+entry_cfg_node(#20387,#20379)
+hasLocation(#20387,#20377)
+#20388=*
+exit_cfg_node(#20388,#20379)
+hasLocation(#20388,#20377)
+successor(#20383,#20388)
+successor(#20387,#20383)
+successor(#20378,#20379)
+successor(#20376,#20242)
+successor(#20354,#20351)
 #20389=*
-exit_cfg_node(#20389,#20306)
-#20390=@"loc,{#10000},11,24,11,23"
-locations_default(#20390,#10000,11,24,11,23)
+entry_cfg_node(#20389,#20354)
+#20390=@"loc,{#10000},14,3,14,2"
+locations_default(#20390,#10000,14,3,14,2)
 hasLocation(#20389,#20390)
-successor(#20321,#20389)
-successor(#20311,#20321)
-successor(#20309,#20311)
-successor(#20387,#20309)
-successor(#20305,#20306)
-successor(#20303,#20325)
-successor(#20290,#20287)
 #20391=*
-entry_cfg_node(#20391,#20290)
-#20392=@"loc,{#10000},10,3,10,2"
-locations_default(#20392,#10000,10,3,10,2)
+exit_cfg_node(#20391,#20354)
+#20392=@"loc,{#10000},14,24,14,23"
+locations_default(#20392,#10000,14,24,14,23)
 hasLocation(#20391,#20392)
+successor(#20374,#20391)
+successor(#20360,#20374)
+successor(#20358,#20360)
+successor(#20389,#20358)
+successor(#20353,#20354)
+successor(#20351,#20378)
+successor(#20333,#20330)
 #20393=*
-exit_cfg_node(#20393,#20290)
-#20394=@"loc,{#10000},10,20,10,19"
-locations_default(#20394,#10000,10,20,10,19)
+entry_cfg_node(#20393,#20333)
+#20394=@"loc,{#10000},13,3,13,2"
+locations_default(#20394,#10000,13,3,13,2)
 hasLocation(#20393,#20394)
-successor(#20301,#20393)
-successor(#20295,#20301)
-successor(#20293,#20295)
-successor(#20391,#20293)
-successor(#20289,#20290)
-successor(#20287,#20305)
-successor(#20272,#20269)
 #20395=*
-entry_cfg_node(#20395,#20272)
-#20396=@"loc,{#10000},8,3,8,2"
-locations_default(#20396,#10000,8,3,8,2)
+exit_cfg_node(#20395,#20333)
+#20396=@"loc,{#10000},13,20,13,19"
+locations_default(#20396,#10000,13,20,13,19)
 hasLocation(#20395,#20396)
+successor(#20349,#20395)
+successor(#20339,#20349)
+successor(#20337,#20339)
+successor(#20393,#20337)
+successor(#20332,#20333)
+successor(#20330,#20353)
+successor(#20312,#20309)
 #20397=*
-exit_cfg_node(#20397,#20272)
-#20398=@"loc,{#10000},8,18,8,17"
-locations_default(#20398,#10000,8,18,8,17)
+entry_cfg_node(#20397,#20312)
+#20398=@"loc,{#10000},11,3,11,2"
+locations_default(#20398,#10000,11,3,11,2)
 hasLocation(#20397,#20398)
-successor(#20285,#20397)
-successor(#20275,#20285)
-successor(#20395,#20275)
-successor(#20271,#20272)
-successor(#20269,#20289)
-successor(#20258,#20255)
 #20399=*
-entry_cfg_node(#20399,#20258)
-#20400=@"loc,{#10000},7,3,7,2"
-locations_default(#20400,#10000,7,3,7,2)
+exit_cfg_node(#20399,#20312)
+#20400=@"loc,{#10000},11,24,11,23"
+locations_default(#20400,#10000,11,24,11,23)
 hasLocation(#20399,#20400)
+successor(#20328,#20399)
+successor(#20318,#20328)
+successor(#20316,#20318)
+successor(#20397,#20316)
+successor(#20311,#20312)
+successor(#20309,#20332)
+successor(#20295,#20292)
 #20401=*
-exit_cfg_node(#20401,#20258)
-#20402=@"loc,{#10000},7,14,7,13"
-locations_default(#20402,#10000,7,14,7,13)
+entry_cfg_node(#20401,#20295)
+#20402=@"loc,{#10000},10,3,10,2"
+locations_default(#20402,#10000,10,3,10,2)
 hasLocation(#20401,#20402)
-successor(#20267,#20401)
-successor(#20261,#20267)
-successor(#20399,#20261)
-successor(#20257,#20258)
-successor(#20255,#20271)
-successor(#20248,#20245)
 #20403=*
-entry_cfg_node(#20403,#20248)
-#20404=@"loc,{#10000},6,3,6,2"
-locations_default(#20404,#10000,6,3,6,2)
+exit_cfg_node(#20403,#20295)
+#20404=@"loc,{#10000},10,20,10,19"
+locations_default(#20404,#10000,10,20,10,19)
 hasLocation(#20403,#20404)
+successor(#20307,#20403)
+successor(#20301,#20307)
+successor(#20299,#20301)
+successor(#20401,#20299)
+successor(#20294,#20295)
+successor(#20292,#20311)
+successor(#20276,#20273)
 #20405=*
-exit_cfg_node(#20405,#20248)
-#20406=@"loc,{#10000},6,14,6,13"
-locations_default(#20406,#10000,6,14,6,13)
+entry_cfg_node(#20405,#20276)
+#20406=@"loc,{#10000},8,3,8,2"
+locations_default(#20406,#10000,8,3,8,2)
 hasLocation(#20405,#20406)
-successor(#20253,#20405)
-successor(#20251,#20253)
-successor(#20403,#20251)
-successor(#20247,#20248)
-successor(#20245,#20257)
-successor(#20243,#20247)
+#20407=*
+exit_cfg_node(#20407,#20276)
+#20408=@"loc,{#10000},8,18,8,17"
+locations_default(#20408,#10000,8,18,8,17)
+hasLocation(#20407,#20408)
+successor(#20290,#20407)
+successor(#20280,#20290)
+successor(#20405,#20280)
+successor(#20275,#20276)
+successor(#20273,#20294)
+successor(#20261,#20258)
+#20409=*
+entry_cfg_node(#20409,#20261)
+#20410=@"loc,{#10000},7,3,7,2"
+locations_default(#20410,#10000,7,3,7,2)
+hasLocation(#20409,#20410)
+#20411=*
+exit_cfg_node(#20411,#20261)
+#20412=@"loc,{#10000},7,14,7,13"
+locations_default(#20412,#10000,7,14,7,13)
+hasLocation(#20411,#20412)
+successor(#20271,#20411)
+successor(#20265,#20271)
+successor(#20409,#20265)
+successor(#20260,#20261)
+successor(#20258,#20275)
+successor(#20250,#20247)
+#20413=*
+entry_cfg_node(#20413,#20250)
+#20414=@"loc,{#10000},6,3,6,2"
+locations_default(#20414,#10000,6,3,6,2)
+hasLocation(#20413,#20414)
+#20415=*
+exit_cfg_node(#20415,#20250)
+#20416=@"loc,{#10000},6,14,6,13"
+locations_default(#20416,#10000,6,14,6,13)
+hasLocation(#20415,#20416)
+successor(#20256,#20415)
+successor(#20254,#20256)
+successor(#20413,#20254)
+successor(#20249,#20250)
+successor(#20247,#20260)
+successor(#20244,#20249)
+successor(#20373,#20371)
+successor(#20371,#20366)
+successor(#20370,#20368)
+successor(#20368,#20373)
+successor(#20366,#20386)
+successor(#20365,#20364)
 successor(#20364,#20362)
-successor(#20362,#20357)
-successor(#20361,#20359)
-successor(#20359,#20364)
-successor(#20357,#20376)
-successor(#20356,#20355)
-successor(#20355,#20353)
-successor(#20353,#20361)
-successor(#20340,#20339)
-successor(#20339,#20337)
-successor(#20337,#20356)
-successor(#20336,#20335)
-successor(#20335,#20333)
-successor(#20333,#20340)
-successor(#20320,#20318)
-successor(#20318,#20313)
-successor(#20317,#20315)
-successor(#20315,#20320)
-successor(#20313,#20336)
-successor(#20300,#20299)
-successor(#20299,#20297)
-successor(#20297,#20317)
-successor(#20284,#20282)
-successor(#20282,#20277)
-successor(#20281,#20279)
-successor(#20279,#20284)
-successor(#20277,#20300)
-successor(#20266,#20265)
-successor(#20265,#20263)
-successor(#20263,#20281)
-successor(#20241,#20266)
-successor(#20236,#20243)
-successor(#20231,#20236)
-successor(#20226,#20231)
-successor(#20374,#20226)
+successor(#20362,#20370)
+successor(#20348,#20347)
+successor(#20347,#20345)
+successor(#20345,#20365)
+successor(#20344,#20343)
+successor(#20343,#20341)
+successor(#20341,#20348)
+successor(#20327,#20325)
+successor(#20325,#20320)
+successor(#20324,#20322)
+successor(#20322,#20327)
+successor(#20320,#20344)
+successor(#20306,#20305)
+successor(#20305,#20303)
+successor(#20303,#20324)
+successor(#20289,#20287)
+successor(#20287,#20282)
+successor(#20286,#20284)
+successor(#20284,#20289)
+successor(#20282,#20306)
+successor(#20270,#20269)
+successor(#20269,#20267)
+successor(#20267,#20286)
+successor(#20242,#20270)
+successor(#20237,#20244)
+successor(#20232,#20237)
+successor(#20227,#20232)
+successor(#20384,#20227)
 numlines(#10000,15,12,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/hello.ts.trap b/javascript/extractor/tests/ts/output/trap/hello.ts.trap
index 9639e17a662..d336402faf3 100644
--- a/javascript/extractor/tests/ts/output/trap/hello.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/hello.ts.trap
@@ -170,162 +170,166 @@ locations_default(#20061,#10000,1,1,6,0)
 hasLocation(#20001,#20061)
 #20062=@"var;{greeter};{#20000}"
 variables(#20062,"greeter",#20000)
-#20063=*
-stmts(#20063,17,#20001,0,"functio ...  ""!"";\n}")
-#20064=@"loc,{#10000},1,1,3,1"
-locations_default(#20064,#10000,1,1,3,1)
-hasLocation(#20063,#20064)
-stmt_containers(#20063,#20001)
-#20065=*
-exprs(#20065,78,#20063,-1,"greeter")
-hasLocation(#20065,#20015)
-expr_containers(#20065,#20063)
-literals("greeter","greeter",#20065)
-decl(#20065,#20062)
+#20063=@"var;{this};{#20000}"
+variables(#20063,"this",#20000)
+#20064=*
+stmts(#20064,17,#20001,0,"functio ...  ""!"";\n}")
+#20065=@"loc,{#10000},1,1,3,1"
+locations_default(#20065,#10000,1,1,3,1)
+hasLocation(#20064,#20065)
+stmt_containers(#20064,#20001)
 #20066=*
-scopes(#20066,1)
-scopenodes(#20063,#20066)
-scopenesting(#20066,#20000)
-#20067=@"var;{person};{#20066}"
-variables(#20067,"person",#20066)
-#20068=*
-exprs(#20068,78,#20063,0,"person")
-hasLocation(#20068,#20019)
-expr_containers(#20068,#20063)
-literals("person","person",#20068)
-decl(#20068,#20067)
-#20069=@"var;{arguments};{#20066}"
-variables(#20069,"arguments",#20066)
-is_arguments_object(#20069)
+exprs(#20066,78,#20064,-1,"greeter")
+hasLocation(#20066,#20015)
+expr_containers(#20066,#20064)
+literals("greeter","greeter",#20066)
+decl(#20066,#20062)
+#20067=*
+scopes(#20067,1)
+scopenodes(#20064,#20067)
+scopenesting(#20067,#20000)
+#20068=@"var;{this};{#20067}"
+variables(#20068,"this",#20067)
+#20069=@"var;{person};{#20067}"
+variables(#20069,"person",#20067)
 #20070=*
-typeexprs(#20070,2,#20063,-6,"string")
-hasLocation(#20070,#20023)
-expr_containers(#20070,#20063)
-literals("string","string",#20070)
-#20071=*
-stmts(#20071,1,#20063,-2,"{\n    r ...  ""!"";\n}")
-#20072=@"loc,{#10000},1,34,3,1"
-locations_default(#20072,#10000,1,34,3,1)
-hasLocation(#20071,#20072)
-stmt_containers(#20071,#20063)
+exprs(#20070,78,#20064,0,"person")
+hasLocation(#20070,#20019)
+expr_containers(#20070,#20064)
+literals("person","person",#20070)
+decl(#20070,#20069)
+#20071=@"var;{arguments};{#20067}"
+variables(#20071,"arguments",#20067)
+is_arguments_object(#20071)
+#20072=*
+typeexprs(#20072,2,#20064,-6,"string")
+hasLocation(#20072,#20023)
+expr_containers(#20072,#20064)
+literals("string","string",#20072)
 #20073=*
-stmts(#20073,9,#20071,0,"return  ...  + ""!"";")
-#20074=@"loc,{#10000},2,5,2,36"
-locations_default(#20074,#10000,2,5,2,36)
+stmts(#20073,1,#20064,-2,"{\n    r ...  ""!"";\n}")
+#20074=@"loc,{#10000},1,34,3,1"
+locations_default(#20074,#10000,1,34,3,1)
 hasLocation(#20073,#20074)
-stmt_containers(#20073,#20063)
+stmt_containers(#20073,#20064)
 #20075=*
-exprs(#20075,34,#20073,0,"""Hello, ... n + ""!""")
-#20076=@"loc,{#10000},2,12,2,35"
-locations_default(#20076,#10000,2,12,2,35)
+stmts(#20075,9,#20073,0,"return  ...  + ""!"";")
+#20076=@"loc,{#10000},2,5,2,36"
+locations_default(#20076,#10000,2,5,2,36)
 hasLocation(#20075,#20076)
-enclosing_stmt(#20075,#20073)
-expr_containers(#20075,#20063)
+stmt_containers(#20075,#20064)
 #20077=*
-exprs(#20077,34,#20075,0,"""Hello, "" + person")
-#20078=@"loc,{#10000},2,12,2,29"
-locations_default(#20078,#10000,2,12,2,29)
+exprs(#20077,34,#20075,0,"""Hello, ... n + ""!""")
+#20078=@"loc,{#10000},2,12,2,35"
+locations_default(#20078,#10000,2,12,2,35)
 hasLocation(#20077,#20078)
-enclosing_stmt(#20077,#20073)
-expr_containers(#20077,#20063)
+enclosing_stmt(#20077,#20075)
+expr_containers(#20077,#20064)
 #20079=*
-exprs(#20079,4,#20077,0,"""Hello, """)
-hasLocation(#20079,#20031)
-enclosing_stmt(#20079,#20073)
-expr_containers(#20079,#20063)
-literals("Hello, ","""Hello, """,#20079)
-#20080=*
-exprs(#20080,79,#20077,1,"person")
-hasLocation(#20080,#20035)
-enclosing_stmt(#20080,#20073)
-expr_containers(#20080,#20063)
-literals("person","person",#20080)
-bind(#20080,#20067)
+exprs(#20079,34,#20077,0,"""Hello, "" + person")
+#20080=@"loc,{#10000},2,12,2,29"
+locations_default(#20080,#10000,2,12,2,29)
+hasLocation(#20079,#20080)
+enclosing_stmt(#20079,#20075)
+expr_containers(#20079,#20064)
 #20081=*
-exprs(#20081,4,#20075,1,"""!""")
-hasLocation(#20081,#20039)
-enclosing_stmt(#20081,#20073)
-expr_containers(#20081,#20063)
-literals("!","""!""",#20081)
+exprs(#20081,4,#20079,0,"""Hello, """)
+hasLocation(#20081,#20031)
+enclosing_stmt(#20081,#20075)
+expr_containers(#20081,#20064)
+literals("Hello, ","""Hello, """,#20081)
 #20082=*
-stmts(#20082,2,#20001,1,"alert(g ... rld""));")
-hasLocation(#20082,#20011)
-stmt_containers(#20082,#20001)
+exprs(#20082,79,#20079,1,"person")
+hasLocation(#20082,#20035)
+enclosing_stmt(#20082,#20075)
+expr_containers(#20082,#20064)
+literals("person","person",#20082)
+bind(#20082,#20069)
 #20083=*
-exprs(#20083,13,#20082,0,"alert(g ... orld""))")
-#20084=@"loc,{#10000},5,1,5,23"
-locations_default(#20084,#10000,5,1,5,23)
-hasLocation(#20083,#20084)
-enclosing_stmt(#20083,#20082)
-expr_containers(#20083,#20001)
+exprs(#20083,4,#20077,1,"""!""")
+hasLocation(#20083,#20039)
+enclosing_stmt(#20083,#20075)
+expr_containers(#20083,#20064)
+literals("!","""!""",#20083)
+#20084=*
+stmts(#20084,2,#20001,1,"alert(g ... rld""));")
+hasLocation(#20084,#20011)
+stmt_containers(#20084,#20001)
 #20085=*
-exprs(#20085,79,#20083,-1,"alert")
-hasLocation(#20085,#20044)
-enclosing_stmt(#20085,#20082)
+exprs(#20085,13,#20084,0,"alert(g ... orld""))")
+#20086=@"loc,{#10000},5,1,5,23"
+locations_default(#20086,#10000,5,1,5,23)
+hasLocation(#20085,#20086)
+enclosing_stmt(#20085,#20084)
 expr_containers(#20085,#20001)
-literals("alert","alert",#20085)
-#20086=@"var;{alert};{#20000}"
-variables(#20086,"alert",#20000)
-bind(#20085,#20086)
 #20087=*
-exprs(#20087,13,#20083,0,"greeter(""world"")")
-#20088=@"loc,{#10000},5,7,5,22"
-locations_default(#20088,#10000,5,7,5,22)
-hasLocation(#20087,#20088)
-enclosing_stmt(#20087,#20082)
+exprs(#20087,79,#20085,-1,"alert")
+hasLocation(#20087,#20044)
+enclosing_stmt(#20087,#20084)
 expr_containers(#20087,#20001)
+literals("alert","alert",#20087)
+#20088=@"var;{alert};{#20000}"
+variables(#20088,"alert",#20000)
+bind(#20087,#20088)
 #20089=*
-exprs(#20089,79,#20087,-1,"greeter")
-hasLocation(#20089,#20048)
-enclosing_stmt(#20089,#20082)
+exprs(#20089,13,#20085,0,"greeter(""world"")")
+#20090=@"loc,{#10000},5,7,5,22"
+locations_default(#20090,#10000,5,7,5,22)
+hasLocation(#20089,#20090)
+enclosing_stmt(#20089,#20084)
 expr_containers(#20089,#20001)
-literals("greeter","greeter",#20089)
-bind(#20089,#20062)
-#20090=*
-exprs(#20090,4,#20087,0,"""world""")
-hasLocation(#20090,#20052)
-enclosing_stmt(#20090,#20082)
-expr_containers(#20090,#20001)
-literals("world","""world""",#20090)
 #20091=*
-regexpterm(#20091,14,#20090,0,"world")
-#20092=@"loc,{#10000},5,16,5,20"
-locations_default(#20092,#10000,5,16,5,20)
-hasLocation(#20091,#20092)
-regexp_const_value(#20091,"world")
+exprs(#20091,79,#20089,-1,"greeter")
+hasLocation(#20091,#20048)
+enclosing_stmt(#20091,#20084)
+expr_containers(#20091,#20001)
+literals("greeter","greeter",#20091)
+bind(#20091,#20062)
+#20092=*
+exprs(#20092,4,#20089,0,"""world""")
+hasLocation(#20092,#20052)
+enclosing_stmt(#20092,#20084)
+expr_containers(#20092,#20001)
+literals("world","""world""",#20092)
 #20093=*
-entry_cfg_node(#20093,#20001)
-#20094=@"loc,{#10000},1,1,1,0"
-locations_default(#20094,#10000,1,1,1,0)
+regexpterm(#20093,14,#20092,0,"world")
+#20094=@"loc,{#10000},5,16,5,20"
+locations_default(#20094,#10000,5,16,5,20)
 hasLocation(#20093,#20094)
+regexp_const_value(#20093,"world")
 #20095=*
-exit_cfg_node(#20095,#20001)
-hasLocation(#20095,#20060)
-successor(#20082,#20085)
-successor(#20090,#20087)
-successor(#20089,#20090)
-successor(#20087,#20083)
-successor(#20085,#20089)
-successor(#20083,#20095)
-successor(#20063,#20082)
-#20096=*
-entry_cfg_node(#20096,#20063)
-hasLocation(#20096,#20094)
+entry_cfg_node(#20095,#20001)
+#20096=@"loc,{#10000},1,1,1,0"
+locations_default(#20096,#10000,1,1,1,0)
+hasLocation(#20095,#20096)
 #20097=*
-exit_cfg_node(#20097,#20063)
-#20098=@"loc,{#10000},3,2,3,1"
-locations_default(#20098,#10000,3,2,3,1)
-hasLocation(#20097,#20098)
-successor(#20081,#20075)
-successor(#20080,#20077)
-successor(#20079,#20080)
-successor(#20077,#20081)
-successor(#20075,#20073)
-successor(#20073,#20097)
-successor(#20071,#20079)
-successor(#20068,#20071)
-successor(#20096,#20068)
-successor(#20065,#20063)
-successor(#20093,#20065)
+exit_cfg_node(#20097,#20001)
+hasLocation(#20097,#20060)
+successor(#20084,#20087)
+successor(#20092,#20089)
+successor(#20091,#20092)
+successor(#20089,#20085)
+successor(#20087,#20091)
+successor(#20085,#20097)
+successor(#20064,#20084)
+#20098=*
+entry_cfg_node(#20098,#20064)
+hasLocation(#20098,#20096)
+#20099=*
+exit_cfg_node(#20099,#20064)
+#20100=@"loc,{#10000},3,2,3,1"
+locations_default(#20100,#10000,3,2,3,1)
+hasLocation(#20099,#20100)
+successor(#20083,#20077)
+successor(#20082,#20079)
+successor(#20081,#20082)
+successor(#20079,#20083)
+successor(#20077,#20075)
+successor(#20075,#20099)
+successor(#20073,#20081)
+successor(#20070,#20073)
+successor(#20098,#20070)
+successor(#20066,#20064)
+successor(#20095,#20066)
 numlines(#10000,5,4,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/import-attributes.ts.trap b/javascript/extractor/tests/ts/output/trap/import-attributes.ts.trap
index 705137f5a27..193a2afeb18 100644
--- a/javascript/extractor/tests/ts/output/trap/import-attributes.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/import-attributes.ts.trap
@@ -1280,866 +1280,868 @@ local_type_names(#20491,"v3",#20485)
 local_namespace_names(#20492,"v1",#20485)
 local_namespace_names(#20493,"v2",#20485)
 local_namespace_names(#20494,"v3",#20485)
-#20496=*
-stmts(#20496,27,#20001,0,"import  ... son"" };")
-hasLocation(#20496,#20007)
-stmt_containers(#20496,#20001)
+#20496=@"var;{this};{#20485}"
+variables(#20496,"this",#20485)
 #20497=*
-exprs(#20497,4,#20496,-1,"""module""")
-hasLocation(#20497,#20057)
-enclosing_stmt(#20497,#20496)
-expr_containers(#20497,#20001)
-literals("module","""module""",#20497)
+stmts(#20497,27,#20001,0,"import  ... son"" };")
+hasLocation(#20497,#20007)
+stmt_containers(#20497,#20001)
 #20498=*
-regexpterm(#20498,14,#20497,0,"module")
-#20499=@"loc,{#10000},1,9,1,14"
-locations_default(#20499,#10000,1,9,1,14)
-hasLocation(#20498,#20499)
-regexp_const_value(#20498,"module")
-#20500=*
-exprs(#20500,8,#20496,-10,"{ type: ""json"" }")
-#20501=@"loc,{#10000},1,22,1,37"
-locations_default(#20501,#10000,1,22,1,37)
-hasLocation(#20500,#20501)
-enclosing_stmt(#20500,#20496)
-expr_containers(#20500,#20001)
-#20502=*
-properties(#20502,#20500,0,0,"type: ""json""")
-#20503=@"loc,{#10000},1,24,1,35"
-locations_default(#20503,#10000,1,24,1,35)
-hasLocation(#20502,#20503)
-#20504=*
-stmts(#20504,27,#20001,1,"import  ... son"" };")
-hasLocation(#20504,#20009)
-stmt_containers(#20504,#20001)
+exprs(#20498,4,#20497,-1,"""module""")
+hasLocation(#20498,#20057)
+enclosing_stmt(#20498,#20497)
+expr_containers(#20498,#20001)
+literals("module","""module""",#20498)
+#20499=*
+regexpterm(#20499,14,#20498,0,"module")
+#20500=@"loc,{#10000},1,9,1,14"
+locations_default(#20500,#10000,1,9,1,14)
+hasLocation(#20499,#20500)
+regexp_const_value(#20499,"module")
+#20501=*
+exprs(#20501,8,#20497,-10,"{ type: ""json"" }")
+#20502=@"loc,{#10000},1,22,1,37"
+locations_default(#20502,#10000,1,22,1,37)
+hasLocation(#20501,#20502)
+enclosing_stmt(#20501,#20497)
+expr_containers(#20501,#20001)
+#20503=*
+properties(#20503,#20501,0,0,"type: ""json""")
+#20504=@"loc,{#10000},1,24,1,35"
+locations_default(#20504,#10000,1,24,1,35)
+hasLocation(#20503,#20504)
 #20505=*
-exprs(#20505,4,#20504,-1,"""module""")
-hasLocation(#20505,#20083)
-enclosing_stmt(#20505,#20504)
-expr_containers(#20505,#20001)
-literals("module","""module""",#20505)
+stmts(#20505,27,#20001,1,"import  ... son"" };")
+hasLocation(#20505,#20009)
+stmt_containers(#20505,#20001)
 #20506=*
-regexpterm(#20506,14,#20505,0,"module")
-#20507=@"loc,{#10000},2,22,2,27"
-locations_default(#20507,#10000,2,22,2,27)
-hasLocation(#20506,#20507)
-regexp_const_value(#20506,"module")
-#20508=*
-exprs(#20508,8,#20504,-10,"{ type: ""json"" }")
-#20509=@"loc,{#10000},2,35,2,50"
-locations_default(#20509,#10000,2,35,2,50)
-hasLocation(#20508,#20509)
-enclosing_stmt(#20508,#20504)
-expr_containers(#20508,#20001)
-#20510=*
-properties(#20510,#20508,0,0,"type: ""json""")
-#20511=@"loc,{#10000},2,37,2,48"
-locations_default(#20511,#10000,2,37,2,48)
-hasLocation(#20510,#20511)
-#20512=*
-exprs(#20512,85,#20504,0,"* as v1")
-#20513=@"loc,{#10000},2,8,2,14"
-locations_default(#20513,#10000,2,8,2,14)
-hasLocation(#20512,#20513)
-enclosing_stmt(#20512,#20504)
-expr_containers(#20512,#20001)
-#20514=*
-exprs(#20514,78,#20512,1,"v1")
-hasLocation(#20514,#20079)
-enclosing_stmt(#20514,#20504)
-expr_containers(#20514,#20001)
-literals("v1","v1",#20514)
-decl(#20514,#20486)
-typedecl(#20514,#20489)
-namespacedecl(#20514,#20492)
+exprs(#20506,4,#20505,-1,"""module""")
+hasLocation(#20506,#20083)
+enclosing_stmt(#20506,#20505)
+expr_containers(#20506,#20001)
+literals("module","""module""",#20506)
+#20507=*
+regexpterm(#20507,14,#20506,0,"module")
+#20508=@"loc,{#10000},2,22,2,27"
+locations_default(#20508,#10000,2,22,2,27)
+hasLocation(#20507,#20508)
+regexp_const_value(#20507,"module")
+#20509=*
+exprs(#20509,8,#20505,-10,"{ type: ""json"" }")
+#20510=@"loc,{#10000},2,35,2,50"
+locations_default(#20510,#10000,2,35,2,50)
+hasLocation(#20509,#20510)
+enclosing_stmt(#20509,#20505)
+expr_containers(#20509,#20001)
+#20511=*
+properties(#20511,#20509,0,0,"type: ""json""")
+#20512=@"loc,{#10000},2,37,2,48"
+locations_default(#20512,#10000,2,37,2,48)
+hasLocation(#20511,#20512)
+#20513=*
+exprs(#20513,85,#20505,0,"* as v1")
+#20514=@"loc,{#10000},2,8,2,14"
+locations_default(#20514,#10000,2,8,2,14)
+hasLocation(#20513,#20514)
+enclosing_stmt(#20513,#20505)
+expr_containers(#20513,#20001)
 #20515=*
-stmts(#20515,27,#20001,2,"import  ... son"" };")
-hasLocation(#20515,#20011)
-stmt_containers(#20515,#20001)
+exprs(#20515,78,#20513,1,"v1")
+hasLocation(#20515,#20079)
+enclosing_stmt(#20515,#20505)
+expr_containers(#20515,#20001)
+literals("v1","v1",#20515)
+decl(#20515,#20486)
+typedecl(#20515,#20489)
+namespacedecl(#20515,#20492)
 #20516=*
-exprs(#20516,4,#20515,-1,"""module""")
-hasLocation(#20516,#20109)
-enclosing_stmt(#20516,#20515)
-expr_containers(#20516,#20001)
-literals("module","""module""",#20516)
+stmts(#20516,27,#20001,2,"import  ... son"" };")
+hasLocation(#20516,#20011)
+stmt_containers(#20516,#20001)
 #20517=*
-regexpterm(#20517,14,#20516,0,"module")
-#20518=@"loc,{#10000},3,21,3,26"
-locations_default(#20518,#10000,3,21,3,26)
-hasLocation(#20517,#20518)
-regexp_const_value(#20517,"module")
-#20519=*
-exprs(#20519,8,#20515,-10,"{ type: ""json"" }")
-#20520=@"loc,{#10000},3,34,3,49"
-locations_default(#20520,#10000,3,34,3,49)
-hasLocation(#20519,#20520)
-enclosing_stmt(#20519,#20515)
-expr_containers(#20519,#20001)
-#20521=*
-properties(#20521,#20519,0,0,"type: ""json""")
-#20522=@"loc,{#10000},3,36,3,47"
-locations_default(#20522,#10000,3,36,3,47)
-hasLocation(#20521,#20522)
-#20523=*
-exprs(#20523,83,#20515,0,"v2")
-hasLocation(#20523,#20103)
-enclosing_stmt(#20523,#20515)
-expr_containers(#20523,#20001)
+exprs(#20517,4,#20516,-1,"""module""")
+hasLocation(#20517,#20109)
+enclosing_stmt(#20517,#20516)
+expr_containers(#20517,#20001)
+literals("module","""module""",#20517)
+#20518=*
+regexpterm(#20518,14,#20517,0,"module")
+#20519=@"loc,{#10000},3,21,3,26"
+locations_default(#20519,#10000,3,21,3,26)
+hasLocation(#20518,#20519)
+regexp_const_value(#20518,"module")
+#20520=*
+exprs(#20520,8,#20516,-10,"{ type: ""json"" }")
+#20521=@"loc,{#10000},3,34,3,49"
+locations_default(#20521,#10000,3,34,3,49)
+hasLocation(#20520,#20521)
+enclosing_stmt(#20520,#20516)
+expr_containers(#20520,#20001)
+#20522=*
+properties(#20522,#20520,0,0,"type: ""json""")
+#20523=@"loc,{#10000},3,36,3,47"
+locations_default(#20523,#10000,3,36,3,47)
+hasLocation(#20522,#20523)
 #20524=*
-exprs(#20524,0,#20523,0,"v2")
+exprs(#20524,83,#20516,0,"v2")
 hasLocation(#20524,#20103)
-enclosing_stmt(#20524,#20515)
+enclosing_stmt(#20524,#20516)
 expr_containers(#20524,#20001)
-literals("v2","v2",#20524)
 #20525=*
-exprs(#20525,78,#20523,1,"v2")
+exprs(#20525,0,#20524,0,"v2")
 hasLocation(#20525,#20103)
-enclosing_stmt(#20525,#20515)
+enclosing_stmt(#20525,#20516)
 expr_containers(#20525,#20001)
 literals("v2","v2",#20525)
-decl(#20525,#20487)
-typedecl(#20525,#20490)
-namespacedecl(#20525,#20493)
 #20526=*
-stmts(#20526,27,#20001,3,"import  ... son"" };")
-hasLocation(#20526,#20013)
-stmt_containers(#20526,#20001)
+exprs(#20526,78,#20524,1,"v2")
+hasLocation(#20526,#20103)
+enclosing_stmt(#20526,#20516)
+expr_containers(#20526,#20001)
+literals("v2","v2",#20526)
+decl(#20526,#20487)
+typedecl(#20526,#20490)
+namespacedecl(#20526,#20493)
 #20527=*
-exprs(#20527,4,#20526,-1,"""module""")
-hasLocation(#20527,#20131)
-enclosing_stmt(#20527,#20526)
-expr_containers(#20527,#20001)
-literals("module","""module""",#20527)
+stmts(#20527,27,#20001,3,"import  ... son"" };")
+hasLocation(#20527,#20013)
+stmt_containers(#20527,#20001)
 #20528=*
-regexpterm(#20528,14,#20527,0,"module")
-#20529=@"loc,{#10000},4,17,4,22"
-locations_default(#20529,#10000,4,17,4,22)
-hasLocation(#20528,#20529)
-regexp_const_value(#20528,"module")
-#20530=*
-exprs(#20530,8,#20526,-10,"{ type: ""json"" }")
-#20531=@"loc,{#10000},4,30,4,45"
-locations_default(#20531,#10000,4,30,4,45)
-hasLocation(#20530,#20531)
-enclosing_stmt(#20530,#20526)
-expr_containers(#20530,#20001)
-#20532=*
-properties(#20532,#20530,0,0,"type: ""json""")
-#20533=@"loc,{#10000},4,32,4,43"
-locations_default(#20533,#10000,4,32,4,43)
-hasLocation(#20532,#20533)
-#20534=*
-exprs(#20534,84,#20526,0,"v3")
-hasLocation(#20534,#20127)
-enclosing_stmt(#20534,#20526)
-expr_containers(#20534,#20001)
+exprs(#20528,4,#20527,-1,"""module""")
+hasLocation(#20528,#20131)
+enclosing_stmt(#20528,#20527)
+expr_containers(#20528,#20001)
+literals("module","""module""",#20528)
+#20529=*
+regexpterm(#20529,14,#20528,0,"module")
+#20530=@"loc,{#10000},4,17,4,22"
+locations_default(#20530,#10000,4,17,4,22)
+hasLocation(#20529,#20530)
+regexp_const_value(#20529,"module")
+#20531=*
+exprs(#20531,8,#20527,-10,"{ type: ""json"" }")
+#20532=@"loc,{#10000},4,30,4,45"
+locations_default(#20532,#10000,4,30,4,45)
+hasLocation(#20531,#20532)
+enclosing_stmt(#20531,#20527)
+expr_containers(#20531,#20001)
+#20533=*
+properties(#20533,#20531,0,0,"type: ""json""")
+#20534=@"loc,{#10000},4,32,4,43"
+locations_default(#20534,#10000,4,32,4,43)
+hasLocation(#20533,#20534)
 #20535=*
-exprs(#20535,78,#20534,1,"v3")
+exprs(#20535,84,#20527,0,"v3")
 hasLocation(#20535,#20127)
-enclosing_stmt(#20535,#20526)
+enclosing_stmt(#20535,#20527)
 expr_containers(#20535,#20001)
-literals("v3","v3",#20535)
-decl(#20535,#20488)
-typedecl(#20535,#20491)
-namespacedecl(#20535,#20494)
 #20536=*
-stmts(#20536,30,#20001,4,"export  ... son"" };")
-hasLocation(#20536,#20017)
-stmt_containers(#20536,#20001)
+exprs(#20536,78,#20535,1,"v3")
+hasLocation(#20536,#20127)
+enclosing_stmt(#20536,#20527)
+expr_containers(#20536,#20001)
+literals("v3","v3",#20536)
+decl(#20536,#20488)
+typedecl(#20536,#20491)
+namespacedecl(#20536,#20494)
 #20537=*
-exprs(#20537,4,#20536,-2,"""module""")
-hasLocation(#20537,#20157)
-enclosing_stmt(#20537,#20536)
-expr_containers(#20537,#20001)
-literals("module","""module""",#20537)
+stmts(#20537,30,#20001,4,"export  ... son"" };")
+hasLocation(#20537,#20017)
+stmt_containers(#20537,#20001)
 #20538=*
-regexpterm(#20538,14,#20537,0,"module")
-#20539=@"loc,{#10000},6,21,6,26"
-locations_default(#20539,#10000,6,21,6,26)
-hasLocation(#20538,#20539)
-regexp_const_value(#20538,"module")
-#20540=*
-exprs(#20540,8,#20536,-10,"{ type: ""json"" }")
-#20541=@"loc,{#10000},6,34,6,49"
-locations_default(#20541,#10000,6,34,6,49)
-hasLocation(#20540,#20541)
-enclosing_stmt(#20540,#20536)
-expr_containers(#20540,#20001)
-#20542=*
-properties(#20542,#20540,0,0,"type: ""json""")
-#20543=@"loc,{#10000},6,36,6,47"
-locations_default(#20543,#10000,6,36,6,47)
-hasLocation(#20542,#20543)
-#20544=*
-exprs(#20544,86,#20536,0,"v4")
-hasLocation(#20544,#20151)
-enclosing_stmt(#20544,#20536)
-expr_containers(#20544,#20001)
+exprs(#20538,4,#20537,-2,"""module""")
+hasLocation(#20538,#20157)
+enclosing_stmt(#20538,#20537)
+expr_containers(#20538,#20001)
+literals("module","""module""",#20538)
+#20539=*
+regexpterm(#20539,14,#20538,0,"module")
+#20540=@"loc,{#10000},6,21,6,26"
+locations_default(#20540,#10000,6,21,6,26)
+hasLocation(#20539,#20540)
+regexp_const_value(#20539,"module")
+#20541=*
+exprs(#20541,8,#20537,-10,"{ type: ""json"" }")
+#20542=@"loc,{#10000},6,34,6,49"
+locations_default(#20542,#10000,6,34,6,49)
+hasLocation(#20541,#20542)
+enclosing_stmt(#20541,#20537)
+expr_containers(#20541,#20001)
+#20543=*
+properties(#20543,#20541,0,0,"type: ""json""")
+#20544=@"loc,{#10000},6,36,6,47"
+locations_default(#20544,#10000,6,36,6,47)
+hasLocation(#20543,#20544)
 #20545=*
-exprs(#20545,0,#20544,0,"v4")
+exprs(#20545,86,#20537,0,"v4")
 hasLocation(#20545,#20151)
-enclosing_stmt(#20545,#20536)
+enclosing_stmt(#20545,#20537)
 expr_containers(#20545,#20001)
-literals("v4","v4",#20545)
 #20546=*
-exprs(#20546,0,#20544,1,"v4")
+exprs(#20546,0,#20545,0,"v4")
 hasLocation(#20546,#20151)
-enclosing_stmt(#20546,#20536)
+enclosing_stmt(#20546,#20537)
 expr_containers(#20546,#20001)
 literals("v4","v4",#20546)
 #20547=*
-stmts(#20547,28,#20001,5,"export  ... son"" };")
-hasLocation(#20547,#20019)
-stmt_containers(#20547,#20001)
+exprs(#20547,0,#20545,1,"v4")
+hasLocation(#20547,#20151)
+enclosing_stmt(#20547,#20537)
+expr_containers(#20547,#20001)
+literals("v4","v4",#20547)
 #20548=*
-exprs(#20548,4,#20547,0,"""module""")
-hasLocation(#20548,#20179)
-enclosing_stmt(#20548,#20547)
-expr_containers(#20548,#20001)
-literals("module","""module""",#20548)
+stmts(#20548,28,#20001,5,"export  ... son"" };")
+hasLocation(#20548,#20019)
+stmt_containers(#20548,#20001)
 #20549=*
-regexpterm(#20549,14,#20548,0,"module")
-#20550=@"loc,{#10000},7,16,7,21"
-locations_default(#20550,#10000,7,16,7,21)
-hasLocation(#20549,#20550)
-regexp_const_value(#20549,"module")
-#20551=*
-exprs(#20551,8,#20547,-10,"{ type: ""json"" }")
-#20552=@"loc,{#10000},7,29,7,44"
-locations_default(#20552,#10000,7,29,7,44)
-hasLocation(#20551,#20552)
-enclosing_stmt(#20551,#20547)
-expr_containers(#20551,#20001)
-#20553=*
-properties(#20553,#20551,0,0,"type: ""json""")
-#20554=@"loc,{#10000},7,31,7,42"
-locations_default(#20554,#10000,7,31,7,42)
-hasLocation(#20553,#20554)
-#20555=*
-stmts(#20555,30,#20001,6,"export  ... son"" };")
-hasLocation(#20555,#20021)
-stmt_containers(#20555,#20001)
+exprs(#20549,4,#20548,0,"""module""")
+hasLocation(#20549,#20179)
+enclosing_stmt(#20549,#20548)
+expr_containers(#20549,#20001)
+literals("module","""module""",#20549)
+#20550=*
+regexpterm(#20550,14,#20549,0,"module")
+#20551=@"loc,{#10000},7,16,7,21"
+locations_default(#20551,#10000,7,16,7,21)
+hasLocation(#20550,#20551)
+regexp_const_value(#20550,"module")
+#20552=*
+exprs(#20552,8,#20548,-10,"{ type: ""json"" }")
+#20553=@"loc,{#10000},7,29,7,44"
+locations_default(#20553,#10000,7,29,7,44)
+hasLocation(#20552,#20553)
+enclosing_stmt(#20552,#20548)
+expr_containers(#20552,#20001)
+#20554=*
+properties(#20554,#20552,0,0,"type: ""json""")
+#20555=@"loc,{#10000},7,31,7,42"
+locations_default(#20555,#10000,7,31,7,42)
+hasLocation(#20554,#20555)
 #20556=*
-exprs(#20556,4,#20555,-2,"""module""")
-hasLocation(#20556,#20205)
-enclosing_stmt(#20556,#20555)
-expr_containers(#20556,#20001)
-literals("module","""module""",#20556)
+stmts(#20556,30,#20001,6,"export  ... son"" };")
+hasLocation(#20556,#20021)
+stmt_containers(#20556,#20001)
 #20557=*
-regexpterm(#20557,14,#20556,0,"module")
-#20558=@"loc,{#10000},8,22,8,27"
-locations_default(#20558,#10000,8,22,8,27)
-hasLocation(#20557,#20558)
-regexp_const_value(#20557,"module")
-#20559=*
-exprs(#20559,8,#20555,-10,"{ type: ""json"" }")
-#20560=@"loc,{#10000},8,35,8,50"
-locations_default(#20560,#10000,8,35,8,50)
-hasLocation(#20559,#20560)
-enclosing_stmt(#20559,#20555)
-expr_containers(#20559,#20001)
-#20561=*
-properties(#20561,#20559,0,0,"type: ""json""")
-#20562=@"loc,{#10000},8,37,8,48"
-locations_default(#20562,#10000,8,37,8,48)
-hasLocation(#20561,#20562)
-#20563=*
-exprs(#20563,96,#20555,0,"* as v5")
-#20564=@"loc,{#10000},8,8,8,14"
-locations_default(#20564,#10000,8,8,8,14)
-hasLocation(#20563,#20564)
-enclosing_stmt(#20563,#20555)
-expr_containers(#20563,#20001)
-#20565=*
-exprs(#20565,0,#20563,1,"v5")
-hasLocation(#20565,#20201)
-enclosing_stmt(#20565,#20555)
-expr_containers(#20565,#20001)
-literals("v5","v5",#20565)
+exprs(#20557,4,#20556,-2,"""module""")
+hasLocation(#20557,#20205)
+enclosing_stmt(#20557,#20556)
+expr_containers(#20557,#20001)
+literals("module","""module""",#20557)
+#20558=*
+regexpterm(#20558,14,#20557,0,"module")
+#20559=@"loc,{#10000},8,22,8,27"
+locations_default(#20559,#10000,8,22,8,27)
+hasLocation(#20558,#20559)
+regexp_const_value(#20558,"module")
+#20560=*
+exprs(#20560,8,#20556,-10,"{ type: ""json"" }")
+#20561=@"loc,{#10000},8,35,8,50"
+locations_default(#20561,#10000,8,35,8,50)
+hasLocation(#20560,#20561)
+enclosing_stmt(#20560,#20556)
+expr_containers(#20560,#20001)
+#20562=*
+properties(#20562,#20560,0,0,"type: ""json""")
+#20563=@"loc,{#10000},8,37,8,48"
+locations_default(#20563,#10000,8,37,8,48)
+hasLocation(#20562,#20563)
+#20564=*
+exprs(#20564,96,#20556,0,"* as v5")
+#20565=@"loc,{#10000},8,8,8,14"
+locations_default(#20565,#10000,8,8,8,14)
+hasLocation(#20564,#20565)
+enclosing_stmt(#20564,#20556)
+expr_containers(#20564,#20001)
 #20566=*
-stmts(#20566,22,#20001,7,"const v ... "" } });")
-hasLocation(#20566,#20025)
-stmt_containers(#20566,#20001)
+exprs(#20566,0,#20564,1,"v5")
+hasLocation(#20566,#20201)
+enclosing_stmt(#20566,#20556)
+expr_containers(#20566,#20001)
+literals("v5","v5",#20566)
 #20567=*
-exprs(#20567,64,#20566,0,"v6 = im ... n"" } })")
-#20568=@"loc,{#10000},10,7,10,57"
-locations_default(#20568,#10000,10,7,10,57)
-hasLocation(#20567,#20568)
-enclosing_stmt(#20567,#20566)
-expr_containers(#20567,#20001)
-#20569=*
-exprs(#20569,78,#20567,0,"v6")
-hasLocation(#20569,#20223)
-enclosing_stmt(#20569,#20566)
-expr_containers(#20569,#20001)
-literals("v6","v6",#20569)
-decl(#20569,#20495)
+stmts(#20567,22,#20001,7,"const v ... "" } });")
+hasLocation(#20567,#20025)
+stmt_containers(#20567,#20001)
+#20568=*
+exprs(#20568,64,#20567,0,"v6 = im ... n"" } })")
+#20569=@"loc,{#10000},10,7,10,57"
+locations_default(#20569,#10000,10,7,10,57)
+hasLocation(#20568,#20569)
+enclosing_stmt(#20568,#20567)
+expr_containers(#20568,#20001)
 #20570=*
-exprs(#20570,99,#20567,1,"import( ... n"" } })")
-#20571=@"loc,{#10000},10,12,10,57"
-locations_default(#20571,#10000,10,12,10,57)
-hasLocation(#20570,#20571)
-enclosing_stmt(#20570,#20566)
+exprs(#20570,78,#20568,0,"v6")
+hasLocation(#20570,#20223)
+enclosing_stmt(#20570,#20567)
 expr_containers(#20570,#20001)
-#20572=*
-exprs(#20572,4,#20570,0,"""module""")
-hasLocation(#20572,#20231)
-enclosing_stmt(#20572,#20566)
-expr_containers(#20572,#20001)
-literals("module","""module""",#20572)
+literals("v6","v6",#20570)
+decl(#20570,#20495)
+#20571=*
+exprs(#20571,99,#20568,1,"import( ... n"" } })")
+#20572=@"loc,{#10000},10,12,10,57"
+locations_default(#20572,#10000,10,12,10,57)
+hasLocation(#20571,#20572)
+enclosing_stmt(#20571,#20567)
+expr_containers(#20571,#20001)
 #20573=*
-regexpterm(#20573,14,#20572,0,"module")
-#20574=@"loc,{#10000},10,20,10,25"
-locations_default(#20574,#10000,10,20,10,25)
-hasLocation(#20573,#20574)
-regexp_const_value(#20573,"module")
-#20575=*
-exprs(#20575,8,#20570,1,"{ ""with ... on"" } }")
-#20576=@"loc,{#10000},10,29,10,56"
-locations_default(#20576,#10000,10,29,10,56)
-hasLocation(#20575,#20576)
-enclosing_stmt(#20575,#20566)
-expr_containers(#20575,#20001)
-#20577=*
-properties(#20577,#20575,0,0,"""with"": ... json"" }")
-#20578=@"loc,{#10000},10,31,10,54"
-locations_default(#20578,#10000,10,31,10,54)
-hasLocation(#20577,#20578)
-#20579=*
-exprs(#20579,4,#20577,0,"""with""")
-hasLocation(#20579,#20237)
-enclosing_stmt(#20579,#20566)
-expr_containers(#20579,#20001)
-literals("with","""with""",#20579)
+exprs(#20573,4,#20571,0,"""module""")
+hasLocation(#20573,#20231)
+enclosing_stmt(#20573,#20567)
+expr_containers(#20573,#20001)
+literals("module","""module""",#20573)
+#20574=*
+regexpterm(#20574,14,#20573,0,"module")
+#20575=@"loc,{#10000},10,20,10,25"
+locations_default(#20575,#10000,10,20,10,25)
+hasLocation(#20574,#20575)
+regexp_const_value(#20574,"module")
+#20576=*
+exprs(#20576,8,#20571,1,"{ ""with ... on"" } }")
+#20577=@"loc,{#10000},10,29,10,56"
+locations_default(#20577,#10000,10,29,10,56)
+hasLocation(#20576,#20577)
+enclosing_stmt(#20576,#20567)
+expr_containers(#20576,#20001)
+#20578=*
+properties(#20578,#20576,0,0,"""with"": ... json"" }")
+#20579=@"loc,{#10000},10,31,10,54"
+locations_default(#20579,#10000,10,31,10,54)
+hasLocation(#20578,#20579)
 #20580=*
-regexpterm(#20580,14,#20579,0,"with")
-#20581=@"loc,{#10000},10,32,10,35"
-locations_default(#20581,#10000,10,32,10,35)
-hasLocation(#20580,#20581)
-regexp_const_value(#20580,"with")
-#20582=*
-exprs(#20582,8,#20577,1,"{ type: ""json"" }")
-#20583=@"loc,{#10000},10,39,10,54"
-locations_default(#20583,#10000,10,39,10,54)
-hasLocation(#20582,#20583)
-enclosing_stmt(#20582,#20566)
-expr_containers(#20582,#20001)
-#20584=*
-properties(#20584,#20582,0,0,"type: ""json""")
-#20585=@"loc,{#10000},10,41,10,52"
-locations_default(#20585,#10000,10,41,10,52)
-hasLocation(#20584,#20585)
-#20586=*
-exprs(#20586,0,#20584,0,"type")
-hasLocation(#20586,#20243)
-enclosing_stmt(#20586,#20566)
-expr_containers(#20586,#20001)
-literals("type","type",#20586)
+exprs(#20580,4,#20578,0,"""with""")
+hasLocation(#20580,#20237)
+enclosing_stmt(#20580,#20567)
+expr_containers(#20580,#20001)
+literals("with","""with""",#20580)
+#20581=*
+regexpterm(#20581,14,#20580,0,"with")
+#20582=@"loc,{#10000},10,32,10,35"
+locations_default(#20582,#10000,10,32,10,35)
+hasLocation(#20581,#20582)
+regexp_const_value(#20581,"with")
+#20583=*
+exprs(#20583,8,#20578,1,"{ type: ""json"" }")
+#20584=@"loc,{#10000},10,39,10,54"
+locations_default(#20584,#10000,10,39,10,54)
+hasLocation(#20583,#20584)
+enclosing_stmt(#20583,#20567)
+expr_containers(#20583,#20001)
+#20585=*
+properties(#20585,#20583,0,0,"type: ""json""")
+#20586=@"loc,{#10000},10,41,10,52"
+locations_default(#20586,#10000,10,41,10,52)
+hasLocation(#20585,#20586)
 #20587=*
-exprs(#20587,4,#20584,1,"""json""")
-hasLocation(#20587,#20247)
-enclosing_stmt(#20587,#20566)
+exprs(#20587,0,#20585,0,"type")
+hasLocation(#20587,#20243)
+enclosing_stmt(#20587,#20567)
 expr_containers(#20587,#20001)
-literals("json","""json""",#20587)
+literals("type","type",#20587)
 #20588=*
-regexpterm(#20588,14,#20587,0,"json")
-#20589=@"loc,{#10000},10,48,10,51"
-locations_default(#20589,#10000,10,48,10,51)
-hasLocation(#20588,#20589)
-regexp_const_value(#20588,"json")
-#20590=*
-stmts(#20590,27,#20001,8,"import ""module"";")
-#20591=@"loc,{#10000},12,1,12,16"
-locations_default(#20591,#10000,12,1,12,16)
-hasLocation(#20590,#20591)
-stmt_containers(#20590,#20001)
-#20592=*
-exprs(#20592,4,#20590,-1,"""module""")
-hasLocation(#20592,#20259)
-enclosing_stmt(#20592,#20590)
-expr_containers(#20592,#20001)
-literals("module","""module""",#20592)
+exprs(#20588,4,#20585,1,"""json""")
+hasLocation(#20588,#20247)
+enclosing_stmt(#20588,#20567)
+expr_containers(#20588,#20001)
+literals("json","""json""",#20588)
+#20589=*
+regexpterm(#20589,14,#20588,0,"json")
+#20590=@"loc,{#10000},10,48,10,51"
+locations_default(#20590,#10000,10,48,10,51)
+hasLocation(#20589,#20590)
+regexp_const_value(#20589,"json")
+#20591=*
+stmts(#20591,27,#20001,8,"import ""module"";")
+#20592=@"loc,{#10000},12,1,12,16"
+locations_default(#20592,#10000,12,1,12,16)
+hasLocation(#20591,#20592)
+stmt_containers(#20591,#20001)
 #20593=*
-regexpterm(#20593,14,#20592,0,"module")
-#20594=@"loc,{#10000},12,9,12,14"
-locations_default(#20594,#10000,12,9,12,14)
-hasLocation(#20593,#20594)
-regexp_const_value(#20593,"module")
-#20595=*
-stmts(#20595,2,#20001,9,"assert( ... on"" });")
-#20596=@"loc,{#10000},13,1,13,25"
-locations_default(#20596,#10000,13,1,13,25)
-hasLocation(#20595,#20596)
-stmt_containers(#20595,#20001)
-#20597=*
-exprs(#20597,13,#20595,0,"assert( ... son"" })")
-#20598=@"loc,{#10000},13,1,13,24"
-locations_default(#20598,#10000,13,1,13,24)
-hasLocation(#20597,#20598)
-enclosing_stmt(#20597,#20595)
-expr_containers(#20597,#20001)
-#20599=*
-exprs(#20599,79,#20597,-1,"assert")
-hasLocation(#20599,#20263)
-enclosing_stmt(#20599,#20595)
-expr_containers(#20599,#20001)
-literals("assert","assert",#20599)
-#20600=@"var;{assert};{#20000}"
-variables(#20600,"assert",#20000)
-bind(#20599,#20600)
-#20601=*
-exprs(#20601,8,#20597,0,"{ type: ""json"" }")
-#20602=@"loc,{#10000},13,8,13,23"
-locations_default(#20602,#10000,13,8,13,23)
-hasLocation(#20601,#20602)
-enclosing_stmt(#20601,#20595)
-expr_containers(#20601,#20001)
-#20603=*
-properties(#20603,#20601,0,0,"type: ""json""")
-#20604=@"loc,{#10000},13,10,13,21"
-locations_default(#20604,#10000,13,10,13,21)
-hasLocation(#20603,#20604)
-#20605=*
-exprs(#20605,0,#20603,0,"type")
-hasLocation(#20605,#20269)
-enclosing_stmt(#20605,#20595)
-expr_containers(#20605,#20001)
-literals("type","type",#20605)
+exprs(#20593,4,#20591,-1,"""module""")
+hasLocation(#20593,#20259)
+enclosing_stmt(#20593,#20591)
+expr_containers(#20593,#20001)
+literals("module","""module""",#20593)
+#20594=*
+regexpterm(#20594,14,#20593,0,"module")
+#20595=@"loc,{#10000},12,9,12,14"
+locations_default(#20595,#10000,12,9,12,14)
+hasLocation(#20594,#20595)
+regexp_const_value(#20594,"module")
+#20596=*
+stmts(#20596,2,#20001,9,"assert( ... on"" });")
+#20597=@"loc,{#10000},13,1,13,25"
+locations_default(#20597,#10000,13,1,13,25)
+hasLocation(#20596,#20597)
+stmt_containers(#20596,#20001)
+#20598=*
+exprs(#20598,13,#20596,0,"assert( ... son"" })")
+#20599=@"loc,{#10000},13,1,13,24"
+locations_default(#20599,#10000,13,1,13,24)
+hasLocation(#20598,#20599)
+enclosing_stmt(#20598,#20596)
+expr_containers(#20598,#20001)
+#20600=*
+exprs(#20600,79,#20598,-1,"assert")
+hasLocation(#20600,#20263)
+enclosing_stmt(#20600,#20596)
+expr_containers(#20600,#20001)
+literals("assert","assert",#20600)
+#20601=@"var;{assert};{#20000}"
+variables(#20601,"assert",#20000)
+bind(#20600,#20601)
+#20602=*
+exprs(#20602,8,#20598,0,"{ type: ""json"" }")
+#20603=@"loc,{#10000},13,8,13,23"
+locations_default(#20603,#10000,13,8,13,23)
+hasLocation(#20602,#20603)
+enclosing_stmt(#20602,#20596)
+expr_containers(#20602,#20001)
+#20604=*
+properties(#20604,#20602,0,0,"type: ""json""")
+#20605=@"loc,{#10000},13,10,13,21"
+locations_default(#20605,#10000,13,10,13,21)
+hasLocation(#20604,#20605)
 #20606=*
-exprs(#20606,4,#20603,1,"""json""")
-hasLocation(#20606,#20273)
-enclosing_stmt(#20606,#20595)
+exprs(#20606,0,#20604,0,"type")
+hasLocation(#20606,#20269)
+enclosing_stmt(#20606,#20596)
 expr_containers(#20606,#20001)
-literals("json","""json""",#20606)
+literals("type","type",#20606)
 #20607=*
-regexpterm(#20607,14,#20606,0,"json")
-#20608=@"loc,{#10000},13,17,13,20"
-locations_default(#20608,#10000,13,17,13,20)
-hasLocation(#20607,#20608)
-regexp_const_value(#20607,"json")
-#20609=*
-stmts(#20609,27,#20001,10,"import  ... son"" };")
-hasLocation(#20609,#20035)
-stmt_containers(#20609,#20001)
+exprs(#20607,4,#20604,1,"""json""")
+hasLocation(#20607,#20273)
+enclosing_stmt(#20607,#20596)
+expr_containers(#20607,#20001)
+literals("json","""json""",#20607)
+#20608=*
+regexpterm(#20608,14,#20607,0,"json")
+#20609=@"loc,{#10000},13,17,13,20"
+locations_default(#20609,#10000,13,17,13,20)
+hasLocation(#20608,#20609)
+regexp_const_value(#20608,"json")
 #20610=*
-exprs(#20610,4,#20609,-1,"""module""")
-hasLocation(#20610,#20283)
-enclosing_stmt(#20610,#20609)
-expr_containers(#20610,#20001)
-literals("module","""module""",#20610)
+stmts(#20610,27,#20001,10,"import  ... son"" };")
+hasLocation(#20610,#20035)
+stmt_containers(#20610,#20001)
 #20611=*
-regexpterm(#20611,14,#20610,0,"module")
-#20612=@"loc,{#10000},15,9,15,14"
-locations_default(#20612,#10000,15,9,15,14)
-hasLocation(#20611,#20612)
-regexp_const_value(#20611,"module")
-#20613=*
-exprs(#20613,8,#20609,-10,"{ type: ""json"" }")
-#20614=@"loc,{#10000},15,24,15,39"
-locations_default(#20614,#10000,15,24,15,39)
-hasLocation(#20613,#20614)
-enclosing_stmt(#20613,#20609)
-expr_containers(#20613,#20001)
-#20615=*
-properties(#20615,#20613,0,0,"type: ""json""")
-#20616=@"loc,{#10000},15,26,15,37"
-locations_default(#20616,#10000,15,26,15,37)
-hasLocation(#20615,#20616)
-#20617=*
-stmts(#20617,27,#20001,11,"import  ... son"" };")
-hasLocation(#20617,#20037)
-stmt_containers(#20617,#20001)
+exprs(#20611,4,#20610,-1,"""module""")
+hasLocation(#20611,#20283)
+enclosing_stmt(#20611,#20610)
+expr_containers(#20611,#20001)
+literals("module","""module""",#20611)
+#20612=*
+regexpterm(#20612,14,#20611,0,"module")
+#20613=@"loc,{#10000},15,9,15,14"
+locations_default(#20613,#10000,15,9,15,14)
+hasLocation(#20612,#20613)
+regexp_const_value(#20612,"module")
+#20614=*
+exprs(#20614,8,#20610,-10,"{ type: ""json"" }")
+#20615=@"loc,{#10000},15,24,15,39"
+locations_default(#20615,#10000,15,24,15,39)
+hasLocation(#20614,#20615)
+enclosing_stmt(#20614,#20610)
+expr_containers(#20614,#20001)
+#20616=*
+properties(#20616,#20614,0,0,"type: ""json""")
+#20617=@"loc,{#10000},15,26,15,37"
+locations_default(#20617,#10000,15,26,15,37)
+hasLocation(#20616,#20617)
 #20618=*
-exprs(#20618,4,#20617,-1,"""module""")
-hasLocation(#20618,#20309)
-enclosing_stmt(#20618,#20617)
-expr_containers(#20618,#20001)
-literals("module","""module""",#20618)
+stmts(#20618,27,#20001,11,"import  ... son"" };")
+hasLocation(#20618,#20037)
+stmt_containers(#20618,#20001)
 #20619=*
-regexpterm(#20619,14,#20618,0,"module")
-#20620=@"loc,{#10000},16,22,16,27"
-locations_default(#20620,#10000,16,22,16,27)
-hasLocation(#20619,#20620)
-regexp_const_value(#20619,"module")
-#20621=*
-exprs(#20621,8,#20617,-10,"{ type: ""json"" }")
-#20622=@"loc,{#10000},16,37,16,52"
-locations_default(#20622,#10000,16,37,16,52)
-hasLocation(#20621,#20622)
-enclosing_stmt(#20621,#20617)
-expr_containers(#20621,#20001)
-#20623=*
-properties(#20623,#20621,0,0,"type: ""json""")
-#20624=@"loc,{#10000},16,39,16,50"
-locations_default(#20624,#10000,16,39,16,50)
-hasLocation(#20623,#20624)
-#20625=*
-exprs(#20625,85,#20617,0,"* as v1")
-#20626=@"loc,{#10000},16,8,16,14"
-locations_default(#20626,#10000,16,8,16,14)
-hasLocation(#20625,#20626)
-enclosing_stmt(#20625,#20617)
-expr_containers(#20625,#20001)
-#20627=*
-exprs(#20627,78,#20625,1,"v1")
-hasLocation(#20627,#20305)
-enclosing_stmt(#20627,#20617)
-expr_containers(#20627,#20001)
-literals("v1","v1",#20627)
-decl(#20627,#20486)
-typedecl(#20627,#20489)
-namespacedecl(#20627,#20492)
+exprs(#20619,4,#20618,-1,"""module""")
+hasLocation(#20619,#20309)
+enclosing_stmt(#20619,#20618)
+expr_containers(#20619,#20001)
+literals("module","""module""",#20619)
+#20620=*
+regexpterm(#20620,14,#20619,0,"module")
+#20621=@"loc,{#10000},16,22,16,27"
+locations_default(#20621,#10000,16,22,16,27)
+hasLocation(#20620,#20621)
+regexp_const_value(#20620,"module")
+#20622=*
+exprs(#20622,8,#20618,-10,"{ type: ""json"" }")
+#20623=@"loc,{#10000},16,37,16,52"
+locations_default(#20623,#10000,16,37,16,52)
+hasLocation(#20622,#20623)
+enclosing_stmt(#20622,#20618)
+expr_containers(#20622,#20001)
+#20624=*
+properties(#20624,#20622,0,0,"type: ""json""")
+#20625=@"loc,{#10000},16,39,16,50"
+locations_default(#20625,#10000,16,39,16,50)
+hasLocation(#20624,#20625)
+#20626=*
+exprs(#20626,85,#20618,0,"* as v1")
+#20627=@"loc,{#10000},16,8,16,14"
+locations_default(#20627,#10000,16,8,16,14)
+hasLocation(#20626,#20627)
+enclosing_stmt(#20626,#20618)
+expr_containers(#20626,#20001)
 #20628=*
-stmts(#20628,27,#20001,12,"import  ... son"" };")
-hasLocation(#20628,#20039)
-stmt_containers(#20628,#20001)
+exprs(#20628,78,#20626,1,"v1")
+hasLocation(#20628,#20305)
+enclosing_stmt(#20628,#20618)
+expr_containers(#20628,#20001)
+literals("v1","v1",#20628)
+decl(#20628,#20486)
+typedecl(#20628,#20489)
+namespacedecl(#20628,#20492)
 #20629=*
-exprs(#20629,4,#20628,-1,"""module""")
-hasLocation(#20629,#20335)
-enclosing_stmt(#20629,#20628)
-expr_containers(#20629,#20001)
-literals("module","""module""",#20629)
+stmts(#20629,27,#20001,12,"import  ... son"" };")
+hasLocation(#20629,#20039)
+stmt_containers(#20629,#20001)
 #20630=*
-regexpterm(#20630,14,#20629,0,"module")
-#20631=@"loc,{#10000},17,21,17,26"
-locations_default(#20631,#10000,17,21,17,26)
-hasLocation(#20630,#20631)
-regexp_const_value(#20630,"module")
-#20632=*
-exprs(#20632,8,#20628,-10,"{ type: ""json"" }")
-#20633=@"loc,{#10000},17,36,17,51"
-locations_default(#20633,#10000,17,36,17,51)
-hasLocation(#20632,#20633)
-enclosing_stmt(#20632,#20628)
-expr_containers(#20632,#20001)
-#20634=*
-properties(#20634,#20632,0,0,"type: ""json""")
-#20635=@"loc,{#10000},17,38,17,49"
-locations_default(#20635,#10000,17,38,17,49)
-hasLocation(#20634,#20635)
-#20636=*
-exprs(#20636,83,#20628,0,"v2")
-hasLocation(#20636,#20329)
-enclosing_stmt(#20636,#20628)
-expr_containers(#20636,#20001)
+exprs(#20630,4,#20629,-1,"""module""")
+hasLocation(#20630,#20335)
+enclosing_stmt(#20630,#20629)
+expr_containers(#20630,#20001)
+literals("module","""module""",#20630)
+#20631=*
+regexpterm(#20631,14,#20630,0,"module")
+#20632=@"loc,{#10000},17,21,17,26"
+locations_default(#20632,#10000,17,21,17,26)
+hasLocation(#20631,#20632)
+regexp_const_value(#20631,"module")
+#20633=*
+exprs(#20633,8,#20629,-10,"{ type: ""json"" }")
+#20634=@"loc,{#10000},17,36,17,51"
+locations_default(#20634,#10000,17,36,17,51)
+hasLocation(#20633,#20634)
+enclosing_stmt(#20633,#20629)
+expr_containers(#20633,#20001)
+#20635=*
+properties(#20635,#20633,0,0,"type: ""json""")
+#20636=@"loc,{#10000},17,38,17,49"
+locations_default(#20636,#10000,17,38,17,49)
+hasLocation(#20635,#20636)
 #20637=*
-exprs(#20637,0,#20636,0,"v2")
+exprs(#20637,83,#20629,0,"v2")
 hasLocation(#20637,#20329)
-enclosing_stmt(#20637,#20628)
+enclosing_stmt(#20637,#20629)
 expr_containers(#20637,#20001)
-literals("v2","v2",#20637)
 #20638=*
-exprs(#20638,78,#20636,1,"v2")
+exprs(#20638,0,#20637,0,"v2")
 hasLocation(#20638,#20329)
-enclosing_stmt(#20638,#20628)
+enclosing_stmt(#20638,#20629)
 expr_containers(#20638,#20001)
 literals("v2","v2",#20638)
-decl(#20638,#20487)
-typedecl(#20638,#20490)
-namespacedecl(#20638,#20493)
 #20639=*
-stmts(#20639,27,#20001,13,"import  ... son"" };")
-hasLocation(#20639,#20041)
-stmt_containers(#20639,#20001)
+exprs(#20639,78,#20637,1,"v2")
+hasLocation(#20639,#20329)
+enclosing_stmt(#20639,#20629)
+expr_containers(#20639,#20001)
+literals("v2","v2",#20639)
+decl(#20639,#20487)
+typedecl(#20639,#20490)
+namespacedecl(#20639,#20493)
 #20640=*
-exprs(#20640,4,#20639,-1,"""module""")
-hasLocation(#20640,#20357)
-enclosing_stmt(#20640,#20639)
-expr_containers(#20640,#20001)
-literals("module","""module""",#20640)
+stmts(#20640,27,#20001,13,"import  ... son"" };")
+hasLocation(#20640,#20041)
+stmt_containers(#20640,#20001)
 #20641=*
-regexpterm(#20641,14,#20640,0,"module")
-#20642=@"loc,{#10000},18,17,18,22"
-locations_default(#20642,#10000,18,17,18,22)
-hasLocation(#20641,#20642)
-regexp_const_value(#20641,"module")
-#20643=*
-exprs(#20643,8,#20639,-10,"{ type: ""json"" }")
-#20644=@"loc,{#10000},18,32,18,47"
-locations_default(#20644,#10000,18,32,18,47)
-hasLocation(#20643,#20644)
-enclosing_stmt(#20643,#20639)
-expr_containers(#20643,#20001)
-#20645=*
-properties(#20645,#20643,0,0,"type: ""json""")
-#20646=@"loc,{#10000},18,34,18,45"
-locations_default(#20646,#10000,18,34,18,45)
-hasLocation(#20645,#20646)
-#20647=*
-exprs(#20647,84,#20639,0,"v3")
-hasLocation(#20647,#20353)
-enclosing_stmt(#20647,#20639)
-expr_containers(#20647,#20001)
+exprs(#20641,4,#20640,-1,"""module""")
+hasLocation(#20641,#20357)
+enclosing_stmt(#20641,#20640)
+expr_containers(#20641,#20001)
+literals("module","""module""",#20641)
+#20642=*
+regexpterm(#20642,14,#20641,0,"module")
+#20643=@"loc,{#10000},18,17,18,22"
+locations_default(#20643,#10000,18,17,18,22)
+hasLocation(#20642,#20643)
+regexp_const_value(#20642,"module")
+#20644=*
+exprs(#20644,8,#20640,-10,"{ type: ""json"" }")
+#20645=@"loc,{#10000},18,32,18,47"
+locations_default(#20645,#10000,18,32,18,47)
+hasLocation(#20644,#20645)
+enclosing_stmt(#20644,#20640)
+expr_containers(#20644,#20001)
+#20646=*
+properties(#20646,#20644,0,0,"type: ""json""")
+#20647=@"loc,{#10000},18,34,18,45"
+locations_default(#20647,#10000,18,34,18,45)
+hasLocation(#20646,#20647)
 #20648=*
-exprs(#20648,78,#20647,1,"v3")
+exprs(#20648,84,#20640,0,"v3")
 hasLocation(#20648,#20353)
-enclosing_stmt(#20648,#20639)
+enclosing_stmt(#20648,#20640)
 expr_containers(#20648,#20001)
-literals("v3","v3",#20648)
-decl(#20648,#20488)
-typedecl(#20648,#20491)
-namespacedecl(#20648,#20494)
 #20649=*
-stmts(#20649,30,#20001,14,"export  ... son"" };")
-hasLocation(#20649,#20045)
-stmt_containers(#20649,#20001)
+exprs(#20649,78,#20648,1,"v3")
+hasLocation(#20649,#20353)
+enclosing_stmt(#20649,#20640)
+expr_containers(#20649,#20001)
+literals("v3","v3",#20649)
+decl(#20649,#20488)
+typedecl(#20649,#20491)
+namespacedecl(#20649,#20494)
 #20650=*
-exprs(#20650,4,#20649,-2,"""module""")
-hasLocation(#20650,#20383)
-enclosing_stmt(#20650,#20649)
-expr_containers(#20650,#20001)
-literals("module","""module""",#20650)
+stmts(#20650,30,#20001,14,"export  ... son"" };")
+hasLocation(#20650,#20045)
+stmt_containers(#20650,#20001)
 #20651=*
-regexpterm(#20651,14,#20650,0,"module")
-#20652=@"loc,{#10000},20,21,20,26"
-locations_default(#20652,#10000,20,21,20,26)
-hasLocation(#20651,#20652)
-regexp_const_value(#20651,"module")
-#20653=*
-exprs(#20653,8,#20649,-10,"{ type: ""json"" }")
-#20654=@"loc,{#10000},20,36,20,51"
-locations_default(#20654,#10000,20,36,20,51)
-hasLocation(#20653,#20654)
-enclosing_stmt(#20653,#20649)
-expr_containers(#20653,#20001)
-#20655=*
-properties(#20655,#20653,0,0,"type: ""json""")
-#20656=@"loc,{#10000},20,38,20,49"
-locations_default(#20656,#10000,20,38,20,49)
-hasLocation(#20655,#20656)
-#20657=*
-exprs(#20657,86,#20649,0,"v4")
-hasLocation(#20657,#20377)
-enclosing_stmt(#20657,#20649)
-expr_containers(#20657,#20001)
+exprs(#20651,4,#20650,-2,"""module""")
+hasLocation(#20651,#20383)
+enclosing_stmt(#20651,#20650)
+expr_containers(#20651,#20001)
+literals("module","""module""",#20651)
+#20652=*
+regexpterm(#20652,14,#20651,0,"module")
+#20653=@"loc,{#10000},20,21,20,26"
+locations_default(#20653,#10000,20,21,20,26)
+hasLocation(#20652,#20653)
+regexp_const_value(#20652,"module")
+#20654=*
+exprs(#20654,8,#20650,-10,"{ type: ""json"" }")
+#20655=@"loc,{#10000},20,36,20,51"
+locations_default(#20655,#10000,20,36,20,51)
+hasLocation(#20654,#20655)
+enclosing_stmt(#20654,#20650)
+expr_containers(#20654,#20001)
+#20656=*
+properties(#20656,#20654,0,0,"type: ""json""")
+#20657=@"loc,{#10000},20,38,20,49"
+locations_default(#20657,#10000,20,38,20,49)
+hasLocation(#20656,#20657)
 #20658=*
-exprs(#20658,0,#20657,0,"v4")
+exprs(#20658,86,#20650,0,"v4")
 hasLocation(#20658,#20377)
-enclosing_stmt(#20658,#20649)
+enclosing_stmt(#20658,#20650)
 expr_containers(#20658,#20001)
-literals("v4","v4",#20658)
 #20659=*
-exprs(#20659,0,#20657,1,"v4")
+exprs(#20659,0,#20658,0,"v4")
 hasLocation(#20659,#20377)
-enclosing_stmt(#20659,#20649)
+enclosing_stmt(#20659,#20650)
 expr_containers(#20659,#20001)
 literals("v4","v4",#20659)
 #20660=*
-stmts(#20660,28,#20001,15,"export  ... son"" };")
-hasLocation(#20660,#20047)
-stmt_containers(#20660,#20001)
+exprs(#20660,0,#20658,1,"v4")
+hasLocation(#20660,#20377)
+enclosing_stmt(#20660,#20650)
+expr_containers(#20660,#20001)
+literals("v4","v4",#20660)
 #20661=*
-exprs(#20661,4,#20660,0,"""module""")
-hasLocation(#20661,#20405)
-enclosing_stmt(#20661,#20660)
-expr_containers(#20661,#20001)
-literals("module","""module""",#20661)
+stmts(#20661,28,#20001,15,"export  ... son"" };")
+hasLocation(#20661,#20047)
+stmt_containers(#20661,#20001)
 #20662=*
-regexpterm(#20662,14,#20661,0,"module")
-#20663=@"loc,{#10000},21,16,21,21"
-locations_default(#20663,#10000,21,16,21,21)
-hasLocation(#20662,#20663)
-regexp_const_value(#20662,"module")
-#20664=*
-exprs(#20664,8,#20660,-10,"{ type: ""json"" }")
-#20665=@"loc,{#10000},21,31,21,46"
-locations_default(#20665,#10000,21,31,21,46)
-hasLocation(#20664,#20665)
-enclosing_stmt(#20664,#20660)
-expr_containers(#20664,#20001)
-#20666=*
-properties(#20666,#20664,0,0,"type: ""json""")
-#20667=@"loc,{#10000},21,33,21,44"
-locations_default(#20667,#10000,21,33,21,44)
-hasLocation(#20666,#20667)
-#20668=*
-stmts(#20668,30,#20001,16,"export  ... son"" };")
-hasLocation(#20668,#20049)
-stmt_containers(#20668,#20001)
+exprs(#20662,4,#20661,0,"""module""")
+hasLocation(#20662,#20405)
+enclosing_stmt(#20662,#20661)
+expr_containers(#20662,#20001)
+literals("module","""module""",#20662)
+#20663=*
+regexpterm(#20663,14,#20662,0,"module")
+#20664=@"loc,{#10000},21,16,21,21"
+locations_default(#20664,#10000,21,16,21,21)
+hasLocation(#20663,#20664)
+regexp_const_value(#20663,"module")
+#20665=*
+exprs(#20665,8,#20661,-10,"{ type: ""json"" }")
+#20666=@"loc,{#10000},21,31,21,46"
+locations_default(#20666,#10000,21,31,21,46)
+hasLocation(#20665,#20666)
+enclosing_stmt(#20665,#20661)
+expr_containers(#20665,#20001)
+#20667=*
+properties(#20667,#20665,0,0,"type: ""json""")
+#20668=@"loc,{#10000},21,33,21,44"
+locations_default(#20668,#10000,21,33,21,44)
+hasLocation(#20667,#20668)
 #20669=*
-exprs(#20669,4,#20668,-2,"""module""")
-hasLocation(#20669,#20431)
-enclosing_stmt(#20669,#20668)
-expr_containers(#20669,#20001)
-literals("module","""module""",#20669)
+stmts(#20669,30,#20001,16,"export  ... son"" };")
+hasLocation(#20669,#20049)
+stmt_containers(#20669,#20001)
 #20670=*
-regexpterm(#20670,14,#20669,0,"module")
-#20671=@"loc,{#10000},22,22,22,27"
-locations_default(#20671,#10000,22,22,22,27)
-hasLocation(#20670,#20671)
-regexp_const_value(#20670,"module")
-#20672=*
-exprs(#20672,8,#20668,-10,"{ type: ""json"" }")
-#20673=@"loc,{#10000},22,37,22,52"
-locations_default(#20673,#10000,22,37,22,52)
-hasLocation(#20672,#20673)
-enclosing_stmt(#20672,#20668)
-expr_containers(#20672,#20001)
-#20674=*
-properties(#20674,#20672,0,0,"type: ""json""")
-#20675=@"loc,{#10000},22,39,22,50"
-locations_default(#20675,#10000,22,39,22,50)
-hasLocation(#20674,#20675)
-#20676=*
-exprs(#20676,96,#20668,0,"* as v5")
-#20677=@"loc,{#10000},22,8,22,14"
-locations_default(#20677,#10000,22,8,22,14)
-hasLocation(#20676,#20677)
-enclosing_stmt(#20676,#20668)
-expr_containers(#20676,#20001)
-#20678=*
-exprs(#20678,0,#20676,1,"v5")
-hasLocation(#20678,#20427)
-enclosing_stmt(#20678,#20668)
-expr_containers(#20678,#20001)
-literals("v5","v5",#20678)
+exprs(#20670,4,#20669,-2,"""module""")
+hasLocation(#20670,#20431)
+enclosing_stmt(#20670,#20669)
+expr_containers(#20670,#20001)
+literals("module","""module""",#20670)
+#20671=*
+regexpterm(#20671,14,#20670,0,"module")
+#20672=@"loc,{#10000},22,22,22,27"
+locations_default(#20672,#10000,22,22,22,27)
+hasLocation(#20671,#20672)
+regexp_const_value(#20671,"module")
+#20673=*
+exprs(#20673,8,#20669,-10,"{ type: ""json"" }")
+#20674=@"loc,{#10000},22,37,22,52"
+locations_default(#20674,#10000,22,37,22,52)
+hasLocation(#20673,#20674)
+enclosing_stmt(#20673,#20669)
+expr_containers(#20673,#20001)
+#20675=*
+properties(#20675,#20673,0,0,"type: ""json""")
+#20676=@"loc,{#10000},22,39,22,50"
+locations_default(#20676,#10000,22,39,22,50)
+hasLocation(#20675,#20676)
+#20677=*
+exprs(#20677,96,#20669,0,"* as v5")
+#20678=@"loc,{#10000},22,8,22,14"
+locations_default(#20678,#10000,22,8,22,14)
+hasLocation(#20677,#20678)
+enclosing_stmt(#20677,#20669)
+expr_containers(#20677,#20001)
 #20679=*
-stmts(#20679,22,#20001,17,"const v ... "" } });")
-hasLocation(#20679,#20053)
-stmt_containers(#20679,#20001)
+exprs(#20679,0,#20677,1,"v5")
+hasLocation(#20679,#20427)
+enclosing_stmt(#20679,#20669)
+expr_containers(#20679,#20001)
+literals("v5","v5",#20679)
 #20680=*
-exprs(#20680,64,#20679,0,"v6 = im ... n"" } })")
-#20681=@"loc,{#10000},24,7,24,57"
-locations_default(#20681,#10000,24,7,24,57)
-hasLocation(#20680,#20681)
-enclosing_stmt(#20680,#20679)
-expr_containers(#20680,#20001)
-#20682=*
-exprs(#20682,78,#20680,0,"v6")
-hasLocation(#20682,#20449)
-enclosing_stmt(#20682,#20679)
-expr_containers(#20682,#20001)
-literals("v6","v6",#20682)
-decl(#20682,#20495)
+stmts(#20680,22,#20001,17,"const v ... "" } });")
+hasLocation(#20680,#20053)
+stmt_containers(#20680,#20001)
+#20681=*
+exprs(#20681,64,#20680,0,"v6 = im ... n"" } })")
+#20682=@"loc,{#10000},24,7,24,57"
+locations_default(#20682,#10000,24,7,24,57)
+hasLocation(#20681,#20682)
+enclosing_stmt(#20681,#20680)
+expr_containers(#20681,#20001)
 #20683=*
-exprs(#20683,99,#20680,1,"import( ... n"" } })")
-#20684=@"loc,{#10000},24,12,24,57"
-locations_default(#20684,#10000,24,12,24,57)
-hasLocation(#20683,#20684)
-enclosing_stmt(#20683,#20679)
+exprs(#20683,78,#20681,0,"v6")
+hasLocation(#20683,#20449)
+enclosing_stmt(#20683,#20680)
 expr_containers(#20683,#20001)
-#20685=*
-exprs(#20685,4,#20683,0,"""module""")
-hasLocation(#20685,#20457)
-enclosing_stmt(#20685,#20679)
-expr_containers(#20685,#20001)
-literals("module","""module""",#20685)
+literals("v6","v6",#20683)
+decl(#20683,#20495)
+#20684=*
+exprs(#20684,99,#20681,1,"import( ... n"" } })")
+#20685=@"loc,{#10000},24,12,24,57"
+locations_default(#20685,#10000,24,12,24,57)
+hasLocation(#20684,#20685)
+enclosing_stmt(#20684,#20680)
+expr_containers(#20684,#20001)
 #20686=*
-regexpterm(#20686,14,#20685,0,"module")
-#20687=@"loc,{#10000},24,20,24,25"
-locations_default(#20687,#10000,24,20,24,25)
-hasLocation(#20686,#20687)
-regexp_const_value(#20686,"module")
-#20688=*
-exprs(#20688,8,#20683,1,"{ asser ... on"" } }")
-#20689=@"loc,{#10000},24,29,24,56"
-locations_default(#20689,#10000,24,29,24,56)
-hasLocation(#20688,#20689)
-enclosing_stmt(#20688,#20679)
-expr_containers(#20688,#20001)
-#20690=*
-properties(#20690,#20688,0,0,"assert: ... json"" }")
-#20691=@"loc,{#10000},24,31,24,54"
-locations_default(#20691,#10000,24,31,24,54)
-hasLocation(#20690,#20691)
-#20692=*
-exprs(#20692,0,#20690,0,"assert")
-hasLocation(#20692,#20463)
-enclosing_stmt(#20692,#20679)
-expr_containers(#20692,#20001)
-literals("assert","assert",#20692)
+exprs(#20686,4,#20684,0,"""module""")
+hasLocation(#20686,#20457)
+enclosing_stmt(#20686,#20680)
+expr_containers(#20686,#20001)
+literals("module","""module""",#20686)
+#20687=*
+regexpterm(#20687,14,#20686,0,"module")
+#20688=@"loc,{#10000},24,20,24,25"
+locations_default(#20688,#10000,24,20,24,25)
+hasLocation(#20687,#20688)
+regexp_const_value(#20687,"module")
+#20689=*
+exprs(#20689,8,#20684,1,"{ asser ... on"" } }")
+#20690=@"loc,{#10000},24,29,24,56"
+locations_default(#20690,#10000,24,29,24,56)
+hasLocation(#20689,#20690)
+enclosing_stmt(#20689,#20680)
+expr_containers(#20689,#20001)
+#20691=*
+properties(#20691,#20689,0,0,"assert: ... json"" }")
+#20692=@"loc,{#10000},24,31,24,54"
+locations_default(#20692,#10000,24,31,24,54)
+hasLocation(#20691,#20692)
 #20693=*
-exprs(#20693,8,#20690,1,"{ type: ""json"" }")
-#20694=@"loc,{#10000},24,39,24,54"
-locations_default(#20694,#10000,24,39,24,54)
-hasLocation(#20693,#20694)
-enclosing_stmt(#20693,#20679)
+exprs(#20693,0,#20691,0,"assert")
+hasLocation(#20693,#20463)
+enclosing_stmt(#20693,#20680)
 expr_containers(#20693,#20001)
-#20695=*
-properties(#20695,#20693,0,0,"type: ""json""")
-#20696=@"loc,{#10000},24,41,24,52"
-locations_default(#20696,#10000,24,41,24,52)
-hasLocation(#20695,#20696)
-#20697=*
-exprs(#20697,0,#20695,0,"type")
-hasLocation(#20697,#20469)
-enclosing_stmt(#20697,#20679)
-expr_containers(#20697,#20001)
-literals("type","type",#20697)
+literals("assert","assert",#20693)
+#20694=*
+exprs(#20694,8,#20691,1,"{ type: ""json"" }")
+#20695=@"loc,{#10000},24,39,24,54"
+locations_default(#20695,#10000,24,39,24,54)
+hasLocation(#20694,#20695)
+enclosing_stmt(#20694,#20680)
+expr_containers(#20694,#20001)
+#20696=*
+properties(#20696,#20694,0,0,"type: ""json""")
+#20697=@"loc,{#10000},24,41,24,52"
+locations_default(#20697,#10000,24,41,24,52)
+hasLocation(#20696,#20697)
 #20698=*
-exprs(#20698,4,#20695,1,"""json""")
-hasLocation(#20698,#20473)
-enclosing_stmt(#20698,#20679)
+exprs(#20698,0,#20696,0,"type")
+hasLocation(#20698,#20469)
+enclosing_stmt(#20698,#20680)
 expr_containers(#20698,#20001)
-literals("json","""json""",#20698)
+literals("type","type",#20698)
 #20699=*
-regexpterm(#20699,14,#20698,0,"json")
-#20700=@"loc,{#10000},24,48,24,51"
-locations_default(#20700,#10000,24,48,24,51)
-hasLocation(#20699,#20700)
-regexp_const_value(#20699,"json")
-#20701=*
-entry_cfg_node(#20701,#20001)
-#20702=@"loc,{#10000},1,1,1,0"
-locations_default(#20702,#10000,1,1,1,0)
-hasLocation(#20701,#20702)
-#20703=*
-exit_cfg_node(#20703,#20001)
-hasLocation(#20703,#20483)
-successor(#20679,#20682)
-successor(#20685,#20683)
-successor(#20683,#20680)
-successor(#20682,#20685)
-successor(#20680,#20703)
-successor(#20668,#20669)
-successor(#20676,#20678)
-successor(#20678,#20679)
-successor(#20669,#20676)
-successor(#20660,#20661)
-successor(#20661,#20668)
-successor(#20649,#20650)
-successor(#20657,#20658)
-successor(#20659,#20660)
+exprs(#20699,4,#20696,1,"""json""")
+hasLocation(#20699,#20473)
+enclosing_stmt(#20699,#20680)
+expr_containers(#20699,#20001)
+literals("json","""json""",#20699)
+#20700=*
+regexpterm(#20700,14,#20699,0,"json")
+#20701=@"loc,{#10000},24,48,24,51"
+locations_default(#20701,#10000,24,48,24,51)
+hasLocation(#20700,#20701)
+regexp_const_value(#20700,"json")
+#20702=*
+entry_cfg_node(#20702,#20001)
+#20703=@"loc,{#10000},1,1,1,0"
+locations_default(#20703,#10000,1,1,1,0)
+hasLocation(#20702,#20703)
+#20704=*
+exit_cfg_node(#20704,#20001)
+hasLocation(#20704,#20483)
+successor(#20680,#20683)
+successor(#20686,#20684)
+successor(#20684,#20681)
+successor(#20683,#20686)
+successor(#20681,#20704)
+successor(#20669,#20670)
+successor(#20677,#20679)
+successor(#20679,#20680)
+successor(#20670,#20677)
+successor(#20661,#20662)
+successor(#20662,#20669)
+successor(#20650,#20651)
 successor(#20658,#20659)
-successor(#20650,#20657)
-successor(#20639,#20649)
-successor(#20628,#20639)
-successor(#20617,#20628)
-successor(#20609,#20617)
-successor(#20595,#20599)
-successor(#20601,#20605)
-successor(#20606,#20603)
-successor(#20605,#20606)
-successor(#20603,#20597)
-successor(#20599,#20601)
-successor(#20597,#20609)
-successor(#20590,#20595)
-successor(#20566,#20569)
-successor(#20572,#20570)
-successor(#20570,#20567)
-successor(#20569,#20572)
-successor(#20567,#20590)
-successor(#20555,#20556)
-successor(#20563,#20565)
-successor(#20565,#20566)
-successor(#20556,#20563)
-successor(#20547,#20548)
-successor(#20548,#20555)
-successor(#20536,#20537)
-successor(#20544,#20545)
-successor(#20546,#20547)
+successor(#20660,#20661)
+successor(#20659,#20660)
+successor(#20651,#20658)
+successor(#20640,#20650)
+successor(#20629,#20640)
+successor(#20618,#20629)
+successor(#20610,#20618)
+successor(#20596,#20600)
+successor(#20602,#20606)
+successor(#20607,#20604)
+successor(#20606,#20607)
+successor(#20604,#20598)
+successor(#20600,#20602)
+successor(#20598,#20610)
+successor(#20591,#20596)
+successor(#20567,#20570)
+successor(#20573,#20571)
+successor(#20571,#20568)
+successor(#20570,#20573)
+successor(#20568,#20591)
+successor(#20556,#20557)
+successor(#20564,#20566)
+successor(#20566,#20567)
+successor(#20557,#20564)
+successor(#20548,#20549)
+successor(#20549,#20556)
+successor(#20537,#20538)
 successor(#20545,#20546)
-successor(#20537,#20544)
-successor(#20526,#20536)
-successor(#20515,#20526)
-successor(#20504,#20515)
-successor(#20496,#20504)
-successor(#20647,#20496)
-successor(#20636,#20647)
-successor(#20625,#20636)
-successor(#20534,#20625)
-successor(#20523,#20534)
-successor(#20512,#20523)
-successor(#20701,#20512)
+successor(#20547,#20548)
+successor(#20546,#20547)
+successor(#20538,#20545)
+successor(#20527,#20537)
+successor(#20516,#20527)
+successor(#20505,#20516)
+successor(#20497,#20505)
+successor(#20648,#20497)
+successor(#20637,#20648)
+successor(#20626,#20637)
+successor(#20535,#20626)
+successor(#20524,#20535)
+successor(#20513,#20524)
+successor(#20702,#20513)
 numlines(#10000,24,18,2)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/importExport.ts.trap b/javascript/extractor/tests/ts/output/trap/importExport.ts.trap
index 5b4b6d1cdcf..f4524136b43 100644
--- a/javascript/extractor/tests/ts/output/trap/importExport.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/importExport.ts.trap
@@ -136,94 +136,96 @@ local_type_names(#20044,"Something",#20041)
 local_type_names(#20045,"importExport",#20041)
 local_namespace_names(#20046,"Something",#20041)
 local_namespace_names(#20047,"importExport",#20041)
-#20048=*
-stmts(#20048,27,#20001,0,"import  ... where';")
-hasLocation(#20048,#20003)
-stmt_containers(#20048,#20001)
+#20048=@"var;{this};{#20041}"
+variables(#20048,"this",#20041)
 #20049=*
-exprs(#20049,4,#20048,-1,"'somewhere'")
-hasLocation(#20049,#20019)
-enclosing_stmt(#20049,#20048)
-expr_containers(#20049,#20001)
-literals("somewhere","'somewhere'",#20049)
+stmts(#20049,27,#20001,0,"import  ... where';")
+hasLocation(#20049,#20003)
+stmt_containers(#20049,#20001)
 #20050=*
-regexpterm(#20050,14,#20049,0,"somewhere")
-#20051=@"loc,{#10000},1,29,1,37"
-locations_default(#20051,#10000,1,29,1,37)
-hasLocation(#20050,#20051)
-regexp_const_value(#20050,"somewhere")
-#20052=*
-exprs(#20052,85,#20048,0,"* as Something")
-#20053=@"loc,{#10000},1,8,1,21"
-locations_default(#20053,#10000,1,8,1,21)
-hasLocation(#20052,#20053)
-enclosing_stmt(#20052,#20048)
-expr_containers(#20052,#20001)
-#20054=*
-exprs(#20054,78,#20052,1,"Something")
-hasLocation(#20054,#20015)
-enclosing_stmt(#20054,#20048)
-expr_containers(#20054,#20001)
-literals("Something","Something",#20054)
-decl(#20054,#20042)
-typedecl(#20054,#20044)
-namespacedecl(#20054,#20046)
+exprs(#20050,4,#20049,-1,"'somewhere'")
+hasLocation(#20050,#20019)
+enclosing_stmt(#20050,#20049)
+expr_containers(#20050,#20001)
+literals("somewhere","'somewhere'",#20050)
+#20051=*
+regexpterm(#20051,14,#20050,0,"somewhere")
+#20052=@"loc,{#10000},1,29,1,37"
+locations_default(#20052,#10000,1,29,1,37)
+hasLocation(#20051,#20052)
+regexp_const_value(#20051,"somewhere")
+#20053=*
+exprs(#20053,85,#20049,0,"* as Something")
+#20054=@"loc,{#10000},1,8,1,21"
+locations_default(#20054,#10000,1,8,1,21)
+hasLocation(#20053,#20054)
+enclosing_stmt(#20053,#20049)
+expr_containers(#20053,#20001)
 #20055=*
-stmts(#20055,30,#20001,1,"export  ... thingy;")
-hasLocation(#20055,#20007)
-stmt_containers(#20055,#20001)
+exprs(#20055,78,#20053,1,"Something")
+hasLocation(#20055,#20015)
+enclosing_stmt(#20055,#20049)
+expr_containers(#20055,#20001)
+literals("Something","Something",#20055)
+decl(#20055,#20042)
+typedecl(#20055,#20044)
+namespacedecl(#20055,#20046)
 #20056=*
-stmts(#20056,32,#20055,-1,"import  ... thingy;")
-#20057=@"loc,{#10000},3,8,3,46"
-locations_default(#20057,#10000,3,8,3,46)
-hasLocation(#20056,#20057)
+stmts(#20056,30,#20001,1,"export  ... thingy;")
+hasLocation(#20056,#20007)
 stmt_containers(#20056,#20001)
-#20058=*
-exprs(#20058,78,#20056,0,"importExport")
-hasLocation(#20058,#20027)
-enclosing_stmt(#20058,#20056)
-expr_containers(#20058,#20001)
-literals("importExport","importExport",#20058)
-decl(#20058,#20043)
-typedecl(#20058,#20045)
-namespacedecl(#20058,#20047)
+#20057=*
+stmts(#20057,32,#20056,-1,"import  ... thingy;")
+#20058=@"loc,{#10000},3,8,3,46"
+locations_default(#20058,#10000,3,8,3,46)
+hasLocation(#20057,#20058)
+stmt_containers(#20057,#20001)
 #20059=*
-exprs(#20059,14,#20056,1,"Something.thingy")
-#20060=@"loc,{#10000},3,30,3,45"
-locations_default(#20060,#10000,3,30,3,45)
-hasLocation(#20059,#20060)
-enclosing_stmt(#20059,#20056)
+exprs(#20059,78,#20057,0,"importExport")
+hasLocation(#20059,#20027)
+enclosing_stmt(#20059,#20057)
 expr_containers(#20059,#20001)
-#20061=*
-exprs(#20061,103,#20059,0,"Something")
-hasLocation(#20061,#20031)
-enclosing_stmt(#20061,#20056)
-expr_containers(#20061,#20001)
-literals("Something","Something",#20061)
-namespacebind(#20061,#20046)
-bind(#20061,#20042)
+literals("importExport","importExport",#20059)
+decl(#20059,#20043)
+typedecl(#20059,#20045)
+namespacedecl(#20059,#20047)
+#20060=*
+exprs(#20060,14,#20057,1,"Something.thingy")
+#20061=@"loc,{#10000},3,30,3,45"
+locations_default(#20061,#10000,3,30,3,45)
+hasLocation(#20060,#20061)
+enclosing_stmt(#20060,#20057)
+expr_containers(#20060,#20001)
 #20062=*
-exprs(#20062,0,#20059,1,"thingy")
-hasLocation(#20062,#20035)
-enclosing_stmt(#20062,#20056)
+exprs(#20062,103,#20060,0,"Something")
+hasLocation(#20062,#20031)
+enclosing_stmt(#20062,#20057)
 expr_containers(#20062,#20001)
-literals("thingy","thingy",#20062)
+literals("Something","Something",#20062)
+namespacebind(#20062,#20046)
+bind(#20062,#20042)
 #20063=*
-entry_cfg_node(#20063,#20001)
-#20064=@"loc,{#10000},1,1,1,0"
-locations_default(#20064,#10000,1,1,1,0)
-hasLocation(#20063,#20064)
-#20065=*
-exit_cfg_node(#20065,#20001)
-hasLocation(#20065,#20039)
-successor(#20055,#20058)
-successor(#20062,#20059)
-successor(#20061,#20062)
-successor(#20059,#20056)
-successor(#20058,#20061)
-successor(#20056,#20065)
-successor(#20048,#20055)
-successor(#20052,#20048)
-successor(#20063,#20052)
+exprs(#20063,0,#20060,1,"thingy")
+hasLocation(#20063,#20035)
+enclosing_stmt(#20063,#20057)
+expr_containers(#20063,#20001)
+literals("thingy","thingy",#20063)
+#20064=*
+entry_cfg_node(#20064,#20001)
+#20065=@"loc,{#10000},1,1,1,0"
+locations_default(#20065,#10000,1,1,1,0)
+hasLocation(#20064,#20065)
+#20066=*
+exit_cfg_node(#20066,#20001)
+hasLocation(#20066,#20039)
+successor(#20056,#20059)
+successor(#20063,#20060)
+successor(#20062,#20063)
+successor(#20060,#20057)
+successor(#20059,#20062)
+successor(#20057,#20066)
+successor(#20049,#20056)
+successor(#20053,#20049)
+successor(#20064,#20053)
 numlines(#10000,3,2,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/importNonStrings.ts.trap b/javascript/extractor/tests/ts/output/trap/importNonStrings.ts.trap
index 82e087ceca7..cc7ec5477d8 100644
--- a/javascript/extractor/tests/ts/output/trap/importNonStrings.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/importNonStrings.ts.trap
@@ -163,95 +163,97 @@ local_type_names(#20059,"X",#20000)
 local_type_names(#20060,"Y",#20000)
 #20061=@"local_type_name;{Z};{#20000}"
 local_type_names(#20061,"Z",#20000)
-#20062=*
-stmts(#20062,35,#20001,0,"type X = import(3);")
-hasLocation(#20062,#20003)
-stmt_containers(#20062,#20001)
+#20062=@"var;{this};{#20000}"
+variables(#20062,"this",#20000)
 #20063=*
-typeexprs(#20063,1,#20062,0,"X")
-hasLocation(#20063,#20011)
-enclosing_stmt(#20063,#20062)
-expr_containers(#20063,#20001)
-literals("X","X",#20063)
-typedecl(#20063,#20059)
+stmts(#20063,35,#20001,0,"type X = import(3);")
+hasLocation(#20063,#20003)
+stmt_containers(#20063,#20001)
 #20064=*
-typeexprs(#20064,30,#20062,1,"import(3)")
-#20065=@"loc,{#10000},1,10,1,18"
-locations_default(#20065,#10000,1,10,1,18)
-hasLocation(#20064,#20065)
-enclosing_stmt(#20064,#20062)
+typeexprs(#20064,1,#20063,0,"X")
+hasLocation(#20064,#20011)
+enclosing_stmt(#20064,#20063)
 expr_containers(#20064,#20001)
-#20066=*
-typeexprs(#20066,4,#20064,0,"3")
-hasLocation(#20066,#20019)
-enclosing_stmt(#20066,#20062)
-expr_containers(#20066,#20001)
-literals("3","3",#20066)
+literals("X","X",#20064)
+typedecl(#20064,#20059)
+#20065=*
+typeexprs(#20065,30,#20063,1,"import(3)")
+#20066=@"loc,{#10000},1,10,1,18"
+locations_default(#20066,#10000,1,10,1,18)
+hasLocation(#20065,#20066)
+enclosing_stmt(#20065,#20063)
+expr_containers(#20065,#20001)
 #20067=*
-stmts(#20067,35,#20001,1,"type Y  ... `Foo`);")
-hasLocation(#20067,#20005)
-stmt_containers(#20067,#20001)
+typeexprs(#20067,4,#20065,0,"3")
+hasLocation(#20067,#20019)
+enclosing_stmt(#20067,#20063)
+expr_containers(#20067,#20001)
+literals("3","3",#20067)
 #20068=*
-typeexprs(#20068,1,#20067,0,"Y")
-hasLocation(#20068,#20027)
-enclosing_stmt(#20068,#20067)
-expr_containers(#20068,#20001)
-literals("Y","Y",#20068)
-typedecl(#20068,#20060)
+stmts(#20068,35,#20001,1,"type Y  ... `Foo`);")
+hasLocation(#20068,#20005)
+stmt_containers(#20068,#20001)
 #20069=*
-typeexprs(#20069,30,#20067,1,"import(`Foo`)")
-#20070=@"loc,{#10000},2,10,2,22"
-locations_default(#20070,#10000,2,10,2,22)
-hasLocation(#20069,#20070)
-enclosing_stmt(#20069,#20067)
+typeexprs(#20069,1,#20068,0,"Y")
+hasLocation(#20069,#20027)
+enclosing_stmt(#20069,#20068)
 expr_containers(#20069,#20001)
-#20071=*
-typeexprs(#20071,37,#20069,0,"`Foo`")
-hasLocation(#20071,#20035)
-enclosing_stmt(#20071,#20067)
-expr_containers(#20071,#20001)
+literals("Y","Y",#20069)
+typedecl(#20069,#20060)
+#20070=*
+typeexprs(#20070,30,#20068,1,"import(`Foo`)")
+#20071=@"loc,{#10000},2,10,2,22"
+locations_default(#20071,#10000,2,10,2,22)
+hasLocation(#20070,#20071)
+enclosing_stmt(#20070,#20068)
+expr_containers(#20070,#20001)
 #20072=*
-typeexprs(#20072,3,#20071,0,"`Foo`")
+typeexprs(#20072,37,#20070,0,"`Foo`")
 hasLocation(#20072,#20035)
-enclosing_stmt(#20072,#20067)
+enclosing_stmt(#20072,#20068)
 expr_containers(#20072,#20001)
-literals("Foo","Foo",#20072)
 #20073=*
-stmts(#20073,35,#20001,2,"type Z = import(Y);")
-hasLocation(#20073,#20007)
-stmt_containers(#20073,#20001)
+typeexprs(#20073,3,#20072,0,"`Foo`")
+hasLocation(#20073,#20035)
+enclosing_stmt(#20073,#20068)
+expr_containers(#20073,#20001)
+literals("Foo","Foo",#20073)
 #20074=*
-typeexprs(#20074,1,#20073,0,"Z")
-hasLocation(#20074,#20043)
-enclosing_stmt(#20074,#20073)
-expr_containers(#20074,#20001)
-literals("Z","Z",#20074)
-typedecl(#20074,#20061)
+stmts(#20074,35,#20001,2,"type Z = import(Y);")
+hasLocation(#20074,#20007)
+stmt_containers(#20074,#20001)
 #20075=*
-typeexprs(#20075,30,#20073,1,"import(Y)")
-#20076=@"loc,{#10000},3,10,3,18"
-locations_default(#20076,#10000,3,10,3,18)
-hasLocation(#20075,#20076)
-enclosing_stmt(#20075,#20073)
+typeexprs(#20075,1,#20074,0,"Z")
+hasLocation(#20075,#20043)
+enclosing_stmt(#20075,#20074)
 expr_containers(#20075,#20001)
-#20077=*
-typeexprs(#20077,0,#20075,0,"Y")
-hasLocation(#20077,#20051)
-enclosing_stmt(#20077,#20073)
-expr_containers(#20077,#20001)
-literals("Y","Y",#20077)
-typebind(#20077,#20060)
+literals("Z","Z",#20075)
+typedecl(#20075,#20061)
+#20076=*
+typeexprs(#20076,30,#20074,1,"import(Y)")
+#20077=@"loc,{#10000},3,10,3,18"
+locations_default(#20077,#10000,3,10,3,18)
+hasLocation(#20076,#20077)
+enclosing_stmt(#20076,#20074)
+expr_containers(#20076,#20001)
 #20078=*
-entry_cfg_node(#20078,#20001)
-#20079=@"loc,{#10000},1,1,1,0"
-locations_default(#20079,#10000,1,1,1,0)
-hasLocation(#20078,#20079)
-#20080=*
-exit_cfg_node(#20080,#20001)
-hasLocation(#20080,#20057)
-successor(#20073,#20080)
-successor(#20067,#20073)
-successor(#20062,#20067)
-successor(#20078,#20062)
+typeexprs(#20078,0,#20076,0,"Y")
+hasLocation(#20078,#20051)
+enclosing_stmt(#20078,#20074)
+expr_containers(#20078,#20001)
+literals("Y","Y",#20078)
+typebind(#20078,#20060)
+#20079=*
+entry_cfg_node(#20079,#20001)
+#20080=@"loc,{#10000},1,1,1,0"
+locations_default(#20080,#10000,1,1,1,0)
+hasLocation(#20079,#20080)
+#20081=*
+exit_cfg_node(#20081,#20001)
+hasLocation(#20081,#20057)
+successor(#20074,#20081)
+successor(#20068,#20074)
+successor(#20063,#20068)
+successor(#20079,#20063)
 numlines(#10000,3,3,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/importassign.ts.trap b/javascript/extractor/tests/ts/output/trap/importassign.ts.trap
index 6b1400b59fb..eb783ba7d92 100644
--- a/javascript/extractor/tests/ts/output/trap/importassign.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/importassign.ts.trap
@@ -80,60 +80,62 @@ local_namespace_names(#20026,"x",#20023)
 variables(#20024,"x",#20023)
 local_type_names(#20025,"x",#20023)
 local_namespace_names(#20026,"x",#20023)
-#20027=*
-stmts(#20027,32,#20001,0,"import  ... sign"");")
-hasLocation(#20027,#20003)
-stmt_containers(#20027,#20001)
+#20027=@"var;{this};{#20023}"
+variables(#20027,"this",#20023)
 #20028=*
-exprs(#20028,78,#20027,0,"x")
-hasLocation(#20028,#20007)
-enclosing_stmt(#20028,#20027)
-expr_containers(#20028,#20001)
-literals("x","x",#20028)
-decl(#20028,#20024)
-typedecl(#20028,#20025)
-namespacedecl(#20028,#20026)
+stmts(#20028,32,#20001,0,"import  ... sign"");")
+hasLocation(#20028,#20003)
+stmt_containers(#20028,#20001)
 #20029=*
-exprs(#20029,98,#20027,1,"require ... ssign"")")
-#20030=@"loc,{#10000},1,12,1,36"
-locations_default(#20030,#10000,1,12,1,36)
-hasLocation(#20029,#20030)
-enclosing_stmt(#20029,#20027)
+exprs(#20029,78,#20028,0,"x")
+hasLocation(#20029,#20007)
+enclosing_stmt(#20029,#20028)
 expr_containers(#20029,#20001)
-#20031=*
-exprs(#20031,4,#20029,0,"""./exportassign""")
-hasLocation(#20031,#20015)
-enclosing_stmt(#20031,#20027)
-expr_containers(#20031,#20001)
-literals("./exportassign","""./exportassign""",#20031)
+literals("x","x",#20029)
+decl(#20029,#20024)
+typedecl(#20029,#20025)
+namespacedecl(#20029,#20026)
+#20030=*
+exprs(#20030,98,#20028,1,"require ... ssign"")")
+#20031=@"loc,{#10000},1,12,1,36"
+locations_default(#20031,#10000,1,12,1,36)
+hasLocation(#20030,#20031)
+enclosing_stmt(#20030,#20028)
+expr_containers(#20030,#20001)
 #20032=*
-regexpterm(#20032,1,#20031,0,"./exportassign")
-#20033=@"loc,{#10000},1,21,1,34"
-locations_default(#20033,#10000,1,21,1,34)
-hasLocation(#20032,#20033)
-#20034=*
-regexpterm(#20034,12,#20032,0,".")
-#20035=@"loc,{#10000},1,21,1,21"
-locations_default(#20035,#10000,1,21,1,21)
-hasLocation(#20034,#20035)
-#20036=*
-regexpterm(#20036,14,#20032,1,"/exportassign")
-#20037=@"loc,{#10000},1,22,1,34"
-locations_default(#20037,#10000,1,22,1,34)
-hasLocation(#20036,#20037)
-regexp_const_value(#20036,"/exportassign")
-#20038=*
-entry_cfg_node(#20038,#20001)
-#20039=@"loc,{#10000},1,1,1,0"
-locations_default(#20039,#10000,1,1,1,0)
-hasLocation(#20038,#20039)
-#20040=*
-exit_cfg_node(#20040,#20001)
-hasLocation(#20040,#20021)
-successor(#20031,#20029)
-successor(#20029,#20027)
-successor(#20028,#20031)
-successor(#20027,#20040)
-successor(#20038,#20028)
+exprs(#20032,4,#20030,0,"""./exportassign""")
+hasLocation(#20032,#20015)
+enclosing_stmt(#20032,#20028)
+expr_containers(#20032,#20001)
+literals("./exportassign","""./exportassign""",#20032)
+#20033=*
+regexpterm(#20033,1,#20032,0,"./exportassign")
+#20034=@"loc,{#10000},1,21,1,34"
+locations_default(#20034,#10000,1,21,1,34)
+hasLocation(#20033,#20034)
+#20035=*
+regexpterm(#20035,12,#20033,0,".")
+#20036=@"loc,{#10000},1,21,1,21"
+locations_default(#20036,#10000,1,21,1,21)
+hasLocation(#20035,#20036)
+#20037=*
+regexpterm(#20037,14,#20033,1,"/exportassign")
+#20038=@"loc,{#10000},1,22,1,34"
+locations_default(#20038,#10000,1,22,1,34)
+hasLocation(#20037,#20038)
+regexp_const_value(#20037,"/exportassign")
+#20039=*
+entry_cfg_node(#20039,#20001)
+#20040=@"loc,{#10000},1,1,1,0"
+locations_default(#20040,#10000,1,1,1,0)
+hasLocation(#20039,#20040)
+#20041=*
+exit_cfg_node(#20041,#20001)
+hasLocation(#20041,#20021)
+successor(#20032,#20030)
+successor(#20030,#20028)
+successor(#20029,#20032)
+successor(#20028,#20041)
+successor(#20039,#20029)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/interfaces.ts.trap b/javascript/extractor/tests/ts/output/trap/interfaces.ts.trap
index 5ceae62d1ba..74f922f4087 100644
--- a/javascript/extractor/tests/ts/output/trap/interfaces.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/interfaces.ts.trap
@@ -261,181 +261,189 @@ hasLocation(#20001,#20092)
 local_namespace_names(#20093,"Foo",#20000)
 #20094=@"local_type_name;{MyInterface};{#20000}"
 local_type_names(#20094,"MyInterface",#20000)
-#20095=*
-stmts(#20095,34,#20001,0,"interfa ... mber;\n}")
-#20096=@"loc,{#10000},1,1,5,1"
-locations_default(#20096,#10000,1,1,5,1)
-hasLocation(#20095,#20096)
-stmt_containers(#20095,#20001)
-#20097=*
-typeexprs(#20097,1,#20095,0,"MyInterface")
-hasLocation(#20097,#20027)
-enclosing_stmt(#20097,#20095)
-expr_containers(#20097,#20001)
-literals("MyInterface","MyInterface",#20097)
-typedecl(#20097,#20094)
+#20095=@"var;{this};{#20000}"
+variables(#20095,"this",#20000)
+#20096=*
+stmts(#20096,34,#20001,0,"interfa ... mber;\n}")
+#20097=@"loc,{#10000},1,1,5,1"
+locations_default(#20097,#10000,1,1,5,1)
+hasLocation(#20096,#20097)
+stmt_containers(#20096,#20001)
 #20098=*
-properties(#20098,#20095,2,0,"foo();")
-#20099=@"loc,{#10000},2,3,2,8"
-locations_default(#20099,#10000,2,3,2,8)
-hasLocation(#20098,#20099)
-#20100=*
-exprs(#20100,0,#20098,0,"foo")
-hasLocation(#20100,#20031)
-enclosing_stmt(#20100,#20095)
-expr_containers(#20100,#20001)
-literals("foo","foo",#20100)
+typeexprs(#20098,1,#20096,0,"MyInterface")
+hasLocation(#20098,#20027)
+enclosing_stmt(#20098,#20096)
+expr_containers(#20098,#20001)
+literals("MyInterface","MyInterface",#20098)
+typedecl(#20098,#20094)
+#20099=*
+properties(#20099,#20096,2,0,"foo();")
+#20100=@"loc,{#10000},2,3,2,8"
+locations_default(#20100,#10000,2,3,2,8)
+hasLocation(#20099,#20100)
 #20101=*
-exprs(#20101,9,#20098,1,"foo();")
-hasLocation(#20101,#20099)
-enclosing_stmt(#20101,#20095)
+exprs(#20101,0,#20099,0,"foo")
+hasLocation(#20101,#20031)
+enclosing_stmt(#20101,#20096)
 expr_containers(#20101,#20001)
+literals("foo","foo",#20101)
 #20102=*
-scopes(#20102,1)
-scopenodes(#20101,#20102)
-scopenesting(#20102,#20000)
-#20103=@"var;{arguments};{#20102}"
-variables(#20103,"arguments",#20102)
-is_arguments_object(#20103)
-is_method(#20098)
-is_abstract_member(#20098)
-#20104=*
-properties(#20104,#20095,3,0,"bar(x:  ... string;")
-#20105=@"loc,{#10000},3,3,3,25"
-locations_default(#20105,#10000,3,3,3,25)
-hasLocation(#20104,#20105)
+exprs(#20102,9,#20099,1,"foo();")
+hasLocation(#20102,#20100)
+enclosing_stmt(#20102,#20096)
+expr_containers(#20102,#20001)
+#20103=*
+scopes(#20103,1)
+scopenodes(#20102,#20103)
+scopenesting(#20103,#20000)
+#20104=@"var;{this};{#20103}"
+variables(#20104,"this",#20103)
+#20105=@"var;{arguments};{#20103}"
+variables(#20105,"arguments",#20103)
+is_arguments_object(#20105)
+is_method(#20099)
+is_abstract_member(#20099)
 #20106=*
-exprs(#20106,0,#20104,0,"bar")
-hasLocation(#20106,#20039)
-enclosing_stmt(#20106,#20095)
-expr_containers(#20106,#20001)
-literals("bar","bar",#20106)
-#20107=*
-exprs(#20107,9,#20104,1,"bar(x:  ... string;")
-hasLocation(#20107,#20105)
-enclosing_stmt(#20107,#20095)
-expr_containers(#20107,#20001)
+properties(#20106,#20096,3,0,"bar(x:  ... string;")
+#20107=@"loc,{#10000},3,3,3,25"
+locations_default(#20107,#10000,3,3,3,25)
+hasLocation(#20106,#20107)
 #20108=*
-scopes(#20108,1)
-scopenodes(#20107,#20108)
-scopenesting(#20108,#20000)
-#20109=@"var;{x};{#20108}"
-variables(#20109,"x",#20108)
+exprs(#20108,0,#20106,0,"bar")
+hasLocation(#20108,#20039)
+enclosing_stmt(#20108,#20096)
+expr_containers(#20108,#20001)
+literals("bar","bar",#20108)
+#20109=*
+exprs(#20109,9,#20106,1,"bar(x:  ... string;")
+hasLocation(#20109,#20107)
+enclosing_stmt(#20109,#20096)
+expr_containers(#20109,#20001)
 #20110=*
-exprs(#20110,78,#20107,0,"x")
-hasLocation(#20110,#20043)
-expr_containers(#20110,#20107)
-literals("x","x",#20110)
-decl(#20110,#20109)
-#20111=@"var;{arguments};{#20108}"
-variables(#20111,"arguments",#20108)
-is_arguments_object(#20111)
-#20112=*
-typeexprs(#20112,2,#20107,-3,"string")
-hasLocation(#20112,#20053)
-expr_containers(#20112,#20107)
-literals("string","string",#20112)
+scopes(#20110,1)
+scopenodes(#20109,#20110)
+scopenesting(#20110,#20000)
+#20111=@"var;{this};{#20110}"
+variables(#20111,"this",#20110)
+#20112=@"var;{x};{#20110}"
+variables(#20112,"x",#20110)
 #20113=*
-typeexprs(#20113,2,#20107,-6,"number")
-hasLocation(#20113,#20047)
-expr_containers(#20113,#20107)
-literals("number","number",#20113)
-is_method(#20104)
-is_abstract_member(#20104)
-#20114=*
-properties(#20114,#20095,4,8,"field: number;")
-#20115=@"loc,{#10000},4,3,4,16"
-locations_default(#20115,#10000,4,3,4,16)
-hasLocation(#20114,#20115)
+exprs(#20113,78,#20109,0,"x")
+hasLocation(#20113,#20043)
+expr_containers(#20113,#20109)
+literals("x","x",#20113)
+decl(#20113,#20112)
+#20114=@"var;{arguments};{#20110}"
+variables(#20114,"arguments",#20110)
+is_arguments_object(#20114)
+#20115=*
+typeexprs(#20115,2,#20109,-3,"string")
+hasLocation(#20115,#20053)
+expr_containers(#20115,#20109)
+literals("string","string",#20115)
 #20116=*
-exprs(#20116,0,#20114,0,"field")
-hasLocation(#20116,#20057)
-enclosing_stmt(#20116,#20095)
-expr_containers(#20116,#20001)
-literals("field","field",#20116)
-is_abstract_member(#20114)
+typeexprs(#20116,2,#20109,-6,"number")
+hasLocation(#20116,#20047)
+expr_containers(#20116,#20109)
+literals("number","number",#20116)
+is_method(#20106)
+is_abstract_member(#20106)
 #20117=*
-typeexprs(#20117,2,#20114,2,"number")
-hasLocation(#20117,#20061)
-enclosing_stmt(#20117,#20095)
-expr_containers(#20117,#20001)
-literals("number","number",#20117)
-#20118=*
-stmts(#20118,31,#20001,1,"namespa ... ;\n  }\n}")
-#20119=@"loc,{#10000},7,1,11,1"
-locations_default(#20119,#10000,7,1,11,1)
-hasLocation(#20118,#20119)
-stmt_containers(#20118,#20001)
+properties(#20117,#20096,4,8,"field: number;")
+#20118=@"loc,{#10000},4,3,4,16"
+locations_default(#20118,#10000,4,3,4,16)
+hasLocation(#20117,#20118)
+#20119=*
+exprs(#20119,0,#20117,0,"field")
+hasLocation(#20119,#20057)
+enclosing_stmt(#20119,#20096)
+expr_containers(#20119,#20001)
+literals("field","field",#20119)
+is_abstract_member(#20117)
 #20120=*
-exprs(#20120,78,#20118,-1,"Foo")
-hasLocation(#20120,#20068)
-enclosing_stmt(#20120,#20118)
+typeexprs(#20120,2,#20117,2,"number")
+hasLocation(#20120,#20061)
+enclosing_stmt(#20120,#20096)
 expr_containers(#20120,#20001)
-literals("Foo","Foo",#20120)
-namespacedecl(#20120,#20093)
+literals("number","number",#20120)
 #20121=*
-scopes(#20121,9)
-scopenodes(#20118,#20121)
-scopenesting(#20121,#20000)
-#20122=@"local_type_name;{I};{#20121}"
-local_type_names(#20122,"I",#20121)
+stmts(#20121,31,#20001,1,"namespa ... ;\n  }\n}")
+#20122=@"loc,{#10000},7,1,11,1"
+locations_default(#20122,#10000,7,1,11,1)
+hasLocation(#20121,#20122)
+stmt_containers(#20121,#20001)
 #20123=*
-stmts(#20123,30,#20118,0,"export  ... ();\n  }")
-#20124=@"loc,{#10000},8,3,10,3"
-locations_default(#20124,#10000,8,3,10,3)
-hasLocation(#20123,#20124)
-stmt_containers(#20123,#20118)
-#20125=*
-stmts(#20125,34,#20123,-1,"interfa ... ();\n  }")
-#20126=@"loc,{#10000},8,10,10,3"
-locations_default(#20126,#10000,8,10,10,3)
-hasLocation(#20125,#20126)
-stmt_containers(#20125,#20118)
-#20127=*
-typeexprs(#20127,1,#20125,0,"I")
-hasLocation(#20127,#20076)
-enclosing_stmt(#20127,#20125)
-expr_containers(#20127,#20118)
-literals("I","I",#20127)
-typedecl(#20127,#20122)
+exprs(#20123,78,#20121,-1,"Foo")
+hasLocation(#20123,#20068)
+enclosing_stmt(#20123,#20121)
+expr_containers(#20123,#20001)
+literals("Foo","Foo",#20123)
+namespacedecl(#20123,#20093)
+#20124=*
+scopes(#20124,9)
+scopenodes(#20121,#20124)
+scopenesting(#20124,#20000)
+#20125=@"local_type_name;{I};{#20124}"
+local_type_names(#20125,"I",#20124)
+#20126=*
+stmts(#20126,30,#20121,0,"export  ... ();\n  }")
+#20127=@"loc,{#10000},8,3,10,3"
+locations_default(#20127,#10000,8,3,10,3)
+hasLocation(#20126,#20127)
+stmt_containers(#20126,#20121)
 #20128=*
-properties(#20128,#20125,2,0,"bar();")
-#20129=@"loc,{#10000},9,5,9,10"
-locations_default(#20129,#10000,9,5,9,10)
+stmts(#20128,34,#20126,-1,"interfa ... ();\n  }")
+#20129=@"loc,{#10000},8,10,10,3"
+locations_default(#20129,#10000,8,10,10,3)
 hasLocation(#20128,#20129)
+stmt_containers(#20128,#20121)
 #20130=*
-exprs(#20130,0,#20128,0,"bar")
-hasLocation(#20130,#20080)
-enclosing_stmt(#20130,#20125)
-expr_containers(#20130,#20118)
-literals("bar","bar",#20130)
+typeexprs(#20130,1,#20128,0,"I")
+hasLocation(#20130,#20076)
+enclosing_stmt(#20130,#20128)
+expr_containers(#20130,#20121)
+literals("I","I",#20130)
+typedecl(#20130,#20125)
 #20131=*
-exprs(#20131,9,#20128,1,"bar();")
-hasLocation(#20131,#20129)
-enclosing_stmt(#20131,#20125)
-expr_containers(#20131,#20118)
-#20132=*
-scopes(#20132,1)
-scopenodes(#20131,#20132)
-scopenesting(#20132,#20121)
-#20133=@"var;{arguments};{#20132}"
-variables(#20133,"arguments",#20132)
-is_arguments_object(#20133)
-is_method(#20128)
-is_abstract_member(#20128)
+properties(#20131,#20128,2,0,"bar();")
+#20132=@"loc,{#10000},9,5,9,10"
+locations_default(#20132,#10000,9,5,9,10)
+hasLocation(#20131,#20132)
+#20133=*
+exprs(#20133,0,#20131,0,"bar")
+hasLocation(#20133,#20080)
+enclosing_stmt(#20133,#20128)
+expr_containers(#20133,#20121)
+literals("bar","bar",#20133)
 #20134=*
-entry_cfg_node(#20134,#20001)
-#20135=@"loc,{#10000},1,1,1,0"
-locations_default(#20135,#10000,1,1,1,0)
-hasLocation(#20134,#20135)
-#20136=*
-exit_cfg_node(#20136,#20001)
-hasLocation(#20136,#20091)
-successor(#20120,#20118)
-successor(#20123,#20125)
-successor(#20125,#20136)
-successor(#20118,#20123)
-successor(#20095,#20120)
-successor(#20134,#20095)
+exprs(#20134,9,#20131,1,"bar();")
+hasLocation(#20134,#20132)
+enclosing_stmt(#20134,#20128)
+expr_containers(#20134,#20121)
+#20135=*
+scopes(#20135,1)
+scopenodes(#20134,#20135)
+scopenesting(#20135,#20124)
+#20136=@"var;{this};{#20135}"
+variables(#20136,"this",#20135)
+#20137=@"var;{arguments};{#20135}"
+variables(#20137,"arguments",#20135)
+is_arguments_object(#20137)
+is_method(#20131)
+is_abstract_member(#20131)
+#20138=*
+entry_cfg_node(#20138,#20001)
+#20139=@"loc,{#10000},1,1,1,0"
+locations_default(#20139,#10000,1,1,1,0)
+hasLocation(#20138,#20139)
+#20140=*
+exit_cfg_node(#20140,#20001)
+hasLocation(#20140,#20091)
+successor(#20123,#20121)
+successor(#20126,#20128)
+successor(#20128,#20140)
+successor(#20121,#20126)
+successor(#20096,#20123)
+successor(#20138,#20096)
 numlines(#10000,11,10,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/invalidExtends.ts.trap b/javascript/extractor/tests/ts/output/trap/invalidExtends.ts.trap
index ec1ddb444ef..88a717270b6 100644
--- a/javascript/extractor/tests/ts/output/trap/invalidExtends.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/invalidExtends.ts.trap
@@ -327,125 +327,127 @@ locations_default(#20124,#10000,1,1,7,0)
 hasLocation(#20001,#20124)
 #20125=@"local_type_name;{Invalid};{#20000}"
 local_type_names(#20125,"Invalid",#20000)
-#20126=*
-stmts(#20126,34,#20001,0,"interfa ... bar) {}")
-hasLocation(#20126,#20003)
-stmt_containers(#20126,#20001)
+#20126=@"var;{this};{#20000}"
+variables(#20126,"this",#20000)
 #20127=*
-typeexprs(#20127,1,#20126,0,"Invalid")
-hasLocation(#20127,#20017)
-enclosing_stmt(#20127,#20126)
-expr_containers(#20127,#20001)
-literals("Invalid","Invalid",#20127)
-typedecl(#20127,#20125)
+stmts(#20127,34,#20001,0,"interfa ... bar) {}")
+hasLocation(#20127,#20003)
+stmt_containers(#20127,#20001)
 #20128=*
-stmts(#20128,34,#20001,1,"interfa ... .bar {}")
-hasLocation(#20128,#20005)
-stmt_containers(#20128,#20001)
+typeexprs(#20128,1,#20127,0,"Invalid")
+hasLocation(#20128,#20017)
+enclosing_stmt(#20128,#20127)
+expr_containers(#20128,#20001)
+literals("Invalid","Invalid",#20128)
+typedecl(#20128,#20125)
 #20129=*
-typeexprs(#20129,1,#20128,0,"Invalid")
-hasLocation(#20129,#20037)
-enclosing_stmt(#20129,#20128)
-expr_containers(#20129,#20001)
-literals("Invalid","Invalid",#20129)
-typedecl(#20129,#20125)
+stmts(#20129,34,#20001,1,"interfa ... .bar {}")
+hasLocation(#20129,#20005)
+stmt_containers(#20129,#20001)
 #20130=*
-stmts(#20130,34,#20001,2,"interfa ... bar] {}")
-hasLocation(#20130,#20007)
-stmt_containers(#20130,#20001)
+typeexprs(#20130,1,#20129,0,"Invalid")
+hasLocation(#20130,#20037)
+enclosing_stmt(#20130,#20129)
+expr_containers(#20130,#20001)
+literals("Invalid","Invalid",#20130)
+typedecl(#20130,#20125)
 #20131=*
-typeexprs(#20131,13,#20130,-1,"foo[bar]")
-#20132=@"loc,{#10000},3,27,3,34"
-locations_default(#20132,#10000,3,27,3,34)
-hasLocation(#20131,#20132)
-enclosing_stmt(#20131,#20130)
-expr_containers(#20131,#20001)
-#20133=*
-typeexprs(#20133,25,#20131,0,"foo")
-hasLocation(#20133,#20061)
-enclosing_stmt(#20133,#20130)
-expr_containers(#20133,#20001)
-literals("foo","foo",#20133)
+stmts(#20131,34,#20001,2,"interfa ... bar] {}")
+hasLocation(#20131,#20007)
+stmt_containers(#20131,#20001)
+#20132=*
+typeexprs(#20132,13,#20131,-1,"foo[bar]")
+#20133=@"loc,{#10000},3,27,3,34"
+locations_default(#20133,#10000,3,27,3,34)
+hasLocation(#20132,#20133)
+enclosing_stmt(#20132,#20131)
+expr_containers(#20132,#20001)
 #20134=*
-typeexprs(#20134,15,#20131,1,"bar")
-hasLocation(#20134,#20065)
-enclosing_stmt(#20134,#20130)
+typeexprs(#20134,25,#20132,0,"foo")
+hasLocation(#20134,#20061)
+enclosing_stmt(#20134,#20131)
 expr_containers(#20134,#20001)
-literals("bar","bar",#20134)
+literals("foo","foo",#20134)
 #20135=*
-typeexprs(#20135,1,#20130,0,"Invalid")
-hasLocation(#20135,#20057)
-enclosing_stmt(#20135,#20130)
+typeexprs(#20135,15,#20132,1,"bar")
+hasLocation(#20135,#20065)
+enclosing_stmt(#20135,#20131)
 expr_containers(#20135,#20001)
-literals("Invalid","Invalid",#20135)
-typedecl(#20135,#20125)
+literals("bar","bar",#20135)
 #20136=*
-stmts(#20136,34,#20001,3,"interfa ... .bar {}")
-hasLocation(#20136,#20009)
-stmt_containers(#20136,#20001)
+typeexprs(#20136,1,#20131,0,"Invalid")
+hasLocation(#20136,#20057)
+enclosing_stmt(#20136,#20131)
+expr_containers(#20136,#20001)
+literals("Invalid","Invalid",#20136)
+typedecl(#20136,#20125)
 #20137=*
-typeexprs(#20137,13,#20136,-1,"foo?.bar")
-#20138=@"loc,{#10000},4,27,4,34"
-locations_default(#20138,#10000,4,27,4,34)
-hasLocation(#20137,#20138)
-enclosing_stmt(#20137,#20136)
-expr_containers(#20137,#20001)
-#20139=*
-typeexprs(#20139,25,#20137,0,"foo")
-hasLocation(#20139,#20079)
-enclosing_stmt(#20139,#20136)
-expr_containers(#20139,#20001)
-literals("foo","foo",#20139)
+stmts(#20137,34,#20001,3,"interfa ... .bar {}")
+hasLocation(#20137,#20009)
+stmt_containers(#20137,#20001)
+#20138=*
+typeexprs(#20138,13,#20137,-1,"foo?.bar")
+#20139=@"loc,{#10000},4,27,4,34"
+locations_default(#20139,#10000,4,27,4,34)
+hasLocation(#20138,#20139)
+enclosing_stmt(#20138,#20137)
+expr_containers(#20138,#20001)
 #20140=*
-typeexprs(#20140,15,#20137,1,"bar")
-hasLocation(#20140,#20083)
-enclosing_stmt(#20140,#20136)
+typeexprs(#20140,25,#20138,0,"foo")
+hasLocation(#20140,#20079)
+enclosing_stmt(#20140,#20137)
 expr_containers(#20140,#20001)
-literals("bar","bar",#20140)
-isOptionalChaining(#20137)
+literals("foo","foo",#20140)
 #20141=*
-typeexprs(#20141,1,#20136,0,"Invalid")
-hasLocation(#20141,#20075)
-enclosing_stmt(#20141,#20136)
+typeexprs(#20141,15,#20138,1,"bar")
+hasLocation(#20141,#20083)
+enclosing_stmt(#20141,#20137)
 expr_containers(#20141,#20001)
-literals("Invalid","Invalid",#20141)
-typedecl(#20141,#20125)
+literals("bar","bar",#20141)
+isOptionalChaining(#20138)
 #20142=*
-stmts(#20142,34,#20001,4,"interfa ... .bar {}")
-hasLocation(#20142,#20011)
-stmt_containers(#20142,#20001)
+typeexprs(#20142,1,#20137,0,"Invalid")
+hasLocation(#20142,#20075)
+enclosing_stmt(#20142,#20137)
+expr_containers(#20142,#20001)
+literals("Invalid","Invalid",#20142)
+typedecl(#20142,#20125)
 #20143=*
-typeexprs(#20143,1,#20142,0,"Invalid")
-hasLocation(#20143,#20091)
-enclosing_stmt(#20143,#20142)
-expr_containers(#20143,#20001)
-literals("Invalid","Invalid",#20143)
-typedecl(#20143,#20125)
+stmts(#20143,34,#20001,4,"interfa ... .bar {}")
+hasLocation(#20143,#20011)
+stmt_containers(#20143,#20001)
 #20144=*
-stmts(#20144,34,#20001,5,"interfa ... oo() {}")
-hasLocation(#20144,#20013)
-stmt_containers(#20144,#20001)
+typeexprs(#20144,1,#20143,0,"Invalid")
+hasLocation(#20144,#20091)
+enclosing_stmt(#20144,#20143)
+expr_containers(#20144,#20001)
+literals("Invalid","Invalid",#20144)
+typedecl(#20144,#20125)
 #20145=*
-typeexprs(#20145,1,#20144,0,"Invalid")
-hasLocation(#20145,#20109)
-enclosing_stmt(#20145,#20144)
-expr_containers(#20145,#20001)
-literals("Invalid","Invalid",#20145)
-typedecl(#20145,#20125)
+stmts(#20145,34,#20001,5,"interfa ... oo() {}")
+hasLocation(#20145,#20013)
+stmt_containers(#20145,#20001)
 #20146=*
-entry_cfg_node(#20146,#20001)
-#20147=@"loc,{#10000},1,1,1,0"
-locations_default(#20147,#10000,1,1,1,0)
-hasLocation(#20146,#20147)
-#20148=*
-exit_cfg_node(#20148,#20001)
-hasLocation(#20148,#20123)
-successor(#20144,#20148)
-successor(#20142,#20144)
-successor(#20136,#20142)
-successor(#20130,#20136)
-successor(#20128,#20130)
-successor(#20126,#20128)
-successor(#20146,#20126)
+typeexprs(#20146,1,#20145,0,"Invalid")
+hasLocation(#20146,#20109)
+enclosing_stmt(#20146,#20145)
+expr_containers(#20146,#20001)
+literals("Invalid","Invalid",#20146)
+typedecl(#20146,#20125)
+#20147=*
+entry_cfg_node(#20147,#20001)
+#20148=@"loc,{#10000},1,1,1,0"
+locations_default(#20148,#10000,1,1,1,0)
+hasLocation(#20147,#20148)
+#20149=*
+exit_cfg_node(#20149,#20001)
+hasLocation(#20149,#20123)
+successor(#20145,#20149)
+successor(#20143,#20145)
+successor(#20137,#20143)
+successor(#20131,#20137)
+successor(#20129,#20131)
+successor(#20127,#20129)
+successor(#20147,#20127)
 numlines(#10000,6,6,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/let.ts.trap b/javascript/extractor/tests/ts/output/trap/let.ts.trap
index cdc760eb16c..c0ddd927e89 100644
--- a/javascript/extractor/tests/ts/output/trap/let.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/let.ts.trap
@@ -118,98 +118,100 @@ variables(#20041,"varX",#20000)
 variables(#20042,"letX",#20000)
 #20043=@"var;{constX};{#20000}"
 variables(#20043,"constX",#20000)
-#20044=*
-stmts(#20044,18,#20001,0,"var varX = 5;")
-hasLocation(#20044,#20003)
-stmt_containers(#20044,#20001)
+#20044=@"var;{this};{#20000}"
+variables(#20044,"this",#20000)
 #20045=*
-exprs(#20045,64,#20044,0,"varX = 5")
-#20046=@"loc,{#10000},1,5,1,12"
-locations_default(#20046,#10000,1,5,1,12)
-hasLocation(#20045,#20046)
-enclosing_stmt(#20045,#20044)
-expr_containers(#20045,#20001)
-#20047=*
-exprs(#20047,78,#20045,0,"varX")
-hasLocation(#20047,#20011)
-enclosing_stmt(#20047,#20044)
-expr_containers(#20047,#20001)
-literals("varX","varX",#20047)
-decl(#20047,#20041)
+stmts(#20045,18,#20001,0,"var varX = 5;")
+hasLocation(#20045,#20003)
+stmt_containers(#20045,#20001)
+#20046=*
+exprs(#20046,64,#20045,0,"varX = 5")
+#20047=@"loc,{#10000},1,5,1,12"
+locations_default(#20047,#10000,1,5,1,12)
+hasLocation(#20046,#20047)
+enclosing_stmt(#20046,#20045)
+expr_containers(#20046,#20001)
 #20048=*
-exprs(#20048,3,#20045,1,"5")
-hasLocation(#20048,#20015)
-enclosing_stmt(#20048,#20044)
+exprs(#20048,78,#20046,0,"varX")
+hasLocation(#20048,#20011)
+enclosing_stmt(#20048,#20045)
 expr_containers(#20048,#20001)
-literals("5","5",#20048)
+literals("varX","varX",#20048)
+decl(#20048,#20041)
 #20049=*
-stmts(#20049,23,#20001,1,"let letX = 6;")
-hasLocation(#20049,#20005)
-stmt_containers(#20049,#20001)
+exprs(#20049,3,#20046,1,"5")
+hasLocation(#20049,#20015)
+enclosing_stmt(#20049,#20045)
+expr_containers(#20049,#20001)
+literals("5","5",#20049)
 #20050=*
-exprs(#20050,64,#20049,0,"letX = 6")
-#20051=@"loc,{#10000},2,5,2,12"
-locations_default(#20051,#10000,2,5,2,12)
-hasLocation(#20050,#20051)
-enclosing_stmt(#20050,#20049)
-expr_containers(#20050,#20001)
-#20052=*
-exprs(#20052,78,#20050,0,"letX")
-hasLocation(#20052,#20021)
-enclosing_stmt(#20052,#20049)
-expr_containers(#20052,#20001)
-literals("letX","letX",#20052)
-decl(#20052,#20042)
+stmts(#20050,23,#20001,1,"let letX = 6;")
+hasLocation(#20050,#20005)
+stmt_containers(#20050,#20001)
+#20051=*
+exprs(#20051,64,#20050,0,"letX = 6")
+#20052=@"loc,{#10000},2,5,2,12"
+locations_default(#20052,#10000,2,5,2,12)
+hasLocation(#20051,#20052)
+enclosing_stmt(#20051,#20050)
+expr_containers(#20051,#20001)
 #20053=*
-exprs(#20053,3,#20050,1,"6")
-hasLocation(#20053,#20025)
-enclosing_stmt(#20053,#20049)
+exprs(#20053,78,#20051,0,"letX")
+hasLocation(#20053,#20021)
+enclosing_stmt(#20053,#20050)
 expr_containers(#20053,#20001)
-literals("6","6",#20053)
+literals("letX","letX",#20053)
+decl(#20053,#20042)
 #20054=*
-stmts(#20054,22,#20001,2,"const constX = 7;")
-hasLocation(#20054,#20007)
-stmt_containers(#20054,#20001)
+exprs(#20054,3,#20051,1,"6")
+hasLocation(#20054,#20025)
+enclosing_stmt(#20054,#20050)
+expr_containers(#20054,#20001)
+literals("6","6",#20054)
 #20055=*
-exprs(#20055,64,#20054,0,"constX = 7")
-#20056=@"loc,{#10000},3,7,3,16"
-locations_default(#20056,#10000,3,7,3,16)
-hasLocation(#20055,#20056)
-enclosing_stmt(#20055,#20054)
-expr_containers(#20055,#20001)
-#20057=*
-exprs(#20057,78,#20055,0,"constX")
-hasLocation(#20057,#20031)
-enclosing_stmt(#20057,#20054)
-expr_containers(#20057,#20001)
-literals("constX","constX",#20057)
-decl(#20057,#20043)
+stmts(#20055,22,#20001,2,"const constX = 7;")
+hasLocation(#20055,#20007)
+stmt_containers(#20055,#20001)
+#20056=*
+exprs(#20056,64,#20055,0,"constX = 7")
+#20057=@"loc,{#10000},3,7,3,16"
+locations_default(#20057,#10000,3,7,3,16)
+hasLocation(#20056,#20057)
+enclosing_stmt(#20056,#20055)
+expr_containers(#20056,#20001)
 #20058=*
-exprs(#20058,3,#20055,1,"7")
-hasLocation(#20058,#20035)
-enclosing_stmt(#20058,#20054)
+exprs(#20058,78,#20056,0,"constX")
+hasLocation(#20058,#20031)
+enclosing_stmt(#20058,#20055)
 expr_containers(#20058,#20001)
-literals("7","7",#20058)
+literals("constX","constX",#20058)
+decl(#20058,#20043)
 #20059=*
-entry_cfg_node(#20059,#20001)
-#20060=@"loc,{#10000},1,1,1,0"
-locations_default(#20060,#10000,1,1,1,0)
-hasLocation(#20059,#20060)
-#20061=*
-exit_cfg_node(#20061,#20001)
-hasLocation(#20061,#20039)
-successor(#20054,#20057)
-successor(#20058,#20055)
-successor(#20057,#20058)
-successor(#20055,#20061)
-successor(#20049,#20052)
-successor(#20053,#20050)
-successor(#20052,#20053)
-successor(#20050,#20054)
-successor(#20044,#20047)
-successor(#20048,#20045)
-successor(#20047,#20048)
-successor(#20045,#20049)
-successor(#20059,#20044)
+exprs(#20059,3,#20056,1,"7")
+hasLocation(#20059,#20035)
+enclosing_stmt(#20059,#20055)
+expr_containers(#20059,#20001)
+literals("7","7",#20059)
+#20060=*
+entry_cfg_node(#20060,#20001)
+#20061=@"loc,{#10000},1,1,1,0"
+locations_default(#20061,#10000,1,1,1,0)
+hasLocation(#20060,#20061)
+#20062=*
+exit_cfg_node(#20062,#20001)
+hasLocation(#20062,#20039)
+successor(#20055,#20058)
+successor(#20059,#20056)
+successor(#20058,#20059)
+successor(#20056,#20062)
+successor(#20050,#20053)
+successor(#20054,#20051)
+successor(#20053,#20054)
+successor(#20051,#20055)
+successor(#20045,#20048)
+successor(#20049,#20046)
+successor(#20048,#20049)
+successor(#20046,#20050)
+successor(#20060,#20045)
 numlines(#10000,3,3,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/logicalOr.ts.trap b/javascript/extractor/tests/ts/output/trap/logicalOr.ts.trap
index 53769c26911..8e7bd5071ad 100644
--- a/javascript/extractor/tests/ts/output/trap/logicalOr.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/logicalOr.ts.trap
@@ -170,181 +170,185 @@ locations_default(#20061,#10000,1,1,5,0)
 hasLocation(#20001,#20061)
 #20062=@"var;{f};{#20000}"
 variables(#20062,"f",#20000)
-#20063=*
-stmts(#20063,17,#20001,0,"functio ... y) {}\n}")
-#20064=@"loc,{#10000},1,1,4,1"
-locations_default(#20064,#10000,1,1,4,1)
-hasLocation(#20063,#20064)
-stmt_containers(#20063,#20001)
-#20065=*
-exprs(#20065,78,#20063,-1,"f")
-hasLocation(#20065,#20013)
-expr_containers(#20065,#20063)
-literals("f","f",#20065)
-decl(#20065,#20062)
+#20063=@"var;{this};{#20000}"
+variables(#20063,"this",#20000)
+#20064=*
+stmts(#20064,17,#20001,0,"functio ... y) {}\n}")
+#20065=@"loc,{#10000},1,1,4,1"
+locations_default(#20065,#10000,1,1,4,1)
+hasLocation(#20064,#20065)
+stmt_containers(#20064,#20001)
 #20066=*
-scopes(#20066,1)
-scopenodes(#20063,#20066)
-scopenesting(#20066,#20000)
-#20067=@"var;{x};{#20066}"
-variables(#20067,"x",#20066)
-#20068=*
-exprs(#20068,78,#20063,0,"x")
-hasLocation(#20068,#20017)
-expr_containers(#20068,#20063)
-literals("x","x",#20068)
-decl(#20068,#20067)
-#20069=@"var;{y};{#20066}"
-variables(#20069,"y",#20066)
+exprs(#20066,78,#20064,-1,"f")
+hasLocation(#20066,#20013)
+expr_containers(#20066,#20064)
+literals("f","f",#20066)
+decl(#20066,#20062)
+#20067=*
+scopes(#20067,1)
+scopenodes(#20064,#20067)
+scopenesting(#20067,#20000)
+#20068=@"var;{this};{#20067}"
+variables(#20068,"this",#20067)
+#20069=@"var;{x};{#20067}"
+variables(#20069,"x",#20067)
 #20070=*
-exprs(#20070,78,#20063,1,"y")
-hasLocation(#20070,#20021)
-expr_containers(#20070,#20063)
-literals("y","y",#20070)
+exprs(#20070,78,#20064,0,"x")
+hasLocation(#20070,#20017)
+expr_containers(#20070,#20064)
+literals("x","x",#20070)
 decl(#20070,#20069)
-#20071=@"var;{arguments};{#20066}"
-variables(#20071,"arguments",#20066)
-is_arguments_object(#20071)
+#20071=@"var;{y};{#20067}"
+variables(#20071,"y",#20067)
 #20072=*
-stmts(#20072,1,#20063,-2,"{\n  if  ... y) {}\n}")
-#20073=@"loc,{#10000},1,17,4,1"
-locations_default(#20073,#10000,1,17,4,1)
-hasLocation(#20072,#20073)
-stmt_containers(#20072,#20063)
+exprs(#20072,78,#20064,1,"y")
+hasLocation(#20072,#20021)
+expr_containers(#20072,#20064)
+literals("y","y",#20072)
+decl(#20072,#20071)
+#20073=@"var;{arguments};{#20067}"
+variables(#20073,"arguments",#20067)
+is_arguments_object(#20073)
 #20074=*
-stmts(#20074,3,#20072,0,"if (x || y) {}")
-#20075=@"loc,{#10000},2,3,2,16"
-locations_default(#20075,#10000,2,3,2,16)
+stmts(#20074,1,#20064,-2,"{\n  if  ... y) {}\n}")
+#20075=@"loc,{#10000},1,17,4,1"
+locations_default(#20075,#10000,1,17,4,1)
 hasLocation(#20074,#20075)
-stmt_containers(#20074,#20063)
+stmt_containers(#20074,#20064)
 #20076=*
-exprs(#20076,45,#20074,0,"x || y")
-#20077=@"loc,{#10000},2,7,2,12"
-locations_default(#20077,#10000,2,7,2,12)
+stmts(#20076,3,#20074,0,"if (x || y) {}")
+#20077=@"loc,{#10000},2,3,2,16"
+locations_default(#20077,#10000,2,3,2,16)
 hasLocation(#20076,#20077)
-enclosing_stmt(#20076,#20074)
-expr_containers(#20076,#20063)
+stmt_containers(#20076,#20064)
 #20078=*
-exprs(#20078,79,#20076,0,"x")
-hasLocation(#20078,#20031)
-enclosing_stmt(#20078,#20074)
-expr_containers(#20078,#20063)
-literals("x","x",#20078)
-bind(#20078,#20067)
-#20079=*
-exprs(#20079,79,#20076,1,"y")
-hasLocation(#20079,#20035)
-enclosing_stmt(#20079,#20074)
-expr_containers(#20079,#20063)
-literals("y","y",#20079)
-bind(#20079,#20069)
+exprs(#20078,45,#20076,0,"x || y")
+#20079=@"loc,{#10000},2,7,2,12"
+locations_default(#20079,#10000,2,7,2,12)
+hasLocation(#20078,#20079)
+enclosing_stmt(#20078,#20076)
+expr_containers(#20078,#20064)
 #20080=*
-stmts(#20080,1,#20074,1,"{}")
-#20081=@"loc,{#10000},2,15,2,16"
-locations_default(#20081,#10000,2,15,2,16)
-hasLocation(#20080,#20081)
-stmt_containers(#20080,#20063)
+exprs(#20080,79,#20078,0,"x")
+hasLocation(#20080,#20031)
+enclosing_stmt(#20080,#20076)
+expr_containers(#20080,#20064)
+literals("x","x",#20080)
+bind(#20080,#20069)
+#20081=*
+exprs(#20081,79,#20078,1,"y")
+hasLocation(#20081,#20035)
+enclosing_stmt(#20081,#20076)
+expr_containers(#20081,#20064)
+literals("y","y",#20081)
+bind(#20081,#20071)
 #20082=*
-stmts(#20082,3,#20072,1,"if (x && y) {}")
-#20083=@"loc,{#10000},3,3,3,16"
-locations_default(#20083,#10000,3,3,3,16)
+stmts(#20082,1,#20076,1,"{}")
+#20083=@"loc,{#10000},2,15,2,16"
+locations_default(#20083,#10000,2,15,2,16)
 hasLocation(#20082,#20083)
-stmt_containers(#20082,#20063)
+stmt_containers(#20082,#20064)
 #20084=*
-exprs(#20084,44,#20082,0,"x && y")
-#20085=@"loc,{#10000},3,7,3,12"
-locations_default(#20085,#10000,3,7,3,12)
+stmts(#20084,3,#20074,1,"if (x && y) {}")
+#20085=@"loc,{#10000},3,3,3,16"
+locations_default(#20085,#10000,3,3,3,16)
 hasLocation(#20084,#20085)
-enclosing_stmt(#20084,#20082)
-expr_containers(#20084,#20063)
+stmt_containers(#20084,#20064)
 #20086=*
-exprs(#20086,79,#20084,0,"x")
-hasLocation(#20086,#20047)
-enclosing_stmt(#20086,#20082)
-expr_containers(#20086,#20063)
-literals("x","x",#20086)
-bind(#20086,#20067)
-#20087=*
-exprs(#20087,79,#20084,1,"y")
-hasLocation(#20087,#20051)
-enclosing_stmt(#20087,#20082)
-expr_containers(#20087,#20063)
-literals("y","y",#20087)
-bind(#20087,#20069)
+exprs(#20086,44,#20084,0,"x && y")
+#20087=@"loc,{#10000},3,7,3,12"
+locations_default(#20087,#10000,3,7,3,12)
+hasLocation(#20086,#20087)
+enclosing_stmt(#20086,#20084)
+expr_containers(#20086,#20064)
 #20088=*
-stmts(#20088,1,#20082,1,"{}")
-#20089=@"loc,{#10000},3,15,3,16"
-locations_default(#20089,#10000,3,15,3,16)
-hasLocation(#20088,#20089)
-stmt_containers(#20088,#20063)
+exprs(#20088,79,#20086,0,"x")
+hasLocation(#20088,#20047)
+enclosing_stmt(#20088,#20084)
+expr_containers(#20088,#20064)
+literals("x","x",#20088)
+bind(#20088,#20069)
+#20089=*
+exprs(#20089,79,#20086,1,"y")
+hasLocation(#20089,#20051)
+enclosing_stmt(#20089,#20084)
+expr_containers(#20089,#20064)
+literals("y","y",#20089)
+bind(#20089,#20071)
 #20090=*
-entry_cfg_node(#20090,#20001)
-#20091=@"loc,{#10000},1,1,1,0"
-locations_default(#20091,#10000,1,1,1,0)
+stmts(#20090,1,#20084,1,"{}")
+#20091=@"loc,{#10000},3,15,3,16"
+locations_default(#20091,#10000,3,15,3,16)
 hasLocation(#20090,#20091)
+stmt_containers(#20090,#20064)
 #20092=*
-exit_cfg_node(#20092,#20001)
-hasLocation(#20092,#20060)
-successor(#20063,#20092)
-#20093=*
-entry_cfg_node(#20093,#20063)
-hasLocation(#20093,#20091)
+entry_cfg_node(#20092,#20001)
+#20093=@"loc,{#10000},1,1,1,0"
+locations_default(#20093,#10000,1,1,1,0)
+hasLocation(#20092,#20093)
 #20094=*
-exit_cfg_node(#20094,#20063)
-#20095=@"loc,{#10000},4,2,4,1"
-locations_default(#20095,#10000,4,2,4,1)
-hasLocation(#20094,#20095)
-successor(#20082,#20084)
-successor(#20084,#20086)
+exit_cfg_node(#20094,#20001)
+hasLocation(#20094,#20060)
+successor(#20064,#20094)
+#20095=*
+entry_cfg_node(#20095,#20064)
+hasLocation(#20095,#20093)
 #20096=*
-guard_node(#20096,1,#20086)
-hasLocation(#20096,#20047)
-successor(#20096,#20087)
-#20097=*
-guard_node(#20097,0,#20086)
-hasLocation(#20097,#20047)
-successor(#20097,#20094)
-successor(#20086,#20096)
-successor(#20086,#20097)
+exit_cfg_node(#20096,#20064)
+#20097=@"loc,{#10000},4,2,4,1"
+locations_default(#20097,#10000,4,2,4,1)
+hasLocation(#20096,#20097)
+successor(#20084,#20086)
+successor(#20086,#20088)
 #20098=*
-guard_node(#20098,1,#20087)
-hasLocation(#20098,#20051)
-successor(#20098,#20088)
+guard_node(#20098,1,#20088)
+hasLocation(#20098,#20047)
+successor(#20098,#20089)
 #20099=*
-guard_node(#20099,0,#20087)
-hasLocation(#20099,#20051)
-successor(#20099,#20094)
-successor(#20087,#20098)
-successor(#20087,#20099)
-successor(#20088,#20094)
-successor(#20074,#20076)
-successor(#20076,#20078)
+guard_node(#20099,0,#20088)
+hasLocation(#20099,#20047)
+successor(#20099,#20096)
+successor(#20088,#20098)
+successor(#20088,#20099)
 #20100=*
-guard_node(#20100,1,#20078)
-hasLocation(#20100,#20031)
-successor(#20100,#20080)
+guard_node(#20100,1,#20089)
+hasLocation(#20100,#20051)
+successor(#20100,#20090)
 #20101=*
-guard_node(#20101,0,#20078)
-hasLocation(#20101,#20031)
-successor(#20101,#20079)
-successor(#20078,#20100)
-successor(#20078,#20101)
+guard_node(#20101,0,#20089)
+hasLocation(#20101,#20051)
+successor(#20101,#20096)
+successor(#20089,#20100)
+successor(#20089,#20101)
+successor(#20090,#20096)
+successor(#20076,#20078)
+successor(#20078,#20080)
 #20102=*
-guard_node(#20102,1,#20079)
-hasLocation(#20102,#20035)
-successor(#20102,#20080)
+guard_node(#20102,1,#20080)
+hasLocation(#20102,#20031)
+successor(#20102,#20082)
 #20103=*
-guard_node(#20103,0,#20079)
-hasLocation(#20103,#20035)
-successor(#20103,#20082)
-successor(#20079,#20102)
-successor(#20079,#20103)
-successor(#20080,#20082)
+guard_node(#20103,0,#20080)
+hasLocation(#20103,#20031)
+successor(#20103,#20081)
+successor(#20080,#20102)
+successor(#20080,#20103)
+#20104=*
+guard_node(#20104,1,#20081)
+hasLocation(#20104,#20035)
+successor(#20104,#20082)
+#20105=*
+guard_node(#20105,0,#20081)
+hasLocation(#20105,#20035)
+successor(#20105,#20084)
+successor(#20081,#20104)
+successor(#20081,#20105)
+successor(#20082,#20084)
+successor(#20074,#20076)
 successor(#20072,#20074)
 successor(#20070,#20072)
-successor(#20068,#20070)
-successor(#20093,#20068)
-successor(#20065,#20063)
-successor(#20090,#20065)
+successor(#20095,#20070)
+successor(#20066,#20064)
+successor(#20092,#20066)
 numlines(#10000,4,4,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/mappedTypeModifiers.ts.trap b/javascript/extractor/tests/ts/output/trap/mappedTypeModifiers.ts.trap
index 536d31ce459..5c6dcf78fb5 100644
--- a/javascript/extractor/tests/ts/output/trap/mappedTypeModifiers.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/mappedTypeModifiers.ts.trap
@@ -691,496 +691,498 @@ locations_default(#20263,#10000,1,1,12,0)
 hasLocation(#20001,#20263)
 #20264=@"local_namespace_name;{MappedTypeModifiers};{#20000}"
 local_namespace_names(#20264,"MappedTypeModifiers",#20000)
-#20265=*
-stmts(#20265,31,#20001,0,"namespa ... ing }\n}")
-#20266=@"loc,{#10000},1,1,11,1"
-locations_default(#20266,#10000,1,1,11,1)
-hasLocation(#20265,#20266)
-stmt_containers(#20265,#20001)
-#20267=*
-exprs(#20267,78,#20265,-1,"MappedTypeModifiers")
-hasLocation(#20267,#20037)
-enclosing_stmt(#20267,#20265)
-expr_containers(#20267,#20001)
-literals("MappedTypeModifiers","MappedTypeModifiers",#20267)
-namespacedecl(#20267,#20264)
+#20265=@"var;{this};{#20000}"
+variables(#20265,"this",#20000)
+#20266=*
+stmts(#20266,31,#20001,0,"namespa ... ing }\n}")
+#20267=@"loc,{#10000},1,1,11,1"
+locations_default(#20267,#10000,1,1,11,1)
+hasLocation(#20266,#20267)
+stmt_containers(#20266,#20001)
 #20268=*
-scopes(#20268,9)
-scopenodes(#20265,#20268)
-scopenesting(#20268,#20000)
-#20269=@"local_type_name;{MutableRequired};{#20268}"
-local_type_names(#20269,"MutableRequired",#20268)
-#20270=@"local_type_name;{ReadonlyPartial};{#20268}"
-local_type_names(#20270,"ReadonlyPartial",#20268)
-#20271=@"local_type_name;{ReadonlyPartial2};{#20268}"
-local_type_names(#20271,"ReadonlyPartial2",#20268)
-#20272=@"local_type_name;{Required};{#20268}"
-local_type_names(#20272,"Required",#20268)
-#20273=@"local_type_name;{Foo};{#20268}"
-local_type_names(#20273,"Foo",#20268)
-#20274=@"local_type_name;{Bar};{#20268}"
-local_type_names(#20274,"Bar",#20268)
-#20275=*
-stmts(#20275,35,#20265,0,"type Mu ... T[P] };")
-#20276=@"loc,{#10000},2,3,2,65"
-locations_default(#20276,#10000,2,3,2,65)
-hasLocation(#20275,#20276)
-stmt_containers(#20275,#20265)
-#20277=*
-typeexprs(#20277,1,#20275,0,"MutableRequired")
-hasLocation(#20277,#20043)
-enclosing_stmt(#20277,#20275)
-expr_containers(#20277,#20265)
-literals("MutableRequired","MutableRequired",#20277)
-typedecl(#20277,#20269)
+exprs(#20268,78,#20266,-1,"MappedTypeModifiers")
+hasLocation(#20268,#20037)
+enclosing_stmt(#20268,#20266)
+expr_containers(#20268,#20001)
+literals("MappedTypeModifiers","MappedTypeModifiers",#20268)
+namespacedecl(#20268,#20264)
+#20269=*
+scopes(#20269,9)
+scopenodes(#20266,#20269)
+scopenesting(#20269,#20000)
+#20270=@"local_type_name;{MutableRequired};{#20269}"
+local_type_names(#20270,"MutableRequired",#20269)
+#20271=@"local_type_name;{ReadonlyPartial};{#20269}"
+local_type_names(#20271,"ReadonlyPartial",#20269)
+#20272=@"local_type_name;{ReadonlyPartial2};{#20269}"
+local_type_names(#20272,"ReadonlyPartial2",#20269)
+#20273=@"local_type_name;{Required};{#20269}"
+local_type_names(#20273,"Required",#20269)
+#20274=@"local_type_name;{Foo};{#20269}"
+local_type_names(#20274,"Foo",#20269)
+#20275=@"local_type_name;{Bar};{#20269}"
+local_type_names(#20275,"Bar",#20269)
+#20276=*
+stmts(#20276,35,#20266,0,"type Mu ... T[P] };")
+#20277=@"loc,{#10000},2,3,2,65"
+locations_default(#20277,#10000,2,3,2,65)
+hasLocation(#20276,#20277)
+stmt_containers(#20276,#20266)
 #20278=*
-scopes(#20278,12)
-scopenodes(#20275,#20278)
-scopenesting(#20278,#20268)
-#20279=@"local_type_name;{T};{#20278}"
-local_type_names(#20279,"T",#20278)
-#20280=*
-typeexprs(#20280,22,#20275,2,"T")
-hasLocation(#20280,#20047)
-enclosing_stmt(#20280,#20275)
-expr_containers(#20280,#20265)
+typeexprs(#20278,1,#20276,0,"MutableRequired")
+hasLocation(#20278,#20043)
+enclosing_stmt(#20278,#20276)
+expr_containers(#20278,#20266)
+literals("MutableRequired","MutableRequired",#20278)
+typedecl(#20278,#20270)
+#20279=*
+scopes(#20279,12)
+scopenodes(#20276,#20279)
+scopenesting(#20279,#20269)
+#20280=@"local_type_name;{T};{#20279}"
+local_type_names(#20280,"T",#20279)
 #20281=*
-typeexprs(#20281,1,#20280,0,"T")
+typeexprs(#20281,22,#20276,2,"T")
 hasLocation(#20281,#20047)
-enclosing_stmt(#20281,#20275)
-expr_containers(#20281,#20265)
-literals("T","T",#20281)
-typedecl(#20281,#20279)
+enclosing_stmt(#20281,#20276)
+expr_containers(#20281,#20266)
 #20282=*
-typeexprs(#20282,27,#20275,1,"{ -read ...  T[P] }")
-#20283=@"loc,{#10000},2,29,2,64"
-locations_default(#20283,#10000,2,29,2,64)
-hasLocation(#20282,#20283)
-enclosing_stmt(#20282,#20275)
-expr_containers(#20282,#20265)
-#20284=*
-scopes(#20284,13)
-scopenodes(#20282,#20284)
-scopenesting(#20284,#20278)
-#20285=@"local_type_name;{P};{#20284}"
-local_type_names(#20285,"P",#20284)
-#20286=*
-typeexprs(#20286,22,#20282,0,"P in keyof T")
-#20287=@"loc,{#10000},2,42,2,53"
-locations_default(#20287,#10000,2,42,2,53)
-hasLocation(#20286,#20287)
-enclosing_stmt(#20286,#20275)
-expr_containers(#20286,#20265)
-#20288=*
-typeexprs(#20288,1,#20286,0,"P")
-hasLocation(#20288,#20061)
-enclosing_stmt(#20288,#20275)
-expr_containers(#20288,#20265)
-literals("P","P",#20288)
-typedecl(#20288,#20285)
+typeexprs(#20282,1,#20281,0,"T")
+hasLocation(#20282,#20047)
+enclosing_stmt(#20282,#20276)
+expr_containers(#20282,#20266)
+literals("T","T",#20282)
+typedecl(#20282,#20280)
+#20283=*
+typeexprs(#20283,27,#20276,1,"{ -read ...  T[P] }")
+#20284=@"loc,{#10000},2,29,2,64"
+locations_default(#20284,#10000,2,29,2,64)
+hasLocation(#20283,#20284)
+enclosing_stmt(#20283,#20276)
+expr_containers(#20283,#20266)
+#20285=*
+scopes(#20285,13)
+scopenodes(#20283,#20285)
+scopenesting(#20285,#20279)
+#20286=@"local_type_name;{P};{#20285}"
+local_type_names(#20286,"P",#20285)
+#20287=*
+typeexprs(#20287,22,#20283,0,"P in keyof T")
+#20288=@"loc,{#10000},2,42,2,53"
+locations_default(#20288,#10000,2,42,2,53)
+hasLocation(#20287,#20288)
+enclosing_stmt(#20287,#20276)
+expr_containers(#20287,#20266)
 #20289=*
-typeexprs(#20289,12,#20286,1,"keyof T")
-#20290=@"loc,{#10000},2,47,2,53"
-locations_default(#20290,#10000,2,47,2,53)
-hasLocation(#20289,#20290)
-enclosing_stmt(#20289,#20275)
-expr_containers(#20289,#20265)
-#20291=*
-typeexprs(#20291,0,#20289,0,"T")
-hasLocation(#20291,#20067)
-enclosing_stmt(#20291,#20275)
-expr_containers(#20291,#20265)
-literals("T","T",#20291)
-typebind(#20291,#20279)
+typeexprs(#20289,1,#20287,0,"P")
+hasLocation(#20289,#20061)
+enclosing_stmt(#20289,#20276)
+expr_containers(#20289,#20266)
+literals("P","P",#20289)
+typedecl(#20289,#20286)
+#20290=*
+typeexprs(#20290,12,#20287,1,"keyof T")
+#20291=@"loc,{#10000},2,47,2,53"
+locations_default(#20291,#10000,2,47,2,53)
+hasLocation(#20290,#20291)
+enclosing_stmt(#20290,#20276)
+expr_containers(#20290,#20266)
 #20292=*
-typeexprs(#20292,8,#20282,1,"T[P]")
-#20293=@"loc,{#10000},2,59,2,62"
-locations_default(#20293,#10000,2,59,2,62)
-hasLocation(#20292,#20293)
-enclosing_stmt(#20292,#20275)
-expr_containers(#20292,#20265)
-#20294=*
-typeexprs(#20294,0,#20292,0,"T")
-hasLocation(#20294,#20077)
-enclosing_stmt(#20294,#20275)
-expr_containers(#20294,#20265)
-literals("T","T",#20294)
-typebind(#20294,#20279)
+typeexprs(#20292,0,#20290,0,"T")
+hasLocation(#20292,#20067)
+enclosing_stmt(#20292,#20276)
+expr_containers(#20292,#20266)
+literals("T","T",#20292)
+typebind(#20292,#20280)
+#20293=*
+typeexprs(#20293,8,#20283,1,"T[P]")
+#20294=@"loc,{#10000},2,59,2,62"
+locations_default(#20294,#10000,2,59,2,62)
+hasLocation(#20293,#20294)
+enclosing_stmt(#20293,#20276)
+expr_containers(#20293,#20266)
 #20295=*
-typeexprs(#20295,0,#20292,1,"P")
-hasLocation(#20295,#20081)
-enclosing_stmt(#20295,#20275)
-expr_containers(#20295,#20265)
-literals("P","P",#20295)
-typebind(#20295,#20285)
+typeexprs(#20295,0,#20293,0,"T")
+hasLocation(#20295,#20077)
+enclosing_stmt(#20295,#20276)
+expr_containers(#20295,#20266)
+literals("T","T",#20295)
+typebind(#20295,#20280)
 #20296=*
-stmts(#20296,35,#20265,1,"type Re ... T[P] };")
-#20297=@"loc,{#10000},3,3,3,65"
-locations_default(#20297,#10000,3,3,3,65)
-hasLocation(#20296,#20297)
-stmt_containers(#20296,#20265)
-#20298=*
-typeexprs(#20298,1,#20296,0,"ReadonlyPartial")
-hasLocation(#20298,#20091)
-enclosing_stmt(#20298,#20296)
-expr_containers(#20298,#20265)
-literals("ReadonlyPartial","ReadonlyPartial",#20298)
-typedecl(#20298,#20270)
+typeexprs(#20296,0,#20293,1,"P")
+hasLocation(#20296,#20081)
+enclosing_stmt(#20296,#20276)
+expr_containers(#20296,#20266)
+literals("P","P",#20296)
+typebind(#20296,#20286)
+#20297=*
+stmts(#20297,35,#20266,1,"type Re ... T[P] };")
+#20298=@"loc,{#10000},3,3,3,65"
+locations_default(#20298,#10000,3,3,3,65)
+hasLocation(#20297,#20298)
+stmt_containers(#20297,#20266)
 #20299=*
-scopes(#20299,12)
-scopenodes(#20296,#20299)
-scopenesting(#20299,#20268)
-#20300=@"local_type_name;{T};{#20299}"
-local_type_names(#20300,"T",#20299)
-#20301=*
-typeexprs(#20301,22,#20296,2,"T")
-hasLocation(#20301,#20095)
-enclosing_stmt(#20301,#20296)
-expr_containers(#20301,#20265)
+typeexprs(#20299,1,#20297,0,"ReadonlyPartial")
+hasLocation(#20299,#20091)
+enclosing_stmt(#20299,#20297)
+expr_containers(#20299,#20266)
+literals("ReadonlyPartial","ReadonlyPartial",#20299)
+typedecl(#20299,#20271)
+#20300=*
+scopes(#20300,12)
+scopenodes(#20297,#20300)
+scopenesting(#20300,#20269)
+#20301=@"local_type_name;{T};{#20300}"
+local_type_names(#20301,"T",#20300)
 #20302=*
-typeexprs(#20302,1,#20301,0,"T")
+typeexprs(#20302,22,#20297,2,"T")
 hasLocation(#20302,#20095)
-enclosing_stmt(#20302,#20296)
-expr_containers(#20302,#20265)
-literals("T","T",#20302)
-typedecl(#20302,#20300)
+enclosing_stmt(#20302,#20297)
+expr_containers(#20302,#20266)
 #20303=*
-typeexprs(#20303,27,#20296,1,"{ +read ...  T[P] }")
-#20304=@"loc,{#10000},3,29,3,64"
-locations_default(#20304,#10000,3,29,3,64)
-hasLocation(#20303,#20304)
-enclosing_stmt(#20303,#20296)
-expr_containers(#20303,#20265)
-#20305=*
-scopes(#20305,13)
-scopenodes(#20303,#20305)
-scopenesting(#20305,#20299)
-#20306=@"local_type_name;{P};{#20305}"
-local_type_names(#20306,"P",#20305)
-#20307=*
-typeexprs(#20307,22,#20303,0,"P in keyof T")
-#20308=@"loc,{#10000},3,42,3,53"
-locations_default(#20308,#10000,3,42,3,53)
-hasLocation(#20307,#20308)
-enclosing_stmt(#20307,#20296)
-expr_containers(#20307,#20265)
-#20309=*
-typeexprs(#20309,1,#20307,0,"P")
-hasLocation(#20309,#20109)
-enclosing_stmt(#20309,#20296)
-expr_containers(#20309,#20265)
-literals("P","P",#20309)
-typedecl(#20309,#20306)
+typeexprs(#20303,1,#20302,0,"T")
+hasLocation(#20303,#20095)
+enclosing_stmt(#20303,#20297)
+expr_containers(#20303,#20266)
+literals("T","T",#20303)
+typedecl(#20303,#20301)
+#20304=*
+typeexprs(#20304,27,#20297,1,"{ +read ...  T[P] }")
+#20305=@"loc,{#10000},3,29,3,64"
+locations_default(#20305,#10000,3,29,3,64)
+hasLocation(#20304,#20305)
+enclosing_stmt(#20304,#20297)
+expr_containers(#20304,#20266)
+#20306=*
+scopes(#20306,13)
+scopenodes(#20304,#20306)
+scopenesting(#20306,#20300)
+#20307=@"local_type_name;{P};{#20306}"
+local_type_names(#20307,"P",#20306)
+#20308=*
+typeexprs(#20308,22,#20304,0,"P in keyof T")
+#20309=@"loc,{#10000},3,42,3,53"
+locations_default(#20309,#10000,3,42,3,53)
+hasLocation(#20308,#20309)
+enclosing_stmt(#20308,#20297)
+expr_containers(#20308,#20266)
 #20310=*
-typeexprs(#20310,12,#20307,1,"keyof T")
-#20311=@"loc,{#10000},3,47,3,53"
-locations_default(#20311,#10000,3,47,3,53)
-hasLocation(#20310,#20311)
-enclosing_stmt(#20310,#20296)
-expr_containers(#20310,#20265)
-#20312=*
-typeexprs(#20312,0,#20310,0,"T")
-hasLocation(#20312,#20115)
-enclosing_stmt(#20312,#20296)
-expr_containers(#20312,#20265)
-literals("T","T",#20312)
-typebind(#20312,#20300)
+typeexprs(#20310,1,#20308,0,"P")
+hasLocation(#20310,#20109)
+enclosing_stmt(#20310,#20297)
+expr_containers(#20310,#20266)
+literals("P","P",#20310)
+typedecl(#20310,#20307)
+#20311=*
+typeexprs(#20311,12,#20308,1,"keyof T")
+#20312=@"loc,{#10000},3,47,3,53"
+locations_default(#20312,#10000,3,47,3,53)
+hasLocation(#20311,#20312)
+enclosing_stmt(#20311,#20297)
+expr_containers(#20311,#20266)
 #20313=*
-typeexprs(#20313,8,#20303,1,"T[P]")
-#20314=@"loc,{#10000},3,59,3,62"
-locations_default(#20314,#10000,3,59,3,62)
-hasLocation(#20313,#20314)
-enclosing_stmt(#20313,#20296)
-expr_containers(#20313,#20265)
-#20315=*
-typeexprs(#20315,0,#20313,0,"T")
-hasLocation(#20315,#20125)
-enclosing_stmt(#20315,#20296)
-expr_containers(#20315,#20265)
-literals("T","T",#20315)
-typebind(#20315,#20300)
+typeexprs(#20313,0,#20311,0,"T")
+hasLocation(#20313,#20115)
+enclosing_stmt(#20313,#20297)
+expr_containers(#20313,#20266)
+literals("T","T",#20313)
+typebind(#20313,#20301)
+#20314=*
+typeexprs(#20314,8,#20304,1,"T[P]")
+#20315=@"loc,{#10000},3,59,3,62"
+locations_default(#20315,#10000,3,59,3,62)
+hasLocation(#20314,#20315)
+enclosing_stmt(#20314,#20297)
+expr_containers(#20314,#20266)
 #20316=*
-typeexprs(#20316,0,#20313,1,"P")
-hasLocation(#20316,#20129)
-enclosing_stmt(#20316,#20296)
-expr_containers(#20316,#20265)
-literals("P","P",#20316)
-typebind(#20316,#20306)
+typeexprs(#20316,0,#20314,0,"T")
+hasLocation(#20316,#20125)
+enclosing_stmt(#20316,#20297)
+expr_containers(#20316,#20266)
+literals("T","T",#20316)
+typebind(#20316,#20301)
 #20317=*
-stmts(#20317,35,#20265,2,"type Re ... T[P] };")
-#20318=@"loc,{#10000},5,3,5,64"
-locations_default(#20318,#10000,5,3,5,64)
-hasLocation(#20317,#20318)
-stmt_containers(#20317,#20265)
-#20319=*
-typeexprs(#20319,1,#20317,0,"ReadonlyPartial2")
-hasLocation(#20319,#20139)
-enclosing_stmt(#20319,#20317)
-expr_containers(#20319,#20265)
-literals("ReadonlyPartial2","ReadonlyPartial2",#20319)
-typedecl(#20319,#20271)
+typeexprs(#20317,0,#20314,1,"P")
+hasLocation(#20317,#20129)
+enclosing_stmt(#20317,#20297)
+expr_containers(#20317,#20266)
+literals("P","P",#20317)
+typebind(#20317,#20307)
+#20318=*
+stmts(#20318,35,#20266,2,"type Re ... T[P] };")
+#20319=@"loc,{#10000},5,3,5,64"
+locations_default(#20319,#10000,5,3,5,64)
+hasLocation(#20318,#20319)
+stmt_containers(#20318,#20266)
 #20320=*
-scopes(#20320,12)
-scopenodes(#20317,#20320)
-scopenesting(#20320,#20268)
-#20321=@"local_type_name;{T};{#20320}"
-local_type_names(#20321,"T",#20320)
-#20322=*
-typeexprs(#20322,22,#20317,2,"T")
-hasLocation(#20322,#20143)
-enclosing_stmt(#20322,#20317)
-expr_containers(#20322,#20265)
+typeexprs(#20320,1,#20318,0,"ReadonlyPartial2")
+hasLocation(#20320,#20139)
+enclosing_stmt(#20320,#20318)
+expr_containers(#20320,#20266)
+literals("ReadonlyPartial2","ReadonlyPartial2",#20320)
+typedecl(#20320,#20272)
+#20321=*
+scopes(#20321,12)
+scopenodes(#20318,#20321)
+scopenesting(#20321,#20269)
+#20322=@"local_type_name;{T};{#20321}"
+local_type_names(#20322,"T",#20321)
 #20323=*
-typeexprs(#20323,1,#20322,0,"T")
+typeexprs(#20323,22,#20318,2,"T")
 hasLocation(#20323,#20143)
-enclosing_stmt(#20323,#20317)
-expr_containers(#20323,#20265)
-literals("T","T",#20323)
-typedecl(#20323,#20321)
+enclosing_stmt(#20323,#20318)
+expr_containers(#20323,#20266)
 #20324=*
-typeexprs(#20324,27,#20317,1,"{ reado ...  T[P] }")
-#20325=@"loc,{#10000},5,30,5,63"
-locations_default(#20325,#10000,5,30,5,63)
-hasLocation(#20324,#20325)
-enclosing_stmt(#20324,#20317)
-expr_containers(#20324,#20265)
-#20326=*
-scopes(#20326,13)
-scopenodes(#20324,#20326)
-scopenesting(#20326,#20320)
-#20327=@"local_type_name;{P};{#20326}"
-local_type_names(#20327,"P",#20326)
-#20328=*
-typeexprs(#20328,22,#20324,0,"P in keyof T")
-#20329=@"loc,{#10000},5,42,5,53"
-locations_default(#20329,#10000,5,42,5,53)
-hasLocation(#20328,#20329)
-enclosing_stmt(#20328,#20317)
-expr_containers(#20328,#20265)
-#20330=*
-typeexprs(#20330,1,#20328,0,"P")
-hasLocation(#20330,#20155)
-enclosing_stmt(#20330,#20317)
-expr_containers(#20330,#20265)
-literals("P","P",#20330)
-typedecl(#20330,#20327)
+typeexprs(#20324,1,#20323,0,"T")
+hasLocation(#20324,#20143)
+enclosing_stmt(#20324,#20318)
+expr_containers(#20324,#20266)
+literals("T","T",#20324)
+typedecl(#20324,#20322)
+#20325=*
+typeexprs(#20325,27,#20318,1,"{ reado ...  T[P] }")
+#20326=@"loc,{#10000},5,30,5,63"
+locations_default(#20326,#10000,5,30,5,63)
+hasLocation(#20325,#20326)
+enclosing_stmt(#20325,#20318)
+expr_containers(#20325,#20266)
+#20327=*
+scopes(#20327,13)
+scopenodes(#20325,#20327)
+scopenesting(#20327,#20321)
+#20328=@"local_type_name;{P};{#20327}"
+local_type_names(#20328,"P",#20327)
+#20329=*
+typeexprs(#20329,22,#20325,0,"P in keyof T")
+#20330=@"loc,{#10000},5,42,5,53"
+locations_default(#20330,#10000,5,42,5,53)
+hasLocation(#20329,#20330)
+enclosing_stmt(#20329,#20318)
+expr_containers(#20329,#20266)
 #20331=*
-typeexprs(#20331,12,#20328,1,"keyof T")
-#20332=@"loc,{#10000},5,47,5,53"
-locations_default(#20332,#10000,5,47,5,53)
-hasLocation(#20331,#20332)
-enclosing_stmt(#20331,#20317)
-expr_containers(#20331,#20265)
-#20333=*
-typeexprs(#20333,0,#20331,0,"T")
-hasLocation(#20333,#20161)
-enclosing_stmt(#20333,#20317)
-expr_containers(#20333,#20265)
-literals("T","T",#20333)
-typebind(#20333,#20321)
+typeexprs(#20331,1,#20329,0,"P")
+hasLocation(#20331,#20155)
+enclosing_stmt(#20331,#20318)
+expr_containers(#20331,#20266)
+literals("P","P",#20331)
+typedecl(#20331,#20328)
+#20332=*
+typeexprs(#20332,12,#20329,1,"keyof T")
+#20333=@"loc,{#10000},5,47,5,53"
+locations_default(#20333,#10000,5,47,5,53)
+hasLocation(#20332,#20333)
+enclosing_stmt(#20332,#20318)
+expr_containers(#20332,#20266)
 #20334=*
-typeexprs(#20334,8,#20324,1,"T[P]")
-#20335=@"loc,{#10000},5,58,5,61"
-locations_default(#20335,#10000,5,58,5,61)
-hasLocation(#20334,#20335)
-enclosing_stmt(#20334,#20317)
-expr_containers(#20334,#20265)
-#20336=*
-typeexprs(#20336,0,#20334,0,"T")
-hasLocation(#20336,#20169)
-enclosing_stmt(#20336,#20317)
-expr_containers(#20336,#20265)
-literals("T","T",#20336)
-typebind(#20336,#20321)
+typeexprs(#20334,0,#20332,0,"T")
+hasLocation(#20334,#20161)
+enclosing_stmt(#20334,#20318)
+expr_containers(#20334,#20266)
+literals("T","T",#20334)
+typebind(#20334,#20322)
+#20335=*
+typeexprs(#20335,8,#20325,1,"T[P]")
+#20336=@"loc,{#10000},5,58,5,61"
+locations_default(#20336,#10000,5,58,5,61)
+hasLocation(#20335,#20336)
+enclosing_stmt(#20335,#20318)
+expr_containers(#20335,#20266)
 #20337=*
-typeexprs(#20337,0,#20334,1,"P")
-hasLocation(#20337,#20173)
-enclosing_stmt(#20337,#20317)
-expr_containers(#20337,#20265)
-literals("P","P",#20337)
-typebind(#20337,#20327)
+typeexprs(#20337,0,#20335,0,"T")
+hasLocation(#20337,#20169)
+enclosing_stmt(#20337,#20318)
+expr_containers(#20337,#20266)
+literals("T","T",#20337)
+typebind(#20337,#20322)
 #20338=*
-stmts(#20338,35,#20265,3,"type Re ... T[P] };")
-#20339=@"loc,{#10000},7,3,7,48"
-locations_default(#20339,#10000,7,3,7,48)
-hasLocation(#20338,#20339)
-stmt_containers(#20338,#20265)
-#20340=*
-typeexprs(#20340,1,#20338,0,"Required")
-hasLocation(#20340,#20183)
-enclosing_stmt(#20340,#20338)
-expr_containers(#20340,#20265)
-literals("Required","Required",#20340)
-typedecl(#20340,#20272)
+typeexprs(#20338,0,#20335,1,"P")
+hasLocation(#20338,#20173)
+enclosing_stmt(#20338,#20318)
+expr_containers(#20338,#20266)
+literals("P","P",#20338)
+typebind(#20338,#20328)
+#20339=*
+stmts(#20339,35,#20266,3,"type Re ... T[P] };")
+#20340=@"loc,{#10000},7,3,7,48"
+locations_default(#20340,#10000,7,3,7,48)
+hasLocation(#20339,#20340)
+stmt_containers(#20339,#20266)
 #20341=*
-scopes(#20341,12)
-scopenodes(#20338,#20341)
-scopenesting(#20341,#20268)
-#20342=@"local_type_name;{T};{#20341}"
-local_type_names(#20342,"T",#20341)
-#20343=*
-typeexprs(#20343,22,#20338,2,"T")
-hasLocation(#20343,#20187)
-enclosing_stmt(#20343,#20338)
-expr_containers(#20343,#20265)
+typeexprs(#20341,1,#20339,0,"Required")
+hasLocation(#20341,#20183)
+enclosing_stmt(#20341,#20339)
+expr_containers(#20341,#20266)
+literals("Required","Required",#20341)
+typedecl(#20341,#20273)
+#20342=*
+scopes(#20342,12)
+scopenodes(#20339,#20342)
+scopenesting(#20342,#20269)
+#20343=@"local_type_name;{T};{#20342}"
+local_type_names(#20343,"T",#20342)
 #20344=*
-typeexprs(#20344,1,#20343,0,"T")
+typeexprs(#20344,22,#20339,2,"T")
 hasLocation(#20344,#20187)
-enclosing_stmt(#20344,#20338)
-expr_containers(#20344,#20265)
-literals("T","T",#20344)
-typedecl(#20344,#20342)
+enclosing_stmt(#20344,#20339)
+expr_containers(#20344,#20266)
 #20345=*
-typeexprs(#20345,27,#20338,1,"{ [P in ...  T[P] }")
-#20346=@"loc,{#10000},7,22,7,47"
-locations_default(#20346,#10000,7,22,7,47)
-hasLocation(#20345,#20346)
-enclosing_stmt(#20345,#20338)
-expr_containers(#20345,#20265)
-#20347=*
-scopes(#20347,13)
-scopenodes(#20345,#20347)
-scopenesting(#20347,#20341)
-#20348=@"local_type_name;{P};{#20347}"
-local_type_names(#20348,"P",#20347)
-#20349=*
-typeexprs(#20349,22,#20345,0,"P in keyof T")
-#20350=@"loc,{#10000},7,25,7,36"
-locations_default(#20350,#10000,7,25,7,36)
-hasLocation(#20349,#20350)
-enclosing_stmt(#20349,#20338)
-expr_containers(#20349,#20265)
-#20351=*
-typeexprs(#20351,1,#20349,0,"P")
-hasLocation(#20351,#20197)
-enclosing_stmt(#20351,#20338)
-expr_containers(#20351,#20265)
-literals("P","P",#20351)
-typedecl(#20351,#20348)
+typeexprs(#20345,1,#20344,0,"T")
+hasLocation(#20345,#20187)
+enclosing_stmt(#20345,#20339)
+expr_containers(#20345,#20266)
+literals("T","T",#20345)
+typedecl(#20345,#20343)
+#20346=*
+typeexprs(#20346,27,#20339,1,"{ [P in ...  T[P] }")
+#20347=@"loc,{#10000},7,22,7,47"
+locations_default(#20347,#10000,7,22,7,47)
+hasLocation(#20346,#20347)
+enclosing_stmt(#20346,#20339)
+expr_containers(#20346,#20266)
+#20348=*
+scopes(#20348,13)
+scopenodes(#20346,#20348)
+scopenesting(#20348,#20342)
+#20349=@"local_type_name;{P};{#20348}"
+local_type_names(#20349,"P",#20348)
+#20350=*
+typeexprs(#20350,22,#20346,0,"P in keyof T")
+#20351=@"loc,{#10000},7,25,7,36"
+locations_default(#20351,#10000,7,25,7,36)
+hasLocation(#20350,#20351)
+enclosing_stmt(#20350,#20339)
+expr_containers(#20350,#20266)
 #20352=*
-typeexprs(#20352,12,#20349,1,"keyof T")
-#20353=@"loc,{#10000},7,30,7,36"
-locations_default(#20353,#10000,7,30,7,36)
-hasLocation(#20352,#20353)
-enclosing_stmt(#20352,#20338)
-expr_containers(#20352,#20265)
-#20354=*
-typeexprs(#20354,0,#20352,0,"T")
-hasLocation(#20354,#20203)
-enclosing_stmt(#20354,#20338)
-expr_containers(#20354,#20265)
-literals("T","T",#20354)
-typebind(#20354,#20342)
+typeexprs(#20352,1,#20350,0,"P")
+hasLocation(#20352,#20197)
+enclosing_stmt(#20352,#20339)
+expr_containers(#20352,#20266)
+literals("P","P",#20352)
+typedecl(#20352,#20349)
+#20353=*
+typeexprs(#20353,12,#20350,1,"keyof T")
+#20354=@"loc,{#10000},7,30,7,36"
+locations_default(#20354,#10000,7,30,7,36)
+hasLocation(#20353,#20354)
+enclosing_stmt(#20353,#20339)
+expr_containers(#20353,#20266)
 #20355=*
-typeexprs(#20355,8,#20345,1,"T[P]")
-#20356=@"loc,{#10000},7,42,7,45"
-locations_default(#20356,#10000,7,42,7,45)
-hasLocation(#20355,#20356)
-enclosing_stmt(#20355,#20338)
-expr_containers(#20355,#20265)
-#20357=*
-typeexprs(#20357,0,#20355,0,"T")
-hasLocation(#20357,#20213)
-enclosing_stmt(#20357,#20338)
-expr_containers(#20357,#20265)
-literals("T","T",#20357)
-typebind(#20357,#20342)
+typeexprs(#20355,0,#20353,0,"T")
+hasLocation(#20355,#20203)
+enclosing_stmt(#20355,#20339)
+expr_containers(#20355,#20266)
+literals("T","T",#20355)
+typebind(#20355,#20343)
+#20356=*
+typeexprs(#20356,8,#20346,1,"T[P]")
+#20357=@"loc,{#10000},7,42,7,45"
+locations_default(#20357,#10000,7,42,7,45)
+hasLocation(#20356,#20357)
+enclosing_stmt(#20356,#20339)
+expr_containers(#20356,#20266)
 #20358=*
-typeexprs(#20358,0,#20355,1,"P")
-hasLocation(#20358,#20217)
-enclosing_stmt(#20358,#20338)
-expr_containers(#20358,#20265)
-literals("P","P",#20358)
-typebind(#20358,#20348)
+typeexprs(#20358,0,#20356,0,"T")
+hasLocation(#20358,#20213)
+enclosing_stmt(#20358,#20339)
+expr_containers(#20358,#20266)
+literals("T","T",#20358)
+typebind(#20358,#20343)
 #20359=*
-stmts(#20359,35,#20265,4,"type Fo ... ring };")
-#20360=@"loc,{#10000},9,3,9,28"
-locations_default(#20360,#10000,9,3,9,28)
-hasLocation(#20359,#20360)
-stmt_containers(#20359,#20265)
-#20361=*
-typeexprs(#20361,1,#20359,0,"Foo")
-hasLocation(#20361,#20227)
-enclosing_stmt(#20361,#20359)
-expr_containers(#20361,#20265)
-literals("Foo","Foo",#20361)
-typedecl(#20361,#20273)
+typeexprs(#20359,0,#20356,1,"P")
+hasLocation(#20359,#20217)
+enclosing_stmt(#20359,#20339)
+expr_containers(#20359,#20266)
+literals("P","P",#20359)
+typebind(#20359,#20349)
+#20360=*
+stmts(#20360,35,#20266,4,"type Fo ... ring };")
+#20361=@"loc,{#10000},9,3,9,28"
+locations_default(#20361,#10000,9,3,9,28)
+hasLocation(#20360,#20361)
+stmt_containers(#20360,#20266)
 #20362=*
-typeexprs(#20362,21,#20359,1,"{ a?: string }")
-#20363=@"loc,{#10000},9,14,9,27"
-locations_default(#20363,#10000,9,14,9,27)
-hasLocation(#20362,#20363)
-enclosing_stmt(#20362,#20359)
-expr_containers(#20362,#20265)
-#20364=*
-properties(#20364,#20362,0,8,"a?: string")
-#20365=@"loc,{#10000},9,16,9,25"
-locations_default(#20365,#10000,9,16,9,25)
-hasLocation(#20364,#20365)
-#20366=*
-exprs(#20366,0,#20364,0,"a")
-hasLocation(#20366,#20233)
-enclosing_stmt(#20366,#20359)
-expr_containers(#20366,#20265)
-literals("a","a",#20366)
-is_abstract_member(#20364)
-is_optional_member(#20364)
+typeexprs(#20362,1,#20360,0,"Foo")
+hasLocation(#20362,#20227)
+enclosing_stmt(#20362,#20360)
+expr_containers(#20362,#20266)
+literals("Foo","Foo",#20362)
+typedecl(#20362,#20274)
+#20363=*
+typeexprs(#20363,21,#20360,1,"{ a?: string }")
+#20364=@"loc,{#10000},9,14,9,27"
+locations_default(#20364,#10000,9,14,9,27)
+hasLocation(#20363,#20364)
+enclosing_stmt(#20363,#20360)
+expr_containers(#20363,#20266)
+#20365=*
+properties(#20365,#20363,0,8,"a?: string")
+#20366=@"loc,{#10000},9,16,9,25"
+locations_default(#20366,#10000,9,16,9,25)
+hasLocation(#20365,#20366)
 #20367=*
-typeexprs(#20367,2,#20364,2,"string")
-hasLocation(#20367,#20239)
-enclosing_stmt(#20367,#20359)
-expr_containers(#20367,#20265)
-literals("string","string",#20367)
+exprs(#20367,0,#20365,0,"a")
+hasLocation(#20367,#20233)
+enclosing_stmt(#20367,#20360)
+expr_containers(#20367,#20266)
+literals("a","a",#20367)
+is_abstract_member(#20365)
+is_optional_member(#20365)
 #20368=*
-stmts(#20368,35,#20265,5,"type Ba ... d<Foo>;")
-#20369=@"loc,{#10000},10,3,10,27"
-locations_default(#20369,#10000,10,3,10,27)
-hasLocation(#20368,#20369)
-stmt_containers(#20368,#20265)
-#20370=*
-typeexprs(#20370,1,#20368,0,"Bar")
-hasLocation(#20370,#20247)
-enclosing_stmt(#20370,#20368)
-expr_containers(#20370,#20265)
-literals("Bar","Bar",#20370)
-typedecl(#20370,#20274)
+typeexprs(#20368,2,#20365,2,"string")
+hasLocation(#20368,#20239)
+enclosing_stmt(#20368,#20360)
+expr_containers(#20368,#20266)
+literals("string","string",#20368)
+#20369=*
+stmts(#20369,35,#20266,5,"type Ba ... d<Foo>;")
+#20370=@"loc,{#10000},10,3,10,27"
+locations_default(#20370,#10000,10,3,10,27)
+hasLocation(#20369,#20370)
+stmt_containers(#20369,#20266)
 #20371=*
-typeexprs(#20371,14,#20368,1,"Required<Foo>")
-#20372=@"loc,{#10000},10,14,10,26"
-locations_default(#20372,#10000,10,14,10,26)
-hasLocation(#20371,#20372)
-enclosing_stmt(#20371,#20368)
-expr_containers(#20371,#20265)
-#20373=*
-typeexprs(#20373,0,#20371,-1,"Required")
-hasLocation(#20373,#20251)
-enclosing_stmt(#20373,#20368)
-expr_containers(#20373,#20265)
-literals("Required","Required",#20373)
-typebind(#20373,#20272)
+typeexprs(#20371,1,#20369,0,"Bar")
+hasLocation(#20371,#20247)
+enclosing_stmt(#20371,#20369)
+expr_containers(#20371,#20266)
+literals("Bar","Bar",#20371)
+typedecl(#20371,#20275)
+#20372=*
+typeexprs(#20372,14,#20369,1,"Required<Foo>")
+#20373=@"loc,{#10000},10,14,10,26"
+locations_default(#20373,#10000,10,14,10,26)
+hasLocation(#20372,#20373)
+enclosing_stmt(#20372,#20369)
+expr_containers(#20372,#20266)
 #20374=*
-typeexprs(#20374,0,#20371,0,"Foo")
-hasLocation(#20374,#20255)
-enclosing_stmt(#20374,#20368)
-expr_containers(#20374,#20265)
-literals("Foo","Foo",#20374)
+typeexprs(#20374,0,#20372,-1,"Required")
+hasLocation(#20374,#20251)
+enclosing_stmt(#20374,#20369)
+expr_containers(#20374,#20266)
+literals("Required","Required",#20374)
 typebind(#20374,#20273)
 #20375=*
-entry_cfg_node(#20375,#20001)
-#20376=@"loc,{#10000},1,1,1,0"
-locations_default(#20376,#10000,1,1,1,0)
-hasLocation(#20375,#20376)
-#20377=*
-exit_cfg_node(#20377,#20001)
-hasLocation(#20377,#20262)
-successor(#20267,#20265)
-successor(#20368,#20377)
-successor(#20359,#20368)
-successor(#20338,#20359)
-successor(#20317,#20338)
-successor(#20296,#20317)
-successor(#20275,#20296)
-successor(#20265,#20275)
-successor(#20375,#20267)
+typeexprs(#20375,0,#20372,0,"Foo")
+hasLocation(#20375,#20255)
+enclosing_stmt(#20375,#20369)
+expr_containers(#20375,#20266)
+literals("Foo","Foo",#20375)
+typebind(#20375,#20274)
+#20376=*
+entry_cfg_node(#20376,#20001)
+#20377=@"loc,{#10000},1,1,1,0"
+locations_default(#20377,#10000,1,1,1,0)
+hasLocation(#20376,#20377)
+#20378=*
+exit_cfg_node(#20378,#20001)
+hasLocation(#20378,#20262)
+successor(#20268,#20266)
+successor(#20369,#20378)
+successor(#20360,#20369)
+successor(#20339,#20360)
+successor(#20318,#20339)
+successor(#20297,#20318)
+successor(#20276,#20297)
+successor(#20266,#20276)
+successor(#20376,#20268)
 numlines(#10000,11,8,5)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/namespaces.ts.trap b/javascript/extractor/tests/ts/output/trap/namespaces.ts.trap
index 5d9345a82be..eb592755f68 100644
--- a/javascript/extractor/tests/ts/output/trap/namespaces.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/namespaces.ts.trap
@@ -195,160 +195,162 @@ local_namespace_names(#20070,"x",#20000)
 variables(#20067,"x",#20000)
 local_type_names(#20068,"x",#20000)
 local_namespace_names(#20070,"x",#20000)
-#20071=*
-stmts(#20071,31,#20001,0,"namespa ... ;\n  }\n}")
-#20072=@"loc,{#10000},1,1,5,1"
-locations_default(#20072,#10000,1,1,5,1)
-hasLocation(#20071,#20072)
-stmt_containers(#20071,#20001)
-#20073=*
-exprs(#20073,78,#20071,-1,"M")
-hasLocation(#20073,#20019)
-enclosing_stmt(#20073,#20071)
-expr_containers(#20073,#20001)
-literals("M","M",#20073)
-decl(#20073,#20066)
-namespacedecl(#20073,#20069)
+#20071=@"var;{this};{#20000}"
+variables(#20071,"this",#20000)
+#20072=*
+stmts(#20072,31,#20001,0,"namespa ... ;\n  }\n}")
+#20073=@"loc,{#10000},1,1,5,1"
+locations_default(#20073,#10000,1,1,5,1)
+hasLocation(#20072,#20073)
+stmt_containers(#20072,#20001)
 #20074=*
-scopes(#20074,9)
-scopenodes(#20071,#20074)
-scopenesting(#20074,#20000)
-#20075=@"var;{N};{#20074}"
-variables(#20075,"N",#20074)
-#20076=@"local_namespace_name;{N};{#20074}"
-local_namespace_names(#20076,"N",#20074)
-#20077=*
-stmts(#20077,30,#20071,0,"export  ... 42;\n  }")
-#20078=@"loc,{#10000},2,3,4,3"
-locations_default(#20078,#10000,2,3,4,3)
-hasLocation(#20077,#20078)
-stmt_containers(#20077,#20071)
-#20079=*
-stmts(#20079,31,#20077,-1,"namespa ... 42;\n  }")
-#20080=@"loc,{#10000},2,10,4,3"
-locations_default(#20080,#10000,2,10,4,3)
-hasLocation(#20079,#20080)
-stmt_containers(#20079,#20071)
-#20081=*
-exprs(#20081,78,#20079,-1,"N")
-hasLocation(#20081,#20027)
-enclosing_stmt(#20081,#20079)
-expr_containers(#20081,#20071)
-literals("N","N",#20081)
-decl(#20081,#20075)
-namespacedecl(#20081,#20076)
+exprs(#20074,78,#20072,-1,"M")
+hasLocation(#20074,#20019)
+enclosing_stmt(#20074,#20072)
+expr_containers(#20074,#20001)
+literals("M","M",#20074)
+decl(#20074,#20066)
+namespacedecl(#20074,#20069)
+#20075=*
+scopes(#20075,9)
+scopenodes(#20072,#20075)
+scopenesting(#20075,#20000)
+#20076=@"var;{N};{#20075}"
+variables(#20076,"N",#20075)
+#20077=@"local_namespace_name;{N};{#20075}"
+local_namespace_names(#20077,"N",#20075)
+#20078=*
+stmts(#20078,30,#20072,0,"export  ... 42;\n  }")
+#20079=@"loc,{#10000},2,3,4,3"
+locations_default(#20079,#10000,2,3,4,3)
+hasLocation(#20078,#20079)
+stmt_containers(#20078,#20072)
+#20080=*
+stmts(#20080,31,#20078,-1,"namespa ... 42;\n  }")
+#20081=@"loc,{#10000},2,10,4,3"
+locations_default(#20081,#10000,2,10,4,3)
+hasLocation(#20080,#20081)
+stmt_containers(#20080,#20072)
 #20082=*
-scopes(#20082,9)
-scopenodes(#20079,#20082)
-scopenesting(#20082,#20074)
-#20083=@"var;{x};{#20082}"
-variables(#20083,"x",#20082)
-#20084=*
-stmts(#20084,30,#20079,0,"export let x = 42;")
-#20085=@"loc,{#10000},3,5,3,22"
-locations_default(#20085,#10000,3,5,3,22)
-hasLocation(#20084,#20085)
-stmt_containers(#20084,#20079)
-#20086=*
-stmts(#20086,23,#20084,-1,"let x = 42;")
-#20087=@"loc,{#10000},3,12,3,22"
-locations_default(#20087,#10000,3,12,3,22)
-hasLocation(#20086,#20087)
-stmt_containers(#20086,#20079)
-#20088=*
-exprs(#20088,64,#20086,0,"x = 42")
-#20089=@"loc,{#10000},3,16,3,21"
-locations_default(#20089,#10000,3,16,3,21)
-hasLocation(#20088,#20089)
-enclosing_stmt(#20088,#20086)
-expr_containers(#20088,#20079)
-#20090=*
-exprs(#20090,78,#20088,0,"x")
-hasLocation(#20090,#20035)
-enclosing_stmt(#20090,#20086)
-expr_containers(#20090,#20079)
-literals("x","x",#20090)
-decl(#20090,#20083)
+exprs(#20082,78,#20080,-1,"N")
+hasLocation(#20082,#20027)
+enclosing_stmt(#20082,#20080)
+expr_containers(#20082,#20072)
+literals("N","N",#20082)
+decl(#20082,#20076)
+namespacedecl(#20082,#20077)
+#20083=*
+scopes(#20083,9)
+scopenodes(#20080,#20083)
+scopenesting(#20083,#20075)
+#20084=@"var;{x};{#20083}"
+variables(#20084,"x",#20083)
+#20085=*
+stmts(#20085,30,#20080,0,"export let x = 42;")
+#20086=@"loc,{#10000},3,5,3,22"
+locations_default(#20086,#10000,3,5,3,22)
+hasLocation(#20085,#20086)
+stmt_containers(#20085,#20080)
+#20087=*
+stmts(#20087,23,#20085,-1,"let x = 42;")
+#20088=@"loc,{#10000},3,12,3,22"
+locations_default(#20088,#10000,3,12,3,22)
+hasLocation(#20087,#20088)
+stmt_containers(#20087,#20080)
+#20089=*
+exprs(#20089,64,#20087,0,"x = 42")
+#20090=@"loc,{#10000},3,16,3,21"
+locations_default(#20090,#10000,3,16,3,21)
+hasLocation(#20089,#20090)
+enclosing_stmt(#20089,#20087)
+expr_containers(#20089,#20080)
 #20091=*
-exprs(#20091,3,#20088,1,"42")
-hasLocation(#20091,#20039)
-enclosing_stmt(#20091,#20086)
-expr_containers(#20091,#20079)
-literals("42","42",#20091)
-is_instantiated(#20079)
-is_instantiated(#20071)
+exprs(#20091,78,#20089,0,"x")
+hasLocation(#20091,#20035)
+enclosing_stmt(#20091,#20087)
+expr_containers(#20091,#20080)
+literals("x","x",#20091)
+decl(#20091,#20084)
 #20092=*
-stmts(#20092,32,#20001,1,"import x = M.N.x;")
-hasLocation(#20092,#20015)
-stmt_containers(#20092,#20001)
+exprs(#20092,3,#20089,1,"42")
+hasLocation(#20092,#20039)
+enclosing_stmt(#20092,#20087)
+expr_containers(#20092,#20080)
+literals("42","42",#20092)
+is_instantiated(#20080)
+is_instantiated(#20072)
 #20093=*
-exprs(#20093,78,#20092,0,"x")
-hasLocation(#20093,#20048)
-enclosing_stmt(#20093,#20092)
-expr_containers(#20093,#20001)
-literals("x","x",#20093)
-decl(#20093,#20067)
-typedecl(#20093,#20068)
-namespacedecl(#20093,#20070)
+stmts(#20093,32,#20001,1,"import x = M.N.x;")
+hasLocation(#20093,#20015)
+stmt_containers(#20093,#20001)
 #20094=*
-exprs(#20094,14,#20092,1,"M.N.x")
-#20095=@"loc,{#10000},7,12,7,16"
-locations_default(#20095,#10000,7,12,7,16)
-hasLocation(#20094,#20095)
-enclosing_stmt(#20094,#20092)
+exprs(#20094,78,#20093,0,"x")
+hasLocation(#20094,#20048)
+enclosing_stmt(#20094,#20093)
 expr_containers(#20094,#20001)
-#20096=*
-exprs(#20096,14,#20094,0,"M.N")
-#20097=@"loc,{#10000},7,12,7,14"
-locations_default(#20097,#10000,7,12,7,14)
-hasLocation(#20096,#20097)
-enclosing_stmt(#20096,#20092)
-expr_containers(#20096,#20001)
-#20098=*
-exprs(#20098,103,#20096,0,"M")
-hasLocation(#20098,#20052)
-enclosing_stmt(#20098,#20092)
-expr_containers(#20098,#20001)
-literals("M","M",#20098)
-namespacebind(#20098,#20069)
-bind(#20098,#20066)
+literals("x","x",#20094)
+decl(#20094,#20067)
+typedecl(#20094,#20068)
+namespacedecl(#20094,#20070)
+#20095=*
+exprs(#20095,14,#20093,1,"M.N.x")
+#20096=@"loc,{#10000},7,12,7,16"
+locations_default(#20096,#10000,7,12,7,16)
+hasLocation(#20095,#20096)
+enclosing_stmt(#20095,#20093)
+expr_containers(#20095,#20001)
+#20097=*
+exprs(#20097,14,#20095,0,"M.N")
+#20098=@"loc,{#10000},7,12,7,14"
+locations_default(#20098,#10000,7,12,7,14)
+hasLocation(#20097,#20098)
+enclosing_stmt(#20097,#20093)
+expr_containers(#20097,#20001)
 #20099=*
-exprs(#20099,0,#20096,1,"N")
-hasLocation(#20099,#20056)
-enclosing_stmt(#20099,#20092)
+exprs(#20099,103,#20097,0,"M")
+hasLocation(#20099,#20052)
+enclosing_stmt(#20099,#20093)
 expr_containers(#20099,#20001)
-literals("N","N",#20099)
+literals("M","M",#20099)
+namespacebind(#20099,#20069)
+bind(#20099,#20066)
 #20100=*
-exprs(#20100,0,#20094,1,"x")
-hasLocation(#20100,#20060)
-enclosing_stmt(#20100,#20092)
+exprs(#20100,0,#20097,1,"N")
+hasLocation(#20100,#20056)
+enclosing_stmt(#20100,#20093)
 expr_containers(#20100,#20001)
-literals("x","x",#20100)
+literals("N","N",#20100)
 #20101=*
-entry_cfg_node(#20101,#20001)
-#20102=@"loc,{#10000},1,1,1,0"
-locations_default(#20102,#10000,1,1,1,0)
-hasLocation(#20101,#20102)
-#20103=*
-exit_cfg_node(#20103,#20001)
-hasLocation(#20103,#20064)
-successor(#20100,#20094)
-successor(#20099,#20096)
-successor(#20098,#20099)
-successor(#20096,#20100)
-successor(#20094,#20092)
-successor(#20093,#20098)
-successor(#20092,#20103)
-successor(#20073,#20071)
-successor(#20077,#20081)
-successor(#20081,#20079)
-successor(#20084,#20086)
-successor(#20086,#20090)
-successor(#20091,#20088)
-successor(#20090,#20091)
-successor(#20088,#20093)
-successor(#20079,#20084)
-successor(#20071,#20077)
-successor(#20101,#20073)
+exprs(#20101,0,#20095,1,"x")
+hasLocation(#20101,#20060)
+enclosing_stmt(#20101,#20093)
+expr_containers(#20101,#20001)
+literals("x","x",#20101)
+#20102=*
+entry_cfg_node(#20102,#20001)
+#20103=@"loc,{#10000},1,1,1,0"
+locations_default(#20103,#10000,1,1,1,0)
+hasLocation(#20102,#20103)
+#20104=*
+exit_cfg_node(#20104,#20001)
+hasLocation(#20104,#20064)
+successor(#20101,#20095)
+successor(#20100,#20097)
+successor(#20099,#20100)
+successor(#20097,#20101)
+successor(#20095,#20093)
+successor(#20094,#20099)
+successor(#20093,#20104)
+successor(#20074,#20072)
+successor(#20078,#20082)
+successor(#20082,#20080)
+successor(#20085,#20087)
+successor(#20087,#20091)
+successor(#20092,#20089)
+successor(#20091,#20092)
+successor(#20089,#20094)
+successor(#20080,#20085)
+successor(#20072,#20078)
+successor(#20102,#20074)
 numlines(#10000,7,6,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/nestedNamespace.ts.trap b/javascript/extractor/tests/ts/output/trap/nestedNamespace.ts.trap
index 72f567e6ebb..eb03173a02d 100644
--- a/javascript/extractor/tests/ts/output/trap/nestedNamespace.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/nestedNamespace.ts.trap
@@ -226,246 +226,248 @@ hasLocation(#20001,#20081)
 local_namespace_names(#20082,"A",#20000)
 #20083=@"local_namespace_name;{X};{#20000}"
 local_namespace_names(#20083,"X",#20000)
-#20084=*
-stmts(#20084,31,#20001,0,"namespace A.B {}")
-hasLocation(#20084,#20003)
-stmt_containers(#20084,#20001)
+#20084=@"var;{this};{#20000}"
+variables(#20084,"this",#20000)
 #20085=*
-exprs(#20085,78,#20084,-1,"A")
-hasLocation(#20085,#20021)
-enclosing_stmt(#20085,#20084)
-expr_containers(#20085,#20001)
-literals("A","A",#20085)
-namespacedecl(#20085,#20082)
+stmts(#20085,31,#20001,0,"namespace A.B {}")
+hasLocation(#20085,#20003)
+stmt_containers(#20085,#20001)
 #20086=*
-scopes(#20086,9)
-scopenodes(#20084,#20086)
-scopenesting(#20086,#20000)
-#20087=@"local_namespace_name;{B};{#20086}"
-local_namespace_names(#20087,"B",#20086)
-#20088=*
-stmts(#20088,30,#20084,0,"B {}")
-#20089=@"loc,{#10000},1,13,1,16"
-locations_default(#20089,#10000,1,13,1,16)
-hasLocation(#20088,#20089)
-stmt_containers(#20088,#20084)
-#20090=*
-stmts(#20090,31,#20088,-1,"B {}")
-hasLocation(#20090,#20089)
-stmt_containers(#20090,#20084)
+exprs(#20086,78,#20085,-1,"A")
+hasLocation(#20086,#20021)
+enclosing_stmt(#20086,#20085)
+expr_containers(#20086,#20001)
+literals("A","A",#20086)
+namespacedecl(#20086,#20082)
+#20087=*
+scopes(#20087,9)
+scopenodes(#20085,#20087)
+scopenesting(#20087,#20000)
+#20088=@"local_namespace_name;{B};{#20087}"
+local_namespace_names(#20088,"B",#20087)
+#20089=*
+stmts(#20089,30,#20085,0,"B {}")
+#20090=@"loc,{#10000},1,13,1,16"
+locations_default(#20090,#10000,1,13,1,16)
+hasLocation(#20089,#20090)
+stmt_containers(#20089,#20085)
 #20091=*
-exprs(#20091,78,#20090,-1,"B")
-hasLocation(#20091,#20025)
-enclosing_stmt(#20091,#20090)
-expr_containers(#20091,#20084)
-literals("B","B",#20091)
-namespacedecl(#20091,#20087)
+stmts(#20091,31,#20089,-1,"B {}")
+hasLocation(#20091,#20090)
+stmt_containers(#20091,#20085)
 #20092=*
-scopes(#20092,9)
-scopenodes(#20090,#20092)
-scopenesting(#20092,#20086)
+exprs(#20092,78,#20091,-1,"B")
+hasLocation(#20092,#20025)
+enclosing_stmt(#20092,#20091)
+expr_containers(#20092,#20085)
+literals("B","B",#20092)
+namespacedecl(#20092,#20088)
 #20093=*
-stmts(#20093,31,#20001,1,"namespace A.B.C {}")
-hasLocation(#20093,#20005)
-stmt_containers(#20093,#20001)
+scopes(#20093,9)
+scopenodes(#20091,#20093)
+scopenesting(#20093,#20087)
 #20094=*
-exprs(#20094,78,#20093,-1,"A")
-hasLocation(#20094,#20033)
-enclosing_stmt(#20094,#20093)
-expr_containers(#20094,#20001)
-literals("A","A",#20094)
-namespacedecl(#20094,#20082)
+stmts(#20094,31,#20001,1,"namespace A.B.C {}")
+hasLocation(#20094,#20005)
+stmt_containers(#20094,#20001)
 #20095=*
-scopes(#20095,9)
-scopenodes(#20093,#20095)
-scopenesting(#20095,#20000)
-#20096=@"local_namespace_name;{B};{#20095}"
-local_namespace_names(#20096,"B",#20095)
-#20097=*
-stmts(#20097,30,#20093,0,"B.C {}")
-#20098=@"loc,{#10000},2,13,2,18"
-locations_default(#20098,#10000,2,13,2,18)
-hasLocation(#20097,#20098)
-stmt_containers(#20097,#20093)
-#20099=*
-stmts(#20099,31,#20097,-1,"B.C {}")
-hasLocation(#20099,#20098)
-stmt_containers(#20099,#20093)
+exprs(#20095,78,#20094,-1,"A")
+hasLocation(#20095,#20033)
+enclosing_stmt(#20095,#20094)
+expr_containers(#20095,#20001)
+literals("A","A",#20095)
+namespacedecl(#20095,#20082)
+#20096=*
+scopes(#20096,9)
+scopenodes(#20094,#20096)
+scopenesting(#20096,#20000)
+#20097=@"local_namespace_name;{B};{#20096}"
+local_namespace_names(#20097,"B",#20096)
+#20098=*
+stmts(#20098,30,#20094,0,"B.C {}")
+#20099=@"loc,{#10000},2,13,2,18"
+locations_default(#20099,#10000,2,13,2,18)
+hasLocation(#20098,#20099)
+stmt_containers(#20098,#20094)
 #20100=*
-exprs(#20100,78,#20099,-1,"B")
-hasLocation(#20100,#20037)
-enclosing_stmt(#20100,#20099)
-expr_containers(#20100,#20093)
-literals("B","B",#20100)
-namespacedecl(#20100,#20096)
+stmts(#20100,31,#20098,-1,"B.C {}")
+hasLocation(#20100,#20099)
+stmt_containers(#20100,#20094)
 #20101=*
-scopes(#20101,9)
-scopenodes(#20099,#20101)
-scopenesting(#20101,#20095)
-#20102=@"local_namespace_name;{C};{#20101}"
-local_namespace_names(#20102,"C",#20101)
-#20103=*
-stmts(#20103,30,#20099,0,"C {}")
-#20104=@"loc,{#10000},2,15,2,18"
-locations_default(#20104,#10000,2,15,2,18)
-hasLocation(#20103,#20104)
-stmt_containers(#20103,#20099)
-#20105=*
-stmts(#20105,31,#20103,-1,"C {}")
-hasLocation(#20105,#20104)
-stmt_containers(#20105,#20099)
+exprs(#20101,78,#20100,-1,"B")
+hasLocation(#20101,#20037)
+enclosing_stmt(#20101,#20100)
+expr_containers(#20101,#20094)
+literals("B","B",#20101)
+namespacedecl(#20101,#20097)
+#20102=*
+scopes(#20102,9)
+scopenodes(#20100,#20102)
+scopenesting(#20102,#20096)
+#20103=@"local_namespace_name;{C};{#20102}"
+local_namespace_names(#20103,"C",#20102)
+#20104=*
+stmts(#20104,30,#20100,0,"C {}")
+#20105=@"loc,{#10000},2,15,2,18"
+locations_default(#20105,#10000,2,15,2,18)
+hasLocation(#20104,#20105)
+stmt_containers(#20104,#20100)
 #20106=*
-exprs(#20106,78,#20105,-1,"C")
-hasLocation(#20106,#20041)
-enclosing_stmt(#20106,#20105)
-expr_containers(#20106,#20099)
-literals("C","C",#20106)
-namespacedecl(#20106,#20102)
+stmts(#20106,31,#20104,-1,"C {}")
+hasLocation(#20106,#20105)
+stmt_containers(#20106,#20100)
 #20107=*
-scopes(#20107,9)
-scopenodes(#20105,#20107)
-scopenesting(#20107,#20101)
+exprs(#20107,78,#20106,-1,"C")
+hasLocation(#20107,#20041)
+enclosing_stmt(#20107,#20106)
+expr_containers(#20107,#20100)
+literals("C","C",#20107)
+namespacedecl(#20107,#20103)
 #20108=*
-stmts(#20108,31,#20001,2,"namespa ... .Q {}\n}")
-#20109=@"loc,{#10000},4,1,8,1"
-locations_default(#20109,#10000,4,1,8,1)
-hasLocation(#20108,#20109)
-stmt_containers(#20108,#20001)
-#20110=*
-exprs(#20110,78,#20108,-1,"X")
-hasLocation(#20110,#20049)
-enclosing_stmt(#20110,#20108)
-expr_containers(#20110,#20001)
-literals("X","X",#20110)
-namespacedecl(#20110,#20083)
+scopes(#20108,9)
+scopenodes(#20106,#20108)
+scopenesting(#20108,#20102)
+#20109=*
+stmts(#20109,31,#20001,2,"namespa ... .Q {}\n}")
+#20110=@"loc,{#10000},4,1,8,1"
+locations_default(#20110,#10000,4,1,8,1)
+hasLocation(#20109,#20110)
+stmt_containers(#20109,#20001)
 #20111=*
-scopes(#20111,9)
-scopenodes(#20108,#20111)
-scopenesting(#20111,#20000)
-#20112=@"local_namespace_name;{Y};{#20111}"
-local_namespace_names(#20112,"Y",#20111)
-#20113=@"local_namespace_name;{W};{#20111}"
-local_namespace_names(#20113,"W",#20111)
-#20114=*
-stmts(#20114,30,#20108,0,"export  ...  Y.Z {}")
-#20115=@"loc,{#10000},5,3,5,25"
-locations_default(#20115,#10000,5,3,5,25)
-hasLocation(#20114,#20115)
-stmt_containers(#20114,#20108)
-#20116=*
-stmts(#20116,31,#20114,-1,"namespace Y.Z {}")
-#20117=@"loc,{#10000},5,10,5,25"
-locations_default(#20117,#10000,5,10,5,25)
-hasLocation(#20116,#20117)
-stmt_containers(#20116,#20108)
-#20118=*
-exprs(#20118,78,#20116,-1,"Y")
-hasLocation(#20118,#20057)
-enclosing_stmt(#20118,#20116)
-expr_containers(#20118,#20108)
-literals("Y","Y",#20118)
-namespacedecl(#20118,#20112)
+exprs(#20111,78,#20109,-1,"X")
+hasLocation(#20111,#20049)
+enclosing_stmt(#20111,#20109)
+expr_containers(#20111,#20001)
+literals("X","X",#20111)
+namespacedecl(#20111,#20083)
+#20112=*
+scopes(#20112,9)
+scopenodes(#20109,#20112)
+scopenesting(#20112,#20000)
+#20113=@"local_namespace_name;{Y};{#20112}"
+local_namespace_names(#20113,"Y",#20112)
+#20114=@"local_namespace_name;{W};{#20112}"
+local_namespace_names(#20114,"W",#20112)
+#20115=*
+stmts(#20115,30,#20109,0,"export  ...  Y.Z {}")
+#20116=@"loc,{#10000},5,3,5,25"
+locations_default(#20116,#10000,5,3,5,25)
+hasLocation(#20115,#20116)
+stmt_containers(#20115,#20109)
+#20117=*
+stmts(#20117,31,#20115,-1,"namespace Y.Z {}")
+#20118=@"loc,{#10000},5,10,5,25"
+locations_default(#20118,#10000,5,10,5,25)
+hasLocation(#20117,#20118)
+stmt_containers(#20117,#20109)
 #20119=*
-scopes(#20119,9)
-scopenodes(#20116,#20119)
-scopenesting(#20119,#20111)
-#20120=@"local_namespace_name;{Z};{#20119}"
-local_namespace_names(#20120,"Z",#20119)
-#20121=*
-stmts(#20121,30,#20116,0,"Z {}")
-#20122=@"loc,{#10000},5,22,5,25"
-locations_default(#20122,#10000,5,22,5,25)
-hasLocation(#20121,#20122)
-stmt_containers(#20121,#20116)
-#20123=*
-stmts(#20123,31,#20121,-1,"Z {}")
-hasLocation(#20123,#20122)
-stmt_containers(#20123,#20116)
+exprs(#20119,78,#20117,-1,"Y")
+hasLocation(#20119,#20057)
+enclosing_stmt(#20119,#20117)
+expr_containers(#20119,#20109)
+literals("Y","Y",#20119)
+namespacedecl(#20119,#20113)
+#20120=*
+scopes(#20120,9)
+scopenodes(#20117,#20120)
+scopenesting(#20120,#20112)
+#20121=@"local_namespace_name;{Z};{#20120}"
+local_namespace_names(#20121,"Z",#20120)
+#20122=*
+stmts(#20122,30,#20117,0,"Z {}")
+#20123=@"loc,{#10000},5,22,5,25"
+locations_default(#20123,#10000,5,22,5,25)
+hasLocation(#20122,#20123)
+stmt_containers(#20122,#20117)
 #20124=*
-exprs(#20124,78,#20123,-1,"Z")
-hasLocation(#20124,#20061)
-enclosing_stmt(#20124,#20123)
-expr_containers(#20124,#20116)
-literals("Z","Z",#20124)
-namespacedecl(#20124,#20120)
+stmts(#20124,31,#20122,-1,"Z {}")
+hasLocation(#20124,#20123)
+stmt_containers(#20124,#20117)
 #20125=*
-scopes(#20125,9)
-scopenodes(#20123,#20125)
-scopenesting(#20125,#20119)
+exprs(#20125,78,#20124,-1,"Z")
+hasLocation(#20125,#20061)
+enclosing_stmt(#20125,#20124)
+expr_containers(#20125,#20117)
+literals("Z","Z",#20125)
+namespacedecl(#20125,#20121)
 #20126=*
-stmts(#20126,31,#20108,1,"namespace W.Q {}")
-#20127=@"loc,{#10000},7,3,7,18"
-locations_default(#20127,#10000,7,3,7,18)
-hasLocation(#20126,#20127)
-stmt_containers(#20126,#20108)
-#20128=*
-exprs(#20128,78,#20126,-1,"W")
-hasLocation(#20128,#20069)
-enclosing_stmt(#20128,#20126)
-expr_containers(#20128,#20108)
-literals("W","W",#20128)
-namespacedecl(#20128,#20113)
+scopes(#20126,9)
+scopenodes(#20124,#20126)
+scopenesting(#20126,#20120)
+#20127=*
+stmts(#20127,31,#20109,1,"namespace W.Q {}")
+#20128=@"loc,{#10000},7,3,7,18"
+locations_default(#20128,#10000,7,3,7,18)
+hasLocation(#20127,#20128)
+stmt_containers(#20127,#20109)
 #20129=*
-scopes(#20129,9)
-scopenodes(#20126,#20129)
-scopenesting(#20129,#20111)
-#20130=@"local_namespace_name;{Q};{#20129}"
-local_namespace_names(#20130,"Q",#20129)
-#20131=*
-stmts(#20131,30,#20126,0,"Q {}")
-#20132=@"loc,{#10000},7,15,7,18"
-locations_default(#20132,#10000,7,15,7,18)
-hasLocation(#20131,#20132)
-stmt_containers(#20131,#20126)
-#20133=*
-stmts(#20133,31,#20131,-1,"Q {}")
-hasLocation(#20133,#20132)
-stmt_containers(#20133,#20126)
+exprs(#20129,78,#20127,-1,"W")
+hasLocation(#20129,#20069)
+enclosing_stmt(#20129,#20127)
+expr_containers(#20129,#20109)
+literals("W","W",#20129)
+namespacedecl(#20129,#20114)
+#20130=*
+scopes(#20130,9)
+scopenodes(#20127,#20130)
+scopenesting(#20130,#20112)
+#20131=@"local_namespace_name;{Q};{#20130}"
+local_namespace_names(#20131,"Q",#20130)
+#20132=*
+stmts(#20132,30,#20127,0,"Q {}")
+#20133=@"loc,{#10000},7,15,7,18"
+locations_default(#20133,#10000,7,15,7,18)
+hasLocation(#20132,#20133)
+stmt_containers(#20132,#20127)
 #20134=*
-exprs(#20134,78,#20133,-1,"Q")
-hasLocation(#20134,#20073)
-enclosing_stmt(#20134,#20133)
-expr_containers(#20134,#20126)
-literals("Q","Q",#20134)
-namespacedecl(#20134,#20130)
+stmts(#20134,31,#20132,-1,"Q {}")
+hasLocation(#20134,#20133)
+stmt_containers(#20134,#20127)
 #20135=*
-scopes(#20135,9)
-scopenodes(#20133,#20135)
-scopenesting(#20135,#20129)
+exprs(#20135,78,#20134,-1,"Q")
+hasLocation(#20135,#20073)
+enclosing_stmt(#20135,#20134)
+expr_containers(#20135,#20127)
+literals("Q","Q",#20135)
+namespacedecl(#20135,#20131)
 #20136=*
-entry_cfg_node(#20136,#20001)
-#20137=@"loc,{#10000},1,1,1,0"
-locations_default(#20137,#10000,1,1,1,0)
-hasLocation(#20136,#20137)
-#20138=*
-exit_cfg_node(#20138,#20001)
-hasLocation(#20138,#20080)
-successor(#20110,#20108)
-successor(#20128,#20126)
-successor(#20131,#20134)
-successor(#20134,#20133)
-successor(#20133,#20138)
-successor(#20126,#20131)
-successor(#20114,#20118)
-successor(#20118,#20116)
-successor(#20121,#20124)
-successor(#20124,#20123)
-successor(#20123,#20128)
-successor(#20116,#20121)
-successor(#20108,#20114)
-successor(#20094,#20093)
-successor(#20097,#20100)
-successor(#20100,#20099)
-successor(#20103,#20106)
-successor(#20106,#20105)
-successor(#20105,#20110)
-successor(#20099,#20103)
-successor(#20093,#20097)
-successor(#20085,#20084)
-successor(#20088,#20091)
-successor(#20091,#20090)
-successor(#20090,#20094)
-successor(#20084,#20088)
-successor(#20136,#20085)
+scopes(#20136,9)
+scopenodes(#20134,#20136)
+scopenesting(#20136,#20130)
+#20137=*
+entry_cfg_node(#20137,#20001)
+#20138=@"loc,{#10000},1,1,1,0"
+locations_default(#20138,#10000,1,1,1,0)
+hasLocation(#20137,#20138)
+#20139=*
+exit_cfg_node(#20139,#20001)
+hasLocation(#20139,#20080)
+successor(#20111,#20109)
+successor(#20129,#20127)
+successor(#20132,#20135)
+successor(#20135,#20134)
+successor(#20134,#20139)
+successor(#20127,#20132)
+successor(#20115,#20119)
+successor(#20119,#20117)
+successor(#20122,#20125)
+successor(#20125,#20124)
+successor(#20124,#20129)
+successor(#20117,#20122)
+successor(#20109,#20115)
+successor(#20095,#20094)
+successor(#20098,#20101)
+successor(#20101,#20100)
+successor(#20104,#20107)
+successor(#20107,#20106)
+successor(#20106,#20111)
+successor(#20100,#20104)
+successor(#20094,#20098)
+successor(#20086,#20085)
+successor(#20089,#20092)
+successor(#20092,#20091)
+successor(#20091,#20095)
+successor(#20085,#20089)
+successor(#20137,#20086)
 numlines(#10000,8,6,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/nobody.ts.trap b/javascript/extractor/tests/ts/output/trap/nobody.ts.trap
index 717d79423ab..c8545f12c55 100644
--- a/javascript/extractor/tests/ts/output/trap/nobody.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/nobody.ts.trap
@@ -704,499 +704,527 @@ variables(#20255,"D",#20000)
 local_type_names(#20256,"C",#20000)
 #20257=@"local_type_name;{D};{#20000}"
 local_type_names(#20257,"D",#20000)
-#20258=*
-stmts(#20258,17,#20001,0,"declare ... on f();")
-hasLocation(#20258,#20020)
-stmt_containers(#20258,#20001)
-has_declare_keyword(#20258)
+#20258=@"var;{this};{#20000}"
+variables(#20258,"this",#20000)
 #20259=*
-exprs(#20259,78,#20258,-1,"f")
-hasLocation(#20259,#20079)
-expr_containers(#20259,#20258)
-literals("f","f",#20259)
-decl(#20259,#20253)
+stmts(#20259,17,#20001,0,"declare ... on f();")
+hasLocation(#20259,#20020)
+stmt_containers(#20259,#20001)
+has_declare_keyword(#20259)
 #20260=*
-scopes(#20260,1)
-scopenodes(#20258,#20260)
-scopenesting(#20260,#20000)
-#20261=@"var;{arguments};{#20260}"
-variables(#20261,"arguments",#20260)
-is_arguments_object(#20261)
-#20262=*
-stmts(#20262,26,#20001,1,"abstrac ... mber;\n}")
-#20263=@"loc,{#10000},4,1,15,1"
-locations_default(#20263,#10000,4,1,15,1)
-hasLocation(#20262,#20263)
-stmt_containers(#20262,#20001)
-is_abstract_class(#20262)
+exprs(#20260,78,#20259,-1,"f")
+hasLocation(#20260,#20079)
+expr_containers(#20260,#20259)
+literals("f","f",#20260)
+decl(#20260,#20253)
+#20261=*
+scopes(#20261,1)
+scopenodes(#20259,#20261)
+scopenesting(#20261,#20000)
+#20262=@"var;{this};{#20261}"
+variables(#20262,"this",#20261)
+#20263=@"var;{arguments};{#20261}"
+variables(#20263,"arguments",#20261)
+is_arguments_object(#20263)
 #20264=*
-exprs(#20264,78,#20262,0,"C")
-hasLocation(#20264,#20091)
-enclosing_stmt(#20264,#20262)
-expr_containers(#20264,#20001)
-literals("C","C",#20264)
-decl(#20264,#20254)
-typedecl(#20264,#20256)
-#20265=*
-scopes(#20265,10)
-scopenodes(#20262,#20265)
-scopenesting(#20265,#20000)
+stmts(#20264,26,#20001,1,"abstrac ... mber;\n}")
+#20265=@"loc,{#10000},4,1,15,1"
+locations_default(#20265,#10000,4,1,15,1)
+hasLocation(#20264,#20265)
+stmt_containers(#20264,#20001)
+is_abstract_class(#20264)
 #20266=*
-properties(#20266,#20262,2,0,"abstract h();")
-#20267=@"loc,{#10000},6,3,6,15"
-locations_default(#20267,#10000,6,3,6,15)
-hasLocation(#20266,#20267)
-#20268=*
-exprs(#20268,0,#20266,0,"h")
-hasLocation(#20268,#20097)
-enclosing_stmt(#20268,#20262)
-expr_containers(#20268,#20001)
-literals("h","h",#20268)
+exprs(#20266,78,#20264,0,"C")
+hasLocation(#20266,#20091)
+enclosing_stmt(#20266,#20264)
+expr_containers(#20266,#20001)
+literals("C","C",#20266)
+decl(#20266,#20254)
+typedecl(#20266,#20256)
+#20267=*
+scopes(#20267,10)
+scopenodes(#20264,#20267)
+scopenesting(#20267,#20000)
+#20268=@"var;{this};{#20267}"
+variables(#20268,"this",#20267)
 #20269=*
-exprs(#20269,9,#20266,1,"abstract h();")
-hasLocation(#20269,#20267)
-enclosing_stmt(#20269,#20262)
-expr_containers(#20269,#20001)
-#20270=*
-scopes(#20270,1)
-scopenodes(#20269,#20270)
-scopenesting(#20270,#20265)
-#20271=@"var;{arguments};{#20270}"
-variables(#20271,"arguments",#20270)
-is_arguments_object(#20271)
-is_method(#20266)
-is_abstract_member(#20266)
+properties(#20269,#20264,2,0,"abstract h();")
+#20270=@"loc,{#10000},6,3,6,15"
+locations_default(#20270,#10000,6,3,6,15)
+hasLocation(#20269,#20270)
+#20271=*
+exprs(#20271,0,#20269,0,"h")
+hasLocation(#20271,#20097)
+enclosing_stmt(#20271,#20264)
+expr_containers(#20271,#20001)
+literals("h","h",#20271)
 #20272=*
-properties(#20272,#20262,3,0,"g(x: nu ... number;")
-#20273=@"loc,{#10000},9,3,9,23"
-locations_default(#20273,#10000,9,3,9,23)
-hasLocation(#20272,#20273)
-#20274=*
-exprs(#20274,0,#20272,0,"g")
-hasLocation(#20274,#20105)
-enclosing_stmt(#20274,#20262)
-expr_containers(#20274,#20001)
-literals("g","g",#20274)
-#20275=*
-exprs(#20275,9,#20272,1,"g(x: nu ... number;")
-hasLocation(#20275,#20273)
-enclosing_stmt(#20275,#20262)
-expr_containers(#20275,#20001)
+exprs(#20272,9,#20269,1,"abstract h();")
+hasLocation(#20272,#20270)
+enclosing_stmt(#20272,#20264)
+expr_containers(#20272,#20001)
+#20273=*
+scopes(#20273,1)
+scopenodes(#20272,#20273)
+scopenesting(#20273,#20267)
+#20274=@"var;{this};{#20273}"
+variables(#20274,"this",#20273)
+#20275=@"var;{arguments};{#20273}"
+variables(#20275,"arguments",#20273)
+is_arguments_object(#20275)
+is_method(#20269)
+is_abstract_member(#20269)
 #20276=*
-scopes(#20276,1)
-scopenodes(#20275,#20276)
-scopenesting(#20276,#20265)
-#20277=@"var;{x};{#20276}"
-variables(#20277,"x",#20276)
+properties(#20276,#20264,3,0,"g(x: nu ... number;")
+#20277=@"loc,{#10000},9,3,9,23"
+locations_default(#20277,#10000,9,3,9,23)
+hasLocation(#20276,#20277)
 #20278=*
-exprs(#20278,78,#20275,0,"x")
-hasLocation(#20278,#20109)
-expr_containers(#20278,#20275)
-literals("x","x",#20278)
-decl(#20278,#20277)
-#20279=@"var;{arguments};{#20276}"
-variables(#20279,"arguments",#20276)
-is_arguments_object(#20279)
+exprs(#20278,0,#20276,0,"g")
+hasLocation(#20278,#20105)
+enclosing_stmt(#20278,#20264)
+expr_containers(#20278,#20001)
+literals("g","g",#20278)
+#20279=*
+exprs(#20279,9,#20276,1,"g(x: nu ... number;")
+hasLocation(#20279,#20277)
+enclosing_stmt(#20279,#20264)
+expr_containers(#20279,#20001)
 #20280=*
-typeexprs(#20280,2,#20275,-3,"number")
-hasLocation(#20280,#20119)
-expr_containers(#20280,#20275)
-literals("number","number",#20280)
-#20281=*
-typeexprs(#20281,2,#20275,-6,"number")
-hasLocation(#20281,#20113)
-expr_containers(#20281,#20275)
-literals("number","number",#20281)
-is_method(#20272)
-#20282=*
-properties(#20282,#20262,4,0,"g(x: st ... string;")
-#20283=@"loc,{#10000},10,3,10,23"
-locations_default(#20283,#10000,10,3,10,23)
-hasLocation(#20282,#20283)
-#20284=*
-exprs(#20284,0,#20282,0,"g")
-hasLocation(#20284,#20123)
-enclosing_stmt(#20284,#20262)
-expr_containers(#20284,#20001)
-literals("g","g",#20284)
+scopes(#20280,1)
+scopenodes(#20279,#20280)
+scopenesting(#20280,#20267)
+#20281=@"var;{this};{#20280}"
+variables(#20281,"this",#20280)
+#20282=@"var;{x};{#20280}"
+variables(#20282,"x",#20280)
+#20283=*
+exprs(#20283,78,#20279,0,"x")
+hasLocation(#20283,#20109)
+expr_containers(#20283,#20279)
+literals("x","x",#20283)
+decl(#20283,#20282)
+#20284=@"var;{arguments};{#20280}"
+variables(#20284,"arguments",#20280)
+is_arguments_object(#20284)
 #20285=*
-exprs(#20285,9,#20282,1,"g(x: st ... string;")
-hasLocation(#20285,#20283)
-enclosing_stmt(#20285,#20262)
-expr_containers(#20285,#20001)
+typeexprs(#20285,2,#20279,-3,"number")
+hasLocation(#20285,#20119)
+expr_containers(#20285,#20279)
+literals("number","number",#20285)
 #20286=*
-scopes(#20286,1)
-scopenodes(#20285,#20286)
-scopenesting(#20286,#20265)
-#20287=@"var;{x};{#20286}"
-variables(#20287,"x",#20286)
-#20288=*
-exprs(#20288,78,#20285,0,"x")
-hasLocation(#20288,#20127)
-expr_containers(#20288,#20285)
-literals("x","x",#20288)
-decl(#20288,#20287)
-#20289=@"var;{arguments};{#20286}"
-variables(#20289,"arguments",#20286)
-is_arguments_object(#20289)
+typeexprs(#20286,2,#20279,-6,"number")
+hasLocation(#20286,#20113)
+expr_containers(#20286,#20279)
+literals("number","number",#20286)
+is_method(#20276)
+#20287=*
+properties(#20287,#20264,4,0,"g(x: st ... string;")
+#20288=@"loc,{#10000},10,3,10,23"
+locations_default(#20288,#10000,10,3,10,23)
+hasLocation(#20287,#20288)
+#20289=*
+exprs(#20289,0,#20287,0,"g")
+hasLocation(#20289,#20123)
+enclosing_stmt(#20289,#20264)
+expr_containers(#20289,#20001)
+literals("g","g",#20289)
 #20290=*
-typeexprs(#20290,2,#20285,-3,"string")
-hasLocation(#20290,#20137)
-expr_containers(#20290,#20285)
-literals("string","string",#20290)
+exprs(#20290,9,#20287,1,"g(x: st ... string;")
+hasLocation(#20290,#20288)
+enclosing_stmt(#20290,#20264)
+expr_containers(#20290,#20001)
 #20291=*
-typeexprs(#20291,2,#20285,-6,"string")
-hasLocation(#20291,#20131)
-expr_containers(#20291,#20285)
-literals("string","string",#20291)
-is_method(#20282)
-#20292=*
-properties(#20292,#20262,5,0,"g(x: any) {}")
-#20293=@"loc,{#10000},11,3,11,14"
-locations_default(#20293,#10000,11,3,11,14)
-hasLocation(#20292,#20293)
+scopes(#20291,1)
+scopenodes(#20290,#20291)
+scopenesting(#20291,#20267)
+#20292=@"var;{this};{#20291}"
+variables(#20292,"this",#20291)
+#20293=@"var;{x};{#20291}"
+variables(#20293,"x",#20291)
 #20294=*
-exprs(#20294,0,#20292,0,"g")
-hasLocation(#20294,#20141)
-enclosing_stmt(#20294,#20262)
-expr_containers(#20294,#20001)
-literals("g","g",#20294)
-#20295=*
-exprs(#20295,9,#20292,1,"g(x: any) {}")
-hasLocation(#20295,#20293)
-enclosing_stmt(#20295,#20262)
-expr_containers(#20295,#20001)
+exprs(#20294,78,#20290,0,"x")
+hasLocation(#20294,#20127)
+expr_containers(#20294,#20290)
+literals("x","x",#20294)
+decl(#20294,#20293)
+#20295=@"var;{arguments};{#20291}"
+variables(#20295,"arguments",#20291)
+is_arguments_object(#20295)
 #20296=*
-scopes(#20296,1)
-scopenodes(#20295,#20296)
-scopenesting(#20296,#20265)
-#20297=@"var;{x};{#20296}"
-variables(#20297,"x",#20296)
+typeexprs(#20296,2,#20290,-3,"string")
+hasLocation(#20296,#20137)
+expr_containers(#20296,#20290)
+literals("string","string",#20296)
+#20297=*
+typeexprs(#20297,2,#20290,-6,"string")
+hasLocation(#20297,#20131)
+expr_containers(#20297,#20290)
+literals("string","string",#20297)
+is_method(#20287)
 #20298=*
-exprs(#20298,78,#20295,0,"x")
-hasLocation(#20298,#20145)
-expr_containers(#20298,#20295)
-literals("x","x",#20298)
-decl(#20298,#20297)
-#20299=@"var;{arguments};{#20296}"
-variables(#20299,"arguments",#20296)
-is_arguments_object(#20299)
+properties(#20298,#20264,5,0,"g(x: any) {}")
+#20299=@"loc,{#10000},11,3,11,14"
+locations_default(#20299,#10000,11,3,11,14)
+hasLocation(#20298,#20299)
 #20300=*
-typeexprs(#20300,2,#20295,-6,"any")
-hasLocation(#20300,#20149)
-expr_containers(#20300,#20295)
-literals("any","any",#20300)
+exprs(#20300,0,#20298,0,"g")
+hasLocation(#20300,#20141)
+enclosing_stmt(#20300,#20264)
+expr_containers(#20300,#20001)
+literals("g","g",#20300)
 #20301=*
-stmts(#20301,1,#20295,-2,"{}")
-#20302=@"loc,{#10000},11,13,11,14"
-locations_default(#20302,#10000,11,13,11,14)
-hasLocation(#20301,#20302)
-stmt_containers(#20301,#20295)
-is_method(#20292)
-#20303=*
-properties(#20303,#20262,6,8,"abstract x: number;")
-#20304=@"loc,{#10000},14,3,14,21"
-locations_default(#20304,#10000,14,3,14,21)
-hasLocation(#20303,#20304)
+exprs(#20301,9,#20298,1,"g(x: any) {}")
+hasLocation(#20301,#20299)
+enclosing_stmt(#20301,#20264)
+expr_containers(#20301,#20001)
+#20302=*
+scopes(#20302,1)
+scopenodes(#20301,#20302)
+scopenesting(#20302,#20267)
+#20303=@"var;{this};{#20302}"
+variables(#20303,"this",#20302)
+#20304=@"var;{x};{#20302}"
+variables(#20304,"x",#20302)
 #20305=*
-#20306=*
-exprs(#20306,0,#20303,0,"x")
-hasLocation(#20306,#20159)
-expr_containers(#20306,#20305)
-literals("x","x",#20306)
-is_abstract_member(#20303)
+exprs(#20305,78,#20301,0,"x")
+hasLocation(#20305,#20145)
+expr_containers(#20305,#20301)
+literals("x","x",#20305)
+decl(#20305,#20304)
+#20306=@"var;{arguments};{#20302}"
+variables(#20306,"arguments",#20302)
+is_arguments_object(#20306)
 #20307=*
-typeexprs(#20307,2,#20303,2,"number")
-hasLocation(#20307,#20163)
-enclosing_stmt(#20307,#20262)
-expr_containers(#20307,#20001)
-literals("number","number",#20307)
+typeexprs(#20307,2,#20301,-6,"any")
+hasLocation(#20307,#20149)
+expr_containers(#20307,#20301)
+literals("any","any",#20307)
 #20308=*
-properties(#20308,#20262,7,0,"constructor() {}")
-#20309=@"loc,{#10000},4,18,4,17"
-locations_default(#20309,#10000,4,18,4,17)
+stmts(#20308,1,#20301,-2,"{}")
+#20309=@"loc,{#10000},11,13,11,14"
+locations_default(#20309,#10000,11,13,11,14)
 hasLocation(#20308,#20309)
+stmt_containers(#20308,#20301)
+is_method(#20298)
 #20310=*
-exprs(#20310,0,#20308,0,"constructor")
-hasLocation(#20310,#20309)
-enclosing_stmt(#20310,#20262)
-expr_containers(#20310,#20001)
-literals("constructor","constructor",#20310)
-exprs(#20305,9,#20308,1,"() {}")
-hasLocation(#20305,#20309)
-enclosing_stmt(#20305,#20262)
-expr_containers(#20305,#20001)
-#20311=*
-scopes(#20311,1)
-scopenodes(#20305,#20311)
-scopenesting(#20311,#20265)
-#20312=@"var;{arguments};{#20311}"
-variables(#20312,"arguments",#20311)
-is_arguments_object(#20312)
+properties(#20310,#20264,6,8,"abstract x: number;")
+#20311=@"loc,{#10000},14,3,14,21"
+locations_default(#20311,#10000,14,3,14,21)
+hasLocation(#20310,#20311)
+#20312=*
 #20313=*
-stmts(#20313,1,#20305,-2,"{}")
-hasLocation(#20313,#20309)
-stmt_containers(#20313,#20305)
-is_method(#20308)
+exprs(#20313,0,#20310,0,"x")
+hasLocation(#20313,#20159)
+expr_containers(#20313,#20312)
+literals("x","x",#20313)
+is_abstract_member(#20310)
 #20314=*
-stmts(#20314,26,#20001,2,"declare ... mber;\n}")
-#20315=@"loc,{#10000},18,1,29,1"
-locations_default(#20315,#10000,18,1,29,1)
-hasLocation(#20314,#20315)
-stmt_containers(#20314,#20001)
-has_declare_keyword(#20314)
-is_abstract_class(#20314)
-#20316=*
-exprs(#20316,78,#20314,0,"D")
-hasLocation(#20316,#20174)
-enclosing_stmt(#20316,#20314)
-expr_containers(#20316,#20001)
-literals("D","D",#20316)
-decl(#20316,#20255)
-typedecl(#20316,#20257)
+typeexprs(#20314,2,#20310,2,"number")
+hasLocation(#20314,#20163)
+enclosing_stmt(#20314,#20264)
+expr_containers(#20314,#20001)
+literals("number","number",#20314)
+#20315=*
+properties(#20315,#20264,7,0,"constructor() {}")
+#20316=@"loc,{#10000},4,18,4,17"
+locations_default(#20316,#10000,4,18,4,17)
+hasLocation(#20315,#20316)
 #20317=*
-scopes(#20317,10)
-scopenodes(#20314,#20317)
-scopenesting(#20317,#20000)
+exprs(#20317,0,#20315,0,"constructor")
+hasLocation(#20317,#20316)
+enclosing_stmt(#20317,#20264)
+expr_containers(#20317,#20001)
+literals("constructor","constructor",#20317)
+exprs(#20312,9,#20315,1,"() {}")
+hasLocation(#20312,#20316)
+enclosing_stmt(#20312,#20264)
+expr_containers(#20312,#20001)
 #20318=*
-properties(#20318,#20314,2,0,"abstract h();")
-#20319=@"loc,{#10000},20,3,20,15"
-locations_default(#20319,#10000,20,3,20,15)
-hasLocation(#20318,#20319)
-#20320=*
-exprs(#20320,0,#20318,0,"h")
-hasLocation(#20320,#20180)
-enclosing_stmt(#20320,#20314)
-expr_containers(#20320,#20001)
-literals("h","h",#20320)
+scopes(#20318,1)
+scopenodes(#20312,#20318)
+scopenesting(#20318,#20267)
+#20319=@"var;{this};{#20318}"
+variables(#20319,"this",#20318)
+#20320=@"var;{arguments};{#20318}"
+variables(#20320,"arguments",#20318)
+is_arguments_object(#20320)
 #20321=*
-exprs(#20321,9,#20318,1,"abstract h();")
-hasLocation(#20321,#20319)
-enclosing_stmt(#20321,#20314)
-expr_containers(#20321,#20001)
+stmts(#20321,1,#20312,-2,"{}")
+hasLocation(#20321,#20316)
+stmt_containers(#20321,#20312)
+is_method(#20315)
 #20322=*
-scopes(#20322,1)
-scopenodes(#20321,#20322)
-scopenesting(#20322,#20317)
-#20323=@"var;{arguments};{#20322}"
-variables(#20323,"arguments",#20322)
-is_arguments_object(#20323)
-is_method(#20318)
-is_abstract_member(#20318)
+stmts(#20322,26,#20001,2,"declare ... mber;\n}")
+#20323=@"loc,{#10000},18,1,29,1"
+locations_default(#20323,#10000,18,1,29,1)
+hasLocation(#20322,#20323)
+stmt_containers(#20322,#20001)
+has_declare_keyword(#20322)
+is_abstract_class(#20322)
 #20324=*
-properties(#20324,#20314,3,0,"g(x: nu ... number;")
-#20325=@"loc,{#10000},23,3,23,23"
-locations_default(#20325,#10000,23,3,23,23)
-hasLocation(#20324,#20325)
-#20326=*
-exprs(#20326,0,#20324,0,"g")
-hasLocation(#20326,#20188)
-enclosing_stmt(#20326,#20314)
-expr_containers(#20326,#20001)
-literals("g","g",#20326)
+exprs(#20324,78,#20322,0,"D")
+hasLocation(#20324,#20174)
+enclosing_stmt(#20324,#20322)
+expr_containers(#20324,#20001)
+literals("D","D",#20324)
+decl(#20324,#20255)
+typedecl(#20324,#20257)
+#20325=*
+scopes(#20325,10)
+scopenodes(#20322,#20325)
+scopenesting(#20325,#20000)
+#20326=@"var;{this};{#20325}"
+variables(#20326,"this",#20325)
 #20327=*
-exprs(#20327,9,#20324,1,"g(x: nu ... number;")
-hasLocation(#20327,#20325)
-enclosing_stmt(#20327,#20314)
-expr_containers(#20327,#20001)
-#20328=*
-scopes(#20328,1)
-scopenodes(#20327,#20328)
-scopenesting(#20328,#20317)
-#20329=@"var;{x};{#20328}"
-variables(#20329,"x",#20328)
+properties(#20327,#20322,2,0,"abstract h();")
+#20328=@"loc,{#10000},20,3,20,15"
+locations_default(#20328,#10000,20,3,20,15)
+hasLocation(#20327,#20328)
+#20329=*
+exprs(#20329,0,#20327,0,"h")
+hasLocation(#20329,#20180)
+enclosing_stmt(#20329,#20322)
+expr_containers(#20329,#20001)
+literals("h","h",#20329)
 #20330=*
-exprs(#20330,78,#20327,0,"x")
-hasLocation(#20330,#20192)
-expr_containers(#20330,#20327)
-literals("x","x",#20330)
-decl(#20330,#20329)
-#20331=@"var;{arguments};{#20328}"
-variables(#20331,"arguments",#20328)
-is_arguments_object(#20331)
-#20332=*
-typeexprs(#20332,2,#20327,-3,"number")
-hasLocation(#20332,#20202)
-expr_containers(#20332,#20327)
-literals("number","number",#20332)
-#20333=*
-typeexprs(#20333,2,#20327,-6,"number")
-hasLocation(#20333,#20196)
-expr_containers(#20333,#20327)
-literals("number","number",#20333)
-is_method(#20324)
+exprs(#20330,9,#20327,1,"abstract h();")
+hasLocation(#20330,#20328)
+enclosing_stmt(#20330,#20322)
+expr_containers(#20330,#20001)
+#20331=*
+scopes(#20331,1)
+scopenodes(#20330,#20331)
+scopenesting(#20331,#20325)
+#20332=@"var;{this};{#20331}"
+variables(#20332,"this",#20331)
+#20333=@"var;{arguments};{#20331}"
+variables(#20333,"arguments",#20331)
+is_arguments_object(#20333)
+is_method(#20327)
+is_abstract_member(#20327)
 #20334=*
-properties(#20334,#20314,4,0,"g(x: st ... string;")
-#20335=@"loc,{#10000},24,3,24,23"
-locations_default(#20335,#10000,24,3,24,23)
+properties(#20334,#20322,3,0,"g(x: nu ... number;")
+#20335=@"loc,{#10000},23,3,23,23"
+locations_default(#20335,#10000,23,3,23,23)
 hasLocation(#20334,#20335)
 #20336=*
 exprs(#20336,0,#20334,0,"g")
-hasLocation(#20336,#20206)
-enclosing_stmt(#20336,#20314)
+hasLocation(#20336,#20188)
+enclosing_stmt(#20336,#20322)
 expr_containers(#20336,#20001)
 literals("g","g",#20336)
 #20337=*
-exprs(#20337,9,#20334,1,"g(x: st ... string;")
+exprs(#20337,9,#20334,1,"g(x: nu ... number;")
 hasLocation(#20337,#20335)
-enclosing_stmt(#20337,#20314)
+enclosing_stmt(#20337,#20322)
 expr_containers(#20337,#20001)
 #20338=*
 scopes(#20338,1)
 scopenodes(#20337,#20338)
-scopenesting(#20338,#20317)
-#20339=@"var;{x};{#20338}"
-variables(#20339,"x",#20338)
-#20340=*
-exprs(#20340,78,#20337,0,"x")
-hasLocation(#20340,#20210)
-expr_containers(#20340,#20337)
-literals("x","x",#20340)
-decl(#20340,#20339)
-#20341=@"var;{arguments};{#20338}"
-variables(#20341,"arguments",#20338)
-is_arguments_object(#20341)
-#20342=*
-typeexprs(#20342,2,#20337,-3,"string")
-hasLocation(#20342,#20220)
-expr_containers(#20342,#20337)
-literals("string","string",#20342)
+scopenesting(#20338,#20325)
+#20339=@"var;{this};{#20338}"
+variables(#20339,"this",#20338)
+#20340=@"var;{x};{#20338}"
+variables(#20340,"x",#20338)
+#20341=*
+exprs(#20341,78,#20337,0,"x")
+hasLocation(#20341,#20192)
+expr_containers(#20341,#20337)
+literals("x","x",#20341)
+decl(#20341,#20340)
+#20342=@"var;{arguments};{#20338}"
+variables(#20342,"arguments",#20338)
+is_arguments_object(#20342)
 #20343=*
-typeexprs(#20343,2,#20337,-6,"string")
-hasLocation(#20343,#20214)
+typeexprs(#20343,2,#20337,-3,"number")
+hasLocation(#20343,#20202)
 expr_containers(#20343,#20337)
-literals("string","string",#20343)
-is_method(#20334)
+literals("number","number",#20343)
 #20344=*
-properties(#20344,#20314,5,0,"g(x: any) {}")
-#20345=@"loc,{#10000},25,3,25,14"
-locations_default(#20345,#10000,25,3,25,14)
-hasLocation(#20344,#20345)
-#20346=*
-exprs(#20346,0,#20344,0,"g")
-hasLocation(#20346,#20224)
-enclosing_stmt(#20346,#20314)
-expr_containers(#20346,#20001)
-literals("g","g",#20346)
+typeexprs(#20344,2,#20337,-6,"number")
+hasLocation(#20344,#20196)
+expr_containers(#20344,#20337)
+literals("number","number",#20344)
+is_method(#20334)
+#20345=*
+properties(#20345,#20322,4,0,"g(x: st ... string;")
+#20346=@"loc,{#10000},24,3,24,23"
+locations_default(#20346,#10000,24,3,24,23)
+hasLocation(#20345,#20346)
 #20347=*
-exprs(#20347,9,#20344,1,"g(x: any) {}")
-hasLocation(#20347,#20345)
-enclosing_stmt(#20347,#20314)
+exprs(#20347,0,#20345,0,"g")
+hasLocation(#20347,#20206)
+enclosing_stmt(#20347,#20322)
 expr_containers(#20347,#20001)
+literals("g","g",#20347)
 #20348=*
-scopes(#20348,1)
-scopenodes(#20347,#20348)
-scopenesting(#20348,#20317)
-#20349=@"var;{x};{#20348}"
-variables(#20349,"x",#20348)
-#20350=*
-exprs(#20350,78,#20347,0,"x")
-hasLocation(#20350,#20228)
-expr_containers(#20350,#20347)
-literals("x","x",#20350)
-decl(#20350,#20349)
-#20351=@"var;{arguments};{#20348}"
-variables(#20351,"arguments",#20348)
-is_arguments_object(#20351)
+exprs(#20348,9,#20345,1,"g(x: st ... string;")
+hasLocation(#20348,#20346)
+enclosing_stmt(#20348,#20322)
+expr_containers(#20348,#20001)
+#20349=*
+scopes(#20349,1)
+scopenodes(#20348,#20349)
+scopenesting(#20349,#20325)
+#20350=@"var;{this};{#20349}"
+variables(#20350,"this",#20349)
+#20351=@"var;{x};{#20349}"
+variables(#20351,"x",#20349)
 #20352=*
-typeexprs(#20352,2,#20347,-6,"any")
-hasLocation(#20352,#20232)
-expr_containers(#20352,#20347)
-literals("any","any",#20352)
-#20353=*
-stmts(#20353,1,#20347,-2,"{}")
-#20354=@"loc,{#10000},25,13,25,14"
-locations_default(#20354,#10000,25,13,25,14)
-hasLocation(#20353,#20354)
-stmt_containers(#20353,#20347)
-is_method(#20344)
+exprs(#20352,78,#20348,0,"x")
+hasLocation(#20352,#20210)
+expr_containers(#20352,#20348)
+literals("x","x",#20352)
+decl(#20352,#20351)
+#20353=@"var;{arguments};{#20349}"
+variables(#20353,"arguments",#20349)
+is_arguments_object(#20353)
+#20354=*
+typeexprs(#20354,2,#20348,-3,"string")
+hasLocation(#20354,#20220)
+expr_containers(#20354,#20348)
+literals("string","string",#20354)
 #20355=*
-properties(#20355,#20314,6,8,"abstract x: number;")
-#20356=@"loc,{#10000},28,3,28,21"
-locations_default(#20356,#10000,28,3,28,21)
-hasLocation(#20355,#20356)
-#20357=*
+typeexprs(#20355,2,#20348,-6,"string")
+hasLocation(#20355,#20214)
+expr_containers(#20355,#20348)
+literals("string","string",#20355)
+is_method(#20345)
+#20356=*
+properties(#20356,#20322,5,0,"g(x: any) {}")
+#20357=@"loc,{#10000},25,3,25,14"
+locations_default(#20357,#10000,25,3,25,14)
+hasLocation(#20356,#20357)
 #20358=*
-exprs(#20358,0,#20355,0,"x")
-hasLocation(#20358,#20242)
-expr_containers(#20358,#20357)
-literals("x","x",#20358)
-is_abstract_member(#20355)
+exprs(#20358,0,#20356,0,"g")
+hasLocation(#20358,#20224)
+enclosing_stmt(#20358,#20322)
+expr_containers(#20358,#20001)
+literals("g","g",#20358)
 #20359=*
-typeexprs(#20359,2,#20355,2,"number")
-hasLocation(#20359,#20246)
-enclosing_stmt(#20359,#20314)
+exprs(#20359,9,#20356,1,"g(x: any) {}")
+hasLocation(#20359,#20357)
+enclosing_stmt(#20359,#20322)
 expr_containers(#20359,#20001)
-literals("number","number",#20359)
 #20360=*
-properties(#20360,#20314,7,0,"constructor() {}")
-#20361=@"loc,{#10000},18,26,18,25"
-locations_default(#20361,#10000,18,26,18,25)
-hasLocation(#20360,#20361)
-#20362=*
-exprs(#20362,0,#20360,0,"constructor")
-hasLocation(#20362,#20361)
-enclosing_stmt(#20362,#20314)
-expr_containers(#20362,#20001)
-literals("constructor","constructor",#20362)
-exprs(#20357,9,#20360,1,"() {}")
-hasLocation(#20357,#20361)
-enclosing_stmt(#20357,#20314)
-expr_containers(#20357,#20001)
+scopes(#20360,1)
+scopenodes(#20359,#20360)
+scopenesting(#20360,#20325)
+#20361=@"var;{this};{#20360}"
+variables(#20361,"this",#20360)
+#20362=@"var;{x};{#20360}"
+variables(#20362,"x",#20360)
 #20363=*
-scopes(#20363,1)
-scopenodes(#20357,#20363)
-scopenesting(#20363,#20317)
-#20364=@"var;{arguments};{#20363}"
-variables(#20364,"arguments",#20363)
+exprs(#20363,78,#20359,0,"x")
+hasLocation(#20363,#20228)
+expr_containers(#20363,#20359)
+literals("x","x",#20363)
+decl(#20363,#20362)
+#20364=@"var;{arguments};{#20360}"
+variables(#20364,"arguments",#20360)
 is_arguments_object(#20364)
 #20365=*
-stmts(#20365,1,#20357,-2,"{}")
-hasLocation(#20365,#20361)
-stmt_containers(#20365,#20357)
-is_method(#20360)
+typeexprs(#20365,2,#20359,-6,"any")
+hasLocation(#20365,#20232)
+expr_containers(#20365,#20359)
+literals("any","any",#20365)
 #20366=*
-entry_cfg_node(#20366,#20001)
-#20367=@"loc,{#10000},2,1,2,0"
-locations_default(#20367,#10000,2,1,2,0)
+stmts(#20366,1,#20359,-2,"{}")
+#20367=@"loc,{#10000},25,13,25,14"
+locations_default(#20367,#10000,25,13,25,14)
 hasLocation(#20366,#20367)
+stmt_containers(#20366,#20359)
+is_method(#20356)
 #20368=*
-exit_cfg_node(#20368,#20001)
-hasLocation(#20368,#20251)
-successor(#20314,#20368)
-successor(#20305,#20308)
-#20369=*
-entry_cfg_node(#20369,#20305)
-hasLocation(#20369,#20309)
+properties(#20368,#20322,6,8,"abstract x: number;")
+#20369=@"loc,{#10000},28,3,28,21"
+locations_default(#20369,#10000,28,3,28,21)
+hasLocation(#20368,#20369)
 #20370=*
-exit_cfg_node(#20370,#20305)
-hasLocation(#20370,#20309)
-successor(#20313,#20370)
-successor(#20369,#20313)
-successor(#20310,#20305)
-successor(#20308,#20262)
-successor(#20295,#20292)
 #20371=*
-entry_cfg_node(#20371,#20295)
-#20372=@"loc,{#10000},11,3,11,2"
-locations_default(#20372,#10000,11,3,11,2)
-hasLocation(#20371,#20372)
+exprs(#20371,0,#20368,0,"x")
+hasLocation(#20371,#20242)
+expr_containers(#20371,#20370)
+literals("x","x",#20371)
+is_abstract_member(#20368)
+#20372=*
+typeexprs(#20372,2,#20368,2,"number")
+hasLocation(#20372,#20246)
+enclosing_stmt(#20372,#20322)
+expr_containers(#20372,#20001)
+literals("number","number",#20372)
 #20373=*
-exit_cfg_node(#20373,#20295)
-#20374=@"loc,{#10000},11,15,11,14"
-locations_default(#20374,#10000,11,15,11,14)
+properties(#20373,#20322,7,0,"constructor() {}")
+#20374=@"loc,{#10000},18,26,18,25"
+locations_default(#20374,#10000,18,26,18,25)
 hasLocation(#20373,#20374)
-successor(#20301,#20373)
-successor(#20298,#20301)
-successor(#20371,#20298)
-successor(#20294,#20295)
-successor(#20292,#20310)
-successor(#20282,#20294)
-successor(#20272,#20282)
-successor(#20266,#20272)
-successor(#20264,#20266)
-successor(#20262,#20314)
-successor(#20258,#20264)
-successor(#20366,#20258)
+#20375=*
+exprs(#20375,0,#20373,0,"constructor")
+hasLocation(#20375,#20374)
+enclosing_stmt(#20375,#20322)
+expr_containers(#20375,#20001)
+literals("constructor","constructor",#20375)
+exprs(#20370,9,#20373,1,"() {}")
+hasLocation(#20370,#20374)
+enclosing_stmt(#20370,#20322)
+expr_containers(#20370,#20001)
+#20376=*
+scopes(#20376,1)
+scopenodes(#20370,#20376)
+scopenesting(#20376,#20325)
+#20377=@"var;{this};{#20376}"
+variables(#20377,"this",#20376)
+#20378=@"var;{arguments};{#20376}"
+variables(#20378,"arguments",#20376)
+is_arguments_object(#20378)
+#20379=*
+stmts(#20379,1,#20370,-2,"{}")
+hasLocation(#20379,#20374)
+stmt_containers(#20379,#20370)
+is_method(#20373)
+#20380=*
+entry_cfg_node(#20380,#20001)
+#20381=@"loc,{#10000},2,1,2,0"
+locations_default(#20381,#10000,2,1,2,0)
+hasLocation(#20380,#20381)
+#20382=*
+exit_cfg_node(#20382,#20001)
+hasLocation(#20382,#20251)
+successor(#20322,#20382)
+successor(#20312,#20315)
+#20383=*
+entry_cfg_node(#20383,#20312)
+hasLocation(#20383,#20316)
+#20384=*
+exit_cfg_node(#20384,#20312)
+hasLocation(#20384,#20316)
+successor(#20321,#20384)
+successor(#20383,#20321)
+successor(#20317,#20312)
+successor(#20315,#20264)
+successor(#20301,#20298)
+#20385=*
+entry_cfg_node(#20385,#20301)
+#20386=@"loc,{#10000},11,3,11,2"
+locations_default(#20386,#10000,11,3,11,2)
+hasLocation(#20385,#20386)
+#20387=*
+exit_cfg_node(#20387,#20301)
+#20388=@"loc,{#10000},11,15,11,14"
+locations_default(#20388,#10000,11,15,11,14)
+hasLocation(#20387,#20388)
+successor(#20308,#20387)
+successor(#20305,#20308)
+successor(#20385,#20305)
+successor(#20300,#20301)
+successor(#20298,#20317)
+successor(#20287,#20300)
+successor(#20276,#20287)
+successor(#20269,#20276)
+successor(#20266,#20269)
+successor(#20264,#20322)
+successor(#20259,#20266)
+successor(#20380,#20259)
 numlines(#10000,29,15,8)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/objectLiteralAccessor.ts.trap b/javascript/extractor/tests/ts/output/trap/objectLiteralAccessor.ts.trap
index f199fee3954..39bf2021809 100644
--- a/javascript/extractor/tests/ts/output/trap/objectLiteralAccessor.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/objectLiteralAccessor.ts.trap
@@ -150,158 +150,164 @@ locations_default(#20053,#10000,1,1,5,0)
 hasLocation(#20001,#20053)
 #20054=@"var;{x};{#20000}"
 variables(#20054,"x",#20000)
-#20055=*
-stmts(#20055,18,#20001,0,"var x = ... v) {}\n}")
-#20056=@"loc,{#10000},1,1,4,1"
-locations_default(#20056,#10000,1,1,4,1)
-hasLocation(#20055,#20056)
-stmt_containers(#20055,#20001)
-#20057=*
-exprs(#20057,64,#20055,0,"x = {\n  ... v) {}\n}")
-#20058=@"loc,{#10000},1,5,4,1"
-locations_default(#20058,#10000,1,5,4,1)
-hasLocation(#20057,#20058)
-enclosing_stmt(#20057,#20055)
-expr_containers(#20057,#20001)
-#20059=*
-exprs(#20059,78,#20057,0,"x")
-hasLocation(#20059,#20013)
-enclosing_stmt(#20059,#20055)
-expr_containers(#20059,#20001)
-literals("x","x",#20059)
-decl(#20059,#20054)
+#20055=@"var;{this};{#20000}"
+variables(#20055,"this",#20000)
+#20056=*
+stmts(#20056,18,#20001,0,"var x = ... v) {}\n}")
+#20057=@"loc,{#10000},1,1,4,1"
+locations_default(#20057,#10000,1,1,4,1)
+hasLocation(#20056,#20057)
+stmt_containers(#20056,#20001)
+#20058=*
+exprs(#20058,64,#20056,0,"x = {\n  ... v) {}\n}")
+#20059=@"loc,{#10000},1,5,4,1"
+locations_default(#20059,#10000,1,5,4,1)
+hasLocation(#20058,#20059)
+enclosing_stmt(#20058,#20056)
+expr_containers(#20058,#20001)
 #20060=*
-exprs(#20060,8,#20057,1,"{\n  get ... v) {}\n}")
-#20061=@"loc,{#10000},1,9,4,1"
-locations_default(#20061,#10000,1,9,4,1)
-hasLocation(#20060,#20061)
-enclosing_stmt(#20060,#20055)
+exprs(#20060,78,#20058,0,"x")
+hasLocation(#20060,#20013)
+enclosing_stmt(#20060,#20056)
 expr_containers(#20060,#20001)
-#20062=*
-properties(#20062,#20060,0,1,"get foo() {return 1}")
-#20063=@"loc,{#10000},2,3,2,22"
-locations_default(#20063,#10000,2,3,2,22)
-hasLocation(#20062,#20063)
-#20064=*
-exprs(#20064,0,#20062,0,"foo")
-hasLocation(#20064,#20021)
-enclosing_stmt(#20064,#20055)
-expr_containers(#20064,#20001)
-literals("foo","foo",#20064)
+literals("x","x",#20060)
+decl(#20060,#20054)
+#20061=*
+exprs(#20061,8,#20058,1,"{\n  get ... v) {}\n}")
+#20062=@"loc,{#10000},1,9,4,1"
+locations_default(#20062,#10000,1,9,4,1)
+hasLocation(#20061,#20062)
+enclosing_stmt(#20061,#20056)
+expr_containers(#20061,#20001)
+#20063=*
+properties(#20063,#20061,0,1,"get foo() {return 1}")
+#20064=@"loc,{#10000},2,3,2,22"
+locations_default(#20064,#10000,2,3,2,22)
+hasLocation(#20063,#20064)
 #20065=*
-exprs(#20065,9,#20062,1,"get foo() {return 1}")
-hasLocation(#20065,#20063)
-enclosing_stmt(#20065,#20055)
+exprs(#20065,0,#20063,0,"foo")
+hasLocation(#20065,#20021)
+enclosing_stmt(#20065,#20056)
 expr_containers(#20065,#20001)
+literals("foo","foo",#20065)
 #20066=*
-scopes(#20066,1)
-scopenodes(#20065,#20066)
-scopenesting(#20066,#20000)
-#20067=@"var;{arguments};{#20066}"
-variables(#20067,"arguments",#20066)
-is_arguments_object(#20067)
-#20068=*
-stmts(#20068,1,#20065,-2,"{return 1}")
-#20069=@"loc,{#10000},2,13,2,22"
-locations_default(#20069,#10000,2,13,2,22)
-hasLocation(#20068,#20069)
-stmt_containers(#20068,#20065)
+exprs(#20066,9,#20063,1,"get foo() {return 1}")
+hasLocation(#20066,#20064)
+enclosing_stmt(#20066,#20056)
+expr_containers(#20066,#20001)
+#20067=*
+scopes(#20067,1)
+scopenodes(#20066,#20067)
+scopenesting(#20067,#20000)
+#20068=@"var;{this};{#20067}"
+variables(#20068,"this",#20067)
+#20069=@"var;{arguments};{#20067}"
+variables(#20069,"arguments",#20067)
+is_arguments_object(#20069)
 #20070=*
-stmts(#20070,9,#20068,0,"return 1")
-#20071=@"loc,{#10000},2,14,2,21"
-locations_default(#20071,#10000,2,14,2,21)
+stmts(#20070,1,#20066,-2,"{return 1}")
+#20071=@"loc,{#10000},2,13,2,22"
+locations_default(#20071,#10000,2,13,2,22)
 hasLocation(#20070,#20071)
-stmt_containers(#20070,#20065)
+stmt_containers(#20070,#20066)
 #20072=*
-exprs(#20072,3,#20070,0,"1")
-hasLocation(#20072,#20031)
-enclosing_stmt(#20072,#20070)
-expr_containers(#20072,#20065)
-literals("1","1",#20072)
-is_method(#20062)
-#20073=*
-properties(#20073,#20060,1,2,"set foo(v) {}")
-#20074=@"loc,{#10000},3,3,3,15"
-locations_default(#20074,#10000,3,3,3,15)
-hasLocation(#20073,#20074)
+stmts(#20072,9,#20070,0,"return 1")
+#20073=@"loc,{#10000},2,14,2,21"
+locations_default(#20073,#10000,2,14,2,21)
+hasLocation(#20072,#20073)
+stmt_containers(#20072,#20066)
+#20074=*
+exprs(#20074,3,#20072,0,"1")
+hasLocation(#20074,#20031)
+enclosing_stmt(#20074,#20072)
+expr_containers(#20074,#20066)
+literals("1","1",#20074)
+is_method(#20063)
 #20075=*
-exprs(#20075,0,#20073,0,"foo")
-hasLocation(#20075,#20039)
-enclosing_stmt(#20075,#20055)
-expr_containers(#20075,#20001)
-literals("foo","foo",#20075)
-#20076=*
-exprs(#20076,9,#20073,1,"set foo(v) {}")
-hasLocation(#20076,#20074)
-enclosing_stmt(#20076,#20055)
-expr_containers(#20076,#20001)
+properties(#20075,#20061,1,2,"set foo(v) {}")
+#20076=@"loc,{#10000},3,3,3,15"
+locations_default(#20076,#10000,3,3,3,15)
+hasLocation(#20075,#20076)
 #20077=*
-scopes(#20077,1)
-scopenodes(#20076,#20077)
-scopenesting(#20077,#20000)
-#20078=@"var;{v};{#20077}"
-variables(#20078,"v",#20077)
+exprs(#20077,0,#20075,0,"foo")
+hasLocation(#20077,#20039)
+enclosing_stmt(#20077,#20056)
+expr_containers(#20077,#20001)
+literals("foo","foo",#20077)
+#20078=*
+exprs(#20078,9,#20075,1,"set foo(v) {}")
+hasLocation(#20078,#20076)
+enclosing_stmt(#20078,#20056)
+expr_containers(#20078,#20001)
 #20079=*
-exprs(#20079,78,#20076,0,"v")
-hasLocation(#20079,#20043)
-expr_containers(#20079,#20076)
-literals("v","v",#20079)
-decl(#20079,#20078)
-#20080=@"var;{arguments};{#20077}"
-variables(#20080,"arguments",#20077)
-is_arguments_object(#20080)
-#20081=*
-stmts(#20081,1,#20076,-2,"{}")
-#20082=@"loc,{#10000},3,14,3,15"
-locations_default(#20082,#10000,3,14,3,15)
-hasLocation(#20081,#20082)
-stmt_containers(#20081,#20076)
-is_method(#20073)
-#20083=*
-entry_cfg_node(#20083,#20001)
-#20084=@"loc,{#10000},1,1,1,0"
-locations_default(#20084,#10000,1,1,1,0)
-hasLocation(#20083,#20084)
-#20085=*
-exit_cfg_node(#20085,#20001)
-hasLocation(#20085,#20052)
-successor(#20055,#20059)
-successor(#20060,#20064)
-successor(#20076,#20073)
+scopes(#20079,1)
+scopenodes(#20078,#20079)
+scopenesting(#20079,#20000)
+#20080=@"var;{this};{#20079}"
+variables(#20080,"this",#20079)
+#20081=@"var;{v};{#20079}"
+variables(#20081,"v",#20079)
+#20082=*
+exprs(#20082,78,#20078,0,"v")
+hasLocation(#20082,#20043)
+expr_containers(#20082,#20078)
+literals("v","v",#20082)
+decl(#20082,#20081)
+#20083=@"var;{arguments};{#20079}"
+variables(#20083,"arguments",#20079)
+is_arguments_object(#20083)
+#20084=*
+stmts(#20084,1,#20078,-2,"{}")
+#20085=@"loc,{#10000},3,14,3,15"
+locations_default(#20085,#10000,3,14,3,15)
+hasLocation(#20084,#20085)
+stmt_containers(#20084,#20078)
+is_method(#20075)
 #20086=*
-entry_cfg_node(#20086,#20076)
-#20087=@"loc,{#10000},3,3,3,2"
-locations_default(#20087,#10000,3,3,3,2)
+entry_cfg_node(#20086,#20001)
+#20087=@"loc,{#10000},1,1,1,0"
+locations_default(#20087,#10000,1,1,1,0)
 hasLocation(#20086,#20087)
 #20088=*
-exit_cfg_node(#20088,#20076)
-#20089=@"loc,{#10000},3,16,3,15"
-locations_default(#20089,#10000,3,16,3,15)
-hasLocation(#20088,#20089)
-successor(#20081,#20088)
-successor(#20079,#20081)
-successor(#20086,#20079)
-successor(#20075,#20076)
-successor(#20073,#20057)
-successor(#20065,#20062)
-#20090=*
-entry_cfg_node(#20090,#20065)
-#20091=@"loc,{#10000},2,3,2,2"
-locations_default(#20091,#10000,2,3,2,2)
-hasLocation(#20090,#20091)
-#20092=*
-exit_cfg_node(#20092,#20065)
-#20093=@"loc,{#10000},2,23,2,22"
-locations_default(#20093,#10000,2,23,2,22)
-hasLocation(#20092,#20093)
-successor(#20072,#20070)
-successor(#20070,#20092)
-successor(#20068,#20072)
-successor(#20090,#20068)
-successor(#20064,#20065)
-successor(#20062,#20075)
-successor(#20059,#20060)
-successor(#20057,#20085)
-successor(#20083,#20055)
+exit_cfg_node(#20088,#20001)
+hasLocation(#20088,#20052)
+successor(#20056,#20060)
+successor(#20061,#20065)
+successor(#20078,#20075)
+#20089=*
+entry_cfg_node(#20089,#20078)
+#20090=@"loc,{#10000},3,3,3,2"
+locations_default(#20090,#10000,3,3,3,2)
+hasLocation(#20089,#20090)
+#20091=*
+exit_cfg_node(#20091,#20078)
+#20092=@"loc,{#10000},3,16,3,15"
+locations_default(#20092,#10000,3,16,3,15)
+hasLocation(#20091,#20092)
+successor(#20084,#20091)
+successor(#20082,#20084)
+successor(#20089,#20082)
+successor(#20077,#20078)
+successor(#20075,#20058)
+successor(#20066,#20063)
+#20093=*
+entry_cfg_node(#20093,#20066)
+#20094=@"loc,{#10000},2,3,2,2"
+locations_default(#20094,#10000,2,3,2,2)
+hasLocation(#20093,#20094)
+#20095=*
+exit_cfg_node(#20095,#20066)
+#20096=@"loc,{#10000},2,23,2,22"
+locations_default(#20096,#10000,2,23,2,22)
+hasLocation(#20095,#20096)
+successor(#20074,#20072)
+successor(#20072,#20095)
+successor(#20070,#20074)
+successor(#20093,#20070)
+successor(#20065,#20066)
+successor(#20063,#20077)
+successor(#20060,#20061)
+successor(#20058,#20088)
+successor(#20086,#20056)
 numlines(#10000,4,4,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/omitted.ts.trap b/javascript/extractor/tests/ts/output/trap/omitted.ts.trap
index ad6845df6f8..09d6c281656 100644
--- a/javascript/extractor/tests/ts/output/trap/omitted.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/omitted.ts.trap
@@ -52,35 +52,37 @@ locations_default(#20017,#10000,1,8,1,7)
 hasLocation(#20016,#20017)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20018=*
-stmts(#20018,2,#20001,0,"[, ,1];")
-hasLocation(#20018,#20003)
-stmt_containers(#20018,#20001)
+#20018=@"var;{this};{#20000}"
+variables(#20018,"this",#20000)
 #20019=*
-exprs(#20019,7,#20018,0,"[, ,1]")
-#20020=@"loc,{#10000},1,1,1,6"
-locations_default(#20020,#10000,1,1,1,6)
-hasLocation(#20019,#20020)
-enclosing_stmt(#20019,#20018)
-expr_containers(#20019,#20001)
-#20021=*
-exprs(#20021,3,#20019,2,"1")
-hasLocation(#20021,#20011)
-enclosing_stmt(#20021,#20018)
-expr_containers(#20021,#20001)
-literals("1","1",#20021)
-array_size(#20019,3)
+stmts(#20019,2,#20001,0,"[, ,1];")
+hasLocation(#20019,#20003)
+stmt_containers(#20019,#20001)
+#20020=*
+exprs(#20020,7,#20019,0,"[, ,1]")
+#20021=@"loc,{#10000},1,1,1,6"
+locations_default(#20021,#10000,1,1,1,6)
+hasLocation(#20020,#20021)
+enclosing_stmt(#20020,#20019)
+expr_containers(#20020,#20001)
 #20022=*
-entry_cfg_node(#20022,#20001)
-#20023=@"loc,{#10000},1,1,1,0"
-locations_default(#20023,#10000,1,1,1,0)
-hasLocation(#20022,#20023)
-#20024=*
-exit_cfg_node(#20024,#20001)
-hasLocation(#20024,#20017)
-successor(#20018,#20019)
-successor(#20019,#20021)
-successor(#20021,#20024)
-successor(#20022,#20018)
+exprs(#20022,3,#20020,2,"1")
+hasLocation(#20022,#20011)
+enclosing_stmt(#20022,#20019)
+expr_containers(#20022,#20001)
+literals("1","1",#20022)
+array_size(#20020,3)
+#20023=*
+entry_cfg_node(#20023,#20001)
+#20024=@"loc,{#10000},1,1,1,0"
+locations_default(#20024,#10000,1,1,1,0)
+hasLocation(#20023,#20024)
+#20025=*
+exit_cfg_node(#20025,#20001)
+hasLocation(#20025,#20017)
+successor(#20019,#20020)
+successor(#20020,#20022)
+successor(#20022,#20025)
+successor(#20023,#20019)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/optionalChaining.ts.trap b/javascript/extractor/tests/ts/output/trap/optionalChaining.ts.trap
index 754aae68649..40f82e8a70a 100644
--- a/javascript/extractor/tests/ts/output/trap/optionalChaining.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/optionalChaining.ts.trap
@@ -147,157 +147,159 @@ toplevels(#20001,0)
 #20054=@"loc,{#10000},1,1,4,0"
 locations_default(#20054,#10000,1,1,4,0)
 hasLocation(#20001,#20054)
-#20055=*
-stmts(#20055,2,#20001,0,"base?.x.y;")
-hasLocation(#20055,#20003)
-stmt_containers(#20055,#20001)
+#20055=@"var;{this};{#20000}"
+variables(#20055,"this",#20000)
 #20056=*
-exprs(#20056,14,#20055,0,"base?.x.y")
-#20057=@"loc,{#10000},1,1,1,9"
-locations_default(#20057,#10000,1,1,1,9)
-hasLocation(#20056,#20057)
-enclosing_stmt(#20056,#20055)
-expr_containers(#20056,#20001)
-#20058=*
-exprs(#20058,14,#20056,0,"base?.x")
-#20059=@"loc,{#10000},1,1,1,7"
-locations_default(#20059,#10000,1,1,1,7)
-hasLocation(#20058,#20059)
-enclosing_stmt(#20058,#20055)
-expr_containers(#20058,#20001)
-#20060=*
-exprs(#20060,79,#20058,0,"base")
-hasLocation(#20060,#20009)
-enclosing_stmt(#20060,#20055)
-expr_containers(#20060,#20001)
-literals("base","base",#20060)
-#20061=@"var;{base};{#20000}"
-variables(#20061,"base",#20000)
-bind(#20060,#20061)
-#20062=*
-exprs(#20062,0,#20058,1,"x")
-hasLocation(#20062,#20013)
-enclosing_stmt(#20062,#20055)
-expr_containers(#20062,#20001)
-literals("x","x",#20062)
-isOptionalChaining(#20058)
+stmts(#20056,2,#20001,0,"base?.x.y;")
+hasLocation(#20056,#20003)
+stmt_containers(#20056,#20001)
+#20057=*
+exprs(#20057,14,#20056,0,"base?.x.y")
+#20058=@"loc,{#10000},1,1,1,9"
+locations_default(#20058,#10000,1,1,1,9)
+hasLocation(#20057,#20058)
+enclosing_stmt(#20057,#20056)
+expr_containers(#20057,#20001)
+#20059=*
+exprs(#20059,14,#20057,0,"base?.x")
+#20060=@"loc,{#10000},1,1,1,7"
+locations_default(#20060,#10000,1,1,1,7)
+hasLocation(#20059,#20060)
+enclosing_stmt(#20059,#20056)
+expr_containers(#20059,#20001)
+#20061=*
+exprs(#20061,79,#20059,0,"base")
+hasLocation(#20061,#20009)
+enclosing_stmt(#20061,#20056)
+expr_containers(#20061,#20001)
+literals("base","base",#20061)
+#20062=@"var;{base};{#20000}"
+variables(#20062,"base",#20000)
+bind(#20061,#20062)
 #20063=*
-exprs(#20063,0,#20056,1,"y")
-hasLocation(#20063,#20017)
-enclosing_stmt(#20063,#20055)
+exprs(#20063,0,#20059,1,"x")
+hasLocation(#20063,#20013)
+enclosing_stmt(#20063,#20056)
 expr_containers(#20063,#20001)
-literals("y","y",#20063)
+literals("x","x",#20063)
+isOptionalChaining(#20059)
 #20064=*
-stmts(#20064,2,#20001,1,"base?.(x).y;")
-hasLocation(#20064,#20005)
-stmt_containers(#20064,#20001)
+exprs(#20064,0,#20057,1,"y")
+hasLocation(#20064,#20017)
+enclosing_stmt(#20064,#20056)
+expr_containers(#20064,#20001)
+literals("y","y",#20064)
 #20065=*
-exprs(#20065,14,#20064,0,"base?.(x).y")
-#20066=@"loc,{#10000},2,1,2,11"
-locations_default(#20066,#10000,2,1,2,11)
-hasLocation(#20065,#20066)
-enclosing_stmt(#20065,#20064)
-expr_containers(#20065,#20001)
-#20067=*
-exprs(#20067,13,#20065,0,"base?.(x)")
-#20068=@"loc,{#10000},2,1,2,9"
-locations_default(#20068,#10000,2,1,2,9)
-hasLocation(#20067,#20068)
-enclosing_stmt(#20067,#20064)
-expr_containers(#20067,#20001)
-#20069=*
-exprs(#20069,79,#20067,-1,"base")
-hasLocation(#20069,#20021)
-enclosing_stmt(#20069,#20064)
-expr_containers(#20069,#20001)
-literals("base","base",#20069)
-bind(#20069,#20061)
+stmts(#20065,2,#20001,1,"base?.(x).y;")
+hasLocation(#20065,#20005)
+stmt_containers(#20065,#20001)
+#20066=*
+exprs(#20066,14,#20065,0,"base?.(x).y")
+#20067=@"loc,{#10000},2,1,2,11"
+locations_default(#20067,#10000,2,1,2,11)
+hasLocation(#20066,#20067)
+enclosing_stmt(#20066,#20065)
+expr_containers(#20066,#20001)
+#20068=*
+exprs(#20068,13,#20066,0,"base?.(x)")
+#20069=@"loc,{#10000},2,1,2,9"
+locations_default(#20069,#10000,2,1,2,9)
+hasLocation(#20068,#20069)
+enclosing_stmt(#20068,#20065)
+expr_containers(#20068,#20001)
 #20070=*
-exprs(#20070,79,#20067,0,"x")
-hasLocation(#20070,#20027)
-enclosing_stmt(#20070,#20064)
+exprs(#20070,79,#20068,-1,"base")
+hasLocation(#20070,#20021)
+enclosing_stmt(#20070,#20065)
 expr_containers(#20070,#20001)
-literals("x","x",#20070)
-#20071=@"var;{x};{#20000}"
-variables(#20071,"x",#20000)
-bind(#20070,#20071)
-isOptionalChaining(#20067)
-#20072=*
-exprs(#20072,0,#20065,1,"y")
-hasLocation(#20072,#20033)
-enclosing_stmt(#20072,#20064)
-expr_containers(#20072,#20001)
-literals("y","y",#20072)
+literals("base","base",#20070)
+bind(#20070,#20062)
+#20071=*
+exprs(#20071,79,#20068,0,"x")
+hasLocation(#20071,#20027)
+enclosing_stmt(#20071,#20065)
+expr_containers(#20071,#20001)
+literals("x","x",#20071)
+#20072=@"var;{x};{#20000}"
+variables(#20072,"x",#20000)
+bind(#20071,#20072)
+isOptionalChaining(#20068)
 #20073=*
-stmts(#20073,2,#20001,2,"base?.[z].y;")
-hasLocation(#20073,#20007)
-stmt_containers(#20073,#20001)
+exprs(#20073,0,#20066,1,"y")
+hasLocation(#20073,#20033)
+enclosing_stmt(#20073,#20065)
+expr_containers(#20073,#20001)
+literals("y","y",#20073)
 #20074=*
-exprs(#20074,14,#20073,0,"base?.[z].y")
-#20075=@"loc,{#10000},3,1,3,11"
-locations_default(#20075,#10000,3,1,3,11)
-hasLocation(#20074,#20075)
-enclosing_stmt(#20074,#20073)
-expr_containers(#20074,#20001)
-#20076=*
-exprs(#20076,15,#20074,0,"base?.[z]")
-#20077=@"loc,{#10000},3,1,3,9"
-locations_default(#20077,#10000,3,1,3,9)
-hasLocation(#20076,#20077)
-enclosing_stmt(#20076,#20073)
-expr_containers(#20076,#20001)
-#20078=*
-exprs(#20078,79,#20076,0,"base")
-hasLocation(#20078,#20037)
-enclosing_stmt(#20078,#20073)
-expr_containers(#20078,#20001)
-literals("base","base",#20078)
-bind(#20078,#20061)
+stmts(#20074,2,#20001,2,"base?.[z].y;")
+hasLocation(#20074,#20007)
+stmt_containers(#20074,#20001)
+#20075=*
+exprs(#20075,14,#20074,0,"base?.[z].y")
+#20076=@"loc,{#10000},3,1,3,11"
+locations_default(#20076,#10000,3,1,3,11)
+hasLocation(#20075,#20076)
+enclosing_stmt(#20075,#20074)
+expr_containers(#20075,#20001)
+#20077=*
+exprs(#20077,15,#20075,0,"base?.[z]")
+#20078=@"loc,{#10000},3,1,3,9"
+locations_default(#20078,#10000,3,1,3,9)
+hasLocation(#20077,#20078)
+enclosing_stmt(#20077,#20074)
+expr_containers(#20077,#20001)
 #20079=*
-exprs(#20079,79,#20076,1,"z")
-hasLocation(#20079,#20043)
-enclosing_stmt(#20079,#20073)
+exprs(#20079,79,#20077,0,"base")
+hasLocation(#20079,#20037)
+enclosing_stmt(#20079,#20074)
 expr_containers(#20079,#20001)
-literals("z","z",#20079)
-#20080=@"var;{z};{#20000}"
-variables(#20080,"z",#20000)
-bind(#20079,#20080)
-isOptionalChaining(#20076)
-#20081=*
-exprs(#20081,0,#20074,1,"y")
-hasLocation(#20081,#20049)
-enclosing_stmt(#20081,#20073)
-expr_containers(#20081,#20001)
-literals("y","y",#20081)
+literals("base","base",#20079)
+bind(#20079,#20062)
+#20080=*
+exprs(#20080,79,#20077,1,"z")
+hasLocation(#20080,#20043)
+enclosing_stmt(#20080,#20074)
+expr_containers(#20080,#20001)
+literals("z","z",#20080)
+#20081=@"var;{z};{#20000}"
+variables(#20081,"z",#20000)
+bind(#20080,#20081)
+isOptionalChaining(#20077)
 #20082=*
-entry_cfg_node(#20082,#20001)
-#20083=@"loc,{#10000},1,1,1,0"
-locations_default(#20083,#10000,1,1,1,0)
-hasLocation(#20082,#20083)
-#20084=*
-exit_cfg_node(#20084,#20001)
-hasLocation(#20084,#20053)
-successor(#20073,#20078)
-successor(#20081,#20074)
-successor(#20079,#20076)
-successor(#20078,#20079)
-successor(#20076,#20081)
-successor(#20078,#20084)
-successor(#20074,#20084)
-successor(#20064,#20069)
-successor(#20072,#20065)
-successor(#20070,#20067)
-successor(#20069,#20070)
-successor(#20067,#20072)
-successor(#20069,#20073)
-successor(#20065,#20073)
-successor(#20055,#20060)
-successor(#20063,#20056)
-successor(#20062,#20058)
-successor(#20060,#20062)
-successor(#20058,#20063)
-successor(#20060,#20064)
-successor(#20056,#20064)
-successor(#20082,#20055)
+exprs(#20082,0,#20075,1,"y")
+hasLocation(#20082,#20049)
+enclosing_stmt(#20082,#20074)
+expr_containers(#20082,#20001)
+literals("y","y",#20082)
+#20083=*
+entry_cfg_node(#20083,#20001)
+#20084=@"loc,{#10000},1,1,1,0"
+locations_default(#20084,#10000,1,1,1,0)
+hasLocation(#20083,#20084)
+#20085=*
+exit_cfg_node(#20085,#20001)
+hasLocation(#20085,#20053)
+successor(#20074,#20079)
+successor(#20082,#20075)
+successor(#20080,#20077)
+successor(#20079,#20080)
+successor(#20077,#20082)
+successor(#20079,#20085)
+successor(#20075,#20085)
+successor(#20065,#20070)
+successor(#20073,#20066)
+successor(#20071,#20068)
+successor(#20070,#20071)
+successor(#20068,#20073)
+successor(#20070,#20074)
+successor(#20066,#20074)
+successor(#20056,#20061)
+successor(#20064,#20057)
+successor(#20063,#20059)
+successor(#20061,#20063)
+successor(#20059,#20064)
+successor(#20061,#20065)
+successor(#20057,#20065)
+successor(#20083,#20056)
 numlines(#10000,3,3,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/privateField.ts.trap b/javascript/extractor/tests/ts/output/trap/privateField.ts.trap
index 55897164df6..f94cabaf5b2 100644
--- a/javascript/extractor/tests/ts/output/trap/privateField.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/privateField.ts.trap
@@ -136,138 +136,145 @@ hasLocation(#20001,#20045)
 variables(#20046,"C",#20000)
 #20047=@"local_type_name;{C};{#20000}"
 local_type_names(#20047,"C",#20000)
-#20048=*
-stmts(#20048,26,#20001,0,"class C ... 5;\n }\n}")
-#20049=@"loc,{#10000},1,1,6,1"
-locations_default(#20049,#10000,1,1,6,1)
-hasLocation(#20048,#20049)
-stmt_containers(#20048,#20001)
-#20050=*
-exprs(#20050,78,#20048,0,"C")
-hasLocation(#20050,#20017)
-enclosing_stmt(#20050,#20048)
-expr_containers(#20050,#20001)
-literals("C","C",#20050)
-decl(#20050,#20046)
-typedecl(#20050,#20047)
+#20048=@"var;{this};{#20000}"
+variables(#20048,"this",#20000)
+#20049=*
+stmts(#20049,26,#20001,0,"class C ... 5;\n }\n}")
+#20050=@"loc,{#10000},1,1,6,1"
+locations_default(#20050,#10000,1,1,6,1)
+hasLocation(#20049,#20050)
+stmt_containers(#20049,#20001)
 #20051=*
-scopes(#20051,10)
-scopenodes(#20048,#20051)
-scopenesting(#20051,#20000)
+exprs(#20051,78,#20049,0,"C")
+hasLocation(#20051,#20017)
+enclosing_stmt(#20051,#20049)
+expr_containers(#20051,#20001)
+literals("C","C",#20051)
+decl(#20051,#20046)
+typedecl(#20051,#20047)
 #20052=*
-properties(#20052,#20048,2,8,"#foo;")
-#20053=@"loc,{#10000},2,2,2,6"
-locations_default(#20053,#10000,2,2,2,6)
-hasLocation(#20052,#20053)
+scopes(#20052,10)
+scopenodes(#20049,#20052)
+scopenesting(#20052,#20000)
+#20053=@"var;{this};{#20052}"
+variables(#20053,"this",#20052)
 #20054=*
-#20055=*
-exprs(#20055,0,#20052,0,"#foo")
-#20056=@"loc,{#10000},2,2,2,5"
-locations_default(#20056,#10000,2,2,2,5)
-hasLocation(#20055,#20056)
-expr_containers(#20055,#20054)
-literals("#foo","#foo",#20055)
+properties(#20054,#20049,2,8,"#foo;")
+#20055=@"loc,{#10000},2,2,2,6"
+locations_default(#20055,#10000,2,2,2,6)
+hasLocation(#20054,#20055)
+#20056=*
 #20057=*
-properties(#20057,#20048,3,0,"constru ... = 5;\n }")
-#20058=@"loc,{#10000},3,2,5,2"
-locations_default(#20058,#10000,3,2,5,2)
+exprs(#20057,0,#20054,0,"#foo")
+#20058=@"loc,{#10000},2,2,2,5"
+locations_default(#20058,#10000,2,2,2,5)
 hasLocation(#20057,#20058)
+expr_containers(#20057,#20056)
+literals("#foo","#foo",#20057)
 #20059=*
-exprs(#20059,0,#20057,0,"constru ... = 5;\n }")
-hasLocation(#20059,#20058)
-enclosing_stmt(#20059,#20048)
-expr_containers(#20059,#20001)
-literals("constructor","constructor",#20059)
-exprs(#20054,9,#20057,1,"constru ... = 5;\n }")
-hasLocation(#20054,#20058)
-enclosing_stmt(#20054,#20048)
-expr_containers(#20054,#20001)
-#20060=*
-scopes(#20060,1)
-scopenodes(#20054,#20060)
-scopenesting(#20060,#20051)
-#20061=@"var;{arguments};{#20060}"
-variables(#20061,"arguments",#20060)
-is_arguments_object(#20061)
+properties(#20059,#20049,3,0,"constru ... = 5;\n }")
+#20060=@"loc,{#10000},3,2,5,2"
+locations_default(#20060,#10000,3,2,5,2)
+hasLocation(#20059,#20060)
+#20061=*
+exprs(#20061,0,#20059,0,"constru ... = 5;\n }")
+hasLocation(#20061,#20060)
+enclosing_stmt(#20061,#20049)
+expr_containers(#20061,#20001)
+literals("constructor","constructor",#20061)
+exprs(#20056,9,#20059,1,"constru ... = 5;\n }")
+hasLocation(#20056,#20060)
+enclosing_stmt(#20056,#20049)
+expr_containers(#20056,#20001)
 #20062=*
-stmts(#20062,1,#20054,-2,"{\n   th ... = 5;\n }")
-#20063=@"loc,{#10000},3,16,5,2"
-locations_default(#20063,#10000,3,16,5,2)
-hasLocation(#20062,#20063)
-stmt_containers(#20062,#20054)
-#20064=*
-stmts(#20064,2,#20062,0,"this.#foo = 5;")
-#20065=@"loc,{#10000},4,4,4,17"
-locations_default(#20065,#10000,4,4,4,17)
-hasLocation(#20064,#20065)
-stmt_containers(#20064,#20054)
-#20066=*
-exprs(#20066,47,#20064,0,"this.#foo = 5")
-#20067=@"loc,{#10000},4,4,4,16"
-locations_default(#20067,#10000,4,4,4,16)
-hasLocation(#20066,#20067)
-enclosing_stmt(#20066,#20064)
-expr_containers(#20066,#20054)
-#20068=*
-exprs(#20068,14,#20066,0,"this.#foo")
-#20069=@"loc,{#10000},4,4,4,12"
-locations_default(#20069,#10000,4,4,4,12)
-hasLocation(#20068,#20069)
-enclosing_stmt(#20068,#20064)
-expr_containers(#20068,#20054)
-#20070=*
-exprs(#20070,6,#20068,0,"this")
-hasLocation(#20070,#20031)
-enclosing_stmt(#20070,#20064)
-expr_containers(#20070,#20054)
+scopes(#20062,1)
+scopenodes(#20056,#20062)
+scopenesting(#20062,#20052)
+#20063=@"var;{this};{#20062}"
+variables(#20063,"this",#20062)
+#20064=@"var;{arguments};{#20062}"
+variables(#20064,"arguments",#20062)
+is_arguments_object(#20064)
+#20065=*
+stmts(#20065,1,#20056,-2,"{\n   th ... = 5;\n }")
+#20066=@"loc,{#10000},3,16,5,2"
+locations_default(#20066,#10000,3,16,5,2)
+hasLocation(#20065,#20066)
+stmt_containers(#20065,#20056)
+#20067=*
+stmts(#20067,2,#20065,0,"this.#foo = 5;")
+#20068=@"loc,{#10000},4,4,4,17"
+locations_default(#20068,#10000,4,4,4,17)
+hasLocation(#20067,#20068)
+stmt_containers(#20067,#20056)
+#20069=*
+exprs(#20069,47,#20067,0,"this.#foo = 5")
+#20070=@"loc,{#10000},4,4,4,16"
+locations_default(#20070,#10000,4,4,4,16)
+hasLocation(#20069,#20070)
+enclosing_stmt(#20069,#20067)
+expr_containers(#20069,#20056)
 #20071=*
-exprs(#20071,0,#20068,1,"#foo")
-#20072=@"loc,{#10000},4,9,4,12"
-locations_default(#20072,#10000,4,9,4,12)
+exprs(#20071,14,#20069,0,"this.#foo")
+#20072=@"loc,{#10000},4,4,4,12"
+locations_default(#20072,#10000,4,4,4,12)
 hasLocation(#20071,#20072)
-enclosing_stmt(#20071,#20064)
-expr_containers(#20071,#20054)
-literals("#foo","#foo",#20071)
+enclosing_stmt(#20071,#20067)
+expr_containers(#20071,#20056)
 #20073=*
-exprs(#20073,3,#20066,1,"5")
-hasLocation(#20073,#20037)
-enclosing_stmt(#20073,#20064)
-expr_containers(#20073,#20054)
-literals("5","5",#20073)
-is_method(#20057)
+exprs(#20073,6,#20071,0,"this")
+hasLocation(#20073,#20031)
+enclosing_stmt(#20073,#20067)
+expr_containers(#20073,#20056)
+bind(#20073,#20063)
 #20074=*
-entry_cfg_node(#20074,#20001)
-#20075=@"loc,{#10000},1,1,1,0"
-locations_default(#20075,#10000,1,1,1,0)
+exprs(#20074,0,#20071,1,"#foo")
+#20075=@"loc,{#10000},4,9,4,12"
+locations_default(#20075,#10000,4,9,4,12)
 hasLocation(#20074,#20075)
+enclosing_stmt(#20074,#20067)
+expr_containers(#20074,#20056)
+literals("#foo","#foo",#20074)
 #20076=*
-exit_cfg_node(#20076,#20001)
-hasLocation(#20076,#20044)
-successor(#20055,#20052)
-successor(#20054,#20057)
+exprs(#20076,3,#20069,1,"5")
+hasLocation(#20076,#20037)
+enclosing_stmt(#20076,#20067)
+expr_containers(#20076,#20056)
+literals("5","5",#20076)
+is_method(#20059)
 #20077=*
-entry_cfg_node(#20077,#20054)
-#20078=@"loc,{#10000},3,2,3,1"
-locations_default(#20078,#10000,3,2,3,1)
+entry_cfg_node(#20077,#20001)
+#20078=@"loc,{#10000},1,1,1,0"
+locations_default(#20078,#10000,1,1,1,0)
 hasLocation(#20077,#20078)
-successor(#20052,#20062)
 #20079=*
-exit_cfg_node(#20079,#20054)
-#20080=@"loc,{#10000},5,3,5,2"
-locations_default(#20080,#10000,5,3,5,2)
-hasLocation(#20079,#20080)
-successor(#20064,#20070)
-successor(#20073,#20066)
-successor(#20071,#20068)
-successor(#20070,#20071)
-successor(#20068,#20073)
-successor(#20066,#20079)
-successor(#20062,#20064)
-successor(#20077,#20055)
-successor(#20059,#20054)
-successor(#20057,#20048)
-successor(#20050,#20059)
-successor(#20048,#20076)
-successor(#20074,#20050)
+exit_cfg_node(#20079,#20001)
+hasLocation(#20079,#20044)
+successor(#20057,#20054)
+successor(#20056,#20059)
+#20080=*
+entry_cfg_node(#20080,#20056)
+#20081=@"loc,{#10000},3,2,3,1"
+locations_default(#20081,#10000,3,2,3,1)
+hasLocation(#20080,#20081)
+successor(#20054,#20065)
+#20082=*
+exit_cfg_node(#20082,#20056)
+#20083=@"loc,{#10000},5,3,5,2"
+locations_default(#20083,#10000,5,3,5,2)
+hasLocation(#20082,#20083)
+successor(#20067,#20073)
+successor(#20076,#20069)
+successor(#20074,#20071)
+successor(#20073,#20074)
+successor(#20071,#20076)
+successor(#20069,#20082)
+successor(#20065,#20067)
+successor(#20080,#20057)
+successor(#20061,#20056)
+successor(#20059,#20049)
+successor(#20051,#20061)
+successor(#20049,#20079)
+successor(#20077,#20051)
 numlines(#10000,6,6,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/regexp.ts.trap b/javascript/extractor/tests/ts/output/trap/regexp.ts.trap
index 9b26fb5f75a..40d9ba26d0e 100644
--- a/javascript/extractor/tests/ts/output/trap/regexp.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/regexp.ts.trap
@@ -25,32 +25,34 @@ locations_default(#20006,#10000,1,4,1,3)
 hasLocation(#20005,#20006)
 toplevels(#20001,0)
 hasLocation(#20001,#20003)
-#20007=*
-stmts(#20007,2,#20001,0,"/a/")
-hasLocation(#20007,#20003)
-stmt_containers(#20007,#20001)
+#20007=@"var;{this};{#20000}"
+variables(#20007,"this",#20000)
 #20008=*
-exprs(#20008,5,#20007,0,"/a/")
+stmts(#20008,2,#20001,0,"/a/")
 hasLocation(#20008,#20003)
-enclosing_stmt(#20008,#20007)
-expr_containers(#20008,#20001)
-literals("/a/","/a/",#20008)
+stmt_containers(#20008,#20001)
 #20009=*
-regexpterm(#20009,14,#20008,0,"a")
-#20010=@"loc,{#10000},1,2,1,2"
-locations_default(#20010,#10000,1,2,1,2)
-hasLocation(#20009,#20010)
-regexp_const_value(#20009,"a")
-#20011=*
-entry_cfg_node(#20011,#20001)
-#20012=@"loc,{#10000},1,1,1,0"
-locations_default(#20012,#10000,1,1,1,0)
-hasLocation(#20011,#20012)
-#20013=*
-exit_cfg_node(#20013,#20001)
-hasLocation(#20013,#20006)
-successor(#20007,#20008)
-successor(#20008,#20013)
-successor(#20011,#20007)
+exprs(#20009,5,#20008,0,"/a/")
+hasLocation(#20009,#20003)
+enclosing_stmt(#20009,#20008)
+expr_containers(#20009,#20001)
+literals("/a/","/a/",#20009)
+#20010=*
+regexpterm(#20010,14,#20009,0,"a")
+#20011=@"loc,{#10000},1,2,1,2"
+locations_default(#20011,#10000,1,2,1,2)
+hasLocation(#20010,#20011)
+regexp_const_value(#20010,"a")
+#20012=*
+entry_cfg_node(#20012,#20001)
+#20013=@"loc,{#10000},1,1,1,0"
+locations_default(#20013,#10000,1,1,1,0)
+hasLocation(#20012,#20013)
+#20014=*
+exit_cfg_node(#20014,#20001)
+hasLocation(#20014,#20006)
+successor(#20008,#20009)
+successor(#20009,#20014)
+successor(#20012,#20008)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/templates.ts.trap b/javascript/extractor/tests/ts/output/trap/templates.ts.trap
index 5193508e1ed..74e774dbdd4 100644
--- a/javascript/extractor/tests/ts/output/trap/templates.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/templates.ts.trap
@@ -60,83 +60,85 @@ toplevels(#20001,0)
 #20020=@"loc,{#10000},1,1,2,0"
 locations_default(#20020,#10000,1,1,2,0)
 hasLocation(#20001,#20020)
-#20021=*
-stmts(#20021,2,#20001,0,"`url(""$ ... age}"")`")
-hasLocation(#20021,#20003)
-stmt_containers(#20021,#20001)
+#20021=@"var;{this};{#20000}"
+variables(#20021,"this",#20000)
 #20022=*
-exprs(#20022,71,#20021,0,"`url(""$ ... age}"")`")
+stmts(#20022,2,#20001,0,"`url(""$ ... age}"")`")
 hasLocation(#20022,#20003)
-enclosing_stmt(#20022,#20021)
-expr_containers(#20022,#20001)
+stmt_containers(#20022,#20001)
 #20023=*
-exprs(#20023,72,#20022,0,"url(""")
-#20024=@"loc,{#10000},1,2,1,6"
-locations_default(#20024,#10000,1,2,1,6)
-hasLocation(#20023,#20024)
-enclosing_stmt(#20023,#20021)
+exprs(#20023,71,#20022,0,"`url(""$ ... age}"")`")
+hasLocation(#20023,#20003)
+enclosing_stmt(#20023,#20022)
 expr_containers(#20023,#20001)
-literals("url(""","url(""",#20023)
-#20025=*
-exprs(#20025,14,#20022,1,"ctx.expected.image")
-#20026=@"loc,{#10000},1,9,1,26"
-locations_default(#20026,#10000,1,9,1,26)
-hasLocation(#20025,#20026)
-enclosing_stmt(#20025,#20021)
-expr_containers(#20025,#20001)
-#20027=*
-exprs(#20027,14,#20025,0,"ctx.expected")
-#20028=@"loc,{#10000},1,9,1,20"
-locations_default(#20028,#10000,1,9,1,20)
-hasLocation(#20027,#20028)
-enclosing_stmt(#20027,#20021)
-expr_containers(#20027,#20001)
-#20029=*
-exprs(#20029,79,#20027,0,"ctx")
-hasLocation(#20029,#20007)
-enclosing_stmt(#20029,#20021)
-expr_containers(#20029,#20001)
-literals("ctx","ctx",#20029)
-#20030=@"var;{ctx};{#20000}"
-variables(#20030,"ctx",#20000)
-bind(#20029,#20030)
-#20031=*
-exprs(#20031,0,#20027,1,"expected")
-hasLocation(#20031,#20011)
-enclosing_stmt(#20031,#20021)
-expr_containers(#20031,#20001)
-literals("expected","expected",#20031)
+#20024=*
+exprs(#20024,72,#20023,0,"url(""")
+#20025=@"loc,{#10000},1,2,1,6"
+locations_default(#20025,#10000,1,2,1,6)
+hasLocation(#20024,#20025)
+enclosing_stmt(#20024,#20022)
+expr_containers(#20024,#20001)
+literals("url(""","url(""",#20024)
+#20026=*
+exprs(#20026,14,#20023,1,"ctx.expected.image")
+#20027=@"loc,{#10000},1,9,1,26"
+locations_default(#20027,#10000,1,9,1,26)
+hasLocation(#20026,#20027)
+enclosing_stmt(#20026,#20022)
+expr_containers(#20026,#20001)
+#20028=*
+exprs(#20028,14,#20026,0,"ctx.expected")
+#20029=@"loc,{#10000},1,9,1,20"
+locations_default(#20029,#10000,1,9,1,20)
+hasLocation(#20028,#20029)
+enclosing_stmt(#20028,#20022)
+expr_containers(#20028,#20001)
+#20030=*
+exprs(#20030,79,#20028,0,"ctx")
+hasLocation(#20030,#20007)
+enclosing_stmt(#20030,#20022)
+expr_containers(#20030,#20001)
+literals("ctx","ctx",#20030)
+#20031=@"var;{ctx};{#20000}"
+variables(#20031,"ctx",#20000)
+bind(#20030,#20031)
 #20032=*
-exprs(#20032,0,#20025,1,"image")
-hasLocation(#20032,#20015)
-enclosing_stmt(#20032,#20021)
+exprs(#20032,0,#20028,1,"expected")
+hasLocation(#20032,#20011)
+enclosing_stmt(#20032,#20022)
 expr_containers(#20032,#20001)
-literals("image","image",#20032)
+literals("expected","expected",#20032)
 #20033=*
-exprs(#20033,72,#20022,2,""")")
-#20034=@"loc,{#10000},1,28,1,29"
-locations_default(#20034,#10000,1,28,1,29)
-hasLocation(#20033,#20034)
-enclosing_stmt(#20033,#20021)
+exprs(#20033,0,#20026,1,"image")
+hasLocation(#20033,#20015)
+enclosing_stmt(#20033,#20022)
 expr_containers(#20033,#20001)
-literals(""")",""")",#20033)
-#20035=*
-entry_cfg_node(#20035,#20001)
-#20036=@"loc,{#10000},1,1,1,0"
-locations_default(#20036,#10000,1,1,1,0)
-hasLocation(#20035,#20036)
-#20037=*
-exit_cfg_node(#20037,#20001)
-hasLocation(#20037,#20019)
-successor(#20021,#20022)
+literals("image","image",#20033)
+#20034=*
+exprs(#20034,72,#20023,2,""")")
+#20035=@"loc,{#10000},1,28,1,29"
+locations_default(#20035,#10000,1,28,1,29)
+hasLocation(#20034,#20035)
+enclosing_stmt(#20034,#20022)
+expr_containers(#20034,#20001)
+literals(""")",""")",#20034)
+#20036=*
+entry_cfg_node(#20036,#20001)
+#20037=@"loc,{#10000},1,1,1,0"
+locations_default(#20037,#10000,1,1,1,0)
+hasLocation(#20036,#20037)
+#20038=*
+exit_cfg_node(#20038,#20001)
+hasLocation(#20038,#20019)
 successor(#20022,#20023)
-successor(#20033,#20037)
-successor(#20032,#20025)
-successor(#20031,#20027)
-successor(#20029,#20031)
-successor(#20027,#20032)
-successor(#20025,#20033)
-successor(#20023,#20029)
-successor(#20035,#20021)
+successor(#20023,#20024)
+successor(#20034,#20038)
+successor(#20033,#20026)
+successor(#20032,#20028)
+successor(#20030,#20032)
+successor(#20028,#20033)
+successor(#20026,#20034)
+successor(#20024,#20030)
+successor(#20036,#20022)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/thisparameter.ts.trap b/javascript/extractor/tests/ts/output/trap/thisparameter.ts.trap
index 27b075f05c7..3959d07da03 100644
--- a/javascript/extractor/tests/ts/output/trap/thisparameter.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/thisparameter.ts.trap
@@ -433,333 +433,349 @@ variables(#20162,"C",#20000)
 local_type_names(#20163,"C",#20000)
 #20164=@"local_type_name;{I};{#20000}"
 local_type_names(#20164,"I",#20000)
-#20165=*
-stmts(#20165,17,#20001,0,"functio ... ber) {}")
-hasLocation(#20165,#20003)
-stmt_containers(#20165,#20001)
+#20165=@"var;{this};{#20000}"
+variables(#20165,"this",#20000)
 #20166=*
-exprs(#20166,78,#20165,-1,"declaration")
-hasLocation(#20166,#20033)
-expr_containers(#20166,#20165)
-literals("declaration","declaration",#20166)
-decl(#20166,#20159)
+stmts(#20166,17,#20001,0,"functio ... ber) {}")
+hasLocation(#20166,#20003)
+stmt_containers(#20166,#20001)
 #20167=*
-scopes(#20167,1)
-scopenodes(#20165,#20167)
-scopenesting(#20167,#20000)
-#20168=@"var;{x};{#20167}"
-variables(#20168,"x",#20167)
-#20169=*
-exprs(#20169,78,#20165,0,"x")
-hasLocation(#20169,#20045)
-expr_containers(#20169,#20165)
-literals("x","x",#20169)
-decl(#20169,#20168)
-#20170=@"var;{arguments};{#20167}"
-variables(#20170,"arguments",#20167)
-is_arguments_object(#20170)
+exprs(#20167,78,#20166,-1,"declaration")
+hasLocation(#20167,#20033)
+expr_containers(#20167,#20166)
+literals("declaration","declaration",#20167)
+decl(#20167,#20159)
+#20168=*
+scopes(#20168,1)
+scopenodes(#20166,#20168)
+scopenesting(#20168,#20000)
+#20169=@"var;{this};{#20168}"
+variables(#20169,"this",#20168)
+#20170=@"var;{x};{#20168}"
+variables(#20170,"x",#20168)
 #20171=*
-typeexprs(#20171,2,#20165,-4,"void")
-hasLocation(#20171,#20041)
-expr_containers(#20171,#20165)
-literals("void","void",#20171)
-#20172=*
-typeexprs(#20172,2,#20165,-6,"number")
-hasLocation(#20172,#20049)
-expr_containers(#20172,#20165)
-literals("number","number",#20172)
+exprs(#20171,78,#20166,0,"x")
+hasLocation(#20171,#20045)
+expr_containers(#20171,#20166)
+literals("x","x",#20171)
+decl(#20171,#20170)
+#20172=@"var;{arguments};{#20168}"
+variables(#20172,"arguments",#20168)
+is_arguments_object(#20172)
 #20173=*
-stmts(#20173,1,#20165,-2,"{}")
-#20174=@"loc,{#10000},1,45,1,46"
-locations_default(#20174,#10000,1,45,1,46)
-hasLocation(#20173,#20174)
-stmt_containers(#20173,#20165)
+typeexprs(#20173,2,#20166,-4,"void")
+hasLocation(#20173,#20041)
+expr_containers(#20173,#20166)
+literals("void","void",#20173)
+#20174=*
+typeexprs(#20174,2,#20166,-6,"number")
+hasLocation(#20174,#20049)
+expr_containers(#20174,#20166)
+literals("number","number",#20174)
 #20175=*
-stmts(#20175,18,#20001,1,"var f = ... ber) {}")
-hasLocation(#20175,#20007)
-stmt_containers(#20175,#20001)
-#20176=*
-exprs(#20176,64,#20175,0,"f = fun ... ber) {}")
-#20177=@"loc,{#10000},3,5,3,44"
-locations_default(#20177,#10000,3,5,3,44)
-hasLocation(#20176,#20177)
-enclosing_stmt(#20176,#20175)
-expr_containers(#20176,#20001)
+stmts(#20175,1,#20166,-2,"{}")
+#20176=@"loc,{#10000},1,45,1,46"
+locations_default(#20176,#10000,1,45,1,46)
+hasLocation(#20175,#20176)
+stmt_containers(#20175,#20166)
+#20177=*
+stmts(#20177,18,#20001,1,"var f = ... ber) {}")
+hasLocation(#20177,#20007)
+stmt_containers(#20177,#20001)
 #20178=*
-exprs(#20178,78,#20176,0,"f")
-hasLocation(#20178,#20059)
-enclosing_stmt(#20178,#20175)
+exprs(#20178,64,#20177,0,"f = fun ... ber) {}")
+#20179=@"loc,{#10000},3,5,3,44"
+locations_default(#20179,#10000,3,5,3,44)
+hasLocation(#20178,#20179)
+enclosing_stmt(#20178,#20177)
 expr_containers(#20178,#20001)
-literals("f","f",#20178)
-decl(#20178,#20160)
-#20179=*
-exprs(#20179,9,#20176,1,"functio ... ber) {}")
-#20180=@"loc,{#10000},3,9,3,44"
-locations_default(#20180,#10000,3,9,3,44)
-hasLocation(#20179,#20180)
-enclosing_stmt(#20179,#20175)
-expr_containers(#20179,#20001)
+#20180=*
+exprs(#20180,78,#20178,0,"f")
+hasLocation(#20180,#20059)
+enclosing_stmt(#20180,#20177)
+expr_containers(#20180,#20001)
+literals("f","f",#20180)
+decl(#20180,#20160)
 #20181=*
-scopes(#20181,1)
-scopenodes(#20179,#20181)
-scopenesting(#20181,#20000)
-#20182=@"var;{x};{#20181}"
-variables(#20182,"x",#20181)
+exprs(#20181,9,#20178,1,"functio ... ber) {}")
+#20182=@"loc,{#10000},3,9,3,44"
+locations_default(#20182,#10000,3,9,3,44)
+hasLocation(#20181,#20182)
+enclosing_stmt(#20181,#20177)
+expr_containers(#20181,#20001)
 #20183=*
-exprs(#20183,78,#20179,0,"x")
-hasLocation(#20183,#20075)
-expr_containers(#20183,#20179)
-literals("x","x",#20183)
-decl(#20183,#20182)
-#20184=@"var;{arguments};{#20181}"
-variables(#20184,"arguments",#20181)
-is_arguments_object(#20184)
-#20185=*
-typeexprs(#20185,2,#20179,-4,"string")
-hasLocation(#20185,#20071)
-expr_containers(#20185,#20179)
-literals("string","string",#20185)
+scopes(#20183,1)
+scopenodes(#20181,#20183)
+scopenesting(#20183,#20000)
+#20184=@"var;{this};{#20183}"
+variables(#20184,"this",#20183)
+#20185=@"var;{x};{#20183}"
+variables(#20185,"x",#20183)
 #20186=*
-typeexprs(#20186,2,#20179,-6,"number")
-hasLocation(#20186,#20079)
-expr_containers(#20186,#20179)
-literals("number","number",#20186)
-#20187=*
-stmts(#20187,1,#20179,-2,"{}")
-#20188=@"loc,{#10000},3,43,3,44"
-locations_default(#20188,#10000,3,43,3,44)
-hasLocation(#20187,#20188)
-stmt_containers(#20187,#20179)
+exprs(#20186,78,#20181,0,"x")
+hasLocation(#20186,#20075)
+expr_containers(#20186,#20181)
+literals("x","x",#20186)
+decl(#20186,#20185)
+#20187=@"var;{arguments};{#20183}"
+variables(#20187,"arguments",#20183)
+is_arguments_object(#20187)
+#20188=*
+typeexprs(#20188,2,#20181,-4,"string")
+hasLocation(#20188,#20071)
+expr_containers(#20188,#20181)
+literals("string","string",#20188)
 #20189=*
-stmts(#20189,17,#20001,2,"declare ... umber);")
-hasLocation(#20189,#20011)
-stmt_containers(#20189,#20001)
-has_declare_keyword(#20189)
+typeexprs(#20189,2,#20181,-6,"number")
+hasLocation(#20189,#20079)
+expr_containers(#20189,#20181)
+literals("number","number",#20189)
 #20190=*
-exprs(#20190,78,#20189,-1,"ambient")
-hasLocation(#20190,#20091)
-expr_containers(#20190,#20189)
-literals("ambient","ambient",#20190)
-decl(#20190,#20161)
-#20191=*
-scopes(#20191,1)
-scopenodes(#20189,#20191)
-scopenesting(#20191,#20000)
-#20192=@"var;{x};{#20191}"
-variables(#20192,"x",#20191)
+stmts(#20190,1,#20181,-2,"{}")
+#20191=@"loc,{#10000},3,43,3,44"
+locations_default(#20191,#10000,3,43,3,44)
+hasLocation(#20190,#20191)
+stmt_containers(#20190,#20181)
+#20192=*
+stmts(#20192,17,#20001,2,"declare ... umber);")
+hasLocation(#20192,#20011)
+stmt_containers(#20192,#20001)
+has_declare_keyword(#20192)
 #20193=*
-exprs(#20193,78,#20189,0,"x")
-hasLocation(#20193,#20103)
-expr_containers(#20193,#20189)
-literals("x","x",#20193)
-decl(#20193,#20192)
-#20194=@"var;{arguments};{#20191}"
-variables(#20194,"arguments",#20191)
-is_arguments_object(#20194)
-#20195=*
-typeexprs(#20195,2,#20189,-4,"string")
-hasLocation(#20195,#20099)
-expr_containers(#20195,#20189)
-literals("string","string",#20195)
-#20196=*
-typeexprs(#20196,2,#20189,-6,"number")
-hasLocation(#20196,#20107)
-expr_containers(#20196,#20189)
-literals("number","number",#20196)
+exprs(#20193,78,#20192,-1,"ambient")
+hasLocation(#20193,#20091)
+expr_containers(#20193,#20192)
+literals("ambient","ambient",#20193)
+decl(#20193,#20161)
+#20194=*
+scopes(#20194,1)
+scopenodes(#20192,#20194)
+scopenesting(#20194,#20000)
+#20195=@"var;{this};{#20194}"
+variables(#20195,"this",#20194)
+#20196=@"var;{x};{#20194}"
+variables(#20196,"x",#20194)
 #20197=*
-stmts(#20197,26,#20001,3,"class C ... C) {}\n}")
-#20198=@"loc,{#10000},7,1,9,1"
-locations_default(#20198,#10000,7,1,9,1)
-hasLocation(#20197,#20198)
-stmt_containers(#20197,#20001)
+exprs(#20197,78,#20192,0,"x")
+hasLocation(#20197,#20103)
+expr_containers(#20197,#20192)
+literals("x","x",#20197)
+decl(#20197,#20196)
+#20198=@"var;{arguments};{#20194}"
+variables(#20198,"arguments",#20194)
+is_arguments_object(#20198)
 #20199=*
-exprs(#20199,78,#20197,0,"C")
-hasLocation(#20199,#20115)
-enclosing_stmt(#20199,#20197)
-expr_containers(#20199,#20001)
-literals("C","C",#20199)
-decl(#20199,#20162)
-typedecl(#20199,#20163)
+typeexprs(#20199,2,#20192,-4,"string")
+hasLocation(#20199,#20099)
+expr_containers(#20199,#20192)
+literals("string","string",#20199)
 #20200=*
-scopes(#20200,10)
-scopenodes(#20197,#20200)
-scopenesting(#20200,#20000)
+typeexprs(#20200,2,#20192,-6,"number")
+hasLocation(#20200,#20107)
+expr_containers(#20200,#20192)
+literals("number","number",#20200)
 #20201=*
-properties(#20201,#20197,2,0,"member(this: C) {}")
-#20202=@"loc,{#10000},8,3,8,20"
-locations_default(#20202,#10000,8,3,8,20)
+stmts(#20201,26,#20001,3,"class C ... C) {}\n}")
+#20202=@"loc,{#10000},7,1,9,1"
+locations_default(#20202,#10000,7,1,9,1)
 hasLocation(#20201,#20202)
+stmt_containers(#20201,#20001)
 #20203=*
-exprs(#20203,0,#20201,0,"member")
-hasLocation(#20203,#20119)
-enclosing_stmt(#20203,#20197)
+exprs(#20203,78,#20201,0,"C")
+hasLocation(#20203,#20115)
+enclosing_stmt(#20203,#20201)
 expr_containers(#20203,#20001)
-literals("member","member",#20203)
+literals("C","C",#20203)
+decl(#20203,#20162)
+typedecl(#20203,#20163)
 #20204=*
-exprs(#20204,9,#20201,1,"member(this: C) {}")
-hasLocation(#20204,#20202)
-enclosing_stmt(#20204,#20197)
-expr_containers(#20204,#20001)
-#20205=*
-scopes(#20205,1)
-scopenodes(#20204,#20205)
-scopenesting(#20205,#20200)
-#20206=@"var;{arguments};{#20205}"
-variables(#20206,"arguments",#20205)
-is_arguments_object(#20206)
-#20207=*
-typeexprs(#20207,0,#20204,-4,"C")
-hasLocation(#20207,#20127)
-expr_containers(#20207,#20204)
-literals("C","C",#20207)
-typebind(#20207,#20163)
+scopes(#20204,10)
+scopenodes(#20201,#20204)
+scopenesting(#20204,#20000)
+#20205=@"var;{this};{#20204}"
+variables(#20205,"this",#20204)
+#20206=*
+properties(#20206,#20201,2,0,"member(this: C) {}")
+#20207=@"loc,{#10000},8,3,8,20"
+locations_default(#20207,#10000,8,3,8,20)
+hasLocation(#20206,#20207)
 #20208=*
-stmts(#20208,1,#20204,-2,"{}")
-#20209=@"loc,{#10000},8,19,8,20"
-locations_default(#20209,#10000,8,19,8,20)
-hasLocation(#20208,#20209)
-stmt_containers(#20208,#20204)
-is_method(#20201)
+exprs(#20208,0,#20206,0,"member")
+hasLocation(#20208,#20119)
+enclosing_stmt(#20208,#20201)
+expr_containers(#20208,#20001)
+literals("member","member",#20208)
+#20209=*
+exprs(#20209,9,#20206,1,"member(this: C) {}")
+hasLocation(#20209,#20207)
+enclosing_stmt(#20209,#20201)
+expr_containers(#20209,#20001)
 #20210=*
-properties(#20210,#20197,3,0,"constructor() {}")
-#20211=@"loc,{#10000},7,9,7,8"
-locations_default(#20211,#10000,7,9,7,8)
-hasLocation(#20210,#20211)
-#20212=*
-exprs(#20212,0,#20210,0,"constructor")
-hasLocation(#20212,#20211)
-enclosing_stmt(#20212,#20197)
-expr_containers(#20212,#20001)
-literals("constructor","constructor",#20212)
+scopes(#20210,1)
+scopenodes(#20209,#20210)
+scopenesting(#20210,#20204)
+#20211=@"var;{this};{#20210}"
+variables(#20211,"this",#20210)
+#20212=@"var;{arguments};{#20210}"
+variables(#20212,"arguments",#20210)
+is_arguments_object(#20212)
 #20213=*
-exprs(#20213,9,#20210,1,"() {}")
-hasLocation(#20213,#20211)
-enclosing_stmt(#20213,#20197)
-expr_containers(#20213,#20001)
+typeexprs(#20213,0,#20209,-4,"C")
+hasLocation(#20213,#20127)
+expr_containers(#20213,#20209)
+literals("C","C",#20213)
+typebind(#20213,#20163)
 #20214=*
-scopes(#20214,1)
-scopenodes(#20213,#20214)
-scopenesting(#20214,#20200)
-#20215=@"var;{arguments};{#20214}"
-variables(#20215,"arguments",#20214)
-is_arguments_object(#20215)
+stmts(#20214,1,#20209,-2,"{}")
+#20215=@"loc,{#10000},8,19,8,20"
+locations_default(#20215,#10000,8,19,8,20)
+hasLocation(#20214,#20215)
+stmt_containers(#20214,#20209)
+is_method(#20206)
 #20216=*
-stmts(#20216,1,#20213,-2,"{}")
-hasLocation(#20216,#20211)
-stmt_containers(#20216,#20213)
-is_method(#20210)
-#20217=*
-stmts(#20217,34,#20001,4,"interfa ... : I);\n}")
-#20218=@"loc,{#10000},11,1,13,1"
-locations_default(#20218,#10000,11,1,13,1)
-hasLocation(#20217,#20218)
-stmt_containers(#20217,#20001)
+properties(#20216,#20201,3,0,"constructor() {}")
+#20217=@"loc,{#10000},7,9,7,8"
+locations_default(#20217,#10000,7,9,7,8)
+hasLocation(#20216,#20217)
+#20218=*
+exprs(#20218,0,#20216,0,"constructor")
+hasLocation(#20218,#20217)
+enclosing_stmt(#20218,#20201)
+expr_containers(#20218,#20001)
+literals("constructor","constructor",#20218)
 #20219=*
-typeexprs(#20219,1,#20217,0,"I")
-hasLocation(#20219,#20138)
-enclosing_stmt(#20219,#20217)
+exprs(#20219,9,#20216,1,"() {}")
+hasLocation(#20219,#20217)
+enclosing_stmt(#20219,#20201)
 expr_containers(#20219,#20001)
-literals("I","I",#20219)
-typedecl(#20219,#20164)
 #20220=*
-properties(#20220,#20217,2,0,"method(this: I);")
-#20221=@"loc,{#10000},12,3,12,18"
-locations_default(#20221,#10000,12,3,12,18)
-hasLocation(#20220,#20221)
-#20222=*
-exprs(#20222,0,#20220,0,"method")
-hasLocation(#20222,#20142)
-enclosing_stmt(#20222,#20217)
-expr_containers(#20222,#20001)
-literals("method","method",#20222)
+scopes(#20220,1)
+scopenodes(#20219,#20220)
+scopenesting(#20220,#20204)
+#20221=@"var;{this};{#20220}"
+variables(#20221,"this",#20220)
+#20222=@"var;{arguments};{#20220}"
+variables(#20222,"arguments",#20220)
+is_arguments_object(#20222)
 #20223=*
-exprs(#20223,9,#20220,1,"method(this: I);")
-hasLocation(#20223,#20221)
-enclosing_stmt(#20223,#20217)
-expr_containers(#20223,#20001)
+stmts(#20223,1,#20219,-2,"{}")
+hasLocation(#20223,#20217)
+stmt_containers(#20223,#20219)
+is_method(#20216)
 #20224=*
-scopes(#20224,1)
-scopenodes(#20223,#20224)
-scopenesting(#20224,#20000)
-#20225=@"var;{arguments};{#20224}"
-variables(#20225,"arguments",#20224)
-is_arguments_object(#20225)
+stmts(#20224,34,#20001,4,"interfa ... : I);\n}")
+#20225=@"loc,{#10000},11,1,13,1"
+locations_default(#20225,#10000,11,1,13,1)
+hasLocation(#20224,#20225)
+stmt_containers(#20224,#20001)
 #20226=*
-typeexprs(#20226,0,#20223,-4,"I")
-hasLocation(#20226,#20150)
-expr_containers(#20226,#20223)
+typeexprs(#20226,1,#20224,0,"I")
+hasLocation(#20226,#20138)
+enclosing_stmt(#20226,#20224)
+expr_containers(#20226,#20001)
 literals("I","I",#20226)
-typebind(#20226,#20164)
-is_method(#20220)
-is_abstract_member(#20220)
+typedecl(#20226,#20164)
 #20227=*
-entry_cfg_node(#20227,#20001)
-#20228=@"loc,{#10000},1,1,1,0"
-locations_default(#20228,#10000,1,1,1,0)
+properties(#20227,#20224,2,0,"method(this: I);")
+#20228=@"loc,{#10000},12,3,12,18"
+locations_default(#20228,#10000,12,3,12,18)
 hasLocation(#20227,#20228)
 #20229=*
-exit_cfg_node(#20229,#20001)
-hasLocation(#20229,#20157)
-successor(#20217,#20229)
-successor(#20213,#20210)
+exprs(#20229,0,#20227,0,"method")
+hasLocation(#20229,#20142)
+enclosing_stmt(#20229,#20224)
+expr_containers(#20229,#20001)
+literals("method","method",#20229)
 #20230=*
-entry_cfg_node(#20230,#20213)
-hasLocation(#20230,#20211)
+exprs(#20230,9,#20227,1,"method(this: I);")
+hasLocation(#20230,#20228)
+enclosing_stmt(#20230,#20224)
+expr_containers(#20230,#20001)
 #20231=*
-exit_cfg_node(#20231,#20213)
-hasLocation(#20231,#20211)
-successor(#20216,#20231)
-successor(#20230,#20216)
-successor(#20212,#20213)
-successor(#20210,#20197)
-successor(#20204,#20201)
-#20232=*
-entry_cfg_node(#20232,#20204)
-#20233=@"loc,{#10000},8,3,8,2"
-locations_default(#20233,#10000,8,3,8,2)
-hasLocation(#20232,#20233)
+scopes(#20231,1)
+scopenodes(#20230,#20231)
+scopenesting(#20231,#20000)
+#20232=@"var;{this};{#20231}"
+variables(#20232,"this",#20231)
+#20233=@"var;{arguments};{#20231}"
+variables(#20233,"arguments",#20231)
+is_arguments_object(#20233)
 #20234=*
-exit_cfg_node(#20234,#20204)
-#20235=@"loc,{#10000},8,21,8,20"
-locations_default(#20235,#10000,8,21,8,20)
-hasLocation(#20234,#20235)
-successor(#20208,#20234)
-successor(#20232,#20208)
-successor(#20203,#20204)
-successor(#20201,#20212)
-successor(#20199,#20203)
-successor(#20197,#20217)
-successor(#20189,#20199)
-successor(#20175,#20178)
-successor(#20179,#20176)
-#20236=*
-entry_cfg_node(#20236,#20179)
-#20237=@"loc,{#10000},3,9,3,8"
-locations_default(#20237,#10000,3,9,3,8)
-hasLocation(#20236,#20237)
+typeexprs(#20234,0,#20230,-4,"I")
+hasLocation(#20234,#20150)
+expr_containers(#20234,#20230)
+literals("I","I",#20234)
+typebind(#20234,#20164)
+is_method(#20227)
+is_abstract_member(#20227)
+#20235=*
+entry_cfg_node(#20235,#20001)
+#20236=@"loc,{#10000},1,1,1,0"
+locations_default(#20236,#10000,1,1,1,0)
+hasLocation(#20235,#20236)
+#20237=*
+exit_cfg_node(#20237,#20001)
+hasLocation(#20237,#20157)
+successor(#20224,#20237)
+successor(#20219,#20216)
 #20238=*
-exit_cfg_node(#20238,#20179)
-#20239=@"loc,{#10000},3,45,3,44"
-locations_default(#20239,#10000,3,45,3,44)
-hasLocation(#20238,#20239)
-successor(#20187,#20238)
-successor(#20183,#20187)
-successor(#20236,#20183)
-successor(#20178,#20179)
-successor(#20176,#20189)
-successor(#20165,#20175)
+entry_cfg_node(#20238,#20219)
+hasLocation(#20238,#20217)
+#20239=*
+exit_cfg_node(#20239,#20219)
+hasLocation(#20239,#20217)
+successor(#20223,#20239)
+successor(#20238,#20223)
+successor(#20218,#20219)
+successor(#20216,#20201)
+successor(#20209,#20206)
 #20240=*
-entry_cfg_node(#20240,#20165)
-hasLocation(#20240,#20228)
-#20241=*
-exit_cfg_node(#20241,#20165)
-#20242=@"loc,{#10000},1,47,1,46"
-locations_default(#20242,#10000,1,47,1,46)
-hasLocation(#20241,#20242)
-successor(#20173,#20241)
-successor(#20169,#20173)
-successor(#20240,#20169)
-successor(#20166,#20165)
-successor(#20227,#20166)
+entry_cfg_node(#20240,#20209)
+#20241=@"loc,{#10000},8,3,8,2"
+locations_default(#20241,#10000,8,3,8,2)
+hasLocation(#20240,#20241)
+#20242=*
+exit_cfg_node(#20242,#20209)
+#20243=@"loc,{#10000},8,21,8,20"
+locations_default(#20243,#10000,8,21,8,20)
+hasLocation(#20242,#20243)
+successor(#20214,#20242)
+successor(#20240,#20214)
+successor(#20208,#20209)
+successor(#20206,#20218)
+successor(#20203,#20208)
+successor(#20201,#20224)
+successor(#20192,#20203)
+successor(#20177,#20180)
+successor(#20181,#20178)
+#20244=*
+entry_cfg_node(#20244,#20181)
+#20245=@"loc,{#10000},3,9,3,8"
+locations_default(#20245,#10000,3,9,3,8)
+hasLocation(#20244,#20245)
+#20246=*
+exit_cfg_node(#20246,#20181)
+#20247=@"loc,{#10000},3,45,3,44"
+locations_default(#20247,#10000,3,45,3,44)
+hasLocation(#20246,#20247)
+successor(#20190,#20246)
+successor(#20186,#20190)
+successor(#20244,#20186)
+successor(#20180,#20181)
+successor(#20178,#20192)
+successor(#20166,#20177)
+#20248=*
+entry_cfg_node(#20248,#20166)
+hasLocation(#20248,#20236)
+#20249=*
+exit_cfg_node(#20249,#20166)
+#20250=@"loc,{#10000},1,47,1,46"
+locations_default(#20250,#10000,1,47,1,46)
+hasLocation(#20249,#20250)
+successor(#20175,#20249)
+successor(#20171,#20175)
+successor(#20248,#20171)
+successor(#20167,#20166)
+successor(#20235,#20167)
 numlines(#10000,14,9,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/tryfinally.ts.trap b/javascript/extractor/tests/ts/output/trap/tryfinally.ts.trap
index de5d0a2d72c..4271f5e9d9b 100644
--- a/javascript/extractor/tests/ts/output/trap/tryfinally.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/tryfinally.ts.trap
@@ -166,119 +166,123 @@ locations_default(#20057,#10000,1,1,8,0)
 hasLocation(#20001,#20057)
 #20058=@"var;{foo};{#20000}"
 variables(#20058,"foo",#20000)
-#20059=*
-stmts(#20059,17,#20001,0,"functio ... ;\n  }\n}")
-#20060=@"loc,{#10000},1,1,7,1"
-locations_default(#20060,#10000,1,1,7,1)
-hasLocation(#20059,#20060)
-stmt_containers(#20059,#20001)
-#20061=*
-exprs(#20061,78,#20059,-1,"foo")
-hasLocation(#20061,#20019)
-expr_containers(#20061,#20059)
-literals("foo","foo",#20061)
-decl(#20061,#20058)
+#20059=@"var;{this};{#20000}"
+variables(#20059,"this",#20000)
+#20060=*
+stmts(#20060,17,#20001,0,"functio ... ;\n  }\n}")
+#20061=@"loc,{#10000},1,1,7,1"
+locations_default(#20061,#10000,1,1,7,1)
+hasLocation(#20060,#20061)
+stmt_containers(#20060,#20001)
 #20062=*
-scopes(#20062,1)
-scopenodes(#20059,#20062)
-scopenesting(#20062,#20000)
-#20063=@"var;{x};{#20062}"
-variables(#20063,"x",#20062)
-#20064=@"var;{arguments};{#20062}"
-variables(#20064,"arguments",#20062)
-is_arguments_object(#20064)
-#20065=*
-stmts(#20065,1,#20059,-2,"{\n  var ... ;\n  }\n}")
-#20066=@"loc,{#10000},1,16,7,1"
-locations_default(#20066,#10000,1,16,7,1)
-hasLocation(#20065,#20066)
-stmt_containers(#20065,#20059)
+exprs(#20062,78,#20060,-1,"foo")
+hasLocation(#20062,#20019)
+expr_containers(#20062,#20060)
+literals("foo","foo",#20062)
+decl(#20062,#20058)
+#20063=*
+scopes(#20063,1)
+scopenodes(#20060,#20063)
+scopenesting(#20063,#20000)
+#20064=@"var;{x};{#20063}"
+variables(#20064,"x",#20063)
+#20065=@"var;{this};{#20063}"
+variables(#20065,"this",#20063)
+#20066=@"var;{arguments};{#20063}"
+variables(#20066,"arguments",#20063)
+is_arguments_object(#20066)
 #20067=*
-stmts(#20067,18,#20065,0,"var x = 5;")
-#20068=@"loc,{#10000},2,3,2,12"
-locations_default(#20068,#10000,2,3,2,12)
+stmts(#20067,1,#20060,-2,"{\n  var ... ;\n  }\n}")
+#20068=@"loc,{#10000},1,16,7,1"
+locations_default(#20068,#10000,1,16,7,1)
 hasLocation(#20067,#20068)
-stmt_containers(#20067,#20059)
+stmt_containers(#20067,#20060)
 #20069=*
-exprs(#20069,64,#20067,0,"x = 5")
-#20070=@"loc,{#10000},2,7,2,11"
-locations_default(#20070,#10000,2,7,2,11)
+stmts(#20069,18,#20067,0,"var x = 5;")
+#20070=@"loc,{#10000},2,3,2,12"
+locations_default(#20070,#10000,2,3,2,12)
 hasLocation(#20069,#20070)
-enclosing_stmt(#20069,#20067)
-expr_containers(#20069,#20059)
+stmt_containers(#20069,#20060)
 #20071=*
-exprs(#20071,78,#20069,0,"x")
-hasLocation(#20071,#20029)
-enclosing_stmt(#20071,#20067)
-expr_containers(#20071,#20059)
-literals("x","x",#20071)
-decl(#20071,#20063)
-#20072=*
-exprs(#20072,3,#20069,1,"5")
-hasLocation(#20072,#20033)
-enclosing_stmt(#20072,#20067)
-expr_containers(#20072,#20059)
-literals("5","5",#20072)
+exprs(#20071,64,#20069,0,"x = 5")
+#20072=@"loc,{#10000},2,7,2,11"
+locations_default(#20072,#10000,2,7,2,11)
+hasLocation(#20071,#20072)
+enclosing_stmt(#20071,#20069)
+expr_containers(#20071,#20060)
 #20073=*
-stmts(#20073,11,#20065,1,"try {\n  ...  x;\n  }")
-#20074=@"loc,{#10000},3,3,6,3"
-locations_default(#20074,#10000,3,3,6,3)
-hasLocation(#20073,#20074)
-stmt_containers(#20073,#20059)
+exprs(#20073,78,#20071,0,"x")
+hasLocation(#20073,#20029)
+enclosing_stmt(#20073,#20069)
+expr_containers(#20073,#20060)
+literals("x","x",#20073)
+decl(#20073,#20064)
+#20074=*
+exprs(#20074,3,#20071,1,"5")
+hasLocation(#20074,#20033)
+enclosing_stmt(#20074,#20069)
+expr_containers(#20074,#20060)
+literals("5","5",#20074)
 #20075=*
-stmts(#20075,1,#20073,0,"{\n  }")
-#20076=@"loc,{#10000},3,7,4,3"
-locations_default(#20076,#10000,3,7,4,3)
+stmts(#20075,11,#20067,1,"try {\n  ...  x;\n  }")
+#20076=@"loc,{#10000},3,3,6,3"
+locations_default(#20076,#10000,3,3,6,3)
 hasLocation(#20075,#20076)
-stmt_containers(#20075,#20059)
+stmt_containers(#20075,#20060)
 #20077=*
-stmts(#20077,1,#20073,-1,"{\n    return x;\n  }")
-#20078=@"loc,{#10000},4,13,6,3"
-locations_default(#20078,#10000,4,13,6,3)
+stmts(#20077,1,#20075,0,"{\n  }")
+#20078=@"loc,{#10000},3,7,4,3"
+locations_default(#20078,#10000,3,7,4,3)
 hasLocation(#20077,#20078)
-stmt_containers(#20077,#20059)
+stmt_containers(#20077,#20060)
 #20079=*
-stmts(#20079,9,#20077,0,"return x;")
-#20080=@"loc,{#10000},5,5,5,13"
-locations_default(#20080,#10000,5,5,5,13)
+stmts(#20079,1,#20075,-1,"{\n    return x;\n  }")
+#20080=@"loc,{#10000},4,13,6,3"
+locations_default(#20080,#10000,4,13,6,3)
 hasLocation(#20079,#20080)
-stmt_containers(#20079,#20059)
+stmt_containers(#20079,#20060)
 #20081=*
-exprs(#20081,79,#20079,0,"x")
-hasLocation(#20081,#20049)
-enclosing_stmt(#20081,#20079)
-expr_containers(#20081,#20059)
-literals("x","x",#20081)
-bind(#20081,#20063)
-#20082=*
-entry_cfg_node(#20082,#20001)
-#20083=@"loc,{#10000},1,1,1,0"
-locations_default(#20083,#10000,1,1,1,0)
-hasLocation(#20082,#20083)
+stmts(#20081,9,#20079,0,"return x;")
+#20082=@"loc,{#10000},5,5,5,13"
+locations_default(#20082,#10000,5,5,5,13)
+hasLocation(#20081,#20082)
+stmt_containers(#20081,#20060)
+#20083=*
+exprs(#20083,79,#20081,0,"x")
+hasLocation(#20083,#20049)
+enclosing_stmt(#20083,#20081)
+expr_containers(#20083,#20060)
+literals("x","x",#20083)
+bind(#20083,#20064)
 #20084=*
-exit_cfg_node(#20084,#20001)
-hasLocation(#20084,#20056)
-successor(#20059,#20084)
-#20085=*
-entry_cfg_node(#20085,#20059)
-hasLocation(#20085,#20083)
+entry_cfg_node(#20084,#20001)
+#20085=@"loc,{#10000},1,1,1,0"
+locations_default(#20085,#10000,1,1,1,0)
+hasLocation(#20084,#20085)
 #20086=*
-exit_cfg_node(#20086,#20059)
-#20087=@"loc,{#10000},7,2,7,1"
-locations_default(#20087,#10000,7,2,7,1)
-hasLocation(#20086,#20087)
-successor(#20073,#20075)
+exit_cfg_node(#20086,#20001)
+hasLocation(#20086,#20056)
+successor(#20060,#20086)
+#20087=*
+entry_cfg_node(#20087,#20060)
+hasLocation(#20087,#20085)
+#20088=*
+exit_cfg_node(#20088,#20060)
+#20089=@"loc,{#10000},7,2,7,1"
+locations_default(#20089,#10000,7,2,7,1)
+hasLocation(#20088,#20089)
 successor(#20075,#20077)
-successor(#20081,#20079)
-successor(#20079,#20086)
-successor(#20077,#20081)
-successor(#20067,#20071)
-successor(#20072,#20069)
-successor(#20071,#20072)
+successor(#20077,#20079)
+successor(#20083,#20081)
+successor(#20081,#20088)
+successor(#20079,#20083)
 successor(#20069,#20073)
-successor(#20065,#20067)
-successor(#20085,#20065)
-successor(#20061,#20059)
-successor(#20082,#20061)
+successor(#20074,#20071)
+successor(#20073,#20074)
+successor(#20071,#20075)
+successor(#20067,#20069)
+successor(#20087,#20067)
+successor(#20062,#20060)
+successor(#20084,#20062)
 numlines(#10000,7,7,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/typeannotations.ts.trap b/javascript/extractor/tests/ts/output/trap/typeannotations.ts.trap
index 69468467279..db0dcaa9c31 100644
--- a/javascript/extractor/tests/ts/output/trap/typeannotations.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/typeannotations.ts.trap
@@ -2507,2204 +2507,2246 @@ local_type_names(#20978,"Fish",#20000)
 local_type_names(#20979,"Bird",#20000)
 #20980=@"local_type_name;{ThisTypes};{#20000}"
 local_type_names(#20980,"ThisTypes",#20000)
-#20981=*
-stmts(#20981,34,#20001,0,"interfa ... umber }")
-hasLocation(#20981,#20003)
-stmt_containers(#20981,#20001)
+#20981=@"var;{this};{#20000}"
+variables(#20981,"this",#20000)
 #20982=*
-typeexprs(#20982,1,#20981,0,"Point")
-hasLocation(#20982,#20135)
-enclosing_stmt(#20982,#20981)
-expr_containers(#20982,#20001)
-literals("Point","Point",#20982)
-typedecl(#20982,#20975)
+stmts(#20982,34,#20001,0,"interfa ... umber }")
+hasLocation(#20982,#20003)
+stmt_containers(#20982,#20001)
 #20983=*
-properties(#20983,#20981,2,8,"x: number;")
-#20984=@"loc,{#10000},1,19,1,28"
-locations_default(#20984,#10000,1,19,1,28)
-hasLocation(#20983,#20984)
-#20985=*
-exprs(#20985,0,#20983,0,"x")
-hasLocation(#20985,#20139)
-enclosing_stmt(#20985,#20981)
-expr_containers(#20985,#20001)
-literals("x","x",#20985)
-is_abstract_member(#20983)
+typeexprs(#20983,1,#20982,0,"Point")
+hasLocation(#20983,#20135)
+enclosing_stmt(#20983,#20982)
+expr_containers(#20983,#20001)
+literals("Point","Point",#20983)
+typedecl(#20983,#20975)
+#20984=*
+properties(#20984,#20982,2,8,"x: number;")
+#20985=@"loc,{#10000},1,19,1,28"
+locations_default(#20985,#10000,1,19,1,28)
+hasLocation(#20984,#20985)
 #20986=*
-typeexprs(#20986,2,#20983,2,"number")
-hasLocation(#20986,#20143)
-enclosing_stmt(#20986,#20981)
+exprs(#20986,0,#20984,0,"x")
+hasLocation(#20986,#20139)
+enclosing_stmt(#20986,#20982)
 expr_containers(#20986,#20001)
-literals("number","number",#20986)
+literals("x","x",#20986)
+is_abstract_member(#20984)
 #20987=*
-properties(#20987,#20981,3,8,"y: number")
-#20988=@"loc,{#10000},1,30,1,38"
-locations_default(#20988,#10000,1,30,1,38)
-hasLocation(#20987,#20988)
-#20989=*
-exprs(#20989,0,#20987,0,"y")
-hasLocation(#20989,#20147)
-enclosing_stmt(#20989,#20981)
-expr_containers(#20989,#20001)
-literals("y","y",#20989)
-is_abstract_member(#20987)
+typeexprs(#20987,2,#20984,2,"number")
+hasLocation(#20987,#20143)
+enclosing_stmt(#20987,#20982)
+expr_containers(#20987,#20001)
+literals("number","number",#20987)
+#20988=*
+properties(#20988,#20982,3,8,"y: number")
+#20989=@"loc,{#10000},1,30,1,38"
+locations_default(#20989,#10000,1,30,1,38)
+hasLocation(#20988,#20989)
 #20990=*
-typeexprs(#20990,2,#20987,2,"number")
-hasLocation(#20990,#20151)
-enclosing_stmt(#20990,#20981)
+exprs(#20990,0,#20988,0,"y")
+hasLocation(#20990,#20147)
+enclosing_stmt(#20990,#20982)
 expr_containers(#20990,#20001)
-literals("number","number",#20990)
+literals("y","y",#20990)
+is_abstract_member(#20988)
 #20991=*
-stmts(#20991,31,#20001,1,"namespa ... T> {}\n}")
-#20992=@"loc,{#10000},3,1,6,1"
-locations_default(#20992,#10000,3,1,6,1)
-hasLocation(#20991,#20992)
-stmt_containers(#20991,#20001)
-#20993=*
-exprs(#20993,78,#20991,-1,"N")
-hasLocation(#20993,#20157)
-enclosing_stmt(#20993,#20991)
-expr_containers(#20993,#20001)
-literals("N","N",#20993)
-namespacedecl(#20993,#20970)
+typeexprs(#20991,2,#20988,2,"number")
+hasLocation(#20991,#20151)
+enclosing_stmt(#20991,#20982)
+expr_containers(#20991,#20001)
+literals("number","number",#20991)
+#20992=*
+stmts(#20992,31,#20001,1,"namespa ... T> {}\n}")
+#20993=@"loc,{#10000},3,1,6,1"
+locations_default(#20993,#10000,3,1,6,1)
+hasLocation(#20992,#20993)
+stmt_containers(#20992,#20001)
 #20994=*
-scopes(#20994,9)
-scopenodes(#20991,#20994)
-scopenesting(#20994,#20000)
-#20995=@"local_type_name;{I};{#20994}"
-local_type_names(#20995,"I",#20994)
-#20996=@"local_type_name;{J};{#20994}"
-local_type_names(#20996,"J",#20994)
-#20997=*
-stmts(#20997,30,#20991,0,"export  ... ce I {}")
-#20998=@"loc,{#10000},4,3,4,23"
-locations_default(#20998,#10000,4,3,4,23)
-hasLocation(#20997,#20998)
-stmt_containers(#20997,#20991)
-#20999=*
-stmts(#20999,34,#20997,-1,"interface I {}")
-#21000=@"loc,{#10000},4,10,4,23"
-locations_default(#21000,#10000,4,10,4,23)
-hasLocation(#20999,#21000)
-stmt_containers(#20999,#20991)
-#21001=*
-typeexprs(#21001,1,#20999,0,"I")
-hasLocation(#21001,#20165)
-enclosing_stmt(#21001,#20999)
-expr_containers(#21001,#20991)
-literals("I","I",#21001)
-typedecl(#21001,#20995)
+exprs(#20994,78,#20992,-1,"N")
+hasLocation(#20994,#20157)
+enclosing_stmt(#20994,#20992)
+expr_containers(#20994,#20001)
+literals("N","N",#20994)
+namespacedecl(#20994,#20970)
+#20995=*
+scopes(#20995,9)
+scopenodes(#20992,#20995)
+scopenesting(#20995,#20000)
+#20996=@"local_type_name;{I};{#20995}"
+local_type_names(#20996,"I",#20995)
+#20997=@"local_type_name;{J};{#20995}"
+local_type_names(#20997,"J",#20995)
+#20998=*
+stmts(#20998,30,#20992,0,"export  ... ce I {}")
+#20999=@"loc,{#10000},4,3,4,23"
+locations_default(#20999,#10000,4,3,4,23)
+hasLocation(#20998,#20999)
+stmt_containers(#20998,#20992)
+#21000=*
+stmts(#21000,34,#20998,-1,"interface I {}")
+#21001=@"loc,{#10000},4,10,4,23"
+locations_default(#21001,#10000,4,10,4,23)
+hasLocation(#21000,#21001)
+stmt_containers(#21000,#20992)
 #21002=*
-stmts(#21002,30,#20991,1,"export  ... J<T> {}")
-#21003=@"loc,{#10000},5,3,5,26"
-locations_default(#21003,#10000,5,3,5,26)
-hasLocation(#21002,#21003)
-stmt_containers(#21002,#20991)
-#21004=*
-stmts(#21004,34,#21002,-1,"interface J<T> {}")
-#21005=@"loc,{#10000},5,10,5,26"
-locations_default(#21005,#10000,5,10,5,26)
-hasLocation(#21004,#21005)
-stmt_containers(#21004,#20991)
-#21006=*
-scopes(#21006,11)
-scopenodes(#21004,#21006)
-scopenesting(#21006,#20994)
-#21007=@"local_type_name;{T};{#21006}"
-local_type_names(#21007,"T",#21006)
-#21008=*
-typeexprs(#21008,22,#21004,-2,"T")
-hasLocation(#21008,#20179)
-enclosing_stmt(#21008,#21004)
-expr_containers(#21008,#20991)
+typeexprs(#21002,1,#21000,0,"I")
+hasLocation(#21002,#20165)
+enclosing_stmt(#21002,#21000)
+expr_containers(#21002,#20992)
+literals("I","I",#21002)
+typedecl(#21002,#20996)
+#21003=*
+stmts(#21003,30,#20992,1,"export  ... J<T> {}")
+#21004=@"loc,{#10000},5,3,5,26"
+locations_default(#21004,#10000,5,3,5,26)
+hasLocation(#21003,#21004)
+stmt_containers(#21003,#20992)
+#21005=*
+stmts(#21005,34,#21003,-1,"interface J<T> {}")
+#21006=@"loc,{#10000},5,10,5,26"
+locations_default(#21006,#10000,5,10,5,26)
+hasLocation(#21005,#21006)
+stmt_containers(#21005,#20992)
+#21007=*
+scopes(#21007,11)
+scopenodes(#21005,#21007)
+scopenesting(#21007,#20995)
+#21008=@"local_type_name;{T};{#21007}"
+local_type_names(#21008,"T",#21007)
 #21009=*
-typeexprs(#21009,1,#21008,0,"T")
+typeexprs(#21009,22,#21005,-2,"T")
 hasLocation(#21009,#20179)
-enclosing_stmt(#21009,#21004)
-expr_containers(#21009,#20991)
-literals("T","T",#21009)
-typedecl(#21009,#21007)
+enclosing_stmt(#21009,#21005)
+expr_containers(#21009,#20992)
 #21010=*
-typeexprs(#21010,1,#21004,0,"J")
-hasLocation(#21010,#20175)
-enclosing_stmt(#21010,#21004)
-expr_containers(#21010,#20991)
-literals("J","J",#21010)
-typedecl(#21010,#20996)
+typeexprs(#21010,1,#21009,0,"T")
+hasLocation(#21010,#20179)
+enclosing_stmt(#21010,#21005)
+expr_containers(#21010,#20992)
+literals("T","T",#21010)
+typedecl(#21010,#21008)
 #21011=*
-stmts(#21011,18,#20001,2,"var any ...    any;")
-hasLocation(#21011,#20017)
-stmt_containers(#21011,#20001)
+typeexprs(#21011,1,#21005,0,"J")
+hasLocation(#21011,#20175)
+enclosing_stmt(#21011,#21005)
+expr_containers(#21011,#20992)
+literals("J","J",#21011)
+typedecl(#21011,#20997)
 #21012=*
-exprs(#21012,64,#21011,0,"anyVar: ...     any")
-#21013=@"loc,{#10000},8,5,8,27"
-locations_default(#21013,#10000,8,5,8,27)
-hasLocation(#21012,#21013)
-enclosing_stmt(#21012,#21011)
-expr_containers(#21012,#20001)
-#21014=*
-exprs(#21014,78,#21012,0,"anyVar")
-hasLocation(#21014,#20190)
-enclosing_stmt(#21014,#21011)
-expr_containers(#21014,#20001)
-literals("anyVar","anyVar",#21014)
-decl(#21014,#20929)
+stmts(#21012,18,#20001,2,"var any ...    any;")
+hasLocation(#21012,#20017)
+stmt_containers(#21012,#20001)
+#21013=*
+exprs(#21013,64,#21012,0,"anyVar: ...     any")
+#21014=@"loc,{#10000},8,5,8,27"
+locations_default(#21014,#10000,8,5,8,27)
+hasLocation(#21013,#21014)
+enclosing_stmt(#21013,#21012)
+expr_containers(#21013,#20001)
 #21015=*
-typeexprs(#21015,2,#21012,2,"any")
-hasLocation(#21015,#20194)
-enclosing_stmt(#21015,#21011)
+exprs(#21015,78,#21013,0,"anyVar")
+hasLocation(#21015,#20190)
+enclosing_stmt(#21015,#21012)
 expr_containers(#21015,#20001)
-literals("any","any",#21015)
+literals("anyVar","anyVar",#21015)
+decl(#21015,#20929)
 #21016=*
-stmts(#21016,18,#20001,3,"var obj ... object;")
-hasLocation(#21016,#20019)
-stmt_containers(#21016,#20001)
+typeexprs(#21016,2,#21013,2,"any")
+hasLocation(#21016,#20194)
+enclosing_stmt(#21016,#21012)
+expr_containers(#21016,#20001)
+literals("any","any",#21016)
 #21017=*
-exprs(#21017,64,#21016,0,"objectV ...  object")
-#21018=@"loc,{#10000},9,5,9,30"
-locations_default(#21018,#10000,9,5,9,30)
-hasLocation(#21017,#21018)
-enclosing_stmt(#21017,#21016)
-expr_containers(#21017,#20001)
-#21019=*
-exprs(#21019,78,#21017,0,"objectVar")
-hasLocation(#21019,#20200)
-enclosing_stmt(#21019,#21016)
-expr_containers(#21019,#20001)
-literals("objectVar","objectVar",#21019)
-decl(#21019,#20930)
+stmts(#21017,18,#20001,3,"var obj ... object;")
+hasLocation(#21017,#20019)
+stmt_containers(#21017,#20001)
+#21018=*
+exprs(#21018,64,#21017,0,"objectV ...  object")
+#21019=@"loc,{#10000},9,5,9,30"
+locations_default(#21019,#10000,9,5,9,30)
+hasLocation(#21018,#21019)
+enclosing_stmt(#21018,#21017)
+expr_containers(#21018,#20001)
 #21020=*
-typeexprs(#21020,2,#21017,2,"object")
-hasLocation(#21020,#20204)
-enclosing_stmt(#21020,#21016)
+exprs(#21020,78,#21018,0,"objectVar")
+hasLocation(#21020,#20200)
+enclosing_stmt(#21020,#21017)
 expr_containers(#21020,#20001)
-literals("object","object",#21020)
+literals("objectVar","objectVar",#21020)
+decl(#21020,#20930)
 #21021=*
-stmts(#21021,18,#20001,4,"var num ... number;")
-hasLocation(#21021,#20021)
-stmt_containers(#21021,#20001)
+typeexprs(#21021,2,#21018,2,"object")
+hasLocation(#21021,#20204)
+enclosing_stmt(#21021,#21017)
+expr_containers(#21021,#20001)
+literals("object","object",#21021)
 #21022=*
-exprs(#21022,64,#21021,0,"numberV ...  number")
-#21023=@"loc,{#10000},10,5,10,30"
-locations_default(#21023,#10000,10,5,10,30)
-hasLocation(#21022,#21023)
-enclosing_stmt(#21022,#21021)
-expr_containers(#21022,#20001)
-#21024=*
-exprs(#21024,78,#21022,0,"numberVar")
-hasLocation(#21024,#20210)
-enclosing_stmt(#21024,#21021)
-expr_containers(#21024,#20001)
-literals("numberVar","numberVar",#21024)
-decl(#21024,#20931)
+stmts(#21022,18,#20001,4,"var num ... number;")
+hasLocation(#21022,#20021)
+stmt_containers(#21022,#20001)
+#21023=*
+exprs(#21023,64,#21022,0,"numberV ...  number")
+#21024=@"loc,{#10000},10,5,10,30"
+locations_default(#21024,#10000,10,5,10,30)
+hasLocation(#21023,#21024)
+enclosing_stmt(#21023,#21022)
+expr_containers(#21023,#20001)
 #21025=*
-typeexprs(#21025,2,#21022,2,"number")
-hasLocation(#21025,#20214)
-enclosing_stmt(#21025,#21021)
+exprs(#21025,78,#21023,0,"numberVar")
+hasLocation(#21025,#20210)
+enclosing_stmt(#21025,#21022)
 expr_containers(#21025,#20001)
-literals("number","number",#21025)
+literals("numberVar","numberVar",#21025)
+decl(#21025,#20931)
 #21026=*
-stmts(#21026,18,#20001,5,"var str ... string;")
-hasLocation(#21026,#20023)
-stmt_containers(#21026,#20001)
+typeexprs(#21026,2,#21023,2,"number")
+hasLocation(#21026,#20214)
+enclosing_stmt(#21026,#21022)
+expr_containers(#21026,#20001)
+literals("number","number",#21026)
 #21027=*
-exprs(#21027,64,#21026,0,"stringV ...  string")
-#21028=@"loc,{#10000},11,5,11,30"
-locations_default(#21028,#10000,11,5,11,30)
-hasLocation(#21027,#21028)
-enclosing_stmt(#21027,#21026)
-expr_containers(#21027,#20001)
-#21029=*
-exprs(#21029,78,#21027,0,"stringVar")
-hasLocation(#21029,#20220)
-enclosing_stmt(#21029,#21026)
-expr_containers(#21029,#20001)
-literals("stringVar","stringVar",#21029)
-decl(#21029,#20932)
+stmts(#21027,18,#20001,5,"var str ... string;")
+hasLocation(#21027,#20023)
+stmt_containers(#21027,#20001)
+#21028=*
+exprs(#21028,64,#21027,0,"stringV ...  string")
+#21029=@"loc,{#10000},11,5,11,30"
+locations_default(#21029,#10000,11,5,11,30)
+hasLocation(#21028,#21029)
+enclosing_stmt(#21028,#21027)
+expr_containers(#21028,#20001)
 #21030=*
-typeexprs(#21030,2,#21027,2,"string")
-hasLocation(#21030,#20224)
-enclosing_stmt(#21030,#21026)
+exprs(#21030,78,#21028,0,"stringVar")
+hasLocation(#21030,#20220)
+enclosing_stmt(#21030,#21027)
 expr_containers(#21030,#20001)
-literals("string","string",#21030)
+literals("stringVar","stringVar",#21030)
+decl(#21030,#20932)
 #21031=*
-stmts(#21031,18,#20001,6,"var boo ... oolean;")
-hasLocation(#21031,#20025)
-stmt_containers(#21031,#20001)
+typeexprs(#21031,2,#21028,2,"string")
+hasLocation(#21031,#20224)
+enclosing_stmt(#21031,#21027)
+expr_containers(#21031,#20001)
+literals("string","string",#21031)
 #21032=*
-exprs(#21032,64,#21031,0,"boolean ... boolean")
-#21033=@"loc,{#10000},12,5,12,31"
-locations_default(#21033,#10000,12,5,12,31)
-hasLocation(#21032,#21033)
-enclosing_stmt(#21032,#21031)
-expr_containers(#21032,#20001)
-#21034=*
-exprs(#21034,78,#21032,0,"booleanVar")
-hasLocation(#21034,#20230)
-enclosing_stmt(#21034,#21031)
-expr_containers(#21034,#20001)
-literals("booleanVar","booleanVar",#21034)
-decl(#21034,#20933)
+stmts(#21032,18,#20001,6,"var boo ... oolean;")
+hasLocation(#21032,#20025)
+stmt_containers(#21032,#20001)
+#21033=*
+exprs(#21033,64,#21032,0,"boolean ... boolean")
+#21034=@"loc,{#10000},12,5,12,31"
+locations_default(#21034,#10000,12,5,12,31)
+hasLocation(#21033,#21034)
+enclosing_stmt(#21033,#21032)
+expr_containers(#21033,#20001)
 #21035=*
-typeexprs(#21035,2,#21032,2,"boolean")
-hasLocation(#21035,#20234)
-enclosing_stmt(#21035,#21031)
+exprs(#21035,78,#21033,0,"booleanVar")
+hasLocation(#21035,#20230)
+enclosing_stmt(#21035,#21032)
 expr_containers(#21035,#20001)
-literals("boolean","boolean",#21035)
+literals("booleanVar","booleanVar",#21035)
+decl(#21035,#20933)
 #21036=*
-stmts(#21036,18,#20001,7,"var nul ...   null;")
-hasLocation(#21036,#20027)
-stmt_containers(#21036,#20001)
+typeexprs(#21036,2,#21033,2,"boolean")
+hasLocation(#21036,#20234)
+enclosing_stmt(#21036,#21032)
+expr_containers(#21036,#20001)
+literals("boolean","boolean",#21036)
 #21037=*
-exprs(#21037,64,#21036,0,"nullVar ...    null")
-#21038=@"loc,{#10000},13,5,13,28"
-locations_default(#21038,#10000,13,5,13,28)
-hasLocation(#21037,#21038)
-enclosing_stmt(#21037,#21036)
-expr_containers(#21037,#20001)
-#21039=*
-exprs(#21039,78,#21037,0,"nullVar")
-hasLocation(#21039,#20240)
-enclosing_stmt(#21039,#21036)
-expr_containers(#21039,#20001)
-literals("nullVar","nullVar",#21039)
-decl(#21039,#20934)
+stmts(#21037,18,#20001,7,"var nul ...   null;")
+hasLocation(#21037,#20027)
+stmt_containers(#21037,#20001)
+#21038=*
+exprs(#21038,64,#21037,0,"nullVar ...    null")
+#21039=@"loc,{#10000},13,5,13,28"
+locations_default(#21039,#10000,13,5,13,28)
+hasLocation(#21038,#21039)
+enclosing_stmt(#21038,#21037)
+expr_containers(#21038,#20001)
 #21040=*
-typeexprs(#21040,2,#21037,2,"null")
-hasLocation(#21040,#20244)
-enclosing_stmt(#21040,#21036)
+exprs(#21040,78,#21038,0,"nullVar")
+hasLocation(#21040,#20240)
+enclosing_stmt(#21040,#21037)
 expr_containers(#21040,#20001)
-literals("null","null",#21040)
+literals("nullVar","nullVar",#21040)
+decl(#21040,#20934)
 #21041=*
-stmts(#21041,18,#20001,8,"var und ... efined;")
-hasLocation(#21041,#20029)
-stmt_containers(#21041,#20001)
+typeexprs(#21041,2,#21038,2,"null")
+hasLocation(#21041,#20244)
+enclosing_stmt(#21041,#21037)
+expr_containers(#21041,#20001)
+literals("null","null",#21041)
 #21042=*
-exprs(#21042,64,#21041,0,"undefin ... defined")
-#21043=@"loc,{#10000},14,5,14,33"
-locations_default(#21043,#10000,14,5,14,33)
-hasLocation(#21042,#21043)
-enclosing_stmt(#21042,#21041)
-expr_containers(#21042,#20001)
-#21044=*
-exprs(#21044,78,#21042,0,"undefinedVar")
-hasLocation(#21044,#20250)
-enclosing_stmt(#21044,#21041)
-expr_containers(#21044,#20001)
-literals("undefinedVar","undefinedVar",#21044)
-decl(#21044,#20935)
+stmts(#21042,18,#20001,8,"var und ... efined;")
+hasLocation(#21042,#20029)
+stmt_containers(#21042,#20001)
+#21043=*
+exprs(#21043,64,#21042,0,"undefin ... defined")
+#21044=@"loc,{#10000},14,5,14,33"
+locations_default(#21044,#10000,14,5,14,33)
+hasLocation(#21043,#21044)
+enclosing_stmt(#21043,#21042)
+expr_containers(#21043,#20001)
 #21045=*
-typeexprs(#21045,2,#21042,2,"undefined")
-hasLocation(#21045,#20254)
-enclosing_stmt(#21045,#21041)
+exprs(#21045,78,#21043,0,"undefinedVar")
+hasLocation(#21045,#20250)
+enclosing_stmt(#21045,#21042)
 expr_containers(#21045,#20001)
-literals("undefined","undefined",#21045)
+literals("undefinedVar","undefinedVar",#21045)
+decl(#21045,#20935)
 #21046=*
-stmts(#21046,18,#20001,9,"var voi ...   void;")
-hasLocation(#21046,#20031)
-stmt_containers(#21046,#20001)
+typeexprs(#21046,2,#21043,2,"undefined")
+hasLocation(#21046,#20254)
+enclosing_stmt(#21046,#21042)
+expr_containers(#21046,#20001)
+literals("undefined","undefined",#21046)
 #21047=*
-exprs(#21047,64,#21046,0,"voidVar ...    void")
-#21048=@"loc,{#10000},15,5,15,28"
-locations_default(#21048,#10000,15,5,15,28)
-hasLocation(#21047,#21048)
-enclosing_stmt(#21047,#21046)
-expr_containers(#21047,#20001)
-#21049=*
-exprs(#21049,78,#21047,0,"voidVar")
-hasLocation(#21049,#20260)
-enclosing_stmt(#21049,#21046)
-expr_containers(#21049,#20001)
-literals("voidVar","voidVar",#21049)
-decl(#21049,#20936)
+stmts(#21047,18,#20001,9,"var voi ...   void;")
+hasLocation(#21047,#20031)
+stmt_containers(#21047,#20001)
+#21048=*
+exprs(#21048,64,#21047,0,"voidVar ...    void")
+#21049=@"loc,{#10000},15,5,15,28"
+locations_default(#21049,#10000,15,5,15,28)
+hasLocation(#21048,#21049)
+enclosing_stmt(#21048,#21047)
+expr_containers(#21048,#20001)
 #21050=*
-typeexprs(#21050,2,#21047,2,"void")
-hasLocation(#21050,#20264)
-enclosing_stmt(#21050,#21046)
+exprs(#21050,78,#21048,0,"voidVar")
+hasLocation(#21050,#20260)
+enclosing_stmt(#21050,#21047)
 expr_containers(#21050,#20001)
-literals("void","void",#21050)
+literals("voidVar","voidVar",#21050)
+decl(#21050,#20936)
 #21051=*
-stmts(#21051,18,#20001,10,"var nev ...  never;")
-hasLocation(#21051,#20033)
-stmt_containers(#21051,#20001)
+typeexprs(#21051,2,#21048,2,"void")
+hasLocation(#21051,#20264)
+enclosing_stmt(#21051,#21047)
+expr_containers(#21051,#20001)
+literals("void","void",#21051)
 #21052=*
-exprs(#21052,64,#21051,0,"neverVa ...   never")
-#21053=@"loc,{#10000},16,5,16,29"
-locations_default(#21053,#10000,16,5,16,29)
-hasLocation(#21052,#21053)
-enclosing_stmt(#21052,#21051)
-expr_containers(#21052,#20001)
-#21054=*
-exprs(#21054,78,#21052,0,"neverVar")
-hasLocation(#21054,#20270)
-enclosing_stmt(#21054,#21051)
-expr_containers(#21054,#20001)
-literals("neverVar","neverVar",#21054)
-decl(#21054,#20937)
+stmts(#21052,18,#20001,10,"var nev ...  never;")
+hasLocation(#21052,#20033)
+stmt_containers(#21052,#20001)
+#21053=*
+exprs(#21053,64,#21052,0,"neverVa ...   never")
+#21054=@"loc,{#10000},16,5,16,29"
+locations_default(#21054,#10000,16,5,16,29)
+hasLocation(#21053,#21054)
+enclosing_stmt(#21053,#21052)
+expr_containers(#21053,#20001)
 #21055=*
-typeexprs(#21055,2,#21052,2,"never")
-hasLocation(#21055,#20274)
-enclosing_stmt(#21055,#21051)
+exprs(#21055,78,#21053,0,"neverVar")
+hasLocation(#21055,#20270)
+enclosing_stmt(#21055,#21052)
 expr_containers(#21055,#20001)
-literals("never","never",#21055)
+literals("neverVar","neverVar",#21055)
+decl(#21055,#20937)
 #21056=*
-stmts(#21056,18,#20001,11,"var sym ... symbol;")
-hasLocation(#21056,#20035)
-stmt_containers(#21056,#20001)
+typeexprs(#21056,2,#21053,2,"never")
+hasLocation(#21056,#20274)
+enclosing_stmt(#21056,#21052)
+expr_containers(#21056,#20001)
+literals("never","never",#21056)
 #21057=*
-exprs(#21057,64,#21056,0,"symbolV ...  symbol")
-#21058=@"loc,{#10000},17,5,17,30"
-locations_default(#21058,#10000,17,5,17,30)
-hasLocation(#21057,#21058)
-enclosing_stmt(#21057,#21056)
-expr_containers(#21057,#20001)
-#21059=*
-exprs(#21059,78,#21057,0,"symbolVar")
-hasLocation(#21059,#20280)
-enclosing_stmt(#21059,#21056)
-expr_containers(#21059,#20001)
-literals("symbolVar","symbolVar",#21059)
-decl(#21059,#20938)
+stmts(#21057,18,#20001,11,"var sym ... symbol;")
+hasLocation(#21057,#20035)
+stmt_containers(#21057,#20001)
+#21058=*
+exprs(#21058,64,#21057,0,"symbolV ...  symbol")
+#21059=@"loc,{#10000},17,5,17,30"
+locations_default(#21059,#10000,17,5,17,30)
+hasLocation(#21058,#21059)
+enclosing_stmt(#21058,#21057)
+expr_containers(#21058,#20001)
 #21060=*
-typeexprs(#21060,2,#21057,2,"symbol")
-hasLocation(#21060,#20284)
-enclosing_stmt(#21060,#21056)
+exprs(#21060,78,#21058,0,"symbolVar")
+hasLocation(#21060,#20280)
+enclosing_stmt(#21060,#21057)
 expr_containers(#21060,#20001)
-literals("symbol","symbol",#21060)
+literals("symbolVar","symbolVar",#21060)
+decl(#21060,#20938)
 #21061=*
-stmts(#21061,18,#20001,12,"var obj ... mber; }")
-hasLocation(#21061,#20037)
-stmt_containers(#21061,#20001)
+typeexprs(#21061,2,#21058,2,"symbol")
+hasLocation(#21061,#20284)
+enclosing_stmt(#21061,#21057)
+expr_containers(#21061,#20001)
+literals("symbol","symbol",#21061)
 #21062=*
-exprs(#21062,64,#21061,0,"objectV ... mber; }")
-#21063=@"loc,{#10000},18,5,18,38"
-locations_default(#21063,#10000,18,5,18,38)
-hasLocation(#21062,#21063)
-enclosing_stmt(#21062,#21061)
-expr_containers(#21062,#20001)
-#21064=*
-exprs(#21064,78,#21062,0,"objectVar")
-hasLocation(#21064,#20290)
-enclosing_stmt(#21064,#21061)
-expr_containers(#21064,#20001)
-literals("objectVar","objectVar",#21064)
-decl(#21064,#20930)
+stmts(#21062,18,#20001,12,"var obj ... mber; }")
+hasLocation(#21062,#20037)
+stmt_containers(#21062,#20001)
+#21063=*
+exprs(#21063,64,#21062,0,"objectV ... mber; }")
+#21064=@"loc,{#10000},18,5,18,38"
+locations_default(#21064,#10000,18,5,18,38)
+hasLocation(#21063,#21064)
+enclosing_stmt(#21063,#21062)
+expr_containers(#21063,#20001)
 #21065=*
-typeexprs(#21065,21,#21062,2,"{ x: number; }")
-#21066=@"loc,{#10000},18,25,18,38"
-locations_default(#21066,#10000,18,25,18,38)
-hasLocation(#21065,#21066)
-enclosing_stmt(#21065,#21061)
+exprs(#21065,78,#21063,0,"objectVar")
+hasLocation(#21065,#20290)
+enclosing_stmt(#21065,#21062)
 expr_containers(#21065,#20001)
-#21067=*
-properties(#21067,#21065,0,8,"x: number;")
-#21068=@"loc,{#10000},18,27,18,36"
-locations_default(#21068,#10000,18,27,18,36)
-hasLocation(#21067,#21068)
-#21069=*
-exprs(#21069,0,#21067,0,"x")
-hasLocation(#21069,#20296)
-enclosing_stmt(#21069,#21061)
-expr_containers(#21069,#20001)
-literals("x","x",#21069)
-is_abstract_member(#21067)
+literals("objectVar","objectVar",#21065)
+decl(#21065,#20930)
+#21066=*
+typeexprs(#21066,21,#21063,2,"{ x: number; }")
+#21067=@"loc,{#10000},18,25,18,38"
+locations_default(#21067,#10000,18,25,18,38)
+hasLocation(#21066,#21067)
+enclosing_stmt(#21066,#21062)
+expr_containers(#21066,#20001)
+#21068=*
+properties(#21068,#21066,0,8,"x: number;")
+#21069=@"loc,{#10000},18,27,18,36"
+locations_default(#21069,#10000,18,27,18,36)
+hasLocation(#21068,#21069)
 #21070=*
-typeexprs(#21070,2,#21067,2,"number")
-hasLocation(#21070,#20300)
-enclosing_stmt(#21070,#21061)
+exprs(#21070,0,#21068,0,"x")
+hasLocation(#21070,#20296)
+enclosing_stmt(#21070,#21062)
 expr_containers(#21070,#20001)
-literals("number","number",#21070)
+literals("x","x",#21070)
+is_abstract_member(#21068)
 #21071=*
-stmts(#21071,18,#20001,13,"var nes ... ber } }")
-hasLocation(#21071,#20039)
-stmt_containers(#21071,#20001)
+typeexprs(#21071,2,#21068,2,"number")
+hasLocation(#21071,#20300)
+enclosing_stmt(#21071,#21062)
+expr_containers(#21071,#20001)
+literals("number","number",#21071)
 #21072=*
-exprs(#21072,64,#21071,0,"nestedO ... ber } }")
-#21073=@"loc,{#10000},19,5,19,44"
-locations_default(#21073,#10000,19,5,19,44)
-hasLocation(#21072,#21073)
-enclosing_stmt(#21072,#21071)
-expr_containers(#21072,#20001)
-#21074=*
-exprs(#21074,78,#21072,0,"nestedObjectVar")
-hasLocation(#21074,#20308)
-enclosing_stmt(#21074,#21071)
-expr_containers(#21074,#20001)
-literals("nestedObjectVar","nestedObjectVar",#21074)
-decl(#21074,#20939)
+stmts(#21072,18,#20001,13,"var nes ... ber } }")
+hasLocation(#21072,#20039)
+stmt_containers(#21072,#20001)
+#21073=*
+exprs(#21073,64,#21072,0,"nestedO ... ber } }")
+#21074=@"loc,{#10000},19,5,19,44"
+locations_default(#21074,#10000,19,5,19,44)
+hasLocation(#21073,#21074)
+enclosing_stmt(#21073,#21072)
+expr_containers(#21073,#20001)
 #21075=*
-typeexprs(#21075,21,#21072,2,"{ x: { y: number } }")
-#21076=@"loc,{#10000},19,25,19,44"
-locations_default(#21076,#10000,19,25,19,44)
-hasLocation(#21075,#21076)
-enclosing_stmt(#21075,#21071)
+exprs(#21075,78,#21073,0,"nestedObjectVar")
+hasLocation(#21075,#20308)
+enclosing_stmt(#21075,#21072)
 expr_containers(#21075,#20001)
-#21077=*
-properties(#21077,#21075,0,8,"x: { y: number }")
-#21078=@"loc,{#10000},19,27,19,42"
-locations_default(#21078,#10000,19,27,19,42)
-hasLocation(#21077,#21078)
-#21079=*
-exprs(#21079,0,#21077,0,"x")
-hasLocation(#21079,#20314)
-enclosing_stmt(#21079,#21071)
-expr_containers(#21079,#20001)
-literals("x","x",#21079)
-is_abstract_member(#21077)
+literals("nestedObjectVar","nestedObjectVar",#21075)
+decl(#21075,#20939)
+#21076=*
+typeexprs(#21076,21,#21073,2,"{ x: { y: number } }")
+#21077=@"loc,{#10000},19,25,19,44"
+locations_default(#21077,#10000,19,25,19,44)
+hasLocation(#21076,#21077)
+enclosing_stmt(#21076,#21072)
+expr_containers(#21076,#20001)
+#21078=*
+properties(#21078,#21076,0,8,"x: { y: number }")
+#21079=@"loc,{#10000},19,27,19,42"
+locations_default(#21079,#10000,19,27,19,42)
+hasLocation(#21078,#21079)
 #21080=*
-typeexprs(#21080,21,#21077,2,"{ y: number }")
-#21081=@"loc,{#10000},19,30,19,42"
-locations_default(#21081,#10000,19,30,19,42)
-hasLocation(#21080,#21081)
-enclosing_stmt(#21080,#21071)
+exprs(#21080,0,#21078,0,"x")
+hasLocation(#21080,#20314)
+enclosing_stmt(#21080,#21072)
 expr_containers(#21080,#20001)
-#21082=*
-properties(#21082,#21080,0,8,"y: number")
-#21083=@"loc,{#10000},19,32,19,40"
-locations_default(#21083,#10000,19,32,19,40)
-hasLocation(#21082,#21083)
-#21084=*
-exprs(#21084,0,#21082,0,"y")
-hasLocation(#21084,#20320)
-enclosing_stmt(#21084,#21071)
-expr_containers(#21084,#20001)
-literals("y","y",#21084)
-is_abstract_member(#21082)
+literals("x","x",#21080)
+is_abstract_member(#21078)
+#21081=*
+typeexprs(#21081,21,#21078,2,"{ y: number }")
+#21082=@"loc,{#10000},19,30,19,42"
+locations_default(#21082,#10000,19,30,19,42)
+hasLocation(#21081,#21082)
+enclosing_stmt(#21081,#21072)
+expr_containers(#21081,#20001)
+#21083=*
+properties(#21083,#21081,0,8,"y: number")
+#21084=@"loc,{#10000},19,32,19,40"
+locations_default(#21084,#10000,19,32,19,40)
+hasLocation(#21083,#21084)
 #21085=*
-typeexprs(#21085,2,#21082,2,"number")
-hasLocation(#21085,#20324)
-enclosing_stmt(#21085,#21071)
+exprs(#21085,0,#21083,0,"y")
+hasLocation(#21085,#20320)
+enclosing_stmt(#21085,#21072)
 expr_containers(#21085,#20001)
-literals("number","number",#21085)
+literals("y","y",#21085)
+is_abstract_member(#21083)
 #21086=*
-stmts(#21086,18,#20001,14,"var arr ... umber[]")
-hasLocation(#21086,#20041)
-stmt_containers(#21086,#20001)
+typeexprs(#21086,2,#21083,2,"number")
+hasLocation(#21086,#20324)
+enclosing_stmt(#21086,#21072)
+expr_containers(#21086,#20001)
+literals("number","number",#21086)
 #21087=*
-exprs(#21087,64,#21086,0,"arrayVa ... umber[]")
-#21088=@"loc,{#10000},20,5,20,32"
-locations_default(#21088,#10000,20,5,20,32)
-hasLocation(#21087,#21088)
-enclosing_stmt(#21087,#21086)
-expr_containers(#21087,#20001)
-#21089=*
-exprs(#21089,78,#21087,0,"arrayVar")
-hasLocation(#21089,#20332)
-enclosing_stmt(#21089,#21086)
-expr_containers(#21089,#20001)
-literals("arrayVar","arrayVar",#21089)
-decl(#21089,#20940)
+stmts(#21087,18,#20001,14,"var arr ... umber[]")
+hasLocation(#21087,#20041)
+stmt_containers(#21087,#20001)
+#21088=*
+exprs(#21088,64,#21087,0,"arrayVa ... umber[]")
+#21089=@"loc,{#10000},20,5,20,32"
+locations_default(#21089,#10000,20,5,20,32)
+hasLocation(#21088,#21089)
+enclosing_stmt(#21088,#21087)
+expr_containers(#21088,#20001)
 #21090=*
-typeexprs(#21090,6,#21087,2,"number[]")
-#21091=@"loc,{#10000},20,25,20,32"
-locations_default(#21091,#10000,20,25,20,32)
-hasLocation(#21090,#21091)
-enclosing_stmt(#21090,#21086)
+exprs(#21090,78,#21088,0,"arrayVar")
+hasLocation(#21090,#20332)
+enclosing_stmt(#21090,#21087)
 expr_containers(#21090,#20001)
-#21092=*
-typeexprs(#21092,2,#21090,0,"number")
-hasLocation(#21092,#20336)
-enclosing_stmt(#21092,#21086)
-expr_containers(#21092,#20001)
-literals("number","number",#21092)
+literals("arrayVar","arrayVar",#21090)
+decl(#21090,#20940)
+#21091=*
+typeexprs(#21091,6,#21088,2,"number[]")
+#21092=@"loc,{#10000},20,25,20,32"
+locations_default(#21092,#10000,20,25,20,32)
+hasLocation(#21091,#21092)
+enclosing_stmt(#21091,#21087)
+expr_containers(#21091,#20001)
 #21093=*
-stmts(#21093,18,#20001,15,"var str ...  String")
-hasLocation(#21093,#20043)
-stmt_containers(#21093,#20001)
+typeexprs(#21093,2,#21091,0,"number")
+hasLocation(#21093,#20336)
+enclosing_stmt(#21093,#21087)
+expr_containers(#21093,#20001)
+literals("number","number",#21093)
 #21094=*
-exprs(#21094,64,#21093,0,"stringO ...  String")
-#21095=@"loc,{#10000},21,5,21,30"
-locations_default(#21095,#10000,21,5,21,30)
-hasLocation(#21094,#21095)
-enclosing_stmt(#21094,#21093)
-expr_containers(#21094,#20001)
-#21096=*
-exprs(#21096,78,#21094,0,"stringObjectVar")
-hasLocation(#21096,#20344)
-enclosing_stmt(#21096,#21093)
-expr_containers(#21096,#20001)
-literals("stringObjectVar","stringObjectVar",#21096)
-decl(#21096,#20941)
+stmts(#21094,18,#20001,15,"var str ...  String")
+hasLocation(#21094,#20043)
+stmt_containers(#21094,#20001)
+#21095=*
+exprs(#21095,64,#21094,0,"stringO ...  String")
+#21096=@"loc,{#10000},21,5,21,30"
+locations_default(#21096,#10000,21,5,21,30)
+hasLocation(#21095,#21096)
+enclosing_stmt(#21095,#21094)
+expr_containers(#21095,#20001)
 #21097=*
-typeexprs(#21097,0,#21094,2,"String")
-hasLocation(#21097,#20348)
-enclosing_stmt(#21097,#21093)
+exprs(#21097,78,#21095,0,"stringObjectVar")
+hasLocation(#21097,#20344)
+enclosing_stmt(#21097,#21094)
 expr_containers(#21097,#20001)
-literals("String","String",#21097)
+literals("stringObjectVar","stringObjectVar",#21097)
+decl(#21097,#20941)
 #21098=*
-stmts(#21098,18,#20001,16,"var poi ...   Point")
-hasLocation(#21098,#20045)
-stmt_containers(#21098,#20001)
+typeexprs(#21098,0,#21095,2,"String")
+hasLocation(#21098,#20348)
+enclosing_stmt(#21098,#21094)
+expr_containers(#21098,#20001)
+literals("String","String",#21098)
 #21099=*
-exprs(#21099,64,#21098,0,"pointVa ...   Point")
-#21100=@"loc,{#10000},22,5,22,29"
-locations_default(#21100,#10000,22,5,22,29)
-hasLocation(#21099,#21100)
-enclosing_stmt(#21099,#21098)
-expr_containers(#21099,#20001)
-#21101=*
-exprs(#21101,78,#21099,0,"pointVar")
-hasLocation(#21101,#20352)
-enclosing_stmt(#21101,#21098)
-expr_containers(#21101,#20001)
-literals("pointVar","pointVar",#21101)
-decl(#21101,#20942)
+stmts(#21099,18,#20001,16,"var poi ...   Point")
+hasLocation(#21099,#20045)
+stmt_containers(#21099,#20001)
+#21100=*
+exprs(#21100,64,#21099,0,"pointVa ...   Point")
+#21101=@"loc,{#10000},22,5,22,29"
+locations_default(#21101,#10000,22,5,22,29)
+hasLocation(#21100,#21101)
+enclosing_stmt(#21100,#21099)
+expr_containers(#21100,#20001)
 #21102=*
-typeexprs(#21102,0,#21099,2,"Point")
-hasLocation(#21102,#20356)
-enclosing_stmt(#21102,#21098)
+exprs(#21102,78,#21100,0,"pointVar")
+hasLocation(#21102,#20352)
+enclosing_stmt(#21102,#21099)
 expr_containers(#21102,#20001)
-literals("Point","Point",#21102)
-typebind(#21102,#20975)
+literals("pointVar","pointVar",#21102)
+decl(#21102,#20942)
 #21103=*
-stmts(#21103,18,#20001,17,"var raw ... unction")
-hasLocation(#21103,#20047)
-stmt_containers(#21103,#20001)
+typeexprs(#21103,0,#21100,2,"Point")
+hasLocation(#21103,#20356)
+enclosing_stmt(#21103,#21099)
+expr_containers(#21103,#20001)
+literals("Point","Point",#21103)
+typebind(#21103,#20975)
 #21104=*
-exprs(#21104,64,#21103,0,"rawFunc ... unction")
-#21105=@"loc,{#10000},23,5,23,32"
-locations_default(#21105,#10000,23,5,23,32)
-hasLocation(#21104,#21105)
-enclosing_stmt(#21104,#21103)
-expr_containers(#21104,#20001)
-#21106=*
-exprs(#21106,78,#21104,0,"rawFunctionVar")
-hasLocation(#21106,#20360)
-enclosing_stmt(#21106,#21103)
-expr_containers(#21106,#20001)
-literals("rawFunctionVar","rawFunctionVar",#21106)
-decl(#21106,#20943)
+stmts(#21104,18,#20001,17,"var raw ... unction")
+hasLocation(#21104,#20047)
+stmt_containers(#21104,#20001)
+#21105=*
+exprs(#21105,64,#21104,0,"rawFunc ... unction")
+#21106=@"loc,{#10000},23,5,23,32"
+locations_default(#21106,#10000,23,5,23,32)
+hasLocation(#21105,#21106)
+enclosing_stmt(#21105,#21104)
+expr_containers(#21105,#20001)
 #21107=*
-typeexprs(#21107,0,#21104,2,"Function")
-hasLocation(#21107,#20364)
-enclosing_stmt(#21107,#21103)
+exprs(#21107,78,#21105,0,"rawFunctionVar")
+hasLocation(#21107,#20360)
+enclosing_stmt(#21107,#21104)
 expr_containers(#21107,#20001)
-literals("Function","Function",#21107)
+literals("rawFunctionVar","rawFunctionVar",#21107)
+decl(#21107,#20943)
 #21108=*
-stmts(#21108,18,#20001,18,"var var ...     x11")
-hasLocation(#21108,#20049)
-stmt_containers(#21108,#20001)
+typeexprs(#21108,0,#21105,2,"Function")
+hasLocation(#21108,#20364)
+enclosing_stmt(#21108,#21104)
+expr_containers(#21108,#20001)
+literals("Function","Function",#21108)
 #21109=*
-exprs(#21109,64,#21108,0,"varVar: ...     x11")
-#21110=@"loc,{#10000},24,5,24,27"
-locations_default(#21110,#10000,24,5,24,27)
-hasLocation(#21109,#21110)
-enclosing_stmt(#21109,#21108)
-expr_containers(#21109,#20001)
-#21111=*
-exprs(#21111,78,#21109,0,"varVar")
-hasLocation(#21111,#20368)
-enclosing_stmt(#21111,#21108)
-expr_containers(#21111,#20001)
-literals("varVar","varVar",#21111)
-decl(#21111,#20944)
+stmts(#21109,18,#20001,18,"var var ...     x11")
+hasLocation(#21109,#20049)
+stmt_containers(#21109,#20001)
+#21110=*
+exprs(#21110,64,#21109,0,"varVar: ...     x11")
+#21111=@"loc,{#10000},24,5,24,27"
+locations_default(#21111,#10000,24,5,24,27)
+hasLocation(#21110,#21111)
+enclosing_stmt(#21110,#21109)
+expr_containers(#21110,#20001)
 #21112=*
-typeexprs(#21112,0,#21109,2,"x11")
-hasLocation(#21112,#20372)
-enclosing_stmt(#21112,#21108)
+exprs(#21112,78,#21110,0,"varVar")
+hasLocation(#21112,#20368)
+enclosing_stmt(#21112,#21109)
 expr_containers(#21112,#20001)
-literals("x11","x11",#21112)
+literals("varVar","varVar",#21112)
+decl(#21112,#20944)
 #21113=*
-stmts(#21113,18,#20001,19,"var gen ... number>")
-hasLocation(#21113,#20051)
-stmt_containers(#21113,#20001)
+typeexprs(#21113,0,#21110,2,"x11")
+hasLocation(#21113,#20372)
+enclosing_stmt(#21113,#21109)
+expr_containers(#21113,#20001)
+literals("x11","x11",#21113)
 #21114=*
-exprs(#21114,64,#21113,0,"generic ... number>")
-#21115=@"loc,{#10000},25,5,25,37"
-locations_default(#21115,#10000,25,5,25,37)
-hasLocation(#21114,#21115)
-enclosing_stmt(#21114,#21113)
-expr_containers(#21114,#20001)
-#21116=*
-exprs(#21116,78,#21114,0,"genericArrayVar")
-hasLocation(#21116,#20376)
-enclosing_stmt(#21116,#21113)
-expr_containers(#21116,#20001)
-literals("genericArrayVar","genericArrayVar",#21116)
-decl(#21116,#20945)
+stmts(#21114,18,#20001,19,"var gen ... number>")
+hasLocation(#21114,#20051)
+stmt_containers(#21114,#20001)
+#21115=*
+exprs(#21115,64,#21114,0,"generic ... number>")
+#21116=@"loc,{#10000},25,5,25,37"
+locations_default(#21116,#10000,25,5,25,37)
+hasLocation(#21115,#21116)
+enclosing_stmt(#21115,#21114)
+expr_containers(#21115,#20001)
 #21117=*
-typeexprs(#21117,14,#21114,2,"Array<number>")
-#21118=@"loc,{#10000},25,25,25,37"
-locations_default(#21118,#10000,25,25,25,37)
-hasLocation(#21117,#21118)
-enclosing_stmt(#21117,#21113)
+exprs(#21117,78,#21115,0,"genericArrayVar")
+hasLocation(#21117,#20376)
+enclosing_stmt(#21117,#21114)
 expr_containers(#21117,#20001)
-#21119=*
-typeexprs(#21119,0,#21117,-1,"Array")
-hasLocation(#21119,#20380)
-enclosing_stmt(#21119,#21113)
-expr_containers(#21119,#20001)
-literals("Array","Array",#21119)
+literals("genericArrayVar","genericArrayVar",#21117)
+decl(#21117,#20945)
+#21118=*
+typeexprs(#21118,14,#21115,2,"Array<number>")
+#21119=@"loc,{#10000},25,25,25,37"
+locations_default(#21119,#10000,25,25,25,37)
+hasLocation(#21118,#21119)
+enclosing_stmt(#21118,#21114)
+expr_containers(#21118,#20001)
 #21120=*
-typeexprs(#21120,2,#21117,0,"number")
-hasLocation(#21120,#20384)
-enclosing_stmt(#21120,#21113)
+typeexprs(#21120,0,#21118,-1,"Array")
+hasLocation(#21120,#20380)
+enclosing_stmt(#21120,#21114)
 expr_containers(#21120,#20001)
-literals("number","number",#21120)
+literals("Array","Array",#21120)
 #21121=*
-stmts(#21121,18,#20001,20,"var nes ... umber>>")
-hasLocation(#21121,#20053)
-stmt_containers(#21121,#20001)
+typeexprs(#21121,2,#21118,0,"number")
+hasLocation(#21121,#20384)
+enclosing_stmt(#21121,#21114)
+expr_containers(#21121,#20001)
+literals("number","number",#21121)
 #21122=*
-exprs(#21122,64,#21121,0,"nestedG ... umber>>")
-#21123=@"loc,{#10000},26,5,26,40"
-locations_default(#21123,#10000,26,5,26,40)
-hasLocation(#21122,#21123)
-enclosing_stmt(#21122,#21121)
-expr_containers(#21122,#20001)
-#21124=*
-exprs(#21124,78,#21122,0,"nestedGenericVar")
-hasLocation(#21124,#20390)
-enclosing_stmt(#21124,#21121)
-expr_containers(#21124,#20001)
-literals("nestedGenericVar","nestedGenericVar",#21124)
-decl(#21124,#20946)
+stmts(#21122,18,#20001,20,"var nes ... umber>>")
+hasLocation(#21122,#20053)
+stmt_containers(#21122,#20001)
+#21123=*
+exprs(#21123,64,#21122,0,"nestedG ... umber>>")
+#21124=@"loc,{#10000},26,5,26,40"
+locations_default(#21124,#10000,26,5,26,40)
+hasLocation(#21123,#21124)
+enclosing_stmt(#21123,#21122)
+expr_containers(#21123,#20001)
 #21125=*
-typeexprs(#21125,14,#21122,2,"Foo<Foo<number>>")
-#21126=@"loc,{#10000},26,25,26,40"
-locations_default(#21126,#10000,26,25,26,40)
-hasLocation(#21125,#21126)
-enclosing_stmt(#21125,#21121)
+exprs(#21125,78,#21123,0,"nestedGenericVar")
+hasLocation(#21125,#20390)
+enclosing_stmt(#21125,#21122)
 expr_containers(#21125,#20001)
-#21127=*
-typeexprs(#21127,0,#21125,-1,"Foo")
-hasLocation(#21127,#20394)
-enclosing_stmt(#21127,#21121)
-expr_containers(#21127,#20001)
-literals("Foo","Foo",#21127)
+literals("nestedGenericVar","nestedGenericVar",#21125)
+decl(#21125,#20946)
+#21126=*
+typeexprs(#21126,14,#21123,2,"Foo<Foo<number>>")
+#21127=@"loc,{#10000},26,25,26,40"
+locations_default(#21127,#10000,26,25,26,40)
+hasLocation(#21126,#21127)
+enclosing_stmt(#21126,#21122)
+expr_containers(#21126,#20001)
 #21128=*
-typeexprs(#21128,14,#21125,0,"Foo<number>")
-#21129=@"loc,{#10000},26,29,26,39"
-locations_default(#21129,#10000,26,29,26,39)
-hasLocation(#21128,#21129)
-enclosing_stmt(#21128,#21121)
+typeexprs(#21128,0,#21126,-1,"Foo")
+hasLocation(#21128,#20394)
+enclosing_stmt(#21128,#21122)
 expr_containers(#21128,#20001)
-#21130=*
-typeexprs(#21130,0,#21128,-1,"Foo")
-hasLocation(#21130,#20398)
-enclosing_stmt(#21130,#21121)
-expr_containers(#21130,#20001)
-literals("Foo","Foo",#21130)
+literals("Foo","Foo",#21128)
+#21129=*
+typeexprs(#21129,14,#21126,0,"Foo<number>")
+#21130=@"loc,{#10000},26,29,26,39"
+locations_default(#21130,#10000,26,29,26,39)
+hasLocation(#21129,#21130)
+enclosing_stmt(#21129,#21122)
+expr_containers(#21129,#20001)
 #21131=*
-typeexprs(#21131,2,#21128,0,"number")
-hasLocation(#21131,#20402)
-enclosing_stmt(#21131,#21121)
+typeexprs(#21131,0,#21129,-1,"Foo")
+hasLocation(#21131,#20398)
+enclosing_stmt(#21131,#21122)
 expr_containers(#21131,#20001)
-literals("number","number",#21131)
+literals("Foo","Foo",#21131)
 #21132=*
-stmts(#21132,18,#20001,21,"var cal ... number;")
-hasLocation(#21132,#20055)
-stmt_containers(#21132,#20001)
+typeexprs(#21132,2,#21129,0,"number")
+hasLocation(#21132,#20402)
+enclosing_stmt(#21132,#21122)
+expr_containers(#21132,#20001)
+literals("number","number",#21132)
 #21133=*
-exprs(#21133,64,#21132,0,"callSig ...  number")
-#21134=@"loc,{#10000},27,5,27,36"
-locations_default(#21134,#10000,27,5,27,36)
-hasLocation(#21133,#21134)
-enclosing_stmt(#21133,#21132)
-expr_containers(#21133,#20001)
-#21135=*
-exprs(#21135,78,#21133,0,"callSigVar")
-hasLocation(#21135,#20410)
-enclosing_stmt(#21135,#21132)
-expr_containers(#21135,#20001)
-literals("callSigVar","callSigVar",#21135)
-decl(#21135,#20947)
+stmts(#21133,18,#20001,21,"var cal ... number;")
+hasLocation(#21133,#20055)
+stmt_containers(#21133,#20001)
+#21134=*
+exprs(#21134,64,#21133,0,"callSig ...  number")
+#21135=@"loc,{#10000},27,5,27,36"
+locations_default(#21135,#10000,27,5,27,36)
+hasLocation(#21134,#21135)
+enclosing_stmt(#21134,#21133)
+expr_containers(#21134,#20001)
 #21136=*
-typeexprs(#21136,23,#21133,2,"() => number")
-#21137=@"loc,{#10000},27,25,27,36"
-locations_default(#21137,#10000,27,25,27,36)
-hasLocation(#21136,#21137)
-enclosing_stmt(#21136,#21132)
+exprs(#21136,78,#21134,0,"callSigVar")
+hasLocation(#21136,#20410)
+enclosing_stmt(#21136,#21133)
 expr_containers(#21136,#20001)
-#21138=*
-exprs(#21138,9,#21136,0,"() => number")
-hasLocation(#21138,#21137)
-enclosing_stmt(#21138,#21132)
-expr_containers(#21138,#20001)
+literals("callSigVar","callSigVar",#21136)
+decl(#21136,#20947)
+#21137=*
+typeexprs(#21137,23,#21134,2,"() => number")
+#21138=@"loc,{#10000},27,25,27,36"
+locations_default(#21138,#10000,27,25,27,36)
+hasLocation(#21137,#21138)
+enclosing_stmt(#21137,#21133)
+expr_containers(#21137,#20001)
 #21139=*
-scopes(#21139,1)
-scopenodes(#21138,#21139)
-scopenesting(#21139,#20000)
-#21140=@"var;{arguments};{#21139}"
-variables(#21140,"arguments",#21139)
-is_arguments_object(#21140)
-#21141=*
-typeexprs(#21141,2,#21138,-3,"number")
-hasLocation(#21141,#20420)
-expr_containers(#21141,#21138)
-literals("number","number",#21141)
-#21142=*
-stmts(#21142,18,#20001,22,"var con ...  Point;")
-hasLocation(#21142,#20057)
-stmt_containers(#21142,#20001)
+exprs(#21139,9,#21137,0,"() => number")
+hasLocation(#21139,#21138)
+enclosing_stmt(#21139,#21133)
+expr_containers(#21139,#20001)
+#21140=*
+scopes(#21140,1)
+scopenodes(#21139,#21140)
+scopenesting(#21140,#20000)
+#21141=@"var;{this};{#21140}"
+variables(#21141,"this",#21140)
+#21142=@"var;{arguments};{#21140}"
+variables(#21142,"arguments",#21140)
+is_arguments_object(#21142)
 #21143=*
-exprs(#21143,64,#21142,0,"constru ... > Point")
-#21144=@"loc,{#10000},28,5,28,39"
-locations_default(#21144,#10000,28,5,28,39)
-hasLocation(#21143,#21144)
-enclosing_stmt(#21143,#21142)
-expr_containers(#21143,#20001)
+typeexprs(#21143,2,#21139,-3,"number")
+hasLocation(#21143,#20420)
+expr_containers(#21143,#21139)
+literals("number","number",#21143)
+#21144=*
+stmts(#21144,18,#20001,22,"var con ...  Point;")
+hasLocation(#21144,#20057)
+stmt_containers(#21144,#20001)
 #21145=*
-exprs(#21145,78,#21143,0,"constructSigVar")
-hasLocation(#21145,#20426)
-enclosing_stmt(#21145,#21142)
+exprs(#21145,64,#21144,0,"constru ... > Point")
+#21146=@"loc,{#10000},28,5,28,39"
+locations_default(#21146,#10000,28,5,28,39)
+hasLocation(#21145,#21146)
+enclosing_stmt(#21145,#21144)
 expr_containers(#21145,#20001)
-literals("constructSigVar","constructSigVar",#21145)
-decl(#21145,#20948)
-#21146=*
-typeexprs(#21146,24,#21143,2,"new () => Point")
-#21147=@"loc,{#10000},28,25,28,39"
-locations_default(#21147,#10000,28,25,28,39)
-hasLocation(#21146,#21147)
-enclosing_stmt(#21146,#21142)
-expr_containers(#21146,#20001)
+#21147=*
+exprs(#21147,78,#21145,0,"constructSigVar")
+hasLocation(#21147,#20426)
+enclosing_stmt(#21147,#21144)
+expr_containers(#21147,#20001)
+literals("constructSigVar","constructSigVar",#21147)
+decl(#21147,#20948)
 #21148=*
-exprs(#21148,9,#21146,0,"new () => Point")
-hasLocation(#21148,#21147)
-enclosing_stmt(#21148,#21142)
+typeexprs(#21148,24,#21145,2,"new () => Point")
+#21149=@"loc,{#10000},28,25,28,39"
+locations_default(#21149,#10000,28,25,28,39)
+hasLocation(#21148,#21149)
+enclosing_stmt(#21148,#21144)
 expr_containers(#21148,#20001)
-#21149=*
-scopes(#21149,1)
-scopenodes(#21148,#21149)
-scopenesting(#21149,#20000)
-#21150=@"var;{arguments};{#21149}"
-variables(#21150,"arguments",#21149)
-is_arguments_object(#21150)
+#21150=*
+exprs(#21150,9,#21148,0,"new () => Point")
+hasLocation(#21150,#21149)
+enclosing_stmt(#21150,#21144)
+expr_containers(#21150,#20001)
 #21151=*
-typeexprs(#21151,0,#21148,-3,"Point")
-hasLocation(#21151,#20438)
-expr_containers(#21151,#21148)
-literals("Point","Point",#21151)
-typebind(#21151,#20975)
-#21152=*
-stmts(#21152,18,#20001,23,"var cal ... > void;")
-hasLocation(#21152,#20059)
-stmt_containers(#21152,#20001)
-#21153=*
-exprs(#21153,64,#21152,0,"callSig ... => void")
-#21154=@"loc,{#10000},29,5,29,34"
-locations_default(#21154,#10000,29,5,29,34)
-hasLocation(#21153,#21154)
-enclosing_stmt(#21153,#21152)
-expr_containers(#21153,#20001)
+scopes(#21151,1)
+scopenodes(#21150,#21151)
+scopenesting(#21151,#20000)
+#21152=@"var;{this};{#21151}"
+variables(#21152,"this",#21151)
+#21153=@"var;{arguments};{#21151}"
+variables(#21153,"arguments",#21151)
+is_arguments_object(#21153)
+#21154=*
+typeexprs(#21154,0,#21150,-3,"Point")
+hasLocation(#21154,#20438)
+expr_containers(#21154,#21150)
+literals("Point","Point",#21154)
+typebind(#21154,#20975)
 #21155=*
-exprs(#21155,78,#21153,0,"callSigVoidVar")
-hasLocation(#21155,#20444)
-enclosing_stmt(#21155,#21152)
-expr_containers(#21155,#20001)
-literals("callSigVoidVar","callSigVoidVar",#21155)
-decl(#21155,#20949)
+stmts(#21155,18,#20001,23,"var cal ... > void;")
+hasLocation(#21155,#20059)
+stmt_containers(#21155,#20001)
 #21156=*
-typeexprs(#21156,23,#21153,2,"() => void")
-#21157=@"loc,{#10000},29,25,29,34"
-locations_default(#21157,#10000,29,25,29,34)
+exprs(#21156,64,#21155,0,"callSig ... => void")
+#21157=@"loc,{#10000},29,5,29,34"
+locations_default(#21157,#10000,29,5,29,34)
 hasLocation(#21156,#21157)
-enclosing_stmt(#21156,#21152)
+enclosing_stmt(#21156,#21155)
 expr_containers(#21156,#20001)
 #21158=*
-exprs(#21158,9,#21156,0,"() => void")
-hasLocation(#21158,#21157)
-enclosing_stmt(#21158,#21152)
+exprs(#21158,78,#21156,0,"callSigVoidVar")
+hasLocation(#21158,#20444)
+enclosing_stmt(#21158,#21155)
 expr_containers(#21158,#20001)
+literals("callSigVoidVar","callSigVoidVar",#21158)
+decl(#21158,#20949)
 #21159=*
-scopes(#21159,1)
-scopenodes(#21158,#21159)
-scopenesting(#21159,#20000)
-#21160=@"var;{arguments};{#21159}"
-variables(#21160,"arguments",#21159)
-is_arguments_object(#21160)
+typeexprs(#21159,23,#21156,2,"() => void")
+#21160=@"loc,{#10000},29,25,29,34"
+locations_default(#21160,#10000,29,25,29,34)
+hasLocation(#21159,#21160)
+enclosing_stmt(#21159,#21155)
+expr_containers(#21159,#20001)
 #21161=*
-typeexprs(#21161,2,#21158,-3,"void")
-hasLocation(#21161,#20454)
-expr_containers(#21161,#21158)
-literals("void","void",#21161)
+exprs(#21161,9,#21159,0,"() => void")
+hasLocation(#21161,#21160)
+enclosing_stmt(#21161,#21155)
+expr_containers(#21161,#20001)
 #21162=*
-stmts(#21162,18,#20001,24,"var cal ...  never;")
-hasLocation(#21162,#20061)
-stmt_containers(#21162,#20001)
-#21163=*
-exprs(#21163,64,#21162,0,"callSig ... > never")
-#21164=@"loc,{#10000},30,5,30,35"
-locations_default(#21164,#10000,30,5,30,35)
-hasLocation(#21163,#21164)
-enclosing_stmt(#21163,#21162)
-expr_containers(#21163,#20001)
+scopes(#21162,1)
+scopenodes(#21161,#21162)
+scopenesting(#21162,#20000)
+#21163=@"var;{this};{#21162}"
+variables(#21163,"this",#21162)
+#21164=@"var;{arguments};{#21162}"
+variables(#21164,"arguments",#21162)
+is_arguments_object(#21164)
 #21165=*
-exprs(#21165,78,#21163,0,"callSigNeverVar")
-hasLocation(#21165,#20460)
-enclosing_stmt(#21165,#21162)
-expr_containers(#21165,#20001)
-literals("callSigNeverVar","callSigNeverVar",#21165)
-decl(#21165,#20950)
+typeexprs(#21165,2,#21161,-3,"void")
+hasLocation(#21165,#20454)
+expr_containers(#21165,#21161)
+literals("void","void",#21165)
 #21166=*
-typeexprs(#21166,23,#21163,2,"() => never")
-#21167=@"loc,{#10000},30,25,30,35"
-locations_default(#21167,#10000,30,25,30,35)
-hasLocation(#21166,#21167)
-enclosing_stmt(#21166,#21162)
-expr_containers(#21166,#20001)
-#21168=*
-exprs(#21168,9,#21166,0,"() => never")
-hasLocation(#21168,#21167)
-enclosing_stmt(#21168,#21162)
-expr_containers(#21168,#20001)
+stmts(#21166,18,#20001,24,"var cal ...  never;")
+hasLocation(#21166,#20061)
+stmt_containers(#21166,#20001)
+#21167=*
+exprs(#21167,64,#21166,0,"callSig ... > never")
+#21168=@"loc,{#10000},30,5,30,35"
+locations_default(#21168,#10000,30,5,30,35)
+hasLocation(#21167,#21168)
+enclosing_stmt(#21167,#21166)
+expr_containers(#21167,#20001)
 #21169=*
-scopes(#21169,1)
-scopenodes(#21168,#21169)
-scopenesting(#21169,#20000)
-#21170=@"var;{arguments};{#21169}"
-variables(#21170,"arguments",#21169)
-is_arguments_object(#21170)
-#21171=*
-typeexprs(#21171,2,#21168,-3,"never")
-hasLocation(#21171,#20470)
-expr_containers(#21171,#21168)
-literals("never","never",#21171)
+exprs(#21169,78,#21167,0,"callSigNeverVar")
+hasLocation(#21169,#20460)
+enclosing_stmt(#21169,#21166)
+expr_containers(#21169,#20001)
+literals("callSigNeverVar","callSigNeverVar",#21169)
+decl(#21169,#20950)
+#21170=*
+typeexprs(#21170,23,#21167,2,"() => never")
+#21171=@"loc,{#10000},30,25,30,35"
+locations_default(#21171,#10000,30,25,30,35)
+hasLocation(#21170,#21171)
+enclosing_stmt(#21170,#21166)
+expr_containers(#21170,#20001)
 #21172=*
-stmts(#21172,18,#20001,25,"var uni ... string;")
-hasLocation(#21172,#20063)
-stmt_containers(#21172,#20001)
+exprs(#21172,9,#21170,0,"() => never")
+hasLocation(#21172,#21171)
+enclosing_stmt(#21172,#21166)
+expr_containers(#21172,#20001)
 #21173=*
-exprs(#21173,64,#21172,0,"unionVa ...  string")
-#21174=@"loc,{#10000},31,5,31,39"
-locations_default(#21174,#10000,31,5,31,39)
-hasLocation(#21173,#21174)
-enclosing_stmt(#21173,#21172)
-expr_containers(#21173,#20001)
-#21175=*
-exprs(#21175,78,#21173,0,"unionVar")
-hasLocation(#21175,#20476)
-enclosing_stmt(#21175,#21172)
-expr_containers(#21175,#20001)
-literals("unionVar","unionVar",#21175)
-decl(#21175,#20951)
+scopes(#21173,1)
+scopenodes(#21172,#21173)
+scopenesting(#21173,#20000)
+#21174=@"var;{this};{#21173}"
+variables(#21174,"this",#21173)
+#21175=@"var;{arguments};{#21173}"
+variables(#21175,"arguments",#21173)
+is_arguments_object(#21175)
 #21176=*
-typeexprs(#21176,7,#21173,2,"number | string")
-#21177=@"loc,{#10000},31,25,31,39"
-locations_default(#21177,#10000,31,25,31,39)
-hasLocation(#21176,#21177)
-enclosing_stmt(#21176,#21172)
-expr_containers(#21176,#20001)
+typeexprs(#21176,2,#21172,-3,"never")
+hasLocation(#21176,#20470)
+expr_containers(#21176,#21172)
+literals("never","never",#21176)
+#21177=*
+stmts(#21177,18,#20001,25,"var uni ... string;")
+hasLocation(#21177,#20063)
+stmt_containers(#21177,#20001)
 #21178=*
-typeexprs(#21178,2,#21176,0,"number")
-hasLocation(#21178,#20480)
-enclosing_stmt(#21178,#21172)
+exprs(#21178,64,#21177,0,"unionVa ...  string")
+#21179=@"loc,{#10000},31,5,31,39"
+locations_default(#21179,#10000,31,5,31,39)
+hasLocation(#21178,#21179)
+enclosing_stmt(#21178,#21177)
 expr_containers(#21178,#20001)
-literals("number","number",#21178)
-#21179=*
-typeexprs(#21179,2,#21176,1,"string")
-hasLocation(#21179,#20484)
-enclosing_stmt(#21179,#21172)
-expr_containers(#21179,#20001)
-literals("string","string",#21179)
 #21180=*
-stmts(#21180,18,#20001,26,"var str ... teral"";")
-hasLocation(#21180,#20065)
-stmt_containers(#21180,#20001)
+exprs(#21180,78,#21178,0,"unionVar")
+hasLocation(#21180,#20476)
+enclosing_stmt(#21180,#21177)
+expr_containers(#21180,#20001)
+literals("unionVar","unionVar",#21180)
+decl(#21180,#20951)
 #21181=*
-exprs(#21181,64,#21180,0,"stringL ... iteral""")
-#21182=@"loc,{#10000},32,5,32,33"
-locations_default(#21182,#10000,32,5,32,33)
+typeexprs(#21181,7,#21178,2,"number | string")
+#21182=@"loc,{#10000},31,25,31,39"
+locations_default(#21182,#10000,31,25,31,39)
 hasLocation(#21181,#21182)
-enclosing_stmt(#21181,#21180)
+enclosing_stmt(#21181,#21177)
 expr_containers(#21181,#20001)
 #21183=*
-exprs(#21183,78,#21181,0,"stringLiteralVar")
-hasLocation(#21183,#20490)
-enclosing_stmt(#21183,#21180)
+typeexprs(#21183,2,#21181,0,"number")
+hasLocation(#21183,#20480)
+enclosing_stmt(#21183,#21177)
 expr_containers(#21183,#20001)
-literals("stringLiteralVar","stringLiteralVar",#21183)
-decl(#21183,#20952)
+literals("number","number",#21183)
 #21184=*
-typeexprs(#21184,3,#21181,2,"""literal""")
-hasLocation(#21184,#20494)
-enclosing_stmt(#21184,#21180)
+typeexprs(#21184,2,#21181,1,"string")
+hasLocation(#21184,#20484)
+enclosing_stmt(#21184,#21177)
 expr_containers(#21184,#20001)
-literals("literal","""literal""",#21184)
+literals("string","string",#21184)
 #21185=*
-stmts(#21185,18,#20001,27,"var tru ...   true;")
-hasLocation(#21185,#20067)
+stmts(#21185,18,#20001,26,"var str ... teral"";")
+hasLocation(#21185,#20065)
 stmt_containers(#21185,#20001)
 #21186=*
-exprs(#21186,64,#21185,0,"trueVar ...    true")
-#21187=@"loc,{#10000},33,5,33,28"
-locations_default(#21187,#10000,33,5,33,28)
+exprs(#21186,64,#21185,0,"stringL ... iteral""")
+#21187=@"loc,{#10000},32,5,32,33"
+locations_default(#21187,#10000,32,5,32,33)
 hasLocation(#21186,#21187)
 enclosing_stmt(#21186,#21185)
 expr_containers(#21186,#20001)
 #21188=*
-exprs(#21188,78,#21186,0,"trueVar")
-hasLocation(#21188,#20500)
+exprs(#21188,78,#21186,0,"stringLiteralVar")
+hasLocation(#21188,#20490)
 enclosing_stmt(#21188,#21185)
 expr_containers(#21188,#20001)
-literals("trueVar","trueVar",#21188)
-decl(#21188,#20953)
+literals("stringLiteralVar","stringLiteralVar",#21188)
+decl(#21188,#20952)
 #21189=*
-typeexprs(#21189,5,#21186,2,"true")
-hasLocation(#21189,#20504)
+typeexprs(#21189,3,#21186,2,"""literal""")
+hasLocation(#21189,#20494)
 enclosing_stmt(#21189,#21185)
 expr_containers(#21189,#20001)
-literals("true","true",#21189)
+literals("literal","""literal""",#21189)
 #21190=*
-stmts(#21190,18,#20001,28,"var fal ...  false;")
-hasLocation(#21190,#20069)
+stmts(#21190,18,#20001,27,"var tru ...   true;")
+hasLocation(#21190,#20067)
 stmt_containers(#21190,#20001)
 #21191=*
-exprs(#21191,64,#21190,0,"falseVa ...   false")
-#21192=@"loc,{#10000},34,5,34,29"
-locations_default(#21192,#10000,34,5,34,29)
+exprs(#21191,64,#21190,0,"trueVar ...    true")
+#21192=@"loc,{#10000},33,5,33,28"
+locations_default(#21192,#10000,33,5,33,28)
 hasLocation(#21191,#21192)
 enclosing_stmt(#21191,#21190)
 expr_containers(#21191,#20001)
 #21193=*
-exprs(#21193,78,#21191,0,"falseVar")
-hasLocation(#21193,#20510)
+exprs(#21193,78,#21191,0,"trueVar")
+hasLocation(#21193,#20500)
 enclosing_stmt(#21193,#21190)
 expr_containers(#21193,#20001)
-literals("falseVar","falseVar",#21193)
-decl(#21193,#20954)
+literals("trueVar","trueVar",#21193)
+decl(#21193,#20953)
 #21194=*
-typeexprs(#21194,5,#21191,2,"false")
-hasLocation(#21194,#20514)
+typeexprs(#21194,5,#21191,2,"true")
+hasLocation(#21194,#20504)
 enclosing_stmt(#21194,#21190)
 expr_containers(#21194,#20001)
-literals("false","false",#21194)
+literals("true","true",#21194)
 #21195=*
-stmts(#21195,18,#20001,29,"var int ...    100;")
-hasLocation(#21195,#20071)
+stmts(#21195,18,#20001,28,"var fal ...  false;")
+hasLocation(#21195,#20069)
 stmt_containers(#21195,#20001)
 #21196=*
-exprs(#21196,64,#21195,0,"intLite ...     100")
-#21197=@"loc,{#10000},35,5,35,27"
-locations_default(#21197,#10000,35,5,35,27)
+exprs(#21196,64,#21195,0,"falseVa ...   false")
+#21197=@"loc,{#10000},34,5,34,29"
+locations_default(#21197,#10000,34,5,34,29)
 hasLocation(#21196,#21197)
 enclosing_stmt(#21196,#21195)
 expr_containers(#21196,#20001)
 #21198=*
-exprs(#21198,78,#21196,0,"intLiteralVar")
-hasLocation(#21198,#20520)
+exprs(#21198,78,#21196,0,"falseVar")
+hasLocation(#21198,#20510)
 enclosing_stmt(#21198,#21195)
 expr_containers(#21198,#20001)
-literals("intLiteralVar","intLiteralVar",#21198)
-decl(#21198,#20955)
+literals("falseVar","falseVar",#21198)
+decl(#21198,#20954)
 #21199=*
-typeexprs(#21199,4,#21196,2,"100")
-hasLocation(#21199,#20524)
+typeexprs(#21199,5,#21196,2,"false")
+hasLocation(#21199,#20514)
 enclosing_stmt(#21199,#21195)
 expr_containers(#21199,#20001)
-literals("100","100",#21199)
+literals("false","false",#21199)
 #21200=*
-stmts(#21200,18,#20001,30,"var dou ... 100.50;")
-hasLocation(#21200,#20073)
+stmts(#21200,18,#20001,29,"var int ...    100;")
+hasLocation(#21200,#20071)
 stmt_containers(#21200,#20001)
 #21201=*
-exprs(#21201,64,#21200,0,"doubleL ...  100.50")
-#21202=@"loc,{#10000},36,5,36,30"
-locations_default(#21202,#10000,36,5,36,30)
+exprs(#21201,64,#21200,0,"intLite ...     100")
+#21202=@"loc,{#10000},35,5,35,27"
+locations_default(#21202,#10000,35,5,35,27)
 hasLocation(#21201,#21202)
 enclosing_stmt(#21201,#21200)
 expr_containers(#21201,#20001)
 #21203=*
-exprs(#21203,78,#21201,0,"doubleLiteralVar")
-hasLocation(#21203,#20530)
+exprs(#21203,78,#21201,0,"intLiteralVar")
+hasLocation(#21203,#20520)
 enclosing_stmt(#21203,#21200)
 expr_containers(#21203,#20001)
-literals("doubleLiteralVar","doubleLiteralVar",#21203)
-decl(#21203,#20956)
+literals("intLiteralVar","intLiteralVar",#21203)
+decl(#21203,#20955)
 #21204=*
-typeexprs(#21204,4,#21201,2,"100.50")
-hasLocation(#21204,#20534)
+typeexprs(#21204,4,#21201,2,"100")
+hasLocation(#21204,#20524)
 enclosing_stmt(#21204,#21200)
 expr_containers(#21204,#20001)
-literals("100.5","100.50",#21204)
+literals("100","100",#21204)
 #21205=*
-stmts(#21205,18,#20001,31,"var tup ... number]")
-hasLocation(#21205,#20075)
+stmts(#21205,18,#20001,30,"var dou ... 100.50;")
+hasLocation(#21205,#20073)
 stmt_containers(#21205,#20001)
 #21206=*
-exprs(#21206,64,#21205,0,"tupleVa ... number]")
-#21207=@"loc,{#10000},37,5,37,40"
-locations_default(#21207,#10000,37,5,37,40)
+exprs(#21206,64,#21205,0,"doubleL ...  100.50")
+#21207=@"loc,{#10000},36,5,36,30"
+locations_default(#21207,#10000,36,5,36,30)
 hasLocation(#21206,#21207)
 enclosing_stmt(#21206,#21205)
 expr_containers(#21206,#20001)
 #21208=*
-exprs(#21208,78,#21206,0,"tupleVar")
-hasLocation(#21208,#20540)
+exprs(#21208,78,#21206,0,"doubleLiteralVar")
+hasLocation(#21208,#20530)
 enclosing_stmt(#21208,#21205)
 expr_containers(#21208,#20001)
-literals("tupleVar","tupleVar",#21208)
-decl(#21208,#20957)
+literals("doubleLiteralVar","doubleLiteralVar",#21208)
+decl(#21208,#20956)
 #21209=*
-typeexprs(#21209,11,#21206,2,"[string, number]")
-#21210=@"loc,{#10000},37,25,37,40"
-locations_default(#21210,#10000,37,25,37,40)
-hasLocation(#21209,#21210)
+typeexprs(#21209,4,#21206,2,"100.50")
+hasLocation(#21209,#20534)
 enclosing_stmt(#21209,#21205)
 expr_containers(#21209,#20001)
+literals("100.5","100.50",#21209)
+#21210=*
+stmts(#21210,18,#20001,31,"var tup ... number]")
+hasLocation(#21210,#20075)
+stmt_containers(#21210,#20001)
 #21211=*
-typeexprs(#21211,2,#21209,0,"string")
-hasLocation(#21211,#20546)
-enclosing_stmt(#21211,#21205)
+exprs(#21211,64,#21210,0,"tupleVa ... number]")
+#21212=@"loc,{#10000},37,5,37,40"
+locations_default(#21212,#10000,37,5,37,40)
+hasLocation(#21211,#21212)
+enclosing_stmt(#21211,#21210)
 expr_containers(#21211,#20001)
-literals("string","string",#21211)
-#21212=*
-typeexprs(#21212,2,#21209,1,"number")
-hasLocation(#21212,#20550)
-enclosing_stmt(#21212,#21205)
-expr_containers(#21212,#20001)
-literals("number","number",#21212)
 #21213=*
-stmts(#21213,18,#20001,32,"var lon ... "" | [3]")
-hasLocation(#21213,#20077)
-stmt_containers(#21213,#20001)
+exprs(#21213,78,#21211,0,"tupleVar")
+hasLocation(#21213,#20540)
+enclosing_stmt(#21213,#21210)
+expr_containers(#21213,#20001)
+literals("tupleVar","tupleVar",#21213)
+decl(#21213,#20957)
 #21214=*
-exprs(#21214,64,#21213,0,"longUni ... "" | [3]")
-#21215=@"loc,{#10000},38,5,38,46"
-locations_default(#21215,#10000,38,5,38,46)
+typeexprs(#21214,11,#21211,2,"[string, number]")
+#21215=@"loc,{#10000},37,25,37,40"
+locations_default(#21215,#10000,37,25,37,40)
 hasLocation(#21214,#21215)
-enclosing_stmt(#21214,#21213)
+enclosing_stmt(#21214,#21210)
 expr_containers(#21214,#20001)
 #21216=*
-exprs(#21216,78,#21214,0,"longUnionVar")
-hasLocation(#21216,#20556)
-enclosing_stmt(#21216,#21213)
+typeexprs(#21216,2,#21214,0,"string")
+hasLocation(#21216,#20546)
+enclosing_stmt(#21216,#21210)
 expr_containers(#21216,#20001)
-literals("longUnionVar","longUnionVar",#21216)
-decl(#21216,#20958)
+literals("string","string",#21216)
 #21217=*
-typeexprs(#21217,7,#21214,2,"null |  ... "" | [3]")
-#21218=@"loc,{#10000},38,25,38,46"
-locations_default(#21218,#10000,38,25,38,46)
-hasLocation(#21217,#21218)
-enclosing_stmt(#21217,#21213)
+typeexprs(#21217,2,#21214,1,"number")
+hasLocation(#21217,#20550)
+enclosing_stmt(#21217,#21210)
 expr_containers(#21217,#20001)
+literals("number","number",#21217)
+#21218=*
+stmts(#21218,18,#20001,32,"var lon ... "" | [3]")
+hasLocation(#21218,#20077)
+stmt_containers(#21218,#20001)
 #21219=*
-typeexprs(#21219,2,#21217,0,"null")
-hasLocation(#21219,#20560)
-enclosing_stmt(#21219,#21213)
+exprs(#21219,64,#21218,0,"longUni ... "" | [3]")
+#21220=@"loc,{#10000},38,5,38,46"
+locations_default(#21220,#10000,38,5,38,46)
+hasLocation(#21219,#21220)
+enclosing_stmt(#21219,#21218)
 expr_containers(#21219,#20001)
-literals("null","null",#21219)
-#21220=*
-typeexprs(#21220,4,#21217,1,"1")
-hasLocation(#21220,#20564)
-enclosing_stmt(#21220,#21213)
-expr_containers(#21220,#20001)
-literals("1","1",#21220)
 #21221=*
-typeexprs(#21221,3,#21217,2,"""two""")
-hasLocation(#21221,#20568)
-enclosing_stmt(#21221,#21213)
+exprs(#21221,78,#21219,0,"longUnionVar")
+hasLocation(#21221,#20556)
+enclosing_stmt(#21221,#21218)
 expr_containers(#21221,#20001)
-literals("two","""two""",#21221)
+literals("longUnionVar","longUnionVar",#21221)
+decl(#21221,#20958)
 #21222=*
-typeexprs(#21222,11,#21217,3,"[3]")
-#21223=@"loc,{#10000},38,44,38,46"
-locations_default(#21223,#10000,38,44,38,46)
+typeexprs(#21222,7,#21219,2,"null |  ... "" | [3]")
+#21223=@"loc,{#10000},38,25,38,46"
+locations_default(#21223,#10000,38,25,38,46)
 hasLocation(#21222,#21223)
-enclosing_stmt(#21222,#21213)
+enclosing_stmt(#21222,#21218)
 expr_containers(#21222,#20001)
 #21224=*
-typeexprs(#21224,4,#21222,0,"3")
-hasLocation(#21224,#20574)
-enclosing_stmt(#21224,#21213)
+typeexprs(#21224,2,#21222,0,"null")
+hasLocation(#21224,#20560)
+enclosing_stmt(#21224,#21218)
 expr_containers(#21224,#20001)
-literals("3","3",#21224)
+literals("null","null",#21224)
 #21225=*
-stmts(#21225,18,#20001,33,"var int ...  & Bar;")
-hasLocation(#21225,#20079)
-stmt_containers(#21225,#20001)
+typeexprs(#21225,4,#21222,1,"1")
+hasLocation(#21225,#20564)
+enclosing_stmt(#21225,#21218)
+expr_containers(#21225,#20001)
+literals("1","1",#21225)
 #21226=*
-exprs(#21226,64,#21225,0,"interse ... o & Bar")
-#21227=@"loc,{#10000},39,5,39,33"
-locations_default(#21227,#10000,39,5,39,33)
-hasLocation(#21226,#21227)
-enclosing_stmt(#21226,#21225)
+typeexprs(#21226,3,#21222,2,"""two""")
+hasLocation(#21226,#20568)
+enclosing_stmt(#21226,#21218)
 expr_containers(#21226,#20001)
-#21228=*
-exprs(#21228,78,#21226,0,"intersectVar")
-hasLocation(#21228,#20580)
-enclosing_stmt(#21228,#21225)
-expr_containers(#21228,#20001)
-literals("intersectVar","intersectVar",#21228)
-decl(#21228,#20959)
+literals("two","""two""",#21226)
+#21227=*
+typeexprs(#21227,11,#21222,3,"[3]")
+#21228=@"loc,{#10000},38,44,38,46"
+locations_default(#21228,#10000,38,44,38,46)
+hasLocation(#21227,#21228)
+enclosing_stmt(#21227,#21218)
+expr_containers(#21227,#20001)
 #21229=*
-typeexprs(#21229,9,#21226,2,"Foo & Bar")
-#21230=@"loc,{#10000},39,25,39,33"
-locations_default(#21230,#10000,39,25,39,33)
-hasLocation(#21229,#21230)
-enclosing_stmt(#21229,#21225)
+typeexprs(#21229,4,#21227,0,"3")
+hasLocation(#21229,#20574)
+enclosing_stmt(#21229,#21218)
 expr_containers(#21229,#20001)
+literals("3","3",#21229)
+#21230=*
+stmts(#21230,18,#20001,33,"var int ...  & Bar;")
+hasLocation(#21230,#20079)
+stmt_containers(#21230,#20001)
 #21231=*
-typeexprs(#21231,0,#21229,0,"Foo")
-hasLocation(#21231,#20584)
-enclosing_stmt(#21231,#21225)
+exprs(#21231,64,#21230,0,"interse ... o & Bar")
+#21232=@"loc,{#10000},39,5,39,33"
+locations_default(#21232,#10000,39,5,39,33)
+hasLocation(#21231,#21232)
+enclosing_stmt(#21231,#21230)
 expr_containers(#21231,#20001)
-literals("Foo","Foo",#21231)
-#21232=*
-typeexprs(#21232,0,#21229,1,"Bar")
-hasLocation(#21232,#20588)
-enclosing_stmt(#21232,#21225)
-expr_containers(#21232,#20001)
-literals("Bar","Bar",#21232)
 #21233=*
-stmts(#21233,18,#20001,34,"var gen ... ) => T;")
-hasLocation(#21233,#20081)
-stmt_containers(#21233,#20001)
+exprs(#21233,78,#21231,0,"intersectVar")
+hasLocation(#21233,#20580)
+enclosing_stmt(#21233,#21230)
+expr_containers(#21233,#20001)
+literals("intersectVar","intersectVar",#21233)
+decl(#21233,#20959)
 #21234=*
-exprs(#21234,64,#21233,0,"generic ... T) => T")
-#21235=@"loc,{#10000},40,5,40,38"
-locations_default(#21235,#10000,40,5,40,38)
+typeexprs(#21234,9,#21231,2,"Foo & Bar")
+#21235=@"loc,{#10000},39,25,39,33"
+locations_default(#21235,#10000,39,25,39,33)
 hasLocation(#21234,#21235)
-enclosing_stmt(#21234,#21233)
+enclosing_stmt(#21234,#21230)
 expr_containers(#21234,#20001)
 #21236=*
-exprs(#21236,78,#21234,0,"genericCallSigVar")
-hasLocation(#21236,#20594)
-enclosing_stmt(#21236,#21233)
+typeexprs(#21236,0,#21234,0,"Foo")
+hasLocation(#21236,#20584)
+enclosing_stmt(#21236,#21230)
 expr_containers(#21236,#20001)
-literals("genericCallSigVar","genericCallSigVar",#21236)
-decl(#21236,#20960)
+literals("Foo","Foo",#21236)
 #21237=*
-typeexprs(#21237,23,#21234,2,"<T>(x: T) => T")
-#21238=@"loc,{#10000},40,25,40,38"
-locations_default(#21238,#10000,40,25,40,38)
-hasLocation(#21237,#21238)
-enclosing_stmt(#21237,#21233)
+typeexprs(#21237,0,#21234,1,"Bar")
+hasLocation(#21237,#20588)
+enclosing_stmt(#21237,#21230)
 expr_containers(#21237,#20001)
+literals("Bar","Bar",#21237)
+#21238=*
+stmts(#21238,18,#20001,34,"var gen ... ) => T;")
+hasLocation(#21238,#20081)
+stmt_containers(#21238,#20001)
 #21239=*
-exprs(#21239,9,#21237,0,"<T>(x: T) => T")
-hasLocation(#21239,#21238)
-enclosing_stmt(#21239,#21233)
+exprs(#21239,64,#21238,0,"generic ... T) => T")
+#21240=@"loc,{#10000},40,5,40,38"
+locations_default(#21240,#10000,40,5,40,38)
+hasLocation(#21239,#21240)
+enclosing_stmt(#21239,#21238)
 expr_containers(#21239,#20001)
-#21240=*
-scopes(#21240,1)
-scopenodes(#21239,#21240)
-scopenesting(#21240,#20000)
-#21241=@"local_type_name;{T};{#21240}"
-local_type_names(#21241,"T",#21240)
-#21242=@"var;{x};{#21240}"
-variables(#21242,"x",#21240)
-#21243=*
-exprs(#21243,78,#21239,0,"x")
-hasLocation(#21243,#20606)
-expr_containers(#21243,#21239)
-literals("x","x",#21243)
-decl(#21243,#21242)
-#21244=@"var;{arguments};{#21240}"
-variables(#21244,"arguments",#21240)
-is_arguments_object(#21244)
+#21241=*
+exprs(#21241,78,#21239,0,"genericCallSigVar")
+hasLocation(#21241,#20594)
+enclosing_stmt(#21241,#21238)
+expr_containers(#21241,#20001)
+literals("genericCallSigVar","genericCallSigVar",#21241)
+decl(#21241,#20960)
+#21242=*
+typeexprs(#21242,23,#21239,2,"<T>(x: T) => T")
+#21243=@"loc,{#10000},40,25,40,38"
+locations_default(#21243,#10000,40,25,40,38)
+hasLocation(#21242,#21243)
+enclosing_stmt(#21242,#21238)
+expr_containers(#21242,#20001)
+#21244=*
+exprs(#21244,9,#21242,0,"<T>(x: T) => T")
+hasLocation(#21244,#21243)
+enclosing_stmt(#21244,#21238)
+expr_containers(#21244,#20001)
 #21245=*
-typeexprs(#21245,0,#21239,-3,"T")
-hasLocation(#21245,#20616)
-expr_containers(#21245,#21239)
-literals("T","T",#21245)
-typebind(#21245,#21241)
-#21246=*
-typeexprs(#21246,0,#21239,-6,"T")
-hasLocation(#21246,#20610)
-expr_containers(#21246,#21239)
-literals("T","T",#21246)
-typebind(#21246,#21241)
-#21247=*
-typeexprs(#21247,22,#21239,-7,"T")
-hasLocation(#21247,#20600)
-expr_containers(#21247,#21239)
-#21248=*
-typeexprs(#21248,1,#21247,0,"T")
-hasLocation(#21248,#20600)
-expr_containers(#21248,#21239)
-literals("T","T",#21248)
-typedecl(#21248,#21241)
+scopes(#21245,1)
+scopenodes(#21244,#21245)
+scopenesting(#21245,#20000)
+#21246=@"var;{this};{#21245}"
+variables(#21246,"this",#21245)
+#21247=@"local_type_name;{T};{#21245}"
+local_type_names(#21247,"T",#21245)
+#21248=@"var;{x};{#21245}"
+variables(#21248,"x",#21245)
 #21249=*
-stmts(#21249,18,#20001,35,"var gen ... ) => T;")
-hasLocation(#21249,#20083)
-stmt_containers(#21249,#20001)
-#21250=*
-exprs(#21250,64,#21249,0,"generic ... T) => T")
-#21251=@"loc,{#10000},41,5,41,46"
-locations_default(#21251,#10000,41,5,41,46)
-hasLocation(#21250,#21251)
-enclosing_stmt(#21250,#21249)
-expr_containers(#21250,#20001)
+exprs(#21249,78,#21244,0,"x")
+hasLocation(#21249,#20606)
+expr_containers(#21249,#21244)
+literals("x","x",#21249)
+decl(#21249,#21248)
+#21250=@"var;{arguments};{#21245}"
+variables(#21250,"arguments",#21245)
+is_arguments_object(#21250)
+#21251=*
+typeexprs(#21251,0,#21244,-3,"T")
+hasLocation(#21251,#20616)
+expr_containers(#21251,#21244)
+literals("T","T",#21251)
+typebind(#21251,#21247)
 #21252=*
-exprs(#21252,78,#21250,0,"generic ... tSigVar")
-hasLocation(#21252,#20622)
-enclosing_stmt(#21252,#21249)
-expr_containers(#21252,#20001)
-literals("genericConstructSigVar","genericConstructSigVar",#21252)
-decl(#21252,#20961)
+typeexprs(#21252,0,#21244,-6,"T")
+hasLocation(#21252,#20610)
+expr_containers(#21252,#21244)
+literals("T","T",#21252)
+typebind(#21252,#21247)
 #21253=*
-typeexprs(#21253,24,#21250,2,"new <T>(x: T) => T")
-#21254=@"loc,{#10000},41,29,41,46"
-locations_default(#21254,#10000,41,29,41,46)
-hasLocation(#21253,#21254)
-enclosing_stmt(#21253,#21249)
-expr_containers(#21253,#20001)
+typeexprs(#21253,22,#21244,-7,"T")
+hasLocation(#21253,#20600)
+expr_containers(#21253,#21244)
+#21254=*
+typeexprs(#21254,1,#21253,0,"T")
+hasLocation(#21254,#20600)
+expr_containers(#21254,#21244)
+literals("T","T",#21254)
+typedecl(#21254,#21247)
 #21255=*
-exprs(#21255,9,#21253,0,"new <T>(x: T) => T")
-hasLocation(#21255,#21254)
-enclosing_stmt(#21255,#21249)
-expr_containers(#21255,#20001)
+stmts(#21255,18,#20001,35,"var gen ... ) => T;")
+hasLocation(#21255,#20083)
+stmt_containers(#21255,#20001)
 #21256=*
-scopes(#21256,1)
-scopenodes(#21255,#21256)
-scopenesting(#21256,#20000)
-#21257=@"local_type_name;{T};{#21256}"
-local_type_names(#21257,"T",#21256)
-#21258=@"var;{x};{#21256}"
-variables(#21258,"x",#21256)
+exprs(#21256,64,#21255,0,"generic ... T) => T")
+#21257=@"loc,{#10000},41,5,41,46"
+locations_default(#21257,#10000,41,5,41,46)
+hasLocation(#21256,#21257)
+enclosing_stmt(#21256,#21255)
+expr_containers(#21256,#20001)
+#21258=*
+exprs(#21258,78,#21256,0,"generic ... tSigVar")
+hasLocation(#21258,#20622)
+enclosing_stmt(#21258,#21255)
+expr_containers(#21258,#20001)
+literals("genericConstructSigVar","genericConstructSigVar",#21258)
+decl(#21258,#20961)
 #21259=*
-exprs(#21259,78,#21255,0,"x")
-hasLocation(#21259,#20636)
-expr_containers(#21259,#21255)
-literals("x","x",#21259)
-decl(#21259,#21258)
-#21260=@"var;{arguments};{#21256}"
-variables(#21260,"arguments",#21256)
-is_arguments_object(#21260)
+typeexprs(#21259,24,#21256,2,"new <T>(x: T) => T")
+#21260=@"loc,{#10000},41,29,41,46"
+locations_default(#21260,#10000,41,29,41,46)
+hasLocation(#21259,#21260)
+enclosing_stmt(#21259,#21255)
+expr_containers(#21259,#20001)
 #21261=*
-typeexprs(#21261,0,#21255,-3,"T")
-hasLocation(#21261,#20646)
-expr_containers(#21261,#21255)
-literals("T","T",#21261)
-typebind(#21261,#21257)
+exprs(#21261,9,#21259,0,"new <T>(x: T) => T")
+hasLocation(#21261,#21260)
+enclosing_stmt(#21261,#21255)
+expr_containers(#21261,#20001)
 #21262=*
-typeexprs(#21262,0,#21255,-6,"T")
-hasLocation(#21262,#20640)
-expr_containers(#21262,#21255)
-literals("T","T",#21262)
-typebind(#21262,#21257)
-#21263=*
-typeexprs(#21263,22,#21255,-7,"T")
-hasLocation(#21263,#20630)
-expr_containers(#21263,#21255)
-#21264=*
-typeexprs(#21264,1,#21263,0,"T")
-hasLocation(#21264,#20630)
-expr_containers(#21264,#21255)
-literals("T","T",#21264)
-typedecl(#21264,#21257)
-#21265=*
-stmts(#21265,18,#20001,36,"var key ... f Point")
-hasLocation(#21265,#20085)
-stmt_containers(#21265,#20001)
+scopes(#21262,1)
+scopenodes(#21261,#21262)
+scopenesting(#21262,#20000)
+#21263=@"var;{this};{#21262}"
+variables(#21263,"this",#21262)
+#21264=@"local_type_name;{T};{#21262}"
+local_type_names(#21264,"T",#21262)
+#21265=@"var;{x};{#21262}"
+variables(#21265,"x",#21262)
 #21266=*
-exprs(#21266,64,#21265,0,"keyofVa ... f Point")
-#21267=@"loc,{#10000},42,5,42,35"
-locations_default(#21267,#10000,42,5,42,35)
-hasLocation(#21266,#21267)
-enclosing_stmt(#21266,#21265)
-expr_containers(#21266,#20001)
+exprs(#21266,78,#21261,0,"x")
+hasLocation(#21266,#20636)
+expr_containers(#21266,#21261)
+literals("x","x",#21266)
+decl(#21266,#21265)
+#21267=@"var;{arguments};{#21262}"
+variables(#21267,"arguments",#21262)
+is_arguments_object(#21267)
 #21268=*
-exprs(#21268,78,#21266,0,"keyofVar")
-hasLocation(#21268,#20652)
-enclosing_stmt(#21268,#21265)
-expr_containers(#21268,#20001)
-literals("keyofVar","keyofVar",#21268)
-decl(#21268,#20962)
+typeexprs(#21268,0,#21261,-3,"T")
+hasLocation(#21268,#20646)
+expr_containers(#21268,#21261)
+literals("T","T",#21268)
+typebind(#21268,#21264)
 #21269=*
-typeexprs(#21269,12,#21266,2,"keyof Point")
-#21270=@"loc,{#10000},42,25,42,35"
-locations_default(#21270,#10000,42,25,42,35)
-hasLocation(#21269,#21270)
-enclosing_stmt(#21269,#21265)
-expr_containers(#21269,#20001)
+typeexprs(#21269,0,#21261,-6,"T")
+hasLocation(#21269,#20640)
+expr_containers(#21269,#21261)
+literals("T","T",#21269)
+typebind(#21269,#21264)
+#21270=*
+typeexprs(#21270,22,#21261,-7,"T")
+hasLocation(#21270,#20630)
+expr_containers(#21270,#21261)
 #21271=*
-typeexprs(#21271,0,#21269,0,"Point")
-hasLocation(#21271,#20658)
-enclosing_stmt(#21271,#21265)
-expr_containers(#21271,#20001)
-literals("Point","Point",#21271)
-typebind(#21271,#20975)
+typeexprs(#21271,1,#21270,0,"T")
+hasLocation(#21271,#20630)
+expr_containers(#21271,#21261)
+literals("T","T",#21271)
+typedecl(#21271,#21264)
 #21272=*
-stmts(#21272,18,#20001,37,"var ind ... nt[""x""]")
-hasLocation(#21272,#20087)
+stmts(#21272,18,#20001,36,"var key ... f Point")
+hasLocation(#21272,#20085)
 stmt_containers(#21272,#20001)
 #21273=*
-exprs(#21273,64,#21272,0,"indexed ... nt[""x""]")
-#21274=@"loc,{#10000},43,5,43,34"
-locations_default(#21274,#10000,43,5,43,34)
+exprs(#21273,64,#21272,0,"keyofVa ... f Point")
+#21274=@"loc,{#10000},42,5,42,35"
+locations_default(#21274,#10000,42,5,42,35)
 hasLocation(#21273,#21274)
 enclosing_stmt(#21273,#21272)
 expr_containers(#21273,#20001)
 #21275=*
-exprs(#21275,78,#21273,0,"indexedVar")
-hasLocation(#21275,#20662)
+exprs(#21275,78,#21273,0,"keyofVar")
+hasLocation(#21275,#20652)
 enclosing_stmt(#21275,#21272)
 expr_containers(#21275,#20001)
-literals("indexedVar","indexedVar",#21275)
-decl(#21275,#20963)
+literals("keyofVar","keyofVar",#21275)
+decl(#21275,#20962)
 #21276=*
-typeexprs(#21276,8,#21273,2,"Point[""x""]")
-#21277=@"loc,{#10000},43,25,43,34"
-locations_default(#21277,#10000,43,25,43,34)
+typeexprs(#21276,12,#21273,2,"keyof Point")
+#21277=@"loc,{#10000},42,25,42,35"
+locations_default(#21277,#10000,42,25,42,35)
 hasLocation(#21276,#21277)
 enclosing_stmt(#21276,#21272)
 expr_containers(#21276,#20001)
 #21278=*
 typeexprs(#21278,0,#21276,0,"Point")
-hasLocation(#21278,#20666)
+hasLocation(#21278,#20658)
 enclosing_stmt(#21278,#21272)
 expr_containers(#21278,#20001)
 literals("Point","Point",#21278)
 typebind(#21278,#20975)
 #21279=*
-typeexprs(#21279,3,#21276,1,"""x""")
-hasLocation(#21279,#20670)
-enclosing_stmt(#21279,#21272)
-expr_containers(#21279,#20001)
-literals("x","""x""",#21279)
+stmts(#21279,18,#20001,37,"var ind ... nt[""x""]")
+hasLocation(#21279,#20087)
+stmt_containers(#21279,#20001)
 #21280=*
-stmts(#21280,18,#20001,38,"var typ ... eof x31")
-hasLocation(#21280,#20089)
-stmt_containers(#21280,#20001)
-#21281=*
-exprs(#21281,64,#21280,0,"typeofV ... eof x31")
-#21282=@"loc,{#10000},44,5,44,34"
-locations_default(#21282,#10000,44,5,44,34)
-hasLocation(#21281,#21282)
-enclosing_stmt(#21281,#21280)
-expr_containers(#21281,#20001)
+exprs(#21280,64,#21279,0,"indexed ... nt[""x""]")
+#21281=@"loc,{#10000},43,5,43,34"
+locations_default(#21281,#10000,43,5,43,34)
+hasLocation(#21280,#21281)
+enclosing_stmt(#21280,#21279)
+expr_containers(#21280,#20001)
+#21282=*
+exprs(#21282,78,#21280,0,"indexedVar")
+hasLocation(#21282,#20662)
+enclosing_stmt(#21282,#21279)
+expr_containers(#21282,#20001)
+literals("indexedVar","indexedVar",#21282)
+decl(#21282,#20963)
 #21283=*
-exprs(#21283,78,#21281,0,"typeofVar")
-hasLocation(#21283,#20676)
-enclosing_stmt(#21283,#21280)
+typeexprs(#21283,8,#21280,2,"Point[""x""]")
+#21284=@"loc,{#10000},43,25,43,34"
+locations_default(#21284,#10000,43,25,43,34)
+hasLocation(#21283,#21284)
+enclosing_stmt(#21283,#21279)
 expr_containers(#21283,#20001)
-literals("typeofVar","typeofVar",#21283)
-decl(#21283,#20964)
-#21284=*
-typeexprs(#21284,16,#21281,2,"typeof x31")
-#21285=@"loc,{#10000},44,25,44,34"
-locations_default(#21285,#10000,44,25,44,34)
-hasLocation(#21284,#21285)
-enclosing_stmt(#21284,#21280)
-expr_containers(#21284,#20001)
+#21285=*
+typeexprs(#21285,0,#21283,0,"Point")
+hasLocation(#21285,#20666)
+enclosing_stmt(#21285,#21279)
+expr_containers(#21285,#20001)
+literals("Point","Point",#21285)
+typebind(#21285,#20975)
 #21286=*
-typeexprs(#21286,17,#21284,0,"x31")
-hasLocation(#21286,#20682)
-enclosing_stmt(#21286,#21280)
+typeexprs(#21286,3,#21283,1,"""x""")
+hasLocation(#21286,#20670)
+enclosing_stmt(#21286,#21279)
 expr_containers(#21286,#20001)
-literals("x31","x31",#21286)
-#21287=@"var;{x31};{#20000}"
-variables(#21287,"x31",#20000)
-bind(#21286,#21287)
+literals("x","""x""",#21286)
+#21287=*
+stmts(#21287,18,#20001,38,"var typ ... eof x31")
+hasLocation(#21287,#20089)
+stmt_containers(#21287,#20001)
 #21288=*
-stmts(#21288,18,#20001,39,"var map ... : any }")
-hasLocation(#21288,#20091)
-stmt_containers(#21288,#20001)
-#21289=*
-exprs(#21289,64,#21288,0,"mappedV ... : any }")
-#21290=@"loc,{#10000},45,5,45,51"
-locations_default(#21290,#10000,45,5,45,51)
-hasLocation(#21289,#21290)
-enclosing_stmt(#21289,#21288)
-expr_containers(#21289,#20001)
+exprs(#21288,64,#21287,0,"typeofV ... eof x31")
+#21289=@"loc,{#10000},44,5,44,34"
+locations_default(#21289,#10000,44,5,44,34)
+hasLocation(#21288,#21289)
+enclosing_stmt(#21288,#21287)
+expr_containers(#21288,#20001)
+#21290=*
+exprs(#21290,78,#21288,0,"typeofVar")
+hasLocation(#21290,#20676)
+enclosing_stmt(#21290,#21287)
+expr_containers(#21290,#20001)
+literals("typeofVar","typeofVar",#21290)
+decl(#21290,#20964)
 #21291=*
-exprs(#21291,78,#21289,0,"mappedVar")
-hasLocation(#21291,#20686)
-enclosing_stmt(#21291,#21288)
+typeexprs(#21291,16,#21288,2,"typeof x31")
+#21292=@"loc,{#10000},44,25,44,34"
+locations_default(#21292,#10000,44,25,44,34)
+hasLocation(#21291,#21292)
+enclosing_stmt(#21291,#21287)
 expr_containers(#21291,#20001)
-literals("mappedVar","mappedVar",#21291)
-decl(#21291,#20965)
-#21292=*
-typeexprs(#21292,27,#21289,2,"{ [K in ... : any }")
-#21293=@"loc,{#10000},45,25,45,51"
-locations_default(#21293,#10000,45,25,45,51)
-hasLocation(#21292,#21293)
-enclosing_stmt(#21292,#21288)
-expr_containers(#21292,#20001)
-#21294=*
-scopes(#21294,13)
-scopenodes(#21292,#21294)
-scopenesting(#21294,#20000)
-#21295=@"local_type_name;{K};{#21294}"
-local_type_names(#21295,"K",#21294)
+#21293=*
+typeexprs(#21293,17,#21291,0,"x31")
+hasLocation(#21293,#20682)
+enclosing_stmt(#21293,#21287)
+expr_containers(#21293,#20001)
+literals("x31","x31",#21293)
+#21294=@"var;{x31};{#20000}"
+variables(#21294,"x31",#20000)
+bind(#21293,#21294)
+#21295=*
+stmts(#21295,18,#20001,39,"var map ... : any }")
+hasLocation(#21295,#20091)
+stmt_containers(#21295,#20001)
 #21296=*
-typeexprs(#21296,22,#21292,0,"K in keyof Point")
-#21297=@"loc,{#10000},45,28,45,43"
-locations_default(#21297,#10000,45,28,45,43)
+exprs(#21296,64,#21295,0,"mappedV ... : any }")
+#21297=@"loc,{#10000},45,5,45,51"
+locations_default(#21297,#10000,45,5,45,51)
 hasLocation(#21296,#21297)
-enclosing_stmt(#21296,#21288)
+enclosing_stmt(#21296,#21295)
 expr_containers(#21296,#20001)
 #21298=*
-typeexprs(#21298,1,#21296,0,"K")
-hasLocation(#21298,#20694)
-enclosing_stmt(#21298,#21288)
+exprs(#21298,78,#21296,0,"mappedVar")
+hasLocation(#21298,#20686)
+enclosing_stmt(#21298,#21295)
 expr_containers(#21298,#20001)
-literals("K","K",#21298)
-typedecl(#21298,#21295)
+literals("mappedVar","mappedVar",#21298)
+decl(#21298,#20965)
 #21299=*
-typeexprs(#21299,12,#21296,1,"keyof Point")
-#21300=@"loc,{#10000},45,33,45,43"
-locations_default(#21300,#10000,45,33,45,43)
+typeexprs(#21299,27,#21296,2,"{ [K in ... : any }")
+#21300=@"loc,{#10000},45,25,45,51"
+locations_default(#21300,#10000,45,25,45,51)
 hasLocation(#21299,#21300)
-enclosing_stmt(#21299,#21288)
+enclosing_stmt(#21299,#21295)
 expr_containers(#21299,#20001)
 #21301=*
-typeexprs(#21301,0,#21299,0,"Point")
-hasLocation(#21301,#20700)
-enclosing_stmt(#21301,#21288)
-expr_containers(#21301,#20001)
-literals("Point","Point",#21301)
-typebind(#21301,#20975)
-#21302=*
-typeexprs(#21302,2,#21292,1,"any")
-hasLocation(#21302,#20706)
-enclosing_stmt(#21302,#21288)
-expr_containers(#21302,#20001)
-literals("any","any",#21302)
+scopes(#21301,13)
+scopenodes(#21299,#21301)
+scopenesting(#21301,#20000)
+#21302=@"local_type_name;{K};{#21301}"
+local_type_names(#21302,"K",#21301)
 #21303=*
-stmts(#21303,18,#20001,40,"var par ... umber);")
-hasLocation(#21303,#20093)
-stmt_containers(#21303,#20001)
-#21304=*
-exprs(#21304,64,#21303,0,"parenth ... number)")
-#21305=@"loc,{#10000},46,5,46,32"
-locations_default(#21305,#10000,46,5,46,32)
-hasLocation(#21304,#21305)
-enclosing_stmt(#21304,#21303)
-expr_containers(#21304,#20001)
+typeexprs(#21303,22,#21299,0,"K in keyof Point")
+#21304=@"loc,{#10000},45,28,45,43"
+locations_default(#21304,#10000,45,28,45,43)
+hasLocation(#21303,#21304)
+enclosing_stmt(#21303,#21295)
+expr_containers(#21303,#20001)
+#21305=*
+typeexprs(#21305,1,#21303,0,"K")
+hasLocation(#21305,#20694)
+enclosing_stmt(#21305,#21295)
+expr_containers(#21305,#20001)
+literals("K","K",#21305)
+typedecl(#21305,#21302)
 #21306=*
-exprs(#21306,78,#21304,0,"parenthesizedVar")
-hasLocation(#21306,#20712)
-enclosing_stmt(#21306,#21303)
+typeexprs(#21306,12,#21303,1,"keyof Point")
+#21307=@"loc,{#10000},45,33,45,43"
+locations_default(#21307,#10000,45,33,45,43)
+hasLocation(#21306,#21307)
+enclosing_stmt(#21306,#21295)
 expr_containers(#21306,#20001)
-literals("parenthesizedVar","parenthesizedVar",#21306)
-decl(#21306,#20966)
-#21307=*
-typeexprs(#21307,10,#21304,2,"(number)")
-#21308=@"loc,{#10000},46,25,46,32"
-locations_default(#21308,#10000,46,25,46,32)
-hasLocation(#21307,#21308)
-enclosing_stmt(#21307,#21303)
-expr_containers(#21307,#20001)
+#21308=*
+typeexprs(#21308,0,#21306,0,"Point")
+hasLocation(#21308,#20700)
+enclosing_stmt(#21308,#21295)
+expr_containers(#21308,#20001)
+literals("Point","Point",#21308)
+typebind(#21308,#20975)
 #21309=*
-typeexprs(#21309,2,#21307,0,"number")
-hasLocation(#21309,#20718)
-enclosing_stmt(#21309,#21303)
+typeexprs(#21309,2,#21299,1,"any")
+hasLocation(#21309,#20706)
+enclosing_stmt(#21309,#21295)
 expr_containers(#21309,#20001)
-literals("number","number",#21309)
+literals("any","any",#21309)
 #21310=*
-stmts(#21310,18,#20001,41,"var nam ...    N.I;")
-hasLocation(#21310,#20095)
+stmts(#21310,18,#20001,40,"var par ... umber);")
+hasLocation(#21310,#20093)
 stmt_containers(#21310,#20001)
 #21311=*
-exprs(#21311,64,#21310,0,"namespa ... :   N.I")
-#21312=@"loc,{#10000},47,5,47,27"
-locations_default(#21312,#10000,47,5,47,27)
+exprs(#21311,64,#21310,0,"parenth ... number)")
+#21312=@"loc,{#10000},46,5,46,32"
+locations_default(#21312,#10000,46,5,46,32)
 hasLocation(#21311,#21312)
 enclosing_stmt(#21311,#21310)
 expr_containers(#21311,#20001)
 #21313=*
-exprs(#21313,78,#21311,0,"namespaceTypeVar")
-hasLocation(#21313,#20726)
+exprs(#21313,78,#21311,0,"parenthesizedVar")
+hasLocation(#21313,#20712)
 enclosing_stmt(#21313,#21310)
 expr_containers(#21313,#20001)
-literals("namespaceTypeVar","namespaceTypeVar",#21313)
-decl(#21313,#20967)
+literals("parenthesizedVar","parenthesizedVar",#21313)
+decl(#21313,#20966)
 #21314=*
-typeexprs(#21314,13,#21311,2,"N.I")
-#21315=@"loc,{#10000},47,25,47,27"
-locations_default(#21315,#10000,47,25,47,27)
+typeexprs(#21314,10,#21311,2,"(number)")
+#21315=@"loc,{#10000},46,25,46,32"
+locations_default(#21315,#10000,46,25,46,32)
 hasLocation(#21314,#21315)
 enclosing_stmt(#21314,#21310)
 expr_containers(#21314,#20001)
 #21316=*
-typeexprs(#21316,25,#21314,0,"N")
-hasLocation(#21316,#20730)
+typeexprs(#21316,2,#21314,0,"number")
+hasLocation(#21316,#20718)
 enclosing_stmt(#21316,#21310)
 expr_containers(#21316,#20001)
-literals("N","N",#21316)
-namespacebind(#21316,#20970)
+literals("number","number",#21316)
 #21317=*
-typeexprs(#21317,15,#21314,1,"I")
-hasLocation(#21317,#20734)
-enclosing_stmt(#21317,#21310)
-expr_containers(#21317,#20001)
-literals("I","I",#21317)
+stmts(#21317,18,#20001,41,"var nam ...    N.I;")
+hasLocation(#21317,#20095)
+stmt_containers(#21317,#20001)
 #21318=*
-stmts(#21318,18,#20001,42,"var nam ... umber>;")
-hasLocation(#21318,#20097)
-stmt_containers(#21318,#20001)
-#21319=*
-exprs(#21319,64,#21318,0,"namespa ... number>")
-#21320=@"loc,{#10000},48,5,48,40"
-locations_default(#21320,#10000,48,5,48,40)
-hasLocation(#21319,#21320)
-enclosing_stmt(#21319,#21318)
-expr_containers(#21319,#20001)
+exprs(#21318,64,#21317,0,"namespa ... :   N.I")
+#21319=@"loc,{#10000},47,5,47,27"
+locations_default(#21319,#10000,47,5,47,27)
+hasLocation(#21318,#21319)
+enclosing_stmt(#21318,#21317)
+expr_containers(#21318,#20001)
+#21320=*
+exprs(#21320,78,#21318,0,"namespaceTypeVar")
+hasLocation(#21320,#20726)
+enclosing_stmt(#21320,#21317)
+expr_containers(#21320,#20001)
+literals("namespaceTypeVar","namespaceTypeVar",#21320)
+decl(#21320,#20967)
 #21321=*
-exprs(#21321,78,#21319,0,"namespa ... TypeVar")
-hasLocation(#21321,#20740)
-enclosing_stmt(#21321,#21318)
+typeexprs(#21321,13,#21318,2,"N.I")
+#21322=@"loc,{#10000},47,25,47,27"
+locations_default(#21322,#10000,47,25,47,27)
+hasLocation(#21321,#21322)
+enclosing_stmt(#21321,#21317)
 expr_containers(#21321,#20001)
-literals("namespaceGenericTypeVar","namespaceGenericTypeVar",#21321)
-decl(#21321,#20968)
-#21322=*
-typeexprs(#21322,14,#21319,2,"N.J<number>")
-#21323=@"loc,{#10000},48,30,48,40"
-locations_default(#21323,#10000,48,30,48,40)
-hasLocation(#21322,#21323)
-enclosing_stmt(#21322,#21318)
-expr_containers(#21322,#20001)
+#21323=*
+typeexprs(#21323,25,#21321,0,"N")
+hasLocation(#21323,#20730)
+enclosing_stmt(#21323,#21317)
+expr_containers(#21323,#20001)
+literals("N","N",#21323)
+namespacebind(#21323,#20970)
 #21324=*
-typeexprs(#21324,13,#21322,-1,"N.J")
-#21325=@"loc,{#10000},48,30,48,32"
-locations_default(#21325,#10000,48,30,48,32)
-hasLocation(#21324,#21325)
-enclosing_stmt(#21324,#21318)
+typeexprs(#21324,15,#21321,1,"I")
+hasLocation(#21324,#20734)
+enclosing_stmt(#21324,#21317)
 expr_containers(#21324,#20001)
+literals("I","I",#21324)
+#21325=*
+stmts(#21325,18,#20001,42,"var nam ... umber>;")
+hasLocation(#21325,#20097)
+stmt_containers(#21325,#20001)
 #21326=*
-typeexprs(#21326,25,#21324,0,"N")
-hasLocation(#21326,#20744)
-enclosing_stmt(#21326,#21318)
+exprs(#21326,64,#21325,0,"namespa ... number>")
+#21327=@"loc,{#10000},48,5,48,40"
+locations_default(#21327,#10000,48,5,48,40)
+hasLocation(#21326,#21327)
+enclosing_stmt(#21326,#21325)
 expr_containers(#21326,#20001)
-literals("N","N",#21326)
-namespacebind(#21326,#20970)
-#21327=*
-typeexprs(#21327,15,#21324,1,"J")
-hasLocation(#21327,#20748)
-enclosing_stmt(#21327,#21318)
-expr_containers(#21327,#20001)
-literals("J","J",#21327)
 #21328=*
-typeexprs(#21328,2,#21322,0,"number")
-hasLocation(#21328,#20752)
-enclosing_stmt(#21328,#21318)
+exprs(#21328,78,#21326,0,"namespa ... TypeVar")
+hasLocation(#21328,#20740)
+enclosing_stmt(#21328,#21325)
 expr_containers(#21328,#20001)
-literals("number","number",#21328)
+literals("namespaceGenericTypeVar","namespaceGenericTypeVar",#21328)
+decl(#21328,#20968)
 #21329=*
-stmts(#21329,34,#20001,43,"interfa ... ): T;\n}")
-#21330=@"loc,{#10000},50,1,53,1"
-locations_default(#21330,#10000,50,1,53,1)
+typeexprs(#21329,14,#21326,2,"N.J<number>")
+#21330=@"loc,{#10000},48,30,48,40"
+locations_default(#21330,#10000,48,30,48,40)
 hasLocation(#21329,#21330)
-stmt_containers(#21329,#20001)
+enclosing_stmt(#21329,#21325)
+expr_containers(#21329,#20001)
 #21331=*
-scopes(#21331,11)
-scopenodes(#21329,#21331)
-scopenesting(#21331,#20000)
-#21332=@"local_type_name;{T};{#21331}"
-local_type_names(#21332,"T",#21331)
+typeexprs(#21331,13,#21329,-1,"N.J")
+#21332=@"loc,{#10000},48,30,48,32"
+locations_default(#21332,#10000,48,30,48,32)
+hasLocation(#21331,#21332)
+enclosing_stmt(#21331,#21325)
+expr_containers(#21331,#20001)
 #21333=*
-typeexprs(#21333,22,#21329,-2,"T")
-hasLocation(#21333,#20764)
-enclosing_stmt(#21333,#21329)
+typeexprs(#21333,25,#21331,0,"N")
+hasLocation(#21333,#20744)
+enclosing_stmt(#21333,#21325)
 expr_containers(#21333,#20001)
+literals("N","N",#21333)
+namespacebind(#21333,#20970)
 #21334=*
-typeexprs(#21334,1,#21333,0,"T")
-hasLocation(#21334,#20764)
-enclosing_stmt(#21334,#21329)
+typeexprs(#21334,15,#21331,1,"J")
+hasLocation(#21334,#20748)
+enclosing_stmt(#21334,#21325)
 expr_containers(#21334,#20001)
-literals("T","T",#21334)
-typedecl(#21334,#21332)
+literals("J","J",#21334)
 #21335=*
-typeexprs(#21335,1,#21329,0,"GenericInterface")
-hasLocation(#21335,#20760)
-enclosing_stmt(#21335,#21329)
+typeexprs(#21335,2,#21329,0,"number")
+hasLocation(#21335,#20752)
+enclosing_stmt(#21335,#21325)
 expr_containers(#21335,#20001)
-literals("GenericInterface","GenericInterface",#21335)
-typedecl(#21335,#20976)
+literals("number","number",#21335)
 #21336=*
-properties(#21336,#21329,2,8,"field: T;")
-#21337=@"loc,{#10000},51,3,51,11"
-locations_default(#21337,#10000,51,3,51,11)
+stmts(#21336,34,#20001,43,"interfa ... ): T;\n}")
+#21337=@"loc,{#10000},50,1,53,1"
+locations_default(#21337,#10000,50,1,53,1)
 hasLocation(#21336,#21337)
+stmt_containers(#21336,#20001)
 #21338=*
-exprs(#21338,0,#21336,0,"field")
-hasLocation(#21338,#20770)
-enclosing_stmt(#21338,#21329)
-expr_containers(#21338,#20001)
-literals("field","field",#21338)
-is_abstract_member(#21336)
-#21339=*
-typeexprs(#21339,0,#21336,2,"T")
-hasLocation(#21339,#20774)
-enclosing_stmt(#21339,#21329)
-expr_containers(#21339,#20001)
-literals("T","T",#21339)
-typebind(#21339,#21332)
+scopes(#21338,11)
+scopenodes(#21336,#21338)
+scopenesting(#21338,#20000)
+#21339=@"local_type_name;{T};{#21338}"
+local_type_names(#21339,"T",#21338)
 #21340=*
-properties(#21340,#21329,3,0,"method(x: T): T;")
-#21341=@"loc,{#10000},52,3,52,18"
-locations_default(#21341,#10000,52,3,52,18)
-hasLocation(#21340,#21341)
+typeexprs(#21340,22,#21336,-2,"T")
+hasLocation(#21340,#20764)
+enclosing_stmt(#21340,#21336)
+expr_containers(#21340,#20001)
+#21341=*
+typeexprs(#21341,1,#21340,0,"T")
+hasLocation(#21341,#20764)
+enclosing_stmt(#21341,#21336)
+expr_containers(#21341,#20001)
+literals("T","T",#21341)
+typedecl(#21341,#21339)
 #21342=*
-exprs(#21342,0,#21340,0,"method")
-hasLocation(#21342,#20778)
-enclosing_stmt(#21342,#21329)
+typeexprs(#21342,1,#21336,0,"GenericInterface")
+hasLocation(#21342,#20760)
+enclosing_stmt(#21342,#21336)
 expr_containers(#21342,#20001)
-literals("method","method",#21342)
+literals("GenericInterface","GenericInterface",#21342)
+typedecl(#21342,#20976)
 #21343=*
-exprs(#21343,9,#21340,1,"method(x: T): T;")
-hasLocation(#21343,#21341)
-enclosing_stmt(#21343,#21329)
-expr_containers(#21343,#20001)
-#21344=*
-scopes(#21344,1)
-scopenodes(#21343,#21344)
-scopenesting(#21344,#21331)
-#21345=@"var;{x};{#21344}"
-variables(#21345,"x",#21344)
+properties(#21343,#21336,2,8,"field: T;")
+#21344=@"loc,{#10000},51,3,51,11"
+locations_default(#21344,#10000,51,3,51,11)
+hasLocation(#21343,#21344)
+#21345=*
+exprs(#21345,0,#21343,0,"field")
+hasLocation(#21345,#20770)
+enclosing_stmt(#21345,#21336)
+expr_containers(#21345,#20001)
+literals("field","field",#21345)
+is_abstract_member(#21343)
 #21346=*
-exprs(#21346,78,#21343,0,"x")
-hasLocation(#21346,#20782)
-expr_containers(#21346,#21343)
-literals("x","x",#21346)
-decl(#21346,#21345)
-#21347=@"var;{arguments};{#21344}"
-variables(#21347,"arguments",#21344)
-is_arguments_object(#21347)
-#21348=*
-typeexprs(#21348,0,#21343,-3,"T")
-hasLocation(#21348,#20792)
-expr_containers(#21348,#21343)
-literals("T","T",#21348)
-typebind(#21348,#21332)
+typeexprs(#21346,0,#21343,2,"T")
+hasLocation(#21346,#20774)
+enclosing_stmt(#21346,#21336)
+expr_containers(#21346,#20001)
+literals("T","T",#21346)
+typebind(#21346,#21339)
+#21347=*
+properties(#21347,#21336,3,0,"method(x: T): T;")
+#21348=@"loc,{#10000},52,3,52,18"
+locations_default(#21348,#10000,52,3,52,18)
+hasLocation(#21347,#21348)
 #21349=*
-typeexprs(#21349,0,#21343,-6,"T")
-hasLocation(#21349,#20786)
-expr_containers(#21349,#21343)
-literals("T","T",#21349)
-typebind(#21349,#21332)
-is_method(#21340)
-is_abstract_member(#21340)
+exprs(#21349,0,#21347,0,"method")
+hasLocation(#21349,#20778)
+enclosing_stmt(#21349,#21336)
+expr_containers(#21349,#20001)
+literals("method","method",#21349)
 #21350=*
-stmts(#21350,26,#20001,44,"abstrac ... ): T;\n}")
-#21351=@"loc,{#10000},54,1,57,1"
-locations_default(#21351,#10000,54,1,57,1)
-hasLocation(#21350,#21351)
-stmt_containers(#21350,#20001)
-is_abstract_class(#21350)
-#21352=*
-exprs(#21352,78,#21350,0,"GenericClass")
-hasLocation(#21352,#20801)
-enclosing_stmt(#21352,#21350)
-expr_containers(#21352,#20001)
-literals("GenericClass","GenericClass",#21352)
-decl(#21352,#20971)
-typedecl(#21352,#20977)
-#21353=*
-scopes(#21353,10)
-scopenodes(#21350,#21353)
-scopenesting(#21353,#20000)
-#21354=@"local_type_name;{T};{#21353}"
-local_type_names(#21354,"T",#21353)
-#21355=*
-typeexprs(#21355,22,#21350,-3,"T")
-hasLocation(#21355,#20805)
-enclosing_stmt(#21355,#21350)
-expr_containers(#21355,#20001)
+exprs(#21350,9,#21347,1,"method(x: T): T;")
+hasLocation(#21350,#21348)
+enclosing_stmt(#21350,#21336)
+expr_containers(#21350,#20001)
+#21351=*
+scopes(#21351,1)
+scopenodes(#21350,#21351)
+scopenesting(#21351,#21338)
+#21352=@"var;{this};{#21351}"
+variables(#21352,"this",#21351)
+#21353=@"var;{x};{#21351}"
+variables(#21353,"x",#21351)
+#21354=*
+exprs(#21354,78,#21350,0,"x")
+hasLocation(#21354,#20782)
+expr_containers(#21354,#21350)
+literals("x","x",#21354)
+decl(#21354,#21353)
+#21355=@"var;{arguments};{#21351}"
+variables(#21355,"arguments",#21351)
+is_arguments_object(#21355)
 #21356=*
-typeexprs(#21356,1,#21355,0,"T")
-hasLocation(#21356,#20805)
-enclosing_stmt(#21356,#21350)
-expr_containers(#21356,#20001)
+typeexprs(#21356,0,#21350,-3,"T")
+hasLocation(#21356,#20792)
+expr_containers(#21356,#21350)
 literals("T","T",#21356)
-typedecl(#21356,#21354)
+typebind(#21356,#21339)
 #21357=*
-typeexprs(#21357,14,#21350,-1,"GenericInterface<T>")
-#21358=@"loc,{#10000},54,43,54,61"
-locations_default(#21358,#10000,54,43,54,61)
-hasLocation(#21357,#21358)
-enclosing_stmt(#21357,#21350)
-expr_containers(#21357,#20001)
-#21359=*
-typeexprs(#21359,0,#21357,-1,"GenericInterface")
-hasLocation(#21359,#20811)
-enclosing_stmt(#21359,#21350)
-expr_containers(#21359,#20001)
-literals("GenericInterface","GenericInterface",#21359)
-typebind(#21359,#20976)
+typeexprs(#21357,0,#21350,-6,"T")
+hasLocation(#21357,#20786)
+expr_containers(#21357,#21350)
+literals("T","T",#21357)
+typebind(#21357,#21339)
+is_method(#21347)
+is_abstract_member(#21347)
+#21358=*
+stmts(#21358,26,#20001,44,"abstrac ... ): T;\n}")
+#21359=@"loc,{#10000},54,1,57,1"
+locations_default(#21359,#10000,54,1,57,1)
+hasLocation(#21358,#21359)
+stmt_containers(#21358,#20001)
+is_abstract_class(#21358)
 #21360=*
-typeexprs(#21360,0,#21357,0,"T")
-hasLocation(#21360,#20815)
-enclosing_stmt(#21360,#21350)
+exprs(#21360,78,#21358,0,"GenericClass")
+hasLocation(#21360,#20801)
+enclosing_stmt(#21360,#21358)
 expr_containers(#21360,#20001)
-literals("T","T",#21360)
-typebind(#21360,#21354)
+literals("GenericClass","GenericClass",#21360)
+decl(#21360,#20971)
+typedecl(#21360,#20977)
 #21361=*
-properties(#21361,#21350,2,8,"field: T")
-#21362=@"loc,{#10000},55,3,55,10"
-locations_default(#21362,#10000,55,3,55,10)
-hasLocation(#21361,#21362)
-#21363=*
+scopes(#21361,10)
+scopenodes(#21358,#21361)
+scopenesting(#21361,#20000)
+#21362=@"var;{this};{#21361}"
+variables(#21362,"this",#21361)
+#21363=@"local_type_name;{T};{#21361}"
+local_type_names(#21363,"T",#21361)
 #21364=*
-exprs(#21364,0,#21361,0,"field")
-hasLocation(#21364,#20821)
-expr_containers(#21364,#21363)
-literals("field","field",#21364)
+typeexprs(#21364,22,#21358,-3,"T")
+hasLocation(#21364,#20805)
+enclosing_stmt(#21364,#21358)
+expr_containers(#21364,#20001)
 #21365=*
-typeexprs(#21365,0,#21361,2,"T")
-hasLocation(#21365,#20825)
-enclosing_stmt(#21365,#21350)
+typeexprs(#21365,1,#21364,0,"T")
+hasLocation(#21365,#20805)
+enclosing_stmt(#21365,#21358)
 expr_containers(#21365,#20001)
 literals("T","T",#21365)
-typebind(#21365,#21354)
+typedecl(#21365,#21363)
 #21366=*
-properties(#21366,#21350,3,0,"abstrac ... :T): T;")
-#21367=@"loc,{#10000},56,3,56,26"
-locations_default(#21367,#10000,56,3,56,26)
+typeexprs(#21366,14,#21358,-1,"GenericInterface<T>")
+#21367=@"loc,{#10000},54,43,54,61"
+locations_default(#21367,#10000,54,43,54,61)
 hasLocation(#21366,#21367)
+enclosing_stmt(#21366,#21358)
+expr_containers(#21366,#20001)
 #21368=*
-exprs(#21368,0,#21366,0,"method")
-hasLocation(#21368,#20829)
-enclosing_stmt(#21368,#21350)
+typeexprs(#21368,0,#21366,-1,"GenericInterface")
+hasLocation(#21368,#20811)
+enclosing_stmt(#21368,#21358)
 expr_containers(#21368,#20001)
-literals("method","method",#21368)
+literals("GenericInterface","GenericInterface",#21368)
+typebind(#21368,#20976)
 #21369=*
-exprs(#21369,9,#21366,1,"abstrac ... :T): T;")
-hasLocation(#21369,#21367)
-enclosing_stmt(#21369,#21350)
+typeexprs(#21369,0,#21366,0,"T")
+hasLocation(#21369,#20815)
+enclosing_stmt(#21369,#21358)
 expr_containers(#21369,#20001)
+literals("T","T",#21369)
+typebind(#21369,#21363)
 #21370=*
-scopes(#21370,1)
-scopenodes(#21369,#21370)
-scopenesting(#21370,#21353)
-#21371=@"var;{x};{#21370}"
-variables(#21371,"x",#21370)
+properties(#21370,#21358,2,8,"field: T")
+#21371=@"loc,{#10000},55,3,55,10"
+locations_default(#21371,#10000,55,3,55,10)
+hasLocation(#21370,#21371)
 #21372=*
-exprs(#21372,78,#21369,0,"x")
-hasLocation(#21372,#20833)
-expr_containers(#21372,#21369)
-literals("x","x",#21372)
-decl(#21372,#21371)
-#21373=@"var;{arguments};{#21370}"
-variables(#21373,"arguments",#21370)
-is_arguments_object(#21373)
+#21373=*
+exprs(#21373,0,#21370,0,"field")
+hasLocation(#21373,#20821)
+expr_containers(#21373,#21372)
+literals("field","field",#21373)
 #21374=*
-typeexprs(#21374,0,#21369,-3,"T")
-hasLocation(#21374,#20843)
-expr_containers(#21374,#21369)
+typeexprs(#21374,0,#21370,2,"T")
+hasLocation(#21374,#20825)
+enclosing_stmt(#21374,#21358)
+expr_containers(#21374,#20001)
 literals("T","T",#21374)
-typebind(#21374,#21354)
+typebind(#21374,#21363)
 #21375=*
-typeexprs(#21375,0,#21369,-6,"T")
-hasLocation(#21375,#20837)
-expr_containers(#21375,#21369)
-literals("T","T",#21375)
-typebind(#21375,#21354)
-is_method(#21366)
-is_abstract_member(#21366)
-#21376=*
-properties(#21376,#21350,4,0,"constructor() {}")
-#21377=@"loc,{#10000},54,63,54,62"
-locations_default(#21377,#10000,54,63,54,62)
-hasLocation(#21376,#21377)
+properties(#21375,#21358,3,0,"abstrac ... :T): T;")
+#21376=@"loc,{#10000},56,3,56,26"
+locations_default(#21376,#10000,56,3,56,26)
+hasLocation(#21375,#21376)
+#21377=*
+exprs(#21377,0,#21375,0,"method")
+hasLocation(#21377,#20829)
+enclosing_stmt(#21377,#21358)
+expr_containers(#21377,#20001)
+literals("method","method",#21377)
 #21378=*
-exprs(#21378,0,#21376,0,"constructor")
-hasLocation(#21378,#21377)
-enclosing_stmt(#21378,#21350)
+exprs(#21378,9,#21375,1,"abstrac ... :T): T;")
+hasLocation(#21378,#21376)
+enclosing_stmt(#21378,#21358)
 expr_containers(#21378,#20001)
-literals("constructor","constructor",#21378)
-exprs(#21363,9,#21376,1,"() {}")
-hasLocation(#21363,#21377)
-enclosing_stmt(#21363,#21350)
-expr_containers(#21363,#20001)
 #21379=*
 scopes(#21379,1)
-scopenodes(#21363,#21379)
-scopenesting(#21379,#21353)
-#21380=@"var;{arguments};{#21379}"
-variables(#21380,"arguments",#21379)
-is_arguments_object(#21380)
-#21381=*
-stmts(#21381,1,#21363,-2,"{}")
-hasLocation(#21381,#21377)
-stmt_containers(#21381,#21363)
-is_method(#21376)
+scopenodes(#21378,#21379)
+scopenesting(#21379,#21361)
+#21380=@"var;{this};{#21379}"
+variables(#21380,"this",#21379)
+#21381=@"var;{x};{#21379}"
+variables(#21381,"x",#21379)
 #21382=*
-stmts(#21382,26,#20001,45,"class Fish {}")
-hasLocation(#21382,#20119)
-stmt_containers(#21382,#20001)
-#21383=*
-exprs(#21383,78,#21382,0,"Fish")
-hasLocation(#21383,#20850)
-enclosing_stmt(#21383,#21382)
-expr_containers(#21383,#20001)
-literals("Fish","Fish",#21383)
-decl(#21383,#20972)
-typedecl(#21383,#20978)
+exprs(#21382,78,#21378,0,"x")
+hasLocation(#21382,#20833)
+expr_containers(#21382,#21378)
+literals("x","x",#21382)
+decl(#21382,#21381)
+#21383=@"var;{arguments};{#21379}"
+variables(#21383,"arguments",#21379)
+is_arguments_object(#21383)
 #21384=*
-scopes(#21384,10)
-scopenodes(#21382,#21384)
-scopenesting(#21384,#20000)
+typeexprs(#21384,0,#21378,-3,"T")
+hasLocation(#21384,#20843)
+expr_containers(#21384,#21378)
+literals("T","T",#21384)
+typebind(#21384,#21363)
 #21385=*
-properties(#21385,#21382,2,0,"constructor() {}")
-#21386=@"loc,{#10000},59,12,59,11"
-locations_default(#21386,#10000,59,12,59,11)
-hasLocation(#21385,#21386)
-#21387=*
-exprs(#21387,0,#21385,0,"constructor")
-hasLocation(#21387,#21386)
-enclosing_stmt(#21387,#21382)
-expr_containers(#21387,#20001)
-literals("constructor","constructor",#21387)
+typeexprs(#21385,0,#21378,-6,"T")
+hasLocation(#21385,#20837)
+expr_containers(#21385,#21378)
+literals("T","T",#21385)
+typebind(#21385,#21363)
+is_method(#21375)
+is_abstract_member(#21375)
+#21386=*
+properties(#21386,#21358,4,0,"constructor() {}")
+#21387=@"loc,{#10000},54,63,54,62"
+locations_default(#21387,#10000,54,63,54,62)
+hasLocation(#21386,#21387)
 #21388=*
-exprs(#21388,9,#21385,1,"() {}")
-hasLocation(#21388,#21386)
-enclosing_stmt(#21388,#21382)
+exprs(#21388,0,#21386,0,"constructor")
+hasLocation(#21388,#21387)
+enclosing_stmt(#21388,#21358)
 expr_containers(#21388,#20001)
+literals("constructor","constructor",#21388)
+exprs(#21372,9,#21386,1,"() {}")
+hasLocation(#21372,#21387)
+enclosing_stmt(#21372,#21358)
+expr_containers(#21372,#20001)
 #21389=*
 scopes(#21389,1)
-scopenodes(#21388,#21389)
-scopenesting(#21389,#21384)
-#21390=@"var;{arguments};{#21389}"
-variables(#21390,"arguments",#21389)
-is_arguments_object(#21390)
-#21391=*
-stmts(#21391,1,#21388,-2,"{}")
-hasLocation(#21391,#21386)
-stmt_containers(#21391,#21388)
-is_method(#21385)
+scopenodes(#21372,#21389)
+scopenesting(#21389,#21361)
+#21390=@"var;{this};{#21389}"
+variables(#21390,"this",#21389)
+#21391=@"var;{arguments};{#21389}"
+variables(#21391,"arguments",#21389)
+is_arguments_object(#21391)
 #21392=*
-stmts(#21392,26,#20001,46,"class Bird {}")
-hasLocation(#21392,#20121)
-stmt_containers(#21392,#20001)
+stmts(#21392,1,#21372,-2,"{}")
+hasLocation(#21392,#21387)
+stmt_containers(#21392,#21372)
+is_method(#21386)
 #21393=*
-exprs(#21393,78,#21392,0,"Bird")
-hasLocation(#21393,#20858)
-enclosing_stmt(#21393,#21392)
-expr_containers(#21393,#20001)
-literals("Bird","Bird",#21393)
-decl(#21393,#20973)
-typedecl(#21393,#20979)
+stmts(#21393,26,#20001,45,"class Fish {}")
+hasLocation(#21393,#20119)
+stmt_containers(#21393,#20001)
 #21394=*
-scopes(#21394,10)
-scopenodes(#21392,#21394)
-scopenesting(#21394,#20000)
+exprs(#21394,78,#21393,0,"Fish")
+hasLocation(#21394,#20850)
+enclosing_stmt(#21394,#21393)
+expr_containers(#21394,#20001)
+literals("Fish","Fish",#21394)
+decl(#21394,#20972)
+typedecl(#21394,#20978)
 #21395=*
-properties(#21395,#21392,2,0,"constructor() {}")
-#21396=@"loc,{#10000},60,12,60,11"
-locations_default(#21396,#10000,60,12,60,11)
-hasLocation(#21395,#21396)
+scopes(#21395,10)
+scopenodes(#21393,#21395)
+scopenesting(#21395,#20000)
+#21396=@"var;{this};{#21395}"
+variables(#21396,"this",#21395)
 #21397=*
-exprs(#21397,0,#21395,0,"constructor")
-hasLocation(#21397,#21396)
-enclosing_stmt(#21397,#21392)
-expr_containers(#21397,#20001)
-literals("constructor","constructor",#21397)
-#21398=*
-exprs(#21398,9,#21395,1,"() {}")
-hasLocation(#21398,#21396)
-enclosing_stmt(#21398,#21392)
-expr_containers(#21398,#20001)
+properties(#21397,#21393,2,0,"constructor() {}")
+#21398=@"loc,{#10000},59,12,59,11"
+locations_default(#21398,#10000,59,12,59,11)
+hasLocation(#21397,#21398)
 #21399=*
-scopes(#21399,1)
-scopenodes(#21398,#21399)
-scopenesting(#21399,#21394)
-#21400=@"var;{arguments};{#21399}"
-variables(#21400,"arguments",#21399)
-is_arguments_object(#21400)
+exprs(#21399,0,#21397,0,"constructor")
+hasLocation(#21399,#21398)
+enclosing_stmt(#21399,#21393)
+expr_containers(#21399,#20001)
+literals("constructor","constructor",#21399)
+#21400=*
+exprs(#21400,9,#21397,1,"() {}")
+hasLocation(#21400,#21398)
+enclosing_stmt(#21400,#21393)
+expr_containers(#21400,#20001)
 #21401=*
-stmts(#21401,1,#21398,-2,"{}")
-hasLocation(#21401,#21396)
-stmt_containers(#21401,#21398)
-is_method(#21395)
-#21402=*
-stmts(#21402,17,#20001,47,"functio ... Fish {}")
-hasLocation(#21402,#20123)
-stmt_containers(#21402,#20001)
-#21403=*
-exprs(#21403,78,#21402,-1,"isFish")
-hasLocation(#21403,#20866)
-expr_containers(#21403,#21402)
-literals("isFish","isFish",#21403)
-decl(#21403,#20969)
+scopes(#21401,1)
+scopenodes(#21400,#21401)
+scopenesting(#21401,#21395)
+#21402=@"var;{this};{#21401}"
+variables(#21402,"this",#21401)
+#21403=@"var;{arguments};{#21401}"
+variables(#21403,"arguments",#21401)
+is_arguments_object(#21403)
 #21404=*
-scopes(#21404,1)
-scopenodes(#21402,#21404)
-scopenesting(#21404,#20000)
-#21405=@"var;{pet};{#21404}"
-variables(#21405,"pet",#21404)
+stmts(#21404,1,#21400,-2,"{}")
+hasLocation(#21404,#21398)
+stmt_containers(#21404,#21400)
+is_method(#21397)
+#21405=*
+stmts(#21405,26,#20001,46,"class Bird {}")
+hasLocation(#21405,#20121)
+stmt_containers(#21405,#20001)
 #21406=*
-exprs(#21406,78,#21402,0,"pet")
-hasLocation(#21406,#20870)
-expr_containers(#21406,#21402)
-literals("pet","pet",#21406)
-decl(#21406,#21405)
-#21407=@"var;{arguments};{#21404}"
-variables(#21407,"arguments",#21404)
-is_arguments_object(#21407)
-#21408=*
-typeexprs(#21408,20,#21402,-3,"pet is Fish")
-#21409=@"loc,{#10000},61,37,61,47"
-locations_default(#21409,#10000,61,37,61,47)
-hasLocation(#21408,#21409)
-expr_containers(#21408,#21402)
-#21410=*
-typeexprs(#21410,17,#21408,0,"pet")
-hasLocation(#21410,#20884)
-expr_containers(#21410,#21402)
-literals("pet","pet",#21410)
-bind(#21410,#21405)
+exprs(#21406,78,#21405,0,"Bird")
+hasLocation(#21406,#20858)
+enclosing_stmt(#21406,#21405)
+expr_containers(#21406,#20001)
+literals("Bird","Bird",#21406)
+decl(#21406,#20973)
+typedecl(#21406,#20979)
+#21407=*
+scopes(#21407,10)
+scopenodes(#21405,#21407)
+scopenesting(#21407,#20000)
+#21408=@"var;{this};{#21407}"
+variables(#21408,"this",#21407)
+#21409=*
+properties(#21409,#21405,2,0,"constructor() {}")
+#21410=@"loc,{#10000},60,12,60,11"
+locations_default(#21410,#10000,60,12,60,11)
+hasLocation(#21409,#21410)
 #21411=*
-typeexprs(#21411,0,#21408,1,"Fish")
-hasLocation(#21411,#20888)
-expr_containers(#21411,#21402)
-literals("Fish","Fish",#21411)
-typebind(#21411,#20978)
+exprs(#21411,0,#21409,0,"constructor")
+hasLocation(#21411,#21410)
+enclosing_stmt(#21411,#21405)
+expr_containers(#21411,#20001)
+literals("constructor","constructor",#21411)
 #21412=*
-typeexprs(#21412,7,#21402,-6,"Fish | Bird")
-#21413=@"loc,{#10000},61,23,61,33"
-locations_default(#21413,#10000,61,23,61,33)
-hasLocation(#21412,#21413)
-expr_containers(#21412,#21402)
-#21414=*
-typeexprs(#21414,0,#21412,0,"Fish")
-hasLocation(#21414,#20874)
-expr_containers(#21414,#21402)
-literals("Fish","Fish",#21414)
-typebind(#21414,#20978)
-#21415=*
-typeexprs(#21415,0,#21412,1,"Bird")
-hasLocation(#21415,#20878)
-expr_containers(#21415,#21402)
-literals("Bird","Bird",#21415)
-typebind(#21415,#20979)
+exprs(#21412,9,#21409,1,"() {}")
+hasLocation(#21412,#21410)
+enclosing_stmt(#21412,#21405)
+expr_containers(#21412,#20001)
+#21413=*
+scopes(#21413,1)
+scopenodes(#21412,#21413)
+scopenesting(#21413,#21407)
+#21414=@"var;{this};{#21413}"
+variables(#21414,"this",#21413)
+#21415=@"var;{arguments};{#21413}"
+variables(#21415,"arguments",#21413)
+is_arguments_object(#21415)
 #21416=*
-stmts(#21416,1,#21402,-2,"{}")
-#21417=@"loc,{#10000},61,49,61,50"
-locations_default(#21417,#10000,61,49,61,50)
-hasLocation(#21416,#21417)
-stmt_containers(#21416,#21402)
+stmts(#21416,1,#21412,-2,"{}")
+hasLocation(#21416,#21410)
+stmt_containers(#21416,#21412)
+is_method(#21409)
+#21417=*
+stmts(#21417,17,#20001,47,"functio ... Fish {}")
+hasLocation(#21417,#20123)
+stmt_containers(#21417,#20001)
 #21418=*
-stmts(#21418,26,#20001,48,"class T ... is; }\n}")
-#21419=@"loc,{#10000},63,1,65,1"
-locations_default(#21419,#10000,63,1,65,1)
-hasLocation(#21418,#21419)
-stmt_containers(#21418,#20001)
-#21420=*
-exprs(#21420,78,#21418,0,"ThisTypes")
-hasLocation(#21420,#20896)
-enclosing_stmt(#21420,#21418)
-expr_containers(#21420,#20001)
-literals("ThisTypes","ThisTypes",#21420)
-decl(#21420,#20974)
-typedecl(#21420,#20980)
-#21421=*
-scopes(#21421,10)
-scopenodes(#21418,#21421)
-scopenesting(#21421,#20000)
+exprs(#21418,78,#21417,-1,"isFish")
+hasLocation(#21418,#20866)
+expr_containers(#21418,#21417)
+literals("isFish","isFish",#21418)
+decl(#21418,#20969)
+#21419=*
+scopes(#21419,1)
+scopenodes(#21417,#21419)
+scopenesting(#21419,#20000)
+#21420=@"var;{this};{#21419}"
+variables(#21420,"this",#21419)
+#21421=@"var;{pet};{#21419}"
+variables(#21421,"pet",#21419)
 #21422=*
-properties(#21422,#21418,2,0,"foo(x:  ... this; }")
-#21423=@"loc,{#10000},64,3,64,39"
-locations_default(#21423,#10000,64,3,64,39)
-hasLocation(#21422,#21423)
+exprs(#21422,78,#21417,0,"pet")
+hasLocation(#21422,#20870)
+expr_containers(#21422,#21417)
+literals("pet","pet",#21422)
+decl(#21422,#21421)
+#21423=@"var;{arguments};{#21419}"
+variables(#21423,"arguments",#21419)
+is_arguments_object(#21423)
 #21424=*
-exprs(#21424,0,#21422,0,"foo")
-hasLocation(#21424,#20900)
-enclosing_stmt(#21424,#21418)
-expr_containers(#21424,#20001)
-literals("foo","foo",#21424)
-#21425=*
-exprs(#21425,9,#21422,1,"foo(x:  ... this; }")
-hasLocation(#21425,#21423)
-enclosing_stmt(#21425,#21418)
-expr_containers(#21425,#20001)
+typeexprs(#21424,20,#21417,-3,"pet is Fish")
+#21425=@"loc,{#10000},61,37,61,47"
+locations_default(#21425,#10000,61,37,61,47)
+hasLocation(#21424,#21425)
+expr_containers(#21424,#21417)
 #21426=*
-scopes(#21426,1)
-scopenodes(#21425,#21426)
-scopenesting(#21426,#21421)
-#21427=@"var;{x};{#21426}"
-variables(#21427,"x",#21426)
+typeexprs(#21426,17,#21424,0,"pet")
+hasLocation(#21426,#20884)
+expr_containers(#21426,#21417)
+literals("pet","pet",#21426)
+bind(#21426,#21421)
+#21427=*
+typeexprs(#21427,0,#21424,1,"Fish")
+hasLocation(#21427,#20888)
+expr_containers(#21427,#21417)
+literals("Fish","Fish",#21427)
+typebind(#21427,#20978)
 #21428=*
-exprs(#21428,78,#21425,0,"x")
-hasLocation(#21428,#20904)
-expr_containers(#21428,#21425)
-literals("x","x",#21428)
-decl(#21428,#21427)
-#21429=@"var;{arguments};{#21426}"
-variables(#21429,"arguments",#21426)
-is_arguments_object(#21429)
+typeexprs(#21428,7,#21417,-6,"Fish | Bird")
+#21429=@"loc,{#10000},61,23,61,33"
+locations_default(#21429,#10000,61,23,61,33)
+hasLocation(#21428,#21429)
+expr_containers(#21428,#21417)
 #21430=*
-typeexprs(#21430,2,#21425,-3,"this")
-hasLocation(#21430,#20914)
-expr_containers(#21430,#21425)
-literals("this","this",#21430)
+typeexprs(#21430,0,#21428,0,"Fish")
+hasLocation(#21430,#20874)
+expr_containers(#21430,#21417)
+literals("Fish","Fish",#21430)
+typebind(#21430,#20978)
 #21431=*
-typeexprs(#21431,2,#21425,-6,"number")
-hasLocation(#21431,#20908)
-expr_containers(#21431,#21425)
-literals("number","number",#21431)
+typeexprs(#21431,0,#21428,1,"Bird")
+hasLocation(#21431,#20878)
+expr_containers(#21431,#21417)
+literals("Bird","Bird",#21431)
+typebind(#21431,#20979)
 #21432=*
-stmts(#21432,1,#21425,-2,"{ return this; }")
-#21433=@"loc,{#10000},64,24,64,39"
-locations_default(#21433,#10000,64,24,64,39)
+stmts(#21432,1,#21417,-2,"{}")
+#21433=@"loc,{#10000},61,49,61,50"
+locations_default(#21433,#10000,61,49,61,50)
 hasLocation(#21432,#21433)
-stmt_containers(#21432,#21425)
+stmt_containers(#21432,#21417)
 #21434=*
-stmts(#21434,9,#21432,0,"return this;")
-#21435=@"loc,{#10000},64,26,64,37"
-locations_default(#21435,#10000,64,26,64,37)
+stmts(#21434,26,#20001,48,"class T ... is; }\n}")
+#21435=@"loc,{#10000},63,1,65,1"
+locations_default(#21435,#10000,63,1,65,1)
 hasLocation(#21434,#21435)
-stmt_containers(#21434,#21425)
+stmt_containers(#21434,#20001)
 #21436=*
-exprs(#21436,6,#21434,0,"this")
-hasLocation(#21436,#20920)
+exprs(#21436,78,#21434,0,"ThisTypes")
+hasLocation(#21436,#20896)
 enclosing_stmt(#21436,#21434)
-expr_containers(#21436,#21425)
-is_method(#21422)
+expr_containers(#21436,#20001)
+literals("ThisTypes","ThisTypes",#21436)
+decl(#21436,#20974)
+typedecl(#21436,#20980)
 #21437=*
-properties(#21437,#21418,3,0,"constructor() {}")
-#21438=@"loc,{#10000},63,17,63,16"
-locations_default(#21438,#10000,63,17,63,16)
-hasLocation(#21437,#21438)
+scopes(#21437,10)
+scopenodes(#21434,#21437)
+scopenesting(#21437,#20000)
+#21438=@"var;{this};{#21437}"
+variables(#21438,"this",#21437)
 #21439=*
-exprs(#21439,0,#21437,0,"constructor")
-hasLocation(#21439,#21438)
-enclosing_stmt(#21439,#21418)
-expr_containers(#21439,#20001)
-literals("constructor","constructor",#21439)
-#21440=*
-exprs(#21440,9,#21437,1,"() {}")
-hasLocation(#21440,#21438)
-enclosing_stmt(#21440,#21418)
-expr_containers(#21440,#20001)
+properties(#21439,#21434,2,0,"foo(x:  ... this; }")
+#21440=@"loc,{#10000},64,3,64,39"
+locations_default(#21440,#10000,64,3,64,39)
+hasLocation(#21439,#21440)
 #21441=*
-scopes(#21441,1)
-scopenodes(#21440,#21441)
-scopenesting(#21441,#21421)
-#21442=@"var;{arguments};{#21441}"
-variables(#21442,"arguments",#21441)
-is_arguments_object(#21442)
+exprs(#21441,0,#21439,0,"foo")
+hasLocation(#21441,#20900)
+enclosing_stmt(#21441,#21434)
+expr_containers(#21441,#20001)
+literals("foo","foo",#21441)
+#21442=*
+exprs(#21442,9,#21439,1,"foo(x:  ... this; }")
+hasLocation(#21442,#21440)
+enclosing_stmt(#21442,#21434)
+expr_containers(#21442,#20001)
 #21443=*
-stmts(#21443,1,#21440,-2,"{}")
-hasLocation(#21443,#21438)
-stmt_containers(#21443,#21440)
-is_method(#21437)
-#21444=*
-entry_cfg_node(#21444,#20001)
-#21445=@"loc,{#10000},1,1,1,0"
-locations_default(#21445,#10000,1,1,1,0)
-hasLocation(#21444,#21445)
+scopes(#21443,1)
+scopenodes(#21442,#21443)
+scopenesting(#21443,#21437)
+#21444=@"var;{this};{#21443}"
+variables(#21444,"this",#21443)
+#21445=@"var;{x};{#21443}"
+variables(#21445,"x",#21443)
 #21446=*
-exit_cfg_node(#21446,#20001)
-hasLocation(#21446,#20927)
-successor(#21440,#21437)
-#21447=*
-entry_cfg_node(#21447,#21440)
-hasLocation(#21447,#21438)
+exprs(#21446,78,#21442,0,"x")
+hasLocation(#21446,#20904)
+expr_containers(#21446,#21442)
+literals("x","x",#21446)
+decl(#21446,#21445)
+#21447=@"var;{arguments};{#21443}"
+variables(#21447,"arguments",#21443)
+is_arguments_object(#21447)
 #21448=*
-exit_cfg_node(#21448,#21440)
-hasLocation(#21448,#21438)
-successor(#21443,#21448)
-successor(#21447,#21443)
-successor(#21439,#21440)
-successor(#21437,#21418)
-successor(#21425,#21422)
+typeexprs(#21448,2,#21442,-3,"this")
+hasLocation(#21448,#20914)
+expr_containers(#21448,#21442)
+literals("this","this",#21448)
 #21449=*
-entry_cfg_node(#21449,#21425)
-#21450=@"loc,{#10000},64,3,64,2"
-locations_default(#21450,#10000,64,3,64,2)
-hasLocation(#21449,#21450)
-#21451=*
-exit_cfg_node(#21451,#21425)
-#21452=@"loc,{#10000},64,40,64,39"
-locations_default(#21452,#10000,64,40,64,39)
-hasLocation(#21451,#21452)
-successor(#21436,#21434)
-successor(#21434,#21451)
-successor(#21432,#21436)
-successor(#21428,#21432)
-successor(#21449,#21428)
-successor(#21424,#21425)
-successor(#21422,#21439)
-successor(#21420,#21424)
-successor(#21418,#21446)
-successor(#21402,#21420)
-#21453=*
-entry_cfg_node(#21453,#21402)
-#21454=@"loc,{#10000},61,1,61,0"
-locations_default(#21454,#10000,61,1,61,0)
-hasLocation(#21453,#21454)
+typeexprs(#21449,2,#21442,-6,"number")
+hasLocation(#21449,#20908)
+expr_containers(#21449,#21442)
+literals("number","number",#21449)
+#21450=*
+stmts(#21450,1,#21442,-2,"{ return this; }")
+#21451=@"loc,{#10000},64,24,64,39"
+locations_default(#21451,#10000,64,24,64,39)
+hasLocation(#21450,#21451)
+stmt_containers(#21450,#21442)
+#21452=*
+stmts(#21452,9,#21450,0,"return this;")
+#21453=@"loc,{#10000},64,26,64,37"
+locations_default(#21453,#10000,64,26,64,37)
+hasLocation(#21452,#21453)
+stmt_containers(#21452,#21442)
+#21454=*
+exprs(#21454,6,#21452,0,"this")
+hasLocation(#21454,#20920)
+enclosing_stmt(#21454,#21452)
+expr_containers(#21454,#21442)
+bind(#21454,#21444)
+is_method(#21439)
 #21455=*
-exit_cfg_node(#21455,#21402)
-#21456=@"loc,{#10000},61,51,61,50"
-locations_default(#21456,#10000,61,51,61,50)
+properties(#21455,#21434,3,0,"constructor() {}")
+#21456=@"loc,{#10000},63,17,63,16"
+locations_default(#21456,#10000,63,17,63,16)
 hasLocation(#21455,#21456)
-successor(#21416,#21455)
-successor(#21406,#21416)
-successor(#21453,#21406)
-successor(#21398,#21395)
 #21457=*
-entry_cfg_node(#21457,#21398)
-hasLocation(#21457,#21396)
+exprs(#21457,0,#21455,0,"constructor")
+hasLocation(#21457,#21456)
+enclosing_stmt(#21457,#21434)
+expr_containers(#21457,#20001)
+literals("constructor","constructor",#21457)
 #21458=*
-exit_cfg_node(#21458,#21398)
-hasLocation(#21458,#21396)
-successor(#21401,#21458)
-successor(#21457,#21401)
-successor(#21397,#21398)
-successor(#21395,#21392)
-successor(#21393,#21397)
-successor(#21392,#21402)
-successor(#21388,#21385)
+exprs(#21458,9,#21455,1,"() {}")
+hasLocation(#21458,#21456)
+enclosing_stmt(#21458,#21434)
+expr_containers(#21458,#20001)
 #21459=*
-entry_cfg_node(#21459,#21388)
-hasLocation(#21459,#21386)
-#21460=*
-exit_cfg_node(#21460,#21388)
-hasLocation(#21460,#21386)
-successor(#21391,#21460)
-successor(#21459,#21391)
-successor(#21387,#21388)
-successor(#21385,#21382)
-successor(#21383,#21387)
-successor(#21382,#21393)
-successor(#21364,#21361)
-successor(#21363,#21376)
-#21461=*
-entry_cfg_node(#21461,#21363)
-hasLocation(#21461,#21377)
-successor(#21361,#21381)
+scopes(#21459,1)
+scopenodes(#21458,#21459)
+scopenesting(#21459,#21437)
+#21460=@"var;{this};{#21459}"
+variables(#21460,"this",#21459)
+#21461=@"var;{arguments};{#21459}"
+variables(#21461,"arguments",#21459)
+is_arguments_object(#21461)
 #21462=*
-exit_cfg_node(#21462,#21363)
-hasLocation(#21462,#21377)
-successor(#21381,#21462)
-successor(#21461,#21364)
-successor(#21378,#21363)
-successor(#21376,#21350)
-successor(#21366,#21378)
-successor(#21352,#21366)
-successor(#21350,#21383)
-successor(#21329,#21352)
-successor(#21318,#21321)
-successor(#21321,#21319)
-successor(#21319,#21329)
+stmts(#21462,1,#21458,-2,"{}")
+hasLocation(#21462,#21456)
+stmt_containers(#21462,#21458)
+is_method(#21455)
+#21463=*
+entry_cfg_node(#21463,#20001)
+#21464=@"loc,{#10000},1,1,1,0"
+locations_default(#21464,#10000,1,1,1,0)
+hasLocation(#21463,#21464)
+#21465=*
+exit_cfg_node(#21465,#20001)
+hasLocation(#21465,#20927)
+successor(#21458,#21455)
+#21466=*
+entry_cfg_node(#21466,#21458)
+hasLocation(#21466,#21456)
+#21467=*
+exit_cfg_node(#21467,#21458)
+hasLocation(#21467,#21456)
+successor(#21462,#21467)
+successor(#21466,#21462)
+successor(#21457,#21458)
+successor(#21455,#21434)
+successor(#21442,#21439)
+#21468=*
+entry_cfg_node(#21468,#21442)
+#21469=@"loc,{#10000},64,3,64,2"
+locations_default(#21469,#10000,64,3,64,2)
+hasLocation(#21468,#21469)
+#21470=*
+exit_cfg_node(#21470,#21442)
+#21471=@"loc,{#10000},64,40,64,39"
+locations_default(#21471,#10000,64,40,64,39)
+hasLocation(#21470,#21471)
+successor(#21454,#21452)
+successor(#21452,#21470)
+successor(#21450,#21454)
+successor(#21446,#21450)
+successor(#21468,#21446)
+successor(#21441,#21442)
+successor(#21439,#21457)
+successor(#21436,#21441)
+successor(#21434,#21465)
+successor(#21417,#21436)
+#21472=*
+entry_cfg_node(#21472,#21417)
+#21473=@"loc,{#10000},61,1,61,0"
+locations_default(#21473,#10000,61,1,61,0)
+hasLocation(#21472,#21473)
+#21474=*
+exit_cfg_node(#21474,#21417)
+#21475=@"loc,{#10000},61,51,61,50"
+locations_default(#21475,#10000,61,51,61,50)
+hasLocation(#21474,#21475)
+successor(#21432,#21474)
+successor(#21422,#21432)
+successor(#21472,#21422)
+successor(#21412,#21409)
+#21476=*
+entry_cfg_node(#21476,#21412)
+hasLocation(#21476,#21410)
+#21477=*
+exit_cfg_node(#21477,#21412)
+hasLocation(#21477,#21410)
+successor(#21416,#21477)
+successor(#21476,#21416)
+successor(#21411,#21412)
+successor(#21409,#21405)
+successor(#21406,#21411)
+successor(#21405,#21417)
+successor(#21400,#21397)
+#21478=*
+entry_cfg_node(#21478,#21400)
+hasLocation(#21478,#21398)
+#21479=*
+exit_cfg_node(#21479,#21400)
+hasLocation(#21479,#21398)
+successor(#21404,#21479)
+successor(#21478,#21404)
+successor(#21399,#21400)
+successor(#21397,#21393)
+successor(#21394,#21399)
+successor(#21393,#21406)
+successor(#21373,#21370)
+successor(#21372,#21386)
+#21480=*
+entry_cfg_node(#21480,#21372)
+hasLocation(#21480,#21387)
+successor(#21370,#21392)
+#21481=*
+exit_cfg_node(#21481,#21372)
+hasLocation(#21481,#21387)
+successor(#21392,#21481)
+successor(#21480,#21373)
+successor(#21388,#21372)
+successor(#21386,#21358)
+successor(#21375,#21388)
+successor(#21360,#21375)
+successor(#21358,#21394)
+successor(#21336,#21360)
+successor(#21325,#21328)
+successor(#21328,#21326)
+successor(#21326,#21336)
+successor(#21317,#21320)
+successor(#21320,#21318)
+successor(#21318,#21325)
 successor(#21310,#21313)
 successor(#21313,#21311)
-successor(#21311,#21318)
-successor(#21303,#21306)
-successor(#21306,#21304)
-successor(#21304,#21310)
-successor(#21288,#21291)
-successor(#21291,#21289)
-successor(#21289,#21303)
-successor(#21280,#21283)
-successor(#21283,#21281)
-successor(#21281,#21288)
+successor(#21311,#21317)
+successor(#21295,#21298)
+successor(#21298,#21296)
+successor(#21296,#21310)
+successor(#21287,#21290)
+successor(#21290,#21288)
+successor(#21288,#21295)
+successor(#21279,#21282)
+successor(#21282,#21280)
+successor(#21280,#21287)
 successor(#21272,#21275)
 successor(#21275,#21273)
-successor(#21273,#21280)
-successor(#21265,#21268)
-successor(#21268,#21266)
-successor(#21266,#21272)
-successor(#21249,#21252)
-successor(#21252,#21250)
-successor(#21250,#21265)
-successor(#21233,#21236)
-successor(#21236,#21234)
-successor(#21234,#21249)
-successor(#21225,#21228)
-successor(#21228,#21226)
-successor(#21226,#21233)
-successor(#21213,#21216)
-successor(#21216,#21214)
-successor(#21214,#21225)
+successor(#21273,#21279)
+successor(#21255,#21258)
+successor(#21258,#21256)
+successor(#21256,#21272)
+successor(#21238,#21241)
+successor(#21241,#21239)
+successor(#21239,#21255)
+successor(#21230,#21233)
+successor(#21233,#21231)
+successor(#21231,#21238)
+successor(#21218,#21221)
+successor(#21221,#21219)
+successor(#21219,#21230)
+successor(#21210,#21213)
+successor(#21213,#21211)
+successor(#21211,#21218)
 successor(#21205,#21208)
 successor(#21208,#21206)
-successor(#21206,#21213)
+successor(#21206,#21210)
 successor(#21200,#21203)
 successor(#21203,#21201)
 successor(#21201,#21205)
@@ -4717,89 +4759,86 @@ successor(#21191,#21195)
 successor(#21185,#21188)
 successor(#21188,#21186)
 successor(#21186,#21190)
-successor(#21180,#21183)
-successor(#21183,#21181)
-successor(#21181,#21185)
-successor(#21172,#21175)
-successor(#21175,#21173)
-successor(#21173,#21180)
-successor(#21162,#21165)
-successor(#21165,#21163)
-successor(#21163,#21172)
-successor(#21152,#21155)
-successor(#21155,#21153)
-successor(#21153,#21162)
-successor(#21142,#21145)
-successor(#21145,#21143)
-successor(#21143,#21152)
-successor(#21132,#21135)
-successor(#21135,#21133)
-successor(#21133,#21142)
-successor(#21121,#21124)
-successor(#21124,#21122)
-successor(#21122,#21132)
-successor(#21113,#21116)
-successor(#21116,#21114)
-successor(#21114,#21121)
-successor(#21108,#21111)
-successor(#21111,#21109)
-successor(#21109,#21113)
-successor(#21103,#21106)
-successor(#21106,#21104)
-successor(#21104,#21108)
-successor(#21098,#21101)
-successor(#21101,#21099)
-successor(#21099,#21103)
-successor(#21093,#21096)
-successor(#21096,#21094)
-successor(#21094,#21098)
-successor(#21086,#21089)
-successor(#21089,#21087)
-successor(#21087,#21093)
-successor(#21071,#21074)
-successor(#21074,#21072)
-successor(#21072,#21086)
-successor(#21061,#21064)
-successor(#21064,#21062)
-successor(#21062,#21071)
-successor(#21056,#21059)
-successor(#21059,#21057)
-successor(#21057,#21061)
-successor(#21051,#21054)
-successor(#21054,#21052)
-successor(#21052,#21056)
-successor(#21046,#21049)
-successor(#21049,#21047)
-successor(#21047,#21051)
-successor(#21041,#21044)
-successor(#21044,#21042)
-successor(#21042,#21046)
-successor(#21036,#21039)
-successor(#21039,#21037)
-successor(#21037,#21041)
-successor(#21031,#21034)
-successor(#21034,#21032)
-successor(#21032,#21036)
-successor(#21026,#21029)
-successor(#21029,#21027)
-successor(#21027,#21031)
-successor(#21021,#21024)
-successor(#21024,#21022)
-successor(#21022,#21026)
-successor(#21016,#21019)
-successor(#21019,#21017)
-successor(#21017,#21021)
-successor(#21011,#21014)
-successor(#21014,#21012)
-successor(#21012,#21016)
-successor(#20993,#20991)
-successor(#21002,#21004)
-successor(#21004,#21011)
-successor(#20997,#20999)
-successor(#20999,#21002)
-successor(#20991,#20997)
-successor(#20981,#20993)
-successor(#21403,#20981)
-successor(#21444,#21403)
+successor(#21177,#21180)
+successor(#21180,#21178)
+successor(#21178,#21185)
+successor(#21166,#21169)
+successor(#21169,#21167)
+successor(#21167,#21177)
+successor(#21155,#21158)
+successor(#21158,#21156)
+successor(#21156,#21166)
+successor(#21144,#21147)
+successor(#21147,#21145)
+successor(#21145,#21155)
+successor(#21133,#21136)
+successor(#21136,#21134)
+successor(#21134,#21144)
+successor(#21122,#21125)
+successor(#21125,#21123)
+successor(#21123,#21133)
+successor(#21114,#21117)
+successor(#21117,#21115)
+successor(#21115,#21122)
+successor(#21109,#21112)
+successor(#21112,#21110)
+successor(#21110,#21114)
+successor(#21104,#21107)
+successor(#21107,#21105)
+successor(#21105,#21109)
+successor(#21099,#21102)
+successor(#21102,#21100)
+successor(#21100,#21104)
+successor(#21094,#21097)
+successor(#21097,#21095)
+successor(#21095,#21099)
+successor(#21087,#21090)
+successor(#21090,#21088)
+successor(#21088,#21094)
+successor(#21072,#21075)
+successor(#21075,#21073)
+successor(#21073,#21087)
+successor(#21062,#21065)
+successor(#21065,#21063)
+successor(#21063,#21072)
+successor(#21057,#21060)
+successor(#21060,#21058)
+successor(#21058,#21062)
+successor(#21052,#21055)
+successor(#21055,#21053)
+successor(#21053,#21057)
+successor(#21047,#21050)
+successor(#21050,#21048)
+successor(#21048,#21052)
+successor(#21042,#21045)
+successor(#21045,#21043)
+successor(#21043,#21047)
+successor(#21037,#21040)
+successor(#21040,#21038)
+successor(#21038,#21042)
+successor(#21032,#21035)
+successor(#21035,#21033)
+successor(#21033,#21037)
+successor(#21027,#21030)
+successor(#21030,#21028)
+successor(#21028,#21032)
+successor(#21022,#21025)
+successor(#21025,#21023)
+successor(#21023,#21027)
+successor(#21017,#21020)
+successor(#21020,#21018)
+successor(#21018,#21022)
+successor(#21012,#21015)
+successor(#21015,#21013)
+successor(#21013,#21017)
+successor(#20994,#20992)
+successor(#21003,#21005)
+successor(#21005,#21012)
+successor(#20998,#21000)
+successor(#21000,#21003)
+successor(#20992,#20998)
+successor(#20982,#20994)
+successor(#21418,#20982)
+successor(#21463,#21418)
 numlines(#10000,65,60,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/unicode.ts.trap b/javascript/extractor/tests/ts/output/trap/unicode.ts.trap
index 749725d9a46..04c31c6c63f 100644
--- a/javascript/extractor/tests/ts/output/trap/unicode.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/unicode.ts.trap
@@ -47,12 +47,14 @@ next_token(#20004,#20011)
 next_token(#20006,#20011)
 toplevels(#20001,0)
 hasLocation(#20001,#20012)
-#20013=*
-entry_cfg_node(#20013,#20001)
-hasLocation(#20013,#20012)
+#20013=@"var;{this};{#20000}"
+variables(#20013,"this",#20000)
 #20014=*
-exit_cfg_node(#20014,#20001)
+entry_cfg_node(#20014,#20001)
 hasLocation(#20014,#20012)
-successor(#20013,#20014)
+#20015=*
+exit_cfg_node(#20015,#20001)
+hasLocation(#20015,#20012)
+successor(#20014,#20015)
 numlines(#10000,3,0,3)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/unicodeId.ts.trap b/javascript/extractor/tests/ts/output/trap/unicodeId.ts.trap
index d5655de7c32..4584a7d7566 100644
--- a/javascript/extractor/tests/ts/output/trap/unicodeId.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/unicodeId.ts.trap
@@ -52,42 +52,44 @@ locations_default(#20016,#10000,1,1,2,0)
 hasLocation(#20001,#20016)
 #20017=@"var;{才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123};{#20000}"
 variables(#20017,"才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123",#20000)
-#20018=*
-stmts(#20018,18,#20001,0,"var \u624d\u80fd\u30bd ... 23 = 1;")
-hasLocation(#20018,#20003)
-stmt_containers(#20018,#20001)
+#20018=@"var;{this};{#20000}"
+variables(#20018,"this",#20000)
 #20019=*
-exprs(#20019,64,#20018,0,"\u624d\u80fd\u30bd\u042b\u2168\u84a4\u90f3 ... 123 = 1")
-#20020=@"loc,{#10000},1,5,1,81"
-locations_default(#20020,#10000,1,5,1,81)
-hasLocation(#20019,#20020)
-enclosing_stmt(#20019,#20018)
-expr_containers(#20019,#20001)
-#20021=*
-exprs(#20021,78,#20019,0,"\u624d\u80fd\u30bd\u042b\u2168\u84a4\u90f3 ... Abcd123")
-hasLocation(#20021,#20007)
-enclosing_stmt(#20021,#20018)
-expr_containers(#20021,#20001)
-literals("才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123","才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123",#20021)
-decl(#20021,#20017)
+stmts(#20019,18,#20001,0,"var \u624d\u80fd\u30bd ... 23 = 1;")
+hasLocation(#20019,#20003)
+stmt_containers(#20019,#20001)
+#20020=*
+exprs(#20020,64,#20019,0,"\u624d\u80fd\u30bd\u042b\u2168\u84a4\u90f3 ... 123 = 1")
+#20021=@"loc,{#10000},1,5,1,81"
+locations_default(#20021,#10000,1,5,1,81)
+hasLocation(#20020,#20021)
+enclosing_stmt(#20020,#20019)
+expr_containers(#20020,#20001)
 #20022=*
-exprs(#20022,3,#20019,1,"1")
-hasLocation(#20022,#20011)
-enclosing_stmt(#20022,#20018)
+exprs(#20022,78,#20020,0,"\u624d\u80fd\u30bd\u042b\u2168\u84a4\u90f3 ... Abcd123")
+hasLocation(#20022,#20007)
+enclosing_stmt(#20022,#20019)
 expr_containers(#20022,#20001)
-literals("1","1",#20022)
+literals("才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123","才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüß才能ソЫⅨ蒤郳र्क्ड्राüışğİliيونيكودöÄüßAbcd123",#20022)
+decl(#20022,#20017)
 #20023=*
-entry_cfg_node(#20023,#20001)
-#20024=@"loc,{#10000},1,1,1,0"
-locations_default(#20024,#10000,1,1,1,0)
-hasLocation(#20023,#20024)
-#20025=*
-exit_cfg_node(#20025,#20001)
-hasLocation(#20025,#20015)
-successor(#20018,#20021)
-successor(#20022,#20019)
-successor(#20021,#20022)
-successor(#20019,#20025)
-successor(#20023,#20018)
+exprs(#20023,3,#20020,1,"1")
+hasLocation(#20023,#20011)
+enclosing_stmt(#20023,#20019)
+expr_containers(#20023,#20001)
+literals("1","1",#20023)
+#20024=*
+entry_cfg_node(#20024,#20001)
+#20025=@"loc,{#10000},1,1,1,0"
+locations_default(#20025,#10000,1,1,1,0)
+hasLocation(#20024,#20025)
+#20026=*
+exit_cfg_node(#20026,#20001)
+hasLocation(#20026,#20015)
+successor(#20019,#20022)
+successor(#20023,#20020)
+successor(#20022,#20023)
+successor(#20020,#20026)
+successor(#20024,#20019)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/uninstantiatedNamespace.ts.trap b/javascript/extractor/tests/ts/output/trap/uninstantiatedNamespace.ts.trap
index 7cc993e08e3..4aa3daac8d9 100644
--- a/javascript/extractor/tests/ts/output/trap/uninstantiatedNamespace.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/uninstantiatedNamespace.ts.trap
@@ -583,415 +583,419 @@ hasLocation(#20001,#20209)
 variables(#20210,"Wrapper",#20000)
 #20211=@"local_namespace_name;{Wrapper};{#20000}"
 local_namespace_names(#20211,"Wrapper",#20000)
-#20212=*
-stmts(#20212,31,#20001,0,"namespa ... lock]\n}")
-#20213=@"loc,{#10000},1,1,25,1"
-locations_default(#20213,#10000,1,1,25,1)
-hasLocation(#20212,#20213)
-stmt_containers(#20212,#20001)
-#20214=*
-exprs(#20214,78,#20212,-1,"Wrapper")
-hasLocation(#20214,#20059)
-enclosing_stmt(#20214,#20212)
-expr_containers(#20214,#20001)
-literals("Wrapper","Wrapper",#20214)
-decl(#20214,#20210)
-namespacedecl(#20214,#20211)
+#20212=@"var;{this};{#20000}"
+variables(#20212,"this",#20000)
+#20213=*
+stmts(#20213,31,#20001,0,"namespa ... lock]\n}")
+#20214=@"loc,{#10000},1,1,25,1"
+locations_default(#20214,#10000,1,1,25,1)
+hasLocation(#20213,#20214)
+stmt_containers(#20213,#20001)
 #20215=*
-scopes(#20215,9)
-scopenodes(#20212,#20215)
-scopenesting(#20215,#20000)
-#20216=@"var;{EmptyStatement};{#20215}"
-variables(#20216,"EmptyStatement",#20215)
-#20217=@"var;{EmptyBlock};{#20215}"
-variables(#20217,"EmptyBlock",#20215)
-#20218=@"var;{x};{#20215}"
-variables(#20218,"x",#20215)
-#20219=@"local_namespace_name;{Empty};{#20215}"
-local_namespace_names(#20219,"Empty",#20215)
-#20220=@"local_namespace_name;{Comments};{#20215}"
-local_namespace_names(#20220,"Comments",#20215)
-#20221=@"local_namespace_name;{Outer};{#20215}"
-local_namespace_names(#20221,"Outer",#20215)
-#20222=@"local_namespace_name;{Outer2};{#20215}"
-local_namespace_names(#20222,"Outer2",#20215)
-#20223=@"local_namespace_name;{Interfaces};{#20215}"
-local_namespace_names(#20223,"Interfaces",#20215)
-#20224=@"local_namespace_name;{EmptyStatement};{#20215}"
-local_namespace_names(#20224,"EmptyStatement",#20215)
-#20225=@"local_namespace_name;{EmptyBlock};{#20215}"
-local_namespace_names(#20225,"EmptyBlock",#20215)
-#20226=*
-stmts(#20226,31,#20212,0,"namespace Empty {}")
-#20227=@"loc,{#10000},3,3,3,20"
-locations_default(#20227,#10000,3,3,3,20)
-hasLocation(#20226,#20227)
-stmt_containers(#20226,#20212)
-#20228=*
-exprs(#20228,78,#20226,-1,"Empty")
-hasLocation(#20228,#20065)
-enclosing_stmt(#20228,#20226)
-expr_containers(#20228,#20212)
-literals("Empty","Empty",#20228)
-namespacedecl(#20228,#20219)
+exprs(#20215,78,#20213,-1,"Wrapper")
+hasLocation(#20215,#20059)
+enclosing_stmt(#20215,#20213)
+expr_containers(#20215,#20001)
+literals("Wrapper","Wrapper",#20215)
+decl(#20215,#20210)
+namespacedecl(#20215,#20211)
+#20216=*
+scopes(#20216,9)
+scopenodes(#20213,#20216)
+scopenesting(#20216,#20000)
+#20217=@"var;{EmptyStatement};{#20216}"
+variables(#20217,"EmptyStatement",#20216)
+#20218=@"var;{EmptyBlock};{#20216}"
+variables(#20218,"EmptyBlock",#20216)
+#20219=@"var;{x};{#20216}"
+variables(#20219,"x",#20216)
+#20220=@"local_namespace_name;{Empty};{#20216}"
+local_namespace_names(#20220,"Empty",#20216)
+#20221=@"local_namespace_name;{Comments};{#20216}"
+local_namespace_names(#20221,"Comments",#20216)
+#20222=@"local_namespace_name;{Outer};{#20216}"
+local_namespace_names(#20222,"Outer",#20216)
+#20223=@"local_namespace_name;{Outer2};{#20216}"
+local_namespace_names(#20223,"Outer2",#20216)
+#20224=@"local_namespace_name;{Interfaces};{#20216}"
+local_namespace_names(#20224,"Interfaces",#20216)
+#20225=@"local_namespace_name;{EmptyStatement};{#20216}"
+local_namespace_names(#20225,"EmptyStatement",#20216)
+#20226=@"local_namespace_name;{EmptyBlock};{#20216}"
+local_namespace_names(#20226,"EmptyBlock",#20216)
+#20227=*
+stmts(#20227,31,#20213,0,"namespace Empty {}")
+#20228=@"loc,{#10000},3,3,3,20"
+locations_default(#20228,#10000,3,3,3,20)
+hasLocation(#20227,#20228)
+stmt_containers(#20227,#20213)
 #20229=*
-scopes(#20229,9)
-scopenodes(#20226,#20229)
-scopenesting(#20229,#20215)
+exprs(#20229,78,#20227,-1,"Empty")
+hasLocation(#20229,#20065)
+enclosing_stmt(#20229,#20227)
+expr_containers(#20229,#20213)
+literals("Empty","Empty",#20229)
+namespacedecl(#20229,#20220)
 #20230=*
-stmts(#20230,31,#20212,1,"namespa ...  */\n  }")
-#20231=@"loc,{#10000},4,3,7,3"
-locations_default(#20231,#10000,4,3,7,3)
-hasLocation(#20230,#20231)
-stmt_containers(#20230,#20212)
-#20232=*
-exprs(#20232,78,#20230,-1,"Comments")
-hasLocation(#20232,#20073)
-enclosing_stmt(#20232,#20230)
-expr_containers(#20232,#20212)
-literals("Comments","Comments",#20232)
-namespacedecl(#20232,#20220)
+scopes(#20230,9)
+scopenodes(#20227,#20230)
+scopenesting(#20230,#20216)
+#20231=*
+stmts(#20231,31,#20213,1,"namespa ...  */\n  }")
+#20232=@"loc,{#10000},4,3,7,3"
+locations_default(#20232,#10000,4,3,7,3)
+hasLocation(#20231,#20232)
+stmt_containers(#20231,#20213)
 #20233=*
-scopes(#20233,9)
-scopenodes(#20230,#20233)
-scopenesting(#20233,#20215)
+exprs(#20233,78,#20231,-1,"Comments")
+hasLocation(#20233,#20073)
+enclosing_stmt(#20233,#20231)
+expr_containers(#20233,#20213)
+literals("Comments","Comments",#20233)
+namespacedecl(#20233,#20221)
 #20234=*
-stmts(#20234,31,#20212,2,"namespa ...  {}\n  }")
-#20235=@"loc,{#10000},8,3,10,3"
-locations_default(#20235,#10000,8,3,10,3)
-hasLocation(#20234,#20235)
-stmt_containers(#20234,#20212)
-#20236=*
-exprs(#20236,78,#20234,-1,"Outer")
-hasLocation(#20236,#20081)
-enclosing_stmt(#20236,#20234)
-expr_containers(#20236,#20212)
-literals("Outer","Outer",#20236)
-namespacedecl(#20236,#20221)
+scopes(#20234,9)
+scopenodes(#20231,#20234)
+scopenesting(#20234,#20216)
+#20235=*
+stmts(#20235,31,#20213,2,"namespa ...  {}\n  }")
+#20236=@"loc,{#10000},8,3,10,3"
+locations_default(#20236,#10000,8,3,10,3)
+hasLocation(#20235,#20236)
+stmt_containers(#20235,#20213)
 #20237=*
-scopes(#20237,9)
-scopenodes(#20234,#20237)
-scopenesting(#20237,#20215)
-#20238=@"local_namespace_name;{Inner};{#20237}"
-local_namespace_names(#20238,"Inner",#20237)
-#20239=*
-stmts(#20239,31,#20234,0,"namespace Inner {}")
-#20240=@"loc,{#10000},9,5,9,22"
-locations_default(#20240,#10000,9,5,9,22)
-hasLocation(#20239,#20240)
-stmt_containers(#20239,#20234)
-#20241=*
-exprs(#20241,78,#20239,-1,"Inner")
-hasLocation(#20241,#20087)
-enclosing_stmt(#20241,#20239)
-expr_containers(#20241,#20234)
-literals("Inner","Inner",#20241)
-namespacedecl(#20241,#20238)
+exprs(#20237,78,#20235,-1,"Outer")
+hasLocation(#20237,#20081)
+enclosing_stmt(#20237,#20235)
+expr_containers(#20237,#20213)
+literals("Outer","Outer",#20237)
+namespacedecl(#20237,#20222)
+#20238=*
+scopes(#20238,9)
+scopenodes(#20235,#20238)
+scopenesting(#20238,#20216)
+#20239=@"local_namespace_name;{Inner};{#20238}"
+local_namespace_names(#20239,"Inner",#20238)
+#20240=*
+stmts(#20240,31,#20235,0,"namespace Inner {}")
+#20241=@"loc,{#10000},9,5,9,22"
+locations_default(#20241,#10000,9,5,9,22)
+hasLocation(#20240,#20241)
+stmt_containers(#20240,#20235)
 #20242=*
-scopes(#20242,9)
-scopenodes(#20239,#20242)
-scopenesting(#20242,#20237)
+exprs(#20242,78,#20240,-1,"Inner")
+hasLocation(#20242,#20087)
+enclosing_stmt(#20242,#20240)
+expr_containers(#20242,#20235)
+literals("Inner","Inner",#20242)
+namespacedecl(#20242,#20239)
 #20243=*
-stmts(#20243,31,#20212,3,"namespa ...  {}\n  }")
-#20244=@"loc,{#10000},11,3,13,3"
-locations_default(#20244,#10000,11,3,13,3)
-hasLocation(#20243,#20244)
-stmt_containers(#20243,#20212)
-#20245=*
-exprs(#20245,78,#20243,-1,"Outer2")
-hasLocation(#20245,#20097)
-enclosing_stmt(#20245,#20243)
-expr_containers(#20245,#20212)
-literals("Outer2","Outer2",#20245)
-namespacedecl(#20245,#20222)
+scopes(#20243,9)
+scopenodes(#20240,#20243)
+scopenesting(#20243,#20238)
+#20244=*
+stmts(#20244,31,#20213,3,"namespa ...  {}\n  }")
+#20245=@"loc,{#10000},11,3,13,3"
+locations_default(#20245,#10000,11,3,13,3)
+hasLocation(#20244,#20245)
+stmt_containers(#20244,#20213)
 #20246=*
-scopes(#20246,9)
-scopenodes(#20243,#20246)
-scopenesting(#20246,#20215)
-#20247=@"local_namespace_name;{Inner};{#20246}"
-local_namespace_names(#20247,"Inner",#20246)
-#20248=*
-stmts(#20248,30,#20243,0,"export  ... nner {}")
-#20249=@"loc,{#10000},12,5,12,29"
-locations_default(#20249,#10000,12,5,12,29)
-hasLocation(#20248,#20249)
-stmt_containers(#20248,#20243)
-#20250=*
-stmts(#20250,31,#20248,-1,"namespace Inner {}")
-#20251=@"loc,{#10000},12,12,12,29"
-locations_default(#20251,#10000,12,12,12,29)
-hasLocation(#20250,#20251)
-stmt_containers(#20250,#20243)
-#20252=*
-exprs(#20252,78,#20250,-1,"Inner")
-hasLocation(#20252,#20105)
-enclosing_stmt(#20252,#20250)
-expr_containers(#20252,#20243)
-literals("Inner","Inner",#20252)
-namespacedecl(#20252,#20247)
+exprs(#20246,78,#20244,-1,"Outer2")
+hasLocation(#20246,#20097)
+enclosing_stmt(#20246,#20244)
+expr_containers(#20246,#20213)
+literals("Outer2","Outer2",#20246)
+namespacedecl(#20246,#20223)
+#20247=*
+scopes(#20247,9)
+scopenodes(#20244,#20247)
+scopenesting(#20247,#20216)
+#20248=@"local_namespace_name;{Inner};{#20247}"
+local_namespace_names(#20248,"Inner",#20247)
+#20249=*
+stmts(#20249,30,#20244,0,"export  ... nner {}")
+#20250=@"loc,{#10000},12,5,12,29"
+locations_default(#20250,#10000,12,5,12,29)
+hasLocation(#20249,#20250)
+stmt_containers(#20249,#20244)
+#20251=*
+stmts(#20251,31,#20249,-1,"namespace Inner {}")
+#20252=@"loc,{#10000},12,12,12,29"
+locations_default(#20252,#10000,12,12,12,29)
+hasLocation(#20251,#20252)
+stmt_containers(#20251,#20244)
 #20253=*
-scopes(#20253,9)
-scopenodes(#20250,#20253)
-scopenesting(#20253,#20246)
+exprs(#20253,78,#20251,-1,"Inner")
+hasLocation(#20253,#20105)
+enclosing_stmt(#20253,#20251)
+expr_containers(#20253,#20244)
+literals("Inner","Inner",#20253)
+namespacedecl(#20253,#20248)
 #20254=*
-stmts(#20254,31,#20212,4,"namespa ...   }\n  }")
-#20255=@"loc,{#10000},14,3,19,3"
-locations_default(#20255,#10000,14,3,19,3)
-hasLocation(#20254,#20255)
-stmt_containers(#20254,#20212)
-#20256=*
-exprs(#20256,78,#20254,-1,"Interfaces")
-hasLocation(#20256,#20115)
-enclosing_stmt(#20256,#20254)
-expr_containers(#20256,#20212)
-literals("Interfaces","Interfaces",#20256)
-namespacedecl(#20256,#20223)
+scopes(#20254,9)
+scopenodes(#20251,#20254)
+scopenesting(#20254,#20247)
+#20255=*
+stmts(#20255,31,#20213,4,"namespa ...   }\n  }")
+#20256=@"loc,{#10000},14,3,19,3"
+locations_default(#20256,#10000,14,3,19,3)
+hasLocation(#20255,#20256)
+stmt_containers(#20255,#20213)
 #20257=*
-scopes(#20257,9)
-scopenodes(#20254,#20257)
-scopenesting(#20257,#20215)
-#20258=@"local_type_name;{I};{#20257}"
-local_type_names(#20258,"I",#20257)
-#20259=*
-stmts(#20259,34,#20254,0,"interfa ... ;\n    }")
-#20260=@"loc,{#10000},15,5,18,5"
-locations_default(#20260,#10000,15,5,18,5)
-hasLocation(#20259,#20260)
-stmt_containers(#20259,#20254)
-#20261=*
-typeexprs(#20261,1,#20259,0,"I")
-hasLocation(#20261,#20121)
-enclosing_stmt(#20261,#20259)
-expr_containers(#20261,#20254)
-literals("I","I",#20261)
-typedecl(#20261,#20258)
+exprs(#20257,78,#20255,-1,"Interfaces")
+hasLocation(#20257,#20115)
+enclosing_stmt(#20257,#20255)
+expr_containers(#20257,#20213)
+literals("Interfaces","Interfaces",#20257)
+namespacedecl(#20257,#20224)
+#20258=*
+scopes(#20258,9)
+scopenodes(#20255,#20258)
+scopenesting(#20258,#20216)
+#20259=@"local_type_name;{I};{#20258}"
+local_type_names(#20259,"I",#20258)
+#20260=*
+stmts(#20260,34,#20255,0,"interfa ... ;\n    }")
+#20261=@"loc,{#10000},15,5,18,5"
+locations_default(#20261,#10000,15,5,18,5)
+hasLocation(#20260,#20261)
+stmt_containers(#20260,#20255)
 #20262=*
-properties(#20262,#20259,2,8,"x: number;")
-#20263=@"loc,{#10000},16,7,16,16"
-locations_default(#20263,#10000,16,7,16,16)
-hasLocation(#20262,#20263)
-#20264=*
-exprs(#20264,0,#20262,0,"x")
-hasLocation(#20264,#20125)
-enclosing_stmt(#20264,#20259)
-expr_containers(#20264,#20254)
-literals("x","x",#20264)
-is_abstract_member(#20262)
+typeexprs(#20262,1,#20260,0,"I")
+hasLocation(#20262,#20121)
+enclosing_stmt(#20262,#20260)
+expr_containers(#20262,#20255)
+literals("I","I",#20262)
+typedecl(#20262,#20259)
+#20263=*
+properties(#20263,#20260,2,8,"x: number;")
+#20264=@"loc,{#10000},16,7,16,16"
+locations_default(#20264,#10000,16,7,16,16)
+hasLocation(#20263,#20264)
 #20265=*
-typeexprs(#20265,2,#20262,2,"number")
-hasLocation(#20265,#20129)
-enclosing_stmt(#20265,#20259)
-expr_containers(#20265,#20254)
-literals("number","number",#20265)
+exprs(#20265,0,#20263,0,"x")
+hasLocation(#20265,#20125)
+enclosing_stmt(#20265,#20260)
+expr_containers(#20265,#20255)
+literals("x","x",#20265)
+is_abstract_member(#20263)
 #20266=*
-properties(#20266,#20259,3,0,"foo(): number;")
-#20267=@"loc,{#10000},17,7,17,20"
-locations_default(#20267,#10000,17,7,17,20)
-hasLocation(#20266,#20267)
-#20268=*
-exprs(#20268,0,#20266,0,"foo")
-hasLocation(#20268,#20133)
-enclosing_stmt(#20268,#20259)
-expr_containers(#20268,#20254)
-literals("foo","foo",#20268)
+typeexprs(#20266,2,#20263,2,"number")
+hasLocation(#20266,#20129)
+enclosing_stmt(#20266,#20260)
+expr_containers(#20266,#20255)
+literals("number","number",#20266)
+#20267=*
+properties(#20267,#20260,3,0,"foo(): number;")
+#20268=@"loc,{#10000},17,7,17,20"
+locations_default(#20268,#10000,17,7,17,20)
+hasLocation(#20267,#20268)
 #20269=*
-exprs(#20269,9,#20266,1,"foo(): number;")
-hasLocation(#20269,#20267)
-enclosing_stmt(#20269,#20259)
-expr_containers(#20269,#20254)
+exprs(#20269,0,#20267,0,"foo")
+hasLocation(#20269,#20133)
+enclosing_stmt(#20269,#20260)
+expr_containers(#20269,#20255)
+literals("foo","foo",#20269)
 #20270=*
-scopes(#20270,1)
-scopenodes(#20269,#20270)
-scopenesting(#20270,#20257)
-#20271=@"var;{arguments};{#20270}"
-variables(#20271,"arguments",#20270)
-is_arguments_object(#20271)
-#20272=*
-typeexprs(#20272,2,#20269,-3,"number")
-hasLocation(#20272,#20141)
-expr_containers(#20272,#20269)
-literals("number","number",#20272)
-is_method(#20266)
-is_abstract_member(#20266)
-#20273=*
-stmts(#20273,31,#20212,5,"namespa ... ent {;}")
-#20274=@"loc,{#10000},21,3,21,30"
-locations_default(#20274,#10000,21,3,21,30)
-hasLocation(#20273,#20274)
-stmt_containers(#20273,#20212)
+exprs(#20270,9,#20267,1,"foo(): number;")
+hasLocation(#20270,#20268)
+enclosing_stmt(#20270,#20260)
+expr_containers(#20270,#20255)
+#20271=*
+scopes(#20271,1)
+scopenodes(#20270,#20271)
+scopenesting(#20271,#20258)
+#20272=@"var;{this};{#20271}"
+variables(#20272,"this",#20271)
+#20273=@"var;{arguments};{#20271}"
+variables(#20273,"arguments",#20271)
+is_arguments_object(#20273)
+#20274=*
+typeexprs(#20274,2,#20270,-3,"number")
+hasLocation(#20274,#20141)
+expr_containers(#20274,#20270)
+literals("number","number",#20274)
+is_method(#20267)
+is_abstract_member(#20267)
 #20275=*
-exprs(#20275,78,#20273,-1,"EmptyStatement")
-hasLocation(#20275,#20151)
-enclosing_stmt(#20275,#20273)
-expr_containers(#20275,#20212)
-literals("EmptyStatement","EmptyStatement",#20275)
-decl(#20275,#20216)
-namespacedecl(#20275,#20224)
-#20276=*
-scopes(#20276,9)
-scopenodes(#20273,#20276)
-scopenesting(#20276,#20215)
+stmts(#20275,31,#20213,5,"namespa ... ent {;}")
+#20276=@"loc,{#10000},21,3,21,30"
+locations_default(#20276,#10000,21,3,21,30)
+hasLocation(#20275,#20276)
+stmt_containers(#20275,#20213)
 #20277=*
-stmts(#20277,0,#20273,0,";")
-hasLocation(#20277,#20155)
-stmt_containers(#20277,#20273)
-is_instantiated(#20273)
+exprs(#20277,78,#20275,-1,"EmptyStatement")
+hasLocation(#20277,#20151)
+enclosing_stmt(#20277,#20275)
+expr_containers(#20277,#20213)
+literals("EmptyStatement","EmptyStatement",#20277)
+decl(#20277,#20217)
+namespacedecl(#20277,#20225)
 #20278=*
-stmts(#20278,31,#20212,6,"namespa ... ck {{}}")
-#20279=@"loc,{#10000},22,3,22,27"
-locations_default(#20279,#10000,22,3,22,27)
-hasLocation(#20278,#20279)
-stmt_containers(#20278,#20212)
+scopes(#20278,9)
+scopenodes(#20275,#20278)
+scopenesting(#20278,#20216)
+#20279=*
+stmts(#20279,0,#20275,0,";")
+hasLocation(#20279,#20155)
+stmt_containers(#20279,#20275)
+is_instantiated(#20275)
 #20280=*
-exprs(#20280,78,#20278,-1,"EmptyBlock")
-hasLocation(#20280,#20161)
-enclosing_stmt(#20280,#20278)
-expr_containers(#20280,#20212)
-literals("EmptyBlock","EmptyBlock",#20280)
-decl(#20280,#20217)
-namespacedecl(#20280,#20225)
-#20281=*
-scopes(#20281,9)
-scopenodes(#20278,#20281)
-scopenesting(#20281,#20215)
+stmts(#20280,31,#20213,6,"namespa ... ck {{}}")
+#20281=@"loc,{#10000},22,3,22,27"
+locations_default(#20281,#10000,22,3,22,27)
+hasLocation(#20280,#20281)
+stmt_containers(#20280,#20213)
 #20282=*
-stmts(#20282,1,#20278,0,"{}")
-#20283=@"loc,{#10000},22,25,22,26"
-locations_default(#20283,#10000,22,25,22,26)
-hasLocation(#20282,#20283)
-stmt_containers(#20282,#20278)
-is_instantiated(#20278)
+exprs(#20282,78,#20280,-1,"EmptyBlock")
+hasLocation(#20282,#20161)
+enclosing_stmt(#20282,#20280)
+expr_containers(#20282,#20213)
+literals("EmptyBlock","EmptyBlock",#20282)
+decl(#20282,#20218)
+namespacedecl(#20282,#20226)
+#20283=*
+scopes(#20283,9)
+scopenodes(#20280,#20283)
+scopenesting(#20283,#20216)
 #20284=*
-stmts(#20284,18,#20212,7,"var x = ... yBlock]")
-#20285=@"loc,{#10000},24,3,24,82"
-locations_default(#20285,#10000,24,3,24,82)
+stmts(#20284,1,#20280,0,"{}")
+#20285=@"loc,{#10000},22,25,22,26"
+locations_default(#20285,#10000,22,25,22,26)
 hasLocation(#20284,#20285)
-stmt_containers(#20284,#20212)
+stmt_containers(#20284,#20280)
+is_instantiated(#20280)
 #20286=*
-exprs(#20286,64,#20284,0,"x = [Em ... yBlock]")
-#20287=@"loc,{#10000},24,7,24,82"
-locations_default(#20287,#10000,24,7,24,82)
+stmts(#20286,18,#20213,7,"var x = ... yBlock]")
+#20287=@"loc,{#10000},24,3,24,82"
+locations_default(#20287,#10000,24,3,24,82)
 hasLocation(#20286,#20287)
-enclosing_stmt(#20286,#20284)
-expr_containers(#20286,#20212)
+stmt_containers(#20286,#20213)
 #20288=*
-exprs(#20288,78,#20286,0,"x")
-hasLocation(#20288,#20173)
-enclosing_stmt(#20288,#20284)
-expr_containers(#20288,#20212)
-literals("x","x",#20288)
-decl(#20288,#20218)
-#20289=*
-exprs(#20289,7,#20286,1,"[Empty, ... yBlock]")
-#20290=@"loc,{#10000},24,11,24,82"
-locations_default(#20290,#10000,24,11,24,82)
-hasLocation(#20289,#20290)
-enclosing_stmt(#20289,#20284)
-expr_containers(#20289,#20212)
+exprs(#20288,64,#20286,0,"x = [Em ... yBlock]")
+#20289=@"loc,{#10000},24,7,24,82"
+locations_default(#20289,#10000,24,7,24,82)
+hasLocation(#20288,#20289)
+enclosing_stmt(#20288,#20286)
+expr_containers(#20288,#20213)
+#20290=*
+exprs(#20290,78,#20288,0,"x")
+hasLocation(#20290,#20173)
+enclosing_stmt(#20290,#20286)
+expr_containers(#20290,#20213)
+literals("x","x",#20290)
+decl(#20290,#20219)
 #20291=*
-exprs(#20291,79,#20289,0,"Empty")
-hasLocation(#20291,#20179)
-enclosing_stmt(#20291,#20284)
-expr_containers(#20291,#20212)
-literals("Empty","Empty",#20291)
-#20292=@"var;{Empty};{#20000}"
-variables(#20292,"Empty",#20000)
-bind(#20291,#20292)
+exprs(#20291,7,#20288,1,"[Empty, ... yBlock]")
+#20292=@"loc,{#10000},24,11,24,82"
+locations_default(#20292,#10000,24,11,24,82)
+hasLocation(#20291,#20292)
+enclosing_stmt(#20291,#20286)
+expr_containers(#20291,#20213)
 #20293=*
-exprs(#20293,79,#20289,1,"Comments")
-hasLocation(#20293,#20183)
-enclosing_stmt(#20293,#20284)
-expr_containers(#20293,#20212)
-literals("Comments","Comments",#20293)
-#20294=@"var;{Comments};{#20000}"
-variables(#20294,"Comments",#20000)
+exprs(#20293,79,#20291,0,"Empty")
+hasLocation(#20293,#20179)
+enclosing_stmt(#20293,#20286)
+expr_containers(#20293,#20213)
+literals("Empty","Empty",#20293)
+#20294=@"var;{Empty};{#20000}"
+variables(#20294,"Empty",#20000)
 bind(#20293,#20294)
 #20295=*
-exprs(#20295,79,#20289,2,"Outer")
-hasLocation(#20295,#20187)
-enclosing_stmt(#20295,#20284)
-expr_containers(#20295,#20212)
-literals("Outer","Outer",#20295)
-#20296=@"var;{Outer};{#20000}"
-variables(#20296,"Outer",#20000)
+exprs(#20295,79,#20291,1,"Comments")
+hasLocation(#20295,#20183)
+enclosing_stmt(#20295,#20286)
+expr_containers(#20295,#20213)
+literals("Comments","Comments",#20295)
+#20296=@"var;{Comments};{#20000}"
+variables(#20296,"Comments",#20000)
 bind(#20295,#20296)
 #20297=*
-exprs(#20297,79,#20289,3,"Outer2")
-hasLocation(#20297,#20191)
-enclosing_stmt(#20297,#20284)
-expr_containers(#20297,#20212)
-literals("Outer2","Outer2",#20297)
-#20298=@"var;{Outer2};{#20000}"
-variables(#20298,"Outer2",#20000)
+exprs(#20297,79,#20291,2,"Outer")
+hasLocation(#20297,#20187)
+enclosing_stmt(#20297,#20286)
+expr_containers(#20297,#20213)
+literals("Outer","Outer",#20297)
+#20298=@"var;{Outer};{#20000}"
+variables(#20298,"Outer",#20000)
 bind(#20297,#20298)
 #20299=*
-exprs(#20299,79,#20289,4,"Interfaces")
-hasLocation(#20299,#20195)
-enclosing_stmt(#20299,#20284)
-expr_containers(#20299,#20212)
-literals("Interfaces","Interfaces",#20299)
-#20300=@"var;{Interfaces};{#20000}"
-variables(#20300,"Interfaces",#20000)
+exprs(#20299,79,#20291,3,"Outer2")
+hasLocation(#20299,#20191)
+enclosing_stmt(#20299,#20286)
+expr_containers(#20299,#20213)
+literals("Outer2","Outer2",#20299)
+#20300=@"var;{Outer2};{#20000}"
+variables(#20300,"Outer2",#20000)
 bind(#20299,#20300)
 #20301=*
-exprs(#20301,79,#20289,5,"EmptyStatement")
-hasLocation(#20301,#20199)
-enclosing_stmt(#20301,#20284)
-expr_containers(#20301,#20212)
-literals("EmptyStatement","EmptyStatement",#20301)
-bind(#20301,#20216)
-#20302=*
-exprs(#20302,79,#20289,6,"EmptyBlock")
-hasLocation(#20302,#20203)
-enclosing_stmt(#20302,#20284)
-expr_containers(#20302,#20212)
-literals("EmptyBlock","EmptyBlock",#20302)
-bind(#20302,#20217)
-array_size(#20289,7)
-is_instantiated(#20212)
+exprs(#20301,79,#20291,4,"Interfaces")
+hasLocation(#20301,#20195)
+enclosing_stmt(#20301,#20286)
+expr_containers(#20301,#20213)
+literals("Interfaces","Interfaces",#20301)
+#20302=@"var;{Interfaces};{#20000}"
+variables(#20302,"Interfaces",#20000)
+bind(#20301,#20302)
 #20303=*
-entry_cfg_node(#20303,#20001)
-#20304=@"loc,{#10000},1,1,1,0"
-locations_default(#20304,#10000,1,1,1,0)
-hasLocation(#20303,#20304)
+exprs(#20303,79,#20291,5,"EmptyStatement")
+hasLocation(#20303,#20199)
+enclosing_stmt(#20303,#20286)
+expr_containers(#20303,#20213)
+literals("EmptyStatement","EmptyStatement",#20303)
+bind(#20303,#20217)
+#20304=*
+exprs(#20304,79,#20291,6,"EmptyBlock")
+hasLocation(#20304,#20203)
+enclosing_stmt(#20304,#20286)
+expr_containers(#20304,#20213)
+literals("EmptyBlock","EmptyBlock",#20304)
+bind(#20304,#20218)
+array_size(#20291,7)
+is_instantiated(#20213)
 #20305=*
-exit_cfg_node(#20305,#20001)
-hasLocation(#20305,#20208)
-successor(#20214,#20212)
-successor(#20284,#20288)
-successor(#20289,#20291)
-successor(#20302,#20286)
-successor(#20301,#20302)
+entry_cfg_node(#20305,#20001)
+#20306=@"loc,{#10000},1,1,1,0"
+locations_default(#20306,#10000,1,1,1,0)
+hasLocation(#20305,#20306)
+#20307=*
+exit_cfg_node(#20307,#20001)
+hasLocation(#20307,#20208)
+successor(#20215,#20213)
+successor(#20286,#20290)
+successor(#20291,#20293)
+successor(#20304,#20288)
+successor(#20303,#20304)
+successor(#20301,#20303)
 successor(#20299,#20301)
 successor(#20297,#20299)
 successor(#20295,#20297)
 successor(#20293,#20295)
-successor(#20291,#20293)
-successor(#20288,#20289)
-successor(#20286,#20305)
-successor(#20280,#20278)
-successor(#20282,#20284)
-successor(#20278,#20282)
-successor(#20275,#20273)
-successor(#20277,#20280)
-successor(#20273,#20277)
-successor(#20256,#20254)
-successor(#20259,#20275)
-successor(#20254,#20259)
-successor(#20245,#20243)
-successor(#20248,#20252)
-successor(#20252,#20250)
-successor(#20250,#20256)
-successor(#20243,#20248)
-successor(#20236,#20234)
-successor(#20241,#20239)
-successor(#20239,#20245)
-successor(#20234,#20241)
-successor(#20232,#20230)
-successor(#20230,#20236)
-successor(#20228,#20226)
-successor(#20226,#20232)
-successor(#20212,#20228)
-successor(#20303,#20214)
+successor(#20290,#20291)
+successor(#20288,#20307)
+successor(#20282,#20280)
+successor(#20284,#20286)
+successor(#20280,#20284)
+successor(#20277,#20275)
+successor(#20279,#20282)
+successor(#20275,#20279)
+successor(#20257,#20255)
+successor(#20260,#20277)
+successor(#20255,#20260)
+successor(#20246,#20244)
+successor(#20249,#20253)
+successor(#20253,#20251)
+successor(#20251,#20257)
+successor(#20244,#20249)
+successor(#20237,#20235)
+successor(#20242,#20240)
+successor(#20240,#20246)
+successor(#20235,#20242)
+successor(#20233,#20231)
+successor(#20231,#20237)
+successor(#20229,#20227)
+successor(#20227,#20233)
+successor(#20213,#20229)
+successor(#20305,#20215)
 numlines(#10000,25,20,2)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/v8/output/trap/tst.js.trap b/javascript/extractor/tests/v8/output/trap/tst.js.trap
index 4eb025bd9d3..c21c4782150 100644
--- a/javascript/extractor/tests/v8/output/trap/tst.js.trap
+++ b/javascript/extractor/tests/v8/output/trap/tst.js.trap
@@ -105,96 +105,98 @@ toplevels(#20001,0)
 #20038=@"loc,{#10000},1,1,2,19"
 locations_default(#20038,#10000,1,1,2,19)
 hasLocation(#20001,#20038)
-#20039=*
-stmts(#20039,2,#20001,0,"%CheckI ... ping();")
-hasLocation(#20039,#20003)
-stmt_containers(#20039,#20001)
+#20039=@"var;{this};{#20000}"
+variables(#20039,"this",#20000)
 #20040=*
-exprs(#20040,13,#20039,0,"%CheckI ... pping()")
-#20041=@"loc,{#10000},1,1,1,23"
-locations_default(#20041,#10000,1,1,1,23)
-hasLocation(#20040,#20041)
-enclosing_stmt(#20040,#20039)
-expr_containers(#20040,#20001)
-#20042=*
-exprs(#20042,79,#20040,-1,"%CheckI ... rapping")
-#20043=@"loc,{#10000},1,1,1,21"
-locations_default(#20043,#10000,1,1,1,21)
-hasLocation(#20042,#20043)
-enclosing_stmt(#20042,#20039)
-expr_containers(#20042,#20001)
-literals("%CheckIsBootstrapping","%CheckIsBootstrapping",#20042)
-#20044=@"var;{%CheckIsBootstrapping};{#20000}"
-variables(#20044,"%CheckIsBootstrapping",#20000)
-bind(#20042,#20044)
-#20045=*
-stmts(#20045,2,#20001,1,"a%%NumberAdd(1, 2);")
-hasLocation(#20045,#20005)
-stmt_containers(#20045,#20001)
+stmts(#20040,2,#20001,0,"%CheckI ... ping();")
+hasLocation(#20040,#20003)
+stmt_containers(#20040,#20001)
+#20041=*
+exprs(#20041,13,#20040,0,"%CheckI ... pping()")
+#20042=@"loc,{#10000},1,1,1,23"
+locations_default(#20042,#10000,1,1,1,23)
+hasLocation(#20041,#20042)
+enclosing_stmt(#20041,#20040)
+expr_containers(#20041,#20001)
+#20043=*
+exprs(#20043,79,#20041,-1,"%CheckI ... rapping")
+#20044=@"loc,{#10000},1,1,1,21"
+locations_default(#20044,#10000,1,1,1,21)
+hasLocation(#20043,#20044)
+enclosing_stmt(#20043,#20040)
+expr_containers(#20043,#20001)
+literals("%CheckIsBootstrapping","%CheckIsBootstrapping",#20043)
+#20045=@"var;{%CheckIsBootstrapping};{#20000}"
+variables(#20045,"%CheckIsBootstrapping",#20000)
+bind(#20043,#20045)
 #20046=*
-exprs(#20046,38,#20045,0,"a%%NumberAdd(1, 2)")
-#20047=@"loc,{#10000},2,1,2,18"
-locations_default(#20047,#10000,2,1,2,18)
-hasLocation(#20046,#20047)
-enclosing_stmt(#20046,#20045)
-expr_containers(#20046,#20001)
-#20048=*
-exprs(#20048,79,#20046,0,"a")
-hasLocation(#20048,#20017)
-enclosing_stmt(#20048,#20045)
-expr_containers(#20048,#20001)
-literals("a","a",#20048)
-#20049=@"var;{a};{#20000}"
-variables(#20049,"a",#20000)
-bind(#20048,#20049)
-#20050=*
-exprs(#20050,13,#20046,1,"%NumberAdd(1, 2)")
-#20051=@"loc,{#10000},2,3,2,18"
-locations_default(#20051,#10000,2,3,2,18)
-hasLocation(#20050,#20051)
-enclosing_stmt(#20050,#20045)
-expr_containers(#20050,#20001)
-#20052=*
-exprs(#20052,79,#20050,-1,"%NumberAdd")
-#20053=@"loc,{#10000},2,3,2,12"
-locations_default(#20053,#10000,2,3,2,12)
-hasLocation(#20052,#20053)
-enclosing_stmt(#20052,#20045)
-expr_containers(#20052,#20001)
-literals("%NumberAdd","%NumberAdd",#20052)
-#20054=@"var;{%NumberAdd};{#20000}"
-variables(#20054,"%NumberAdd",#20000)
-bind(#20052,#20054)
-#20055=*
-exprs(#20055,3,#20050,0,"1")
-hasLocation(#20055,#20027)
-enclosing_stmt(#20055,#20045)
-expr_containers(#20055,#20001)
-literals("1","1",#20055)
+stmts(#20046,2,#20001,1,"a%%NumberAdd(1, 2);")
+hasLocation(#20046,#20005)
+stmt_containers(#20046,#20001)
+#20047=*
+exprs(#20047,38,#20046,0,"a%%NumberAdd(1, 2)")
+#20048=@"loc,{#10000},2,1,2,18"
+locations_default(#20048,#10000,2,1,2,18)
+hasLocation(#20047,#20048)
+enclosing_stmt(#20047,#20046)
+expr_containers(#20047,#20001)
+#20049=*
+exprs(#20049,79,#20047,0,"a")
+hasLocation(#20049,#20017)
+enclosing_stmt(#20049,#20046)
+expr_containers(#20049,#20001)
+literals("a","a",#20049)
+#20050=@"var;{a};{#20000}"
+variables(#20050,"a",#20000)
+bind(#20049,#20050)
+#20051=*
+exprs(#20051,13,#20047,1,"%NumberAdd(1, 2)")
+#20052=@"loc,{#10000},2,3,2,18"
+locations_default(#20052,#10000,2,3,2,18)
+hasLocation(#20051,#20052)
+enclosing_stmt(#20051,#20046)
+expr_containers(#20051,#20001)
+#20053=*
+exprs(#20053,79,#20051,-1,"%NumberAdd")
+#20054=@"loc,{#10000},2,3,2,12"
+locations_default(#20054,#10000,2,3,2,12)
+hasLocation(#20053,#20054)
+enclosing_stmt(#20053,#20046)
+expr_containers(#20053,#20001)
+literals("%NumberAdd","%NumberAdd",#20053)
+#20055=@"var;{%NumberAdd};{#20000}"
+variables(#20055,"%NumberAdd",#20000)
+bind(#20053,#20055)
 #20056=*
-exprs(#20056,3,#20050,1,"2")
-hasLocation(#20056,#20031)
-enclosing_stmt(#20056,#20045)
+exprs(#20056,3,#20051,0,"1")
+hasLocation(#20056,#20027)
+enclosing_stmt(#20056,#20046)
 expr_containers(#20056,#20001)
-literals("2","2",#20056)
+literals("1","1",#20056)
 #20057=*
-entry_cfg_node(#20057,#20001)
-#20058=@"loc,{#10000},1,1,1,0"
-locations_default(#20058,#10000,1,1,1,0)
-hasLocation(#20057,#20058)
-#20059=*
-exit_cfg_node(#20059,#20001)
-hasLocation(#20059,#20037)
-successor(#20045,#20048)
-successor(#20056,#20050)
-successor(#20055,#20056)
-successor(#20052,#20055)
-successor(#20050,#20046)
-successor(#20048,#20052)
-successor(#20046,#20059)
-successor(#20039,#20042)
-successor(#20042,#20040)
-successor(#20040,#20045)
-successor(#20057,#20039)
+exprs(#20057,3,#20051,1,"2")
+hasLocation(#20057,#20031)
+enclosing_stmt(#20057,#20046)
+expr_containers(#20057,#20001)
+literals("2","2",#20057)
+#20058=*
+entry_cfg_node(#20058,#20001)
+#20059=@"loc,{#10000},1,1,1,0"
+locations_default(#20059,#10000,1,1,1,0)
+hasLocation(#20058,#20059)
+#20060=*
+exit_cfg_node(#20060,#20001)
+hasLocation(#20060,#20037)
+successor(#20046,#20049)
+successor(#20057,#20051)
+successor(#20056,#20057)
+successor(#20053,#20056)
+successor(#20051,#20047)
+successor(#20049,#20053)
+successor(#20047,#20060)
+successor(#20040,#20043)
+successor(#20043,#20041)
+successor(#20041,#20046)
+successor(#20058,#20040)
 numlines(#10000,2,2,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/variables/output/trap/const.js.trap b/javascript/extractor/tests/variables/output/trap/const.js.trap
index 6b4f41cd0b8..6834a8373d9 100644
--- a/javascript/extractor/tests/variables/output/trap/const.js.trap
+++ b/javascript/extractor/tests/variables/output/trap/const.js.trap
@@ -49,42 +49,44 @@ toplevels(#20001,0)
 hasLocation(#20001,#20003)
 #20016=@"var;{answer};{#20000}"
 variables(#20016,"answer",#20000)
-#20017=*
-stmts(#20017,22,#20001,0,"const answer = 42;")
-hasLocation(#20017,#20003)
-stmt_containers(#20017,#20001)
+#20017=@"var;{this};{#20000}"
+variables(#20017,"this",#20000)
 #20018=*
-exprs(#20018,64,#20017,0,"answer = 42")
-#20019=@"loc,{#10000},1,7,1,17"
-locations_default(#20019,#10000,1,7,1,17)
-hasLocation(#20018,#20019)
-enclosing_stmt(#20018,#20017)
-expr_containers(#20018,#20001)
-#20020=*
-exprs(#20020,78,#20018,0,"answer")
-hasLocation(#20020,#20007)
-enclosing_stmt(#20020,#20017)
-expr_containers(#20020,#20001)
-literals("answer","answer",#20020)
-decl(#20020,#20016)
+stmts(#20018,22,#20001,0,"const answer = 42;")
+hasLocation(#20018,#20003)
+stmt_containers(#20018,#20001)
+#20019=*
+exprs(#20019,64,#20018,0,"answer = 42")
+#20020=@"loc,{#10000},1,7,1,17"
+locations_default(#20020,#10000,1,7,1,17)
+hasLocation(#20019,#20020)
+enclosing_stmt(#20019,#20018)
+expr_containers(#20019,#20001)
 #20021=*
-exprs(#20021,3,#20018,1,"42")
-hasLocation(#20021,#20011)
-enclosing_stmt(#20021,#20017)
+exprs(#20021,78,#20019,0,"answer")
+hasLocation(#20021,#20007)
+enclosing_stmt(#20021,#20018)
 expr_containers(#20021,#20001)
-literals("42","42",#20021)
+literals("answer","answer",#20021)
+decl(#20021,#20016)
 #20022=*
-entry_cfg_node(#20022,#20001)
-#20023=@"loc,{#10000},1,1,1,0"
-locations_default(#20023,#10000,1,1,1,0)
-hasLocation(#20022,#20023)
-#20024=*
-exit_cfg_node(#20024,#20001)
-hasLocation(#20024,#20015)
-successor(#20017,#20020)
-successor(#20021,#20018)
-successor(#20020,#20021)
-successor(#20018,#20024)
-successor(#20022,#20017)
+exprs(#20022,3,#20019,1,"42")
+hasLocation(#20022,#20011)
+enclosing_stmt(#20022,#20018)
+expr_containers(#20022,#20001)
+literals("42","42",#20022)
+#20023=*
+entry_cfg_node(#20023,#20001)
+#20024=@"loc,{#10000},1,1,1,0"
+locations_default(#20024,#10000,1,1,1,0)
+hasLocation(#20023,#20024)
+#20025=*
+exit_cfg_node(#20025,#20001)
+hasLocation(#20025,#20015)
+successor(#20018,#20021)
+successor(#20022,#20019)
+successor(#20021,#20022)
+successor(#20019,#20025)
+successor(#20023,#20018)
 numlines(#10000,1,1,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/variables/output/trap/finally.js.trap b/javascript/extractor/tests/variables/output/trap/finally.js.trap
index 7d651126529..ab9acce7df1 100644
--- a/javascript/extractor/tests/variables/output/trap/finally.js.trap
+++ b/javascript/extractor/tests/variables/output/trap/finally.js.trap
@@ -183,145 +183,151 @@ locations_default(#20063,#10000,1,1,9,0)
 hasLocation(#20001,#20063)
 #20064=@"var;{f};{#20000}"
 variables(#20064,"f",#20000)
-#20065=*
-stmts(#20065,17,#20001,0,"functio ... }\n  }\n}")
-#20066=@"loc,{#10000},1,1,8,1"
-locations_default(#20066,#10000,1,1,8,1)
-hasLocation(#20065,#20066)
-stmt_containers(#20065,#20001)
-#20067=*
-exprs(#20067,78,#20065,-1,"f")
-hasLocation(#20067,#20021)
-expr_containers(#20067,#20065)
-literals("f","f",#20067)
-decl(#20067,#20064)
+#20065=@"var;{this};{#20000}"
+variables(#20065,"this",#20000)
+#20066=*
+stmts(#20066,17,#20001,0,"functio ... }\n  }\n}")
+#20067=@"loc,{#10000},1,1,8,1"
+locations_default(#20067,#10000,1,1,8,1)
+hasLocation(#20066,#20067)
+stmt_containers(#20066,#20001)
 #20068=*
-scopes(#20068,1)
-scopenodes(#20065,#20068)
-scopenesting(#20068,#20000)
-#20069=@"var;{g};{#20068}"
-variables(#20069,"g",#20068)
-#20070=@"var;{x};{#20068}"
-variables(#20070,"x",#20068)
-#20071=*
-exprs(#20071,78,#20065,0,"x")
-hasLocation(#20071,#20025)
-expr_containers(#20071,#20065)
-literals("x","x",#20071)
-decl(#20071,#20070)
-#20072=@"var;{arguments};{#20068}"
-variables(#20072,"arguments",#20068)
-is_arguments_object(#20072)
+exprs(#20068,78,#20066,-1,"f")
+hasLocation(#20068,#20021)
+expr_containers(#20068,#20066)
+literals("f","f",#20068)
+decl(#20068,#20064)
+#20069=*
+scopes(#20069,1)
+scopenodes(#20066,#20069)
+scopenesting(#20069,#20000)
+#20070=@"var;{g};{#20069}"
+variables(#20070,"g",#20069)
+#20071=@"var;{this};{#20069}"
+variables(#20071,"this",#20069)
+#20072=@"var;{x};{#20069}"
+variables(#20072,"x",#20069)
 #20073=*
-stmts(#20073,1,#20065,-2,"{\n  fun ... }\n  }\n}")
-#20074=@"loc,{#10000},1,15,8,1"
-locations_default(#20074,#10000,1,15,8,1)
-hasLocation(#20073,#20074)
-stmt_containers(#20073,#20065)
+exprs(#20073,78,#20066,0,"x")
+hasLocation(#20073,#20025)
+expr_containers(#20073,#20066)
+literals("x","x",#20073)
+decl(#20073,#20072)
+#20074=@"var;{arguments};{#20069}"
+variables(#20074,"arguments",#20069)
+is_arguments_object(#20074)
 #20075=*
-stmts(#20075,17,#20073,0,"functio ...   }\n  }")
-#20076=@"loc,{#10000},2,3,7,3"
-locations_default(#20076,#10000,2,3,7,3)
+stmts(#20075,1,#20066,-2,"{\n  fun ... }\n  }\n}")
+#20076=@"loc,{#10000},1,15,8,1"
+locations_default(#20076,#10000,1,15,8,1)
 hasLocation(#20075,#20076)
-stmt_containers(#20075,#20065)
+stmt_containers(#20075,#20066)
 #20077=*
-exprs(#20077,78,#20075,-1,"g")
-hasLocation(#20077,#20033)
-expr_containers(#20077,#20075)
-literals("g","g",#20077)
-decl(#20077,#20069)
-#20078=*
-scopes(#20078,1)
-scopenodes(#20075,#20078)
-scopenesting(#20078,#20068)
-#20079=@"var;{x};{#20078}"
-variables(#20079,"x",#20078)
-#20080=@"var;{arguments};{#20078}"
-variables(#20080,"arguments",#20078)
-is_arguments_object(#20080)
-#20081=*
-stmts(#20081,1,#20075,-2,"{\n    t ...   }\n  }")
-#20082=@"loc,{#10000},2,16,7,3"
-locations_default(#20082,#10000,2,16,7,3)
-hasLocation(#20081,#20082)
-stmt_containers(#20081,#20075)
-#20083=*
-stmts(#20083,11,#20081,0,"try {\n  ... ;\n    }")
-#20084=@"loc,{#10000},3,5,6,5"
-locations_default(#20084,#10000,3,5,6,5)
-hasLocation(#20083,#20084)
-stmt_containers(#20083,#20075)
-#20085=*
-stmts(#20085,1,#20083,0,"{\n    }")
-#20086=@"loc,{#10000},3,9,4,5"
-locations_default(#20086,#10000,3,9,4,5)
-hasLocation(#20085,#20086)
-stmt_containers(#20085,#20075)
-#20087=*
-stmts(#20087,1,#20083,-1,"{\n      var x;\n    }")
-#20088=@"loc,{#10000},4,15,6,5"
-locations_default(#20088,#10000,4,15,6,5)
-hasLocation(#20087,#20088)
-stmt_containers(#20087,#20075)
-#20089=*
-stmts(#20089,18,#20087,0,"var x;")
-#20090=@"loc,{#10000},5,7,5,12"
-locations_default(#20090,#10000,5,7,5,12)
-hasLocation(#20089,#20090)
-stmt_containers(#20089,#20075)
-#20091=*
-exprs(#20091,64,#20089,0,"x")
-hasLocation(#20091,#20053)
-enclosing_stmt(#20091,#20089)
-expr_containers(#20091,#20075)
+stmts(#20077,17,#20075,0,"functio ...   }\n  }")
+#20078=@"loc,{#10000},2,3,7,3"
+locations_default(#20078,#10000,2,3,7,3)
+hasLocation(#20077,#20078)
+stmt_containers(#20077,#20066)
+#20079=*
+exprs(#20079,78,#20077,-1,"g")
+hasLocation(#20079,#20033)
+expr_containers(#20079,#20077)
+literals("g","g",#20079)
+decl(#20079,#20070)
+#20080=*
+scopes(#20080,1)
+scopenodes(#20077,#20080)
+scopenesting(#20080,#20069)
+#20081=@"var;{x};{#20080}"
+variables(#20081,"x",#20080)
+#20082=@"var;{this};{#20080}"
+variables(#20082,"this",#20080)
+#20083=@"var;{arguments};{#20080}"
+variables(#20083,"arguments",#20080)
+is_arguments_object(#20083)
+#20084=*
+stmts(#20084,1,#20077,-2,"{\n    t ...   }\n  }")
+#20085=@"loc,{#10000},2,16,7,3"
+locations_default(#20085,#10000,2,16,7,3)
+hasLocation(#20084,#20085)
+stmt_containers(#20084,#20077)
+#20086=*
+stmts(#20086,11,#20084,0,"try {\n  ... ;\n    }")
+#20087=@"loc,{#10000},3,5,6,5"
+locations_default(#20087,#10000,3,5,6,5)
+hasLocation(#20086,#20087)
+stmt_containers(#20086,#20077)
+#20088=*
+stmts(#20088,1,#20086,0,"{\n    }")
+#20089=@"loc,{#10000},3,9,4,5"
+locations_default(#20089,#10000,3,9,4,5)
+hasLocation(#20088,#20089)
+stmt_containers(#20088,#20077)
+#20090=*
+stmts(#20090,1,#20086,-1,"{\n      var x;\n    }")
+#20091=@"loc,{#10000},4,15,6,5"
+locations_default(#20091,#10000,4,15,6,5)
+hasLocation(#20090,#20091)
+stmt_containers(#20090,#20077)
 #20092=*
-exprs(#20092,78,#20091,0,"x")
-hasLocation(#20092,#20053)
-enclosing_stmt(#20092,#20089)
-expr_containers(#20092,#20075)
-literals("x","x",#20092)
-decl(#20092,#20079)
-#20093=*
-entry_cfg_node(#20093,#20001)
-#20094=@"loc,{#10000},1,1,1,0"
-locations_default(#20094,#10000,1,1,1,0)
-hasLocation(#20093,#20094)
+stmts(#20092,18,#20090,0,"var x;")
+#20093=@"loc,{#10000},5,7,5,12"
+locations_default(#20093,#10000,5,7,5,12)
+hasLocation(#20092,#20093)
+stmt_containers(#20092,#20077)
+#20094=*
+exprs(#20094,64,#20092,0,"x")
+hasLocation(#20094,#20053)
+enclosing_stmt(#20094,#20092)
+expr_containers(#20094,#20077)
 #20095=*
-exit_cfg_node(#20095,#20001)
-hasLocation(#20095,#20062)
-successor(#20065,#20095)
+exprs(#20095,78,#20094,0,"x")
+hasLocation(#20095,#20053)
+enclosing_stmt(#20095,#20092)
+expr_containers(#20095,#20077)
+literals("x","x",#20095)
+decl(#20095,#20081)
 #20096=*
-entry_cfg_node(#20096,#20065)
-hasLocation(#20096,#20094)
-#20097=*
-exit_cfg_node(#20097,#20065)
-#20098=@"loc,{#10000},8,2,8,1"
-locations_default(#20098,#10000,8,2,8,1)
-hasLocation(#20097,#20098)
-successor(#20075,#20097)
+entry_cfg_node(#20096,#20001)
+#20097=@"loc,{#10000},1,1,1,0"
+locations_default(#20097,#10000,1,1,1,0)
+hasLocation(#20096,#20097)
+#20098=*
+exit_cfg_node(#20098,#20001)
+hasLocation(#20098,#20062)
+successor(#20066,#20098)
 #20099=*
-entry_cfg_node(#20099,#20075)
-#20100=@"loc,{#10000},2,3,2,2"
-locations_default(#20100,#10000,2,3,2,2)
-hasLocation(#20099,#20100)
-#20101=*
-exit_cfg_node(#20101,#20075)
-#20102=@"loc,{#10000},7,4,7,3"
-locations_default(#20102,#10000,7,4,7,3)
-hasLocation(#20101,#20102)
-successor(#20083,#20085)
-successor(#20085,#20087)
-successor(#20089,#20092)
-successor(#20092,#20091)
-successor(#20091,#20101)
-successor(#20087,#20089)
-successor(#20081,#20083)
-successor(#20099,#20081)
-successor(#20077,#20075)
-successor(#20073,#20077)
-successor(#20071,#20073)
-successor(#20096,#20071)
-successor(#20067,#20065)
-successor(#20093,#20067)
+entry_cfg_node(#20099,#20066)
+hasLocation(#20099,#20097)
+#20100=*
+exit_cfg_node(#20100,#20066)
+#20101=@"loc,{#10000},8,2,8,1"
+locations_default(#20101,#10000,8,2,8,1)
+hasLocation(#20100,#20101)
+successor(#20077,#20100)
+#20102=*
+entry_cfg_node(#20102,#20077)
+#20103=@"loc,{#10000},2,3,2,2"
+locations_default(#20103,#10000,2,3,2,2)
+hasLocation(#20102,#20103)
+#20104=*
+exit_cfg_node(#20104,#20077)
+#20105=@"loc,{#10000},7,4,7,3"
+locations_default(#20105,#10000,7,4,7,3)
+hasLocation(#20104,#20105)
+successor(#20086,#20088)
+successor(#20088,#20090)
+successor(#20092,#20095)
+successor(#20095,#20094)
+successor(#20094,#20104)
+successor(#20090,#20092)
+successor(#20084,#20086)
+successor(#20102,#20084)
+successor(#20079,#20077)
+successor(#20075,#20079)
+successor(#20073,#20075)
+successor(#20099,#20073)
+successor(#20068,#20066)
+successor(#20096,#20068)
 numlines(#10000,8,8,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/variables/output/trap/switch.js.trap b/javascript/extractor/tests/variables/output/trap/switch.js.trap
index 7ea8d83f4ee..17d71b8ab9e 100644
--- a/javascript/extractor/tests/variables/output/trap/switch.js.trap
+++ b/javascript/extractor/tests/variables/output/trap/switch.js.trap
@@ -144,95 +144,99 @@ locations_default(#20049,#10000,1,1,7,0)
 hasLocation(#20001,#20049)
 #20050=@"var;{g};{#20000}"
 variables(#20050,"g",#20000)
-#20051=*
-stmts(#20051,17,#20001,0,"functio ... i;\n\t}\n}")
-#20052=@"loc,{#10000},1,1,6,1"
-locations_default(#20052,#10000,1,1,6,1)
-hasLocation(#20051,#20052)
-stmt_containers(#20051,#20001)
-#20053=*
-exprs(#20053,78,#20051,-1,"g")
-hasLocation(#20053,#20017)
-expr_containers(#20053,#20051)
-literals("g","g",#20053)
-decl(#20053,#20050)
+#20051=@"var;{this};{#20000}"
+variables(#20051,"this",#20000)
+#20052=*
+stmts(#20052,17,#20001,0,"functio ... i;\n\t}\n}")
+#20053=@"loc,{#10000},1,1,6,1"
+locations_default(#20053,#10000,1,1,6,1)
+hasLocation(#20052,#20053)
+stmt_containers(#20052,#20001)
 #20054=*
-scopes(#20054,1)
-scopenodes(#20051,#20054)
-scopenesting(#20054,#20000)
-#20055=@"var;{i};{#20054}"
-variables(#20055,"i",#20054)
-#20056=@"var;{arguments};{#20054}"
-variables(#20056,"arguments",#20054)
-is_arguments_object(#20056)
-#20057=*
-stmts(#20057,1,#20051,-2,"{\n\tswit ... i;\n\t}\n}")
-#20058=@"loc,{#10000},1,14,6,1"
-locations_default(#20058,#10000,1,14,6,1)
-hasLocation(#20057,#20058)
-stmt_containers(#20057,#20051)
+exprs(#20054,78,#20052,-1,"g")
+hasLocation(#20054,#20017)
+expr_containers(#20054,#20052)
+literals("g","g",#20054)
+decl(#20054,#20050)
+#20055=*
+scopes(#20055,1)
+scopenodes(#20052,#20055)
+scopenesting(#20055,#20000)
+#20056=@"var;{i};{#20055}"
+variables(#20056,"i",#20055)
+#20057=@"var;{this};{#20055}"
+variables(#20057,"this",#20055)
+#20058=@"var;{arguments};{#20055}"
+variables(#20058,"arguments",#20055)
+is_arguments_object(#20058)
 #20059=*
-stmts(#20059,8,#20057,0,"switch  ... r i;\n\t}")
-#20060=@"loc,{#10000},2,2,5,2"
-locations_default(#20060,#10000,2,2,5,2)
+stmts(#20059,1,#20052,-2,"{\n\tswit ... i;\n\t}\n}")
+#20060=@"loc,{#10000},1,14,6,1"
+locations_default(#20060,#10000,1,14,6,1)
 hasLocation(#20059,#20060)
-stmt_containers(#20059,#20051)
+stmt_containers(#20059,#20052)
 #20061=*
-exprs(#20061,3,#20059,-1,"0")
-hasLocation(#20061,#20029)
-enclosing_stmt(#20061,#20059)
-expr_containers(#20061,#20051)
-literals("0","0",#20061)
-#20062=*
-stmts(#20062,19,#20059,0,"default:\n\t\tvar i;")
-#20063=@"loc,{#10000},3,2,4,8"
-locations_default(#20063,#10000,3,2,4,8)
-hasLocation(#20062,#20063)
-stmt_containers(#20062,#20051)
+stmts(#20061,8,#20059,0,"switch  ... r i;\n\t}")
+#20062=@"loc,{#10000},2,2,5,2"
+locations_default(#20062,#10000,2,2,5,2)
+hasLocation(#20061,#20062)
+stmt_containers(#20061,#20052)
+#20063=*
+exprs(#20063,3,#20061,-1,"0")
+hasLocation(#20063,#20029)
+enclosing_stmt(#20063,#20061)
+expr_containers(#20063,#20052)
+literals("0","0",#20063)
 #20064=*
-stmts(#20064,18,#20062,0,"var i;")
-#20065=@"loc,{#10000},4,3,4,8"
-locations_default(#20065,#10000,4,3,4,8)
+stmts(#20064,19,#20061,0,"default:\n\t\tvar i;")
+#20065=@"loc,{#10000},3,2,4,8"
+locations_default(#20065,#10000,3,2,4,8)
 hasLocation(#20064,#20065)
-stmt_containers(#20064,#20051)
+stmt_containers(#20064,#20052)
 #20066=*
-exprs(#20066,64,#20064,0,"i")
-hasLocation(#20066,#20041)
-enclosing_stmt(#20066,#20064)
-expr_containers(#20066,#20051)
-#20067=*
-exprs(#20067,78,#20066,0,"i")
-hasLocation(#20067,#20041)
-enclosing_stmt(#20067,#20064)
-expr_containers(#20067,#20051)
-literals("i","i",#20067)
-decl(#20067,#20055)
+stmts(#20066,18,#20064,0,"var i;")
+#20067=@"loc,{#10000},4,3,4,8"
+locations_default(#20067,#10000,4,3,4,8)
+hasLocation(#20066,#20067)
+stmt_containers(#20066,#20052)
 #20068=*
-entry_cfg_node(#20068,#20001)
-#20069=@"loc,{#10000},1,1,1,0"
-locations_default(#20069,#10000,1,1,1,0)
-hasLocation(#20068,#20069)
+exprs(#20068,64,#20066,0,"i")
+hasLocation(#20068,#20041)
+enclosing_stmt(#20068,#20066)
+expr_containers(#20068,#20052)
+#20069=*
+exprs(#20069,78,#20068,0,"i")
+hasLocation(#20069,#20041)
+enclosing_stmt(#20069,#20066)
+expr_containers(#20069,#20052)
+literals("i","i",#20069)
+decl(#20069,#20056)
 #20070=*
-exit_cfg_node(#20070,#20001)
-hasLocation(#20070,#20048)
-successor(#20051,#20070)
-#20071=*
-entry_cfg_node(#20071,#20051)
-hasLocation(#20071,#20069)
+entry_cfg_node(#20070,#20001)
+#20071=@"loc,{#10000},1,1,1,0"
+locations_default(#20071,#10000,1,1,1,0)
+hasLocation(#20070,#20071)
 #20072=*
-exit_cfg_node(#20072,#20051)
-#20073=@"loc,{#10000},6,2,6,1"
-locations_default(#20073,#10000,6,2,6,1)
-hasLocation(#20072,#20073)
+exit_cfg_node(#20072,#20001)
+hasLocation(#20072,#20048)
+successor(#20052,#20072)
+#20073=*
+entry_cfg_node(#20073,#20052)
+hasLocation(#20073,#20071)
+#20074=*
+exit_cfg_node(#20074,#20052)
+#20075=@"loc,{#10000},6,2,6,1"
+locations_default(#20075,#10000,6,2,6,1)
+hasLocation(#20074,#20075)
+successor(#20061,#20063)
+successor(#20063,#20064)
+successor(#20064,#20066)
+successor(#20066,#20069)
+successor(#20069,#20068)
+successor(#20068,#20074)
 successor(#20059,#20061)
-successor(#20061,#20062)
-successor(#20062,#20064)
-successor(#20064,#20067)
-successor(#20067,#20066)
-successor(#20066,#20072)
-successor(#20057,#20059)
-successor(#20071,#20057)
-successor(#20053,#20051)
-successor(#20068,#20053)
+successor(#20073,#20059)
+successor(#20054,#20052)
+successor(#20070,#20054)
 numlines(#10000,6,6,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/variables/output/trap/try.js.trap b/javascript/extractor/tests/variables/output/trap/try.js.trap
index 4ce7fe8bb58..e656b81820a 100644
--- a/javascript/extractor/tests/variables/output/trap/try.js.trap
+++ b/javascript/extractor/tests/variables/output/trap/try.js.trap
@@ -126,91 +126,95 @@ locations_default(#20043,#10000,1,1,5,1)
 hasLocation(#20001,#20043)
 #20044=@"var;{f};{#20000}"
 variables(#20044,"f",#20000)
-#20045=*
-stmts(#20045,17,#20001,0,"functio ... ly {}\n}")
-hasLocation(#20045,#20043)
-stmt_containers(#20045,#20001)
+#20045=@"var;{this};{#20000}"
+variables(#20045,"this",#20000)
 #20046=*
-exprs(#20046,78,#20045,-1,"f")
-hasLocation(#20046,#20015)
-expr_containers(#20046,#20045)
-literals("f","f",#20046)
-decl(#20046,#20044)
+stmts(#20046,17,#20001,0,"functio ... ly {}\n}")
+hasLocation(#20046,#20043)
+stmt_containers(#20046,#20001)
 #20047=*
-scopes(#20047,1)
-scopenodes(#20045,#20047)
-scopenesting(#20047,#20000)
-#20048=@"var;{x};{#20047}"
-variables(#20048,"x",#20047)
-#20049=@"var;{arguments};{#20047}"
-variables(#20049,"arguments",#20047)
-is_arguments_object(#20049)
-#20050=*
-stmts(#20050,1,#20045,-2,"{\n\ttry  ... ly {}\n}")
-#20051=@"loc,{#10000},1,14,5,1"
-locations_default(#20051,#10000,1,14,5,1)
-hasLocation(#20050,#20051)
-stmt_containers(#20050,#20045)
+exprs(#20047,78,#20046,-1,"f")
+hasLocation(#20047,#20015)
+expr_containers(#20047,#20046)
+literals("f","f",#20047)
+decl(#20047,#20044)
+#20048=*
+scopes(#20048,1)
+scopenodes(#20046,#20048)
+scopenesting(#20048,#20000)
+#20049=@"var;{x};{#20048}"
+variables(#20049,"x",#20048)
+#20050=@"var;{this};{#20048}"
+variables(#20050,"this",#20048)
+#20051=@"var;{arguments};{#20048}"
+variables(#20051,"arguments",#20048)
+is_arguments_object(#20051)
 #20052=*
-stmts(#20052,11,#20050,0,"try {\n\t ... ally {}")
-#20053=@"loc,{#10000},2,2,4,13"
-locations_default(#20053,#10000,2,2,4,13)
+stmts(#20052,1,#20046,-2,"{\n\ttry  ... ly {}\n}")
+#20053=@"loc,{#10000},1,14,5,1"
+locations_default(#20053,#10000,1,14,5,1)
 hasLocation(#20052,#20053)
-stmt_containers(#20052,#20045)
+stmt_containers(#20052,#20046)
 #20054=*
-stmts(#20054,1,#20052,0,"{\n\t\tvar x;\n\t}")
-#20055=@"loc,{#10000},2,6,4,2"
-locations_default(#20055,#10000,2,6,4,2)
+stmts(#20054,11,#20052,0,"try {\n\t ... ally {}")
+#20055=@"loc,{#10000},2,2,4,13"
+locations_default(#20055,#10000,2,2,4,13)
 hasLocation(#20054,#20055)
-stmt_containers(#20054,#20045)
+stmt_containers(#20054,#20046)
 #20056=*
-stmts(#20056,18,#20054,0,"var x;")
-#20057=@"loc,{#10000},3,3,3,8"
-locations_default(#20057,#10000,3,3,3,8)
+stmts(#20056,1,#20054,0,"{\n\t\tvar x;\n\t}")
+#20057=@"loc,{#10000},2,6,4,2"
+locations_default(#20057,#10000,2,6,4,2)
 hasLocation(#20056,#20057)
-stmt_containers(#20056,#20045)
+stmt_containers(#20056,#20046)
 #20058=*
-exprs(#20058,64,#20056,0,"x")
-hasLocation(#20058,#20029)
-enclosing_stmt(#20058,#20056)
-expr_containers(#20058,#20045)
-#20059=*
-exprs(#20059,78,#20058,0,"x")
-hasLocation(#20059,#20029)
-enclosing_stmt(#20059,#20056)
-expr_containers(#20059,#20045)
-literals("x","x",#20059)
-decl(#20059,#20048)
+stmts(#20058,18,#20056,0,"var x;")
+#20059=@"loc,{#10000},3,3,3,8"
+locations_default(#20059,#10000,3,3,3,8)
+hasLocation(#20058,#20059)
+stmt_containers(#20058,#20046)
 #20060=*
-stmts(#20060,1,#20052,-1,"{}")
-#20061=@"loc,{#10000},4,12,4,13"
-locations_default(#20061,#10000,4,12,4,13)
-hasLocation(#20060,#20061)
-stmt_containers(#20060,#20045)
+exprs(#20060,64,#20058,0,"x")
+hasLocation(#20060,#20029)
+enclosing_stmt(#20060,#20058)
+expr_containers(#20060,#20046)
+#20061=*
+exprs(#20061,78,#20060,0,"x")
+hasLocation(#20061,#20029)
+enclosing_stmt(#20061,#20058)
+expr_containers(#20061,#20046)
+literals("x","x",#20061)
+decl(#20061,#20049)
 #20062=*
-entry_cfg_node(#20062,#20001)
-#20063=@"loc,{#10000},1,1,1,0"
-locations_default(#20063,#10000,1,1,1,0)
+stmts(#20062,1,#20054,-1,"{}")
+#20063=@"loc,{#10000},4,12,4,13"
+locations_default(#20063,#10000,4,12,4,13)
 hasLocation(#20062,#20063)
+stmt_containers(#20062,#20046)
 #20064=*
-exit_cfg_node(#20064,#20001)
-hasLocation(#20064,#20042)
-successor(#20045,#20064)
-#20065=*
-entry_cfg_node(#20065,#20045)
-hasLocation(#20065,#20063)
+entry_cfg_node(#20064,#20001)
+#20065=@"loc,{#10000},1,1,1,0"
+locations_default(#20065,#10000,1,1,1,0)
+hasLocation(#20064,#20065)
 #20066=*
-exit_cfg_node(#20066,#20045)
+exit_cfg_node(#20066,#20001)
 hasLocation(#20066,#20042)
-successor(#20052,#20054)
-successor(#20056,#20059)
-successor(#20059,#20058)
-successor(#20058,#20060)
+successor(#20046,#20066)
+#20067=*
+entry_cfg_node(#20067,#20046)
+hasLocation(#20067,#20065)
+#20068=*
+exit_cfg_node(#20068,#20046)
+hasLocation(#20068,#20042)
 successor(#20054,#20056)
-successor(#20060,#20066)
-successor(#20050,#20052)
-successor(#20065,#20050)
-successor(#20046,#20045)
-successor(#20062,#20046)
+successor(#20058,#20061)
+successor(#20061,#20060)
+successor(#20060,#20062)
+successor(#20056,#20058)
+successor(#20062,#20068)
+successor(#20052,#20054)
+successor(#20067,#20052)
+successor(#20047,#20046)
+successor(#20064,#20047)
 numlines(#10000,5,5,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/variables/output/trap/variables.js.trap b/javascript/extractor/tests/variables/output/trap/variables.js.trap
index b0c3a1b7e71..bf445efea76 100644
--- a/javascript/extractor/tests/variables/output/trap/variables.js.trap
+++ b/javascript/extractor/tests/variables/output/trap/variables.js.trap
@@ -406,372 +406,382 @@ variables(#20146,"another_global",#20000)
 variables(#20147,"f",#20000)
 #20148=@"var;{g};{#20000}"
 variables(#20148,"g",#20000)
-#20149=*
-stmts(#20149,18,#20001,0,"var global;")
-hasLocation(#20149,#20003)
-stmt_containers(#20149,#20001)
+#20149=@"var;{this};{#20000}"
+variables(#20149,"this",#20000)
 #20150=*
-exprs(#20150,64,#20149,0,"global")
-hasLocation(#20150,#20043)
-enclosing_stmt(#20150,#20149)
-expr_containers(#20150,#20001)
+stmts(#20150,18,#20001,0,"var global;")
+hasLocation(#20150,#20003)
+stmt_containers(#20150,#20001)
 #20151=*
-exprs(#20151,78,#20150,0,"global")
+exprs(#20151,64,#20150,0,"global")
 hasLocation(#20151,#20043)
-enclosing_stmt(#20151,#20149)
+enclosing_stmt(#20151,#20150)
 expr_containers(#20151,#20001)
-literals("global","global",#20151)
-decl(#20151,#20145)
 #20152=*
-stmts(#20152,2,#20001,1,"also_a_global = 23;")
-hasLocation(#20152,#20005)
-stmt_containers(#20152,#20001)
+exprs(#20152,78,#20151,0,"global")
+hasLocation(#20152,#20043)
+enclosing_stmt(#20152,#20150)
+expr_containers(#20152,#20001)
+literals("global","global",#20152)
+decl(#20152,#20145)
 #20153=*
-exprs(#20153,47,#20152,0,"also_a_global = 23")
-#20154=@"loc,{#10000},2,1,2,18"
-locations_default(#20154,#10000,2,1,2,18)
-hasLocation(#20153,#20154)
-enclosing_stmt(#20153,#20152)
-expr_containers(#20153,#20001)
-#20155=*
-exprs(#20155,79,#20153,0,"also_a_global")
-hasLocation(#20155,#20047)
-enclosing_stmt(#20155,#20152)
-expr_containers(#20155,#20001)
-literals("also_a_global","also_a_global",#20155)
-#20156=@"var;{also_a_global};{#20000}"
-variables(#20156,"also_a_global",#20000)
-bind(#20155,#20156)
-#20157=*
-exprs(#20157,3,#20153,1,"23")
-hasLocation(#20157,#20051)
-enclosing_stmt(#20157,#20152)
-expr_containers(#20157,#20001)
-literals("23","23",#20157)
+stmts(#20153,2,#20001,1,"also_a_global = 23;")
+hasLocation(#20153,#20005)
+stmt_containers(#20153,#20001)
+#20154=*
+exprs(#20154,47,#20153,0,"also_a_global = 23")
+#20155=@"loc,{#10000},2,1,2,18"
+locations_default(#20155,#10000,2,1,2,18)
+hasLocation(#20154,#20155)
+enclosing_stmt(#20154,#20153)
+expr_containers(#20154,#20001)
+#20156=*
+exprs(#20156,79,#20154,0,"also_a_global")
+hasLocation(#20156,#20047)
+enclosing_stmt(#20156,#20153)
+expr_containers(#20156,#20001)
+literals("also_a_global","also_a_global",#20156)
+#20157=@"var;{also_a_global};{#20000}"
+variables(#20157,"also_a_global",#20000)
+bind(#20156,#20157)
 #20158=*
-stmts(#20158,2,#20001,2,"global;")
-hasLocation(#20158,#20007)
-stmt_containers(#20158,#20001)
+exprs(#20158,3,#20154,1,"23")
+hasLocation(#20158,#20051)
+enclosing_stmt(#20158,#20153)
+expr_containers(#20158,#20001)
+literals("23","23",#20158)
 #20159=*
-exprs(#20159,79,#20158,0,"global")
-hasLocation(#20159,#20055)
-enclosing_stmt(#20159,#20158)
-expr_containers(#20159,#20001)
-literals("global","global",#20159)
-bind(#20159,#20145)
+stmts(#20159,2,#20001,2,"global;")
+hasLocation(#20159,#20007)
+stmt_containers(#20159,#20001)
 #20160=*
-stmts(#20160,2,#20001,3,"another_global;")
-hasLocation(#20160,#20009)
-stmt_containers(#20160,#20001)
+exprs(#20160,79,#20159,0,"global")
+hasLocation(#20160,#20055)
+enclosing_stmt(#20160,#20159)
+expr_containers(#20160,#20001)
+literals("global","global",#20160)
+bind(#20160,#20145)
 #20161=*
-exprs(#20161,79,#20160,0,"another_global")
-hasLocation(#20161,#20059)
-enclosing_stmt(#20161,#20160)
-expr_containers(#20161,#20001)
-literals("another_global","another_global",#20161)
-bind(#20161,#20146)
+stmts(#20161,2,#20001,3,"another_global;")
+hasLocation(#20161,#20009)
+stmt_containers(#20161,#20001)
 #20162=*
-stmts(#20162,1,#20001,4,"{\n\tvar  ... obal;\n}")
-#20163=@"loc,{#10000},5,1,7,1"
-locations_default(#20163,#10000,5,1,7,1)
-hasLocation(#20162,#20163)
-stmt_containers(#20162,#20001)
-#20164=*
-stmts(#20164,18,#20162,0,"var another_global;")
-#20165=@"loc,{#10000},6,2,6,20"
-locations_default(#20165,#10000,6,2,6,20)
-hasLocation(#20164,#20165)
-stmt_containers(#20164,#20001)
-#20166=*
-exprs(#20166,64,#20164,0,"another_global")
-hasLocation(#20166,#20066)
-enclosing_stmt(#20166,#20164)
-expr_containers(#20166,#20001)
+exprs(#20162,79,#20161,0,"another_global")
+hasLocation(#20162,#20059)
+enclosing_stmt(#20162,#20161)
+expr_containers(#20162,#20001)
+literals("another_global","another_global",#20162)
+bind(#20162,#20146)
+#20163=*
+stmts(#20163,1,#20001,4,"{\n\tvar  ... obal;\n}")
+#20164=@"loc,{#10000},5,1,7,1"
+locations_default(#20164,#10000,5,1,7,1)
+hasLocation(#20163,#20164)
+stmt_containers(#20163,#20001)
+#20165=*
+stmts(#20165,18,#20163,0,"var another_global;")
+#20166=@"loc,{#10000},6,2,6,20"
+locations_default(#20166,#10000,6,2,6,20)
+hasLocation(#20165,#20166)
+stmt_containers(#20165,#20001)
 #20167=*
-exprs(#20167,78,#20166,0,"another_global")
+exprs(#20167,64,#20165,0,"another_global")
 hasLocation(#20167,#20066)
-enclosing_stmt(#20167,#20164)
+enclosing_stmt(#20167,#20165)
 expr_containers(#20167,#20001)
-literals("another_global","another_global",#20167)
-decl(#20167,#20146)
 #20168=*
-stmts(#20168,17,#20001,5,"functio ... ;\n\tx;\n}")
-#20169=@"loc,{#10000},8,1,11,1"
-locations_default(#20169,#10000,8,1,11,1)
-hasLocation(#20168,#20169)
-stmt_containers(#20168,#20001)
-#20170=*
-exprs(#20170,78,#20168,-1,"f")
-hasLocation(#20170,#20073)
-expr_containers(#20170,#20168)
-literals("f","f",#20170)
-decl(#20170,#20147)
+exprs(#20168,78,#20167,0,"another_global")
+hasLocation(#20168,#20066)
+enclosing_stmt(#20168,#20165)
+expr_containers(#20168,#20001)
+literals("another_global","another_global",#20168)
+decl(#20168,#20146)
+#20169=*
+stmts(#20169,17,#20001,5,"functio ... ;\n\tx;\n}")
+#20170=@"loc,{#10000},8,1,11,1"
+locations_default(#20170,#10000,8,1,11,1)
+hasLocation(#20169,#20170)
+stmt_containers(#20169,#20001)
 #20171=*
-scopes(#20171,1)
-scopenodes(#20168,#20171)
-scopenesting(#20171,#20000)
-#20172=@"var;{x};{#20171}"
-variables(#20172,"x",#20171)
-#20173=@"var;{arguments};{#20171}"
-variables(#20173,"arguments",#20171)
-is_arguments_object(#20173)
-#20174=*
-stmts(#20174,1,#20168,-2,"{\n\tvar x;\n\tx;\n}")
-#20175=@"loc,{#10000},8,14,11,1"
-locations_default(#20175,#10000,8,14,11,1)
-hasLocation(#20174,#20175)
-stmt_containers(#20174,#20168)
+exprs(#20171,78,#20169,-1,"f")
+hasLocation(#20171,#20073)
+expr_containers(#20171,#20169)
+literals("f","f",#20171)
+decl(#20171,#20147)
+#20172=*
+scopes(#20172,1)
+scopenodes(#20169,#20172)
+scopenesting(#20172,#20000)
+#20173=@"var;{x};{#20172}"
+variables(#20173,"x",#20172)
+#20174=@"var;{this};{#20172}"
+variables(#20174,"this",#20172)
+#20175=@"var;{arguments};{#20172}"
+variables(#20175,"arguments",#20172)
+is_arguments_object(#20175)
 #20176=*
-stmts(#20176,18,#20174,0,"var x;")
-#20177=@"loc,{#10000},9,2,9,7"
-locations_default(#20177,#10000,9,2,9,7)
+stmts(#20176,1,#20169,-2,"{\n\tvar x;\n\tx;\n}")
+#20177=@"loc,{#10000},8,14,11,1"
+locations_default(#20177,#10000,8,14,11,1)
 hasLocation(#20176,#20177)
-stmt_containers(#20176,#20168)
+stmt_containers(#20176,#20169)
 #20178=*
-exprs(#20178,64,#20176,0,"x")
-hasLocation(#20178,#20083)
-enclosing_stmt(#20178,#20176)
-expr_containers(#20178,#20168)
-#20179=*
-exprs(#20179,78,#20178,0,"x")
-hasLocation(#20179,#20083)
-enclosing_stmt(#20179,#20176)
-expr_containers(#20179,#20168)
-literals("x","x",#20179)
-decl(#20179,#20172)
+stmts(#20178,18,#20176,0,"var x;")
+#20179=@"loc,{#10000},9,2,9,7"
+locations_default(#20179,#10000,9,2,9,7)
+hasLocation(#20178,#20179)
+stmt_containers(#20178,#20169)
 #20180=*
-stmts(#20180,2,#20174,1,"x;")
-#20181=@"loc,{#10000},10,2,10,3"
-locations_default(#20181,#10000,10,2,10,3)
-hasLocation(#20180,#20181)
-stmt_containers(#20180,#20168)
+exprs(#20180,64,#20178,0,"x")
+hasLocation(#20180,#20083)
+enclosing_stmt(#20180,#20178)
+expr_containers(#20180,#20169)
+#20181=*
+exprs(#20181,78,#20180,0,"x")
+hasLocation(#20181,#20083)
+enclosing_stmt(#20181,#20178)
+expr_containers(#20181,#20169)
+literals("x","x",#20181)
+decl(#20181,#20173)
 #20182=*
-exprs(#20182,79,#20180,0,"x")
-hasLocation(#20182,#20087)
-enclosing_stmt(#20182,#20180)
-expr_containers(#20182,#20168)
-literals("x","x",#20182)
-bind(#20182,#20172)
-#20183=*
-stmts(#20183,17,#20001,6,"functio ... {}\n\t}\n}")
-#20184=@"loc,{#10000},12,1,19,1"
-locations_default(#20184,#10000,12,1,19,1)
-hasLocation(#20183,#20184)
-stmt_containers(#20183,#20001)
+stmts(#20182,2,#20176,1,"x;")
+#20183=@"loc,{#10000},10,2,10,3"
+locations_default(#20183,#10000,10,2,10,3)
+hasLocation(#20182,#20183)
+stmt_containers(#20182,#20169)
+#20184=*
+exprs(#20184,79,#20182,0,"x")
+hasLocation(#20184,#20087)
+enclosing_stmt(#20184,#20182)
+expr_containers(#20184,#20169)
+literals("x","x",#20184)
+bind(#20184,#20173)
 #20185=*
-exprs(#20185,78,#20183,-1,"g")
-hasLocation(#20185,#20094)
-expr_containers(#20185,#20183)
-literals("g","g",#20185)
-decl(#20185,#20148)
-#20186=*
-scopes(#20186,1)
-scopenodes(#20183,#20186)
-scopenesting(#20186,#20000)
-#20187=@"var;{x};{#20186}"
-variables(#20187,"x",#20186)
-#20188=@"var;{h};{#20186}"
-variables(#20188,"h",#20186)
-#20189=@"var;{arguments};{#20186}"
-variables(#20189,"arguments",#20186)
-is_arguments_object(#20189)
-#20190=*
-stmts(#20190,1,#20183,-2,"{\n\tx;\n\t ... {}\n\t}\n}")
-#20191=@"loc,{#10000},12,14,19,1"
-locations_default(#20191,#10000,12,14,19,1)
-hasLocation(#20190,#20191)
-stmt_containers(#20190,#20183)
-#20192=*
-stmts(#20192,2,#20190,0,"x;")
-#20193=@"loc,{#10000},13,2,13,3"
-locations_default(#20193,#10000,13,2,13,3)
-hasLocation(#20192,#20193)
-stmt_containers(#20192,#20183)
-#20194=*
-exprs(#20194,79,#20192,0,"x")
-hasLocation(#20194,#20102)
-enclosing_stmt(#20194,#20192)
-expr_containers(#20194,#20183)
-literals("x","x",#20194)
-bind(#20194,#20187)
+stmts(#20185,17,#20001,6,"functio ... {}\n\t}\n}")
+#20186=@"loc,{#10000},12,1,19,1"
+locations_default(#20186,#10000,12,1,19,1)
+hasLocation(#20185,#20186)
+stmt_containers(#20185,#20001)
+#20187=*
+exprs(#20187,78,#20185,-1,"g")
+hasLocation(#20187,#20094)
+expr_containers(#20187,#20185)
+literals("g","g",#20187)
+decl(#20187,#20148)
+#20188=*
+scopes(#20188,1)
+scopenodes(#20185,#20188)
+scopenesting(#20188,#20000)
+#20189=@"var;{x};{#20188}"
+variables(#20189,"x",#20188)
+#20190=@"var;{h};{#20188}"
+variables(#20190,"h",#20188)
+#20191=@"var;{this};{#20188}"
+variables(#20191,"this",#20188)
+#20192=@"var;{arguments};{#20188}"
+variables(#20192,"arguments",#20188)
+is_arguments_object(#20192)
+#20193=*
+stmts(#20193,1,#20185,-2,"{\n\tx;\n\t ... {}\n\t}\n}")
+#20194=@"loc,{#10000},12,14,19,1"
+locations_default(#20194,#10000,12,14,19,1)
+hasLocation(#20193,#20194)
+stmt_containers(#20193,#20185)
 #20195=*
-stmts(#20195,18,#20190,1,"var x;")
-#20196=@"loc,{#10000},14,2,14,7"
-locations_default(#20196,#10000,14,2,14,7)
+stmts(#20195,2,#20193,0,"x;")
+#20196=@"loc,{#10000},13,2,13,3"
+locations_default(#20196,#10000,13,2,13,3)
 hasLocation(#20195,#20196)
-stmt_containers(#20195,#20183)
+stmt_containers(#20195,#20185)
 #20197=*
-exprs(#20197,64,#20195,0,"x")
-hasLocation(#20197,#20108)
+exprs(#20197,79,#20195,0,"x")
+hasLocation(#20197,#20102)
 enclosing_stmt(#20197,#20195)
-expr_containers(#20197,#20183)
+expr_containers(#20197,#20185)
+literals("x","x",#20197)
+bind(#20197,#20189)
 #20198=*
-exprs(#20198,78,#20197,0,"x")
-hasLocation(#20198,#20108)
-enclosing_stmt(#20198,#20195)
-expr_containers(#20198,#20183)
-literals("x","x",#20198)
-decl(#20198,#20187)
-#20199=*
-stmts(#20199,1,#20190,2,"{\n\t\tfun ... ) {}\n\t}")
-#20200=@"loc,{#10000},15,2,18,2"
-locations_default(#20200,#10000,15,2,18,2)
-hasLocation(#20199,#20200)
-stmt_containers(#20199,#20183)
+stmts(#20198,18,#20193,1,"var x;")
+#20199=@"loc,{#10000},14,2,14,7"
+locations_default(#20199,#10000,14,2,14,7)
+hasLocation(#20198,#20199)
+stmt_containers(#20198,#20185)
+#20200=*
+exprs(#20200,64,#20198,0,"x")
+hasLocation(#20200,#20108)
+enclosing_stmt(#20200,#20198)
+expr_containers(#20200,#20185)
 #20201=*
-stmts(#20201,17,#20199,0,"function h() {}")
-#20202=@"loc,{#10000},16,3,16,17"
-locations_default(#20202,#10000,16,3,16,17)
-hasLocation(#20201,#20202)
-stmt_containers(#20201,#20183)
-#20203=*
-exprs(#20203,78,#20201,-1,"h")
-hasLocation(#20203,#20116)
-expr_containers(#20203,#20201)
-literals("h","h",#20203)
-decl(#20203,#20188)
+exprs(#20201,78,#20200,0,"x")
+hasLocation(#20201,#20108)
+enclosing_stmt(#20201,#20198)
+expr_containers(#20201,#20185)
+literals("x","x",#20201)
+decl(#20201,#20189)
+#20202=*
+stmts(#20202,1,#20193,2,"{\n\t\tfun ... ) {}\n\t}")
+#20203=@"loc,{#10000},15,2,18,2"
+locations_default(#20203,#10000,15,2,18,2)
+hasLocation(#20202,#20203)
+stmt_containers(#20202,#20185)
 #20204=*
-scopes(#20204,1)
-scopenodes(#20201,#20204)
-scopenesting(#20204,#20186)
-#20205=@"var;{arguments};{#20204}"
-variables(#20205,"arguments",#20204)
-is_arguments_object(#20205)
+stmts(#20204,17,#20202,0,"function h() {}")
+#20205=@"loc,{#10000},16,3,16,17"
+locations_default(#20205,#10000,16,3,16,17)
+hasLocation(#20204,#20205)
+stmt_containers(#20204,#20185)
 #20206=*
-stmts(#20206,1,#20201,-2,"{}")
-#20207=@"loc,{#10000},16,16,16,17"
-locations_default(#20207,#10000,16,16,16,17)
-hasLocation(#20206,#20207)
-stmt_containers(#20206,#20201)
-#20208=*
-stmts(#20208,2,#20199,1,"!function k() {}")
-#20209=@"loc,{#10000},17,3,17,18"
-locations_default(#20209,#10000,17,3,17,18)
-hasLocation(#20208,#20209)
-stmt_containers(#20208,#20183)
+exprs(#20206,78,#20204,-1,"h")
+hasLocation(#20206,#20116)
+expr_containers(#20206,#20204)
+literals("h","h",#20206)
+decl(#20206,#20190)
+#20207=*
+scopes(#20207,1)
+scopenodes(#20204,#20207)
+scopenesting(#20207,#20188)
+#20208=@"var;{this};{#20207}"
+variables(#20208,"this",#20207)
+#20209=@"var;{arguments};{#20207}"
+variables(#20209,"arguments",#20207)
+is_arguments_object(#20209)
 #20210=*
-exprs(#20210,18,#20208,0,"!function k() {}")
-hasLocation(#20210,#20209)
-enclosing_stmt(#20210,#20208)
-expr_containers(#20210,#20183)
-#20211=*
-exprs(#20211,9,#20210,0,"function k() {}")
-#20212=@"loc,{#10000},17,4,17,18"
-locations_default(#20212,#10000,17,4,17,18)
-hasLocation(#20211,#20212)
-enclosing_stmt(#20211,#20208)
-expr_containers(#20211,#20183)
-#20213=*
-scopes(#20213,1)
-scopenodes(#20211,#20213)
-scopenesting(#20213,#20186)
-#20214=@"var;{k};{#20213}"
-variables(#20214,"k",#20213)
+stmts(#20210,1,#20204,-2,"{}")
+#20211=@"loc,{#10000},16,16,16,17"
+locations_default(#20211,#10000,16,16,16,17)
+hasLocation(#20210,#20211)
+stmt_containers(#20210,#20204)
+#20212=*
+stmts(#20212,2,#20202,1,"!function k() {}")
+#20213=@"loc,{#10000},17,3,17,18"
+locations_default(#20213,#10000,17,3,17,18)
+hasLocation(#20212,#20213)
+stmt_containers(#20212,#20185)
+#20214=*
+exprs(#20214,18,#20212,0,"!function k() {}")
+hasLocation(#20214,#20213)
+enclosing_stmt(#20214,#20212)
+expr_containers(#20214,#20185)
 #20215=*
-exprs(#20215,78,#20211,-1,"k")
-hasLocation(#20215,#20130)
-expr_containers(#20215,#20211)
-literals("k","k",#20215)
-decl(#20215,#20214)
-#20216=@"var;{arguments};{#20213}"
-variables(#20216,"arguments",#20213)
-is_arguments_object(#20216)
+exprs(#20215,9,#20214,0,"function k() {}")
+#20216=@"loc,{#10000},17,4,17,18"
+locations_default(#20216,#10000,17,4,17,18)
+hasLocation(#20215,#20216)
+enclosing_stmt(#20215,#20212)
+expr_containers(#20215,#20185)
 #20217=*
-stmts(#20217,1,#20211,-2,"{}")
-#20218=@"loc,{#10000},17,17,17,18"
-locations_default(#20218,#10000,17,17,17,18)
-hasLocation(#20217,#20218)
-stmt_containers(#20217,#20211)
-#20219=*
-entry_cfg_node(#20219,#20001)
-#20220=@"loc,{#10000},1,1,1,0"
-locations_default(#20220,#10000,1,1,1,0)
-hasLocation(#20219,#20220)
-#20221=*
-exit_cfg_node(#20221,#20001)
-hasLocation(#20221,#20143)
-successor(#20183,#20221)
+scopes(#20217,1)
+scopenodes(#20215,#20217)
+scopenesting(#20217,#20188)
+#20218=@"var;{this};{#20217}"
+variables(#20218,"this",#20217)
+#20219=@"var;{k};{#20217}"
+variables(#20219,"k",#20217)
+#20220=*
+exprs(#20220,78,#20215,-1,"k")
+hasLocation(#20220,#20130)
+expr_containers(#20220,#20215)
+literals("k","k",#20220)
+decl(#20220,#20219)
+#20221=@"var;{arguments};{#20217}"
+variables(#20221,"arguments",#20217)
+is_arguments_object(#20221)
 #20222=*
-entry_cfg_node(#20222,#20183)
-#20223=@"loc,{#10000},12,1,12,0"
-locations_default(#20223,#10000,12,1,12,0)
+stmts(#20222,1,#20215,-2,"{}")
+#20223=@"loc,{#10000},17,17,17,18"
+locations_default(#20223,#10000,17,17,17,18)
 hasLocation(#20222,#20223)
+stmt_containers(#20222,#20215)
 #20224=*
-exit_cfg_node(#20224,#20183)
-hasLocation(#20224,#20143)
-successor(#20208,#20211)
-successor(#20211,#20210)
-#20225=*
-entry_cfg_node(#20225,#20211)
-#20226=@"loc,{#10000},17,4,17,3"
-locations_default(#20226,#10000,17,4,17,3)
-hasLocation(#20225,#20226)
+entry_cfg_node(#20224,#20001)
+#20225=@"loc,{#10000},1,1,1,0"
+locations_default(#20225,#10000,1,1,1,0)
+hasLocation(#20224,#20225)
+#20226=*
+exit_cfg_node(#20226,#20001)
+hasLocation(#20226,#20143)
+successor(#20185,#20226)
 #20227=*
-exit_cfg_node(#20227,#20211)
-#20228=@"loc,{#10000},17,19,17,18"
-locations_default(#20228,#10000,17,19,17,18)
+entry_cfg_node(#20227,#20185)
+#20228=@"loc,{#10000},12,1,12,0"
+locations_default(#20228,#10000,12,1,12,0)
 hasLocation(#20227,#20228)
-successor(#20217,#20227)
-successor(#20215,#20217)
-successor(#20225,#20215)
-successor(#20210,#20224)
-successor(#20201,#20208)
 #20229=*
-entry_cfg_node(#20229,#20201)
-#20230=@"loc,{#10000},16,3,16,2"
-locations_default(#20230,#10000,16,3,16,2)
-hasLocation(#20229,#20230)
-#20231=*
-exit_cfg_node(#20231,#20201)
-#20232=@"loc,{#10000},16,18,16,17"
-locations_default(#20232,#10000,16,18,16,17)
-hasLocation(#20231,#20232)
-successor(#20206,#20231)
-successor(#20229,#20206)
-successor(#20203,#20201)
-successor(#20199,#20203)
-successor(#20195,#20198)
-successor(#20198,#20197)
-successor(#20197,#20199)
-successor(#20192,#20194)
-successor(#20194,#20195)
-successor(#20190,#20192)
-successor(#20222,#20190)
-successor(#20168,#20183)
-#20233=*
-entry_cfg_node(#20233,#20168)
-#20234=@"loc,{#10000},8,1,8,0"
-locations_default(#20234,#10000,8,1,8,0)
-hasLocation(#20233,#20234)
-#20235=*
-exit_cfg_node(#20235,#20168)
-#20236=@"loc,{#10000},11,2,11,1"
-locations_default(#20236,#10000,11,2,11,1)
-hasLocation(#20235,#20236)
+exit_cfg_node(#20229,#20185)
+hasLocation(#20229,#20143)
+successor(#20212,#20215)
+successor(#20215,#20214)
+#20230=*
+entry_cfg_node(#20230,#20215)
+#20231=@"loc,{#10000},17,4,17,3"
+locations_default(#20231,#10000,17,4,17,3)
+hasLocation(#20230,#20231)
+#20232=*
+exit_cfg_node(#20232,#20215)
+#20233=@"loc,{#10000},17,19,17,18"
+locations_default(#20233,#10000,17,19,17,18)
+hasLocation(#20232,#20233)
+successor(#20222,#20232)
+successor(#20220,#20222)
+successor(#20230,#20220)
+successor(#20214,#20229)
+successor(#20204,#20212)
+#20234=*
+entry_cfg_node(#20234,#20204)
+#20235=@"loc,{#10000},16,3,16,2"
+locations_default(#20235,#10000,16,3,16,2)
+hasLocation(#20234,#20235)
+#20236=*
+exit_cfg_node(#20236,#20204)
+#20237=@"loc,{#10000},16,18,16,17"
+locations_default(#20237,#10000,16,18,16,17)
+hasLocation(#20236,#20237)
+successor(#20210,#20236)
+successor(#20234,#20210)
+successor(#20206,#20204)
+successor(#20202,#20206)
+successor(#20198,#20201)
+successor(#20201,#20200)
+successor(#20200,#20202)
+successor(#20195,#20197)
+successor(#20197,#20198)
+successor(#20193,#20195)
+successor(#20227,#20193)
+successor(#20169,#20185)
+#20238=*
+entry_cfg_node(#20238,#20169)
+#20239=@"loc,{#10000},8,1,8,0"
+locations_default(#20239,#10000,8,1,8,0)
+hasLocation(#20238,#20239)
+#20240=*
+exit_cfg_node(#20240,#20169)
+#20241=@"loc,{#10000},11,2,11,1"
+locations_default(#20241,#10000,11,2,11,1)
+hasLocation(#20240,#20241)
+successor(#20182,#20184)
+successor(#20184,#20240)
+successor(#20178,#20181)
+successor(#20181,#20180)
 successor(#20180,#20182)
-successor(#20182,#20235)
-successor(#20176,#20179)
-successor(#20179,#20178)
-successor(#20178,#20180)
-successor(#20174,#20176)
-successor(#20233,#20174)
-successor(#20164,#20167)
-successor(#20167,#20166)
-successor(#20166,#20168)
-successor(#20162,#20164)
-successor(#20160,#20161)
+successor(#20176,#20178)
+successor(#20238,#20176)
+successor(#20165,#20168)
+successor(#20168,#20167)
+successor(#20167,#20169)
+successor(#20163,#20165)
 successor(#20161,#20162)
-successor(#20158,#20159)
+successor(#20162,#20163)
 successor(#20159,#20160)
-successor(#20152,#20155)
-successor(#20157,#20153)
-successor(#20155,#20157)
-successor(#20153,#20158)
-successor(#20149,#20151)
-successor(#20151,#20150)
+successor(#20160,#20161)
+successor(#20153,#20156)
+successor(#20158,#20154)
+successor(#20156,#20158)
+successor(#20154,#20159)
 successor(#20150,#20152)
-successor(#20185,#20149)
-successor(#20170,#20185)
-successor(#20219,#20170)
+successor(#20152,#20151)
+successor(#20151,#20153)
+successor(#20187,#20150)
+successor(#20171,#20187)
+successor(#20224,#20171)
 numlines(#10000,19,19,0)
 filetype(#10000,"javascript")
diff --git a/javascript/extractor/tests/vue/output/trap/rails.html.erb.trap b/javascript/extractor/tests/vue/output/trap/rails.html.erb.trap
index 2bfa0afc073..be7ac3a32be 100644
--- a/javascript/extractor/tests/vue/output/trap/rails.html.erb.trap
+++ b/javascript/extractor/tests/vue/output/trap/rails.html.erb.trap
@@ -68,70 +68,72 @@ toplevels(#20002,1)
 #20023=@"loc,{#10000},1,9,3,0"
 locations_default(#20023,#10000,1,9,3,0)
 hasLocation(#20002,#20023)
-#20024=*
-stmts(#20024,2,#20002,0,"console.log(""FOO"");")
-#20025=@"loc,{#10000},2,3,2,21"
-locations_default(#20025,#10000,2,3,2,21)
-hasLocation(#20024,#20025)
-stmt_containers(#20024,#20002)
-#20026=*
-exprs(#20026,13,#20024,0,"console.log(""FOO"")")
-#20027=@"loc,{#10000},2,3,2,20"
-locations_default(#20027,#10000,2,3,2,20)
-hasLocation(#20026,#20027)
-enclosing_stmt(#20026,#20024)
-expr_containers(#20026,#20002)
-#20028=*
-exprs(#20028,14,#20026,-1,"console.log")
-#20029=@"loc,{#10000},2,3,2,13"
-locations_default(#20029,#10000,2,3,2,13)
-hasLocation(#20028,#20029)
-enclosing_stmt(#20028,#20024)
-expr_containers(#20028,#20002)
-#20030=*
-exprs(#20030,79,#20028,0,"console")
-hasLocation(#20030,#20008)
-enclosing_stmt(#20030,#20024)
-expr_containers(#20030,#20002)
-literals("console","console",#20030)
-#20031=@"var;{console};{#20000}"
-variables(#20031,"console",#20000)
-bind(#20030,#20031)
-#20032=*
-exprs(#20032,0,#20028,1,"log")
-hasLocation(#20032,#20012)
-enclosing_stmt(#20032,#20024)
-expr_containers(#20032,#20002)
-literals("log","log",#20032)
+#20024=@"var;{this};{#20000}"
+variables(#20024,"this",#20000)
+#20025=*
+stmts(#20025,2,#20002,0,"console.log(""FOO"");")
+#20026=@"loc,{#10000},2,3,2,21"
+locations_default(#20026,#10000,2,3,2,21)
+hasLocation(#20025,#20026)
+stmt_containers(#20025,#20002)
+#20027=*
+exprs(#20027,13,#20025,0,"console.log(""FOO"")")
+#20028=@"loc,{#10000},2,3,2,20"
+locations_default(#20028,#10000,2,3,2,20)
+hasLocation(#20027,#20028)
+enclosing_stmt(#20027,#20025)
+expr_containers(#20027,#20002)
+#20029=*
+exprs(#20029,14,#20027,-1,"console.log")
+#20030=@"loc,{#10000},2,3,2,13"
+locations_default(#20030,#10000,2,3,2,13)
+hasLocation(#20029,#20030)
+enclosing_stmt(#20029,#20025)
+expr_containers(#20029,#20002)
+#20031=*
+exprs(#20031,79,#20029,0,"console")
+hasLocation(#20031,#20008)
+enclosing_stmt(#20031,#20025)
+expr_containers(#20031,#20002)
+literals("console","console",#20031)
+#20032=@"var;{console};{#20000}"
+variables(#20032,"console",#20000)
+bind(#20031,#20032)
 #20033=*
-exprs(#20033,4,#20026,0,"""FOO""")
-hasLocation(#20033,#20016)
-enclosing_stmt(#20033,#20024)
+exprs(#20033,0,#20029,1,"log")
+hasLocation(#20033,#20012)
+enclosing_stmt(#20033,#20025)
 expr_containers(#20033,#20002)
-literals("FOO","""FOO""",#20033)
+literals("log","log",#20033)
 #20034=*
-regexpterm(#20034,14,#20033,0,"FOO")
-#20035=@"loc,{#10000},2,16,2,18"
-locations_default(#20035,#10000,2,16,2,18)
-hasLocation(#20034,#20035)
-regexp_const_value(#20034,"FOO")
-#20036=*
-entry_cfg_node(#20036,#20002)
-hasLocation(#20036,#20004)
+exprs(#20034,4,#20027,0,"""FOO""")
+hasLocation(#20034,#20016)
+enclosing_stmt(#20034,#20025)
+expr_containers(#20034,#20002)
+literals("FOO","""FOO""",#20034)
+#20035=*
+regexpterm(#20035,14,#20034,0,"FOO")
+#20036=@"loc,{#10000},2,16,2,18"
+locations_default(#20036,#10000,2,16,2,18)
+hasLocation(#20035,#20036)
+regexp_const_value(#20035,"FOO")
 #20037=*
-exit_cfg_node(#20037,#20002)
-hasLocation(#20037,#20022)
-successor(#20024,#20030)
-successor(#20033,#20026)
-successor(#20032,#20028)
-successor(#20030,#20032)
-successor(#20028,#20033)
-successor(#20026,#20037)
-successor(#20036,#20024)
+entry_cfg_node(#20037,#20002)
+hasLocation(#20037,#20004)
+#20038=*
+exit_cfg_node(#20038,#20002)
+hasLocation(#20038,#20022)
+successor(#20025,#20031)
+successor(#20034,#20027)
+successor(#20033,#20029)
+successor(#20031,#20033)
+successor(#20029,#20034)
+successor(#20027,#20038)
+successor(#20037,#20025)
 toplevel_parent_xml_node(#20002,#20001)
 xmlElements(#20001,"script",#10000,0,#10000)
-#20038=@"loc,{#10000},1,1,3,9"
-locations_default(#20038,#10000,1,1,3,9)
-xmllocations(#20001,#20038)
+#20039=@"loc,{#10000},1,1,3,9"
+locations_default(#20039,#10000,1,1,3,9)
+xmllocations(#20001,#20039)
 numlines(#10000,3,1,0)
 filetype(#10000,"html")
diff --git a/javascript/extractor/tests/vue/output/trap/simple-jsp.jsp.trap b/javascript/extractor/tests/vue/output/trap/simple-jsp.jsp.trap
index 066868e24b3..a112b3ae1a1 100644
--- a/javascript/extractor/tests/vue/output/trap/simple-jsp.jsp.trap
+++ b/javascript/extractor/tests/vue/output/trap/simple-jsp.jsp.trap
@@ -73,160 +73,164 @@ toplevels(#20002,1)
 #20025=@"loc,{#10000},10,13,12,4"
 locations_default(#20025,#10000,10,13,12,4)
 hasLocation(#20002,#20025)
-#20026=*
-stmts(#20026,2,#20002,0,"console.log(123);")
-#20027=@"loc,{#10000},11,7,11,23"
-locations_default(#20027,#10000,11,7,11,23)
-hasLocation(#20026,#20027)
-stmt_containers(#20026,#20002)
-#20028=*
-exprs(#20028,13,#20026,0,"console.log(123)")
-#20029=@"loc,{#10000},11,7,11,22"
-locations_default(#20029,#10000,11,7,11,22)
-hasLocation(#20028,#20029)
-enclosing_stmt(#20028,#20026)
-expr_containers(#20028,#20002)
-#20030=*
-exprs(#20030,14,#20028,-1,"console.log")
-#20031=@"loc,{#10000},11,7,11,17"
-locations_default(#20031,#10000,11,7,11,17)
-hasLocation(#20030,#20031)
-enclosing_stmt(#20030,#20026)
-expr_containers(#20030,#20002)
-#20032=*
-exprs(#20032,79,#20030,0,"console")
-hasLocation(#20032,#20010)
-enclosing_stmt(#20032,#20026)
-expr_containers(#20032,#20002)
-literals("console","console",#20032)
-#20033=@"var;{console};{#20000}"
-variables(#20033,"console",#20000)
-bind(#20032,#20033)
-#20034=*
-exprs(#20034,0,#20030,1,"log")
-hasLocation(#20034,#20014)
-enclosing_stmt(#20034,#20026)
-expr_containers(#20034,#20002)
-literals("log","log",#20034)
+#20026=@"var;{this};{#20000}"
+variables(#20026,"this",#20000)
+#20027=*
+stmts(#20027,2,#20002,0,"console.log(123);")
+#20028=@"loc,{#10000},11,7,11,23"
+locations_default(#20028,#10000,11,7,11,23)
+hasLocation(#20027,#20028)
+stmt_containers(#20027,#20002)
+#20029=*
+exprs(#20029,13,#20027,0,"console.log(123)")
+#20030=@"loc,{#10000},11,7,11,22"
+locations_default(#20030,#10000,11,7,11,22)
+hasLocation(#20029,#20030)
+enclosing_stmt(#20029,#20027)
+expr_containers(#20029,#20002)
+#20031=*
+exprs(#20031,14,#20029,-1,"console.log")
+#20032=@"loc,{#10000},11,7,11,17"
+locations_default(#20032,#10000,11,7,11,17)
+hasLocation(#20031,#20032)
+enclosing_stmt(#20031,#20027)
+expr_containers(#20031,#20002)
+#20033=*
+exprs(#20033,79,#20031,0,"console")
+hasLocation(#20033,#20010)
+enclosing_stmt(#20033,#20027)
+expr_containers(#20033,#20002)
+literals("console","console",#20033)
+#20034=@"var;{console};{#20000}"
+variables(#20034,"console",#20000)
+bind(#20033,#20034)
 #20035=*
-exprs(#20035,3,#20028,0,"123")
-hasLocation(#20035,#20018)
-enclosing_stmt(#20035,#20026)
+exprs(#20035,0,#20031,1,"log")
+hasLocation(#20035,#20014)
+enclosing_stmt(#20035,#20027)
 expr_containers(#20035,#20002)
-literals("123","123",#20035)
+literals("log","log",#20035)
 #20036=*
-entry_cfg_node(#20036,#20002)
-hasLocation(#20036,#20004)
+exprs(#20036,3,#20029,0,"123")
+hasLocation(#20036,#20018)
+enclosing_stmt(#20036,#20027)
+expr_containers(#20036,#20002)
+literals("123","123",#20036)
 #20037=*
-exit_cfg_node(#20037,#20002)
-hasLocation(#20037,#20024)
-successor(#20026,#20032)
-successor(#20035,#20028)
-successor(#20034,#20030)
-successor(#20032,#20034)
-successor(#20030,#20035)
-successor(#20028,#20037)
-successor(#20036,#20026)
-toplevel_parent_xml_node(#20002,#20001)
+entry_cfg_node(#20037,#20002)
+hasLocation(#20037,#20004)
 #20038=*
-template_placeholder_tag_info(#20038,#10000,"<%@ page contentType=""text/html;charset=UTF-8"" language=""java"" %>")
-#20039=@"loc,{#10000},1,1,1,65"
-locations_default(#20039,#10000,1,1,1,65)
-hasLocation(#20038,#20039)
-#20040=*
-xmlElements(#20040,"html",#10000,0,#10000)
-#20041=@"loc,{#10000},2,1,14,7"
-locations_default(#20041,#10000,2,1,14,7)
-xmllocations(#20040,#20041)
-#20042=*
-xmlElements(#20042,"body",#20040,1,#10000)
-#20043=@"loc,{#10000},6,3,13,9"
-locations_default(#20043,#10000,6,3,13,9)
-xmllocations(#20042,#20043)
-#20044=*
-template_placeholder_tag_info(#20044,#20042,"<% String name = ""John""; %>")
-#20045=@"loc,{#10000},8,5,8,31"
-locations_default(#20045,#10000,8,5,8,31)
-hasLocation(#20044,#20045)
-xmlElements(#20001,"script",#20042,2,#10000)
-#20046=@"loc,{#10000},10,5,12,13"
-locations_default(#20046,#10000,10,5,12,13)
-xmllocations(#20001,#20046)
-#20047=*
-xmlElements(#20047,"p",#20042,1,#10000)
-#20048=@"loc,{#10000},9,5,9,31"
-locations_default(#20048,#10000,9,5,9,31)
-xmllocations(#20047,#20048)
-#20049=*
-template_placeholder_tag_info(#20049,#20047,"<%= name %>")
-#20050=@"loc,{#10000},9,16,9,26"
-locations_default(#20050,#10000,9,16,9,26)
-hasLocation(#20049,#20050)
+exit_cfg_node(#20038,#20002)
+hasLocation(#20038,#20024)
+successor(#20027,#20033)
+successor(#20036,#20029)
+successor(#20035,#20031)
+successor(#20033,#20035)
+successor(#20031,#20036)
+successor(#20029,#20038)
+successor(#20037,#20027)
+toplevel_parent_xml_node(#20002,#20001)
+#20039=*
+template_placeholder_tag_info(#20039,#10000,"<%@ page contentType=""text/html;charset=UTF-8"" language=""java"" %>")
+#20040=@"loc,{#10000},1,1,1,65"
+locations_default(#20040,#10000,1,1,1,65)
+hasLocation(#20039,#20040)
+#20041=*
+xmlElements(#20041,"html",#10000,0,#10000)
+#20042=@"loc,{#10000},2,1,14,7"
+locations_default(#20042,#10000,2,1,14,7)
+xmllocations(#20041,#20042)
+#20043=*
+xmlElements(#20043,"body",#20041,1,#10000)
+#20044=@"loc,{#10000},6,3,13,9"
+locations_default(#20044,#10000,6,3,13,9)
+xmllocations(#20043,#20044)
+#20045=*
+template_placeholder_tag_info(#20045,#20043,"<% String name = ""John""; %>")
+#20046=@"loc,{#10000},8,5,8,31"
+locations_default(#20046,#10000,8,5,8,31)
+hasLocation(#20045,#20046)
+xmlElements(#20001,"script",#20043,2,#10000)
+#20047=@"loc,{#10000},10,5,12,13"
+locations_default(#20047,#10000,10,5,12,13)
+xmllocations(#20001,#20047)
+#20048=*
+xmlElements(#20048,"p",#20043,1,#10000)
+#20049=@"loc,{#10000},9,5,9,31"
+locations_default(#20049,#10000,9,5,9,31)
+xmllocations(#20048,#20049)
+#20050=*
+template_placeholder_tag_info(#20050,#20048,"<%= name %>")
+#20051=@"loc,{#10000},9,16,9,26"
+locations_default(#20051,#10000,9,16,9,26)
+hasLocation(#20050,#20051)
 scopes(#20000,0)
-#20051=@"script;{#10000},9,19"
-#20052=*
-lines(#20052,#20051," name ","")
-#20053=@"loc,{#10000},9,19,9,24"
-locations_default(#20053,#10000,9,19,9,24)
-hasLocation(#20052,#20053)
+#20052=@"script;{#10000},9,19"
+#20053=*
+lines(#20053,#20052," name ","")
+#20054=@"loc,{#10000},9,19,9,24"
+locations_default(#20054,#10000,9,19,9,24)
+hasLocation(#20053,#20054)
 indentation(#10000,9," ",1)
-numlines(#20051,1,1,0)
-#20054=*
-tokeninfo(#20054,6,#20051,0,"name")
-#20055=@"loc,{#10000},9,20,9,23"
-locations_default(#20055,#10000,9,20,9,23)
-hasLocation(#20054,#20055)
-#20056=*
-tokeninfo(#20056,0,#20051,1,"")
-#20057=@"loc,{#10000},9,25,9,24"
-locations_default(#20057,#10000,9,25,9,24)
-hasLocation(#20056,#20057)
-toplevels(#20051,4)
-hasLocation(#20051,#20053)
-#20058=@"module;{#10000},9,19"
-scopes(#20058,3)
-scopenodes(#20051,#20058)
-scopenesting(#20058,#20000)
-is_module(#20051)
-#20059=*
-stmts(#20059,2,#20051,0,"name")
-hasLocation(#20059,#20055)
-stmt_containers(#20059,#20051)
-#20060=*
-exprs(#20060,79,#20059,0,"name")
-hasLocation(#20060,#20055)
-enclosing_stmt(#20060,#20059)
-expr_containers(#20060,#20051)
-literals("name","name",#20060)
-#20061=@"var;{name};{#20058}"
-variables(#20061,"name",#20058)
-bind(#20060,#20061)
+numlines(#20052,1,1,0)
+#20055=*
+tokeninfo(#20055,6,#20052,0,"name")
+#20056=@"loc,{#10000},9,20,9,23"
+locations_default(#20056,#10000,9,20,9,23)
+hasLocation(#20055,#20056)
+#20057=*
+tokeninfo(#20057,0,#20052,1,"")
+#20058=@"loc,{#10000},9,25,9,24"
+locations_default(#20058,#10000,9,25,9,24)
+hasLocation(#20057,#20058)
+toplevels(#20052,4)
+hasLocation(#20052,#20054)
+#20059=@"module;{#10000},9,19"
+scopes(#20059,3)
+scopenodes(#20052,#20059)
+scopenesting(#20059,#20000)
+is_module(#20052)
+#20060=@"var;{this};{#20059}"
+variables(#20060,"this",#20059)
+#20061=*
+stmts(#20061,2,#20052,0,"name")
+hasLocation(#20061,#20056)
+stmt_containers(#20061,#20052)
 #20062=*
-entry_cfg_node(#20062,#20051)
-#20063=@"loc,{#10000},9,19,9,18"
-locations_default(#20063,#10000,9,19,9,18)
-hasLocation(#20062,#20063)
+exprs(#20062,79,#20061,0,"name")
+hasLocation(#20062,#20056)
+enclosing_stmt(#20062,#20061)
+expr_containers(#20062,#20052)
+literals("name","name",#20062)
+#20063=@"var;{name};{#20059}"
+variables(#20063,"name",#20059)
+bind(#20062,#20063)
 #20064=*
-exit_cfg_node(#20064,#20051)
-hasLocation(#20064,#20057)
-successor(#20059,#20060)
-successor(#20060,#20064)
-successor(#20062,#20059)
-toplevel_parent_xml_node(#20051,#20049)
-#20065=*
-xmlElements(#20065,"h1",#20042,0,#10000)
-#20066=@"loc,{#10000},7,5,7,25"
-locations_default(#20066,#10000,7,5,7,25)
-xmllocations(#20065,#20066)
+entry_cfg_node(#20064,#20052)
+#20065=@"loc,{#10000},9,19,9,18"
+locations_default(#20065,#10000,9,19,9,18)
+hasLocation(#20064,#20065)
+#20066=*
+exit_cfg_node(#20066,#20052)
+hasLocation(#20066,#20058)
+successor(#20061,#20062)
+successor(#20062,#20066)
+successor(#20064,#20061)
+toplevel_parent_xml_node(#20052,#20050)
 #20067=*
-xmlElements(#20067,"head",#20040,0,#10000)
-#20068=@"loc,{#10000},3,3,5,9"
-locations_default(#20068,#10000,3,3,5,9)
+xmlElements(#20067,"h1",#20043,0,#10000)
+#20068=@"loc,{#10000},7,5,7,25"
+locations_default(#20068,#10000,7,5,7,25)
 xmllocations(#20067,#20068)
 #20069=*
-xmlElements(#20069,"title",#20067,0,#10000)
-#20070=@"loc,{#10000},4,5,4,34"
-locations_default(#20070,#10000,4,5,4,34)
+xmlElements(#20069,"head",#20041,0,#10000)
+#20070=@"loc,{#10000},3,3,5,9"
+locations_default(#20070,#10000,3,3,5,9)
 xmllocations(#20069,#20070)
+#20071=*
+xmlElements(#20071,"title",#20069,0,#10000)
+#20072=@"loc,{#10000},4,5,4,34"
+locations_default(#20072,#10000,4,5,4,34)
+xmllocations(#20071,#20072)
 numlines(#10000,14,2,0)
 filetype(#10000,"html")
diff --git a/javascript/ql/lib/CHANGELOG.md b/javascript/ql/lib/CHANGELOG.md
index 1d872998261..01ac46e87c5 100644
--- a/javascript/ql/lib/CHANGELOG.md
+++ b/javascript/ql/lib/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 2.6.24
+
+### Minor Analysis Improvements
+
+* Added support for browser-specific source kinds (`browser`, `browser-url-query`, `browser-url-fragment`, `browser-url-path`, `browser-url`, `browser-window-name`, `browser-message-event`) that can be used in data extensions to model sources in browser environments.
+* Inline expectations test comments, which are of the form `// $ tag` or `// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the `$` symbol.
+
+## 2.6.23
+
+### Minor Analysis Improvements
+
+* Added support for React components wrapped by `observer` from `mobx-react` and `mobx-react-lite`.
+
 ## 2.6.22
 
 No user-facing changes.
diff --git a/javascript/ql/lib/change-notes/released/2.6.23.md b/javascript/ql/lib/change-notes/released/2.6.23.md
new file mode 100644
index 00000000000..28f42d8f924
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.6.23.md
@@ -0,0 +1,5 @@
+## 2.6.23
+
+### Minor Analysis Improvements
+
+* Added support for React components wrapped by `observer` from `mobx-react` and `mobx-react-lite`.
diff --git a/javascript/ql/lib/change-notes/released/2.6.24.md b/javascript/ql/lib/change-notes/released/2.6.24.md
new file mode 100644
index 00000000000..9d16a33f1a8
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.6.24.md
@@ -0,0 +1,6 @@
+## 2.6.24
+
+### Minor Analysis Improvements
+
+* Added support for browser-specific source kinds (`browser`, `browser-url-query`, `browser-url-fragment`, `browser-url-path`, `browser-url`, `browser-window-name`, `browser-message-event`) that can be used in data extensions to model sources in browser environments.
+* Inline expectations test comments, which are of the form `// $ tag` or `// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the `$` symbol.
diff --git a/javascript/ql/lib/codeql-pack.release.yml b/javascript/ql/lib/codeql-pack.release.yml
index 205f738ae8d..ce80dc3be1c 100644
--- a/javascript/ql/lib/codeql-pack.release.yml
+++ b/javascript/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.6.22
+lastReleaseVersion: 2.6.24
diff --git a/javascript/ql/lib/qlpack.yml b/javascript/ql/lib/qlpack.yml
index 2415cf3d3b7..c753467a0b8 100644
--- a/javascript/ql/lib/qlpack.yml
+++ b/javascript/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-all
-version: 2.6.23-dev
+version: 2.6.25-dev
 groups: javascript
 dbscheme: semmlecode.javascript.dbscheme
 extractor: javascript
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.model.yml b/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.model.yml
index ce6e0f68425..43035615a12 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.model.yml
+++ b/javascript/ql/lib/semmle/javascript/frameworks/NodeJSLib.model.yml
@@ -8,9 +8,3 @@ extensions:
       - ['global', 'Member[process].Member[stdin].Member[on,addListener].WithStringArgument[0=data].Argument[1].Parameter[0]', 'stdin']
       - ['readline', 'Member[createInterface].ReturnValue.Member[question].Argument[1].Parameter[0]', 'stdin']
       - ['readline', 'Member[createInterface].ReturnValue.Member[on,addListener].WithStringArgument[0=line].Argument[1].Parameter[0]', 'stdin']
-
-  - addsTo:
-      pack: codeql/javascript-all
-      extensible: barrierModel
-    data:
-      - ['global', 'Member[encodeURIComponent,encodeURI].ReturnValue', 'request-forgery']
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/React.qll b/javascript/ql/lib/semmle/javascript/frameworks/React.qll
index 42885f6b9cb..a2cee41429b 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/React.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/React.qll
@@ -832,6 +832,8 @@ private DataFlow::SourceNode higherOrderComponentBuilder() {
   or
   result = DataFlow::moduleMember("recompose", _).getACall()
   or
+  result = DataFlow::moduleMember(["mobx-react", "mobx-react-lite"], "observer")
+  or
   result = reactRouterDom().getAPropertyRead("withRouter")
   or
   exists(FunctionCompositionCall compose |
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/data/ModelsAsData.qll b/javascript/ql/lib/semmle/javascript/frameworks/data/ModelsAsData.qll
index e4adff2a9ac..391f2ea1b33 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/data/ModelsAsData.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/data/ModelsAsData.qll
@@ -35,6 +35,18 @@ private class RemoteFlowSourceFromMaD extends RemoteFlowSource {
   override string getSourceType() { result = "Remote flow" }
 }
 
+private class ClientSideRemoteFlowSourceFromMaD extends ClientSideRemoteFlowSource {
+  private ClientSideRemoteFlowKind kind;
+
+  ClientSideRemoteFlowSourceFromMaD() { ModelOutput::sourceNode(this, kind) }
+
+  override ClientSideRemoteFlowKind getKind() { result = kind }
+
+  override string getSourceType() {
+    result = "Source node (" + this.getThreatModel() + ") [from data-extension]"
+  }
+}
+
 /**
  * A threat-model flow source originating from a data extension.
  */
diff --git a/javascript/ql/lib/semmle/javascript/security/CorsPermissiveConfigurationCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/CorsPermissiveConfigurationCustomizations.qll
index e67b9e0d38c..aa43f4607d8 100644
--- a/javascript/ql/lib/semmle/javascript/security/CorsPermissiveConfigurationCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/CorsPermissiveConfigurationCustomizations.qll
@@ -82,4 +82,8 @@ module CorsPermissiveConfiguration {
       )
     }
   }
+
+  private class SanitizerFromModel extends Sanitizer {
+    SanitizerFromModel() { ModelOutput::barrierNode(this, "cors-origin") }
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll
index a8d15d0e698..01fc7ee5e5d 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll
@@ -270,4 +270,8 @@ module ClientSideUrlRedirect {
   private class SinkFromModel extends Sink {
     SinkFromModel() { ModelOutput::sinkNode(this, "url-redirection") }
   }
+
+  private class SanitizerFromModel extends Sanitizer {
+    SanitizerFromModel() { ModelOutput::barrierNode(this, "url-redirection") }
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/CodeInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/CodeInjectionCustomizations.qll
index 9a72ae4a231..1d181d97591 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/CodeInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/CodeInjectionCustomizations.qll
@@ -438,4 +438,8 @@ module CodeInjection {
   private class SinkFromModel extends Sink {
     SinkFromModel() { ModelOutput::sinkNode(this, "code-injection") }
   }
+
+  private class SanitizerFromModel extends Sanitizer {
+    SanitizerFromModel() { ModelOutput::barrierNode(this, "code-injection") }
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionCustomizations.qll
index 6b17adcb773..b3516a79bf4 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionCustomizations.qll
@@ -58,4 +58,8 @@ module CommandInjection {
   private class SinkFromModel extends Sink {
     SinkFromModel() { ModelOutput::sinkNode(this, "command-injection") }
   }
+
+  private class SanitizerFromModel extends Sanitizer {
+    SanitizerFromModel() { ModelOutput::barrierNode(this, "command-injection") }
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/DomBasedXssCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/DomBasedXssCustomizations.qll
index b7639ccc3aa..b5c0be71f45 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/DomBasedXssCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/DomBasedXssCustomizations.qll
@@ -421,4 +421,8 @@ module DomBasedXss {
   private class SinkFromModel extends Sink {
     SinkFromModel() { ModelOutput::sinkNode(this, "html-injection") }
   }
+
+  private class SanitizerFromModel extends Sanitizer {
+    SanitizerFromModel() { ModelOutput::barrierNode(this, "html-injection") }
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/HardcodedCredentialsCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/HardcodedCredentialsCustomizations.qll
index 8bd9b290fc6..54811baf14f 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/HardcodedCredentialsCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/HardcodedCredentialsCustomizations.qll
@@ -44,4 +44,14 @@ module HardcodedCredentials {
       not (super.getCredentialsKind() = "jwt key" and isTestFile(this.getFile()))
     }
   }
+
+  /**
+   * Note that a sanitizer with kind `credentials-key` will sanitize flow to
+   * all sinks, not just sinks with the same kind.
+   */
+  private class CredentialSanitizerFromModel extends Sanitizer {
+    CredentialSanitizerFromModel() {
+      exists(string kind | ModelOutput::barrierNode(this, "credentials-" + kind))
+    }
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/IncompleteHtmlAttributeSanitizationCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/IncompleteHtmlAttributeSanitizationCustomizations.qll
index c93cb07bbc7..f421a92298f 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/IncompleteHtmlAttributeSanitizationCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/IncompleteHtmlAttributeSanitizationCustomizations.qll
@@ -101,7 +101,13 @@ module IncompleteHtmlAttributeSanitization {
     }
   }
 
-  private class SanitizerFromModel extends Sanitizer {
-    SanitizerFromModel() { ModelOutput::barrierNode(this, "request-forgery") }
+  /**
+   * An encoder for potentially malicious characters, as a sanitizer
+   * for incomplete HTML sanitization vulnerabilities.
+   */
+  class EncodingSanitizer extends Sanitizer {
+    EncodingSanitizer() {
+      this = DataFlow::globalVarRef(["encodeURIComponent", "encodeURI"]).getACall()
+    }
   }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/LogInjectionQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/LogInjectionQuery.qll
index 25474297d09..6e4dbbf396e 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/LogInjectionQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/LogInjectionQuery.qll
@@ -88,3 +88,7 @@ class JsonStringifySanitizer extends Sanitizer {
 private class SinkFromModel extends Sink {
   SinkFromModel() { ModelOutput::sinkNode(this, "log-injection") }
 }
+
+private class SanitizerFromModel extends Sanitizer {
+  SanitizerFromModel() { ModelOutput::barrierNode(this, "log-injection") }
+}
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionCustomizations.qll
index 36c0601d501..3d3eaadf9d3 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/NosqlInjectionCustomizations.qll
@@ -47,4 +47,8 @@ module NosqlInjection {
 
   /** An expression interpreted as a NoSql query, viewed as a sink. */
   class NosqlQuerySink extends Sink instanceof NoSql::Query { }
+
+  private class SanitizerFromModel extends Sanitizer {
+    SanitizerFromModel() { ModelOutput::barrierNode(this, "nosql-injection") }
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ReflectedXssCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ReflectedXssCustomizations.qll
index 82b6e99dc21..87a522df7a5 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ReflectedXssCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ReflectedXssCustomizations.qll
@@ -147,4 +147,8 @@ module ReflectedXss {
   private class SinkFromModel extends Sink {
     SinkFromModel() { ModelOutput::sinkNode(this, "html-injection") }
   }
+
+  private class SanitizerFromModel extends Sanitizer {
+    SanitizerFromModel() { ModelOutput::barrierNode(this, "html-injection") }
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/RemoteFlowSources.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/RemoteFlowSources.qll
index 9f4975e605a..8791382180a 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/RemoteFlowSources.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/RemoteFlowSources.qll
@@ -43,53 +43,65 @@ import Cached
 
 /**
  * A type of remote flow source that is specific to the browser environment.
+ *
+ * The underlying string also corresponds to a source kind.
  */
 class ClientSideRemoteFlowKind extends string {
   ClientSideRemoteFlowKind() {
-    this = ["query", "fragment", "path", "url", "name", "message-event"]
+    this =
+      [
+        "browser", "browser-url-query", "browser-url-fragment", "browser-url-path", "browser-url",
+        "browser-window-name", "browser-message-event"
+      ]
   }
 
   /**
-   * Holds if this is the `query` kind, describing sources derived from the query parameters of the browser URL,
+   * Holds if this is the `browser` kind, indicating a remote source in a browser context, that does not fit into one
+   * of the more specific kinds.
+   */
+  predicate isGenericBrowserSourceKind() { this = "browser" }
+
+  /**
+   * Holds if this is the `browser-url-query` kind, describing sources derived from the query parameters of the browser URL,
    * such as `location.search`.
    */
-  predicate isQuery() { this = "query" }
+  predicate isQuery() { this = "browser-url-query" }
 
   /**
-   * Holds if this is the `frgament` kind, describing sources derived from the fragment part of the browser URL,
+   * Holds if this is the `browser-url-fragment` kind, describing sources derived from the fragment part of the browser URL,
    * such as `location.hash`.
    */
-  predicate isFragment() { this = "fragment" }
+  predicate isFragment() { this = "browser-url-fragment" }
 
   /**
-   * Holds if this is the `path` kind, describing sources derived from the pathname of the browser URL,
+   * Holds if this is the `browser-url-path` kind, describing sources derived from the pathname of the browser URL,
    * such as `location.pathname`.
    */
-  predicate isPath() { this = "path" }
+  predicate isPath() { this = "browser-url-path" }
 
   /**
-   * Holds if this is the `url` kind, describing sources derived from the browser URL,
+   * Holds if this is the `browser-url` kind, describing sources derived from the browser URL,
    * where the untrusted part of the URL is prefixed by trusted data, such as the scheme and hostname.
    */
-  predicate isUrl() { this = "url" }
+  predicate isUrl() { this = "browser-url" }
 
-  /** Holds if this is the `query` or `fragment` kind. */
+  /** Holds if this is the `browser-url-query` or `browser-url-fragment` kind. */
   predicate isQueryOrFragment() { this.isQuery() or this.isFragment() }
 
-  /** Holds if this is the `path`, `query`, or `fragment` kind. */
+  /** Holds if this is the `browser-url-path`, `browser-url-query`, or `browser-url-fragment` kind. */
   predicate isPathOrQueryOrFragment() { this.isPath() or this.isQuery() or this.isFragment() }
 
-  /** Holds if this is the `path` or `url` kind. */
+  /** Holds if this is the `browser-url-path` or `browser-url` kind. */
   predicate isPathOrUrl() { this.isPath() or this.isUrl() }
 
-  /** Holds if this is the `name` kind, describing sources derived from the window name, such as `window.name`. */
-  predicate isWindowName() { this = "name" }
+  /** Holds if this is the `browser-window-name` kind, describing sources derived from the window name, such as `window.name`. */
+  predicate isWindowName() { this = "browser-window-name" }
 
   /**
-   * Holds if this is the `message-event` kind, describing sources derived from cross-window message passing,
+   * Holds if this is the `browser-message-event` kind, describing sources derived from cross-window message passing,
    * such as `event` in `window.onmessage = event => {...}`.
    */
-  predicate isMessageEvent() { this = "message-event" }
+  predicate isMessageEvent() { this = "browser-message-event" }
 }
 
 /**
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/RequestForgeryCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/RequestForgeryCustomizations.qll
index de2a1e3c6bf..8d9310d46c2 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/RequestForgeryCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/RequestForgeryCustomizations.qll
@@ -114,4 +114,8 @@ module RequestForgery {
   class UriEncodingSanitizer extends Sanitizer instanceof Xss::Shared::UriEncodingSanitizer {
     UriEncodingSanitizer() { this.encodesPathSeparators() }
   }
+
+  private class SanitizerFromModel extends Sanitizer {
+    SanitizerFromModel() { ModelOutput::barrierNode(this, "request-forgery") }
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ServerSideUrlRedirectCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ServerSideUrlRedirectCustomizations.qll
index 18cfaf6f742..5827e95900d 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ServerSideUrlRedirectCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ServerSideUrlRedirectCustomizations.qll
@@ -66,4 +66,8 @@ module ServerSideUrlRedirect {
   private class SinkFromModel extends Sink {
     SinkFromModel() { ModelOutput::sinkNode(this, "url-redirection") }
   }
+
+  private class SanitizerFromModel extends Sanitizer {
+    SanitizerFromModel() { ModelOutput::barrierNode(this, "url-redirection") }
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/SqlInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/SqlInjectionCustomizations.qll
index 8afb65519ad..6a3a9df41de 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/SqlInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/SqlInjectionCustomizations.qll
@@ -74,4 +74,8 @@ module SqlInjection {
       )
     }
   }
+
+  private class SanitizerFromModel extends Sanitizer {
+    SanitizerFromModel() { ModelOutput::barrierNode(this, "sql-injection") }
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll
index bb1da3f4a23..735026095df 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll
@@ -1124,4 +1124,8 @@ module TaintedPath {
   private class SinkFromModel extends Sink {
     SinkFromModel() { ModelOutput::sinkNode(this, "path-injection") }
   }
+
+  private class SanitizerFromModel extends Sanitizer {
+    SanitizerFromModel() { ModelOutput::barrierNode(this, "path-injection") }
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationCustomizations.qll
index 82f11ec8003..44ce8d56bcd 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationCustomizations.qll
@@ -69,4 +69,8 @@ module UnsafeDeserialization {
   private class SinkFromModel extends Sink {
     SinkFromModel() { ModelOutput::sinkNode(this, "unsafe-deserialization") }
   }
+
+  private class SanitizerFromModel extends Sanitizer {
+    SanitizerFromModel() { ModelOutput::barrierNode(this, "unsafe-deserialization") }
+  }
 }
diff --git a/javascript/ql/lib/semmlecode.javascript.dbscheme b/javascript/ql/lib/semmlecode.javascript.dbscheme
index 578367e82a2..26a123164be 100644
--- a/javascript/ql/lib/semmlecode.javascript.dbscheme
+++ b/javascript/ql/lib/semmlecode.javascript.dbscheme
@@ -453,7 +453,7 @@ is_arguments_object (int id: @variable ref);
 
 @lexical_name = @variable | @local_type_name | @local_namespace_name;
 
-@bind_id = @varaccess | @local_var_type_access;
+@bind_id = @varaccess | @local_var_type_access | @this_expr;
 bind (unique int id: @bind_id ref,
       int decl: @variable ref);
 
diff --git a/javascript/ql/lib/upgrades/578367e82a25a3e286aaf1238613db3717b67476/old.dbscheme b/javascript/ql/lib/upgrades/578367e82a25a3e286aaf1238613db3717b67476/old.dbscheme
new file mode 100644
index 00000000000..578367e82a2
--- /dev/null
+++ b/javascript/ql/lib/upgrades/578367e82a25a3e286aaf1238613db3717b67476/old.dbscheme
@@ -0,0 +1,1217 @@
+/*** 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);
+has_defer_keyword (int id: @import_declaration 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 -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
diff --git a/javascript/ql/lib/upgrades/578367e82a25a3e286aaf1238613db3717b67476/semmlecode.javascript.dbscheme b/javascript/ql/lib/upgrades/578367e82a25a3e286aaf1238613db3717b67476/semmlecode.javascript.dbscheme
new file mode 100644
index 00000000000..26a123164be
--- /dev/null
+++ b/javascript/ql/lib/upgrades/578367e82a25a3e286aaf1238613db3717b67476/semmlecode.javascript.dbscheme
@@ -0,0 +1,1217 @@
+/*** 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 | @this_expr;
+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);
+has_defer_keyword (int id: @import_declaration 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 -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
diff --git a/javascript/ql/lib/upgrades/578367e82a25a3e286aaf1238613db3717b67476/upgrade.properties b/javascript/ql/lib/upgrades/578367e82a25a3e286aaf1238613db3717b67476/upgrade.properties
new file mode 100644
index 00000000000..a083a5559da
--- /dev/null
+++ b/javascript/ql/lib/upgrades/578367e82a25a3e286aaf1238613db3717b67476/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add variable bindings for 'this'
+compatibility: partial
diff --git a/javascript/ql/src/CHANGELOG.md b/javascript/ql/src/CHANGELOG.md
index c08f0793935..872cd055c51 100644
--- a/javascript/ql/src/CHANGELOG.md
+++ b/javascript/ql/src/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2.3.4
+
+No user-facing changes.
+
+## 2.3.3
+
+No user-facing changes.
+
 ## 2.3.2
 
 No user-facing changes.
diff --git a/javascript/ql/src/change-notes/released/2.3.3.md b/javascript/ql/src/change-notes/released/2.3.3.md
new file mode 100644
index 00000000000..6ede742aa46
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/2.3.3.md
@@ -0,0 +1,3 @@
+## 2.3.3
+
+No user-facing changes.
diff --git a/javascript/ql/src/change-notes/released/2.3.4.md b/javascript/ql/src/change-notes/released/2.3.4.md
new file mode 100644
index 00000000000..c7dcb90e95a
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/2.3.4.md
@@ -0,0 +1,3 @@
+## 2.3.4
+
+No user-facing changes.
diff --git a/javascript/ql/src/codeql-pack.release.yml b/javascript/ql/src/codeql-pack.release.yml
index f51e9b8563c..1d7561c966c 100644
--- a/javascript/ql/src/codeql-pack.release.yml
+++ b/javascript/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.3.2
+lastReleaseVersion: 2.3.4
diff --git a/javascript/ql/src/qlpack.yml b/javascript/ql/src/qlpack.yml
index 1f57b3e99e2..5d4952bd6a5 100644
--- a/javascript/ql/src/qlpack.yml
+++ b/javascript/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-queries
-version: 2.3.3-dev
+version: 2.3.5-dev
 groups:
   - javascript
   - queries
diff --git a/javascript/ql/test/library-tests/TypeScript/Shebangs/Shebangs.expected b/javascript/ql/test/library-tests/TypeScript/Shebangs/Shebangs.expected
new file mode 100644
index 00000000000..3f4d018029a
--- /dev/null
+++ b/javascript/ql/test/library-tests/TypeScript/Shebangs/Shebangs.expected
@@ -0,0 +1,4 @@
+| shebang_bun.ts |
+| shebang_node.ts |
+| shebang_tsx.ts |
+| tsconfig.json |
diff --git a/javascript/ql/test/library-tests/TypeScript/Shebangs/Shebangs.ql b/javascript/ql/test/library-tests/TypeScript/Shebangs/Shebangs.ql
new file mode 100644
index 00000000000..1b3590b82d0
--- /dev/null
+++ b/javascript/ql/test/library-tests/TypeScript/Shebangs/Shebangs.ql
@@ -0,0 +1,4 @@
+import javascript
+
+from File f
+select f.getRelativePath()
diff --git a/javascript/ql/test/library-tests/TypeScript/Shebangs/shebang_bun.ts b/javascript/ql/test/library-tests/TypeScript/Shebangs/shebang_bun.ts
new file mode 100644
index 00000000000..417e04ff16a
--- /dev/null
+++ b/javascript/ql/test/library-tests/TypeScript/Shebangs/shebang_bun.ts
@@ -0,0 +1,2 @@
+#!/usr/bin/env bun
+const x: number = 1;
diff --git a/javascript/ql/test/library-tests/TypeScript/Shebangs/shebang_node.ts b/javascript/ql/test/library-tests/TypeScript/Shebangs/shebang_node.ts
new file mode 100644
index 00000000000..10b11969aa5
--- /dev/null
+++ b/javascript/ql/test/library-tests/TypeScript/Shebangs/shebang_node.ts
@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+const x: number = 1;
diff --git a/javascript/ql/test/library-tests/TypeScript/Shebangs/shebang_tsx.ts b/javascript/ql/test/library-tests/TypeScript/Shebangs/shebang_tsx.ts
new file mode 100644
index 00000000000..31331240ced
--- /dev/null
+++ b/javascript/ql/test/library-tests/TypeScript/Shebangs/shebang_tsx.ts
@@ -0,0 +1,2 @@
+#!/usr/bin/env tsx
+const x: number = 1;
diff --git a/javascript/ql/test/library-tests/TypeScript/Shebangs/tsconfig.json b/javascript/ql/test/library-tests/TypeScript/Shebangs/tsconfig.json
new file mode 100644
index 00000000000..82194fc7ab0
--- /dev/null
+++ b/javascript/ql/test/library-tests/TypeScript/Shebangs/tsconfig.json
@@ -0,0 +1,3 @@
+{
+    "include": ["."]
+}
diff --git a/javascript/ql/test/library-tests/frameworks/ReactJS/higherOrderComponent.jsx b/javascript/ql/test/library-tests/frameworks/ReactJS/higherOrderComponent.jsx
index a2c6eeb3666..a917a9dc683 100644
--- a/javascript/ql/test/library-tests/frameworks/ReactJS/higherOrderComponent.jsx
+++ b/javascript/ql/test/library-tests/frameworks/ReactJS/higherOrderComponent.jsx
@@ -5,6 +5,8 @@ import styled from 'styled-components';
 import unknownFunction from 'somewhere';
 import { hot } from 'react-hot-loader';
 import { withState } from 'recompose';
+import { observer as observer1 } from 'mobx-react';
+import { observer as observer2 } from 'mobx-react-lite';
 
 import { MyComponent } from './exportedComponent';
 
@@ -25,4 +27,6 @@ const ConnectedComponent = compose(withConnect, unknownFunction)(StyledComponent
 
 const ConnectedComponent2 = withState('counter', 'setCounter', 0)(ConnectedComponent);
 
-export default hot(module)(memo(forwardRef(ConnectedComponent2)));
+const ConnectedComponent3 = observer1(observer2(ConnectedComponent2));
+
+export default hot(module)(memo(forwardRef(ConnectedComponent3)));
diff --git a/javascript/ql/test/library-tests/frameworks/WebSocket/browser.js b/javascript/ql/test/library-tests/frameworks/WebSocket/browser.js
index 4d82c113e08..f1063ff638d 100644
--- a/javascript/ql/test/library-tests/frameworks/WebSocket/browser.js
+++ b/javascript/ql/test/library-tests/frameworks/WebSocket/browser.js
@@ -1,34 +1,34 @@
 (function () {
-	const socket = new WebSocket('ws://localhost:8080'); // $clientSocket
+	const socket = new WebSocket('ws://localhost:8080'); // $ clientSocket
 
 	socket.addEventListener('open', function (event) {
-		socket.send('Hi from browser!'); // $clientSend
+		socket.send('Hi from browser!'); // $ clientSend
 	});
 
 	socket.addEventListener('message', function (event) {
 		console.log('Message from server ', event.data); // $ remoteFlow
-	}); // $clientReceive
+	}); // $ clientReceive
 
 	socket.onmessage = function (event) {
 		console.log("Message from server 2", event.data); // $ remoteFlow
-	}; // $clientReceive
+	}; // $ clientReceive
 })();
 
 
 (function () {
-	var sock = new SockJS('http://0.0.0.0:9999/echo'); // $clientSocket
+	var sock = new SockJS('http://0.0.0.0:9999/echo'); // $ clientSocket
 	sock.onopen = function () {
-		sock.send('test'); // $clientSend
+		sock.send('test'); // $ clientSend
 	};
-	
+
 	sock.onmessage = function (e) {
 		console.log('message', e.data); // $ remoteFlow
 		sock.close();
-	}; // $clientReceive
-	
+	}; // $ clientReceive
+
 	sock.addEventListener('message', function (event) {
 		console.log('Using addEventListener ', event.data); // $ remoteFlow
-	}); // $clientReceive
+	}); // $ clientReceive
 })();
 
 export const MyWebSocket = WebSocket;
diff --git a/javascript/ql/test/library-tests/frameworks/WebSocket/client.js b/javascript/ql/test/library-tests/frameworks/WebSocket/client.js
index 7061d51a954..89d31052fd7 100644
--- a/javascript/ql/test/library-tests/frameworks/WebSocket/client.js
+++ b/javascript/ql/test/library-tests/frameworks/WebSocket/client.js
@@ -1,15 +1,15 @@
 const WebSocket = require('ws');
 
 (function () {
-	const ws = new WebSocket('ws://example.org'); // $clientSocket
+	const ws = new WebSocket('ws://example.org'); // $ clientSocket
 
 	ws.on('open', function open() {
-		ws.send('Hi from client!'); // $clientSend
+		ws.send('Hi from client!'); // $ clientSend
 	});
 
 	ws.on('message', function incoming(data) { // $ remoteFlow
 		console.log(data);
-	}); // $clientReceive
+	}); // $ clientReceive
 })();
 
 module.exports.MyWebSocketWS = require('ws');
diff --git a/javascript/ql/test/library-tests/frameworks/WebSocket/server.js b/javascript/ql/test/library-tests/frameworks/WebSocket/server.js
index a1fd536501e..44e0068a537 100644
--- a/javascript/ql/test/library-tests/frameworks/WebSocket/server.js
+++ b/javascript/ql/test/library-tests/frameworks/WebSocket/server.js
@@ -3,12 +3,12 @@ const WebSocket = require('ws');
 (function () {
 	const wss = new WebSocket.Server({ port: 8080 });
 
-	wss.on('connection', function connection(ws) { // $serverSocket
-		ws.on('message', function incoming(message) { // $remoteFlow
+	wss.on('connection', function connection(ws) { // $ serverSocket
+		ws.on('message', function incoming(message) { // $ remoteFlow
 			console.log('received: %s', message);
-		}); // $serverReceive
+		}); // $ serverReceive
 
-		ws.send('Hi from server!'); // $serverSend
+		ws.send('Hi from server!'); // $ serverSend
 	});
 })();
 
diff --git a/javascript/ql/test/library-tests/frameworks/WebSocket/sockjs.js b/javascript/ql/test/library-tests/frameworks/WebSocket/sockjs.js
index 4b599cf5fed..ae8e8285ef4 100644
--- a/javascript/ql/test/library-tests/frameworks/WebSocket/sockjs.js
+++ b/javascript/ql/test/library-tests/frameworks/WebSocket/sockjs.js
@@ -5,11 +5,11 @@ const sockjs = require('sockjs');
 const app = express();
 const server = http.createServer(app);
 const sockjs_echo = sockjs.createServer({});
-sockjs_echo.on('connection', function (conn) { // $serverSocket
-    conn.on('data', function (message) { // $remoteFlow
+sockjs_echo.on('connection', function (conn) { // $ serverSocket
+    conn.on('data', function (message) { // $ remoteFlow
         var data = JSON.parse(message);
-        conn.write(JSON.stringify(eval(data.test))); // $serverSend
-    }); // $serverReceive
+        conn.write(JSON.stringify(eval(data.test))); // $ serverSend
+    }); // $ serverReceive
 });
 
 sockjs_echo.installHandlers(server, { prefix: '/echo' });
diff --git a/javascript/ql/test/library-tests/variables/tests.expected b/javascript/ql/test/library-tests/variables/tests.expected
index 0e3d568b570..537281e159d 100644
--- a/javascript/ql/test/library-tests/variables/tests.expected
+++ b/javascript/ql/test/library-tests/variables/tests.expected
@@ -54,23 +54,30 @@ getAnAssignedExpr
 | y | let.js:19:12:19:13 | 19 |
 getDeclaringContainer
 | arrayPatternDefault.js:1:2:1:1 | arguments | arrayPatternDefault.js:1:2:4:1 | functio ... bal2;\\n} |
+| arrayPatternDefault.js:1:2:1:1 | this | arrayPatternDefault.js:1:2:4:1 | functio ... bal2;\\n} |
 | arrayPatternDefault.js:1:11:1:11 | o | arrayPatternDefault.js:1:2:4:1 | functio ... bal2;\\n} |
 | arrayPatternDefault.js:2:8:2:8 | x | arrayPatternDefault.js:1:2:4:1 | functio ... bal2;\\n} |
 | assignments.js:3:1:3:0 | arguments | assignments.js:3:1:6:1 | functio ... = 56;\\n} |
+| assignments.js:3:1:3:0 | this | assignments.js:3:1:6:1 | functio ... = 56;\\n} |
 | assignments.js:4:6:4:6 | g | assignments.js:3:1:6:1 | functio ... = 56;\\n} |
 | assignments.js:4:10:4:9 | arguments | assignments.js:4:10:4:24 | function h() {} |
+| assignments.js:4:10:4:9 | this | assignments.js:4:10:4:24 | function h() {} |
 | assignments.js:4:19:4:19 | h | assignments.js:4:10:4:24 | function h() {} |
+| defaultargs.js:1:2:1:1 | this | defaultargs.js:1:2:5:1 | functio ... ]) {}\\n} |
 | defaultargs.js:2:7:2:7 | x | defaultargs.js:1:2:5:1 | functio ... ]) {}\\n} |
 | defaultargs.js:2:10:2:18 | arguments | defaultargs.js:1:2:5:1 | functio ... ]) {}\\n} |
 | defaultargs.js:3:3:3:2 | arguments | defaultargs.js:3:3:3:25 | functio ... = x) {} |
+| defaultargs.js:3:3:3:2 | this | defaultargs.js:3:3:3:25 | functio ... = x) {} |
 | defaultargs.js:3:12:3:12 | f | defaultargs.js:1:2:5:1 | functio ... ]) {}\\n} |
 | defaultargs.js:3:14:3:14 | x | defaultargs.js:3:3:3:25 | functio ... = x) {} |
 | defaultargs.js:3:17:3:17 | y | defaultargs.js:3:3:3:25 | functio ... = x) {} |
 | defaultargs.js:4:3:4:2 | arguments | defaultargs.js:4:3:4:51 | functio ... [0]) {} |
+| defaultargs.js:4:3:4:2 | this | defaultargs.js:4:3:4:51 | functio ... [0]) {} |
 | defaultargs.js:4:12:4:12 | g | defaultargs.js:1:2:5:1 | functio ... ]) {}\\n} |
 | defaultargs.js:4:14:4:14 | x | defaultargs.js:4:3:4:51 | functio ... [0]) {} |
 | defaultargs.js:4:32:4:32 | y | defaultargs.js:4:3:4:51 | functio ... [0]) {} |
 | for.js:1:2:1:1 | arguments | for.js:1:2:5:1 | functio ...    x;\\n} |
+| for.js:1:2:1:1 | this | for.js:1:2:5:1 | functio ...    x;\\n} |
 | for.js:1:11:1:11 | o | for.js:1:2:5:1 | functio ...    x;\\n} |
 | for.js:2:7:2:7 | x | for.js:1:2:5:1 | functio ...    x;\\n} |
 | legacyletstmt.js:3:6:3:6 | x | legacyletstmt.js:1:1:8:0 | <toplevel> |
@@ -82,20 +89,26 @@ getDeclaringContainer
 | let.js:6:17:6:17 | x | let.js:1:1:22:0 | <toplevel> |
 | let.js:9:18:9:18 | x | let.js:1:1:22:0 | <toplevel> |
 | let.js:14:1:14:0 | arguments | let.js:14:1:21:1 | functio ...     }\\n} |
+| let.js:14:1:14:0 | this | let.js:14:1:21:1 | functio ...     }\\n} |
 | let.js:14:14:14:14 | x | let.js:14:1:21:1 | functio ...     }\\n} |
 | let.js:17:11:17:11 | y | let.js:14:1:21:1 | functio ...     }\\n} |
 | typeoftype.ts:1:1:1:0 | arguments | typeoftype.ts:1:1:6:1 | functio ... x\\n  }\\n} |
+| typeoftype.ts:1:1:1:0 | this | typeoftype.ts:1:1:6:1 | functio ... x\\n  }\\n} |
 | typeoftype.ts:2:7:2:7 | x | typeoftype.ts:1:1:6:1 | functio ... x\\n  }\\n} |
 | typeoftype.ts:3:3:3:2 | arguments | typeoftype.ts:3:3:5:3 | functio ... e x\\n  } |
+| typeoftype.ts:3:3:3:2 | this | typeoftype.ts:3:3:5:3 | functio ... e x\\n  } |
 | typeoftype.ts:3:12:3:12 | g | typeoftype.ts:1:1:6:1 | functio ... x\\n  }\\n} |
 | typeoftype.ts:4:9:4:9 | y | typeoftype.ts:3:3:5:3 | functio ... e x\\n  } |
 | variables.js:8:1:8:0 | arguments | variables.js:8:1:12:1 | functio ... ar x;\\n} |
+| variables.js:8:1:8:0 | this | variables.js:8:1:12:1 | functio ... ar x;\\n} |
 | variables.js:9:6:9:6 | x | variables.js:8:1:12:1 | functio ... ar x;\\n} |
 | variables.js:13:1:13:0 | arguments | variables.js:13:1:23:1 | functio ... z;\\n\\t}\\n} |
+| variables.js:13:1:13:0 | this | variables.js:13:1:23:1 | functio ... z;\\n\\t}\\n} |
 | variables.js:13:12:13:12 | y | variables.js:13:1:23:1 | functio ... z;\\n\\t}\\n} |
 | variables.js:13:15:13:15 | z | variables.js:13:1:23:1 | functio ... z;\\n\\t}\\n} |
 | variables.js:15:6:15:6 | x | variables.js:13:1:23:1 | functio ... z;\\n\\t}\\n} |
 | variables.js:16:2:16:1 | arguments | variables.js:16:2:22:2 | functio ... y+z;\\n\\t} |
+| variables.js:16:2:16:1 | this | variables.js:16:2:22:2 | functio ... y+z;\\n\\t} |
 | variables.js:16:11:16:11 | h | variables.js:13:1:23:1 | functio ... z;\\n\\t}\\n} |
 | variables.js:16:13:16:13 | z | variables.js:16:2:22:2 | functio ... y+z;\\n\\t} |
 | variables.js:18:11:18:11 | y | variables.js:16:2:22:2 | functio ... y+z;\\n\\t} |
diff --git a/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/tst.ts b/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/tst.ts
index 12a6087b3a3..307a1e0bbe2 100644
--- a/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/tst.ts
+++ b/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/tst.ts
@@ -7,7 +7,7 @@ interface MyInterface {
   constructor(): string; // $ Alert - This a called "constructor"
   new(): Date; // OK - This a constructor signature.
 
-  myNumber: 123; 
+  myNumber: 123;
 }
 
 var a : MyFunction = null as any;
@@ -25,7 +25,7 @@ class Foo {
 
   }
   myString = "foobar"
-  
+
   myMethod(): boolean {
     return Math.random() > 0.5;
   }
@@ -71,17 +71,17 @@ class StaticMethods {
 }
 
 interface Overloaded {
-  function(x: string): string; // $Alert
-  function(x: number): number; // $Alert
-  function(x: any): any; // $Alert
+  function(x: string): string; // $ Alert
+  function(x: number): number; // $ Alert
+  function(x: any): any; // $ Alert
 }
 
 abstract class AbstractFoo {
-  abstract new(): void; // $Alert
+  abstract new(): void; // $ Alert
 }
 
 abstract class AbstractFooFunction {
-  abstract function(): number; // $Alert
+  abstract function(): number; // $ Alert
 }
 
 abstract class AbstractFooConstructor {
@@ -90,12 +90,12 @@ abstract class AbstractFooConstructor {
 
 declare module "some-module" {
   interface ModuleInterface {
-    function(): void;  // $Alert
+    function(): void;  // $ Alert
   }
 }
 
 type Intersection = {
-  function(): number; // $Alert
+  function(): number; // $ Alert
 } & {
   other(): string;
 };
@@ -107,13 +107,13 @@ type Union = {
 };
 
 type Union2 = {
-  constructor(): number; // $Alert
+  constructor(): number; // $ Alert
 } | {
   valid(): string;
 };
 
 type Intersection2 = {
-  constructor(): number; // $Alert
+  constructor(): number; // $ Alert
 } & {
   other(): string;
 };
diff --git a/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/UniquePropertyNames.expected b/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/UniquePropertyNames.expected
index 81270ed3d73..d8674dcb15f 100644
--- a/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/UniquePropertyNames.expected
+++ b/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/UniquePropertyNames.expected
@@ -1,3 +1,4 @@
+| tst2.js:4:3:6:3 | getX: f ... .x;\\n  } | This property is overwritten by $@ in the same object literal. | tst2.js:12:3:14:3 | getX: f ... .x;\\n  } | another property |
 | tst2.js:8:3:10:3 | setX: f ...  x;\\n  } | This property is overwritten by $@ in the same object literal. | tst2.js:16:3:18:3 | setX: f ...  x;\\n  } | another property |
 | tst.js:20:3:20:7 | x: 23 | This property is overwritten by $@ in the same object literal. | tst.js:23:3:23:7 | x: 56 | another property |
 | tst.js:21:3:21:12 | y: "hello" | This property is overwritten by $@ in the same object literal. | tst.js:24:3:24:14 | "y": "world" | another property |
diff --git a/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/tst2.js b/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/tst2.js
index 731b0525c7b..2bbfa1d1993 100644
--- a/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/tst2.js
+++ b/javascript/ql/test/query-tests/Declarations/UniquePropertyNames/tst2.js
@@ -3,7 +3,7 @@ var o = {
 
   getX: function() {
     return this.x;
-  },
+  }, // $ Alert
 
   setX: function(x) {
     this.x = x;
diff --git a/javascript/ql/test/query-tests/Expressions/DuplicateProperty/DuplicateProperty.expected b/javascript/ql/test/query-tests/Expressions/DuplicateProperty/DuplicateProperty.expected
index a004986cf63..fb8d1a74841 100644
--- a/javascript/ql/test/query-tests/Expressions/DuplicateProperty/DuplicateProperty.expected
+++ b/javascript/ql/test/query-tests/Expressions/DuplicateProperty/DuplicateProperty.expected
@@ -1,4 +1,3 @@
-| tst2.js:4:3:6:3 | getX: f ... .x;\\n  } | This property is duplicated $@. | tst2.js:12:3:14:3 | getX: f ... .x;\\n  } | in a later property |
 | tst.js:2:3:2:16 | "key": "value" | This property is duplicated $@. | tst.js:5:3:5:16 | "key": "value" | in a later property |
 | tst.js:4:3:4:14 | "1": "value" | This property is duplicated $@. | tst.js:11:3:11:12 | 1: "value" | in a later property |
 | tst.js:5:3:5:16 | "key": "value" | This property is duplicated $@. | tst.js:6:3:6:16 | 'key': "value" | in a later property |
diff --git a/javascript/ql/test/query-tests/Expressions/DuplicateProperty/tst2.js b/javascript/ql/test/query-tests/Expressions/DuplicateProperty/tst2.js
index c673055fbf7..ac359c56498 100644
--- a/javascript/ql/test/query-tests/Expressions/DuplicateProperty/tst2.js
+++ b/javascript/ql/test/query-tests/Expressions/DuplicateProperty/tst2.js
@@ -3,11 +3,11 @@ var o = {
 
   getX: function() {
     return this.x;
-  }, // $ Alert
+  }, // $ MISSING: Alert // The structural comparison fails to treat the two 'this' variables as the same
 
   setX: function(x) {
     this.x = x;
-  },
+  }, // $ MISSING: Alert // The structural comparison fails to treat the two 'x' variables as the same
 
   getX: function() {
     return this.x;
diff --git a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/dom.js b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/dom.js
index 5d22e4a0bed..bd11d91220b 100644
--- a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/dom.js
+++ b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/dom.js
@@ -1,7 +1,7 @@
-function f(){
-    a.clientTop && a.clientTop, a.clientTop === !0; //$Alert
+function f() {
+    a.clientTop && a.clientTop, a.clientTop === !0; // $ Alert
     a && a.clientTop;
     a.clientTop, a.clientTop;
-    if(a) return a.clientTop && a.clientTop, a.clientTop === !0;
-    if(b) return b && (b.clientTop, b.clientTop && b.clientTop), null;
+    if (a) return a.clientTop && a.clientTop, a.clientTop === !0;
+    if (b) return b && (b.clientTop, b.clientTop && b.clientTop), null;
 }
diff --git a/javascript/ql/test/query-tests/Quality/UnhandledErrorInStreamPipeline/test.js b/javascript/ql/test/query-tests/Quality/UnhandledErrorInStreamPipeline/test.js
index a253f7edf00..d3b23d519d6 100644
--- a/javascript/ql/test/query-tests/Quality/UnhandledErrorInStreamPipeline/test.js
+++ b/javascript/ql/test/query-tests/Quality/UnhandledErrorInStreamPipeline/test.js
@@ -1,7 +1,7 @@
 function test() {
   {
     const stream = getStream();
-    stream.pipe(destination).on("error", e); // $Alert
+    stream.pipe(destination).on("error", e); // $ Alert
   }
   {
     const stream = getStream();
@@ -16,7 +16,7 @@ function test() {
   {
     const stream = getStream();
     const s2 = stream;
-    s2.pipe(dest).on("error", e); // $Alert
+    s2.pipe(dest).on("error", e); // $ Alert
   }
   {
     const stream = getStream();
@@ -33,7 +33,7 @@ function test() {
   {
     const s = getStream().on('error', handler);
     const d = getDest();
-    s.pipe(d); 
+    s.pipe(d);
   }
   {
     getStream().on('error', handler).pipe(dest);
@@ -42,12 +42,12 @@ function test() {
     const stream = getStream();
     stream.on('error', handleError);
     const stream2 = stream.pipe(destination);
-    stream2.pipe(destination2).on("error", e); // $Alert
+    stream2.pipe(destination2).on("error", e); // $ Alert
   }
   {
     const stream = getStream();
     stream.on('error', handleError);
-    const destination  = getDest();
+    const destination = getDest();
     destination.on('error', handleError);
     const stream2 = stream.pipe(destination);
     const s3 = stream2;
@@ -57,13 +57,13 @@ function test() {
     const stream = getStream();
     stream.on('error', handleError);
     const stream2 = stream.pipe(destination);
-    stream2.pipe(destination2).on("error", e); // $Alert
+    stream2.pipe(destination2).on("error", e); // $ Alert
   }
   { // Error handler on destination instead of source
     const stream = getStream();
     const dest = getDest();
     dest.on('error', handler);
-    stream.pipe(dest).on("error", e); // $Alert
+    stream.pipe(dest).on("error", e); // $ Alert
   }
   { // Multiple aliases, error handler on one
     const stream = getStream();
@@ -76,7 +76,7 @@ function test() {
     const stream = getStream();
     const s2 = stream.pipe(destination1);
     stream.on('error', handleError);
-    s2.pipe(destination2).on("error", e); // $Alert
+    s2.pipe(destination2).on("error", e); // $ Alert
   }
   { // Handler registered via .once
     const stream = getStream();
@@ -91,24 +91,24 @@ function test() {
   { // Handler registered for unrelated event
     const stream = getStream();
     stream.on('close', handleClose);
-    stream.pipe(dest).on("error", e); // $Alert
+    stream.pipe(dest).on("error", e); // $ Alert
   }
   { // Error handler registered after pipe, but before error
     const stream = getStream();
     stream.pipe(dest);
-    setTimeout(() => stream.on('error', handleError), 8000); // $MISSING:Alert
+    setTimeout(() => stream.on('error', handleError), 8000); // $ MISSING:Alert
   }
   { // Pipe in a function, error handler outside
     const stream = getStream();
-    function doPipe(s) { s.pipe(dest); } 
+    function doPipe(s) { s.pipe(dest); }
     stream.on('error', handleError);
     doPipe(stream);
   }
   { // Pipe in a function, error handler not set
     const stream = getStream();
-    function doPipe(s) { 
-      f = s.pipe(dest); // $Alert
-      f.on("error", e); 
+    function doPipe(s) {
+      f = s.pipe(dest); // $ Alert
+      f.on("error", e);
     }
     doPipe(stream);
   }
@@ -116,7 +116,7 @@ function test() {
     const stream = getStream();
     const event = 'error';
     stream.on(event, handleError);
-    stream.pipe(dest).on("error", e);  // $SPURIOUS:Alert
+    stream.pipe(dest).on("error", e);  // $ SPURIOUS:Alert
   }
   { // Handler assigned via variable property
     const stream = getStream();
@@ -125,7 +125,7 @@ function test() {
     stream.pipe(dest);
   }
   { // Pipe with no intermediate variable, no error handler
-    getStream().pipe(dest).on("error", e); // $Alert
+    getStream().pipe(dest).on("error", e); // $ Alert
   }
   { // Handler set via .addListener synonym
     const stream = getStream();
@@ -143,7 +143,7 @@ function test() {
   }
   { // Long chained pipe without error handler
     const stream = getStream();
-    stream.pause().setEncoding('utf8').resume().pipe(writable).on("error", e); // $Alert
+    stream.pause().setEncoding('utf8').resume().pipe(writable).on("error", e); // $ Alert
   }
   { // Long chained pipe without error handler
     const stream = getStream();
@@ -157,13 +157,13 @@ function test() {
     const notStream = getNotAStream();
     const result = notStream.pipe(writable);
     const dealWithResult = (result) => { result.subscribe(); };
-    dealWithResult(result); 
+    dealWithResult(result);
   }
   { // Non-stream with pipe method that returns subscribable object (Streams do not have subscribe method)
     const notStream = getNotAStream();
     const pipeIt = (someVariable) => { return someVariable.pipe(something); };
     let x = pipeIt(notStream);
-    x.subscribe(); 
+    x.subscribe();
   }
   { // Calling custom pipe method with no arguments
     const notStream = getNotAStream();
@@ -179,7 +179,7 @@ function test() {
   }
   { // Member access on a stream after pipe
     const notStream = getNotAStream();
-    const val = notStream.pipe(writable).on("error", e).readable; // $Alert
+    const val = notStream.pipe(writable).on("error", e).readable; // $ Alert
   }
   { // Method access on a non-stream after pipe
     const notStream = getNotAStream();
@@ -189,14 +189,14 @@ function test() {
     const fs = require('fs');
     const stream = fs.createReadStream('file.txt');
     const copyStream = stream;
-    copyStream.pipe(destination).on("error", e); // $Alert
+    copyStream.pipe(destination).on("error", e); // $ Alert
   }
   {
     const notStream = getNotAStream();
     const something = notStream.someNotStreamPropertyAccess;
     const val = notStream.pipe(writable);
   }
-  { 
+  {
     const notStream = getNotAStream();
     const something = notStream.someNotStreamPropertyAccess();
     const val = notStream.pipe(writable);
@@ -207,7 +207,7 @@ function test() {
   }
   {
     const notStream = getNotAStream();
-    notStream.pipe(()=>{});
+    notStream.pipe(() => { });
   }
   {
     const plumber = require('gulp-plumber');
@@ -230,6 +230,6 @@ function test() {
   }
   {
     const notStream = getNotAStream();
-    notStream.pipe(getStream(),()=>{});
+    notStream.pipe(getStream(), () => { });
   }
 }
diff --git a/javascript/ql/test/query-tests/Quality/UnhandledErrorInStreamPipeline/tst.js b/javascript/ql/test/query-tests/Quality/UnhandledErrorInStreamPipeline/tst.js
index 46bf969255f..c8e53c4f73e 100644
--- a/javascript/ql/test/query-tests/Quality/UnhandledErrorInStreamPipeline/tst.js
+++ b/javascript/ql/test/query-tests/Quality/UnhandledErrorInStreamPipeline/tst.js
@@ -1,11 +1,11 @@
 const fs = require('fs');
 const zlib = require('zlib');
 
-function foo(){
+function foo() {
     const source = fs.createReadStream('input.txt');
     const gzip = zlib.createGzip();
     const destination = fs.createWriteStream('output.txt.gz');
-    source.pipe(gzip).pipe(destination); // $Alert    
+    source.pipe(gzip).pipe(destination); // $ Alert
     gzip.on('error', e);
 }
 class StreamWrapper {
@@ -34,14 +34,14 @@ function zip1() {
 function zip2() {
     const zipStream = createWriteStream(zipPath);
     let wrapper = new StreamWrapper();
-    let outStream = wrapper.outputStream.pipe(zipStream); // $Alert
+    let outStream = wrapper.outputStream.pipe(zipStream); // $ Alert
     outStream.on('error', e);
 }
 
 function zip3() {
     const zipStream = createWriteStream(zipPath);
     let wrapper = new StreamWrapper();
-    wrapper.outputStream.pipe(zipStream); // $Alert
+    wrapper.outputStream.pipe(zipStream); // $ Alert
     zipStream.on('error', e);
 }
 
@@ -49,14 +49,14 @@ function zip3() {
     const zipStream = createWriteStream(zipPath);
     let wrapper = new StreamWrapper();
     let source = getStream();
-    source.pipe(wrapper.outputStream); // $Alert
+    source.pipe(wrapper.outputStream); // $ Alert
     wrapper.outputStream.on('error', e);
 }
 
 function zip4() {
     const zipStream = createWriteStream(zipPath);
     let stream = getStream();
-    let output = stream.pipe(zipStream); // $Alert
+    let output = stream.pipe(zipStream); // $ Alert
     output.on('error', e);
 }
 
@@ -89,7 +89,7 @@ class StreamWrapper3 {
 function zip5() {
     const zipStream = createWriteStream(zipPath);
     let wrapper = new StreamWrapper3();
-    wrapper.pipeIt(zipStream); // $MISSING:Alert
+    wrapper.pipeIt(zipStream); // $ MISSING:Alert
     zipStream.on('error', e);
 }
 function zip6() {
@@ -108,6 +108,6 @@ function zip7() {
     const zipStream = createWriteStream(zipPath);
     let stream = getStream();
     registerErr(stream, e);
-    stream.pipe(zipStream); // $SPURIOUS:Alert
+    stream.pipe(zipStream); // $ SPURIOUS:Alert
     zipStream.on('error', e);
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/execa.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/execa.js
index 8fcfdd42c67..76c1b0b305f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/execa.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/execa.js
@@ -3,17 +3,17 @@ import http from 'node:http'
 import url from 'url'
 
 http.createServer(async function (req, res) {
-    let filePath = url.parse(req.url, true).query["filePath"][0]; // $Source
+    let filePath = url.parse(req.url, true).query["filePath"][0]; // $ Source
 
     // Piping to stdin from a file
-    await $({ inputFile: filePath })`cat` // $Alert
+    await $({ inputFile: filePath })`cat` // $ Alert
 
     // Piping to stdin from a file
-    await execa('cat', { inputFile: filePath });  // $Alert
+    await execa('cat', { inputFile: filePath });  // $ Alert
 
     // Piping Stdout to file
-    await execa('echo', ['example3']).pipeStdout(filePath); // $Alert
+    await execa('echo', ['example3']).pipeStdout(filePath); // $ Alert
 
     // Piping all of command output to file
-    await execa('echo', ['example4'], { all: true }).pipeAll(filePath); // $Alert
+    await execa('echo', ['example4'], { all: true }).pipeAll(filePath); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/execa.js b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/execa.js
index ed7f8832f9c..c78c1f56da5 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/execa.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/CommandInjection/execa.js
@@ -3,33 +3,33 @@ import http from 'node:http'
 import url from 'url'
 
 http.createServer(async function (req, res) {
-    let cmd = url.parse(req.url, true).query["cmd"][0]; // $Source
-    let arg1 = url.parse(req.url, true).query["arg1"]; // $Source
-    let arg2 = url.parse(req.url, true).query["arg2"]; // $Source
-    let arg3 = url.parse(req.url, true).query["arg3"]; // $Source
+    let cmd = url.parse(req.url, true).query["cmd"][0]; // $ Source
+    let arg1 = url.parse(req.url, true).query["arg1"]; // $ Source
+    let arg2 = url.parse(req.url, true).query["arg2"]; // $ Source
+    let arg3 = url.parse(req.url, true).query["arg3"]; // $ Source
 
-    await $`${cmd} ${arg1} ${arg2} ${arg3}`; // $Alert
+    await $`${cmd} ${arg1} ${arg2} ${arg3}`; // $ Alert
     await $`ssh ${arg1} ${arg2} ${arg3}`; // safely escapes variables, preventing shell injection.
-    $({ shell: false }).sync`${cmd} ${arg1} ${arg2} ${arg3}`; // $Alert
-    $({ shell: true }).sync`${cmd} ${arg1} ${arg2} ${arg3}`; // $Alert
+    $({ shell: false }).sync`${cmd} ${arg1} ${arg2} ${arg3}`; // $ Alert
+    $({ shell: true }).sync`${cmd} ${arg1} ${arg2} ${arg3}`; // $ Alert
     $({ shell: false }).sync`ssh ${arg1} ${arg2} ${arg3}`; // safely escapes variables, preventing shell injection.
 
-    $.sync`${cmd} ${arg1} ${arg2} ${arg3}`; // $Alert
+    $.sync`${cmd} ${arg1} ${arg2} ${arg3}`; // $ Alert
     $.sync`ssh ${arg1} ${arg2} ${arg3}`; // safely escapes variables, preventing shell injection.
-    await $({ shell: true })`${cmd} ${arg1} ${arg2} ${arg3}`; // $Alert
-    await $({ shell: false })`${cmd} ${arg1} ${arg2} ${arg3}`; // $Alert
+    await $({ shell: true })`${cmd} ${arg1} ${arg2} ${arg3}`; // $ Alert
+    await $({ shell: false })`${cmd} ${arg1} ${arg2} ${arg3}`; // $ Alert
     await $({ shell: false })`ssh ${arg1} ${arg2} ${arg3}`; // safely escapes variables, preventing shell injection.
 
-    await execa(cmd, [arg1, arg2, arg3]); // $Alert
-    await execa(cmd, { shell: true }); // $Alert
-    await execa(cmd, [arg1, arg2, arg3], { shell: true }); // $Alert
+    await execa(cmd, [arg1, arg2, arg3]); // $ Alert
+    await execa(cmd, { shell: true }); // $ Alert
+    await execa(cmd, [arg1, arg2, arg3], { shell: true }); // $ Alert
 
-    execaSync(cmd, [arg1, arg2, arg3]); // $Alert
-    execaSync(cmd, [arg1, arg2, arg3], { shell: true }); // $Alert
+    execaSync(cmd, [arg1, arg2, arg3]); // $ Alert
+    execaSync(cmd, [arg1, arg2, arg3], { shell: true }); // $ Alert
 
-    await execaCommand(cmd + arg1 + arg2 + arg3); // $Alert
-    await execaCommand(cmd + arg1 + arg2 + arg3, { shell: true }); // $Alert
+    await execaCommand(cmd + arg1 + arg2 + arg3); // $ Alert
+    await execaCommand(cmd + arg1 + arg2 + arg3, { shell: true }); // $ Alert
 
-    execaCommandSync(cmd + arg1 + arg2 + arg3); // $Alert
-    execaCommandSync(cmd + arg1 + arg2 + arg3, { shell: true }); // $Alert
+    execaCommandSync(cmd + arg1 + arg2 + arg3); // $ Alert
+    execaCommandSync(cmd + arg1 + arg2 + arg3, { shell: true }); // $ Alert
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.expected b/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.expected
index 1d6b8781db7..aed2cabe358 100644
--- a/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.expected
@@ -3,6 +3,7 @@
 | clientSide.js:14:5:14:64 | request ... search) | clientSide.js:14:42:14:63 | window. ... .search | clientSide.js:14:13:14:63 | 'https: ... .search | The $@ of this request depends on a $@. | clientSide.js:14:13:14:63 | 'https: ... .search | URL | clientSide.js:14:42:14:63 | window. ... .search | user-provided value |
 | clientSide.js:17:5:17:58 | request ...  '/id') | clientSide.js:16:22:16:41 | window.location.hash | clientSide.js:17:13:17:57 | 'https: ... + '/id' | The $@ of this request depends on a $@. | clientSide.js:17:13:17:57 | 'https: ... + '/id' | URL | clientSide.js:16:22:16:41 | window.location.hash | user-provided value |
 | clientSide.js:21:5:21:54 | request ...  '/id') | clientSide.js:20:18:20:28 | window.name | clientSide.js:21:13:21:53 | 'https: ... + '/id' | The $@ of this request depends on a $@. | clientSide.js:21:13:21:53 | 'https: ... + '/id' | URL | clientSide.js:20:18:20:28 | window.name | user-provided value |
+| clientSide.js:27:5:27:19 | request(custom) | clientSide.js:26:20:26:56 | require ... ource() | clientSide.js:27:13:27:18 | custom | The $@ of this request depends on a $@. | clientSide.js:27:13:27:18 | custom | URL | clientSide.js:26:20:26:56 | require ... ource() | user-provided value |
 edges
 | 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 |  |
@@ -16,6 +17,8 @@ edges
 | 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 |  |
+| clientSide.js:26:11:26:16 | custom | clientSide.js:27:13:27:18 | custom | provenance |  |
+| clientSide.js:26:20:26:56 | require ... ource() | clientSide.js:26:11:26:16 | custom | provenance |  |
 nodes
 | clientSide.js:11:11:11:15 | query | semmle.label | query |
 | clientSide.js:11:19:11:40 | window. ... .search | semmle.label | window. ... .search |
@@ -33,4 +36,7 @@ nodes
 | 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 |
+| clientSide.js:26:11:26:16 | custom | semmle.label | custom |
+| clientSide.js:26:20:26:56 | require ... ource() | semmle.label | require ... ource() |
+| clientSide.js:27:13:27:18 | custom | semmle.label | custom |
 subpaths
diff --git a/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.ext.yml b/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.ext.yml
new file mode 100644
index 00000000000..950186d58df
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.ext.yml
@@ -0,0 +1,7 @@
+extensions:
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: sourceModel
+    data:
+      - ['testlib', 'Member[getBrowserSource].ReturnValue', 'browser-url-query']
+      - ['testlib', 'Member[getServerSource].ReturnValue', 'remote']
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 a91a6348dfa..79383f58521 100644
--- a/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
@@ -6,39 +6,40 @@
 | apollo.serverSide.ts:8:39:8:64 | get(fil ...  => {}) | apollo.serverSide.ts:7:36:7:44 | { files } | apollo.serverSide.ts:8:43:8:50 | file.url | The $@ of this request depends on a $@. | apollo.serverSide.ts:8:43:8:50 | file.url | URL | apollo.serverSide.ts:7:36:7:44 | { files } | user-provided value |
 | apollo.serverSide.ts:18:37:18:62 | get(fil ...  => {}) | apollo.serverSide.ts:17:34:17:42 | { files } | apollo.serverSide.ts:18:41:18:48 | file.url | The $@ of this request depends on a $@. | apollo.serverSide.ts:18:41:18:48 | file.url | URL | apollo.serverSide.ts:17:34:17:42 | { files } | user-provided value |
 | axiosInterceptors.serverSide.js:11:26:11:40 | userProvidedUrl | axiosInterceptors.serverSide.js:19:21:19:28 | req.body | axiosInterceptors.serverSide.js:11:26:11:40 | userProvidedUrl | The $@ of this request depends on a $@. | axiosInterceptors.serverSide.js:11:26:11:40 | userProvidedUrl | endpoint | axiosInterceptors.serverSide.js:19:21:19:28 | req.body | user-provided value |
-| serverSide2.js:17:28:17:47 | axios.get(targetUrl) | serverSide2.js:10:25:10:31 | req.url | serverSide2.js:17:38:17:46 | targetUrl | The $@ of this request depends on a $@. | serverSide2.js:17:38:17:46 | targetUrl | URL | serverSide2.js:10:25:10:31 | req.url | user-provided value |
-| serverSide2.js:20:29:20:49 | axios.g ... etUrl1) | serverSide2.js:9:43:9:56 | req._parsedUrl | serverSide2.js:20:39:20:48 | targetUrl1 | The $@ of this request depends on a $@. | serverSide2.js:20:39:20:48 | targetUrl1 | URL | serverSide2.js:9:43:9:56 | req._parsedUrl | user-provided value |
-| serverSide2.js:23:29:23:49 | axios.g ... etUrl2) | serverSide2.js:22:24:22:30 | req.url | serverSide2.js:23:39:23:48 | targetUrl2 | The $@ of this request depends on a $@. | serverSide2.js:23:39:23:48 | targetUrl2 | URL | serverSide2.js:22:24:22:30 | req.url | user-provided value |
-| serverSide2.js:26:29:26:49 | axios.g ... etUrl3) | serverSide2.js:11:24:11:30 | req.url | serverSide2.js:26:39:26:48 | targetUrl3 | The $@ of this request depends on a $@. | serverSide2.js:26:39:26:48 | targetUrl3 | URL | serverSide2.js:11:24:11:30 | req.url | user-provided value |
+| serverSide2.js:17:26:17:45 | axios.get(targetUrl) | serverSide2.js:10:25:10:31 | req.url | serverSide2.js:17:36:17:44 | targetUrl | The $@ of this request depends on a $@. | serverSide2.js:17:36:17:44 | targetUrl | URL | serverSide2.js:10:25:10:31 | req.url | user-provided value |
+| serverSide2.js:20:27:20:47 | axios.g ... etUrl1) | serverSide2.js:9:43:9:56 | req._parsedUrl | serverSide2.js:20:37:20:46 | targetUrl1 | The $@ of this request depends on a $@. | serverSide2.js:20:37:20:46 | targetUrl1 | URL | serverSide2.js:9:43:9:56 | req._parsedUrl | user-provided value |
+| serverSide2.js:23:27:23:47 | axios.g ... etUrl2) | serverSide2.js:22:22:22:28 | req.url | serverSide2.js:23:37:23:46 | targetUrl2 | The $@ of this request depends on a $@. | serverSide2.js:23:37:23:46 | targetUrl2 | URL | serverSide2.js:22:22:22:28 | req.url | user-provided value |
+| serverSide2.js:26:27:26:47 | axios.g ... etUrl3) | serverSide2.js:11:24:11:30 | req.url | serverSide2.js:26:37:26:46 | targetUrl3 | The $@ of this request depends on a $@. | serverSide2.js:26:37:26:46 | targetUrl3 | URL | serverSide2.js:11:24:11:30 | req.url | user-provided value |
 | serverSide.js:18:5:18:20 | request(tainted) | serverSide.js:14:29:14:35 | req.url | serverSide.js:18:13:18:19 | tainted | The $@ of this request depends on a $@. | serverSide.js:18:13:18:19 | tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
 | serverSide.js:20:5:20:24 | request.get(tainted) | serverSide.js:14:29:14:35 | req.url | serverSide.js:20:17:20:23 | tainted | The $@ of this request depends on a $@. | serverSide.js:20:17:20:23 | tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
 | serverSide.js:24:5:24:20 | request(options) | serverSide.js:14:29:14:35 | req.url | serverSide.js:23:19:23:25 | tainted | The $@ of this request depends on a $@. | serverSide.js:23:19:23:25 | tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
 | serverSide.js:26:5:26:32 | request ... ainted) | serverSide.js:14:29:14:35 | req.url | serverSide.js:26:13:26:31 | "http://" + tainted | The $@ of this request depends on a $@. | serverSide.js:26:13:26:31 | "http://" + tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
 | serverSide.js:28:5:28:43 | request ... ainted) | serverSide.js:14:29:14:35 | req.url | serverSide.js:28:13:28:42 | "http:/ ... tainted | The $@ of this request depends on a $@. | serverSide.js:28:13:28:42 | "http:/ ... tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
 | serverSide.js:30:5:30:44 | request ... ainted) | serverSide.js:14:29:14:35 | req.url | serverSide.js:30:13:30:43 | "http:/ ... tainted | The $@ of this request depends on a $@. | serverSide.js:30:13:30:43 | "http:/ ... tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
-| serverSide.js:34:5:34:42 | http.ge ... inted}) | serverSide.js:14:29:14:35 | req.url | serverSide.js:34:34:34:40 | tainted | The $@ of this request depends on a $@. | serverSide.js:34:34:34:40 | tainted | host | serverSide.js:14:29:14:35 | req.url | user-provided value |
+| serverSide.js:34:5:34:44 | http.ge ... nted }) | serverSide.js:14:29:14:35 | req.url | serverSide.js:34:35:34:41 | tainted | The $@ of this request depends on a $@. | serverSide.js:34:35:34:41 | tainted | host | serverSide.js:14:29:14:35 | req.url | user-provided value |
 | serverSide.js:36:5:36:32 | XhrIo.s ... inted)) | serverSide.js:14:29:14:35 | req.url | serverSide.js:36:16:36:31 | new Uri(tainted) | The $@ of this request depends on a $@. | serverSide.js:36:16:36:31 | new Uri(tainted) | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
 | serverSide.js:37:5:37:38 | new Xhr ... inted)) | serverSide.js:14:29:14:35 | req.url | serverSide.js:37:22:37:37 | new Uri(tainted) | The $@ of this request depends on a $@. | serverSide.js:37:22:37:37 | new Uri(tainted) | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
 | serverSide.js:41:5:41:52 | request ... nted}`) | serverSide.js:14:29:14:35 | req.url | serverSide.js:41:13:41:51 | `http:/ ... inted}` | The $@ of this request depends on a $@. | serverSide.js:41:13:41:51 | `http:/ ... inted}` | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
 | serverSide.js:43:5:43:55 | request ... nted}`) | serverSide.js:14:29:14:35 | req.url | serverSide.js:43:13:43:54 | `http:/ ... inted}` | The $@ of this request depends on a $@. | serverSide.js:43:13:43:54 | `http:/ ... inted}` | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
 | serverSide.js:45:5:45:57 | request ... ainted) | serverSide.js:14:29:14:35 | req.url | serverSide.js:45:13:45:56 | 'http:/ ... tainted | The $@ of this request depends on a $@. | serverSide.js:45:13:45:56 | 'http:/ ... tainted | URL | serverSide.js:14:29:14:35 | req.url | user-provided value |
-| serverSide.js:61:2:61:37 | client. ... inted}) | serverSide.js:58:29:58:35 | req.url | serverSide.js:61:29:61:35 | tainted | The $@ of this request depends on a $@. | serverSide.js:61:29:61:35 | tainted | URL | serverSide.js:58:29:58:35 | req.url | user-provided value |
-| serverSide.js:64:3:64:38 | client. ... inted}) | serverSide.js:58:29:58:35 | req.url | serverSide.js:64:30:64:36 | tainted | The $@ of this request depends on a $@. | serverSide.js:64:30:64:36 | tainted | URL | serverSide.js:58:29:58:35 | req.url | user-provided value |
-| serverSide.js:68:3:68:38 | client. ... inted}) | serverSide.js:58:29:58:35 | req.url | serverSide.js:68:30:68:36 | tainted | The $@ of this request depends on a $@. | serverSide.js:68:30:68:36 | tainted | URL | serverSide.js:58:29:58:35 | req.url | user-provided value |
+| serverSide.js:61:5:61:42 | client. ... nted }) | serverSide.js:58:29:58:35 | req.url | serverSide.js:61:33:61:39 | tainted | The $@ of this request depends on a $@. | serverSide.js:61:33:61:39 | tainted | URL | serverSide.js:58:29:58:35 | req.url | user-provided value |
+| serverSide.js:64:9:64:46 | client. ... nted }) | serverSide.js:58:29:58:35 | req.url | serverSide.js:64:37:64:43 | tainted | The $@ of this request depends on a $@. | serverSide.js:64:37:64:43 | tainted | URL | serverSide.js:58:29:58:35 | req.url | user-provided value |
+| serverSide.js:68:9:68:46 | client. ... nted }) | serverSide.js:58:29:58:35 | req.url | serverSide.js:68:37:68:43 | tainted | The $@ of this request depends on a $@. | serverSide.js:68:37:68:43 | tainted | URL | serverSide.js:58:29:58:35 | req.url | user-provided value |
 | serverSide.js:76:5:76:26 | JSDOM.f ... ainted) | serverSide.js:74:29:74:35 | req.url | serverSide.js:76:19:76:25 | tainted | The $@ of this request depends on a $@. | serverSide.js:76:19:76:25 | tainted | URL | serverSide.js:74:29:74:35 | req.url | user-provided value |
 | serverSide.js:84:5:84:25 | JSDOM.f ... param1) | serverSide.js:83:38:83:43 | param1 | serverSide.js:84:19:84:24 | param1 | The $@ of this request depends on a $@. | serverSide.js:84:19:84:24 | param1 | URL | serverSide.js:83:38:83:43 | param1 | user-provided value |
 | serverSide.js:90:5:90:33 | JSDOM.f ... ms.foo) | serverSide.js:90:19:90:28 | ctx.params | serverSide.js:90:19:90:32 | ctx.params.foo | The $@ of this request depends on a $@. | serverSide.js:90:19:90:32 | ctx.params.foo | URL | serverSide.js:90:19:90:28 | ctx.params | user-provided value |
 | serverSide.js:92:5:92:33 | JSDOM.f ... ms.foo) | serverSide.js:92:19:92:28 | ctx.params | serverSide.js:92:19:92:32 | ctx.params.foo | The $@ of this request depends on a $@. | serverSide.js:92:19:92:32 | ctx.params.foo | URL | serverSide.js:92:19:92:28 | ctx.params | user-provided value |
 | serverSide.js:100:5:100:26 | new Web ... ainted) | serverSide.js:98:29:98:35 | req.url | serverSide.js:100:19:100:25 | tainted | The $@ of this request depends on a $@. | serverSide.js:100:19:100:25 | tainted | URL | serverSide.js:98:29:98:35 | req.url | user-provided value |
-| serverSide.js:109:20:109:30 | new ws(url) | serverSide.js:108:17:108:27 | request.url | serverSide.js:109:27:109:29 | url | The $@ of this request depends on a $@. | serverSide.js:109:27:109:29 | url | URL | serverSide.js:108:17:108:27 | request.url | user-provided value |
-| serverSide.js:117:20:117:30 | new ws(url) | serverSide.js:115:25:115:35 | request.url | serverSide.js:117:27:117:29 | url | The $@ of this request depends on a $@. | serverSide.js:117:27:117:29 | url | URL | serverSide.js:115:25:115:35 | request.url | user-provided value |
+| serverSide.js:109:24:109:34 | new ws(url) | serverSide.js:108:21:108:31 | request.url | serverSide.js:109:31:109:33 | url | The $@ of this request depends on a $@. | serverSide.js:109:31:109:33 | url | URL | serverSide.js:108:21:108:31 | request.url | user-provided value |
+| serverSide.js:117:24:117:34 | new ws(url) | serverSide.js:115:29:115:39 | request.url | serverSide.js:117:31:117:33 | url | The $@ of this request depends on a $@. | serverSide.js:117:31:117:33 | url | URL | serverSide.js:115:29:115:39 | request.url | user-provided value |
 | serverSide.js:125:5:128:6 | axios({ ... \\n    }) | serverSide.js:123:29:123:35 | req.url | serverSide.js:127:14:127:20 | tainted | The $@ of this request depends on a $@. | serverSide.js:127:14:127:20 | tainted | URL | serverSide.js:123:29:123:35 | req.url | user-provided value |
 | serverSide.js:131:5:131:20 | axios.get(myUrl) | serverSide.js:123:29:123:35 | req.url | serverSide.js:131:15:131:19 | myUrl | The $@ of this request depends on a $@. | serverSide.js:131:15:131:19 | myUrl | URL | serverSide.js:123:29:123:35 | req.url | user-provided value |
-| serverSide.js:141:3:141:30 | axios.g ... ring()) | serverSide.js:139:17:139:29 | req.query.url | serverSide.js:141:13:141:29 | target.toString() | The $@ of this request depends on a $@. | serverSide.js:141:13:141:29 | target.toString() | URL | serverSide.js:139:17:139:29 | req.query.url | user-provided value |
-| serverSide.js:142:3:142:19 | axios.get(target) | serverSide.js:139:17:139:29 | req.query.url | serverSide.js:142:13:142:18 | target | The $@ of this request depends on a $@. | serverSide.js:142:13:142:18 | target | URL | serverSide.js:139:17:139:29 | req.query.url | user-provided value |
-| serverSide.js:143:3:143:24 | axios.g ... t.href) | serverSide.js:139:17:139:29 | req.query.url | serverSide.js:143:13:143:23 | target.href | The $@ of this request depends on a $@. | serverSide.js:143:13:143:23 | target.href | URL | serverSide.js:139:17:139:29 | req.query.url | user-provided value |
-| 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 |
+| serverSide.js:141:5:141:32 | axios.g ... ring()) | serverSide.js:139:19:139:31 | req.query.url | serverSide.js:141:15:141:31 | target.toString() | The $@ of this request depends on a $@. | serverSide.js:141:15:141:31 | target.toString() | URL | serverSide.js:139:19:139:31 | req.query.url | user-provided value |
+| serverSide.js:142:5:142:21 | axios.get(target) | serverSide.js:139:19:139:31 | req.query.url | serverSide.js:142:15:142:20 | target | The $@ of this request depends on a $@. | serverSide.js:142:15:142:20 | target | URL | serverSide.js:139:19:139:31 | req.query.url | user-provided value |
+| serverSide.js:143:5:143:26 | axios.g ... t.href) | serverSide.js:139:19:139:31 | req.query.url | serverSide.js:143:15:143:25 | target.href | The $@ of this request depends on a $@. | serverSide.js:143:15:143:25 | target.href | URL | serverSide.js:139:19:139:31 | req.query.url | user-provided value |
+| serverSide.js:145:5:145:25 | axios.g ... dedUrl) | serverSide.js:139:19:139:31 | req.query.url | serverSide.js:145:15:145:24 | encodedUrl | The $@ of this request depends on a $@. | serverSide.js:145:15:145:24 | encodedUrl | URL | serverSide.js:139:19:139:31 | req.query.url | user-provided value |
+| serverSide.js:147:5:147:25 | axios.g ... pedUrl) | serverSide.js:139:19:139:31 | req.query.url | serverSide.js:147:15:147:24 | escapedUrl | The $@ of this request depends on a $@. | serverSide.js:147:15:147:24 | escapedUrl | URL | serverSide.js:139:19:139:31 | req.query.url | user-provided value |
+| serverSide.js:151:1:151:15 | request(custom) | serverSide.js:150:16:150:51 | require ... ource() | serverSide.js:151:9:151:14 | custom | The $@ of this request depends on a $@. | serverSide.js:151:9:151:14 | custom | URL | serverSide.js:150:16:150:51 | require ... ource() | user-provided value |
 edges
 | 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 |  |
@@ -67,25 +68,25 @@ edges
 | axiosInterceptors.serverSide.js:19:21:19:28 | req.body | axiosInterceptors.serverSide.js:19:11:19:17 | { url } | 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:34:9:63 | qs.pars ... .query) | serverSide2.js:19:22:19:49 | 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: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 |  |
+| serverSide2.js:10:25:10:31 | req.url | serverSide2.js:16:21:16:39 | req.parsedQuery.url | provenance |  |
+| serverSide2.js:11:24:11:30 | req.url | serverSide2.js:25:22:25:39 | req.SomeObject.url | provenance |  |
+| serverSide2.js:16:9:16:17 | targetUrl | serverSide2.js:17:36:17:44 | targetUrl | provenance |  |
+| serverSide2.js:16:21:16:39 | req.parsedQuery.url | serverSide2.js:16:9:16:17 | targetUrl | provenance |  |
+| serverSide2.js:19:9:19:18 | targetUrl1 | serverSide2.js:20:37:20:46 | targetUrl1 | provenance |  |
+| serverSide2.js:19:22:19:49 | req.par ... rsedUrl | serverSide2.js:19:9:19:18 | targetUrl1 | provenance |  |
+| serverSide2.js:22:9:22:18 | targetUrl2 | serverSide2.js:23:37:23:46 | targetUrl2 | provenance |  |
+| serverSide2.js:22:22:22:28 | req.url | serverSide2.js:22:9:22:18 | targetUrl2 | provenance |  |
+| serverSide2.js:25:9:25:18 | targetUrl3 | serverSide2.js:26:37:26:46 | targetUrl3 | provenance |  |
+| serverSide2.js:25:22:25:39 | req.SomeObject.url | serverSide2.js:25:9:25:18 | 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:34:35:34:41 | 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 |  |
@@ -101,12 +102,12 @@ 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: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:9:58:15 | tainted | serverSide.js:61:33:61:39 | tainted | provenance |  |
+| serverSide.js:58:9:58:15 | tainted | serverSide.js:61:33:61:39 | 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:61:33:61:39 | tainted | serverSide.js:64:37:64:43 | tainted | provenance |  |
+| serverSide.js:61:33:61:39 | tainted | serverSide.js:68:37:68:43 | 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 |  |
@@ -116,34 +117,36 @@ edges
 | 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: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:108:15:108:17 | url | serverSide.js:109:31:109:33 | url | provenance |  |
+| serverSide.js:108:21:108:31 | request.url | serverSide.js:108:15:108:17 | url | provenance |  |
+| serverSide.js:115:15:115:17 | url | serverSide.js:117:31:117:33 | url | provenance |  |
+| serverSide.js:115:21:115:46 | new URL ... , base) | serverSide.js:115:15:115:17 | url | provenance |  |
+| serverSide.js:115:29:115:39 | request.url | serverSide.js:115:21:115:46 | new URL ... , base) | provenance | Config |
 | 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: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: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: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 |  |
+| serverSide.js:139:11:139:15 | input | serverSide.js:140:28:140:32 | input | provenance |  |
+| serverSide.js:139:11:139:15 | input | serverSide.js:144:34:144:38 | input | provenance |  |
+| serverSide.js:139:11:139:15 | input | serverSide.js:146:31:146:35 | input | provenance |  |
+| serverSide.js:139:19:139:31 | req.query.url | serverSide.js:139:11:139:15 | input | provenance |  |
+| serverSide.js:140:11:140:16 | target | serverSide.js:141:15:141:20 | target | provenance |  |
+| serverSide.js:140:11:140:16 | target | serverSide.js:142:15:142:20 | target | provenance |  |
+| serverSide.js:140:11:140:16 | target | serverSide.js:143:15:143:20 | target | provenance |  |
+| serverSide.js:140:20:140:33 | new URL(input) | serverSide.js:140:11:140:16 | target | provenance |  |
+| serverSide.js:140:28:140:32 | input | serverSide.js:140:20:140:33 | new URL(input) | provenance | Config |
+| serverSide.js:141:15:141:20 | target | serverSide.js:141:15:141:31 | target.toString() | provenance |  |
+| serverSide.js:143:15:143:20 | target | serverSide.js:143:15:143:25 | target.href | provenance |  |
+| serverSide.js:144:11:144:20 | encodedUrl | serverSide.js:145:15:145:24 | encodedUrl | provenance |  |
+| serverSide.js:144:24:144:39 | encodeURI(input) | serverSide.js:144:11:144:20 | encodedUrl | provenance |  |
+| serverSide.js:144:34:144:38 | input | serverSide.js:144:24:144:39 | encodeURI(input) | provenance |  |
+| serverSide.js:146:11:146:20 | escapedUrl | serverSide.js:147:15:147:24 | escapedUrl | provenance |  |
+| serverSide.js:146:24:146:36 | escape(input) | serverSide.js:146:11:146:20 | escapedUrl | provenance |  |
+| serverSide.js:146:31:146:35 | input | serverSide.js:146:24:146:36 | escape(input) | provenance |  |
+| serverSide.js:150:7:150:12 | custom | serverSide.js:151:9:151:14 | custom | provenance |  |
+| serverSide.js:150:16:150:51 | require ... ource() | serverSide.js:150:7:150:12 | custom | 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:11:4:13 | url | semmle.label | url |
@@ -183,18 +186,18 @@ nodes
 | 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: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: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: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: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 |
+| serverSide2.js:16:9:16:17 | targetUrl | semmle.label | targetUrl |
+| serverSide2.js:16:21:16:39 | req.parsedQuery.url | semmle.label | req.parsedQuery.url |
+| serverSide2.js:17:36:17:44 | targetUrl | semmle.label | targetUrl |
+| serverSide2.js:19:9:19:18 | targetUrl1 | semmle.label | targetUrl1 |
+| serverSide2.js:19:22:19:49 | req.par ... rsedUrl | semmle.label | req.par ... rsedUrl |
+| serverSide2.js:20:37:20:46 | targetUrl1 | semmle.label | targetUrl1 |
+| serverSide2.js:22:9:22:18 | targetUrl2 | semmle.label | targetUrl2 |
+| serverSide2.js:22:22:22:28 | req.url | semmle.label | req.url |
+| serverSide2.js:23:37:23:46 | targetUrl2 | semmle.label | targetUrl2 |
+| serverSide2.js:25:9:25:18 | targetUrl3 | semmle.label | targetUrl3 |
+| serverSide2.js:25:22:25:39 | req.SomeObject.url | semmle.label | req.SomeObject.url |
+| serverSide2.js:26:37:26:46 | targetUrl3 | semmle.label | targetUrl3 |
 | 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 |
@@ -207,7 +210,7 @@ nodes
 | serverSide.js:28:36:28:42 | tainted | semmle.label | tainted |
 | serverSide.js:30:13:30:43 | "http:/ ... tainted | semmle.label | "http:/ ... tainted |
 | serverSide.js:30:37:30:43 | tainted | semmle.label | tainted |
-| serverSide.js:34:34:34:40 | tainted | semmle.label | tainted |
+| serverSide.js:34:35:34:41 | tainted | semmle.label | tainted |
 | serverSide.js:36:16:36:31 | new Uri(tainted) | semmle.label | new Uri(tainted) |
 | serverSide.js:36:24:36:30 | tainted | semmle.label | tainted |
 | serverSide.js:37:22:37:37 | new Uri(tainted) | semmle.label | new Uri(tainted) |
@@ -221,10 +224,10 @@ nodes
 | 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:61:33:61:39 | tainted | semmle.label | tainted |
+| serverSide.js:61:33:61:39 | tainted | semmle.label | tainted |
+| serverSide.js:64:37:64:43 | tainted | semmle.label | tainted |
+| serverSide.js:68:37:68:43 | 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 |
@@ -239,13 +242,13 @@ nodes
 | 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: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: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:108:15:108:17 | url | semmle.label | url |
+| serverSide.js:108:21:108:31 | request.url | semmle.label | request.url |
+| serverSide.js:109:31:109:33 | url | semmle.label | url |
+| serverSide.js:115:15:115:17 | url | semmle.label | url |
+| serverSide.js:115:21:115:46 | new URL ... , base) | semmle.label | new URL ... , base) |
+| serverSide.js:115:29:115:39 | request.url | semmle.label | request.url |
+| serverSide.js:117:31:117:33 | url | semmle.label | url |
 | 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 |
@@ -253,22 +256,25 @@ nodes
 | 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:13 | input | semmle.label | input |
-| serverSide.js:139:17:139:29 | req.query.url | semmle.label | req.query.url |
-| 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 |
-| serverSide.js:141:13:141:29 | target.toString() | semmle.label | target.toString() |
-| 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: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: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 |
+| serverSide.js:139:11:139:15 | input | semmle.label | input |
+| serverSide.js:139:19:139:31 | req.query.url | semmle.label | req.query.url |
+| serverSide.js:140:11:140:16 | target | semmle.label | target |
+| serverSide.js:140:20:140:33 | new URL(input) | semmle.label | new URL(input) |
+| serverSide.js:140:28:140:32 | input | semmle.label | input |
+| serverSide.js:141:15:141:20 | target | semmle.label | target |
+| serverSide.js:141:15:141:31 | target.toString() | semmle.label | target.toString() |
+| serverSide.js:142:15:142:20 | target | semmle.label | target |
+| serverSide.js:143:15:143:20 | target | semmle.label | target |
+| serverSide.js:143:15:143:25 | target.href | semmle.label | target.href |
+| serverSide.js:144:11:144:20 | encodedUrl | semmle.label | encodedUrl |
+| serverSide.js:144:24:144:39 | encodeURI(input) | semmle.label | encodeURI(input) |
+| serverSide.js:144:34:144:38 | input | semmle.label | input |
+| serverSide.js:145:15:145:24 | encodedUrl | semmle.label | encodedUrl |
+| serverSide.js:146:11:146:20 | escapedUrl | semmle.label | escapedUrl |
+| serverSide.js:146:24:146:36 | escape(input) | semmle.label | escape(input) |
+| serverSide.js:146:31:146:35 | input | semmle.label | input |
+| serverSide.js:147:15:147:24 | escapedUrl | semmle.label | escapedUrl |
+| serverSide.js:150:7:150:12 | custom | semmle.label | custom |
+| serverSide.js:150:16:150:51 | require ... ource() | semmle.label | require ... ource() |
+| serverSide.js:151:9:151:14 | custom | semmle.label | custom |
 subpaths
diff --git a/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.ext.yml b/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.ext.yml
new file mode 100644
index 00000000000..950186d58df
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.ext.yml
@@ -0,0 +1,7 @@
+extensions:
+  - addsTo:
+      pack: codeql/javascript-all
+      extensible: sourceModel
+    data:
+      - ['testlib', 'Member[getBrowserSource].ReturnValue', 'browser-url-query']
+      - ['testlib', 'Member[getServerSource].ReturnValue', 'remote']
diff --git a/javascript/ql/test/query-tests/Security/CWE-918/clientSide.js b/javascript/ql/test/query-tests/Security/CWE-918/clientSide.js
index aa4174cd9ab..a8e29602f1f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-918/clientSide.js
+++ b/javascript/ql/test/query-tests/Security/CWE-918/clientSide.js
@@ -22,4 +22,7 @@ export function MyComponent() {
     request('https://example.com/api?q=' + name);
 
     request(window.location.href + '?q=123');
+
+    const custom = require('testlib').getBrowserSource(); // $ Source[js/client-side-request-forgery]
+    request(custom); // $ Alert[js/client-side-request-forgery]
 }
diff --git a/javascript/ql/test/query-tests/Security/CWE-918/serverSide.js b/javascript/ql/test/query-tests/Security/CWE-918/serverSide.js
index c578b268e40..c359312738b 100644
--- a/javascript/ql/test/query-tests/Security/CWE-918/serverSide.js
+++ b/javascript/ql/test/query-tests/Security/CWE-918/serverSide.js
@@ -10,7 +10,7 @@ import url from 'url';
 let XhrIo = goog.require('goog.net.XhrIo');
 let Uri = goog.require('goog.Uri');
 
-var server = http.createServer(function(req, res) {
+var server = http.createServer(function (req, res) {
     var tainted = url.parse(req.url, true).query.url; // $ Source[js/request-forgery]
 
     request("example.com");
@@ -31,7 +31,7 @@ var server = http.createServer(function(req, res) {
 
     request("http://example.com/?" + tainted);
 
-    http.get(relativeUrl, {host: tainted}); // $ Alert[js/request-forgery]
+    http.get(relativeUrl, { host: tainted }); // $ Alert[js/request-forgery]
 
     XhrIo.send(new Uri(tainted)); // $ Alert[js/request-forgery]
     new XhrIo().send(new Uri(tainted)); // $ Alert[js/request-forgery]
@@ -54,23 +54,23 @@ var server = http.createServer(function(req, res) {
 })
 
 var CDP = require("chrome-remote-interface");
-var server = http.createServer(async function(req, res) {
+var server = http.createServer(async function (req, res) {
     var tainted = url.parse(req.url, true).query.url; // $ Source[js/request-forgery]
 
     var client = await CDP(options);
-	client.Page.navigate({url: tainted}); // $ Alert[js/request-forgery]
-	
-	CDP(options).catch((ignored) => {}).then((client) => {
-		client.Page.navigate({url: tainted}); // $ Alert[js/request-forgery]
-	})
-	
-	CDP(options, (client) => {
-		client.Page.navigate({url: tainted}); // $ Alert[js/request-forgery]
-	});
+    client.Page.navigate({ url: tainted }); // $ Alert[js/request-forgery]
+
+    CDP(options).catch((ignored) => { }).then((client) => {
+        client.Page.navigate({ url: tainted }); // $ Alert[js/request-forgery]
+    })
+
+    CDP(options, (client) => {
+        client.Page.navigate({ url: tainted }); // $ Alert[js/request-forgery]
+    });
 })
 
-import {JSDOM} from "jsdom";
-var server = http.createServer(async function(req, res) {
+import { JSDOM } from "jsdom";
+var server = http.createServer(async function (req, res) {
     var tainted = url.parse(req.url, true).query.url; // $ Source[js/request-forgery]
 
     JSDOM.fromURL(tainted); // $ Alert[js/request-forgery]
@@ -93,8 +93,8 @@ router.get('/', async (ctx, next) => {
 });
 app.use(router.routes());
 
-import {JSDOM} from "jsdom";
-var server = http.createServer(async function(req, res) {
+import { JSDOM } from "jsdom";
+var server = http.createServer(async function (req, res) {
     var tainted = url.parse(req.url, true).query.url; // $ Source[js/request-forgery]
 
     new WebSocket(tainted); // $ Alert[js/request-forgery]
@@ -103,23 +103,23 @@ var server = http.createServer(async function(req, res) {
 
 import * as ws from 'ws';
 
-new ws.Server({ port: 8080 }).on('connection', function(socket, request) {
-  socket.on('message', function(message) {
-    const url = request.url; // $ Source[js/request-forgery]
-    const socket = new ws(url); // $ Alert[js/request-forgery]
-  });
+new ws.Server({ port: 8080 }).on('connection', function (socket, request) {
+    socket.on('message', function (message) {
+        const url = request.url; // $ Source[js/request-forgery]
+        const socket = new ws(url); // $ Alert[js/request-forgery]
+    });
 });
 
 new ws.Server({ port: 8080 }).on('connection', function (socket, request) {
-  socket.on('message', function (message) {
-    const url = new URL(request.url, base); // $ Source[js/request-forgery]
-    const target = new URL(url.pathname, base);
-    const socket = new ws(url); // $ Alert[js/request-forgery]
-  });
+    socket.on('message', function (message) {
+        const url = new URL(request.url, base); // $ Source[js/request-forgery]
+        const target = new URL(url.pathname, base);
+        const socket = new ws(url); // $ Alert[js/request-forgery]
+    });
 });
 
 
-var server2 = http.createServer(function(req, res) {
+var server2 = http.createServer(function (req, res) {
     var tainted = url.parse(req.url, true).query.url; // $ Source[js/request-forgery]
 
     axios({
@@ -127,22 +127,25 @@ var server2 = http.createServer(function(req, res) {
         url: tainted // $ Sink[js/request-forgery]
     }) // $ Alert[js/request-forgery]
 
-    var myUrl = `${something}/bla/${tainted}`; 
+    var myUrl = `${something}/bla/${tainted}`;
     axios.get(myUrl); // $ Alert[js/request-forgery]
 
-    var myEncodedUrl = `${something}/bla/${encodeURIComponent(tainted)}`; 
+    var myEncodedUrl = `${something}/bla/${encodeURIComponent(tainted)}`;
     axios.get(myEncodedUrl);
 })
 
-var server2 = http.createServer(function(req, res) {
-  const { URL } = require('url'); 
-  const input = req.query.url; // $Source[js/request-forgery]
-  const target = new URL(input);
-  axios.get(target.toString()); // $Alert[js/request-forgery]
-  axios.get(target); // $Alert[js/request-forgery]
-  axios.get(target.href); // $Alert[js/request-forgery]
-  const encodedUrl = encodeURI(input);
-  axios.get(encodedUrl); // $Alert[js/request-forgery]
-  const escapedUrl = escape(input);
-  axios.get(escapedUrl); // $Alert[js/request-forgery]
+var server2 = http.createServer(function (req, res) {
+    const { URL } = require('url');
+    const input = req.query.url; // $ Source[js/request-forgery]
+    const target = new URL(input);
+    axios.get(target.toString()); // $ Alert[js/request-forgery]
+    axios.get(target); // $ Alert[js/request-forgery]
+    axios.get(target.href); // $ Alert[js/request-forgery]
+    const encodedUrl = encodeURI(input);
+    axios.get(encodedUrl); // $ Alert[js/request-forgery]
+    const escapedUrl = escape(input);
+    axios.get(escapedUrl); // $ Alert[js/request-forgery]
 });
+
+const custom = require('testlib').getServerSource(); // $ Source[js/request-forgery]
+request(custom); // $ Alert[js/request-forgery]
diff --git a/javascript/ql/test/query-tests/Security/CWE-918/serverSide2.js b/javascript/ql/test/query-tests/Security/CWE-918/serverSide2.js
index 7743d0eec38..77919eb4074 100644
--- a/javascript/ql/test/query-tests/Security/CWE-918/serverSide2.js
+++ b/javascript/ql/test/query-tests/Security/CWE-918/serverSide2.js
@@ -6,22 +6,22 @@ const app = express();
 const PORT = 3000;
 
 app.use((req, res, next) => {
-  req.parsedQueryFromParsedUrl = qs.parse(req._parsedUrl.query);  // $Source[js/request-forgery]
-  req.parsedQuery.url = req.url || {}; // $Source[js/request-forgery]
-  req.SomeObject.url = req.url; // $Source[js/request-forgery]
+  req.parsedQueryFromParsedUrl = qs.parse(req._parsedUrl.query);  // $ Source[js/request-forgery]
+  req.parsedQuery.url = req.url || {}; // $ Source[js/request-forgery]
+  req.SomeObject.url = req.url; // $ Source[js/request-forgery]
   next();
 });
 
 app.get('/proxy', async (req, res) => {
-    const targetUrl = req.parsedQuery.url;  
-    const response = await axios.get(targetUrl); // $Alert[js/request-forgery]
+  const targetUrl = req.parsedQuery.url;
+  const response = await axios.get(targetUrl); // $ Alert[js/request-forgery]
 
-    const targetUrl1 = req.parsedQueryFromParsedUrl.url;  
-    const response1 = await axios.get(targetUrl1); // $Alert[js/request-forgery]
- 
-    const targetUrl2 = req.url || {};  // $Source[js/request-forgery]
-    const response2 = await axios.get(targetUrl2);  // $Alert[js/request-forgery]
+  const targetUrl1 = req.parsedQueryFromParsedUrl.url;
+  const response1 = await axios.get(targetUrl1); // $ Alert[js/request-forgery]
 
-    const targetUrl3 = req.SomeObject.url || {};
-    const response3 = await axios.get(targetUrl3);  // $Alert[js/request-forgery]
+  const targetUrl2 = req.url || {};  // $ Source[js/request-forgery]
+  const response2 = await axios.get(targetUrl2);  // $ Alert[js/request-forgery]
+
+  const targetUrl3 = req.SomeObject.url || {};
+  const response3 = await axios.get(targetUrl3);  // $ Alert[js/request-forgery]
 });
diff --git a/javascript/ql/test/query-tests/Statements/LoopIterationSkippedDueToShifting/LoopIterationSkippedDueToShifting.expected b/javascript/ql/test/query-tests/Statements/LoopIterationSkippedDueToShifting/LoopIterationSkippedDueToShifting.expected
index cfe2b5f4f58..bc2d12c2c44 100644
--- a/javascript/ql/test/query-tests/Statements/LoopIterationSkippedDueToShifting/LoopIterationSkippedDueToShifting.expected
+++ b/javascript/ql/test/query-tests/Statements/LoopIterationSkippedDueToShifting/LoopIterationSkippedDueToShifting.expected
@@ -1,5 +1,5 @@
 | tst.js:4:27:4:44 | parts.splice(i, 1) | Removing an array item without adjusting the loop index 'i' causes the subsequent array item to be skipped. |
 | tst.js:13:29:13:46 | parts.splice(i, 1) | Removing an array item without adjusting the loop index 'i' causes the subsequent array item to be skipped. |
 | tst.js:24:9:24:26 | parts.splice(i, 1) | Removing an array item without adjusting the loop index 'i' causes the subsequent array item to be skipped. |
-| tst.js:128:11:128:33 | pending ... e(i, 1) | Removing an array item without adjusting the loop index 'i' causes the subsequent array item to be skipped. |
-| tst.js:153:11:153:26 | toc.splice(i, 1) | Removing an array item without adjusting the loop index 'i' causes the subsequent array item to be skipped. |
+| tst.js:128:7:128:29 | pending ... e(i, 1) | Removing an array item without adjusting the loop index 'i' causes the subsequent array item to be skipped. |
+| tst.js:153:12:153:27 | toc.splice(i, 1) | Removing an array item without adjusting the loop index 'i' causes the subsequent array item to be skipped. |
diff --git a/javascript/ql/test/query-tests/Statements/LoopIterationSkippedDueToShifting/tst.js b/javascript/ql/test/query-tests/Statements/LoopIterationSkippedDueToShifting/tst.js
index 01f046d1c1e..b3fd2bfa6bc 100644
--- a/javascript/ql/test/query-tests/Statements/LoopIterationSkippedDueToShifting/tst.js
+++ b/javascript/ql/test/query-tests/Statements/LoopIterationSkippedDueToShifting/tst.js
@@ -33,8 +33,8 @@ function decrementAfter(string) {
   let parts = string.split('/');
   for (let i = 0; i < parts.length; ++i) {
     if (parts[i] === 'X') {
-        parts.splice(i, 1);
-        --i;
+      parts.splice(i, 1);
+      --i;
     }
   }
   return parts.join('/');
@@ -44,7 +44,7 @@ function postDecrementArgument(string) {
   let parts = string.split('/');
   for (let i = 0; i < parts.length; ++i) {
     if (parts[i] === 'X') {
-        parts.splice(i--, 1);
+      parts.splice(i--, 1);
     }
   }
   return parts.join('/');
@@ -55,8 +55,8 @@ function breakAfter(string) {
   let parts = string.split('/');
   for (let i = 0; i < parts.length; ++i) {
     if (parts[i] === 'X') {
-        parts.splice(i, 1); // OK - only removes first occurrence
-        break;
+      parts.splice(i, 1); // OK - only removes first occurrence
+      break;
     }
   }
   return parts.join('/');
@@ -66,7 +66,7 @@ function insertNewElements(string) {
   let parts = string.split('/');
   for (let i = 0; i < parts.length; ++i) {
     if (parts[i] === 'X') {
-        parts.splice(i, 1, '.'); // OK - no shifting due to insert
+      parts.splice(i, 1, '.'); // OK - no shifting due to insert
     }
   }
   return parts.join('/');
@@ -89,7 +89,7 @@ function spliceAfterLoopNested(string) {
   for (let j = 0; j < parts.length; ++j) {
     let i = j;
     for (; i < parts.length; ++i) {
-        if (parts[i] === 'X') break;
+      if (parts[i] === 'X') break;
     }
     parts.splice(i, 1); // OK - not inside 'i' loop
   }
@@ -124,10 +124,10 @@ function inspectNextElement(string) {
 
 function withTryCatch(pendingCSS) {
   for (let i = 0; i < pendingCSS.length; ++i) {
-      try {
-          pendingCSS.splice(i, 1); // $ SPURIOUS:Alert
-          i -= 1;
-      } catch (ex) {}
+    try {
+      pendingCSS.splice(i, 1); // $ SPURIOUS:Alert
+      i -= 1;
+    } catch (ex) { }
   }
 }
 
@@ -139,9 +139,9 @@ function andOperand(toc) {
 
 function ifStatement(toc) {
   for (let i = 0; i < toc.length; i++) {
-    if(toc[i].ignoreSubHeading){
-      if(toc.splice(i, 1)){
-        i--; 
+    if (toc[i].ignoreSubHeading) {
+      if (toc.splice(i, 1)) {
+        i--;
       }
     }
   }
@@ -149,8 +149,8 @@ function ifStatement(toc) {
 
 function ifStatement2(toc) {
   for (let i = 0; i < toc.length; i++) {
-    if(toc[i].ignoreSubHeading){
-      if(!toc.splice(i, 1)){ // $Alert
+    if (toc[i].ignoreSubHeading) {
+      if (!toc.splice(i, 1)) { // $ Alert
         i--;
       }
     }
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.aho-corasick-1.1.3.bazel b/misc/bazel/3rdparty/py_deps/BUILD.aho-corasick-1.1.3.bazel
index e8bbd96a1c5..19fb311dc77 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.aho-corasick-1.1.3.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.aho-corasick-1.1.3.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anstream-0.6.18.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anstream-0.6.18.bazel
index dba6f5a5313..c447208da1e 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.anstream-0.6.18.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anstream-0.6.18.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-1.0.10.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-1.0.10.bazel
index a6c3752b60f..5646802d7c8 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-1.0.10.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-1.0.10.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-parse-0.2.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-parse-0.2.6.bazel
index 5f8c366ff87..a3db2f4cf0e 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-parse-0.2.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-parse-0.2.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-query-1.1.2.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-query-1.1.2.bazel
index 598ea5da3af..974053fa210 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-query-1.1.2.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-query-1.1.2.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-wincon-3.0.7.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-wincon-3.0.7.bazel
index ce4d5dc8abd..4e55fe14335 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.anstyle-wincon-3.0.7.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anstyle-wincon-3.0.7.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.anyhow-1.0.95.bazel b/misc/bazel/3rdparty/py_deps/BUILD.anyhow-1.0.95.bazel
index 34ea952cd26..c2bbc00cde7 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.anyhow-1.0.95.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.anyhow-1.0.95.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.cc-1.2.14.bazel b/misc/bazel/3rdparty/py_deps/BUILD.cc-1.2.14.bazel
index e3f89bafb19..eb579ddb2fe 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.cc-1.2.14.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.cc-1.2.14.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.clap-4.5.30.bazel b/misc/bazel/3rdparty/py_deps/BUILD.clap-4.5.30.bazel
index 7ddd490dffc..7846c81d4b7 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.clap-4.5.30.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.clap-4.5.30.bazel
@@ -70,6 +70,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.clap_builder-4.5.30.bazel b/misc/bazel/3rdparty/py_deps/BUILD.clap_builder-4.5.30.bazel
index c44b8554ad4..9e32f334ec2 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.clap_builder-4.5.30.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.clap_builder-4.5.30.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.clap_lex-0.7.4.bazel b/misc/bazel/3rdparty/py_deps/BUILD.clap_lex-0.7.4.bazel
index 231ff9c856e..7e672468ebb 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.clap_lex-0.7.4.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.clap_lex-0.7.4.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.colorchoice-1.0.3.bazel b/misc/bazel/3rdparty/py_deps/BUILD.colorchoice-1.0.3.bazel
index 94d46209718..f9a26a33bf3 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.colorchoice-1.0.3.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.colorchoice-1.0.3.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.is_terminal_polyfill-1.70.1.bazel b/misc/bazel/3rdparty/py_deps/BUILD.is_terminal_polyfill-1.70.1.bazel
index 6528f5edc54..acd21224d11 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.is_terminal_polyfill-1.70.1.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.is_terminal_polyfill-1.70.1.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.itoa-1.0.14.bazel b/misc/bazel/3rdparty/py_deps/BUILD.itoa-1.0.14.bazel
index b9b1384da8d..1121f1c6fa8 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.itoa-1.0.14.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.itoa-1.0.14.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.log-0.4.25.bazel b/misc/bazel/3rdparty/py_deps/BUILD.log-0.4.25.bazel
index 5d8cb464baf..a6e892fc3e2 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.log-0.4.25.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.log-0.4.25.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.memchr-2.7.4.bazel b/misc/bazel/3rdparty/py_deps/BUILD.memchr-2.7.4.bazel
index 290610f2234..92c05c11576 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.memchr-2.7.4.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.memchr-2.7.4.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.once_cell-1.20.3.bazel b/misc/bazel/3rdparty/py_deps/BUILD.once_cell-1.20.3.bazel
index ad2cdfd44f6..d9b023658c4 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.once_cell-1.20.3.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.once_cell-1.20.3.bazel
@@ -67,6 +67,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.proc-macro2-1.0.93.bazel b/misc/bazel/3rdparty/py_deps/BUILD.proc-macro2-1.0.93.bazel
index 0dc7bb180d1..de386a5fb13 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.proc-macro2-1.0.93.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.proc-macro2-1.0.93.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.quote-1.0.38.bazel b/misc/bazel/3rdparty/py_deps/BUILD.quote-1.0.38.bazel
index f14687523f0..fd1be054161 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.quote-1.0.38.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.quote-1.0.38.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.regex-1.11.1.bazel b/misc/bazel/3rdparty/py_deps/BUILD.regex-1.11.1.bazel
index a450cf23e5b..4363055577d 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.regex-1.11.1.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.regex-1.11.1.bazel
@@ -80,6 +80,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.regex-automata-0.4.9.bazel b/misc/bazel/3rdparty/py_deps/BUILD.regex-automata-0.4.9.bazel
index 95353401fa8..ed2546bbd8a 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.regex-automata-0.4.9.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.regex-automata-0.4.9.bazel
@@ -85,6 +85,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.regex-syntax-0.8.5.bazel b/misc/bazel/3rdparty/py_deps/BUILD.regex-syntax-0.8.5.bazel
index be5fade3f8b..59c59087303 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.regex-syntax-0.8.5.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.regex-syntax-0.8.5.bazel
@@ -73,6 +73,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.ryu-1.0.19.bazel b/misc/bazel/3rdparty/py_deps/BUILD.ryu-1.0.19.bazel
index 7f8fb872113..275c416bec6 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.ryu-1.0.19.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.ryu-1.0.19.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.serde-1.0.217.bazel b/misc/bazel/3rdparty/py_deps/BUILD.serde-1.0.217.bazel
index c2f3f0b2f1e..04b9339ef8e 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.serde-1.0.217.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.serde-1.0.217.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.serde_derive-1.0.217.bazel b/misc/bazel/3rdparty/py_deps/BUILD.serde_derive-1.0.217.bazel
index 49ca3826b70..3836976f89e 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.serde_derive-1.0.217.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.serde_derive-1.0.217.bazel
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.serde_json-1.0.138.bazel b/misc/bazel/3rdparty/py_deps/BUILD.serde_json-1.0.138.bazel
index 6f981174de7..c36081cf133 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.serde_json-1.0.138.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.serde_json-1.0.138.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.shlex-1.3.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.shlex-1.3.0.bazel
index 3a7b5dd13f3..8de318e16ce 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.shlex-1.3.0.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.shlex-1.3.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.smallvec-1.14.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.smallvec-1.14.0.bazel
index 5ef3609e865..afc560f32d2 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.smallvec-1.14.0.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.smallvec-1.14.0.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.streaming-iterator-0.1.9.bazel b/misc/bazel/3rdparty/py_deps/BUILD.streaming-iterator-0.1.9.bazel
index c693289d0d5..1fb4f82d40b 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.streaming-iterator-0.1.9.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.streaming-iterator-0.1.9.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.strsim-0.11.1.bazel b/misc/bazel/3rdparty/py_deps/BUILD.strsim-0.11.1.bazel
index 89f35680ecd..a350fe401c6 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.strsim-0.11.1.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.strsim-0.11.1.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.syn-2.0.98.bazel b/misc/bazel/3rdparty/py_deps/BUILD.syn-2.0.98.bazel
index 74c276c55b2..756de2c409a 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.syn-2.0.98.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.syn-2.0.98.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.thiserror-1.0.69.bazel b/misc/bazel/3rdparty/py_deps/BUILD.thiserror-1.0.69.bazel
index c085df67e5c..4c5de787505 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.thiserror-1.0.69.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.thiserror-1.0.69.bazel
@@ -68,6 +68,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.thiserror-impl-1.0.69.bazel b/misc/bazel/3rdparty/py_deps/BUILD.thiserror-impl-1.0.69.bazel
index f2dc22a0d19..f2b15bc166f 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.thiserror-impl-1.0.69.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.thiserror-impl-1.0.69.bazel
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.24.7.bazel b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.24.7.bazel
index a37116c26fb..475770bc957 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.24.7.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.24.7.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.12.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.12.0.bazel
index 3917bb3d165..3a5a51895a6 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.12.0.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.12.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-language-0.1.5.bazel b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-language-0.1.5.bazel
index de6215593a4..e35100f228a 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-language-0.1.5.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-language-0.1.5.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.unicode-ident-1.0.16.bazel b/misc/bazel/3rdparty/py_deps/BUILD.unicode-ident-1.0.16.bazel
index cf6899aafa0..9754167cc21 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.unicode-ident-1.0.16.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.unicode-ident-1.0.16.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.utf8parse-0.2.2.bazel b/misc/bazel/3rdparty/py_deps/BUILD.utf8parse-0.2.2.bazel
index caf972ae7c8..813c2349a87 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.utf8parse-0.2.2.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.utf8parse-0.2.2.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows-sys-0.59.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows-sys-0.59.0.bazel
index aba90d60cc2..1c3cf791f0f 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows-sys-0.59.0.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows-sys-0.59.0.bazel
@@ -68,6 +68,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows-targets-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows-targets-0.52.6.bazel
index 469d31b2fec..eab2d920044 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows-targets-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows-targets-0.52.6.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
index f4b8a614e6f..413560f9a9a 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
index 82e1c57e2ab..41270f37827 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnu-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnu-0.52.6.bazel
index b0904b98ca8..635e04fb829 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnu-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnu-0.52.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
index 78e37e28693..aa701fa5f9e 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_msvc-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_msvc-0.52.6.bazel
index 6406d8c7c69..51a7afa148f 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_msvc-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_i686_msvc-0.52.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
index e5e5950f643..95bb840fe66 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
index 9107aa2b364..e7cc05336f3 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel b/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
index 326deb21750..dd7abf4671c 100644
--- a/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
+++ b/misc/bazel/3rdparty/py_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/py_deps/defs.bzl b/misc/bazel/3rdparty/py_deps/defs.bzl
index 90b5a7b640c..70e6051ac93 100644
--- a/misc/bazel/3rdparty/py_deps/defs.bzl
+++ b/misc/bazel/3rdparty/py_deps/defs.bzl
@@ -154,7 +154,7 @@ def all_crate_deps(
         normal (bool, optional): If True, normal dependencies are included in the
             output list.
         normal_dev (bool, optional): If True, normal dev dependencies will be
-            included in the output list..
+            included in the output list.
         proc_macro (bool, optional): If True, proc_macro dependencies are included
             in the output list.
         proc_macro_dev (bool, optional): If True, dev proc_macro dependencies are
@@ -408,6 +408,7 @@ _CONDITIONS = {
     "aarch64-unknown-nto-qnx710": ["@rules_rust//rust/platform:aarch64-unknown-nto-qnx710"],
     "aarch64-unknown-uefi": ["@rules_rust//rust/platform:aarch64-unknown-uefi"],
     "arm-unknown-linux-gnueabi": ["@rules_rust//rust/platform:arm-unknown-linux-gnueabi"],
+    "arm-unknown-linux-musleabi": ["@rules_rust//rust/platform:arm-unknown-linux-musleabi"],
     "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"],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.adler2-2.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.adler2-2.0.1.bazel
index 15d108fcbec..2a2e575fd12 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.adler2-2.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.adler2-2.0.1.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.3.bazel
index d47c7298b75..29ac012c763 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.aho-corasick-1.1.3.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.allocator-api2-0.2.21.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.allocator-api2-0.2.21.bazel
index b1ca8b4a42d..4fe1a5ae3db 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.allocator-api2-0.2.21.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.allocator-api2-0.2.21.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android_system_properties-0.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android_system_properties-0.1.5.bazel
index a133ae2799b..165cf9da2fd 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android_system_properties-0.1.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.android_system_properties-0.1.5.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.20.bazel
index ebd0e844157..bd6489b11e3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.20.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.20.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.11.bazel
index bf8779d93c9..1739823d66f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.11.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.11.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.7.bazel
index 4a81b5ca7fa..d2c9594f554 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.7.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.4.bazel
index 2004f465f53..fe3361ea411 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.4.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.10.bazel
index cc610fb0aa9..822d2d90ec4 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.10.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.10.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.100.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.100.bazel
index 5d8502998aa..48f6fcce142 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.100.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.100.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-0.2.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-0.2.1.bazel
index 32b9ff0d9c7..4a1e9ba7915 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-0.2.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.argfile-0.2.1.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.arrayvec-0.7.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.arrayvec-0.7.6.bazel
index b9e36249cf7..4f70598af85 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.arrayvec-0.7.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.arrayvec-0.7.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.1.bazel
index b0be5564bb5..dfa4a0f21eb 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.atomic-0.6.1.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.5.0.bazel
index 2be65fdc967..8eb4be76a1b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.5.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.5.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.base64-0.22.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.base64-0.22.1.bazel
index 17d891f3c2c..089c4eb1ba8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.base64-0.22.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.base64-0.22.1.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-1.3.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-1.3.2.bazel
index b9b25068599..3c554f70f16 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-1.3.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-1.3.2.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.9.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.9.4.bazel
index 1bfb8cf8e15..1e9bde485ea 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.9.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bitflags-2.9.4.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.7.bazel
index cf4d5c3aaa1..cdf0bd3bcde 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.7.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.boxcar-0.2.14.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.boxcar-0.2.14.bazel
index cfc997b9101..1238ed9a02b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.boxcar-0.2.14.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.boxcar-0.2.14.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.12.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.12.0.bazel
index 04c40d43016..efe6232bbf7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.12.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bstr-1.12.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.19.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.19.0.bazel
index bd48b980b9a..223a747c07a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.19.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.19.0.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.23.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.23.2.bazel
index 05edb30b608..6ef9d8ce918 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.23.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bytemuck-1.23.2.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.12.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.12.bazel
index b138a8c2f3d..250bb124b51 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.12.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.camino-1.1.12.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.2.0.bazel
index e4ee9d80fbd..1a1a383b639 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-platform-0.2.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.8.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.8.2.bazel
index 7564be022f1..802e8d67808 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.8.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.8.2.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.21.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.21.0.bazel
index 95acbcc53aa..aefea796d4c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.21.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.21.0.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.37.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.37.bazel
index ef757a77cac..c747c1c3c4f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.37.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.37.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.3.bazel
index 6df1698a8b4..66d5b40eb23 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg-if-1.0.3.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg_aliases-0.2.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg_aliases-0.2.1.bazel
index 093182c2bdd..3845773a67b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg_aliases-0.2.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cfg_aliases-0.2.1.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 09fe4a1d194..d43c7b6b893 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
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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
index 6f83f8a3128..c7b526db2fb 100644
--- 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
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.103.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.103.0.bazel
index 61c81e205d3..7f20b012de9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.103.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.103.0.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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
index 01017b869eb..2d796bef0b6 100644
--- 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
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.103.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.103.0.bazel
index 4f15fef15d6..b5bb39ea428 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.103.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-recursive-0.103.0.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 3b35ec7bf2b..f1124f1108f 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
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.42.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.42.bazel
index 0b5f1b3f916..41e2b0285ec 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.42.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.42.bazel
@@ -76,6 +76,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
@@ -142,6 +143,9 @@ rust_library(
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
             "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # arm-unknown-linux-gnueabi
         ],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
+            "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # arm-unknown-linux-musleabi
+        ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
             "@vendor_ts__iana-time-zone-0.1.63//:iana_time_zone",  # armv7-linux-androideabi
         ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.48.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.48.bazel
index 07b70d3c00e..1ef4252fc09 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.48.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.48.bazel
@@ -74,6 +74,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.48.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.48.bazel
index d4778d3ba49..f15804a6928 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.48.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.48.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.47.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.47.bazel
index 30ec5af6c1f..d203b2121e8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.47.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.47.bazel
@@ -64,6 +64,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.5.bazel
index 54194c27503..a5a6cca1fe8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.5.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.4.bazel
index 3fde0013d95..5956c5ff8f7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.4.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.core-foundation-sys-0.8.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.core-foundation-sys-0.8.7.bazel
index d7c24a33e09..fdbed4c6dc7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.core-foundation-sys-0.8.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.core-foundation-sys-0.8.7.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.countme-3.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.countme-3.0.1.bazel
index 6471b14ab04..24e1b277c8e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.countme-3.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.countme-3.0.1.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.1.0.bazel
index 934e00d1c70..ca4a3e64b05 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.1.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cov-mark-2.1.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.5.0.bazel
index f626b633f13..46c3fb30a59 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.5.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crc32fast-1.5.0.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.15.bazel
index c179f7d4da0..3a6999466ae 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.15.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-channel-0.5.15.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.6.bazel
index 0208adb97be..5d08b0a7259 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-deque-0.8.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.18.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.18.bazel
index 627145e84ee..bded5897eb8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.18.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-epoch-0.9.18.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-queue-0.3.12.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-queue-0.3.12.bazel
index 52201cf8a8b..18797ac294c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-queue-0.3.12.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-queue-0.3.12.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.21.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.21.bazel
index 18ae31e2eca..ba484864b40 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.21.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.crossbeam-utils-0.8.21.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.21.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.21.3.bazel
index 4c292c1d710..a9572a79a81 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.21.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.21.3.bazel
@@ -68,6 +68,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.21.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.21.3.bazel
index 85fc26280ae..22e3ea592f6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.21.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.21.3.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.21.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.21.3.bazel
index 84a6db16b68..99c3af7e2e4 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.21.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.21.3.bazel
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 9dfad53ceb5..c9a20e45392 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
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.5.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.5.3.bazel
index 68432d606f8..850713a2e45 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.5.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.5.3.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 c021a09033e..41aae8ab1ec 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
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.drop_bomb-0.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.drop_bomb-0.1.5.bazel
index 2d4581a50d9..d63db7ce6aa 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.drop_bomb-0.1.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.drop_bomb-0.1.5.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dunce-1.0.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dunce-1.0.5.bazel
index df9735fb044..c47d2917bf6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dunce-1.0.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dunce-1.0.5.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dyn-clone-1.0.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dyn-clone-1.0.20.bazel
index c810715cbc8..40f78950a02 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dyn-clone-1.0.20.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dyn-clone-1.0.20.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.15.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.15.0.bazel
index 7889b2bacd1..f0853ff36b7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.15.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.either-1.15.0.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.3.bazel
index bc79eea8cb9..c59d0a9a316 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ena-0.14.3.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel
index c9577c65f88..c88ddeb86a8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-0.2.33.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-japanese-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-japanese-1.20141219.5.bazel
index 2479888abce..fc81caebaa9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-japanese-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-japanese-1.20141219.5.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel
index 4bfdf59c286..6776c8f8f2f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-korean-1.20141219.5.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel
index 8b4274d602b..cd8250d7be6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-simpchinese-1.20141219.5.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel
index a53f1999f2c..3466817c9f0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-singlebyte-1.20141219.5.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel
index b6a7ad2993b..e98585004e6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding-index-tradchinese-1.20141219.5.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding_index_tests-0.1.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding_index_tests-0.1.4.bazel
index a68310e470d..987bc9667d3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding_index_tests-0.1.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.encoding_index_tests-0.1.4.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.equivalent-1.0.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.equivalent-1.0.2.bazel
index c262f8362d7..251b726dcc9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.equivalent-1.0.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.equivalent-1.0.2.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.erased-serde-0.4.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.erased-serde-0.4.6.bazel
index 3eebca66b45..7c25af54774 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.erased-serde-0.4.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.erased-serde-0.4.6.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.figment-0.10.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.figment-0.10.19.bazel
index 9f707fe589a..4bb767ff10e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.figment-0.10.19.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.figment-0.10.19.bazel
@@ -72,6 +72,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
@@ -114,6 +115,9 @@ rust_library(
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
             "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
+            "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
+        ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
             "@vendor_ts__atomic-0.6.1//:atomic",  # cfg(any(target_pointer_width = "8", target_pointer_width = "16", target_pointer_width = "32"))
         ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.find-msvc-tools-0.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.find-msvc-tools-0.1.1.bazel
index c04dd7706d6..8fc8c9a81e2 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.find-msvc-tools-0.1.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.find-msvc-tools-0.1.1.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fixedbitset-0.4.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fixedbitset-0.4.2.bazel
index 2e2ffe86c6a..b41f13ec6e5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fixedbitset-0.4.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fixedbitset-0.4.2.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.2.bazel
index 6b919bce0b8..efc1a622b66 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.flate2-1.1.2.bazel
@@ -67,6 +67,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fnv-1.0.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fnv-1.0.7.bazel
index c3eab8bc83c..80252992a21 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fnv-1.0.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fnv-1.0.7.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.foldhash-0.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.foldhash-0.1.5.bazel
index 7d6f47fa04f..8fc2c7d51b8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.foldhash-0.1.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.foldhash-0.1.5.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.form_urlencoded-1.2.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.form_urlencoded-1.2.2.bazel
index e496ef247da..7d4cbdcdecb 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.form_urlencoded-1.2.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.form_urlencoded-1.2.2.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 263df3abe82..657e1cd8a4a 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
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fsevent-sys-4.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fsevent-sys-4.1.0.bazel
index ece66edee6c..cb938292839 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fsevent-sys-4.1.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fsevent-sys-4.1.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel
index 060ec5e07d9..484accede2c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.fst-0.4.7.bazel
@@ -68,6 +68,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.3.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.3.3.bazel
index 47a353d3df9..d09e3ce7a4a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.3.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.3.3.bazel
@@ -68,6 +68,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
@@ -128,6 +129,9 @@ rust_library(
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
             "@vendor_ts__libc-0.2.175//: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:arm-unknown-linux-musleabi": [
+            "@vendor_ts__libc-0.2.175//: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.175//: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"))))
         ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.3.bazel
index 6ce6e3c9719..d26541b4fca 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.3.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.16.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.16.bazel
index 8a77be50b7f..0f83adee8e7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.16.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.globset-0.4.16.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.12.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.12.3.bazel
index 57dc7dc0b07..83f146a6367 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.12.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.12.3.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.14.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.14.5.bazel
index dadefeac311..a485aa4c1e6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.14.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.14.5.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.5.bazel
index b7b644fb681..a51bce9391a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.5.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 c4549368f6c..badd7cb2721 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
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.5.0.bazel
index 78a22ad0140..a8e52fe9b29 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.5.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.heck-0.5.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hermit-abi-0.5.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hermit-abi-0.5.2.bazel
index a7fa4e0c9e1..0db33a0a48a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hermit-abi-0.5.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hermit-abi-0.5.2.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hex-0.4.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hex-0.4.3.bazel
index 2d7ca484cad..702f649e110 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hex-0.4.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hex-0.4.3.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.home-0.5.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.home-0.5.11.bazel
index 3f5d6f3e711..97b2f5a5b94 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.home-0.5.11.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.home-0.5.11.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.63.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.63.bazel
index 2363e88f60e..d66d4803a46 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.63.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.63.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 0a2ab447f06..fe120c04689 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
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_collections-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_collections-2.0.0.bazel
index 03ec6ed98b2..4d6d3133825 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_collections-2.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_collections-2.0.0.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_locale_core-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_locale_core-2.0.0.bazel
index 78b39e2617e..b0cb71a3299 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_locale_core-2.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_locale_core-2.0.0.bazel
@@ -67,6 +67,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer-2.0.0.bazel
index a99daf34fd7..460c5de79a2 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer-2.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer-2.0.0.bazel
@@ -67,6 +67,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer_data-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer_data-2.0.0.bazel
index a54e63d5cbc..f5367ece66c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer_data-2.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_normalizer_data-2.0.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties-2.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties-2.0.1.bazel
index 31ae1bf654d..4416b825305 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties-2.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties-2.0.1.bazel
@@ -67,6 +67,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties_data-2.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties_data-2.0.1.bazel
index f74ecbdc568..e7aa78908e3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties_data-2.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_properties_data-2.0.1.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_provider-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_provider-2.0.0.bazel
index cdb3b7c9449..08e96e830c7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_provider-2.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.icu_provider-2.0.0.bazel
@@ -68,6 +68,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ident_case-1.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ident_case-1.0.1.bazel
index de24b64e74b..44123d03908 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ident_case-1.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ident_case-1.0.1.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna-1.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna-1.1.0.bazel
index c79d20f3a9e..afb404176fd 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna-1.1.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna-1.1.0.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna_adapter-1.2.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna_adapter-1.2.1.bazel
index 538648fc1eb..7f44f43eac2 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna_adapter-1.2.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.idna_adapter-1.2.1.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 f3c41fc7d20..13298f4aa2c 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
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.11.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.11.4.bazel
index 339324bc897..53cca2f5677 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.11.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.11.4.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inlinable_string-0.1.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inlinable_string-0.1.15.bazel
index 838f8dfd6ce..662494b3e79 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inlinable_string-0.1.15.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inlinable_string-0.1.15.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.11.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.11.0.bazel
index 687f07ab93b..6be5e3be9d9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.11.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-0.11.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.5.bazel
index c9e73bfb91c..9316b8d907c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.inotify-sys-0.1.5.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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
index 4135430c0dd..ee299069b1e 100644
--- 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
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.is_terminal_polyfill-1.70.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.is_terminal_polyfill-1.70.1.bazel
index 178eb9ea801..637041b51c3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.is_terminal_polyfill-1.70.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.is_terminal_polyfill-1.70.1.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.12.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.12.1.bazel
index 8c01d09ec29..ff3ee2442f8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.12.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.12.1.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.14.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.14.0.bazel
index ff6f7e18e76..6e2c04598d0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.14.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itertools-0.14.0.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itoa-1.0.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itoa-1.0.15.bazel
index 64e8b1bf5db..57e6f406e90 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itoa-1.0.15.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.itoa-1.0.15.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jobserver-0.1.34.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jobserver-0.1.34.bazel
index 6f7696c7983..2546f6c8a77 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jobserver-0.1.34.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jobserver-0.1.34.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
@@ -124,6 +125,9 @@ rust_library(
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
             "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
+        ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
             "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jod-thread-1.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jod-thread-1.0.0.bazel
index 9659dec0e4b..91f0e1ff55d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jod-thread-1.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.jod-thread-1.0.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.78.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.78.bazel
index 3a2d6e01b80..91569ee3526 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.78.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.78.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.1.1.bazel
index 2163666cef7..3943bd7e1b9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.1.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.1.1.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.0.4.bazel
index a162ce9265a..dadf3b16e81 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.0.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-sys-1.0.4.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.la-arena-0.3.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.la-arena-0.3.1.bazel
index 078852cfe3c..ab216fe6e83 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.la-arena-0.3.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.la-arena-0.3.1.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lazy_static-1.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lazy_static-1.5.0.bazel
index 204862e396e..c81cfa64f50 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lazy_static-1.5.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lazy_static-1.5.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.175.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.175.bazel
index b00d5c2476c..b63baa0019d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.175.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libc-0.2.175.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel
index 6570e76db93..423b236b28f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.line-index-0.1.2.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.litemap-0.8.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.litemap-0.8.0.bazel
index 47e14a2a214..47c9e11a8b9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.litemap-0.8.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.litemap-0.8.0.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.13.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.13.bazel
index e369edeb455..465339500a5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.13.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.13.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.3.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.3.9.bazel
index a2b546f0520..45798b37ab7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.3.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.3.9.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.28.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.28.bazel
index b3bed18c81c..26a8978cb1b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.28.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.log-0.4.28.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.2.0.bazel
index cc8ef40941e..3e43dd562ab 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.matchers-0.2.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memchr-2.7.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memchr-2.7.5.bazel
index 03b04580ea9..2338b0077da 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memchr-2.7.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.memchr-2.7.5.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 3485ee47710..8bac1c6d8e7 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
@@ -68,6 +68,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.9.bazel
index 6f1ca1a97da..48322b462ca 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miniz_oxide-0.8.9.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.0.4.bazel
index 539da180bb7..4b6fcc8c864 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.0.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.0.4.bazel
@@ -67,6 +67,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
@@ -132,6 +133,9 @@ rust_library(
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
             "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
+        ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
             "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.1.bazel
index 8025e8f3b2c..aa7509dd1fe 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.miow-0.6.1.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mustache-0.9.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mustache-0.9.0.bazel
index aec7c2bd00b..51e1d88fe23 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mustache-0.9.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mustache-0.9.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nohash-hasher-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nohash-hasher-0.2.0.bazel
index 6ed4e8027e7..ea49f4108a1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nohash-hasher-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nohash-hasher-0.2.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-8.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-8.2.0.bazel
index 6d024f0d1d9..0c838f2c6c3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-8.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-8.2.0.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
@@ -135,6 +136,10 @@ rust_library(
             "@vendor_ts__inotify-0.11.0//:inotify",  # 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-musleabi": [
+            "@vendor_ts__inotify-0.11.0//:inotify",  # 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.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-types-2.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-types-2.0.0.bazel
index 643378311dd..f690f5b4249 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-types-2.0.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.notify-types-2.0.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.50.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.50.1.bazel
index a12b6b5e5d7..03714107c72 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.50.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.nu-ansi-term-0.50.1.bazel
@@ -73,6 +73,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-conv-0.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-conv-0.1.0.bazel
index 7f7685c0d5b..587cbdf418f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-conv-0.1.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num-conv-0.1.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 97a0e0a2f13..6b95a1d7743 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
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.17.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.17.0.bazel
index 0cd3c5c33dd..00293e65e2d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.17.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.num_cpus-1.17.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
@@ -124,6 +125,9 @@ rust_library(
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
             "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
+        ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
             "@vendor_ts__libc-0.2.175//:libc",  # cfg(not(windows))
         ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.21.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.21.3.bazel
index 686dd8f6a79..d10ec0a4bce 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.21.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.21.3.bazel
@@ -67,6 +67,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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
index dc02094678d..968db54eafe 100644
--- 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
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.oorandom-11.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.oorandom-11.1.5.bazel
index 826c14777f0..72de567588f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.oorandom-11.1.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.oorandom-11.1.5.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ordered-float-2.10.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ordered-float-2.10.1.bazel
index e9e1714252b..58f67759d31 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ordered-float-2.10.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ordered-float-2.10.1.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.1.1.bazel
index b957f54c950..05f864c1758 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.1.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.os_str_bytes-7.1.1.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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
index d10b3e75896..27bb71298a8 100644
--- 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
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.4.bazel
index 4bc7f4f9bb8..b93d8562fad 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.4.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.11.bazel
index e602d4cf358..f2199e602c2 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.11.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.11.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
@@ -132,6 +133,9 @@ rust_library(
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
             "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
+        ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
             "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear-0.2.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear-0.2.9.bazel
index a806ba783a6..ccc77659375 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear-0.2.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pear-0.2.9.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 d37a7916d11..2b0175999d4 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
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.percent-encoding-2.3.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.percent-encoding-2.3.2.bazel
index 925777f7837..8a8d1e9e3c9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.percent-encoding-2.3.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.percent-encoding-2.3.2.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.7.bazel
index 3dcdb7841a8..8ba85de58da 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-0.4.7.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-1.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-1.0.1.bazel
index 66c6d44fb9c..120842ef4fb 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-1.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.perf-event-open-sys-1.0.1.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 96b02e10e07..1ad22b9f498 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
@@ -67,6 +67,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pin-project-lite-0.2.16.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pin-project-lite-0.2.16.bazel
index 613c24f7cbc..9234efd2e0e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pin-project-lite-0.2.16.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pin-project-lite-0.2.16.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pkg-config-0.3.32.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pkg-config-0.3.32.bazel
index e03ef295d21..806b9c904c7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pkg-config-0.3.32.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.pkg-config-0.3.32.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.11.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.11.1.bazel
index c8afae58b26..ba1a8734eaa 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.11.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.11.1.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.potential_utf-0.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.potential_utf-0.1.3.bazel
index 343962c4585..4a5d00884b1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.potential_utf-0.1.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.potential_utf-0.1.3.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.powerfmt-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.powerfmt-0.2.0.bazel
index 9d58835a336..4f67e7c1603 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.powerfmt-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.powerfmt-0.2.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.21.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.21.bazel
index 8043ecaee06..a4b01dcbc67 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.21.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.21.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.101.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.101.bazel
index b979922bfcf..bb23160f9b8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.101.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.101.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 e97d61f229b..9a309e0d43a 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
@@ -70,6 +70,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.41.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.41.bazel
index bf89a7251f3..621cfb33ab4 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.41.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.quote-1.0.41.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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
index 778a94832fb..d71877ee91c 100644
--- 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
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.123.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.123.0.bazel
index de56de7393c..6222aecac16 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.123.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.123.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.123.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.123.0.bazel
index 5d4250c41bc..6d510190f02 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.123.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.123.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.123.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.123.0.bazel
index bf33fe6c892..b8d5f8af922 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.123.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.123.0.bazel
@@ -67,6 +67,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.123.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.123.0.bazel
index b3dcedb0ec5..f25a9e19768 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.123.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.123.0.bazel
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.121.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.121.0.bazel
index 88d4046a03a..1ba187aeb8f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.121.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.121.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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
index 4971fc67e03..5ed4bd3f912 100644
--- 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
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.121.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.121.0.bazel
index c5eaeddb683..987599aa964 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.121.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.121.0.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.123.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.123.0.bazel
index bd2180aa2c5..e81038a0084 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.123.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.123.0.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.301.bazel
index 2c5fe2ea244..60cece39191 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.301.bazel
@@ -73,6 +73,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.301.bazel
index a3eb4397b88..35af421f023 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.301.bazel
@@ -68,6 +68,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.301.bazel
index 648552243c8..50b4f2e87d1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.301.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.301.bazel
index a138ff5c887..c1272206d93 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.301.bazel
@@ -73,6 +73,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.301.bazel
index 8811733c690..bd85f440ba5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.301.bazel
@@ -77,6 +77,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.301.bazel
index 87e6fa6e904..1593a5a8db9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.301.bazel
@@ -78,6 +78,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.301.bazel
index c9b81576e38..2dbbe4f7717 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.301.bazel
@@ -76,6 +76,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.301.bazel
index 6c023eedf9a..66d015a2efb 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.301.bazel
@@ -76,6 +76,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.301.bazel
index 4542092adf9..9216daa25b5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.301.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.301.bazel
index 137cdb42e44..cc43b8dd630 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.301.bazel
@@ -72,6 +72,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.301.bazel
index 2fbff68fc77..bdf4d297074 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.301.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.301.bazel
index e31fb6afe34..2134a4d9cbc 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.301.bazel
@@ -68,6 +68,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.301.bazel
index d3627c8e09d..5210ea74ec8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.301.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.301.bazel
index 62382cb6834..12961c51aec 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.301.bazel
@@ -71,6 +71,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.301.bazel
index bda44ea0ec5..cb28397b3ab 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.301.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
@@ -111,6 +112,9 @@ rust_library(
             "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
             "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
         ],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
+            "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
+        ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
             "@vendor_ts__libc-0.2.175//:libc",  # cfg(all(target_os = "linux", target_env = "gnu"))
             "@vendor_ts__perf-event-0.4.7//:perf_event",  # cfg(all(target_os = "linux", not(target_env = "ohos")))
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.301.bazel
index e54b95b9252..8f551d7bd0b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.301.bazel
@@ -73,6 +73,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.301.bazel
index d1a49cd5f95..ccd6eb8aefa 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.301.bazel
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.301.bazel
index fa784c663a8..0b47ce03347 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.301.bazel
@@ -70,6 +70,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.301.bazel
index 4d81268c7ba..41c6f4f8cc7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.301.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
@@ -131,6 +132,9 @@ rust_library(
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
             "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
+        "@rules_rust//rust/platform:arm-unknown-linux-musleabi": [
+            "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
+        ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
             "@vendor_ts__libc-0.2.175//:libc",  # cfg(unix)
         ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.301.bazel
index 2413110f255..e5548afe6ab 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.301.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.301.bazel
index 4f0ccf66d07..646c0f8c2f4 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.301.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.301.bazel
index 8688fe6dde8..2956a594ec1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.301.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.301.bazel
index 4e3842c4f09..e5b2117f769 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.301.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.301.bazel
index bca4bbf5f85..67dd8bdd610 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.301.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.301.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.301.bazel
index 8f09f78c4b0..e0c3859bfa3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.301.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.301.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.2.bazel
index 1e5b380c8e8..adf2414f3af 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.2.bazel
@@ -70,6 +70,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 d95c304574e..63fd0014d76 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
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.9.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.9.3.bazel
index 02b349c691a..0ae8f72c261 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.9.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.9.3.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.11.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.11.0.bazel
index b022fcc5c8f..c867d354a77 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.11.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-1.11.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.13.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.13.0.bazel
index 293c4247781..29542077f37 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.13.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rayon-core-1.13.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.17.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.17.bazel
index 4f235ca509f..ec928fcac82 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.17.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.17.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-1.0.24.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-1.0.24.bazel
index aa00cedf811..8b96305dfa7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-1.0.24.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-1.0.24.bazel
@@ -68,6 +68,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 283e6bf5a8f..56045a5d8dd 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
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.3.bazel
index 67446df2cc3..2dff7cf5444 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-1.11.3.bazel
@@ -80,6 +80,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.11.bazel
index b921cf34fd2..77270d5287f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.11.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-automata-0.4.11.bazel
@@ -89,6 +89,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.6.bazel
index 8591bbb61ad..20579d899f0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.regex-syntax-0.8.6.bazel
@@ -73,6 +73,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.15.15.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.15.15.bazel
index 8dd1734cb0b..45eaa325827 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.15.15.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rowan-0.15.15.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-1.1.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-1.1.0.bazel
index 2e1e394414b..c2d2a8ecadb 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-1.1.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-1.1.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.1.bazel
index 3510d2a1ecb..233e17d9085 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-hash-2.1.1.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.4.bazel
index e28c0bc4178..8a273994a82 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.4.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.2.bazel
index adfeba65d21..0803a2e277e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.2.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.3+llvm-462a31f5a5ab.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.3+llvm-462a31f5a5ab.bazel
index 0120f3ea41b..0bf75234574 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.3+llvm-462a31f5a5ab.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc_apfloat-0.2.3+llvm-462a31f5a5ab.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.22.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.22.bazel
index 03476d43a93..442f3ba0590 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.22.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.22.bazel
@@ -65,6 +65,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.20.bazel
index 5b099b034d2..8550c107af8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.20.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.20.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.23.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.23.0.bazel
index 6a57925fb36..25fcd798c65 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.23.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.23.0.bazel
@@ -70,6 +70,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.23.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.23.0.bazel
index 2fa60dda2d7..a3cc0e24a36 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.23.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.23.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.23.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.23.0.bazel
index 622d2817781..5d9bd4b0935 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.23.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.23.0.bazel
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.same-file-1.0.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.same-file-1.0.6.bazel
index 01d9cc94d56..1ae75e4d777 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.same-file-1.0.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.same-file-1.0.6.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 7229003a1d0..69546680a9f 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
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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
index 757f0deab3c..1fe84d175b3 100644
--- 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
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scoped-tls-1.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scoped-tls-1.0.1.bazel
index 6083076913d..83ffd8145e7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scoped-tls-1.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scoped-tls-1.0.1.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scopeguard-1.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scopeguard-1.2.0.bazel
index e9f53614a25..fd65460b977 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scopeguard-1.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.scopeguard-1.2.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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
index 1a284015551..192a6088028 100644
--- 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
@@ -67,6 +67,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.26.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.26.bazel
index b50da61882e..a495f639d42 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.26.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.semver-1.0.26.bazel
@@ -70,6 +70,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.228.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.228.bazel
index c8b33b40bfe..f21954648d6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.228.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-1.0.228.bazel
@@ -75,6 +75,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-untagged-0.1.8.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-untagged-0.1.8.bazel
index 61298a6ffb6..099925888d5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-untagged-0.1.8.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-untagged-0.1.8.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-value-0.7.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-value-0.7.0.bazel
index 4225c41bd21..5ccd9ac3b51 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-value-0.7.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde-value-0.7.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_core-1.0.228.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_core-1.0.228.bazel
index 2052a7e95a1..4f597ff13ac 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_core-1.0.228.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_core-1.0.228.bazel
@@ -70,6 +70,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.228.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.228.bazel
index 55489195f29..f6d5b8be14a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.228.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_derive-1.0.228.bazel
@@ -64,6 +64,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.145.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.145.bazel
index c1beaef5896..eaee1ee4b28 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.145.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.145.bazel
@@ -132,6 +132,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-0.6.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-0.6.9.bazel
index cfd8057e492..c5d9c5336e6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-0.6.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-0.6.9.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-1.0.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-1.0.2.bazel
index 6e22434699e..ac82ae1e149 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-1.0.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-1.0.2.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.14.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.14.1.bazel
index b34c3aebce9..2500ec6a49b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.14.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.14.1.bazel
@@ -71,6 +71,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.14.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.14.1.bazel
index adec2841a5f..fe552ca2a28 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.14.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.14.1.bazel
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 0baae2b420d..42f05a8553a 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
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel
index d51e394269a..504c16d3ed6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.sharded-slab-0.1.7.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.shlex-1.3.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.shlex-1.3.0.bazel
index 9c85601923b..1b3b26b2284 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.shlex-1.3.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.shlex-1.3.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.15.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.15.1.bazel
index ef1a58e47b6..9ffaf6afce7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.15.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smallvec-1.15.1.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smol_str-0.3.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smol_str-0.3.2.bazel
index ba66fdd7cff..954df9a6361 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smol_str-0.3.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.smol_str-0.3.2.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.stable_deref_trait-1.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.stable_deref_trait-1.2.0.bazel
index d01e1329328..a726ed9d70a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.stable_deref_trait-1.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.stable_deref_trait-1.2.0.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.streaming-iterator-0.1.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.streaming-iterator-0.1.9.bazel
index 70243163889..7f8b002061e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.streaming-iterator-0.1.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.streaming-iterator-0.1.9.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.strsim-0.11.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.strsim-0.11.1.bazel
index 3b807674bb6..2d86e10662e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.strsim-0.11.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.strsim-0.11.1.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.106.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.106.bazel
index b771972149b..50cde9ced99 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.106.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.106.bazel
@@ -74,6 +74,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.2.bazel
index 100a3963472..fa9cc6081a5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.2.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.temp-dir-0.1.16.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.temp-dir-0.1.16.bazel
index b8c9c3fa890..37f2db5c210 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.temp-dir-0.1.16.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.temp-dir-0.1.16.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.text-size-1.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.text-size-1.1.1.bazel
index 24c4e086a8e..7dadc9eea33 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.text-size-1.1.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.text-size-1.1.1.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thin-vec-0.2.14.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thin-vec-0.2.14.bazel
index 20749982e65..c930359eefe 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thin-vec-0.2.14.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thin-vec-0.2.14.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-2.0.16.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-2.0.16.bazel
index d4da859d348..3e1ae194c3b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-2.0.16.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-2.0.16.bazel
@@ -72,6 +72,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.16.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.16.bazel
index 9bce5c77e1d..9d87f60d5d1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.16.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.16.bazel
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.9.bazel
index 5fdccb311d1..01efca58790 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thread_local-1.1.9.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.43.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.43.bazel
index 095ed4f18ce..c3ee5405393 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.43.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.43.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.6.bazel
index c97b1837f2e..57d22c65064 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.6.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.24.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.24.bazel
index 74e05258e0c..08d61498717 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.24.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.24.bazel
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tinystr-0.8.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tinystr-0.8.1.bazel
index af42b4cbcb1..896bfb0dd66 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tinystr-0.8.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tinystr-0.8.1.bazel
@@ -68,6 +68,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.8.23.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.8.23.bazel
index f772d5dcdc2..50cb78eec1e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.8.23.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.8.23.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.9.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.9.7.bazel
index 73249141b0f..04609ea84f5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.9.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.9.7.bazel
@@ -68,6 +68,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.6.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.6.11.bazel
index 2d752cc867d..2673acb9f66 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.6.11.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.6.11.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.7.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.7.2.bazel
index 662a538d5b7..f0a1a3502d0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.7.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.7.2.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 4a3081f858a..b8a2048b67f 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
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_parser-1.0.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_parser-1.0.3.bazel
index 9920a989d97..3ad30e38760 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_parser-1.0.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_parser-1.0.3.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_write-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_write-0.1.2.bazel
index b25d3e86f9f..61e730c7939 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_write-0.1.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_write-0.1.2.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_writer-1.0.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_writer-1.0.3.bazel
index 178d3e98f70..2bed2419242 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_writer-1.0.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_writer-1.0.3.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 48d06e879a6..183d4cdd586 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
@@ -70,6 +70,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.30.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.30.bazel
index 16782034af3..8f607d2a321 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.30.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.30.bazel
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.34.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.34.bazel
index e758ef8b8e9..c30ffdd41df 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.34.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.34.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-flame-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-flame-0.2.0.bazel
index 310b8a8a6d2..23e0eab2f41 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-flame-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-flame-0.2.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 292b84993bc..9cd5f33c7cd 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
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.20.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.20.bazel
index a118ed152c5..f0c94ca745b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.20.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-subscriber-0.3.20.bazel
@@ -78,6 +78,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.25.9.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.25.9.bazel
index aec4b5a2fa4..fd97779c54c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.25.9.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-0.25.9.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.25.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.25.0.bazel
index 4d3af159e79..c9dd60b03c0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.25.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-embedded-template-0.25.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 613b9ec6fd1..6b9a7bf0582 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
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.5.bazel
index 956e222a8f0..b950d1343c8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tree-sitter-language-0.1.5.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 f1b7c0f0118..0b7ce3a9a29 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
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 443ca47fa2c..f939b4b9493 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
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.14.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.14.bazel
index 480f760f197..f1774bfb2f0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.14.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.triomphe-0.1.14.bazel
@@ -67,6 +67,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typed-arena-2.0.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typed-arena-2.0.2.bazel
index f0af1025ad3..1cf6200569b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typed-arena-2.0.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typed-arena-2.0.2.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typeid-1.0.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typeid-1.0.3.bazel
index 07d0afb6bd7..0e5737ac61b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typeid-1.0.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.typeid-1.0.3.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.uncased-0.9.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.uncased-0.9.10.bazel
index 3a95385b785..f677429c07b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.uncased-0.9.10.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.uncased-0.9.10.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ungrammar-1.16.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ungrammar-1.16.1.bazel
index 473cc4ece53..680143ae606 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ungrammar-1.16.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ungrammar-1.16.1.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.19.bazel
index 0879a535547..75aa1ff078a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.19.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.19.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-properties-0.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-properties-0.1.3.bazel
index fc560bc6d41..b621e469421 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-properties-0.1.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-properties-0.1.3.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-xid-0.2.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-xid-0.2.6.bazel
index 0d91b8333d9..c5725abf313 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-xid-0.2.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-xid-0.2.6.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unsafe-libyaml-0.2.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unsafe-libyaml-0.2.11.bazel
index 089e3d57c69..c5a1e9accf9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unsafe-libyaml-0.2.11.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unsafe-libyaml-0.2.11.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.url-2.5.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.url-2.5.7.bazel
index 7f701fa2f9a..043bed2ca2c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.url-2.5.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.url-2.5.7.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8_iter-1.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8_iter-1.0.4.bazel
index f933e15e86f..9ebd1462558 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8_iter-1.0.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8_iter-1.0.4.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8parse-0.2.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8parse-0.2.2.bazel
index 436b71c8e8b..186b6221a21 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8parse-0.2.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.utf8parse-0.2.2.bazel
@@ -64,6 +64,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.1.bazel
index 020a37ab945..73f685b51f7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.1.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.version_check-0.9.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.version_check-0.9.5.bazel
index 43b406d0976..e742e2f5c3c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.version_check-0.9.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.version_check-0.9.5.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.walkdir-2.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.walkdir-2.5.0.bazel
index 5ac9c7ffbc7..eaa6ea808b4 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.walkdir-2.5.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.walkdir-2.5.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.1+wasi-snapshot-preview1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.1+wasi-snapshot-preview1.bazel
index 5e8b84da975..1544ed0659e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.1+wasi-snapshot-preview1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.1+wasi-snapshot-preview1.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.14.5+wasi-0.2.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.14.5+wasi-0.2.4.bazel
index 0b482a2c9b2..a5826f5cea2 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.14.5+wasi-0.2.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.14.5+wasi-0.2.4.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasip2-1.0.0+wasi-0.2.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasip2-1.0.0+wasi-0.2.4.bazel
index 113948d4094..9de7c19c3c2 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasip2-1.0.0+wasi-0.2.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasip2-1.0.0+wasi-0.2.4.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.101.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.101.bazel
index 244a8c5b365..91c146904b6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.101.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.101.bazel
@@ -75,6 +75,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.101.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.101.bazel
index b56eaba879c..8bd3515bef8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.101.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.101.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.101.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.101.bazel
index 5ee795fafbf..3e207f054b0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.101.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.101.bazel
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.101.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.101.bazel
index 6930d6021e9..b2276e1a638 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.101.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.101.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.101.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.101.bazel
index 948ae73962f..bb7bc40362a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.101.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.101.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.11.bazel
index 9a98af20dc9..8730541d4ab 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.11.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winapi-util-0.1.11.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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
index 24e0b959158..df42bab2c4f 100644
--- 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
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-implement-0.60.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-implement-0.60.0.bazel
index d48b53ff142..4477961b0a8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-implement-0.60.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-implement-0.60.0.bazel
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-interface-0.59.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-interface-0.59.1.bazel
index 49937afe581..cc4f0390337 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-interface-0.59.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-interface-0.59.1.bazel
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.1.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.1.3.bazel
index 977e17dfc3b..469607d7d5b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.1.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.1.3.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.2.0.bazel
index f50b21712e5..e093251e525 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.2.0.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-result-0.3.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-result-0.3.4.bazel
index e5cec242987..c86097f47b3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-result-0.3.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-result-0.3.4.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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
index 412effdf6db..1cfcc59e7ed 100644
--- 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
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 7e31f8f0880..9aee199dc0a 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
@@ -72,6 +72,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.59.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.59.0.bazel
index f744a0937da..b3222f2a658 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.59.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.59.0.bazel
@@ -70,6 +70,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.60.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.60.2.bazel
index 1d83a074bfd..2008e7287ac 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.60.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.60.2.bazel
@@ -75,6 +75,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.61.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.61.0.bazel
index ba1daef32f2..a6f072e5b2a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.61.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-sys-0.61.0.bazel
@@ -77,6 +77,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.52.6.bazel
index cd7e40af7c3..82fb2acfc31 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.52.6.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.53.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.53.3.bazel
index d719429a8dc..56bad6b1174 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.53.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-targets-0.53.3.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
index ef1741d80d4..633de17430d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.52.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.53.0.bazel
index 602461b5c35..00807d34df3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.53.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_gnullvm-0.53.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
index f9a5577d654..2aa1466d81d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.52.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.53.0.bazel
index e69571a86c9..e66c8c46945 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.53.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_aarch64_msvc-0.53.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.52.6.bazel
index a1a0cbcda3a..d30adc2538f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.52.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.53.0.bazel
index ae4bfaa33b3..437938cf242 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.53.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnu-0.53.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
index 0188a24e021..5d18a1d418f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.52.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.53.0.bazel
index 27afbde319d..51364c25a81 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.53.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_gnullvm-0.53.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.52.6.bazel
index 06d2929a45f..977fc0c5575 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.52.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.53.0.bazel
index 7772ad2658c..ca459bbcb83 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.53.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_i686_msvc-0.53.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
index 9520c81c38e..b446bfdbb5b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.52.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.53.0.bazel
index 8c35bce1d55..e8ffe9e4cbf 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.53.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnu-0.53.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
index b73914ecb7c..31d4d5a8b6f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.52.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.53.0.bazel
index 6d9af145384..df9e56de61d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.53.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_gnullvm-0.53.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
index 6cfc3a6ef6f..99ef607128c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.52.6.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.53.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.53.0.bazel
index 6886d7c018a..ceaf0cb6337 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.53.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows_x86_64_msvc-0.53.0.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.7.13.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.7.13.bazel
index 3d741c7c121..997a4bf65d4 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.7.13.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.winnow-0.7.13.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wit-bindgen-0.45.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wit-bindgen-0.45.1.bazel
index b1993606fb8..4960067c91a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wit-bindgen-0.45.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wit-bindgen-0.45.1.bazel
@@ -65,6 +65,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.writeable-0.6.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.writeable-0.6.1.bazel
index 91386e84b83..28b6f63ce6f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.writeable-0.6.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.writeable-0.6.1.bazel
@@ -61,6 +61,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yansi-1.0.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yansi-1.0.1.bazel
index 33212c84bf0..8770902865a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yansi-1.0.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yansi-1.0.1.bazel
@@ -66,6 +66,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-0.8.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-0.8.0.bazel
index 5a2396ce8c2..ecef8b52a73 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-0.8.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-0.8.0.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 b1f81925305..1529534e17b 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
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.8.27.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.8.27.bazel
index 9e99c8ff5ca..e0fee3f0f2e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.8.27.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.8.27.bazel
@@ -68,6 +68,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.8.27.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.8.27.bazel
index 0b0f63f88cc..11df1449c96 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.8.27.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.8.27.bazel
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-0.1.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-0.1.6.bazel
index 35d1978548b..fbb85d748c8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-0.1.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-0.1.6.bazel
@@ -68,6 +68,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 6e1f2b13254..ff9c1ef2142 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
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerotrie-0.2.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerotrie-0.2.2.bazel
index 94342aec8e3..1bcd44131b7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerotrie-0.2.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerotrie-0.2.2.bazel
@@ -68,6 +68,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-0.11.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-0.11.4.bazel
index 931a800f5d0..a8fe8f8c7e9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-0.11.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-0.11.4.bazel
@@ -69,6 +69,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
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 820d85f680f..ace3c224c5d 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
@@ -61,6 +61,7 @@ rust_proc_macro(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-0.13.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-0.13.3.bazel
index 2cb5eb09652..ff3e776a7f8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-0.13.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-0.13.3.bazel
@@ -67,6 +67,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-safe-7.2.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-safe-7.2.4.bazel
index f51a0c3a30e..eed1e00af81 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-safe-7.2.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-safe-7.2.4.bazel
@@ -71,6 +71,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.0.16+zstd.1.5.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.0.16+zstd.1.5.7.bazel
index 060e52d4a08..32a06f94788 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.0.16+zstd.1.5.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.0.16+zstd.1.5.7.bazel
@@ -70,6 +70,7 @@ rust_library(
         "@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:arm-unknown-linux-musleabi": [],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
         "@rules_rust//rust/platform:i686-apple-darwin": [],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl b/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
index a56d266ab74..bf11bc6c82f 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
@@ -154,7 +154,7 @@ def all_crate_deps(
         normal (bool, optional): If True, normal dependencies are included in the
             output list.
         normal_dev (bool, optional): If True, normal dev dependencies will be
-            included in the output list..
+            included in the output list.
         proc_macro (bool, optional): If True, proc_macro dependencies are included
             in the output list.
         proc_macro_dev (bool, optional): If True, dev proc_macro dependencies are
@@ -585,17 +585,18 @@ _CONDITIONS = {
     "aarch64-unknown-nto-qnx710": ["@rules_rust//rust/platform:aarch64-unknown-nto-qnx710"],
     "aarch64-unknown-uefi": ["@rules_rust//rust/platform:aarch64-unknown-uefi"],
     "arm-unknown-linux-gnueabi": ["@rules_rust//rust/platform:arm-unknown-linux-gnueabi"],
+    "arm-unknown-linux-musleabi": ["@rules_rust//rust/platform:arm-unknown-linux-musleabi"],
     "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(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:riscv64gc-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:arm-unknown-linux-musleabi", "@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:riscv64gc-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\"))": ["@rules_rust//rust/platform:wasm32-wasip2"],
     "cfg(all(target_arch = \"x86\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-unknown-linux-gnu"],
     "cfg(all(target_arch = \"x86\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:i686-pc-windows-msvc"],
     "cfg(all(target_arch = \"x86_64\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
-    "cfg(all(target_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:riscv64gc-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\", 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:arm-unknown-linux-musleabi", "@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:riscv64gc-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:riscv64gc-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 = \"uefi\", getrandom_backend = \"efi_rng\"))": [],
     "cfg(any())": [],
@@ -603,10 +604,10 @@ _CONDITIONS = {
     "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:riscv64gc-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 = \"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:arm-unknown-linux-musleabi", "@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:riscv64gc-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 = \"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:wasm32-unknown-emscripten", "@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-emscripten", "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2"],
-    "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-linux-gnu", "@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-emscripten", "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-fuchsia", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu", "@rules_rust//rust/platform:x86_64-unknown-none", "@rules_rust//rust/platform:x86_64-unknown-uefi"],
+    "cfg(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:arm-unknown-linux-musleabi", "@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-emscripten", "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2"],
+    "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:arm-unknown-linux-musleabi", "@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-linux-gnu", "@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-emscripten", "@rules_rust//rust/platform:wasm32-unknown-unknown", "@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2", "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-apple-ios", "@rules_rust//rust/platform:x86_64-linux-android", "@rules_rust//rust/platform:x86_64-unknown-freebsd", "@rules_rust//rust/platform:x86_64-unknown-fuchsia", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu", "@rules_rust//rust/platform:x86_64-unknown-none", "@rules_rust//rust/platform:x86_64-unknown-uefi"],
     "cfg(target_os = \"android\")": ["@rules_rust//rust/platform:aarch64-linux-android", "@rules_rust//rust/platform:armv7-linux-androideabi", "@rules_rust//rust/platform:i686-linux-android", "@rules_rust//rust/platform:x86_64-linux-android"],
     "cfg(target_os = \"haiku\")": [],
     "cfg(target_os = \"hermit\")": [],
@@ -618,7 +619,7 @@ _CONDITIONS = {
     "cfg(target_os = \"wasi\")": ["@rules_rust//rust/platform:wasm32-wasip1", "@rules_rust//rust/platform:wasm32-wasip1-threads", "@rules_rust//rust/platform:wasm32-wasip2"],
     "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:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:wasm32-unknown-emscripten", "@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(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:arm-unknown-linux-musleabi", "@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:riscv64gc-unknown-linux-gnu", "@rules_rust//rust/platform:s390x-unknown-linux-gnu", "@rules_rust//rust/platform:wasm32-unknown-emscripten", "@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"],
     "cfg(windows_raw_dylib)": [],
     "i686-apple-darwin": ["@rules_rust//rust/platform:i686-apple-darwin"],
diff --git a/misc/bazel/registry/modules/rules_dotnet/0.21.5-codeql.1/MODULE.bazel b/misc/bazel/registry/modules/rules_dotnet/0.21.5-codeql.1/MODULE.bazel
index caaf52f2b9b..9ad1005a850 100644
--- a/misc/bazel/registry/modules/rules_dotnet/0.21.5-codeql.1/MODULE.bazel
+++ b/misc/bazel/registry/modules/rules_dotnet/0.21.5-codeql.1/MODULE.bazel
@@ -43,7 +43,7 @@ use_repo(apphost_packs_extension, "dotnet.apphost_packs")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "bazel_lib", version = "3.0.0")
-bazel_dep(name = "rules_shell", version = "0.5.0")
+bazel_dep(name = "rules_shell", version = "0.6.1")
 
 # Dev dependencies
 bazel_dep(name = "rules_pkg", version = "1.1.0", dev_dependency = True)
diff --git a/misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/MODULE.bazel b/misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/MODULE.bazel
deleted file mode 100644
index aedc5a8a242..00000000000
--- a/misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/MODULE.bazel
+++ /dev/null
@@ -1,151 +0,0 @@
-"""bazelbuild/rules_rust"""
-
-module(
-    name = "rules_rust",
-    version = "0.68.1.codeql.1",
-)
-
-###############################################################################
-## Core
-###############################################################################
-
-bazel_dep(name = "bazel_features", version = "1.32.0")
-bazel_dep(name = "bazel_skylib", version = "1.8.2")
-bazel_dep(name = "platforms", version = "1.0.0")
-bazel_dep(name = "rules_cc", version = "0.2.4")
-bazel_dep(name = "rules_license", version = "1.0.0")
-bazel_dep(name = "rules_shell", version = "0.6.1")
-bazel_dep(name = "apple_support", version = "1.24.1", repo_name = "build_bazel_apple_support")
-
-internal_deps = use_extension("//rust/private:internal_extensions.bzl", "i")
-use_repo(
-    internal_deps,
-    "rrra",
-    "rrra__anyhow-1.0.71",
-    "rrra__camino-1.1.9",
-    "rrra__clap-4.3.11",
-    "rrra__env_logger-0.10.0",
-    "rrra__itertools-0.11.0",
-    "rrra__log-0.4.19",
-    "rrra__serde-1.0.171",
-    "rrra__serde_json-1.0.102",
-    "rules_rust_tinyjson",
-)
-
-cargo_internal_deps = use_extension("//cargo/private:internal_extensions.bzl", "i")
-use_repo(
-    cargo_internal_deps,
-    "rrc",
-    "rrc__cargo-util-schemas-0.3.1",
-    "rrc__cargo_toml-0.20.5",
-    "rrc__pathdiff-0.1.0",
-    "rrc__semver-1.0.25",
-    "rrc__toml-0.8.20",
-)
-
-rust = use_extension("//rust:extensions.bzl", "rust")
-rust.toolchain(edition = "2021")
-use_repo(rust, "rust_toolchains")
-
-register_toolchains(
-    "@rust_toolchains//:all",
-)
-
-rust_host_tools = use_extension("//rust:extensions.bzl", "rust_host_tools")
-rust_host_tools.host_tools(
-    name = "rust_host_tools",
-)
-use_repo(
-    rust_host_tools,
-    "rust_host_tools",
-)
-
-rust_test = use_extension("//test:test_extensions.bzl", "rust_test", dev_dependency = True)
-use_repo(
-    rust_test,
-    "buildkite_config",
-    "generated_inputs_in_external_repo",
-    "libc",
-    "rtra",
-    "rtra__serde-1.0.228",
-    "rtra__serde_json-1.0.145",
-    "rtvsc",
-    "rtvsc__serde-1.0.228",
-    "rtvsc__serde_json-1.0.145",
-    "rules_rust_test_load_arbitrary_tool",
-    "rules_rust_toolchain_test_target_json",
-)
-
-bazel_dep(name = "rules_python", version = "0.40.0", dev_dependency = True)
-bazel_dep(name = "rules_testing", version = "0.7.0", dev_dependency = True)
-bazel_dep(name = "bazel_ci_rules", version = "1.0.0", dev_dependency = True)
-
-###############################################################################
-## Crate Universe
-###############################################################################
-
-crate_universe_internal_deps = use_extension(
-    "//crate_universe/private:internal_extensions.bzl",
-    "cu",
-)
-use_repo(
-    crate_universe_internal_deps,
-    "cargo_bazel.buildifier-darwin-amd64",
-    "cargo_bazel.buildifier-darwin-arm64",
-    "cargo_bazel.buildifier-linux-amd64",
-    "cargo_bazel.buildifier-linux-arm64",
-    "cargo_bazel.buildifier-windows-amd64.exe",
-    "cui",
-    "cui__anyhow-1.0.98",
-    "cui__camino-1.1.9",
-    "cui__cargo-lock-10.1.0",
-    "cui__cargo-platform-0.1.9",
-    "cui__cargo_metadata-0.19.2",
-    "cui__cargo_toml-0.22.1",
-    "cui__cfg-expr-0.18.0",
-    "cui__clap-4.5.37",
-    "cui__crates-index-3.7.0",
-    "cui__glob-0.3.2",
-    "cui__hex-0.4.3",
-    "cui__indoc-2.0.6",
-    "cui__itertools-0.14.0",
-    "cui__maplit-1.0.2",
-    "cui__normpath-1.3.0",
-    "cui__once_cell-1.21.3",
-    "cui__pathdiff-0.2.3",
-    "cui__regex-1.11.1",
-    "cui__semver-1.0.26",
-    "cui__serde-1.0.219",
-    "cui__serde_json-1.0.140",
-    "cui__serde_starlark-0.1.17",
-    "cui__sha2-0.10.8",
-    "cui__spdx-0.10.8",
-    "cui__tempfile-3.19.1",
-    "cui__tera-1.20.0",
-    "cui__textwrap-0.16.2",
-    "cui__toml-0.8.21",
-    "cui__tracing-0.1.41",
-    "cui__tracing-subscriber-0.3.19",
-    "cui__url-2.5.4",
-    "cui__walkdir-2.5.0",
-)
-
-crate_universe_internal_non_repro_deps = use_extension(
-    "//crate_universe/private:internal_extensions.bzl",
-    "cu_nr",
-)
-use_repo(
-    crate_universe_internal_non_repro_deps,
-    "cargo_bazel_bootstrap",
-)
-
-crate_universe_internal_dev_deps = use_extension(
-    "//crate_universe/private:internal_extensions.bzl",
-    "cu_dev",
-    dev_dependency = True,
-)
-use_repo(
-    crate_universe_internal_dev_deps,
-    "cross_rs",
-    "cross_rs_host_bin",
-)
diff --git a/misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/patches/include_rmeta_in_stdlib.patch b/misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/patches/include_rmeta_in_stdlib.patch
deleted file mode 100644
index 3707cb51b63..00000000000
--- a/misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/patches/include_rmeta_in_stdlib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/rust/private/repository_utils.bzl b/rust/private/repository_utils.bzl
-index 05b741947..f88074af6 100644
---- a/rust/private/repository_utils.bzl
-+++ b/rust/private/repository_utils.bzl
-@@ -280,6 +280,7 @@ rust_stdlib_filegroup(
-     srcs = glob(
-         [
-             "lib/rustlib/{target_triple}/lib/*.rlib",
-+            "lib/rustlib/{target_triple}/lib/*.rmeta",
-             "lib/rustlib/{target_triple}/lib/*{dylib_ext}*",
-             "lib/rustlib/{target_triple}/lib/*{staticlib_ext}",
-             "lib/rustlib/{target_triple}/lib/self-contained/**",
diff --git a/misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/source.json b/misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/source.json
deleted file mode 100644
index 6048521ce2f..00000000000
--- a/misc/bazel/registry/modules/rules_rust/0.68.1.codeql.1/source.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "integrity": "sha256-yKqAbPYGZnmsI0YyQe6ArWkiZdrQRl9RERy74wuJA1I=",
-    "strip_prefix": "",
-    "url": "https://github.com/bazelbuild/rules_rust/releases/download/0.68.1/rules_rust-0.68.1.tar.gz",
-    "patches": {
-        "include_rmeta_in_stdlib.patch": "sha256-7n8XHpfkLUMEbRG6lKqdhLWydsWlRRG+Ywkxk6LvY9c="
-    },
-    "patch_strip": 1
-}
diff --git a/misc/bazel/registry/modules/rules_rust/metadata.json b/misc/bazel/registry/modules/rules_rust/metadata.json
deleted file mode 100644
index deffe6f6dfa..00000000000
--- a/misc/bazel/registry/modules/rules_rust/metadata.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "homepage": "https://github.com/bazelbuild/rules_rust",
-    "maintainers": [],
-    "repository": [
-        "github:bazelbuild/rules_rust"
-    ],
-    "versions": [
-        "0.68.1.codeql.1"
-    ],
-    "yanked_versions": {}
-}
diff --git a/misc/suite-helpers/CHANGELOG.md b/misc/suite-helpers/CHANGELOG.md
index 2a81d5f40ba..8b32c3a6018 100644
--- a/misc/suite-helpers/CHANGELOG.md
+++ b/misc/suite-helpers/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.0.44
+
+No user-facing changes.
+
+## 1.0.43
+
+No user-facing changes.
+
 ## 1.0.42
 
 No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.43.md b/misc/suite-helpers/change-notes/released/1.0.43.md
new file mode 100644
index 00000000000..ace72ed890f
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.43.md
@@ -0,0 +1,3 @@
+## 1.0.43
+
+No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.44.md b/misc/suite-helpers/change-notes/released/1.0.44.md
new file mode 100644
index 00000000000..9a8d400d319
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.44.md
@@ -0,0 +1,3 @@
+## 1.0.44
+
+No user-facing changes.
diff --git a/misc/suite-helpers/codeql-pack.release.yml b/misc/suite-helpers/codeql-pack.release.yml
index 53e8667626a..59728e63980 100644
--- a/misc/suite-helpers/codeql-pack.release.yml
+++ b/misc/suite-helpers/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.42
+lastReleaseVersion: 1.0.44
diff --git a/misc/suite-helpers/qlpack.yml b/misc/suite-helpers/qlpack.yml
index 48e31175a00..5d2436f3e04 100644
--- a/misc/suite-helpers/qlpack.yml
+++ b/misc/suite-helpers/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql/suite-helpers
-version: 1.0.43-dev
+version: 1.0.45-dev
 groups: shared
 warnOnImplicitThis: true
diff --git a/python/ql/lib/CHANGELOG.md b/python/ql/lib/CHANGELOG.md
index 76d2adf3a03..4db07a9c83e 100644
--- a/python/ql/lib/CHANGELOG.md
+++ b/python/ql/lib/CHANGELOG.md
@@ -1,3 +1,25 @@
+## 7.0.1
+
+### Minor Analysis Improvements
+
+- The call graph resolution no longer considers methods marked using [`@typing.overload`](https://typing.python.org/en/latest/spec/overload.html#overloads) as valid targets. This ensures that only the method that contains the actual implementation gets resolved as a target.
+* Inline expectations test comments, which are of the form `# $ tag` or `# $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the `$` symbol.
+
+## 7.0.0
+
+### Breaking Changes
+
+- The `Metrics` library no longer contains code that depends on the points-to analysis. The removed functionality has instead been moved to the `LegacyPointsTo` module, to classes like `ModuleMetricsWithPointsTo` etc. If you depend on any of these classes, you must now remember to import `LegacyPointsTo`, and use the appropriate types in order to use the points-to-based functionality.
+
+### Major Analysis Improvements
+
+- The CodeQL Python libraries have been updated to be compatible with overlay evaluation. This should result in a significant speedup on analyses for which a base database already exists. Note that it may be necessary to add `overlay[local?] module;` to user-managed libraries that extend classes that are now marked as `overlay[local]`.
+
+### Minor Analysis Improvements
+
+* Added new full SSRF sanitization barrier from the new AntiSSRF library. 
+* When a guard such as `isSafe(x)` is defined, we now also automatically handle `isSafe(x) == true` and `isSafe(x) != false`.
+
 ## 6.1.1
 
 ### Minor Analysis Improvements
@@ -7,7 +29,7 @@
 
 ### Bug Fixes
 
-- Using `=` as a fill character in a format specifier (e.g `f"{x:=^20}"`) now no longer results in a syntax error during parsing.
+- Using `=` as a fill character in a format specifier (e.g. `f"{x:=^20}"`) now no longer results in a syntax error during parsing.
 
 ## 6.1.0
 
diff --git a/python/ql/lib/LegacyPointsTo.qll b/python/ql/lib/LegacyPointsTo.qll
index 45f4a80e8d1..ffea2d93b66 100644
--- a/python/ql/lib/LegacyPointsTo.qll
+++ b/python/ql/lib/LegacyPointsTo.qll
@@ -430,3 +430,179 @@ private predicate exits_early(BasicBlock b) {
     f.getACall().getBasicBlock() = b
   )
 }
+
+/** The metrics for a function that require points-to analysis */
+class FunctionMetricsWithPointsTo extends FunctionMetrics {
+  /**
+   * Gets the cyclomatic complexity of the function:
+   * The number of linearly independent paths through the source code.
+   * Computed as     E - N + 2P,
+   * where
+   *  E = the number of edges of the graph.
+   *  N = the number of nodes of the graph.
+   *  P = the number of connected components, which for a single function is 1.
+   */
+  int getCyclomaticComplexity() {
+    exists(int e, int n |
+      n = count(BasicBlockWithPointsTo b | b = this.getABasicBlock() and b.likelyReachable()) and
+      e =
+        count(BasicBlockWithPointsTo b1, BasicBlockWithPointsTo b2 |
+          b1 = this.getABasicBlock() and
+          b1.likelyReachable() and
+          b2 = this.getABasicBlock() and
+          b2.likelyReachable() and
+          b2 = b1.getASuccessor() and
+          not b1.unlikelySuccessor(b2)
+        )
+    |
+      result = e - n + 2
+    )
+  }
+
+  private BasicBlock getABasicBlock() {
+    result = this.getEntryNode().getBasicBlock()
+    or
+    exists(BasicBlock mid | mid = this.getABasicBlock() and result = mid.getASuccessor())
+  }
+
+  /**
+   * Dependency of Callables
+   * One callable "this" depends on another callable "result"
+   * if "this" makes some call to a method that may end up being "result".
+   */
+  FunctionMetricsWithPointsTo getADependency() {
+    result != this and
+    not non_coupling_method(result) and
+    exists(Call call | call.getScope() = this |
+      exists(FunctionObject callee | callee.getFunction() = result |
+        call.getAFlowNode().getFunction().(ControlFlowNodeWithPointsTo).refersTo(callee)
+      )
+      or
+      exists(Attribute a | call.getFunc() = a |
+        unique_root_method(result, a.getName())
+        or
+        exists(Name n | a.getObject() = n and n.getId() = "self" |
+          result.getScope() = this.getScope() and
+          result.getName() = a.getName()
+        )
+      )
+    )
+  }
+
+  /**
+   * Afferent Coupling
+   * the number of callables that depend on this method.
+   * This is sometimes called the "fan-in" of a method.
+   */
+  int getAfferentCoupling() {
+    result = count(FunctionMetricsWithPointsTo m | m.getADependency() = this)
+  }
+
+  /**
+   * Efferent Coupling
+   * the number of methods that this method depends on
+   * This is sometimes called the "fan-out" of a method.
+   */
+  int getEfferentCoupling() {
+    result = count(FunctionMetricsWithPointsTo m | this.getADependency() = m)
+  }
+
+  override string getAQlClass() { result = "FunctionMetrics" }
+}
+
+/** The metrics for a class that require points-to analysis */
+class ClassMetricsWithPointsTo extends ClassMetrics {
+  private predicate dependsOn(Class other) {
+    other != this and
+    (
+      exists(FunctionMetricsWithPointsTo f1, FunctionMetricsWithPointsTo f2 |
+        f1.getADependency() = f2
+      |
+        f1.getScope() = this and f2.getScope() = other
+      )
+      or
+      exists(Function f, Call c, ClassObject cls | c.getScope() = f and f.getScope() = this |
+        c.getFunc().(ExprWithPointsTo).refersTo(cls) and
+        cls.getPyClass() = other
+      )
+    )
+  }
+
+  /**
+   * Gets the afferent coupling of a class -- the number of classes that
+   * directly depend on it.
+   */
+  int getAfferentCoupling() { result = count(ClassMetricsWithPointsTo t | t.dependsOn(this)) }
+
+  /**
+   * Gets the efferent coupling of a class -- the number of classes that
+   * it directly depends on.
+   */
+  int getEfferentCoupling() { result = count(ClassMetricsWithPointsTo t | this.dependsOn(t)) }
+
+  /** Gets the depth of inheritance of the class. */
+  int getInheritanceDepth() {
+    exists(ClassObject cls | cls.getPyClass() = this | result = max(classInheritanceDepth(cls)))
+  }
+
+  override string getAQlClass() { result = "ClassMetrics" }
+}
+
+private int classInheritanceDepth(ClassObject cls) {
+  /* Prevent run-away recursion in case of circular inheritance */
+  not cls.getASuperType() = cls and
+  (
+    exists(ClassObject sup | cls.getABaseType() = sup | result = classInheritanceDepth(sup) + 1)
+    or
+    not exists(cls.getABaseType()) and
+    (
+      major_version() = 2 and result = 0
+      or
+      major_version() > 2 and result = 1
+    )
+  )
+}
+
+/** The metrics for a module that require points-to analysis */
+class ModuleMetricsWithPointsTo extends ModuleMetrics {
+  /**
+   * Gets the afferent coupling of a module -- the number of modules that
+   *  directly depend on it.
+   */
+  int getAfferentCoupling() { result = count(ModuleMetricsWithPointsTo t | t.dependsOn(this)) }
+
+  /**
+   * Gets the efferent coupling of a module -- the number of modules that
+   *  it directly depends on.
+   */
+  int getEfferentCoupling() { result = count(ModuleMetricsWithPointsTo t | this.dependsOn(t)) }
+
+  private predicate dependsOn(Module other) {
+    other != this and
+    (
+      exists(FunctionMetricsWithPointsTo f1, FunctionMetricsWithPointsTo f2 |
+        f1.getADependency() = f2
+      |
+        f1.getEnclosingModule() = this and f2.getEnclosingModule() = other
+      )
+      or
+      exists(Function f, Call c, ClassObject cls | c.getScope() = f and f.getScope() = this |
+        c.getFunc().(ExprWithPointsTo).refersTo(cls) and
+        cls.getPyClass().getEnclosingModule() = other
+      )
+    )
+  }
+
+  override string getAQlClass() { result = "ModuleMetrics" }
+}
+
+/** Helpers for coupling */
+predicate unique_root_method(Function func, string name) {
+  name = func.getName() and
+  not exists(FunctionObject f, FunctionObject other |
+    f.getFunction() = func and
+    other.getName() = name
+  |
+    not other.overrides(f)
+  )
+}
diff --git a/python/ql/lib/analysis/DefinitionTracking.qll b/python/ql/lib/analysis/DefinitionTracking.qll
index 0d58bd69b7b..21155970375 100644
--- a/python/ql/lib/analysis/DefinitionTracking.qll
+++ b/python/ql/lib/analysis/DefinitionTracking.qll
@@ -471,11 +471,10 @@ Definition getUniqueDefinition(Expr use) {
   not result = TLocalDefinition(use)
 }
 
-/** A helper class to get suitable locations for attributes */
-class NiceLocationExpr extends Expr {
-  /** Gets a textual representation of this element. */
-  override string toString() { result = this.(Expr).toString() }
+final class FinalExpr = Expr;
 
+/** A helper class to get suitable locations for attributes */
+class NiceLocationExpr extends FinalExpr {
   /**
    * Holds if this element is at the specified location.
    * The location spans column `bc` of line `bl` to
diff --git a/python/ql/lib/change-notes/2026-02-09-ssrf_test_case_cleanup_and_new_ssrf_barriers.md b/python/ql/lib/change-notes/2026-02-09-ssrf_test_case_cleanup_and_new_ssrf_barriers.md
deleted file mode 100644
index c3b4194e7b8..00000000000
--- a/python/ql/lib/change-notes/2026-02-09-ssrf_test_case_cleanup_and_new_ssrf_barriers.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* Added new full SSRF sanitization barrier from the new AntiSSRF library. 
\ No newline at end of file
diff --git a/python/ql/lib/change-notes/2026-03-11-fix-unresolved-relative-imports.md b/python/ql/lib/change-notes/2026-03-11-fix-unresolved-relative-imports.md
new file mode 100644
index 00000000000..15290fb3d66
--- /dev/null
+++ b/python/ql/lib/change-notes/2026-03-11-fix-unresolved-relative-imports.md
@@ -0,0 +1,5 @@
+---
+category: fix
+---
+
+- Fixed the resolution of relative imports such as `from . import helper` inside namespace packages (directories without an `__init__.py` file), which previously did not work correctly, leading to missing flow.
diff --git a/python/ql/lib/change-notes/released/6.1.1.md b/python/ql/lib/change-notes/released/6.1.1.md
index ca4d1bf4684..a880762af11 100644
--- a/python/ql/lib/change-notes/released/6.1.1.md
+++ b/python/ql/lib/change-notes/released/6.1.1.md
@@ -7,4 +7,4 @@
 
 ### Bug Fixes
 
-- Using `=` as a fill character in a format specifier (e.g `f"{x:=^20}"`) now no longer results in a syntax error during parsing.
+- Using `=` as a fill character in a format specifier (e.g. `f"{x:=^20}"`) now no longer results in a syntax error during parsing.
diff --git a/python/ql/lib/change-notes/released/7.0.0.md b/python/ql/lib/change-notes/released/7.0.0.md
new file mode 100644
index 00000000000..9a4e782f4f2
--- /dev/null
+++ b/python/ql/lib/change-notes/released/7.0.0.md
@@ -0,0 +1,14 @@
+## 7.0.0
+
+### Breaking Changes
+
+- The `Metrics` library no longer contains code that depends on the points-to analysis. The removed functionality has instead been moved to the `LegacyPointsTo` module, to classes like `ModuleMetricsWithPointsTo` etc. If you depend on any of these classes, you must now remember to import `LegacyPointsTo`, and use the appropriate types in order to use the points-to-based functionality.
+
+### Major Analysis Improvements
+
+- The CodeQL Python libraries have been updated to be compatible with overlay evaluation. This should result in a significant speedup on analyses for which a base database already exists. Note that it may be necessary to add `overlay[local?] module;` to user-managed libraries that extend classes that are now marked as `overlay[local]`.
+
+### Minor Analysis Improvements
+
+* Added new full SSRF sanitization barrier from the new AntiSSRF library. 
+* When a guard such as `isSafe(x)` is defined, we now also automatically handle `isSafe(x) == true` and `isSafe(x) != false`.
diff --git a/python/ql/lib/change-notes/released/7.0.1.md b/python/ql/lib/change-notes/released/7.0.1.md
new file mode 100644
index 00000000000..97224884c93
--- /dev/null
+++ b/python/ql/lib/change-notes/released/7.0.1.md
@@ -0,0 +1,6 @@
+## 7.0.1
+
+### Minor Analysis Improvements
+
+- The call graph resolution no longer considers methods marked using [`@typing.overload`](https://typing.python.org/en/latest/spec/overload.html#overloads) as valid targets. This ensures that only the method that contains the actual implementation gets resolved as a target.
+* Inline expectations test comments, which are of the form `# $ tag` or `# $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the `$` symbol.
diff --git a/python/ql/lib/codeql-pack.release.yml b/python/ql/lib/codeql-pack.release.yml
index 54acf3e5e47..a18747dd3a7 100644
--- a/python/ql/lib/codeql-pack.release.yml
+++ b/python/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 6.1.1
+lastReleaseVersion: 7.0.1
diff --git a/python/ql/lib/python.qll b/python/ql/lib/python.qll
index 54306408a33..d127e297dbb 100644
--- a/python/ql/lib/python.qll
+++ b/python/ql/lib/python.qll
@@ -14,7 +14,7 @@ import semmle.python.Patterns
 import semmle.python.Keywords
 import semmle.python.Comprehensions
 import semmle.python.Flow
-private import semmle.python.Metrics
+import semmle.python.Metrics
 import semmle.python.Constants
 import semmle.python.Scope
 import semmle.python.Comment
diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml
index 36b8813f8de..8d8597ea915 100644
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-all
-version: 6.1.2-dev
+version: 7.0.2-dev
 groups: python
 dbscheme: semmlecode.python.dbscheme
 extractor: python
diff --git a/python/ql/lib/semmle/python/ApiGraphs.qll b/python/ql/lib/semmle/python/ApiGraphs.qll
index b45c10e1417..efd8141efc6 100644
--- a/python/ql/lib/semmle/python/ApiGraphs.qll
+++ b/python/ql/lib/semmle/python/ApiGraphs.qll
@@ -451,6 +451,7 @@ module API {
    * allowing this predicate to be used in a negative
    * context when constructing new nodes.
    */
+  overlay[local]
   predicate moduleImportExists(string m) {
     Impl::isImported(m) and
     // restrict `moduleImport` so it will never give results for a dotted name. Note
@@ -695,6 +696,7 @@ module API {
      *
      * This is determined syntactically.
      */
+    overlay[local]
     cached
     predicate isImported(string name) {
       // Ignore the following module name for Python 2, as we alias `__builtin__` to `builtins` elsewhere
diff --git a/python/ql/lib/semmle/python/AstExtended.qll b/python/ql/lib/semmle/python/AstExtended.qll
index 73292b85c3a..13da4e899a7 100644
--- a/python/ql/lib/semmle/python/AstExtended.qll
+++ b/python/ql/lib/semmle/python/AstExtended.qll
@@ -1,3 +1,6 @@
+overlay[local]
+module;
+
 import python
 private import semmle.python.internal.CachedStages
 
diff --git a/python/ql/lib/semmle/python/AstGenerated.qll b/python/ql/lib/semmle/python/AstGenerated.qll
index 12f86832387..8805a43bec3 100644
--- a/python/ql/lib/semmle/python/AstGenerated.qll
+++ b/python/ql/lib/semmle/python/AstGenerated.qll
@@ -3,6 +3,8 @@
  *      WARNING: Any modifications to this file will be lost.
  *      Relations can be changed by modifying master.py.
  */
+overlay[local]
+module;
 
 import python
 
diff --git a/python/ql/lib/semmle/python/Class.qll b/python/ql/lib/semmle/python/Class.qll
index 19b81e86a12..cee0e730cb4 100644
--- a/python/ql/lib/semmle/python/Class.qll
+++ b/python/ql/lib/semmle/python/Class.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes representing Python classes.
  */
+overlay[local]
+module;
 
 import python
 
diff --git a/python/ql/lib/semmle/python/Comment.qll b/python/ql/lib/semmle/python/Comment.qll
index 839d700b8cd..c87ccc1521d 100644
--- a/python/ql/lib/semmle/python/Comment.qll
+++ b/python/ql/lib/semmle/python/Comment.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes representing comments in Python.
  */
+overlay[local]
+module;
 
 import python
 
diff --git a/python/ql/lib/semmle/python/Comprehensions.qll b/python/ql/lib/semmle/python/Comprehensions.qll
index 37f07614282..12e71e2d5d1 100644
--- a/python/ql/lib/semmle/python/Comprehensions.qll
+++ b/python/ql/lib/semmle/python/Comprehensions.qll
@@ -1,3 +1,6 @@
+overlay[local]
+module;
+
 import python
 
 /** The base class for list, set and dictionary comprehensions, and generator expressions. */
diff --git a/python/ql/lib/semmle/python/Constants.qll b/python/ql/lib/semmle/python/Constants.qll
index 03254a4bfd0..f86019c0256 100644
--- a/python/ql/lib/semmle/python/Constants.qll
+++ b/python/ql/lib/semmle/python/Constants.qll
@@ -1,4 +1,6 @@
 /** Standard builtin types and modules */
+overlay[local]
+module;
 
 import python
 
diff --git a/python/ql/lib/semmle/python/Exprs.qll b/python/ql/lib/semmle/python/Exprs.qll
index c374863d684..6ab9f8d8340 100644
--- a/python/ql/lib/semmle/python/Exprs.qll
+++ b/python/ql/lib/semmle/python/Exprs.qll
@@ -1,3 +1,6 @@
+overlay[local]
+module;
+
 private import python
 private import semmle.python.internal.CachedStages
 
diff --git a/python/ql/lib/semmle/python/Files.qll b/python/ql/lib/semmle/python/Files.qll
index 2da0dd61f88..bb3c504654e 100644
--- a/python/ql/lib/semmle/python/Files.qll
+++ b/python/ql/lib/semmle/python/Files.qll
@@ -1,4 +1,6 @@
 /** Provides classes for working with files and folders. */
+overlay[local]
+module;
 
 import python
 private import codeql.util.FileSystem
@@ -178,6 +180,7 @@ class Container extends Impl::Container {
 
   override Container getParentContainer() { result = super.getParentContainer() }
 
+  overlay[global]
   Container getChildContainer(string baseName) {
     result = this.getAChildContainer() and
     result.getBaseName() = baseName
diff --git a/python/ql/lib/semmle/python/Flow.qll b/python/ql/lib/semmle/python/Flow.qll
index 898cd566ab9..94caf513aa9 100644
--- a/python/ql/lib/semmle/python/Flow.qll
+++ b/python/ql/lib/semmle/python/Flow.qll
@@ -1,3 +1,6 @@
+overlay[local]
+module;
+
 import python
 private import semmle.python.internal.CachedStages
 private import codeql.controlflow.BasicBlock as BB
@@ -191,6 +194,7 @@ class ControlFlowNode extends @py_flow_node {
   predicate isNormalExit() { py_scope_flow(this, _, 0) or py_scope_flow(this, _, 2) }
 
   /** Whether this strictly dominates other. */
+  overlay[caller]
   pragma[inline]
   predicate strictlyDominates(ControlFlowNode other) {
     // This predicate is gigantic, so it must be inlined.
@@ -204,6 +208,7 @@ class ControlFlowNode extends @py_flow_node {
    * Whether this dominates other.
    * Note that all nodes dominate themselves.
    */
+  overlay[caller]
   pragma[inline]
   predicate dominates(ControlFlowNode other) {
     // This predicate is gigantic, so it must be inlined.
@@ -213,6 +218,7 @@ class ControlFlowNode extends @py_flow_node {
   }
 
   /** Whether this strictly reaches other. */
+  overlay[caller]
   pragma[inline]
   predicate strictlyReaches(ControlFlowNode other) {
     // This predicate is gigantic, even larger than strictlyDominates,
diff --git a/python/ql/lib/semmle/python/Function.qll b/python/ql/lib/semmle/python/Function.qll
index e15d28d3a12..c133275b8b7 100644
--- a/python/ql/lib/semmle/python/Function.qll
+++ b/python/ql/lib/semmle/python/Function.qll
@@ -1,3 +1,6 @@
+overlay[local]
+module;
+
 import python
 
 /**
diff --git a/python/ql/lib/semmle/python/GuardedControlFlow.qll b/python/ql/lib/semmle/python/GuardedControlFlow.qll
index 73ea183850a..3169e4d0c1a 100644
--- a/python/ql/lib/semmle/python/GuardedControlFlow.qll
+++ b/python/ql/lib/semmle/python/GuardedControlFlow.qll
@@ -1,3 +1,6 @@
+overlay[local]
+module;
+
 import python
 
 /** A basic block which terminates in a condition, splitting the subsequent control flow */
diff --git a/python/ql/lib/semmle/python/Import.qll b/python/ql/lib/semmle/python/Import.qll
index c75ef9f0c91..2f7fae95539 100644
--- a/python/ql/lib/semmle/python/Import.qll
+++ b/python/ql/lib/semmle/python/Import.qll
@@ -1,3 +1,6 @@
+overlay[local]
+module;
+
 import python
 private import semmle.python.types.Builtins
 private import semmle.python.internal.CachedStages
@@ -14,6 +17,10 @@ private predicate valid_module_name(string name) {
   exists(Module m | m.getName() = name)
   or
   exists(Builtin cmod | cmod.getClass() = Builtin::special("ModuleType") and cmod.getName() = name)
+  or
+  // Namespace packages may not have a corresponding Module entity,
+  // but their names are still valid for the purpose of import resolution.
+  name = moduleNameFromFile(any(Folder f))
 }
 
 /** An artificial expression representing an import */
diff --git a/python/ql/lib/semmle/python/Keywords.qll b/python/ql/lib/semmle/python/Keywords.qll
index b7ecca528bb..da7b582ef16 100644
--- a/python/ql/lib/semmle/python/Keywords.qll
+++ b/python/ql/lib/semmle/python/Keywords.qll
@@ -1,3 +1,6 @@
+overlay[local]
+module;
+
 import python
 
 class KeyValuePair extends KeyValuePair_, DictDisplayItem {
diff --git a/python/ql/lib/semmle/python/Metrics.qll b/python/ql/lib/semmle/python/Metrics.qll
index 4959a06317f..26560bad25c 100644
--- a/python/ql/lib/semmle/python/Metrics.qll
+++ b/python/ql/lib/semmle/python/Metrics.qll
@@ -1,5 +1,5 @@
 import python
-private import LegacyPointsTo
+private import semmle.python.SelfAttribute
 
 /** The metrics for a function */
 class FunctionMetrics extends Function {
@@ -18,76 +18,6 @@ class FunctionMetrics extends Function {
   /** Gets the number of lines of docstring in the function */
   int getNumberOfLinesOfDocStrings() { py_docstringlines(this, result) }
 
-  /**
-   * Gets the cyclomatic complexity of the function:
-   * The number of linearly independent paths through the source code.
-   * Computed as     E - N + 2P,
-   * where
-   *  E = the number of edges of the graph.
-   *  N = the number of nodes of the graph.
-   *  P = the number of connected components, which for a single function is 1.
-   */
-  int getCyclomaticComplexity() {
-    exists(int e, int n |
-      n = count(BasicBlockWithPointsTo b | b = this.getABasicBlock() and b.likelyReachable()) and
-      e =
-        count(BasicBlockWithPointsTo b1, BasicBlockWithPointsTo b2 |
-          b1 = this.getABasicBlock() and
-          b1.likelyReachable() and
-          b2 = this.getABasicBlock() and
-          b2.likelyReachable() and
-          b2 = b1.getASuccessor() and
-          not b1.unlikelySuccessor(b2)
-        )
-    |
-      result = e - n + 2
-    )
-  }
-
-  private BasicBlock getABasicBlock() {
-    result = this.getEntryNode().getBasicBlock()
-    or
-    exists(BasicBlock mid | mid = this.getABasicBlock() and result = mid.getASuccessor())
-  }
-
-  /**
-   * Dependency of Callables
-   * One callable "this" depends on another callable "result"
-   * if "this" makes some call to a method that may end up being "result".
-   */
-  FunctionMetrics getADependency() {
-    result != this and
-    not non_coupling_method(result) and
-    exists(Call call | call.getScope() = this |
-      exists(FunctionObject callee | callee.getFunction() = result |
-        call.getAFlowNode().getFunction().(ControlFlowNodeWithPointsTo).refersTo(callee)
-      )
-      or
-      exists(Attribute a | call.getFunc() = a |
-        unique_root_method(result, a.getName())
-        or
-        exists(Name n | a.getObject() = n and n.getId() = "self" |
-          result.getScope() = this.getScope() and
-          result.getName() = a.getName()
-        )
-      )
-    )
-  }
-
-  /**
-   * Afferent Coupling
-   * the number of callables that depend on this method.
-   * This is sometimes called the "fan-in" of a method.
-   */
-  int getAfferentCoupling() { result = count(FunctionMetrics m | m.getADependency() = this) }
-
-  /**
-   * Efferent Coupling
-   * the number of methods that this method depends on
-   * This is sometimes called the "fan-out" of a method.
-   */
-  int getEfferentCoupling() { result = count(FunctionMetrics m | this.getADependency() = m) }
-
   int getNumberOfParametersWithoutDefault() {
     result =
       this.getPositionalParameterCount() -
@@ -116,36 +46,6 @@ class ClassMetrics extends Class {
   /** Gets the number of lines of docstrings in the class */
   int getNumberOfLinesOfDocStrings() { py_docstringlines(this, result) }
 
-  private predicate dependsOn(Class other) {
-    other != this and
-    (
-      exists(FunctionMetrics f1, FunctionMetrics f2 | f1.getADependency() = f2 |
-        f1.getScope() = this and f2.getScope() = other
-      )
-      or
-      exists(Function f, Call c, ClassObject cls | c.getScope() = f and f.getScope() = this |
-        c.getFunc().(ExprWithPointsTo).refersTo(cls) and
-        cls.getPyClass() = other
-      )
-    )
-  }
-
-  /**
-   * Gets the afferent coupling of a class -- the number of classes that
-   * directly depend on it.
-   */
-  int getAfferentCoupling() { result = count(ClassMetrics t | t.dependsOn(this)) }
-
-  /**
-   * Gets the efferent coupling of a class -- the number of classes that
-   * it directly depends on.
-   */
-  int getEfferentCoupling() { result = count(ClassMetrics t | this.dependsOn(t)) }
-
-  int getInheritanceDepth() {
-    exists(ClassObject cls | cls.getPyClass() = this | result = max(classInheritanceDepth(cls)))
-  }
-
   /* -------- CHIDAMBER AND KEMERER LACK OF COHESION IN METHODS ------------ */
   /*
    * The aim of this metric is to try and determine whether a class
@@ -245,21 +145,6 @@ class ClassMetrics extends Class {
   int getLackOfCohesionHM() { result = count(int line | this.unionSubgraph(_, line)) }
 }
 
-private int classInheritanceDepth(ClassObject cls) {
-  /* Prevent run-away recursion in case of circular inheritance */
-  not cls.getASuperType() = cls and
-  (
-    exists(ClassObject sup | cls.getABaseType() = sup | result = classInheritanceDepth(sup) + 1)
-    or
-    not exists(cls.getABaseType()) and
-    (
-      major_version() = 2 and result = 0
-      or
-      major_version() > 2 and result = 1
-    )
-  )
-}
-
 class ModuleMetrics extends Module {
   /** Gets the total number of lines (including blank lines) in the module */
   int getNumberOfLines() { py_alllines(this, result) }
@@ -272,43 +157,6 @@ class ModuleMetrics extends Module {
 
   /** Gets the number of lines of docstrings in the module */
   int getNumberOfLinesOfDocStrings() { py_docstringlines(this, result) }
-
-  /**
-   * Gets the afferent coupling of a class -- the number of classes that
-   *  directly depend on it.
-   */
-  int getAfferentCoupling() { result = count(ModuleMetrics t | t.dependsOn(this)) }
-
-  /**
-   * Gets the efferent coupling of a class -- the number of classes that
-   *  it directly depends on.
-   */
-  int getEfferentCoupling() { result = count(ModuleMetrics t | this.dependsOn(t)) }
-
-  private predicate dependsOn(Module other) {
-    other != this and
-    (
-      exists(FunctionMetrics f1, FunctionMetrics f2 | f1.getADependency() = f2 |
-        f1.getEnclosingModule() = this and f2.getEnclosingModule() = other
-      )
-      or
-      exists(Function f, Call c, ClassObject cls | c.getScope() = f and f.getScope() = this |
-        c.getFunc().(ExprWithPointsTo).refersTo(cls) and
-        cls.getPyClass().getEnclosingModule() = other
-      )
-    )
-  }
-}
-
-/** Helpers for coupling */
-predicate unique_root_method(Function func, string name) {
-  name = func.getName() and
-  not exists(FunctionObject f, FunctionObject other |
-    f.getFunction() = func and
-    other.getName() = name
-  |
-    not other.overrides(f)
-  )
 }
 
 predicate non_coupling_method(Function f) {
diff --git a/python/ql/lib/semmle/python/Module.qll b/python/ql/lib/semmle/python/Module.qll
index f22f0d6fe39..a30aab452c3 100644
--- a/python/ql/lib/semmle/python/Module.qll
+++ b/python/ql/lib/semmle/python/Module.qll
@@ -1,3 +1,6 @@
+overlay[local]
+module;
+
 import python
 private import semmle.python.internal.CachedStages
 
diff --git a/python/ql/lib/semmle/python/Operations.qll b/python/ql/lib/semmle/python/Operations.qll
index e8f5e4799a5..c6318af63e2 100644
--- a/python/ql/lib/semmle/python/Operations.qll
+++ b/python/ql/lib/semmle/python/Operations.qll
@@ -1,3 +1,6 @@
+overlay[local]
+module;
+
 import python
 
 /** The base class for operators */
diff --git a/python/ql/lib/semmle/python/Patterns.qll b/python/ql/lib/semmle/python/Patterns.qll
index 9b4760611d0..fb99a123584 100644
--- a/python/ql/lib/semmle/python/Patterns.qll
+++ b/python/ql/lib/semmle/python/Patterns.qll
@@ -1,6 +1,8 @@
 /**
  * Wrapping generated AST classes: `Pattern_` and subclasses.
  */
+overlay[local]
+module;
 
 import python
 
diff --git a/python/ql/lib/semmle/python/SSA.qll b/python/ql/lib/semmle/python/SSA.qll
index b71bd95de79..77779287734 100644
--- a/python/ql/lib/semmle/python/SSA.qll
+++ b/python/ql/lib/semmle/python/SSA.qll
@@ -1,4 +1,6 @@
 /** SSA library */
+overlay[local]
+module;
 
 import python
 
diff --git a/python/ql/lib/semmle/python/Scope.qll b/python/ql/lib/semmle/python/Scope.qll
index 4131455299c..66a7170aec7 100644
--- a/python/ql/lib/semmle/python/Scope.qll
+++ b/python/ql/lib/semmle/python/Scope.qll
@@ -1,3 +1,6 @@
+overlay[local]
+module;
+
 import python
 private import semmle.python.dataflow.new.internal.ImportResolution
 
@@ -6,6 +9,7 @@ private import semmle.python.dataflow.new.internal.ImportResolution
  *
  * This aims to be the same as m.getAnExport(), but without using the points-to machinery.
  */
+overlay[global]
 private string getAModuleExport(Module m) {
   py_exports(m, result)
   or
@@ -76,6 +80,7 @@ class Scope extends Scope_ {
   predicate isTopLevel() { this.getEnclosingModule() = this.getEnclosingScope() }
 
   /** Holds if this scope is deemed to be public */
+  overlay[global]
   predicate isPublic() {
     /* Not inside a function */
     not this.getEnclosingScope() instanceof Function and
diff --git a/python/ql/lib/semmle/python/Stmts.qll b/python/ql/lib/semmle/python/Stmts.qll
index ea309227af6..c0dfac10ee8 100644
--- a/python/ql/lib/semmle/python/Stmts.qll
+++ b/python/ql/lib/semmle/python/Stmts.qll
@@ -1,3 +1,6 @@
+overlay[local]
+module;
+
 import python
 
 /** A statement */
diff --git a/python/ql/lib/semmle/python/Variables.qll b/python/ql/lib/semmle/python/Variables.qll
index 1249fd020ca..d2baf04a5bf 100644
--- a/python/ql/lib/semmle/python/Variables.qll
+++ b/python/ql/lib/semmle/python/Variables.qll
@@ -1,3 +1,6 @@
+overlay[local]
+module;
+
 import python
 
 /** A variable, either a global or local variable (including parameters) */
diff --git a/python/ql/lib/semmle/python/dataflow/new/FlowSummary.qll b/python/ql/lib/semmle/python/dataflow/new/FlowSummary.qll
index f83870ab050..f9a95124187 100644
--- a/python/ql/lib/semmle/python/dataflow/new/FlowSummary.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/FlowSummary.qll
@@ -25,6 +25,7 @@ deprecated module SummaryComponentStack = Impl::Private::SummaryComponentStack;
 class Provenance = Impl::Public::Provenance;
 
 /** Provides the `Range` class used to define the extent of `SummarizedCallable`. */
+overlay[local]
 module SummarizedCallable {
   /** A callable with a flow summary, identified by a unique string. */
   abstract class Range extends LibraryCallable, Impl::Public::SummarizedCallable {
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/Attributes.qll b/python/ql/lib/semmle/python/dataflow/new/internal/Attributes.qll
index e9bcc5e6785..8778ae28866 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/Attributes.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/Attributes.qll
@@ -1,4 +1,6 @@
 /** This module provides an API for attribute reads and writes. */
+overlay[local]
+module;
 
 private import python
 import DataFlowUtil
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/Builtins.qll b/python/ql/lib/semmle/python/dataflow/new/internal/Builtins.qll
index 9ed9e7d7a2b..764af5d9dc5 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/Builtins.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/Builtins.qll
@@ -1,4 +1,6 @@
 /** Provides predicates for reasoning about built-ins in Python. */
+overlay[local]
+module;
 
 private import python
 private import semmle.python.dataflow.new.DataFlow
@@ -30,7 +32,9 @@ module Builtins {
         "UnicodeDecodeError", "UnicodeEncodeError", "UnicodeError", "UnicodeTranslateError",
         "UnicodeWarning", "UserWarning", "ValueError", "Warning", "ZeroDivisionError",
         // Added for compatibility
-        "exec"
+        "exec",
+        // Added by the `site` module (available by default unless `-S` is used)
+        "copyright", "credits", "exit", "quit"
       ]
     or
     // Built-in constants shared between Python 2 and 3
@@ -49,8 +53,8 @@ module Builtins {
     or
     // Python 2 only
     result in [
-        "basestring", "cmp", "execfile", "file", "long", "raw_input", "reduce", "reload", "unichr",
-        "unicode", "xrange"
+        "apply", "basestring", "cmp", "execfile", "file", "long", "raw_input", "reduce", "reload",
+        "unichr", "unicode", "xrange"
       ]
   }
 
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
index b04b83be83e..1db6c08f5f4 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowDispatch.qll
@@ -31,6 +31,8 @@
  * Note: This hasn't been 100% realized yet, so we don't currently expose a predicate to
  * ask what targets any data-flow node has. But it's still the plan to do this!
  */
+overlay[local?]
+module;
 
 private import python
 private import DataFlowPublic
@@ -39,6 +41,7 @@ private import FlowSummaryImpl as FlowSummaryImpl
 private import semmle.python.internal.CachedStages
 private import semmle.python.dataflow.new.internal.TypeTrackingImpl::CallGraphConstruction as CallGraphConstruction
 
+overlay[local]
 newtype TParameterPosition =
   /** Used for `self` in methods, and `cls` in classmethods. */
   TSelfParameterPosition() or
@@ -84,6 +87,7 @@ newtype TParameterPosition =
   TSynthDictSplatParameterPosition()
 
 /** A parameter position. */
+overlay[local]
 class ParameterPosition extends TParameterPosition {
   /** Holds if this position represents a `self`/`cls` parameter. */
   predicate isSelf() { this = TSelfParameterPosition() }
@@ -146,6 +150,7 @@ class ParameterPosition extends TParameterPosition {
   }
 }
 
+overlay[local]
 newtype TArgumentPosition =
   /** Used for `self` in methods, and `cls` in classmethods. */
   TSelfArgumentPosition() or
@@ -180,6 +185,7 @@ newtype TArgumentPosition =
   TDictSplatArgumentPosition()
 
 /** An argument position. */
+overlay[local]
 class ArgumentPosition extends TArgumentPosition {
   /** Holds if this position represents a `self`/`cls` argument. */
   predicate isSelf() { this = TSelfArgumentPosition() }
@@ -248,6 +254,7 @@ predicate parameterMatch(ParameterPosition ppos, ArgumentPosition apos) {
  * `@staticmethod` decorator or by convention
  * (like a `__new__` method on a class is a classmethod even without the decorator).
  */
+overlay[local]
 predicate isStaticmethod(Function func) {
   exists(NameNode id | id.getId() = "staticmethod" and id.isGlobal() |
     func.getADecorator() = id.getNode()
@@ -259,6 +266,7 @@ predicate isStaticmethod(Function func) {
  * `@classmethod` decorator or by convention
  * (like a `__new__` method on a class is a classmethod even without the decorator).
  */
+overlay[local]
 predicate isClassmethod(Function func) {
   exists(NameNode id | id.getId() = "classmethod" and id.isGlobal() |
     func.getADecorator() = id.getNode()
@@ -275,6 +283,7 @@ predicate isClassmethod(Function func) {
 }
 
 /** Holds if the function `func` has a `property` decorator. */
+overlay[local]
 predicate hasPropertyDecorator(Function func) {
   exists(NameNode id | id.getId() = "property" and id.isGlobal() |
     func.getADecorator() = id.getNode()
@@ -284,6 +293,7 @@ predicate hasPropertyDecorator(Function func) {
 /**
  * Holds if the function `func` has a `contextlib.contextmanager`.
  */
+overlay[local]
 predicate hasContextmanagerDecorator(Function func) {
   exists(ControlFlowNode contextmanager |
     contextmanager.(NameNode).getId() = "contextmanager" and contextmanager.(NameNode).isGlobal()
@@ -294,24 +304,48 @@ predicate hasContextmanagerDecorator(Function func) {
   )
 }
 
+/**
+ * Holds if the function `func` has a `typing.overload` decorator.
+ * Such functions are type stubs that declare an overload signature but are
+ * not the actual implementation.
+ *
+ * Normally we would want to model this using API graphs for more precision, but since this
+ * predicate is used in the call graph computation, we have to use a more syntactic approach.
+ */
+overlay[local]
+private predicate hasOverloadDecorator(Function func) {
+  exists(ControlFlowNode overload |
+    overload.(NameNode).getId() = "overload" and overload.(NameNode).isGlobal()
+    or
+    overload.(AttrNode).getObject("overload").(NameNode).isGlobal()
+  |
+    func.getADecorator() = overload.getNode()
+  )
+}
+
 // =============================================================================
 // Callables
 // =============================================================================
 /** A callable defined in library code, identified by a unique string. */
+overlay[local]
 abstract class LibraryCallable extends string {
   bindingset[this]
   LibraryCallable() { any() }
 
   /** Gets a call to this library callable. */
+  overlay[global]
   abstract CallCfgNode getACall();
 
   /** Same as `getACall` but without referring to the call graph or API graph. */
+  overlay[global]
   CallCfgNode getACallSimple() { none() }
 
   /** Gets a data-flow node, where this library callable is used as a call-back. */
+  overlay[global]
   abstract ArgumentNode getACallback();
 }
 
+overlay[local]
 newtype TDataFlowCallable =
   /**
    * Is used as the target for all calls: plain functions, lambdas, methods on classes,
@@ -329,6 +363,7 @@ newtype TDataFlowCallable =
   TLibraryCallable(LibraryCallable callable)
 
 /** A callable. */
+overlay[local]
 abstract class DataFlowCallable extends TDataFlowCallable {
   /** Gets a textual representation of this element. */
   abstract string toString();
@@ -350,6 +385,7 @@ abstract class DataFlowCallable extends TDataFlowCallable {
 }
 
 /** A callable function. */
+overlay[local]
 abstract class DataFlowFunction extends DataFlowCallable, TFunction {
   Function func;
 
@@ -370,6 +406,7 @@ abstract class DataFlowFunction extends DataFlowCallable, TFunction {
   /** Gets the positional parameter offset, to take into account self/cls parameters. */
   int positionalOffset() { result = 0 }
 
+  overlay[local]
   override ParameterNode getParameter(ParameterPosition ppos) {
     // Do not handle lower bound positions (such as `[1..]`) here
     // they are handled by parameter matching and would create
@@ -408,11 +445,13 @@ abstract class DataFlowFunction extends DataFlowCallable, TFunction {
 }
 
 /** A plain (non-method) function. */
+overlay[local]
 class DataFlowPlainFunction extends DataFlowFunction {
   DataFlowPlainFunction() { not this instanceof DataFlowMethod }
 }
 
 /** A method. */
+overlay[local]
 class DataFlowMethod extends DataFlowFunction {
   Class cls;
 
@@ -431,11 +470,13 @@ class DataFlowMethod extends DataFlowFunction {
 }
 
 /** A classmethod. */
+overlay[local]
 class DataFlowClassmethod extends DataFlowMethod {
   DataFlowClassmethod() { isClassmethod(func) }
 }
 
 /** A staticmethod. */
+overlay[local]
 class DataFlowStaticmethod extends DataFlowMethod, DataFlowFunction {
   DataFlowStaticmethod() { isStaticmethod(func) }
 
@@ -450,6 +491,7 @@ class DataFlowStaticmethod extends DataFlowMethod, DataFlowFunction {
  * A module. This is not actually a callable, but we need this so a
  * `ModuleVariableNode` have an enclosing callable.
  */
+overlay[local]
 class DataFlowModuleScope extends DataFlowCallable, TModule {
   Module mod;
 
@@ -466,6 +508,7 @@ class DataFlowModuleScope extends DataFlowCallable, TModule {
   override ParameterNode getParameter(ParameterPosition ppos) { none() }
 }
 
+overlay[local]
 class LibraryCallableValue extends DataFlowCallable, TLibraryCallable {
   LibraryCallable callable;
 
@@ -476,6 +519,7 @@ class LibraryCallableValue extends DataFlowCallable, TLibraryCallable {
   override string getQualifiedName() { result = callable.toString() }
 
   /** Gets a data-flow node, where this library callable is used as a call-back. */
+  overlay[global]
   ArgumentNode getACallback() { result = callable.getACallback() }
 
   override Scope getScope() { none() }
@@ -824,7 +868,8 @@ private Class getNextClassInMro(Class cls) {
  */
 Function findFunctionAccordingToMro(Class cls, string name) {
   result = cls.getAMethod() and
-  result.getName() = name
+  result.getName() = name and
+  not hasOverloadDecorator(result)
   or
   not class_has_method(cls, name) and
   result = findFunctionAccordingToMro(getNextClassInMro(cls), name)
@@ -866,6 +911,7 @@ Class getNextClassInMroKnownStartingClass(Class cls, Class startingClass) {
 Function findFunctionAccordingToMroKnownStartingClass(Class cls, Class startingClass, string name) {
   result = cls.getAMethod() and
   result.getName() = name and
+  not hasOverloadDecorator(result) and
   cls = getADirectSuperclass*(startingClass)
   or
   not class_has_method(cls, name) and
@@ -1210,6 +1256,7 @@ predicate resolveCall(CallNode call, Function target, CallType type) {
  * Holds if the argument of `call` at position `apos` is `arg`. This is just a helper
  * predicate that maps ArgumentPositions to the arguments of the underlying `CallNode`.
  */
+overlay[local]
 cached
 predicate normalCallArg(CallNode call, Node arg, ArgumentPosition apos) {
   exists(int index |
@@ -1589,6 +1636,7 @@ class SummaryCall extends DataFlowCall, TSummaryCall {
  * The value of a parameter at function entry, viewed as a node in a data
  * flow graph.
  */
+overlay[local]
 abstract class ParameterNodeImpl extends Node {
   /** Gets the `Parameter` this `ParameterNode` represents. */
   abstract Parameter getParameter();
@@ -1610,6 +1658,7 @@ abstract class ParameterNodeImpl extends Node {
  *
  * This is used for tracking flow through captured variables.
  */
+overlay[local]
 class SynthCapturedVariablesParameterNode extends ParameterNodeImpl,
   TSynthCapturedVariablesParameterNode
 {
@@ -1634,6 +1683,7 @@ class SynthCapturedVariablesParameterNode extends ParameterNodeImpl,
 }
 
 /** A parameter for a library callable with a flow summary. */
+overlay[local]
 class SummaryParameterNode extends ParameterNodeImpl, FlowSummaryNode {
   SummaryParameterNode() {
     FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), _)
@@ -1684,6 +1734,7 @@ private class SummaryReturnNode extends FlowSummaryNode, ReturnNode {
   override ReturnKind getKind() { result = rk }
 }
 
+overlay[global]
 private class SummaryArgumentNode extends FlowSummaryNode, ArgumentNode {
   private SummaryCall call_;
   private ArgumentPosition pos_;
@@ -1737,6 +1788,7 @@ class SynthCapturedVariablesArgumentNode extends Node, TSynthCapturedVariablesAr
 class CapturedVariablesArgumentNodeAsArgumentNode extends ArgumentNode,
   SynthCapturedVariablesArgumentNode
 {
+  overlay[global]
   override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
     exists(CallNode callNode | callNode = this.getCallNode() |
       callNode = call.getNode() and
@@ -1773,6 +1825,7 @@ class SynthCapturedVariablesArgumentPostUpdateNode extends PostUpdateNodeImpl,
 }
 
 /** A synthetic node representing the values of variables captured by a comprehension. */
+overlay[local]
 class SynthCompCapturedVariablesArgumentNode extends Node, TSynthCompCapturedVariablesArgumentNode {
   Comp comp;
 
@@ -1790,6 +1843,7 @@ class SynthCompCapturedVariablesArgumentNode extends Node, TSynthCompCapturedVar
 class SynthCompCapturedVariablesArgumentNodeAsArgumentNode extends SynthCompCapturedVariablesArgumentNode,
   ArgumentNode
 {
+  overlay[global]
   override predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
     call.(ComprehensionCall).getComprehension() = comp and
     pos.isLambdaSelf()
@@ -1834,12 +1888,14 @@ DataFlowCallable viableCallable(DataFlowCall call) {
 // =============================================================================
 // Remaining required data-flow things
 // =============================================================================
+overlay[local]
 private newtype TReturnKind = TNormalReturnKind()
 
 /**
  * A return kind. A return kind describes how a value can be returned
  * from a callable. For Python, this is simply a method return.
  */
+overlay[local]
 class ReturnKind extends TReturnKind {
   /** Gets a textual representation of this element. */
   string toString() { result = "return" }
@@ -1921,3 +1977,185 @@ private module OutNodes {
  * `kind`.
  */
 OutNode getAnOutNode(DataFlowCall call, ReturnKind kind) { call = result.getCall(kind) }
+
+/**
+ * Provides predicates for approximating type properties of user-defined classes
+ * based on their structure (method declarations, base classes).
+ *
+ * This module should _not_ be used in the call graph computation itself, as parts of it may depend
+ * on layers that themselves build upon the call graph (e.g. API graphs).
+ */
+module DuckTyping {
+  private import semmle.python.ApiGraphs
+
+  /**
+   * Holds if `cls` or any of its resolved superclasses declares a method with the given `name`.
+   */
+  predicate hasMethod(Class cls, string name) {
+    cls.getAMethod().getName() = name
+    or
+    hasMethod(getADirectSuperclass(cls), name)
+  }
+
+  /**
+   * Holds if `cls` has a base class that cannot be resolved to a user-defined class
+   * and is not just `object`, meaning it may inherit methods from an unknown class.
+   */
+  predicate hasUnresolvedBase(Class cls) {
+    exists(Expr base | base = cls.getABase() |
+      not base = classTracker(_).asExpr() and
+      not base = API::builtin("object").getAValueReachableFromSource().asExpr()
+    )
+  }
+
+  /**
+   * Holds if `cls` supports the container protocol, i.e. it declares
+   * `__contains__`, `__iter__`, or `__getitem__`.
+   */
+  predicate isContainer(Class cls) {
+    hasMethod(cls, "__contains__") or
+    hasMethod(cls, "__iter__") or
+    hasMethod(cls, "__getitem__")
+  }
+
+  /**
+   * Holds if `cls` supports the iterable protocol, i.e. it declares
+   * `__iter__` or `__getitem__`.
+   */
+  predicate isIterable(Class cls) {
+    hasMethod(cls, "__iter__") or
+    hasMethod(cls, "__getitem__")
+  }
+
+  /**
+   * Holds if `cls` supports the iterator protocol, i.e. it declares
+   * both `__iter__` and `__next__`.
+   */
+  predicate isIterator(Class cls) {
+    hasMethod(cls, "__iter__") and
+    hasMethod(cls, "__next__")
+  }
+
+  /**
+   * Holds if `cls` supports the context manager protocol, i.e. it declares
+   * both `__enter__` and `__exit__`.
+   */
+  predicate isContextManager(Class cls) {
+    hasMethod(cls, "__enter__") and
+    hasMethod(cls, "__exit__")
+  }
+
+  /**
+   * Holds if `cls` supports the descriptor protocol, i.e. it declares
+   * `__get__`, `__set__`, or `__delete__`.
+   */
+  predicate isDescriptor(Class cls) {
+    hasMethod(cls, "__get__") or
+    hasMethod(cls, "__set__") or
+    hasMethod(cls, "__delete__")
+  }
+
+  /**
+   * Holds if `cls` directly assigns to an attribute named `name` in its class body.
+   * This covers attribute assignments like `x = value`, but not method definitions.
+   */
+  predicate declaresAttribute(Class cls, string name) { exists(getAnAttributeValue(cls, name)) }
+
+  /**
+   * Gets the value expression assigned to attribute `name` directly in the class body of `cls`.
+   */
+  Expr getAnAttributeValue(Class cls, string name) {
+    exists(Assign a |
+      a.getScope() = cls and
+      a.getATarget().(Name).getId() = name and
+      result = a.getValue()
+    )
+  }
+
+  /**
+   * Holds if `cls` is callable, i.e. it declares `__call__`.
+   */
+  predicate isCallable(Class cls) { hasMethod(cls, "__call__") }
+
+  /**
+   * Holds if `cls` supports the mapping protocol, i.e. it declares
+   * `__getitem__` and `keys`, or `__getitem__` and `__iter__`.
+   */
+  predicate isMapping(Class cls) {
+    hasMethod(cls, "__getitem__") and
+    (hasMethod(cls, "keys") or hasMethod(cls, "__iter__"))
+  }
+
+  /**
+   * Holds if `cls` is a new-style class. In Python 3, all classes are new-style.
+   * In Python 2, a class is new-style if it (transitively) inherits from `object`,
+   * or has a declared `__metaclass__`, or is in a module with a module-level
+   * `__metaclass__` declaration, or has an unresolved base class.
+   */
+  predicate isNewStyle(Class cls) {
+    major_version() = 3
+    or
+    major_version() = 2 and
+    (
+      cls.getABase() = API::builtin("object").getAValueReachableFromSource().asExpr()
+      or
+      isNewStyle(getADirectSuperclass(cls))
+      or
+      hasUnresolvedBase(cls)
+      or
+      exists(cls.getMetaClass())
+      or
+      // Module-level __metaclass__ = type makes all classes in the module new-style
+      exists(Assign a |
+        a.getScope() = cls.getEnclosingModule() and
+        a.getATarget().(Name).getId() = "__metaclass__" and
+        a.getValue() = API::builtin("type").getAValueReachableFromSource().asExpr()
+      )
+    )
+  }
+
+  /**
+   * Gets the `__init__` function that will be invoked when `cls` is constructed,
+   * resolved according to the MRO.
+   */
+  Function getInit(Class cls) { result = invokedFunctionFromClassConstruction(cls, "__init__") }
+
+  /**
+   * Holds if `cls` or any of its superclasses uses multiple inheritance, or
+   * has an unresolved base class. In these cases, our MRO approximation may
+   * resolve to the wrong `__init__`, so we should not flag argument mismatches.
+   */
+  predicate hasUnreliableMro(Class cls) {
+    exists(Class sup | sup = getADirectSuperclass*(cls) |
+      exists(sup.getBase(1))
+      or
+      hasUnresolvedBase(sup)
+    )
+  }
+
+  /**
+   * Holds if `f` overrides a method in a superclass with the same name.
+   */
+  predicate overridesMethod(Function f) { overridesMethod(f, _, _) }
+
+  /**
+   * Holds if `f` overrides `overridden` declared in `superclass`.
+   */
+  predicate overridesMethod(Function f, Class superclass, Function overridden) {
+    exists(Class cls |
+      f.getScope() = cls and
+      superclass = getADirectSuperclass+(cls) and
+      overridden = superclass.getMethod(f.getName())
+    )
+  }
+
+  /**
+   * Holds if `f` is a property accessor (decorated with `@property`, `@name.setter`,
+   * or `@name.deleter`).
+   */
+  predicate isPropertyAccessor(Function f) {
+    exists(Attribute a | a = f.getADecorator() | a.getName() = "setter" or a.getName() = "deleter")
+    or
+    f.getADecorator().(Name).getId() = "property"
+  }
+}
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
index 9866bd00964..fffd0150008 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPrivate.qll
@@ -1,3 +1,6 @@
+overlay[local?]
+module;
+
 private import python
 private import DataFlowPublic
 private import semmle.python.essa.SsaCompute
@@ -39,6 +42,7 @@ predicate isArgumentNode(ArgumentNode arg, DataFlowCall c, ArgumentPosition pos)
 //--------
 // Nodes
 //--------
+overlay[local]
 predicate isExpressionNode(ControlFlowNode node) { node.getNode() instanceof Expr }
 
 // =============================================================================
@@ -111,6 +115,7 @@ class SyntheticPreUpdateNode extends Node, TSyntheticPreUpdateNode {
  * func = foo if <cond> else bar
  * func(1, 2, 3)
  */
+overlay[local]
 class SynthStarArgsElementParameterNode extends ParameterNodeImpl,
   TSynthStarArgsElementParameterNode
 {
@@ -241,6 +246,7 @@ private predicate dictSplatParameterNodeClearStep(ParameterNode n, DictionaryEle
  *  (c) since the synthesized nodes are hidden, the reported data-flow paths will be
  *      collapsed anyway.
  */
+overlay[local]
 class SynthDictSplatParameterNode extends ParameterNodeImpl, TSynthDictSplatParameterNode {
   DataFlowCallable callable;
 
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
index de26d988c06..8612d4a253e 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowPublic.qll
@@ -1,6 +1,8 @@
 /**
  * Provides Python-specific definitions for use in the data flow library.
  */
+overlay[local]
+module;
 
 private import python
 private import DataFlowPrivate
@@ -22,6 +24,7 @@ private import semmle.python.frameworks.data.ModelsAsData
  * - Module variable nodes: These represent global variables and act as canonical targets for reads and writes of these.
  * - Synthetic nodes: These handle flow in various special cases.
  */
+overlay[local]
 newtype TNode =
   /** A node corresponding to a control flow node. */
   TCfgNode(ControlFlowNode node) {
@@ -157,6 +160,7 @@ private import semmle.python.internal.CachedStages
  * An element, viewed as a node in a data flow graph. Either an SSA variable
  * (`EssaNode`) or a control flow node (`CfgNode`).
  */
+overlay[local]
 class Node extends TNode {
   /** Gets a textual representation of this element. */
   cached
@@ -324,6 +328,7 @@ class ScopeEntryDefinitionNode extends Node, TScopeEntryDefinitionNode {
  * The value of a parameter at function entry, viewed as a node in a data
  * flow graph.
  */
+overlay[local]
 class ParameterNode extends Node instanceof ParameterNodeImpl {
   /** Gets the parameter corresponding to this node, if any. */
   final Parameter getParameter() { result = super.getParameter() }
@@ -345,6 +350,7 @@ class LocalSourceParameterNode extends ExtractedParameterNode, LocalSourceNode {
 ExtractedParameterNode parameterNode(Parameter p) { result.getParameter() = p }
 
 /** A data flow node that represents a call argument. */
+overlay[global]
 abstract class ArgumentNode extends Node {
   /** Holds if this argument occurs at the given position in the given call. */
   abstract predicate argumentOf(DataFlowCall call, ArgumentPosition pos);
@@ -383,6 +389,7 @@ private Node implicitArgumentNode() {
 /**
  * A data flow node that represents a call argument found in the source code.
  */
+overlay[global]
 class ExtractedArgumentNode extends ArgumentNode {
   ExtractedArgumentNode() {
     this = getCallArgApproximation()
@@ -469,6 +476,7 @@ class ModuleVariableNode extends Node, TModuleVariableNode {
   GlobalVariable getVariable() { result = var }
 
   /** Gets a node that reads this variable. */
+  overlay[global]
   Node getARead() {
     result = this.getALocalRead()
     or
@@ -500,10 +508,12 @@ class ModuleVariableNode extends Node, TModuleVariableNode {
   override Location getLocation() { result = mod.getLocation() }
 }
 
+overlay[global]
 private ModuleVariableNode import_star_read(Node n) {
   resolved_import_star_module(result.getModule(), result.getVariable().getId(), n)
 }
 
+overlay[global]
 pragma[nomagic]
 private predicate resolved_import_star_module(Module m, string name, Node n) {
   exists(NameNode nn | nn = n.asCfgNode() |
@@ -585,7 +595,8 @@ ControlFlowNode guardNode(ConditionBlock conditionBlock, boolean flipped) {
   result = conditionBlock.getLastNode() and
   flipped = false
   or
-  // Recursive case: if a guard node is a `not`-expression,
+  // Recursive cases:
+  // if a guard node is a `not`-expression,
   // the operand is also a guard node, but with inverted polarity.
   exists(UnaryExprNode notNode |
     result = notNode.getOperand() and
@@ -593,6 +604,33 @@ ControlFlowNode guardNode(ConditionBlock conditionBlock, boolean flipped) {
   |
     notNode = guardNode(conditionBlock, flipped.booleanNot())
   )
+  or
+  // if a guard node is compared to a boolean literal,
+  // the other operand is also a guard node,
+  // but with polarity depending on the literal (and on the comparison).
+  exists(CompareNode cmpNode, Cmpop op, ControlFlowNode b, boolean should_flip |
+    (
+      cmpNode.operands(result, op, b) or
+      cmpNode.operands(b, op, result)
+    ) and
+    not result.getNode() instanceof BooleanLiteral and
+    (
+      // comparing to the boolean
+      (op instanceof Eq or op instanceof Is) and
+      // we should flip if the value compared against, here the value of `b`, is false
+      should_flip = b.getNode().(BooleanLiteral).booleanValue().booleanNot()
+      or
+      // comparing to the negation of the boolean
+      (op instanceof NotEq or op instanceof IsNot) and
+      // again, we should flip if the value compared against, here the value of `not b`, is false.
+      // That is, if the value of `b` is true.
+      should_flip = b.getNode().(BooleanLiteral).booleanValue()
+    )
+  |
+    // we flip `flipped` according to `should_flip` via the formula `flipped xor should_flip`.
+    flipped in [true, false] and
+    cmpNode = guardNode(conditionBlock, flipped.booleanXor(should_flip))
+  )
 }
 
 /**
@@ -625,6 +663,7 @@ signature predicate guardChecksSig(GuardNode g, ControlFlowNode node, boolean br
  * This is expected to be used in `isBarrier`/`isSanitizer` definitions
  * in data flow and taint tracking.
  */
+overlay[global]
 module BarrierGuard<guardChecksSig/3 guardChecks> {
   /** Gets a node that is safely guarded by the given guard check. */
   ExprNode getABarrierNode() {
@@ -652,6 +691,7 @@ private module WithParam<ParamSig P> {
  */
 module ParameterizedBarrierGuard<ParamSig P, WithParam<P>::guardChecksSig/4 guardChecks> {
   /** Gets a node that is safely guarded by the given guard check with parameter `param`. */
+  overlay[global]
   ExprNode getABarrierNode(P param) {
     exists(GuardNode g, EssaDefinition def, ControlFlowNode node, boolean branch |
       AdjacentUses::useOfDef(def, node) and
@@ -671,6 +711,7 @@ module ParameterizedBarrierGuard<ParamSig P, WithParam<P>::guardChecksSig/4 guar
 module ExternalBarrierGuard {
   private import semmle.python.ApiGraphs
 
+  overlay[global]
   private predicate guardCheck(GuardNode g, ControlFlowNode node, boolean branch, string kind) {
     exists(API::CallNode call, API::Node parameter |
       parameter = call.getAParameter() and
@@ -689,6 +730,7 @@ module ExternalBarrierGuard {
    *
    * INTERNAL: Do not use.
    */
+  overlay[global]
   ExprNode getAnExternalBarrierNode(string kind) {
     result = ParameterizedBarrierGuard<string, guardCheck/4>::getABarrierNode(kind)
   }
@@ -698,6 +740,7 @@ module ExternalBarrierGuard {
  * Algebraic datatype for tracking data content associated with values.
  * Content can be collection elements or object attributes.
  */
+overlay[local]
 newtype TContent =
   /** An element of a list. */
   TListElementContent() or
@@ -769,6 +812,7 @@ newtype TContent =
  * If the value is a collection, it can have elements,
  * if it is an object, it can have attribute values.
  */
+overlay[local]
 class Content extends TContent {
   /** Gets a textual representation of this element. */
   string toString() { result = "Content" }
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll
index 449b51565a8..41cb0368b50 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/FlowSummaryImpl.qll
@@ -1,6 +1,8 @@
 /**
  * Provides classes and predicates for defining flow summaries.
  */
+overlay[local]
+module;
 
 private import python
 private import codeql.dataflow.internal.FlowSummaryImpl
@@ -99,6 +101,7 @@ module Input implements InputSig<Location, DataFlowImplSpecific::PythonDataFlow>
 private import Make<Location, DataFlowImplSpecific::PythonDataFlow, Input> as Impl
 
 private module StepsInput implements Impl::Private::StepsInputSig {
+  overlay[global]
   DataFlowCall getACall(Public::SummarizedCallable sc) {
     result =
       TPotentialLibraryCall([
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/ImportStar.qll b/python/ql/lib/semmle/python/dataflow/new/internal/ImportStar.qll
index 564630c47db..83f8ee862c3 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/ImportStar.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/ImportStar.qll
@@ -1,4 +1,6 @@
 /** Provides predicates for reasoning about uses of `import *` in Python. */
+overlay[local]
+module;
 
 private import python
 private import semmle.python.dataflow.new.internal.Builtins
@@ -11,6 +13,7 @@ module ImportStar {
    * Holds if `n` is an access of a variable called `name` (which is _not_ the name of a
    * built-in, and which is _not_ a global defined in the enclosing module) inside the scope `s`.
    */
+  overlay[local]
   cached
   predicate namePossiblyDefinedInImportStar(NameNode n, string name, Scope s) {
     n.isLoad() and
@@ -61,6 +64,7 @@ module ImportStar {
    * Holds if `n` may refer to a global variable of the same name in the module `m`, accessible
    *  from the scope of `n` by a chain of `import *` imports.
    */
+  overlay[global]
   cached
   predicate importStarResolvesTo(NameNode n, Module m) {
     m = getStarImported+(n.getEnclosingModule()) and
@@ -71,6 +75,7 @@ module ImportStar {
   /**
    * Gets a module that is imported from `m` via `import *`.
    */
+  overlay[global]
   cached
   Module getStarImported(Module m) {
     exists(ImportStar i, DataFlow::CfgNode imported_module |
@@ -92,6 +97,7 @@ module ImportStar {
    *
    * this would return the data-flow nodes corresponding to `foo.bar` and `quux`.
    */
+  overlay[local]
   cached
   ControlFlowNode potentialImportStarBase(Scope s) {
     result = any(ImportStarNode n | n.getScope() = s).getModule()
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/IterableUnpacking.qll b/python/ql/lib/semmle/python/dataflow/new/internal/IterableUnpacking.qll
index e83e789c2fb..5def15fa3c8 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/IterableUnpacking.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/IterableUnpacking.qll
@@ -166,6 +166,8 @@
  *
  *  `c`: [ListElementContent]
  */
+overlay[local]
+module;
 
 private import python
 private import DataFlowPublic
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/LocalSources.qll b/python/ql/lib/semmle/python/dataflow/new/internal/LocalSources.qll
index 7752846ae1f..5cbe7b44ab3 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/LocalSources.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/LocalSources.qll
@@ -5,6 +5,8 @@
  * Note that unlike `TypeTracker.qll`, this library only performs
  * local tracking within a function.
  */
+overlay[local]
+module;
 
 private import python
 import DataFlowPublic
@@ -77,6 +79,7 @@ class LocalSourceNode extends Node {
   }
 
   /** Holds if this `LocalSourceNode` can flow to `nodeTo` in one or more local flow steps. */
+  overlay[caller]
   pragma[inline]
   predicate flowsTo(Node nodeTo) { Cached::hasLocalSource(nodeTo, this) }
 
@@ -149,6 +152,7 @@ class LocalSourceNode extends Node {
    *
    * See `TypeTracker` for more details about how to use this.
    */
+  overlay[global]
   pragma[inline]
   LocalSourceNode track(TypeTracker t2, TypeTracker t) { t = t2.step(this, result) }
 
@@ -157,6 +161,7 @@ class LocalSourceNode extends Node {
    *
    * See `TypeBackTracker` for more details about how to use this.
    */
+  overlay[global]
   pragma[inline]
   LocalSourceNode backtrack(TypeBackTracker t2, TypeBackTracker t) { t = t2.step(result, this) }
 }
@@ -210,6 +215,7 @@ private module FutureWork {
      *
      * See `TypeTracker` for more details about how to use this.
      */
+    overlay[global]
     pragma[inline]
     TypeTrackingNode track(TypeTracker t2, TypeTracker t) { t = t2.step(this, result) }
 
@@ -218,6 +224,7 @@ private module FutureWork {
      *
      * See `TypeBackTracker` for more details about how to use this.
      */
+    overlay[global]
     pragma[inline]
     TypeTrackingNode backtrack(TypeBackTracker t2, TypeBackTracker t) { t2 = t.step(result, this) }
   }
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/MatchUnpacking.qll b/python/ql/lib/semmle/python/dataflow/new/internal/MatchUnpacking.qll
index 8064c34d921..e72e378da52 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/MatchUnpacking.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/MatchUnpacking.qll
@@ -50,6 +50,8 @@
  * keyword arguments using the `__match_args__` attribute on the class. We do not
  * currently model this.
  */
+overlay[local]
+module;
 
 private import python
 private import DataFlowPublic
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
index 2f98ab70719..95434b05451 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/TypeTrackingImpl.qll
@@ -202,11 +202,18 @@ module TypeTrackingInput implements Shared::TypeTrackingInput<Location> {
    */
   predicate returnStep(Node nodeFrom, LocalSourceNode nodeTo) {
     exists(DataFlowPrivate::ExtractedDataFlowCall call |
-      nodeFrom.(DataFlowPrivate::ReturnNode).getEnclosingCallable() = call.getCallable() and
+      returnNodeEnclosingCallable(nodeFrom) = call.getCallable() and
       nodeTo.(DataFlowPublic::CfgNode).getNode() = call.getNode()
     )
   }
 
+  pragma[nomagic]
+  private DataFlowDispatch::DataFlowCallable returnNodeEnclosingCallable(
+    DataFlowPrivate::ReturnNode returnNode
+  ) {
+    result = returnNode.getEnclosingCallable()
+  }
+
   /**
    * Holds if `nodeFrom` is being written to the `content` content of the object in `nodeTo`.
    */
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 5ed365a8e56..fbe05979328 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/VariableCapture.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/VariableCapture.qll
@@ -1,4 +1,6 @@
 /** Provides logic related to captured variables. */
+overlay[local]
+module;
 
 private import python
 private import DataFlowPublic
diff --git a/python/ql/lib/semmle/python/essa/Definitions.qll b/python/ql/lib/semmle/python/essa/Definitions.qll
index aca6991b9f6..6e7b8d5b376 100644
--- a/python/ql/lib/semmle/python/essa/Definitions.qll
+++ b/python/ql/lib/semmle/python/essa/Definitions.qll
@@ -1,3 +1,6 @@
+overlay[local]
+module;
+
 import python
 /*
  * Classification of variables. These should be non-overlapping and complete.
diff --git a/python/ql/lib/semmle/python/essa/Essa.qll b/python/ql/lib/semmle/python/essa/Essa.qll
index 384bfd2f91f..ebc22beedf3 100644
--- a/python/ql/lib/semmle/python/essa/Essa.qll
+++ b/python/ql/lib/semmle/python/essa/Essa.qll
@@ -1,6 +1,8 @@
 /**
  * Library for SSA representation (Static Single Assignment form).
  */
+overlay[local]
+module;
 
 import python
 private import SsaCompute
diff --git a/python/ql/lib/semmle/python/essa/SsaCompute.qll b/python/ql/lib/semmle/python/essa/SsaCompute.qll
index d2512eecded..fb030b6250e 100644
--- a/python/ql/lib/semmle/python/essa/SsaCompute.qll
+++ b/python/ql/lib/semmle/python/essa/SsaCompute.qll
@@ -88,6 +88,8 @@
  * ```
  * and thus it falls out that `g3` must be `1`.
  */
+overlay[local]
+module;
 
 import python
 private import semmle.python.internal.CachedStages
diff --git a/python/ql/lib/semmle/python/essa/SsaDefinitions.qll b/python/ql/lib/semmle/python/essa/SsaDefinitions.qll
index 6c87af102fa..827bee34474 100644
--- a/python/ql/lib/semmle/python/essa/SsaDefinitions.qll
+++ b/python/ql/lib/semmle/python/essa/SsaDefinitions.qll
@@ -2,6 +2,8 @@
  * Provides classes and predicates for determining the uses and definitions of
  * variables for ESSA form.
  */
+overlay[local]
+module;
 
 import python
 private import semmle.python.internal.CachedStages
diff --git a/python/ql/lib/semmle/python/frameworks/AntiSSRF.model.yml b/python/ql/lib/semmle/python/frameworks/AntiSSRF.model.yml
new file mode 100644
index 00000000000..42f483c6970
--- /dev/null
+++ b/python/ql/lib/semmle/python/frameworks/AntiSSRF.model.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: codeql/python-all
+      extensible: barrierGuardModel
+    data:
+      - ['AntiSSRF', 'Member[URIValidator].Member[in_domain,in_azure_keyvault_domain,in_azure_storage_domain].Argument[0]', "true", 'request-forgery']
diff --git a/python/ql/lib/semmle/python/frameworks/Flask.qll b/python/ql/lib/semmle/python/frameworks/Flask.qll
index b9bba675ac0..f819e867907 100644
--- a/python/ql/lib/semmle/python/frameworks/Flask.qll
+++ b/python/ql/lib/semmle/python/frameworks/Flask.qll
@@ -2,6 +2,8 @@
  * Provides classes modeling security-relevant aspects of the `flask` PyPI package.
  * See https://flask.palletsprojects.com/en/1.1.x/.
  */
+overlay[local?]
+module;
 
 private import python
 private import semmle.python.dataflow.new.DataFlow
diff --git a/python/ql/lib/semmle/python/frameworks/Requests.qll b/python/ql/lib/semmle/python/frameworks/Requests.qll
index 4c8038787c9..30980d47322 100644
--- a/python/ql/lib/semmle/python/frameworks/Requests.qll
+++ b/python/ql/lib/semmle/python/frameworks/Requests.qll
@@ -24,6 +24,18 @@ private import semmle.python.frameworks.data.ModelsAsData
  * - https://requests.readthedocs.io/en/latest/
  */
 module Requests {
+  /** Join-order helper for `OutgoingRequestCall`. */
+  pragma[nomagic]
+  private API::Node sessionInstance() {
+    exists(API::Node moduleExporting |
+      moduleExporting in [
+          API::moduleImport("requests"), //
+          API::moduleImport("requests").getMember("sessions")
+        ] and
+      result = moduleExporting.getMember(["Session", "session"]).getReturn()
+    )
+  }
+
   /**
    * An outgoing HTTP request, from the `requests` library.
    *
@@ -37,15 +49,7 @@ module Requests {
       (
         this = API::moduleImport("requests").getMember(methodName).getACall()
         or
-        exists(API::Node moduleExporting, API::Node sessionInstance |
-          moduleExporting in [
-              API::moduleImport("requests"), //
-              API::moduleImport("requests").getMember("sessions")
-            ] and
-          sessionInstance = moduleExporting.getMember(["Session", "session"]).getReturn()
-        |
-          this = sessionInstance.getMember(methodName).getACall()
-        )
+        this = sessionInstance().getMember(methodName).getACall()
       )
     }
 
diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
index e749ab66f8b..5d3b994880a 100644
--- a/python/ql/lib/semmle/python/frameworks/Stdlib.qll
+++ b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -2,6 +2,8 @@
  * Provides classes modeling security-relevant aspects of the standard libraries.
  * Note: some modeling is done internally in the dataflow/taint tracking implementation.
  */
+overlay[local?]
+module;
 
 private import python
 private import semmle.python.dataflow.new.DataFlow
diff --git a/python/ql/lib/semmle/python/frameworks/data/ModelsAsData.qll b/python/ql/lib/semmle/python/frameworks/data/ModelsAsData.qll
index e66f2c01d70..542f8c995e9 100644
--- a/python/ql/lib/semmle/python/frameworks/data/ModelsAsData.qll
+++ b/python/ql/lib/semmle/python/frameworks/data/ModelsAsData.qll
@@ -8,6 +8,8 @@
  * The package name refers to the top-level module the import comes from, and not a PyPI package.
  * So for `from foo.bar import baz`, the package will be `foo`.
  */
+overlay[local?]
+module;
 
 private import python
 private import internal.ApiGraphModels as Shared
diff --git a/python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModelsSpecific.qll b/python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModelsSpecific.qll
index 7adc24bab14..3136f87569c 100644
--- a/python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModelsSpecific.qll
+++ b/python/ql/lib/semmle/python/frameworks/data/internal/ApiGraphModelsSpecific.qll
@@ -30,6 +30,7 @@ import semmle.python.dataflow.new.DataFlow::DataFlow as DataFlow
  * Holds if models describing `type` may be relevant for the analysis of this database.
  */
 bindingset[type]
+overlay[local]
 predicate isTypeUsed(string type) {
   // If `type` is a path, then it is the first component that should be imported.
   API::moduleImportExists(type.splitAt(".", 0))
@@ -39,6 +40,7 @@ predicate isTypeUsed(string type) {
  * Holds if `type` can be obtained from an instance of `otherType` due to
  * language semantics modeled by `getExtraNodeFromType`.
  */
+overlay[local]
 predicate hasImplicitTypeModel(string type, string otherType) { none() }
 
 /** Gets a Python-specific interpretation of the `(type, path)` tuple after resolving the first `n` access path tokens. */
diff --git a/python/ql/lib/semmle/python/internal/Awaited.qll b/python/ql/lib/semmle/python/internal/Awaited.qll
index cd5162e6151..43affdf95a4 100644
--- a/python/ql/lib/semmle/python/internal/Awaited.qll
+++ b/python/ql/lib/semmle/python/internal/Awaited.qll
@@ -3,6 +3,8 @@
  *
  * Provides helper class for defining additional API graph edges.
  */
+overlay[local]
+module;
 
 private import python
 private import semmle.python.dataflow.new.DataFlow
diff --git a/python/ql/lib/semmle/python/internal/CachedStages.qll b/python/ql/lib/semmle/python/internal/CachedStages.qll
index 687cabeceae..7379cc51372 100644
--- a/python/ql/lib/semmle/python/internal/CachedStages.qll
+++ b/python/ql/lib/semmle/python/internal/CachedStages.qll
@@ -35,6 +35,7 @@ module Stages {
    * Computes predicates based on the AST.
    * These include SSA and basic-blocks.
    */
+  overlay[local]
   cached
   module AST {
     /**
@@ -176,6 +177,7 @@ module Stages {
      * Always holds.
      * Ensures that a predicate is evaluated as part of the DataFlow stage.
      */
+    overlay[local]
     cached
     predicate ref() { 1 = 1 }
 
diff --git a/python/ql/lib/semmle/python/objects/TObject.qll b/python/ql/lib/semmle/python/objects/TObject.qll
index c041827ff5a..cfa8cb5aa07 100644
--- a/python/ql/lib/semmle/python/objects/TObject.qll
+++ b/python/ql/lib/semmle/python/objects/TObject.qll
@@ -397,6 +397,12 @@ private predicate neither_class_nor_static_method(Function f) {
   )
 }
 
+/** Join-order helper for `missing_imported_module`. */
+pragma[nomagic]
+private predicate module_has_syntaxerror(Module m) {
+  exists(SyntaxError se | se.getFile() = m.getFile())
+}
+
 predicate missing_imported_module(ControlFlowNode imp, Context ctx, string name) {
   ctx.isImport() and
   imp.(ImportExprNode).getNode().getAnImportedModuleName() = name and
@@ -404,9 +410,9 @@ predicate missing_imported_module(ControlFlowNode imp, Context ctx, string name)
     not exists(Module m | m.getName() = name) and
     not exists(Builtin b | b.isModule() and b.getName() = name)
     or
-    exists(Module m, SyntaxError se |
+    exists(Module m |
       m.getName() = name and
-      se.getFile() = m.getFile()
+      module_has_syntaxerror(m)
     )
   )
   or
diff --git a/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryCustomizations.qll b/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryCustomizations.qll
index 3fb260e425d..e3f18170f63 100644
--- a/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryCustomizations.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryCustomizations.qll
@@ -10,6 +10,7 @@ private import semmle.python.Concepts
 private import semmle.python.dataflow.new.RemoteFlowSources
 private import semmle.python.dataflow.new.BarrierGuards
 private import semmle.python.ApiGraphs
+private import semmle.python.frameworks.data.internal.ApiGraphModels
 
 /**
  * Provides default sources, sinks and sanitizers for detecting
@@ -177,35 +178,7 @@ module ServerSideRequestForgery {
     )
   }
 
-  /** A validation of a URI using the `AntiSSRF` library, considered as a full-ssrf sanitizer. */
-  private class UriValidator extends FullUrlControlSanitizer {
-    UriValidator() { this = DataFlow::BarrierGuard<uri_validator/3>::getABarrierNode() }
-  }
-
-  import semmle.python.dataflow.new.internal.DataFlowPublic
-
-  private predicate uri_validator(DataFlow::GuardNode g, ControlFlowNode node, boolean branch) {
-    exists(DataFlow::CallCfgNode call, string funcs |
-      funcs in ["in_domain", "in_azure_keyvault_domain", "in_azure_storage_domain"] and
-      call = API::moduleImport("AntiSSRF").getMember("URIValidator").getMember(funcs).getACall() and
-      call.getArg(0).asCfgNode() = node
-    |
-      // validator call directly (e.g., if URIValidator.in_domain(...) )
-      g = call.asCfgNode() and
-      branch = true
-      or
-      // validator used in a comparison
-      exists(Cmpop op, Node n, ControlFlowNode l |
-        n.getALocalSource() = call and g.(CompareNode).operands(n.asCfgNode(), op, l)
-      |
-        // validator == true or validator == false or validator is True or validator is False
-        (op instanceof Eq or op instanceof Is) and
-        branch = l.getNode().(BooleanLiteral).booleanValue()
-        or
-        // validator != false or validator != true or validator is not True or validator is not False
-        (op instanceof NotEq or op instanceof IsNot) and
-        branch = l.getNode().(BooleanLiteral).booleanValue().booleanNot()
-      )
-    )
+  private class ExternalRequestForgerySanitizer extends FullUrlControlSanitizer {
+    ExternalRequestForgerySanitizer() { ModelOutput::barrierNode(this, "request-forgery") }
   }
 }
diff --git a/python/ql/lib/semmle/python/types/Builtins.qll b/python/ql/lib/semmle/python/types/Builtins.qll
index 796397f72cd..371cf758d5c 100644
--- a/python/ql/lib/semmle/python/types/Builtins.qll
+++ b/python/ql/lib/semmle/python/types/Builtins.qll
@@ -1,3 +1,6 @@
+overlay[local?]
+module;
+
 import python
 private import LegacyPointsTo
 
diff --git a/python/ql/lib/semmle/python/types/ImportTime.qll b/python/ql/lib/semmle/python/types/ImportTime.qll
index 1604013d7ff..27f70b09aa4 100644
--- a/python/ql/lib/semmle/python/types/ImportTime.qll
+++ b/python/ql/lib/semmle/python/types/ImportTime.qll
@@ -1,3 +1,6 @@
+overlay[local]
+module;
+
 import python
 
 /**
diff --git a/python/ql/src/CHANGELOG.md b/python/ql/src/CHANGELOG.md
index a68b2d3b8db..46e1c23df07 100644
--- a/python/ql/src/CHANGELOG.md
+++ b/python/ql/src/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.7.9
+
+No user-facing changes.
+
+## 1.7.8
+
+No user-facing changes.
+
 ## 1.7.7
 
 No user-facing changes.
diff --git a/python/ql/src/Classes/CallsToInitDel/MethodCallOrder.qll b/python/ql/src/Classes/CallsToInitDel/MethodCallOrder.qll
index 635953168d7..232c29e7dee 100644
--- a/python/ql/src/Classes/CallsToInitDel/MethodCallOrder.qll
+++ b/python/ql/src/Classes/CallsToInitDel/MethodCallOrder.qll
@@ -152,11 +152,7 @@ predicate missingCallToSuperclassMethod(Class base, Function shouldCall, string
  */
 predicate missingCallToSuperclassMethodRestricted(Class base, Function shouldCall, string name) {
   missingCallToSuperclassMethod(base, shouldCall, name) and
-  not exists(Class superBase |
-    // Alert only on the highest base class that has the issue
-    superBase = getADirectSuperclass+(base) and
-    missingCallToSuperclassMethod(superBase, shouldCall, name)
-  ) and
+  not superclassAlsoMissesCall(base, shouldCall, name) and
   not exists(Function subShouldCall |
     // Mention in the alert only the lowest method we're missing the call to
     subShouldCall.getScope() = getADirectSubclass+(shouldCall.getScope()) and
@@ -164,6 +160,15 @@ predicate missingCallToSuperclassMethodRestricted(Class base, Function shouldCal
   )
 }
 
+/**
+ * Holds if a strict superclass of `base` is also missing a call to `shouldCall` named `name`,
+ * indicating that `base` is not the highest class in the hierarchy with this issue.
+ */
+pragma[nomagic]
+private predicate superclassAlsoMissesCall(Class base, Function shouldCall, string name) {
+  missingCallToSuperclassMethod(getADirectSuperclass+(base), shouldCall, name)
+}
+
 /**
  * If `base` contains a `super()` call, gets a method in the inheritance hierarchy of `name` in the MRO of `base`
  * that does not contain a `super()` call, but would call `shouldCall` if it did, which does not otherwise get called
diff --git a/python/ql/src/Classes/PropertyInOldStyleClass.ql b/python/ql/src/Classes/PropertyInOldStyleClass.ql
index 2fd7b1d14cf..4b3666067ec 100644
--- a/python/ql/src/Classes/PropertyInOldStyleClass.ql
+++ b/python/ql/src/Classes/PropertyInOldStyleClass.ql
@@ -11,10 +11,14 @@
  */
 
 import python
-private import LegacyPointsTo
+private import semmle.python.dataflow.new.internal.DataFlowDispatch
 
-from PropertyObject prop, ClassObject cls
-where cls.declaredAttribute(_) = prop and not cls.failedInference() and not cls.isNewStyle()
-select prop,
+from Function prop, Class cls, Name decorator
+where
+  prop.getScope() = cls and
+  decorator = prop.getADecorator() and
+  decorator.getId() = "property" and
+  not DuckTyping::isNewStyle(cls)
+select decorator,
   "Property " + prop.getName() + " will not work properly, as class " + cls.getName() +
     " is an old-style class."
diff --git a/python/ql/src/Classes/ShouldBeContextManager.ql b/python/ql/src/Classes/ShouldBeContextManager.ql
index 6aec0f0e0ab..ee97a0e682f 100644
--- a/python/ql/src/Classes/ShouldBeContextManager.ql
+++ b/python/ql/src/Classes/ShouldBeContextManager.ql
@@ -14,10 +14,12 @@
  */
 
 import python
-private import LegacyPointsTo
+private import semmle.python.dataflow.new.internal.DataFlowDispatch
 
-from ClassValue c
-where not c.isBuiltin() and not c.isContextManager() and exists(c.declaredAttribute("__del__"))
+from Class c
+where
+  not DuckTyping::isContextManager(c) and
+  exists(c.getMethod("__del__"))
 select c,
   "Class " + c.getName() +
     " implements __del__ (presumably to release some resource). Consider making it a context manager."
diff --git a/python/ql/src/Classes/SlotsInOldStyleClass.ql b/python/ql/src/Classes/SlotsInOldStyleClass.ql
index 2f91a88cf64..70a7997113e 100644
--- a/python/ql/src/Classes/SlotsInOldStyleClass.ql
+++ b/python/ql/src/Classes/SlotsInOldStyleClass.ql
@@ -12,9 +12,11 @@
  */
 
 import python
-private import LegacyPointsTo
+private import semmle.python.dataflow.new.internal.DataFlowDispatch
 
-from ClassObject c
-where not c.isNewStyle() and c.declaresAttribute("__slots__") and not c.failedInference()
+from Class c
+where
+  not DuckTyping::isNewStyle(c) and
+  DuckTyping::declaresAttribute(c, "__slots__")
 select c,
   "Using '__slots__' in an old style class just creates a class attribute called '__slots__'."
diff --git a/python/ql/src/Classes/SuperInOldStyleClass.ql b/python/ql/src/Classes/SuperInOldStyleClass.ql
index a6a272b1b3b..bc6541052de 100644
--- a/python/ql/src/Classes/SuperInOldStyleClass.ql
+++ b/python/ql/src/Classes/SuperInOldStyleClass.ql
@@ -11,14 +11,13 @@
  */
 
 import python
-private import LegacyPointsTo
+private import semmle.python.dataflow.new.internal.DataFlowDispatch
 
 predicate uses_of_super_in_old_style_class(Call s) {
-  exists(Function f, ClassObject c |
+  exists(Function f, Class c |
     s.getScope() = f and
-    f.getScope() = c.getPyClass() and
-    not c.failedInference() and
-    not c.isNewStyle() and
+    f.getScope() = c and
+    not DuckTyping::isNewStyle(c) and
     s.getFunc().(Name).getId() = "super"
   )
 }
diff --git a/python/ql/src/Classes/UselessClass.ql b/python/ql/src/Classes/UselessClass.ql
index 740c74bf96d..229e42fd292 100644
--- a/python/ql/src/Classes/UselessClass.ql
+++ b/python/ql/src/Classes/UselessClass.ql
@@ -13,7 +13,7 @@
  */
 
 import python
-private import LegacyPointsTo
+private import semmle.python.dataflow.new.internal.DataFlowDispatch
 
 predicate fewer_than_two_public_methods(Class cls, int methods) {
   (methods = 0 or methods = 1) and
@@ -25,13 +25,8 @@ predicate does_not_define_special_method(Class cls) {
 }
 
 predicate no_inheritance(Class c) {
-  not exists(ClassValue cls, ClassValue other |
-    cls.getScope() = c and
-    other != ClassValue::object()
-  |
-    other.getABaseType() = cls or
-    cls.getABaseType() = other
-  ) and
+  not exists(getADirectSubclass(c)) and
+  not exists(getADirectSuperclass(c)) and
   not exists(Expr base | base = c.getABase() |
     not base instanceof Name or base.(Name).getId() != "object"
   )
diff --git a/python/ql/src/Expressions/UseofApply.ql b/python/ql/src/Expressions/UseofApply.ql
index 2012f2d9361..f1068eca837 100644
--- a/python/ql/src/Expressions/UseofApply.ql
+++ b/python/ql/src/Expressions/UseofApply.ql
@@ -10,9 +10,10 @@
  */
 
 import python
-private import LegacyPointsTo
-private import semmle.python.types.Builtins
+private import semmle.python.ApiGraphs
 
-from CallNode call, ControlFlowNodeWithPointsTo func
-where major_version() = 2 and call.getFunction() = func and func.pointsTo(Value::named("apply"))
+from CallNode call
+where
+  major_version() = 2 and
+  call = API::builtin("apply").getACall().asCfgNode()
 select call, "Call to the obsolete builtin function 'apply'."
diff --git a/python/ql/src/Functions/DeprecatedSliceMethod.ql b/python/ql/src/Functions/DeprecatedSliceMethod.ql
index 3e9cdb681d9..937b3f46a4f 100644
--- a/python/ql/src/Functions/DeprecatedSliceMethod.ql
+++ b/python/ql/src/Functions/DeprecatedSliceMethod.ql
@@ -10,16 +10,17 @@
  */
 
 import python
-private import LegacyPointsTo
+private import semmle.python.dataflow.new.internal.DataFlowDispatch
 
 predicate slice_method_name(string name) {
   name = "__getslice__" or name = "__setslice__" or name = "__delslice__"
 }
 
-from PythonFunctionValue f, string meth
+from Function f, string meth
 where
-  f.getScope().isMethod() and
-  not f.isOverridingMethod() and
+  f.isMethod() and
   slice_method_name(meth) and
-  f.getName() = meth
+  f.getName() = meth and
+  not DuckTyping::overridesMethod(f) and
+  not DuckTyping::hasUnresolvedBase(getADirectSuperclass*(f.getScope()))
 select f, meth + " method has been deprecated since Python 2.0."
diff --git a/python/ql/src/Functions/OverlyComplexDelMethod.ql b/python/ql/src/Functions/OverlyComplexDelMethod.ql
index 12776db1b60..6b08a40fa29 100644
--- a/python/ql/src/Functions/OverlyComplexDelMethod.ql
+++ b/python/ql/src/Functions/OverlyComplexDelMethod.ql
@@ -18,6 +18,6 @@ from FunctionValue method
 where
   exists(ClassValue c |
     c.declaredAttribute("__del__") = method and
-    method.getScope().(FunctionMetrics).getCyclomaticComplexity() > 3
+    method.getScope().(FunctionMetricsWithPointsTo).getCyclomaticComplexity() > 3
   )
 select method, "Overly complex '__del__' method."
diff --git a/python/ql/src/Imports/DeprecatedModule.ql b/python/ql/src/Imports/DeprecatedModule.ql
index 3d529943fb8..62d77231334 100644
--- a/python/ql/src/Imports/DeprecatedModule.ql
+++ b/python/ql/src/Imports/DeprecatedModule.ql
@@ -11,7 +11,7 @@
  */
 
 import python
-private import LegacyPointsTo
+private import semmle.python.ApiGraphs
 
 /**
  * Holds if the module `name` was deprecated in Python version `major`.`minor`,
@@ -80,7 +80,7 @@ where
   name = imp.getName() and
   deprecated_module(name, instead, _, _) and
   not exists(Try try, ExceptStmt except | except = try.getAHandler() |
-    except.getType().(ExprWithPointsTo).pointsTo(ClassValue::importError()) and
+    except.getType() = API::builtin("ImportError").getAValueReachableFromSource().asExpr() and
     except.containsInScope(imp)
   )
 select imp, deprecation_message(name) + replacement_message(name)
diff --git a/python/ql/src/Metrics/CLinesOfCode.ql b/python/ql/src/Metrics/CLinesOfCode.ql
index 66a107a521f..274d45e8415 100644
--- a/python/ql/src/Metrics/CLinesOfCode.ql
+++ b/python/ql/src/Metrics/CLinesOfCode.ql
@@ -10,7 +10,6 @@
  */
 
 import python
-private import LegacyPointsTo
 
 from FunctionMetrics f
 select f, f.getNumberOfLinesOfCode() as n order by n desc
diff --git a/python/ql/src/Metrics/ClassAfferentCoupling.ql b/python/ql/src/Metrics/ClassAfferentCoupling.ql
index 3faf714d09c..69983f564ec 100644
--- a/python/ql/src/Metrics/ClassAfferentCoupling.ql
+++ b/python/ql/src/Metrics/ClassAfferentCoupling.ql
@@ -13,5 +13,5 @@
 import python
 private import LegacyPointsTo
 
-from ClassMetrics cls
+from ClassMetricsWithPointsTo cls
 select cls, cls.getAfferentCoupling() as n order by n desc
diff --git a/python/ql/src/Metrics/ClassEfferentCoupling.ql b/python/ql/src/Metrics/ClassEfferentCoupling.ql
index b4c5a29696b..08016a83889 100644
--- a/python/ql/src/Metrics/ClassEfferentCoupling.ql
+++ b/python/ql/src/Metrics/ClassEfferentCoupling.ql
@@ -13,5 +13,5 @@
 import python
 private import LegacyPointsTo
 
-from ClassMetrics cls
+from ClassMetricsWithPointsTo cls
 select cls, cls.getEfferentCoupling() as n order by n desc
diff --git a/python/ql/src/Metrics/CommentRatio.ql b/python/ql/src/Metrics/CommentRatio.ql
index 38394c1bf4f..5886c9d09e7 100644
--- a/python/ql/src/Metrics/CommentRatio.ql
+++ b/python/ql/src/Metrics/CommentRatio.ql
@@ -12,7 +12,6 @@
  */
 
 import python
-private import LegacyPointsTo
 
 from ModuleMetrics mm
 where mm.getNumberOfLines() > 0
diff --git a/python/ql/src/Metrics/CyclomaticComplexity.ql b/python/ql/src/Metrics/CyclomaticComplexity.ql
index 3d9ca10dd99..1d9874ac12c 100644
--- a/python/ql/src/Metrics/CyclomaticComplexity.ql
+++ b/python/ql/src/Metrics/CyclomaticComplexity.ql
@@ -15,6 +15,6 @@
 import python
 private import LegacyPointsTo
 
-from FunctionMetrics func, int complexity
+from FunctionMetricsWithPointsTo func, int complexity
 where complexity = func.getCyclomaticComplexity()
 select func, complexity order by complexity desc
diff --git a/python/ql/src/Metrics/DocStringRatio.ql b/python/ql/src/Metrics/DocStringRatio.ql
index 824ff5a3509..3c763c7742b 100644
--- a/python/ql/src/Metrics/DocStringRatio.ql
+++ b/python/ql/src/Metrics/DocStringRatio.ql
@@ -11,7 +11,6 @@
  */
 
 import python
-private import LegacyPointsTo
 
 from ModuleMetrics mm
 where mm.getNumberOfLines() > 0
diff --git a/python/ql/src/Metrics/FLines.ql b/python/ql/src/Metrics/FLines.ql
index dc5418711c9..01ea5a04f77 100644
--- a/python/ql/src/Metrics/FLines.ql
+++ b/python/ql/src/Metrics/FLines.ql
@@ -9,7 +9,6 @@
  */
 
 import python
-private import LegacyPointsTo
 
 from ModuleMetrics m, int n
 where n = m.getNumberOfLines()
diff --git a/python/ql/src/Metrics/FLinesOfCode.ql b/python/ql/src/Metrics/FLinesOfCode.ql
index 8159eb86c57..72131d3b74f 100644
--- a/python/ql/src/Metrics/FLinesOfCode.ql
+++ b/python/ql/src/Metrics/FLinesOfCode.ql
@@ -11,7 +11,6 @@
  */
 
 import python
-private import LegacyPointsTo
 
 from ModuleMetrics m, int n
 where n = m.getNumberOfLinesOfCode()
diff --git a/python/ql/src/Metrics/FLinesOfComments.ql b/python/ql/src/Metrics/FLinesOfComments.ql
index ac4b295003a..33523054f0c 100644
--- a/python/ql/src/Metrics/FLinesOfComments.ql
+++ b/python/ql/src/Metrics/FLinesOfComments.ql
@@ -10,7 +10,6 @@
  */
 
 import python
-private import LegacyPointsTo
 
 from ModuleMetrics m, int n
 where n = m.getNumberOfLinesOfComments() + m.getNumberOfLinesOfDocStrings()
diff --git a/python/ql/src/Metrics/FunctionNumberOfCalls.ql b/python/ql/src/Metrics/FunctionNumberOfCalls.ql
index 60171c790bf..fb4dfe5a9d2 100644
--- a/python/ql/src/Metrics/FunctionNumberOfCalls.ql
+++ b/python/ql/src/Metrics/FunctionNumberOfCalls.ql
@@ -9,7 +9,6 @@
  */
 
 import python
-private import LegacyPointsTo
 
 from FunctionMetrics func
 select func, func.getNumberOfCalls() as n order by n desc
diff --git a/python/ql/src/Metrics/FunctionStatementNestingDepth.ql b/python/ql/src/Metrics/FunctionStatementNestingDepth.ql
index 94f7e355750..ab40cc6068d 100644
--- a/python/ql/src/Metrics/FunctionStatementNestingDepth.ql
+++ b/python/ql/src/Metrics/FunctionStatementNestingDepth.ql
@@ -11,7 +11,6 @@
  */
 
 import python
-private import LegacyPointsTo
 
 from FunctionMetrics func
 select func, func.getStatementNestingDepth() as n order by n desc
diff --git a/python/ql/src/Metrics/History/HChurn.ql b/python/ql/src/Metrics/History/HChurn.ql
index dba28843670..f9d90d5eb19 100644
--- a/python/ql/src/Metrics/History/HChurn.ql
+++ b/python/ql/src/Metrics/History/HChurn.ql
@@ -10,7 +10,6 @@
 
 import python
 import external.VCS
-private import LegacyPointsTo
 
 from ModuleMetrics m, int n
 where
diff --git a/python/ql/src/Metrics/History/HLinesAdded.ql b/python/ql/src/Metrics/History/HLinesAdded.ql
index 51a0af62460..8d13986988d 100644
--- a/python/ql/src/Metrics/History/HLinesAdded.ql
+++ b/python/ql/src/Metrics/History/HLinesAdded.ql
@@ -10,7 +10,6 @@
 
 import python
 import external.VCS
-private import LegacyPointsTo
 
 from ModuleMetrics m, int n
 where
diff --git a/python/ql/src/Metrics/History/HLinesDeleted.ql b/python/ql/src/Metrics/History/HLinesDeleted.ql
index 3016c9f128b..a1e3ac0275c 100644
--- a/python/ql/src/Metrics/History/HLinesDeleted.ql
+++ b/python/ql/src/Metrics/History/HLinesDeleted.ql
@@ -10,7 +10,6 @@
 
 import python
 import external.VCS
-private import LegacyPointsTo
 
 from ModuleMetrics m, int n
 where
diff --git a/python/ql/src/Metrics/History/HNumberOfAuthors.ql b/python/ql/src/Metrics/History/HNumberOfAuthors.ql
index ff00773d98c..1bc1dbb70b0 100644
--- a/python/ql/src/Metrics/History/HNumberOfAuthors.ql
+++ b/python/ql/src/Metrics/History/HNumberOfAuthors.ql
@@ -10,7 +10,6 @@
 
 import python
 import external.VCS
-private import LegacyPointsTo
 
 from ModuleMetrics m
 where exists(m.getNumberOfLinesOfCode())
diff --git a/python/ql/src/Metrics/History/HNumberOfCoCommits.ql b/python/ql/src/Metrics/History/HNumberOfCoCommits.ql
index 4192ecf57ac..e998aaa66d4 100644
--- a/python/ql/src/Metrics/History/HNumberOfCoCommits.ql
+++ b/python/ql/src/Metrics/History/HNumberOfCoCommits.ql
@@ -10,7 +10,6 @@
 
 import python
 import external.VCS
-private import LegacyPointsTo
 
 int committedFiles(Commit commit) { result = count(commit.getAnAffectedFile()) }
 
diff --git a/python/ql/src/Metrics/History/HNumberOfReCommits.ql b/python/ql/src/Metrics/History/HNumberOfReCommits.ql
index f12c51840dc..14330692ff9 100644
--- a/python/ql/src/Metrics/History/HNumberOfReCommits.ql
+++ b/python/ql/src/Metrics/History/HNumberOfReCommits.ql
@@ -10,7 +10,6 @@
 
 import python
 import external.VCS
-private import LegacyPointsTo
 
 predicate inRange(Commit first, Commit second) {
   first.getAnAffectedFile() = second.getAnAffectedFile() and
diff --git a/python/ql/src/Metrics/History/HNumberOfRecentAuthors.ql b/python/ql/src/Metrics/History/HNumberOfRecentAuthors.ql
index 9b787f52957..6469b393dce 100644
--- a/python/ql/src/Metrics/History/HNumberOfRecentAuthors.ql
+++ b/python/ql/src/Metrics/History/HNumberOfRecentAuthors.ql
@@ -10,7 +10,6 @@
 
 import python
 import external.VCS
-private import LegacyPointsTo
 
 from ModuleMetrics m
 where exists(m.getNumberOfLinesOfCode())
diff --git a/python/ql/src/Metrics/History/HNumberOfRecentChangedFiles.ql b/python/ql/src/Metrics/History/HNumberOfRecentChangedFiles.ql
index 501094907af..9ec94df7e76 100644
--- a/python/ql/src/Metrics/History/HNumberOfRecentChangedFiles.ql
+++ b/python/ql/src/Metrics/History/HNumberOfRecentChangedFiles.ql
@@ -10,7 +10,6 @@
 
 import python
 import external.VCS
-private import LegacyPointsTo
 
 from ModuleMetrics m
 where
diff --git a/python/ql/src/Metrics/LackofCohesionInMethodsCK.ql b/python/ql/src/Metrics/LackofCohesionInMethodsCK.ql
index f06b050827c..c0ef582c32b 100644
--- a/python/ql/src/Metrics/LackofCohesionInMethodsCK.ql
+++ b/python/ql/src/Metrics/LackofCohesionInMethodsCK.ql
@@ -9,7 +9,6 @@
  */
 
 import python
-private import LegacyPointsTo
 
 from ClassMetrics cls
 select cls, cls.getLackOfCohesionCK() as n order by n desc
diff --git a/python/ql/src/Metrics/LackofCohesionInMethodsHM.ql b/python/ql/src/Metrics/LackofCohesionInMethodsHM.ql
index 1456b76b286..5cc77ecfb4f 100644
--- a/python/ql/src/Metrics/LackofCohesionInMethodsHM.ql
+++ b/python/ql/src/Metrics/LackofCohesionInMethodsHM.ql
@@ -9,7 +9,6 @@
  */
 
 import python
-private import LegacyPointsTo
 
 from ClassMetrics cls
 select cls, cls.getLackOfCohesionHM() as n order by n desc
diff --git a/python/ql/src/Metrics/ModuleAfferentCoupling.ql b/python/ql/src/Metrics/ModuleAfferentCoupling.ql
index d61cc61e4da..7203d12ae84 100644
--- a/python/ql/src/Metrics/ModuleAfferentCoupling.ql
+++ b/python/ql/src/Metrics/ModuleAfferentCoupling.ql
@@ -13,5 +13,5 @@
 import python
 private import LegacyPointsTo
 
-from ModuleMetrics m
+from ModuleMetricsWithPointsTo m
 select m, m.getAfferentCoupling() as n order by n desc
diff --git a/python/ql/src/Metrics/ModuleEfferentCoupling.ql b/python/ql/src/Metrics/ModuleEfferentCoupling.ql
index bfabf4b6012..a392a44e751 100644
--- a/python/ql/src/Metrics/ModuleEfferentCoupling.ql
+++ b/python/ql/src/Metrics/ModuleEfferentCoupling.ql
@@ -13,5 +13,5 @@
 import python
 private import LegacyPointsTo
 
-from ModuleMetrics m
+from ModuleMetricsWithPointsTo m
 select m, m.getEfferentCoupling() as n order by n desc
diff --git a/python/ql/src/Metrics/NumberOfParametersWithoutDefault.ql b/python/ql/src/Metrics/NumberOfParametersWithoutDefault.ql
index e5164499331..00a4c1bf0db 100644
--- a/python/ql/src/Metrics/NumberOfParametersWithoutDefault.ql
+++ b/python/ql/src/Metrics/NumberOfParametersWithoutDefault.ql
@@ -11,7 +11,6 @@
  */
 
 import python
-private import LegacyPointsTo
 
 from FunctionMetrics func
 select func, func.getNumberOfParametersWithoutDefault() as n order by n desc
diff --git a/python/ql/src/Security/CWE-079/Jinja2WithoutEscaping.ql b/python/ql/src/Security/CWE-079/Jinja2WithoutEscaping.ql
index 97bbb72edec..fd03ba433a1 100644
--- a/python/ql/src/Security/CWE-079/Jinja2WithoutEscaping.ql
+++ b/python/ql/src/Security/CWE-079/Jinja2WithoutEscaping.ql
@@ -4,7 +4,7 @@
  *              cause a cross-site scripting vulnerability.
  * @kind problem
  * @problem.severity error
- * @security-severity 6.1
+ * @security-severity 7.8
  * @precision medium
  * @id py/jinja2/autoescape-false
  * @tags security
diff --git a/python/ql/src/Security/CWE-079/ReflectedXss.ql b/python/ql/src/Security/CWE-079/ReflectedXss.ql
index 11ebad00e37..286dbece126 100644
--- a/python/ql/src/Security/CWE-079/ReflectedXss.ql
+++ b/python/ql/src/Security/CWE-079/ReflectedXss.ql
@@ -4,7 +4,7 @@
  *              allows for a cross-site scripting vulnerability.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 6.1
+ * @security-severity 7.8
  * @sub-severity high
  * @precision high
  * @id py/reflective-xss
diff --git a/python/ql/src/Security/CWE-117/LogInjection.ql b/python/ql/src/Security/CWE-117/LogInjection.ql
index f1b72faaccb..64b29e142e0 100644
--- a/python/ql/src/Security/CWE-117/LogInjection.ql
+++ b/python/ql/src/Security/CWE-117/LogInjection.ql
@@ -4,7 +4,7 @@
  *              insertion of forged log entries by a malicious user.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 7.8
+ * @security-severity 6.1
  * @precision medium
  * @id py/log-injection
  * @tags security
diff --git a/python/ql/src/Statements/DocStrings.ql b/python/ql/src/Statements/DocStrings.ql
index df7b09a963e..d1f8c07abba 100644
--- a/python/ql/src/Statements/DocStrings.ql
+++ b/python/ql/src/Statements/DocStrings.ql
@@ -17,7 +17,7 @@
  */
 
 import python
-private import LegacyPointsTo
+private import semmle.python.dataflow.new.internal.DataFlowDispatch
 
 predicate needs_docstring(Scope s) {
   s.isPublic() and
@@ -29,15 +29,13 @@ predicate needs_docstring(Scope s) {
 }
 
 predicate function_needs_docstring(FunctionMetrics f) {
-  not exists(FunctionValue fo, FunctionValue base | fo.overrides(base) and fo.getScope() = f |
-    not function_needs_docstring(base.getScope())
+  not exists(Function base |
+    DuckTyping::overridesMethod(f, _, base) and
+    not function_needs_docstring(base)
   ) and
   f.getName() != "lambda" and
   (f.getNumberOfLinesOfCode() - count(f.getADecorator())) > 2 and
-  not exists(PythonPropertyObject p |
-    p.getGetter().getFunction() = f or
-    p.getSetter().getFunction() = f
-  )
+  not DuckTyping::isPropertyAccessor(f)
 }
 
 string scope_type(Scope s) {
diff --git a/python/ql/src/Statements/SideEffectInAssert.ql b/python/ql/src/Statements/SideEffectInAssert.ql
index 902b6c4c9c1..7ac96030c04 100644
--- a/python/ql/src/Statements/SideEffectInAssert.ql
+++ b/python/ql/src/Statements/SideEffectInAssert.ql
@@ -13,7 +13,7 @@
  */
 
 import python
-private import LegacyPointsTo
+private import semmle.python.ApiGraphs
 
 predicate func_with_side_effects(Expr e) {
   exists(string name | name = e.(Attribute).getName() or name = e.(Name).getId() |
@@ -24,11 +24,11 @@ predicate func_with_side_effects(Expr e) {
 }
 
 predicate call_with_side_effect(Call e) {
-  e.getAFlowNode() = Value::named("subprocess.call").getACall()
-  or
-  e.getAFlowNode() = Value::named("subprocess.check_call").getACall()
-  or
-  e.getAFlowNode() = Value::named("subprocess.check_output").getACall()
+  e.getAFlowNode() =
+    API::moduleImport("subprocess")
+        .getMember(["call", "check_call", "check_output"])
+        .getACall()
+        .asCfgNode()
 }
 
 predicate probable_side_effect(Expr e) {
diff --git a/python/ql/src/Statements/TopLevelPrint.ql b/python/ql/src/Statements/TopLevelPrint.ql
index 12095f7a484..1896d41908e 100644
--- a/python/ql/src/Statements/TopLevelPrint.ql
+++ b/python/ql/src/Statements/TopLevelPrint.ql
@@ -12,7 +12,6 @@
  */
 
 import python
-private import LegacyPointsTo
 
 predicate main_eq_name(If i) {
   exists(Name n, StringLiteral m, Compare c |
@@ -32,10 +31,19 @@ predicate is_print_stmt(Stmt s) {
   )
 }
 
+/**
+ * Holds if module `m` is likely used as a module (imported by another module),
+ * as opposed to being exclusively used as a script.
+ */
+predicate is_used_as_module(Module m) {
+  m.isPackageInit()
+  or
+  exists(ImportingStmt i | i.getAnImportedModuleName() = m.getName())
+}
+
 from Stmt p
 where
   is_print_stmt(p) and
-  // TODO: Need to discuss how we would like to handle ModuleObject.getKind in the glorious future
-  exists(ModuleValue m | m.getScope() = p.getScope() and m.isUsedAsModule()) and
+  is_used_as_module(p.getScope()) and
   not exists(If i | main_eq_name(i) and i.getASubStatement().getASubStatement*() = p)
 select p, "Print statement may execute during import."
diff --git a/python/ql/src/Statements/UnnecessaryDelete.ql b/python/ql/src/Statements/UnnecessaryDelete.ql
index c7b80ecc66a..da239f81405 100644
--- a/python/ql/src/Statements/UnnecessaryDelete.ql
+++ b/python/ql/src/Statements/UnnecessaryDelete.ql
@@ -13,7 +13,7 @@
  */
 
 import python
-private import LegacyPointsTo
+private import semmle.python.ApiGraphs
 
 predicate isInsideLoop(AstNode node) {
   node.getParentNode() instanceof While
@@ -33,9 +33,9 @@ where
   not isInsideLoop(del) and
   // False positive: calling `sys.exc_info` within a function results in a
   //       reference cycle, and an explicit call to `del` helps break this cycle.
-  not exists(FunctionValue ex |
-    ex = Value::named("sys.exc_info") and
-    ex.getACall().getScope() = f
+  not exists(API::CallNode call |
+    call = API::moduleImport("sys").getMember("exc_info").getACall() and
+    call.getScope() = f
   )
 select del, "Unnecessary deletion of local variable $@ in function $@.", e, e.toString(), f,
   f.getName()
diff --git a/python/ql/src/Summary/LinesOfCode.ql b/python/ql/src/Summary/LinesOfCode.ql
index 04cb33a3451..24f1f38fbd7 100644
--- a/python/ql/src/Summary/LinesOfCode.ql
+++ b/python/ql/src/Summary/LinesOfCode.ql
@@ -10,6 +10,5 @@
  */
 
 import python
-private import LegacyPointsTo
 
 select sum(ModuleMetrics m | | m.getNumberOfLinesOfCode())
diff --git a/python/ql/src/Summary/LinesOfUserCode.ql b/python/ql/src/Summary/LinesOfUserCode.ql
index f920ebb51f4..331350dae4e 100644
--- a/python/ql/src/Summary/LinesOfUserCode.ql
+++ b/python/ql/src/Summary/LinesOfUserCode.ql
@@ -14,7 +14,6 @@
 
 import python
 import semmle.python.filters.GeneratedCode
-private import LegacyPointsTo
 
 select sum(ModuleMetrics m |
     exists(m.getFile().getRelativePath()) and
diff --git a/python/ql/src/Variables/LoopVariableCapture/LoopVariableCaptureQuery.qll b/python/ql/src/Variables/LoopVariableCapture/LoopVariableCaptureQuery.qll
index 7f25701cac8..987740236f2 100644
--- a/python/ql/src/Variables/LoopVariableCapture/LoopVariableCaptureQuery.qll
+++ b/python/ql/src/Variables/LoopVariableCapture/LoopVariableCaptureQuery.qll
@@ -3,8 +3,10 @@
 import python
 import semmle.python.dataflow.new.DataFlow
 
+final class FinalAstNode = AstNode;
+
 /** A looping construct. */
-abstract class Loop extends AstNode {
+abstract class Loop extends FinalAstNode {
   /**
    * Gets a loop variable of this loop.
    * For example, `x` and `y` in `for x,y in pairs: print(x+y)`
@@ -13,9 +15,9 @@ abstract class Loop extends AstNode {
 }
 
 /** A `for` loop. */
-private class ForLoop extends Loop, For {
+private class ForLoop extends Loop instanceof For {
   override Variable getALoopVariable() {
-    this.getTarget() = result.getAnAccess().getParentNode*() and
+    this.(For).getTarget() = result.getAnAccess().getParentNode*() and
     result.getScope() = this.getScope()
   }
 }
diff --git a/python/ql/src/Variables/SuspiciousUnusedLoopIterationVariable.ql b/python/ql/src/Variables/SuspiciousUnusedLoopIterationVariable.ql
index 87900c48fc5..d252742d67c 100644
--- a/python/ql/src/Variables/SuspiciousUnusedLoopIterationVariable.ql
+++ b/python/ql/src/Variables/SuspiciousUnusedLoopIterationVariable.ql
@@ -12,7 +12,7 @@
  */
 
 import python
-private import LegacyPointsTo
+private import semmle.python.ApiGraphs
 import Definition
 
 predicate is_increment(Stmt s) {
@@ -41,26 +41,19 @@ predicate one_item_only(For f) {
   )
 }
 
-predicate points_to_call_to_range(ControlFlowNode f) {
-  /* (x)range is a function in Py2 and a class in Py3, so we must treat it as a plain object */
-  exists(Value range |
-    range = Value::named("range") or
-    range = Value::named("xrange")
-  |
-    f = range.getACall()
-  )
+/** Holds if `node` is a call to `range`, `xrange`, or `list(range(...))`. */
+predicate call_to_range(DataFlow::Node node) {
+  node = API::builtin(["range", "xrange"]).getACall()
   or
-  /* In case points-to fails due to 'from six.moves import range' or similar. */
-  exists(string range | f.getNode().(Call).getFunc().(Name).getId() = range |
-    range = "range" or range = "xrange"
-  )
+  /* Handle 'from six.moves import range' or similar. */
+  node = API::moduleImport("six").getMember("moves").getMember(["range", "xrange"]).getACall()
   or
   /* Handle list(range(...)) and list(list(range(...))) */
-  f.(CallNode).(ControlFlowNodeWithPointsTo).pointsTo().getClass() = ClassValue::list() and
-  points_to_call_to_range(f.(CallNode).getArg(0))
+  node = API::builtin("list").getACall() and
+  call_to_range(node.(DataFlow::CallCfgNode).getArg(0))
 }
 
-/** Whether n is a use of a variable that is a not effectively a constant. */
+/** Whether n is a use of a variable that is not effectively a constant. */
 predicate use_of_non_constant(Name n) {
   exists(Variable var |
     n.uses(var) and
@@ -102,8 +95,8 @@ from For f, Variable v, string msg
 where
   f.getTarget() = v.getAnAccess() and
   not f.getAStmt().contains(v.getAnAccess()) and
-  not points_to_call_to_range(f.getIter().getAFlowNode()) and
-  not points_to_call_to_range(get_comp_iterable(f)) and
+  not call_to_range(DataFlow::exprNode(f.getIter())) and
+  not call_to_range(DataFlow::exprNode(get_comp_iterable(f).getNode())) and
   not name_acceptable_for_unused_variable(v) and
   not f.getScope().getName() = "genexpr" and
   not empty_loop(f) and
diff --git a/python/ql/src/analysis/ImportFailure.ql b/python/ql/src/analysis/ImportFailure.ql
index c9289a8b474..71967e6e04f 100644
--- a/python/ql/src/analysis/ImportFailure.ql
+++ b/python/ql/src/analysis/ImportFailure.ql
@@ -59,7 +59,9 @@ predicate ok_to_fail(ImportExpr ie) {
   os_specific_import(ie) != get_os()
 }
 
-class VersionTest extends ControlFlowNode {
+final class FinalControlFlowNode = ControlFlowNode;
+
+class VersionTest extends FinalControlFlowNode {
   VersionTest() {
     exists(string name |
       name.matches("%version%") and
@@ -70,7 +72,7 @@ class VersionTest extends ControlFlowNode {
     )
   }
 
-  override string toString() { result = "VersionTest" }
+  string toString() { result = "VersionTest" }
 }
 
 /** A guard on the version of the Python interpreter */
diff --git a/python/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md b/python/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md
new file mode 100644
index 00000000000..4278d0171e3
--- /dev/null
+++ b/python/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md
@@ -0,0 +1,5 @@
+---
+category: queryMetadata
+---
+* The `@security-severity` metadata of `py/log-injection` has been reduced from 7.8 (high) to 6.1 (medium).
+* The `@security-severity` metadata of `py/jinja2/autoescape-false` and `py/reflective-xss` has been increased from 6.1 (medium) to 7.8 (high).
diff --git a/python/ql/src/change-notes/2026-03-13-port-simple-points-to-queries.md b/python/ql/src/change-notes/2026-03-13-port-simple-points-to-queries.md
new file mode 100644
index 00000000000..3673b6de83a
--- /dev/null
+++ b/python/ql/src/change-notes/2026-03-13-port-simple-points-to-queries.md
@@ -0,0 +1,5 @@
+---
+category: majorAnalysis
+---
+
+- Several quality queries have been ported away from using the legacy points-to library. This may lead to changes in alerts.
diff --git a/python/ql/src/change-notes/released/1.7.8.md b/python/ql/src/change-notes/released/1.7.8.md
new file mode 100644
index 00000000000..89c236d93c5
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.7.8.md
@@ -0,0 +1,3 @@
+## 1.7.8
+
+No user-facing changes.
diff --git a/python/ql/src/change-notes/released/1.7.9.md b/python/ql/src/change-notes/released/1.7.9.md
new file mode 100644
index 00000000000..84107525ff7
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.7.9.md
@@ -0,0 +1,3 @@
+## 1.7.9
+
+No user-facing changes.
diff --git a/python/ql/src/codeql-pack.release.yml b/python/ql/src/codeql-pack.release.yml
index df4010bd267..678da6bc37e 100644
--- a/python/ql/src/codeql-pack.release.yml
+++ b/python/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.7
+lastReleaseVersion: 1.7.9
diff --git a/python/ql/src/qlpack.yml b/python/ql/src/qlpack.yml
index c6b7d29f631..389b1dfb493 100644
--- a/python/ql/src/qlpack.yml
+++ b/python/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-queries
-version: 1.7.8-dev
+version: 1.7.10-dev
 groups:
   - python
   - queries
diff --git a/python/ql/test/2/query-tests/Classes/new-style/PropertyInOldStyleClass.expected b/python/ql/test/2/query-tests/Classes/new-style/PropertyInOldStyleClass.expected
index 9fb3e582cb7..fb508cbe859 100644
--- a/python/ql/test/2/query-tests/Classes/new-style/PropertyInOldStyleClass.expected
+++ b/python/ql/test/2/query-tests/Classes/new-style/PropertyInOldStyleClass.expected
@@ -1 +1 @@
-| property_old_style.py:8:6:8:13 | Property piosc | Property piosc will not work properly, as class OldStyle is an old-style class. |
+| property_old_style.py:8:6:8:13 | property | Property piosc will not work properly, as class OldStyle is an old-style class. |
diff --git a/python/ql/test/2/query-tests/Classes/new-style/SlotsInOldStyleClass.expected b/python/ql/test/2/query-tests/Classes/new-style/SlotsInOldStyleClass.expected
index ccad85bd384..14d30913b93 100644
--- a/python/ql/test/2/query-tests/Classes/new-style/SlotsInOldStyleClass.expected
+++ b/python/ql/test/2/query-tests/Classes/new-style/SlotsInOldStyleClass.expected
@@ -1 +1 @@
-| newstyle_test.py:4:1:4:16 | class OldStyle1 | Using '__slots__' in an old style class just creates a class attribute called '__slots__'. |
+| newstyle_test.py:4:1:4:16 | Class OldStyle1 | Using '__slots__' in an old style class just creates a class attribute called '__slots__'. |
diff --git a/python/ql/test/experimental/import-resolution-namespace-relative/pkg/caller.py b/python/ql/test/experimental/import-resolution-namespace-relative/pkg/caller.py
new file mode 100644
index 00000000000..f30065eec99
--- /dev/null
+++ b/python/ql/test/experimental/import-resolution-namespace-relative/pkg/caller.py
@@ -0,0 +1,5 @@
+from . import helper
+
+def use_relative():
+    tainted = source()
+    helper.process(tainted)
diff --git a/python/ql/test/experimental/import-resolution-namespace-relative/pkg/helper.py b/python/ql/test/experimental/import-resolution-namespace-relative/pkg/helper.py
new file mode 100644
index 00000000000..f75e9957738
--- /dev/null
+++ b/python/ql/test/experimental/import-resolution-namespace-relative/pkg/helper.py
@@ -0,0 +1,5 @@
+def process(value):
+    sink(value) #$ flow=source
+
+def process2(value):
+    sink(value) #$ flow=source
diff --git a/java/ql/test/library-tests/successors/CloseReaderTest/FalseSuccessors.expected b/python/ql/test/experimental/import-resolution-namespace-relative/pkg/sub/__init__.py
similarity index 100%
rename from java/ql/test/library-tests/successors/CloseReaderTest/FalseSuccessors.expected
rename to python/ql/test/experimental/import-resolution-namespace-relative/pkg/sub/__init__.py
diff --git a/python/ql/test/experimental/import-resolution-namespace-relative/pkg/sub/caller2.py b/python/ql/test/experimental/import-resolution-namespace-relative/pkg/sub/caller2.py
new file mode 100644
index 00000000000..3afab28cd42
--- /dev/null
+++ b/python/ql/test/experimental/import-resolution-namespace-relative/pkg/sub/caller2.py
@@ -0,0 +1,5 @@
+from .. import helper
+
+def use_multi_level_relative():
+    tainted = source()
+    helper.process2(tainted)
diff --git a/python/ql/test/experimental/import-resolution-namespace-relative/test.expected b/python/ql/test/experimental/import-resolution-namespace-relative/test.expected
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/python/ql/test/experimental/import-resolution-namespace-relative/test.expected
@@ -0,0 +1 @@
+
diff --git a/python/ql/test/experimental/import-resolution-namespace-relative/test.ql b/python/ql/test/experimental/import-resolution-namespace-relative/test.ql
new file mode 100644
index 00000000000..4f5f09a527d
--- /dev/null
+++ b/python/ql/test/experimental/import-resolution-namespace-relative/test.ql
@@ -0,0 +1,35 @@
+import python
+import semmle.python.dataflow.new.DataFlow
+import semmle.python.dataflow.new.TaintTracking
+import utils.test.InlineExpectationsTest
+
+private module TestConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node node) {
+    node.(DataFlow::CallCfgNode).getFunction().asCfgNode().(NameNode).getId() = "source"
+  }
+
+  predicate isSink(DataFlow::Node node) {
+    exists(DataFlow::CallCfgNode call |
+      call.getFunction().asCfgNode().(NameNode).getId() = "sink" and
+      node = call.getArg(0)
+    )
+  }
+}
+
+private module TestFlow = TaintTracking::Global<TestConfig>;
+
+module FlowTest implements TestSig {
+  string getARelevantTag() { result = "flow" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(DataFlow::Node sink |
+      TestFlow::flow(_, sink) and
+      tag = "flow" and
+      location = sink.getLocation() and
+      value = "source" and
+      element = sink.toString()
+    )
+  }
+}
+
+import MakeTest<FlowTest>
diff --git a/python/ql/test/experimental/import-resolution/block_flow_check.py b/python/ql/test/experimental/import-resolution/block_flow_check.py
index cd939b037e6..83bc3201b06 100644
--- a/python/ql/test/experimental/import-resolution/block_flow_check.py
+++ b/python/ql/test/experimental/import-resolution/block_flow_check.py
@@ -5,7 +5,7 @@ class SOURCE(object):
     @staticmethod
     def block_flow(): pass
 
-check("SOURCE", SOURCE, SOURCE, globals()) #$ prints=SOURCE
+check("SOURCE", SOURCE, SOURCE, globals()) # $ prints=SOURCE
 
 SOURCE.block_flow()
 
diff --git a/python/ql/test/experimental/import-resolution/foo.py b/python/ql/test/experimental/import-resolution/foo.py
index d112007ad03..e0986a6babf 100644
--- a/python/ql/test/experimental/import-resolution/foo.py
+++ b/python/ql/test/experimental/import-resolution/foo.py
@@ -8,7 +8,7 @@ foo_attr = "foo_attr"
 __private_foo_attr = "__private_foo_attr"
 
 # A reexport of bar under a new name. Used in main.py
-import bar as bar_reexported #$ imports=bar as=bar_reexported
-check("bar_reexported.bar_attr", bar_reexported.bar_attr, "bar_attr", globals()) #$ prints=bar_attr
+import bar as bar_reexported # $ imports=bar as=bar_reexported
+check("bar_reexported.bar_attr", bar_reexported.bar_attr, "bar_attr", globals()) # $ prints=bar_attr
 
 exit(__file__)
diff --git a/python/ql/test/experimental/import-resolution/generous_export.py b/python/ql/test/experimental/import-resolution/generous_export.py
index cbea96e19ce..3b817a29f82 100644
--- a/python/ql/test/experimental/import-resolution/generous_export.py
+++ b/python/ql/test/experimental/import-resolution/generous_export.py
@@ -5,7 +5,7 @@ class SOURCE(object):
     @staticmethod
     def block_flow(): pass
 
-check("SOURCE", SOURCE, SOURCE, globals()) #$ prints=SOURCE
+check("SOURCE", SOURCE, SOURCE, globals()) # $ prints=SOURCE
 
 if eval("False"):
     # With our current import resolution, this value for SOURCE will be considered to be
diff --git a/python/ql/test/experimental/import-resolution/if_then_else_refined.py b/python/ql/test/experimental/import-resolution/if_then_else_refined.py
index 670c7f178e9..fe1210fbf11 100644
--- a/python/ql/test/experimental/import-resolution/if_then_else_refined.py
+++ b/python/ql/test/experimental/import-resolution/if_then_else_refined.py
@@ -14,6 +14,6 @@ else:
 
 src.foo = 42
 
-check("src", src, src, globals()) #$ prints=SOURCE
+check("src", src, src, globals()) # $ prints=SOURCE
 
 exit(__file__)
diff --git a/python/ql/test/experimental/import-resolution/main.py b/python/ql/test/experimental/import-resolution/main.py
index ce1bee040f4..43560800df5 100644
--- a/python/ql/test/experimental/import-resolution/main.py
+++ b/python/ql/test/experimental/import-resolution/main.py
@@ -24,76 +24,76 @@ from trace import *
 enter(__file__)
 
 # A simple import. Binds foo to the foo module
-import foo #$ imports=foo as=foo
-check("foo.foo_attr", foo.foo_attr, "foo_attr", globals()) #$ prints=foo_attr
+import foo # $ imports=foo as=foo
+check("foo.foo_attr", foo.foo_attr, "foo_attr", globals()) # $ prints=foo_attr
 
 # Private attributes are still accessible.
-check("foo.__private_foo_attr", foo.__private_foo_attr, "__private_foo_attr", globals()) #$ prints=__private_foo_attr
+check("foo.__private_foo_attr", foo.__private_foo_attr, "__private_foo_attr", globals()) # $ prints=__private_foo_attr
 
 # An aliased import, binding foo to foo_alias
-import foo as foo_alias #$ imports=foo as=foo_alias
-check("foo_alias.foo_attr", foo_alias.foo_attr, "foo_attr", globals()) #$ prints=foo_attr
+import foo as foo_alias # $ imports=foo as=foo_alias
+check("foo_alias.foo_attr", foo_alias.foo_attr, "foo_attr", globals()) # $ prints=foo_attr
 
 # A reference to a reexported module
-check("foo.bar_reexported", foo.bar_reexported, "<module bar>", globals()) #$ prints="<module bar>"
-check("foo.bar_reexported.bar_attr", foo.bar_reexported.bar_attr, "bar_attr", globals()) #$ prints=bar_attr
+check("foo.bar_reexported", foo.bar_reexported, "<module bar>", globals()) # $ prints="<module bar>"
+check("foo.bar_reexported.bar_attr", foo.bar_reexported.bar_attr, "bar_attr", globals()) # $ prints=bar_attr
 
 # A simple "import from" statement.
 from bar import bar_attr
-check("bar_attr", bar_attr, "bar_attr", globals()) #$ prints=bar_attr
+check("bar_attr", bar_attr, "bar_attr", globals()) # $ prints=bar_attr
 
 # Importing an attribute from a subpackage of a package.
 from package.subpackage import subpackage_attr
-check("subpackage_attr", subpackage_attr, "subpackage_attr", globals()) #$ prints=subpackage_attr
+check("subpackage_attr", subpackage_attr, "subpackage_attr", globals()) # $ prints=subpackage_attr
 
 # Importing a package attribute under an alias.
 from package import package_attr as package_attr_alias
-check("package_attr_alias", package_attr_alias,  "package_attr", globals()) #$ prints=package_attr
+check("package_attr_alias", package_attr_alias,  "package_attr", globals()) # $ prints=package_attr
 
 # Importing a subpackage under an alias.
-from package import subpackage as aliased_subpackage #$ imports=package.subpackage.__init__ as=aliased_subpackage
-check("aliased_subpackage.subpackage_attr", aliased_subpackage.subpackage_attr, "subpackage_attr", globals()) #$ prints=subpackage_attr
+from package import subpackage as aliased_subpackage # $ imports=package.subpackage.__init__ as=aliased_subpackage
+check("aliased_subpackage.subpackage_attr", aliased_subpackage.subpackage_attr, "subpackage_attr", globals()) # $ prints=subpackage_attr
 
 def local_import():
     # Same as above, but in a local scope.
-    import package.subpackage as local_subpackage #$ imports=package.subpackage.__init__ as=local_subpackage
-    check("local_subpackage.subpackage_attr", local_subpackage.subpackage_attr, "subpackage_attr", locals()) #$ prints=subpackage_attr
+    import package.subpackage as local_subpackage # $ imports=package.subpackage.__init__ as=local_subpackage
+    check("local_subpackage.subpackage_attr", local_subpackage.subpackage_attr, "subpackage_attr", locals()) # $ prints=subpackage_attr
 
 local_import()
 
 # Importing a subpacking using `import` and binding it to a name.
-import package.subpackage as aliased_subpackage #$ imports=package.subpackage.__init__ as=aliased_subpackage
-check("aliased_subpackage.subpackage_attr", aliased_subpackage.subpackage_attr, "subpackage_attr", globals()) #$ prints=subpackage_attr
+import package.subpackage as aliased_subpackage # $ imports=package.subpackage.__init__ as=aliased_subpackage
+check("aliased_subpackage.subpackage_attr", aliased_subpackage.subpackage_attr, "subpackage_attr", globals()) # $ prints=subpackage_attr
 
 # Importing without binding instead binds the top level name.
-import package.subpackage #$ imports=package.__init__ as=package
-check("package.package_attr", package.package_attr, "package_attr", globals()) #$ prints=package_attr
+import package.subpackage # $ imports=package.__init__ as=package
+check("package.package_attr", package.package_attr, "package_attr", globals()) # $ prints=package_attr
 
 # Deep imports
-import package.subpackage.submodule #$ imports=package.__init__ as=package
-check("package.subpackage.submodule.submodule_attr", package.subpackage.submodule.submodule_attr, "submodule_attr", globals()) #$ prints=submodule_attr
+import package.subpackage.submodule # $ imports=package.__init__ as=package
+check("package.subpackage.submodule.submodule_attr", package.subpackage.submodule.submodule_attr, "submodule_attr", globals()) # $ prints=submodule_attr
 
 
 if sys.version_info[0] == 3:
     # Importing from a namespace module.
     from namespace_package.namespace_module import namespace_module_attr
-    check("namespace_module_attr", namespace_module_attr, "namespace_module_attr", globals()) #$ prints3=namespace_module_attr
+    check("namespace_module_attr", namespace_module_attr, "namespace_module_attr", globals()) # $ prints3=namespace_module_attr
 
 
-from attr_clash import clashing_attr, non_clashing_submodule #$ imports=attr_clash.clashing_attr as=clashing_attr imports=attr_clash.non_clashing_submodule as=non_clashing_submodule
-check("clashing_attr", clashing_attr, "clashing_attr", globals()) #$ prints=clashing_attr SPURIOUS: prints="<module attr_clash.clashing_attr>"
-check("non_clashing_submodule", non_clashing_submodule, "<module attr_clash.non_clashing_submodule>", globals()) #$ prints="<module attr_clash.non_clashing_submodule>"
+from attr_clash import clashing_attr, non_clashing_submodule # $ imports=attr_clash.clashing_attr as=clashing_attr imports=attr_clash.non_clashing_submodule as=non_clashing_submodule
+check("clashing_attr", clashing_attr, "clashing_attr", globals()) # $ prints=clashing_attr SPURIOUS: prints="<module attr_clash.clashing_attr>"
+check("non_clashing_submodule", non_clashing_submodule, "<module attr_clash.non_clashing_submodule>", globals()) # $ prints="<module attr_clash.non_clashing_submodule>"
 
-import attr_clash.clashing_attr as _doesnt_matter #$ imports=attr_clash.clashing_attr as=_doesnt_matter
-from attr_clash import clashing_attr, non_clashing_submodule #$ imports=attr_clash.clashing_attr as=clashing_attr imports=attr_clash.non_clashing_submodule as=non_clashing_submodule
-check("clashing_attr", clashing_attr, "<module attr_clash.clashing_attr>", globals()) #$ prints="<module attr_clash.clashing_attr>" SPURIOUS: prints=clashing_attr
+import attr_clash.clashing_attr as _doesnt_matter # $ imports=attr_clash.clashing_attr as=_doesnt_matter
+from attr_clash import clashing_attr, non_clashing_submodule # $ imports=attr_clash.clashing_attr as=clashing_attr imports=attr_clash.non_clashing_submodule as=non_clashing_submodule
+check("clashing_attr", clashing_attr, "<module attr_clash.clashing_attr>", globals()) # $ prints="<module attr_clash.clashing_attr>" SPURIOUS: prints=clashing_attr
 
 # check that import * only imports the __all__ attributes
 from has_defined_all import *
-check("all_defined_foo", all_defined_foo, "all_defined_foo", globals()) #$ prints=all_defined_foo
+check("all_defined_foo", all_defined_foo, "all_defined_foo", globals()) # $ prints=all_defined_foo
 
 try:
-    check("all_defined_bar", all_defined_bar, "all_defined_bar", globals()) #$ SPURIOUS: prints=all_defined_bar
+    check("all_defined_bar", all_defined_bar, "all_defined_bar", globals()) # $ SPURIOUS: prints=all_defined_bar
     raise Exception("Did not get expected NameError")
 except NameError as e:
     if "all_defined_bar" in str(e):
@@ -102,15 +102,15 @@ except NameError as e:
         raise
 
 import has_defined_all # $ imports=has_defined_all as=has_defined_all
-check("has_defined_all.all_defined_foo", has_defined_all.all_defined_foo, "all_defined_foo", globals()) #$ prints=all_defined_foo
-check("has_defined_all.all_defined_bar", has_defined_all.all_defined_bar, "all_defined_bar", globals()) #$ prints=all_defined_bar
+check("has_defined_all.all_defined_foo", has_defined_all.all_defined_foo, "all_defined_foo", globals()) # $ prints=all_defined_foo
+check("has_defined_all.all_defined_bar", has_defined_all.all_defined_bar, "all_defined_bar", globals()) # $ prints=all_defined_bar
 
 # same check as above, but going through one level of indirection (which can make a difference)
 from has_defined_all_indirection import *
-check("all_defined_foo_copy", all_defined_foo_copy, "all_defined_foo_copy", globals()) #$ prints=all_defined_foo_copy
+check("all_defined_foo_copy", all_defined_foo_copy, "all_defined_foo_copy", globals()) # $ prints=all_defined_foo_copy
 
 try:
-    check("all_defined_bar_copy", all_defined_bar_copy, "all_defined_bar_copy", globals()) #$ SPURIOUS: prints=all_defined_bar_copy
+    check("all_defined_bar_copy", all_defined_bar_copy, "all_defined_bar_copy", globals()) # $ SPURIOUS: prints=all_defined_bar_copy
     raise Exception("Did not get expected NameError")
 except NameError as e:
     if "all_defined_bar_copy" in str(e):
@@ -120,7 +120,7 @@ except NameError as e:
 
 # same check as above, but going through one level of indirection (which can make a difference)
 import has_defined_all_indirection # $ imports=has_defined_all_indirection as=has_defined_all_indirection
-check("has_defined_all_indirection.all_defined_foo_copy", has_defined_all_indirection.all_defined_foo_copy, "all_defined_foo_copy", globals()) #$ prints=all_defined_foo_copy
+check("has_defined_all_indirection.all_defined_foo_copy", has_defined_all_indirection.all_defined_foo_copy, "all_defined_foo_copy", globals()) # $ prints=all_defined_foo_copy
 
 try:
     check("has_defined_all_indirection.all_defined_bar_copy", has_defined_all_indirection.all_defined_bar_copy, "all_defined_bar_copy", globals())
@@ -133,30 +133,30 @@ except AttributeError as e:
 
 # check that import * from an __init__ file works
 from package.subpackage2 import *
-check("subpackage2_attr", subpackage2_attr, "subpackage2_attr", globals()) #$ prints=subpackage2_attr
+check("subpackage2_attr", subpackage2_attr, "subpackage2_attr", globals()) # $ prints=subpackage2_attr
 
 # check that definitions from within if-then-else are found
 from if_then_else import if_then_else_defined
-check("if_then_else_defined", if_then_else_defined, "if_defined", globals()) #$ prints=if_defined prints=else_defined_1 prints=else_defined_2
+check("if_then_else_defined", if_then_else_defined, "if_defined", globals()) # $ prints=if_defined prints=else_defined_1 prints=else_defined_2
 
 # check that refined definitions are handled correctly
 import refined # $ imports=refined as=refined
-check("refined.SOURCE", refined.SOURCE, refined.SOURCE, globals()) #$ prints=SOURCE
+check("refined.SOURCE", refined.SOURCE, refined.SOURCE, globals()) # $ prints=SOURCE
 
 import if_then_else_refined # $ imports=if_then_else_refined as=if_then_else_refined
-check("if_then_else_refined.src", if_then_else_refined.src, if_then_else_refined.src, globals()) #$ prints=SOURCE
+check("if_then_else_refined.src", if_then_else_refined.src, if_then_else_refined.src, globals()) # $ prints=SOURCE
 
 import simplistic_reexport # $ imports=simplistic_reexport as=simplistic_reexport
-check("simplistic_reexport.bar_attr", simplistic_reexport.bar_attr, "overwritten", globals()) #$ prints=overwritten SPURIOUS: prints=bar_attr
-check("simplistic_reexport.baz_attr", simplistic_reexport.baz_attr, "overwritten", globals()) #$ prints=overwritten SPURIOUS: prints=baz_attr
+check("simplistic_reexport.bar_attr", simplistic_reexport.bar_attr, "overwritten", globals()) # $ prints=overwritten SPURIOUS: prints=bar_attr
+check("simplistic_reexport.baz_attr", simplistic_reexport.baz_attr, "overwritten", globals()) # $ prints=overwritten SPURIOUS: prints=baz_attr
 
 # check that we don't treat all assignments as being exports
-import block_flow_check #$ imports=block_flow_check as=block_flow_check
+import block_flow_check # $ imports=block_flow_check as=block_flow_check
 check("block_flow_check.SOURCE", block_flow_check.SOURCE, block_flow_check.SOURCE, globals())
 
 # show that import resolution is a bit too generous with definitions
-import generous_export #$ imports=generous_export as=generous_export
-check("generous_export.SOURCE", generous_export.SOURCE, generous_export.SOURCE, globals()) #$ SPURIOUS: prints=SOURCE
+import generous_export # $ imports=generous_export as=generous_export
+check("generous_export.SOURCE", generous_export.SOURCE, generous_export.SOURCE, globals()) # $ SPURIOUS: prints=SOURCE
 
 exit(__file__)
 
diff --git a/python/ql/test/experimental/import-resolution/package/subpackage/__init__.py b/python/ql/test/experimental/import-resolution/package/subpackage/__init__.py
index 9110bcfd506..1bd64b549c1 100644
--- a/python/ql/test/experimental/import-resolution/package/subpackage/__init__.py
+++ b/python/ql/test/experimental/import-resolution/package/subpackage/__init__.py
@@ -5,10 +5,10 @@ subpackage_attr = "subpackage_attr"
 
 # Importing an attribute from the parent package.
 from .. import attr_used_in_subpackage as imported_attr
-check("imported_attr", imported_attr,  "attr_used_in_subpackage", globals()) #$ prints=attr_used_in_subpackage
+check("imported_attr", imported_attr,  "attr_used_in_subpackage", globals()) # $ prints=attr_used_in_subpackage
 
 # Importing an irrelevant attribute from a sibling module binds the name to the module.
 from .submodule import irrelevant_attr
-check("submodule.submodule_attr", submodule.submodule_attr, "submodule_attr", globals()) #$ MISSING:prints=submodule_attr
+check("submodule.submodule_attr", submodule.submodule_attr, "submodule_attr", globals()) # $ MISSING:prints=submodule_attr
 
 exit(__file__)
diff --git a/python/ql/test/experimental/import-resolution/refined.py b/python/ql/test/experimental/import-resolution/refined.py
index 3694168c5df..218824fbaf1 100644
--- a/python/ql/test/experimental/import-resolution/refined.py
+++ b/python/ql/test/experimental/import-resolution/refined.py
@@ -3,12 +3,12 @@ enter(__file__)
 
 class SOURCE(object): pass
 
-check("SOURCE", SOURCE, SOURCE, globals()) #$ prints=SOURCE
+check("SOURCE", SOURCE, SOURCE, globals()) # $ prints=SOURCE
 
 SOURCE.foo = 42
 SOURCE.bar = 43
 SOURCE.baz = 44
 
-check("SOURCE", SOURCE, SOURCE, globals()) #$ prints=SOURCE
+check("SOURCE", SOURCE, SOURCE, globals()) # $ prints=SOURCE
 
 exit(__file__)
diff --git a/python/ql/test/experimental/import-resolution/simplistic_reexport.py b/python/ql/test/experimental/import-resolution/simplistic_reexport.py
index 2847a8a66e0..1f02d647f9b 100644
--- a/python/ql/test/experimental/import-resolution/simplistic_reexport.py
+++ b/python/ql/test/experimental/import-resolution/simplistic_reexport.py
@@ -4,16 +4,16 @@ from trace import *
 enter(__file__)
 
 from bar import bar_attr
-check("bar_attr", bar_attr, "bar_attr", globals()) #$ prints=bar_attr
+check("bar_attr", bar_attr, "bar_attr", globals()) # $ prints=bar_attr
 
 bar_attr = "overwritten"
-check("bar_attr", bar_attr, "overwritten", globals()) #$ prints=overwritten
+check("bar_attr", bar_attr, "overwritten", globals()) # $ prints=overwritten
 
 
 from baz import *
-check("baz_attr", baz_attr, "baz_attr", globals()) #$ MISSING: prints=baz_attr
+check("baz_attr", baz_attr, "baz_attr", globals()) # $ MISSING: prints=baz_attr
 
 baz_attr = "overwritten"
-check("baz_attr", baz_attr, "overwritten", globals()) #$ prints=overwritten
+check("baz_attr", baz_attr, "overwritten", globals()) # $ prints=overwritten
 
 exit(__file__)
diff --git a/python/ql/test/experimental/library-tests/CallGraph-type-annotations/type_annotations.py b/python/ql/test/experimental/library-tests/CallGraph-type-annotations/type_annotations.py
index 51c08d1675e..a71d3103456 100644
--- a/python/ql/test/experimental/library-tests/CallGraph-type-annotations/type_annotations.py
+++ b/python/ql/test/experimental/library-tests/CallGraph-type-annotations/type_annotations.py
@@ -3,7 +3,7 @@ class Foo:
         pass
 
 def test_parameter_annotation(x: Foo):
-    x.method() #$ tt=Foo.method
+    x.method() # $ tt=Foo.method
 
 def test_no_parameter_annotation(x):
     x.method()
@@ -12,21 +12,21 @@ def function_with_return_annotation() -> Foo:
     return eval("Foo()")
 
 def test_return_annotation():
-    x = function_with_return_annotation() #$ pt,tt=function_with_return_annotation
-    x.method() #$ tt=Foo.method
+    x = function_with_return_annotation() # $ pt,tt=function_with_return_annotation
+    x.method() # $ tt=Foo.method
 
 def function_without_return_annotation():
     return eval("Foo()")
 
 def test_no_return_annotation():
-    x = function_without_return_annotation() #$ pt,tt=function_without_return_annotation
+    x = function_without_return_annotation() # $ pt,tt=function_without_return_annotation
     x.method()
 
 def test_variable_annotation():
     x = eval("Foo()")
     x : Foo
     # Currently fails because there is no flow from the class definition to the type annotation.
-    x.method() #$ MISSING: tt=Foo.method
+    x.method() # $ MISSING: tt=Foo.method
 
 def test_no_variable_annotation():
     x = eval("Foo()")
diff --git a/python/ql/test/experimental/library-tests/CallGraph/code/self_passing.py b/python/ql/test/experimental/library-tests/CallGraph/code/self_passing.py
index f5618450033..54809c0aef3 100644
--- a/python/ql/test/experimental/library-tests/CallGraph/code/self_passing.py
+++ b/python/ql/test/experimental/library-tests/CallGraph/code/self_passing.py
@@ -24,7 +24,7 @@ class A(Base):
         self.bar() # $ pt,tt=A.bar
 
     def not_called(self):
-        self.bar() #$ pt,tt=A.bar
+        self.bar() # $ pt,tt=A.bar
 
     def bar(self):
         print("A.bar")
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.py b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.py
index 6b533462d23..1e28e24861c 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.py
+++ b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/UnsafeUnpack.py
@@ -1,6 +1,6 @@
 import requests
 import shutil
-import os 
+import os
 
 from flask import Flask, request
 app = Flask(__name__)
@@ -16,8 +16,8 @@ def download_from_url():
             with open(tarpath, "wb") as f:
                   f.write(response.raw.read())
             untarredpath = "/tmp/tmp123"
-            shutil.unpack_archive(tarpath, untarredpath)  # $result=BAD
-        
+            shutil.unpack_archive(tarpath, untarredpath)  # $ result=BAD
+
 
 # A source catching an S3 filename download
 # see boto3: https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/s3.html#S3.Client.download_file
@@ -31,7 +31,7 @@ bucket_name = "mybucket"
 
 s3 = boto3.client('s3')
 s3.download_file(bucket_name, remote_ziped_name, local_ziped_path)
-shutil.unpack_archive(local_ziped_path, base_dir)  # $result=BAD
+shutil.unpack_archive(local_ziped_path, base_dir)  # $ result=BAD
 
 
 # wget
@@ -45,11 +45,11 @@ base_dir = "/tmp/basedir"
 
 # download(url, out, bar) contains out parameter
 wget.download(url, compressed_file)
-shutil.unpack_archive(compressed_file, base_dir) # $result=BAD
+shutil.unpack_archive(compressed_file, base_dir) # $ result=BAD
 
 # download(url) returns filename
 compressed_file = wget.download(url)
-shutil.unpack_archive(compressed_file, base_dir) # $result=BAD
+shutil.unpack_archive(compressed_file, base_dir) # $ result=BAD
 
 
 # A source coming from a CLI argparse module
@@ -63,7 +63,7 @@ parser.add_argument('filename', help='filename to be provided')
 
 args = parser.parse_args()
 compressed_file = args.filename
-shutil.unpack_archive(compressed_file, base_dir) # $result=BAD
+shutil.unpack_archive(compressed_file, base_dir) # $ result=BAD
 
 
 # A source coming from a CLI and downloaded
@@ -83,8 +83,8 @@ response = requests.get(url_filename, stream=True)
 tarpath = "/tmp/tmp456/tarball.tar.gz"
 with open(tarpath, "wb") as f:
       f.write(response.raw.read())
-      
-shutil.unpack_archive(tarpath, base_dir) # $result=BAD
+
+shutil.unpack_archive(tarpath, base_dir) # $ result=BAD
 
 # the django upload functionality
 # see HttpRequest.FILES: https://docs.djangoproject.com/en/4.1/ref/request-response/#django.http.HttpRequest.FILES
@@ -97,19 +97,19 @@ def simple_upload(request):
       base_dir = "/tmp/baase_dir"
       if request.method == 'POST':
             # Read uploaded files by chunks of data
-            # see chunks(): https://docs.djangoproject.com/en/4.1/ref/files/uploads/#django.core.files.uploadedfile.UploadedFile.chunks 
+            # see chunks(): https://docs.djangoproject.com/en/4.1/ref/files/uploads/#django.core.files.uploadedfile.UploadedFile.chunks
             savepath = os.path.join(base_dir, "tarball_compressed.tar.gz")
             with open(savepath, 'wb+') as wfile:
                   for chunk in request.FILES["ufile1"].chunks():
                         wfile.write(chunk)
-            shutil.unpack_archive(savepath, base_dir) # $result=BAD
+            shutil.unpack_archive(savepath, base_dir) # $ result=BAD
 
             # Write in binary the uploaded tarball
             myfile = request.FILES.get("ufile1")
             file_path = os.path.join(base_dir, "tarball.tar")
             with file_path.open('wb') as f:
                   f.write(myfile.read())
-            shutil.unpack_archive(file_path, base_dir) # $result=BAD
+            shutil.unpack_archive(file_path, base_dir) # $ result=BAD
 
             # Save uploaded files using FileSystemStorage Django API
             # see FileSystemStorage: https://docs.djangoproject.com/en/4.1/ref/files/storage/#django.core.files.storage.FileSystemStorage
@@ -117,8 +117,8 @@ def simple_upload(request):
                   fs = FileSystemStorage()
                   filename = fs.save(ufile.name, ufile)
                   uploaded_file_path = fs.path(filename)
-                  shutil.unpack_archive(uploaded_file_path, base_dir) # $result=BAD
-            
+                  shutil.unpack_archive(uploaded_file_path, base_dir) # $ result=BAD
+
             return render(request, 'simple_upload.html')
 
       elif request.method == 'GET':
@@ -126,7 +126,7 @@ def simple_upload(request):
 
 
 import shutil
-import os 
+import os
 import tarfile
 import tempfile
 import argparse
@@ -139,8 +139,8 @@ parser.add_argument('filename', help='filename to be provided')
 args = parser.parse_args()
 unsafe_filename_tar = args.filename
 with tarfile.TarFile(unsafe_filename_tar, mode="r") as tar:
-    tar.extractall(path="/tmp/unpack/", members=tar) # $result=BAD
-tar = tarfile.open(unsafe_filename_tar)   
+    tar.extractall(path="/tmp/unpack/", members=tar) # $ result=BAD
+tar = tarfile.open(unsafe_filename_tar)
 
 
 from django.shortcuts import render
@@ -152,7 +152,7 @@ def simple_upload(request):
       base_dir = "/tmp/baase_dir"
       if request.method == 'POST':
             # Read uploaded files by chunks of data
-            # see chunks(): https://docs.djangoproject.com/en/4.1/ref/files/uploads/#django.core.files.uploadedfile.UploadedFile.chunks 
+            # see chunks(): https://docs.djangoproject.com/en/4.1/ref/files/uploads/#django.core.files.uploadedfile.UploadedFile.chunks
             savepath = os.path.join(base_dir, "tarball_compressed.tar.gz")
             with open(savepath, 'wb+') as wfile:
                   for chunk in request.FILES["ufile1"].chunks():
@@ -160,11 +160,11 @@ def simple_upload(request):
 
                   tar = tarfile.open(savepath)
                   result = []
-                  for member in tar:      
-                      if member.issym():  
-                          raise ValueError("But it is a symlink")       
-                      result.append(member)     
-                  tar.extractall(path=tempfile.mkdtemp(), members=result) # $result=BAD   
+                  for member in tar:
+                      if member.issym():
+                          raise ValueError("But it is a symlink")
+                      result.append(member)
+                  tar.extractall(path=tempfile.mkdtemp(), members=result) # $ result=BAD
                   tar.close()
 
 
@@ -173,7 +173,7 @@ tarpath = "/tmp/tmp456/tarball.tar.gz"
 with open(tarpath, "wb") as f:
       f.write(response.raw.read())
 target_dir = "/tmp/unpack"
-tarfile.TarFile(tarpath, mode="r").extractall(path=target_dir) # $result=BAD
+tarfile.TarFile(tarpath, mode="r").extractall(path=target_dir) # $ result=BAD
 
 
 from pathlib import Path
@@ -183,7 +183,7 @@ import boto3
 def default_session() -> boto3.Session:
     _SESSION = None
     if _SESSION is None:
-        _SESSION = boto3.Session() 
+        _SESSION = boto3.Session()
     return _SESSION
 
 cache = False
@@ -198,4 +198,4 @@ with tempfile.NamedTemporaryFile(suffix=".tar.gz") as tmp:
           target = cache_dir
       else:
           target = Path(tempfile.mkdtemp())
-      shutil.unpack_archive(tmp.name, target) # $result=BAD
\ No newline at end of file
+      shutil.unpack_archive(tmp.name, target) # $ result=BAD
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-1427-PromptInjection/agent_instructions.py b/python/ql/test/experimental/query-tests/Security/CWE-1427-PromptInjection/agent_instructions.py
index 12cebc1b583..4dc1c245f29 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-1427-PromptInjection/agent_instructions.py
+++ b/python/ql/test/experimental/query-tests/Security/CWE-1427-PromptInjection/agent_instructions.py
@@ -6,7 +6,7 @@ app = Flask(__name__)
 def get_input1():
     input = request.args.get("input")
 
-    agent = Agent(name="Assistant", instructions="This prompt is customized for " + input) # $Alert[py/prompt-injection]
+    agent = Agent(name="Assistant", instructions="This prompt is customized for " + input) # $ Alert[py/prompt-injection]
 
     result = Runner.run_sync(agent, "This is a user message.")
     print(result.final_output)
@@ -22,9 +22,9 @@ def get_input2():
         input=[
             {
                 "role": "user",
-                "content": input, # $Alert[py/prompt-injection]
+                "content": input, # $ Alert[py/prompt-injection]
             }
-        ] 
+        ]
     )
 
     result2 = Runner.run_sync(
@@ -32,7 +32,7 @@ def get_input2():
         [
             {
                 "role": "user",
-                "content": input, # $Alert[py/prompt-injection]
+                "content": input, # $ Alert[py/prompt-injection]
             }
-        ] 
+        ]
     )
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-176/samples.py b/python/ql/test/experimental/query-tests/Security/CWE-176/samples.py
index 9b346d2d27a..37ebfd25d41 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-176/samples.py
+++ b/python/ql/test/experimental/query-tests/Security/CWE-176/samples.py
@@ -7,7 +7,7 @@ app = Flask(__name__)
 @app.route("/unsafe1")
 def unsafe1():
     user_input = escape(request.args.get("ui"))
-    normalized_user_input = unicodedata.normalize("NFKC", user_input)  # $result=BAD
+    normalized_user_input = unicodedata.normalize("NFKC", user_input)  # $ result=BAD
     return render_template("result.html", normalized_user_input=normalized_user_input)
 
 
@@ -17,7 +17,7 @@ def unsafe1bis():
     if user_input.isascii():
         normalized_user_input = user_input
     else:
-        normalized_user_input = unicodedata.normalize("NFC", user_input)  # $result=BAD
+        normalized_user_input = unicodedata.normalize("NFC", user_input)  # $ result=BAD
     return render_template("result.html", normalized_user_input=normalized_user_input)
 
 
@@ -25,6 +25,6 @@ def unsafe1bis():
 def safe1():
     normalized_user_input = unicodedata.normalize(
         "NFKC", request.args.get("ui")
-    )  # $result=OK
+    )  # $ result=OK
     user_input = escape(normalized_user_input)
     return render_template("result.html", normalized_user_input=user_input)
diff --git a/python/ql/test/library-tests/ApiGraphs/py2/test.py b/python/ql/test/library-tests/ApiGraphs/py2/test.py
index d98eae40852..98178a43eaa 100644
--- a/python/ql/test/library-tests/ApiGraphs/py2/test.py
+++ b/python/ql/test/library-tests/ApiGraphs/py2/test.py
@@ -1,3 +1,3 @@
 def python2_style():
-    from __builtin__ import open #$ use=moduleImport("builtins").getMember("open")
-    open("hello.txt") #$ use=moduleImport("builtins").getMember("open").getReturn()
+    from __builtin__ import open # $ use=moduleImport("builtins").getMember("open")
+    open("hello.txt") # $ use=moduleImport("builtins").getMember("open").getReturn()
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/deftest1.py b/python/ql/test/library-tests/ApiGraphs/py3/deftest1.py
index db04548eaa0..5e67e5f6f7e 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/deftest1.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/deftest1.py
@@ -1,29 +1,29 @@
-from mypkg import foo  #$ use=moduleImport("mypkg").getMember("foo")
+from mypkg import foo  # $ use=moduleImport("mypkg").getMember("foo")
 
-def callback(x): #$ use=moduleImport("mypkg").getMember("foo").getMember("bar").getParameter(0).getParameter(0)
-    x.baz() #$ use=moduleImport("mypkg").getMember("foo").getMember("bar").getParameter(0).getParameter(0).getMember("baz").getReturn()
+def callback(x): # $ use=moduleImport("mypkg").getMember("foo").getMember("bar").getParameter(0).getParameter(0)
+    x.baz() # $ use=moduleImport("mypkg").getMember("foo").getMember("bar").getParameter(0).getParameter(0).getMember("baz").getReturn()
 
-foo.bar(callback) #$ def=moduleImport("mypkg").getMember("foo").getMember("bar").getParameter(0) use=moduleImport("mypkg").getMember("foo").getMember("bar").getReturn()
+foo.bar(callback) # $ def=moduleImport("mypkg").getMember("foo").getMember("bar").getParameter(0) use=moduleImport("mypkg").getMember("foo").getMember("bar").getReturn()
 
-def callback2(x): #$ use=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getASubscript().getParameter(0)
-    x.baz2() #$ use=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getASubscript().getParameter(0).getMember("baz2").getReturn()
+def callback2(x): # $ use=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getASubscript().getParameter(0)
+    x.baz2() # $ use=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getASubscript().getParameter(0).getMember("baz2").getReturn()
 
 mydict = {
-  "c": callback2, #$ def=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getASubscript()
-  "other": "whatever" #$ def=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getASubscript()
+  "c": callback2, # $ def=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getASubscript()
+  "other": "whatever" # $ def=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getASubscript()
 }
 
-foo.baz(mydict) #$ def=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0) use=moduleImport("mypkg").getMember("foo").getMember("baz").getReturn()
+foo.baz(mydict) # $ def=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0) use=moduleImport("mypkg").getMember("foo").getMember("baz").getReturn()
 
-def callback3(x): #$ use=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getMember("third").getParameter(0)
-    x.baz3() #$ use=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getMember("third").getParameter(0).getMember("baz3").getReturn()
+def callback3(x): # $ use=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getMember("third").getParameter(0)
+    x.baz3() # $ use=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getMember("third").getParameter(0).getMember("baz3").getReturn()
 
-mydict.third = callback3 #$ def=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getMember("third")
+mydict.third = callback3 # $ def=moduleImport("mypkg").getMember("foo").getMember("baz").getParameter(0).getMember("third")
 
-foo.blab(mydict) #$ def=moduleImport("mypkg").getMember("foo").getMember("blab").getParameter(0) use=moduleImport("mypkg").getMember("foo").getMember("blab").getReturn()
+foo.blab(mydict) # $ def=moduleImport("mypkg").getMember("foo").getMember("blab").getParameter(0) use=moduleImport("mypkg").getMember("foo").getMember("blab").getReturn()
 
-def callback4(x): #$ use=moduleImport("mypkg").getMember("foo").getMember("quack").getParameter(0).getParameter(0)
-    x.baz4() #$ use=moduleImport("mypkg").getMember("foo").getMember("quack").getParameter(0).getParameter(0).getMember("baz4").getReturn()
+def callback4(x): # $ use=moduleImport("mypkg").getMember("foo").getMember("quack").getParameter(0).getParameter(0)
+    x.baz4() # $ use=moduleImport("mypkg").getMember("foo").getMember("quack").getParameter(0).getParameter(0).getMember("baz4").getReturn()
 
 otherDict = {
     # TODO: Backtracking through a property set using a dict doesn't work, but I can backtrack through explicit property writes, e.g. the `otherDict.fourth` below.
@@ -32,30 +32,30 @@ otherDict = {
 }
 otherDict.fourth = callback4
 
-foo.quack(otherDict.fourth) #$ def=moduleImport("mypkg").getMember("foo").getMember("quack").getParameter(0) use=moduleImport("mypkg").getMember("foo").getMember("quack").getReturn()
+foo.quack(otherDict.fourth) # $ def=moduleImport("mypkg").getMember("foo").getMember("quack").getParameter(0) use=moduleImport("mypkg").getMember("foo").getMember("quack").getReturn()
 
 def namedCallback(myName, otherName):
     # Using named parameters:
-    myName() #$ use=moduleImport("mypkg").getMember("foo").getMember("blob").getParameter(0).getKeywordParameter("myName").getReturn()
-    otherName() #$ use=moduleImport("mypkg").getMember("foo").getMember("blob").getParameter(0).getKeywordParameter("otherName").getReturn()
+    myName() # $ use=moduleImport("mypkg").getMember("foo").getMember("blob").getParameter(0).getKeywordParameter("myName").getReturn()
+    otherName() # $ use=moduleImport("mypkg").getMember("foo").getMember("blob").getParameter(0).getKeywordParameter("otherName").getReturn()
     # Using numbered parameters:
-    myName() #$ use=moduleImport("mypkg").getMember("foo").getMember("blob").getParameter(0).getParameter(0).getReturn()
-    otherName() #$ use=moduleImport("mypkg").getMember("foo").getMember("blob").getParameter(0).getParameter(1).getReturn()
+    myName() # $ use=moduleImport("mypkg").getMember("foo").getMember("blob").getParameter(0).getParameter(0).getReturn()
+    otherName() # $ use=moduleImport("mypkg").getMember("foo").getMember("blob").getParameter(0).getParameter(1).getReturn()
 
-foo.blob(namedCallback) #$ use=moduleImport("mypkg").getMember("foo").getMember("blob").getReturn()
+foo.blob(namedCallback) # $ use=moduleImport("mypkg").getMember("foo").getMember("blob").getReturn()
 
-foo.named(myName = 2) #$ def=moduleImport("mypkg").getMember("foo").getMember("named").getKeywordParameter("myName")
+foo.named(myName = 2) # $ def=moduleImport("mypkg").getMember("foo").getMember("named").getKeywordParameter("myName")
 
 
 def recusisionCallback(x):
-    x.recursion() #$ use=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0).getMember("callback").getParameter(0).getMember("recursion").getReturn()
-    x.recursion() #$ use=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0).getMember("rec1").getMember("callback").getParameter(0).getMember("recursion").getReturn()
-    x.recursion() #$ use=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0).getMember("rec1").getMember("rec2").getMember("callback").getParameter(0).getMember("recursion").getReturn()
-    x.recursion() #$ use=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0).getMember("rec1").getMember("rec2").getMember("rec1").getMember("callback").getParameter(0).getMember("recursion").getReturn()
+    x.recursion() # $ use=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0).getMember("callback").getParameter(0).getMember("recursion").getReturn()
+    x.recursion() # $ use=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0).getMember("rec1").getMember("callback").getParameter(0).getMember("recursion").getReturn()
+    x.recursion() # $ use=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0).getMember("rec1").getMember("rec2").getMember("callback").getParameter(0).getMember("recursion").getReturn()
+    x.recursion() # $ use=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0).getMember("rec1").getMember("rec2").getMember("rec1").getMember("callback").getParameter(0).getMember("recursion").getReturn()
 
 recursiveDict = {};
 recursiveDict.callback = recusisionCallback;
 recursiveDict.rec1 = recursiveDict;
 recursiveDict.rec2 = recursiveDict;
 
-foo.rec(recursiveDict); #$ def=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0)
+foo.rec(recursiveDict); # $ def=moduleImport("mypkg").getMember("foo").getMember("rec").getParameter(0)
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/deftest2.py b/python/ql/test/library-tests/ApiGraphs/py3/deftest2.py
index ef15ece04f6..9453e23ad1d 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/deftest2.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/deftest2.py
@@ -1,22 +1,22 @@
 # Subclasses
 
-from flask.views import View #$ use=moduleImport("flask").getMember("views").getMember("View")
+from flask.views import View # $ use=moduleImport("flask").getMember("views").getMember("View")
 
-class MyView(View): #$ use=moduleImport("flask").getMember("views").getMember("View").getASubclass()
-    myvar = 45 #$ def=moduleImport("flask").getMember("views").getMember("View").getASubclass().getMember("myvar")
-    def my_method(self): #$ def=moduleImport("flask").getMember("views").getMember("View").getASubclass().getMember("my_method")
-        return 3 #$ def=moduleImport("flask").getMember("views").getMember("View").getASubclass().getMember("my_method").getReturn()
+class MyView(View): # $ use=moduleImport("flask").getMember("views").getMember("View").getASubclass()
+    myvar = 45 # $ def=moduleImport("flask").getMember("views").getMember("View").getASubclass().getMember("myvar")
+    def my_method(self): # $ def=moduleImport("flask").getMember("views").getMember("View").getASubclass().getMember("my_method")
+        return 3 # $ def=moduleImport("flask").getMember("views").getMember("View").getASubclass().getMember("my_method").getReturn()
 
-instance = MyView() #$ use=moduleImport("flask").getMember("views").getMember("View").getASubclass().getReturn()
+instance = MyView() # $ use=moduleImport("flask").getMember("views").getMember("View").getASubclass().getReturn()
 
 def internal():
-    from pflask.views import View #$ use=moduleImport("pflask").getMember("views").getMember("View")
-    class IntMyView(View): #$ use=moduleImport("pflask").getMember("views").getMember("View").getASubclass()
-        my_internal_var = 35 #$ def=moduleImport("pflask").getMember("views").getMember("View").getASubclass().getMember("my_internal_var")
-        def my_internal_method(self): #$ def=moduleImport("pflask").getMember("views").getMember("View").getASubclass().getMember("my_internal_method")
+    from pflask.views import View # $ use=moduleImport("pflask").getMember("views").getMember("View")
+    class IntMyView(View): # $ use=moduleImport("pflask").getMember("views").getMember("View").getASubclass()
+        my_internal_var = 35 # $ def=moduleImport("pflask").getMember("views").getMember("View").getASubclass().getMember("my_internal_var")
+        def my_internal_method(self): # $ def=moduleImport("pflask").getMember("views").getMember("View").getASubclass().getMember("my_internal_method")
             pass
 
-    int_instance = IntMyView() #$ use=moduleImport("pflask").getMember("views").getMember("View").getASubclass().getReturn()
+    int_instance = IntMyView() # $ use=moduleImport("pflask").getMember("views").getMember("View").getASubclass().getReturn()
 
 # ------------------------------------------------------------------------------
 # Class decorator
@@ -27,8 +27,8 @@ def my_class_decorator(cls):
     return cls
 
 @my_class_decorator
-class MyViewWithDecorator(View): #$ use=moduleImport("flask").getMember("views").getMember("View").getASubclass()
+class MyViewWithDecorator(View): # $ use=moduleImport("flask").getMember("views").getMember("View").getASubclass()
     pass
 
-class SubclassFromDecorated(MyViewWithDecorator): #$ use=moduleImport("flask").getMember("views").getMember("View").getASubclass().getASubclass()
+class SubclassFromDecorated(MyViewWithDecorator): # $ use=moduleImport("flask").getMember("views").getMember("View").getASubclass().getASubclass()
     pass
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test.py b/python/ql/test/library-tests/ApiGraphs/py3/test.py
index 424c6248907..4c48e1f1dae 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test.py
@@ -1,44 +1,44 @@
-import a1 #$ use=moduleImport("a1")
+import a1 # $ use=moduleImport("a1")
 
-x = a1.blah1 #$ use=moduleImport("a1").getMember("blah1")
+x = a1.blah1 # $ use=moduleImport("a1").getMember("blah1")
 
-import a2 as m2 #$ use=moduleImport("a2")
+import a2 as m2 # $ use=moduleImport("a2")
 
-x2 = m2.blah2 #$ use=moduleImport("a2").getMember("blah2")
+x2 = m2.blah2 # $ use=moduleImport("a2").getMember("blah2")
 
-import a3.b3 as m3 #$ use=moduleImport("a3").getMember("b3")
+import a3.b3 as m3 # $ use=moduleImport("a3").getMember("b3")
 
-x3 = m3.blah3 #$  use=moduleImport("a3").getMember("b3").getMember("blah3")
+x3 = m3.blah3 # $ use=moduleImport("a3").getMember("b3").getMember("blah3")
 
-from a4.b4 import c4 as m4 #$ use=moduleImport("a4").getMember("b4").getMember("c4")
+from a4.b4 import c4 as m4 # $ use=moduleImport("a4").getMember("b4").getMember("c4")
 
-x4 = m4.blah4 #$ use=moduleImport("a4").getMember("b4").getMember("c4").getMember("blah4")
+x4 = m4.blah4 # $ use=moduleImport("a4").getMember("b4").getMember("c4").getMember("blah4")
 
-import a.b.c.d #$ use=moduleImport("a")
+import a.b.c.d # $ use=moduleImport("a")
 
-ab = a.b #$ use=moduleImport("a").getMember("b")
+ab = a.b # $ use=moduleImport("a").getMember("b")
 
-abc = ab.c #$ use=moduleImport("a").getMember("b").getMember("c")
+abc = ab.c # $ use=moduleImport("a").getMember("b").getMember("c")
 
-abcd = abc.d #$ use=moduleImport("a").getMember("b").getMember("c").getMember("d")
+abcd = abc.d # $ use=moduleImport("a").getMember("b").getMember("c").getMember("d")
 
-x5 = abcd.method() #$ use=moduleImport("a").getMember("b").getMember("c").getMember("d").getMember("method").getReturn()
+x5 = abcd.method() # $ use=moduleImport("a").getMember("b").getMember("c").getMember("d").getMember("method").getReturn()
 
 from a.b.c.d import method
-x5_alt = method() #$ use=moduleImport("a").getMember("b").getMember("c").getMember("d").getMember("method").getReturn()
+x5_alt = method() # $ use=moduleImport("a").getMember("b").getMember("c").getMember("d").getMember("method").getReturn()
 
-from a6 import m6 #$ use=moduleImport("a6").getMember("m6")
+from a6 import m6 # $ use=moduleImport("a6").getMember("m6")
 
-x6 = m6().foo().bar() #$ use=moduleImport("a6").getMember("m6").getReturn().getMember("foo").getReturn().getMember("bar").getReturn()
+x6 = m6().foo().bar() # $ use=moduleImport("a6").getMember("m6").getReturn().getMember("foo").getReturn().getMember("bar").getReturn()
 
-import foo.baz.baz as fbb #$ use=moduleImport("foo").getMember("baz").getMember("baz")
-from foo.bar.baz import quux as fbbq #$ use=moduleImport("foo").getMember("bar").getMember("baz").getMember("quux")
-from ham.bar.eggs import spam as hbes #$ use=moduleImport("ham").getMember("bar").getMember("eggs").getMember("spam")
-fbb.quux #$ use=moduleImport("foo").getMember("baz").getMember("baz").getMember("quux")
-fbbq #$ use=moduleImport("foo").getMember("bar").getMember("baz").getMember("quux")
-hbes #$ use=moduleImport("ham").getMember("bar").getMember("eggs").getMember("spam")
+import foo.baz.baz as fbb # $ use=moduleImport("foo").getMember("baz").getMember("baz")
+from foo.bar.baz import quux as fbbq # $ use=moduleImport("foo").getMember("bar").getMember("baz").getMember("quux")
+from ham.bar.eggs import spam as hbes # $ use=moduleImport("ham").getMember("bar").getMember("eggs").getMember("spam")
+fbb.quux # $ use=moduleImport("foo").getMember("baz").getMember("baz").getMember("quux")
+fbbq # $ use=moduleImport("foo").getMember("bar").getMember("baz").getMember("quux")
+hbes # $ use=moduleImport("ham").getMember("bar").getMember("eggs").getMember("spam")
 
-import foo.bar.baz #$ use=moduleImport("foo")
+import foo.bar.baz # $ use=moduleImport("foo")
 
 # Relative imports. These are ignored
 
@@ -50,51 +50,51 @@ from ..foobar import baz
 # Use of imports across scopes
 
 def use_m4():
-    x = m4.blah4 #$ use=moduleImport("a4").getMember("b4").getMember("c4").getMember("blah4")
+    x = m4.blah4 # $ use=moduleImport("a4").getMember("b4").getMember("c4").getMember("blah4")
 
 def local_import_use():
-    from foo import bar #$ use=moduleImport("foo").getMember("bar")
+    from foo import bar # $ use=moduleImport("foo").getMember("bar")
 
-    x = bar() #$ use=moduleImport("foo").getMember("bar").getReturn()
+    x = bar() # $ use=moduleImport("foo").getMember("bar").getReturn()
 
-from eggs import ham as spam #$ use=moduleImport("eggs").getMember("ham")
+from eggs import ham as spam # $ use=moduleImport("eggs").getMember("ham")
 
 def bbb():
-    f = spam #$ use=moduleImport("eggs").getMember("ham")
+    f = spam # $ use=moduleImport("eggs").getMember("ham")
 
-from danger import SOURCE #$ use=moduleImport("danger").getMember("SOURCE")
+from danger import SOURCE # $ use=moduleImport("danger").getMember("SOURCE")
 
-foo = SOURCE #$ use=moduleImport("danger").getMember("SOURCE")
+foo = SOURCE # $ use=moduleImport("danger").getMember("SOURCE")
 
 def change_foo():
     global foo
-    foo = SOURCE #$ use=moduleImport("danger").getMember("SOURCE")
+    foo = SOURCE # $ use=moduleImport("danger").getMember("SOURCE")
 
 def f():
     global foo
-    sink(foo) #$ use=moduleImport("danger").getMember("SOURCE")
+    sink(foo) # $ use=moduleImport("danger").getMember("SOURCE")
     foo = NONSOURCE
     change_foo()
-    sink(foo) #$ use=moduleImport("danger").getMember("SOURCE")
+    sink(foo) # $ use=moduleImport("danger").getMember("SOURCE")
 
 
 # Built-ins
 
 def use_of_builtins():
-    for x in range(5): #$ use=moduleImport("builtins").getMember("range").getReturn()
-        if x < len([]): #$ use=moduleImport("builtins").getMember("len").getReturn()
-            print("Hello") #$ use=moduleImport("builtins").getMember("print").getReturn()
-            raise Exception("Farewell") #$ use=moduleImport("builtins").getMember("Exception").getReturn()
+    for x in range(5): # $ use=moduleImport("builtins").getMember("range").getReturn()
+        if x < len([]): # $ use=moduleImport("builtins").getMember("len").getReturn()
+            print("Hello") # $ use=moduleImport("builtins").getMember("print").getReturn()
+            raise Exception("Farewell") # $ use=moduleImport("builtins").getMember("Exception").getReturn()
 
 def imported_builtins():
-    import builtins #$ use=moduleImport("builtins")
+    import builtins # $ use=moduleImport("builtins")
     def open(f):
-        return builtins.open(f) #$ use=moduleImport("builtins").getMember("open").getReturn()
+        return builtins.open(f) # $ use=moduleImport("builtins").getMember("open").getReturn()
 
 def redefine_print():
     def my_print(x):
-        import builtins #$ use=moduleImport("builtins")
-        builtins.print("I'm printing", x) #$ use=moduleImport("builtins").getMember("print").getReturn()
+        import builtins # $ use=moduleImport("builtins")
+        builtins.print("I'm printing", x) # $ use=moduleImport("builtins").getMember("print").getReturn()
     print = my_print
     print("these words")
 
@@ -109,13 +109,13 @@ def global_redefine_chr():
 
 def what_is_chr_now():
     # If global_redefine_chr has been run, then the following is _not_ a reference to the built-in chr
-    return chr(123) #$ MISSING: use=moduleImport("builtins").getMember("chr").getReturn()
+    return chr(123) # $ MISSING: use=moduleImport("builtins").getMember("chr").getReturn()
 
 def obscured_print():
-    p = print #$ use=moduleImport("builtins").getMember("print")
-    p("Can you see me?") #$ use=moduleImport("builtins").getMember("print").getReturn()
+    p = print # $ use=moduleImport("builtins").getMember("print")
+    p("Can you see me?") # $ use=moduleImport("builtins").getMember("print").getReturn()
 
 def python2_style():
     # In Python 3, `__builtin__` has no special meaning.
-    from __builtin__ import open #$ use=moduleImport("__builtin__").getMember("open")
-    open("hello.txt") #$ use=moduleImport("__builtin__").getMember("open").getReturn()
+    from __builtin__ import open # $ use=moduleImport("__builtin__").getMember("open")
+    open("hello.txt") # $ use=moduleImport("__builtin__").getMember("open").getReturn()
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test1.py b/python/ql/test/library-tests/ApiGraphs/py3/test1.py
index 471cb09d4fa..548070cd60e 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test1.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test1.py
@@ -1,6 +1,6 @@
-import mypkg #$ use=moduleImport("mypkg")
-print(mypkg.foo) #$ use=moduleImport("mypkg").getMember("foo") // 42
+import mypkg # $ use=moduleImport("mypkg")
+print(mypkg.foo) # $ use=moduleImport("mypkg").getMember("foo") // 42
 try:
-    print(mypkg.bar) #$ use=moduleImport("mypkg").getMember("bar")
-except AttributeError as e: #$ use=moduleImport("builtins").getMember("AttributeError")
-    print(e)  #$ use=moduleImport("builtins").getMember("print").getReturn() // module 'mypkg' has no attribute 'bar'
+    print(mypkg.bar) # $ use=moduleImport("mypkg").getMember("bar")
+except AttributeError as e: # $ use=moduleImport("builtins").getMember("AttributeError")
+    print(e)  # $ use=moduleImport("builtins").getMember("print").getReturn() // module 'mypkg' has no attribute 'bar'
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test2.py b/python/ql/test/library-tests/ApiGraphs/py3/test2.py
index dce67f0b034..00e65f12853 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test2.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test2.py
@@ -1,4 +1,4 @@
-from mypkg import foo #$ use=moduleImport("mypkg").getMember("foo")
-from mypkg import bar #$ use=moduleImport("mypkg").getMember("bar")
-print(foo) #$ use=moduleImport("mypkg").getMember("foo")
-print(bar) #$ use=moduleImport("mypkg").getMember("bar")
+from mypkg import foo # $ use=moduleImport("mypkg").getMember("foo")
+from mypkg import bar # $ use=moduleImport("mypkg").getMember("bar")
+print(foo) # $ use=moduleImport("mypkg").getMember("foo")
+print(bar) # $ use=moduleImport("mypkg").getMember("bar")
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test3.py b/python/ql/test/library-tests/ApiGraphs/py3/test3.py
index 83ff25cc402..b8f27f62fa6 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test3.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test3.py
@@ -1,4 +1,4 @@
-import mypkg.foo #$ use=moduleImport("mypkg")
-import mypkg.bar #$ use=moduleImport("mypkg")
-print(mypkg.foo)  #$ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...
-print(mypkg.bar)  #$ use=moduleImport("mypkg").getMember("bar") // <module 'mypkg.bar' ...
+import mypkg.foo # $ use=moduleImport("mypkg")
+import mypkg.bar # $ use=moduleImport("mypkg")
+print(mypkg.foo)  # $ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...
+print(mypkg.bar)  # $ use=moduleImport("mypkg").getMember("bar") // <module 'mypkg.bar' ...
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test4.py b/python/ql/test/library-tests/ApiGraphs/py3/test4.py
index c1790aa2263..665e01dc69a 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test4.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test4.py
@@ -1,4 +1,4 @@
-import mypkg.foo as _foo #$ use=moduleImport("mypkg").getMember("foo")
-import mypkg.bar as _bar #$ use=moduleImport("mypkg").getMember("bar")
-print(_foo) #$ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...
-print(_bar) #$ use=moduleImport("mypkg").getMember("bar") // <module 'mypkg.bar' ...
+import mypkg.foo as _foo # $ use=moduleImport("mypkg").getMember("foo")
+import mypkg.bar as _bar # $ use=moduleImport("mypkg").getMember("bar")
+print(_foo) # $ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...
+print(_bar) # $ use=moduleImport("mypkg").getMember("bar") // <module 'mypkg.bar' ...
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test5.py b/python/ql/test/library-tests/ApiGraphs/py3/test5.py
index 1825937a6a2..020e080a806 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test5.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test5.py
@@ -1,10 +1,10 @@
-import mypkg #$ use=moduleImport("mypkg")
+import mypkg # $ use=moduleImport("mypkg")
 
-print(mypkg.foo) #$ use=moduleImport("mypkg").getMember("foo") // 42
+print(mypkg.foo) # $ use=moduleImport("mypkg").getMember("foo") // 42
 try:
-    print(mypkg.bar) #$ use=moduleImport("mypkg").getMember("bar")
-except AttributeError as e: #$ use=moduleImport("builtins").getMember("AttributeError")
-    print(e)  #$ use=moduleImport("builtins").getMember("print").getReturn() // module 'mypkg' has no attribute 'bar'
+    print(mypkg.bar) # $ use=moduleImport("mypkg").getMember("bar")
+except AttributeError as e: # $ use=moduleImport("builtins").getMember("AttributeError")
+    print(e)  # $ use=moduleImport("builtins").getMember("print").getReturn() // module 'mypkg' has no attribute 'bar'
 
-from mypkg import bar as _bar #$ use=moduleImport("mypkg").getMember("bar")
-print(mypkg.bar) #$ use=moduleImport("mypkg").getMember("bar") // <module 'mypkg.bar' ...
+from mypkg import bar as _bar # $ use=moduleImport("mypkg").getMember("bar")
+print(mypkg.bar) # $ use=moduleImport("mypkg").getMember("bar") // <module 'mypkg.bar' ...
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test6.py b/python/ql/test/library-tests/ApiGraphs/py3/test6.py
index f0da9d16840..899d18c00e8 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test6.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test6.py
@@ -1,6 +1,6 @@
-import mypkg #$ use=moduleImport("mypkg")
+import mypkg # $ use=moduleImport("mypkg")
 
-print(mypkg.foo) #$ use=moduleImport("mypkg").getMember("foo") // 42
+print(mypkg.foo) # $ use=moduleImport("mypkg").getMember("foo") // 42
 
-import mypkg.foo #$ use=moduleImport("mypkg")
-print(mypkg.foo) #$ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...
+import mypkg.foo # $ use=moduleImport("mypkg")
+print(mypkg.foo) # $ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test7.py b/python/ql/test/library-tests/ApiGraphs/py3/test7.py
index e74159efaed..b938d581f28 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test7.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test7.py
@@ -1,10 +1,10 @@
-from mypkg import foo #$ use=moduleImport("mypkg").getMember("foo")
+from mypkg import foo # $ use=moduleImport("mypkg").getMember("foo")
 
-print(foo) #$ use=moduleImport("mypkg").getMember("foo") // 42
+print(foo) # $ use=moduleImport("mypkg").getMember("foo") // 42
 
-import mypkg.foo #$ use=moduleImport("mypkg")
-print(foo) #$ use=moduleImport("mypkg").getMember("foo") // 42
-print(mypkg.foo) #$ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...
+import mypkg.foo # $ use=moduleImport("mypkg")
+print(foo) # $ use=moduleImport("mypkg").getMember("foo") // 42
+print(mypkg.foo) # $ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...
 
-from mypkg import foo #$ use=moduleImport("mypkg").getMember("foo")
-print(foo) #$ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...
+from mypkg import foo # $ use=moduleImport("mypkg").getMember("foo")
+print(foo) # $ use=moduleImport("mypkg").getMember("foo") // <module 'mypkg.foo' ...
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test_annotations.py b/python/ql/test/library-tests/ApiGraphs/py3/test_annotations.py
index 664096b9d33..9cfd7a9922b 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test_annotations.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test_annotations.py
@@ -1,25 +1,25 @@
 from types import AssignmentAnnotation, ParameterAnnotation
 
 def test_annotated_assignment():
-    local_x : AssignmentAnnotation = create_x() #$ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation")
-    local_x #$ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
+    local_x : AssignmentAnnotation = create_x() # $ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation")
+    local_x # $ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
 
-global_x : AssignmentAnnotation #$ use=moduleImport("types").getMember("AssignmentAnnotation")
-global_x #$ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
+global_x : AssignmentAnnotation # $ use=moduleImport("types").getMember("AssignmentAnnotation")
+global_x # $ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
 
-def test_parameter_annotation(parameter_y: ParameterAnnotation): #$ use=moduleImport("types").getMember("ParameterAnnotation")
-    parameter_y #$ use=moduleImport("types").getMember("ParameterAnnotation").getAnnotatedInstance()
+def test_parameter_annotation(parameter_y: ParameterAnnotation): # $ use=moduleImport("types").getMember("ParameterAnnotation")
+    parameter_y # $ use=moduleImport("types").getMember("ParameterAnnotation").getAnnotatedInstance()
 
 type Alias = AssignmentAnnotation
 
-global_z : Alias #$ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation")
-global_z #$ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
+global_z : Alias # $ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation")
+global_z # $ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
 
-def test_parameter_alias(parameter_z: Alias): #$ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation")
-    parameter_z #$ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
+def test_parameter_alias(parameter_z: Alias): # $ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation")
+    parameter_z # $ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
 
 # local type aliases
 def test_local_type_alias():
     type LocalAlias = AssignmentAnnotation
-    local_alias : LocalAlias = create_value() #$ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation")
-    local_alias #$ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
+    local_alias : LocalAlias = create_value() # $ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation")
+    local_alias # $ MISSING: use=moduleImport("types").getMember("AssignmentAnnotation").getAnnotatedInstance()
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test_captured.py b/python/ql/test/library-tests/ApiGraphs/py3/test_captured.py
index 9057b1d1fd7..ec8d24b8b3b 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test_captured.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test_captured.py
@@ -1,14 +1,14 @@
 from html import escape
 
 def p(x):
-    return escape(x) #$ use=moduleImport("html").getMember("escape").getReturn()
+    return escape(x) # $ use=moduleImport("html").getMember("escape").getReturn()
 
 def p_list(l):
-    return ", ".join(p(x) for x in l) #$ use=moduleImport("html").getMember("escape").getReturn()
+    return ", ".join(p(x) for x in l) # $ use=moduleImport("html").getMember("escape").getReturn()
 
 def pp_list(l):
     def pp(x):
-        return escape(x) #$ use=moduleImport("html").getMember("escape").getReturn()
+        return escape(x) # $ use=moduleImport("html").getMember("escape").getReturn()
 
     def pp_list_inner(l):
-        return ", ".join(pp(x) for x in l) #$ use=moduleImport("html").getMember("escape").getReturn()
+        return ", ".join(pp(x) for x in l) # $ use=moduleImport("html").getMember("escape").getReturn()
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test_captured_flask.py b/python/ql/test/library-tests/ApiGraphs/py3/test_captured_flask.py
index 9bf9ee4d598..8492a2577c4 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test_captured_flask.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test_captured_flask.py
@@ -4,11 +4,11 @@ from flask_user import UserMixin
 
 def create_app():
   app = Flask(__name__)
-  db = SQLAlchemy(app)  #$ use=moduleImport("flask_sqlalchemy").getMember("SQLAlchemy").getReturn()
+  db = SQLAlchemy(app)  # $ use=moduleImport("flask_sqlalchemy").getMember("SQLAlchemy").getReturn()
 
-  class Users(db.Model, UserMixin):  #$ use=moduleImport("flask_sqlalchemy").getMember("SQLAlchemy").getReturn().getMember("Model").getASubclass()
+  class Users(db.Model, UserMixin):  # $ use=moduleImport("flask_sqlalchemy").getMember("SQLAlchemy").getReturn().getMember("Model").getASubclass()
       __tablename__ = 'users'
 
   @app.route('/v2/user/<int:id>', methods=['GET','PUT'])
   def users(id):
-      Users.query.filter_by(id=id).first()  #$ use=moduleImport("flask_sqlalchemy").getMember("SQLAlchemy").getReturn().getMember("Model").getASubclass().getMember("query").getMember("filter_by")
+      Users.query.filter_by(id=id).first()  # $ use=moduleImport("flask_sqlalchemy").getMember("SQLAlchemy").getReturn().getMember("Model").getASubclass().getMember("query").getMember("filter_by")
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test_captured_inheritance.py b/python/ql/test/library-tests/ApiGraphs/py3/test_captured_inheritance.py
index 14ceb88b54a..77e4dd7ed25 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test_captured_inheritance.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test_captured_inheritance.py
@@ -10,17 +10,17 @@ def func():
     class Bar(B): pass
 
     class Baz(A): pass
-    
+
     def other_func():
-        print(Foo)  #$ use=moduleImport("foo").getMember("A").getASubclass() use=moduleImport("foo").getMember("B").getASubclass()
+        print(Foo)  # $ use=moduleImport("foo").getMember("A").getASubclass() use=moduleImport("foo").getMember("B").getASubclass()
         # On the next line, we wish to express that it is not possible for `Bar` to be a subclass of `A`.
         # However, we have no "true negative" annotation, so we use the MISSING annotation instead.
         # (Normally, "true negative" is not needed as all applicable annotations must be present,
-        # but these API graph tests work differently, since having all results recorded in annotations 
+        # but these API graph tests work differently, since having all results recorded in annotations
         # would be excessive)
-        print(Bar)  #$ use=moduleImport("foo").getMember("B").getASubclass() MISSING: use=moduleImport("foo").getMember("A").getASubclass()
-        print(Baz)  #$ use=moduleImport("foo").getMember("B").getASubclass() SPURIOUS: use=moduleImport("foo").getMember("A").getASubclass()
+        print(Bar)  # $ use=moduleImport("foo").getMember("B").getASubclass() MISSING: use=moduleImport("foo").getMember("A").getASubclass()
+        print(Baz)  # $ use=moduleImport("foo").getMember("B").getASubclass() SPURIOUS: use=moduleImport("foo").getMember("A").getASubclass()
 
     class Baz(B): pass
 
-    other_func()
\ No newline at end of file
+    other_func()
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test_deep.py b/python/ql/test/library-tests/ApiGraphs/py3/test_deep.py
index 0d5dab44411..e67bbadc642 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test_deep.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test_deep.py
@@ -1,4 +1,4 @@
-from start.middle.end import foo #$ use=moduleImport("start").getMember("middle").getMember("end").getMember("foo")
-from start.middle.end import bar #$ use=moduleImport("start").getMember("middle").getMember("end").getMember("bar")
-print(foo) #$ use=moduleImport("start").getMember("middle").getMember("end").getMember("foo")
-print(bar) #$ use=moduleImport("start").getMember("middle").getMember("end").getMember("bar")
\ No newline at end of file
+from start.middle.end import foo # $ use=moduleImport("start").getMember("middle").getMember("end").getMember("foo")
+from start.middle.end import bar # $ use=moduleImport("start").getMember("middle").getMember("end").getMember("bar")
+print(foo) # $ use=moduleImport("start").getMember("middle").getMember("end").getMember("foo")
+print(bar) # $ use=moduleImport("start").getMember("middle").getMember("end").getMember("bar")
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test_entry_point.py b/python/ql/test/library-tests/ApiGraphs/py3/test_entry_point.py
index 17d0cfacc4b..e5c5a0579a0 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test_entry_point.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test_entry_point.py
@@ -1,2 +1,2 @@
-"magic_string".foo.bar #$ use=entryPoint("CustomEntryPoint").getMember("foo").getMember("bar")
+"magic_string".foo.bar # $ use=entryPoint("CustomEntryPoint").getMember("foo").getMember("bar")
 "magic_string2".foo.bar
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test_import_star.py b/python/ql/test/library-tests/ApiGraphs/py3/test_import_star.py
index edf344bac29..8b29a7d2e8f 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test_import_star.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test_import_star.py
@@ -1,12 +1,12 @@
 # Star imports
 
-from unknown import * #$ use=moduleImport("unknown")
+from unknown import * # $ use=moduleImport("unknown")
 
 # This used to be missing, as we did not consider `hello` to be a `LocalSourceNode`,
 # since it has flow going into it from its corresponding `GlobalSsaVariable`.
-hello() #$ use=moduleImport("unknown").getMember("hello").getReturn()
+hello() # $ use=moduleImport("unknown").getMember("hello").getReturn()
 
-print(const_from_unknown) #$ use=moduleImport("unknown").getMember("const_from_unknown")
+print(const_from_unknown) # $ use=moduleImport("unknown").getMember("const_from_unknown")
 
 # We don't want our analysis to think that either `non_module_member` or `outer_bar` can
 # come from `from unknown import *`
@@ -16,23 +16,23 @@ outer_bar = 5
 outer_bar
 
 def foo():
-    world() #$ use=moduleImport("unknown").getMember("world").getReturn()
+    world() # $ use=moduleImport("unknown").getMember("world").getReturn()
     bar = 5
     bar
     non_module_member
-    print(bar) #$ use=moduleImport("builtins").getMember("print").getReturn()
+    print(bar) # $ use=moduleImport("builtins").getMember("print").getReturn()
 
 def quux():
     global non_module_member
     non_module_member = 5
 
 def func1():
-    var() #$ use=moduleImport("unknown").getMember("var").getReturn()
+    var() # $ use=moduleImport("unknown").getMember("var").getReturn()
     def func2():
         var = "FOO"
 
 def func3():
-    var2 = print #$ use=moduleImport("builtins").getMember("print")
+    var2 = print # $ use=moduleImport("builtins").getMember("print")
     def func4():
-        var2() #$ use=moduleImport("builtins").getMember("print").getReturn()
+        var2() # $ use=moduleImport("builtins").getMember("print").getReturn()
     func4()
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test_import_star2.py b/python/ql/test/library-tests/ApiGraphs/py3/test_import_star2.py
index a73f1f43548..d6f26a5bc40 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test_import_star2.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test_import_star2.py
@@ -1,14 +1,14 @@
 # Star imports in local scope
 
-hello2() 
+hello2()
 
 def foo():
-    from unknown2 import * #$ use=moduleImport("unknown2")
-    world2() #$ use=moduleImport("unknown2").getMember("world2").getReturn()
+    from unknown2 import * # $ use=moduleImport("unknown2")
+    world2() # $ use=moduleImport("unknown2").getMember("world2").getReturn()
     bar2 = 5
     bar2
     non_module_member2
-    print(bar2) #$ use=moduleImport("builtins").getMember("print").getReturn()
+    print(bar2) # $ use=moduleImport("builtins").getMember("print").getReturn()
 
 def quux2():
     global non_module_member2
diff --git a/python/ql/test/library-tests/ApiGraphs/py3/test_subscript.py b/python/ql/test/library-tests/ApiGraphs/py3/test_subscript.py
index c4d3c655983..5773facfca0 100644
--- a/python/ql/test/library-tests/ApiGraphs/py3/test_subscript.py
+++ b/python/ql/test/library-tests/ApiGraphs/py3/test_subscript.py
@@ -1,8 +1,8 @@
 import mypkg
 
 def test_subscript():
-    bar = mypkg.foo()["bar"] #$ use=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
-    mypkg.foo()["baz"] = 42 #$ def=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
-    mypkg.foo()["qux"] += 42 #$ use=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
-    mypkg.foo()["qux"] += 42 #$ def=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
-    mypkg.foo()[mypkg.index] = mypkg.value #$ def=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
+    bar = mypkg.foo()["bar"] # $ use=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
+    mypkg.foo()["baz"] = 42 # $ def=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
+    mypkg.foo()["qux"] += 42 # $ use=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
+    mypkg.foo()["qux"] += 42 # $ def=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
+    mypkg.foo()[mypkg.index] = mypkg.value # $ def=moduleImport("mypkg").getMember("foo").getReturn().getASubscript()
diff --git a/python/ql/test/library-tests/ControlFlow/general/Cyclo.ql b/python/ql/test/library-tests/ControlFlow/general/Cyclo.ql
index a36375b7f3d..5a35a35922c 100644
--- a/python/ql/test/library-tests/ControlFlow/general/Cyclo.ql
+++ b/python/ql/test/library-tests/ControlFlow/general/Cyclo.ql
@@ -1,5 +1,5 @@
 import python
 private import LegacyPointsTo
 
-from FunctionMetrics func
+from FunctionMetricsWithPointsTo func
 select func.toString(), func.getCyclomaticComplexity()
diff --git a/python/ql/test/library-tests/dataflow/basic/test.py b/python/ql/test/library-tests/dataflow/basic/test.py
index aa1f9906b7c..b0d4307ad2a 100644
--- a/python/ql/test/library-tests/dataflow/basic/test.py
+++ b/python/ql/test/library-tests/dataflow/basic/test.py
@@ -1,7 +1,7 @@
-def obfuscated_id(x): #$ step="FunctionExpr -> obfuscated_id"
-  y = x #$ step="x -> y" step="x, l:-1 -> x"
-  z = y #$ step="y -> z" step="y, l:-1 -> y"
-  return z #$ flow="42, l:+2 -> z" step="z, l:-1 -> z"
+def obfuscated_id(x): # $ step="FunctionExpr -> obfuscated_id"
+  y = x # $ step="x -> y" step="x, l:-1 -> x"
+  z = y # $ step="y -> z" step="y, l:-1 -> y"
+  return z # $ flow="42, l:+2 -> z" step="z, l:-1 -> z"
 
-a = 42 #$ step="42 -> a"
-b = obfuscated_id(a) #$ flow="42, l:-1 -> b" flow="FunctionExpr, l:-6 -> obfuscated_id" step="obfuscated_id(..) -> b" step="obfuscated_id, l:-6 -> obfuscated_id" step="a, l:-1 -> a"
+a = 42 # $ step="42 -> a"
+b = obfuscated_id(a) # $ flow="42, l:-1 -> b" flow="FunctionExpr, l:-6 -> obfuscated_id" step="obfuscated_id(..) -> b" step="obfuscated_id, l:-6 -> obfuscated_id" step="a, l:-1 -> a"
diff --git a/java/ql/test/library-tests/successors/TestThrow2/FalseSuccessors.expected b/python/ql/test/library-tests/dataflow/calls-overload/OverloadCallTest.expected
similarity index 100%
rename from java/ql/test/library-tests/successors/TestThrow2/FalseSuccessors.expected
rename to python/ql/test/library-tests/dataflow/calls-overload/OverloadCallTest.expected
diff --git a/python/ql/test/library-tests/dataflow/calls-overload/OverloadCallTest.ql b/python/ql/test/library-tests/dataflow/calls-overload/OverloadCallTest.ql
new file mode 100644
index 00000000000..6050f56c0ba
--- /dev/null
+++ b/python/ql/test/library-tests/dataflow/calls-overload/OverloadCallTest.ql
@@ -0,0 +1,26 @@
+/**
+ * Test that `@typing.overload` stubs are not resolved as call targets.
+ */
+
+import python
+import semmle.python.dataflow.new.internal.DataFlowDispatch as DataFlowDispatch
+import utils.test.InlineExpectationsTest
+
+module OverloadCallTest implements TestSig {
+  string getARelevantTag() { result = "init" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(location.getFile().getRelativePath()) and
+    exists(DataFlowDispatch::DataFlowCall call, Function target |
+      location = call.getLocation() and
+      element = call.toString() and
+      DataFlowDispatch::resolveCall(call.getNode(), target, _) and
+      target.getName() = "__init__"
+    |
+      value = target.getQualifiedName() + ":" + target.getLocation().getStartLine().toString() and
+      tag = "init"
+    )
+  }
+}
+
+import MakeTest<OverloadCallTest>
diff --git a/python/ql/test/library-tests/dataflow/calls-overload/test.py b/python/ql/test/library-tests/dataflow/calls-overload/test.py
new file mode 100644
index 00000000000..bb385b9de38
--- /dev/null
+++ b/python/ql/test/library-tests/dataflow/calls-overload/test.py
@@ -0,0 +1,39 @@
+import typing
+
+
+class OverloadedInit:
+    @typing.overload
+    def __init__(self, x: int) -> None: ...
+
+    @typing.overload
+    def __init__(self, x: str, y: str) -> None: ...
+
+    def __init__(self, x, y=None):
+        pass
+
+OverloadedInit(1) # $ init=OverloadedInit.__init__:11
+OverloadedInit("a", "b") # $ init=OverloadedInit.__init__:11
+
+
+from typing import overload
+
+
+class OverloadedInitFromImport:
+    @overload
+    def __init__(self, x: int) -> None: ...
+
+    @overload
+    def __init__(self, x: str, y: str) -> None: ...
+
+    def __init__(self, x, y=None):
+        pass
+
+OverloadedInitFromImport(1) # $ init=OverloadedInitFromImport.__init__:28
+OverloadedInitFromImport("a", "b") # $ init=OverloadedInitFromImport.__init__:28
+
+
+class NoOverloads:
+    def __init__(self, x):
+        pass
+
+NoOverloads(1) # $ init=NoOverloads.__init__:36
diff --git a/python/ql/test/library-tests/dataflow/coverage-py2/classes.py b/python/ql/test/library-tests/dataflow/coverage-py2/classes.py
index 48dbaea8e93..9f1b92c7b4d 100644
--- a/python/ql/test/library-tests/dataflow/coverage-py2/classes.py
+++ b/python/ql/test/library-tests/dataflow/coverage-py2/classes.py
@@ -50,5 +50,5 @@ class With_index:
 def test_index():
     import operator
 
-    with_index = With_index()  #$ MISSING: arg1="SSA variable with_index" func=With_index.__index__
+    with_index = With_index()  # $ MISSING: arg1="SSA variable with_index" func=With_index.__index__
     operator.index(with_index)
diff --git a/python/ql/test/library-tests/dataflow/coverage-py3/argumentRoutingTest.expected b/python/ql/test/library-tests/dataflow/coverage-py3/argumentRoutingTest.expected
index a0001b7c55c..fd4f79f2acc 100644
--- a/python/ql/test/library-tests/dataflow/coverage-py3/argumentRoutingTest.expected
+++ b/python/ql/test/library-tests/dataflow/coverage-py3/argumentRoutingTest.expected
@@ -1,4 +1,4 @@
-| classes.py:54:44:54:107 | Comment #$ arg1="with_length_hint" func=With_length_hint.__length_hint__ | Missing result: arg1="with_length_hint" |
-| classes.py:54:44:54:107 | Comment #$ arg1="with_length_hint" func=With_length_hint.__length_hint__ | Missing result: func=With_length_hint.__length_hint__ |
-| classes.py:71:32:71:77 | Comment #$ arg1="with_index" func=With_index.__index__ | Missing result: arg1="with_index" |
-| classes.py:71:32:71:77 | Comment #$ arg1="with_index" func=With_index.__index__ | Missing result: func=With_index.__index__ |
+| classes.py:54:44:54:108 | Comment # $ arg1="with_length_hint" func=With_length_hint.__length_hint__ | Missing result: arg1="with_length_hint" |
+| classes.py:54:44:54:108 | Comment # $ arg1="with_length_hint" func=With_length_hint.__length_hint__ | Missing result: func=With_length_hint.__length_hint__ |
+| classes.py:71:32:71:78 | Comment # $ arg1="with_index" func=With_index.__index__ | Missing result: arg1="with_index" |
+| classes.py:71:32:71:78 | Comment # $ arg1="with_index" func=With_index.__index__ | Missing result: func=With_index.__index__ |
diff --git a/python/ql/test/library-tests/dataflow/coverage-py3/classes.py b/python/ql/test/library-tests/dataflow/coverage-py3/classes.py
index 199c31c2535..20a6d725505 100644
--- a/python/ql/test/library-tests/dataflow/coverage-py3/classes.py
+++ b/python/ql/test/library-tests/dataflow/coverage-py3/classes.py
@@ -51,7 +51,7 @@ class With_length_hint:
 def test_length_hint():
     import operator
 
-    with_length_hint = With_length_hint()  #$ arg1="with_length_hint" func=With_length_hint.__length_hint__
+    with_length_hint = With_length_hint()  # $ arg1="with_length_hint" func=With_length_hint.__length_hint__
     operator.length_hint(with_length_hint)
 
 
@@ -68,5 +68,5 @@ class With_index:
 def test_index():
     import operator
 
-    with_index = With_index()  #$ arg1="with_index" func=With_index.__index__
+    with_index = With_index()  # $ arg1="with_index" func=With_index.__index__
     operator.index(with_index)
diff --git a/python/ql/test/library-tests/dataflow/coverage/argumentPassing.py b/python/ql/test/library-tests/dataflow/coverage/argumentPassing.py
index 5ece2a3aaa6..dc70cd2dc6c 100644
--- a/python/ql/test/library-tests/dataflow/coverage/argumentPassing.py
+++ b/python/ql/test/library-tests/dataflow/coverage/argumentPassing.py
@@ -53,9 +53,9 @@ def argument_passing(
     b,
     /,
     c,
-    d=arg4,  #$ arg4 func=argument_passing
+    d=arg4,  # $ arg4 func=argument_passing
     *,
-    e=arg5,  #$ arg5 func=argument_passing
+    e=arg5,  # $ arg5 func=argument_passing
     f,
     **g,
 ):
@@ -73,12 +73,12 @@ def argument_passing(
 
 @expects(7)
 def test_argument_passing1():
-    argument_passing(arg1, *(arg2, arg3, arg4), e=arg5, **{"f": arg6, "g": arg7})  #$ arg1 arg5 arg6 arg7 func=argument_passing MISSING: arg2 arg3 arg4
+    argument_passing(arg1, *(arg2, arg3, arg4), e=arg5, **{"f": arg6, "g": arg7})  # $ arg1 arg5 arg6 arg7 func=argument_passing MISSING: arg2 arg3 arg4
 
 
 @expects(7)
 def test_argument_passing2():
-    argument_passing(arg1, arg2, arg3, f=arg6)  #$ arg1 arg2 arg3 arg6
+    argument_passing(arg1, arg2, arg3, f=arg6)  # $ arg1 arg2 arg3 arg6
 
 
 def with_pos_only(a, /, b):
@@ -88,9 +88,9 @@ def with_pos_only(a, /, b):
 
 @expects(6)
 def test_pos_only():
-    with_pos_only(arg1, arg2)  #$ arg1 arg2
-    with_pos_only(arg1, b=arg2)  #$ arg1 arg2
-    with_pos_only(arg1, *(arg2,))  #$ arg1 MISSING: arg2
+    with_pos_only(arg1, arg2)  # $ arg1 arg2
+    with_pos_only(arg1, b=arg2)  # $ arg1 arg2
+    with_pos_only(arg1, *(arg2,))  # $ arg1 MISSING: arg2
 
 
 def with_multiple_kw_args(a, b, c):
@@ -101,13 +101,13 @@ def with_multiple_kw_args(a, b, c):
 
 @expects(12)
 def test_multiple_kw_args():
-    with_multiple_kw_args(b=arg2, c=arg3, a=arg1)  #$ arg1 arg2 arg3
-    with_multiple_kw_args(arg1, *(arg2,), arg3)  #$ arg1 MISSING: arg2 arg3
-    with_multiple_kw_args(arg1, **{"c": arg3}, b=arg2)  #$ arg1 arg2 arg3 func=with_multiple_kw_args
-    with_multiple_kw_args(**{"b": arg2}, **{"c": arg3}, **{"a": arg1})  #$ arg1 arg2 arg3 func=with_multiple_kw_args
+    with_multiple_kw_args(b=arg2, c=arg3, a=arg1)  # $ arg1 arg2 arg3
+    with_multiple_kw_args(arg1, *(arg2,), arg3)  # $ arg1 MISSING: arg2 arg3
+    with_multiple_kw_args(arg1, **{"c": arg3}, b=arg2)  # $ arg1 arg2 arg3 func=with_multiple_kw_args
+    with_multiple_kw_args(**{"b": arg2}, **{"c": arg3}, **{"a": arg1})  # $ arg1 arg2 arg3 func=with_multiple_kw_args
 
 
-def with_default_arguments(a=arg1, b=arg2, c=arg3):  #$ arg1 arg2 arg3 func=with_default_arguments
+def with_default_arguments(a=arg1, b=arg2, c=arg3):  # $ arg1 arg2 arg3 func=with_default_arguments
     SINK1(a)
     SINK2(b)
     SINK3(c)
@@ -116,9 +116,9 @@ def with_default_arguments(a=arg1, b=arg2, c=arg3):  #$ arg1 arg2 arg3 func=with
 @expects(12)
 def test_default_arguments():
     with_default_arguments()
-    with_default_arguments(arg1)  #$ arg1
-    with_default_arguments(b=arg2)  #$ arg2
-    with_default_arguments(**{"c": arg3})  #$ arg3 func=with_default_arguments
+    with_default_arguments(arg1)  # $ arg1
+    with_default_arguments(b=arg2)  # $ arg2
+    with_default_arguments(**{"c": arg3})  # $ arg3 func=with_default_arguments
 
 
 # All combinations
@@ -126,14 +126,14 @@ def test_pos_pos():
     def with_pos(a):
         SINK1(a)
 
-    with_pos(arg1)  #$ arg1 func=test_pos_pos.with_pos
+    with_pos(arg1)  # $ arg1 func=test_pos_pos.with_pos
 
 
 def test_pos_pos_only():
     def with_pos_only(a, /):
         SINK1(a)
 
-    with_pos_only(arg1)  #$ arg1 func=test_pos_pos_only.with_pos_only
+    with_pos_only(arg1)  # $ arg1 func=test_pos_pos_only.with_pos_only
 
 
 def test_pos_star():
@@ -141,35 +141,35 @@ def test_pos_star():
         if len(a) > 0:
             SINK1(a[0])
 
-    with_star(arg1)  #$ arg1 func=test_pos_star.with_star
+    with_star(arg1)  # $ arg1 func=test_pos_star.with_star
 
 
 def test_pos_kw():
     def with_kw(a=""):
         SINK1(a)
 
-    with_kw(arg1)  #$ arg1 func=test_pos_kw.with_kw
+    with_kw(arg1)  # $ arg1 func=test_pos_kw.with_kw
 
 
 def test_kw_pos():
     def with_pos(a):
         SINK1(a)
 
-    with_pos(a=arg1)  #$ arg1 func=test_kw_pos.with_pos
+    with_pos(a=arg1)  # $ arg1 func=test_kw_pos.with_pos
 
 
 def test_kw_kw():
     def with_kw(a=""):
         SINK1(a)
 
-    with_kw(a=arg1)  #$ arg1 func=test_kw_kw.with_kw
+    with_kw(a=arg1)  # $ arg1 func=test_kw_kw.with_kw
 
 
 def test_kw_doublestar():
     def with_doublestar(**kwargs):
         SINK1(kwargs["a"])
 
-    with_doublestar(a=arg1)  #$ arg1 func=test_kw_doublestar.with_doublestar
+    with_doublestar(a=arg1)  # $ arg1 func=test_kw_doublestar.with_doublestar
 
 
 def only_kwargs(**kwargs):
diff --git a/python/ql/test/library-tests/dataflow/coverage/classes.py b/python/ql/test/library-tests/dataflow/coverage/classes.py
index 74127d34d20..2bd1b8f4856 100644
--- a/python/ql/test/library-tests/dataflow/coverage/classes.py
+++ b/python/ql/test/library-tests/dataflow/coverage/classes.py
@@ -38,7 +38,7 @@ def OK():
 
 
 # object.__new__(cls[, ...])
-class With_new:  #$ MISSING: arg1="With_new" func=With_new.__new__
+class With_new:  # $ MISSING: arg1="With_new" func=With_new.__new__
     def __new__(cls):
         SINK1(cls)
         OK()  # Call not found
@@ -57,7 +57,7 @@ class With_init:
 
 
 def test_init():
-    with_init = With_init()  #$ MISSING: arg1="with_init" func=With_init.__init__
+    with_init = With_init()  # $ MISSING: arg1="with_init" func=With_init.__init__
 
 
 # object.__del__(self)
@@ -68,7 +68,7 @@ class With_del:
 
 
 def test_del():
-    with_del = With_del()  #$ MISSING: arg1="with_del" func=With_del.__del__
+    with_del = With_del()  # $ MISSING: arg1="with_del" func=With_del.__del__
     del with_del
 
 
@@ -81,7 +81,7 @@ class With_repr:
 
 
 def test_repr():
-    with_repr = With_repr()  #$ MISSING: arg1="with_repr" func=With_repr.__repr__
+    with_repr = With_repr()  # $ MISSING: arg1="with_repr" func=With_repr.__repr__
     repr(with_repr)
 
 
@@ -94,7 +94,7 @@ class With_str:
 
 
 def test_str():
-    with_str = With_str()  #$ MISSING: arg1="with_str" func=With_str.__str__
+    with_str = With_str()  # $ MISSING: arg1="with_str" func=With_str.__str__
     str(with_str)
 
 
@@ -107,7 +107,7 @@ class With_bytes:
 
 
 def test_bytes():
-    with_bytes = With_bytes()  #$ MISSING: arg1="with_bytes" func=With_bytes.__bytes__
+    with_bytes = With_bytes()  # $ MISSING: arg1="with_bytes" func=With_bytes.__bytes__
     bytes(with_bytes)
 
 
@@ -121,18 +121,18 @@ class With_format:
 
 
 def test_format():
-    with_format = With_format()  #$ MISSING: arg1="with_format" func=With_format.__format__
-    arg2 = ""  #$ MISSING: arg2 func=With_format.__format__
+    with_format = With_format()  # $ MISSING: arg1="with_format" func=With_format.__format__
+    arg2 = ""  # $ MISSING: arg2 func=With_format.__format__
     format(with_format, arg2)
 
 
 def test_format_str():
-    with_format = With_format()  #$ MISSING: arg1="with_format" func=With_format.__format__
+    with_format = With_format()  # $ MISSING: arg1="with_format" func=With_format.__format__
     "{0}".format(with_format)
 
 
 def test_format_fstr():
-    with_format = With_format()  #$ MISSING: arg1="with_format" func=With_format.__format__
+    with_format = With_format()  # $ MISSING: arg1="with_format" func=With_format.__format__
     f"{with_format}"
 
 
@@ -146,8 +146,8 @@ class With_lt:
 
 
 def test_lt():
-    with_lt = With_lt()  #$ MISSING: arg1="with_lt" func=With_lt.__lt__
-    arg2 = with_lt  #$ MISSING: arg2 func=With_lt.__lt__
+    with_lt = With_lt()  # $ MISSING: arg1="with_lt" func=With_lt.__lt__
+    arg2 = with_lt  # $ MISSING: arg2 func=With_lt.__lt__
     with_lt < arg2
 
 
@@ -161,8 +161,8 @@ class With_le:
 
 
 def test_le():
-    with_le = With_le()  #$ MISSING: arg1="with_le" func=With_le.__le__
-    arg2 = with_le  #$ MISSING: arg2 func=With_le.__le__
+    with_le = With_le()  # $ MISSING: arg1="with_le" func=With_le.__le__
+    arg2 = with_le  # $ MISSING: arg2 func=With_le.__le__
     with_le <= arg2
 
 
@@ -176,8 +176,8 @@ class With_eq:
 
 
 def test_eq():
-    with_eq = With_eq()  #$ MISSING: arg1="with_eq" func=With_eq.__eq__
-    with_eq == with_eq  #$ MISSING: arg2="with_eq" func=With_eq.__eq__
+    with_eq = With_eq()  # $ MISSING: arg1="with_eq" func=With_eq.__eq__
+    with_eq == with_eq  # $ MISSING: arg2="with_eq" func=With_eq.__eq__
 
 
 # object.__ne__(self, other)
@@ -190,8 +190,8 @@ class With_ne:
 
 
 def test_ne():
-    with_ne = With_ne()  #$ MISSING: arg1="with_ne" func=With_ne.__ne__
-    with_ne != with_ne  #$ MISSING: arg2="with_ne" func=With_ne.__ne__
+    with_ne = With_ne()  # $ MISSING: arg1="with_ne" func=With_ne.__ne__
+    with_ne != with_ne  # $ MISSING: arg2="with_ne" func=With_ne.__ne__
 
 
 # object.__gt__(self, other)
@@ -204,8 +204,8 @@ class With_gt:
 
 
 def test_gt():
-    with_gt = With_gt()  #$ MISSING: arg1="with_gt" func=With_gt.__gt__
-    arg2 = with_gt  #$ MISSING: arg2 func=With_gt.__gt__
+    with_gt = With_gt()  # $ MISSING: arg1="with_gt" func=With_gt.__gt__
+    arg2 = with_gt  # $ MISSING: arg2 func=With_gt.__gt__
     with_gt > arg2
 
 
@@ -219,8 +219,8 @@ class With_ge:
 
 
 def test_ge():
-    with_ge = With_ge()  #$ MISSING: arg1="with_ge" func=With_ge.__ge__
-    arg2 = with_ge  #$ MISSING: arg2 func=With_ge.__ge__
+    with_ge = With_ge()  # $ MISSING: arg1="with_ge" func=With_ge.__ge__
+    arg2 = with_ge  # $ MISSING: arg2 func=With_ge.__ge__
     with_ge >= arg2
 
 
@@ -233,22 +233,22 @@ class With_hash:
 
 
 def test_hash():
-    with_hash = With_hash()  #$ MISSING: arg1="with_hash" func=With_hash.__hash__
+    with_hash = With_hash()  # $ MISSING: arg1="with_hash" func=With_hash.__hash__
     hash(with_hash)
 
 
 def test_hash_set():
-    with_hash = With_hash()  #$ MISSING: arg1="with_hash" func=With_hash.__hash__
+    with_hash = With_hash()  # $ MISSING: arg1="with_hash" func=With_hash.__hash__
     len(set([with_hash]))
 
 
 def test_hash_frozenset():
-    with_hash = With_hash()  #$ MISSING: arg1="with_hash" func=With_hash.__hash__
+    with_hash = With_hash()  # $ MISSING: arg1="with_hash" func=With_hash.__hash__
     len(frozenset([with_hash]))
 
 
 def test_hash_dict():
-    with_hash = With_hash()  #$ MISSING: arg1="with_hash" func=With_hash.__hash__
+    with_hash = With_hash()  # $ MISSING: arg1="with_hash" func=With_hash.__hash__
     len(dict({with_hash: 0}))
 
 
@@ -261,12 +261,12 @@ class With_bool:
 
 
 def test_bool():
-    with_bool = With_bool()  #$ MISSING: arg1="with_bool" func=With_bool.__bool__
+    with_bool = With_bool()  # $ MISSING: arg1="with_bool" func=With_bool.__bool__
     bool(with_bool)
 
 
 def test_bool_if():
-    with_bool = With_bool()  #$ MISSING: arg1="with_bool" func=With_bool.__bool__
+    with_bool = With_bool()  # $ MISSING: arg1="with_bool" func=With_bool.__bool__
     if with_bool:
         pass
 
@@ -282,8 +282,8 @@ class With_getattr:
 
 
 def test_getattr():
-    with_getattr = With_getattr()  #$ MISSING: arg1="with_getattr" func=With_getattr.__getattr__
-    with_getattr.arg2  #$ MISSING: arg2="with_getattr.arg2" func=With_getattr.__getattr__
+    with_getattr = With_getattr()  # $ MISSING: arg1="with_getattr" func=With_getattr.__getattr__
+    with_getattr.arg2  # $ MISSING: arg2="with_getattr.arg2" func=With_getattr.__getattr__
 
 
 # object.__getattribute__(self, name)
@@ -296,8 +296,8 @@ class With_getattribute:
 
 
 def test_getattribute():
-    with_getattribute = With_getattribute()  #$ MISSING: arg1="with_getattribute" func=With_getattribute.__getattribute__
-    with_getattribute.arg2  #$ MISSING: arg2 func=With_getattribute.__getattribute__
+    with_getattribute = With_getattribute()  # $ MISSING: arg1="with_getattribute" func=With_getattribute.__getattribute__
+    with_getattribute.arg2  # $ MISSING: arg2 func=With_getattribute.__getattribute__
 
 
 # object.__setattr__(self, name, value)
@@ -310,9 +310,9 @@ class With_setattr:
 
 
 def test_setattr():
-    with_setattr = With_setattr()  #$ MISSING: arg1="with_setattr" func=With_setattr.__setattr__
-    arg3 = ""  #$ MISSING: arg3 func=With_setattr.__setattr__
-    with_setattr.arg2 = arg3  #$ MISSING: arg2 func=With_setattr.__setattr__
+    with_setattr = With_setattr()  # $ MISSING: arg1="with_setattr" func=With_setattr.__setattr__
+    arg3 = ""  # $ MISSING: arg3 func=With_setattr.__setattr__
+    with_setattr.arg2 = arg3  # $ MISSING: arg2 func=With_setattr.__setattr__
 
 
 # object.__delattr__(self, name)
@@ -324,8 +324,8 @@ class With_delattr:
 
 
 def test_delattr():
-    with_delattr = With_delattr()  #$ MISSING: arg1="with_delattr" func=With_delattr.__delattr__
-    del with_delattr.arg2  #$ MISSING: arg2 func=With_delattr.__delattr__
+    with_delattr = With_delattr()  # $ MISSING: arg1="with_delattr" func=With_delattr.__delattr__
+    del with_delattr.arg2  # $ MISSING: arg2 func=With_delattr.__delattr__
 
 
 # object.__dir__(self)
@@ -337,7 +337,7 @@ class With_dir:
 
 
 def test_dir():
-    with_dir = With_dir()  #$ MISSING: arg1="with_dir" func=With_dir.__dir__
+    with_dir = With_dir()  # $ MISSING: arg1="with_dir" func=With_dir.__dir__
     dir(with_dir)
 
 
@@ -360,9 +360,9 @@ def test_get():
     class arg3:
         pass
 
-    with_get = With_get()  #$ MISSING: arg1="with_get" func=With_get.__get__
+    with_get = With_get()  # $ MISSING: arg1="with_get" func=With_get.__get__
     arg3.attr = with_get
-    arg2 = arg3()  #$ MISSING: arg2 func=With_get.__get__
+    arg2 = arg3()  # $ MISSING: arg2 func=With_get.__get__
     arg2.attr
 
 
@@ -376,10 +376,10 @@ class With_set:
 
 
 def test_set():
-    with_set = With_set()  #$ MISSING: arg1="with_set" func=With_set.__set__
+    with_set = With_set()  # $ MISSING: arg1="with_set" func=With_set.__set__
     Owner.attr = with_set
-    arg2 = Owner()  #$ MISSING: arg2 func=With_set.__set__
-    arg3 = ""  #$ MISSING: arg3 func=With_set.__set__
+    arg2 = Owner()  # $ MISSING: arg2 func=With_set.__set__
+    arg3 = ""  # $ MISSING: arg3 func=With_set.__set__
     arg2.attr = arg3
 
 
@@ -392,9 +392,9 @@ class With_delete:
 
 
 def test_delete():
-    with_delete = With_delete()  #$ MISSING: arg1="with_delete" func=With_delete.__delete__
+    with_delete = With_delete()  # $ MISSING: arg1="with_delete" func=With_delete.__delete__
     Owner.attr = with_delete
-    arg2 = Owner()  #$ MISSING: arg2 func=With_delete.__delete__
+    arg2 = Owner()  # $ MISSING: arg2 func=With_delete.__delete__
     del arg2.attr
 
 
@@ -408,8 +408,8 @@ class With_set_name:
 
 
 def test_set_name():
-    with_set_name = With_set_name()  #$ MISSING: arg1="with_set_name" func=With_set_name.__set_name__
-    type("arg2", (object,), dict(arg3=with_set_name))  #$ MISSING: arg2 arg3 func=With_set_name.__set_name__
+    with_set_name = With_set_name()  # $ MISSING: arg1="with_set_name" func=With_set_name.__set_name__
+    type("arg2", (object,), dict(arg3=with_set_name))  # $ MISSING: arg2 arg3 func=With_set_name.__set_name__
 
 
 # 3.3.2.4. __slots__   // We are not testing the  suppression of __weakref__ and __dict__ here
@@ -421,7 +421,7 @@ def test_set_name():
 # classmethod object.__init_subclass__(cls)
 class With_init_subclass:
     def __init_subclass__(cls):
-        SINK1(cls)  #$ MISSING: arg1="Tuple[0], l:+5 -> cls"
+        SINK1(cls)  # $ MISSING: arg1="Tuple[0], l:+5 -> cls"
         OK()  # Call not found
 
 
@@ -441,7 +441,7 @@ class With_prepare(type):
     def __prepare__(name, bases, **kwds):
         SINK3(kwds)  # Flow not tested
         SINK2(bases)  # Flow not tested
-        SINK1(name)  #$ MISSING: arg1="arg1, l:+6 -> name"
+        SINK1(name)  # $ MISSING: arg1="arg1, l:+6 -> name"
         OK()  # Call not found
         return kwds
 
@@ -462,8 +462,8 @@ class With_instancecheck:
 
 
 def test_instancecheck():
-    with_instancecheck = With_instancecheck()  #$ MISSING: arg1="with_instancecheck" func=With_instancecheck.__instancecheck__
-    arg2 = ""  #$ MISSING: arg2 func=With_instancecheck.__instancecheck__
+    with_instancecheck = With_instancecheck()  # $ MISSING: arg1="with_instancecheck" func=With_instancecheck.__instancecheck__
+    arg2 = ""  # $ MISSING: arg2 func=With_instancecheck.__instancecheck__
     isinstance(arg2, with_instancecheck)
 
 
@@ -477,14 +477,14 @@ class With_subclasscheck:
 
 
 def test_subclasscheck():
-    with_subclasscheck = With_subclasscheck()  #$ MISSING: arg1="with_subclasscheck" func=With_subclasscheck.__subclasscheck__
-    arg2 = object  #$ MISSING: arg2 func=With_subclasscheck.__subclasscheck__
+    with_subclasscheck = With_subclasscheck()  # $ MISSING: arg1="with_subclasscheck" func=With_subclasscheck.__subclasscheck__
+    arg2 = object  # $ MISSING: arg2 func=With_subclasscheck.__subclasscheck__
     issubclass(arg2, with_subclasscheck)
 
 
 # 3.3.5. Emulating generic types
 # classmethod object.__class_getitem__(cls, key)
-class With_class_getitem:  #$ MISSING: arg1="With_class_getitem" func=With_class_getitem.__class_getitem__
+class With_class_getitem:  # $ MISSING: arg1="With_class_getitem" func=With_class_getitem.__class_getitem__
     def __class_getitem__(cls, key):
         SINK2(key)
         SINK1(cls)
@@ -493,7 +493,7 @@ class With_class_getitem:  #$ MISSING: arg1="With_class_getitem" func=With_class
 
 
 def test_class_getitem():
-    arg2 = int  #$ MISSING: arg2 func=With_class_getitem.__class_getitem__
+    arg2 = int  # $ MISSING: arg2 func=With_class_getitem.__class_getitem__
     with_class_getitem = With_class_getitem[arg2]()
 
 
@@ -506,7 +506,7 @@ class With_call:
 
 
 def test_call():
-    with_call = With_call()  #$ arg1="with_call" func=With_call.__call__
+    with_call = With_call()  # $ arg1="with_call" func=With_call.__call__
     with_call()
 
 
@@ -520,17 +520,17 @@ class With_len:
 
 
 def test_len():
-    with_len = With_len()  #$ MISSING: arg1="with_len" func=With_len.__len__
+    with_len = With_len()  # $ MISSING: arg1="with_len" func=With_len.__len__
     len(with_len)
 
 
 def test_len_bool():
-    with_len = With_len()  #$ MISSING: arg1="with_len" func=With_len.__len__
+    with_len = With_len()  # $ MISSING: arg1="with_len" func=With_len.__len__
     bool(with_len)
 
 
 def test_len_if():
-    with_len = With_len()  #$ MISSING: arg1="with_len" func=With_len.__len__
+    with_len = With_len()  # $ MISSING: arg1="with_len" func=With_len.__len__
     if with_len:
         pass
 
@@ -545,9 +545,9 @@ class With_getitem:
 
 
 def test_getitem():
-    with_getitem = With_getitem() #$ MISSING: arg1="with_getitem" func=With_getitem.__getitem__
+    with_getitem = With_getitem() # $ MISSING: arg1="with_getitem" func=With_getitem.__getitem__
     arg2 = 0
-    with_getitem[arg2] #$ MISSING: arg2 func=With_getitem.__getitem__
+    with_getitem[arg2] # $ MISSING: arg2 func=With_getitem.__getitem__
 
 
 # object.__setitem__(self, key, value)
@@ -560,10 +560,10 @@ class With_setitem:
 
 
 def test_setitem():
-    with_setitem = With_setitem()  #$ MISSING: arg1="with_setitem" func=With_setitem.__setitem__
+    with_setitem = With_setitem()  # $ MISSING: arg1="with_setitem" func=With_setitem.__setitem__
     arg2 = 0
     arg3 = ""
-    with_setitem[arg2] = arg3  #$ MISSING: arg2 arg3 func=With_setitem.__setitem__
+    with_setitem[arg2] = arg3  # $ MISSING: arg2 arg3 func=With_setitem.__setitem__
 
 
 # object.__delitem__(self, key)
@@ -575,9 +575,9 @@ class With_delitem:
 
 
 def test_delitem():
-    with_delitem = With_delitem()  #$ MISSING: arg1="with_delitem" func=With_delitem.__delitem__
+    with_delitem = With_delitem()  # $ MISSING: arg1="with_delitem" func=With_delitem.__delitem__
     arg2 = 0
-    del with_delitem[arg2]  #$ MISSING: arg2 func=With_delitem.__delitem__
+    del with_delitem[arg2]  # $ MISSING: arg2 func=With_delitem.__delitem__
 
 
 # object.__missing__(self, key)
@@ -590,8 +590,8 @@ class With_missing(dict):
 
 
 def test_missing():
-    with_missing = With_missing()  #$ MISSING: arg1="with_missing" func=With_missing.__missing__
-    arg2 = 0  #$ MISSING: arg2 func=With_missing.__missing__
+    with_missing = With_missing()  # $ MISSING: arg1="with_missing" func=With_missing.__missing__
+    arg2 = 0  # $ MISSING: arg2 func=With_missing.__missing__
     with_missing[arg2]
 
 
@@ -604,7 +604,7 @@ class With_iter:
 
 
 def test_iter():
-    with_iter = With_iter()  #$ MISSING: arg1="with_iter" func=With_iter.__iter__
+    with_iter = With_iter()  # $ MISSING: arg1="with_iter" func=With_iter.__iter__
     [x for x in with_iter]
 
 
@@ -617,7 +617,7 @@ class With_reversed:
 
 
 def test_reversed():
-    with_reversed = With_reversed()  #$ MISSING: arg1="with_reversed" func=With_reversed.__reversed__
+    with_reversed = With_reversed()  # $ MISSING: arg1="with_reversed" func=With_reversed.__reversed__
     reversed(with_reversed)
 
 
@@ -631,8 +631,8 @@ class With_contains:
 
 
 def test_contains():
-    with_contains = With_contains()  #$ MISSING: arg1="with_contains" func=With_contains.__contains__
-    arg2 = 0  #$ MISSING: arg2 func=With_contains.__contains__
+    with_contains = With_contains()  # $ MISSING: arg1="with_contains" func=With_contains.__contains__
+    arg2 = 0  # $ MISSING: arg2 func=With_contains.__contains__
     arg2 in with_contains
 
 
@@ -647,9 +647,9 @@ class With_add:
 
 
 def test_add():
-    with_add = With_add()  #$ MISSING: arg1="with_add" func=With_add.__add__
+    with_add = With_add()  # $ MISSING: arg1="with_add" func=With_add.__add__
     arg2 = with_add
-    with_add + arg2  #$ MISSING: arg2 func=With_add.__add__
+    with_add + arg2  # $ MISSING: arg2 func=With_add.__add__
 
 
 # object.__sub__(self, other)
@@ -662,9 +662,9 @@ class With_sub:
 
 
 def test_sub():
-    with_sub = With_sub()  #$ MISSING: arg1="with_sub" func=With_sub.__sub__
+    with_sub = With_sub()  # $ MISSING: arg1="with_sub" func=With_sub.__sub__
     arg2 = with_sub
-    with_sub - arg2  #$ MISSING: arg2 func=With_sub.__sub__
+    with_sub - arg2  # $ MISSING: arg2 func=With_sub.__sub__
 
 
 # object.__mul__(self, other)
@@ -677,9 +677,9 @@ class With_mul:
 
 
 def test_mul():
-    with_mul = With_mul()  #$ MISSING: arg1="with_mul" func=With_mul.__mul__
+    with_mul = With_mul()  # $ MISSING: arg1="with_mul" func=With_mul.__mul__
     arg2 = with_mul
-    with_mul * arg2  #$ MISSING: arg2 func=With_mul.__mul__
+    with_mul * arg2  # $ MISSING: arg2 func=With_mul.__mul__
 
 
 # object.__matmul__(self, other)
@@ -692,9 +692,9 @@ class With_matmul:
 
 
 def test_matmul():
-    with_matmul = With_matmul()  #$ MISSING: arg1="with_matmul" func=With_matmul.__matmul__
+    with_matmul = With_matmul()  # $ MISSING: arg1="with_matmul" func=With_matmul.__matmul__
     arg2 = with_matmul
-    with_matmul @ arg2  #$ MISSING: arg2 func=With_matmul.__matmul__
+    with_matmul @ arg2  # $ MISSING: arg2 func=With_matmul.__matmul__
 
 
 # object.__truediv__(self, other)
@@ -707,9 +707,9 @@ class With_truediv:
 
 
 def test_truediv():
-    with_truediv = With_truediv()  #$ MISSING: arg1="with_truediv" func=With_truediv.__truediv__
+    with_truediv = With_truediv()  # $ MISSING: arg1="with_truediv" func=With_truediv.__truediv__
     arg2 = with_truediv
-    with_truediv / arg2  #$ MISSING: arg2 func=With_truediv.__truediv__
+    with_truediv / arg2  # $ MISSING: arg2 func=With_truediv.__truediv__
 
 
 # object.__floordiv__(self, other)
@@ -722,9 +722,9 @@ class With_floordiv:
 
 
 def test_floordiv():
-    with_floordiv = With_floordiv()  #$ MISSING: arg1="with_floordiv" func=With_floordiv.__floordiv__
+    with_floordiv = With_floordiv()  # $ MISSING: arg1="with_floordiv" func=With_floordiv.__floordiv__
     arg2 = with_floordiv
-    with_floordiv // arg2  #$ MISSING: arg2 func=With_floordiv.__floordiv__
+    with_floordiv // arg2  # $ MISSING: arg2 func=With_floordiv.__floordiv__
 
 
 # object.__mod__(self, other)
@@ -737,9 +737,9 @@ class With_mod:
 
 
 def test_mod():
-    with_mod = With_mod()  #$ MISSING: arg1="with_mod" func=With_mod.__mod__
+    with_mod = With_mod()  # $ MISSING: arg1="with_mod" func=With_mod.__mod__
     arg2 = with_mod
-    with_mod % arg2  #$ MISSING: arg2 func=With_mod.__mod__
+    with_mod % arg2  # $ MISSING: arg2 func=With_mod.__mod__
 
 
 # object.__divmod__(self, other)
@@ -752,8 +752,8 @@ class With_divmod:
 
 
 def test_divmod():
-    with_divmod = With_divmod()  #$ MISSING: arg1="with_divmod" func=With_divmod.__divmod__
-    arg2 = With_divmod  #$ MISSING: arg2 func=With_divmod.__divmod__
+    with_divmod = With_divmod()  # $ MISSING: arg1="with_divmod" func=With_divmod.__divmod__
+    arg2 = With_divmod  # $ MISSING: arg2 func=With_divmod.__divmod__
     divmod(with_divmod, arg2)
 
 
@@ -767,15 +767,15 @@ class With_pow:
 
 
 def test_pow():
-    with_pow = With_pow()  #$ MISSING: arg1="with_pow" func=With_pow.__pow__
+    with_pow = With_pow()  # $ MISSING: arg1="with_pow" func=With_pow.__pow__
     arg2 = with_pow
-    pow(with_pow, arg2)  #$ MISSING: arg2 func=With_pow.__pow__
+    pow(with_pow, arg2)  # $ MISSING: arg2 func=With_pow.__pow__
 
 
 def test_pow_op():
-    with_pow = With_pow()  #$ MISSING: arg1="with_pow" func=With_pow.__pow__
+    with_pow = With_pow()  # $ MISSING: arg1="with_pow" func=With_pow.__pow__
     arg2 = with_pow
-    with_pow ** arg2  #$ MISSING: arg2 func=With_pow.__pow__
+    with_pow ** arg2  # $ MISSING: arg2 func=With_pow.__pow__
 
 
 # object.__lshift__(self, other)
@@ -788,9 +788,9 @@ class With_lshift:
 
 
 def test_lshift():
-    with_lshift = With_lshift()  #$ MISSING: arg1="with_lshift" func=With_lshift.__lshift__
+    with_lshift = With_lshift()  # $ MISSING: arg1="with_lshift" func=With_lshift.__lshift__
     arg2 = with_lshift
-    with_lshift << arg2  #$ MISSING: arg2 func=With_lshift.__lshift__
+    with_lshift << arg2  # $ MISSING: arg2 func=With_lshift.__lshift__
 
 
 # object.__rshift__(self, other)
@@ -803,9 +803,9 @@ class With_rshift:
 
 
 def test_rshift():
-    with_rshift = With_rshift()  #$ MISSING: arg1="with_rshift" func=With_rshift.__rshift__
+    with_rshift = With_rshift()  # $ MISSING: arg1="with_rshift" func=With_rshift.__rshift__
     arg2 = with_rshift
-    with_rshift >> arg2  #$ MISSING: arg2 func=With_rshift.__rshift__
+    with_rshift >> arg2  # $ MISSING: arg2 func=With_rshift.__rshift__
 
 
 # object.__and__(self, other)
@@ -818,9 +818,9 @@ class With_and:
 
 
 def test_and():
-    with_and = With_and()  #$ MISSING: arg1="with_and" func=With_and.__and__
+    with_and = With_and()  # $ MISSING: arg1="with_and" func=With_and.__and__
     arg2 = with_and
-    with_and & arg2  #$ MISSING: arg2 func=With_and.__and__
+    with_and & arg2  # $ MISSING: arg2 func=With_and.__and__
 
 
 # object.__xor__(self, other)
@@ -833,9 +833,9 @@ class With_xor:
 
 
 def test_xor():
-    with_xor = With_xor()  #$ MISSING: arg1="with_xor" func=With_xor.__xor__
+    with_xor = With_xor()  # $ MISSING: arg1="with_xor" func=With_xor.__xor__
     arg2 = with_xor
-    with_xor ^ arg2  #$ MISSING: arg2 func=With_xor.__xor__
+    with_xor ^ arg2  # $ MISSING: arg2 func=With_xor.__xor__
 
 
 # object.__or__(self, other)
@@ -848,23 +848,23 @@ class With_or:
 
 
 def test_or():
-    with_or = With_or()  #$ MISSING: arg1="with_or" func=With_or.__or__
+    with_or = With_or()  # $ MISSING: arg1="with_or" func=With_or.__or__
     arg2 = with_or
-    with_or | arg2  #$ MISSING: arg2 func=With_or.__or__
+    with_or | arg2  # $ MISSING: arg2 func=With_or.__or__
 
 
 # object.__radd__(self, other)
 class With_radd:
     def __radd__(self, other):
-        SINK2(other)  #$ MISSING: arg2="arg2, l:+8 -> other"
+        SINK2(other)  # $ MISSING: arg2="arg2, l:+8 -> other"
         SINK1(self)
         OK()  # Call not found
         return self
 
 
 def test_radd():
-    with_radd = With_radd()  #$ MISSING: arg1="with_radd" func=With_radd.__radd__
-    arg2 = ""  #$ MISSING: arg2 func=With_radd.__radd__
+    with_radd = With_radd()  # $ MISSING: arg1="with_radd" func=With_radd.__radd__
+    arg2 = ""  # $ MISSING: arg2 func=With_radd.__radd__
     arg2 + with_radd
 
 
@@ -878,8 +878,8 @@ class With_rsub:
 
 
 def test_rsub():
-    with_rsub = With_rsub()  #$ MISSING: arg1="with_rsub" func=With_rsub.__rsub__
-    arg2 = ""  #$ MISSING: arg2 func=With_rsub.__rsub__
+    with_rsub = With_rsub()  # $ MISSING: arg1="with_rsub" func=With_rsub.__rsub__
+    arg2 = ""  # $ MISSING: arg2 func=With_rsub.__rsub__
     arg2 - with_rsub
 
 
@@ -893,8 +893,8 @@ class With_rmul:
 
 
 def test_rmul():
-    with_rmul = With_rmul()  #$ MISSING: arg1="with_rmul" func=With_rmul.__rmul__
-    arg2 = ""  #$ MISSING: arg2 func=With_rmul.__rmul__
+    with_rmul = With_rmul()  # $ MISSING: arg1="with_rmul" func=With_rmul.__rmul__
+    arg2 = ""  # $ MISSING: arg2 func=With_rmul.__rmul__
     arg2 * with_rmul
 
 
@@ -908,8 +908,8 @@ class With_rmatmul:
 
 
 def test_rmatmul():
-    with_rmatmul = With_rmatmul()  #$ MISSING: arg1="with_rmatmul" func=With_rmatmul.__rmatmul__
-    arg2 = ""  #$ MISSING: arg2 func=With_rmatmul.__rmatmul__
+    with_rmatmul = With_rmatmul()  # $ MISSING: arg1="with_rmatmul" func=With_rmatmul.__rmatmul__
+    arg2 = ""  # $ MISSING: arg2 func=With_rmatmul.__rmatmul__
     arg2 @ with_rmatmul
 
 
@@ -923,8 +923,8 @@ class With_rtruediv:
 
 
 def test_rtruediv():
-    with_rtruediv = With_rtruediv()  #$ MISSING: arg1="with_rtruediv" func=With_rtruediv.__rtruediv__
-    arg2 = ""  #$ MISSING: arg2 func=With_rtruediv.__rtruediv__
+    with_rtruediv = With_rtruediv()  # $ MISSING: arg1="with_rtruediv" func=With_rtruediv.__rtruediv__
+    arg2 = ""  # $ MISSING: arg2 func=With_rtruediv.__rtruediv__
     arg2 / with_rtruediv
 
 
@@ -938,8 +938,8 @@ class With_rfloordiv:
 
 
 def test_rfloordiv():
-    with_rfloordiv = With_rfloordiv()  #$ MISSING: arg1="with_rfloordiv" func=With_rfloordiv.__rfloordiv__
-    arg2 = ""  #$ MISSING: arg2 func=With_rfloordiv.__rfloordiv__
+    with_rfloordiv = With_rfloordiv()  # $ MISSING: arg1="with_rfloordiv" func=With_rfloordiv.__rfloordiv__
+    arg2 = ""  # $ MISSING: arg2 func=With_rfloordiv.__rfloordiv__
     arg2 // with_rfloordiv
 
 
@@ -953,8 +953,8 @@ class With_rmod:
 
 
 def test_rmod():
-    with_rmod = With_rmod()  #$ MISSING: arg1="with_rmod" func=With_rmod.__rmod__
-    arg2 = {}  #$ MISSING: arg2 func=With_rmod.__rmod__
+    with_rmod = With_rmod()  # $ MISSING: arg1="with_rmod" func=With_rmod.__rmod__
+    arg2 = {}  # $ MISSING: arg2 func=With_rmod.__rmod__
     arg2 % with_rmod
 
 
@@ -968,8 +968,8 @@ class With_rdivmod:
 
 
 def test_rdivmod():
-    with_rdivmod = With_rdivmod()  #$ MISSING: arg1="with_rdivmod" func=With_rdivmod.__rdivmod__
-    arg2 = ""  #$ MISSING: arg2 func=With_rdivmod.__rdivmod__
+    with_rdivmod = With_rdivmod()  # $ MISSING: arg1="with_rdivmod" func=With_rdivmod.__rdivmod__
+    arg2 = ""  # $ MISSING: arg2 func=With_rdivmod.__rdivmod__
     divmod(arg2, with_rdivmod)
 
 
@@ -983,14 +983,14 @@ class With_rpow:
 
 
 def test_rpow():
-    with_rpow = With_rpow()  #$ MISSING: arg1="with_rpow" func=With_rpow.__rpow__
-    arg2 = ""  #$ MISSING: arg2 func=With_rpow.__rpow__
+    with_rpow = With_rpow()  # $ MISSING: arg1="with_rpow" func=With_rpow.__rpow__
+    arg2 = ""  # $ MISSING: arg2 func=With_rpow.__rpow__
     pow(arg2, with_rpow)
 
 
 def test_rpow_op():
-    with_rpow = With_rpow()  #$ MISSING: arg1="with_rpow" func=With_rpow.__rpow__
-    arg2 = ""  #$ MISSING: arg2 func=With_rpow.__rpow__
+    with_rpow = With_rpow()  # $ MISSING: arg1="with_rpow" func=With_rpow.__rpow__
+    arg2 = ""  # $ MISSING: arg2 func=With_rpow.__rpow__
     arg2 ** with_rpow
 
 
@@ -1004,8 +1004,8 @@ class With_rlshift:
 
 
 def test_rlshift():
-    with_rlshift = With_rlshift()  #$ MISSING: arg1="with_rlshift" func=With_rlshift.__rlshift__
-    arg2 = ""  #$ MISSING: arg2 func=With_rlshift.__rlshift__
+    with_rlshift = With_rlshift()  # $ MISSING: arg1="with_rlshift" func=With_rlshift.__rlshift__
+    arg2 = ""  # $ MISSING: arg2 func=With_rlshift.__rlshift__
     arg2 << with_rlshift
 
 
@@ -1019,8 +1019,8 @@ class With_rrshift:
 
 
 def test_rrshift():
-    with_rrshift = With_rrshift()  #$ MISSING: arg1="with_rrshift" func=With_rrshift.__rrshift__
-    arg2 = ""  #$ MISSING: arg2 func=With_rrshift.__rrshift__
+    with_rrshift = With_rrshift()  # $ MISSING: arg1="with_rrshift" func=With_rrshift.__rrshift__
+    arg2 = ""  # $ MISSING: arg2 func=With_rrshift.__rrshift__
     arg2 >> with_rrshift
 
 
@@ -1034,8 +1034,8 @@ class With_rand:
 
 
 def test_rand():
-    with_rand = With_rand()  #$ MISSING: arg1="with_rand" func=With_rand.__rand__
-    arg2 = ""  #$ MISSING: arg2 func=With_rand.__rand__
+    with_rand = With_rand()  # $ MISSING: arg1="with_rand" func=With_rand.__rand__
+    arg2 = ""  # $ MISSING: arg2 func=With_rand.__rand__
     arg2 & with_rand
 
 
@@ -1049,8 +1049,8 @@ class With_rxor:
 
 
 def test_rxor():
-    with_rxor = With_rxor()  #$ MISSING: arg1="with_rxor" func=With_rxor.__rxor__
-    arg2 = ""  #$ MISSING: arg2 func=With_rxor.__rxor__
+    with_rxor = With_rxor()  # $ MISSING: arg1="with_rxor" func=With_rxor.__rxor__
+    arg2 = ""  # $ MISSING: arg2 func=With_rxor.__rxor__
     arg2 ^ with_rxor
 
 
@@ -1064,8 +1064,8 @@ class With_ror:
 
 
 def test_ror():
-    with_ror = With_ror()  #$ MISSING: arg1="with_ror" func=With_ror.__ror__
-    arg2 = ""  #$ MISSING: arg2 func=With_ror.__ror__
+    with_ror = With_ror()  # $ MISSING: arg1="with_ror" func=With_ror.__ror__
+    arg2 = ""  # $ MISSING: arg2 func=With_ror.__ror__
     arg2 | with_ror
 
 
@@ -1079,8 +1079,8 @@ class With_iadd:
 
 
 def test_iadd():
-    with_iadd = With_iadd()  #$ MISSING: arg1="with_iadd" func=With_iadd.__iadd__
-    arg2 = with_iadd  #$ MISSING: arg2 func=With_iadd.__iadd__
+    with_iadd = With_iadd()  # $ MISSING: arg1="with_iadd" func=With_iadd.__iadd__
+    arg2 = with_iadd  # $ MISSING: arg2 func=With_iadd.__iadd__
     with_iadd += arg2
 
 
@@ -1094,8 +1094,8 @@ class With_isub:
 
 
 def test_isub():
-    with_isub = With_isub()  #$ MISSING: arg1="with_isub" func=With_isub.__isub__
-    arg2 = with_isub  #$ MISSING: arg2 func=With_isub.__isub__
+    with_isub = With_isub()  # $ MISSING: arg1="with_isub" func=With_isub.__isub__
+    arg2 = with_isub  # $ MISSING: arg2 func=With_isub.__isub__
     with_isub -= arg2
 
 
@@ -1109,8 +1109,8 @@ class With_imul:
 
 
 def test_imul():
-    with_imul = With_imul()  #$ MISSING: arg1="with_imul" func=With_imul.__imul__
-    arg2 = with_imul  #$ MISSING: arg2 func=With_imul.__imul__
+    with_imul = With_imul()  # $ MISSING: arg1="with_imul" func=With_imul.__imul__
+    arg2 = with_imul  # $ MISSING: arg2 func=With_imul.__imul__
     with_imul *= arg2
 
 
@@ -1124,8 +1124,8 @@ class With_imatmul:
 
 
 def test_imatmul():
-    with_imatmul = With_imatmul()  #$ MISSING: arg1="with_imatmul" func=With_imatmul.__imatmul__
-    arg2 = with_imatmul  #$ MISSING: arg2 func=With_imatmul.__imatmul__
+    with_imatmul = With_imatmul()  # $ MISSING: arg1="with_imatmul" func=With_imatmul.__imatmul__
+    arg2 = with_imatmul  # $ MISSING: arg2 func=With_imatmul.__imatmul__
     with_imatmul @= arg2
 
 
@@ -1139,8 +1139,8 @@ class With_itruediv:
 
 
 def test_itruediv():
-    with_itruediv = With_itruediv()  #$ MISSING: arg1="with_itruediv" func=With_itruediv.__itruediv__
-    arg2 = with_itruediv  #$ MISSING: arg2 func=With_itruediv.__itruediv__
+    with_itruediv = With_itruediv()  # $ MISSING: arg1="with_itruediv" func=With_itruediv.__itruediv__
+    arg2 = with_itruediv  # $ MISSING: arg2 func=With_itruediv.__itruediv__
     with_itruediv /= arg2
 
 
@@ -1154,8 +1154,8 @@ class With_ifloordiv:
 
 
 def test_ifloordiv():
-    with_ifloordiv = With_ifloordiv()  #$ MISSING: arg1="with_ifloordiv" func=With_ifloordiv.__ifloordiv__
-    arg2 = with_ifloordiv  #$ MISSING: arg2 func=With_ifloordiv.__ifloordiv__
+    with_ifloordiv = With_ifloordiv()  # $ MISSING: arg1="with_ifloordiv" func=With_ifloordiv.__ifloordiv__
+    arg2 = with_ifloordiv  # $ MISSING: arg2 func=With_ifloordiv.__ifloordiv__
     with_ifloordiv //= arg2
 
 
@@ -1169,8 +1169,8 @@ class With_imod:
 
 
 def test_imod():
-    with_imod = With_imod()  #$ MISSING: arg1="with_imod" func=With_imod.__imod__
-    arg2 = with_imod  #$ MISSING: arg2 func=With_imod.__imod__
+    with_imod = With_imod()  # $ MISSING: arg1="with_imod" func=With_imod.__imod__
+    arg2 = with_imod  # $ MISSING: arg2 func=With_imod.__imod__
     with_imod %= arg2
 
 
@@ -1184,8 +1184,8 @@ class With_ipow:
 
 
 def test_ipow():
-    with_ipow = With_ipow()  #$ MISSING: arg1="with_ipow" func=With_ipow.__ipow__
-    arg2 = with_ipow  #$ MISSING: arg2 func=With_ipow.__ipow__
+    with_ipow = With_ipow()  # $ MISSING: arg1="with_ipow" func=With_ipow.__ipow__
+    arg2 = with_ipow  # $ MISSING: arg2 func=With_ipow.__ipow__
     with_ipow **= arg2
 
 
@@ -1199,8 +1199,8 @@ class With_ilshift:
 
 
 def test_ilshift():
-    with_ilshift = With_ilshift()  #$ MISSING: arg1="with_ilshift" func=With_ilshift.__ilshift__
-    arg2 = with_ilshift  #$ MISSING: arg2 func=With_ilshift.__ilshift__
+    with_ilshift = With_ilshift()  # $ MISSING: arg1="with_ilshift" func=With_ilshift.__ilshift__
+    arg2 = with_ilshift  # $ MISSING: arg2 func=With_ilshift.__ilshift__
     with_ilshift <<= arg2
 
 
@@ -1214,8 +1214,8 @@ class With_irshift:
 
 
 def test_irshift():
-    with_irshift = With_irshift()  #$ MISSING: arg1="with_irshift" func=With_irshift.__irshift__
-    arg2 = with_irshift  #$ MISSING: arg2 func=With_irshift.__irshift__
+    with_irshift = With_irshift()  # $ MISSING: arg1="with_irshift" func=With_irshift.__irshift__
+    arg2 = with_irshift  # $ MISSING: arg2 func=With_irshift.__irshift__
     with_irshift >>= arg2
 
 
@@ -1229,8 +1229,8 @@ class With_iand:
 
 
 def test_iand():
-    with_iand = With_iand()  #$ MISSING: arg1="with_iand" func=With_iand.__iand__
-    arg2 = with_iand  #$ MISSING: arg2 func=With_iand.__iand__
+    with_iand = With_iand()  # $ MISSING: arg1="with_iand" func=With_iand.__iand__
+    arg2 = with_iand  # $ MISSING: arg2 func=With_iand.__iand__
     with_iand &= arg2
 
 
@@ -1244,8 +1244,8 @@ class With_ixor:
 
 
 def test_ixor():
-    with_ixor = With_ixor()  #$ MISSING: arg1="with_ixor" func=With_ixor.__ixor__
-    arg2 = with_ixor  #$ MISSING: arg2 func=With_ixor.__ixor__
+    with_ixor = With_ixor()  # $ MISSING: arg1="with_ixor" func=With_ixor.__ixor__
+    arg2 = with_ixor  # $ MISSING: arg2 func=With_ixor.__ixor__
     with_ixor ^= arg2
 
 
@@ -1259,8 +1259,8 @@ class With_ior:
 
 
 def test_ior():
-    with_ior = With_ior()  #$ MISSING: arg1="with_ior" func=With_ior.__ior__
-    arg2 = with_ior  #$ MISSING: arg2 func=With_ior.__ior__
+    with_ior = With_ior()  # $ MISSING: arg1="with_ior" func=With_ior.__ior__
+    arg2 = with_ior  # $ MISSING: arg2 func=With_ior.__ior__
     with_ior |= arg2
 
 
@@ -1273,7 +1273,7 @@ class With_neg:
 
 
 def test_neg():
-    with_neg = With_neg()  #$ MISSING: arg1="with_neg" func=With_neg.__neg__
+    with_neg = With_neg()  # $ MISSING: arg1="with_neg" func=With_neg.__neg__
     -with_neg
 
 
@@ -1286,7 +1286,7 @@ class With_pos:
 
 
 def test_pos():
-    with_pos = With_pos()  #$ MISSING: arg1="with_pos" func=With_pos.__pos__
+    with_pos = With_pos()  # $ MISSING: arg1="with_pos" func=With_pos.__pos__
     +with_pos
 
 
@@ -1299,7 +1299,7 @@ class With_abs:
 
 
 def test_abs():
-    with_abs = With_abs()  #$ MISSING: arg1="with_abs" func=With_abs.__abs__
+    with_abs = With_abs()  # $ MISSING: arg1="with_abs" func=With_abs.__abs__
     abs(with_abs)
 
 
@@ -1312,7 +1312,7 @@ class With_invert:
 
 
 def test_invert():
-    with_invert = With_invert()  #$ MISSING: arg1="with_invert" func=With_invert.__invert__
+    with_invert = With_invert()  # $ MISSING: arg1="with_invert" func=With_invert.__invert__
     ~with_invert
 
 
@@ -1325,7 +1325,7 @@ class With_complex:
 
 
 def test_complex():
-    with_complex = With_complex()  #$ MISSING: arg1="with_complex" func=With_complex.__complex__
+    with_complex = With_complex()  # $ MISSING: arg1="with_complex" func=With_complex.__complex__
     complex(with_complex)
 
 
@@ -1338,7 +1338,7 @@ class With_int:
 
 
 def test_int():
-    with_int = With_int()  #$ MISSING: arg1="with_int" func=With_int.__int__
+    with_int = With_int()  # $ MISSING: arg1="with_int" func=With_int.__int__
     int(with_int)
 
 
@@ -1351,7 +1351,7 @@ class With_float:
 
 
 def test_float():
-    with_float = With_float()  #$ MISSING: arg1="with_float" func=With_float.__float__
+    with_float = With_float()  # $ MISSING: arg1="with_float" func=With_float.__float__
     float(with_float)
 
 
@@ -1364,37 +1364,37 @@ class With_index:
 
 
 def test_index_slicing():
-    with_index = With_index()  #$ MISSING: arg1="with_index" func=With_index.__index__
+    with_index = With_index()  # $ MISSING: arg1="with_index" func=With_index.__index__
     [0][with_index:1]
 
 
 def test_index_bin():
-    with_index = With_index()  #$ MISSING: arg1="with_index" func=With_index.__index__
+    with_index = With_index()  # $ MISSING: arg1="with_index" func=With_index.__index__
     bin(with_index)
 
 
 def test_index_hex():
-    with_index = With_index()  #$ MISSING: arg1="with_index" func=With_index.__index__
+    with_index = With_index()  # $ MISSING: arg1="with_index" func=With_index.__index__
     hex(with_index)
 
 
 def test_index_oct():
-    with_index = With_index()  #$ MISSING: arg1="with_index" func=With_index.__index__
+    with_index = With_index()  # $ MISSING: arg1="with_index" func=With_index.__index__
     oct(with_index)
 
 
 def test_index_int():
-    with_index = With_index()  #$ MISSING: arg1="with_index" func=With_index.__index__
+    with_index = With_index()  # $ MISSING: arg1="with_index" func=With_index.__index__
     int(with_index)
 
 
 def test_index_float():
-    with_index = With_index()  #$ MISSING: arg1="with_index" func=With_index.__index__
+    with_index = With_index()  # $ MISSING: arg1="with_index" func=With_index.__index__
     float(with_index)
 
 
 def test_index_complex():
-    with_index = With_index()  #$ MISSING: arg1="with_index" func=With_index.__index__
+    with_index = With_index()  # $ MISSING: arg1="with_index" func=With_index.__index__
     complex(with_index)
 
 
@@ -1407,7 +1407,7 @@ class With_round:
 
 
 def test_round():
-    with_round = With_round()  #$ MISSING: arg1="with_round" func=With_round.__round__
+    with_round = With_round()  # $ MISSING: arg1="with_round" func=With_round.__round__
     round(with_round)
 
 
@@ -1420,7 +1420,7 @@ class With_trunc:
 
 
 def test_trunc():
-    with_trunc = With_trunc()  #$ MISSING: arg1="with_trunc" func=With_trunc.__trunc__
+    with_trunc = With_trunc()  # $ MISSING: arg1="with_trunc" func=With_trunc.__trunc__
     import math
 
     math.trunc(with_trunc)
@@ -1435,7 +1435,7 @@ class With_floor:
 
 
 def test_floor():
-    with_floor = With_floor()  #$ MISSING: arg1="with_floor" func=With_floor.__floor__
+    with_floor = With_floor()  # $ MISSING: arg1="with_floor" func=With_floor.__floor__
     import math
 
     math.floor(with_floor)
@@ -1450,7 +1450,7 @@ class With_ceil:
 
 
 def test_ceil():
-    with_ceil = With_ceil()  #$ MISSING: arg1="with_ceil" func=With_ceil.__ceil__
+    with_ceil = With_ceil()  # $ MISSING: arg1="with_ceil" func=With_ceil.__ceil__
     import math
 
     math.ceil(with_ceil)
@@ -1503,7 +1503,7 @@ class With_await:
 
 
 async def atest_await():
-    with_await = With_await()  #$ MISSING: arg1="with_await" func=With_await.__await__
+    with_await = With_await()  # $ MISSING: arg1="with_await" func=With_await.__await__
     await (with_await)
 
 
@@ -1525,7 +1525,7 @@ class With_aiter:
 
 
 async def atest_aiter():
-    with_aiter = With_aiter()  #$ MISSING: arg1="with_aiter" func=With_aiter.__aiter__
+    with_aiter = With_aiter()  # $ MISSING: arg1="with_aiter" func=With_aiter.__aiter__
     async for x in with_aiter:
         pass
 
@@ -1542,7 +1542,7 @@ class With_anext:
 
 
 async def atest_anext():
-    with_anext = With_anext()  #$ MISSING: arg1="with_anext" func=With_anext.__anext__
+    with_anext = With_anext()  # $ MISSING: arg1="with_anext" func=With_anext.__anext__
     async for x in with_anext:
         pass
 
@@ -1559,7 +1559,7 @@ class With_aenter:
 
 
 async def atest_aenter():
-    with_aenter = With_aenter()  #$ MISSING: arg1="with_aenter" func=With_aenter.__aenter__
+    with_aenter = With_aenter()  # $ MISSING: arg1="with_aenter" func=With_aenter.__aenter__
     async with with_aenter:
         pass
 
@@ -1578,6 +1578,6 @@ class With_aexit:
 
 
 async def atest_aexit():
-    with_aexit = With_aexit()  #$ MISSING: arg1="with_aexit" func=With_aexit.__aexit__
+    with_aexit = With_aexit()  # $ MISSING: arg1="with_aexit" func=With_aexit.__aexit__
     async with with_aexit:
         pass
diff --git a/python/ql/test/library-tests/dataflow/coverage/datamodel.py b/python/ql/test/library-tests/dataflow/coverage/datamodel.py
index 22111a0abbd..3b561843b43 100644
--- a/python/ql/test/library-tests/dataflow/coverage/datamodel.py
+++ b/python/ql/test/library-tests/dataflow/coverage/datamodel.py
@@ -58,7 +58,7 @@ SINK7 = functools.partial(SINK, expected=arg7)
 def f(a, b):
   return a
 
-SINK(f(SOURCE, 3)) #$ flow="SOURCE -> f(..)"
+SINK(f(SOURCE, 3)) # $ flow="SOURCE -> f(..)"
 
 # Instance methods
 # An instance method object combines a class, a class instance and any callable object (normally a user-defined function).
@@ -236,10 +236,10 @@ class Customized:
 
 # testing __new__ and __init__
 customized = Customized()
-SINK(Customized.a)  #$ MISSING:flow="SOURCE, l:-8 -> customized.a"
+SINK(Customized.a)  # $ MISSING:flow="SOURCE, l:-8 -> customized.a"
 SINK_F(Customized.b)
-SINK(customized.a)  #$ MISSING: flow="SOURCE, l:-10 -> customized.a"
-SINK(customized.b)  #$ flow="SOURCE, l:-7 -> customized.b"
+SINK(customized.a)  # $ MISSING: flow="SOURCE, l:-10 -> customized.a"
+SINK(customized.b)  # $ flow="SOURCE, l:-7 -> customized.b"
 
 
 class Test2:
diff --git a/python/ql/test/library-tests/dataflow/coverage/loops.py b/python/ql/test/library-tests/dataflow/coverage/loops.py
index df1dc24310b..d240f8ffc15 100644
--- a/python/ql/test/library-tests/dataflow/coverage/loops.py
+++ b/python/ql/test/library-tests/dataflow/coverage/loops.py
@@ -38,7 +38,7 @@ def test_while():
     n = 2
     while n > 0:
         if n == 1:
-            SINK(x) #$ flow="SOURCE, l:+1 -> x"
+            SINK(x) # $ flow="SOURCE, l:+1 -> x"
         x = SOURCE
         n -= 1
 
@@ -54,14 +54,14 @@ def test_while_obj():
     n = 2
     while n > 0:
         if n == 1:
-            SINK(myobj.foo) #$ flow="SOURCE, l:+1 -> myobj.foo"
+            SINK(myobj.foo) # $ flow="SOURCE, l:+1 -> myobj.foo"
         setFoo(myobj, SOURCE)
         n -= 1
 
 def setAndTestFoo(obj, x, test):
     if test:
         # This flow is not found, if self-loops are broken at the SSA level.
-        SINK(obj.foo) #$ flow="SOURCE, l:+7 -> obj.foo"
+        SINK(obj.foo) # $ flow="SOURCE, l:+7 -> obj.foo"
     obj.foo = x
 
 def test_while_obj_sink():
@@ -70,4 +70,3 @@ def test_while_obj_sink():
     while n > 0:
         setAndTestFoo(myobj, SOURCE, n == 1)
         n -= 1
-
diff --git a/python/ql/test/library-tests/dataflow/coverage/module_level.py b/python/ql/test/library-tests/dataflow/coverage/module_level.py
index bd2d38088b1..f73520589de 100644
--- a/python/ql/test/library-tests/dataflow/coverage/module_level.py
+++ b/python/ql/test/library-tests/dataflow/coverage/module_level.py
@@ -3,5 +3,5 @@
 
 t = (SOURCE, NONSOURCE)
 a, b = t
-SINK(a) #$ flow="SOURCE, l:-2 -> a"
+SINK(a) # $ flow="SOURCE, l:-2 -> a"
 SINK_F(b)
diff --git a/python/ql/test/library-tests/dataflow/coverage/test.py b/python/ql/test/library-tests/dataflow/coverage/test.py
index 64c500b5b69..5f13ba5a403 100644
--- a/python/ql/test/library-tests/dataflow/coverage/test.py
+++ b/python/ql/test/library-tests/dataflow/coverage/test.py
@@ -41,7 +41,7 @@ def SINK_F(x):
 def test_tuple_with_local_flow():
     x = (NONSOURCE, SOURCE)
     y = x[1]
-    SINK(y) #$ flow="SOURCE, l:-2 -> y"
+    SINK(y) # $ flow="SOURCE, l:-2 -> y"
 
 
 def test_tuple_negative():
@@ -53,45 +53,45 @@ def test_tuple_negative():
 # 6.2.1. Identifiers (Names)
 def test_names():
     x = SOURCE
-    SINK(x) #$ flow="SOURCE, l:-1 -> x"
+    SINK(x) # $ flow="SOURCE, l:-1 -> x"
 
 
 # 6.2.2. Literals
 def test_string_literal():
     x = "source"
-    SINK(x) #$ flow="'source', l:-1 -> x"
+    SINK(x) # $ flow="'source', l:-1 -> x"
 
 
 def test_bytes_literal():
     x = b"source"
-    SINK(x) #$ flow="b'source', l:-1 -> x"
+    SINK(x) # $ flow="b'source', l:-1 -> x"
 
 
 def test_integer_literal():
     x = 42
-    SINK(x) #$ flow="42, l:-1 -> x"
+    SINK(x) # $ flow="42, l:-1 -> x"
 
 
 def test_floatnumber_literal():
     x = 42.0
-    SINK(x) #$ flow="42.0, l:-1 -> x"
+    SINK(x) # $ flow="42.0, l:-1 -> x"
 
 
 def test_imagnumber_literal():
     x = 42j
-    SINK(x) #$ MISSING:flow="42j, l:-1 -> x"
+    SINK(x) # $ MISSING:flow="42j, l:-1 -> x"
 
 
 # 6.2.3. Parenthesized forms
 def test_parenthesized_form():
     x = (SOURCE)
-    SINK(x) #$ flow="SOURCE, l:-1 -> x"
+    SINK(x) # $ flow="SOURCE, l:-1 -> x"
 
 
 # 6.2.5. List displays
 def test_list_display():
     x = [SOURCE]
-    SINK(x[0]) #$ flow="SOURCE, l:-1 -> x[0]"
+    SINK(x[0]) # $ flow="SOURCE, l:-1 -> x[0]"
 
 
 def test_list_display_negative():
@@ -101,23 +101,23 @@ def test_list_display_negative():
 
 def test_list_comprehension():
     x = [SOURCE for y in [NONSOURCE]]
-    SINK(x[0]) #$ flow="SOURCE, l:-1 -> x[0]"
+    SINK(x[0]) # $ flow="SOURCE, l:-1 -> x[0]"
 
 
 def test_list_comprehension_flow():
     x = [y for y in [SOURCE]]
-    SINK(x[0]) #$  flow="SOURCE, l:-1 -> x[0]"
+    SINK(x[0]) # $ flow="SOURCE, l:-1 -> x[0]"
 
 
 def test_list_comprehension_inflow():
     l = [SOURCE]
     x = [y for y in l]
-    SINK(x[0]) #$ flow="SOURCE, l:-2 -> x[0]"
+    SINK(x[0]) # $ flow="SOURCE, l:-2 -> x[0]"
 
 
 def test_nested_list_display():
     x = [*[SOURCE]]
-    SINK(x[0]) #$ MISSING:flow="SOURCE, l:-1 -> x[0]"
+    SINK(x[0]) # $ MISSING:flow="SOURCE, l:-1 -> x[0]"
 
 
 @expects(6)
@@ -144,98 +144,98 @@ def test_list_comprehension_with_tuple_result():
 # 6.2.6. Set displays
 def test_set_display():
     x = {SOURCE}
-    SINK(x.pop()) #$ flow="SOURCE, l:-1 -> x.pop()"
+    SINK(x.pop()) # $ flow="SOURCE, l:-1 -> x.pop()"
 
 
 def test_set_comprehension():
     x = {SOURCE for y in [NONSOURCE]}
-    SINK(x.pop()) #$ flow="SOURCE, l:-1 -> x.pop()"
+    SINK(x.pop()) # $ flow="SOURCE, l:-1 -> x.pop()"
 
 
 def test_set_comprehension_flow():
     x = {y for y in [SOURCE]}
-    SINK(x.pop()) #$ flow="SOURCE, l:-1 -> x.pop()"
+    SINK(x.pop()) # $ flow="SOURCE, l:-1 -> x.pop()"
 
 
 def test_set_comprehension_inflow():
     l = {SOURCE}
     x = {y for y in l}
-    SINK(x.pop()) #$ flow="SOURCE, l:-2 -> x.pop()"
+    SINK(x.pop()) # $ flow="SOURCE, l:-2 -> x.pop()"
 
 
 def test_nested_set_display():
     x = {*{SOURCE}}
-    SINK(x.pop()) #$ MISSING:flow="SOURCE, l:-1 -> x.pop()"
+    SINK(x.pop()) # $ MISSING:flow="SOURCE, l:-1 -> x.pop()"
 
 
 # 6.2.7. Dictionary displays
 def test_dict_display():
     x = {"s": SOURCE}
-    SINK(x["s"]) #$ flow="SOURCE, l:-1 -> x['s']"
+    SINK(x["s"]) # $ flow="SOURCE, l:-1 -> x['s']"
 
 
 def test_dict_display_pop():
     x = {"s": SOURCE}
-    SINK(x.pop("s")) #$ flow="SOURCE, l:-1 -> x.pop(..)"
+    SINK(x.pop("s")) # $ flow="SOURCE, l:-1 -> x.pop(..)"
 
 
 def test_dict_comprehension():
     x = {y: SOURCE for y in ["s"]}
-    SINK(x["s"]) #$ MISSING:flow="SOURCE, l:-1 -> x['s']"
+    SINK(x["s"]) # $ MISSING:flow="SOURCE, l:-1 -> x['s']"
 
 
 def test_dict_comprehension_pop():
     x = {y: SOURCE for y in ["s"]}
-    SINK(x.pop("s")) #$ MISSING:flow="SOURCE, l:-1 -> x.pop()"
+    SINK(x.pop("s")) # $ MISSING:flow="SOURCE, l:-1 -> x.pop()"
 
 
 def test_nested_dict_display():
     x = {**{"s": SOURCE}}
-    SINK(x["s"]) #$ MISSING:flow="SOURCE, l:-1 -> x['s']"
+    SINK(x["s"]) # $ MISSING:flow="SOURCE, l:-1 -> x['s']"
 
 
 def test_nested_dict_display_pop():
     x = {**{"s": SOURCE}}
-    SINK(x.pop("s")) #$ MISSING:flow="SOURCE, l:-1 -> x.pop()"
+    SINK(x.pop("s")) # $ MISSING:flow="SOURCE, l:-1 -> x.pop()"
 
 
 # Nested comprehensions
 def test_nested_comprehension():
     x = [y for z in [[SOURCE]] for y in z]
-    SINK(x[0]) #$ flow="SOURCE, l:-1 -> x[0]"
+    SINK(x[0]) # $ flow="SOURCE, l:-1 -> x[0]"
 
 
 def test_nested_comprehension_deep_with_local_flow():
     x = [y for v in [[[[SOURCE]]]] for u in v for z in u for y in z]
-    SINK(x[0]) #$ flow="SOURCE, l:-1 -> x[0]"
+    SINK(x[0]) # $ flow="SOURCE, l:-1 -> x[0]"
 
 
 def test_nested_comprehension_dict():
     d = {"s": [SOURCE]}
     x = [y for k, v in d.items() for y in v]
-    SINK(x[0]) #$ flow="SOURCE, l:-2 -> x[0]"
+    SINK(x[0]) # $ flow="SOURCE, l:-2 -> x[0]"
 
 
 def test_nested_comprehension_paren():
     x = [y for y in (z for z in [SOURCE])]
-    SINK(x[0]) #$ flow="SOURCE, l:-1 -> x[0]"
+    SINK(x[0]) # $ flow="SOURCE, l:-1 -> x[0]"
 
 
 # Iterable unpacking in comprehensions
 def test_unpacking_comprehension():
     x = [a for (a, b) in [(SOURCE, NONSOURCE)]]
-    SINK(x[0]) #$ flow="SOURCE, l:-1 -> x[0]"
+    SINK(x[0]) # $ flow="SOURCE, l:-1 -> x[0]"
 
 
 def test_star_unpacking_comprehension():
     x = [a[0] for (*a, b) in [(SOURCE, NONSOURCE)]]
-    SINK(x[0]) #$ flow="SOURCE, l:-1 -> x[0]"
+    SINK(x[0]) # $ flow="SOURCE, l:-1 -> x[0]"
 
 
 # 6.2.8. Generator expressions
 def test_generator():
     x = (SOURCE for y in [NONSOURCE])
-    SINK([*x][0]) #$ MISSING:flow="SOURCE, l:-1 -> List[0]"
+    SINK([*x][0]) # $ MISSING:flow="SOURCE, l:-1 -> List[0]"
 
 
 # 6.2.9. Yield expressions
@@ -245,7 +245,7 @@ def gen(x):
 
 def test_yield():
     g = gen(SOURCE)
-    SINK(next(g)) #$ flow="SOURCE, l:-1 -> next(..)"
+    SINK(next(g)) # $ flow="SOURCE, l:-1 -> next(..)"
 
 
 def gen_from(x):
@@ -254,19 +254,19 @@ def gen_from(x):
 
 def test_yield_from():
     g = gen_from(SOURCE)
-    SINK(next(g)) #$ MISSING:flow="SOURCE, l:-1 -> next()"
+    SINK(next(g)) # $ MISSING:flow="SOURCE, l:-1 -> next()"
 
 
 # a statement rather than an expression, but related to generators
 def test_for():
     for x in gen(SOURCE):
-        SINK(x) #$ flow="SOURCE, l:-1 -> x"
+        SINK(x) # $ flow="SOURCE, l:-1 -> x"
 
 
 # 6.2.9.1. Generator-iterator methods
 def test___next__():
     g = gen(SOURCE)
-    SINK(g.__next__()) #$ MISSING:flow="SOURCE, l:-1 -> g.__next__()"
+    SINK(g.__next__()) # $ MISSING:flow="SOURCE, l:-1 -> g.__next__()"
 
 
 def gen2(x):
@@ -278,7 +278,7 @@ def gen2(x):
 def test_send():
     g = gen2(NONSOURCE)
     n = next(g)
-    SINK(g.send(SOURCE)) #$ MISSING:flow="SOURCE -> g.send()"
+    SINK(g.send(SOURCE)) # $ MISSING:flow="SOURCE -> g.send()"
 
 
 def gen_ex(x):
@@ -291,7 +291,7 @@ def gen_ex(x):
 def test_throw():
     g = gen_ex(SOURCE)
     n = next(g)
-    SINK(g.throw(TypeError)) #$ MISSING:flow="SOURCE, l:-2 -> g.throw()"
+    SINK(g.throw(TypeError)) # $ MISSING:flow="SOURCE, l:-2 -> g.throw()"
 
 
 # no `test_close` as `close` involves no data flow
@@ -312,7 +312,7 @@ def runa(a):
 
 async def atest___anext__():
     g = agen(SOURCE)
-    SINK(await g.__anext__()) #$ MISSING:flow="SOURCE, l:-1 -> g.__anext__()"
+    SINK(await g.__anext__()) # $ MISSING:flow="SOURCE, l:-1 -> g.__anext__()"
 
 
 def test___anext__():
@@ -328,7 +328,7 @@ async def agen2(x):
 async def atest_asend():
     g = agen2(NONSOURCE)
     n = await g.__anext__()
-    SINK(await g.asend(SOURCE)) #$ MISSING:flow="SOURCE -> g.asend()"
+    SINK(await g.asend(SOURCE)) # $ MISSING:flow="SOURCE -> g.asend()"
 
 
 def test_asend():
@@ -345,7 +345,7 @@ async def agen_ex(x):
 async def atest_athrow():
     g = agen_ex(SOURCE)
     n = await g.__anext__()
-    SINK(await g.athrow(TypeError)) #$ MISSING:flow="SOURCE, l:-2 -> g.athrow()"
+    SINK(await g.athrow(TypeError)) # $ MISSING:flow="SOURCE, l:-2 -> g.athrow()"
 
 
 def test_athrow():
@@ -367,15 +367,15 @@ def test_attribute_reference():
 
 # 6.3.2. Subscriptions
 def test_subscription_tuple():
-    SINK((SOURCE,)[0]) #$ flow="SOURCE -> Tuple[0]"
+    SINK((SOURCE,)[0]) # $ flow="SOURCE -> Tuple[0]"
 
 
 def test_subscription_list():
-    SINK([SOURCE][0]) #$ flow="SOURCE -> List[0]"
+    SINK([SOURCE][0]) # $ flow="SOURCE -> List[0]"
 
 
 def test_subscription_mapping():
-    SINK({"s": SOURCE}["s"]) #$ flow="SOURCE -> Dict['s']"
+    SINK({"s": SOURCE}["s"]) # $ flow="SOURCE -> Dict['s']"
 
 
 # overriding __getitem__ should be tested by the class coverage tests
@@ -387,7 +387,7 @@ l = [SOURCE]
 
 def test_slicing():
     s = l[0:1:1]
-    SINK(s[0]) #$ MISSING:flow="SOURCE -> s[0]"
+    SINK(s[0]) # $ MISSING:flow="SOURCE -> s[0]"
 
 
 # The grammar seems to allow `l[0:1:1, 0:1]`, but the interpreter does not like it
@@ -398,7 +398,7 @@ def second(a, b):
 
 
 def test_call_positional():
-    SINK(second(NONSOURCE, SOURCE)) #$ flow="SOURCE -> second(..)"
+    SINK(second(NONSOURCE, SOURCE)) # $ flow="SOURCE -> second(..)"
 
 
 def test_call_positional_negative():
@@ -406,15 +406,15 @@ def test_call_positional_negative():
 
 
 def test_call_keyword():
-    SINK(second(NONSOURCE, b=SOURCE)) #$ flow="SOURCE -> second(..)"
+    SINK(second(NONSOURCE, b=SOURCE)) # $ flow="SOURCE -> second(..)"
 
 
 def test_call_unpack_iterable():
-    SINK(second(NONSOURCE, *[SOURCE])) #$ MISSING:flow="SOURCE -> second(..)"
+    SINK(second(NONSOURCE, *[SOURCE])) # $ MISSING:flow="SOURCE -> second(..)"
 
 
 def test_call_unpack_mapping():
-    SINK(second(NONSOURCE, **{"b": SOURCE})) #$ flow="SOURCE -> second(..)"
+    SINK(second(NONSOURCE, **{"b": SOURCE})) # $ flow="SOURCE -> second(..)"
 
 
 def f_extra_pos(a, *b):
@@ -422,7 +422,7 @@ def f_extra_pos(a, *b):
 
 
 def test_call_extra_pos():
-    SINK(f_extra_pos(NONSOURCE, SOURCE)) #$ flow="SOURCE -> f_extra_pos(..)"
+    SINK(f_extra_pos(NONSOURCE, SOURCE)) # $ flow="SOURCE -> f_extra_pos(..)"
 
 
 def f_extra_keyword(a, **b):
@@ -430,7 +430,7 @@ def f_extra_keyword(a, **b):
 
 
 def test_call_extra_keyword():
-    SINK(f_extra_keyword(NONSOURCE, b=SOURCE)) #$ flow="SOURCE -> f_extra_keyword(..)"
+    SINK(f_extra_keyword(NONSOURCE, b=SOURCE)) # $ flow="SOURCE -> f_extra_keyword(..)"
 
 
 # return the name of the first extra keyword argument
@@ -440,34 +440,34 @@ def f_extra_keyword_flow(**a):
 
 # call the function with our source as the name of the keyword arguemnt
 def test_call_extra_keyword_flow():
-    SINK(f_extra_keyword_flow(**{SOURCE: None})) #$ MISSING:flow="SOURCE -> f_extra_keyword(..)"
+    SINK(f_extra_keyword_flow(**{SOURCE: None})) # $ MISSING:flow="SOURCE -> f_extra_keyword(..)"
 
 
 # 6.11. Boolean operations
 
 def test_or(x = False):
     # if we don't know the value of the lhs, we should always add flow
-    SINK(x or SOURCE) #$ flow="SOURCE -> BoolExpr"
+    SINK(x or SOURCE) # $ flow="SOURCE -> BoolExpr"
 
 
 def test_and(x = True):
     # if we don't know the value of the lhs, we should always add flow
-    SINK(x and SOURCE) #$ flow="SOURCE -> BoolExpr"
+    SINK(x and SOURCE) # $ flow="SOURCE -> BoolExpr"
 
 
 # 6.12. Assignment expressions
 def test_assignment_expression_flow_lhs():
     x = NONSOURCE
     if x := SOURCE:
-        SINK(x) #$ flow="SOURCE, l:-1 -> x"
+        SINK(x) # $ flow="SOURCE, l:-1 -> x"
 
 def test_assignment_expression_flow_out():
     x = NONSOURCE
-    SINK(x := SOURCE) #$ flow="SOURCE -> AssignExpr"
+    SINK(x := SOURCE) # $ flow="SOURCE -> AssignExpr"
 
 # 6.13. Conditional expressions
 def test_conditional_true():
-    SINK(SOURCE if True else NONSOURCE) #$ flow="SOURCE -> IfExp"
+    SINK(SOURCE if True else NONSOURCE) # $ flow="SOURCE -> IfExp"
 
 
 def test_conditional_true_guards():
@@ -475,7 +475,7 @@ def test_conditional_true_guards():
 
 
 def test_conditional_false():
-    SINK(NONSOURCE if False else SOURCE) #$ flow="SOURCE -> IfExp"
+    SINK(NONSOURCE if False else SOURCE) # $ flow="SOURCE -> IfExp"
 
 
 def test_conditional_false_guards():
@@ -485,13 +485,13 @@ def test_conditional_false_guards():
 # Condition is evaluated first, so x is SOURCE once chosen
 def test_conditional_evaluation_true():
     x = NONSOURCE
-    SINK(x if (SOURCE == (x := SOURCE)) else NONSOURCE) #$ flow="SOURCE -> IfExp"
+    SINK(x if (SOURCE == (x := SOURCE)) else NONSOURCE) # $ flow="SOURCE -> IfExp"
 
 
 # Condition is evaluated first, so x is SOURCE once chosen
 def test_conditional_evaluation_false():
     x = NONSOURCE
-    SINK(NONSOURCE if (NONSOURCE == (x := SOURCE)) else x) #$ flow="SOURCE -> IfExp"
+    SINK(NONSOURCE if (NONSOURCE == (x := SOURCE)) else x) # $ flow="SOURCE -> IfExp"
 
 
 # 6.14. Lambdas
@@ -499,14 +499,14 @@ def test_lambda():
     def f(x):
         return x
 
-    SINK(f(SOURCE)) #$ flow="SOURCE -> f(..)"
+    SINK(f(SOURCE)) # $ flow="SOURCE -> f(..)"
 
 
 def test_lambda_positional():
     def second(a, b):
         return b
 
-    SINK(second(NONSOURCE, SOURCE)) #$ flow="SOURCE -> second(..)"
+    SINK(second(NONSOURCE, SOURCE)) # $ flow="SOURCE -> second(..)"
 
 
 def test_lambda_positional_negative():
@@ -520,57 +520,57 @@ def test_lambda_keyword():
     def second(a, b):
         return b
 
-    SINK(second(NONSOURCE, b=SOURCE)) #$ flow="SOURCE -> second(..)"
+    SINK(second(NONSOURCE, b=SOURCE)) # $ flow="SOURCE -> second(..)"
 
 
 def test_lambda_unpack_iterable():
     def second(a, b):
         return b
 
-    SINK(second(NONSOURCE, *[SOURCE])) #$ MISSING:flow="SOURCE -> second(..)"  # Flow missing
+    SINK(second(NONSOURCE, *[SOURCE])) # $ MISSING:flow="SOURCE -> second(..)"  # Flow missing
 
 
 def test_lambda_unpack_mapping():
     def second(a, b):
         return b
 
-    SINK(second(NONSOURCE, **{"b": SOURCE})) #$ flow="SOURCE -> second(..)"
+    SINK(second(NONSOURCE, **{"b": SOURCE})) # $ flow="SOURCE -> second(..)"
 
 
 def test_lambda_extra_pos():
     f_extra_pos = lambda a, *b: b[0]
-    SINK(f_extra_pos(NONSOURCE, SOURCE)) #$ flow="SOURCE -> f_extra_pos(..)"
+    SINK(f_extra_pos(NONSOURCE, SOURCE)) # $ flow="SOURCE -> f_extra_pos(..)"
 
 
 def test_lambda_extra_keyword():
     f_extra_keyword = lambda a, **b: b["b"]
-    SINK(f_extra_keyword(NONSOURCE, b=SOURCE)) #$ flow="SOURCE -> f_extra_keyword(..)"
+    SINK(f_extra_keyword(NONSOURCE, b=SOURCE)) # $ flow="SOURCE -> f_extra_keyword(..)"
 
 
 # call the function with our source as the name of the keyword argument
 def test_lambda_extra_keyword_flow():
     # return the name of the first extra keyword argument
     f_extra_keyword_flow = lambda **a: [*a][0]
-    SINK(f_extra_keyword_flow(**{SOURCE: None})) #$ MISSING:flow="SOURCE -> f_extra_keyword(..)"
+    SINK(f_extra_keyword_flow(**{SOURCE: None})) # $ MISSING:flow="SOURCE -> f_extra_keyword(..)"
 
 
 @expects(4)
 def test_swap():
     a = SOURCE
     b = NONSOURCE
-    SINK(a) #$ flow="SOURCE, l:-2 -> a"
+    SINK(a) # $ flow="SOURCE, l:-2 -> a"
     SINK_F(b)
 
     a, b = b, a
     SINK_F(a)
-    SINK(b) #$ flow="SOURCE, l:-7 -> b"
+    SINK(b) # $ flow="SOURCE, l:-7 -> b"
 
 
 @expects(2)
 def test_unpacking_assignment():
     t = (SOURCE, NONSOURCE)
     a, b = t
-    SINK(a) #$ flow="SOURCE, l:-2 -> a"
+    SINK(a) # $ flow="SOURCE, l:-2 -> a"
     SINK_F(b)
 
 
@@ -578,16 +578,16 @@ def test_unpacking_assignment():
 def test_nested_unpacking_assignment():
     t = (SOURCE, (NONSOURCE, SOURCE))
     a, (b, c) = t
-    SINK(a) #$ flow="SOURCE, l:-2 -> a"
+    SINK(a) # $ flow="SOURCE, l:-2 -> a"
     SINK_F(b)
-    SINK(c) #$ flow="SOURCE, l:-4 -> c"
+    SINK(c) # $ flow="SOURCE, l:-4 -> c"
 
 
 @expects(2)
 def test_deeply_nested_unpacking_assignment():
     t = [[[[SOURCE]]], NONSOURCE]
     [[[a]]], b = t
-    SINK(a) #$ flow="SOURCE, l:-2 -> a"
+    SINK(a) # $ flow="SOURCE, l:-2 -> a"
     SINK_F(b)
 
 
@@ -595,19 +595,19 @@ def test_deeply_nested_unpacking_assignment():
 def test_iterated_unpacking_assignment():
     t = (SOURCE, SOURCE, NONSOURCE)
     a, *b, c = t
-    SINK(a) #$ flow="SOURCE, l:-2 -> a"
+    SINK(a) # $ flow="SOURCE, l:-2 -> a"
     SINK_F(b)
-    SINK(b[0]) #$ flow="SOURCE, l:-4 -> b[0]"
-    SINK_F(c) #$ SPURIOUS: flow="SOURCE, l:-5 -> c"  # We do not track tuple sizes
+    SINK(b[0]) # $ flow="SOURCE, l:-4 -> b[0]"
+    SINK_F(c) # $ SPURIOUS: flow="SOURCE, l:-5 -> c"  # We do not track tuple sizes
 
 
 @expects(3)
 def test_iterated_unpacking_assignment_shrink():
     t = (SOURCE, SOURCE)
     a, *b, c = t
-    SINK(a) #$ flow="SOURCE, l:-2 -> a"
+    SINK(a) # $ flow="SOURCE, l:-2 -> a"
     SINK_F(b)
-    SINK(c) #$ flow="SOURCE, l:-4 -> c"
+    SINK(c) # $ flow="SOURCE, l:-4 -> c"
 
 
 @expects(15)
@@ -616,25 +616,25 @@ def test_unpacking_assignment_conversion():
 
     # tuple
     ((a1, a2, a3), b, c) = ll
-    SINK(a1) #$ flow="SOURCE, l:-4 -> a1"
-    SINK_F(a2) #$ SPURIOUS: flow="SOURCE, l:-5 -> a2"  # We expect an FP as all elements are tainted
-    SINK(a3) #$ flow="SOURCE, l:-6 -> a3"
+    SINK(a1) # $ flow="SOURCE, l:-4 -> a1"
+    SINK_F(a2) # $ SPURIOUS: flow="SOURCE, l:-5 -> a2"  # We expect an FP as all elements are tainted
+    SINK(a3) # $ flow="SOURCE, l:-6 -> a3"
     SINK_F(b)  # The list itself is not tainted
     SINK_F(c)
 
     # mixed
     [(a1, a2, a3), b, c] = ll
-    SINK(a1) #$ flow="SOURCE, l:-12 -> a1"
-    SINK_F(a2) #$ SPURIOUS: flow="SOURCE, l:-13 -> a2"  # We expect an FP as all elements are tainted
-    SINK(a3) #$ flow="SOURCE, l:-14 -> a3"
+    SINK(a1) # $ flow="SOURCE, l:-12 -> a1"
+    SINK_F(a2) # $ SPURIOUS: flow="SOURCE, l:-13 -> a2"  # We expect an FP as all elements are tainted
+    SINK(a3) # $ flow="SOURCE, l:-14 -> a3"
     SINK_F(b)  # The list itself is not tainted
     SINK_F(c)
 
     # mixed differently
     ([a1, a2, a3], b, c) = ll
-    SINK(a1) #$ flow="SOURCE, l:-20 -> a1"
-    SINK_F(a2) #$ SPURIOUS: flow="SOURCE, l:-21 -> a2"  # We expect an FP as all elements are tainted
-    SINK(a3) #$ flow="SOURCE, l:-22 -> a3"
+    SINK(a1) # $ flow="SOURCE, l:-20 -> a1"
+    SINK_F(a2) # $ SPURIOUS: flow="SOURCE, l:-21 -> a2"  # We expect an FP as all elements are tainted
+    SINK(a3) # $ flow="SOURCE, l:-22 -> a3"
     SINK_F(b)  # The list itself is not tainted
     SINK_F(c)
 
@@ -644,37 +644,37 @@ def test_iterated_unpacking_assignment_conversion():
 
     # list
     [[a1, *a2], *b] = tt
-    SINK(a1) #$ flow="SOURCE, l:-4 -> a1"
+    SINK(a1) # $ flow="SOURCE, l:-4 -> a1"
     SINK_F(a2)  # The list itself is not tainted
-    SINK_F(a2[0]) #$ SPURIOUS: flow="SOURCE, l:-6 -> a2[0]"  # FP here due to list abstraction
-    SINK(a2[1]) #$ flow="SOURCE, l:-7 -> a2[1]"
+    SINK_F(a2[0]) # $ SPURIOUS: flow="SOURCE, l:-6 -> a2[0]"  # FP here due to list abstraction
+    SINK(a2[1]) # $ flow="SOURCE, l:-7 -> a2[1]"
     SINK_F(b)  # The list itself is not tainted
     SINK_F(b[0])
 
     # tuple
     ((a1, *a2), *b) = tt
-    SINK(a1) #$ flow="SOURCE, l:-13 -> a1"
+    SINK(a1) # $ flow="SOURCE, l:-13 -> a1"
     SINK_F(a2)  # The list itself is not tainted
-    SINK_F(a2[0]) #$ SPURIOUS: flow="SOURCE, l:-15 -> a2[0]"  # FP here due to list abstraction
-    SINK(a2[1]) #$ flow="SOURCE, l:-16 -> a2[1]"
+    SINK_F(a2[0]) # $ SPURIOUS: flow="SOURCE, l:-15 -> a2[0]"  # FP here due to list abstraction
+    SINK(a2[1]) # $ flow="SOURCE, l:-16 -> a2[1]"
     SINK_F(b)  # The list itself is not tainted
     SINK_F(b[0])
 
     # mixed
     [(a1, *a2), *b] = tt
-    SINK(a1) #$ flow="SOURCE, l:-22 -> a1"
+    SINK(a1) # $ flow="SOURCE, l:-22 -> a1"
     SINK_F(a2)  # The list itself is not tainted
-    SINK_F(a2[0]) #$ SPURIOUS: flow="SOURCE, l:-24 -> a2[0]"  # FP here due to list abstraction
-    SINK(a2[1]) #$ flow="SOURCE, l:-25 -> a2[1]"
+    SINK_F(a2[0]) # $ SPURIOUS: flow="SOURCE, l:-24 -> a2[0]"  # FP here due to list abstraction
+    SINK(a2[1]) # $ flow="SOURCE, l:-25 -> a2[1]"
     SINK_F(b)  # The list itself is not tainted
     SINK_F(b[0])
 
     # mixed differently
     ([a1, *a2], *b) = tt
-    SINK(a1) #$ flow="SOURCE, l:-31 -> a1"
+    SINK(a1) # $ flow="SOURCE, l:-31 -> a1"
     SINK_F(a2)  # The list itself is not tainted
-    SINK_F(a2[0]) #$ SPURIOUS: flow="SOURCE, l:-33 -> a2[0]"  # FP here due to list abstraction
-    SINK(a2[1]) #$ flow="SOURCE, l:-34 -> a2[1]"
+    SINK_F(a2[0]) # $ SPURIOUS: flow="SOURCE, l:-33 -> a2[0]"  # FP here due to list abstraction
+    SINK(a2[1]) # $ flow="SOURCE, l:-34 -> a2[1]"
     SINK_F(b)  # The list itself is not tainted
     SINK_F(b[0])
 
@@ -682,16 +682,16 @@ def test_iterated_unpacking_assignment_conversion():
 @expects(3)
 def test_iterable_repacking():
     a, *(b, c) = (SOURCE, NONSOURCE, SOURCE)
-    SINK(a) #$ flow="SOURCE, l:-1 -> a"
+    SINK(a) # $ flow="SOURCE, l:-1 -> a"
     SINK_F(b)
-    SINK(c) #$ MISSING: flow="SOURCE, l:-3 -> c"
+    SINK(c) # $ MISSING: flow="SOURCE, l:-3 -> c"
 
 
 @expects(4)
 def test_iterable_unpacking_in_for():
     tl = [(SOURCE, NONSOURCE), (SOURCE, NONSOURCE)]
     for x,y in tl:
-        SINK(x) #$ flow="SOURCE, l:-2 -> x"
+        SINK(x) # $ flow="SOURCE, l:-2 -> x"
         SINK_F(y)
 
 
@@ -700,21 +700,21 @@ def test_iterable_star_unpacking_in_for():
     tl = [(SOURCE, NONSOURCE), (SOURCE, NONSOURCE)]
     for *x,y in tl:
         SINK_F(x)
-        SINK(x[0]) #$ flow="SOURCE, l:-3 -> x[0]"
-        SINK_F(y) #$ SPURIOUS: flow="SOURCE, l:-4 -> y"  # FP here since we do not track the tuple lenght and so `*x` could be empty
+        SINK(x[0]) # $ flow="SOURCE, l:-3 -> x[0]"
+        SINK_F(y) # $ SPURIOUS: flow="SOURCE, l:-4 -> y"  # FP here since we do not track the tuple lenght and so `*x` could be empty
 
 
 @expects(6)
 def test_iterable_star_unpacking_in_for_2():
     tl = [(SOURCE, NONSOURCE), (SOURCE, NONSOURCE)]
     for x,*y,z in tl:
-        SINK(x) #$ flow="SOURCE, l:-2 -> x"
+        SINK(x) # $ flow="SOURCE, l:-2 -> x"
         SINK_F(y)  # The list itself is not tainted (and is here empty)
         SINK_F(z)
 
 def iterate_star_args(first, second, *args):
   for arg in args:
-    SINK(arg) #$ flow="SOURCE, l:+5 -> arg" flow="SOURCE, l:+6 -> arg"
+    SINK(arg) # $ flow="SOURCE, l:+5 -> arg" flow="SOURCE, l:+6 -> arg"
 
 # FP reported here: https://github.com/github/codeql-python-team/issues/49
 @expects(2)
@@ -751,17 +751,17 @@ def test_deep_callgraph():
         return f5(arg)
 
     x = f6(SOURCE)
-    SINK(x) #$ flow="SOURCE, l:-1 -> x"
+    SINK(x) # $ flow="SOURCE, l:-1 -> x"
     x = f5(SOURCE)
-    SINK(x) #$ flow="SOURCE, l:-1 -> x"
+    SINK(x) # $ flow="SOURCE, l:-1 -> x"
     x = f4(SOURCE)
-    SINK(x) #$ flow="SOURCE, l:-1 -> x"
+    SINK(x) # $ flow="SOURCE, l:-1 -> x"
     x = f3(SOURCE)
-    SINK(x) #$ flow="SOURCE, l:-1 -> x"
+    SINK(x) # $ flow="SOURCE, l:-1 -> x"
     x = f2(SOURCE)
-    SINK(x) #$ flow="SOURCE, l:-1 -> x"
+    SINK(x) # $ flow="SOURCE, l:-1 -> x"
     x = f1(SOURCE)
-    SINK(x) #$ flow="SOURCE, l:-1 -> x"
+    SINK(x) # $ flow="SOURCE, l:-1 -> x"
 
 
 def wat_f1(arg):
@@ -785,17 +785,17 @@ def wat_f6(arg):
 @expects(6)
 def test_deep_callgraph_defined_in_module():
     x = wat_f6(SOURCE)
-    SINK(x) #$ flow="SOURCE, l:-1 -> x"
+    SINK(x) # $ flow="SOURCE, l:-1 -> x"
     x = wat_f5(SOURCE)
-    SINK(x) #$ flow="SOURCE, l:-1 -> x"
+    SINK(x) # $ flow="SOURCE, l:-1 -> x"
     x = wat_f4(SOURCE)
-    SINK(x) #$ flow="SOURCE, l:-1 -> x"
+    SINK(x) # $ flow="SOURCE, l:-1 -> x"
     x = wat_f3(SOURCE)
-    SINK(x) #$ flow="SOURCE, l:-1 -> x"
+    SINK(x) # $ flow="SOURCE, l:-1 -> x"
     x = wat_f2(SOURCE)
-    SINK(x) #$ flow="SOURCE, l:-1 -> x"
+    SINK(x) # $ flow="SOURCE, l:-1 -> x"
     x = wat_f1(SOURCE)
-    SINK(x) #$ flow="SOURCE, l:-1 -> x"
+    SINK(x) # $ flow="SOURCE, l:-1 -> x"
 
 @expects(2)
 def test_dynamic_tuple_creation_1():
@@ -803,7 +803,7 @@ def test_dynamic_tuple_creation_1():
     tup += (SOURCE,)
     tup += (NONSOURCE,)
 
-    SINK(tup[0]) #$ MISSING:flow="SOURCE, l:-3 -> tup[0]"
+    SINK(tup[0]) # $ MISSING:flow="SOURCE, l:-3 -> tup[0]"
     SINK_F(tup[1])
 
 
@@ -813,7 +813,7 @@ def test_dynamic_tuple_creation_2():
     tup += (SOURCE,)
     tup += (NONSOURCE,)
 
-    SINK(tup[0]) #$ MISSING:flow="SOURCE, l:-3 -> tup[0]"
+    SINK(tup[0]) # $ MISSING:flow="SOURCE, l:-3 -> tup[0]"
     SINK_F(tup[1])
 
 
@@ -823,7 +823,7 @@ def test_dynamic_tuple_creation_3():
     tup2 = (NONSOURCE,)
     tup = tup1 + tup2
 
-    SINK(tup[0]) #$ MISSING:flow="SOURCE, l:-4 -> tup[0]"
+    SINK(tup[0]) # $ MISSING:flow="SOURCE, l:-4 -> tup[0]"
     SINK_F(tup[1])
 
 
@@ -834,7 +834,7 @@ def test_dynamic_tuple_creation_4():
     for item in [SOURCE, NONSOURCE]:
         tup += (item,)
 
-    SINK(tup[0]) #$ MISSING:flow="SOURCE, l:-3 -> tup[0]"
+    SINK(tup[0]) # $ MISSING:flow="SOURCE, l:-3 -> tup[0]"
     SINK_F(tup[1])
 
 def return_from_inner_scope(x):
@@ -844,7 +844,7 @@ def return_from_inner_scope(x):
         return SOURCE
 
 def test_return_from_inner_scope():
-    SINK(return_from_inner_scope([]))  #$ flow="SOURCE, l:-3 -> return_from_inner_scope(..)"
+    SINK(return_from_inner_scope([]))  # $ flow="SOURCE, l:-3 -> return_from_inner_scope(..)"
 
 
 # Inspired by reverse read inconsistency check
@@ -855,13 +855,13 @@ def test_reverse_read_subscript():
     d = {"a": NONSOURCE}
     l = [d]
     insertAtA(l[0])
-    SINK(d["a"])  #$ MISSING:flow="SOURCE, l-6 -> d['a']""
+    SINK(d["a"])  # $ MISSING:flow="SOURCE, l-6 -> d['a']""
 
 def test_reverse_read_dict_arg():
     d = {"a": NONSOURCE}
     dd = {"d": d}
     insertAtA(**dd)
-    SINK(d["a"])  #$ MISSING:flow="SOURCE, l-12 -> d['a']""
+    SINK(d["a"])  # $ MISSING:flow="SOURCE, l-12 -> d['a']""
 
 
 class WithA:
@@ -876,10 +876,10 @@ def test_reverse_read_subscript_cls():
     withA = WithA()
     l = [withA]
     l[0].setA(SOURCE)
-    SINK(withA.a) #$ MISSING:flow="SOURCE, l:-1 -> self.a"
+    SINK(withA.a) # $ MISSING:flow="SOURCE, l:-1 -> self.a"
 
 @expects(3)
 def test_with_default_param_value(x=SOURCE, /, y=SOURCE, *, z=SOURCE):
-    SINK(x) #$ flow="SOURCE, l:-1 -> x"
-    SINK(y) #$ flow="SOURCE, l:-2 -> y"
-    SINK(z) #$ flow="SOURCE, l:-3 -> z"
+    SINK(x) # $ flow="SOURCE, l:-1 -> x"
+    SINK(y) # $ flow="SOURCE, l:-2 -> y"
+    SINK(z) # $ flow="SOURCE, l:-3 -> z"
diff --git a/python/ql/test/library-tests/dataflow/coverage/test_builtins.py b/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
index d609dbe3ef2..8e87e56dc2e 100644
--- a/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
+++ b/python/ql/test/library-tests/dataflow/coverage/test_builtins.py
@@ -41,8 +41,8 @@ def SINK_F(x):
 def test_list_from_list():
     l1 = [SOURCE, NONSOURCE]
     l2 = list(l1)
-    SINK(l2[0]) #$ flow="SOURCE, l:-2 -> l2[0]"
-    SINK_F(l2[1]) #$ SPURIOUS: flow="SOURCE, l:-3 -> l2[1]"
+    SINK(l2[0]) # $ flow="SOURCE, l:-2 -> l2[0]"
+    SINK_F(l2[1]) # $ SPURIOUS: flow="SOURCE, l:-3 -> l2[1]"
 
 # -- skip list_from_string
 
@@ -50,19 +50,19 @@ def test_list_from_list():
 def test_list_from_tuple():
     t = (SOURCE, NONSOURCE)
     l = list(t)
-    SINK(l[0]) #$ flow="SOURCE, l:-2 -> l[0]"
-    SINK_F(l[1]) #$ SPURIOUS: flow="SOURCE, l:-3 -> l[1]"
+    SINK(l[0]) # $ flow="SOURCE, l:-2 -> l[0]"
+    SINK_F(l[1]) # $ SPURIOUS: flow="SOURCE, l:-3 -> l[1]"
 
 def test_list_from_set():
     s = {SOURCE}
     l = list(s)
-    SINK(l[0]) #$ flow="SOURCE, l:-2 -> l[0]"
+    SINK(l[0]) # $ flow="SOURCE, l:-2 -> l[0]"
 
 @expects(2)
 def test_list_from_dict():
     d = {SOURCE: 'v', NONSOURCE: 'v2'}
     l = list(d)
-    SINK(l[0]) #$ MISSING: flow="SOURCE, l:-2 -> l[0]"
+    SINK(l[0]) # $ MISSING: flow="SOURCE, l:-2 -> l[0]"
     SINK_F(l[1]) # expecting FP due to imprecise flow
 
 ### Tuple
@@ -71,26 +71,26 @@ def test_list_from_dict():
 def test_tuple_from_list():
     l = [SOURCE, NONSOURCE]
     t = tuple(l)
-    SINK(t[0]) #$ MISSING: flow="SOURCE, l:-2 -> t[0]"
+    SINK(t[0]) # $ MISSING: flow="SOURCE, l:-2 -> t[0]"
     SINK_F(t[1])
 
 @expects(2)
 def test_tuple_from_tuple():
     t0 = (SOURCE, NONSOURCE)
     t = tuple(t0)
-    SINK(t[0]) #$ flow="SOURCE, l:-2 -> t[0]"
+    SINK(t[0]) # $ flow="SOURCE, l:-2 -> t[0]"
     SINK_F(t[1])
 
 def test_tuple_from_set():
     s = {SOURCE}
     t = tuple(s)
-    SINK(t[0]) #$ MISSING: flow="SOURCE, l:-2 -> t[0]"
+    SINK(t[0]) # $ MISSING: flow="SOURCE, l:-2 -> t[0]"
 
 @expects(2)
 def test_tuple_from_dict():
     d = {SOURCE: "v1", NONSOURCE: "v2"}
     t = tuple(d)
-    SINK(t[0]) #$ MISSING: flow="SOURCE, l:-2 -> t[0]"
+    SINK(t[0]) # $ MISSING: flow="SOURCE, l:-2 -> t[0]"
     SINK_F(t[1])
 
 
@@ -100,25 +100,25 @@ def test_set_from_list():
     l = [SOURCE]
     s = set(l)
     v = s.pop()
-    SINK(v) #$ flow="SOURCE, l:-3 -> v"
+    SINK(v) # $ flow="SOURCE, l:-3 -> v"
 
 def test_set_from_tuple():
     t = (SOURCE,)
     s = set(t)
     v = s.pop()
-    SINK(v) #$ flow="SOURCE, l:-3 -> v"
+    SINK(v) # $ flow="SOURCE, l:-3 -> v"
 
 def test_set_from_set():
     s0 = {SOURCE}
     s = set(s0)
     v = s.pop()
-    SINK(v) #$ flow="SOURCE, l:-3 -> v"
+    SINK(v) # $ flow="SOURCE, l:-3 -> v"
 
 def test_set_from_dict():
     d = {SOURCE: "val"}
     s = set(d)
     v = s.pop()
-    SINK(v) #$ MISSING: flow="SOURCE, l:-3 -> v"
+    SINK(v) # $ MISSING: flow="SOURCE, l:-3 -> v"
 
 
 ### Dict
@@ -126,29 +126,29 @@ def test_set_from_dict():
 @expects(2)
 def test_dict_from_keyword():
     d = dict(k = SOURCE, k1 = NONSOURCE)
-    SINK(d["k"]) #$ flow="SOURCE, l:-1 -> d['k']"
+    SINK(d["k"]) # $ flow="SOURCE, l:-1 -> d['k']"
     SINK_F(d["k1"])
 
 @expects(2)
 def test_dict_from_list():
     d = dict([("k", SOURCE), ("k1", NONSOURCE)])
-    SINK(d["k"]) #$ flow="SOURCE, l:-1 -> d['k']"
-    SINK_F(d["k1"]) #$ SPURIOUS: flow="SOURCE, l:-2 -> d['k1']"  // due to imprecise list content
+    SINK(d["k"]) # $ flow="SOURCE, l:-1 -> d['k']"
+    SINK_F(d["k1"]) # $ SPURIOUS: flow="SOURCE, l:-2 -> d['k1']"  // due to imprecise list content
 
 @expects(2)
 def test_dict_from_dict():
     d1 = {'k': SOURCE, 'k1': NONSOURCE}
     d2 = dict(d1)
-    SINK(d2["k"]) #$ flow="SOURCE, l:-2 -> d2['k']"
+    SINK(d2["k"]) # $ flow="SOURCE, l:-2 -> d2['k']"
     SINK_F(d2["k1"])
 
 @expects(4)
 def test_dict_from_multiple_args():
     d = dict([("k", SOURCE), ("k1", NONSOURCE)], k2 = SOURCE, k3 = NONSOURCE)
-    SINK(d["k"]) #$ flow="SOURCE, l:-1 -> d['k']"
-    SINK_F(d["k1"]) #$ SPURIOUS: flow="SOURCE, l:-2 -> d['k1']" // due to imprecise list content
-    SINK(d["k2"]) #$ flow="SOURCE, l:-3 -> d['k2']"
-    SINK_F(d["k3"]) #$ SPURIOUS: flow="SOURCE, l:-4 -> d['k3']" // due to imprecise list content
+    SINK(d["k"]) # $ flow="SOURCE, l:-1 -> d['k']"
+    SINK_F(d["k1"]) # $ SPURIOUS: flow="SOURCE, l:-2 -> d['k1']" // due to imprecise list content
+    SINK(d["k2"]) # $ flow="SOURCE, l:-3 -> d['k2']"
+    SINK_F(d["k3"]) # $ SPURIOUS: flow="SOURCE, l:-4 -> d['k3']" // due to imprecise list content
 
 ## Container methods
 
@@ -157,46 +157,46 @@ def test_dict_from_multiple_args():
 def test_list_pop():
     l = [SOURCE]
     v = l.pop()
-    SINK(v) #$ flow="SOURCE, l:-2 -> v"
+    SINK(v) # $ flow="SOURCE, l:-2 -> v"
 
 def test_list_pop_index():
     l = [SOURCE]
     v = l.pop(0)
-    SINK(v) #$ flow="SOURCE, l:-2 -> v"
+    SINK(v) # $ flow="SOURCE, l:-2 -> v"
 
 def test_list_pop_index_imprecise():
     l = [SOURCE, NONSOURCE]
     v = l.pop(1)
-    SINK_F(v) #$ SPURIOUS: flow="SOURCE, l:-2 -> v"
+    SINK_F(v) # $ SPURIOUS: flow="SOURCE, l:-2 -> v"
 
 @expects(2)
 def test_list_copy():
     l0 = [SOURCE, NONSOURCE]
     l = l0.copy()
-    SINK(l[0]) #$ flow="SOURCE, l:-2 -> l[0]"
-    SINK_F(l[1]) #$ SPURIOUS: flow="SOURCE, l:-3 -> l[1]"
+    SINK(l[0]) # $ flow="SOURCE, l:-2 -> l[0]"
+    SINK_F(l[1]) # $ SPURIOUS: flow="SOURCE, l:-3 -> l[1]"
 
 def test_list_append():
     l = [NONSOURCE]
     l.append(SOURCE)
-    SINK(l[1]) #$ flow="SOURCE, l:-1 -> l[1]"
+    SINK(l[1]) # $ flow="SOURCE, l:-1 -> l[1]"
 
 ### Set
 
 def test_set_pop():
     s = {SOURCE}
     v = s.pop()
-    SINK(v) #$ flow="SOURCE, l:-2 -> v"
+    SINK(v) # $ flow="SOURCE, l:-2 -> v"
 
 def test_set_copy():
     s0 = {SOURCE}
     s = s0.copy()
-    SINK(s.pop()) #$ flow="SOURCE, l:-2 -> s.pop()"
+    SINK(s.pop()) # $ flow="SOURCE, l:-2 -> s.pop()"
 
 def test_set_add():
     s = set([])
     s.add(SOURCE)
-    SINK(s.pop()) #$ flow="SOURCE, l:-1 -> s.pop()"
+    SINK(s.pop()) # $ flow="SOURCE, l:-1 -> s.pop()"
 
 ### Dict
 
@@ -204,13 +204,13 @@ def test_dict_keys():
     d = {SOURCE: "value"}
     keys = d.keys()
     key_list = list(keys)
-    SINK(key_list[0]) #$ MISSING: flow="SOURCE, l:-3 -> key_list[0]"
+    SINK(key_list[0]) # $ MISSING: flow="SOURCE, l:-3 -> key_list[0]"
 
 def test_dict_values():
     d = {'k': SOURCE}
     vals = d.values()
     val_list = list(vals)
-    SINK(val_list[0]) #$ flow="SOURCE, l:-3 -> val_list[0]"
+    SINK(val_list[0]) # $ flow="SOURCE, l:-3 -> val_list[0]"
 
 @expects(4)
 def test_dict_items():
@@ -218,43 +218,43 @@ def test_dict_items():
     items = d.items()
     item_list = list(items)
     SINK_F(item_list[0][0]) # expecting FP due to imprecise flow
-    SINK(item_list[0][1]) #$ flow="SOURCE, l:-4 -> item_list[0][1]"
-    SINK(item_list[1][0]) #$ MISSING: flow="SOURCE, l:-5 -> item_list[1][0]"
-    SINK_F(item_list[1][1]) #$ SPURIOUS: flow="SOURCE, l:-6 -> item_list[1][1]"
+    SINK(item_list[0][1]) # $ flow="SOURCE, l:-4 -> item_list[0][1]"
+    SINK(item_list[1][0]) # $ MISSING: flow="SOURCE, l:-5 -> item_list[1][0]"
+    SINK_F(item_list[1][1]) # $ SPURIOUS: flow="SOURCE, l:-6 -> item_list[1][1]"
 
 @expects(3)
 def test_dict_pop():
     d = {'k': SOURCE}
     v = d.pop("k")
-    SINK(v) #$ flow="SOURCE, l:-2 -> v"
+    SINK(v) # $ flow="SOURCE, l:-2 -> v"
     v1 = d.pop("k", NONSOURCE)
-    SINK_F(v1) #$ SPURIOUS: flow="SOURCE, l:-4 -> v1"
+    SINK_F(v1) # $ SPURIOUS: flow="SOURCE, l:-4 -> v1"
     v2 = d.pop("non-existing", SOURCE)
-    SINK(v2) #$ flow="SOURCE, l:-1 -> v2"
+    SINK(v2) # $ flow="SOURCE, l:-1 -> v2"
 
 @expects(3)
 def test_dict_get():
     d = {'k': SOURCE}
     v = d.get("k")
-    SINK(v) #$ flow="SOURCE, l:-2 -> v"
+    SINK(v) # $ flow="SOURCE, l:-2 -> v"
     v1 = d.get("non-existing", SOURCE)
-    SINK(v1) #$ flow="SOURCE, l:-1 -> v1"
+    SINK(v1) # $ flow="SOURCE, l:-1 -> v1"
     k = "k"
     v2 = d.get(k)
-    SINK(v2) #$ flow="SOURCE, l:-7 -> v2"
+    SINK(v2) # $ flow="SOURCE, l:-7 -> v2"
 
 @expects(2)
 def test_dict_popitem():
     d = {'k': SOURCE}
     t = d.popitem() # could be any pair (before 3.7), but we only have one
     SINK_F(t[0])
-    SINK(t[1]) #$ flow="SOURCE, l:-3 -> t[1]"
+    SINK(t[1]) # $ flow="SOURCE, l:-3 -> t[1]"
 
 @expects(2)
 def test_dict_copy():
     d = {'k': SOURCE, 'k1': NONSOURCE}
     d1 = d.copy()
-    SINK(d1["k"]) #$ flow="SOURCE, l:-2 -> d1['k']"
+    SINK(d1["k"]) # $ flow="SOURCE, l:-2 -> d1['k']"
     SINK_F(d1["k1"])
 
 
@@ -265,22 +265,22 @@ def test_dict_copy():
 def test_sorted_list():
     l0 = [SOURCE]
     l = sorted(l0)
-    SINK(l[0]) #$ flow="SOURCE, l:-2 -> l[0]"
+    SINK(l[0]) # $ flow="SOURCE, l:-2 -> l[0]"
 
 def test_sorted_tuple():
     t = (SOURCE,)
     l = sorted(t)
-    SINK(l[0]) #$ flow="SOURCE, l:-2 -> l[0]"
+    SINK(l[0]) # $ flow="SOURCE, l:-2 -> l[0]"
 
 def test_sorted_set():
     s = {SOURCE}
     l = sorted(s)
-    SINK(l[0]) #$ flow="SOURCE, l:-2 -> l[0]"
+    SINK(l[0]) # $ flow="SOURCE, l:-2 -> l[0]"
 
 def test_sorted_dict():
     d = {SOURCE: "val"}
     l = sorted(d)
-    SINK(l[0]) #$ MISSING: flow="SOURCE, l:-2 -> l[0]"
+    SINK(l[0]) # $ MISSING: flow="SOURCE, l:-2 -> l[0]"
 
 ### reversed
 
@@ -289,16 +289,16 @@ def test_reversed_list():
     l0 = [SOURCE, NONSOURCE]
     r = reversed(l0)
     l = list(r)
-    SINK_F(l[0]) #$ SPURIOUS: flow="SOURCE, l:-3 -> l[0]"
-    SINK(l[1]) #$ flow="SOURCE, l:-4 -> l[1]"
+    SINK_F(l[0]) # $ SPURIOUS: flow="SOURCE, l:-3 -> l[0]"
+    SINK(l[1]) # $ flow="SOURCE, l:-4 -> l[1]"
 
 @expects(2)
 def test_reversed_tuple():
     t = (SOURCE, NONSOURCE)
     r = reversed(t)
     l = list(r)
-    SINK_F(l[0]) #$ SPURIOUS: flow="SOURCE, l:-3 -> l[0]"
-    SINK(l[1]) #$ flow="SOURCE, l:-4 -> l[1]"
+    SINK_F(l[0]) # $ SPURIOUS: flow="SOURCE, l:-3 -> l[0]"
+    SINK(l[1]) # $ flow="SOURCE, l:-4 -> l[1]"
 
 @expects(2)
 def test_reversed_dict():
@@ -306,7 +306,7 @@ def test_reversed_dict():
     r = reversed(d)
     l = list(r)
     SINK_F(l[0])
-    SINK(l[1]) #$ MISSING: flow="SOURCE, l:-4 -> l[1]"
+    SINK(l[1]) # $ MISSING: flow="SOURCE, l:-4 -> l[1]"
 
 ### iter
 
@@ -314,32 +314,32 @@ def test_iter_list():
     l0 = [SOURCE]
     i = iter(l0)
     l = list(i)
-    SINK(l[0]) #$ flow="SOURCE, l:-3 -> l[0]"
+    SINK(l[0]) # $ flow="SOURCE, l:-3 -> l[0]"
 
 def test_iter_tuple():
     t = (SOURCE,)
     i = iter(t)
     l = list(i)
-    SINK(l[0]) #$ flow="SOURCE, l:-3 -> l[0]"
+    SINK(l[0]) # $ flow="SOURCE, l:-3 -> l[0]"
 
 def test_iter_set():
     t = {SOURCE}
     i = iter(t)
     l = list(i)
-    SINK(l[0]) #$ flow="SOURCE, l:-3 -> l[0]"
+    SINK(l[0]) # $ flow="SOURCE, l:-3 -> l[0]"
 
 def test_iter_dict():
     d = {SOURCE: "val"}
     i = iter(d)
     l = list(i)
-    SINK(l[0]) #$ MISSING: flow="SOURCE, l:-3 -> l[0]"
+    SINK(l[0]) # $ MISSING: flow="SOURCE, l:-3 -> l[0]"
 
 def test_iter_iter():
     # applying iter() to the result of iter() is basically a no-op
     l0 = [SOURCE]
     i = iter(iter(l0))
     l = list(i)
-    SINK(l[0]) #$ flow="SOURCE, l:-3 -> l[0]"
+    SINK(l[0]) # $ flow="SOURCE, l:-3 -> l[0]"
 
 ### next
 
@@ -347,25 +347,25 @@ def test_next_list():
     l = [SOURCE]
     i = iter(l)
     n = next(i)
-    SINK(n) #$ flow="SOURCE, l:-3 -> n"
+    SINK(n) # $ flow="SOURCE, l:-3 -> n"
 
 def test_next_tuple():
     t = (SOURCE,)
     i = iter(t)
     n = next(i)
-    SINK(n) #$ flow="SOURCE, l:-3 -> n"
+    SINK(n) # $ flow="SOURCE, l:-3 -> n"
 
 def test_next_set():
     s = {SOURCE}
     i = iter(s)
     n = next(i)
-    SINK(n) #$ flow="SOURCE, l:-3 -> n"
+    SINK(n) # $ flow="SOURCE, l:-3 -> n"
 
 def test_next_dict():
     d = {SOURCE: "val"}
     i = iter(d)
     n = next(i)
-    SINK(n) #$ MISSING: flow="SOURCE, l:-3 -> n"
+    SINK(n) # $ MISSING: flow="SOURCE, l:-3 -> n"
 
 ### map
 
@@ -375,13 +375,13 @@ def test_map_list():
     l2 = [NONSOURCE]
 
     def f(p1,p2):
-        SINK(p1)  #$ flow="SOURCE, l:-4 -> p1"
+        SINK(p1)  # $ flow="SOURCE, l:-4 -> p1"
         SINK_F(p2)
 
         return p1,p2
 
     rl = list(map(f, l1, l2))
-    SINK(rl[0][0]) #$ flow="SOURCE, l:-10 -> rl[0][0]"
+    SINK(rl[0][0]) # $ flow="SOURCE, l:-10 -> rl[0][0]"
     SINK_F(rl[0][1])
 
 @expects(4)
@@ -390,13 +390,13 @@ def test_map_set():
     s2 = {NONSOURCE}
 
     def f(p1,p2):
-        SINK(p1)  #$ flow="SOURCE, l:-4 -> p1"
+        SINK(p1)  # $ flow="SOURCE, l:-4 -> p1"
         SINK_F(p2)
 
         return p1,p2
 
     rl = list(map(f, s1, s2))
-    SINK(rl[0][0]) #$ flow="SOURCE, l:-10 -> rl[0][0]"
+    SINK(rl[0][0]) # $ flow="SOURCE, l:-10 -> rl[0][0]"
     SINK_F(rl[0][1])
 
 @expects(4)
@@ -405,13 +405,13 @@ def test_map_tuple():
     t2 = (NONSOURCE,)
 
     def f(p1,p2):
-        SINK(p1)  #$ flow="SOURCE, l:-4 -> p1"
+        SINK(p1)  # $ flow="SOURCE, l:-4 -> p1"
         SINK_F(p2)
 
         return p1,p2
 
     rl = list(map(f, t1, t2))
-    SINK(rl[0][0]) #$ flow="SOURCE, l:-10 -> rl[0][0]"
+    SINK(rl[0][0]) # $ flow="SOURCE, l:-10 -> rl[0][0]"
     SINK_F(rl[0][1])
 
 
@@ -421,13 +421,13 @@ def test_map_dict():
     d2 = {NONSOURCE: "v2"}
 
     def f(p1,p2):
-        SINK(p1)  #$ MISSING: flow="SOURCE, l:-4 -> p1"
+        SINK(p1)  # $ MISSING: flow="SOURCE, l:-4 -> p1"
         SINK_F(p2)
 
         return p1,p2
 
     rl = list(map(f, d1, d2))
-    SINK(rl[0][0]) #$ MISSING: flow="SOURCE, l:-10 -> rl[0][0]"
+    SINK(rl[0][0]) # $ MISSING: flow="SOURCE, l:-10 -> rl[0][0]"
     SINK_F(rl[0][1])
 
 @expects(4)
@@ -436,13 +436,13 @@ def test_map_multi_list():
     l2 = [SOURCE]
 
     def f(p1,p2):
-        SINK(p1)  #$ flow="SOURCE, l:-4 -> p1"
-        SINK(p2)  #$ flow="SOURCE, l:-4 -> p2"
+        SINK(p1)  # $ flow="SOURCE, l:-4 -> p1"
+        SINK(p2)  # $ flow="SOURCE, l:-4 -> p2"
         return p1,p2
 
     rl = list(map(f, l1, l2))
-    SINK(rl[0][0]) #$ flow="SOURCE, l:-9 -> rl[0][0]"
-    SINK(rl[0][1]) #$ flow="SOURCE, l:-9 -> rl[0][1]"
+    SINK(rl[0][0]) # $ flow="SOURCE, l:-9 -> rl[0][0]"
+    SINK(rl[0][1]) # $ flow="SOURCE, l:-9 -> rl[0][1]"
 
 @expects(4)
 def test_map_multi_tuple():
@@ -450,59 +450,59 @@ def test_map_multi_tuple():
     l2 = (SOURCE,)
 
     def f(p1,p2):
-        SINK(p1)  #$ flow="SOURCE, l:-4 -> p1"
-        SINK(p2)  #$ MISSING: flow="SOURCE, l:-4 -> p2" # Tuples are not tracked beyond the first list argument for performance.
+        SINK(p1)  # $ flow="SOURCE, l:-4 -> p1"
+        SINK(p2)  # $ MISSING: flow="SOURCE, l:-4 -> p2" # Tuples are not tracked beyond the first list argument for performance.
         return p1,p2
 
     rl = list(map(f, l1, l2))
-    SINK(rl[0][0]) #$ flow="SOURCE, l:-9 -> rl[0][0]"
-    SINK(rl[0][1]) #$ MISSING: flow="SOURCE, l:-9 -> rl[0][1]"
+    SINK(rl[0][0]) # $ flow="SOURCE, l:-9 -> rl[0][0]"
+    SINK(rl[0][1]) # $ MISSING: flow="SOURCE, l:-9 -> rl[0][1]"
 
-### filter 
+### filter
 
 @expects(2)
 def test_filter_list():
     l = [SOURCE]
 
     def f(p):
-        SINK(p) #$ flow="SOURCE, l:-3 -> p"
-        return True 
+        SINK(p) # $ flow="SOURCE, l:-3 -> p"
+        return True
 
     rl = list(filter(f,l))
-    SINK(rl[0]) #$ flow="SOURCE, l:-7 -> rl[0]"
+    SINK(rl[0]) # $ flow="SOURCE, l:-7 -> rl[0]"
 
 @expects(2)
 def test_filter_set():
     s = {SOURCE}
 
     def f(p):
-        SINK(p) #$ flow="SOURCE, l:-3 -> p"
-        return True 
+        SINK(p) # $ flow="SOURCE, l:-3 -> p"
+        return True
 
     rl = list(filter(f,s))
-    SINK(rl[0]) #$ flow="SOURCE, l:-7 -> rl[0]"
+    SINK(rl[0]) # $ flow="SOURCE, l:-7 -> rl[0]"
 
 @expects(2)
 def test_filter_tuple():
     t = (SOURCE,)
 
     def f(p):
-        SINK(p) #$ flow="SOURCE, l:-3 -> p"
-        return True 
+        SINK(p) # $ flow="SOURCE, l:-3 -> p"
+        return True
 
     rl = list(filter(f,t))
-    SINK(rl[0]) #$ flow="SOURCE, l:-7 -> rl[0]"
+    SINK(rl[0]) # $ flow="SOURCE, l:-7 -> rl[0]"
 
 @expects(2)
 def test_filter_dict():
     d = {SOURCE: "v"}
 
     def f(p):
-        SINK(p) #$ MISSING: flow="SOURCE, l:-3 -> p"
-        return True 
+        SINK(p) # $ MISSING: flow="SOURCE, l:-3 -> p"
+        return True
 
     rl = list(filter(f,d))
-    SINK(rl[0]) #$ MISSING: flow="SOURCE, l:-7 -> rl[0]"
+    SINK(rl[0]) # $ MISSING: flow="SOURCE, l:-7 -> rl[0]"
 
 @expects(1)
 def test_enumerate_list():
@@ -510,7 +510,7 @@ def test_enumerate_list():
 
     e = list(enumerate(l))
 
-    SINK(e[0][1]) #$ flow="SOURCE, l:-4 -> e[0][1]"
+    SINK(e[0][1]) # $ flow="SOURCE, l:-4 -> e[0][1]"
 
 @expects(1)
 def test_enumerate_set():
@@ -518,7 +518,7 @@ def test_enumerate_set():
 
     e = list(enumerate(s))
 
-    SINK(e[0][1]) #$ flow="SOURCE, l:-4 -> e[0][1]"
+    SINK(e[0][1]) # $ flow="SOURCE, l:-4 -> e[0][1]"
 
 @expects(1)
 def test_enumerate_tuple():
@@ -526,17 +526,17 @@ def test_enumerate_tuple():
 
     e = list(enumerate(t))
 
-    SINK(e[0][1]) #$ flow="SOURCE, l:-4 -> e[0][1]"
+    SINK(e[0][1]) # $ flow="SOURCE, l:-4 -> e[0][1]"
 
 @expects(2)
 def test_enumerate_list_for():
     l = [SOURCE]
 
     for i, x in enumerate(l):
-        SINK(x) #$ flow="SOURCE, l:-3 -> x" 
+        SINK(x) # $ flow="SOURCE, l:-3 -> x"
 
     for t in enumerate(l):
-        SINK(t[1]) #$ flow="SOURCE, l:-6 -> t[1]"
+        SINK(t[1]) # $ flow="SOURCE, l:-6 -> t[1]"
 
 @expects(1)
 def test_enumerate_dict():
@@ -552,16 +552,16 @@ def test_zip_list():
     l2 = [SOURCE, NONSOURCE]
     l3 = [NONSOURCE, SOURCE]
     l4 = [NONSOURCE, NONSOURCE]
-    
+
     z =  list(zip(l1,l2,l3,l4))
 
-    SINK(z[0][0])  #$ flow="SOURCE, l:-7 -> z[0][0]"
-    SINK(z[0][1])  #$ flow="SOURCE, l:-7 -> z[0][1]"
-    SINK_F(z[0][2])  #$ SPURIOUS: flow="SOURCE, l:-7 -> z[0][2]"
+    SINK(z[0][0])  # $ flow="SOURCE, l:-7 -> z[0][0]"
+    SINK(z[0][1])  # $ flow="SOURCE, l:-7 -> z[0][1]"
+    SINK_F(z[0][2])  # $ SPURIOUS: flow="SOURCE, l:-7 -> z[0][2]"
     SINK_F(z[0][3])
-    SINK(z[1][0])  #$ flow="SOURCE, l:-11 -> z[1][0]"
-    SINK_F(z[1][1]) #$ SPURIOUS: flow="SOURCE, l:-11 -> z[1][1]"
-    SINK(z[1][2]) #$ flow="SOURCE, l:-11 -> z[1][2]"
+    SINK(z[1][0])  # $ flow="SOURCE, l:-11 -> z[1][0]"
+    SINK_F(z[1][1]) # $ SPURIOUS: flow="SOURCE, l:-11 -> z[1][1]"
+    SINK(z[1][2]) # $ flow="SOURCE, l:-11 -> z[1][2]"
     SINK_F(z[1][3])
 
 @expects(4)
@@ -570,12 +570,12 @@ def test_zip_set():
     s2 = {NONSOURCE}
     s3 = {SOURCE}
     s4 = {NONSOURCE}
-    
+
     z =  list(zip(s1,s2,s3,s4))
 
-    SINK(z[0][0])  #$ flow="SOURCE, l:-7 -> z[0][0]"
+    SINK(z[0][0])  # $ flow="SOURCE, l:-7 -> z[0][0]"
     SINK_F(z[0][1])
-    SINK(z[0][2]) #$ flow="SOURCE, l:-7 -> z[0][2]"
+    SINK(z[0][2]) # $ flow="SOURCE, l:-7 -> z[0][2]"
     SINK_F(z[0][3])
 
 @expects(8)
@@ -584,16 +584,16 @@ def test_zip_tuple():
     t2 = (SOURCE, NONSOURCE)
     t3 = (NONSOURCE, SOURCE)
     t4 = (NONSOURCE, NONSOURCE)
-    
+
     z =  list(zip(t1,t2,t3,t4))
 
-    SINK(z[0][0])  #$ flow="SOURCE, l:-7 -> z[0][0]"
-    SINK(z[0][1])  #$ flow="SOURCE, l:-7 -> z[0][1]"
-    SINK_F(z[0][2])  
+    SINK(z[0][0])  # $ flow="SOURCE, l:-7 -> z[0][0]"
+    SINK(z[0][1])  # $ flow="SOURCE, l:-7 -> z[0][1]"
+    SINK_F(z[0][2])
     SINK_F(z[0][3])
-    SINK(z[1][0])  #$ flow="SOURCE, l:-11 -> z[1][0]"
-    SINK_F(z[1][1]) #$ SPURIOUS: flow="SOURCE, l:-11 -> z[1][1]"
-    SINK(z[1][2]) #$ MISSING: flow="SOURCE, l:-11 -> z[1][2]" # Tuple contents are not tracked beyond the first two arguments for performance.
+    SINK(z[1][0])  # $ flow="SOURCE, l:-11 -> z[1][0]"
+    SINK_F(z[1][1]) # $ SPURIOUS: flow="SOURCE, l:-11 -> z[1][1]"
+    SINK(z[1][2]) # $ MISSING: flow="SOURCE, l:-11 -> z[1][2]" # Tuple contents are not tracked beyond the first two arguments for performance.
     SINK_F(z[1][3])
 
 @expects(4)
@@ -602,10 +602,10 @@ def test_zip_dict():
     d2 = {NONSOURCE: "v"}
     d3 = {SOURCE: "v"}
     d4 = {NONSOURCE: "v"}
-    
+
     z =  list(zip(d1,d2,d3,d4))
 
-    SINK(z[0][0])  #$ MISSING: flow="SOURCE, l:-7 -> z[0][0]"
-    SINK_F(z[0][1]) 
-    SINK(z[0][2]) #$ MISSING: flow="SOURCE, l:-7 -> z[0][2]"
-    SINK_F(z[0][3])
\ No newline at end of file
+    SINK(z[0][0])  # $ MISSING: flow="SOURCE, l:-7 -> z[0][0]"
+    SINK_F(z[0][1])
+    SINK(z[0][2]) # $ MISSING: flow="SOURCE, l:-7 -> z[0][2]"
+    SINK_F(z[0][3])
diff --git a/python/ql/test/library-tests/dataflow/global-flow/known.py b/python/ql/test/library-tests/dataflow/global-flow/known.py
index f9bdbd7af54..045e9ecc051 100644
--- a/python/ql/test/library-tests/dataflow/global-flow/known.py
+++ b/python/ql/test/library-tests/dataflow/global-flow/known.py
@@ -1 +1 @@
-known_attr = [1000] #$ writes=known_attr
+known_attr = [1000] # $ writes=known_attr
diff --git a/python/ql/test/library-tests/dataflow/global-flow/test.py b/python/ql/test/library-tests/dataflow/global-flow/test.py
index 0b62e47c71f..2f122364d37 100644
--- a/python/ql/test/library-tests/dataflow/global-flow/test.py
+++ b/python/ql/test/library-tests/dataflow/global-flow/test.py
@@ -2,15 +2,15 @@
 
 # Simple assignment
 
-g = [5] # $writes=g
+g = [5] # $ writes=g
 
 # Multiple assignment
 
-g1, g2 = [6], [7] # $writes=g1 writes=g2
+g1, g2 = [6], [7] # $ writes=g1 writes=g2
 
 # Assignment that's only referenced in this scope.
 
-unreferenced_g = [8] # $writes=unreferenced_g
+unreferenced_g = [8] # $ writes=unreferenced_g
 print(unreferenced_g)
 
 # Testing modifications of globals
@@ -24,49 +24,49 @@ g_mod = []
 # but currently our analysis thinks `g_mod` might be used in the `print` call
 g_mod = [10] # $ SPURIOUS: writes=g_mod
 print("foo")
-g_mod = [100] # $writes=g_mod
+g_mod = [100] # $ writes=g_mod
 
 # Modification by mutation
 
-g_ins = [50] # $writes=g_ins
+g_ins = [50] # $ writes=g_ins
 print(g_ins)
 g_ins.append(75)
 
 # A global with multiple potential definitions
 
-import unknown_module # $writes=unknown_module
+import unknown_module # $ writes=unknown_module
 if unknown_module.attr:
-    g_mult = [200] # $writes=g_mult
+    g_mult = [200] # $ writes=g_mult
 else:
-    g_mult = [300] # $writes=g_mult
+    g_mult = [300] # $ writes=g_mult
 
 # A global variable that may be redefined depending on some unknown value
 
-g_redef = [400] # $writes=g_redef
+g_redef = [400] # $ writes=g_redef
 if unknown_module.attr:
-    g_redef = [500] # $writes=g_redef
+    g_redef = [500] # $ writes=g_redef
 
-def global_access(): # $writes=global_access
+def global_access(): # $ writes=global_access
     l = 5
-    print(g) # $reads=g
-    print(g1) # $reads=g1
-    print(g2) # $reads=g2
-    print(g_mod) # $reads=g_mod
-    print(g_ins) # $reads=g_ins
-    print(g_mult) # $reads=g_mult
-    print(g_redef) # $reads=g_redef
+    print(g) # $ reads=g
+    print(g1) # $ reads=g1
+    print(g2) # $ reads=g2
+    print(g_mod) # $ reads=g_mod
+    print(g_ins) # $ reads=g_ins
+    print(g_mult) # $ reads=g_mult
+    print(g_redef) # $ reads=g_redef
 
-def print_g_mod(): # $writes=print_g_mod
-    print(g_mod) # $reads=g_mod
+def print_g_mod(): # $ writes=print_g_mod
+    print(g_mod) # $ reads=g_mod
 
-def global_mod(): # $writes=global_mod
+def global_mod(): # $ writes=global_mod
     global g_mod
-    g_mod += [150] # $reads,writes=g_mod
-    print_g_mod() # $reads=print_g_mod
+    g_mod += [150] # $ reads,writes=g_mod
+    print_g_mod() # $ reads=print_g_mod
 
-def global_inside_local_function(): # $writes=global_inside_local_function
+def global_inside_local_function(): # $ writes=global_inside_local_function
     def local_function():
-        print(g) # $reads=g
+        print(g) # $ reads=g
     local_function()
 
 ## Imports
@@ -74,24 +74,24 @@ def global_inside_local_function(): # $writes=global_inside_local_function
 
 # Direct imports
 
-import foo_module # $writes=foo_module
+import foo_module # $ writes=foo_module
 
-def use_foo(): # $writes=use_foo
-    print(foo_module.attr) # $reads=foo_module
+def use_foo(): # $ writes=use_foo
+    print(foo_module.attr) # $ reads=foo_module
 
 # Partial imports
 
-from bar import baz_attr, quux_attr # $writes=baz_attr writes=quux_attr
+from bar import baz_attr, quux_attr # $ writes=baz_attr writes=quux_attr
 
-def use_partial_import(): # $writes=use_partial_import
-    print(baz_attr, quux_attr) # $reads=baz_attr reads=quux_attr
+def use_partial_import(): # $ writes=use_partial_import
+    print(baz_attr, quux_attr) # $ reads=baz_attr reads=quux_attr
 
 # Aliased imports
 
-from spam_module import ham_attr as eggs_attr # $writes=eggs_attr
+from spam_module import ham_attr as eggs_attr # $ writes=eggs_attr
 
-def use_aliased_import(): # $writes=use_aliased_import
-    print(eggs_attr) # $reads=eggs_attr
+def use_aliased_import(): # $ writes=use_aliased_import
+    print(eggs_attr) # $ reads=eggs_attr
 
 # Import star (unlikely to work unless we happen to extract/model the referenced module)
 
@@ -99,23 +99,23 @@ def use_aliased_import(): # $writes=use_aliased_import
 
 from unknown import *
 
-def secretly_use_unknown(): # $writes=secretly_use_unknown
-    print(unknown_attr) # $reads=unknown_attr
+def secretly_use_unknown(): # $ writes=secretly_use_unknown
+    print(unknown_attr) # $ reads=unknown_attr
 
 # Known modules
 
 from known import *
 
-def secretly_use_known(): # $writes=secretly_use_known
-    print(known_attr) # $reads=known_attr
+def secretly_use_known(): # $ writes=secretly_use_known
+    print(known_attr) # $ reads=known_attr
 
 # Local import in function
 
-def imports_locally(): # $writes=imports_locally
+def imports_locally(): # $ writes=imports_locally
     import mod1
 
 # Global import hidden in function
 
-def imports_stuff(): # $writes=imports_stuff
+def imports_stuff(): # $ writes=imports_stuff
     global mod2
-    import mod2 # $writes=mod2
+    import mod2 # $ writes=mod2
diff --git a/python/ql/test/library-tests/dataflow/global-or-captured-vars/test.py b/python/ql/test/library-tests/dataflow/global-or-captured-vars/test.py
index 7719021890f..dcb09c61187 100644
--- a/python/ql/test/library-tests/dataflow/global-or-captured-vars/test.py
+++ b/python/ql/test/library-tests/dataflow/global-or-captured-vars/test.py
@@ -1,4 +1,4 @@
-import threading 
+import threading
 import time
 
 # Test 1
@@ -7,11 +7,11 @@ foo1 = None
 
 def bar1():
     time.sleep(1)
-    ensure_tainted(foo1) # $tainted
+    ensure_tainted(foo1) # $ tainted
 
-# The intent of these tests is to test how dataflow is handled through shared state accessed by different threads; 
+# The intent of these tests is to test how dataflow is handled through shared state accessed by different threads;
 # but the presense or absense of the actual call to start a thread does not affect the results (there is no special modelling for Thread)
-# threading.Thread(target=bar).start() 
+# threading.Thread(target=bar).start()
 
 foo1 = TAINTED_STRING
 
@@ -21,7 +21,7 @@ foo2 = []
 
 def bar2():
     time.sleep(1)
-    ensure_tainted(foo2[0]) # $MISSING:tainted
+    ensure_tainted(foo2[0]) # $ MISSING:tainted
 
 threading.Thread(target=bar2).start()
 
@@ -33,7 +33,7 @@ foo3 = []
 
 def bar3():
     time.sleep(1)
-    ensure_tainted(foo2[0]) # $MISSING:tainted
+    ensure_tainted(foo2[0]) # $ MISSING:tainted
 
 foo3.append(TAINTED_STRING)
 bar3()
@@ -42,16 +42,16 @@ bar3()
 # TP - Sanity check: Flow is found through a ListElement directly without a call
 foo4 = []
 foo4.append(TAINTED_STRING)
-ensure_tainted(foo4[0]) # $tainted
+ensure_tainted(foo4[0]) # $ tainted
 
 # Test 5
 # FN - Flow is *not* tracked through a shared captured but non-global variable
 def test5():
-    foo5 = None 
+    foo5 = None
 
     def bar5():
         time.sleep(1)
-        ensure_tainted(foo5) # $MISSING:tainted
+        ensure_tainted(foo5) # $ MISSING:tainted
 
     threading.Thread(target=bar5).start() # Only the presense of this thread call makes this an FN rather than a TN
 
@@ -64,7 +64,7 @@ def test6():
 
     def bar6():
         time.sleep(1)
-        ensure_tainted(foo6[0]) # $tainted
+        ensure_tainted(foo6[0]) # $ tainted
 
     foo6.append(TAINTED_STRING)
     bar6()
@@ -78,7 +78,7 @@ foo7 = []
 
 def bar7():
     time.sleep(1)
-    ensure_tainted(foo7[0]) # $MISSING: tainted
+    ensure_tainted(foo7[0]) # $ MISSING: tainted
 
 def baz7(loc_foo):
     loc_foo.append(TAINTED_STRING)
@@ -88,13 +88,13 @@ threading.Thread(target=bar7).start()
 baz7(foo7)
 
 # Test 8
-# FN - Flow is also *not* found in the above case through a direct call 
+# FN - Flow is also *not* found in the above case through a direct call
 
 foo8 = []
 
 def bar8():
     time.sleep(1)
-    ensure_tainted(foo8[0]) # $MISSING: tainted
+    ensure_tainted(foo8[0]) # $ MISSING: tainted
 
 def baz8(loc_foo):
     loc_foo.append(TAINTED_STRING)
@@ -109,10 +109,10 @@ def test9():
     foo9 = []
     def bar9():
         time.sleep(1)
-        ensure_tainted(foo9[0]) # $tainted
+        ensure_tainted(foo9[0]) # $ tainted
 
     def baz9(loc_foo):
         loc_foo.append(TAINTED_STRING)
 
     baz9(foo9)
-    bar9()
\ No newline at end of file
+    bar9()
diff --git a/python/ql/test/library-tests/dataflow/match/test.py b/python/ql/test/library-tests/dataflow/match/test.py
index abdeaa2ee7c..cc921a9753e 100644
--- a/python/ql/test/library-tests/dataflow/match/test.py
+++ b/python/ql/test/library-tests/dataflow/match/test.py
@@ -29,32 +29,32 @@ def SINK_F(x):
 
 def test_guard():
     match SOURCE:
-        case x if SINK(x): #$ flow="SOURCE, l:-1 -> x"
+        case x if SINK(x): # $ flow="SOURCE, l:-1 -> x"
             pass
 
 @expects(2)
 def test_as_pattern():
     match SOURCE:
         case x as y:
-            SINK(x) #$ flow="SOURCE, l:-2 -> x"
-            SINK(y) #$ flow="SOURCE, l:-3 -> y"
+            SINK(x) # $ flow="SOURCE, l:-2 -> x"
+            SINK(y) # $ flow="SOURCE, l:-3 -> y"
 
 def test_or_pattern():
     match SOURCE:
         # We cannot use NONSOURCE in place of "" below, since it would be seen as a variable.
         case ("" as x) | x:
-            SINK(x) #$ flow="SOURCE, l:-3 -> x"
+            SINK(x) # $ flow="SOURCE, l:-3 -> x"
 
 # No flow for literal pattern
 def test_literal_pattern():
     match SOURCE:
         case "source" as x:
-            SINK(x) #$ flow="SOURCE, l:-2 -> x" flow="'source', l:-1 -> x"
+            SINK(x) # $ flow="SOURCE, l:-2 -> x" flow="'source', l:-1 -> x"
 
 def test_capture_pattern():
     match SOURCE:
         case x:
-            SINK(x) #$ flow="SOURCE, l:-2 -> x"
+            SINK(x) # $ flow="SOURCE, l:-2 -> x"
 
 # No flow for wildcard pattern
 
@@ -64,21 +64,21 @@ class Unsafe:
 def test_value_pattern():
     match SOURCE:
         case Unsafe.VALUE as x:
-            SINK(x) #$ flow="SOURCE, l:-2 -> x" flow="SOURCE, l:-5 -> x"
+            SINK(x) # $ flow="SOURCE, l:-2 -> x" flow="SOURCE, l:-5 -> x"
 
 @expects(2)
 def test_sequence_pattern_tuple():
     match (NONSOURCE, SOURCE):
         case (x, y):
             SINK_F(x)
-            SINK(y) #$ flow="SOURCE, l:-3 -> y"
+            SINK(y) # $ flow="SOURCE, l:-3 -> y"
 
 @expects(2)
 def test_sequence_pattern_list():
     match [NONSOURCE, SOURCE]:
         case [x, y]:
-            SINK_F(x) #$ SPURIOUS: flow="SOURCE, l:-2 -> x"
-            SINK(y) #$ flow="SOURCE, l:-3 -> y"
+            SINK_F(x) # $ SPURIOUS: flow="SOURCE, l:-2 -> x"
+            SINK(y) # $ flow="SOURCE, l:-3 -> y"
 
 # Sets are excluded from sequence patterns,
 #   see https://www.python.org/dev/peps/pep-0635/#sequence-patterns
@@ -88,35 +88,35 @@ def test_star_pattern_tuple():
     match (NONSOURCE, SOURCE):
         case (x, *y):
             SINK_F(x)
-            SINK(y[0]) #$ flow="SOURCE, l:-3 -> y[0]"
+            SINK(y[0]) # $ flow="SOURCE, l:-3 -> y[0]"
 
 @expects(2)
 def test_star_pattern_tuple_exclusion():
     match (SOURCE, NONSOURCE):
         case (x, *y):
-            SINK(x) #$ flow="SOURCE, l:-2 -> x"
+            SINK(x) # $ flow="SOURCE, l:-2 -> x"
             SINK_F(y[0])
 
 @expects(2)
 def test_star_pattern_list():
     match [NONSOURCE, SOURCE]:
         case [x, *y]:
-            SINK_F(x) #$ SPURIOUS: flow="SOURCE, l:-2 -> x"
-            SINK(y[0]) #$ flow="SOURCE, l:-3 -> y[0]"
+            SINK_F(x) # $ SPURIOUS: flow="SOURCE, l:-2 -> x"
+            SINK(y[0]) # $ flow="SOURCE, l:-3 -> y[0]"
 
 @expects(2)
 def test_star_pattern_list_exclusion():
     match [SOURCE, NONSOURCE]:
         case [x, *y]:
-            SINK(x) #$ flow="SOURCE, l:-2 -> x"
-            SINK_F(y[0]) #$ SPURIOUS: flow="SOURCE, l:-3 -> y[0]"
+            SINK(x) # $ flow="SOURCE, l:-2 -> x"
+            SINK_F(y[0]) # $ SPURIOUS: flow="SOURCE, l:-3 -> y[0]"
 
 @expects(2)
 def test_mapping_pattern():
     match {"a": NONSOURCE, "b": SOURCE}:
         case {"a": x, "b": y}:
             SINK_F(x)
-            SINK(y) #$ flow="SOURCE, l:-3 -> y"
+            SINK(y) # $ flow="SOURCE, l:-3 -> y"
 
 # also tests the key value pattern
 @expects(2)
@@ -124,13 +124,13 @@ def test_double_star_pattern():
     match {"a": NONSOURCE, "b": SOURCE}:
         case {"a": x, **y}:
             SINK_F(x)
-            SINK(y["b"]) #$ flow="SOURCE, l:-3 -> y['b']"
+            SINK(y["b"]) # $ flow="SOURCE, l:-3 -> y['b']"
 
 @expects(2)
 def test_double_star_pattern_exclusion():
     match {"a": SOURCE, "b": NONSOURCE}:
         case {"a": x, **y}:
-            SINK(x) #$ flow="SOURCE, l:-2 -> x"
+            SINK(x) # $ flow="SOURCE, l:-2 -> x"
             SINK_F(y["b"])
             try:
                 SINK_F(y["a"])
@@ -149,7 +149,7 @@ def test_class_pattern():
 
     match bad_cell:
         case Cell(value = x):
-            SINK(x) #$ flow="SOURCE, l:-5 -> x"
+            SINK(x) # $ flow="SOURCE, l:-5 -> x"
 
     match good_cell:
         case Cell(value = x):
diff --git a/python/ql/test/library-tests/dataflow/model-summaries/model_summaries.py b/python/ql/test/library-tests/dataflow/model-summaries/model_summaries.py
index 7fda90c1cd7..86c9d3103e9 100644
--- a/python/ql/test/library-tests/dataflow/model-summaries/model_summaries.py
+++ b/python/ql/test/library-tests/dataflow/model-summaries/model_summaries.py
@@ -182,7 +182,7 @@ SINK(instance.instance_method(SOURCE)[1])  # $ flow="SOURCE -> instance.instance
 returned_class = get_class()
 SINK(returned_class(SOURCE).config)  # $ flow="SOURCE -> returned_class(..).config"
 
-SINK(returned_class().instance_method(SOURCE)[1])  # $flow="SOURCE -> returned_class().instance_method(..)[1]"
+SINK(returned_class().instance_method(SOURCE)[1])  # $ flow="SOURCE -> returned_class().instance_method(..)[1]"
 
 fatory_instance = MS_Factory.get_instance()
 SINK(fatory_instance.instance_method(SOURCE)[1])  # $ flow="SOURCE -> fatory_instance.instance_method(..)[1]"
diff --git a/python/ql/test/library-tests/dataflow/module-initialization/multiphase.py b/python/ql/test/library-tests/dataflow/module-initialization/multiphase.py
index 9a3512732f5..71c0ca2e62d 100644
--- a/python/ql/test/library-tests/dataflow/module-initialization/multiphase.py
+++ b/python/ql/test/library-tests/dataflow/module-initialization/multiphase.py
@@ -1,42 +1,42 @@
-import sys  #$ importTimeFlow="ImportExpr -> sys"
-import os  #$ importTimeFlow="ImportExpr -> os"
+import sys  # $ importTimeFlow="ImportExpr -> sys"
+import os  # $ importTimeFlow="ImportExpr -> os"
 
 sys.path.append(os.path.dirname(os.path.dirname((__file__))))
-from testlib import expects #$ importTimeFlow="ImportMember -> expects"
+from testlib import expects # $ importTimeFlow="ImportMember -> expects"
 
 # These are defined so that we can evaluate the test code.
-NONSOURCE = "not a source"  #$ importTimeFlow="'not a source' -> NONSOURCE"
-SOURCE = "source"  #$ importTimeFlow="'source' -> SOURCE"
+NONSOURCE = "not a source"  # $ importTimeFlow="'not a source' -> NONSOURCE"
+SOURCE = "source"  # $ importTimeFlow="'source' -> SOURCE"
 
 
-def is_source(x):  #$ importTimeFlow="FunctionExpr -> is_source"
+def is_source(x):  # $ importTimeFlow="FunctionExpr -> is_source"
     return x == "source" or x == b"source" or x == 42 or x == 42.0 or x == 42j
 
 
-def SINK(x):  #$ importTimeFlow="FunctionExpr -> SINK"
-    if is_source(x):  #$ runtimeFlow="ModuleVariableNode in Module multiphase for is_source, l:-17 -> is_source"
-        print("OK")  #$ runtimeFlow="ModuleVariableNode in Module multiphase for print, l:-18 -> print"
+def SINK(x):  # $ importTimeFlow="FunctionExpr -> SINK"
+    if is_source(x):  # $ runtimeFlow="ModuleVariableNode in Module multiphase for is_source, l:-17 -> is_source"
+        print("OK")  # $ runtimeFlow="ModuleVariableNode in Module multiphase for print, l:-18 -> print"
     else:
-        print("Unexpected flow", x)  #$ runtimeFlow="ModuleVariableNode in Module multiphase for print, l:-20 -> print"
+        print("Unexpected flow", x)  # $ runtimeFlow="ModuleVariableNode in Module multiphase for print, l:-20 -> print"
 
 
-def SINK_F(x):  #$ importTimeFlow="FunctionExpr -> SINK_F"
-    if is_source(x):  #$ runtimeFlow="ModuleVariableNode in Module multiphase for is_source, l:-24 -> is_source"
-        print("Unexpected flow", x)  #$ runtimeFlow="ModuleVariableNode in Module multiphase for print, l:-25 -> print"
+def SINK_F(x):  # $ importTimeFlow="FunctionExpr -> SINK_F"
+    if is_source(x):  # $ runtimeFlow="ModuleVariableNode in Module multiphase for is_source, l:-24 -> is_source"
+        print("Unexpected flow", x)  # $ runtimeFlow="ModuleVariableNode in Module multiphase for print, l:-25 -> print"
     else:
-        print("OK")  #$ runtimeFlow="ModuleVariableNode in Module multiphase for print, l:-27 -> print"
+        print("OK")  # $ runtimeFlow="ModuleVariableNode in Module multiphase for print, l:-27 -> print"
 
-def set_foo():  #$ importTimeFlow="FunctionExpr -> set_foo"
+def set_foo():  # $ importTimeFlow="FunctionExpr -> set_foo"
     global foo
-    foo = SOURCE  #$ runtimeFlow="ModuleVariableNode in Module multiphase for SOURCE, l:-31 -> SOURCE" # missing final definition of foo
+    foo = SOURCE  # $ runtimeFlow="ModuleVariableNode in Module multiphase for SOURCE, l:-31 -> SOURCE" # missing final definition of foo
 
-foo = NONSOURCE  #$ importTimeFlow="NONSOURCE -> foo"
+foo = NONSOURCE  # $ importTimeFlow="NONSOURCE -> foo"
 set_foo()
 
 @expects(2)
-def test_phases():  #$ importTimeFlow="expects(..)(..), l:-1 -> test_phases"
+def test_phases():  # $ importTimeFlow="expects(..)(..), l:-1 -> test_phases"
     global foo
-    SINK(foo)  #$ runtimeFlow="ModuleVariableNode in Module multiphase for SINK, l:-39 -> SINK" runtimeFlow="ModuleVariableNode in Module multiphase for foo, l:-39 -> foo"
-    foo = NONSOURCE  #$ runtimeFlow="ModuleVariableNode in Module multiphase for NONSOURCE, l:-40 -> NONSOURCE"
-    set_foo()  #$ runtimeFlow="ModuleVariableNode in Module multiphase for set_foo, l:-41 -> set_foo"
-    SINK(foo)  #$ runtimeFlow="ModuleVariableNode in Module multiphase for SINK, l:-42 -> SINK" runtimeFlow="ModuleVariableNode in Module multiphase for foo, l:-42 -> foo"
+    SINK(foo)  # $ runtimeFlow="ModuleVariableNode in Module multiphase for SINK, l:-39 -> SINK" runtimeFlow="ModuleVariableNode in Module multiphase for foo, l:-39 -> foo"
+    foo = NONSOURCE  # $ runtimeFlow="ModuleVariableNode in Module multiphase for NONSOURCE, l:-40 -> NONSOURCE"
+    set_foo()  # $ runtimeFlow="ModuleVariableNode in Module multiphase for set_foo, l:-41 -> set_foo"
+    SINK(foo)  # $ runtimeFlow="ModuleVariableNode in Module multiphase for SINK, l:-42 -> SINK" runtimeFlow="ModuleVariableNode in Module multiphase for foo, l:-42 -> foo"
diff --git a/python/ql/test/library-tests/dataflow/summaries/TestSummaries.qll b/python/ql/test/library-tests/dataflow/summaries/TestSummaries.qll
index 11b9c0ef09e..14d68455d62 100644
--- a/python/ql/test/library-tests/dataflow/summaries/TestSummaries.qll
+++ b/python/ql/test/library-tests/dataflow/summaries/TestSummaries.qll
@@ -1,3 +1,6 @@
+overlay[local?]
+module;
+
 private import python
 private import semmle.python.dataflow.new.FlowSummary
 private import semmle.python.ApiGraphs
diff --git a/python/ql/test/library-tests/dataflow/tainttracking/customSanitizer/InlineTaintTest.expected b/python/ql/test/library-tests/dataflow/tainttracking/customSanitizer/InlineTaintTest.expected
index 86d49b2b249..89849279d44 100644
--- a/python/ql/test/library-tests/dataflow/tainttracking/customSanitizer/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/dataflow/tainttracking/customSanitizer/InlineTaintTest.expected
@@ -22,4 +22,12 @@ isSanitizer
 | test_logical.py:176:24:176:24 | ControlFlowNode for s |
 | test_logical.py:185:24:185:24 | ControlFlowNode for s |
 | test_logical.py:193:24:193:24 | ControlFlowNode for s |
+| test_logical.py:199:28:199:28 | ControlFlowNode for s |
+| test_logical.py:206:28:206:28 | ControlFlowNode for s |
+| test_logical.py:211:28:211:28 | ControlFlowNode for s |
+| test_logical.py:214:28:214:28 | ControlFlowNode for s |
+| test_logical.py:219:28:219:28 | ControlFlowNode for s |
+| test_logical.py:226:28:226:28 | ControlFlowNode for s |
+| test_logical.py:231:28:231:28 | ControlFlowNode for s |
+| test_logical.py:234:28:234:28 | ControlFlowNode for s |
 | test_reference.py:31:28:31:28 | ControlFlowNode for s |
diff --git a/python/ql/test/library-tests/dataflow/tainttracking/customSanitizer/test_logical.py b/python/ql/test/library-tests/dataflow/tainttracking/customSanitizer/test_logical.py
index 26e69b8fc05..ff215f97f41 100644
--- a/python/ql/test/library-tests/dataflow/tainttracking/customSanitizer/test_logical.py
+++ b/python/ql/test/library-tests/dataflow/tainttracking/customSanitizer/test_logical.py
@@ -192,6 +192,49 @@ def test_with_exception_neg():
 
     ensure_not_tainted(s)
 
+def test_comparison_with_bool():
+    s = TAINTED_STRING
+
+    if is_safe(s) == True:
+        ensure_not_tainted(s)
+    else:
+        ensure_tainted(s) # $ tainted
+
+    if is_safe(s) == False:
+        ensure_tainted(s) # $ tainted
+    else:
+        ensure_not_tainted(s)
+
+    if is_safe(s) != True:
+        ensure_tainted(s) # $ tainted
+    else:
+        ensure_not_tainted(s)
+
+    if is_safe(s) != False:
+        ensure_not_tainted(s)
+    else:
+        ensure_tainted(s) # $ tainted
+
+    if is_safe(s) is True:
+        ensure_not_tainted(s)
+    else:
+        ensure_tainted(s) # $ tainted
+
+    if is_safe(s) is False:
+        ensure_tainted(s) # $ tainted
+    else:
+        ensure_not_tainted(s)
+
+    if is_safe(s) is not True:
+        ensure_tainted(s) # $ tainted
+    else:
+        ensure_not_tainted(s)
+
+    if is_safe(s) is not False:
+        ensure_not_tainted(s)
+    else:
+        ensure_tainted(s) # $ tainted   
+
 # Make tests runable
 
 test_basic()
@@ -211,3 +254,4 @@ try:
     test_with_exception_neg()
 except:
     pass
+test_comparison_with_bool()
diff --git a/python/ql/test/library-tests/dataflow/typetracking-summaries/TestSummaries.qll b/python/ql/test/library-tests/dataflow/typetracking-summaries/TestSummaries.qll
index c4c4096c686..57e0013b6e0 100644
--- a/python/ql/test/library-tests/dataflow/typetracking-summaries/TestSummaries.qll
+++ b/python/ql/test/library-tests/dataflow/typetracking-summaries/TestSummaries.qll
@@ -1,3 +1,6 @@
+overlay[local?]
+module;
+
 private import python
 private import semmle.python.dataflow.new.FlowSummary
 private import semmle.python.ApiGraphs
diff --git a/python/ql/test/library-tests/dataflow/typetracking/attribute_tests.py b/python/ql/test/library-tests/dataflow/typetracking/attribute_tests.py
index 8df3ef51f88..c49cdf77fcd 100644
--- a/python/ql/test/library-tests/dataflow/typetracking/attribute_tests.py
+++ b/python/ql/test/library-tests/dataflow/typetracking/attribute_tests.py
@@ -2,32 +2,32 @@ class SomeClass:
     pass
 
 def simple_read_write():
-    x = SomeClass() # $tracked=foo
-    x.foo = tracked # $tracked tracked=foo
-    y = x.foo # $tracked=foo tracked
-    do_stuff(y) # $tracked
+    x = SomeClass() # $ tracked=foo
+    x.foo = tracked # $ tracked tracked=foo
+    y = x.foo # $ tracked=foo tracked
+    do_stuff(y) # $ tracked
 
 def foo():
-    x = SomeClass() # $tracked=attr
-    bar(x) # $tracked=attr
-    x.attr = tracked # $tracked=attr tracked
-    baz(x) # $tracked=attr
+    x = SomeClass() # $ tracked=attr
+    bar(x) # $ tracked=attr
+    x.attr = tracked # $ tracked=attr tracked
+    baz(x) # $ tracked=attr
 
-def bar(x): # $tracked=attr
-    z = x.attr # $tracked tracked=attr
-    do_stuff(z) # $tracked
+def bar(x): # $ tracked=attr
+    z = x.attr # $ tracked tracked=attr
+    do_stuff(z) # $ tracked
 
-def expects_int(x): # $int=field SPURIOUS: str=field
-    do_int_stuff(x.field) # $int int=field SPURIOUS: str str=field
+def expects_int(x): # $ int=field SPURIOUS: str=field
+    do_int_stuff(x.field) # $ int int=field SPURIOUS: str str=field
 
 def expects_string(x): # $ str=field SPURIOUS: int=field
-    do_string_stuff(x.field) # $str str=field SPURIOUS: int int=field
+    do_string_stuff(x.field) # $ str str=field SPURIOUS: int int=field
 
 def test_incompatible_types():
-    x = SomeClass() # $int,str=field
-    x.field = int(5) # $int=field int SPURIOUS: str=field
-    expects_int(x) # $int=field SPURIOUS: str=field
-    x.field = str("Hello") # $str=field str SPURIOUS: int=field
+    x = SomeClass() # $ int,str=field
+    x.field = int(5) # $ int=field int SPURIOUS: str=field
+    expects_int(x) # $ int=field SPURIOUS: str=field
+    x.field = str("Hello") # $ str=field str SPURIOUS: int=field
     expects_string(x) # $ str=field SPURIOUS: int=field
 
 # set in different function
@@ -58,7 +58,7 @@ def test_global_attribute_read():
 
 def test_local_attribute_assignment():
     # Same as `test_global_attribute_assignment`, but the assigned variable is not global
-    # In this case, we don't want flow going to the `ModuleVariableNode` for `local_var` 
+    # In this case, we don't want flow going to the `ModuleVariableNode` for `local_var`
     # (which is referenced in `test_local_attribute_read`).
     local_var = object() # $ tracked=foo
     local_var.foo = tracked # $ tracked tracked=foo
@@ -71,11 +71,11 @@ def test_local_attribute_read():
 # Attributes assigned statically to a class
 # ------------------------------------------------------------------------------
 
-class MyClass: # $tracked=field
-    field = tracked # $tracked
+class MyClass: # $ tracked=field
+    field = tracked # $ tracked
 
-lookup = MyClass.field # $tracked tracked=field
-instance = MyClass() # $tracked=field
+lookup = MyClass.field # $ tracked tracked=field
+instance = MyClass() # $ tracked=field
 lookup2 = instance.field # MISSING: tracked
 
 # ------------------------------------------------------------------------------
@@ -85,56 +85,56 @@ lookup2 = instance.field # MISSING: tracked
 # Via `getattr`/`setattr`
 
 def setattr_immediate_write():
-    x = SomeClass() # $tracked=foo
-    setattr(x,"foo", tracked) # $tracked tracked=foo
-    y = x.foo # $tracked tracked=foo
-    do_stuff(y) # $tracked
+    x = SomeClass() # $ tracked=foo
+    setattr(x,"foo", tracked) # $ tracked tracked=foo
+    y = x.foo # $ tracked tracked=foo
+    do_stuff(y) # $ tracked
 
 def getattr_immediate_read():
-    x = SomeClass() # $tracked=foo
-    x.foo = tracked # $tracked tracked=foo
-    y = getattr(x,"foo") # $tracked tracked=foo
-    do_stuff(y) # $tracked
+    x = SomeClass() # $ tracked=foo
+    x.foo = tracked # $ tracked tracked=foo
+    y = getattr(x,"foo") # $ tracked tracked=foo
+    do_stuff(y) # $ tracked
 
 def setattr_indirect_write():
     attr = "foo"
-    x = SomeClass() # $tracked=foo
-    setattr(x, attr, tracked) # $tracked tracked=foo
-    y = x.foo # $tracked tracked=foo
-    do_stuff(y) # $tracked
+    x = SomeClass() # $ tracked=foo
+    setattr(x, attr, tracked) # $ tracked tracked=foo
+    y = x.foo # $ tracked tracked=foo
+    do_stuff(y) # $ tracked
 
 def getattr_indirect_read():
     attr = "foo"
-    x = SomeClass() # $tracked=foo
-    x.foo = tracked # $tracked tracked=foo
-    y = getattr(x, attr) #$tracked tracked=foo
-    do_stuff(y) # $tracked
+    x = SomeClass() # $ tracked=foo
+    x.foo = tracked # $ tracked tracked=foo
+    y = getattr(x, attr) # $ tracked tracked=foo
+    do_stuff(y) # $ tracked
 
 # Via `__dict__` -- not currently implemented.
 
 def dunder_dict_immediate_write():
     x = SomeClass() # $ MISSING: tracked=foo
-    x.__dict__["foo"] = tracked # $tracked MISSING: tracked=foo
+    x.__dict__["foo"] = tracked # $ tracked MISSING: tracked=foo
     y = x.foo # $ MISSING: tracked tracked=foo
     do_stuff(y) # $ MISSING: tracked
 
 def dunder_dict_immediate_read():
-    x = SomeClass() # $tracked=foo
-    x.foo = tracked # $tracked tracked=foo
+    x = SomeClass() # $ tracked=foo
+    x.foo = tracked # $ tracked tracked=foo
     y = x.__dict__["foo"] # $ tracked=foo MISSING: tracked
     do_stuff(y) # $ MISSING: tracked
 
 def dunder_dict_indirect_write():
     attr = "foo"
     x = SomeClass() # $ MISSING: tracked=foo
-    x.__dict__[attr] = tracked # $tracked MISSING: tracked=foo
+    x.__dict__[attr] = tracked # $ tracked MISSING: tracked=foo
     y = x.foo # $ MISSING: tracked tracked=foo
     do_stuff(y) # $ MISSING: tracked
 
 def dunder_dict_indirect_read():
     attr = "foo"
-    x = SomeClass() # $tracked=foo
-    x.foo = tracked # $tracked tracked=foo
+    x = SomeClass() # $ tracked=foo
+    x.foo = tracked # $ tracked tracked=foo
     y = x.__dict__[attr] # $ tracked=foo MISSING: tracked
     do_stuff(y) # $ MISSING: tracked
 
diff --git a/python/ql/test/library-tests/dataflow/typetracking/content_test.py b/python/ql/test/library-tests/dataflow/typetracking/content_test.py
index 1c52d659582..18b283d2b8f 100644
--- a/python/ql/test/library-tests/dataflow/typetracking/content_test.py
+++ b/python/ql/test/library-tests/dataflow/typetracking/content_test.py
@@ -1,12 +1,12 @@
 # test of other content types than attributes
 
 def test_tuple(index_arg):
-    tup = (tracked, other) # $tracked
+    tup = (tracked, other) # $ tracked
 
     tup[0] # $ tracked
     tup[1]
 
-    a,b = tup # $tracked
+    a,b = tup # $ tracked
     a # $ tracked
     b
 
@@ -22,7 +22,7 @@ def test_tuple(index_arg):
 
 
     # nested tuples
-    nested_tuples = ((tracked, other), (other, tracked)) # $tracked
+    nested_tuples = ((tracked, other), (other, tracked)) # $ tracked
 
     nested_tuples[0][0] # $ MISSING: tracked
     nested_tuples[0][1]
@@ -44,7 +44,7 @@ def test_tuple(index_arg):
 
 
 def test_dict(key_arg):
-    d1 = {"t": tracked, "o": other} # $tracked
+    d1 = {"t": tracked, "o": other} # $ tracked
     d1["t"] # $ tracked
     d1.get("t") # $ MISSING: tracked
     d1.setdefault("t") # $ MISSING: tracked
@@ -84,7 +84,7 @@ def test_dict(key_arg):
 
 
 def test_list(index_arg):
-    l = [tracked, other] # $tracked
+    l = [tracked, other] # $ tracked
 
     l[0] # $ MISSING: tracked
     l[1]
diff --git a/python/ql/test/library-tests/dataflow/typetracking/multiple_callables.py b/python/ql/test/library-tests/dataflow/typetracking/multiple_callables.py
index 084ef39cd3e..a9eab809c96 100644
--- a/python/ql/test/library-tests/dataflow/typetracking/multiple_callables.py
+++ b/python/ql/test/library-tests/dataflow/typetracking/multiple_callables.py
@@ -1,9 +1,9 @@
-def foo(foo_x):  # $tracked
-    print("foo", foo_x)  # $tracked
+def foo(foo_x):  # $ tracked
+    print("foo", foo_x)  # $ tracked
 
 
-def bar(bar_x):  # $tracked
-    print("bar", bar_x)  # $tracked
+def bar(bar_x):  # $ tracked
+    print("bar", bar_x)  # $ tracked
 
 
 if len(__file__) % 2 == 0:
@@ -11,5 +11,5 @@ if len(__file__) % 2 == 0:
 else:
     f = bar
 
-x = tracked  # $tracked
-f(x)  # $tracked
+x = tracked  # $ tracked
+f(x)  # $ tracked
diff --git a/python/ql/test/library-tests/dataflow/typetracking/mymodule.py b/python/ql/test/library-tests/dataflow/typetracking/mymodule.py
index 86bd891efd7..1240230bee7 100644
--- a/python/ql/test/library-tests/dataflow/typetracking/mymodule.py
+++ b/python/ql/test/library-tests/dataflow/typetracking/mymodule.py
@@ -1,7 +1,7 @@
-x = tracked # $tracked
+x = tracked # $ tracked
 
 def func():
-    return tracked # $tracked
+    return tracked # $ tracked
 
-z = tracked # $tracked
-some_func(z) # $tracked
+z = tracked # $ tracked
+some_func(z) # $ tracked
diff --git a/python/ql/test/library-tests/dataflow/typetracking/test.py b/python/ql/test/library-tests/dataflow/typetracking/test.py
index a54daa1f046..74ee091cc23 100644
--- a/python/ql/test/library-tests/dataflow/typetracking/test.py
+++ b/python/ql/test/library-tests/dataflow/typetracking/test.py
@@ -1,64 +1,64 @@
 def get_tracked():
-    x = tracked # $tracked
-    return x # $tracked
+    x = tracked # $ tracked
+    return x # $ tracked
 
-def use_tracked_foo(x): # $tracked
-    do_stuff(x) # $tracked
+def use_tracked_foo(x): # $ tracked
+    do_stuff(x) # $ tracked
 
 def foo():
     use_tracked_foo(
-        get_tracked() # $tracked
+        get_tracked() # $ tracked
     )
 
-def use_tracked_bar(x): # $tracked
-    do_stuff(x) # $tracked
+def use_tracked_bar(x): # $ tracked
+    do_stuff(x) # $ tracked
 
 def bar():
-    x = get_tracked() # $tracked
-    use_tracked_bar(x) # $tracked
+    x = get_tracked() # $ tracked
+    use_tracked_bar(x) # $ tracked
 
-def use_tracked_baz(x): # $tracked
-    do_stuff(x) # $tracked
+def use_tracked_baz(x): # $ tracked
+    do_stuff(x) # $ tracked
 
 def baz():
-    x = tracked # $tracked
-    use_tracked_baz(x) # $tracked
+    x = tracked # $ tracked
+    use_tracked_baz(x) # $ tracked
 
-def id(x): # $tracked
-    return x # $tracked
+def id(x): # $ tracked
+    return x # $ tracked
 
 def use_tracked_quux(x): # $ MISSING: tracked
     do_stuff(y) # call after return -- not tracked in here.
 
 def quux():
-    x = tracked # $tracked
-    y = id(x) # $tracked
+    x = tracked # $ tracked
+    y = id(x) # $ tracked
     use_tracked_quux(y) # not tracked out of call to id.
 
 g = None
 
-def write_g(x): # $tracked
+def write_g(x): # $ tracked
     global g
-    g = x # $tracked
+    g = x # $ tracked
 
 def use_g():
-    do_stuff(g) # $tracked
+    do_stuff(g) # $ tracked
 
 def global_var_write_test():
-    x = tracked # $tracked
-    write_g(x) # $tracked
+    x = tracked # $ tracked
+    write_g(x) # $ tracked
     use_g()
 
 def test_import():
     import mymodule
-    mymodule.x # $tracked
-    y = mymodule.func() # $tracked
-    y # $tracked
-    mymodule.z # $tracked
+    mymodule.x # $ tracked
+    y = mymodule.func() # $ tracked
+    y # $ tracked
+    mymodule.z # $ tracked
 
 
 def to_inner_scope():
-    x = tracked # $tracked
+    x = tracked # $ tracked
     def foo():
         y = x # $ tracked
         return y # $ tracked
@@ -67,15 +67,15 @@ def to_inner_scope():
 
 
 def from_parameter_default():
-    x_alias = tracked # $tracked
-    def outer(x=tracked): # $tracked
-        print(x) # $tracked
+    x_alias = tracked # $ tracked
+    def outer(x=tracked): # $ tracked
+        print(x) # $ tracked
         def inner():
             print(x) # $ tracked
-            print(x_alias) # $tracked
-        return x # $tracked
-    also_x = outer() # $tracked
-    print(also_x) # $tracked
+            print(x_alias) # $ tracked
+        return x # $ tracked
+    also_x = outer() # $ tracked
+    print(also_x) # $ tracked
 
 
 # ------------------------------------------------------------------------------
@@ -86,7 +86,7 @@ def my_decorator(func):
     # This part doesn't make any sense in a normal decorator, but just shows how we
     # handle type-tracking
 
-    func() # $tracked
+    func() # $ tracked
 
     def wrapper():
         print("before function call")
@@ -97,7 +97,7 @@ def my_decorator(func):
 
 @my_decorator
 def get_tracked2():
-    return tracked # $tracked
+    return tracked # $ tracked
 
 @my_decorator
 def unrelated_func():
@@ -109,17 +109,17 @@ def use_funcs_with_decorators():
 
 # ------------------------------------------------------------------------------
 
-def expects_int(x): # $int
-    do_int_stuff(x) # $int
+def expects_int(x): # $ int
+    do_int_stuff(x) # $ int
 
-def expects_string(x): # $str
-    do_string_stuff(x) # $str
+def expects_string(x): # $ str
+    do_string_stuff(x) # $ str
 
 def redefine_test():
-    x = int(5) # $int
-    expects_int(x) # $int
-    x = str("Hello") # $str
-    expects_string(x) # $str
+    x = int(5) # $ int
+    expects_int(x) # $ int
+    x = str("Hello") # $ str
+    expects_string(x) # $ str
 
 # ------------------------------------------------------------------------------
 # Tracking of self in methods
diff --git a/python/ql/test/library-tests/dataflow/variable-capture/by_value.py b/python/ql/test/library-tests/dataflow/variable-capture/by_value.py
index 01b2ed83a46..4aeeca92852 100644
--- a/python/ql/test/library-tests/dataflow/variable-capture/by_value.py
+++ b/python/ql/test/library-tests/dataflow/variable-capture/by_value.py
@@ -33,7 +33,7 @@ def SINK_F(x):
 def by_value1():
     a = SOURCE
     def inner(a_val=a):
-        SINK(a_val) #$ captured
+        SINK(a_val) # $ captured
         SINK_F(a)
     a = NONSOURCE
     inner()
@@ -41,7 +41,7 @@ def by_value1():
 def by_value2():
     a = NONSOURCE
     def inner(a_val=a):
-        SINK(a) #$ captured
+        SINK(a) # $ captured
         SINK_F(a_val)
     a = SOURCE
     inner()
diff --git a/python/ql/test/library-tests/dataflow/variable-capture/dict.py b/python/ql/test/library-tests/dataflow/variable-capture/dict.py
index 8a8165d6674..978a9722c0c 100644
--- a/python/ql/test/library-tests/dataflow/variable-capture/dict.py
+++ b/python/ql/test/library-tests/dataflow/variable-capture/dict.py
@@ -37,7 +37,7 @@ def out():
     def captureOut1():
         sinkO1["x"] = SOURCE
     captureOut1()
-    SINK(sinkO1["x"]) #$ captured
+    SINK(sinkO1["x"]) # $ captured
 
     sinkO2 = { "x": "" }
     def captureOut2():
@@ -45,7 +45,7 @@ def out():
             sinkO2["x"] = SOURCE
         m()
     captureOut2()
-    SINK(sinkO2["x"]) #$ captured
+    SINK(sinkO2["x"]) # $ captured
 
     nonSink0 = { "x": "" }
     def captureOut1NotCalled():
@@ -67,7 +67,7 @@ def through(tainted):
     def captureOut1():
         sinkO1["x"] = tainted
     captureOut1()
-    SINK(sinkO1["x"]) #$ captured
+    SINK(sinkO1["x"]) # $ captured
 
     sinkO2 = { "x": "" }
     def captureOut2():
@@ -75,7 +75,7 @@ def through(tainted):
             sinkO2["x"] = tainted
         m()
     captureOut2()
-    SINK(sinkO2["x"]) #$ captured
+    SINK(sinkO2["x"]) # $ captured
 
     nonSink1 = { "x": "" }
     def captureOut1NotCalled():
diff --git a/python/ql/test/library-tests/dataflow/variable-capture/global.py b/python/ql/test/library-tests/dataflow/variable-capture/global.py
index 92d273592b8..c4833ac1f85 100644
--- a/python/ql/test/library-tests/dataflow/variable-capture/global.py
+++ b/python/ql/test/library-tests/dataflow/variable-capture/global.py
@@ -42,7 +42,7 @@ def out():
         global sinkO1
         sinkO1 = SOURCE
     captureOut1()
-    SINK(sinkO1) #$ captured
+    SINK(sinkO1) # $ captured
 
     def captureOut2():
         def m():
@@ -50,12 +50,12 @@ def out():
             sinkO2 = SOURCE
         m()
     captureOut2()
-    SINK(sinkO2) #$ captured
+    SINK(sinkO2) # $ captured
 
     def captureOut1NotCalled():
         global nonSink1
         nonSink1 = SOURCE
-    SINK_F(nonSink1) #$ SPURIOUS: captured
+    SINK_F(nonSink1) # $ SPURIOUS: captured
 
     def captureOut2NotCalled():
         # notice that `m` is not called
@@ -63,7 +63,7 @@ def out():
             global nonSink2
             nonSink2 = SOURCE
     captureOut2NotCalled()
-    SINK_F(nonSink2) #$ SPURIOUS: captured
+    SINK_F(nonSink2) # $ SPURIOUS: captured
 
 @expects(4)
 def test_out():
@@ -78,7 +78,7 @@ def through(tainted):
         global sinkT1
         sinkT1 = tainted
     captureOut1()
-    SINK(sinkT1) #$ captured
+    SINK(sinkT1) # $ captured
 
     def captureOut2():
         def m():
@@ -86,7 +86,7 @@ def through(tainted):
             sinkT2 = tainted
         m()
     captureOut2()
-    SINK(sinkT2) #$ captured
+    SINK(sinkT2) # $ captured
 
     def captureOut1NotCalled():
         global nonSinkT1
diff --git a/python/ql/test/library-tests/dataflow/variable-capture/in.py b/python/ql/test/library-tests/dataflow/variable-capture/in.py
index 35fad035355..c4d73a3a0a2 100644
--- a/python/ql/test/library-tests/dataflow/variable-capture/in.py
+++ b/python/ql/test/library-tests/dataflow/variable-capture/in.py
@@ -34,17 +34,17 @@ def SINK_F(x):
 def inParam(tainted):
     def captureIn1():
         sinkI1 = tainted
-        SINK(sinkI1) #$ captured
+        SINK(sinkI1) # $ captured
     captureIn1()
 
     def captureIn2():
         def m():
             sinkI2 = tainted
-            SINK(sinkI2) #$ captured
+            SINK(sinkI2) # $ captured
         m()
     captureIn2()
 
-    captureIn3 = lambda arg: SINK(tainted) #$ captured
+    captureIn3 = lambda arg: SINK(tainted) # $ captured
     captureIn3("")
 
     def captureIn1NotCalled():
@@ -68,17 +68,17 @@ def inLocal():
 
     def captureIn1():
         sinkI1 = tainted
-        SINK(sinkI1) #$ captured
+        SINK(sinkI1) # $ captured
     captureIn1()
 
     def captureIn2():
         def m():
             sinkI2 = tainted
-            SINK(sinkI2) #$ captured
+            SINK(sinkI2) # $ captured
         m()
     captureIn2()
 
-    captureIn3 = lambda arg: SINK(tainted) #$ captured
+    captureIn3 = lambda arg: SINK(tainted) # $ captured
     captureIn3("")
 
     def captureIn1NotCalled():
diff --git a/python/ql/test/library-tests/dataflow/variable-capture/nonlocal.py b/python/ql/test/library-tests/dataflow/variable-capture/nonlocal.py
index 91a06aae639..f89d4960878 100644
--- a/python/ql/test/library-tests/dataflow/variable-capture/nonlocal.py
+++ b/python/ql/test/library-tests/dataflow/variable-capture/nonlocal.py
@@ -38,7 +38,7 @@ def out():
         nonlocal sinkO1
         sinkO1 = SOURCE
     captureOut1()
-    SINK(sinkO1) #$ captured
+    SINK(sinkO1) # $ captured
 
     sinkO2 = ""
     def captureOut2():
@@ -47,7 +47,7 @@ def out():
             sinkO2 = SOURCE
         m()
     captureOut2()
-    SINK(sinkO2) #$ captured
+    SINK(sinkO2) # $ captured
 
     nonSink1 = ""
     def captureOut1NotCalled():
@@ -74,7 +74,7 @@ def through(tainted):
         nonlocal sinkO1
         sinkO1 = tainted
     captureOut1()
-    SINK(sinkO1) #$ captured
+    SINK(sinkO1) # $ captured
 
     sinkO2 = ""
     def captureOut2():
@@ -83,7 +83,7 @@ def through(tainted):
             sinkO2 = tainted
         m()
     captureOut2()
-    SINK(sinkO2) #$ captured
+    SINK(sinkO2) # $ captured
 
     nonSink1 = ""
     def captureOut1NotCalled():
diff --git a/python/ql/test/library-tests/dataflow/variable-capture/test_collections.py b/python/ql/test/library-tests/dataflow/variable-capture/test_collections.py
index 5d47f06595c..1e903ac3f3b 100644
--- a/python/ql/test/library-tests/dataflow/variable-capture/test_collections.py
+++ b/python/ql/test/library-tests/dataflow/variable-capture/test_collections.py
@@ -34,16 +34,16 @@ l = [NONSOURCE]
 SINK_F(l[0])
 
 l_mod = [SOURCE for x in l]
-SINK(l_mod[0]) #$ captured
+SINK(l_mod[0]) # $ captured
 
 l_mod_lambda = [(lambda a : SOURCE)(x) for x in l]
-SINK(l_mod_lambda[0]) #$ captured
+SINK(l_mod_lambda[0]) # $ captured
 
 def mod(x):
     return SOURCE
 
 l_mod_function = [mod(x) for x in l]
-SINK(l_mod_function[0]) #$ captured
+SINK(l_mod_function[0]) # $ captured
 
 def mod_list(l):
     def mod_local(x):
@@ -52,7 +52,7 @@ def mod_list(l):
     return [mod_local(x) for x in l]
 
 l_modded = mod_list(l)
-SINK(l_modded[0]) #$ captured
+SINK(l_modded[0]) # $ captured
 
 def mod_list_first(l):
     def mod_local(x):
@@ -61,4 +61,4 @@ def mod_list_first(l):
     return [mod_local(l[0])]
 
 l_modded_first = mod_list_first(l)
-SINK(l_modded_first[0]) #$ captured
+SINK(l_modded_first[0]) # $ captured
diff --git a/python/ql/test/library-tests/dataflow/variable-capture/test_fields.py b/python/ql/test/library-tests/dataflow/variable-capture/test_fields.py
index 79f2c4d04f4..023300248a8 100644
--- a/python/ql/test/library-tests/dataflow/variable-capture/test_fields.py
+++ b/python/ql/test/library-tests/dataflow/variable-capture/test_fields.py
@@ -38,7 +38,7 @@ def test_captured_field():
     foo.setFoo(NONSOURCE)
 
     def test():
-        SINK(foo.getFoo()) #$ captured
+        SINK(foo.getFoo()) # $ captured
 
     def read():
         return foo.getFoo()
@@ -48,4 +48,4 @@ def test_captured_field():
     foo.setFoo(SOURCE)
     test()
 
-    SINK(read()) #$ captured
\ No newline at end of file
+    SINK(read()) # $ captured
diff --git a/python/ql/test/library-tests/dataflow/variable-capture/test_library_calls.py b/python/ql/test/library-tests/dataflow/variable-capture/test_library_calls.py
index 5db25fc8348..b7d28dd252e 100644
--- a/python/ql/test/library-tests/dataflow/variable-capture/test_library_calls.py
+++ b/python/ql/test/library-tests/dataflow/variable-capture/test_library_calls.py
@@ -45,4 +45,4 @@ def test_library_call():
     for x in map(set, [1]):
         pass
 
-    SINK(captured["x"]) #$ captured
+    SINK(captured["x"]) # $ captured
diff --git a/python/ql/test/library-tests/frameworks/data/warnings.ql b/python/ql/test/library-tests/frameworks/data/warnings.ql
index f0968413235..07c746547dd 100644
--- a/python/ql/test/library-tests/frameworks/data/warnings.ql
+++ b/python/ql/test/library-tests/frameworks/data/warnings.ql
@@ -2,6 +2,7 @@ import python
 import semmle.python.frameworks.data.internal.ApiGraphModels as ApiGraphModels
 import semmle.python.frameworks.data.ModelsAsData
 
+overlay[local]
 class IsTesting extends ApiGraphModels::TestAllModels {
   IsTesting() { this = this }
 }
diff --git a/python/ql/test/library-tests/frameworks/django-orm/testapp/orm_security_tests.py b/python/ql/test/library-tests/frameworks/django-orm/testapp/orm_security_tests.py
index 25112e6b073..74d23d95009 100644
--- a/python/ql/test/library-tests/frameworks/django-orm/testapp/orm_security_tests.py
+++ b/python/ql/test/library-tests/frameworks/django-orm/testapp/orm_security_tests.py
@@ -92,12 +92,12 @@ def only_az(value):
 class CommentValidatorNotUsed(models.Model):
     text = models.CharField(max_length=256, validators=[only_az])
 
-def save_comment_validator_not_used(request): # $requestHandler
+def save_comment_validator_not_used(request): # $ requestHandler
     comment = CommentValidatorNotUsed(text=request.POST["text"])
     comment.save()
     return HttpResponse("ok")
 
-def display_comment_validator_not_used(request): # $requestHandler
+def display_comment_validator_not_used(request): # $ requestHandler
     comment = CommentValidatorNotUsed.objects.last()
     return HttpResponse(comment.text)  # NOT OK
 
@@ -111,12 +111,12 @@ http http://127.0.0.1:8000/display_comment_validator_not_used/
 class CommentValidatorUsed(models.Model):
     text = models.CharField(max_length=256, validators=[only_az])
 
-def save_comment_validator_used(request): # $requestHandler
+def save_comment_validator_used(request): # $ requestHandler
     comment = CommentValidatorUsed(text=request.POST["text"])
     comment.full_clean()
     comment.save()
 
-def display_comment_validator_used(request): # $requestHandler
+def display_comment_validator_used(request): # $ requestHandler
     comment = CommentValidatorUsed.objects.last()
     return HttpResponse(comment.text)  # sort of OK
 
diff --git a/python/ql/test/library-tests/frameworks/django-v1/routing_test.py b/python/ql/test/library-tests/frameworks/django-v1/routing_test.py
index f0d51577e2e..6a24472518b 100644
--- a/python/ql/test/library-tests/frameworks/django-v1/routing_test.py
+++ b/python/ql/test/library-tests/frameworks/django-v1/routing_test.py
@@ -4,21 +4,21 @@ from django.http.response import HttpResponse
 from django.views.generic import View
 
 
-def url_match_xss(request, foo, bar, no_taint=None):  # $requestHandler routedParameter=foo routedParameter=bar
-    return HttpResponse('url_match_xss: {} {}'.format(foo, bar))  # $HttpResponse
+def url_match_xss(request, foo, bar, no_taint=None):  # $ requestHandler routedParameter=foo routedParameter=bar
+    return HttpResponse('url_match_xss: {} {}'.format(foo, bar))  # $ HttpResponse
 
 
-def get_params_xss(request):  # $requestHandler
-    return HttpResponse(request.GET.get("untrusted"))  # $HttpResponse
+def get_params_xss(request):  # $ requestHandler
+    return HttpResponse(request.GET.get("untrusted"))  # $ HttpResponse
 
 
-def post_params_xss(request):  # $requestHandler
-    return HttpResponse(request.POST.get("untrusted"))  # $HttpResponse
+def post_params_xss(request):  # $ requestHandler
+    return HttpResponse(request.POST.get("untrusted"))  # $ HttpResponse
 
 
-def http_resp_write(request):  # $requestHandler
-    rsp = HttpResponse()  # $HttpResponse
-    rsp.write(request.GET.get("untrusted"))  # $HttpResponse
+def http_resp_write(request):  # $ requestHandler
+    rsp = HttpResponse()  # $ HttpResponse
+    rsp.write(request.GET.get("untrusted"))  # $ HttpResponse
     return rsp
 
 
@@ -27,53 +27,53 @@ class Foo(object):
 
 
     def post(self, request, untrusted):  # $ MISSING: requestHandler routedParameter=untrusted
-        return HttpResponse('Foo post: {}'.format(untrusted))  # $HttpResponse
+        return HttpResponse('Foo post: {}'.format(untrusted))  # $ HttpResponse
 
 
 class ClassView(View, Foo):
 
     def get(self, request, untrusted):  # $ requestHandler routedParameter=untrusted
-        return HttpResponse('ClassView get: {}'.format(untrusted))  # $HttpResponse
+        return HttpResponse('ClassView get: {}'.format(untrusted))  # $ HttpResponse
 
 
-def show_articles(request, page_number=1):  # $requestHandler routedParameter=page_number
+def show_articles(request, page_number=1):  # $ requestHandler routedParameter=page_number
     page_number = int(page_number)
-    return HttpResponse('articles page: {}'.format(page_number))  # $HttpResponse
+    return HttpResponse('articles page: {}'.format(page_number))  # $ HttpResponse
 
 
-def xxs_positional_arg(request, arg0, arg1, no_taint=None):  # $requestHandler routedParameter=arg0 routedParameter=arg1
-    return HttpResponse('xxs_positional_arg: {} {}'.format(arg0, arg1))  # $HttpResponse
+def xxs_positional_arg(request, arg0, arg1, no_taint=None):  # $ requestHandler routedParameter=arg0 routedParameter=arg1
+    return HttpResponse('xxs_positional_arg: {} {}'.format(arg0, arg1))  # $ HttpResponse
 
 
 urlpatterns = [
-    url(r"^url_match/(?P<foo>[^/]+)/(?P<bar>[^/]+)", url_match_xss),  # $routeSetup="^url_match/(?P<foo>[^/]+)/(?P<bar>[^/]+)"
-    url(r"^get_params", get_params_xss),  # $routeSetup="^get_params"
-    url(r"^post_params", post_params_xss),  # $routeSetup="^post_params"
-    url(r"^http_resp_write", http_resp_write),  # $routeSetup="^http_resp_write"
-    url(r"^class_view/(?P<untrusted>.+)", ClassView.as_view()),  # $routeSetup="^class_view/(?P<untrusted>.+)"
+    url(r"^url_match/(?P<foo>[^/]+)/(?P<bar>[^/]+)", url_match_xss),  # $ routeSetup="^url_match/(?P<foo>[^/]+)/(?P<bar>[^/]+)"
+    url(r"^get_params", get_params_xss),  # $ routeSetup="^get_params"
+    url(r"^post_params", post_params_xss),  # $ routeSetup="^post_params"
+    url(r"^http_resp_write", http_resp_write),  # $ routeSetup="^http_resp_write"
+    url(r"^class_view/(?P<untrusted>.+)", ClassView.as_view()),  # $ routeSetup="^class_view/(?P<untrusted>.+)"
 
     # one pattern to support `articles/page-<n>` and ensuring that articles/ goes to page-1
-    url(r"articles/^(?:page-(?P<page_number>\d+)/)?", show_articles),  # $routeSetup="articles/^(?:page-(?P<page_number>\d+)/)?"
+    url(r"articles/^(?:page-(?P<page_number>\d+)/)?", show_articles),  # $ routeSetup="articles/^(?:page-(?P<page_number>\d+)/)?"
     # passing as positional argument is not the recommended way of doing things, but it is certainly
     # possible
-    url(r"^([^/]+)/(?:foo|bar)/([^/]+)", xxs_positional_arg, name='xxs_positional_arg'),  # $routeSetup="^([^/]+)/(?:foo|bar)/([^/]+)"
+    url(r"^([^/]+)/(?:foo|bar)/([^/]+)", xxs_positional_arg, name='xxs_positional_arg'),  # $ routeSetup="^([^/]+)/(?:foo|bar)/([^/]+)"
 ]
 
 ################################################################################
 # Using patterns() for routing
 
-def show_user(request, username):  # $requestHandler routedParameter=username
-    return HttpResponse('show_user {}'.format(username))  # $HttpResponse
+def show_user(request, username):  # $ requestHandler routedParameter=username
+    return HttpResponse('show_user {}'.format(username))  # $ HttpResponse
 
 
-urlpatterns = patterns(url(r"^users/(?P<username>[^/]+)", show_user))  # $routeSetup="^users/(?P<username>[^/]+)"
+urlpatterns = patterns(url(r"^users/(?P<username>[^/]+)", show_user))  # $ routeSetup="^users/(?P<username>[^/]+)"
 
 ################################################################################
 # Show we understand the keyword arguments to django.conf.urls.url
 
-def kw_args(request):  # $requestHandler
-    return HttpResponse('kw_args')  # $HttpResponse
+def kw_args(request):  # $ requestHandler
+    return HttpResponse('kw_args')  # $ HttpResponse
 
 urlpatterns = [
-    url(view=kw_args, regex=r"^kw_args")  # $routeSetup="^kw_args"
+    url(view=kw_args, regex=r"^kw_args")  # $ routeSetup="^kw_args"
 ]
diff --git a/python/ql/test/library-tests/frameworks/django-v2-v3/response_test.py b/python/ql/test/library-tests/frameworks/django-v2-v3/response_test.py
index 3023b9212fc..4bc20df217c 100644
--- a/python/ql/test/library-tests/frameworks/django-v2-v3/response_test.py
+++ b/python/ql/test/library-tests/frameworks/django-v2-v3/response_test.py
@@ -8,12 +8,12 @@ import json
 # FP reported in https://github.com/github/codeql-python-team/issues/38
 def safe__json_response(request):
     # implicitly sets Content-Type to "application/json"
-    return JsonResponse({"foo": request.GET.get("foo")})  # $HttpResponse mimetype=application/json responseBody=Dict
+    return JsonResponse({"foo": request.GET.get("foo")})  # $ HttpResponse mimetype=application/json responseBody=Dict
 
 # Not an XSS sink, since the Content-Type is not "text/html"
 def safe__manual_json_response(request):
     json_data = '{"json": "{}"}'.format(request.GET.get("foo"))
-    return HttpResponse(json_data, content_type="application/json")  # $HttpResponse mimetype=application/json responseBody=json_data
+    return HttpResponse(json_data, content_type="application/json")  # $ HttpResponse mimetype=application/json responseBody=json_data
 
 # reproduction of FP seen here:
 # Usage: https://github.com/edx/edx-platform/blob/d70ebe6343a1573c694d6cf68f92c1ad40b73d7d/lms/djangoapps/commerce/api/v0/views.py#L106
@@ -27,25 +27,25 @@ class MyJsonResponse(HttpResponse):
 # Not an XSS sink, since the Content-Type is not "text/html"
 def safe__custom_json_response(request):
     json_data = '{"json": "{}"}'.format(request.GET.get("foo"))
-    return MyJsonResponse(json_data)  # $HttpResponse responseBody=json_data SPURIOUS: mimetype=text/html MISSING: mimetype=application/json
+    return MyJsonResponse(json_data)  # $ HttpResponse responseBody=json_data SPURIOUS: mimetype=text/html MISSING: mimetype=application/json
 
 
 # Not an XSS sink, since the Content-Type is not "text/html"
 def safe__manual_content_type(request):
-    return HttpResponse('<img src="0" onerror="alert(1)">', content_type="text/plain")  # $HttpResponse mimetype=text/plain responseBody='<img src="0" onerror="alert(1)">'
+    return HttpResponse('<img src="0" onerror="alert(1)">', content_type="text/plain")  # $ HttpResponse mimetype=text/plain responseBody='<img src="0" onerror="alert(1)">'
 
 # XSS FP reported in https://github.com/github/codeql/issues/3466
 # Note: This should be an open-redirect sink, but not an XSS sink.
 def or__redirect(request):
     next = request.GET.get("next")
-    return HttpResponseRedirect(next)  # $HttpResponse mimetype=text/html HttpRedirectResponse redirectLocation=next
+    return HttpResponseRedirect(next)  # $ HttpResponse mimetype=text/html HttpRedirectResponse redirectLocation=next
 
 def information_exposure_through_redirect(request, as_kw=False):
     # This is a contrived example, but possible
     private = "private"
     next = request.GET.get("next")
     if as_kw:
-        return HttpResponseRedirect(next, content=private)  # $HttpResponse mimetype=text/html responseBody=private HttpRedirectResponse redirectLocation=next
+        return HttpResponseRedirect(next, content=private)  # $ HttpResponse mimetype=text/html responseBody=private HttpRedirectResponse redirectLocation=next
     else:
         return HttpResponseRedirect(next, private)  # $ HttpResponse mimetype=text/html responseBody=private HttpRedirectResponse redirectLocation=next
 
@@ -91,20 +91,20 @@ class CustomRedirectView(RedirectView):
 
 # Ensure that simple subclasses are still vuln to XSS
 def xss__not_found(request):
-    return HttpResponseNotFound(request.GET.get("name"))  # $HttpResponse mimetype=text/html responseBody=request.GET.get(..)
+    return HttpResponseNotFound(request.GET.get("name"))  # $ HttpResponse mimetype=text/html responseBody=request.GET.get(..)
 
 # Ensure we still have an XSS sink when manually setting the content_type to HTML
 def xss__manual_response_type(request):
-    return HttpResponse(request.GET.get("name"), content_type="text/html; charset=utf-8")  # $HttpResponse mimetype=text/html responseBody=request.GET.get(..)
+    return HttpResponse(request.GET.get("name"), content_type="text/html; charset=utf-8")  # $ HttpResponse mimetype=text/html responseBody=request.GET.get(..)
 
 def xss__write(request):
-    response = HttpResponse()  # $HttpResponse mimetype=text/html
-    response.write(request.GET.get("name"))  # $HttpResponse mimetype=text/html responseBody=request.GET.get(..)
+    response = HttpResponse()  # $ HttpResponse mimetype=text/html
+    response.write(request.GET.get("name"))  # $ HttpResponse mimetype=text/html responseBody=request.GET.get(..)
 
 # This is safe but probably a bug if the argument to `write` is not a result of `json.dumps` or similar.
 def safe__write_json(request):
-    response = JsonResponse()  # $HttpResponse mimetype=application/json
-    response.write(request.GET.get("name"))  # $HttpResponse mimetype=application/json responseBody=request.GET.get(..)
+    response = JsonResponse()  # $ HttpResponse mimetype=application/json
+    response.write(request.GET.get("name"))  # $ HttpResponse mimetype=application/json responseBody=request.GET.get(..)
 
 # Ensure manual subclasses are vulnerable
 class CustomResponse(HttpResponse):
@@ -112,15 +112,15 @@ class CustomResponse(HttpResponse):
         super().__init__(content, *args, content_type="text/html", **kwargs)
 
 def xss__custom_response(request):
-    return CustomResponse("ACME Responses", request.GET("name"))  # $HttpResponse MISSING: mimetype=text/html responseBody=request.GET.get(..) SPURIOUS: responseBody="ACME Responses"
+    return CustomResponse("ACME Responses", request.GET("name"))  # $ HttpResponse MISSING: mimetype=text/html responseBody=request.GET.get(..) SPURIOUS: responseBody="ACME Responses"
 
 class CustomJsonResponse(JsonResponse):
     def __init__(self, banner, content, *args, **kwargs):
         super().__init__(content, *args, content_type="text/html", **kwargs)
 
-@csrf_protect  # $CsrfLocalProtectionEnabled=safe__custom_json_response
+@csrf_protect  # $ CsrfLocalProtectionEnabled=safe__custom_json_response
 def safe__custom_json_response(request):
-    return CustomJsonResponse("ACME Responses", {"foo": request.GET.get("foo")})  # $HttpResponse mimetype=application/json MISSING: responseBody=Dict SPURIOUS: responseBody="ACME Responses"
+    return CustomJsonResponse("ACME Responses", {"foo": request.GET.get("foo")})  # $ HttpResponse mimetype=application/json MISSING: responseBody=Dict SPURIOUS: responseBody="ACME Responses"
 
 ################################################################################
 # Cookies
@@ -135,7 +135,7 @@ def setting_cookie(request):
     resp.delete_cookie("key4") # $ CookieWrite CookieName="key4"
     resp.delete_cookie(key="key4") # $ CookieWrite CookieName="key4"
     resp["Set-Cookie"] = "key5=value5" # $ headerWriteName="Set-Cookie" headerWriteValue="key5=value5" CookieWrite CookieRawHeader="key5=value5" CookieSecure=false CookieHttpOnly=false CookieSameSite=Lax
-    resp.set_cookie(key="key6", value="value6", secure=True, httponly=False, samesite="None") # $ CookieWrite CookieName="key6" CookieValue="value6" CookieSecure=true CookieHttpOnly=false CookieSameSite=None 
+    resp.set_cookie(key="key6", value="value6", secure=True, httponly=False, samesite="None") # $ CookieWrite CookieName="key6" CookieValue="value6" CookieSecure=true CookieHttpOnly=false CookieSameSite=None
     kwargs = {'secure': True}
     resp.set_cookie(key="key7", value="value7", **kwargs) # $ CookieWrite CookieName="key7" CookieValue="value7"
     return resp
diff --git a/python/ql/test/library-tests/frameworks/django-v2-v3/routing_test.py b/python/ql/test/library-tests/frameworks/django-v2-v3/routing_test.py
index 8f36f55ee26..4de1df4b2f5 100644
--- a/python/ql/test/library-tests/frameworks/django-v2-v3/routing_test.py
+++ b/python/ql/test/library-tests/frameworks/django-v2-v3/routing_test.py
@@ -6,21 +6,21 @@ import django.views.generic.base
 from django.views.decorators.http import require_GET
 
 
-def url_match_xss(request, foo, bar, no_taint=None):  # $requestHandler routedParameter=foo routedParameter=bar
-    return HttpResponse('url_match_xss: {} {}'.format(foo, bar))  # $HttpResponse
+def url_match_xss(request, foo, bar, no_taint=None):  # $ requestHandler routedParameter=foo routedParameter=bar
+    return HttpResponse('url_match_xss: {} {}'.format(foo, bar))  # $ HttpResponse
 
 
-def get_params_xss(request):  # $requestHandler
-    return HttpResponse(request.GET.get("untrusted"))  # $HttpResponse
+def get_params_xss(request):  # $ requestHandler
+    return HttpResponse(request.GET.get("untrusted"))  # $ HttpResponse
 
 
-def post_params_xss(request):  # $requestHandler
-    return HttpResponse(request.POST.get("untrusted"))  # $HttpResponse
+def post_params_xss(request):  # $ requestHandler
+    return HttpResponse(request.POST.get("untrusted"))  # $ HttpResponse
 
 
-def http_resp_write(request):  # $requestHandler
-    rsp = HttpResponse()  # $HttpResponse
-    rsp.write(request.GET.get("untrusted"))  # $HttpResponse
+def http_resp_write(request):  # $ requestHandler
+    rsp = HttpResponse()  # $ HttpResponse
+    rsp.write(request.GET.get("untrusted"))  # $ HttpResponse
     return rsp
 
 
@@ -29,13 +29,13 @@ class Foo(object):
 
 
     def post(self, request, untrusted):  # $ MISSING: requestHandler routedParameter=untrusted
-        return HttpResponse('Foo post: {}'.format(untrusted))  # $HttpResponse
+        return HttpResponse('Foo post: {}'.format(untrusted))  # $ HttpResponse
 
 
 class ClassView(View, Foo):
 
     def get(self, request, untrusted):  # $ requestHandler routedParameter=untrusted
-        return HttpResponse('ClassView get: {}'.format(untrusted))  # $HttpResponse
+        return HttpResponse('ClassView get: {}'.format(untrusted))  # $ HttpResponse
 
 
 # direct import with full path to `View` class
@@ -44,38 +44,38 @@ class ClassView2(django.views.generic.base.View):
         pass
 
 
-def show_articles(request, page_number=1):  # $requestHandler routedParameter=page_number
+def show_articles(request, page_number=1):  # $ requestHandler routedParameter=page_number
     page_number = int(page_number)
-    return HttpResponse('articles page: {}'.format(page_number))  # $HttpResponse
+    return HttpResponse('articles page: {}'.format(page_number))  # $ HttpResponse
 
 
-def xxs_positional_arg(request, arg0, arg1, no_taint=None):  # $requestHandler routedParameter=arg0 routedParameter=arg1
-    return HttpResponse('xxs_positional_arg: {} {}'.format(arg0, arg1))  # $HttpResponse
+def xxs_positional_arg(request, arg0, arg1, no_taint=None):  # $ requestHandler routedParameter=arg0 routedParameter=arg1
+    return HttpResponse('xxs_positional_arg: {} {}'.format(arg0, arg1))  # $ HttpResponse
 
 
 urlpatterns = [
-    re_path(r"^url_match/(?P<foo>[^/]+)/(?P<bar>[^/]+)", url_match_xss),  # $routeSetup="^url_match/(?P<foo>[^/]+)/(?P<bar>[^/]+)"
-    re_path(r"^get_params", get_params_xss),  # $routeSetup="^get_params"
-    re_path(r"^post_params", post_params_xss),  # $routeSetup="^post_params"
-    re_path(r"^http_resp_write", http_resp_write),  # $routeSetup="^http_resp_write"
-    re_path(r"^class_view/(?P<untrusted>.+)", ClassView.as_view()),  # $routeSetup="^class_view/(?P<untrusted>.+)"
+    re_path(r"^url_match/(?P<foo>[^/]+)/(?P<bar>[^/]+)", url_match_xss),  # $ routeSetup="^url_match/(?P<foo>[^/]+)/(?P<bar>[^/]+)"
+    re_path(r"^get_params", get_params_xss),  # $ routeSetup="^get_params"
+    re_path(r"^post_params", post_params_xss),  # $ routeSetup="^post_params"
+    re_path(r"^http_resp_write", http_resp_write),  # $ routeSetup="^http_resp_write"
+    re_path(r"^class_view/(?P<untrusted>.+)", ClassView.as_view()),  # $ routeSetup="^class_view/(?P<untrusted>.+)"
 
     # one pattern to support `articles/page-<n>` and ensuring that articles/ goes to page-1
-    re_path(r"articles/^(?:page-(?P<page_number>\d+)/)?", show_articles),  # $routeSetup="articles/^(?:page-(?P<page_number>\d+)/)?"
+    re_path(r"articles/^(?:page-(?P<page_number>\d+)/)?", show_articles),  # $ routeSetup="articles/^(?:page-(?P<page_number>\d+)/)?"
     # passing as positional argument is not the recommended way of doing things, but it is certainly
     # possible
-    re_path(r"^([^/]+)/(?:foo|bar)/([^/]+)", xxs_positional_arg, name='xxs_positional_arg'),  # $routeSetup="^([^/]+)/(?:foo|bar)/([^/]+)"
+    re_path(r"^([^/]+)/(?:foo|bar)/([^/]+)", xxs_positional_arg, name='xxs_positional_arg'),  # $ routeSetup="^([^/]+)/(?:foo|bar)/([^/]+)"
 ]
 
 
 # Show we understand the keyword arguments to django.urls.re_path
 
-def re_path_kwargs(request):  # $requestHandler
-    return HttpResponse('re_path_kwargs')  # $HttpResponse
+def re_path_kwargs(request):  # $ requestHandler
+    return HttpResponse('re_path_kwargs')  # $ HttpResponse
 
 
 urlpatterns = [
-    re_path(view=re_path_kwargs, route=r"^specifying-as-kwargs-is-not-a-problem")  # $routeSetup="^specifying-as-kwargs-is-not-a-problem"
+    re_path(view=re_path_kwargs, route=r"^specifying-as-kwargs-is-not-a-problem")  # $ routeSetup="^specifying-as-kwargs-is-not-a-problem"
 ]
 
 ################################################################################
@@ -83,27 +83,27 @@ urlpatterns = [
 ################################################################################
 
 # saying page_number is an externally controlled *string* is a bit strange, when we have an int converter :O
-def page_number(request, page_number=1):  # $requestHandler routedParameter=page_number
-    return HttpResponse('page_number: {}'.format(page_number))  # $HttpResponse
+def page_number(request, page_number=1):  # $ requestHandler routedParameter=page_number
+    return HttpResponse('page_number: {}'.format(page_number))  # $ HttpResponse
 
-def foo_bar_baz(request, foo, bar, baz):  # $requestHandler routedParameter=foo routedParameter=bar routedParameter=baz
-    return HttpResponse('foo_bar_baz: {} {} {}'.format(foo, bar, baz))  # $HttpResponse
+def foo_bar_baz(request, foo, bar, baz):  # $ requestHandler routedParameter=foo routedParameter=bar routedParameter=baz
+    return HttpResponse('foo_bar_baz: {} {} {}'.format(foo, bar, baz))  # $ HttpResponse
 
-def path_kwargs(request, foo, bar):  # $requestHandler routedParameter=foo routedParameter=bar
-    return HttpResponse('path_kwargs: {} {} {}'.format(foo, bar))  # $HttpResponse
+def path_kwargs(request, foo, bar):  # $ requestHandler routedParameter=foo routedParameter=bar
+    return HttpResponse('path_kwargs: {} {} {}'.format(foo, bar))  # $ HttpResponse
 
-def not_valid_identifier(request):  # $requestHandler
-    return HttpResponse('<foo!>')  # $HttpResponse
+def not_valid_identifier(request):  # $ requestHandler
+    return HttpResponse('<foo!>')  # $ HttpResponse
 
 urlpatterns = [
-    path("articles/", page_number),  # $routeSetup="articles/"
-    path("articles/page-<int:page_number>", page_number),  # $routeSetup="articles/page-<int:page_number>"
-    path("<int:foo>/<str:bar>/<baz>", foo_bar_baz, name='foo-bar-baz'),  # $routeSetup="<int:foo>/<str:bar>/<baz>"
+    path("articles/", page_number),  # $ routeSetup="articles/"
+    path("articles/page-<int:page_number>", page_number),  # $ routeSetup="articles/page-<int:page_number>"
+    path("<int:foo>/<str:bar>/<baz>", foo_bar_baz, name='foo-bar-baz'),  # $ routeSetup="<int:foo>/<str:bar>/<baz>"
 
-    path(view=path_kwargs, route="<foo>/<bar>"),  # $routeSetup="<foo>/<bar>"
+    path(view=path_kwargs, route="<foo>/<bar>"),  # $ routeSetup="<foo>/<bar>"
 
     # We should not report there is a request parameter called `not_valid!`
-    path("not_valid/<not_valid!>", not_valid_identifier),  # $routeSetup="not_valid/<not_valid!>"
+    path("not_valid/<not_valid!>", not_valid_identifier),  # $ routeSetup="not_valid/<not_valid!>"
 ]
 
 ################################################################################
@@ -113,11 +113,11 @@ urlpatterns = [
 # This version 1.x way of defining urls is deprecated in Django 3.1, but still works
 from django.conf.urls import url
 
-def deprecated(request):  # $requestHandler
-    return HttpResponse('deprecated')  # $HttpResponse
+def deprecated(request):  # $ requestHandler
+    return HttpResponse('deprecated')  # $ HttpResponse
 
 urlpatterns = [
-    url(r"^deprecated/", deprecated),  # $routeSetup="^deprecated/"
+    url(r"^deprecated/", deprecated),  # $ routeSetup="^deprecated/"
 ]
 
 
@@ -130,7 +130,7 @@ class PossiblyNotRouted(View):
     # consider it to be a handle incoming HTTP requests
 
     def get(self, request, possibly_not_routed=42):  # $ requestHandler routedParameter=possibly_not_routed
-        return HttpResponse('PossiblyNotRouted get: {}'.format(possibly_not_routed))  # $HttpResponse
+        return HttpResponse('PossiblyNotRouted get: {}'.format(possibly_not_routed))  # $ HttpResponse
 
 
 @require_GET
diff --git a/python/ql/test/library-tests/frameworks/django-v2-v3/taint_test.py b/python/ql/test/library-tests/frameworks/django-v2-v3/taint_test.py
index aa6f78be509..51fe3a545b5 100644
--- a/python/ql/test/library-tests/frameworks/django-v2-v3/taint_test.py
+++ b/python/ql/test/library-tests/frameworks/django-v2-v3/taint_test.py
@@ -4,7 +4,7 @@ from django.http import HttpRequest
 from django.views import View
 
 
-def test_taint(request: HttpRequest, foo, bar, baz=None):  # $requestHandler routedParameter=foo routedParameter=bar
+def test_taint(request: HttpRequest, foo, bar, baz=None):  # $ requestHandler routedParameter=foo routedParameter=bar
     ensure_tainted(foo, bar) # $ tainted
     ensure_not_tainted(baz)
 
diff --git a/python/ql/test/library-tests/frameworks/django-v2-v3/testapp/urls.py b/python/ql/test/library-tests/frameworks/django-v2-v3/testapp/urls.py
index e8f6930c895..fd07a79702c 100644
--- a/python/ql/test/library-tests/frameworks/django-v2-v3/testapp/urls.py
+++ b/python/ql/test/library-tests/frameworks/django-v2-v3/testapp/urls.py
@@ -3,19 +3,19 @@ from django.urls import path, re_path
 from . import views
 
 urlpatterns = [
-    path("foo/", views.foo),  # $routeSetup="foo/"
+    path("foo/", views.foo),  # $ routeSetup="foo/"
     # TODO: Doesn't include standard `$` to mark end of string, due to problems with
     # inline expectation tests (which thinks the `$` would mark the beginning of a new
     # line)
-    re_path(r"^ba[rz]/", views.bar_baz),  # $routeSetup="^ba[rz]/"
+    re_path(r"^ba[rz]/", views.bar_baz),  # $ routeSetup="^ba[rz]/"
 
-    path("basic-view-handler/", views.MyBasicViewHandler.as_view()),  # $routeSetup="basic-view-handler/"
-    path("custom-inheritance-view-handler/", views.MyViewHandlerWithCustomInheritance.as_view()),  # $routeSetup="custom-inheritance-view-handler/"
+    path("basic-view-handler/", views.MyBasicViewHandler.as_view()),  # $ routeSetup="basic-view-handler/"
+    path("custom-inheritance-view-handler/", views.MyViewHandlerWithCustomInheritance.as_view()),  # $ routeSetup="custom-inheritance-view-handler/"
 
-    path("CustomRedirectView/<foo>", views.CustomRedirectView.as_view()),  # $routeSetup="CustomRedirectView/<foo>"
-    path("CustomRedirectView2/<foo>", views.CustomRedirectView2.as_view()),  # $routeSetup="CustomRedirectView2/<foo>"
+    path("CustomRedirectView/<foo>", views.CustomRedirectView.as_view()),  # $ routeSetup="CustomRedirectView/<foo>"
+    path("CustomRedirectView2/<foo>", views.CustomRedirectView2.as_view()),  # $ routeSetup="CustomRedirectView2/<foo>"
 
-    path("file-test/", views.file_test), # $routeSetup="file-test/"
+    path("file-test/", views.file_test), # $ routeSetup="file-test/"
 ]
 
 from django import __version__ as django_version
@@ -30,7 +30,7 @@ if django_version[0] == "3":
     # we need this assignment to get our logic working... maybe it should be more
     # sophisticated?
     urlpatterns = [
-        url(r"^deprecated/", views.deprecated),  # $routeSetup="^deprecated/"
+        url(r"^deprecated/", views.deprecated),  # $ routeSetup="^deprecated/"
     ]
 
     urlpatterns += old_urlpatterns
diff --git a/python/ql/test/library-tests/frameworks/django-v2-v3/testapp/views.py b/python/ql/test/library-tests/frameworks/django-v2-v3/testapp/views.py
index 0ba978ea365..9487970e340 100644
--- a/python/ql/test/library-tests/frameworks/django-v2-v3/testapp/views.py
+++ b/python/ql/test/library-tests/frameworks/django-v2-v3/testapp/views.py
@@ -4,16 +4,16 @@ from django.views.decorators.csrf import csrf_exempt
 
 from .models import MyModel
 
-def foo(request: HttpRequest):  # $requestHandler
-    return HttpResponse("foo")  # $HttpResponse
+def foo(request: HttpRequest):  # $ requestHandler
+    return HttpResponse("foo")  # $ HttpResponse
 
 
-def bar_baz(request: HttpRequest):  # $requestHandler
-    return HttpResponse("bar_baz")  # $HttpResponse
+def bar_baz(request: HttpRequest):  # $ requestHandler
+    return HttpResponse("bar_baz")  # $ HttpResponse
 
 
-def deprecated(request: HttpRequest):  # $requestHandler
-    return HttpResponse("deprecated")  # $HttpResponse
+def deprecated(request: HttpRequest):  # $ requestHandler
+    return HttpResponse("deprecated")  # $ HttpResponse
 
 
 class MyBasicViewHandler(View):
diff --git a/python/ql/test/library-tests/frameworks/django-v2-v3/testproj/settings.py b/python/ql/test/library-tests/frameworks/django-v2-v3/testproj/settings.py
index d88ce4c05e3..648152f5a53 100644
--- a/python/ql/test/library-tests/frameworks/django-v2-v3/testproj/settings.py
+++ b/python/ql/test/library-tests/frameworks/django-v2-v3/testproj/settings.py
@@ -13,7 +13,7 @@ https://docs.djangoproject.com/en/3.1/ref/settings/
 from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve().parent.parent  #$ getAPathArgument=Path(..)
+BASE_DIR = Path(__file__).resolve().parent.parent  # $ getAPathArgument=Path(..)
 
 
 # Quick-start development settings - unsuitable for production
@@ -48,7 +48,7 @@ MIDDLEWARE = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-] # $CsrfProtectionSetting=false
+] # $ CsrfProtectionSetting=false
 
 ROOT_URLCONF = 'testproj.urls'
 
diff --git a/python/ql/test/library-tests/frameworks/django-v2-v3/testproj/urls.py b/python/ql/test/library-tests/frameworks/django-v2-v3/testproj/urls.py
index 135b86a2a19..2d5a736a582 100644
--- a/python/ql/test/library-tests/frameworks/django-v2-v3/testproj/urls.py
+++ b/python/ql/test/library-tests/frameworks/django-v2-v3/testproj/urls.py
@@ -17,6 +17,6 @@ from django.contrib import admin
 from django.urls import path, include
 
 urlpatterns = [
-    path("admin/", admin.site.urls),  # $routeSetup="admin/"
-    path("app/", include("testapp.urls")),  # $routeSetup="app/"
+    path("admin/", admin.site.urls),  # $ routeSetup="admin/"
+    path("app/", include("testapp.urls")),  # $ routeSetup="app/"
 ]
diff --git a/python/ql/test/library-tests/frameworks/django/SqlExecution.py b/python/ql/test/library-tests/frameworks/django/SqlExecution.py
index 8bf657d04da..743277a1fd7 100644
--- a/python/ql/test/library-tests/frameworks/django/SqlExecution.py
+++ b/python/ql/test/library-tests/frameworks/django/SqlExecution.py
@@ -4,13 +4,13 @@ from django.db.models.expressions import RawSQL
 
 def test_plain():
     cursor = connection.cursor()
-    cursor.execute("some sql")  # $getSql="some sql"
+    cursor.execute("some sql")  # $ getSql="some sql"
 
 
 def test_context():
     with connection.cursor() as cursor:
-        cursor.execute("some sql")  # $getSql="some sql"
-        cursor.execute(sql="some sql")  # $getSql="some sql"
+        cursor.execute("some sql")  # $ getSql="some sql"
+        cursor.execute(sql="some sql")  # $ getSql="some sql"
 
 
 class User(models.Model):
@@ -18,20 +18,20 @@ class User(models.Model):
 
 
 def test_model():
-    User.objects.raw("some sql")  # $getSql="some sql"
+    User.objects.raw("some sql")  # $ getSql="some sql"
 
-    User.objects.annotate(RawSQL("some sql"))  # $getSql="some sql"
-    User.objects.annotate(RawSQL("foo"), RawSQL("bar"))  # $getSql="foo" getSql="bar"
-    User.objects.annotate(val=RawSQL("some sql"))  # $getSql="some sql"
+    User.objects.annotate(RawSQL("some sql"))  # $ getSql="some sql"
+    User.objects.annotate(RawSQL("foo"), RawSQL("bar"))  # $ getSql="foo" getSql="bar"
+    User.objects.annotate(val=RawSQL("some sql"))  # $ getSql="some sql"
 
-    User.objects.alias(RawSQL("foo"), RawSQL("bar"))  # $getSql="foo" getSql="bar"
-    User.objects.alias(val=RawSQL("some sql"))  # $getSql="some sql"
+    User.objects.alias(RawSQL("foo"), RawSQL("bar"))  # $ getSql="foo" getSql="bar"
+    User.objects.alias(val=RawSQL("some sql"))  # $ getSql="some sql"
 
-    User.objects.extra("some sql")  # $getSql="some sql"
-    User.objects.extra(select="select", where="where", tables="tables", order_by="order_by")  # $getSql="select" getSql="where" getSql="tables" getSql="order_by"
+    User.objects.extra("some sql")  # $ getSql="some sql"
+    User.objects.extra(select="select", where="where", tables="tables", order_by="order_by")  # $ getSql="select" getSql="where" getSql="tables" getSql="order_by"
 
     raw = RawSQL("so raw")
-    User.objects.annotate(val=raw)  # $getSql="so raw"
+    User.objects.annotate(val=raw)  # $ getSql="so raw"
 
     # chaining QuerySet calls
     User.objects.using("db-name").exclude(username="admin").extra("some sql") # $ getSql="some sql"
diff --git a/python/ql/test/library-tests/frameworks/fabric/fabric_v1_test.py b/python/ql/test/library-tests/frameworks/fabric/fabric_v1_test.py
index a5e3ed57539..91bab0a72cd 100644
--- a/python/ql/test/library-tests/frameworks/fabric/fabric_v1_test.py
+++ b/python/ql/test/library-tests/frameworks/fabric/fabric_v1_test.py
@@ -5,15 +5,15 @@ See http://docs.fabfile.org/en/1.14/tutorial.html
 
 from fabric.api import run, local, sudo
 
-local("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-run("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-sudo("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+local("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+run("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+sudo("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
-local(command="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-run(command="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-sudo(command="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+local(command="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+run(command="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+sudo(command="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 from fabric import operations
 
-operations.local("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-operations.local(command="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+operations.local("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+operations.local(command="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
diff --git a/python/ql/test/library-tests/frameworks/fabric/fabric_v2_test.py b/python/ql/test/library-tests/frameworks/fabric/fabric_v2_test.py
index 0334458273f..a73232d42d4 100644
--- a/python/ql/test/library-tests/frameworks/fabric/fabric_v2_test.py
+++ b/python/ql/test/library-tests/frameworks/fabric/fabric_v2_test.py
@@ -9,41 +9,41 @@ from fabric import connection, Connection, group, SerialGroup, ThreadingGroup, t
 # Connection
 ################################################################################
 c = Connection("web1")
-c.run("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-c.local("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-c.sudo("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+c.run("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+c.local("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+c.sudo("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
-c.local(command="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-c.run(command="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-c.sudo(command="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+c.local(command="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+c.run(command="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+c.sudo(command="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 # fully qualified usage
 c2 = connection.Connection("web2")
-c2.run("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+c2.run("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 # ssh proxy_command command injection with gateway parameter,
 # we need to call some of the following functions to run the proxy command
-c = Connection("web1", gateway="cmd")  # $getCommand="cmd"
-c.run(command="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-c = Connection("web1", gateway="cmd")  # $getCommand="cmd"
+c = Connection("web1", gateway="cmd")  # $ getCommand="cmd"
+c.run(command="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+c = Connection("web1", gateway="cmd")  # $ getCommand="cmd"
 c.get("afs")
-c = Connection("web1", gateway="cmd")  # $getCommand="cmd"
-c.sudo(command="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-c = Connection("web1", gateway="cmd")  # $getCommand="cmd"
+c = Connection("web1", gateway="cmd")  # $ getCommand="cmd"
+c.sudo(command="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+c = Connection("web1", gateway="cmd")  # $ getCommand="cmd"
 c.open_gateway()
-c = Connection("web1", gateway="cmd")  # $getCommand="cmd"
+c = Connection("web1", gateway="cmd")  # $ getCommand="cmd"
 c.open()
-c = Connection("web1", gateway="cmd")  # $getCommand="cmd"
+c = Connection("web1", gateway="cmd")  # $ getCommand="cmd"
 c.create_session()
-c = Connection("web1", gateway="cmd")  # $getCommand="cmd"
+c = Connection("web1", gateway="cmd")  # $ getCommand="cmd"
 c.forward_local("80")
-c = Connection("web1", gateway="cmd")  # $getCommand="cmd"
+c = Connection("web1", gateway="cmd")  # $ getCommand="cmd"
 c.forward_remote("80")
-c = Connection("web1", gateway="cmd")  # $getCommand="cmd"
+c = Connection("web1", gateway="cmd")  # $ getCommand="cmd"
 c.put(local="local")
-c = Connection("web1", gateway="cmd")  # $getCommand="cmd"
+c = Connection("web1", gateway="cmd")  # $ getCommand="cmd"
 c.shell()
-c = Connection("web1", gateway="cmd")  # $getCommand="cmd"
+c = Connection("web1", gateway="cmd")  # $ getCommand="cmd"
 c.sftp()
 # no call to desired methods so it is safe
 c = Connection("web1", gateway="cmd")
@@ -51,26 +51,26 @@ c = Connection("web1", gateway="cmd")
 ################################################################################
 # SerialGroup
 ################################################################################
-results = SerialGroup("web1", "web2", "mac1").run("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+results = SerialGroup("web1", "web2", "mac1").run("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 pool = SerialGroup("web1", "web2", "web3")
-pool.run("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-pool.sudo("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+pool.run("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+pool.sudo("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 # fully qualified usage
-group.SerialGroup("web1", "web2", "mac1").run("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+group.SerialGroup("web1", "web2", "mac1").run("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 ################################################################################
 # ThreadingGroup
 ################################################################################
-results = ThreadingGroup("web1", "web2", "mac1").run("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+results = ThreadingGroup("web1", "web2", "mac1").run("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 pool = ThreadingGroup("web1", "web2", "web3")
-pool.run("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-pool.sudo("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+pool.run("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+pool.sudo("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 # fully qualified usage
-group.ThreadingGroup("web1", "web2", "mac1").run("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+group.ThreadingGroup("web1", "web2", "mac1").run("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 
 ################################################################################
@@ -81,11 +81,11 @@ group.ThreadingGroup("web1", "web2", "mac1").run("cmd1; cmd2")  # $getCommand="c
 @task
 def foo(c):
     # 'c' is a fabric.connection.Connection
-    c.run("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+    c.run("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 
 # fully qualified usage
 @tasks.task
 def bar(c):
     # 'c' is a fabric.connection.Connection
-    c.run("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+    c.run("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
diff --git a/python/ql/test/library-tests/frameworks/flask/old_test.py b/python/ql/test/library-tests/frameworks/flask/old_test.py
index 556467fad9b..4c1ee89b530 100644
--- a/python/ql/test/library-tests/frameworks/flask/old_test.py
+++ b/python/ql/test/library-tests/frameworks/flask/old_test.py
@@ -3,9 +3,9 @@ import flask
 from flask import Flask, request, make_response
 app = Flask(__name__)
 
-@app.route("/")  # $routeSetup="/"
-def hello_world():  # $requestHandler
-    return "Hello World!"  # $HttpResponse
+@app.route("/")  # $ routeSetup="/"
+def hello_world():  # $ requestHandler
+    return "Hello World!"  # $ HttpResponse
 
 from flask.views import MethodView
 
@@ -22,46 +22,46 @@ class MyView(MethodView):
 the_view = MyView.as_view('my_view')
 
 app.add_url_rule('/the/', defaults={'user_id': None},
-                 view_func=the_view, methods=['GET',]) # $routeSetup="/the/"
+                 view_func=the_view, methods=['GET',]) # $ routeSetup="/the/"
 
-@app.route("/dangerous")  # $routeSetup="/dangerous"
-def dangerous():  # $requestHandler
-    return request.args.get('payload')  # $HttpResponse
+@app.route("/dangerous")  # $ routeSetup="/dangerous"
+def dangerous():  # $ requestHandler
+    return request.args.get('payload')  # $ HttpResponse
 
-@app.route("/dangerous-with-cfg-split")  # $routeSetup="/dangerous-with-cfg-split"
-def dangerous2():  # $requestHandler
+@app.route("/dangerous-with-cfg-split")  # $ routeSetup="/dangerous-with-cfg-split"
+def dangerous2():  # $ requestHandler
     x = request.form['param0']
     if request.method == "POST":
-        return request.form['param1']  # $HttpResponse
+        return request.form['param1']  # $ HttpResponse
     return None  # $ SPURIOUS: HttpResponse
 
-@app.route("/unsafe")  # $routeSetup="/unsafe"
-def unsafe():  # $requestHandler
+@app.route("/unsafe")  # $ routeSetup="/unsafe"
+def unsafe():  # $ requestHandler
     first_name = request.args.get('name', '')
-    return make_response("Your name is " + first_name)  # $HttpResponse
+    return make_response("Your name is " + first_name)  # $ HttpResponse
 
-@app.route("/safe")  # $routeSetup="/safe"
-def safe():  # $requestHandler
+@app.route("/safe")  # $ routeSetup="/safe"
+def safe():  # $ requestHandler
     first_name = request.args.get('name', '')
-    return make_response("Your name is " + escape(first_name))  # $HttpResponse
+    return make_response("Your name is " + escape(first_name))  # $ HttpResponse
 
-@app.route("/hello/<name>")  # $routeSetup="/hello/<name>"
-def hello(name):  # $requestHandler routedParameter=name
-    return make_response("Your name is " + name)  # $HttpResponse
+@app.route("/hello/<name>")  # $ routeSetup="/hello/<name>"
+def hello(name):  # $ requestHandler routedParameter=name
+    return make_response("Your name is " + name)  # $ HttpResponse
 
-@app.route("/foo/<path:subpath>")  # $routeSetup="/foo/<path:subpath>"
-def foo(subpath):  # $requestHandler routedParameter=subpath
-    return make_response("The subpath is " + subpath)  # $HttpResponse
+@app.route("/foo/<path:subpath>")  # $ routeSetup="/foo/<path:subpath>"
+def foo(subpath):  # $ requestHandler routedParameter=subpath
+    return make_response("The subpath is " + subpath)  # $ HttpResponse
 
-@app.route("/multiple/")  # $routeSetup="/multiple/"
-@app.route("/multiple/foo/<foo>")  # $routeSetup="/multiple/foo/<foo>"
-@app.route("/multiple/bar/<bar>")  # $routeSetup="/multiple/bar/<bar>"
-def multiple(foo=None, bar=None):  # $requestHandler routedParameter=foo routedParameter=bar
-    return make_response("foo={!r} bar={!r}".format(foo, bar))  # $HttpResponse
+@app.route("/multiple/")  # $ routeSetup="/multiple/"
+@app.route("/multiple/foo/<foo>")  # $ routeSetup="/multiple/foo/<foo>"
+@app.route("/multiple/bar/<bar>")  # $ routeSetup="/multiple/bar/<bar>"
+def multiple(foo=None, bar=None):  # $ requestHandler routedParameter=foo routedParameter=bar
+    return make_response("foo={!r} bar={!r}".format(foo, bar))  # $ HttpResponse
 
-@app.route("/complex/<string(length=2):lang_code>")  # $routeSetup="/complex/<string(length=2):lang_code>"
-def complex(lang_code):  # $requestHandler routedParameter=lang_code
-    return make_response("lang_code {}".format(lang_code))  # $HttpResponse
+@app.route("/complex/<string(length=2):lang_code>")  # $ routeSetup="/complex/<string(length=2):lang_code>"
+def complex(lang_code):  # $ requestHandler routedParameter=lang_code
+    return make_response("lang_code {}".format(lang_code))  # $ HttpResponse
 
 if __name__ == "__main__":
     app.run(debug=True)
diff --git a/python/ql/test/library-tests/frameworks/flask/response_test.py b/python/ql/test/library-tests/frameworks/flask/response_test.py
index 128037f0e30..e775239d642 100644
--- a/python/ql/test/library-tests/frameworks/flask/response_test.py
+++ b/python/ql/test/library-tests/frameworks/flask/response_test.py
@@ -6,23 +6,23 @@ from werkzeug.datastructures import Headers
 app = Flask(__name__)
 
 
-@app.route("/html1")  # $routeSetup="/html1"
-def html1():  # $requestHandler
-    return "<h1>hello</h1>"  # $HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
+@app.route("/html1")  # $ routeSetup="/html1"
+def html1():  # $ requestHandler
+    return "<h1>hello</h1>"  # $ HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
 
 
-@app.route("/html2")  # $routeSetup="/html2"
-def html2():  # $requestHandler
+@app.route("/html2")  # $ routeSetup="/html2"
+def html2():  # $ requestHandler
     # note that response saved in a variable intentionally -- we wan the annotations to
     # show that we recognize the response creation, and not the return (hopefully). (and
     # do the same in the following of the file)
-    resp = make_response("<h1>hello</h1>")  # $HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
+    resp = make_response("<h1>hello</h1>")  # $ HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
     return resp  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp
 
 
-@app.route("/html3")  # $routeSetup="/html3"
-def html3():  # $requestHandler
-    resp = app.make_response("<h1>hello</h1>")  # $HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
+@app.route("/html3")  # $ routeSetup="/html3"
+def html3():  # $ requestHandler
+    resp = app.make_response("<h1>hello</h1>")  # $ HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
     return resp  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp
 
 
@@ -30,50 +30,50 @@ def html3():  # $requestHandler
 # https://flask.palletsprojects.com/en/1.1.x/api/#flask.Flask.make_response
 
 
-@app.route("/html4")  # $routeSetup="/html4"
-def html4():  # $requestHandler
-    resp = Response("<h1>hello</h1>")  # $HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
+@app.route("/html4")  # $ routeSetup="/html4"
+def html4():  # $ requestHandler
+    resp = Response("<h1>hello</h1>")  # $ HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
     return resp  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp
 
 
-@app.route("/html5")  # $routeSetup="/html5"
-def html5():  # $requestHandler
-    resp = Response(response="<h1>hello</h1>")  # $HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
+@app.route("/html5")  # $ routeSetup="/html5"
+def html5():  # $ requestHandler
+    resp = Response(response="<h1>hello</h1>")  # $ HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
     return resp  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp
 
 
-@app.route("/html6")  # $routeSetup="/html6"
-def html6():  # $requestHandler
+@app.route("/html6")  # $ routeSetup="/html6"
+def html6():  # $ requestHandler
     # note: flask.Flask.response_class is set to `flask.Response` by default.
     # it can be overridden, but we don't try to handle that right now.
-    resp = Flask.response_class("<h1>hello</h1>")  # $HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
+    resp = Flask.response_class("<h1>hello</h1>")  # $ HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
     return resp  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp
 
 
-@app.route("/html7")  # $routeSetup="/html7"
-def html7():  # $requestHandler
+@app.route("/html7")  # $ routeSetup="/html7"
+def html7():  # $ requestHandler
     # note: app.response_class (flask.Flask.response_class) is set to `flask.Response` by default.
     # it can be overridden, but we don't try to handle that right now.
-    resp = app.response_class("<h1>hello</h1>")  # $HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
+    resp = app.response_class("<h1>hello</h1>")  # $ HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
     return resp  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp
 
 
-@app.route("/html8")  # $routeSetup="/html8"
-def html8():  # $requestHandler
-    resp = make_response()  # $HttpResponse mimetype=text/html
+@app.route("/html8")  # $ routeSetup="/html8"
+def html8():  # $ requestHandler
+    resp = make_response()  # $ HttpResponse mimetype=text/html
     resp.set_data("<h1>hello</h1>")  # $ MISSING: responseBody="<h1>hello</h1>"
     return resp  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp
 
 
-@app.route("/jsonify")  # $routeSetup="/jsonify"
-def jsonify_route():  # $requestHandler
+@app.route("/jsonify")  # $ routeSetup="/jsonify"
+def jsonify_route():  # $ requestHandler
     x = "x"; y = "y"; z = "z"
     if True:
         import flask.json
-        resp = flask.json.jsonify(x, y, z=z)  # $HttpResponse mimetype=application/json responseBody=x responseBody=y responseBody=z
+        resp = flask.json.jsonify(x, y, z=z)  # $ HttpResponse mimetype=application/json responseBody=x responseBody=y responseBody=z
         assert resp.mimetype == "application/json"
 
-        resp = app.json.response(x, y, z=z)  # $HttpResponse mimetype=application/json responseBody=x responseBody=y responseBody=z
+        resp = app.json.response(x, y, z=z)  # $ HttpResponse mimetype=application/json responseBody=x responseBody=y responseBody=z
         assert resp.mimetype == "application/json"
 
     resp = jsonify(x, y, z=z)  # $ HttpResponse mimetype=application/json responseBody=x responseBody=y responseBody=z
@@ -83,24 +83,24 @@ def jsonify_route():  # $requestHandler
 # Tricky return handling
 ################################################################################
 
-@app.route("/tricky-return1")  # $routeSetup="/tricky-return1"
-def tricky_return1():  # $requestHandler
+@app.route("/tricky-return1")  # $ routeSetup="/tricky-return1"
+def tricky_return1():  # $ requestHandler
     if "raw" in request.args:
         resp = "<h1>hellu</h1>"
     else:
-        resp = make_response("<h1>hello</h1>")  # $HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
-    return resp  # $HttpResponse mimetype=text/html responseBody=resp
+        resp = make_response("<h1>hello</h1>")  # $ HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
+    return resp  # $ HttpResponse mimetype=text/html responseBody=resp
 
 def helper():
     if "raw" in request.args:
         return "<h1>hellu</h1>"
     else:
-        return make_response("<h1>hello</h1>")  # $HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
+        return make_response("<h1>hello</h1>")  # $ HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
 
-@app.route("/tricky-return2")  # $routeSetup="/tricky-return2"
-def tricky_return2():  # $requestHandler
+@app.route("/tricky-return2")  # $ routeSetup="/tricky-return2"
+def tricky_return2():  # $ requestHandler
     resp = helper()
-    return resp  # $HttpResponse mimetype=text/html responseBody=resp
+    return resp  # $ HttpResponse mimetype=text/html responseBody=resp
 
 
 ################################################################################
@@ -108,16 +108,16 @@ def tricky_return2():  # $requestHandler
 ################################################################################
 
 
-@app.route("/content-type/response-modification1")  # $routeSetup="/content-type/response-modification1"
-def response_modification1():  # $requestHandler
-    resp = make_response("<h1>hello</h1>")  # $HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
+@app.route("/content-type/response-modification1")  # $ routeSetup="/content-type/response-modification1"
+def response_modification1():  # $ requestHandler
+    resp = make_response("<h1>hello</h1>")  # $ HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
     resp.content_type = "text/plain"  # $ MISSING: HttpResponse mimetype=text/plain
     return resp  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp
 
 
-@app.route("/content-type/response-modification2")  # $routeSetup="/content-type/response-modification2"
-def response_modification2():  # $requestHandler
-    resp = make_response("<h1>hello</h1>")  # $HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
+@app.route("/content-type/response-modification2")  # $ routeSetup="/content-type/response-modification2"
+def response_modification2():  # $ requestHandler
+    resp = make_response("<h1>hello</h1>")  # $ HttpResponse mimetype=text/html responseBody="<h1>hello</h1>"
     resp.headers["content-type"] = "text/plain"  # $ headerWriteNameUnsanitized="content-type" headerWriteValue="text/plain" MISSING: HttpResponse mimetype=text/plain
     return resp  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp
 
@@ -126,61 +126,61 @@ def response_modification2():  # $requestHandler
 # see https://werkzeug.palletsprojects.com/en/1.0.x/wrappers/#werkzeug.wrappers.Response
 
 
-@app.route("/content-type/Response1")  # $routeSetup="/content-type/Response1"
-def Response1():  # $requestHandler
-    resp = Response("<h1>hello</h1>", mimetype="text/plain")  # $HttpResponse mimetype=text/plain responseBody="<h1>hello</h1>"
+@app.route("/content-type/Response1")  # $ routeSetup="/content-type/Response1"
+def Response1():  # $ requestHandler
+    resp = Response("<h1>hello</h1>", mimetype="text/plain")  # $ HttpResponse mimetype=text/plain responseBody="<h1>hello</h1>"
     return resp  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp
 
 
-@app.route("/content-type/Response2")  # $routeSetup="/content-type/Response2"
-def Response2():  # $requestHandler
-    resp = Response("<h1>hello</h1>", content_type="text/plain; charset=utf-8")  # $HttpResponse mimetype=text/plain responseBody="<h1>hello</h1>"
+@app.route("/content-type/Response2")  # $ routeSetup="/content-type/Response2"
+def Response2():  # $ requestHandler
+    resp = Response("<h1>hello</h1>", content_type="text/plain; charset=utf-8")  # $ HttpResponse mimetype=text/plain responseBody="<h1>hello</h1>"
     return resp  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp
 
 
-@app.route("/content-type/Response3")  # $routeSetup="/content-type/Response3"
-def Response3():  # $requestHandler
+@app.route("/content-type/Response3")  # $ routeSetup="/content-type/Response3"
+def Response3():  # $ requestHandler
     # content_type argument takes priority (and result is text/plain)
-    resp = Response("<h1>hello</h1>", content_type="text/plain; charset=utf-8", mimetype="text/html")  # $HttpResponse mimetype=text/plain responseBody="<h1>hello</h1>"
+    resp = Response("<h1>hello</h1>", content_type="text/plain; charset=utf-8", mimetype="text/html")  # $ HttpResponse mimetype=text/plain responseBody="<h1>hello</h1>"
     return resp  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp
 
 
-@app.route("/content-type/Response4")  # $routeSetup="/content-type/Response4"
-def Response4():  # $requestHandler
+@app.route("/content-type/Response4")  # $ routeSetup="/content-type/Response4"
+def Response4():  # $ requestHandler
     # note: capitalization of Content-Type does not matter
     resp = Response("<h1>hello</h1>", headers={"Content-TYPE": "text/plain"})  # $ headerWriteBulk=Dict headerWriteBulkUnsanitized=name headerWriteNameUnsanitized="Content-TYPE" headerWriteValue="text/plain" HttpResponse responseBody="<h1>hello</h1>" SPURIOUS: mimetype=text/html MISSING: mimetype=text/plain
     return resp  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp
 
 
-@app.route("/content-type/Response5")  # $routeSetup="/content-type/Response5"
-def Response5():  # $requestHandler
+@app.route("/content-type/Response5")  # $ routeSetup="/content-type/Response5"
+def Response5():  # $ requestHandler
     # content_type argument takes priority (and result is text/plain)
     # note: capitalization of Content-Type does not matter
     resp = Response("<h1>hello</h1>", headers={"Content-TYPE": "text/html"}, content_type="text/plain; charset=utf-8")  # $ headerWriteBulk=Dict headerWriteBulkUnsanitized=name headerWriteNameUnsanitized="Content-TYPE" headerWriteValue="text/html" HttpResponse mimetype=text/plain responseBody="<h1>hello</h1>"
     return resp  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp
 
 
-@app.route("/content-type/Response6")  # $routeSetup="/content-type/Response6"
-def Response6():  # $requestHandler
+@app.route("/content-type/Response6")  # $ routeSetup="/content-type/Response6"
+def Response6():  # $ requestHandler
     # mimetype argument takes priority over header (and result is text/plain)
     # note: capitalization of Content-Type does not matter
     resp = Response("<h1>hello</h1>", headers={"Content-TYPE": "text/html"}, mimetype="text/plain")  # $ headerWriteBulk=Dict headerWriteBulkUnsanitized=name headerWriteNameUnsanitized="Content-TYPE" headerWriteValue="text/html" HttpResponse mimetype=text/plain responseBody="<h1>hello</h1>"
     return resp  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp
 
 
-@app.route("/content-type/Flask-response-class")  # $routeSetup="/content-type/Flask-response-class"
-def Flask_response_class():  # $requestHandler
+@app.route("/content-type/Flask-response-class")  # $ routeSetup="/content-type/Flask-response-class"
+def Flask_response_class():  # $ requestHandler
     # note: flask.Flask.response_class is set to `flask.Response` by default.
     # it can be overridden, but we don't try to handle that right now.
-    resp = Flask.response_class("<h1>hello</h1>", mimetype="text/plain")  # $HttpResponse mimetype=text/plain responseBody="<h1>hello</h1>"
+    resp = Flask.response_class("<h1>hello</h1>", mimetype="text/plain")  # $ HttpResponse mimetype=text/plain responseBody="<h1>hello</h1>"
     return resp  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp
 
 
-@app.route("/content-type/app-response-class")  # $routeSetup="/content-type/app-response-class"
-def app_response_class():  # $requestHandler
+@app.route("/content-type/app-response-class")  # $ routeSetup="/content-type/app-response-class"
+def app_response_class():  # $ requestHandler
     # note: app.response_class (flask.Flask.response_class) is set to `flask.Response` by default.
     # it can be overridden, but we don't try to handle that right now.
-    resp = app.response_class("<h1>hello</h1>", mimetype="text/plain")  # $HttpResponse mimetype=text/plain responseBody="<h1>hello</h1>"
+    resp = app.response_class("<h1>hello</h1>", mimetype="text/plain")  # $ HttpResponse mimetype=text/plain responseBody="<h1>hello</h1>"
     return resp  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp
 
 
@@ -192,8 +192,8 @@ def app_response_class():  # $requestHandler
 ################################################################################
 
 
-@app.route("/redirect-simple")  # $routeSetup="/redirect-simple"
-def redirect_simple():  # $requestHandler
+@app.route("/redirect-simple")  # $ routeSetup="/redirect-simple"
+def redirect_simple():  # $ requestHandler
     next = request.args['next']
     resp = redirect(next) # $ HttpResponse mimetype=text/html HttpRedirectResponse redirectLocation=next
     return resp  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp
@@ -206,13 +206,13 @@ def redirect_simple():  # $requestHandler
 def unk():
     return
 
-@app.route("/setting_cookie")  # $routeSetup="/setting_cookie"
-def setting_cookie():  # $requestHandler
+@app.route("/setting_cookie")  # $ routeSetup="/setting_cookie"
+def setting_cookie():  # $ requestHandler
     resp = make_response() # $ HttpResponse mimetype=text/html
     resp.set_cookie("key", "value") # $ CookieWrite CookieName="key" CookieValue="value" CookieSecure=false CookieHttpOnly=false CookieSameSite=Lax
     resp.set_cookie(key="key", value="value") # $ CookieWrite CookieName="key" CookieValue="value" CookieSecure=false CookieHttpOnly=false CookieSameSite=Lax
     resp.set_cookie(key="key", value="value", secure=True, httponly=True, samesite="Strict") # $ CookieWrite CookieName="key" CookieValue="value" CookieSecure=true CookieHttpOnly=true CookieSameSite=Strict
-    resp.set_cookie(key="key", value="value", secure=unk(), httponly=unk(), samesite=unk()) # $ CookieWrite CookieName="key" CookieValue="value" 
+    resp.set_cookie(key="key", value="value", secure=unk(), httponly=unk(), samesite=unk()) # $ CookieWrite CookieName="key" CookieValue="value"
     resp.headers.add("Set-Cookie", "key2=value2") # $ headerWriteNameUnsanitized="Set-Cookie" headerWriteValue="key2=value2" CookieWrite CookieRawHeader="key2=value2" CookieSecure=false CookieHttpOnly=false CookieSameSite=Lax
     resp.delete_cookie("key3") # $ CookieWrite CookieName="key3"
     resp.delete_cookie(key="key3") # $ CookieWrite CookieName="key3"
@@ -222,33 +222,33 @@ def setting_cookie():  # $requestHandler
 # Headers
 ################################################################################
 
-@app.route("/headers") # $routeSetup="/headers"
-def headers():  # $requestHandler
+@app.route("/headers") # $ routeSetup="/headers"
+def headers():  # $ requestHandler
     resp1 = Response() # $ HttpResponse mimetype=text/html
     resp1.headers["X-MyHeader"] = "a" # $ headerWriteNameUnsanitized="X-MyHeader" headerWriteValue="a"
     resp2 = make_response() # $ HttpResponse mimetype=text/html
     resp2.headers["X-MyHeader"] = "aa" # $ headerWriteNameUnsanitized="X-MyHeader" headerWriteValue="aa"
-    resp2.headers.extend({"X-MyHeader2": "b"}) # $ headerWriteBulk=Dict headerWriteBulkUnsanitized=name headerWriteNameUnsanitized="X-MyHeader2" headerWriteValue="b" 
+    resp2.headers.extend({"X-MyHeader2": "b"}) # $ headerWriteBulk=Dict headerWriteBulkUnsanitized=name headerWriteNameUnsanitized="X-MyHeader2" headerWriteValue="b"
     resp3 = make_response("hello", 200, {"X-MyHeader3": "c"}) # $ HttpResponse mimetype=text/html responseBody="hello" headerWriteBulk=Dict headerWriteBulkUnsanitized=name headerWriteNameUnsanitized="X-MyHeader3" headerWriteValue="c"
     resp4 = make_response("hello", {"X-MyHeader4": "d"}) # $ HttpResponse mimetype=text/html responseBody="hello" headerWriteBulk=Dict headerWriteBulkUnsanitized=name headerWriteNameUnsanitized="X-MyHeader4" headerWriteValue="d"
     resp5 = Response(headers={"X-MyHeader5":"e"}) # $ HttpResponse mimetype=text/html headerWriteBulk=Dict headerWriteBulkUnsanitized=name headerWriteBulkUnsanitized=name headerWriteNameUnsanitized="X-MyHeader5" headerWriteValue="e"
     return resp5  # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=resp5
 
-@app.route("/werkzeug-headers") # $routeSetup="/werkzeug-headers"
-def werkzeug_headers():  # $requestHandler
+@app.route("/werkzeug-headers") # $ routeSetup="/werkzeug-headers"
+def werkzeug_headers():  # $ requestHandler
     response = Response() # $ HttpResponse mimetype=text/html
     headers = Headers()
     headers.add("X-MyHeader1", "a") # $ headerWriteNameUnsanitized="X-MyHeader1" headerWriteValue="a"
     headers.add_header("X-MyHeader2", "b") # $ headerWriteNameUnsanitized="X-MyHeader2" headerWriteValue="b"
-    headers.set("X-MyHeader3", "c") # $ headerWriteNameUnsanitized="X-MyHeader3" headerWriteValue="c" 
-    headers.setdefault("X-MyHeader4", "d") # $ headerWriteNameUnsanitized="X-MyHeader4" headerWriteValue="d" 
-    headers.__setitem__("X-MyHeader5", "e") # $ headerWriteNameUnsanitized="X-MyHeader5" headerWriteValue="e" 
-    headers["X-MyHeader6"] = "f" # $ headerWriteNameUnsanitized="X-MyHeader6" headerWriteValue="f" 
+    headers.set("X-MyHeader3", "c") # $ headerWriteNameUnsanitized="X-MyHeader3" headerWriteValue="c"
+    headers.setdefault("X-MyHeader4", "d") # $ headerWriteNameUnsanitized="X-MyHeader4" headerWriteValue="d"
+    headers.__setitem__("X-MyHeader5", "e") # $ headerWriteNameUnsanitized="X-MyHeader5" headerWriteValue="e"
+    headers["X-MyHeader6"] = "f" # $ headerWriteNameUnsanitized="X-MyHeader6" headerWriteValue="f"
     h1 = {"X-MyHeader7": "g"} # $ headerWriteNameUnsanitized="X-MyHeader7" headerWriteValue="g"
-    headers.extend(h1) # $ headerWriteBulk=h1 headerWriteBulkUnsanitized=name 
+    headers.extend(h1) # $ headerWriteBulk=h1 headerWriteBulkUnsanitized=name
     h2 = [("X-MyHeader8", "h")] # $ headerWriteNameUnsanitized="X-MyHeader8" headerWriteValue="h"
-    headers.extend(h2) # $ headerWriteBulk=h2 headerWriteBulkUnsanitized=name 
-    response.headers = headers 
+    headers.extend(h2) # $ headerWriteBulk=h2 headerWriteBulkUnsanitized=name
+    response.headers = headers
     return response # $ SPURIOUS: HttpResponse mimetype=text/html responseBody=response
 
 ################################################################################
diff --git a/python/ql/test/library-tests/frameworks/flask/routing_test.py b/python/ql/test/library-tests/frameworks/flask/routing_test.py
index 1e9eafe2611..1bd8de5e7de 100644
--- a/python/ql/test/library-tests/frameworks/flask/routing_test.py
+++ b/python/ql/test/library-tests/frameworks/flask/routing_test.py
@@ -5,28 +5,28 @@ app = Flask(__name__)
 
 
 SOME_ROUTE = "/some/route"
-@app.route(SOME_ROUTE) # $routeSetup="/some/route"
-def some_route():  # $requestHandler
-    return make_response("some_route")  # $HttpResponse
+@app.route(SOME_ROUTE) # $ routeSetup="/some/route"
+def some_route():  # $ requestHandler
+    return make_response("some_route")  # $ HttpResponse
 
 
-def index():  # $requestHandler
-    return make_response("index")  # $HttpResponse
-app.add_url_rule('/index', 'index', index)  # $routeSetup="/index"
+def index():  # $ requestHandler
+    return make_response("index")  # $ HttpResponse
+app.add_url_rule('/index', 'index', index)  # $ routeSetup="/index"
 
 
 # We don't support this yet, and I think that's OK
 def later_set():  # $ MISSING: requestHandler
-    return make_response("later_set")  # $HttpResponse
-app.add_url_rule('/later-set', 'later_set', view_func=None)  # $routeSetup="/later-set"
+    return make_response("later_set")  # $ HttpResponse
+app.add_url_rule('/later-set', 'later_set', view_func=None)  # $ routeSetup="/later-set"
 app.view_functions['later_set'] = later_set
 
 # We don't want to execute this at runtime (since program will crash). Just using
 # `False` makes our analysis skip it, so here's a workaround :D
 if __file__ == "False":
-    @app.route(UNKNOWN_ROUTE) # $routeSetup
-    def unkown_route(foo, bar):  # $requestHandler routedParameter=foo routedParameter=bar
-        return make_response("unkown_route")  # $HttpResponse
+    @app.route(UNKNOWN_ROUTE) # $ routeSetup
+    def unkown_route(foo, bar):  # $ requestHandler routedParameter=foo routedParameter=bar
+        return make_response("unkown_route")  # $ HttpResponse
 
 # View
 #
@@ -40,7 +40,7 @@ class ShowUser(View):
     def dispatch_request(self, user_id):  # $ requestHandler routedParameter=user_id
         return "user_id: {}".format(user_id)  # $ HttpResponse
 
-app.add_url_rule("/basic/user/<int:user_id>", view_func=ShowUser.as_view('show_user'))  # $routeSetup="/basic/user/<int:user_id>"
+app.add_url_rule("/basic/user/<int:user_id>", view_func=ShowUser.as_view('show_user'))  # $ routeSetup="/basic/user/<int:user_id>"
 
 
 class WithoutKnownRoute1(View):
@@ -81,9 +81,9 @@ class UserAPI(MethodView):
 
 
 user_view = UserAPI.as_view("user_api")
-app.add_url_rule("/users/", defaults={"user_id": None}, view_func=user_view, methods=["GET",]) # $routeSetup="/users/"
-app.add_url_rule("/users/", view_func=user_view, methods=["POST",]) # $routeSetup="/users/"
-app.add_url_rule("/users/<int:user_id>", view_func=user_view, methods=["GET", "PUT", "DELETE"]) # $routeSetup="/users/<int:user_id>"
+app.add_url_rule("/users/", defaults={"user_id": None}, view_func=user_view, methods=["GET",]) # $ routeSetup="/users/"
+app.add_url_rule("/users/", view_func=user_view, methods=["POST",]) # $ routeSetup="/users/"
+app.add_url_rule("/users/<int:user_id>", view_func=user_view, methods=["GET", "PUT", "DELETE"]) # $ routeSetup="/users/<int:user_id>"
 
 
 class WithoutKnownRoute2(MethodView):
diff --git a/python/ql/test/library-tests/frameworks/flask/save_uploaded_file.py b/python/ql/test/library-tests/frameworks/flask/save_uploaded_file.py
index 8aba97d1876..502d4cdcbc2 100644
--- a/python/ql/test/library-tests/frameworks/flask/save_uploaded_file.py
+++ b/python/ql/test/library-tests/frameworks/flask/save_uploaded_file.py
@@ -1,6 +1,6 @@
 from flask import Flask, request
 app = Flask(__name__)
 
-@app.route("/save-uploaded-file")  # $routeSetup="/save-uploaded-file"
-def test_taint():  # $requestHandler
+@app.route("/save-uploaded-file")  # $ routeSetup="/save-uploaded-file"
+def test_taint():  # $ requestHandler
     request.files['key'].save("path") # $ getAPathArgument="path"
diff --git a/python/ql/test/library-tests/frameworks/flask/session_interface.py b/python/ql/test/library-tests/frameworks/flask/session_interface.py
index fec57ccfd97..0182102fe4c 100644
--- a/python/ql/test/library-tests/frameworks/flask/session_interface.py
+++ b/python/ql/test/library-tests/frameworks/flask/session_interface.py
@@ -1,5 +1,5 @@
-import flask 
+import flask
 
 class MySessionInterface(flask.sessions.SessionInterface):
     def open_session(self, app, request):
-        ensure_tainted(request) # $tainted
\ No newline at end of file
+        ensure_tainted(request) # $ tainted
diff --git a/python/ql/test/library-tests/frameworks/flask/taint_test.py b/python/ql/test/library-tests/frameworks/flask/taint_test.py
index ac8a5a82dc2..85637d60f42 100644
--- a/python/ql/test/library-tests/frameworks/flask/taint_test.py
+++ b/python/ql/test/library-tests/frameworks/flask/taint_test.py
@@ -1,8 +1,8 @@
 from flask import Flask, request, render_template_string, stream_template_string
 app = Flask(__name__)
 
-@app.route("/test_taint/<name>/<int:number>")  # $routeSetup="/test_taint/<name>/<int:number>"
-def test_taint(name = "World!", number="0", foo="foo"):  # $requestHandler routedParameter=name routedParameter=number
+@app.route("/test_taint/<name>/<int:number>")  # $ routeSetup="/test_taint/<name>/<int:number>"
+def test_taint(name = "World!", number="0", foo="foo"):  # $ requestHandler routedParameter=name routedParameter=number
     ensure_tainted(name, number) # $ tainted
     ensure_not_tainted(foo)
 
@@ -245,8 +245,8 @@ def test_taint(name = "World!", number="0", foo="foo"):  # $requestHandler route
         ensure_not_tainted(x)
 
 
-@app.route("/debug/<foo>/<bar>", methods=['GET']) # $routeSetup="/debug/<foo>/<bar>"
-def debug(foo, bar):  # $requestHandler routedParameter=foo routedParameter=bar
+@app.route("/debug/<foo>/<bar>", methods=['GET']) # $ routeSetup="/debug/<foo>/<bar>"
+def debug(foo, bar):  # $ requestHandler routedParameter=foo routedParameter=bar
     print("request.view_args", request.view_args)
 
     print("request.headers {!r}".format(request.headers))
@@ -254,20 +254,20 @@ def debug(foo, bar):  # $requestHandler routedParameter=foo routedParameter=bar
 
     print("request.pragma {!r}".format(request.pragma))
 
-    return 'ok'  # $HttpResponse
+    return 'ok'  # $ HttpResponse
 
-@app.route("/stream", methods=['POST'])  # $routeSetup="/stream"
-def stream():  # $requestHandler
+@app.route("/stream", methods=['POST'])  # $ routeSetup="/stream"
+def stream():  # $ requestHandler
     print(request.path)
     s = request.stream
     print(s)
     # just works :)
     print(s.read())
 
-    return 'ok'  # $HttpResponse
+    return 'ok'  # $ HttpResponse
 
-@app.route("/input_stream", methods=['POST'])  # $routeSetup="/input_stream"
-def input_stream():  # $requestHandler
+@app.route("/input_stream", methods=['POST'])  # $ routeSetup="/input_stream"
+def input_stream():  # $ requestHandler
     print(request.path)
     s = request.input_stream
     print(s)
@@ -275,38 +275,38 @@ def input_stream():  # $requestHandler
     # be handled manually
     print(s.read())
 
-    return 'ok'  # $HttpResponse
+    return 'ok'  # $ HttpResponse
 
-@app.route("/form", methods=['POST'])  # $routeSetup="/form"
-def form():  # $requestHandler
+@app.route("/form", methods=['POST'])  # $ routeSetup="/form"
+def form():  # $ requestHandler
     print(request.path)
     print("request.form", request.form)
 
-    return 'ok'  # $HttpResponse
+    return 'ok'  # $ HttpResponse
 
-@app.route("/cache_control", methods=['POST'])  # $routeSetup="/cache_control"
-def cache_control():  # $requestHandler
+@app.route("/cache_control", methods=['POST'])  # $ routeSetup="/cache_control"
+def cache_control():  # $ requestHandler
     print(request.path)
     print("request.cache_control.max_age", request.cache_control.max_age, type(request.cache_control.max_age))
     print("request.cache_control.max_stale", request.cache_control.max_stale, type(request.cache_control.max_stale))
     print("request.cache_control.min_fresh", request.cache_control.min_fresh, type(request.cache_control.min_fresh))
 
-    return 'ok'  # $HttpResponse
+    return 'ok'  # $ HttpResponse
 
-@app.route("/file_upload", methods=['POST'])  # $routeSetup="/file_upload"
-def file_upload():  # $requestHandler
+@app.route("/file_upload", methods=['POST'])  # $ routeSetup="/file_upload"
+def file_upload():  # $ requestHandler
     print(request.path)
     for k,v in request.files.items():
         print(k, v, v.name, v.filename, v.stream)
 
-    return 'ok'  # $HttpResponse
+    return 'ok'  # $ HttpResponse
 
-@app.route("/args", methods=['GET'])  # $routeSetup="/args"
-def args():  # $requestHandler
+@app.route("/args", methods=['GET'])  # $ routeSetup="/args"
+def args():  # $ requestHandler
     print(request.path)
     print("request.args", request.args)
 
-    return 'ok'  # $HttpResponse
+    return 'ok'  # $ HttpResponse
 
 # curl --header "My-Header: some-value" http://localhost:5000/debug/fooval/barval
 # curl --header "Pragma: foo, bar" --header "Pragma: stuff, foo" http://localhost:5000/debug/fooval/barval
diff --git a/python/ql/test/library-tests/frameworks/flask/template_test.py b/python/ql/test/library-tests/frameworks/flask/template_test.py
index e50ab706355..b10dd3e6645 100644
--- a/python/ql/test/library-tests/frameworks/flask/template_test.py
+++ b/python/ql/test/library-tests/frameworks/flask/template_test.py
@@ -1,16 +1,16 @@
 from flask import Flask, Response, stream_with_context, render_template_string, stream_template_string
 app = Flask(__name__)
 
-@app.route("/a")  # $routeSetup="/a"
+@app.route("/a")  # $ routeSetup="/a"
 def a():  # $ requestHandler
     r = render_template_string("abc") # $ templateConstruction="abc"
     return r # $ HttpResponse
 
-@app.route("/b")  # $routeSetup="/b"
+@app.route("/b")  # $ routeSetup="/b"
 def b():  # $ requestHandler
     s = stream_template_string("abc") # $ templateConstruction="abc"
     r = Response(stream_with_context(s)) # $ HttpResponse
     return r # $ HttpResponse
 
 if __name__ == "__main__":
-    app.run(debug=True)
\ No newline at end of file
+    app.run(debug=True)
diff --git a/python/ql/test/library-tests/frameworks/invoke/invoke_test.py b/python/ql/test/library-tests/frameworks/invoke/invoke_test.py
index e926a79f9f7..7fa93ce1cdb 100644
--- a/python/ql/test/library-tests/frameworks/invoke/invoke_test.py
+++ b/python/ql/test/library-tests/frameworks/invoke/invoke_test.py
@@ -5,35 +5,35 @@ see https://www.pyinvoke.org/
 
 import invoke
 
-invoke.run("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-invoke.run(command="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+invoke.run("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+invoke.run(command="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 
 def with_sudo():
-    invoke.sudo("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-    invoke.sudo(command="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+    invoke.sudo("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+    invoke.sudo(command="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 
 def manual_context():
     c = invoke.Context()
-    c.run("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-    c.sudo("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+    c.run("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+    c.sudo("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
     # invoke.Context is just an alias for invoke.context.Context
     c2 = invoke.context.Context()
-    c2.run("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+    c2.run("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 
 manual_context()
 
 
 def foo_helper(c):
-    c.run("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+    c.run("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 
 # for use with the 'invoke' command-line tool
 @invoke.task
 def foo(c):
     # 'c' is a invoke.context.Context
-    c.run("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+    c.run("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
     foo_helper(c)
diff --git a/python/ql/test/library-tests/frameworks/mysql-connector-python/pep249.py b/python/ql/test/library-tests/frameworks/mysql-connector-python/pep249.py
index 358fff229dd..5d7196e1c83 100644
--- a/python/ql/test/library-tests/frameworks/mysql-connector-python/pep249.py
+++ b/python/ql/test/library-tests/frameworks/mysql-connector-python/pep249.py
@@ -18,7 +18,7 @@ add_salary = ("INSERT INTO salaries "
 data_employee = ('Geert', 'Vanderkelen', tomorrow, 'M', date(1977, 6, 14))
 
 # Insert new employee
-cursor.execute(add_employee, data_employee)  # $getSql=add_employee
+cursor.execute(add_employee, data_employee)  # $ getSql=add_employee
 emp_no = cursor.lastrowid
 
 # Insert salary information
@@ -28,10 +28,10 @@ data_salary = {
   'from_date': tomorrow,
   'to_date': date(9999, 1, 1),
 }
-cursor.execute(add_salary, data_salary)  # $getSql=add_salary
+cursor.execute(add_salary, data_salary)  # $ getSql=add_salary
 
 # Make sure data is committed to the database
 cnx.commit()
 
 cursor.close()
-cnx.close()
\ No newline at end of file
+cnx.close()
diff --git a/python/ql/test/library-tests/frameworks/mysqldb/pep249.py b/python/ql/test/library-tests/frameworks/mysqldb/pep249.py
index eac2d7b0b0c..cd1cbbff777 100644
--- a/python/ql/test/library-tests/frameworks/mysqldb/pep249.py
+++ b/python/ql/test/library-tests/frameworks/mysqldb/pep249.py
@@ -4,4 +4,4 @@ db=MySQLdb.connect(passwd="moonpie",db="thangs")
 
 c=db.cursor()
 max_price=5
-c.execute("some sql", (max_price,))  # $getSql="some sql"
\ No newline at end of file
+c.execute("some sql", (max_price,))  # $ getSql="some sql"
diff --git a/python/ql/test/library-tests/frameworks/pandas/dataframe_query.py b/python/ql/test/library-tests/frameworks/pandas/dataframe_query.py
index e9a368f8c1b..16f99bafc48 100644
--- a/python/ql/test/library-tests/frameworks/pandas/dataframe_query.py
+++ b/python/ql/test/library-tests/frameworks/pandas/dataframe_query.py
@@ -2,79 +2,79 @@ import pandas as pd
 import sqlite3
 
 df = pd.DataFrame({'temp_c': [17.0, 25.0]}, index=['Portland', 'Berkeley'])
-df.sample().query("query")  # $getCode="query"
-df.mod().query("query")   # $getCode="query"
-pd.eval("pythonExpr", target=df)  # $getCode="pythonExpr"
+df.sample().query("query")  # $ getCode="query"
+df.mod().query("query")   # $ getCode="query"
+pd.eval("pythonExpr", target=df)  # $ getCode="pythonExpr"
 
 df = pd.read_csv("filepath")
-df.query("query")  # $getCode="query"
-df.eval("query")  # $getCode="query"
-df.copy().query("query")  # $getCode="query"
+df.query("query")  # $ getCode="query"
+df.eval("query")  # $ getCode="query"
+df.copy().query("query")  # $ getCode="query"
 
 df = pd.read_fwf("filepath")
-df.query("query")  # $getCode="query"
-df.eval("query")  # $getCode="query"
+df.query("query")  # $ getCode="query"
+df.eval("query")  # $ getCode="query"
 
 
 df = pd.read_pickle("filepath")  # $ decodeInput="filepath" decodeOutput=pd.read_pickle(..) decodeFormat=pickle decodeMayExecuteInput
-df.query("query")  # $getCode="query"
-df.eval("query")  # $getCode="query"
+df.query("query")  # $ getCode="query"
+df.eval("query")  # $ getCode="query"
 
 df = pd.read_table("filepath")
-df.query("query")  # $getCode="query"
-df.eval("query")  # $getCode="query"
+df.query("query")  # $ getCode="query"
+df.eval("query")  # $ getCode="query"
 
 df = pd.read_clipboard("filepath")
-df.query("query")  # $getCode="query"
-df.eval("query")  # $getCode="query"
+df.query("query")  # $ getCode="query"
+df.eval("query")  # $ getCode="query"
 
 df = pd.read_excel("filepath")
-df.query("query")  # $getCode="query"
-df.eval("query")  # $getCode="query"
+df.query("query")  # $ getCode="query"
+df.eval("query")  # $ getCode="query"
 
 df = pd.read_html("filepath")
-df[0].query("query")  # $getCode="query"
+df[0].query("query")  # $ getCode="query"
 
 df = pd.read_xml("filepath")
-df.query("query")  # $getCode="query"
-df.eval("query")  # $getCode="query"
+df.query("query")  # $ getCode="query"
+df.eval("query")  # $ getCode="query"
 
 df = pd.read_parquet("filepath")
-df.query("query")  # $getCode="query"
-df.eval("query")  # $getCode="query"
+df.query("query")  # $ getCode="query"
+df.eval("query")  # $ getCode="query"
 
 df = pd.read_orc("filepath")
-df.query("query")  # $getCode="query"
-df.eval("query")  # $getCode="query"
+df.query("query")  # $ getCode="query"
+df.eval("query")  # $ getCode="query"
 
 df = pd.read_spss("filepath")
-df.query("query")  # $getCode="query"
-df.eval("query")  # $getCode="query"
+df.query("query")  # $ getCode="query"
+df.eval("query")  # $ getCode="query"
 
 df = pd.read_sql_table("filepath", 'postgres:///db_name')
-df.query("query")  # $getCode="query"
-df.eval("query")  # $getCode="query"
+df.query("query")  # $ getCode="query"
+df.eval("query")  # $ getCode="query"
 
 connection = sqlite3.connect("pets.db")
-df = pd.read_sql_query("sql query", connection) # $getSql="sql query"
-df.query("query")  # $getCode="query"
-df.eval("query")  # $getCode="query"
+df = pd.read_sql_query("sql query", connection) # $ getSql="sql query"
+df.query("query")  # $ getCode="query"
+df.eval("query")  # $ getCode="query"
 
-df = pd.read_sql("sql query", connection) # $getSql="sql query"
-df.query("query")  # $getCode="query"
-df.eval("query")  # $getCode="query"
+df = pd.read_sql("sql query", connection) # $ getSql="sql query"
+df.query("query")  # $ getCode="query"
+df.eval("query")  # $ getCode="query"
 
 df = pd.read_gbq("filepath")
-df.query("query")  # $getCode="query"
-df.eval("query")  # $getCode="query"
+df.query("query")  # $ getCode="query"
+df.eval("query")  # $ getCode="query"
 
 df = pd.read_stata("filepath")
-df.query("query")  # $getCode="query"
-df.eval("query")  # $getCode="query"
+df.query("query")  # $ getCode="query"
+df.eval("query")  # $ getCode="query"
 
 df = pd.read_sas("filepath")
-df.query("query")  # $getCode="query"
-df.eval("query")  # $getCode="query"
+df.query("query")  # $ getCode="query"
+df.eval("query")  # $ getCode="query"
 df = pd.read_sas("filepath", iterator=True, chunksize=1)
 df.query("query")
 df = pd.read_sas("filepath", iterator=False, chunksize=1)
@@ -82,5 +82,5 @@ df.query("query")
 df = pd.read_sas("filepath", iterator=True, chunksize=None)
 df.query("query")
 df = pd.read_sas("filepath", iterator=False, chunksize=None)
-df.query("query")  # $getCode="query"
-df.eval("query")  # $getCode="query"
+df.query("query")  # $ getCode="query"
+df.eval("query")  # $ getCode="query"
diff --git a/python/ql/test/library-tests/frameworks/paramiko/proxy_command.py b/python/ql/test/library-tests/frameworks/paramiko/proxy_command.py
index a43cee59636..57be0fa9135 100644
--- a/python/ql/test/library-tests/frameworks/paramiko/proxy_command.py
+++ b/python/ql/test/library-tests/frameworks/paramiko/proxy_command.py
@@ -8,4 +8,4 @@ paramiko_ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 paramiko_ssh_client.connect(hostname="127.0.0.1", port="22", username="ssh_user_name", pkey="k", timeout=11, banner_timeout=200)
 
 cmd = "cmd"
-paramiko_ssh_client.connect('hostname', username='user', password='yourpassword', sock=paramiko.ProxyCommand(cmd)) # $getCommand=cmd
+paramiko_ssh_client.connect('hostname', username='user', password='yourpassword', sock=paramiko.ProxyCommand(cmd)) # $ getCommand=cmd
diff --git a/python/ql/test/library-tests/frameworks/pyramid/pyramid_test.py b/python/ql/test/library-tests/frameworks/pyramid/pyramid_test.py
index c9e8383c7fa..914e401572f 100644
--- a/python/ql/test/library-tests/frameworks/pyramid/pyramid_test.py
+++ b/python/ql/test/library-tests/frameworks/pyramid/pyramid_test.py
@@ -8,7 +8,7 @@ def ignore(*args, **kwargs): pass
 ensure_tainted = ensure_not_tainted = ignore
 
 @view_config(route_name="test1") # $ routeSetup
-def test1(request): # $ requestHandler 
+def test1(request): # $ requestHandler
     ensure_tainted(
         request,                   # $ tainted
 
@@ -26,7 +26,7 @@ def test1(request): # $ requestHandler
         request.host_url,          # $ tainted
         request.if_match,          # $ tainted
         request.if_none_match,     # $ tainted
-        request.if_range,          # $ tainted   
+        request.if_range,          # $ tainted
         request.pragma,            # $ tainted
         request.range,             # $ tainted
         request.referer,           # $ tainted
@@ -71,11 +71,11 @@ def test1(request): # $ requestHandler
         request.copy_get(),         # $ tainted
         request.copy().GET['a'],    # $ tainted
         request.copy_get().body     # $ tainted
-        ) 
+        )
 
     return Response("Ok") # $ HttpResponse responseBody="Ok" mimetype=text/html
 
-def test2(request): # $ requestHandler 
+def test2(request): # $ requestHandler
     ensure_tainted(request) # $ tainted
 
     resp = Response("Ok", content_type="text/plain") # $ HttpResponse responseBody="Ok" mimetype=text/plain
@@ -83,7 +83,7 @@ def test2(request): # $ requestHandler
     return resp
 
 @view_config(route_name="test3", renderer="string") # $ routeSetup
-def test3(ctx, req): # $ requestHandler 
+def test3(ctx, req): # $ requestHandler
     ensure_tainted(req) # $ tainted
     resp = req.response # $ HttpResponse mimetype=text/html
     resp.set_cookie("hi", "there") # $ CookieWrite CookieName="hi" CookieValue="there" CookieSecure=false CookieHttpOnly=false CookieSameSite=Lax
@@ -93,13 +93,13 @@ def test3(ctx, req): # $ requestHandler
 
 @view_config(route_name="test4", renderer="string") # $ routeSetup
 def test4(request): # $ requestHandler
-    a = HTTPMultipleChoices("redirect") # $HttpResponse mimetype=text/html HttpRedirectResponse redirectLocation="redirect"
-    b = HTTPMovedPermanently(location="redirect") # $HttpResponse mimetype=text/html HttpRedirectResponse redirectLocation="redirect"
-    c = HTTPFound(location="redirect") # $HttpResponse mimetype=text/html HttpRedirectResponse redirectLocation="redirect"
-    d = HTTPSeeOther(location="redirect") # $HttpResponse mimetype=text/html HttpRedirectResponse redirectLocation="redirect"
-    e = HTTPUseProxy(location="redirect") # $HttpResponse mimetype=text/html HttpRedirectResponse redirectLocation="redirect"
-    f = HTTPTemporaryRedirect(location="redirect") # $HttpResponse mimetype=text/html HttpRedirectResponse redirectLocation="redirect"
-    g = HTTPPermanentRedirect(location="redirect") # $HttpResponse mimetype=text/html HttpRedirectResponse redirectLocation="redirect"
+    a = HTTPMultipleChoices("redirect") # $ HttpResponse mimetype=text/html HttpRedirectResponse redirectLocation="redirect"
+    b = HTTPMovedPermanently(location="redirect") # $ HttpResponse mimetype=text/html HttpRedirectResponse redirectLocation="redirect"
+    c = HTTPFound(location="redirect") # $ HttpResponse mimetype=text/html HttpRedirectResponse redirectLocation="redirect"
+    d = HTTPSeeOther(location="redirect") # $ HttpResponse mimetype=text/html HttpRedirectResponse redirectLocation="redirect"
+    e = HTTPUseProxy(location="redirect") # $ HttpResponse mimetype=text/html HttpRedirectResponse redirectLocation="redirect"
+    f = HTTPTemporaryRedirect(location="redirect") # $ HttpResponse mimetype=text/html HttpRedirectResponse redirectLocation="redirect"
+    g = HTTPPermanentRedirect(location="redirect") # $ HttpResponse mimetype=text/html HttpRedirectResponse redirectLocation="redirect"
     raise a
 
 # Unsupported cases
@@ -121,7 +121,7 @@ class Test6:
         self.req = request
 
     def test6method(self): # $ MISSING: requestHandler
-        ensure_not_tainted(self) 
+        ensure_not_tainted(self)
         ensure_tainted(self.req) # $ MISSING: tainted
         return "Ok" # $ MISSING: HttpResponse mimetype=text/html responseBody="Ok"
 
@@ -132,7 +132,7 @@ class Test6:
         self.req = request
 
     def __call__(self): # $ MISSING: requestHandler
-        ensure_not_tainted(self) 
+        ensure_not_tainted(self)
         ensure_tainted(self.req) # $ MISSING: tainted
         return "Ok" # $ MISSING: HttpResponse mimetype=text/html responseBody="Ok"
 
diff --git a/python/ql/test/library-tests/frameworks/rest_framework/testproj/urls.py b/python/ql/test/library-tests/frameworks/rest_framework/testproj/urls.py
index f8d037cdcf9..dcbb1061781 100644
--- a/python/ql/test/library-tests/frameworks/rest_framework/testproj/urls.py
+++ b/python/ql/test/library-tests/frameworks/rest_framework/testproj/urls.py
@@ -18,5 +18,5 @@ from django.urls import path, include
 
 urlpatterns = [
     path('admin/', admin.site.urls),  # $ routeSetup="admin/"
-    path("", include("testapp.urls")),  # $routeSetup=""
+    path("", include("testapp.urls")),  # $ routeSetup=""
 ]
diff --git a/python/ql/test/library-tests/frameworks/ruamel.yaml/Decoding.py b/python/ql/test/library-tests/frameworks/ruamel.yaml/Decoding.py
index 99648fbbad0..0e0d4d00f33 100644
--- a/python/ql/test/library-tests/frameworks/ruamel.yaml/Decoding.py
+++ b/python/ql/test/library-tests/frameworks/ruamel.yaml/Decoding.py
@@ -6,27 +6,27 @@ ruamel.yaml.load(stream=payload)  # $ decodeInput=payload decodeOutput=ruamel.ya
 ruamel.yaml.load(payload, ruamel.yaml.Loader)  # $ decodeInput=payload decodeOutput=ruamel.yaml.load(..) decodeFormat=YAML decodeMayExecuteInput
 
 # Safe:
-ruamel.yaml.load(payload, ruamel.yaml.SafeLoader)  # $  decodeInput=payload decodeOutput=ruamel.yaml.load(..) decodeFormat=YAML
+ruamel.yaml.load(payload, ruamel.yaml.SafeLoader)  # $ decodeInput=payload decodeOutput=ruamel.yaml.load(..) decodeFormat=YAML
 ruamel.yaml.load(payload, Loader=ruamel.yaml.SafeLoader)  # $ decodeInput=payload decodeOutput=ruamel.yaml.load(..) decodeFormat=YAML
 ruamel.yaml.load(payload, ruamel.yaml.BaseLoader)  # $ decodeInput=payload decodeOutput=ruamel.yaml.load(..) decodeFormat=YAML
-ruamel.yaml.safe_load(payload) # $  decodeInput=payload decodeOutput=ruamel.yaml.safe_load(..) decodeFormat=YAML
+ruamel.yaml.safe_load(payload) # $ decodeInput=payload decodeOutput=ruamel.yaml.safe_load(..) decodeFormat=YAML
 
 ################################################################################
 # load_all variants
 ################################################################################
 
 # Unsafe:
-ruamel.yaml.load_all(payload) # $  decodeInput=payload decodeOutput=ruamel.yaml.load_all(..) decodeFormat=YAML decodeMayExecuteInput
+ruamel.yaml.load_all(payload) # $ decodeInput=payload decodeOutput=ruamel.yaml.load_all(..) decodeFormat=YAML decodeMayExecuteInput
 
 # Safe:
-ruamel.yaml.safe_load_all(payload) # $  decodeInput=payload decodeOutput=ruamel.yaml.safe_load_all(..) decodeFormat=YAML
+ruamel.yaml.safe_load_all(payload) # $ decodeInput=payload decodeOutput=ruamel.yaml.safe_load_all(..) decodeFormat=YAML
 
 ################################################################################
 # C-based loaders with `libyaml`
 ################################################################################
 
 # Unsafe:
-ruamel.yaml.load(payload, ruamel.yaml.CLoader)  # $  decodeInput=payload decodeOutput=ruamel.yaml.load(..) decodeFormat=YAML decodeMayExecuteInput
+ruamel.yaml.load(payload, ruamel.yaml.CLoader)  # $ decodeInput=payload decodeOutput=ruamel.yaml.load(..) decodeFormat=YAML decodeMayExecuteInput
 
 # Safe:
 ruamel.yaml.load(payload, ruamel.yaml.CSafeLoader)  # $ decodeInput=payload decodeOutput=ruamel.yaml.load(..) decodeFormat=YAML
diff --git a/python/ql/test/library-tests/frameworks/stdlib-py2/CodeExecution.py b/python/ql/test/library-tests/frameworks/stdlib-py2/CodeExecution.py
index 72020941211..c14b4a1e94b 100644
--- a/python/ql/test/library-tests/frameworks/stdlib-py2/CodeExecution.py
+++ b/python/ql/test/library-tests/frameworks/stdlib-py2/CodeExecution.py
@@ -1,2 +1,2 @@
 # exec statement is Python 2 specific
-exec "print(42)"  # $getCode="print(42)"
+exec "print(42)"  # $ getCode="print(42)"
diff --git a/python/ql/test/library-tests/frameworks/stdlib-py2/SystemCommandExecution.py b/python/ql/test/library-tests/frameworks/stdlib-py2/SystemCommandExecution.py
index 1e61a9c9399..583493946a1 100644
--- a/python/ql/test/library-tests/frameworks/stdlib-py2/SystemCommandExecution.py
+++ b/python/ql/test/library-tests/frameworks/stdlib-py2/SystemCommandExecution.py
@@ -1,14 +1,14 @@
 ########################################
 import os
 
-os.popen2("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-os.popen3("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-os.popen4("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+os.popen2("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+os.popen3("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+os.popen4("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 
-os.popen2(cmd="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-os.popen3(cmd="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-os.popen4(cmd="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+os.popen2(cmd="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+os.popen3(cmd="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+os.popen4(cmd="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 # os.popen does not support keyword arguments, so this is a TypeError
 os.popen(cmd="cmd1; cmd2")
@@ -16,21 +16,21 @@ os.popen(cmd="cmd1; cmd2")
 ########################################
 import platform
 
-platform.popen("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-platform.popen(cmd="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+platform.popen("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+platform.popen(cmd="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 ########################################
 # popen2 was deprecated in Python 2.6, but still available in Python 2.7
 import popen2
 
-popen2.popen2("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-popen2.popen3("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-popen2.popen4("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-popen2.Popen3("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-popen2.Popen4("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+popen2.popen2("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+popen2.popen3("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+popen2.popen4("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+popen2.Popen3("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+popen2.Popen4("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
-popen2.popen2(cmd="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-popen2.popen3(cmd="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-popen2.popen4(cmd="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-popen2.Popen3(cmd="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-popen2.Popen4(cmd="cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+popen2.popen2(cmd="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+popen2.popen3(cmd="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+popen2.popen4(cmd="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+popen2.Popen3(cmd="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+popen2.Popen4(cmd="cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
diff --git a/python/ql/test/library-tests/frameworks/stdlib-py3/CodeExecution.py b/python/ql/test/library-tests/frameworks/stdlib-py3/CodeExecution.py
index 0ec80543dd5..4a6a1b801e6 100644
--- a/python/ql/test/library-tests/frameworks/stdlib-py3/CodeExecution.py
+++ b/python/ql/test/library-tests/frameworks/stdlib-py3/CodeExecution.py
@@ -1,4 +1,4 @@
 import builtins
 
 # exec being part of builtins is Python 3 only
-builtins.exec("print(42)")  # $getCode="print(42)"
+builtins.exec("print(42)")  # $ getCode="print(42)"
diff --git a/python/ql/test/library-tests/frameworks/stdlib/CodeExecution.py b/python/ql/test/library-tests/frameworks/stdlib/CodeExecution.py
index 771978cb1c8..b3f6c19102c 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/CodeExecution.py
+++ b/python/ql/test/library-tests/frameworks/stdlib/CodeExecution.py
@@ -9,16 +9,16 @@ if sys.version_info[0] == 3:
 if sys.version_info[0] == 2:
     import __builtin__ as builtins
 
-exec("print(42)")  # $getCode="print(42)"
-eval("print(42)")  # $getCode="print(42)"
+exec("print(42)")  # $ getCode="print(42)"
+eval("print(42)")  # $ getCode="print(42)"
 
-builtins.eval("print(42)")  # $getCode="print(42)"
+builtins.eval("print(42)")  # $ getCode="print(42)"
 
 cmd = compile("print(42)", "<filename>", "exec")
-exec(cmd)  # $getCode=cmd
+exec(cmd)  # $ getCode=cmd
 
 cmd = builtins.compile("print(42)", "<filename>", "exec")
-exec(cmd)  # $getCode=cmd
+exec(cmd)  # $ getCode=cmd
 
 # ------------------------------------------------------------------------------
 # taint related
diff --git a/python/ql/test/library-tests/frameworks/stdlib/PathNormalization.py b/python/ql/test/library-tests/frameworks/stdlib/PathNormalization.py
index 43850e37b9a..31b84ed04f0 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/PathNormalization.py
+++ b/python/ql/test/library-tests/frameworks/stdlib/PathNormalization.py
@@ -2,17 +2,17 @@ import os.path
 
 path = "un\\normalized/path"
 
-p1 = os.path.normpath(path)  # $pathNormalization
-p2 = os.path.normpath(path=path)  # $pathNormalization
+p1 = os.path.normpath(path)  # $ pathNormalization
+p2 = os.path.normpath(path=path)  # $ pathNormalization
 
 np = os.path.normpath
 
-p3 = np(path)  # $pathNormalization
-p4 = np(path=path)  # $pathNormalization
+p3 = np(path)  # $ pathNormalization
+p4 = np(path=path)  # $ pathNormalization
 
 
 def normalize(path):
-    return os.path.normpath(path)  # $pathNormalization
+    return os.path.normpath(path)  # $ pathNormalization
 
 
 p5 = normalize(path)
diff --git a/python/ql/test/library-tests/frameworks/stdlib/SafeAccessCheck.py b/python/ql/test/library-tests/frameworks/stdlib/SafeAccessCheck.py
index f29cd223273..d52e900dbb5 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/SafeAccessCheck.py
+++ b/python/ql/test/library-tests/frameworks/stdlib/SafeAccessCheck.py
@@ -1,7 +1,7 @@
 s = "taintedString"
 
 if s.startswith("tainted"):
-    s2 = s  # $SafeAccessCheck=s
+    s2 = s  # $ SafeAccessCheck=s
     pass
 
 sw = s.startswith
diff --git a/python/ql/test/library-tests/frameworks/stdlib/SystemCommandExecution.py b/python/ql/test/library-tests/frameworks/stdlib/SystemCommandExecution.py
index 593b66cb694..824639dffea 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/SystemCommandExecution.py
+++ b/python/ql/test/library-tests/frameworks/stdlib/SystemCommandExecution.py
@@ -13,8 +13,8 @@ import os
 
 # can't use a string literal with spaces in the tags of an InlineExpectationsTest, so using variables :|
 
-os.popen("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-os.system("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+os.popen("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+os.system("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 
 def os_members():
@@ -24,8 +24,8 @@ def os_members():
     # :|
     from os import popen, system
 
-    popen("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
-    system("cmd1; cmd2")  # $getCommand="cmd1; cmd2"
+    popen("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
+    system("cmd1; cmd2")  # $ getCommand="cmd1; cmd2"
 
 
 ########################################
@@ -85,62 +85,62 @@ os.posix_spawnp(path="path", argv=["<progname>", "arg0"], env=env)  # $ getComma
 
 import subprocess
 
-subprocess.Popen("cmd1; cmd2", shell=True)  # $getCommand="cmd1; cmd2"
-subprocess.Popen("cmd1; cmd2", shell="truthy string")  # $getCommand="cmd1; cmd2"
-subprocess.Popen(["cmd1; cmd2", "shell-arg"], shell=True)  # $getCommand="cmd1; cmd2"
-subprocess.Popen("cmd1; cmd2", shell=True, executable="/bin/bash")  # $getCommand="cmd1; cmd2" getCommand="/bin/bash"
+subprocess.Popen("cmd1; cmd2", shell=True)  # $ getCommand="cmd1; cmd2"
+subprocess.Popen("cmd1; cmd2", shell="truthy string")  # $ getCommand="cmd1; cmd2"
+subprocess.Popen(["cmd1; cmd2", "shell-arg"], shell=True)  # $ getCommand="cmd1; cmd2"
+subprocess.Popen("cmd1; cmd2", shell=True, executable="/bin/bash")  # $ getCommand="cmd1; cmd2" getCommand="/bin/bash"
 
-subprocess.Popen("executable")  # $getCommand="executable"
-subprocess.Popen(["executable", "arg0"])  # $getCommand="executable"
-subprocess.Popen("<progname>", executable="executable")  # $getCommand="executable"
-subprocess.Popen(["<progname>", "arg0"], executable="executable")  # $getCommand="executable"
+subprocess.Popen("executable")  # $ getCommand="executable"
+subprocess.Popen(["executable", "arg0"])  # $ getCommand="executable"
+subprocess.Popen("<progname>", executable="executable")  # $ getCommand="executable"
+subprocess.Popen(["<progname>", "arg0"], executable="executable")  # $ getCommand="executable"
 
 # call/check_call/check_output/run all work like Popen from a command execution point of view
-subprocess.call(["executable", "arg0"])  # $getCommand="executable"
-subprocess.check_call(["executable", "arg0"])  # $getCommand="executable"
-subprocess.check_output(["executable", "arg0"])  # $getCommand="executable"
-subprocess.run(["executable", "arg0"])  # $getCommand="executable"
+subprocess.call(["executable", "arg0"])  # $ getCommand="executable"
+subprocess.check_call(["executable", "arg0"])  # $ getCommand="executable"
+subprocess.check_output(["executable", "arg0"])  # $ getCommand="executable"
+subprocess.run(["executable", "arg0"])  # $ getCommand="executable"
 
 
 ########################################
 # actively using known shell as the executable
 
-subprocess.Popen(["/bin/sh", "-c", "vuln"])  # $getCommand="/bin/sh" MISSING: getCommand="vuln"
-subprocess.Popen(["/bin/bash", "-c", "vuln"])  # $getCommand="/bin/bash" MISSING: getCommand="vuln"
-subprocess.Popen(["/bin/dash", "-c", "vuln"])  # $getCommand="/bin/dash" MISSING: getCommand="vuln"
-subprocess.Popen(["/bin/zsh", "-c", "vuln"])  # $getCommand="/bin/zsh" MISSING: getCommand="vuln"
+subprocess.Popen(["/bin/sh", "-c", "vuln"])  # $ getCommand="/bin/sh" MISSING: getCommand="vuln"
+subprocess.Popen(["/bin/bash", "-c", "vuln"])  # $ getCommand="/bin/bash" MISSING: getCommand="vuln"
+subprocess.Popen(["/bin/dash", "-c", "vuln"])  # $ getCommand="/bin/dash" MISSING: getCommand="vuln"
+subprocess.Popen(["/bin/zsh", "-c", "vuln"])  # $ getCommand="/bin/zsh" MISSING: getCommand="vuln"
 
-subprocess.Popen(["sh", "-c", "vuln"])  # $getCommand="sh" MISSING: getCommand="vuln"
-subprocess.Popen(["bash", "-c", "vuln"])  # $getCommand="bash" MISSING: getCommand="vuln"
-subprocess.Popen(["dash", "-c", "vuln"])  # $getCommand="dash" MISSING: getCommand="vuln"
-subprocess.Popen(["zsh", "-c", "vuln"])  # $getCommand="zsh" MISSING: getCommand="vuln"
+subprocess.Popen(["sh", "-c", "vuln"])  # $ getCommand="sh" MISSING: getCommand="vuln"
+subprocess.Popen(["bash", "-c", "vuln"])  # $ getCommand="bash" MISSING: getCommand="vuln"
+subprocess.Popen(["dash", "-c", "vuln"])  # $ getCommand="dash" MISSING: getCommand="vuln"
+subprocess.Popen(["zsh", "-c", "vuln"])  # $ getCommand="zsh" MISSING: getCommand="vuln"
 
 # Check that we don't consider ANY argument a command injection sink
-subprocess.Popen(["sh", "/bin/python"])  # $getCommand="sh"
+subprocess.Popen(["sh", "/bin/python"])  # $ getCommand="sh"
 
-subprocess.Popen(["cmd.exe", "/c", "vuln"])  # $getCommand="cmd.exe" MISSING: getCommand="vuln"
-subprocess.Popen(["cmd.exe", "/C", "vuln"])  # $getCommand="cmd.exe" MISSING: getCommand="vuln"
-subprocess.Popen(["cmd", "/c", "vuln"])  # $getCommand="cmd" MISSING: getCommand="vuln"
-subprocess.Popen(["cmd", "/C", "vuln"])  # $getCommand="cmd" MISSING: getCommand="vuln"
+subprocess.Popen(["cmd.exe", "/c", "vuln"])  # $ getCommand="cmd.exe" MISSING: getCommand="vuln"
+subprocess.Popen(["cmd.exe", "/C", "vuln"])  # $ getCommand="cmd.exe" MISSING: getCommand="vuln"
+subprocess.Popen(["cmd", "/c", "vuln"])  # $ getCommand="cmd" MISSING: getCommand="vuln"
+subprocess.Popen(["cmd", "/C", "vuln"])  # $ getCommand="cmd" MISSING: getCommand="vuln"
 
-subprocess.Popen(["<progname>", "-c", "vuln"], executable="/bin/bash")  # $getCommand="/bin/bash" MISSING: getCommand="vuln"
+subprocess.Popen(["<progname>", "-c", "vuln"], executable="/bin/bash")  # $ getCommand="/bin/bash" MISSING: getCommand="vuln"
 
 if UNKNOWN:
-    os.execl("/bin/sh", "<progname>", "-c", "vuln")  # $getCommand="/bin/sh" getAPathArgument="/bin/sh" MISSING: getCommand="vuln"
+    os.execl("/bin/sh", "<progname>", "-c", "vuln")  # $ getCommand="/bin/sh" getAPathArgument="/bin/sh" MISSING: getCommand="vuln"
 
-os.spawnl(os.P_WAIT, "/bin/sh", "<progname>", "-c", "vuln")  # $getCommand="/bin/sh" getAPathArgument="/bin/sh" MISSING: getCommand="vuln"
+os.spawnl(os.P_WAIT, "/bin/sh", "<progname>", "-c", "vuln")  # $ getCommand="/bin/sh" getAPathArgument="/bin/sh" MISSING: getCommand="vuln"
 
 
 ########################################
 # Passing arguments by reference
 
 args = ["/bin/sh", "-c", "vuln"]
-subprocess.Popen(args)  # $getCommand=args
+subprocess.Popen(args)  # $ getCommand=args
 
 args = "<progname>"
 use_shell = False
 exe = "executable"
-subprocess.Popen(args, shell=use_shell, executable=exe)  # $getCommand=exe
+subprocess.Popen(args, shell=use_shell, executable=exe)  # $ getCommand=exe
 
 
 ################################################################################
@@ -165,14 +165,14 @@ cmd = "sh -c " + wrong_use
 import asyncio
 from asyncio import subprocess
 
-asyncio.run(asyncio.create_subprocess_exec("executable", "arg0"))  # $getCommand="executable" getAPathArgument="executable"
-asyncio.run(subprocess.create_subprocess_exec("executable", "arg0"))  # $getCommand="executable" getAPathArgument="executable"
+asyncio.run(asyncio.create_subprocess_exec("executable", "arg0"))  # $ getCommand="executable" getAPathArgument="executable"
+asyncio.run(subprocess.create_subprocess_exec("executable", "arg0"))  # $ getCommand="executable" getAPathArgument="executable"
 
 loop = asyncio.new_event_loop()
-loop.run_until_complete(loop.subprocess_exec(asyncio.SubprocessProtocol, "executable", "arg0")) # $getCommand="executable" getAPathArgument="executable"
+loop.run_until_complete(loop.subprocess_exec(asyncio.SubprocessProtocol, "executable", "arg0")) # $ getCommand="executable" getAPathArgument="executable"
 
-asyncio.run(asyncio.create_subprocess_shell("shell_command"))  # $getCommand="shell_command" getAPathArgument="shell_command"
-asyncio.run(subprocess.create_subprocess_shell("shell_command")) # $getCommand="shell_command" getAPathArgument="shell_command"
+asyncio.run(asyncio.create_subprocess_shell("shell_command"))  # $ getCommand="shell_command" getAPathArgument="shell_command"
+asyncio.run(subprocess.create_subprocess_shell("shell_command")) # $ getCommand="shell_command" getAPathArgument="shell_command"
 
 loop = asyncio.get_running_loop()
-loop.run_until_complete(loop.subprocess_shell(asyncio.SubprocessProtocol, "shell_command")) # $getCommand="shell_command" getAPathArgument="shell_command"
+loop.run_until_complete(loop.subprocess_shell(asyncio.SubprocessProtocol, "shell_command")) # $ getCommand="shell_command" getAPathArgument="shell_command"
diff --git a/python/ql/test/library-tests/frameworks/yaml/Decoding.py b/python/ql/test/library-tests/frameworks/yaml/Decoding.py
index d76faa8b20b..8d2799f9651 100644
--- a/python/ql/test/library-tests/frameworks/yaml/Decoding.py
+++ b/python/ql/test/library-tests/frameworks/yaml/Decoding.py
@@ -1,16 +1,16 @@
 import yaml
 
 # Unsafe:
-yaml.load(payload)  # $decodeInput=payload decodeOutput=yaml.load(..) decodeFormat=YAML decodeMayExecuteInput
-yaml.load(stream=payload)  # $decodeInput=payload decodeOutput=yaml.load(..) decodeFormat=YAML decodeMayExecuteInput
-yaml.load(payload, yaml.Loader)  # $decodeInput=payload decodeOutput=yaml.load(..) decodeFormat=YAML decodeMayExecuteInput
+yaml.load(payload)  # $ decodeInput=payload decodeOutput=yaml.load(..) decodeFormat=YAML decodeMayExecuteInput
+yaml.load(stream=payload)  # $ decodeInput=payload decodeOutput=yaml.load(..) decodeFormat=YAML decodeMayExecuteInput
+yaml.load(payload, yaml.Loader)  # $ decodeInput=payload decodeOutput=yaml.load(..) decodeFormat=YAML decodeMayExecuteInput
 yaml.unsafe_load(payload) # $ decodeInput=payload decodeOutput=yaml.unsafe_load(..) decodeFormat=YAML decodeMayExecuteInput
 yaml.full_load(payload) # $ decodeInput=payload decodeOutput=yaml.full_load(..) decodeFormat=YAML decodeMayExecuteInput
 
 # Safe:
 yaml.load(payload, yaml.SafeLoader)  # $ decodeInput=payload decodeOutput=yaml.load(..) decodeFormat=YAML
-yaml.load(payload, Loader=yaml.SafeLoader)  # $decodeInput=payload decodeOutput=yaml.load(..) decodeFormat=YAML
-yaml.load(payload, yaml.BaseLoader)  # $decodeInput=payload decodeOutput=yaml.load(..) decodeFormat=YAML
+yaml.load(payload, Loader=yaml.SafeLoader)  # $ decodeInput=payload decodeOutput=yaml.load(..) decodeFormat=YAML
+yaml.load(payload, yaml.BaseLoader)  # $ decodeInput=payload decodeOutput=yaml.load(..) decodeFormat=YAML
 yaml.safe_load(payload) # $ decodeInput=payload decodeOutput=yaml.safe_load(..) decodeFormat=YAML
 
 ################################################################################
@@ -34,5 +34,5 @@ yaml.load(payload, yaml.CLoader)  # $ decodeInput=payload decodeOutput=yaml.load
 yaml.load(payload, yaml.CFullLoader)  # $ decodeInput=payload decodeOutput=yaml.load(..) decodeFormat=YAML decodeMayExecuteInput
 
 # Safe:
-yaml.load(payload, yaml.CSafeLoader)  # $decodeInput=payload decodeOutput=yaml.load(..) decodeFormat=YAML
-yaml.load(payload, yaml.CBaseLoader)  # $decodeInput=payload decodeOutput=yaml.load(..) decodeFormat=YAML
+yaml.load(payload, yaml.CSafeLoader)  # $ decodeInput=payload decodeOutput=yaml.load(..) decodeFormat=YAML
+yaml.load(payload, yaml.CBaseLoader)  # $ decodeInput=payload decodeOutput=yaml.load(..) decodeFormat=YAML
diff --git a/python/ql/test/library-tests/regex/charRangeTest.py b/python/ql/test/library-tests/regex/charRangeTest.py
index 706037df7d0..338d0e7b752 100644
--- a/python/ql/test/library-tests/regex/charRangeTest.py
+++ b/python/ql/test/library-tests/regex/charRangeTest.py
@@ -1,46 +1,46 @@
 import re
 
 
-re.compile(r'[A-Z]') #$ charRange=1:2-3:4
+re.compile(r'[A-Z]') # $ charRange=1:2-3:4
 
 try:
-    re.compile(r'[]-[]') #$ SPURIOUS: charRange=1:2-3:4
+    re.compile(r'[]-[]') # $ SPURIOUS: charRange=1:2-3:4
     raise Exception("this should not be reached")
 except re.error:
     pass
 
-re.compile(r'[---]') #$ charRange=1:2-3:4
-re.compile(r'[\---]') #$ charRange=1:3-4:5
-re.compile(r'[--\-]') #$ charRange=1:2-3:5
-re.compile(r'[\--\-]') #$ charRange=1:3-4:6
-re.compile(r'[0-9-A-Z]') #$ charRange=1:2-3:4 charRange=5:6-7:8
-re.compile(r'[0\-9-A-Z]') #$ charRange=4:5-6:7
+re.compile(r'[---]') # $ charRange=1:2-3:4
+re.compile(r'[\---]') # $ charRange=1:3-4:5
+re.compile(r'[--\-]') # $ charRange=1:2-3:5
+re.compile(r'[\--\-]') # $ charRange=1:3-4:6
+re.compile(r'[0-9-A-Z]') # $ charRange=1:2-3:4 charRange=5:6-7:8
+re.compile(r'[0\-9-A-Z]') # $ charRange=4:5-6:7
 
 try:
-    re.compile(r'[0--9-A-Z]') #$ SPURIOUS: charRange=1:2-3:4 charRange=4:5-6:7
+    re.compile(r'[0--9-A-Z]') # $ SPURIOUS: charRange=1:2-3:4 charRange=4:5-6:7
     raise Exception("this should not be reached")
 except re.error:
     pass
 
-re.compile(r'[^A-Z]') #$ charRange=2:3-4:5
+re.compile(r'[^A-Z]') # $ charRange=2:3-4:5
 
-re.compile(r'[\0-\09]') #$ charRange=1:3-4:6
-re.compile(r'[\0-\07]') #$ charRange=1:3-4:7
+re.compile(r'[\0-\09]') # $ charRange=1:3-4:6
+re.compile(r'[\0-\07]') # $ charRange=1:3-4:7
 
-re.compile(r'[\0123-5]') #$ charRange=5:6-7:8
+re.compile(r'[\0123-5]') # $ charRange=5:6-7:8
 
 
 #Negative lookahead
-re.compile(r'(?!not-this)^[A-Z_]+$') #$ charRange=14:15-16:17
+re.compile(r'(?!not-this)^[A-Z_]+$') # $ charRange=14:15-16:17
 #Negative lookbehind
-re.compile(r'^[A-Z_]+$(?<!not-this)') #$ charRange=2:3-4:5
+re.compile(r'^[A-Z_]+$(?<!not-this)') # $ charRange=2:3-4:5
 
 
 #OK -- ODASA-ODASA-3968
-re.compile('(?:[^%]|^)?%\((\w*)\)[a-z]') #$ charRange=22:23-24:25
+re.compile('(?:[^%]|^)?%\((\w*)\)[a-z]') # $ charRange=22:23-24:25
 
 #ODASA-3985
 #Half Surrogate pairs
-re.compile(u'[\uD800-\uDBFF][\uDC00-\uDFFF]') #$ charRange=1:2-3:4 charRange=6:7-8:9
+re.compile(u'[\uD800-\uDBFF][\uDC00-\uDFFF]') # $ charRange=1:2-3:4 charRange=6:7-8:9
 #Outside BMP
-re.compile(u'[\U00010000-\U0010ffff]') #$ charRange=1:2-3:4
+re.compile(u'[\U00010000-\U0010ffff]') # $ charRange=1:2-3:4
diff --git a/python/ql/test/library-tests/regex/charSetTest.py b/python/ql/test/library-tests/regex/charSetTest.py
index d5a44be6514..29bddb4e513 100644
--- a/python/ql/test/library-tests/regex/charSetTest.py
+++ b/python/ql/test/library-tests/regex/charSetTest.py
@@ -1,37 +1,37 @@
 import re
-re.compile(r'\A[+-]?\d+') #$ charSet=2:6
-re.compile(r'(?P<name>[\w]+)|') #$ charSet=9:13
-re.compile(r'\|\[\][123]|\{\}') #$ charSet=6:11
-re.compile(r'[^A-Z]') #$ charSet=0:6
-re.compile("[]]") #$ charSet=0:3
-re.compile("[][]") #$ charSet=0:4
-re.compile("[^][^]") #$ charSet=0:6
-re.compile("[.][.]") #$ charSet=0:3 charSet=3:6
-re.compile("[[]]") #$ charSet=0:3
-re.compile("[^]]") #$ charSet=0:4
-re.compile("[^-]") #$ charSet=0:4
+re.compile(r'\A[+-]?\d+') # $ charSet=2:6
+re.compile(r'(?P<name>[\w]+)|') # $ charSet=9:13
+re.compile(r'\|\[\][123]|\{\}') # $ charSet=6:11
+re.compile(r'[^A-Z]') # $ charSet=0:6
+re.compile("[]]") # $ charSet=0:3
+re.compile("[][]") # $ charSet=0:4
+re.compile("[^][^]") # $ charSet=0:6
+re.compile("[.][.]") # $ charSet=0:3 charSet=3:6
+re.compile("[[]]") # $ charSet=0:3
+re.compile("[^]]") # $ charSet=0:4
+re.compile("[^-]") # $ charSet=0:4
 
 try:
-    re.compile("[]-[]") #$ SPURIOUS: charSet=0:5
+    re.compile("[]-[]") # $ SPURIOUS: charSet=0:5
     raise Exception("this should not be reached")
 except re.error:
     pass
 
 try:
-    re.compile("[^]-[]") #$ SPURIOUS: charSet=0:6
+    re.compile("[^]-[]") # $ SPURIOUS: charSet=0:6
     raise Exception("this should not be reached")
 except re.error:
     pass
 
-re.compile("]]][[[[]") #$ charSet=3:8
+re.compile("]]][[[[]") # $ charSet=3:8
 
 #Half Surrogate pairs
-re.compile(u'[\uD800-\uDBFF][\uDC00-\uDFFF]') #$ charSet=0:5 charSet=5:10
+re.compile(u'[\uD800-\uDBFF][\uDC00-\uDFFF]') # $ charSet=0:5 charSet=5:10
 #Outside BMP
-re.compile(u'[\U00010000-\U0010ffff]') #$ charSet=0:5
+re.compile(u'[\U00010000-\U0010ffff]') # $ charSet=0:5
 
 #Misparsed
-re.compile(r"\[(?P<txt>[^[]*)\]\((?P<uri>[^)]*)") #$ charSet=10:14 charSet=28:32
+re.compile(r"\[(?P<txt>[^[]*)\]\((?P<uri>[^)]*)") # $ charSet=10:14 charSet=28:32
 
  # parses wrongly, sees this   \|/ as a char set start
-re.compile(r'''(?:[\s;,"'<>(){}|[\]@=+*]|:(?![/\\]))+''') #$ charSet=3:25 charSet=30:35
+re.compile(r'''(?:[\s;,"'<>(){}|[\]@=+*]|:(?![/\\]))+''') # $ charSet=3:25 charSet=30:35
diff --git a/python/ql/test/library-tests/regex/escapedCharacterTest.py b/python/ql/test/library-tests/regex/escapedCharacterTest.py
index 79cac6db623..9a3fc07bbd8 100644
--- a/python/ql/test/library-tests/regex/escapedCharacterTest.py
+++ b/python/ql/test/library-tests/regex/escapedCharacterTest.py
@@ -1,19 +1,19 @@
 import re
 
-re.compile(r'\b') #$ escapedCharacter=0:2
-re.compile(r'''\b''') #$ escapedCharacter=0:2
-re.compile(r"\b") #$ escapedCharacter=0:2
+re.compile(r'\b') # $ escapedCharacter=0:2
+re.compile(r'''\b''') # $ escapedCharacter=0:2
+re.compile(r"\b") # $ escapedCharacter=0:2
 re.compile(u"\b") # not escape
 re.compile("\b") # not escape
-re.compile(r'\\\b') #$ escapedCharacter=0:2 escapedCharacter=2:4
-re.compile(r'[\---]') #$ escapedCharacter=1:3
-re.compile(r'[--\-]') #$ escapedCharacter=3:5
-re.compile(r'[\--\-]') #$ escapedCharacter=1:3 escapedCharacter=4:6
-re.compile(r'[0\-9-A-Z]') #$ escapedCharacter=2:4
-re.compile(r'[\0-\09]') #$ escapedCharacter=1:3 escapedCharacter=4:6
-re.compile(r'[\0-\07]') #$ escapedCharacter=1:3 escapedCharacter=4:7
-re.compile(r'[\0123-5]') #$ escapedCharacter=1:5
-re.compile(r'\1754\1854\17\18\07\08') #$ escapedCharacter=0:4 escapedCharacter=16:19 escapedCharacter=19:21
+re.compile(r'\\\b') # $ escapedCharacter=0:2 escapedCharacter=2:4
+re.compile(r'[\---]') # $ escapedCharacter=1:3
+re.compile(r'[--\-]') # $ escapedCharacter=3:5
+re.compile(r'[\--\-]') # $ escapedCharacter=1:3 escapedCharacter=4:6
+re.compile(r'[0\-9-A-Z]') # $ escapedCharacter=2:4
+re.compile(r'[\0-\09]') # $ escapedCharacter=1:3 escapedCharacter=4:6
+re.compile(r'[\0-\07]') # $ escapedCharacter=1:3 escapedCharacter=4:7
+re.compile(r'[\0123-5]') # $ escapedCharacter=1:5
+re.compile(r'\1754\1854\17\18\07\08') # $ escapedCharacter=0:4 escapedCharacter=16:19 escapedCharacter=19:21
 
 #ODASA-3985
 #Half Surrogate pairs
@@ -22,10 +22,10 @@ re.compile(u'[\uD800-\uDBFF][\uDC00-\uDFFF]') # not escapes
 re.compile(u'[\U00010000-\U0010ffff]') # not escapes
 
 #Misparsed
-re.compile(r"\[(?P<txt>[^[]*)\]\((?P<uri>[^)]*)") #$ escapedCharacter=0:2 escapedCharacter=16:18 escapedCharacter=18:20
+re.compile(r"\[(?P<txt>[^[]*)\]\((?P<uri>[^)]*)") # $ escapedCharacter=0:2 escapedCharacter=16:18 escapedCharacter=18:20
 
 #Non-raw string
-re_blank = re.compile('(\n|\r|\\s)*\n', re.M) #$ escapedCharacter=5:7
+re_blank = re.compile('(\n|\r|\\s)*\n', re.M) # $ escapedCharacter=5:7
 
 #Backreference confusion
-re.compile(r'\+0') #$ escapedCharacter=0:2
+re.compile(r'\+0') # $ escapedCharacter=0:2
diff --git a/python/ql/test/library-tests/regex/groupTest.py b/python/ql/test/library-tests/regex/groupTest.py
index 2cb96801f77..bd1f16d2d95 100644
--- a/python/ql/test/library-tests/regex/groupTest.py
+++ b/python/ql/test/library-tests/regex/groupTest.py
@@ -1,4 +1,4 @@
 import re
 
-re.compile(r'(?P<first>\w+) (?P<second>\w+)') #$ group=0:14 group=15:30
-re.compile(r'([)(])') #$ group=0:6
+re.compile(r'(?P<first>\w+) (?P<second>\w+)') # $ group=0:14 group=15:30
+re.compile(r'([)(])') # $ group=0:6
diff --git a/python/ql/test/library-tests/regexparser/locations.py b/python/ql/test/library-tests/regexparser/locations.py
index 133ba528ce1..4143b6f30f2 100644
--- a/python/ql/test/library-tests/regexparser/locations.py
+++ b/python/ql/test/library-tests/regexparser/locations.py
@@ -10,7 +10,7 @@ import re
 # Comments indicate the found locations relative to the call to `compile`.
 
 # plain string
-re.compile( # $location=1:2
+re.compile( # $ location=1:2
 '[this] is a test'
 )
 
@@ -97,4 +97,4 @@ r'\A[this] is a test'
 re.compile( # $ location=1:2 SPURIOUS:location=1:23 MISSING:location=2:6
 '[this] is a test\
  and [this] is another test'
-)
\ No newline at end of file
+)
diff --git a/python/ql/test/query-tests/Classes/should-be-context-manager/ShouldBeContextManager.expected b/python/ql/test/query-tests/Classes/should-be-context-manager/ShouldBeContextManager.expected
index 47c773804ae..3cd6d92ff64 100644
--- a/python/ql/test/query-tests/Classes/should-be-context-manager/ShouldBeContextManager.expected
+++ b/python/ql/test/query-tests/Classes/should-be-context-manager/ShouldBeContextManager.expected
@@ -1,2 +1,2 @@
-| should_be_context_manager.py:3:1:3:22 | class MegaDel | Class MegaDel implements __del__ (presumably to release some resource). Consider making it a context manager. |
-| should_be_context_manager.py:16:1:16:22 | class MiniDel | Class MiniDel implements __del__ (presumably to release some resource). Consider making it a context manager. |
+| should_be_context_manager.py:3:1:3:22 | Class MegaDel | Class MegaDel implements __del__ (presumably to release some resource). Consider making it a context manager. |
+| should_be_context_manager.py:16:1:16:22 | Class MiniDel | Class MiniDel implements __del__ (presumably to release some resource). Consider making it a context manager. |
diff --git a/python/ql/test/query-tests/Exceptions/general/exceptions_test.py b/python/ql/test/query-tests/Exceptions/general/exceptions_test.py
index cf197683f15..e5e9ea67a6e 100644
--- a/python/ql/test/query-tests/Exceptions/general/exceptions_test.py
+++ b/python/ql/test/query-tests/Exceptions/general/exceptions_test.py
@@ -61,35 +61,35 @@ try:
     val.attr
 except Exception:
     print (2)
-except AttributeError: # $Alert[py/unreachable-except]
+except AttributeError: # $ Alert[py/unreachable-except]
     print (3)
 
 class MyExc(ValueError):
-    pass 
+    pass
 
 try:
     pass
 except ValueError:
-    pass 
-except MyExc: # $MISSING:Alert[py/unreachable-except] # Missing due to dataflow limitiation preventing MyExc from being tracked here.
-    pass 
+    pass
+except MyExc: # $ MISSING:Alert[py/unreachable-except] # Missing due to dataflow limitiation preventing MyExc from being tracked here.
+    pass
 
 class MyBaseExc(Exception):
-    pass 
+    pass
 
 class MySubExc(MyBaseExc):
-    pass 
+    pass
 
 try:
     pass
 except MyBaseExc:
-    pass 
-except MySubExc: # $MISSING:Alert[py/unreachable-except] # Missing due to dataflow limitation preventing MyExc from being tracked here.
-    pass 
+    pass
+except MySubExc: # $ MISSING:Alert[py/unreachable-except] # Missing due to dataflow limitation preventing MyExc from being tracked here.
+    pass
 except Exception:
     pass
 
-    
+
 #Catch BaseException
 def catch_base_exception():
     try:
@@ -97,13 +97,13 @@ def catch_base_exception():
     except BaseException:
         #Consumes KeyboardInterrupt
         pass
-    
+
 def catch_base_exception_ok():
     try:
         illegal_raise()
     except BaseException:
         raise
-    
+
 def legal_handler1():
     try:
         illegal_raise()
diff --git a/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.py b/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.py
index ca7bb71d760..b047f4ddc64 100644
--- a/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.py
+++ b/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.py
@@ -1,31 +1,31 @@
 # Not OK
 def simple(l = [0]):
-    l[0] = 1  #$ modification=l
+    l[0] = 1  # $ modification=l
     return l
 
 # Not OK
 def slice(l = [0]):
-    l[0:1] = 1  #$ modification=l
+    l[0:1] = 1  # $ modification=l
     return l
 
 # Not OK
 def list_del(l = [0]):
-    del l[0]  #$ modification=l
+    del l[0]  # $ modification=l
     return l
 
 # Not OK
 def append_op(l = []):
-    l += [1, 2, 3]  #$ modification=l
+    l += [1, 2, 3]  # $ modification=l
     return l
 
 # Not OK
 def repeat_op(l = [0]):
-    l *= 3  #$ modification=l
+    l *= 3  # $ modification=l
     return l
 
 # Not OK
 def append(l = []):
-    l.append(1)  #$ modification=l
+    l.append(1)  # $ modification=l
     return l
 
 # OK
@@ -36,7 +36,7 @@ def includes(l = []):
     return x
 
 def extends(l):
-    l.extend([1])  #$ modification=l
+    l.extend([1])  # $ modification=l
     return l
 
 # Not OK
@@ -46,26 +46,26 @@ def deferred(l = []):
 
 # Not OK
 def nonempty(l = [5]):
-    l.append(1)  #$ modification=l
+    l.append(1)  # $ modification=l
     return l
 
 # Not OK
 def dict(d = {}):
-    d['a'] = 1  #$ modification=d
+    d['a'] = 1  # $ modification=d
     return d
 
 # Not OK
 def dict_nonempty(d = {'a': 1}):
-    d['a'] = 2  #$ modification=d
+    d['a'] = 2  # $ modification=d
     return d
 
 # OK
 def dict_nonempty_nochange(d = {'a': 1}):
-    d['a'] = 1  #$ SPURIOUS: modification=d
+    d['a'] = 1  # $ SPURIOUS: modification=d
     return d
 
 def modifies(d):
-    d['a'] = 1  #$ modification=d
+    d['a'] = 1  # $ modification=d
     return d
 
 # Not OK
@@ -75,21 +75,21 @@ def dict_deferred(d = {}):
 
 # Not OK
 def dict_method(d = {}):
-    d.update({'a': 1})  #$ modification=d
+    d.update({'a': 1})  # $ modification=d
     return d
 
 # Not OK
 def dict_method_nonempty(d = {'a': 1}):
-    d.update({'a': 2})  #$ modification=d
+    d.update({'a': 2})  # $ modification=d
     return d
 
 # OK
 def dict_method_nonempty_nochange(d = {'a': 1}):
-    d.update({'a': 1})  #$ SPURIOUS:modification=d
+    d.update({'a': 1})  # $ SPURIOUS:modification=d
     return d
 
 def modifies_method(d):
-    d.update({'a': 1})  #$ modification=d
+    d.update({'a': 1})  # $ modification=d
     return d
 
 # Not OK
@@ -106,55 +106,55 @@ def dict_includes(d = {}):
 
 # Not OK
 def dict_del(d = {'a': 1}):
-    del d['a']  #$ modification=d
+    del d['a']  # $ modification=d
     return d
 
 # Not OK
 def dict_update_op(d = {}):
     x = {'a': 1}
-    d |= x  #$ modification=d
+    d |= x  # $ modification=d
     return d
 
 # OK
 def dict_update_op_nochange(d = {}):
     x = {}
-    d |= x  #$ SPURIOUS: modification=d
+    d |= x  # $ SPURIOUS: modification=d
     return d
 
 def sanitizer(l = []):
     if l:
         l.append(1)
     else:
-        l.append(1)  #$ modification=l
+        l.append(1)  # $ modification=l
     return l
 
 def sanitizer_negated(l = [1]):
     if not l:
         l.append(1)
     else:
-        l.append(1)  #$ modification=l
+        l.append(1)  # $ modification=l
     return l
 
 def sanitizer(l = []):
     if not l:
-        l.append(1)  #$ modification=l
+        l.append(1)  # $ modification=l
     else:
         l.append(1)
     return l
 
 def sanitizer_negated(l = [1]):
     if l:
-        l.append(1)  #$ modification=l
+        l.append(1)  # $ modification=l
     else:
         l.append(1)
     return l
 
 # indirect modification of parameter with default
 def aug_assign_argument(x):
-    x += ['x'] #$ modification=x
+    x += ['x'] # $ modification=x
 
 def mutate_argument(x):
-    x.append('x') #$ modification=x
+    x.append('x') # $ modification=x
 
 def indirect_modification(y = []):
     aug_assign_argument(y)
@@ -182,9 +182,9 @@ def do_stuff_based_on_type(x):
     if isinstance(x, str):
         x = x.split()
     elif isinstance(x, dict):
-        x.setdefault('foo', 'bar') #$ modification=x
+        x.setdefault('foo', 'bar') # $ modification=x
     elif isinstance(x, list):
-        x.append(5) #$ modification=x
+        x.append(5) # $ modification=x
     elif isinstance(x, tuple):
         x = x.unknown_method()
 
diff --git a/python/ql/test/query-tests/Functions/general/DeprecatedSliceMethod.expected b/python/ql/test/query-tests/Functions/general/DeprecatedSliceMethod.expected
index 1a6df6eca47..c9875b7a805 100644
--- a/python/ql/test/query-tests/Functions/general/DeprecatedSliceMethod.expected
+++ b/python/ql/test/query-tests/Functions/general/DeprecatedSliceMethod.expected
@@ -1,3 +1,3 @@
-| functions_test.py:95:5:95:40 | Function DeprecatedSliceMethods.__getslice__ | __getslice__ method has been deprecated since Python 2.0. |
-| functions_test.py:98:5:98:47 | Function DeprecatedSliceMethods.__setslice__ | __setslice__ method has been deprecated since Python 2.0. |
-| functions_test.py:101:5:101:40 | Function DeprecatedSliceMethods.__delslice__ | __delslice__ method has been deprecated since Python 2.0. |
+| functions_test.py:95:5:95:40 | Function __getslice__ | __getslice__ method has been deprecated since Python 2.0. |
+| functions_test.py:98:5:98:47 | Function __setslice__ | __setslice__ method has been deprecated since Python 2.0. |
+| functions_test.py:101:5:101:40 | Function __delslice__ | __delslice__ method has been deprecated since Python 2.0. |
diff --git a/python/ql/test/query-tests/Functions/methodArgNames/parameter_names.py b/python/ql/test/query-tests/Functions/methodArgNames/parameter_names.py
index 3a2fddc9f02..51632ef1482 100644
--- a/python/ql/test/query-tests/Functions/methodArgNames/parameter_names.py
+++ b/python/ql/test/query-tests/Functions/methodArgNames/parameter_names.py
@@ -14,17 +14,17 @@ class Normal(object):
 
     # not ok
     @classmethod
-    def n_cmethod(self): # $shouldBeCls
+    def n_cmethod(self): # $ shouldBeCls
         pass
 
     # not ok
     @classmethod
-    def n_cmethod2(): # $shouldBeCls
+    def n_cmethod2(): # $ shouldBeCls
         pass
 
     @classmethod
     @id
-    def n_dec(any_name): # $shouldBeCls
+    def n_dec(any_name): # $ shouldBeCls
         pass
 
 
@@ -34,13 +34,13 @@ class Class(type):
     def __init__(cls):
         pass
 
-    def c_method(y):  # $shouldBeCls
+    def c_method(y):  # $ shouldBeCls
         pass
 
     def c_ok(cls):
         pass
 
-    # technically we could alert on mixing self for metaclasses with cls for metaclasses in the same codebase, 
+    # technically we could alert on mixing self for metaclasses with cls for metaclasses in the same codebase,
     # but it's probably not too significant.
     def c_self_ok(self):
         pass
@@ -48,13 +48,13 @@ class Class(type):
 
 class NonSelf(object):
 
-    def __init__(x): # $shouldBeSelf
+    def __init__(x): # $ shouldBeSelf
         pass
 
-    def s_method(y): # $shouldBeSelf
+    def s_method(y): # $ shouldBeSelf
         pass
 
-    def s_method2(): # $shouldBeSelf
+    def s_method2(): # $ shouldBeSelf
         pass
 
     def s_ok(self):
@@ -68,7 +68,7 @@ class NonSelf(object):
     def s_cmethod(cls):
         pass
 
-    # we allow methods that are used in class initialization, but only detect this case when they are called. 
+    # we allow methods that are used in class initialization, but only detect this case when they are called.
     def s_smethod2(ok): # $ SPURIOUS: shouldBeSelf
         pass
     s_smethod2 = staticmethod(s_smethod2)
@@ -123,7 +123,7 @@ Z().meth(0)
 def weird_decorator(f):
     def g(self):
         return f()
-    return g 
+    return g
 
 class B:
     @weird_decorator
@@ -152,7 +152,7 @@ class SpecialMethodNames(object):
 
 from dataclasses import dataclass, field
 
-@dataclass 
+@dataclass
 class A:
     # Lambdas used in initilisation aren't methods.
-    x: int = field(default_factory = lambda: 2)
\ No newline at end of file
+    x: int = field(default_factory = lambda: 2)
diff --git a/python/ql/test/query-tests/Functions/overriding/test.py b/python/ql/test/query-tests/Functions/overriding/test.py
index 63ee50e820c..879efdbe291 100644
--- a/python/ql/test/query-tests/Functions/overriding/test.py
+++ b/python/ql/test/query-tests/Functions/overriding/test.py
@@ -21,13 +21,13 @@ class Base(object):
 
 class Derived(Base):
 
-    def meth1(self, spam): # $Alert[py/inheritance/signature-mismatch] # Has 1 more arg, base called in Base.foo
+    def meth1(self, spam): # $ Alert[py/inheritance/signature-mismatch] # Has 1 more arg, base called in Base.foo
         pass
 
-    def meth2(self): # $Alert[py/inheritance/signature-mismatch] # Has 1 fewer arg, base called in Base.foo
+    def meth2(self): # $ Alert[py/inheritance/signature-mismatch] # Has 1 fewer arg, base called in Base.foo
         pass
 
-    def meth3(self, eggs): # $Alert[py/inheritance/signature-mismatch] # Has 1 more arg. Method is not called.
+    def meth3(self, eggs): # $ Alert[py/inheritance/signature-mismatch] # Has 1 more arg. Method is not called.
         pass
 
     def bar(self):
@@ -66,12 +66,12 @@ class BlameBase(object):
 
 class Correct1(BlameBase):
 
-    def meth(self, arg): # $Alert[py/inheritance/signature-mismatch] # Has 1 more arg. The incorrect-overridden-method query would alert for the base method in this case.
+    def meth(self, arg): # $ Alert[py/inheritance/signature-mismatch] # Has 1 more arg. The incorrect-overridden-method query would alert for the base method in this case.
         pass
 
 class Correct2(BlameBase):
 
-    def meth(self, arg): # $Alert[py/inheritance/signature-mismatch] # Has 1 more arg
+    def meth(self, arg): # $ Alert[py/inheritance/signature-mismatch] # Has 1 more arg
         pass
 
 c = Correct2()
@@ -122,28 +122,28 @@ class Base2:
 
 class Derrived2(Base2):
 
-    def meth1(self): pass # $Alert[py/inheritance/signature-mismatch] # Weak mismatch (base may be called with 2 args. only alert if mismatching call exists)
+    def meth1(self): pass # $ Alert[py/inheritance/signature-mismatch] # Weak mismatch (base may be called with 2 args. only alert if mismatching call exists)
 
     def meth2(self): pass # No alert (weak mismatch, but not called)
 
     def meth3(self, x=1): pass # No alert (no mismatch - all base calls are valid for sub)
 
-    def meth4(self, x, y, z=1): pass # $Alert[py/inheritance/signature-mismatch] # sub min > base max (strong mismatch)
+    def meth4(self, x, y, z=1): pass # $ Alert[py/inheritance/signature-mismatch] # sub min > base max (strong mismatch)
 
-    def meth5(self, x, y=1): pass # $Alert[py/inheritance/signature-mismatch]
+    def meth5(self, x, y=1): pass # $ Alert[py/inheritance/signature-mismatch]
 
-    def meth6(self, x): pass # $Alert[py/inheritance/signature-mismatch] # weak mismatch (base may be called with 3+ args)
+    def meth6(self, x): pass # $ Alert[py/inheritance/signature-mismatch] # weak mismatch (base may be called with 3+ args)
 
-    def meth7(self, x, *ys): pass # $Alert[py/inheritance/signature-mismatch] # weak mismatch (base may be called with 1 arg only)
+    def meth7(self, x, *ys): pass # $ Alert[py/inheritance/signature-mismatch] # weak mismatch (base may be called with 1 arg only)
 
-    def meth8(self, x, z): pass # $Alert[py/inheritance/signature-mismatch] # weak mismatch (base may be called with arg named y)
+    def meth8(self, x, z): pass # $ Alert[py/inheritance/signature-mismatch] # weak mismatch (base may be called with arg named y)
 
     def meth9(self, x, z): pass # No alert (never called with wrong keyword arg)
 
     def meth10(self, x, **kwargs): pass # No alert (y is kw-only arg in base, calls that use it are valid for sub)
 
-    def meth11(self, x, z, **kwargs): pass # $MISSING:Alert[py/inheritance/signature-mismatch] # call using y kw-arg is invalid due to not specifying z, but this is not detected. Likely a fairly niche situation.
+    def meth11(self, x, z, **kwargs): pass # $ MISSING:Alert[py/inheritance/signature-mismatch] # call using y kw-arg is invalid due to not specifying z, but this is not detected. Likely a fairly niche situation.
 
-    def meth12(self): pass # $Alert[py/inheritance/signature-mismatch] # call including extra kwarg invalid
+    def meth12(self): pass # $ Alert[py/inheritance/signature-mismatch] # call including extra kwarg invalid
 
-    def meth13(self, /, y): pass # $Alert[py/inheritance/signature-mismatch] # weak mismatch (base may be called with arg named x), however meth13 is incorrectly detected as having 2 minimum positional arguments, whereas x is kw-only; resulting in the witness call not being detected as a valid call to Base2.meth13. 
+    def meth13(self, /, y): pass # $ Alert[py/inheritance/signature-mismatch] # weak mismatch (base may be called with arg named x), however meth13 is incorrectly detected as having 2 minimum positional arguments, whereas x is kw-only; resulting in the witness call not being detected as a valid call to Base2.meth13.
diff --git a/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/resources_test.py b/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/resources_test.py
index 15ba9393715..f4bd33eb12c 100644
--- a/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/resources_test.py
+++ b/python/ql/test/query-tests/Resources/FileNotAlwaysClosed/resources_test.py
@@ -3,10 +3,10 @@
 def not_close1():
     f1 = open("filename") # $ Alert # not closed on exception
     f1.write("Error could occur")
-    f1.close() 
+    f1.close()
 
 def not_close2():
-    f2 = open("filename") # $ Alert 
+    f2 = open("filename") # $ Alert
 
 def closed3():
     f3 = open("filename")
@@ -46,7 +46,7 @@ def closed7():
 def not_closed8():
     f8 = None
     try:
-        f8 = open("filename") # $ MISSING:Alert # not closed on exception 
+        f8 = open("filename") # $ MISSING:Alert # not closed on exception
         f8.write("Error could occur")
     finally:
         if f8 is None: # We don't precisely consider this condition, so this result is MISSING. However, this seems uncommon.
@@ -88,7 +88,7 @@ def doesnt_raise(*args):
     pass
 
 def mostly_closed12():
-    f12 = open("filename") 
+    f12 = open("filename")
     try:
         f12.write("IOError could occur")
         f12.write("IOError could occur")
@@ -105,7 +105,7 @@ def opener_func2(name):
     return t1
 
 def not_closed13(name):
-    f13 = open(name) # $ Alert 
+    f13 = open(name) # $ Alert
     f13.write("Hello")
 
 def may_not_be_closed14(name):
@@ -120,7 +120,7 @@ def closer2(t3):
     closer1(t3)
 
 def closed15():
-    f15 = opener_func2() # $ SPURIOUS:Alert 
+    f15 = opener_func2() # $ SPURIOUS:Alert
     closer2(f15) # We don't detect that this call closes the file, so this result is SPURIOUS.
 
 
@@ -151,11 +151,11 @@ def not_closed17():
 #With statement will close the fp
 def closed18(path):
     try:
-        f18 = open(path) 
+        f18 = open(path)
     except IOError as ex:
         print(ex)
         raise ex
-    with f18: 
+    with f18:
         f18.read()
 
 class Closed19(object):
@@ -245,7 +245,7 @@ def not_closed22(path):
             f22.close()
 
 def not_closed23(path):
-    f23 = open(path, "w") # $ Alert 
+    f23 = open(path, "w") # $ Alert
     wr = FileWrapper(f23)
 
 def closed24(path):
@@ -253,11 +253,11 @@ def closed24(path):
     try:
         f24.write("hi")
     except:
-        pass 
+        pass
     f24.close()
 
 def closed25(path):
-    from django.http import FileResponse 
+    from django.http import FileResponse
     return FileResponse(open(path))
 
 import os
@@ -266,13 +266,13 @@ def closed26(path):
     os.close(fd)
 
 def not_closed27(path):
-    fd = os.open(path, "w") # $Alert # not closed on exception
+    fd = os.open(path, "w") # $ Alert # not closed on exception
     f27 = os.fdopen(fd, "w")
     f27.write("hi")
     f27.close()
 
 def closed28(path):
-    fd = os.open(path, os.O_WRONLY) 
+    fd = os.open(path, os.O_WRONLY)
     f28 = os.fdopen(fd, "w")
     try:
         f28.write("hi")
@@ -282,9 +282,9 @@ def closed28(path):
 def closed29(path):
     # Due to an approximation in CFG reachability for performance, it is not detected that the `write` call that may raise occurs after the file has already been closed.
     # We presume this case to be uncommon.
-    f28 = open(path) # $SPURIOUS:Alert # not closed on exception 
+    f28 = open(path) # $ SPURIOUS:Alert # not closed on exception
     f28.close()
-    f28.write("already closed") 
+    f28.write("already closed")
 
 # False positive in a previous implementation:
 
@@ -294,11 +294,11 @@ class NotWrapper:
         fp.close()
 
     def do_something(self):
-        pass 
+        pass
 
 def closed30(path):
     # Combination of approximations resulted in this FP:
-    # - NotWrapper is treated as a wrapper class as a file handle is passed to it 
+    # - NotWrapper is treated as a wrapper class as a file handle is passed to it
     # - thing.do_something() is treated as a call that can raise an exception while a file is open
     # - this call is treated as occurring after the open but not as being guarded by the with statement, as it is in the same basic block
     # - - this behavior has been changed fixing the FP
@@ -306,11 +306,11 @@ def closed30(path):
     with open(path) as fp: # No longer spurious alert here.
         thing = NotWrapper(fp)
 
-    thing.do_something() 
+    thing.do_something()
 
 
 def closed31(path):
-    with open(path) as fp: 
+    with open(path) as fp:
         data = fp.readline()
         data2 = fp.readline()
 
@@ -328,7 +328,7 @@ class Wrapper():
 def closed32(path):
     with open(path, "rb") as f: # No longer spurious alert here.
         wrap = Wrapper(f)
-        # This resulted in an FP in a previous implementation, 
+        # This resulted in an FP in a previous implementation,
         # due to a check that an operation is lexically contained within a `with` block (with `expr.getParent*()`)
         # not detecting this case.
-        return list(wrap.read())
\ No newline at end of file
+        return list(wrap.read())
diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/flask_path_injection.py b/python/ql/test/query-tests/Security/CWE-022-PathInjection/flask_path_injection.py
index f289bcc94ec..fbc217cf4c2 100644
--- a/python/ql/test/query-tests/Security/CWE-022-PathInjection/flask_path_injection.py
+++ b/python/ql/test/query-tests/Security/CWE-022-PathInjection/flask_path_injection.py
@@ -1,4 +1,4 @@
-from flask import Flask, request, send_from_directory # $Source
+from flask import Flask, request, send_from_directory # $ Source
 app = Flask(__name__)
 
 
@@ -10,7 +10,7 @@ STATIC_DIR = "/server/static/"
 def download_file():
     filename = request.args.get('filename', '')
     # ok since `send_from_directory` ensure this stays within `STATIC_DIR`
-    return send_from_directory(STATIC_DIR, filename) # $result=OK
+    return send_from_directory(STATIC_DIR, filename) # $ result=OK
 
 
 # see https://flask.palletsprojects.com/en/1.1.x/api/#flask.send_from_directory
diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/path_injection.py b/python/ql/test/query-tests/Security/CWE-022-PathInjection/path_injection.py
index 37ff20b7de1..bff0d750c9f 100644
--- a/python/ql/test/query-tests/Security/CWE-022-PathInjection/path_injection.py
+++ b/python/ql/test/query-tests/Security/CWE-022-PathInjection/path_injection.py
@@ -37,7 +37,7 @@ def safe_path_normpath():
     filename = request.args.get('filename', '')
     npath = os.path.normpath(os.path.join(STATIC_DIR, filename))
     if npath.startswith(STATIC_DIR):
-        f = open(npath)  # $result=OK
+        f = open(npath)  # $ result=OK
 
 
 @app.route("/path5")
@@ -54,7 +54,7 @@ def safe_path_realpath():
     filename = request.args.get('filename', '')
     npath = os.path.realpath(os.path.join(STATIC_DIR, filename))
     if npath.startswith(STATIC_DIR):
-        f = open(npath)  # $result=OK
+        f = open(npath)  # $ result=OK
 
 
 @app.route("/path6")
@@ -71,7 +71,7 @@ def safe_path_abspath():
     filename = request.args.get('filename', '')
     npath = os.path.abspath(os.path.join(STATIC_DIR, filename))
     if npath.startswith(STATIC_DIR):
-        f = open(npath)  # $result=OK
+        f = open(npath)  # $ result=OK
 
 
 @app.route("/abspath_tricky")
diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/test.py b/python/ql/test/query-tests/Security/CWE-022-PathInjection/test.py
index c10c257dae5..d9a9cd43fa6 100644
--- a/python/ql/test/query-tests/Security/CWE-022-PathInjection/test.py
+++ b/python/ql/test/query-tests/Security/CWE-022-PathInjection/test.py
@@ -38,7 +38,7 @@ def normalize_then_check():
     x = source()
     y = normalize(x)
     if y.startswith("subfolder/"):
-        open(y)  # $result=OK
+        open(y)  # $ result=OK
 
 
 @app.route("/path")
diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/test_chaining.py b/python/ql/test/query-tests/Security/CWE-022-PathInjection/test_chaining.py
index 05d8f2620b1..9a3a6fd5a8e 100644
--- a/python/ql/test/query-tests/Security/CWE-022-PathInjection/test_chaining.py
+++ b/python/ql/test/query-tests/Security/CWE-022-PathInjection/test_chaining.py
@@ -20,7 +20,7 @@ def normalize_then_check():
     x = source()
     y = normalize(x)  # <--- this call...
     if y.startswith("subfolder/"):
-        open(y)  # $result=OK
+        open(y)  # $ result=OK
 
 
 @app.route("/path")
@@ -29,7 +29,7 @@ def normalize_check_normalize():
     y = normalize(x)  # (...or this call...)
     if y.startswith("subfolder/"):
         z = normalize(y)  # <--- ...can jump to here, resulting in FP
-        open(z)  # $result=OK
+        open(z)  # $ result=OK
 
 
 # The problem does not manifest if we simply define an alias
@@ -42,4 +42,4 @@ def normalize_check_normalize_alias():
     y = normpath(x)
     if y.startswith("subfolder/"):
         z = normpath(y)
-        open(z)  # $result=OK
+        open(z)  # $ result=OK
diff --git a/python/ql/test/query-tests/Security/CWE-078-CommandInjection/command_injection.py b/python/ql/test/query-tests/Security/CWE-078-CommandInjection/command_injection.py
index c969a1b1020..3ba50c25480 100644
--- a/python/ql/test/query-tests/Security/CWE-078-CommandInjection/command_injection.py
+++ b/python/ql/test/query-tests/Security/CWE-078-CommandInjection/command_injection.py
@@ -10,27 +10,27 @@ app = Flask(__name__)
 def command_injection1():
     files = request.args.get('files', '')
     # Don't let files be `; rm -rf /`
-    os.system("ls " + files) # $result=BAD
+    os.system("ls " + files) # $ result=BAD
 
 
 @app.route("/command2")
 def command_injection2():
     files = request.args.get('files', '')
     # Don't let files be `; rm -rf /`
-    subprocess.Popen("ls " + files, shell=True) # $result=BAD
+    subprocess.Popen("ls " + files, shell=True) # $ result=BAD
 
 
 @app.route("/command3")
 def first_arg_injection():
     cmd = request.args.get('cmd', '')
-    subprocess.Popen([cmd, "param1"]) # $result=BAD
+    subprocess.Popen([cmd, "param1"]) # $ result=BAD
 
 
 @app.route("/other_cases")
 def others():
     files = request.args.get('files', '')
     # Don't let files be `; rm -rf /`
-    os.popen("ls " + files) # $result=BAD
+    os.popen("ls " + files) # $ result=BAD
 
 
 @app.route("/multiple")
@@ -38,8 +38,8 @@ def multiple():
     command = request.args.get('command', '')
     # We should mark flow to both calls here, which conflicts with removing flow out of
     # a sink due to use-use flow.
-    os.system(command) # $result=BAD
-    os.system(command) # $result=BAD
+    os.system(command) # $ result=BAD
+    os.system(command) # $ result=BAD
 
 
 @app.route("/not-into-sink-impl")
@@ -52,11 +52,11 @@ def not_into_sink_impl():
     subprocess.call implementation: https://github.com/python/cpython/blob/fa7ce080175f65d678a7d5756c94f82887fc9803/Lib/subprocess.py#L341
     """
     command = request.args.get('command', '')
-    os.system(command) # $result=BAD
-    os.popen(command) # $result=BAD
-    subprocess.call(command) # $result=BAD
-    subprocess.check_call(command) # $result=BAD
-    subprocess.run(command) # $result=BAD
+    os.system(command) # $ result=BAD
+    os.popen(command) # $ result=BAD
+    subprocess.call(command) # $ result=BAD
+    subprocess.check_call(command) # $ result=BAD
+    subprocess.run(command) # $ result=BAD
 
 
 @app.route("/path-exists-not-sanitizer")
@@ -70,11 +70,11 @@ def path_exists_not_sanitizer():
     """
     path = request.args.get('path', '')
     if os.path.exists(path):
-        os.system("ls " + path) # $result=BAD
+        os.system("ls " + path) # $ result=BAD
 
 
 @app.route("/restricted-characters")
 def restricted_characters():
     path = request.args.get('path', '')
     if re.match(r'^[a-zA-Z0-9_-]+$', path):
-        os.system("ls " + path) # $SPURIOUS: result=BAD
+        os.system("ls " + path) # $ SPURIOUS: result=BAD
diff --git a/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/setup_posix.py b/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/setup_posix.py
index d5f3fb63d96..dec30a2aab7 100644
--- a/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/setup_posix.py
+++ b/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/setup_posix.py
@@ -1,4 +1,4 @@
-import os 
+import os
 
 def unsafe_setup(name):
-    os.system("ping " + name) # $result=OK - this is inside a setyp script, so it's fine.
\ No newline at end of file
+    os.system("ping " + name) # $ result=OK - this is inside a setyp script, so it's fine.
diff --git a/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/src/unsafe_shell_test.py b/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/src/unsafe_shell_test.py
index f491b93583d..95d05bbfaf0 100644
--- a/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/src/unsafe_shell_test.py
+++ b/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/src/unsafe_shell_test.py
@@ -2,52 +2,52 @@ import os
 import subprocess
 
 def unsafe_shell_one(name):
-    os.system("ping " + name) # $result=BAD
+    os.system("ping " + name) # $ result=BAD
 
     # f-strings
-    os.system(f"ping {name}") # $result=BAD
+    os.system(f"ping {name}") # $ result=BAD
 
     # array.join
-    os.system("ping " + " ".join(name)) # $result=BAD
+    os.system("ping " + " ".join(name)) # $ result=BAD
 
     # array.join, with a list
-    os.system("ping " + " ".join([name])) # $result=BAD
+    os.system("ping " + " ".join([name])) # $ result=BAD
 
     # format, using .format
-    os.system("ping {}".format(name)) # $result=BAD
+    os.system("ping {}".format(name)) # $ result=BAD
 
     # format, using %
-    os.system("ping %s" % name) # $result=BAD
+    os.system("ping %s" % name) # $ result=BAD
 
     os.system(name) # OK - seems intentional.
 
 import fabric
 
-def facbric_stuff (name): 
+def facbric_stuff (name):
     fabric.api.run("ping " + name, shell=False) # OK
 
-    fabric.api.run("ping " + name, shell=True) # $result=BAD
+    fabric.api.run("ping " + name, shell=True) # $ result=BAD
 
-    def indirect(flag): 
+    def indirect(flag):
         fabric.api.run("ping " + name, shell=flag) # OK
 
     indirect(False)
 
-def subprocess_flag (name): 
+def subprocess_flag (name):
     subprocess.run("ping " + name, shell=False) # OK - and nonsensical
 
-    subprocess.run("ping " + name, shell=True) # $result=BAD
+    subprocess.run("ping " + name, shell=True) # $ result=BAD
 
-    def indirect(flag, x): 
-        subprocess.run("ping " + x, shell=flag) # $result=BAD
+    def indirect(flag, x):
+        subprocess.run("ping " + x, shell=flag) # $ result=BAD
 
     indirect(True, name)
 
     subprocess.Popen("ping " + name, shell=unknownValue) # OK - shell assumed to be False
 
-def intentional(command): 
-    os.system("fish -ic " + command) # $result=OK - intentional
+def intentional(command):
+    os.system("fish -ic " + command) # $ result=OK - intentional
 
 import shlex
-def unsafe_shell_sanitized(name): 
-    os.system("ping " + shlex.quote(name)) # $result=OK - sanitized
\ No newline at end of file
+def unsafe_shell_sanitized(name):
+    os.system("ping " + shlex.quote(name)) # $ result=OK - sanitized
diff --git a/python/ql/test/query-tests/Security/CWE-1004-NonHttpOnlyCookie/test.py b/python/ql/test/query-tests/Security/CWE-1004-NonHttpOnlyCookie/test.py
index 6091e31ae32..f2ab60f8aa1 100644
--- a/python/ql/test/query-tests/Security/CWE-1004-NonHttpOnlyCookie/test.py
+++ b/python/ql/test/query-tests/Security/CWE-1004-NonHttpOnlyCookie/test.py
@@ -5,8 +5,8 @@ app = Flask(__name__)
 @app.route("/test")
 def test():
     resp = make_response()
-    resp.set_cookie("oauth", "value1") # $Alert[py/client-exposed-cookie]
-    resp.set_cookie("oauth", "value2", secure=True) # $Alert[py/client-exposed-cookie]
-    resp.set_cookie("oauth", "value2", httponly=True) 
-    resp.set_cookie("oauth", "value2", samesite="Strict") # $Alert[py/client-exposed-cookie]
-    resp.set_cookie("oauth", "value2", httponly=True, samesite="None") 
\ No newline at end of file
+    resp.set_cookie("oauth", "value1") # $ Alert[py/client-exposed-cookie]
+    resp.set_cookie("oauth", "value2", secure=True) # $ Alert[py/client-exposed-cookie]
+    resp.set_cookie("oauth", "value2", httponly=True)
+    resp.set_cookie("oauth", "value2", samesite="Strict") # $ Alert[py/client-exposed-cookie]
+    resp.set_cookie("oauth", "value2", httponly=True, samesite="None")
diff --git a/python/ql/test/query-tests/Security/CWE-1275-SameSiteNoneCookie/test.py b/python/ql/test/query-tests/Security/CWE-1275-SameSiteNoneCookie/test.py
index f1fd1fd4486..e36c7560b5f 100644
--- a/python/ql/test/query-tests/Security/CWE-1275-SameSiteNoneCookie/test.py
+++ b/python/ql/test/query-tests/Security/CWE-1275-SameSiteNoneCookie/test.py
@@ -5,11 +5,10 @@ app = Flask(__name__)
 @app.route("/test")
 def test(oauth_cookie_name):
     resp = make_response()
-    resp.set_cookie("password", "value1") 
-    resp.set_cookie("authKey", "value2", samesite="Lax") 
-    resp.set_cookie("session_id", "value2", samesite="None") # $Alert[py/samesite-none-cookie]
-    resp.set_cookie("oauth", "value2", secure=True, samesite="Strict") 
-    resp.set_cookie("oauth", "value2", httponly=True, samesite="Strict") 
-    resp.set_cookie(oauth_cookie_name, "value2", secure=True, samesite="None") # $Alert[py/samesite-none-cookie]
+    resp.set_cookie("password", "value1")
+    resp.set_cookie("authKey", "value2", samesite="Lax")
+    resp.set_cookie("session_id", "value2", samesite="None") # $ Alert[py/samesite-none-cookie]
+    resp.set_cookie("oauth", "value2", secure=True, samesite="Strict")
+    resp.set_cookie("oauth", "value2", httponly=True, samesite="Strict")
+    resp.set_cookie(oauth_cookie_name, "value2", secure=True, samesite="None") # $ Alert[py/samesite-none-cookie]
     resp.set_cookie("not_sensitive", "value2", samesite="None")
-    
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/Exceptions.py b/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/Exceptions.py
index f2aa049fc1d..4da2e96009d 100644
--- a/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/Exceptions.py
+++ b/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/Exceptions.py
@@ -1,10 +1,10 @@
 try:
     1+2
-except Exception as e:  #$ exceptionInfo
+except Exception as e:  # $ exceptionInfo
     e
 
 def test_exception():
     try:
         1+2
-    except Exception as e:  #$ exceptionInfo
+    except Exception as e:  # $ exceptionInfo
         e
diff --git a/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/Stacktrace.py b/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/Stacktrace.py
index 118fe54c9f2..f3092e68aa1 100644
--- a/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/Stacktrace.py
+++ b/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/Stacktrace.py
@@ -3,13 +3,13 @@ import sys, traceback
 try:
     1/0
 except:
-    exc_type, exc_value, exc_traceback = sys.exc_info() #$ exceptionInfo
+    exc_type, exc_value, exc_traceback = sys.exc_info() # $ exceptionInfo
 
-    tb = traceback.extract_tb(exc_traceback) #$ exceptionInfo
-    stack = traceback.extract_stack() #$ exceptionInfo
-    print(traceback.format_exc(1, tb)) #$ exceptionInfo
-    print(traceback.format_exception(exc_type, exc_value, exc_traceback)) #$ exceptionInfo
-    print(traceback.format_exception_only(None, exc_value)) #$ exceptionInfo
-    print(traceback.format_list(stack)) #$ exceptionInfo
-    print(traceback.format_stack()) #$ exceptionInfo
-    print(traceback.format_tb(exc_traceback)) #$ exceptionInfo
+    tb = traceback.extract_tb(exc_traceback) # $ exceptionInfo
+    stack = traceback.extract_stack() # $ exceptionInfo
+    print(traceback.format_exc(1, tb)) # $ exceptionInfo
+    print(traceback.format_exception(exc_type, exc_value, exc_traceback)) # $ exceptionInfo
+    print(traceback.format_exception_only(None, exc_value)) # $ exceptionInfo
+    print(traceback.format_list(stack)) # $ exceptionInfo
+    print(traceback.format_stack()) # $ exceptionInfo
+    print(traceback.format_tb(exc_traceback)) # $ exceptionInfo
diff --git a/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/test.py b/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/test.py
index 3bcafbaf5dc..96bfba9cf57 100644
--- a/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/test.py
+++ b/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/test.py
@@ -13,14 +13,14 @@ def server_bad():
     try:
         do_computation()
     except Exception:
-        return traceback.format_exc()  #$ exceptionInfo
+        return traceback.format_exc()  # $ exceptionInfo
 
 # BAD
 @app.route('/bad/direct')
 def server_bad_direct():
     try:
         do_computation()
-    except Exception as e:  #$ exceptionInfo
+    except Exception as e:  # $ exceptionInfo
         return e
 
 # BAD
@@ -28,7 +28,7 @@ def server_bad_direct():
 def server_bad_traceback():
     try:
         do_computation()
-    except Exception as e:  #$ exceptionInfo
+    except Exception as e:  # $ exceptionInfo
         return e.__traceback__
 
 # GOOD
@@ -37,7 +37,7 @@ def server_good():
     try:
         do_computation()
     except Exception:
-        log(traceback.format_exc())  #$ exceptionInfo
+        log(traceback.format_exc())  # $ exceptionInfo
         return "An internal error has occurred!"
 
 #BAD
@@ -46,7 +46,7 @@ def server_bad_flow():
     try:
         do_computation()
     except Exception:
-        err = traceback.format_exc()  #$ exceptionInfo
+        err = traceback.format_exc()  # $ exceptionInfo
         return format_error(err)
 
 def format_error(msg):
diff --git a/python/ql/test/query-tests/Security/CWE-614-InsecureCookie/test.py b/python/ql/test/query-tests/Security/CWE-614-InsecureCookie/test.py
index 214567275e5..4531cd5398e 100644
--- a/python/ql/test/query-tests/Security/CWE-614-InsecureCookie/test.py
+++ b/python/ql/test/query-tests/Security/CWE-614-InsecureCookie/test.py
@@ -5,8 +5,8 @@ app = Flask(__name__)
 @app.route("/test")
 def test():
     resp = make_response()
-    resp.set_cookie("authKey", "value1") # $Alert[py/insecure-cookie]
-    resp.set_cookie("authKey", "value2", secure=True) 
-    resp.set_cookie("sessionID", "value2", httponly=True) # $Alert[py/insecure-cookie]
-    resp.set_cookie("password", "value2", samesite="Strict") # $Alert[py/insecure-cookie]
-    resp.set_cookie("notSensitive", "value3") 
+    resp.set_cookie("authKey", "value1") # $ Alert[py/insecure-cookie]
+    resp.set_cookie("authKey", "value2", secure=True)
+    resp.set_cookie("sessionID", "value2", httponly=True) # $ Alert[py/insecure-cookie]
+    resp.set_cookie("password", "value2", samesite="Strict") # $ Alert[py/insecure-cookie]
+    resp.set_cookie("notSensitive", "value3")
diff --git a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_mongoengine_bad.py b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_mongoengine_bad.py
index 76ac28edf79..098611adce4 100644
--- a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_mongoengine_bad.py
+++ b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_mongoengine_bad.py
@@ -19,7 +19,7 @@ def subclass_objects():
     unsafe_search = request.args['search']
     json_search = json.loads(unsafe_search)
 
-    return Movie.objects(__raw__=json_search)  #$ result=BAD
+    return Movie.objects(__raw__=json_search)  # $ result=BAD
 
 @app.route("/get_db_find")
 def get_db_find():
@@ -27,7 +27,7 @@ def get_db_find():
     json_search = json.loads(unsafe_search)
 
     retrieved_db = db.get_db()
-    return retrieved_db["Movie"].find({'name': json_search})  #$ result=BAD
+    return retrieved_db["Movie"].find({'name': json_search})  # $ result=BAD
 
 # if __name__ == "__main__":
 #     app.run(debug=True)
diff --git a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_mongoengine_good.py b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_mongoengine_good.py
index 1ce065569f2..3cb08a4db7a 100644
--- a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_mongoengine_good.py
+++ b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_mongoengine_good.py
@@ -21,7 +21,7 @@ def subclass_objects():
     json_search = json.loads(unsafe_search)
     safe_search = sanitize(json_search)
 
-    return Movie.objects(__raw__=safe_search)  #$ result=OK
+    return Movie.objects(__raw__=safe_search)  # $ result=OK
 
 # if __name__ == "__main__":
 #     app.run(debug=True)
diff --git a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_pymongo_bad.py b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_pymongo_bad.py
index 735fbff9b34..e9799c055dd 100644
--- a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_pymongo_bad.py
+++ b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_pymongo_bad.py
@@ -11,7 +11,7 @@ def home_page():
     unsafe_search = request.args['search']
     json_search = json.loads(unsafe_search)
 
-    return mongo.db.user.find({'name': json_search})  #$ result=BAD
+    return mongo.db.user.find({'name': json_search})  # $ result=BAD
 
 # if __name__ == "__main__":
 #     app.run(debug=True)
diff --git a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_pymongo_good.py b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_pymongo_good.py
index f2458f91b89..790455da064 100644
--- a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_pymongo_good.py
+++ b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_pymongo_good.py
@@ -13,7 +13,7 @@ def home_page():
     json_search = json.loads(unsafe_search)
     safe_search = sanitize(json_search)
 
-    return mongo.db.user.find({'name': safe_search})  #$ result=OK
+    return mongo.db.user.find({'name': safe_search})  # $ result=OK
 
 # if __name__ == "__main__":
 #    app.run(debug=True)
diff --git a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/mongoengine_bad.py b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/mongoengine_bad.py
index 8dcedda62a2..7ad4323bba9 100644
--- a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/mongoengine_bad.py
+++ b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/mongoengine_bad.py
@@ -19,7 +19,7 @@ def connect_find():
     json_search = json.loads(unsafe_search)
 
     db = me.connect('mydb')
-    return db.movie.find({'name': json_search})  #$ result=BAD
+    return db.movie.find({'name': json_search})  # $ result=BAD
 
 @app.route("/connection_connect_find")
 def connection_connect_find():
@@ -27,7 +27,7 @@ def connection_connect_find():
     json_search = json.loads(unsafe_search)
 
     db = connect('mydb')
-    return db.movie.find({'name': json_search})  #$ result=BAD
+    return db.movie.find({'name': json_search})  # $ result=BAD
 
 @app.route("/get_db_find")
 def get_db_find():
@@ -35,7 +35,7 @@ def get_db_find():
     json_search = json.loads(unsafe_search)
 
     db = me.get_db()
-    return db.movie.find({'name': json_search})  #$ result=BAD
+    return db.movie.find({'name': json_search})  # $ result=BAD
 
 @app.route("/connection_get_db_find")
 def connection_get_db_find():
@@ -43,14 +43,14 @@ def connection_get_db_find():
     json_search = json.loads(unsafe_search)
 
     db = get_db()
-    return db.movie.find({'name': json_search})  #$ result=BAD
+    return db.movie.find({'name': json_search})  # $ result=BAD
 
 @app.route("/subclass_objects")
 def subclass_objects():
     unsafe_search = request.args['search']
     json_search = json.loads(unsafe_search)
 
-    return Movie.objects(__raw__=json_search)  #$ result=BAD
+    return Movie.objects(__raw__=json_search)  # $ result=BAD
 
 @app.route("/subscript_find")
 def subscript_find():
@@ -58,7 +58,7 @@ def subscript_find():
     json_search = json.loads(unsafe_search)
 
     db = me.connect('mydb')
-    return db['movie'].find({'name': json_search})  #$ result=BAD
+    return db['movie'].find({'name': json_search})  # $ result=BAD
 
 # if __name__ == "__main__":
 #     app.run(debug=True)
diff --git a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/mongoengine_good.py b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/mongoengine_good.py
index e8ac68cccba..a813a9f3c70 100644
--- a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/mongoengine_good.py
+++ b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/mongoengine_good.py
@@ -20,8 +20,8 @@ def connect_find():
     json_search = json.loads(unsafe_search)
     safe_search = sanitize(json_search)
 
-    db = me.connect('mydb')  
-    return db.movie.find({'name': safe_search})  #$ result=OK
+    db = me.connect('mydb')
+    return db.movie.find({'name': safe_search})  # $ result=OK
 
 # if __name__ == "__main__":
 #     app.run(debug=True)
diff --git a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/pymongo_test.py b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/pymongo_test.py
index 69377260715..1ba7558d287 100644
--- a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/pymongo_test.py
+++ b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/pymongo_test.py
@@ -12,7 +12,7 @@ def bad():
     unsafe_search = request.args['search']
     json_search = json.loads(unsafe_search)
 
-    return client.db.collection.find_one({'data': json_search})  #$ result=BAD
+    return client.db.collection.find_one({'data': json_search})  # $ result=BAD
 
 
 @app.route("/good")
@@ -21,7 +21,7 @@ def good():
     json_search = json.loads(unsafe_search)
     safe_search = sanitize(json_search)
 
-    return client.db.collection.find_one({'data': safe_search})  #$ result=OK
+    return client.db.collection.find_one({'data': safe_search})  # $ result=OK
 
 
 @app.route("/bad2")
@@ -30,7 +30,7 @@ def bad2():
     client = MongoClient("localhost", 27017, maxPoolSize=50)
     db = client.localhost
     collection = db['collection']
-    cursor = collection.find_one({"$where": f"this._id == '${event_id}'"})  #$ result=BAD
+    cursor = collection.find_one({"$where": f"this._id == '${event_id}'"})  # $ result=BAD
 
 
 @app.route("/bad3")
@@ -40,7 +40,7 @@ def bad3():
     client = MongoClient("localhost", 27017, maxPoolSize=50)
     db = client.get_database(name="localhost")
     collection = db.get_collection("collection")
-    cursor = collection.find_one({"$where": f"this._id == '${event_id}'"})  #$ result=BAD
+    cursor = collection.find_one({"$where": f"this._id == '${event_id}'"})  # $ result=BAD
 
 
 @app.route("/bad4")
diff --git a/python/ql/test/query-tests/Variables/capture/test.py b/python/ql/test/query-tests/Variables/capture/test.py
index 186a19b7570..dc5642d823c 100644
--- a/python/ql/test/query-tests/Variables/capture/test.py
+++ b/python/ql/test/query-tests/Variables/capture/test.py
@@ -2,12 +2,12 @@
 def bad1():
     results = []
     for x in range(10):
-        def inner(): # $capturedVar=x
+        def inner(): # $ capturedVar=x
             return x
         results.append(inner)
     return results
 
-a = [lambda: i for i in range(1, 4)] # $capturedVar=i
+a = [lambda: i for i in range(1, 4)] # $ capturedVar=i
 for f in a:
     print(f())
 
@@ -46,30 +46,30 @@ def ok1():
         result += inner()
     return result
 
-b = [lambda: i for i in range(1, 4) for j in range(1,5)] # $capturedVar=i
-c = [lambda: j for i in range(1, 4) for j in range(1,5)] # $capturedVar=j
+b = [lambda: i for i in range(1, 4) for j in range(1,5)] # $ capturedVar=i
+c = [lambda: j for i in range(1, 4) for j in range(1,5)] # $ capturedVar=j
 
-s = {lambda: i for i in range(1, 4)} # $capturedVar=i
+s = {lambda: i for i in range(1, 4)} # $ capturedVar=i
 for f in s:
     print(f())
 
-d = {i:lambda: i for i in range(1, 4)} # $capturedVar=i
+d = {i:lambda: i for i in range(1, 4)} # $ capturedVar=i
 for k, f in d.items():
     print(k, f())
 
-#Generator expressions are sometimes OK, if they evaluate the iteration 
+#Generator expressions are sometimes OK, if they evaluate the iteration
 #When the captured variable is used.
 #So technically this is a false positive, but it is extremely fragile
 #code, so I (Mark) think it is fine to report it as a violation.
-g = (lambda: i for i in range(1, 4)) # $capturedVar=i
+g = (lambda: i for i in range(1, 4)) # $ capturedVar=i
 for f in g:
     print(f())
 
 #But not if evaluated eagerly
-l = list(lambda: i for i in range(1, 4)) # $capturedVar=i
+l = list(lambda: i for i in range(1, 4)) # $ capturedVar=i
 for f in l:
     print(f())
 
 # This result is MISSING since the lambda is not detected to escape the loop
 def odasa4860(asset_ids):
-    return dict((asset_id, filter(lambda c : c.asset_id == asset_id, xxx)) for asset_id in asset_ids) # $MISSING: capturedVar=asset_id
+    return dict((asset_id, filter(lambda c : c.asset_id == asset_id, xxx)) for asset_id in asset_ids) # $ MISSING: capturedVar=asset_id
diff --git a/ruby/ql/lib/CHANGELOG.md b/ruby/ql/lib/CHANGELOG.md
index 063e5f16211..8014d434977 100644
--- a/ruby/ql/lib/CHANGELOG.md
+++ b/ruby/ql/lib/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 5.1.12
+
+### Minor Analysis Improvements
+
+* Inline expectations test comments, which are of the form `# $ tag` or `# $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the `$` symbol.
+
+## 5.1.11
+
+### Minor Analysis Improvements
+
+* We now track taint flow through `Shellwords.escape` and `Shellwords.shellescape` for all queries except command injection, for which they are sanitizers.
+
 ## 5.1.10
 
 No user-facing changes.
diff --git a/ruby/ql/lib/change-notes/released/5.1.11.md b/ruby/ql/lib/change-notes/released/5.1.11.md
new file mode 100644
index 00000000000..d2e133c1514
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/5.1.11.md
@@ -0,0 +1,5 @@
+## 5.1.11
+
+### Minor Analysis Improvements
+
+* We now track taint flow through `Shellwords.escape` and `Shellwords.shellescape` for all queries except command injection, for which they are sanitizers.
diff --git a/ruby/ql/lib/change-notes/released/5.1.12.md b/ruby/ql/lib/change-notes/released/5.1.12.md
new file mode 100644
index 00000000000..8112f58ab86
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/5.1.12.md
@@ -0,0 +1,5 @@
+## 5.1.12
+
+### Minor Analysis Improvements
+
+* Inline expectations test comments, which are of the form `# $ tag` or `# $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the `$` symbol.
diff --git a/ruby/ql/lib/codeql-pack.release.yml b/ruby/ql/lib/codeql-pack.release.yml
index 9198af0dd6c..537ae582d46 100644
--- a/ruby/ql/lib/codeql-pack.release.yml
+++ b/ruby/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 5.1.10
+lastReleaseVersion: 5.1.12
diff --git a/ruby/ql/lib/codeql/ruby/Concepts.qll b/ruby/ql/lib/codeql/ruby/Concepts.qll
index 2ddcb433e1b..642a2fd0b1b 100644
--- a/ruby/ql/lib/codeql/ruby/Concepts.qll
+++ b/ruby/ql/lib/codeql/ruby/Concepts.qll
@@ -9,6 +9,7 @@ private import codeql.ruby.CFG
 private import codeql.ruby.DataFlow
 private import codeql.ruby.dataflow.internal.DataFlowImplSpecific
 private import codeql.ruby.Frameworks
+private import codeql.ruby.frameworks.data.internal.ApiGraphModels
 private import codeql.ruby.dataflow.RemoteFlowSources
 private import codeql.ruby.ApiGraphs
 private import codeql.ruby.Regexp as RE
@@ -95,6 +96,10 @@ module SqlSanitization {
   abstract class Range extends DataFlow::Node { }
 }
 
+private class ExternalSqlInjectionSanitizer extends SqlSanitization::Range {
+  ExternalSqlInjectionSanitizer() { ModelOutput::barrierNode(this, "sql-injection") }
+}
+
 /**
  * A data-flow node that executes a regular expression.
  *
diff --git a/ruby/ql/lib/codeql/ruby/ast/internal/Literal.qll b/ruby/ql/lib/codeql/ruby/ast/internal/Literal.qll
index 6a2df06b349..c6f906a8752 100644
--- a/ruby/ql/lib/codeql/ruby/ast/internal/Literal.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/internal/Literal.qll
@@ -9,8 +9,12 @@ private import codeql.ruby.ast.internal.Scope
 private import codeql.ruby.controlflow.CfgNodes
 private import codeql.util.Numbers
 
+bindingset[t]
+pragma[inline_late]
+private string getTokenValue(Ruby::Token t) { result = t.getValue() }
+
 int parseInteger(Ruby::Integer i) {
-  exists(string s | s = i.getValue().toLowerCase().replaceAll("_", "") |
+  exists(string s | s = getTokenValue(i).toLowerCase().replaceAll("_", "") |
     s.charAt(0) != "0" and
     result = s.toInt()
     or
@@ -38,7 +42,7 @@ class IntegerLiteralReal extends IntegerLiteralImpl, TIntegerLiteralReal {
 
   final override int getValue() { result = parseInteger(g) }
 
-  final override string toString() { result = g.getValue() }
+  final override string toString() { result = getTokenValue(g) }
 }
 
 class IntegerLiteralSynth extends IntegerLiteralImpl, TIntegerLiteralSynth {
@@ -52,7 +56,7 @@ class IntegerLiteralSynth extends IntegerLiteralImpl, TIntegerLiteralSynth {
 }
 
 // TODO: implement properly
-float parseFloat(Ruby::Float f) { result = f.getValue().toFloat() }
+float parseFloat(Ruby::Float f) { result = getTokenValue(f).toFloat() }
 
 class FloatLiteralImpl extends Expr, TFloatLiteral {
   private Ruby::Float g;
@@ -61,7 +65,7 @@ class FloatLiteralImpl extends Expr, TFloatLiteral {
 
   final float getValue() { result = parseFloat(g) }
 
-  final override string toString() { result = g.getValue() }
+  final override string toString() { result = getTokenValue(g) }
 }
 
 predicate isRationalValue(Ruby::Rational r, int numerator, int denominator) {
@@ -71,8 +75,8 @@ predicate isRationalValue(Ruby::Rational r, int numerator, int denominator) {
   exists(Ruby::Float f, string regex, string before, string after |
     f = r.getChild() and
     regex = "([^.]*)\\.(.*)" and
-    before = f.getValue().regexpCapture(regex, 1) and
-    after = f.getValue().regexpCapture(regex, 2) and
+    before = getTokenValue(f).regexpCapture(regex, 1) and
+    after = getTokenValue(f).regexpCapture(regex, 2) and
     numerator = before.toInt() * denominator + after.toInt() and
     denominator = 10.pow(after.length())
   )
@@ -87,14 +91,14 @@ class RationalLiteralImpl extends Expr, TRationalLiteral {
     isRationalValue(g, numerator, denominator)
   }
 
-  final override string toString() { result = g.getChild().(Ruby::Token).getValue() + "r" }
+  final override string toString() { result = getTokenValue(g.getChild()) + "r" }
 }
 
 float getComplexValue(Ruby::Complex c) {
   exists(int n, int d | isRationalValue(c.getChild(), n, d) and result = n.(float) / d.(float))
   or
   exists(string s |
-    s = c.getChild().(Ruby::Token).getValue() and
+    s = getTokenValue(c.getChild()) and
     result = s.prefix(s.length()).toFloat()
   )
 }
@@ -109,8 +113,8 @@ class ComplexLiteralImpl extends Expr, TComplexLiteral {
   }
 
   final override string toString() {
-    result = g.getChild().(Ruby::Token).getValue() + "i" or
-    result = g.getChild().(Ruby::Rational).getChild().(Ruby::Token).getValue() + "ri"
+    result = getTokenValue(g.getChild()) + "i" or
+    result = getTokenValue(g.getChild().(Ruby::Rational).getChild()) + "ri"
   }
 }
 
@@ -137,7 +141,7 @@ class TrueLiteral extends BooleanLiteralImpl, TTrueLiteral {
 
   TrueLiteral() { this = TTrueLiteral(g) }
 
-  final override string toString() { result = g.getValue() }
+  final override string toString() { result = getTokenValue(g) }
 
   final override boolean getValue() { result = true }
 }
@@ -147,7 +151,7 @@ class FalseLiteral extends BooleanLiteralImpl, TFalseLiteral {
 
   FalseLiteral() { this = TFalseLiteral(g) }
 
-  final override string toString() { result = g.getValue() }
+  final override string toString() { result = getTokenValue(g) }
 
   final override boolean getValue() { result = false }
 }
@@ -290,9 +294,9 @@ class RangeLiteralSynth extends RangeLiteralImpl, TRangeLiteralSynth {
 }
 
 private string getMethodName(MethodName::Token t) {
-  result = t.(Ruby::Token).getValue()
+  result = getTokenValue(t)
   or
-  result = t.(Ruby::Setter).getName().getValue() + "="
+  result = getTokenValue(t.(Ruby::Setter).getName()) + "="
 }
 
 class TokenMethodName extends Expr, TTokenMethodName {
@@ -339,9 +343,9 @@ class StringTextComponentStringOrHeredocContent extends StringTextComponentImpl,
 
   final override string getValue() { result = this.getUnescapedText() }
 
-  final override string getRawTextImpl() { result = g.getValue() }
+  final override string getRawTextImpl() { result = getTokenValue(g) }
 
-  final private string getUnescapedText() { result = unescapeTextComponent(g.getValue()) }
+  final private string getUnescapedText() { result = unescapeTextComponent(getTokenValue(g)) }
 }
 
 private class StringTextComponentSimpleSymbol extends StringTextComponentImpl,
@@ -352,7 +356,7 @@ private class StringTextComponentSimpleSymbol extends StringTextComponentImpl,
   StringTextComponentSimpleSymbol() { this = TStringTextComponentNonRegexpSimpleSymbol(g) }
 
   // Tree-sitter gives us value text including the colon, which we skip.
-  private string getSimpleSymbolValue() { result = g.getValue().suffix(1) }
+  private string getSimpleSymbolValue() { result = getTokenValue(g).suffix(1) }
 
   final override string getValue() { result = this.getSimpleSymbolValue() }
 
@@ -366,9 +370,9 @@ private class StringTextComponentHashKeySymbol extends StringTextComponentImpl,
 
   StringTextComponentHashKeySymbol() { this = TStringTextComponentNonRegexpHashKeySymbol(g) }
 
-  final override string getValue() { result = g.getValue() }
+  final override string getValue() { result = getTokenValue(g) }
 
-  final override string getRawTextImpl() { result = g.getValue() }
+  final override string getRawTextImpl() { result = getTokenValue(g) }
 }
 
 bindingset[escaped]
@@ -438,9 +442,9 @@ class StringEscapeSequenceComponentImpl extends StringComponentImpl,
 
   final override string getValue() { result = this.getUnescapedText() }
 
-  final string getRawTextImpl() { result = g.getValue() }
+  final string getRawTextImpl() { result = getTokenValue(g) }
 
-  final private string getUnescapedText() { result = unescapeEscapeSequence(g.getValue()) }
+  final private string getUnescapedText() { result = unescapeEscapeSequence(getTokenValue(g)) }
 
   final override string toString() { result = this.getRawTextImpl() }
 }
@@ -473,10 +477,10 @@ class RegExpTextComponentImpl extends RegExpComponentImpl, TStringTextComponentR
     // Exclude components that are children of a free-spacing regex.
     // We do this because `ParseRegExp.qll` cannot handle free-spacing regexes.
     not this.getParent().(RegExpLiteral).hasFreeSpacingFlag() and
-    result = g.getValue()
+    result = getTokenValue(g)
   }
 
-  final override string toString() { result = g.getValue() }
+  final override string toString() { result = getTokenValue(g) }
 }
 
 class RegExpEscapeSequenceComponentImpl extends RegExpComponentImpl,
@@ -490,10 +494,10 @@ class RegExpEscapeSequenceComponentImpl extends RegExpComponentImpl,
     // Exclude components that are children of a free-spacing regex.
     // We do this because `ParseRegExp.qll` cannot handle free-spacing regexes.
     not this.getParent().(RegExpLiteral).hasFreeSpacingFlag() and
-    result = g.getValue()
+    result = getTokenValue(g)
   }
 
-  final override string toString() { result = g.getValue() }
+  final override string toString() { result = getTokenValue(g) }
 }
 
 class RegExpInterpolationComponentImpl extends RegExpComponentImpl,
@@ -564,7 +568,7 @@ abstract class StringlikeLiteralImpl extends Expr, TStringlikeLiteral {
         concat(StringComponent c, int i, string s |
           c = this.getComponentImpl(i) and
           (
-            s = toGenerated(c).(Ruby::Token).getValue()
+            s = getTokenValue(toGenerated(c))
             or
             not toGenerated(c) instanceof Ruby::Token and
             s = "#{...}"
@@ -635,7 +639,7 @@ class SimpleSymbolLiteralReal extends SimpleSymbolLiteralImpl, TSimpleSymbolLite
 
   final override StringComponent getComponentImpl(int n) { n = 0 and toGenerated(result) = g }
 
-  final override string toString() { result = g.getValue() }
+  final override string toString() { result = getTokenValue(g) }
 }
 
 class SimpleSymbolLiteralSynth extends SimpleSymbolLiteralImpl, TSimpleSymbolLiteralSynth,
@@ -677,7 +681,7 @@ private class HashKeySymbolLiteral extends SymbolLiteralImpl, THashKeySymbolLite
 
   final override StringComponent getComponentImpl(int n) { n = 0 and toGenerated(result) = g }
 
-  final override string toString() { result = ":" + g.getValue() }
+  final override string toString() { result = ":" + getTokenValue(g) }
 }
 
 class RegExpLiteralImpl extends StringlikeLiteralImpl, TRegExpLiteral {
@@ -701,9 +705,9 @@ class CharacterLiteralImpl extends Expr, TCharacterLiteral {
 
   CharacterLiteralImpl() { this = TCharacterLiteral(g) }
 
-  final string getValue() { result = g.getValue() }
+  final string getValue() { result = getTokenValue(g) }
 
-  final override string toString() { result = g.getValue() }
+  final override string toString() { result = getTokenValue(g) }
 }
 
 class HereDocImpl extends StringlikeLiteralImpl, THereDoc {
@@ -715,5 +719,5 @@ class HereDocImpl extends StringlikeLiteralImpl, THereDoc {
     toGenerated(result) = getHereDocBody(g).getChild(n)
   }
 
-  final override string toString() { result = g.getValue() }
+  final override string toString() { result = getTokenValue(g) }
 }
diff --git a/ruby/ql/lib/codeql/ruby/ast/internal/Module.qll b/ruby/ql/lib/codeql/ruby/ast/internal/Module.qll
index 3670cc5eb98..4d65a743346 100644
--- a/ruby/ql/lib/codeql/ruby/ast/internal/Module.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/internal/Module.qll
@@ -639,7 +639,7 @@ private TMethodOrExpr lookupMethodOrConst(Module m, string name) {
   // For now, we restrict the scope of top-level declarations to their file.
   // This may remove some plausible targets, but also removes a lot of
   // implausible targets
-  if getNode(result).getEnclosingModule() instanceof Toplevel
-  then getNode(result).getFile() = m.getADeclaration().getFile()
-  else any()
+  forall(File file | file = getNode(result).getEnclosingModule().(Toplevel).getFile() |
+    file = m.getADeclaration().getFile()
+  )
 }
diff --git a/ruby/ql/lib/codeql/ruby/ast/internal/Scope.qll b/ruby/ql/lib/codeql/ruby/ast/internal/Scope.qll
index 9ec237012bc..03fe2ce4350 100644
--- a/ruby/ql/lib/codeql/ruby/ast/internal/Scope.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/internal/Scope.qll
@@ -149,11 +149,11 @@ cached
 private module Cached {
   /** Gets the enclosing scope of a node */
   cached
-  Scope::Range scopeOf(Ruby::AstNode n) {
+  Scope::Range scopeOfImpl(Ruby::AstNode n) {
     exists(Ruby::AstNode p | p = parentOf(n) |
       p = result
       or
-      not p instanceof Scope::Range and result = scopeOf(p)
+      not p instanceof Scope::Range and result = scopeOfImpl(p)
     )
   }
 
@@ -163,16 +163,22 @@ private module Cached {
    * and synthesized scopes into account.
    */
   cached
-  Scope scopeOfInclSynth(AstNode n) {
+  Scope scopeOfInclSynthImpl(AstNode n) {
     exists(AstNode p | p = parentOfInclSynth(n) |
       p = result
       or
-      not p instanceof Scope and result = scopeOfInclSynth(p)
+      not p instanceof Scope and result = scopeOfInclSynthImpl(p)
     )
   }
 }
 
-import Cached
+bindingset[n]
+pragma[inline_late]
+Scope::Range scopeOf(Ruby::AstNode n) { result = Cached::scopeOfImpl(n) }
+
+bindingset[n]
+pragma[inline_late]
+Scope scopeOfInclSynth(AstNode n) { result = Cached::scopeOfInclSynthImpl(n) }
 
 abstract class ScopeImpl extends AstNode, TScopeType {
   final Scope getOuterScopeImpl() { result = scopeOfInclSynth(this) }
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowDispatch.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowDispatch.qll
index 70c761e411c..3c647f41bbb 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowDispatch.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowDispatch.qll
@@ -687,26 +687,30 @@ pragma[nomagic]
 private CfgScope getTargetInstance(DataFlowCall call, string method) {
   exists(boolean exact |
     result = lookupInstanceMethodCall(call, method, exact) and
-    (
-      if result.(Method).isPrivate()
-      then
-        call.asCall().getReceiver().getExpr() instanceof SelfVariableAccess and
-        // For now, we restrict the scope of top-level declarations to their file.
-        // This may remove some plausible targets, but also removes a lot of
-        // implausible targets
-        (
-          isToplevelMethodInFile(result, call.asCall().getFile()) or
-          not isToplevelMethodInFile(result, _)
-        )
-      else any()
-    ) and
-    if result.(Method).isProtected()
-    then
-      result = lookupMethod(call.asCall().getExpr().getEnclosingModule().getModule(), method, exact)
-    else any()
+    (if result.(Method).isPrivate() then result = privateFilter(call) else any()) and
+    if result.(Method).isProtected() then result = protectedFilter(call, method, exact) else any()
   )
 }
 
+bindingset[call, result]
+pragma[inline_late]
+private CfgScope privateFilter(DataFlowCall call) {
+  call.asCall().getReceiver().getExpr() instanceof SelfVariableAccess and
+  // For now, we restrict the scope of top-level declarations to their file.
+  // This may remove some plausible targets, but also removes a lot of
+  // implausible targets
+  (
+    isToplevelMethodInFile(result, call.asCall().getFile()) or
+    not isToplevelMethodInFile(result, _)
+  )
+}
+
+bindingset[call, method, exact, result]
+pragma[inline_late]
+private CfgScope protectedFilter(DataFlowCall call, string method, boolean exact) {
+  result = lookupMethod(call.asCall().getExpr().getEnclosingModule().getModule(), method, exact)
+}
+
 private module TrackBlockInput implements CallGraphConstruction::Simple::InputSig {
   class State = Block;
 
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
index 9332aa43e52..e4bcf2537a7 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
@@ -28,7 +28,13 @@ abstract class NodeImpl extends Node {
   DataFlowCallable getEnclosingCallable() { result = TCfgScope(this.getCfgScope()) }
 
   /** Do not call: use `getEnclosingCallable()` instead. */
-  abstract CfgScope getCfgScope();
+  abstract CfgScope getCfgScopeImpl();
+
+  /** Do not call: use `getEnclosingCallable()` instead. */
+  pragma[inline]
+  final CfgScope getCfgScope() {
+    pragma[only_bind_into](result) = pragma[only_bind_out](this).getCfgScopeImpl()
+  }
 
   /** Do not call: use `getLocation()` instead. */
   abstract Location getLocationImpl();
@@ -38,7 +44,7 @@ abstract class NodeImpl extends Node {
 }
 
 private class ExprNodeImpl extends ExprNode, NodeImpl {
-  override CfgScope getCfgScope() { result = this.getExprNode().getExpr().getCfgScope() }
+  override CfgScope getCfgScopeImpl() { result = this.getExprNode().getExpr().getCfgScope() }
 
   override Location getLocationImpl() { result = this.getExprNode().getLocation() }
 
@@ -780,7 +786,7 @@ class SsaNode extends NodeImpl, TSsaNode {
   /** Holds if this node should be hidden from path explanations. */
   predicate isHidden() { any() }
 
-  override CfgScope getCfgScope() { result = node.getBasicBlock().getScope() }
+  override CfgScope getCfgScopeImpl() { result = node.getBasicBlock().getScope() }
 
   override Location getLocationImpl() { result = node.getLocation() }
 
@@ -827,7 +833,7 @@ class CapturedVariableNode extends NodeImpl, TCapturedVariableNode {
   /** Gets the captured variable represented by this node. */
   VariableCapture::CapturedVariable getVariable() { result = variable }
 
-  override CfgScope getCfgScope() { result = variable.getCallable() }
+  override CfgScope getCfgScopeImpl() { result = variable.getCallable() }
 
   override Location getLocationImpl() { result = variable.getLocation() }
 
@@ -849,7 +855,7 @@ class ReturningStatementNode extends NodeImpl, TReturningNode {
   /** Gets the expression corresponding to this node. */
   CfgNodes::ReturningCfgNode getReturningNode() { result = n }
 
-  override CfgScope getCfgScope() { result = n.getScope() }
+  override CfgScope getCfgScopeImpl() { result = n.getScope() }
 
   override Location getLocationImpl() { result = n.getLocation() }
 
@@ -867,7 +873,7 @@ class CaptureNode extends NodeImpl, TCaptureNode {
 
   VariableCapture::Flow::SynthesizedCaptureNode getSynthesizedCaptureNode() { result = cn }
 
-  override CfgScope getCfgScope() { result = cn.getEnclosingCallable() }
+  override CfgScope getCfgScopeImpl() { result = cn.getEnclosingCallable() }
 
   override Location getLocationImpl() { result = cn.getLocation() }
 
@@ -935,7 +941,7 @@ private module ParameterNodes {
       )
     }
 
-    override CfgScope getCfgScope() { result = parameter.getCallable() }
+    override CfgScope getCfgScopeImpl() { result = parameter.getCallable() }
 
     override Location getLocationImpl() { result = parameter.getLocation() }
 
@@ -979,7 +985,7 @@ private module ParameterNodes {
 
     final override SelfVariable getSelfVariable() { result.getDeclaringScope() = method }
 
-    override CfgScope getCfgScope() { result = method }
+    override CfgScope getCfgScopeImpl() { result = method }
 
     override Location getLocationImpl() { result = method.getLocation() }
   }
@@ -1001,7 +1007,7 @@ private module ParameterNodes {
 
     final override SelfVariable getSelfVariable() { result.getDeclaringScope() = t }
 
-    override CfgScope getCfgScope() { result = t }
+    override CfgScope getCfgScopeImpl() { result = t }
 
     override Location getLocationImpl() { result = t.getLocation() }
   }
@@ -1028,7 +1034,7 @@ private module ParameterNodes {
       callable = c.asCfgScope() and pos.isLambdaSelf()
     }
 
-    override CfgScope getCfgScope() { result = callable }
+    override CfgScope getCfgScopeImpl() { result = callable }
 
     override Location getLocationImpl() { result = callable.getLocation() }
 
@@ -1071,7 +1077,7 @@ private module ParameterNodes {
       c.asCfgScope() = method and pos.isBlock()
     }
 
-    override CfgScope getCfgScope() { result = method }
+    override CfgScope getCfgScopeImpl() { result = method }
 
     override Location getLocationImpl() {
       result = this.getParameter().getLocation()
@@ -1130,7 +1136,7 @@ private module ParameterNodes {
       c = callable and pos.isSynthHashSplat()
     }
 
-    final override CfgScope getCfgScope() { result = callable.asCfgScope() }
+    final override CfgScope getCfgScopeImpl() { result = callable.asCfgScope() }
 
     final override DataFlowCallable getEnclosingCallable() { result = callable }
 
@@ -1193,7 +1199,7 @@ private module ParameterNodes {
       )
     }
 
-    final override CfgScope getCfgScope() { result = callable.asCfgScope() }
+    final override CfgScope getCfgScopeImpl() { result = callable.asCfgScope() }
 
     final override DataFlowCallable getEnclosingCallable() { result = callable }
 
@@ -1240,7 +1246,7 @@ private module ParameterNodes {
       cs = getArrayContent(pos)
     }
 
-    final override CfgScope getCfgScope() { result = callable.asCfgScope() }
+    final override CfgScope getCfgScopeImpl() { result = callable.asCfgScope() }
 
     final override DataFlowCallable getEnclosingCallable() { result = callable }
 
@@ -1278,7 +1284,7 @@ class FlowSummaryNode extends NodeImpl, TFlowSummaryNode {
     result = this.getSummaryNode().getSummarizedCallable()
   }
 
-  override CfgScope getCfgScope() { none() }
+  override CfgScope getCfgScopeImpl() { none() }
 
   override DataFlowCallable getEnclosingCallable() {
     result.asLibraryCallable() = this.getSummarizedCallable()
@@ -1349,7 +1355,7 @@ module ArgumentNodes {
       this.sourceArgumentOf(call.asCall(), pos)
     }
 
-    override CfgScope getCfgScope() { result = yield.getScope() }
+    override CfgScope getCfgScopeImpl() { result = yield.getScope() }
 
     override Location getLocationImpl() { result = yield.getLocation() }
   }
@@ -1379,7 +1385,7 @@ module ArgumentNodes {
       this.sourceArgumentOf(call.asCall(), pos)
     }
 
-    override CfgScope getCfgScope() { result = sup.getScope() }
+    override CfgScope getCfgScopeImpl() { result = sup.getScope() }
 
     override Location getLocationImpl() { result = sup.getLocation() }
   }
@@ -1415,7 +1421,7 @@ module ArgumentNodes {
       this.sourceArgumentOf(call.asCall(), pos)
     }
 
-    final override CfgScope getCfgScope() { result = call_.getExpr().getCfgScope() }
+    final override CfgScope getCfgScopeImpl() { result = call_.getExpr().getCfgScope() }
 
     final override Location getLocationImpl() { result = call_.getLocation() }
   }
@@ -1563,7 +1569,7 @@ module ArgumentNodes {
       )
     }
 
-    override CfgScope getCfgScope() { result = c.getExpr().getCfgScope() }
+    override CfgScope getCfgScopeImpl() { result = c.getExpr().getCfgScope() }
 
     override Location getLocationImpl() { result = c.getLocation() }
 
@@ -2037,16 +2043,21 @@ private predicate compatibleTypesNonSymRefl(DataFlowType t1, DataFlowType t2) {
 }
 
 pragma[nomagic]
-private predicate compatibleModuleTypes(TModuleDataFlowType t1, TModuleDataFlowType t2) {
-  exists(Module m1, Module m2, Module m3 |
-    t1 = TModuleDataFlowType(m1) and
-    t2 = TModuleDataFlowType(m2)
-  |
+private predicate compatibleModules(Module m1, Module m2) {
+  exists(Module m3 |
     m3.getAnAncestor() = m1 and
     m3.getAnAncestor() = m2
   )
 }
 
+private predicate compatibleModuleTypes(TModuleDataFlowType t1, TModuleDataFlowType t2) {
+  exists(Module m1, Module m2 |
+    compatibleModules(m1, m2) and
+    t1 = TModuleDataFlowType(m1) and
+    t2 = TModuleDataFlowType(m2)
+  )
+}
+
 /**
  * Holds if `t1` and `t2` are compatible, that is, whether data can flow from
  * a node of type `t1` to a node of type `t2`.
@@ -2074,7 +2085,7 @@ private module PostUpdateNodes {
 
     override ExprNode getPreUpdateNode() { e = result.getExprNode() }
 
-    override CfgScope getCfgScope() { result = e.getExpr().getCfgScope() }
+    override CfgScope getCfgScopeImpl() { result = e.getExpr().getCfgScope() }
 
     override Location getLocationImpl() { result = e.getLocation() }
 
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/ActiveRecord.qll b/ruby/ql/lib/codeql/ruby/frameworks/ActiveRecord.qll
index 42c6286e4ea..6275da6d98c 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/ActiveRecord.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/ActiveRecord.qll
@@ -500,6 +500,7 @@ private module Persistence {
 class ActiveRecordAssociation extends DataFlow::CallNode {
   private ActiveRecordModelClass modelClass;
 
+  pragma[nomagic]
   ActiveRecordAssociation() {
     not exists(this.asExpr().getExpr().getEnclosingMethod()) and
     this.asExpr().getExpr().getEnclosingModule() = modelClass and
@@ -583,6 +584,14 @@ private string pluralize(string input) {
   exists(string stem | stem + "s" = input) and result = input
 }
 
+pragma[nomagic]
+private predicate activeRecordAssociationMethodCall(
+  DataFlow::CallNode call, ActiveRecordAssociation assoc, string model
+) {
+  call.getReceiver().(ActiveRecordInstance).getClass() = assoc.getSourceClass() and
+  model = assoc.getTargetModelName()
+}
+
 /**
  * A call to a method generated by an ActiveRecord association.
  * These yield ActiveRecord collection proxies, which act like collections but
@@ -595,24 +604,21 @@ private class ActiveRecordAssociationMethodCall extends DataFlow::CallNode {
   ActiveRecordAssociation assoc;
 
   ActiveRecordAssociationMethodCall() {
-    exists(string model | model = assoc.getTargetModelName() |
-      this.getReceiver().(ActiveRecordInstance).getClass() = assoc.getSourceClass() and
+    exists(string model | activeRecordAssociationMethodCall(this, assoc, model) |
+      assoc.isCollection() and
       (
-        assoc.isCollection() and
-        (
-          this.getMethodName() = pluralize(model) + ["", "="]
-          or
-          this.getMethodName() = "<<"
-          or
-          this.getMethodName() = model + ["_ids", "_ids="]
-        )
+        this.getMethodName() = pluralize(model) + ["", "="]
         or
-        assoc.isSingular() and
-        (
-          this.getMethodName() = model + ["", "="] or
-          this.getMethodName() = ["build_", "reload_"] + model or
-          this.getMethodName() = "create_" + model + ["!", ""]
-        )
+        this.getMethodName() = "<<"
+        or
+        this.getMethodName() = model + ["_ids", "_ids="]
+      )
+      or
+      assoc.isSingular() and
+      (
+        this.getMethodName() = model + ["", "="] or
+        this.getMethodName() = ["build_", "reload_"] + model or
+        this.getMethodName() = "create_" + model + ["!", ""]
       )
     )
   }
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/Mysql2.model.yml b/ruby/ql/lib/codeql/ruby/frameworks/Mysql2.model.yml
new file mode 100644
index 00000000000..1b6c8c754f5
--- /dev/null
+++ b/ruby/ql/lib/codeql/ruby/frameworks/Mysql2.model.yml
@@ -0,0 +1,11 @@
+extensions:
+  - addsTo:
+      pack: codeql/ruby-all
+      extensible: summaryModel
+    data:
+      - ['Mysql2::Client!', 'Method[escape]', 'Argument[0]', 'ReturnValue', 'taint']
+  - addsTo:
+      pack: codeql/ruby-all
+      extensible: barrierModel
+    data:
+      - ['Mysql2::Client!', 'Method[escape].ReturnValue', 'sql-injection']
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/Mysql2.qll b/ruby/ql/lib/codeql/ruby/frameworks/Mysql2.qll
index baca5bba95f..67cf762f985 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/Mysql2.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/Mysql2.qll
@@ -48,26 +48,4 @@ module Mysql2 {
 
     override DataFlow::Node getSql() { result = query }
   }
-
-  /**
-   * A call to `Mysql2::Client.escape`, considered as a sanitizer for SQL statements.
-   */
-  private class Mysql2EscapeSanitization extends SqlSanitization::Range {
-    Mysql2EscapeSanitization() {
-      this = API::getTopLevelMember("Mysql2").getMember("Client").getAMethodCall("escape")
-    }
-  }
-
-  /**
-   * Flow summary for `Mysql2::Client.escape()`.
-   */
-  private class EscapeSummary extends SummarizedCallable::Range {
-    EscapeSummary() { this = "Mysql2::Client.escape()" }
-
-    override MethodCall getACall() { result = any(Mysql2EscapeSanitization c).asExpr().getExpr() }
-
-    override predicate propagatesFlow(string input, string output, boolean preservesValue) {
-      input = "Argument[0]" and output = "ReturnValue" and preservesValue = false
-    }
-  }
 }
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/Sqlite3.model.yml b/ruby/ql/lib/codeql/ruby/frameworks/Sqlite3.model.yml
new file mode 100644
index 00000000000..13b7b5b4871
--- /dev/null
+++ b/ruby/ql/lib/codeql/ruby/frameworks/Sqlite3.model.yml
@@ -0,0 +1,11 @@
+extensions:
+  - addsTo:
+      pack: codeql/ruby-all
+      extensible: summaryModel
+    data:
+      - ['SQLite3::Database!', 'Method[quote]', 'Argument[0]', 'ReturnValue', 'taint']
+  - addsTo:
+      pack: codeql/ruby-all
+      extensible: barrierModel
+    data:
+      - ['SQLite3::Database!', 'Method[quote].ReturnValue', 'sql-injection']
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/Sqlite3.qll b/ruby/ql/lib/codeql/ruby/frameworks/Sqlite3.qll
index f3e7626f733..1cf167baa72 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/Sqlite3.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/Sqlite3.qll
@@ -76,26 +76,4 @@ module Sqlite3 {
 
     override DataFlow::Node getSql() { result = this.getArgument(0) }
   }
-
-  /**
-   * A call to `SQLite3::Database.quote`, considered as a sanitizer for SQL statements.
-   */
-  private class SQLite3QuoteSanitization extends SqlSanitization {
-    SQLite3QuoteSanitization() {
-      this = API::getTopLevelMember("SQLite3").getMember("Database").getAMethodCall("quote")
-    }
-  }
-
-  /**
-   * Flow summary for `SQLite3::Database.quote()`.
-   */
-  private class QuoteSummary extends SummarizedCallable::Range {
-    QuoteSummary() { this = "SQLite3::Database.quote()" }
-
-    override MethodCall getACall() { result = any(SQLite3QuoteSanitization c).asExpr().getExpr() }
-
-    override predicate propagatesFlow(string input, string output, boolean preservesValue) {
-      input = "Argument[0]" and output = "ReturnValue" and preservesValue = false
-    }
-  }
 }
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/actioncontroller/Filters.qll b/ruby/ql/lib/codeql/ruby/frameworks/actioncontroller/Filters.qll
index 568f99da475..20bde03daad 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/actioncontroller/Filters.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/actioncontroller/Filters.qll
@@ -46,6 +46,10 @@ module Filters {
     )
   }
 
+  bindingset[m, name]
+  pragma[inline_late]
+  private Method lookupMethodInlineLate(Module m, string name) { result = lookupMethod(m, name) }
+
   /**
    * A call to a class method that adds or removes a filter from the callback chain.
    * This class exists to encapsulate common behavior between calls that
@@ -140,7 +144,8 @@ module Filters {
      */
     Callable getAFilterCallable() {
       result =
-        lookupMethod(this.getExpr().getEnclosingModule().getModule(), this.getFilterArgumentName())
+        lookupMethodInlineLate(this.getExpr().getEnclosingModule().getModule(),
+          this.getFilterArgumentName())
     }
   }
 
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/actiondispatch/internal/Routing.qll b/ruby/ql/lib/codeql/ruby/frameworks/actiondispatch/internal/Routing.qll
index 5910317b2c1..e6e453d449f 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/actiondispatch/internal/Routing.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/actiondispatch/internal/Routing.qll
@@ -943,6 +943,7 @@ module Routing {
    * Note: All-uppercase words like `CONSTANT` are not handled correctly.
    */
   bindingset[base]
+  pragma[inline_late]
   string underscore(string base) {
     base = "" and result = ""
     or
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/core/Array.qll b/ruby/ql/lib/codeql/ruby/frameworks/core/Array.qll
index ec21ffc7475..a29f7c2a427 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/core/Array.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/core/Array.qll
@@ -526,7 +526,7 @@ module Array {
     MethodCall mc;
 
     bindingset[this]
-    DeleteSummary() { mc.getMethodName() = "delete" }
+    DeleteSummary() { pragma[only_bind_into](mc).getMethodName() = "delete" }
 
     final override MethodCall getACallSimple() { result = mc }
 
@@ -790,7 +790,7 @@ module Array {
     MethodCall mc;
 
     bindingset[this]
-    FetchSummary() { mc.getMethodName() = "fetch" }
+    FetchSummary() { pragma[only_bind_into](mc).getMethodName() = "fetch" }
 
     override MethodCall getACallSimple() { result = mc }
   }
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/core/Hash.qll b/ruby/ql/lib/codeql/ruby/frameworks/core/Hash.qll
index 36d7bd2cc75..c1a4c4d50d1 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/core/Hash.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/core/Hash.qll
@@ -286,7 +286,7 @@ abstract private class FetchValuesSummary extends SummarizedCallable::Range {
   MethodCall mc;
 
   bindingset[this]
-  FetchValuesSummary() { mc.getMethodName() = "fetch_values" }
+  FetchValuesSummary() { pragma[only_bind_into](mc).getMethodName() = "fetch_values" }
 
   final override MethodCall getACallSimple() { result = mc }
 
@@ -390,7 +390,7 @@ abstract private class SliceSummary extends SummarizedCallable::Range {
   MethodCall mc;
 
   bindingset[this]
-  SliceSummary() { mc.getMethodName() = "slice" }
+  SliceSummary() { pragma[only_bind_into](mc).getMethodName() = "slice" }
 
   final override MethodCall getACallSimple() { result = mc }
 }
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/stdlib/Shellwords.model.yml b/ruby/ql/lib/codeql/ruby/frameworks/stdlib/Shellwords.model.yml
new file mode 100644
index 00000000000..283b1daa8fa
--- /dev/null
+++ b/ruby/ql/lib/codeql/ruby/frameworks/stdlib/Shellwords.model.yml
@@ -0,0 +1,12 @@
+extensions:
+  - addsTo:
+      pack: codeql/ruby-all
+      extensible: summaryModel
+    data:
+      - ['Shellwords!', 'Method[escape,shellescape]', 'Argument[0]', 'ReturnValue', 'taint']
+
+  - addsTo:
+      pack: codeql/ruby-all
+      extensible: barrierModel
+    data:
+      - ['Shellwords!', 'Method[escape,shellescape].ReturnValue', 'command-injection']
diff --git a/ruby/ql/lib/codeql/ruby/security/CodeInjectionCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/CodeInjectionCustomizations.qll
index ca79a079a10..0e84aa710b5 100644
--- a/ruby/ql/lib/codeql/ruby/security/CodeInjectionCustomizations.qll
+++ b/ruby/ql/lib/codeql/ruby/security/CodeInjectionCustomizations.qll
@@ -118,4 +118,8 @@ module CodeInjection {
   private class ExternalCodeInjectionSink extends Sink {
     ExternalCodeInjectionSink() { ModelOutput::sinkNode(this, "code-injection") }
   }
+
+  private class ExternalCodeInjectionSanitizer extends Sanitizer {
+    ExternalCodeInjectionSanitizer() { ModelOutput::barrierNode(this, "code-injection") }
+  }
 }
diff --git a/ruby/ql/lib/codeql/ruby/security/CommandInjectionCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/CommandInjectionCustomizations.qll
index f36b72ae6b7..479907d2052 100644
--- a/ruby/ql/lib/codeql/ruby/security/CommandInjectionCustomizations.qll
+++ b/ruby/ql/lib/codeql/ruby/security/CommandInjectionCustomizations.qll
@@ -43,13 +43,11 @@ module CommandInjection {
   }
 
   /**
-   * A call to `Shellwords.escape` or `Shellwords.shellescape` sanitizes its input.
+   * A call to `String#shellescape` sanitizes its input.
    */
   class ShellwordsEscapeAsSanitizer extends Sanitizer {
     ShellwordsEscapeAsSanitizer() {
-      this = API::getTopLevelMember("Shellwords").getAMethodCall(["escape", "shellescape"])
-      or
-      // The method is also added as `String#shellescape`.
+      // The `Shellwords.shellescape` method is also added as `String#shellescape`.
       this.(DataFlow::CallNode).getMethodName() = "shellescape"
     }
   }
@@ -57,4 +55,8 @@ module CommandInjection {
   private class ExternalCommandInjectionSink extends Sink {
     ExternalCommandInjectionSink() { ModelOutput::sinkNode(this, "command-injection") }
   }
+
+  private class ExternalCommandInjectionSanitizer extends Sanitizer {
+    ExternalCommandInjectionSanitizer() { ModelOutput::barrierNode(this, "command-injection") }
+  }
 }
diff --git a/ruby/ql/lib/codeql/ruby/security/InsecureDownloadCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/InsecureDownloadCustomizations.qll
index 59fb2391c7e..336464623b7 100644
--- a/ruby/ql/lib/codeql/ruby/security/InsecureDownloadCustomizations.qll
+++ b/ruby/ql/lib/codeql/ruby/security/InsecureDownloadCustomizations.qll
@@ -163,7 +163,7 @@ module InsecureDownload {
       //
       // ```rb
       // f = File.open("foo.exe")
-      // f.write(Excon.get(...).body) # $BAD=
+      // f.write(Excon.get(...).body) # $ BAD=
       // ```
       //
       // `f` is the `FileSystemAccess` and the call `f.write` is the `IO::FileWriter`.
diff --git a/ruby/ql/lib/codeql/ruby/security/LogInjectionQuery.qll b/ruby/ql/lib/codeql/ruby/security/LogInjectionQuery.qll
index 8111932c7df..a5230a8b845 100644
--- a/ruby/ql/lib/codeql/ruby/security/LogInjectionQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/LogInjectionQuery.qll
@@ -67,6 +67,10 @@ class HtmlEscapingAsSanitizer extends Sanitizer {
   HtmlEscapingAsSanitizer() { this = any(HtmlEscaping esc).getOutput() }
 }
 
+private class ExternalLogInjectionSanitizer extends Sanitizer {
+  ExternalLogInjectionSanitizer() { ModelOutput::barrierNode(this, "log-injection") }
+}
+
 private module LogInjectionConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/PathInjectionCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/PathInjectionCustomizations.qll
index 8a8b916f627..beab1af5dc4 100644
--- a/ruby/ql/lib/codeql/ruby/security/PathInjectionCustomizations.qll
+++ b/ruby/ql/lib/codeql/ruby/security/PathInjectionCustomizations.qll
@@ -57,4 +57,8 @@ module PathInjection {
   private class ExternalPathInjectionSink extends Sink {
     ExternalPathInjectionSink() { ModelOutput::sinkNode(this, "path-injection") }
   }
+
+  private class ExternalPathInjectionSanitizer extends Sanitizer {
+    ExternalPathInjectionSanitizer() { ModelOutput::barrierNode(this, "path-injection") }
+  }
 }
diff --git a/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryCustomizations.qll
index 509900a12e1..e64abe413b8 100644
--- a/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryCustomizations.qll
+++ b/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryCustomizations.qll
@@ -46,4 +46,8 @@ module ServerSideRequestForgery {
   private class ExternalRequestForgerySink extends Sink {
     ExternalRequestForgerySink() { ModelOutput::sinkNode(this, "request-forgery") }
   }
+
+  private class ExternalRequestForgerySanitizer extends Sanitizer {
+    ExternalRequestForgerySanitizer() { ModelOutput::barrierNode(this, "request-forgery") }
+  }
 }
diff --git a/ruby/ql/lib/codeql/ruby/security/UrlRedirectCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/UrlRedirectCustomizations.qll
index 4e02b3181e3..0cef83070a6 100644
--- a/ruby/ql/lib/codeql/ruby/security/UrlRedirectCustomizations.qll
+++ b/ruby/ql/lib/codeql/ruby/security/UrlRedirectCustomizations.qll
@@ -125,6 +125,10 @@ module UrlRedirect {
    */
   class StringInterpolationAsSanitizer extends PrefixedStringInterpolation, Sanitizer { }
 
+  private class ExternalUrlRedirectSanitizer extends Sanitizer {
+    ExternalUrlRedirectSanitizer() { ModelOutput::barrierNode(this, "url-redirection") }
+  }
+
   /**
    * These methods return a new `ActionController::Parameters` or a `Hash` containing a subset of
    * the original values. This may still contain user input, so the results are tainted.
diff --git a/ruby/ql/lib/qlpack.yml b/ruby/ql/lib/qlpack.yml
index 1d14ca0e3d2..c642ddab974 100644
--- a/ruby/ql/lib/qlpack.yml
+++ b/ruby/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-all
-version: 5.1.11-dev
+version: 5.1.13-dev
 groups: ruby
 extractor: ruby
 dbscheme: ruby.dbscheme
diff --git a/ruby/ql/lib/ruby.dbscheme.stats b/ruby/ql/lib/ruby.dbscheme.stats
index 468bd72c780..9995467e33e 100644
--- a/ruby/ql/lib/ruby.dbscheme.stats
+++ b/ruby/ql/lib/ruby.dbscheme.stats
@@ -1,21832 +1,4 @@
 <dbstats>
-  <typesizes><e>
-            <k>@diagnostic_debug</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@diagnostic_error</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@diagnostic_info</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@diagnostic_warning</k>
-            <v>188</v>
-        </e>
-        <e>
-            <k>@erb_comment_directive</k>
-            <v>26</v>
-        </e>
-        <e>
-            <k>@erb_directive</k>
-            <v>1108</v>
-        </e>
-        <e>
-            <k>@erb_graphql_directive</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@erb_output_directive</k>
-            <v>3270</v>
-        </e>
-        <e>
-            <k>@erb_reserved_word</k>
-            <v>8756</v>
-        </e>
-        <e>
-            <k>@erb_template</k>
-            <v>1508</v>
-        </e>
-        <e>
-            <k>@erb_token_code</k>
-            <v>4378</v>
-        </e>
-        <e>
-            <k>@erb_token_comment</k>
-            <v>26</v>
-        </e>
-        <e>
-            <k>@erb_token_content</k>
-            <v>4555</v>
-        </e>
-        <e>
-            <k>@file</k>
-            <v>18724</v>
-        </e>
-        <e>
-            <k>@folder</k>
-            <v>5165</v>
-        </e>
-        <e>
-            <k>@location_default</k>
-            <v>9223392</v>
-        </e>
-        <e>
-            <k>@ruby_alias</k>
-            <v>1289</v>
-        </e>
-        <e>
-            <k>@ruby_alternative_pattern</k>
-            <v>9</v>
-        </e>
-        <e>
-            <k>@ruby_argument_list</k>
-            <v>706474</v>
-        </e>
-        <e>
-            <k>@ruby_array</k>
-            <v>249320</v>
-        </e>
-        <e>
-            <k>@ruby_array_pattern</k>
-            <v>179</v>
-        </e>
-        <e>
-            <k>@ruby_as_pattern</k>
-            <v>156</v>
-        </e>
-        <e>
-            <k>@ruby_assignment</k>
-            <v>141202</v>
-        </e>
-        <e>
-            <k>@ruby_bare_string</k>
-            <v>13136</v>
-        </e>
-        <e>
-            <k>@ruby_bare_symbol</k>
-            <v>8435</v>
-        </e>
-        <e>
-            <k>@ruby_begin</k>
-            <v>2610</v>
-        </e>
-        <e>
-            <k>@ruby_begin_block</k>
-            <v>10</v>
-        </e>
-        <e>
-            <k>@ruby_binary_ampersand</k>
-            <v>630</v>
-        </e>
-        <e>
-            <k>@ruby_binary_ampersandampersand</k>
-            <v>8142</v>
-        </e>
-        <e>
-            <k>@ruby_binary_and</k>
-            <v>1189</v>
-        </e>
-        <e>
-            <k>@ruby_binary_bangequal</k>
-            <v>1434</v>
-        </e>
-        <e>
-            <k>@ruby_binary_bangtilde</k>
-            <v>176</v>
-        </e>
-        <e>
-            <k>@ruby_binary_caret</k>
-            <v>153</v>
-        </e>
-        <e>
-            <k>@ruby_binary_equalequal</k>
-            <v>33761</v>
-        </e>
-        <e>
-            <k>@ruby_binary_equalequalequal</k>
-            <v>689</v>
-        </e>
-        <e>
-            <k>@ruby_binary_equaltilde</k>
-            <v>1823</v>
-        </e>
-        <e>
-            <k>@ruby_binary_langle</k>
-            <v>1101</v>
-        </e>
-        <e>
-            <k>@ruby_binary_langleequal</k>
-            <v>431</v>
-        </e>
-        <e>
-            <k>@ruby_binary_langleequalrangle</k>
-            <v>764</v>
-        </e>
-        <e>
-            <k>@ruby_binary_langlelangle</k>
-            <v>10779</v>
-        </e>
-        <e>
-            <k>@ruby_binary_minus</k>
-            <v>2747</v>
-        </e>
-        <e>
-            <k>@ruby_binary_or</k>
-            <v>647</v>
-        </e>
-        <e>
-            <k>@ruby_binary_percent</k>
-            <v>986</v>
-        </e>
-        <e>
-            <k>@ruby_binary_pipe</k>
-            <v>1058</v>
-        </e>
-        <e>
-            <k>@ruby_binary_pipepipe</k>
-            <v>7336</v>
-        </e>
-        <e>
-            <k>@ruby_binary_plus</k>
-            <v>6593</v>
-        </e>
-        <e>
-            <k>@ruby_binary_rangle</k>
-            <v>2114</v>
-        </e>
-        <e>
-            <k>@ruby_binary_rangleequal</k>
-            <v>597</v>
-        </e>
-        <e>
-            <k>@ruby_binary_ranglerangle</k>
-            <v>259</v>
-        </e>
-        <e>
-            <k>@ruby_binary_slash</k>
-            <v>1169</v>
-        </e>
-        <e>
-            <k>@ruby_binary_star</k>
-            <v>3490</v>
-        </e>
-        <e>
-            <k>@ruby_binary_starstar</k>
-            <v>1227</v>
-        </e>
-        <e>
-            <k>@ruby_block</k>
-            <v>104143</v>
-        </e>
-        <e>
-            <k>@ruby_block_argument</k>
-            <v>6547</v>
-        </e>
-        <e>
-            <k>@ruby_block_body</k>
-            <v>103820</v>
-        </e>
-        <e>
-            <k>@ruby_block_parameter</k>
-            <v>2543</v>
-        </e>
-        <e>
-            <k>@ruby_block_parameters</k>
-            <v>25884</v>
-        </e>
-        <e>
-            <k>@ruby_body_statement</k>
-            <v>213896</v>
-        </e>
-        <e>
-            <k>@ruby_break</k>
-            <v>3414</v>
-        </e>
-        <e>
-            <k>@ruby_call</k>
-            <v>1027501</v>
-        </e>
-        <e>
-            <k>@ruby_case__</k>
-            <v>1319</v>
-        </e>
-        <e>
-            <k>@ruby_case_match</k>
-            <v>232</v>
-        </e>
-        <e>
-            <k>@ruby_chained_string</k>
-            <v>884</v>
-        </e>
-        <e>
-            <k>@ruby_class</k>
-            <v>17441</v>
-        </e>
-        <e>
-            <k>@ruby_complex</k>
-            <v>72</v>
-        </e>
-        <e>
-            <k>@ruby_conditional</k>
-            <v>2896</v>
-        </e>
-        <e>
-            <k>@ruby_delimited_symbol</k>
-            <v>1247</v>
-        </e>
-        <e>
-            <k>@ruby_destructured_left_assignment</k>
-            <v>108</v>
-        </e>
-        <e>
-            <k>@ruby_destructured_parameter</k>
-            <v>208</v>
-        </e>
-        <e>
-            <k>@ruby_do</k>
-            <v>1675</v>
-        </e>
-        <e>
-            <k>@ruby_do_block</k>
-            <v>145534</v>
-        </e>
-        <e>
-            <k>@ruby_element_reference</k>
-            <v>82606</v>
-        </e>
-        <e>
-            <k>@ruby_else</k>
-            <v>7681</v>
-        </e>
-        <e>
-            <k>@ruby_elsif</k>
-            <v>1583</v>
-        </e>
-        <e>
-            <k>@ruby_end_block</k>
-            <v>13</v>
-        </e>
-        <e>
-            <k>@ruby_ensure</k>
-            <v>4106</v>
-        </e>
-        <e>
-            <k>@ruby_exception_variable</k>
-            <v>935</v>
-        </e>
-        <e>
-            <k>@ruby_exceptions</k>
-            <v>1904</v>
-        </e>
-        <e>
-            <k>@ruby_expression_reference_pattern</k>
-            <v>3</v>
-        </e>
-        <e>
-            <k>@ruby_find_pattern</k>
-            <v>18</v>
-        </e>
-        <e>
-            <k>@ruby_for</k>
-            <v>136</v>
-        </e>
-        <e>
-            <k>@ruby_hash</k>
-            <v>41915</v>
-        </e>
-        <e>
-            <k>@ruby_hash_pattern</k>
-            <v>73</v>
-        </e>
-        <e>
-            <k>@ruby_hash_splat_argument</k>
-            <v>1989</v>
-        </e>
-        <e>
-            <k>@ruby_hash_splat_parameter</k>
-            <v>1574</v>
-        </e>
-        <e>
-            <k>@ruby_heredoc_body</k>
-            <v>6934</v>
-        </e>
-        <e>
-            <k>@ruby_if</k>
-            <v>16164</v>
-        </e>
-        <e>
-            <k>@ruby_if_guard</k>
-            <v>9</v>
-        </e>
-        <e>
-            <k>@ruby_if_modifier</k>
-            <v>14541</v>
-        </e>
-        <e>
-            <k>@ruby_in</k>
-            <v>136</v>
-        </e>
-        <e>
-            <k>@ruby_in_clause</k>
-            <v>381</v>
-        </e>
-        <e>
-            <k>@ruby_interpolation</k>
-            <v>38493</v>
-        </e>
-        <e>
-            <k>@ruby_keyword_parameter</k>
-            <v>4763</v>
-        </e>
-        <e>
-            <k>@ruby_keyword_pattern</k>
-            <v>77</v>
-        </e>
-        <e>
-            <k>@ruby_lambda</k>
-            <v>8187</v>
-        </e>
-        <e>
-            <k>@ruby_lambda_parameters</k>
-            <v>1811</v>
-        </e>
-        <e>
-            <k>@ruby_left_assignment_list</k>
-            <v>3100</v>
-        </e>
-        <e>
-            <k>@ruby_match_pattern</k>
-            <v>31</v>
-        </e>
-        <e>
-            <k>@ruby_method</k>
-            <v>103532</v>
-        </e>
-        <e>
-            <k>@ruby_method_parameters</k>
-            <v>31208</v>
-        </e>
-        <e>
-            <k>@ruby_module</k>
-            <v>22962</v>
-        </e>
-        <e>
-            <k>@ruby_next</k>
-            <v>2020</v>
-        </e>
-        <e>
-            <k>@ruby_operator_assignment_ampersandampersandequal</k>
-            <v>118</v>
-        </e>
-        <e>
-            <k>@ruby_operator_assignment_ampersandequal</k>
-            <v>17</v>
-        </e>
-        <e>
-            <k>@ruby_operator_assignment_caretequal</k>
-            <v>6</v>
-        </e>
-        <e>
-            <k>@ruby_operator_assignment_langlelangleequal</k>
-            <v>19</v>
-        </e>
-        <e>
-            <k>@ruby_operator_assignment_minusequal</k>
-            <v>305</v>
-        </e>
-        <e>
-            <k>@ruby_operator_assignment_percentequal</k>
-            <v>26</v>
-        </e>
-        <e>
-            <k>@ruby_operator_assignment_pipeequal</k>
-            <v>164</v>
-        </e>
-        <e>
-            <k>@ruby_operator_assignment_pipepipeequal</k>
-            <v>4272</v>
-        </e>
-        <e>
-            <k>@ruby_operator_assignment_plusequal</k>
-            <v>1732</v>
-        </e>
-        <e>
-            <k>@ruby_operator_assignment_ranglerangleequal</k>
-            <v>11</v>
-        </e>
-        <e>
-            <k>@ruby_operator_assignment_slashequal</k>
-            <v>13</v>
-        </e>
-        <e>
-            <k>@ruby_operator_assignment_starequal</k>
-            <v>42</v>
-        </e>
-        <e>
-            <k>@ruby_operator_assignment_starstarequal</k>
-            <v>6</v>
-        </e>
-        <e>
-            <k>@ruby_optional_parameter</k>
-            <v>6556</v>
-        </e>
-        <e>
-            <k>@ruby_pair</k>
-            <v>254198</v>
-        </e>
-        <e>
-            <k>@ruby_parenthesized_pattern</k>
-            <v>8</v>
-        </e>
-        <e>
-            <k>@ruby_parenthesized_statements</k>
-            <v>11296</v>
-        </e>
-        <e>
-            <k>@ruby_pattern</k>
-            <v>4745</v>
-        </e>
-        <e>
-            <k>@ruby_program</k>
-            <v>18697</v>
-        </e>
-        <e>
-            <k>@ruby_range_dotdot</k>
-            <v>3690</v>
-        </e>
-        <e>
-            <k>@ruby_range_dotdotdot</k>
-            <v>1376</v>
-        </e>
-        <e>
-            <k>@ruby_rational</k>
-            <v>166</v>
-        </e>
-        <e>
-            <k>@ruby_redo</k>
-            <v>34</v>
-        </e>
-        <e>
-            <k>@ruby_regex</k>
-            <v>13680</v>
-        </e>
-        <e>
-            <k>@ruby_rescue</k>
-            <v>2299</v>
-        </e>
-        <e>
-            <k>@ruby_rescue_modifier</k>
-            <v>458</v>
-        </e>
-        <e>
-            <k>@ruby_reserved_word</k>
-            <v>3894800</v>
-        </e>
-        <e>
-            <k>@ruby_rest_assignment</k>
-            <v>414</v>
-        </e>
-        <e>
-            <k>@ruby_retry</k>
-            <v>58</v>
-        </e>
-        <e>
-            <k>@ruby_return</k>
-            <v>7979</v>
-        </e>
-        <e>
-            <k>@ruby_right_assignment_list</k>
-            <v>1280</v>
-        </e>
-        <e>
-            <k>@ruby_scope_resolution</k>
-            <v>87113</v>
-        </e>
-        <e>
-            <k>@ruby_setter</k>
-            <v>656</v>
-        </e>
-        <e>
-            <k>@ruby_singleton_class</k>
-            <v>677</v>
-        </e>
-        <e>
-            <k>@ruby_singleton_method</k>
-            <v>6325</v>
-        </e>
-        <e>
-            <k>@ruby_splat_argument</k>
-            <v>3606</v>
-        </e>
-        <e>
-            <k>@ruby_splat_parameter</k>
-            <v>3014</v>
-        </e>
-        <e>
-            <k>@ruby_string__</k>
-            <v>490602</v>
-        </e>
-        <e>
-            <k>@ruby_string_array</k>
-            <v>4287</v>
-        </e>
-        <e>
-            <k>@ruby_subshell</k>
-            <v>359</v>
-        </e>
-        <e>
-            <k>@ruby_superclass</k>
-            <v>13806</v>
-        </e>
-        <e>
-            <k>@ruby_symbol_array</k>
-            <v>2240</v>
-        </e>
-        <e>
-            <k>@ruby_test_pattern</k>
-            <v>5</v>
-        </e>
-        <e>
-            <k>@ruby_then</k>
-            <v>22229</v>
-        </e>
-        <e>
-            <k>@ruby_token_character</k>
-            <v>440</v>
-        </e>
-        <e>
-            <k>@ruby_token_class_variable</k>
-            <v>887</v>
-        </e>
-        <e>
-            <k>@ruby_token_comment</k>
-            <v>194426</v>
-        </e>
-        <e>
-            <k>@ruby_token_constant</k>
-            <v>302373</v>
-        </e>
-        <e>
-            <k>@ruby_token_empty_statement</k>
-            <v>58</v>
-        </e>
-        <e>
-            <k>@ruby_token_encoding</k>
-            <v>1</v>
-        </e>
-        <e>
-            <k>@ruby_token_escape_sequence</k>
-            <v>80835</v>
-        </e>
-        <e>
-            <k>@ruby_token_false</k>
-            <v>17355</v>
-        </e>
-        <e>
-            <k>@ruby_token_file</k>
-            <v>1</v>
-        </e>
-        <e>
-            <k>@ruby_token_float</k>
-            <v>8689</v>
-        </e>
-        <e>
-            <k>@ruby_token_forward_argument</k>
-            <v>194</v>
-        </e>
-        <e>
-            <k>@ruby_token_forward_parameter</k>
-            <v>287</v>
-        </e>
-        <e>
-            <k>@ruby_token_global_variable</k>
-            <v>7165</v>
-        </e>
-        <e>
-            <k>@ruby_token_hash_key_symbol</k>
-            <v>246826</v>
-        </e>
-        <e>
-            <k>@ruby_token_hash_splat_nil</k>
-            <v>14</v>
-        </e>
-        <e>
-            <k>@ruby_token_heredoc_beginning</k>
-            <v>6933</v>
-        </e>
-        <e>
-            <k>@ruby_token_heredoc_content</k>
-            <v>12986</v>
-        </e>
-        <e>
-            <k>@ruby_token_heredoc_end</k>
-            <v>6934</v>
-        </e>
-        <e>
-            <k>@ruby_token_identifier</k>
-            <v>1590836</v>
-        </e>
-        <e>
-            <k>@ruby_token_instance_variable</k>
-            <v>89852</v>
-        </e>
-        <e>
-            <k>@ruby_token_integer</k>
-            <v>310358</v>
-        </e>
-        <e>
-            <k>@ruby_token_line</k>
-            <v>1</v>
-        </e>
-        <e>
-            <k>@ruby_token_nil</k>
-            <v>19333</v>
-        </e>
-        <e>
-            <k>@ruby_token_operator</k>
-            <v>878</v>
-        </e>
-        <e>
-            <k>@ruby_token_self</k>
-            <v>14094</v>
-        </e>
-        <e>
-            <k>@ruby_token_simple_symbol</k>
-            <v>267609</v>
-        </e>
-        <e>
-            <k>@ruby_token_string_content</k>
-            <v>510164</v>
-        </e>
-        <e>
-            <k>@ruby_token_super</k>
-            <v>5329</v>
-        </e>
-        <e>
-            <k>@ruby_token_true</k>
-            <v>25065</v>
-        </e>
-        <e>
-            <k>@ruby_token_uninterpreted</k>
-            <v>11</v>
-        </e>
-        <e>
-            <k>@ruby_unary_bang</k>
-            <v>5909</v>
-        </e>
-        <e>
-            <k>@ruby_unary_definedquestion</k>
-            <v>1369</v>
-        </e>
-        <e>
-            <k>@ruby_unary_minus</k>
-            <v>9830</v>
-        </e>
-        <e>
-            <k>@ruby_unary_not</k>
-            <v>172</v>
-        </e>
-        <e>
-            <k>@ruby_unary_plus</k>
-            <v>1394</v>
-        </e>
-        <e>
-            <k>@ruby_unary_tilde</k>
-            <v>97</v>
-        </e>
-        <e>
-            <k>@ruby_undef</k>
-            <v>182</v>
-        </e>
-        <e>
-            <k>@ruby_unless</k>
-            <v>2723</v>
-        </e>
-        <e>
-            <k>@ruby_unless_guard</k>
-            <v>4</v>
-        </e>
-        <e>
-            <k>@ruby_unless_modifier</k>
-            <v>3416</v>
-        </e>
-        <e>
-            <k>@ruby_until</k>
-            <v>126</v>
-        </e>
-        <e>
-            <k>@ruby_until_modifier</k>
-            <v>238</v>
-        </e>
-        <e>
-            <k>@ruby_variable_reference_pattern</k>
-            <v>5</v>
-        </e>
-        <e>
-            <k>@ruby_when</k>
-            <v>3882</v>
-        </e>
-        <e>
-            <k>@ruby_while</k>
-            <v>1413</v>
-        </e>
-        <e>
-            <k>@ruby_while_modifier</k>
-            <v>198</v>
-        </e>
-        <e>
-            <k>@ruby_yield</k>
-            <v>2450</v>
-        </e>
-        <e>
-            <k>@yaml_alias_node</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@yaml_error</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@yaml_mapping_node</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@yaml_scalar_node</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@yaml_sequence_node</k>
-            <v>0</v>
-        </e>
-        </typesizes>
-  <stats><relation>
-            <name>containerparent</name>
-            <cardinality>23863</cardinality>
-            <columnsizes>
-                <e>
-                    <k>parent</k>
-                    <v>5165</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>23863</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>parent</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2394</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>968</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>295</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>443</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>14</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>126</b>
-                                    <v>242</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>23863</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>diagnostics</name>
-            <cardinality>188</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>188</v>
-                </e>
-                <e>
-                    <k>severity</k>
-                    <v>13</v>
-                </e>
-                <e>
-                    <k>error_tag</k>
-                    <v>13</v>
-                </e>
-                <e>
-                    <k>error_message</k>
-                    <v>53</v>
-                </e>
-                <e>
-                    <k>full_error_message</k>
-                    <v>161</v>
-                </e>
-                <e>
-                    <k>location</k>
-                    <v>174</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>severity</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>188</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>error_tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>188</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>188</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>full_error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>188</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>188</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>severity</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>severity</src>
-                    <trg>error_tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>severity</src>
-                    <trg>error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>severity</src>
-                    <trg>full_error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>severity</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>severity</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>full_error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_tag</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>severity</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>53</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>error_tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>53</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>full_error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>error_message</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>full_error_message</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>134</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>26</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>full_error_message</src>
-                    <trg>severity</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>161</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>full_error_message</src>
-                    <trg>error_tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>161</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>full_error_message</src>
-                    <trg>error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>161</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>full_error_message</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>134</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>26</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>161</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>location</src>
-                    <trg>severity</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>174</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>location</src>
-                    <trg>error_tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>174</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>location</src>
-                    <trg>error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>161</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>location</src>
-                    <trg>full_error_message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>161</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>erb_ast_node_location</name>
-            <cardinality>22409</cardinality>
-            <columnsizes>
-                <e>
-                    <k>node</k>
-                    <v>22409</v>
-                </e>
-                <e>
-                    <k>loc</k>
-                    <v>22407</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>node</src>
-                    <trg>loc</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>22409</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>loc</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>22404</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>erb_ast_node_parent</name>
-            <cardinality>22069</cardinality>
-            <columnsizes>
-                <e>
-                    <k>node</k>
-                    <v>22069</v>
-                </e>
-                <e>
-                    <k>parent</k>
-                    <v>4718</v>
-                </e>
-                <e>
-                    <k>parent_index</k>
-                    <v>564</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>node</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>22069</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>node</src>
-                    <trg>parent_index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>22069</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>3</b>
-                                    <v>9</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>4494</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>240</b>
-                                    <v>215</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>parent_index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>3</b>
-                                    <v>9</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>4494</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>240</b>
-                                    <v>215</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent_index</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>33</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>33</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>122</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>96</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>13</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>20</b>
-                                    <v>44</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>31</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>35</a>
-                                    <b>55</b>
-                                    <v>44</v>
-                                </b>
-                                <b>
-                                    <a>55</a>
-                                    <b>1998</b>
-                                    <v>37</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent_index</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>33</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>33</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>122</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>96</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>13</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>20</b>
-                                    <v>44</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>31</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>35</a>
-                                    <b>55</b>
-                                    <v>44</v>
-                                </b>
-                                <b>
-                                    <a>55</a>
-                                    <b>1998</b>
-                                    <v>37</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-    <relation>
-            <name>erb_comment_directive_child</name>
-            <cardinality>26</cardinality>
-            <columnsizes>
-                <e>
-                    <k>erb_comment_directive</k>
-                    <v>26</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>26</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>erb_comment_directive</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>26</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>erb_comment_directive</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>26</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>erb_comment_directive_def</name>
-            <cardinality>26</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>26</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>erb_directive_child</name>
-            <cardinality>1108</cardinality>
-            <columnsizes>
-                <e>
-                    <k>erb_directive</k>
-                    <v>1108</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>1108</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>erb_directive</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1108</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>erb_directive</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1108</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>erb_directive_def</name>
-            <cardinality>1108</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1108</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>erb_graphql_directive_child</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>erb_graphql_directive</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>erb_graphql_directive</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>erb_graphql_directive</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>erb_graphql_directive_def</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>erb_output_directive_child</name>
-            <cardinality>3270</cardinality>
-            <columnsizes>
-                <e>
-                    <k>erb_output_directive</k>
-                    <v>3270</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>3270</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>erb_output_directive</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3270</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>erb_output_directive</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3270</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>erb_output_directive_def</name>
-            <cardinality>3270</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>3270</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>erb_template_child</name>
-            <cardinality>8934</cardinality>
-            <columnsizes>
-                <e>
-                    <k>erb_template</k>
-                    <v>340</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>564</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>8934</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>erb_template</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>3</b>
-                                    <v>9</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>115</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>10</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>14</b>
-                                    <v>28</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>24</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>33</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>44</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>45</a>
-                                    <b>64</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>67</a>
-                                    <b>149</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>200</a>
-                                    <b>240</b>
-                                    <v>9</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>erb_template</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>3</b>
-                                    <v>9</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>115</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>21</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>10</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>14</b>
-                                    <v>28</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>24</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>33</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>44</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>45</a>
-                                    <b>64</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>67</a>
-                                    <b>149</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>200</a>
-                                    <b>240</b>
-                                    <v>9</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>erb_template</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>33</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>33</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>122</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>96</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>13</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>20</b>
-                                    <v>44</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>31</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>35</a>
-                                    <b>55</b>
-                                    <v>44</v>
-                                </b>
-                                <b>
-                                    <a>55</a>
-                                    <b>145</b>
-                                    <v>37</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>33</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>33</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>122</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>96</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>13</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>20</b>
-                                    <v>44</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>31</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>35</a>
-                                    <b>55</b>
-                                    <v>44</v>
-                                </b>
-                                <b>
-                                    <a>55</a>
-                                    <b>145</b>
-                                    <v>37</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>erb_template</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8934</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8934</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>erb_template_def</name>
-            <cardinality>1508</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1508</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>erb_tokeninfo</name>
-            <cardinality>17690</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>17690</v>
-                </e>
-                <e>
-                    <k>kind</k>
-                    <v>7</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>4822</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>17690</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>17690</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1853</a>
-                                    <b>1854</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1928</a>
-                                    <b>1929</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>3706</a>
-                                    <b>3707</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>984</a>
-                                    <b>985</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1052</a>
-                                    <b>1053</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3879</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>600</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>1786</b>
-                                    <v>342</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4822</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>files</name>
-            <cardinality>18724</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>18724</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>18724</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>18724</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>18724</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>folders</name>
-            <cardinality>5165</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>5165</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>5165</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5165</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5165</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>locations_default</name>
-            <cardinality>9223392</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>9223392</v>
-                </e>
-                <e>
-                    <k>file</k>
-                    <v>18724</v>
-                </e>
-                <e>
-                    <k>beginLine</k>
-                    <v>31826</v>
-                </e>
-                <e>
-                    <k>beginColumn</k>
-                    <v>5300</v>
-                </e>
-                <e>
-                    <k>endLine</k>
-                    <v>31826</v>
-                </e>
-                <e>
-                    <k>endColumn</k>
-                    <v>5407</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>file</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9223392</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>beginLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9223392</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>beginColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9223392</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>endLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9223392</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>endColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9223392</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>32</b>
-                                    <v>1479</v>
-                                </b>
-                                <b>
-                                    <a>32</a>
-                                    <b>47</b>
-                                    <v>1412</v>
-                                </b>
-                                <b>
-                                    <a>47</a>
-                                    <b>71</b>
-                                    <v>1452</v>
-                                </b>
-                                <b>
-                                    <a>71</a>
-                                    <b>94</b>
-                                    <v>1439</v>
-                                </b>
-                                <b>
-                                    <a>94</a>
-                                    <b>119</b>
-                                    <v>1412</v>
-                                </b>
-                                <b>
-                                    <a>119</a>
-                                    <b>161</b>
-                                    <v>1412</v>
-                                </b>
-                                <b>
-                                    <a>161</a>
-                                    <b>209</b>
-                                    <v>1466</v>
-                                </b>
-                                <b>
-                                    <a>209</a>
-                                    <b>260</b>
-                                    <v>1439</v>
-                                </b>
-                                <b>
-                                    <a>260</a>
-                                    <b>333</b>
-                                    <v>1412</v>
-                                </b>
-                                <b>
-                                    <a>336</a>
-                                    <b>445</b>
-                                    <v>1425</v>
-                                </b>
-                                <b>
-                                    <a>445</a>
-                                    <b>679</b>
-                                    <v>1412</v>
-                                </b>
-                                <b>
-                                    <a>684</a>
-                                    <b>1221</b>
-                                    <v>1412</v>
-                                </b>
-                                <b>
-                                    <a>1228</a>
-                                    <b>5812</b>
-                                    <v>1412</v>
-                                </b>
-                                <b>
-                                    <a>7145</a>
-                                    <b>22841</b>
-                                    <v>134</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>beginLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>7</b>
-                                    <v>1398</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>10</b>
-                                    <v>1641</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>13</b>
-                                    <v>1479</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>16</b>
-                                    <v>1668</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>20</b>
-                                    <v>1600</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>25</b>
-                                    <v>1587</v>
-                                </b>
-                                <b>
-                                    <a>25</a>
-                                    <b>31</b>
-                                    <v>1573</v>
-                                </b>
-                                <b>
-                                    <a>31</a>
-                                    <b>38</b>
-                                    <v>1506</v>
-                                </b>
-                                <b>
-                                    <a>38</a>
-                                    <b>49</b>
-                                    <v>1506</v>
-                                </b>
-                                <b>
-                                    <a>49</a>
-                                    <b>69</b>
-                                    <v>1425</v>
-                                </b>
-                                <b>
-                                    <a>69</a>
-                                    <b>117</b>
-                                    <v>1425</v>
-                                </b>
-                                <b>
-                                    <a>119</a>
-                                    <b>275</b>
-                                    <v>1412</v>
-                                </b>
-                                <b>
-                                    <a>276</a>
-                                    <b>2339</b>
-                                    <v>497</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>beginColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>16</b>
-                                    <v>1533</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>24</b>
-                                    <v>1493</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>31</b>
-                                    <v>1412</v>
-                                </b>
-                                <b>
-                                    <a>31</a>
-                                    <b>40</b>
-                                    <v>1573</v>
-                                </b>
-                                <b>
-                                    <a>40</a>
-                                    <b>46</b>
-                                    <v>1452</v>
-                                </b>
-                                <b>
-                                    <a>46</a>
-                                    <b>52</b>
-                                    <v>1533</v>
-                                </b>
-                                <b>
-                                    <a>52</a>
-                                    <b>60</b>
-                                    <v>1587</v>
-                                </b>
-                                <b>
-                                    <a>60</a>
-                                    <b>68</b>
-                                    <v>1721</v>
-                                </b>
-                                <b>
-                                    <a>68</a>
-                                    <b>76</b>
-                                    <v>1533</v>
-                                </b>
-                                <b>
-                                    <a>76</a>
-                                    <b>85</b>
-                                    <v>1452</v>
-                                </b>
-                                <b>
-                                    <a>85</a>
-                                    <b>98</b>
-                                    <v>1412</v>
-                                </b>
-                                <b>
-                                    <a>98</a>
-                                    <b>122</b>
-                                    <v>1412</v>
-                                </b>
-                                <b>
-                                    <a>122</a>
-                                    <b>357</b>
-                                    <v>605</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>endLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>7</b>
-                                    <v>1398</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>10</b>
-                                    <v>1600</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>13</b>
-                                    <v>1506</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>16</b>
-                                    <v>1641</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>20</b>
-                                    <v>1614</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>25</b>
-                                    <v>1600</v>
-                                </b>
-                                <b>
-                                    <a>25</a>
-                                    <b>31</b>
-                                    <v>1587</v>
-                                </b>
-                                <b>
-                                    <a>31</a>
-                                    <b>38</b>
-                                    <v>1506</v>
-                                </b>
-                                <b>
-                                    <a>38</a>
-                                    <b>49</b>
-                                    <v>1506</v>
-                                </b>
-                                <b>
-                                    <a>49</a>
-                                    <b>69</b>
-                                    <v>1425</v>
-                                </b>
-                                <b>
-                                    <a>69</a>
-                                    <b>117</b>
-                                    <v>1425</v>
-                                </b>
-                                <b>
-                                    <a>119</a>
-                                    <b>275</b>
-                                    <v>1412</v>
-                                </b>
-                                <b>
-                                    <a>276</a>
-                                    <b>2339</b>
-                                    <v>497</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>endColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>19</b>
-                                    <v>1412</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>27</b>
-                                    <v>1587</v>
-                                </b>
-                                <b>
-                                    <a>27</a>
-                                    <b>35</b>
-                                    <v>1425</v>
-                                </b>
-                                <b>
-                                    <a>35</a>
-                                    <b>44</b>
-                                    <v>1452</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>50</b>
-                                    <v>1600</v>
-                                </b>
-                                <b>
-                                    <a>50</a>
-                                    <b>57</b>
-                                    <v>1533</v>
-                                </b>
-                                <b>
-                                    <a>57</a>
-                                    <b>64</b>
-                                    <v>1439</v>
-                                </b>
-                                <b>
-                                    <a>64</a>
-                                    <b>71</b>
-                                    <v>1412</v>
-                                </b>
-                                <b>
-                                    <a>71</a>
-                                    <b>78</b>
-                                    <v>1533</v>
-                                </b>
-                                <b>
-                                    <a>78</a>
-                                    <b>87</b>
-                                    <v>1520</v>
-                                </b>
-                                <b>
-                                    <a>87</a>
-                                    <b>99</b>
-                                    <v>1493</v>
-                                </b>
-                                <b>
-                                    <a>99</a>
-                                    <b>118</b>
-                                    <v>1425</v>
-                                </b>
-                                <b>
-                                    <a>118</a>
-                                    <b>367</b>
-                                    <v>887</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginLine</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1600</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>5</b>
-                                    <v>1627</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>3484</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>10</b>
-                                    <v>2676</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>17</b>
-                                    <v>2878</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>24</b>
-                                    <v>2421</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>43</b>
-                                    <v>2448</v>
-                                </b>
-                                <b>
-                                    <a>43</a>
-                                    <b>78</b>
-                                    <v>2394</v>
-                                </b>
-                                <b>
-                                    <a>78</a>
-                                    <b>117</b>
-                                    <v>2394</v>
-                                </b>
-                                <b>
-                                    <a>117</a>
-                                    <b>168</b>
-                                    <v>2407</v>
-                                </b>
-                                <b>
-                                    <a>169</a>
-                                    <b>262</b>
-                                    <v>2421</v>
-                                </b>
-                                <b>
-                                    <a>262</a>
-                                    <b>703</b>
-                                    <v>2394</v>
-                                </b>
-                                <b>
-                                    <a>708</a>
-                                    <b>5999</b>
-                                    <v>2394</v>
-                                </b>
-                                <b>
-                                    <a>6159</a>
-                                    <b>10971</b>
-                                    <v>282</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginLine</src>
-                    <trg>file</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>10304</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>5609</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>7</b>
-                                    <v>2838</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>10</b>
-                                    <v>2663</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>15</b>
-                                    <v>2407</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>23</b>
-                                    <v>2394</v>
-                                </b>
-                                <b>
-                                    <a>23</a>
-                                    <b>58</b>
-                                    <v>2407</v>
-                                </b>
-                                <b>
-                                    <a>58</a>
-                                    <b>287</b>
-                                    <v>2394</v>
-                                </b>
-                                <b>
-                                    <a>296</a>
-                                    <b>1392</b>
-                                    <v>807</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginLine</src>
-                    <trg>beginColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1600</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1520</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2394</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>2650</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>1775</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>13</b>
-                                    <v>2811</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>18</b>
-                                    <v>2448</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>29</b>
-                                    <v>2582</v>
-                                </b>
-                                <b>
-                                    <a>29</a>
-                                    <b>44</b>
-                                    <v>2475</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>56</b>
-                                    <v>2582</v>
-                                </b>
-                                <b>
-                                    <a>56</a>
-                                    <b>69</b>
-                                    <v>2475</v>
-                                </b>
-                                <b>
-                                    <a>69</a>
-                                    <b>86</b>
-                                    <v>2461</v>
-                                </b>
-                                <b>
-                                    <a>86</a>
-                                    <b>113</b>
-                                    <v>2407</v>
-                                </b>
-                                <b>
-                                    <a>113</a>
-                                    <b>205</b>
-                                    <v>1641</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginLine</src>
-                    <trg>endLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11299</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>6591</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2380</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1815</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>2623</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>10</b>
-                                    <v>2367</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>17</b>
-                                    <v>2461</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>240</b>
-                                    <v>2286</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginLine</src>
-                    <trg>endColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1600</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>4</b>
-                                    <v>1627</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>3537</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>2152</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>11</b>
-                                    <v>2744</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>15</b>
-                                    <v>2461</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>24</b>
-                                    <v>2394</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>39</b>
-                                    <v>2421</v>
-                                </b>
-                                <b>
-                                    <a>39</a>
-                                    <b>52</b>
-                                    <v>2448</v>
-                                </b>
-                                <b>
-                                    <a>52</a>
-                                    <b>65</b>
-                                    <v>2542</v>
-                                </b>
-                                <b>
-                                    <a>65</a>
-                                    <b>80</b>
-                                    <v>2555</v>
-                                </b>
-                                <b>
-                                    <a>80</a>
-                                    <b>102</b>
-                                    <v>2434</v>
-                                </b>
-                                <b>
-                                    <a>102</a>
-                                    <b>136</b>
-                                    <v>2421</v>
-                                </b>
-                                <b>
-                                    <a>136</a>
-                                    <b>209</b>
-                                    <v>484</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginColumn</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>484</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>605</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>255</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>269</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>336</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>457</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>16</b>
-                                    <v>430</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>43</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>46</a>
-                                    <b>182</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>184</a>
-                                    <b>794</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>811</a>
-                                    <b>3014</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>3015</a>
-                                    <b>8230</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>8347</a>
-                                    <b>25670</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>28494</a>
-                                    <b>38951</b>
-                                    <v>40</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginColumn</src>
-                    <trg>file</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1466</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>605</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>484</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>9</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>37</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>37</a>
-                                    <b>118</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>124</a>
-                                    <b>381</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>381</a>
-                                    <b>728</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>754</a>
-                                    <b>985</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>996</a>
-                                    <b>1392</b>
-                                    <v>309</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginColumn</src>
-                    <trg>beginLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>551</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>712</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>322</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>363</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>363</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>13</b>
-                                    <v>457</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>35</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>35</a>
-                                    <b>103</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>109</a>
-                                    <b>281</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>286</a>
-                                    <b>583</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>591</a>
-                                    <b>927</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>935</a>
-                                    <b>1163</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>1198</a>
-                                    <b>1405</b>
-                                    <v>107</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginColumn</src>
-                    <trg>endLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>551</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>712</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>322</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>363</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>363</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>13</b>
-                                    <v>457</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>35</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>35</a>
-                                    <b>105</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>108</a>
-                                    <b>282</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>287</a>
-                                    <b>596</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>596</a>
-                                    <b>945</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>956</a>
-                                    <b>1202</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>1223</a>
-                                    <b>1412</b>
-                                    <v>107</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>beginColumn</src>
-                    <trg>endColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1318</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>712</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>524</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>443</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>15</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>37</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>37</a>
-                                    <b>66</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>66</a>
-                                    <b>98</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>100</a>
-                                    <b>127</b>
-                                    <v>403</v>
-                                </b>
-                                <b>
-                                    <a>128</a>
-                                    <b>180</b>
-                                    <v>282</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endLine</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>3</b>
-                                    <v>322</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>3510</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>2528</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>2394</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>13</b>
-                                    <v>2488</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>20</b>
-                                    <v>2407</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>33</b>
-                                    <v>2461</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>64</b>
-                                    <v>2421</v>
-                                </b>
-                                <b>
-                                    <a>64</a>
-                                    <b>103</b>
-                                    <v>2421</v>
-                                </b>
-                                <b>
-                                    <a>103</a>
-                                    <b>143</b>
-                                    <v>2448</v>
-                                </b>
-                                <b>
-                                    <a>143</a>
-                                    <b>220</b>
-                                    <v>2394</v>
-                                </b>
-                                <b>
-                                    <a>220</a>
-                                    <b>446</b>
-                                    <v>2394</v>
-                                </b>
-                                <b>
-                                    <a>446</a>
-                                    <b>1691</b>
-                                    <v>2394</v>
-                                </b>
-                                <b>
-                                    <a>1717</a>
-                                    <b>10278</b>
-                                    <v>1237</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endLine</src>
-                    <trg>file</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>10304</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>5609</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>7</b>
-                                    <v>2838</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>10</b>
-                                    <v>2663</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>15</b>
-                                    <v>2407</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>23</b>
-                                    <v>2394</v>
-                                </b>
-                                <b>
-                                    <a>23</a>
-                                    <b>58</b>
-                                    <v>2407</v>
-                                </b>
-                                <b>
-                                    <a>58</a>
-                                    <b>287</b>
-                                    <v>2394</v>
-                                </b>
-                                <b>
-                                    <a>296</a>
-                                    <b>1376</b>
-                                    <v>807</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endLine</src>
-                    <trg>beginLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11420</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>5959</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2636</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1654</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>2650</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>10</b>
-                                    <v>2407</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>17</b>
-                                    <v>2394</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>34</b>
-                                    <v>2434</v>
-                                </b>
-                                <b>
-                                    <a>34</a>
-                                    <b>43</b>
-                                    <v>269</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endLine</src>
-                    <trg>beginColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>3</b>
-                                    <v>1614</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>3497</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>2824</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>1694</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>12</b>
-                                    <v>2502</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>17</b>
-                                    <v>2771</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>28</b>
-                                    <v>2421</v>
-                                </b>
-                                <b>
-                                    <a>28</a>
-                                    <b>42</b>
-                                    <v>2448</v>
-                                </b>
-                                <b>
-                                    <a>42</a>
-                                    <b>55</b>
-                                    <v>2650</v>
-                                </b>
-                                <b>
-                                    <a>55</a>
-                                    <b>67</b>
-                                    <v>2407</v>
-                                </b>
-                                <b>
-                                    <a>67</a>
-                                    <b>82</b>
-                                    <v>2434</v>
-                                </b>
-                                <b>
-                                    <a>82</a>
-                                    <b>108</b>
-                                    <v>2461</v>
-                                </b>
-                                <b>
-                                    <a>108</a>
-                                    <b>204</b>
-                                    <v>2098</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endLine</src>
-                    <trg>endColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1587</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1520</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2421</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>2650</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>1748</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>13</b>
-                                    <v>2851</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>18</b>
-                                    <v>2448</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>30</b>
-                                    <v>2488</v>
-                                </b>
-                                <b>
-                                    <a>30</a>
-                                    <b>45</b>
-                                    <v>2448</v>
-                                </b>
-                                <b>
-                                    <a>45</a>
-                                    <b>58</b>
-                                    <v>2542</v>
-                                </b>
-                                <b>
-                                    <a>58</a>
-                                    <b>71</b>
-                                    <v>2421</v>
-                                </b>
-                                <b>
-                                    <a>71</a>
-                                    <b>86</b>
-                                    <v>2407</v>
-                                </b>
-                                <b>
-                                    <a>86</a>
-                                    <b>113</b>
-                                    <v>2394</v>
-                                </b>
-                                <b>
-                                    <a>113</a>
-                                    <b>209</b>
-                                    <v>1896</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endColumn</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>484</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>457</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>174</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>470</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>12</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>24</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>72</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>76</a>
-                                    <b>277</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>278</a>
-                                    <b>1206</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>1227</a>
-                                    <b>3859</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>3977</a>
-                                    <b>8618</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>9094</a>
-                                    <b>11251</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>11548</a>
-                                    <b>19740</b>
-                                    <v>67</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endColumn</src>
-                    <trg>file</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1479</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>578</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>538</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>29</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>35</a>
-                                    <b>115</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>115</a>
-                                    <b>399</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>427</a>
-                                    <b>798</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>805</a>
-                                    <b>1038</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>1039</a>
-                                    <b>1359</b>
-                                    <v>309</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endColumn</src>
-                    <trg>beginLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>591</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>645</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>336</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>470</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>470</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>17</b>
-                                    <v>443</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>47</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>51</a>
-                                    <b>153</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>153</a>
-                                    <b>387</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>390</a>
-                                    <b>717</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>730</a>
-                                    <b>1059</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>1062</a>
-                                    <b>1404</b>
-                                    <v>363</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endColumn</src>
-                    <trg>beginColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>928</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>390</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>497</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>363</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>363</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>14</b>
-                                    <v>443</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>33</b>
-                                    <v>470</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>49</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>49</a>
-                                    <b>64</b>
-                                    <v>430</v>
-                                </b>
-                                <b>
-                                    <a>65</a>
-                                    <b>81</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>81</a>
-                                    <b>96</b>
-                                    <v>457</v>
-                                </b>
-                                <b>
-                                    <a>97</a>
-                                    <b>109</b>
-                                    <v>228</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>endColumn</src>
-                    <trg>endLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>591</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>659</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>336</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>457</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>470</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>16</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>43</b>
-                                    <v>430</v>
-                                </b>
-                                <b>
-                                    <a>45</a>
-                                    <b>151</b>
-                                    <v>430</v>
-                                </b>
-                                <b>
-                                    <a>161</a>
-                                    <b>379</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>384</a>
-                                    <b>712</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>729</a>
-                                    <b>1046</b>
-                                    <v>417</v>
-                                </b>
-                                <b>
-                                    <a>1049</a>
-                                    <b>1397</b>
-                                    <v>363</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_alias_def</name>
-            <cardinality>1289</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1289</v>
-                </e>
-                <e>
-                    <k>alias</k>
-                    <v>1289</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>1289</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>alias</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1289</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1289</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>alias</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1289</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>alias</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1289</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1289</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>alias</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1289</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_alternative_pattern_alternatives</name>
-            <cardinality>23</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_alternative_pattern</k>
-                    <v>9</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>4</v>
-                </e>
-                <e>
-                    <k>alternatives</k>
-                    <v>23</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_alternative_pattern</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_alternative_pattern</src>
-                    <trg>alternatives</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_alternative_pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>alternatives</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>alternatives</src>
-                    <trg>ruby_alternative_pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>23</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>alternatives</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>23</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_alternative_pattern_def</name>
-            <cardinality>9</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>9</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_argument_list_child</name>
-            <cardinality>879410</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_argument_list</k>
-                    <v>706205</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>443</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>879410</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_argument_list</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>596855</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>68483</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>34</b>
-                                    <v>40866</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_argument_list</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>596855</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>68483</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>34</b>
-                                    <v>40866</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_argument_list</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>147</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>7</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>11</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>21</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>23</a>
-                                    <b>45</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>56</a>
-                                    <b>385</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>963</a>
-                                    <b>8130</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>52499</a>
-                                    <b>52500</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>147</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>7</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>11</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>21</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>23</a>
-                                    <b>45</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>56</a>
-                                    <b>385</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>963</a>
-                                    <b>8130</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>52499</a>
-                                    <b>52500</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_argument_list</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>879410</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>879410</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_argument_list_def</name>
-            <cardinality>706474</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>706474</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_array_child</name>
-            <cardinality>708919</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_array</k>
-                    <v>240456</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>63360</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>708919</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_array</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12708</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>213730</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>63361</b>
-                                    <v>14018</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_array</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12708</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>213730</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>63361</b>
-                                    <v>14018</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_array</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>40208</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>6</b>
-                                    <v>4769</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>9559</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>598</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>6932</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>240457</b>
-                                    <v>1294</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>40208</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>6</b>
-                                    <v>4769</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>9559</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>598</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>6932</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>240457</b>
-                                    <v>1294</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_array</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>708919</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>708919</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_array_def</name>
-            <cardinality>249320</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>249320</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_array_pattern_child</name>
-            <cardinality>336</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_array_pattern</k>
-                    <v>168</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>18</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>336</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_array_pattern</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>51</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>97</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>14</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>19</b>
-                                    <v>6</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_array_pattern</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>51</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>97</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>14</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>19</b>
-                                    <v>6</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_array_pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>117</a>
-                                    <b>118</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>168</a>
-                                    <b>169</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>117</a>
-                                    <b>118</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>168</a>
-                                    <b>169</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_array_pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>336</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>336</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_array_pattern_class</name>
-            <cardinality>51</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_array_pattern</k>
-                    <v>51</v>
-                </e>
-                <e>
-                    <k>class</k>
-                    <v>51</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_array_pattern</src>
-                    <trg>class</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>51</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>class</src>
-                    <trg>ruby_array_pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>51</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_array_pattern_def</name>
-            <cardinality>179</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>179</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_as_pattern_def</name>
-            <cardinality>156</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>156</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>156</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>156</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>156</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>156</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>156</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>156</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>156</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>156</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_assignment_def</name>
-            <cardinality>141202</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>141202</v>
-                </e>
-                <e>
-                    <k>left</k>
-                    <v>141202</v>
-                </e>
-                <e>
-                    <k>right</k>
-                    <v>141202</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>141202</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>141202</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>141202</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>141202</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>141202</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>141202</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_ast_node_location</name>
-            <cardinality>9723503</cardinality>
-            <columnsizes>
-                <e>
-                    <k>node</k>
-                    <v>9723503</v>
-                </e>
-                <e>
-                    <k>loc</k>
-                    <v>9209550</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>node</src>
-                    <trg>loc</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9723503</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>loc</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8697279</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>4</b>
-                                    <v>512270</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_ast_node_parent</name>
-            <cardinality>9674605</cardinality>
-            <columnsizes>
-                <e>
-                    <k>node</k>
-                    <v>9674605</v>
-                </e>
-                <e>
-                    <k>parent</k>
-                    <v>3381025</v>
-                </e>
-                <e>
-                    <k>parent_index</k>
-                    <v>2892</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>node</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9674605</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>node</src>
-                    <trg>parent_index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9674605</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>533793</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>465418</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1832321</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>359620</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>216</b>
-                                    <v>189871</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>parent_index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>533793</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>465418</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1832321</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>359620</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>216</b>
-                                    <v>189871</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent_index</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>470</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>242</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>363</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>161</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>484</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>17</b>
-                                    <v>255</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>29</b>
-                                    <v>228</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>71</b>
-                                    <v>228</v>
-                                </b>
-                                <b>
-                                    <a>72</a>
-                                    <b>298</b>
-                                    <v>228</v>
-                                </b>
-                                <b>
-                                    <a>358</a>
-                                    <b>251345</b>
-                                    <v>228</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent_index</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>470</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>242</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>363</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>161</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>484</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>17</b>
-                                    <v>255</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>29</b>
-                                    <v>228</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>71</b>
-                                    <v>228</v>
-                                </b>
-                                <b>
-                                    <a>72</a>
-                                    <b>298</b>
-                                    <v>228</v>
-                                </b>
-                                <b>
-                                    <a>358</a>
-                                    <b>251345</b>
-                                    <v>228</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_bare_string_child</name>
-            <cardinality>16784</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_bare_string</k>
-                    <v>13136</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>2309</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>16784</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_bare_string</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12728</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>2310</b>
-                                    <v>408</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_bare_string</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12728</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>2310</b>
-                                    <v>408</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_bare_string</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1942</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>72</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>276</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>13137</b>
-                                    <v>19</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1942</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>72</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>276</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>13137</b>
-                                    <v>19</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_bare_string</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>16784</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>16784</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_bare_string_def</name>
-            <cardinality>13136</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>13136</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_bare_symbol_child</name>
-            <cardinality>8435</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_bare_symbol</k>
-                    <v>8435</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>2</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>8435</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_bare_symbol</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8435</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_bare_symbol</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8435</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_bare_symbol</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3570</a>
-                                    <b>3571</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3570</a>
-                                    <b>3571</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_bare_symbol</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8435</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8435</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_bare_symbol_def</name>
-            <cardinality>8435</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>8435</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_begin_block_child</name>
-            <cardinality>39</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_begin_block</k>
-                    <v>10</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>7</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>39</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_begin_block</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_begin_block</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_begin_block</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_begin_block</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>39</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>39</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_begin_block_def</name>
-            <cardinality>10</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>10</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_begin_child</name>
-            <cardinality>7606</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_begin</k>
-                    <v>2610</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>39</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>7606</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_begin</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>161</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1414</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>537</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>200</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>221</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>40</b>
-                                    <v>77</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_begin</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>161</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1414</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>537</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>200</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>221</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>40</b>
-                                    <v>77</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_begin</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>12</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>17</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>23</a>
-                                    <b>33</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>37</a>
-                                    <b>59</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>77</a>
-                                    <b>166</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>298</a>
-                                    <b>1036</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>2449</a>
-                                    <b>2611</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>12</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>17</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>23</a>
-                                    <b>33</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>37</a>
-                                    <b>59</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>77</a>
-                                    <b>166</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>298</a>
-                                    <b>1036</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>2449</a>
-                                    <b>2611</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_begin</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7606</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7606</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_begin_def</name>
-            <cardinality>2610</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>2610</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_binary_def</name>
-            <cardinality>73665</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>73665</v>
-                </e>
-                <e>
-                    <k>left</k>
-                    <v>73665</v>
-                </e>
-                <e>
-                    <k>operator</k>
-                    <v>25</v>
-                </e>
-                <e>
-                    <k>right</k>
-                    <v>73665</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>73665</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>operator</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>73665</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>73665</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>73665</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>operator</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>73665</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>73665</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>operator</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>153</a>
-                                    <b>177</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>259</a>
-                                    <b>432</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>597</a>
-                                    <b>631</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>647</a>
-                                    <b>690</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>764</a>
-                                    <b>987</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1026</a>
-                                    <b>1033</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1058</a>
-                                    <b>1073</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1169</a>
-                                    <b>1190</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1227</a>
-                                    <b>1824</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2079</a>
-                                    <b>2661</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2747</a>
-                                    <b>3491</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6593</a>
-                                    <b>7408</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>33761</a>
-                                    <b>33762</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>operator</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>153</a>
-                                    <b>177</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>259</a>
-                                    <b>432</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>597</a>
-                                    <b>631</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>647</a>
-                                    <b>690</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>764</a>
-                                    <b>987</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1026</a>
-                                    <b>1033</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1058</a>
-                                    <b>1073</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1169</a>
-                                    <b>1190</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1227</a>
-                                    <b>1824</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2079</a>
-                                    <b>2661</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2747</a>
-                                    <b>3491</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6593</a>
-                                    <b>7408</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>33761</a>
-                                    <b>33762</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>operator</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>153</a>
-                                    <b>177</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>259</a>
-                                    <b>432</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>597</a>
-                                    <b>631</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>647</a>
-                                    <b>690</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>764</a>
-                                    <b>987</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1026</a>
-                                    <b>1033</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1058</a>
-                                    <b>1073</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1169</a>
-                                    <b>1190</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1227</a>
-                                    <b>1824</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2079</a>
-                                    <b>2661</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2747</a>
-                                    <b>3491</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6593</a>
-                                    <b>7408</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>33761</a>
-                                    <b>33762</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>73665</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>73665</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>operator</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>73665</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_block_argument_child</name>
-            <cardinality>6541</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_block_argument</k>
-                    <v>6541</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>6541</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_block_argument</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6541</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_block_argument</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6541</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_block_argument_def</name>
-            <cardinality>6547</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>6547</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_block_body</name>
-            <cardinality>103820</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_block</k>
-                    <v>103820</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>103820</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_block</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>103820</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>ruby_block</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>103820</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_block_body_child</name>
-            <cardinality>103995</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_block_body</k>
-                    <v>103820</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>53</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>103995</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_block_body</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>103699</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>5</b>
-                                    <v>121</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_block_body</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>103699</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>5</b>
-                                    <v>121</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_block_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>7718</a>
-                                    <b>7719</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>7718</a>
-                                    <b>7719</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_block_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>103995</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>103995</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_block_body_def</name>
-            <cardinality>103820</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>103820</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_block_def</name>
-            <cardinality>104143</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>104143</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_block_parameter_def</name>
-            <cardinality>2543</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>2543</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_block_parameter_name</name>
-            <cardinality>2537</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_block_parameter</k>
-                    <v>2537</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>2537</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_block_parameter</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2537</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>ruby_block_parameter</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2537</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_block_parameters</name>
-            <cardinality>10767</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_block</k>
-                    <v>10767</v>
-                </e>
-                <e>
-                    <k>parameters</k>
-                    <v>10767</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_block</src>
-                    <trg>parameters</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>10767</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parameters</src>
-                    <trg>ruby_block</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>10767</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_block_parameters_child</name>
-            <cardinality>30131</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_block_parameters</k>
-                    <v>25884</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>14</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>30131</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_block_parameters</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>22189</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3329</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>365</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_block_parameters</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>22189</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3329</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>365</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_block_parameters</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>27</a>
-                                    <b>28</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>35</a>
-                                    <b>36</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>122</a>
-                                    <b>123</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1232</a>
-                                    <b>1233</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>8630</a>
-                                    <b>8631</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>27</a>
-                                    <b>28</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>35</a>
-                                    <b>36</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>122</a>
-                                    <b>123</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1232</a>
-                                    <b>1233</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>8630</a>
-                                    <b>8631</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_block_parameters</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>30131</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>30131</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_block_parameters_def</name>
-            <cardinality>25884</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>25884</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_block_parameters_locals</name>
-            <cardinality>16</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_block_parameters</k>
-                    <v>12</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>2</v>
-                </e>
-                <e>
-                    <k>locals</k>
-                    <v>16</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_block_parameters</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_block_parameters</src>
-                    <trg>locals</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_block_parameters</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>locals</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>locals</src>
-                    <trg>ruby_block_parameters</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>16</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>locals</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>16</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_body_statement_child</name>
-            <cardinality>641142</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_body_statement</k>
-                    <v>206879</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>1187</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>641142</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_body_statement</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>95107</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>37693</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>24510</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>15881</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>16388</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>23</b>
-                                    <v>15560</v>
-                                </b>
-                                <b>
-                                    <a>23</a>
-                                    <b>397</b>
-                                    <v>1736</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_body_statement</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>95107</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>37693</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>24510</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>15881</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>16388</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>23</b>
-                                    <v>15560</v>
-                                </b>
-                                <b>
-                                    <a>23</a>
-                                    <b>397</b>
-                                    <v>1736</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_body_statement</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>140</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>122</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>77</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>62</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>98</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>10</b>
-                                    <v>86</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>12</b>
-                                    <v>89</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>26</b>
-                                    <v>95</v>
-                                </b>
-                                <b>
-                                    <a>26</a>
-                                    <b>42</b>
-                                    <v>92</v>
-                                </b>
-                                <b>
-                                    <a>42</a>
-                                    <b>77</b>
-                                    <v>89</v>
-                                </b>
-                                <b>
-                                    <a>80</a>
-                                    <b>179</b>
-                                    <v>89</v>
-                                </b>
-                                <b>
-                                    <a>184</a>
-                                    <b>1016</b>
-                                    <v>89</v>
-                                </b>
-                                <b>
-                                    <a>1134</a>
-                                    <b>68975</b>
-                                    <v>47</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>140</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>122</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>77</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>62</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>7</b>
-                                    <v>98</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>10</b>
-                                    <v>86</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>12</b>
-                                    <v>89</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>26</b>
-                                    <v>95</v>
-                                </b>
-                                <b>
-                                    <a>26</a>
-                                    <b>42</b>
-                                    <v>92</v>
-                                </b>
-                                <b>
-                                    <a>42</a>
-                                    <b>77</b>
-                                    <v>89</v>
-                                </b>
-                                <b>
-                                    <a>80</a>
-                                    <b>179</b>
-                                    <v>89</v>
-                                </b>
-                                <b>
-                                    <a>184</a>
-                                    <b>1016</b>
-                                    <v>89</v>
-                                </b>
-                                <b>
-                                    <a>1134</a>
-                                    <b>68975</b>
-                                    <v>47</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_body_statement</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>641142</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>641142</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_body_statement_def</name>
-            <cardinality>213896</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>213896</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_break_child</name>
-            <cardinality>394</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_break</k>
-                    <v>394</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>394</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_break</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>394</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_break</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>394</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_break_def</name>
-            <cardinality>3414</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>3414</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_call_arguments</name>
-            <cardinality>703178</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_call</k>
-                    <v>703178</v>
-                </e>
-                <e>
-                    <k>arguments</k>
-                    <v>703178</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_call</src>
-                    <trg>arguments</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>703178</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>arguments</src>
-                    <trg>ruby_call</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>703178</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_call_block</name>
-            <cardinality>246208</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_call</k>
-                    <v>246208</v>
-                </e>
-                <e>
-                    <k>block</k>
-                    <v>246208</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_call</src>
-                    <trg>block</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>246208</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>block</src>
-                    <trg>ruby_call</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>246208</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_call_def</name>
-            <cardinality>1027501</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1027501</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_call_method</name>
-            <cardinality>1027501</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_call</k>
-                    <v>1027501</v>
-                </e>
-                <e>
-                    <k>method</k>
-                    <v>1027501</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_call</src>
-                    <trg>method</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1027501</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>method</src>
-                    <trg>ruby_call</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1027501</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_call_operator</name>
-            <cardinality>571632</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_call</k>
-                    <v>571632</v>
-                </e>
-                <e>
-                    <k>operator</k>
-                    <v>571632</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_call</src>
-                    <trg>operator</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>571632</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>operator</src>
-                    <trg>ruby_call</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>571632</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_call_receiver</name>
-            <cardinality>571632</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_call</k>
-                    <v>571632</v>
-                </e>
-                <e>
-                    <k>receiver</k>
-                    <v>571632</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_call</src>
-                    <trg>receiver</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>571632</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>receiver</src>
-                    <trg>ruby_call</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>571632</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_case_child</name>
-            <cardinality>4685</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_case__</k>
-                    <v>1267</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>86</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>4685</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_case__</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>69</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>405</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>399</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>166</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>89</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>12</b>
-                                    <v>100</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>87</b>
-                                    <v>39</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_case__</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>69</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>405</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>399</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>166</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>89</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>12</b>
-                                    <v>100</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>87</b>
-                                    <v>39</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_case__</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>31</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>39</a>
-                                    <b>140</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>228</a>
-                                    <b>1268</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>42</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>6</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>31</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>39</a>
-                                    <b>140</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>228</a>
-                                    <b>1268</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_case__</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4685</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4685</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_case_def</name>
-            <cardinality>1319</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1319</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_case_match_clauses</name>
-            <cardinality>381</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_case_match</k>
-                    <v>232</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>12</v>
-                </e>
-                <e>
-                    <k>clauses</k>
-                    <v>381</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_case_match</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>160</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>13</b>
-                                    <v>15</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_case_match</src>
-                    <trg>clauses</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>160</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>13</b>
-                                    <v>15</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_case_match</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>32</a>
-                                    <b>33</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>72</a>
-                                    <b>73</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>232</a>
-                                    <b>233</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>clauses</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>32</a>
-                                    <b>33</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>72</a>
-                                    <b>73</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>232</a>
-                                    <b>233</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>clauses</src>
-                    <trg>ruby_case_match</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>381</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>clauses</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>381</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_case_match_def</name>
-            <cardinality>232</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>232</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>232</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>232</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>232</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_case_match_else</name>
-            <cardinality>45</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_case_match</k>
-                    <v>45</v>
-                </e>
-                <e>
-                    <k>else</k>
-                    <v>45</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_case_match</src>
-                    <trg>else</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>45</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>else</src>
-                    <trg>ruby_case_match</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>45</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_case_value</name>
-            <cardinality>1277</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_case__</k>
-                    <v>1277</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>1277</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_case__</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1277</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>ruby_case__</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1277</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_chained_string_child</name>
-            <cardinality>3320</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_chained_string</k>
-                    <v>884</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>35</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>3320</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_chained_string</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>296</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>215</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>128</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>116</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>65</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>13</b>
-                                    <v>59</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_chained_string</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>296</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>215</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>128</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>116</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>65</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>13</b>
-                                    <v>59</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_chained_string</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>34</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>42</a>
-                                    <b>43</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>81</a>
-                                    <b>82</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>124</a>
-                                    <b>125</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>196</a>
-                                    <b>197</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>295</a>
-                                    <b>296</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>34</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>42</a>
-                                    <b>43</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>81</a>
-                                    <b>82</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>124</a>
-                                    <b>125</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>196</a>
-                                    <b>197</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>295</a>
-                                    <b>296</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_chained_string</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3320</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3320</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_chained_string_def</name>
-            <cardinality>884</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>884</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_class_body</name>
-            <cardinality>15734</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_class</k>
-                    <v>15734</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>15734</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_class</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>15734</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>ruby_class</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>15734</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_class_def</name>
-            <cardinality>17441</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>17441</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>17441</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>17441</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>17441</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_class_superclass</name>
-            <cardinality>13806</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_class</k>
-                    <v>13806</v>
-                </e>
-                <e>
-                    <k>superclass</k>
-                    <v>13806</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_class</src>
-                    <trg>superclass</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13806</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>superclass</src>
-                    <trg>ruby_class</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13806</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_complex_def</name>
-            <cardinality>72</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>72</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>72</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>72</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>72</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_conditional_def</name>
-            <cardinality>2896</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>2896</v>
-                </e>
-                <e>
-                    <k>alternative</k>
-                    <v>2896</v>
-                </e>
-                <e>
-                    <k>condition</k>
-                    <v>2896</v>
-                </e>
-                <e>
-                    <k>consequence</k>
-                    <v>2896</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>alternative</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2896</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2896</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>consequence</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2896</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>alternative</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2896</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>alternative</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2896</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>alternative</src>
-                    <trg>consequence</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2896</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2896</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>alternative</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2896</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>consequence</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2896</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>consequence</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2896</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>consequence</src>
-                    <trg>alternative</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2896</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>consequence</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2896</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_delimited_symbol_child</name>
-            <cardinality>1742</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_delimited_symbol</k>
-                    <v>1247</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>23</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>1742</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_delimited_symbol</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>920</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>254</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>9</b>
-                                    <v>71</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_delimited_symbol</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>920</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>254</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>9</b>
-                                    <v>71</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_delimited_symbol</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>25</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>109</a>
-                                    <b>110</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>416</a>
-                                    <b>417</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>25</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>109</a>
-                                    <b>110</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>416</a>
-                                    <b>417</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_delimited_symbol</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1742</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1742</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_delimited_symbol_def</name>
-            <cardinality>1247</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1247</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_destructured_left_assignment_child</name>
-            <cardinality>226</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_destructured_left_assignment</k>
-                    <v>108</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>4</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>226</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_destructured_left_assignment</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>79</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_destructured_left_assignment</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>79</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_destructured_left_assignment</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>96</a>
-                                    <b>97</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>108</a>
-                                    <b>109</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>96</a>
-                                    <b>97</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>108</a>
-                                    <b>109</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_destructured_left_assignment</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>226</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>226</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_destructured_left_assignment_def</name>
-            <cardinality>108</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>108</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_destructured_parameter_child</name>
-            <cardinality>463</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_destructured_parameter</k>
-                    <v>208</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>11</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>463</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_destructured_parameter</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>162</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>19</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>12</b>
-                                    <v>11</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_destructured_parameter</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>162</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>19</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>12</b>
-                                    <v>11</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_destructured_parameter</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>30</a>
-                                    <b>31</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>192</a>
-                                    <b>193</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>208</a>
-                                    <b>209</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>30</a>
-                                    <b>31</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>192</a>
-                                    <b>193</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>208</a>
-                                    <b>209</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_destructured_parameter</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>463</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>463</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_destructured_parameter_def</name>
-            <cardinality>208</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>208</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_do_block_body</name>
-            <cardinality>145373</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_do_block</k>
-                    <v>145373</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>145373</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_do_block</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>145373</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>ruby_do_block</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>145373</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_do_block_def</name>
-            <cardinality>145534</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>145534</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_do_block_parameters</name>
-            <cardinality>16724</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_do_block</k>
-                    <v>16724</v>
-                </e>
-                <e>
-                    <k>parameters</k>
-                    <v>16724</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_do_block</src>
-                    <trg>parameters</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>16724</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parameters</src>
-                    <trg>ruby_do_block</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>16724</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_do_child</name>
-            <cardinality>9352</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_do</k>
-                    <v>1651</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>211</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>9352</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_do</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>347</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>300</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>204</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>149</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>137</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>209</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>14</b>
-                                    <v>116</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>18</b>
-                                    <v>125</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>212</b>
-                                    <v>39</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_do</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>347</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>300</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>204</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>149</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>25</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>137</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>209</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>14</b>
-                                    <v>116</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>18</b>
-                                    <v>125</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>212</b>
-                                    <v>39</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_do</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>105</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>63</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>116</a>
-                                    <b>1652</b>
-                                    <v>15</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>105</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>26</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>31</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>63</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>116</a>
-                                    <b>1652</b>
-                                    <v>15</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_do</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9352</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9352</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_do_def</name>
-            <cardinality>1675</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1675</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_element_reference_child</name>
-            <cardinality>82748</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_element_reference</k>
-                    <v>82601</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>4</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>82748</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_element_reference</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>82455</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>146</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_element_reference</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>82455</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>146</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_element_reference</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>62</a>
-                                    <b>63</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>34958</a>
-                                    <b>34959</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>62</a>
-                                    <b>63</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>34958</a>
-                                    <b>34959</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_element_reference</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>82748</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>82748</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_element_reference_def</name>
-            <cardinality>82606</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>82606</v>
-                </e>
-                <e>
-                    <k>object</k>
-                    <v>82606</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>object</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>82606</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>object</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>82606</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_else_child</name>
-            <cardinality>9730</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_else</k>
-                    <v>7669</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>32</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>9730</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_else</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6454</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>758</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>12</b>
-                                    <v>455</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_else</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6454</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>758</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>12</b>
-                                    <v>455</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_else</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>26</a>
-                                    <b>27</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>64</a>
-                                    <b>65</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>152</a>
-                                    <b>153</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>405</a>
-                                    <b>406</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2557</a>
-                                    <b>2558</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>26</a>
-                                    <b>27</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>64</a>
-                                    <b>65</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>152</a>
-                                    <b>153</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>405</a>
-                                    <b>406</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2557</a>
-                                    <b>2558</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_else</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9730</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9730</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_else_def</name>
-            <cardinality>7681</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>7681</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_elsif_alternative</name>
-            <cardinality>1058</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_elsif</k>
-                    <v>1058</v>
-                </e>
-                <e>
-                    <k>alternative</k>
-                    <v>1058</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_elsif</src>
-                    <trg>alternative</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1058</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>alternative</src>
-                    <trg>ruby_elsif</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1058</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_elsif_consequence</name>
-            <cardinality>1571</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_elsif</k>
-                    <v>1571</v>
-                </e>
-                <e>
-                    <k>consequence</k>
-                    <v>1571</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_elsif</src>
-                    <trg>consequence</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1571</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>consequence</src>
-                    <trg>ruby_elsif</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1571</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_elsif_def</name>
-            <cardinality>1583</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1583</v>
-                </e>
-                <e>
-                    <k>condition</k>
-                    <v>1583</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1583</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1583</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_end_block_child</name>
-            <cardinality>27</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_end_block</k>
-                    <v>13</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>10</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>27</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_end_block</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_end_block</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_end_block</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_end_block</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>27</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>27</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_end_block_def</name>
-            <cardinality>13</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>13</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_ensure_child</name>
-            <cardinality>5236</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_ensure</k>
-                    <v>4106</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>47</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>5236</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_ensure</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3323</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>554</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>17</b>
-                                    <v>227</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_ensure</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3323</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>554</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>17</b>
-                                    <v>227</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_ensure</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>23</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>76</a>
-                                    <b>77</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>261</a>
-                                    <b>262</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1369</a>
-                                    <b>1370</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>23</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>76</a>
-                                    <b>77</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>261</a>
-                                    <b>262</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1369</a>
-                                    <b>1370</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_ensure</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5236</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5236</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_ensure_def</name>
-            <cardinality>4106</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>4106</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_exception_variable_def</name>
-            <cardinality>935</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>935</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>935</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>935</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>935</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_exceptions_child</name>
-            <cardinality>2128</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_exceptions</k>
-                    <v>1904</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>11</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>2128</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_exceptions</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1748</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>5</b>
-                                    <v>153</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_exceptions</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1748</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>5</b>
-                                    <v>153</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_exceptions</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>23</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>66</a>
-                                    <b>67</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>806</a>
-                                    <b>807</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>23</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>66</a>
-                                    <b>67</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>806</a>
-                                    <b>807</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_exceptions</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2128</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2128</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_exceptions_def</name>
-            <cardinality>1904</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1904</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_expression_reference_pattern_def</name>
-            <cardinality>3</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>3</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>3</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_find_pattern_child</name>
-            <cardinality>56</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_find_pattern</k>
-                    <v>18</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>4</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>56</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_find_pattern</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_find_pattern</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_find_pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>3</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>3</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_find_pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>56</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>56</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_find_pattern_class</name>
-            <cardinality>5</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_find_pattern</k>
-                    <v>5</v>
-                </e>
-                <e>
-                    <k>class</k>
-                    <v>5</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_find_pattern</src>
-                    <trg>class</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>class</src>
-                    <trg>ruby_find_pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_find_pattern_def</name>
-            <cardinality>18</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>18</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_for_def</name>
-            <cardinality>136</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>136</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>136</v>
-                </e>
-                <e>
-                    <k>pattern</k>
-                    <v>136</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>136</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>136</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>136</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>136</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>136</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>136</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>136</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>pattern</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>136</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>pattern</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>136</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>pattern</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>136</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>136</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>136</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>136</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_hash_child</name>
-            <cardinality>96207</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_hash</k>
-                    <v>37893</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>1439</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>96207</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_hash</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>15577</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>10573</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>4318</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>4385</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>20</b>
-                                    <v>2878</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>108</b>
-                                    <v>161</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_hash</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>15577</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>10573</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>4318</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>4385</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>20</b>
-                                    <v>2878</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>108</b>
-                                    <v>161</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_hash</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>363</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>255</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>336</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>107</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>13</b>
-                                    <v>121</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>55</b>
-                                    <v>121</v>
-                                </b>
-                                <b>
-                                    <a>59</a>
-                                    <b>1660</b>
-                                    <v>121</v>
-                                </b>
-                                <b>
-                                    <a>2817</a>
-                                    <b>2818</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>363</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>255</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>336</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>107</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>13</b>
-                                    <v>121</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>55</b>
-                                    <v>121</v>
-                                </b>
-                                <b>
-                                    <a>59</a>
-                                    <b>1660</b>
-                                    <v>121</v>
-                                </b>
-                                <b>
-                                    <a>2817</a>
-                                    <b>2818</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_hash</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>96207</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>96207</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_hash_def</name>
-            <cardinality>41915</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>41915</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_hash_pattern_child</name>
-            <cardinality>94</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_hash_pattern</k>
-                    <v>68</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>4</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>94</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_hash_pattern</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>50</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>6</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_hash_pattern</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>50</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>12</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>6</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_hash_pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>68</a>
-                                    <b>69</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>68</a>
-                                    <b>69</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_hash_pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>94</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>94</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_hash_pattern_class</name>
-            <cardinality>32</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_hash_pattern</k>
-                    <v>32</v>
-                </e>
-                <e>
-                    <k>class</k>
-                    <v>32</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_hash_pattern</src>
-                    <trg>class</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>32</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>class</src>
-                    <trg>ruby_hash_pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>32</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_hash_pattern_def</name>
-            <cardinality>73</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>73</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_hash_splat_argument_child</name>
-            <cardinality>1988</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_hash_splat_argument</k>
-                    <v>1988</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>1988</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_hash_splat_argument</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1988</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_hash_splat_argument</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1988</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_hash_splat_argument_def</name>
-            <cardinality>1989</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1989</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_hash_splat_parameter_def</name>
-            <cardinality>1574</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1574</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_hash_splat_parameter_name</name>
-            <cardinality>1352</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_hash_splat_parameter</k>
-                    <v>1352</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>1352</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_hash_splat_parameter</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1352</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>ruby_hash_splat_parameter</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1352</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_heredoc_body_child</name>
-            <cardinality>26244</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_heredoc_body</k>
-                    <v>5817</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>512</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>26244</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_heredoc_body</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3504</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>701</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>675</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>9</b>
-                                    <v>328</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>17</b>
-                                    <v>467</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>218</b>
-                                    <v>137</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_heredoc_body</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3504</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>701</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>675</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>9</b>
-                                    <v>328</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>17</b>
-                                    <v>467</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>218</b>
-                                    <v>137</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_heredoc_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>302</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>47</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>13</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>43</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>56</a>
-                                    <b>2463</b>
-                                    <v>42</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>302</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>47</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>13</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>43</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>56</a>
-                                    <b>2463</b>
-                                    <v>42</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_heredoc_body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>26244</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>26244</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_heredoc_body_def</name>
-            <cardinality>6934</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>6934</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_if_alternative</name>
-            <cardinality>7192</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_if</k>
-                    <v>7192</v>
-                </e>
-                <e>
-                    <k>alternative</k>
-                    <v>7192</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_if</src>
-                    <trg>alternative</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7192</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>alternative</src>
-                    <trg>ruby_if</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7192</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_if_consequence</name>
-            <cardinality>16117</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_if</k>
-                    <v>16117</v>
-                </e>
-                <e>
-                    <k>consequence</k>
-                    <v>16117</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_if</src>
-                    <trg>consequence</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>16117</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>consequence</src>
-                    <trg>ruby_if</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>16117</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_if_def</name>
-            <cardinality>16164</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>16164</v>
-                </e>
-                <e>
-                    <k>condition</k>
-                    <v>16164</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>16164</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>16164</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_if_guard_def</name>
-            <cardinality>9</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>9</v>
-                </e>
-                <e>
-                    <k>condition</k>
-                    <v>9</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_if_modifier_def</name>
-            <cardinality>14541</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>14541</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>14541</v>
-                </e>
-                <e>
-                    <k>condition</k>
-                    <v>14541</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>14541</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>14541</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>14541</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>14541</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>14541</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>14541</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_in_clause_body</name>
-            <cardinality>341</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_in_clause</k>
-                    <v>341</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>341</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_in_clause</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>341</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>ruby_in_clause</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>341</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_in_clause_def</name>
-            <cardinality>381</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>381</v>
-                </e>
-                <e>
-                    <k>pattern</k>
-                    <v>381</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>381</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>pattern</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>381</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_in_clause_guard</name>
-            <cardinality>13</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_in_clause</k>
-                    <v>13</v>
-                </e>
-                <e>
-                    <k>guard</k>
-                    <v>13</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_in_clause</src>
-                    <trg>guard</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>guard</src>
-                    <trg>ruby_in_clause</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_in_def</name>
-            <cardinality>136</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>136</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>136</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>136</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>136</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_interpolation_child</name>
-            <cardinality>38493</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_interpolation</k>
-                    <v>38493</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>2</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>38493</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_interpolation</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>38493</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_interpolation</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>38493</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_interpolation</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>16291</a>
-                                    <b>16292</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>16291</a>
-                                    <b>16292</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_interpolation</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>38493</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>38493</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_interpolation_def</name>
-            <cardinality>38493</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>38493</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_keyword_parameter_def</name>
-            <cardinality>4763</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>4763</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>4763</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4763</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4763</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_keyword_parameter_value</name>
-            <cardinality>3293</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_keyword_parameter</k>
-                    <v>3293</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>3293</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_keyword_parameter</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3293</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>ruby_keyword_parameter</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3293</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_keyword_pattern_def</name>
-            <cardinality>77</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>77</v>
-                </e>
-                <e>
-                    <k>key__</k>
-                    <v>77</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>key__</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>77</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>key__</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>77</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_keyword_pattern_value</name>
-            <cardinality>56</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_keyword_pattern</k>
-                    <v>56</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>56</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_keyword_pattern</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>56</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>ruby_keyword_pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>56</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_lambda_def</name>
-            <cardinality>8187</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>8187</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>8187</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8187</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8187</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_lambda_parameters</name>
-            <cardinality>1811</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_lambda</k>
-                    <v>1811</v>
-                </e>
-                <e>
-                    <k>parameters</k>
-                    <v>1811</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_lambda</src>
-                    <trg>parameters</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1811</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parameters</src>
-                    <trg>ruby_lambda</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1811</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_lambda_parameters_child</name>
-            <cardinality>2197</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_lambda_parameters</k>
-                    <v>1801</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>8</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>2197</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_lambda_parameters</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1545</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>164</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>9</b>
-                                    <v>92</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_lambda_parameters</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1545</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>164</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>9</b>
-                                    <v>92</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_lambda_parameters</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>29</a>
-                                    <b>30</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>92</a>
-                                    <b>93</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>256</a>
-                                    <b>257</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1801</a>
-                                    <b>1802</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>29</a>
-                                    <b>30</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>92</a>
-                                    <b>93</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>256</a>
-                                    <b>257</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1801</a>
-                                    <b>1802</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_lambda_parameters</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2197</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2197</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_lambda_parameters_def</name>
-            <cardinality>1811</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1811</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_left_assignment_list_child</name>
-            <cardinality>6934</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_left_assignment_list</k>
-                    <v>3100</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>15</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>6934</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_left_assignment_list</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>382</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2002</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>531</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>16</b>
-                                    <v>185</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_left_assignment_list</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>382</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2002</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>531</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>16</b>
-                                    <v>185</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_left_assignment_list</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>23</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>41</a>
-                                    <b>42</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>72</a>
-                                    <b>73</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>185</a>
-                                    <b>186</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>716</a>
-                                    <b>717</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2718</a>
-                                    <b>2719</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3100</a>
-                                    <b>3101</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>3</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>23</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>41</a>
-                                    <b>42</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>72</a>
-                                    <b>73</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>185</a>
-                                    <b>186</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>716</a>
-                                    <b>717</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2718</a>
-                                    <b>2719</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3100</a>
-                                    <b>3101</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_left_assignment_list</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6934</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6934</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_left_assignment_list_def</name>
-            <cardinality>3100</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>3100</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_match_pattern_def</name>
-            <cardinality>31</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>31</v>
-                </e>
-                <e>
-                    <k>pattern</k>
-                    <v>31</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>31</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>31</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>31</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>pattern</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>31</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>pattern</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>31</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>31</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>31</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_method_body</name>
-            <cardinality>102401</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_method</k>
-                    <v>102401</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>102401</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_method</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>102401</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>ruby_method</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>102401</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_method_def</name>
-            <cardinality>103532</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>103532</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>103532</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>103532</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>103532</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_method_parameters</name>
-            <cardinality>29519</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_method</k>
-                    <v>29519</v>
-                </e>
-                <e>
-                    <k>parameters</k>
-                    <v>29519</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_method</src>
-                    <trg>parameters</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>29519</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parameters</src>
-                    <trg>ruby_method</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>29519</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_method_parameters_child</name>
-            <cardinality>51112</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_method_parameters</k>
-                    <v>31001</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>41</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>51112</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_method_parameters</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>18836</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>7543</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2840</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>15</b>
-                                    <v>1781</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_method_parameters</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>18836</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>7543</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2840</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>15</b>
-                                    <v>1781</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_method_parameters</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>37</a>
-                                    <b>38</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>59</a>
-                                    <b>60</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>129</a>
-                                    <b>130</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>262</a>
-                                    <b>263</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>594</a>
-                                    <b>595</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1541</a>
-                                    <b>1542</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>4056</a>
-                                    <b>4057</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>10336</a>
-                                    <b>10337</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>14</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>37</a>
-                                    <b>38</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>59</a>
-                                    <b>60</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>129</a>
-                                    <b>130</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>262</a>
-                                    <b>263</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>594</a>
-                                    <b>595</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1541</a>
-                                    <b>1542</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>4056</a>
-                                    <b>4057</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>10336</a>
-                                    <b>10337</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_method_parameters</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>51112</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>51112</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_method_parameters_def</name>
-            <cardinality>31208</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>31208</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_module_body</name>
-            <cardinality>22881</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_module</k>
-                    <v>22881</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>22881</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_module</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>22881</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>ruby_module</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>22881</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_module_def</name>
-            <cardinality>22962</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>22962</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>22962</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>22962</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>22962</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_next_child</name>
-            <cardinality>256</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_next</k>
-                    <v>256</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>256</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_next</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>256</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_next</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>256</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_next_def</name>
-            <cardinality>2020</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>2020</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_operator_assignment_def</name>
-            <cardinality>6160</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>6160</v>
-                </e>
-                <e>
-                    <k>left</k>
-                    <v>6160</v>
-                </e>
-                <e>
-                    <k>operator</k>
-                    <v>16</v>
-                </e>
-                <e>
-                    <k>right</k>
-                    <v>6160</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6160</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>operator</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6160</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6160</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6160</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>operator</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6160</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>left</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6160</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>operator</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>64</a>
-                                    <b>65</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>707</a>
-                                    <b>708</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1808</a>
-                                    <b>1809</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>operator</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>64</a>
-                                    <b>65</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>707</a>
-                                    <b>708</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1808</a>
-                                    <b>1809</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>operator</src>
-                    <trg>right</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>64</a>
-                                    <b>65</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>707</a>
-                                    <b>708</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>1808</a>
-                                    <b>1809</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6160</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>left</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6160</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>right</src>
-                    <trg>operator</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6160</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_optional_parameter_def</name>
-            <cardinality>6556</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>6556</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>6556</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>6556</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6556</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6556</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6556</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6556</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6556</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6556</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_pair_def</name>
-            <cardinality>254198</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>254198</v>
-                </e>
-                <e>
-                    <k>key__</k>
-                    <v>254198</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>key__</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>254198</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>key__</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>254198</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_pair_value</name>
-            <cardinality>254198</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_pair</k>
-                    <v>254198</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>254198</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_pair</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>254198</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>ruby_pair</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>254198</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_parenthesized_pattern_def</name>
-            <cardinality>8</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>8</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>8</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_parenthesized_statements_child</name>
-            <cardinality>11347</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_parenthesized_statements</k>
-                    <v>11258</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>4</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>11347</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_parenthesized_statements</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11179</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>5</b>
-                                    <v>79</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_parenthesized_statements</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11179</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>5</b>
-                                    <v>79</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_parenthesized_statements</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>79</a>
-                                    <b>80</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>11258</a>
-                                    <b>11259</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>79</a>
-                                    <b>80</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>11258</a>
-                                    <b>11259</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_parenthesized_statements</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11347</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11347</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_parenthesized_statements_def</name>
-            <cardinality>11296</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>11296</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_pattern_def</name>
-            <cardinality>4745</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>4745</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>4745</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4745</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4745</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_program_child</name>
-            <cardinality>33893</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_program</k>
-                    <v>10674</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>239</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>33893</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_program</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3956</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2531</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1772</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>794</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>902</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>81</b>
-                                    <v>716</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_program</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3956</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2531</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1772</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>794</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>902</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>81</b>
-                                    <v>716</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_program</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>50</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>29</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>7</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>11</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>15</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>23</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>26</a>
-                                    <b>36</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>38</a>
-                                    <b>60</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>67</a>
-                                    <b>129</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>145</a>
-                                    <b>397</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>540</a>
-                                    <b>3560</b>
-                                    <v>14</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>50</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>29</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>7</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>11</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>15</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>23</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>26</a>
-                                    <b>36</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>38</a>
-                                    <b>60</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>67</a>
-                                    <b>129</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>145</a>
-                                    <b>397</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>540</a>
-                                    <b>3560</b>
-                                    <v>14</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_program</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>33893</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>33893</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_program_def</name>
-            <cardinality>18697</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>18697</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_range_begin</name>
-            <cardinality>4748</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_range</k>
-                    <v>4748</v>
-                </e>
-                <e>
-                    <k>begin</k>
-                    <v>4748</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_range</src>
-                    <trg>begin</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4748</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>begin</src>
-                    <trg>ruby_range</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4748</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_range_def</name>
-            <cardinality>5066</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>5066</v>
-                </e>
-                <e>
-                    <k>operator</k>
-                    <v>2</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>operator</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5066</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>operator</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1376</a>
-                                    <b>1377</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3690</a>
-                                    <b>3691</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_range_end</name>
-            <cardinality>4818</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_range</k>
-                    <v>4818</v>
-                </e>
-                <e>
-                    <k>end</k>
-                    <v>4818</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_range</src>
-                    <trg>end</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4818</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>end</src>
-                    <trg>ruby_range</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4818</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_rational_def</name>
-            <cardinality>166</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>166</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>166</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>166</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>166</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_redo_child</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_redo</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_redo</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_redo</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_redo_def</name>
-            <cardinality>34</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>34</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_regex_child</name>
-            <cardinality>45368</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_regex</k>
-                    <v>13665</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>146</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>45368</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_regex</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7006</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>800</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1868</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>500</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1124</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>1031</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>16</b>
-                                    <v>1094</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>50</b>
-                                    <v>236</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_regex</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7006</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>800</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1868</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>500</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1124</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>1031</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>16</b>
-                                    <v>1094</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>50</b>
-                                    <v>236</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_regex</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>15</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>18</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>21</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>31</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>32</a>
-                                    <b>80</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>103</a>
-                                    <b>184</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>249</a>
-                                    <b>445</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>696</a>
-                                    <b>1331</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>1953</a>
-                                    <b>4557</b>
-                                    <v>8</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>17</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>15</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>18</b>
-                                    <v>8</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>21</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>21</a>
-                                    <b>31</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>32</a>
-                                    <b>80</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>103</a>
-                                    <b>184</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>249</a>
-                                    <b>445</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>696</a>
-                                    <b>1331</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>1953</a>
-                                    <b>4557</b>
-                                    <v>8</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_regex</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>45368</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>45368</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_regex_def</name>
-            <cardinality>13680</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>13680</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_rescue_body</name>
-            <cardinality>2050</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_rescue</k>
-                    <v>2050</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>2050</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_rescue</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2050</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>ruby_rescue</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2050</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_rescue_def</name>
-            <cardinality>2299</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>2299</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_rescue_exceptions</name>
-            <cardinality>1904</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_rescue</k>
-                    <v>1904</v>
-                </e>
-                <e>
-                    <k>exceptions</k>
-                    <v>1904</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_rescue</src>
-                    <trg>exceptions</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1904</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>exceptions</src>
-                    <trg>ruby_rescue</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1904</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_rescue_modifier_def</name>
-            <cardinality>458</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>458</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>458</v>
-                </e>
-                <e>
-                    <k>handler</k>
-                    <v>458</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>458</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>handler</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>458</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>458</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>handler</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>458</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>handler</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>458</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>handler</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>458</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_rescue_variable</name>
-            <cardinality>935</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_rescue</k>
-                    <v>935</v>
-                </e>
-                <e>
-                    <k>variable</k>
-                    <v>935</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_rescue</src>
-                    <trg>variable</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>935</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>variable</src>
-                    <trg>ruby_rescue</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>935</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_rest_assignment_child</name>
-            <cardinality>392</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_rest_assignment</k>
-                    <v>392</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>392</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_rest_assignment</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>392</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_rest_assignment</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>392</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_rest_assignment_def</name>
-            <cardinality>414</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>414</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_retry_child</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_retry</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_retry</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_retry</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_retry_def</name>
-            <cardinality>58</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>58</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_return_child</name>
-            <cardinality>4938</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_return</k>
-                    <v>4938</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>4938</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_return</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4938</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_return</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4938</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_return_def</name>
-            <cardinality>7979</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>7979</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_right_assignment_list_child</name>
-            <cardinality>2741</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_right_assignment_list</k>
-                    <v>1280</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>14</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>2741</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_right_assignment_list</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1136</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>113</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>29</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_right_assignment_list</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1136</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>113</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>29</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_right_assignment_list</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>48</a>
-                                    <b>49</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>427</a>
-                                    <b>428</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>48</a>
-                                    <b>49</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>427</a>
-                                    <b>428</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_right_assignment_list</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2741</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2741</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_right_assignment_list_def</name>
-            <cardinality>1280</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1280</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_scope_resolution_def</name>
-            <cardinality>87113</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>87113</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>87113</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>87113</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>87113</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_scope_resolution_scope</name>
-            <cardinality>85203</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_scope_resolution</k>
-                    <v>85203</v>
-                </e>
-                <e>
-                    <k>scope</k>
-                    <v>85203</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_scope_resolution</src>
-                    <trg>scope</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>85203</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>scope</src>
-                    <trg>ruby_scope_resolution</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>85203</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_setter_def</name>
-            <cardinality>656</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>656</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>656</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>656</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>656</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_singleton_class_body</name>
-            <cardinality>677</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_singleton_class</k>
-                    <v>677</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>677</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_singleton_class</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>677</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>ruby_singleton_class</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>677</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_singleton_class_def</name>
-            <cardinality>677</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>677</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>677</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>677</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>677</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_singleton_method_body</name>
-            <cardinality>6313</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_singleton_method</k>
-                    <v>6313</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>6313</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_singleton_method</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6313</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>ruby_singleton_method</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6313</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_singleton_method_def</name>
-            <cardinality>6325</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>6325</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>6325</v>
-                </e>
-                <e>
-                    <k>object</k>
-                    <v>6325</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6325</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>object</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6325</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6325</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>object</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6325</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>object</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6325</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>object</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6325</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_singleton_method_parameters</name>
-            <cardinality>3929</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_singleton_method</k>
-                    <v>3929</v>
-                </e>
-                <e>
-                    <k>parameters</k>
-                    <v>3929</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_singleton_method</src>
-                    <trg>parameters</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3929</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parameters</src>
-                    <trg>ruby_singleton_method</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3929</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_splat_argument_child</name>
-            <cardinality>3605</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_splat_argument</k>
-                    <v>3605</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>3605</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_splat_argument</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3605</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_splat_argument</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3605</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_splat_argument_def</name>
-            <cardinality>3606</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>3606</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_splat_parameter_def</name>
-            <cardinality>3014</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>3014</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_splat_parameter_name</name>
-            <cardinality>2297</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_splat_parameter</k>
-                    <v>2297</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>2297</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_splat_parameter</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2297</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>ruby_splat_parameter</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2297</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_string_array_child</name>
-            <cardinality>13136</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_string_array</k>
-                    <v>4120</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>606</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>13136</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_string_array</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1350</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1304</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>630</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>356</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>10</b>
-                                    <v>332</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>607</b>
-                                    <v>148</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_string_array</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1350</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1304</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>630</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>356</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>10</b>
-                                    <v>332</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>607</b>
-                                    <v>148</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_string_array</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>506</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>10</b>
-                                    <v>48</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>266</b>
-                                    <v>46</v>
-                                </b>
-                                <b>
-                                    <a>344</a>
-                                    <b>4121</b>
-                                    <v>6</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>506</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>10</b>
-                                    <v>48</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>266</b>
-                                    <v>46</v>
-                                </b>
-                                <b>
-                                    <a>344</a>
-                                    <b>4121</b>
-                                    <v>6</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_string_array</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13136</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13136</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_string_array_def</name>
-            <cardinality>4287</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>4287</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_string_child</name>
-            <cardinality>559228</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_string__</k>
-                    <v>483542</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>281</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>559228</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_string__</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>454555</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>282</b>
-                                    <v>28987</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_string__</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>454555</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>282</b>
-                                    <v>28987</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_string__</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>95</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>34</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>64</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>22</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>37</b>
-                                    <v>22</v>
-                                </b>
-                                <b>
-                                    <a>37</a>
-                                    <b>108</b>
-                                    <v>22</v>
-                                </b>
-                                <b>
-                                    <a>129</a>
-                                    <b>483543</b>
-                                    <v>22</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>95</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>34</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>64</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>22</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>37</b>
-                                    <v>22</v>
-                                </b>
-                                <b>
-                                    <a>37</a>
-                                    <b>108</b>
-                                    <v>22</v>
-                                </b>
-                                <b>
-                                    <a>129</a>
-                                    <b>483543</b>
-                                    <v>22</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_string__</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>559228</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>559228</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_string_def</name>
-            <cardinality>490602</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>490602</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_subshell_child</name>
-            <cardinality>551</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_subshell</k>
-                    <v>359</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>32</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>551</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_subshell</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>263</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>53</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>32</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>12</b>
-                                    <v>8</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_subshell</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>263</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>53</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>32</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>12</b>
-                                    <v>8</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_subshell</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>32</a>
-                                    <b>33</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>120</a>
-                                    <b>121</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>32</a>
-                                    <b>33</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>120</a>
-                                    <b>121</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_subshell</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>551</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>551</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_subshell_def</name>
-            <cardinality>359</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>359</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_superclass_def</name>
-            <cardinality>13806</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>13806</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>13806</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13806</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13806</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_symbol_array_child</name>
-            <cardinality>8435</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_symbol_array</k>
-                    <v>2240</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>233</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>8435</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_symbol_array</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>219</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1129</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>347</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>160</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>189</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>24</b>
-                                    <v>170</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>100</b>
-                                    <v>23</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_symbol_array</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>219</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1129</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>347</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>160</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>8</b>
-                                    <v>189</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>24</b>
-                                    <v>170</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>100</b>
-                                    <v>23</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_symbol_array</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>139</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>17</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>41</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>163</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>230</a>
-                                    <b>949</b>
-                                    <v>9</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>139</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>17</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>41</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>163</b>
-                                    <v>18</v>
-                                </b>
-                                <b>
-                                    <a>230</a>
-                                    <b>949</b>
-                                    <v>9</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_symbol_array</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8435</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8435</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_symbol_array_def</name>
-            <cardinality>2240</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>2240</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_test_pattern_def</name>
-            <cardinality>5</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>5</v>
-                </e>
-                <e>
-                    <k>pattern</k>
-                    <v>5</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>5</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>pattern</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>pattern</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_then_child</name>
-            <cardinality>37016</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_then</k>
-                    <v>22229</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>85</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>37016</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_then</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13943</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>5070</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1817</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>37</b>
-                                    <v>1398</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_then</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>13943</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>5070</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1817</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>37</b>
-                                    <v>1398</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_then</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>30</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>4</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>9</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>19</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>30</a>
-                                    <b>61</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>98</a>
-                                    <b>310</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>592</a>
-                                    <b>3508</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>9408</a>
-                                    <b>9409</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>30</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>4</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>9</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>19</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>30</a>
-                                    <b>61</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>98</a>
-                                    <b>310</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>592</a>
-                                    <b>3508</b>
-                                    <v>7</v>
-                                </b>
-                                <b>
-                                    <a>9408</a>
-                                    <b>9409</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_then</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>37016</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>37016</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_then_def</name>
-            <cardinality>22229</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>22229</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_tokeninfo</name>
-            <cardinality>6351611</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>6351611</v>
-                </e>
-                <e>
-                    <k>kind</k>
-                    <v>56</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>275925</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6351611</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6351611</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>49</a>
-                                    <b>160</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>291</a>
-                                    <b>443</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>2054</a>
-                                    <b>2055</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>2462</a>
-                                    <b>2463</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>5047</a>
-                                    <b>5260</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>5496</a>
-                                    <b>7346</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>10365</a>
-                                    <b>10609</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>15376</a>
-                                    <b>22709</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>31415</a>
-                                    <b>70704</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>77014</a>
-                                    <b>106932</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>129596</a>
-                                    <b>673263</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>1509036</a>
-                                    <b>1509037</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>16</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>26</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>36</a>
-                                    <b>48</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>68</a>
-                                    <b>121</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>151</a>
-                                    <b>181</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>1509</a>
-                                    <b>2060</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>3983</a>
-                                    <b>4628</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>5781</a>
-                                    <b>9380</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>13063</a>
-                                    <b>24102</b>
-                                    <v>4</v>
-                                </b>
-                                <b>
-                                    <a>58689</a>
-                                    <b>58690</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>164156</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>41140</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>19333</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>22761</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>29</b>
-                                    <v>20750</v>
-                                </b>
-                                <b>
-                                    <a>29</a>
-                                    <b>243390</b>
-                                    <v>7783</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>262839</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>5</b>
-                                    <v>13085</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_unary_def</name>
-            <cardinality>14535</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>14535</v>
-                </e>
-                <e>
-                    <k>operand</k>
-                    <v>14535</v>
-                </e>
-                <e>
-                    <k>operator</k>
-                    <v>6</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>operand</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>14535</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>operator</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>14535</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>operand</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>14535</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>operand</src>
-                    <trg>operator</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>14535</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>operator</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>97</a>
-                                    <b>98</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>172</a>
-                                    <b>173</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>947</a>
-                                    <b>948</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1369</a>
-                                    <b>1370</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2120</a>
-                                    <b>2121</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9830</a>
-                                    <b>9831</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>operator</src>
-                    <trg>operand</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>97</a>
-                                    <b>98</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>172</a>
-                                    <b>173</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>947</a>
-                                    <b>948</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>1369</a>
-                                    <b>1370</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>2120</a>
-                                    <b>2121</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>9830</a>
-                                    <b>9831</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_undef_child</name>
-            <cardinality>183</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_undef</k>
-                    <v>182</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>2</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>183</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_undef</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>181</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_undef</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>181</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_undef</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>182</a>
-                                    <b>183</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>182</a>
-                                    <b>183</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_undef</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>183</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>183</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_undef_def</name>
-            <cardinality>182</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>182</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_unless_alternative</name>
-            <cardinality>43</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_unless</k>
-                    <v>43</v>
-                </e>
-                <e>
-                    <k>alternative</k>
-                    <v>43</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_unless</src>
-                    <trg>alternative</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>43</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>alternative</src>
-                    <trg>ruby_unless</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>43</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_unless_consequence</name>
-            <cardinality>2721</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_unless</k>
-                    <v>2721</v>
-                </e>
-                <e>
-                    <k>consequence</k>
-                    <v>2721</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_unless</src>
-                    <trg>consequence</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2721</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>consequence</src>
-                    <trg>ruby_unless</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2721</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_unless_def</name>
-            <cardinality>2723</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>2723</v>
-                </e>
-                <e>
-                    <k>condition</k>
-                    <v>2723</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2723</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2723</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_unless_guard_def</name>
-            <cardinality>4</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>4</v>
-                </e>
-                <e>
-                    <k>condition</k>
-                    <v>4</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_unless_modifier_def</name>
-            <cardinality>3416</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>3416</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>3416</v>
-                </e>
-                <e>
-                    <k>condition</k>
-                    <v>3416</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3416</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3416</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3416</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3416</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3416</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3416</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_until_def</name>
-            <cardinality>126</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>126</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>126</v>
-                </e>
-                <e>
-                    <k>condition</k>
-                    <v>126</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>126</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>126</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>126</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>126</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>126</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>126</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_until_modifier_def</name>
-            <cardinality>238</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>238</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>238</v>
-                </e>
-                <e>
-                    <k>condition</k>
-                    <v>238</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>238</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>238</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>238</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>238</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>238</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>238</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_variable_reference_pattern_def</name>
-            <cardinality>5</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>5</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>5</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_when_body</name>
-            <cardinality>3790</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_when</k>
-                    <v>3790</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>3790</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_when</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3790</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>ruby_when</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3790</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_when_def</name>
-            <cardinality>3882</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>3882</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>ruby_when_pattern</name>
-            <cardinality>4745</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_when</k>
-                    <v>3882</v>
-                </e>
-                <e>
-                    <k>index</k>
-                    <v>15</v>
-                </e>
-                <e>
-                    <k>pattern</k>
-                    <v>4745</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_when</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3393</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>330</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>16</b>
-                                    <v>159</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>ruby_when</src>
-                    <trg>pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>3393</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>330</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>16</b>
-                                    <v>159</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>ruby_when</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>20</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>31</a>
-                                    <b>32</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>45</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>90</a>
-                                    <b>91</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>159</a>
-                                    <b>160</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>489</a>
-                                    <b>490</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3882</a>
-                                    <b>3883</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>index</src>
-                    <trg>pattern</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>2</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>20</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>31</a>
-                                    <b>32</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>44</a>
-                                    <b>45</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>90</a>
-                                    <b>91</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>159</a>
-                                    <b>160</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>489</a>
-                                    <b>490</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>3882</a>
-                                    <b>3883</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>pattern</src>
-                    <trg>ruby_when</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4745</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>pattern</src>
-                    <trg>index</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4745</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_while_def</name>
-            <cardinality>1413</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>1413</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>1413</v>
-                </e>
-                <e>
-                    <k>condition</k>
-                    <v>1413</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1413</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1413</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1413</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1413</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1413</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1413</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_while_modifier_def</name>
-            <cardinality>198</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>198</v>
-                </e>
-                <e>
-                    <k>body</k>
-                    <v>198</v>
-                </e>
-                <e>
-                    <k>condition</k>
-                    <v>198</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>198</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>198</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>198</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>body</src>
-                    <trg>condition</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>198</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>198</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>condition</src>
-                    <trg>body</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>198</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_yield_child</name>
-            <cardinality>1103</cardinality>
-            <columnsizes>
-                <e>
-                    <k>ruby_yield</k>
-                    <v>1103</v>
-                </e>
-                <e>
-                    <k>child</k>
-                    <v>1103</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>ruby_yield</src>
-                    <trg>child</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1103</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>child</src>
-                    <trg>ruby_yield</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1103</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>ruby_yield_def</name>
-            <cardinality>2450</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>2450</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>sourceLocationPrefix</name>
-            <cardinality>13</cardinality>
-            <columnsizes>
-                <e>
-                    <k>prefix</k>
-                    <v>13</v>
-                </e>
-            </columnsizes>
-            <dependencies/>
-        </relation>
-        <relation>
-            <name>yaml</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>kind</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>parent</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>idx</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>tag</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>tostring</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>idx</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>tostring</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>idx</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>kind</src>
-                    <trg>tostring</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>idx</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>parent</src>
-                    <trg>tostring</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>idx</src>
-                    <trg>tostring</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tag</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tag</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tag</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tag</src>
-                    <trg>idx</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tag</src>
-                    <trg>tostring</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tostring</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tostring</src>
-                    <trg>kind</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tostring</src>
-                    <trg>parent</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tostring</src>
-                    <trg>idx</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>tostring</src>
-                    <trg>tag</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </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>
-        <relation>
-            <name>yaml_aliases</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>alias</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>target</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>alias</src>
-                    <trg>target</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>target</src>
-                    <trg>alias</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>yaml_anchors</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>node</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>anchor</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>node</src>
-                    <trg>anchor</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>anchor</src>
-                    <trg>node</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>yaml_errors</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>message</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>message</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>yaml_locations</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>locatable</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>location</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>locatable</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>location</src>
-                    <trg>locatable</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>yaml_scalars</name>
-            <cardinality>0</cardinality>
-            <columnsizes>
-                <e>
-                    <k>scalar</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>style</k>
-                    <v>0</v>
-                </e>
-                <e>
-                    <k>value</k>
-                    <v>0</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>scalar</src>
-                    <trg>style</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>scalar</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>2</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>style</src>
-                    <trg>scalar</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>style</src>
-                    <trg>value</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>scalar</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>value</src>
-                    <trg>style</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs/>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        </stats>
+     <typesizes />
+     <stats />
 </dbstats>
diff --git a/ruby/ql/src/CHANGELOG.md b/ruby/ql/src/CHANGELOG.md
index 247072967e7..ddefff5e95b 100644
--- a/ruby/ql/src/CHANGELOG.md
+++ b/ruby/ql/src/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.5.9
+
+No user-facing changes.
+
+## 1.5.8
+
+No user-facing changes.
+
 ## 1.5.7
 
 No user-facing changes.
diff --git a/ruby/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md b/ruby/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md
new file mode 100644
index 00000000000..459c2ce7f91
--- /dev/null
+++ b/ruby/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md
@@ -0,0 +1,5 @@
+---
+category: queryMetadata
+---
+* The `@security-severity` metadata of `rb/log-injection` has been reduced from 7.8 (high) to 6.1 (medium).
+* The `@security-severity` metadata of `rb/reflected-xss`, `rb/stored-xss` and `rb/html-constructed-from-input` has been increased from 6.1 (medium) to 7.8 (high).
diff --git a/ruby/ql/src/change-notes/released/1.5.8.md b/ruby/ql/src/change-notes/released/1.5.8.md
new file mode 100644
index 00000000000..ec8f84e657f
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.5.8.md
@@ -0,0 +1,3 @@
+## 1.5.8
+
+No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.5.9.md b/ruby/ql/src/change-notes/released/1.5.9.md
new file mode 100644
index 00000000000..be9d418e598
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.5.9.md
@@ -0,0 +1,3 @@
+## 1.5.9
+
+No user-facing changes.
diff --git a/ruby/ql/src/codeql-pack.release.yml b/ruby/ql/src/codeql-pack.release.yml
index 227ac5febef..5ac7d08bfbf 100644
--- a/ruby/ql/src/codeql-pack.release.yml
+++ b/ruby/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.5.7
+lastReleaseVersion: 1.5.9
diff --git a/ruby/ql/src/experimental/cwe-176/examples/unicode_normalization.rb b/ruby/ql/src/experimental/cwe-176/examples/unicode_normalization.rb
index 099c2cfa051..8da39bcf3c8 100644
--- a/ruby/ql/src/experimental/cwe-176/examples/unicode_normalization.rb
+++ b/ruby/ql/src/experimental/cwe-176/examples/unicode_normalization.rb
@@ -4,7 +4,7 @@ class UnicodeNormalizationHtMLSafeController < ActionController::Base
   def unicodeNormalize
     unicode_input = params[:unicode_input]
     unicode_html_safe = ERB::Util.html_escape(unicode_input)
-    normalized_nfkc = unicode_html_safe.unicode_normalize(:nfkc) # $result=BAD
-    normalized_nfc = unicode_html_safe.unicode_normalize(:nfc) # $result=BAD
+    normalized_nfkc = unicode_html_safe.unicode_normalize(:nfkc) # $ result=BAD
+    normalized_nfc = unicode_html_safe.unicode_normalize(:nfc) # $ result=BAD
   end
 end
diff --git a/ruby/ql/src/qlpack.yml b/ruby/ql/src/qlpack.yml
index b027389bc63..6978ce40015 100644
--- a/ruby/ql/src/qlpack.yml
+++ b/ruby/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-queries
-version: 1.5.8-dev
+version: 1.5.10-dev
 groups:
   - ruby
   - queries
diff --git a/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql b/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql
index 8cc60618cc5..04eed164046 100644
--- a/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql
+++ b/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql
@@ -4,7 +4,7 @@
  *              allows for a cross-site scripting vulnerability.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 6.1
+ * @security-severity 7.8
  * @sub-severity high
  * @precision high
  * @id rb/reflected-xss
diff --git a/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql b/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql
index a621aee00b0..a2a1752f7f4 100644
--- a/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql
+++ b/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql
@@ -4,7 +4,7 @@
  *              a stored cross-site scripting vulnerability.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 6.1
+ * @security-severity 7.8
  * @precision high
  * @id rb/stored-xss
  * @tags security
diff --git a/ruby/ql/src/queries/security/cwe-079/UnsafeHtmlConstruction.ql b/ruby/ql/src/queries/security/cwe-079/UnsafeHtmlConstruction.ql
index c1527783fc3..3fa40cd6f91 100644
--- a/ruby/ql/src/queries/security/cwe-079/UnsafeHtmlConstruction.ql
+++ b/ruby/ql/src/queries/security/cwe-079/UnsafeHtmlConstruction.ql
@@ -4,7 +4,7 @@
  *              user to perform a cross-site scripting attack.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 6.1
+ * @security-severity 7.8
  * @precision high
  * @id rb/html-constructed-from-input
  * @tags security
diff --git a/ruby/ql/src/queries/security/cwe-117/LogInjection.ql b/ruby/ql/src/queries/security/cwe-117/LogInjection.ql
index 624c2f90e64..50a4a718e32 100644
--- a/ruby/ql/src/queries/security/cwe-117/LogInjection.ql
+++ b/ruby/ql/src/queries/security/cwe-117/LogInjection.ql
@@ -4,7 +4,7 @@
  *              insertion of forged log entries by a malicious user.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 7.8
+ * @security-severity 6.1
  * @precision medium
  * @id rb/log-injection
  * @tags security
diff --git a/ruby/ql/test/library-tests/dataflow/api-graphs/callbacks.rb b/ruby/ql/test/library-tests/dataflow/api-graphs/callbacks.rb
index 35cf4471b48..e200d5686d9 100644
--- a/ruby/ql/test/library-tests/dataflow/api-graphs/callbacks.rb
+++ b/ruby/ql/test/library-tests/dataflow/api-graphs/callbacks.rb
@@ -1,39 +1,39 @@
-Something.foo.withCallback do |a, b| #$ source=Member[Something].Method[foo].ReturnValue
-    a.something #$ source=Member[Something].Method[foo].ReturnValue.Method[withCallback].Argument[block].Argument[0].Method[something].ReturnValue
-    b.somethingElse #$ source=Member[Something].Method[foo].ReturnValue.Method[withCallback].Argument[block].Argument[1].Method[somethingElse].ReturnValue
-end #$ source=Member[Something].Method[foo].ReturnValue.Method[withCallback].ReturnValue
+Something.foo.withCallback do |a, b| # $ source=Member[Something].Method[foo].ReturnValue
+    a.something # $ source=Member[Something].Method[foo].ReturnValue.Method[withCallback].Argument[block].Argument[0].Method[something].ReturnValue
+    b.somethingElse # $ source=Member[Something].Method[foo].ReturnValue.Method[withCallback].Argument[block].Argument[1].Method[somethingElse].ReturnValue
+end # $ source=Member[Something].Method[foo].ReturnValue.Method[withCallback].ReturnValue
 
-Something.withNamedArg do |a:, b: nil| #$ source=Member[Something]
-    a.something #$ source=Member[Something].Method[withNamedArg].Argument[block].Parameter[a:].Method[something].ReturnValue
-    b.somethingElse #$ source=Member[Something].Method[withNamedArg].Argument[block].Parameter[b:].Method[somethingElse].ReturnValue
-end #$ source=Member[Something].Method[withNamedArg].ReturnValue
+Something.withNamedArg do |a:, b: nil| # $ source=Member[Something]
+    a.something # $ source=Member[Something].Method[withNamedArg].Argument[block].Parameter[a:].Method[something].ReturnValue
+    b.somethingElse # $ source=Member[Something].Method[withNamedArg].Argument[block].Parameter[b:].Method[somethingElse].ReturnValue
+end # $ source=Member[Something].Method[withNamedArg].ReturnValue
 
-Something.withLambda ->(a, b) { #$ source=Member[Something]
-    a.something #$ source=Member[Something].Method[withLambda].Argument[0].Parameter[0].Method[something].ReturnValue
-    b.something #$ source=Member[Something].Method[withLambda].Argument[0].Parameter[1].Method[something].ReturnValue
-} #$ source=Member[Something].Method[withLambda].ReturnValue
+Something.withLambda ->(a, b) { # $ source=Member[Something]
+    a.something # $ source=Member[Something].Method[withLambda].Argument[0].Parameter[0].Method[something].ReturnValue
+    b.something # $ source=Member[Something].Method[withLambda].Argument[0].Parameter[1].Method[something].ReturnValue
+} # $ source=Member[Something].Method[withLambda].ReturnValue
 
-Something.namedCallback( #$ source=Member[Something]
+Something.namedCallback( # $ source=Member[Something]
     onEvent: ->(a, b) {
-        a.something #$ source=Member[Something].Method[namedCallback].Argument[onEvent:].Parameter[0].Method[something].ReturnValue
-        b.something #$ source=Member[Something].Method[namedCallback].Argument[onEvent:].Parameter[1].Method[something].ReturnValue
+        a.something # $ source=Member[Something].Method[namedCallback].Argument[onEvent:].Parameter[0].Method[something].ReturnValue
+        b.something # $ source=Member[Something].Method[namedCallback].Argument[onEvent:].Parameter[1].Method[something].ReturnValue
     }
-) #$ source=Member[Something].Method[namedCallback].ReturnValue
+) # $ source=Member[Something].Method[namedCallback].ReturnValue
 
-Something.nestedCall1 do |a| #$ source=Member[Something]
-    a.nestedCall2 do |b:| #$ reachableFromSource=Member[Something].Method[nestedCall1].Argument[block].Parameter[0]
-        b.something #$ source=Member[Something].Method[nestedCall1].Argument[block].Parameter[0].Method[nestedCall2].Argument[block].Parameter[b:].Method[something].ReturnValue
-    end #$ source=Member[Something].Method[nestedCall1].Argument[block].Parameter[0].Method[nestedCall2].ReturnValue
-end #$ source=Member[Something].Method[nestedCall1].ReturnValue
+Something.nestedCall1 do |a| # $ source=Member[Something]
+    a.nestedCall2 do |b:| # $ reachableFromSource=Member[Something].Method[nestedCall1].Argument[block].Parameter[0]
+        b.something # $ source=Member[Something].Method[nestedCall1].Argument[block].Parameter[0].Method[nestedCall2].Argument[block].Parameter[b:].Method[something].ReturnValue
+    end # $ source=Member[Something].Method[nestedCall1].Argument[block].Parameter[0].Method[nestedCall2].ReturnValue
+end # $ source=Member[Something].Method[nestedCall1].ReturnValue
 
 def getCallback()
     ->(x) {
-        x.something #$ source=Member[Something].Method[indirectCallback].Argument[0].Parameter[0].Method[something].ReturnValue
+        x.something # $ source=Member[Something].Method[indirectCallback].Argument[0].Parameter[0].Method[something].ReturnValue
     }
 end
-Something.indirectCallback(getCallback()) #$ source=Member[Something].Method[indirectCallback].ReturnValue
+Something.indirectCallback(getCallback()) # $ source=Member[Something].Method[indirectCallback].ReturnValue
 
-Something.withMixed do |a, *args, b| #$ source=Member[Something]
-    a.something #$ source=Member[Something].Method[withMixed].Argument[block].Parameter[0].Method[something].ReturnValue
+Something.withMixed do |a, *args, b| # $ source=Member[Something]
+    a.something # $ source=Member[Something].Method[withMixed].Argument[block].Parameter[0].Method[something].ReturnValue
     # b.something # not currently handled correctly
-end #$ source=Member[Something].Method[withMixed].ReturnValue
+end # $ source=Member[Something].Method[withMixed].ReturnValue
diff --git a/ruby/ql/test/library-tests/dataflow/api-graphs/test1.rb b/ruby/ql/test/library-tests/dataflow/api-graphs/test1.rb
index 3af793dd4f7..3660d8241ab 100644
--- a/ruby/ql/test/library-tests/dataflow/api-graphs/test1.rb
+++ b/ruby/ql/test/library-tests/dataflow/api-graphs/test1.rb
@@ -1,34 +1,34 @@
-MyModule #$ source=Member[MyModule]
-print MyModule.foo #$ source=Member[MyModule].Method[foo].ReturnValue
-Kernel.print(e) #$ source=Member[Kernel].Method[print].ReturnValue sink=Member[Kernel].Method[print].Argument[0]
-Object::Kernel #$ source=Member[Kernel]
-Object::Kernel.print(e)  #$ source=Member[Kernel].Method[print].ReturnValue
+MyModule # $ source=Member[MyModule]
+print MyModule.foo # $ source=Member[MyModule].Method[foo].ReturnValue
+Kernel.print(e) # $ source=Member[Kernel].Method[print].ReturnValue sink=Member[Kernel].Method[print].Argument[0]
+Object::Kernel # $ source=Member[Kernel]
+Object::Kernel.print(e)  # $ source=Member[Kernel].Method[print].ReturnValue
 begin
-    print MyModule.bar #$ source=Member[MyModule].Method[bar].ReturnValue
-    raise AttributeError #$ source=Member[AttributeError]
-rescue AttributeError => e #$ source=Member[AttributeError]
-    Kernel.print(e)  #$ source=Member[Kernel].Method[print].ReturnValue
+    print MyModule.bar # $ source=Member[MyModule].Method[bar].ReturnValue
+    raise AttributeError # $ source=Member[AttributeError]
+rescue AttributeError => e # $ source=Member[AttributeError]
+    Kernel.print(e)  # $ source=Member[Kernel].Method[print].ReturnValue
 end
-Unknown.new.run #$ source=Member[Unknown].Method[new].ReturnValue.Method[run].ReturnValue
-Foo::Bar::Baz #$ source=Member[Foo].Member[Bar].Member[Baz]
+Unknown.new.run # $ source=Member[Unknown].Method[new].ReturnValue.Method[run].ReturnValue
+Foo::Bar::Baz # $ source=Member[Foo].Member[Bar].Member[Baz]
 
-Const = [1, 2, 3] #$ source=Member[Array].MethodBracket.ReturnValue
-Const.each do |c| #$ source=Member[Const]
-    puts c #$ reachableFromSource=Member[Const].Method[each].Argument[block].Parameter[0] reachableFromSource=Member[Const].Element[any]
-end #$ source=Member[Const].Method[each].ReturnValue sink=Member[Const].Method[each].Argument[block]
+Const = [1, 2, 3] # $ source=Member[Array].MethodBracket.ReturnValue
+Const.each do |c| # $ source=Member[Const]
+    puts c # $ reachableFromSource=Member[Const].Method[each].Argument[block].Parameter[0] reachableFromSource=Member[Const].Element[any]
+end # $ source=Member[Const].Method[each].ReturnValue sink=Member[Const].Method[each].Argument[block]
 
-foo = Foo #$ source=Member[Foo]
-foo::Bar::Baz #$ source=Member[Foo].Member[Bar].Member[Baz]
+foo = Foo # $ source=Member[Foo]
+foo::Bar::Baz # $ source=Member[Foo].Member[Bar].Member[Baz]
 
-FooAlias = Foo #$ source=Member[Foo]
-FooAlias::Bar::Baz #$ source=Member[Foo].Member[Bar].Member[Baz] source=Member[FooAlias].Member[Bar].Member[Baz]
+FooAlias = Foo # $ source=Member[Foo]
+FooAlias::Bar::Baz # $ source=Member[Foo].Member[Bar].Member[Baz] source=Member[FooAlias].Member[Bar].Member[Baz]
 
 module Outer
     module Inner
     end
 end
 
-Outer::Inner.foo #$ source=Member[Outer].Member[Inner].Method[foo].ReturnValue
+Outer::Inner.foo # $ source=Member[Outer].Member[Inner].Method[foo].ReturnValue
 
 module M1
     class C1
@@ -40,36 +40,36 @@ module M1
     end
 end
 
-class C2 < M1::C1 #$ source=Member[M1].Member[C1]
+class C2 < M1::C1 # $ source=Member[M1].Member[C1]
 end
 
 module M2
-    class C3 < M1::C1 #$ source=Member[M1].Member[C1]
+    class C3 < M1::C1 # $ source=Member[M1].Member[C1]
     end
 
-    class C4 < C2 #$ source=Member[C2]
+    class C4 < C2 # $ source=Member[C2]
     end
 end
 
-C2 #$ source=Member[C2] reachableFromSource=Member[M1].Member[C1]
-M2::C3 #$ source=Member[M2].Member[C3] reachableFromSource=Member[M1].Member[C1]
-M2::C4 #$ source=Member[M2].Member[C4] reachableFromSource=Member[C2] reachableFromSource=Member[M1].Member[C1]
+C2 # $ source=Member[C2] reachableFromSource=Member[M1].Member[C1]
+M2::C3 # $ source=Member[M2].Member[C3] reachableFromSource=Member[M1].Member[C1]
+M2::C4 # $ source=Member[M2].Member[C4] reachableFromSource=Member[C2] reachableFromSource=Member[M1].Member[C1]
 
-M1::C1.m #$ source=Member[M1].Member[C1].Method[m].ReturnValue
-M2::C3.m #$ source=Member[M2].Member[C3].Method[m].ReturnValue source=Member[M1].Member[C1].Method[m].ReturnValue
+M1::C1.m # $ source=Member[M1].Member[C1].Method[m].ReturnValue
+M2::C3.m # $ source=Member[M2].Member[C3].Method[m].ReturnValue source=Member[M1].Member[C1].Method[m].ReturnValue
 
-M1::C1.new.m #$ source=Member[M1].Member[C1].Method[new].ReturnValue.Method[m].ReturnValue
-M2::C3.new.m #$ source=Member[M2].Member[C3].Method[new].ReturnValue.Method[m].ReturnValue
+M1::C1.new.m # $ source=Member[M1].Member[C1].Method[new].ReturnValue.Method[m].ReturnValue
+M2::C3.new.m # $ source=Member[M2].Member[C3].Method[new].ReturnValue.Method[m].ReturnValue
 
-Foo.foo(a,b:c) #$ source=Member[Foo].Method[foo].ReturnValue sink=Member[Foo].Method[foo].Argument[0] sink=Member[Foo].Method[foo].Argument[b:]
+Foo.foo(a,b:c) # $ source=Member[Foo].Method[foo].ReturnValue sink=Member[Foo].Method[foo].Argument[0] sink=Member[Foo].Method[foo].Argument[b:]
 
 def userDefinedFunction(x, y)
     x.noApiGraph(y)
-    x.customEntryPointCall(y) #$ call=EntryPoint[CustomEntryPointCall] source=EntryPoint[CustomEntryPointCall].ReturnValue sink=EntryPoint[CustomEntryPointCall].Parameter[0]
-    x.customEntryPointUse(y) #$ source=EntryPoint[CustomEntryPointUse]
+    x.customEntryPointCall(y) # $ call=EntryPoint[CustomEntryPointCall] source=EntryPoint[CustomEntryPointCall].ReturnValue sink=EntryPoint[CustomEntryPointCall].Parameter[0]
+    x.customEntryPointUse(y) # $ source=EntryPoint[CustomEntryPointUse]
 end
 
-array = [A::B::C] #$ source=Member[Array].MethodBracket.ReturnValue
-array[0].m #$ source=Member[A].Member[B].Member[C].Method[m].ReturnValue source=Member[Array].MethodBracket.ReturnValue.Element[0].Method[m].ReturnValue
+array = [A::B::C] # $ source=Member[Array].MethodBracket.ReturnValue
+array[0].m # $ source=Member[A].Member[B].Member[C].Method[m].ReturnValue source=Member[Array].MethodBracket.ReturnValue.Element[0].Method[m].ReturnValue
 
-A::B::C[0] #$ source=Member[A].Member[B].Member[C].Element[0]
+A::B::C[0] # $ source=Member[A].Member[B].Member[C].Element[0]
diff --git a/ruby/ql/test/library-tests/dataflow/flow-summaries/semantics.rb b/ruby/ql/test/library-tests/dataflow/flow-summaries/semantics.rb
index 710c949e49e..c0961829858 100644
--- a/ruby/ql/test/library-tests/dataflow/flow-summaries/semantics.rb
+++ b/ruby/ql/test/library-tests/dataflow/flow-summaries/semantics.rb
@@ -45,8 +45,8 @@ end
 def m8
     sink(s8 { source "a" }) # $ hasValueFlow=a
     sink(s8 do
-        source "a" 
-    end) # $hasValueFlow=a
+        source "a"
+    end) # $ hasValueFlow=a
 end
 
 def m9
@@ -259,7 +259,7 @@ def m31(h, i)
     h[:bar] = source("b")
     h[1] = source("c")
     h[i] = source("d")
-    
+
     sink s31(h) # $ hasValueFlow=a hasValueFlow=d
 end
 
@@ -269,7 +269,7 @@ def m32(h, i)
     h[:bar] = source("c")
     h[1] = source("d")
     h[i] = source("e")
-    
+
     sink s32(h) # $ hasValueFlow=b $ hasValueFlow=e $ SPURIOUS: hasValueFlow=a
 end
 
@@ -282,7 +282,7 @@ def m33(h, i)
     h[nil] = source("f")
     h[true] = source("g")
     h[false] = source("h")
-    
+
     sink s33(h) # $ hasValueFlow=e hasValueFlow=f hasValueFlow=g hasValueFlow=h
 end
 
@@ -312,7 +312,7 @@ end
 def m38(h, i)
     h["foo"] = source("a")
     h[i] = source("b")
-    
+
     sink s38(h) # $ hasValueFlow=a
 end
 
@@ -364,7 +364,7 @@ def m44(i, h)
     h[i] = source("c")
 
     s44(h)
-    
+
     sink h[0]
     sink h[1] # $ hasValueFlow=b
     sink h[i] # $ hasValueFlow=b
@@ -380,7 +380,7 @@ def m45(i, h)
     sink h[i] # $ hasValueFlow=a hasValueFlow=b hasValueFlow=c
 
     s45(h)
-    
+
     sink h[0] # $ hasValueFlow=c
     sink h[1] # $ hasValueFlow=b hasValueFlow=c
     sink h[i] # $ hasValueFlow=b hasValueFlow=c
@@ -396,7 +396,7 @@ def m46(i, h)
     sink h[i] # $ hasValueFlow=a hasValueFlow=b hasValueFlow=c
 
     x = s46(h)
-    
+
     sink x[0]
     sink x[1] # $ hasValueFlow=b
     sink x[i] # $ hasValueFlow=b
@@ -406,12 +406,12 @@ def m47(i, h)
     h[:foo] = source("a")
     h[:bar] = source("b")
     h[i] = source("c")
-    
+
     sink h[:foo] # $ hasValueFlow=a hasValueFlow=c
     sink h[:bar] # $ hasValueFlow=b hasValueFlow=c
-    
+
     x = s47(h)
-    
+
     sink x[:foo]
     sink x[:bar] # $ hasValueFlow=b
 end
@@ -420,12 +420,12 @@ def m48(i, h)
     h[:foo] = source("a")
     h[:bar] = source("b")
     h[i] = source("c")
-    
+
     sink h[:foo] # $ hasValueFlow=a hasValueFlow=c
     sink h[:bar] # $ hasValueFlow=b hasValueFlow=c
-    
+
     x = s48(h)
-    
+
     sink x[:foo]
     sink x[:bar] # $ hasValueFlow=b
 end
@@ -434,12 +434,12 @@ def m49(i, h)
     h[:foo] = source("a")
     h[:bar] = source("b")
     h[i] = source("c")
-    
+
     sink h[:foo] # $ hasValueFlow=a hasValueFlow=c
     sink h[:bar] # $ hasValueFlow=b hasValueFlow=c
-    
+
     x = s49(h)
-    
+
     sink x[:foo] # $ hasValueFlow=c
     sink x[:bar] # $ hasValueFlow=b hasValueFlow=c
 end
@@ -448,12 +448,12 @@ def m50(i, h)
     h[:foo] = source("a")
     h[:bar] = source("b")
     h[i] = source("c")
-    
+
     sink h[:foo] # $ hasValueFlow=a hasValueFlow=c
     sink h[:bar] # $ hasValueFlow=b hasValueFlow=c
-    
+
     s50(h)
-    
+
     sink h[:foo]
     sink h[:bar] # $ hasValueFlow=b
 end
@@ -462,12 +462,12 @@ def m51(i, h)
     h[:foo] = source("a")
     h[:bar] = source("b")
     h[i] = source("c")
-    
+
     sink h[:foo] # $ hasValueFlow=a hasValueFlow=c
     sink h[:bar] # $ hasValueFlow=b hasValueFlow=c
-    
+
     s51(h)
-    
+
     sink h[:foo] # $ hasValueFlow=c
     sink h[:bar] # $ hasValueFlow=b hasValueFlow=c
 end
@@ -476,12 +476,12 @@ def m52(i, h)
     h[:foo] = source("a")
     h[:bar] = source("b")
     h[i] = source("c")
-    
+
     sink h[:foo] # $ hasValueFlow=a hasValueFlow=c
     sink h[:bar] # $ hasValueFlow=b hasValueFlow=c
-    
+
     h.s52
-    
+
     sink h[:foo]
     sink h[:bar] # $ hasValueFlow=b
 end
@@ -490,12 +490,12 @@ def m53(i, h)
     h[:foo] = source("a")
     h[:bar] = source("b")
     h[i] = source("c")
-    
+
     sink h[:foo] # $ hasValueFlow=a hasValueFlow=c
     sink h[:bar] # $ hasValueFlow=b hasValueFlow=c
-    
+
     x = h.s53()
-    
+
     sink x[:foo]
     sink x[:bar] # $ hasValueFlow=b
 
diff --git a/ruby/ql/test/library-tests/dataflow/local/TaintStep.expected b/ruby/ql/test/library-tests/dataflow/local/TaintStep.expected
index 4fa46d163b4..353edd203f9 100644
--- a/ruby/ql/test/library-tests/dataflow/local/TaintStep.expected
+++ b/ruby/ql/test/library-tests/dataflow/local/TaintStep.expected
@@ -2921,13 +2921,11 @@
 | file://:0:0:0:0 | [summary param] position 0 in File.realdirpath | file://:0:0:0:0 | [summary] to write: ReturnValue in File.realdirpath |
 | file://:0:0:0:0 | [summary param] position 0 in File.realpath | file://:0:0:0:0 | [summary] to write: ReturnValue in File.realpath |
 | file://:0:0:0:0 | [summary param] position 0 in Hash[] | file://:0:0:0:0 | [summary] read: Argument[0].Element[any] in Hash[] |
-| file://:0:0:0:0 | [summary param] position 0 in Mysql2::Client.escape() | file://:0:0:0:0 | [summary] to write: ReturnValue in Mysql2::Client.escape() |
 | file://:0:0:0:0 | [summary param] position 0 in Mysql2::Client.new() | file://:0:0:0:0 | [summary] to write: ReturnValue in Mysql2::Client.new() |
 | file://:0:0:0:0 | [summary param] position 0 in Net::LDAP.new | file://:0:0:0:0 | [summary] to write: ReturnValue in Net::LDAP.new |
 | file://:0:0:0:0 | [summary param] position 0 in Net::LDAP::Filter | file://:0:0:0:0 | [summary] to write: ReturnValue in Net::LDAP::Filter |
 | file://:0:0:0:0 | [summary param] position 0 in PG.new() | file://:0:0:0:0 | [summary] to write: ReturnValue in PG.new() |
 | file://:0:0:0:0 | [summary param] position 0 in Rack::Utils.parse_query | file://:0:0:0:0 | [summary] to write: ReturnValue in Rack::Utils.parse_query |
-| file://:0:0:0:0 | [summary param] position 0 in SQLite3::Database.quote() | file://:0:0:0:0 | [summary] to write: ReturnValue in SQLite3::Database.quote() |
 | file://:0:0:0:0 | [summary param] position 0 in Sequel.connect | file://:0:0:0:0 | [summary] to write: ReturnValue in Sequel.connect |
 | file://:0:0:0:0 | [summary param] position 0 in String.try_convert | file://:0:0:0:0 | [summary] to write: ReturnValue in String.try_convert |
 | file://:0:0:0:0 | [summary param] position 0 in \| | file://:0:0:0:0 | [summary] read: Argument[0].Element[any] in \| |
diff --git a/ruby/ql/test/library-tests/frameworks/action_controller/params_flow.rb b/ruby/ql/test/library-tests/frameworks/action_controller/params_flow.rb
index ece3b551556..5e40860ffc9 100644
--- a/ruby/ql/test/library-tests/frameworks/action_controller/params_flow.rb
+++ b/ruby/ql/test/library-tests/frameworks/action_controller/params_flow.rb
@@ -1,10 +1,10 @@
 class MyController < ActionController::Base
   def m1
-    sink params[:a] # $hasTaintFlow
+    sink params[:a] # $ hasTaintFlow
   end
 
   def m2
-    sink params.as_json # $hasTaintFlow
+    sink params.as_json # $ hasTaintFlow
   end
 
   def m2
@@ -12,186 +12,186 @@ class MyController < ActionController::Base
   end
 
   def m3
-    sink params.permit(:some_key) # $hasTaintFlow
+    sink params.permit(:some_key) # $ hasTaintFlow
   end
 
   def m4
-    sink params.require(:some_key) # $hasTaintFlow
+    sink params.require(:some_key) # $ hasTaintFlow
   end
 
   def m5
-    sink params.required(:some_key) # $hasTaintFlow
+    sink params.required(:some_key) # $ hasTaintFlow
   end
 
   def m6
-    sink params.deep_dup # $hasTaintFlow
+    sink params.deep_dup # $ hasTaintFlow
   end
 
   def m7
-    sink params.deep_transform_keys(&:upcase) # $hasTaintFlow
+    sink params.deep_transform_keys(&:upcase) # $ hasTaintFlow
   end
 
   def m8
-    sink params.deep_transform_keys!(&:upcase) # $hasTaintFlow
+    sink params.deep_transform_keys!(&:upcase) # $ hasTaintFlow
   end
 
   def m9
-    sink params.delete_if { |v| v.match? regex } # $hasTaintFlow
+    sink params.delete_if { |v| v.match? regex } # $ hasTaintFlow
   end
 
   def m10
-    sink params.extract!(:a, :b) # $hasTaintFlow
+    sink params.extract!(:a, :b) # $ hasTaintFlow
   end
 
   def m11
-    sink params.keep_if { |v| v.match? regex } # $hasTaintFlow
+    sink params.keep_if { |v| v.match? regex } # $ hasTaintFlow
   end
 
   def m12
-    sink params.select { |v| v.match? regex } # $hasTaintFlow
+    sink params.select { |v| v.match? regex } # $ hasTaintFlow
   end
 
   def m13
-    sink params.select! { |v| v.match? regex } # $hasTaintFlow
+    sink params.select! { |v| v.match? regex } # $ hasTaintFlow
   end
 
   def m14
-    sink params.reject { |v| v.match? regex } # $hasTaintFlow
+    sink params.reject { |v| v.match? regex } # $ hasTaintFlow
   end
 
   def m15
-    sink params.reject! { |v| v.match? regex } # $hasTaintFlow
+    sink params.reject! { |v| v.match? regex } # $ hasTaintFlow
   end
 
   def m16
-    sink params.to_h # $hasTaintFlow
+    sink params.to_h # $ hasTaintFlow
   end
 
   def m17
-    sink params.to_hash # $hasTaintFlow
+    sink params.to_hash # $ hasTaintFlow
   end
 
   def m18
-    sink params.to_query # $hasTaintFlow
+    sink params.to_query # $ hasTaintFlow
   end
 
   def m19
-    sink params.to_param # $hasTaintFlow
+    sink params.to_param # $ hasTaintFlow
   end
 
   def m20
-    sink params.to_unsafe_h # $hasTaintFlow
+    sink params.to_unsafe_h # $ hasTaintFlow
   end
 
   def m21
-    sink params.to_unsafe_hash # $hasTaintFlow
+    sink params.to_unsafe_hash # $ hasTaintFlow
   end
 
   def m22
-    sink params.transform_keys(&:upcase) # $hasTaintFlow
+    sink params.transform_keys(&:upcase) # $ hasTaintFlow
   end
 
   def m23
-    sink params.transform_keys!(&:upcase) # $hasTaintFlow
+    sink params.transform_keys!(&:upcase) # $ hasTaintFlow
   end
 
   def m24
-    sink params.transform_values(&:upcase) # $hasTaintFlow
+    sink params.transform_values(&:upcase) # $ hasTaintFlow
   end
 
   def m25
-    sink params.transform_values!(&:upcase) # $hasTaintFlow
+    sink params.transform_values!(&:upcase) # $ hasTaintFlow
   end
 
   def m26
-    sink params.values_at(:a, :b) # $hasTaintFlow
+    sink params.values_at(:a, :b) # $ hasTaintFlow
   end
 
   def m27
-    sink params.merge({a: 1}) # $hasTaintFlow
-    sink {a: 1}.merge(params) # $hasTaintFlow
+    sink params.merge({a: 1}) # $ hasTaintFlow
+    sink {a: 1}.merge(params) # $ hasTaintFlow
   end
 
   def m28
-    sink params.reverse_merge({a: 1}) # $hasTaintFlow
-    sink {a: 1}.reverse_merge(params) # $hasTaintFlow
+    sink params.reverse_merge({a: 1}) # $ hasTaintFlow
+    sink {a: 1}.reverse_merge(params) # $ hasTaintFlow
   end
 
   def m29
-    sink params.with_defaults({a: 1, b: 2}) # $hasTaintFlow
-    sink {a: 1}.with_defaults(params) # $hasTaintFlow
+    sink params.with_defaults({a: 1, b: 2}) # $ hasTaintFlow
+    sink {a: 1}.with_defaults(params) # $ hasTaintFlow
   end
 
   def m30
-    sink params.merge!({a: 1}) # $hasTaintFlow
-    sink {a: 1}.merge!(params) # $hasTaintFlow
+    sink params.merge!({a: 1}) # $ hasTaintFlow
+    sink {a: 1}.merge!(params) # $ hasTaintFlow
 
     p = {a: 1}
     p.merge!(params)
-    sink p # $hasTaintFlow
+    sink p # $ hasTaintFlow
   end
 
   def m31
-    sink params.reverse_merge!({a: 1}) # $hasTaintFlow
-    sink {a: 1}.reverse_merge!(params) # $hasTaintFlow
+    sink params.reverse_merge!({a: 1}) # $ hasTaintFlow
+    sink {a: 1}.reverse_merge!(params) # $ hasTaintFlow
 
     p = {a: 1}
     p.reverse_merge!(params)
-    sink p # $hasTaintFlow
+    sink p # $ hasTaintFlow
   end
 
   def m32
-    sink params.with_defaults!({a: 1, b: 2}) # $hasTaintFlow
-    sink {a: 1}.with_defaults!(params) # $hasTaintFlow
+    sink params.with_defaults!({a: 1, b: 2}) # $ hasTaintFlow
+    sink {a: 1}.with_defaults!(params) # $ hasTaintFlow
 
     p = {a: 1}
     p.with_defaults!(params)
-    sink p # $hasTaintFlow
+    sink p # $ hasTaintFlow
   end
 
   def m33
-    sink params.reverse_update({a: 1, b: 2}) # $hasTaintFlow
-    sink {a: 1}.reverse_update(params) # $hasTaintFlow
+    sink params.reverse_update({a: 1, b: 2}) # $ hasTaintFlow
+    sink {a: 1}.reverse_update(params) # $ hasTaintFlow
 
     p = {a: 1}
     p.reverse_update(params)
-    sink p # $hasTaintFlow
+    sink p # $ hasTaintFlow
   end
-  
+
   include Mixin
 end
 
 module Mixin
   def m34
-    sink params[:x] # $hasTaintFlow
+    sink params[:x] # $ hasTaintFlow
   end
 end
 
 class Subclass < MyController
   def m35
-    sink params[:x] # $hasTaintFlow
+    sink params[:x] # $ hasTaintFlow
   end
 
   rescue_from 'Foo::Bar' do |err|
-    sink params[:x] # $hasTaintFlow
+    sink params[:x] # $ hasTaintFlow
   end
 end
 
 class UploadedFileTests < MyController
   def m36
-    sink params[:file].original_filename # $hasTaintFlow
+    sink params[:file].original_filename # $ hasTaintFlow
   end
 
   def m37
-    sink params.require(:file).content_type # $hasTaintFlow
+    sink params.require(:file).content_type # $ hasTaintFlow
   end
 
   def m38
-    sink params.permit(:file)[:file].headers # $hasTaintFlow
+    sink params.permit(:file)[:file].headers # $ hasTaintFlow
   end
 
   def m39
-    sink params[:a].to_unsafe_h[:b][:file].read # $hasTaintFlow
+    sink params[:a].to_unsafe_h[:b][:file].read # $ hasTaintFlow
   end
 
   def m40(a)
@@ -204,4 +204,4 @@ class UploadedFileTests < MyController
     params[:file].read(nil,a)
     sink a # $ hasTaintFlow
   end
-end
\ No newline at end of file
+end
diff --git a/ruby/ql/test/library-tests/frameworks/action_mailer/mailer.rb b/ruby/ql/test/library-tests/frameworks/action_mailer/mailer.rb
index 09243fbb7fe..e93ddf8515f 100644
--- a/ruby/ql/test/library-tests/frameworks/action_mailer/mailer.rb
+++ b/ruby/ql/test/library-tests/frameworks/action_mailer/mailer.rb
@@ -1,5 +1,5 @@
 class MyMailer < ActionMailer::Base
   def foo
-    sink params[:foo] # $hasTaintFlow
+    sink params[:foo] # $ hasTaintFlow
   end
 end
diff --git a/ruby/ql/test/library-tests/frameworks/active_support/active_support.rb b/ruby/ql/test/library-tests/frameworks/active_support/active_support.rb
index a614a27eaf4..c94752ec446 100644
--- a/ruby/ql/test/library-tests/frameworks/active_support/active_support.rb
+++ b/ruby/ql/test/library-tests/frameworks/active_support/active_support.rb
@@ -8,196 +8,196 @@ ActiveSupport::TaggedLogging.new(STDOUT)
 
 def m_at
     x = source "a"
-    sink x.at(1..3) # $hasTaintFlow=a
+    sink x.at(1..3) # $ hasTaintFlow=a
 end
 
 def m_camelize
     x = source "a"
-    sink x.camelize # $hasTaintFlow=a
+    sink x.camelize # $ hasTaintFlow=a
 end
 
 def m_camelcase
     x = source "a"
-    sink x.camelcase # $hasTaintFlow=a
+    sink x.camelcase # $ hasTaintFlow=a
 end
 
 def m_classify
     x = source "a"
-    sink x.classify # $hasTaintFlow=a
+    sink x.classify # $ hasTaintFlow=a
 end
 
 def m_dasherize
     x = source "a"
-    sink x.dasherize # $hasTaintFlow=a
+    sink x.dasherize # $ hasTaintFlow=a
 end
 
 def m_deconstantize
     x = source "a"
-    sink x.deconstantize # $hasTaintFlow=a
+    sink x.deconstantize # $ hasTaintFlow=a
 end
 
 def m_demodulize
     x = source "a"
-    sink x.demodulize # $hasTaintFlow=a
+    sink x.demodulize # $ hasTaintFlow=a
 end
 
 def first
     x = source "a"
-    sink x.first(3) # $hasTaintFlow=a
+    sink x.first(3) # $ hasTaintFlow=a
 end
 
 def m_foreign_key
     x = source "a"
-    sink x.foreign_key # $hasTaintFlow=a
+    sink x.foreign_key # $ hasTaintFlow=a
 end
 
 def m_from
     x = source "a"
-    sink x.from(3) # $hasTaintFlow=a
+    sink x.from(3) # $ hasTaintFlow=a
 end
 
 def m_html_safe
     x = source "a"
-    sink x.html_safe # $hasTaintFlow=a
+    sink x.html_safe # $ hasTaintFlow=a
 end
 
 def m_humanize
     x = source "a"
-    sink x.humanize # $hasTaintFlow=a
+    sink x.humanize # $ hasTaintFlow=a
 end
 
 def m_indent
     x = source "a"
-    sink x.indent(1) # $hasTaintFlow=a
+    sink x.indent(1) # $ hasTaintFlow=a
 end
 
 def m_indent!
     x = source "a"
-    sink x.indent!(1) # $hasTaintFlow=a
+    sink x.indent!(1) # $ hasTaintFlow=a
 end
 
 def m_inquiry
     x = source "a"
-    sink x.inquiry # $hasTaintFlow=a
+    sink x.inquiry # $ hasTaintFlow=a
 end
 
 def m_last
     x = source "a"
-    sink x.last(1) # $hasTaintFlow=a
+    sink x.last(1) # $ hasTaintFlow=a
 end
 
 def m_mb_chars
     x = source "a"
-    sink x.mb_chars # $hasTaintFlow=a
+    sink x.mb_chars # $ hasTaintFlow=a
 end
 
 def m_parameterize
     x = source "a"
-    sink x.parameterize # $hasTaintFlow=a
+    sink x.parameterize # $ hasTaintFlow=a
 end
 
 def m_pluralize
     x = source "a"
-    sink x.pluralize # $hasTaintFlow=a
+    sink x.pluralize # $ hasTaintFlow=a
 end
 
 def m_remove
     x = source "a"
-    sink x.remove("foo") # $hasTaintFlow=a
+    sink x.remove("foo") # $ hasTaintFlow=a
 end
 
 def m_remove!
     x = source "a"
-    sink x.remove!("foo") # $hasTaintFlow=a
+    sink x.remove!("foo") # $ hasTaintFlow=a
 end
 
 def m_singularize
     x = source "a"
-    sink x.singularize # $hasTaintFlow=a
+    sink x.singularize # $ hasTaintFlow=a
 end
 
 def m_squish
     x = source "a"
-    sink x.squish # $hasTaintFlow=a
+    sink x.squish # $ hasTaintFlow=a
 end
 
 def m_squish!
     x = source "a"
-    sink x.squish! # $hasTaintFlow=a
+    sink x.squish! # $ hasTaintFlow=a
 end
 
 def m_strip_heredoc
     x = source "a"
-    sink x.strip_heredoc # $hasTaintFlow=a
+    sink x.strip_heredoc # $ hasTaintFlow=a
 end
 
 def m_tableize
     x = source "a"
-    sink x.tableize # $hasTaintFlow=a
+    sink x.tableize # $ hasTaintFlow=a
 end
 
 def m_titlecase
     x = source "a"
-    sink x.titlecase # $hasTaintFlow=a
+    sink x.titlecase # $ hasTaintFlow=a
 end
 
 def m_titleize
     x = source "a"
-    sink x.titleize # $hasTaintFlow=a
+    sink x.titleize # $ hasTaintFlow=a
 end
 
 def m_to
     x = source "a"
-    sink x.to(3) # $hasTaintFlow=a
+    sink x.to(3) # $ hasTaintFlow=a
 end
 
 def m_truncate
     x = source "a"
-    sink x.truncate(3) # $hasTaintFlow=a
+    sink x.truncate(3) # $ hasTaintFlow=a
 end
 
 def m_truncate_bytes
     x = source "a"
-    sink x.truncate_bytes(3) # $hasTaintFlow=a
+    sink x.truncate_bytes(3) # $ hasTaintFlow=a
 end
 
 def m_truncate_words
     x = source "a"
-    sink x.truncate_words(3) # $hasTaintFlow=a
+    sink x.truncate_words(3) # $ hasTaintFlow=a
 end
 
 def m_underscore
     x = source "a"
-    sink x.underscore # $hasTaintFlow=a
+    sink x.underscore # $ hasTaintFlow=a
 end
 
 def m_upcase_first
     x = source "a"
-    sink x.upcase_first # $hasTaintFlow=a
+    sink x.upcase_first # $ hasTaintFlow=a
 end
 
 def m_compact_blank
     x = [source 1]
     y = x.compact_blank
-    sink y[0] # $hasValueFlow=1
+    sink y[0] # $ hasValueFlow=1
 end
 
 def m_excluding
     x = [source(1), 2]
     y = x.excluding 2
-    sink y[0] # $hasValueFlow=1
+    sink y[0] # $ hasValueFlow=1
 end
 
 def m_without
     x = [source(1), 2]
     y = x.without 2
-    sink y[0] # $hasValueFlow=1
+    sink y[0] # $ hasValueFlow=1
 end
 
 def m_in_order_of
     x = [source(1), 2]
     y = x.in_order_of(:itself, [2,1])
-    sink y[0] # $hasValueFlow=1
+    sink y[0] # $ hasValueFlow=1
 end
 
 def m_including
@@ -214,21 +214,21 @@ end
 def m_safe_buffer_new
   x = source "a"
   y = ActionView::SafeBuffer.new(x)
-  sink y # $hasTaintFlow=a
+  sink y # $ hasTaintFlow=a
 end
 
 def m_safe_buffer_safe_concat_retval
   x = ActionView::SafeBuffer.new("a")
   b = source "b"
   y = x.safe_concat(b)
-  sink y # $hasTaintFlow=b
+  sink y # $ hasTaintFlow=b
 end
 
 def m_safe_buffer_safe_concat_self
   x = ActionView::SafeBuffer.new("a")
   b = source "b"
   x.safe_concat(b)
-  sink x # $hasTaintFlow=b
+  sink x # $ hasTaintFlow=b
 end
 
 def m_safe_buffer_concat
@@ -236,7 +236,7 @@ def m_safe_buffer_concat
   b = source "b"
   x = ActionView::SafeBuffer.new(a)
   y = x.concat(b)
-  sink y # $hasTaintFlow=a
+  sink y # $ hasTaintFlow=a
 end
 
 def m_safe_buffer_insert
@@ -244,7 +244,7 @@ def m_safe_buffer_insert
   b = source "b"
   x = ActionView::SafeBuffer.new(a)
   y = x.insert(i, b)
-  sink y # $hasTaintFlow=a $hasTaintFlow=b
+  sink y # $ hasTaintFlow=a $hasTaintFlow=b
 end
 
 def m_safe_buffer_prepend
@@ -252,43 +252,43 @@ def m_safe_buffer_prepend
   b = source "b"
   x = ActionView::SafeBuffer.new(a)
   y = x.prepend(b)
-  sink y # $hasTaintFlow=a
+  sink y # $ hasTaintFlow=a
 end
 
 def m_safe_buffer_to_s
   a = source "a"
   x = ActionView::SafeBuffer.new(a)
   y = x.to_s
-  sink y # $hasTaintFlow=a
+  sink y # $ hasTaintFlow=a
 end
 
 def m_safe_buffer_to_param
   a = source "a"
   x = ActionView::SafeBuffer.new(a)
   y = x.to_param
-  sink y # $hasTaintFlow=a
+  sink y # $ hasTaintFlow=a
 end
 
 def m_pathname_existence
   a = source "a"
   x = Pathname.new(a)
   y = x.existence
-  sink y # $hasTaintFlow=a
+  sink y # $ hasTaintFlow=a
   z = y.existence
-  sink z # $hasTaintFlow=a
+  sink z # $ hasTaintFlow=a
 end
 
 def m_presence
   x = source "a"
-  sink x.presence # $hasValueFlow=a
+  sink x.presence # $ hasValueFlow=a
 
   y = source 123
-  sink y.presence # $hasValueFlow=123
+  sink y.presence # $ hasValueFlow=123
 end
 
 def m_deep_dup
   x = source "a"
-  sink x.deep_dup # $hasValueFlow=a
+  sink x.deep_dup # $ hasValueFlow=a
 end
 
 def m_try(method)
@@ -302,32 +302,32 @@ end
 def m_json_escape
   a = source "a"
   b = json_escape a
-  sink b # $hasTaintFlow=a
+  sink b # $ hasTaintFlow=a
 end
 
 def m_json_encode
     x = source "a"
-    sink ActiveSupport::JSON.encode(x) # $hasTaintFlow=a
+    sink ActiveSupport::JSON.encode(x) # $ hasTaintFlow=a
 end
 
 def m_json_decode
     x = source "a"
-    sink ActiveSupport::JSON.decode(x) # $hasTaintFlow=a
+    sink ActiveSupport::JSON.decode(x) # $ hasTaintFlow=a
 end
 
 def m_json_dump
     x = source "a"
-    sink ActiveSupport::JSON.dump(x) # $hasTaintFlow=a
+    sink ActiveSupport::JSON.dump(x) # $ hasTaintFlow=a
 end
 
 def m_json_load
     x = source "a"
-    sink ActiveSupport::JSON.load(x) # $hasTaintFlow=a
+    sink ActiveSupport::JSON.load(x) # $ hasTaintFlow=a
 end
 
 def m_to_json
     x = source "a"
     y = [x]
-    sink x.to_json # $hasTaintFlow=a
-    sink y.to_json # $hasTaintFlow=a
+    sink x.to_json # $ hasTaintFlow=a
+    sink y.to_json # $ hasTaintFlow=a
 end
diff --git a/ruby/ql/test/library-tests/frameworks/active_support/hash_extensions.rb b/ruby/ql/test/library-tests/frameworks/active_support/hash_extensions.rb
index 9222620fef4..f386eba7022 100644
--- a/ruby/ql/test/library-tests/frameworks/active_support/hash_extensions.rb
+++ b/ruby/ql/test/library-tests/frameworks/active_support/hash_extensions.rb
@@ -1,7 +1,7 @@
 def m_stringify_keys
     h = { a: source("a") }
     x = h.stringify_keys
-    sink x["a"] # $hasValueFlow=a
+    sink x["a"] # $ hasValueFlow=a
 end
 
 m_stringify_keys()
@@ -9,7 +9,7 @@ m_stringify_keys()
 def m_to_options
     h = { "a" => source("a") }
     x = h.to_options
-    sink x[:a] # $hasValueFlow=a
+    sink x[:a] # $ hasValueFlow=a
 end
 
 m_to_options()
@@ -17,7 +17,7 @@ m_to_options()
 def m_symbolize_keys
     h = { "a" => source("a") }
     x = h.symbolize_keys
-    sink x[:a] # $hasValueFlow=a
+    sink x[:a] # $ hasValueFlow=a
 end
 
 m_symbolize_keys()
@@ -25,7 +25,7 @@ m_symbolize_keys()
 def m_deep_stringify_keys
     h = { a: source("a") }
     x = h.deep_stringify_keys
-    sink x["a"] # $hasValueFlow=a
+    sink x["a"] # $ hasValueFlow=a
 end
 
 m_deep_stringify_keys()
@@ -33,7 +33,7 @@ m_deep_stringify_keys()
 def m_deep_symbolize_keys
     h = { "a" => source("a") }
     x = h.deep_symbolize_keys
-    sink x[:a] # $hasValueFlow=a
+    sink x[:a] # $ hasValueFlow=a
 end
 
 m_deep_symbolize_keys()
@@ -41,7 +41,7 @@ m_deep_symbolize_keys()
 def m_with_indifferent_access
     h = { a: source("a") }
     x = h.with_indifferent_access
-    sink x["a"] # $hasValueFlow=a
+    sink x["a"] # $ hasValueFlow=a
 end
 
 m_with_indifferent_access()
diff --git a/ruby/ql/test/library-tests/frameworks/arel/arel.rb b/ruby/ql/test/library-tests/frameworks/arel/arel.rb
index 7e7bc51f9a8..1bfddd898ec 100644
--- a/ruby/ql/test/library-tests/frameworks/arel/arel.rb
+++ b/ruby/ql/test/library-tests/frameworks/arel/arel.rb
@@ -1,6 +1,6 @@
 def m1
   x = source 1
-  sink(Arel.sql(x)) # $hasTaintFlow=1
+  sink(Arel.sql(x)) # $ hasTaintFlow=1
 end
 
 def m2
diff --git a/ruby/ql/test/library-tests/frameworks/json/json.rb b/ruby/ql/test/library-tests/frameworks/json/json.rb
index a48fe9bf5e0..7c2c5f0c653 100644
--- a/ruby/ql/test/library-tests/frameworks/json/json.rb
+++ b/ruby/ql/test/library-tests/frameworks/json/json.rb
@@ -1,11 +1,11 @@
-sink JSON.parse(source "a") # $hasTaintFlow=a
-sink JSON.parse!(source "a") # $hasTaintFlow=a
-sink JSON.load(source "a") # $hasTaintFlow=a
-sink JSON.restore(source "a") # $hasTaintFlow=a
+sink JSON.parse(source "a") # $ hasTaintFlow=a
+sink JSON.parse!(source "a") # $ hasTaintFlow=a
+sink JSON.load(source "a") # $ hasTaintFlow=a
+sink JSON.restore(source "a") # $ hasTaintFlow=a
 
-sink JSON.generate(source "a") # $hasTaintFlow=a
-sink JSON.fast_generate(source "a") # $hasTaintFlow=a
-sink JSON.pretty_generate(source "a") # $hasTaintFlow=a
-sink JSON.dump(source "a") # $hasTaintFlow=a
-sink JSON.unparse(source "a") # $hasTaintFlow=a
-sink JSON.fast_unparse(source "a") # $hasTaintFlow=a
+sink JSON.generate(source "a") # $ hasTaintFlow=a
+sink JSON.fast_generate(source "a") # $ hasTaintFlow=a
+sink JSON.pretty_generate(source "a") # $ hasTaintFlow=a
+sink JSON.dump(source "a") # $ hasTaintFlow=a
+sink JSON.unparse(source "a") # $ hasTaintFlow=a
+sink JSON.fast_unparse(source "a") # $ hasTaintFlow=a
diff --git a/ruby/ql/test/library-tests/frameworks/mysql2/Mysql2.rb b/ruby/ql/test/library-tests/frameworks/mysql2/Mysql2.rb
index b9b3b5a7b57..1294f161475 100644
--- a/ruby/ql/test/library-tests/frameworks/mysql2/Mysql2.rb
+++ b/ruby/ql/test/library-tests/frameworks/mysql2/Mysql2.rb
@@ -1,6 +1,6 @@
 class UsersController < ActionController::Base
   def mysql2_handler(event:, context:)
-    name = params[:user_name]
+    name = params[:user_name] # $ Source[rb/sql-injection]
 
     conn = Mysql2::Client.new(
         host: "127.0.0.1",
@@ -10,7 +10,7 @@ class UsersController < ActionController::Base
     results1 = conn.query("SELECT * FROM users")
 
     # BAD: SQL statement constructed from user input
-    results2 = conn.query("SELECT * FROM users WHERE username='#{name}'")
+    results2 = conn.query("SELECT * FROM users WHERE username='#{name}'") # $ Alert[rb/sql-injection]
 
     # GOOD: user input is escaped
     escaped = Mysql2::Client.escape(name)
@@ -21,10 +21,10 @@ class UsersController < ActionController::Base
     results4 = statement1.execute(1, name, :as => :array)
 
     # BAD: SQL statement constructed from user input
-    statement2 = conn.prepare("SELECT * FROM users WHERE username='#{name}' AND password = ?")
+    statement2 = conn.prepare("SELECT * FROM users WHERE username='#{name}' AND password = ?") # $ Alert[rb/sql-injection]
     results4 = statement2.execute("password", :as => :array)
 
     # NOT EXECUTED
     statement3 = conn.prepare("SELECT * FROM users WHERE username = ?")
   end
-end
\ No newline at end of file
+end
diff --git a/ruby/ql/test/library-tests/frameworks/mysql2/SqlInjection.expected b/ruby/ql/test/library-tests/frameworks/mysql2/SqlInjection.expected
new file mode 100644
index 00000000000..f29b1738394
--- /dev/null
+++ b/ruby/ql/test/library-tests/frameworks/mysql2/SqlInjection.expected
@@ -0,0 +1,15 @@
+#select
+| Mysql2.rb:13:27:13:72 | "SELECT * FROM users WHERE use..." | Mysql2.rb:3:12:3:17 | call to params | Mysql2.rb:13:27:13:72 | "SELECT * FROM users WHERE use..." | This SQL query depends on a $@. | Mysql2.rb:3:12:3:17 | call to params | user-provided value |
+| Mysql2.rb:24:31:24:93 | "SELECT * FROM users WHERE use..." | Mysql2.rb:3:12:3:17 | call to params | Mysql2.rb:24:31:24:93 | "SELECT * FROM users WHERE use..." | This SQL query depends on a $@. | Mysql2.rb:3:12:3:17 | call to params | user-provided value |
+edges
+| Mysql2.rb:3:5:3:8 | name | Mysql2.rb:13:27:13:72 | "SELECT * FROM users WHERE use..." | provenance | AdditionalTaintStep |
+| Mysql2.rb:3:5:3:8 | name | Mysql2.rb:24:31:24:93 | "SELECT * FROM users WHERE use..." | provenance | AdditionalTaintStep |
+| Mysql2.rb:3:12:3:17 | call to params | Mysql2.rb:3:12:3:29 | ...[...] | provenance |  |
+| Mysql2.rb:3:12:3:29 | ...[...] | Mysql2.rb:3:5:3:8 | name | provenance |  |
+nodes
+| Mysql2.rb:3:5:3:8 | name | semmle.label | name |
+| Mysql2.rb:3:12:3:17 | call to params | semmle.label | call to params |
+| Mysql2.rb:3:12:3:29 | ...[...] | semmle.label | ...[...] |
+| Mysql2.rb:13:27:13:72 | "SELECT * FROM users WHERE use..." | semmle.label | "SELECT * FROM users WHERE use..." |
+| Mysql2.rb:24:31:24:93 | "SELECT * FROM users WHERE use..." | semmle.label | "SELECT * FROM users WHERE use..." |
+subpaths
diff --git a/ruby/ql/test/library-tests/frameworks/mysql2/SqlInjection.qlref b/ruby/ql/test/library-tests/frameworks/mysql2/SqlInjection.qlref
new file mode 100644
index 00000000000..ff400a718e2
--- /dev/null
+++ b/ruby/ql/test/library-tests/frameworks/mysql2/SqlInjection.qlref
@@ -0,0 +1,4 @@
+query: queries/security/cwe-089/SqlInjection.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
diff --git a/ruby/ql/test/library-tests/frameworks/sqlite3/SqlInjection.expected b/ruby/ql/test/library-tests/frameworks/sqlite3/SqlInjection.expected
new file mode 100644
index 00000000000..e094f9603c8
--- /dev/null
+++ b/ruby/ql/test/library-tests/frameworks/sqlite3/SqlInjection.expected
@@ -0,0 +1,12 @@
+#select
+| sqlite3.rb:29:16:29:67 | "select * from table where cat..." | sqlite3.rb:25:16:25:21 | call to params | sqlite3.rb:29:16:29:67 | "select * from table where cat..." | This SQL query depends on a $@. | sqlite3.rb:25:16:25:21 | call to params | user-provided value |
+edges
+| sqlite3.rb:25:5:25:12 | category | sqlite3.rb:29:16:29:67 | "select * from table where cat..." | provenance | AdditionalTaintStep |
+| sqlite3.rb:25:16:25:21 | call to params | sqlite3.rb:25:16:25:32 | ...[...] | provenance |  |
+| sqlite3.rb:25:16:25:32 | ...[...] | sqlite3.rb:25:5:25:12 | category | provenance |  |
+nodes
+| sqlite3.rb:25:5:25:12 | category | semmle.label | category |
+| sqlite3.rb:25:16:25:21 | call to params | semmle.label | call to params |
+| sqlite3.rb:25:16:25:32 | ...[...] | semmle.label | ...[...] |
+| sqlite3.rb:29:16:29:67 | "select * from table where cat..." | semmle.label | "select * from table where cat..." |
+subpaths
diff --git a/ruby/ql/test/library-tests/frameworks/sqlite3/SqlInjection.qlref b/ruby/ql/test/library-tests/frameworks/sqlite3/SqlInjection.qlref
new file mode 100644
index 00000000000..ff400a718e2
--- /dev/null
+++ b/ruby/ql/test/library-tests/frameworks/sqlite3/SqlInjection.qlref
@@ -0,0 +1,4 @@
+query: queries/security/cwe-089/SqlInjection.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
diff --git a/ruby/ql/test/library-tests/frameworks/sqlite3/Sqlite3.expected b/ruby/ql/test/library-tests/frameworks/sqlite3/Sqlite3.expected
index 9e7263aa3bb..b3573ed217e 100644
--- a/ruby/ql/test/library-tests/frameworks/sqlite3/Sqlite3.expected
+++ b/ruby/ql/test/library-tests/frameworks/sqlite3/Sqlite3.expected
@@ -2,9 +2,11 @@ sqlite3SqlConstruction
 | sqlite3.rb:5:1:5:17 | call to execute | sqlite3.rb:5:12:5:17 | <<-SQL |
 | sqlite3.rb:12:8:12:41 | call to prepare | sqlite3.rb:12:19:12:41 | "select * from numbers" |
 | sqlite3.rb:17:3:19:5 | call to execute | sqlite3.rb:17:15:17:35 | "select * from table" |
-| sqlite3.rb:29:7:29:40 | call to execute | sqlite3.rb:29:19:29:39 | "select * from table" |
+| sqlite3.rb:29:5:29:68 | call to execute | sqlite3.rb:29:16:29:67 | "select * from table where cat..." |
+| sqlite3.rb:33:5:33:78 | call to execute | sqlite3.rb:33:16:33:77 | "select * from table where cat..." |
 sqlite3SqlExecution
 | sqlite3.rb:5:1:5:17 | call to execute | sqlite3.rb:5:12:5:17 | <<-SQL |
 | sqlite3.rb:14:1:14:12 | call to execute | sqlite3.rb:12:19:12:41 | "select * from numbers" |
 | sqlite3.rb:17:3:19:5 | call to execute | sqlite3.rb:17:15:17:35 | "select * from table" |
-| sqlite3.rb:29:7:29:40 | call to execute | sqlite3.rb:29:19:29:39 | "select * from table" |
+| sqlite3.rb:29:5:29:68 | call to execute | sqlite3.rb:29:16:29:67 | "select * from table where cat..." |
+| sqlite3.rb:33:5:33:78 | call to execute | sqlite3.rb:33:16:33:77 | "select * from table where cat..." |
diff --git a/ruby/ql/test/library-tests/frameworks/sqlite3/sqlite3.rb b/ruby/ql/test/library-tests/frameworks/sqlite3/sqlite3.rb
index 465bb708598..36b146abe8d 100644
--- a/ruby/ql/test/library-tests/frameworks/sqlite3/sqlite3.rb
+++ b/ruby/ql/test/library-tests/frameworks/sqlite3/sqlite3.rb
@@ -20,12 +20,16 @@ SQLite3::Database.new( "data.db" ) do |db|
 end
 
 
-class MyDatabaseWrapper
-      def initialize(filename)
-      @db = SQLite3::Database.new(filename, results_as_hash: true)
-    end
+class SqliteController < ActionController::Base
+  def sqlite3_handler
+    category = params[:category] # $ Source[rb/sql-injection]
+    db = SQLite3::Database.new "test.db"
 
-    def select_rows(category)
-      @db.execute("select * from table")
-    end
+    # BAD: SQL injection vulnerability
+    db.execute("select * from table where category = '#{category}'") # $ Alert[rb/sql-injection]
+
+    # GOOD: Sanitized by SQLite3::Database.quote
+    sanitized_category = SQLite3::Database.quote(category)
+    db.execute("select * from table where category = '#{sanitized_category}'")
+  end
 end
diff --git a/ruby/ql/test/query-tests/experimental/cwe-176/unicode_normalization.rb b/ruby/ql/test/query-tests/experimental/cwe-176/unicode_normalization.rb
index 848be4b081c..a7b77cc3a66 100644
--- a/ruby/ql/test/query-tests/experimental/cwe-176/unicode_normalization.rb
+++ b/ruby/ql/test/query-tests/experimental/cwe-176/unicode_normalization.rb
@@ -5,8 +5,8 @@ require 'cgi'
 class UnicodeNormalizationOKController < ActionController::Base
   def unicodeNormalize
     unicode_input = params[:unicode_input]
-    normalized_nfkc = unicode_input.unicode_normalize(:nfkc)      # $MISSING:result=OK
-    normalized_nfc = unicode_input.unicode_normalize(:nfc)        # $MISSING:result=OK
+    normalized_nfkc = unicode_input.unicode_normalize(:nfkc)      # $ MISSING:result=OK
+    normalized_nfc = unicode_input.unicode_normalize(:nfc)        # $ MISSING:result=OK
   end
 end
 
@@ -14,8 +14,8 @@ class UnicodeNormalizationStrManipulationController < ActionController::Base
   def unicodeNormalize
     unicode_input = params[:unicode_input]
     unicode_input_manip = unicode_input.sub(/[aeiou]/, "*")
-    normalized_nfkc = unicode_input_manip.unicode_normalize(:nfkc)  # $result=BAD
-    normalized_nfc = unicode_input_manip.unicode_normalize(:nfc)    # $result=BAD
+    normalized_nfkc = unicode_input_manip.unicode_normalize(:nfkc)  # $ result=BAD
+    normalized_nfc = unicode_input_manip.unicode_normalize(:nfc)    # $ result=BAD
   end
 end
 
@@ -23,8 +23,8 @@ class UnicodeNormalizationHtMLEscapeController < ActionController::Base
   def unicodeNormalize
     unicode_input = params[:unicode_input]
     unicode_html_safe = html_escape(unicode_input)
-    normalized_nfkc = unicode_html_safe.unicode_normalize(:nfkc)    # $result=BAD
-    normalized_nfc = unicode_html_safe.unicode_normalize(:nfc)      # $result=BAD
+    normalized_nfkc = unicode_html_safe.unicode_normalize(:nfkc)    # $ result=BAD
+    normalized_nfc = unicode_html_safe.unicode_normalize(:nfc)      # $ result=BAD
   end
 end
 
@@ -32,7 +32,7 @@ class UnicodeNormalizationCGIHtMLEscapeController < ActionController::Base
   def unicodeNormalize
     unicode_input = params[:unicode_input]
     unicode_html_safe = CGI.escapeHTML(unicode_input).html_safe
-    normalized_nfkc = unicode_html_safe.unicode_normalize(:nfkd)    # $result=BAD
-    normalized_nfc = unicode_html_safe.unicode_normalize(:nfd)      # $result=BAD
+    normalized_nfkc = unicode_html_safe.unicode_normalize(:nfkd)    # $ result=BAD
+    normalized_nfc = unicode_html_safe.unicode_normalize(:nfd)      # $ result=BAD
   end
 end
diff --git a/ruby/ql/test/query-tests/experimental/improper-memoization/improper_memoization.rb b/ruby/ql/test/query-tests/experimental/improper-memoization/improper_memoization.rb
index e1e60209c79..0b12fe2ad59 100644
--- a/ruby/ql/test/query-tests/experimental/improper-memoization/improper_memoization.rb
+++ b/ruby/ql/test/query-tests/experimental/improper-memoization/improper_memoization.rb
@@ -52,7 +52,7 @@ def m7(arg)
     arg += 3
   end
   @m7
-end # $result=BAD
+end # $ result=BAD
 
 # Bad: method has parameter but only one result is memoized.
 def m8(arg)
@@ -60,23 +60,23 @@ def m8(arg)
     long_running_method(arg)
   end
   @m8
-end # $result=BAD
+end # $ result=BAD
 
 # Bad: method has parameter but only one result is memoized.
 def m9(arg)
   @m9 ||= long_running_method(arg)
-end # $result=BAD
+end # $ result=BAD
 
 # Bad: method has parameter but only one result is memoized.
 def m10(arg1, arg2)
   @m10 ||= long_running_method(arg1, arg2)
-end # $result=BAD
+end # $ result=BAD
 
 # Bad: `arg2` not used in key.
 def m11(arg1, arg2)
   @m11 ||= {}
   @m11[arg1] ||= long_running_method(arg1, arg2)
-end # $result=BAD
+end # $ result=BAD
 
 # Bad: `arg2` not used in key.
 def m12(arg1, arg2)
@@ -84,7 +84,7 @@ def m12(arg1, arg2)
     h1[arg1] = result(arg1, arg2)
   end
   @m12[arg1]
-end # $result=BAD
+end # $ result=BAD
 
 # Bad: arg not used in key.
 def m13(id:)
@@ -94,11 +94,11 @@ def m13(id:)
     end
   end
   @m13
-end # $result=BAD
+end # $ result=BAD
 
 # Good (FP): arg is used in key via string interpolation.
 def m14(arg)
   @m14 ||= {}
   key = "foo/#{arg}"
   @m14[key] ||= long_running_method(arg)
-end
\ No newline at end of file
+end
diff --git a/ruby/ql/test/query-tests/security/cwe-094/CodeInjection/CodeInjection.expected b/ruby/ql/test/query-tests/security/cwe-094/CodeInjection/CodeInjection.expected
index f598d37e32a..07febf8cda6 100644
--- a/ruby/ql/test/query-tests/security/cwe-094/CodeInjection/CodeInjection.expected
+++ b/ruby/ql/test/query-tests/security/cwe-094/CodeInjection/CodeInjection.expected
@@ -1,3 +1,46 @@
+#select
+| CodeInjection.rb:8:10:8:13 | code | CodeInjection.rb:5:12:5:17 | call to params | CodeInjection.rb:8:10:8:13 | code | This code execution depends on a $@. | CodeInjection.rb:5:12:5:17 | call to params | user-provided value |
+| CodeInjection.rb:11:10:11:15 | call to params | CodeInjection.rb:11:10:11:15 | call to params | CodeInjection.rb:11:10:11:15 | call to params | This code execution depends on a $@. | CodeInjection.rb:11:10:11:15 | call to params | user-provided value |
+| CodeInjection.rb:20:20:20:23 | code | CodeInjection.rb:5:12:5:17 | call to params | CodeInjection.rb:20:20:20:23 | code | This code execution depends on a $@. | CodeInjection.rb:5:12:5:17 | call to params | user-provided value |
+| CodeInjection.rb:23:21:23:24 | code | CodeInjection.rb:5:12:5:17 | call to params | CodeInjection.rb:23:21:23:24 | code | This code execution depends on a $@. | CodeInjection.rb:5:12:5:17 | call to params | user-provided value |
+| CodeInjection.rb:29:15:29:18 | code | CodeInjection.rb:5:12:5:17 | call to params | CodeInjection.rb:29:15:29:18 | code | This code execution depends on a $@. | CodeInjection.rb:5:12:5:17 | call to params | user-provided value |
+| CodeInjection.rb:32:19:32:22 | code | CodeInjection.rb:5:12:5:17 | call to params | CodeInjection.rb:32:19:32:22 | code | This code execution depends on a $@. | CodeInjection.rb:5:12:5:17 | call to params | user-provided value |
+| CodeInjection.rb:38:10:38:28 | call to escape | CodeInjection.rb:5:12:5:17 | call to params | CodeInjection.rb:38:10:38:28 | call to escape | This code execution depends on a $@. | CodeInjection.rb:5:12:5:17 | call to params | user-provided value |
+| CodeInjection.rb:41:40:41:43 | code | CodeInjection.rb:5:12:5:17 | call to params | CodeInjection.rb:41:40:41:43 | code | This code execution depends on a $@. | CodeInjection.rb:5:12:5:17 | call to params | user-provided value |
+| CodeInjection.rb:81:16:81:19 | code | CodeInjection.rb:78:12:78:17 | call to params | CodeInjection.rb:81:16:81:19 | code | This code execution depends on a $@. | CodeInjection.rb:78:12:78:17 | call to params | user-provided value |
+| CodeInjection.rb:90:10:90:37 | ... + ... | CodeInjection.rb:78:12:78:17 | call to params | CodeInjection.rb:90:10:90:37 | ... + ... | This code execution depends on a $@. | CodeInjection.rb:78:12:78:17 | call to params | user-provided value |
+| CodeInjection.rb:93:10:93:32 | "prefix_#{...}_suffix" | CodeInjection.rb:78:12:78:17 | call to params | CodeInjection.rb:93:10:93:32 | "prefix_#{...}_suffix" | This code execution depends on a $@. | CodeInjection.rb:78:12:78:17 | call to params | user-provided value |
+| CodeInjection.rb:96:10:96:13 | code | CodeInjection.rb:78:12:78:17 | call to params | CodeInjection.rb:96:10:96:13 | code | This code execution depends on a $@. | CodeInjection.rb:78:12:78:17 | call to params | user-provided value |
+| CodeInjection.rb:118:10:118:13 | @foo | CodeInjection.rb:111:12:111:17 | call to params | CodeInjection.rb:118:10:118:13 | @foo | This code execution depends on a $@. | CodeInjection.rb:111:12:111:17 | call to params | user-provided value |
+edges
+| CodeInjection.rb:5:5:5:8 | code | CodeInjection.rb:8:10:8:13 | code | provenance |  |
+| CodeInjection.rb:5:5:5:8 | code | CodeInjection.rb:20:20:20:23 | code | provenance |  |
+| CodeInjection.rb:5:5:5:8 | code | CodeInjection.rb:23:21:23:24 | code | provenance |  |
+| CodeInjection.rb:5:5:5:8 | code | CodeInjection.rb:29:15:29:18 | code | provenance |  |
+| CodeInjection.rb:5:5:5:8 | code | CodeInjection.rb:32:19:32:22 | code | provenance |  |
+| CodeInjection.rb:5:5:5:8 | code | CodeInjection.rb:38:24:38:27 | code | provenance |  |
+| CodeInjection.rb:5:5:5:8 | code | CodeInjection.rb:41:40:41:43 | code | provenance |  |
+| CodeInjection.rb:5:12:5:17 | call to params | CodeInjection.rb:5:12:5:24 | ...[...] | provenance |  |
+| CodeInjection.rb:5:12:5:24 | ...[...] | CodeInjection.rb:5:5:5:8 | code | provenance |  |
+| CodeInjection.rb:38:24:38:27 | code | CodeInjection.rb:38:10:38:28 | call to escape | provenance | MaD:1 |
+| CodeInjection.rb:78:5:78:8 | code | CodeInjection.rb:81:16:81:19 | code | provenance |  |
+| CodeInjection.rb:78:5:78:8 | code | CodeInjection.rb:90:10:90:37 | ... + ... | provenance |  |
+| CodeInjection.rb:78:5:78:8 | code | CodeInjection.rb:90:22:90:25 | code | provenance |  |
+| CodeInjection.rb:78:5:78:8 | code | CodeInjection.rb:93:10:93:32 | "prefix_#{...}_suffix" | provenance | AdditionalTaintStep |
+| CodeInjection.rb:78:5:78:8 | code | CodeInjection.rb:96:10:96:13 | code | provenance |  |
+| CodeInjection.rb:78:12:78:17 | call to params | CodeInjection.rb:78:12:78:24 | ...[...] | provenance |  |
+| CodeInjection.rb:78:12:78:24 | ...[...] | CodeInjection.rb:78:5:78:8 | code | provenance |  |
+| CodeInjection.rb:90:10:90:25 | ... + ... : [collection] [element] | CodeInjection.rb:90:10:90:37 | ... + ... | provenance |  |
+| CodeInjection.rb:90:22:90:25 | code | CodeInjection.rb:90:10:90:25 | ... + ... : [collection] [element] | provenance |  |
+| CodeInjection.rb:107:3:108:5 | self in index : PostsController [@foo] | CodeInjection.rb:117:3:119:5 | self in baz : PostsController [@foo] | provenance |  |
+| CodeInjection.rb:111:5:111:8 | [post] self [@foo] | CodeInjection.rb:114:3:115:5 | self in bar : PostsController [@foo] | provenance |  |
+| CodeInjection.rb:111:12:111:17 | call to params | CodeInjection.rb:111:12:111:23 | ...[...] | provenance |  |
+| CodeInjection.rb:111:12:111:23 | ...[...] | CodeInjection.rb:111:5:111:8 | [post] self [@foo] | provenance |  |
+| CodeInjection.rb:114:3:115:5 | self in bar : PostsController [@foo] | CodeInjection.rb:107:3:108:5 | self in index : PostsController [@foo] | provenance |  |
+| CodeInjection.rb:117:3:119:5 | self in baz : PostsController [@foo] | CodeInjection.rb:118:10:118:13 | self : PostsController [@foo] | provenance |  |
+| CodeInjection.rb:118:10:118:13 | self : PostsController [@foo] | CodeInjection.rb:118:10:118:13 | @foo | provenance |  |
+models
+| 1 | Summary: Regexp!; Method[escape,quote]; Argument[0]; ReturnValue; taint |
 nodes
 | CodeInjection.rb:5:5:5:8 | code | semmle.label | code |
 | CodeInjection.rb:5:12:5:17 | call to params | semmle.label | call to params |
@@ -14,59 +57,18 @@ nodes
 | CodeInjection.rb:78:5:78:8 | code | semmle.label | code |
 | CodeInjection.rb:78:12:78:17 | call to params | semmle.label | call to params |
 | CodeInjection.rb:78:12:78:24 | ...[...] | semmle.label | ...[...] |
-| CodeInjection.rb:80:16:80:19 | code | semmle.label | code |
-| CodeInjection.rb:86:10:86:25 | ... + ... : [collection] [element] | semmle.label | ... + ... : [collection] [element] |
-| CodeInjection.rb:86:10:86:37 | ... + ... | semmle.label | ... + ... |
-| CodeInjection.rb:86:22:86:25 | code | semmle.label | code |
-| CodeInjection.rb:88:10:88:32 | "prefix_#{...}_suffix" | semmle.label | "prefix_#{...}_suffix" |
-| CodeInjection.rb:90:10:90:13 | code | semmle.label | code |
-| CodeInjection.rb:101:3:102:5 | self in index : PostsController [@foo] | semmle.label | self in index : PostsController [@foo] |
-| CodeInjection.rb:105:5:105:8 | [post] self [@foo] | semmle.label | [post] self [@foo] |
-| CodeInjection.rb:105:12:105:17 | call to params | semmle.label | call to params |
-| CodeInjection.rb:105:12:105:23 | ...[...] | semmle.label | ...[...] |
-| CodeInjection.rb:108:3:109:5 | self in bar : PostsController [@foo] | semmle.label | self in bar : PostsController [@foo] |
-| CodeInjection.rb:111:3:113:5 | self in baz : PostsController [@foo] | semmle.label | self in baz : PostsController [@foo] |
-| CodeInjection.rb:112:10:112:13 | @foo | semmle.label | @foo |
-| CodeInjection.rb:112:10:112:13 | self : PostsController [@foo] | semmle.label | self : PostsController [@foo] |
-edges
-| CodeInjection.rb:5:5:5:8 | code | CodeInjection.rb:8:10:8:13 | code | provenance |  |
-| CodeInjection.rb:5:5:5:8 | code | CodeInjection.rb:20:20:20:23 | code | provenance |  |
-| CodeInjection.rb:5:5:5:8 | code | CodeInjection.rb:23:21:23:24 | code | provenance |  |
-| CodeInjection.rb:5:5:5:8 | code | CodeInjection.rb:29:15:29:18 | code | provenance |  |
-| CodeInjection.rb:5:5:5:8 | code | CodeInjection.rb:32:19:32:22 | code | provenance |  |
-| CodeInjection.rb:5:5:5:8 | code | CodeInjection.rb:38:24:38:27 | code | provenance |  |
-| CodeInjection.rb:5:5:5:8 | code | CodeInjection.rb:41:40:41:43 | code | provenance |  |
-| CodeInjection.rb:5:12:5:17 | call to params | CodeInjection.rb:5:12:5:24 | ...[...] | provenance |  |
-| CodeInjection.rb:5:12:5:24 | ...[...] | CodeInjection.rb:5:5:5:8 | code | provenance |  |
-| CodeInjection.rb:38:24:38:27 | code | CodeInjection.rb:38:10:38:28 | call to escape | provenance | MaD:21 |
-| CodeInjection.rb:78:5:78:8 | code | CodeInjection.rb:80:16:80:19 | code | provenance |  |
-| CodeInjection.rb:78:5:78:8 | code | CodeInjection.rb:86:10:86:37 | ... + ... | provenance |  |
-| CodeInjection.rb:78:5:78:8 | code | CodeInjection.rb:86:22:86:25 | code | provenance |  |
-| CodeInjection.rb:78:5:78:8 | code | CodeInjection.rb:88:10:88:32 | "prefix_#{...}_suffix" | provenance | AdditionalTaintStep |
-| CodeInjection.rb:78:5:78:8 | code | CodeInjection.rb:90:10:90:13 | code | provenance |  |
-| CodeInjection.rb:78:12:78:17 | call to params | CodeInjection.rb:78:12:78:24 | ...[...] | provenance |  |
-| CodeInjection.rb:78:12:78:24 | ...[...] | CodeInjection.rb:78:5:78:8 | code | provenance |  |
-| CodeInjection.rb:86:10:86:25 | ... + ... : [collection] [element] | CodeInjection.rb:86:10:86:37 | ... + ... | provenance |  |
-| CodeInjection.rb:86:22:86:25 | code | CodeInjection.rb:86:10:86:25 | ... + ... : [collection] [element] | provenance |  |
-| CodeInjection.rb:101:3:102:5 | self in index : PostsController [@foo] | CodeInjection.rb:111:3:113:5 | self in baz : PostsController [@foo] | provenance |  |
-| CodeInjection.rb:105:5:105:8 | [post] self [@foo] | CodeInjection.rb:108:3:109:5 | self in bar : PostsController [@foo] | provenance |  |
-| CodeInjection.rb:105:12:105:17 | call to params | CodeInjection.rb:105:12:105:23 | ...[...] | provenance |  |
-| CodeInjection.rb:105:12:105:23 | ...[...] | CodeInjection.rb:105:5:105:8 | [post] self [@foo] | provenance |  |
-| CodeInjection.rb:108:3:109:5 | self in bar : PostsController [@foo] | CodeInjection.rb:101:3:102:5 | self in index : PostsController [@foo] | provenance |  |
-| CodeInjection.rb:111:3:113:5 | self in baz : PostsController [@foo] | CodeInjection.rb:112:10:112:13 | self : PostsController [@foo] | provenance |  |
-| CodeInjection.rb:112:10:112:13 | self : PostsController [@foo] | CodeInjection.rb:112:10:112:13 | @foo | provenance |  |
+| CodeInjection.rb:81:16:81:19 | code | semmle.label | code |
+| CodeInjection.rb:90:10:90:25 | ... + ... : [collection] [element] | semmle.label | ... + ... : [collection] [element] |
+| CodeInjection.rb:90:10:90:37 | ... + ... | semmle.label | ... + ... |
+| CodeInjection.rb:90:22:90:25 | code | semmle.label | code |
+| CodeInjection.rb:93:10:93:32 | "prefix_#{...}_suffix" | semmle.label | "prefix_#{...}_suffix" |
+| CodeInjection.rb:96:10:96:13 | code | semmle.label | code |
+| CodeInjection.rb:107:3:108:5 | self in index : PostsController [@foo] | semmle.label | self in index : PostsController [@foo] |
+| CodeInjection.rb:111:5:111:8 | [post] self [@foo] | semmle.label | [post] self [@foo] |
+| CodeInjection.rb:111:12:111:17 | call to params | semmle.label | call to params |
+| CodeInjection.rb:111:12:111:23 | ...[...] | semmle.label | ...[...] |
+| CodeInjection.rb:114:3:115:5 | self in bar : PostsController [@foo] | semmle.label | self in bar : PostsController [@foo] |
+| CodeInjection.rb:117:3:119:5 | self in baz : PostsController [@foo] | semmle.label | self in baz : PostsController [@foo] |
+| CodeInjection.rb:118:10:118:13 | @foo | semmle.label | @foo |
+| CodeInjection.rb:118:10:118:13 | self : PostsController [@foo] | semmle.label | self : PostsController [@foo] |
 subpaths
-#select
-| CodeInjection.rb:8:10:8:13 | code | CodeInjection.rb:5:12:5:17 | call to params | CodeInjection.rb:8:10:8:13 | code | This code execution depends on a $@. | CodeInjection.rb:5:12:5:17 | call to params | user-provided value |
-| CodeInjection.rb:11:10:11:15 | call to params | CodeInjection.rb:11:10:11:15 | call to params | CodeInjection.rb:11:10:11:15 | call to params | This code execution depends on a $@. | CodeInjection.rb:11:10:11:15 | call to params | user-provided value |
-| CodeInjection.rb:20:20:20:23 | code | CodeInjection.rb:5:12:5:17 | call to params | CodeInjection.rb:20:20:20:23 | code | This code execution depends on a $@. | CodeInjection.rb:5:12:5:17 | call to params | user-provided value |
-| CodeInjection.rb:23:21:23:24 | code | CodeInjection.rb:5:12:5:17 | call to params | CodeInjection.rb:23:21:23:24 | code | This code execution depends on a $@. | CodeInjection.rb:5:12:5:17 | call to params | user-provided value |
-| CodeInjection.rb:29:15:29:18 | code | CodeInjection.rb:5:12:5:17 | call to params | CodeInjection.rb:29:15:29:18 | code | This code execution depends on a $@. | CodeInjection.rb:5:12:5:17 | call to params | user-provided value |
-| CodeInjection.rb:32:19:32:22 | code | CodeInjection.rb:5:12:5:17 | call to params | CodeInjection.rb:32:19:32:22 | code | This code execution depends on a $@. | CodeInjection.rb:5:12:5:17 | call to params | user-provided value |
-| CodeInjection.rb:38:10:38:28 | call to escape | CodeInjection.rb:5:12:5:17 | call to params | CodeInjection.rb:38:10:38:28 | call to escape | This code execution depends on a $@. | CodeInjection.rb:5:12:5:17 | call to params | user-provided value |
-| CodeInjection.rb:41:40:41:43 | code | CodeInjection.rb:5:12:5:17 | call to params | CodeInjection.rb:41:40:41:43 | code | This code execution depends on a $@. | CodeInjection.rb:5:12:5:17 | call to params | user-provided value |
-| CodeInjection.rb:80:16:80:19 | code | CodeInjection.rb:78:12:78:17 | call to params | CodeInjection.rb:80:16:80:19 | code | This code execution depends on a $@. | CodeInjection.rb:78:12:78:17 | call to params | user-provided value |
-| CodeInjection.rb:86:10:86:37 | ... + ... | CodeInjection.rb:78:12:78:17 | call to params | CodeInjection.rb:86:10:86:37 | ... + ... | This code execution depends on a $@. | CodeInjection.rb:78:12:78:17 | call to params | user-provided value |
-| CodeInjection.rb:88:10:88:32 | "prefix_#{...}_suffix" | CodeInjection.rb:78:12:78:17 | call to params | CodeInjection.rb:88:10:88:32 | "prefix_#{...}_suffix" | This code execution depends on a $@. | CodeInjection.rb:78:12:78:17 | call to params | user-provided value |
-| CodeInjection.rb:90:10:90:13 | code | CodeInjection.rb:78:12:78:17 | call to params | CodeInjection.rb:90:10:90:13 | code | This code execution depends on a $@. | CodeInjection.rb:78:12:78:17 | call to params | user-provided value |
-| CodeInjection.rb:112:10:112:13 | @foo | CodeInjection.rb:105:12:105:17 | call to params | CodeInjection.rb:112:10:112:13 | @foo | This code execution depends on a $@. | CodeInjection.rb:105:12:105:17 | call to params | user-provided value |
diff --git a/ruby/ql/test/query-tests/security/cwe-094/CodeInjection/CodeInjection.qlref b/ruby/ql/test/query-tests/security/cwe-094/CodeInjection/CodeInjection.qlref
index 6dcbcb4448e..c62d0af0a1b 100644
--- a/ruby/ql/test/query-tests/security/cwe-094/CodeInjection/CodeInjection.qlref
+++ b/ruby/ql/test/query-tests/security/cwe-094/CodeInjection/CodeInjection.qlref
@@ -1 +1,4 @@
-queries/security/cwe-094/CodeInjection.ql
+query: queries/security/cwe-094/CodeInjection.ql
+postprocess:
+  - utils/test/PrettyPrintModels.ql
+  - utils/test/InlineExpectationsTestQuery.ql
diff --git a/ruby/ql/test/query-tests/security/cwe-094/CodeInjection/CodeInjection.rb b/ruby/ql/test/query-tests/security/cwe-094/CodeInjection/CodeInjection.rb
index a8ed4a71613..f9c69d08e13 100644
--- a/ruby/ql/test/query-tests/security/cwe-094/CodeInjection/CodeInjection.rb
+++ b/ruby/ql/test/query-tests/security/cwe-094/CodeInjection/CodeInjection.rb
@@ -2,13 +2,13 @@ require 'active_job'
 
 class UsersController < ActionController::Base
   def create
-    code = params[:code]
+    code = params[:code] # $ Source
 
     # BAD
-    eval(code)
+    eval(code) # $ Alert
 
     # BAD
-    eval(params)
+    eval(params) # $ Alert
 
     # GOOD - user input is in second argument, which is not evaluated as Ruby code
     send(:sanitize, params[:code])
@@ -17,28 +17,28 @@ class UsersController < ActionController::Base
     Foo.new.bar(code)
 
     # BAD
-    Foo.class_eval(code)
+    Foo.class_eval(code) # $ Alert
 
     # BAD
-    Foo.module_eval(code)
+    Foo.module_eval(code) # $ Alert
 
     # GOOD
     Bar.class_eval(code)
 
     # BAD
-    const_get(code)
+    const_get(code) # $ Alert
 
     # BAD
-    Foo.const_get(code)
+    Foo.const_get(code) # $ Alert
 
     # GOOD
     Bar.const_get(code)
 
     # BAD
-    eval(Regexp.escape(code))
+    eval(Regexp.escape(code)) # $ Alert
 
     # BAD
-    ActiveJob::Serializers.deserialize(code)
+    ActiveJob::Serializers.deserialize(code) # $ Alert
   end
 
   def update
@@ -75,19 +75,25 @@ end
 
 class UsersController < ActionController::Base
   def create
-    code = params[:code]
+    code = params[:code] # $ Source
 
-    obj().send(code, "foo"); # BAD
+    # BAD
+    obj().send(code, "foo"); # $ Alert
 
-    obj().send("prefix_" + code + "_suffix", "foo"); # GOOD
+    # GOOD
+    obj().send("prefix_" + code + "_suffix", "foo");
 
-    obj().send("prefix_#{code}_suffix", "foo"); # GOOD
+    # GOOD
+    obj().send("prefix_#{code}_suffix", "foo");
 
-    eval("prefix_" + code + "_suffix"); # BAD
+    # BAD
+    eval("prefix_" + code + "_suffix"); # $ Alert
 
-    eval("prefix_#{code}_suffix"); # BAD
+    # BAD
+    eval("prefix_#{code}_suffix"); # $ Alert
 
-    eval(code); # BAD
+    # BAD
+    eval(code); # $ Alert
   end
 end
 
@@ -102,13 +108,13 @@ class PostsController < ActionController::Base
   end
 
   def foo
-    @foo = params[:foo]
+    @foo = params[:foo] # $ Source
   end
 
   def bar
   end
 
   def baz
-    eval(@foo)
+    eval(@foo) # $ Alert
   end
 end
diff --git a/ruby/ql/test/query-tests/security/cwe-300/Gemfile b/ruby/ql/test/query-tests/security/cwe-300/Gemfile
index f97c050d2e3..7d495697b1a 100644
--- a/ruby/ql/test/query-tests/security/cwe-300/Gemfile
+++ b/ruby/ql/test/query-tests/security/cwe-300/Gemfile
@@ -1,18 +1,18 @@
 source "https://rubygems.org" # GOOD
-source "http://rubygems.org" # $result=BAD
-source "ftp://rubygems.org" # $result=BAD
+source "http://rubygems.org" # $ result=BAD
+source "ftp://rubygems.org" # $ result=BAD
 source "ftps://rubygems.org" # GOOD
 source "unknown://rubygems.org" # GOOD
 
 git_source(:a) { "https://github.com"   } # GOOD
-git_source(:b) { "http://github.com"    } # $result=BAD
-git_source(:c) { "ftp://github.com"     } # $result=BAD
+git_source(:b) { "http://github.com"    } # $ result=BAD
+git_source(:c) { "ftp://github.com"     } # $ result=BAD
 git_source(:d) { "ftps://github.com"    } # GOOD
 git_source(:e) { "unknown://github.com" } # GOOD
 
 git_source(:f) { |name| "https://github.com/#{name}" } # GOOD
-git_source(:g) { |name| "http://github.com/#{name}" } # $result=BAD
-git_source(:h) { |name| "ftp://github.com/#{name}" } # $result=BAD
+git_source(:g) { |name| "http://github.com/#{name}" } # $ result=BAD
+git_source(:h) { |name| "ftp://github.com/#{name}" } # $ result=BAD
 git_source(:i) { |name| "ftps://github.com/#{name}" } # GOOD
 git_source(:j) { |name| "unknown://github.com/#{name}" } # GOOD
 
@@ -22,11 +22,11 @@ git_source(:k) do |name|
 end
 git_source(:l) do |name|
     foo
-    "http://github.com/#{name}" # $result=BAD
+    "http://github.com/#{name}" # $ result=BAD
 end
 git_source(:m) do |name|
     foo
-    "ftp://github.com/#{name}" # $result=BAD
+    "ftp://github.com/#{name}" # $ result=BAD
 end
 git_source(:n) do |name|
     foo
@@ -38,19 +38,19 @@ git_source(:o) do |name|
 end
 
 gem "jwt", "1.2.3", git: "https://github.com/jwt/ruby-jwt" # GOOD
-gem "jwt", "1.2.3", git: "http://github.com/jwt/ruby-jwt" # $result=BAD
-gem "jwt", "1.2.3", git: "ftp://github.com/jwt/ruby-jwt" # $result=BAD
+gem "jwt", "1.2.3", git: "http://github.com/jwt/ruby-jwt" # $ result=BAD
+gem "jwt", "1.2.3", git: "ftp://github.com/jwt/ruby-jwt" # $ result=BAD
 gem "jwt", "1.2.3", git: "ftps://github.com/jwt/ruby-jwt" # GOOD
 gem "jwt", "1.2.3", git: "unknown://github.com/jwt/ruby-jwt" # GOOD
 
 gem "jwt", "1.2.3", :git => "https://github.com/jwt/ruby-jwt" # GOOD
-gem "jwt", "1.2.3", :git => "http://github.com/jwt/ruby-jwt" # $result=BAD
-gem "jwt", "1.2.3", :git => "ftp://github.com/jwt/ruby-jwt" # $result=BAD
+gem "jwt", "1.2.3", :git => "http://github.com/jwt/ruby-jwt" # $ result=BAD
+gem "jwt", "1.2.3", :git => "ftp://github.com/jwt/ruby-jwt" # $ result=BAD
 gem "jwt", "1.2.3", :git => "ftps://github.com/jwt/ruby-jwt" # GOOD
 gem "jwt", "1.2.3", :git => "unknown://github.com/jwt/ruby-jwt" # GOOD
 
 gem "jwt", "1.2.3", source: "https://rubygems.org" # GOOD
-gem "jwt", "1.2.3", source: "http://rubygems.org" # $result=BAD
-gem "jwt", "1.2.3", source: "ftp://rubygems.org" # $result=BAD
+gem "jwt", "1.2.3", source: "http://rubygems.org" # $ result=BAD
+gem "jwt", "1.2.3", source: "ftp://rubygems.org" # $ result=BAD
 gem "jwt", "1.2.3", source: "ftps://rubygems.org" # GOOD
-gem "jwt", "1.2.3", source: "unknown://rubygems.org" # GOOD
\ No newline at end of file
+gem "jwt", "1.2.3", source: "unknown://rubygems.org" # GOOD
diff --git a/ruby/ql/test/query-tests/variables/DeadStoreOfLocal/DeadStoreOfLocal.rb b/ruby/ql/test/query-tests/variables/DeadStoreOfLocal/DeadStoreOfLocal.rb
index ae40573c5c1..9dfe8e42ecc 100644
--- a/ruby/ql/test/query-tests/variables/DeadStoreOfLocal/DeadStoreOfLocal.rb
+++ b/ruby/ql/test/query-tests/variables/DeadStoreOfLocal/DeadStoreOfLocal.rb
@@ -1,5 +1,5 @@
 def test_basic(x)
-    y = x  #$ Alert
+    y = x  # $ Alert
     y = x + 2
     return y
 end
@@ -27,7 +27,7 @@ class Sup
         print(x + 1)
     end
 end
-  
+
 class Sub < Sup
     def m(y)
         y = 3  # OK - the call to `super` sees the value of `y``
@@ -39,7 +39,7 @@ def do_twice
     yield
     yield
 end
-    
+
 def get_done_twice x
     do_twice do
         print x
@@ -52,7 +52,7 @@ def retry_once
 rescue
     yield
 end
-    
+
 def get_retried x
     retry_once do
         print x
@@ -63,4 +63,4 @@ def get_retried x
             end
         end
     end
-end
\ No newline at end of file
+end
diff --git a/ruby/ql/test/query-tests/variables/UninitializedLocal/UninitializedLocal.rb b/ruby/ql/test/query-tests/variables/UninitializedLocal/UninitializedLocal.rb
index 7c82c8bf69e..c4fc67dbe9a 100644
--- a/ruby/ql/test/query-tests/variables/UninitializedLocal/UninitializedLocal.rb
+++ b/ruby/ql/test/query-tests/variables/UninitializedLocal/UninitializedLocal.rb
@@ -9,7 +9,7 @@ def foo
       m # reads local variable m
   else
   end
-  m.strip  #$ Alert
+  m.strip  # $ Alert
   m2 # undefined local variable or method 'm2' for main (NameError)
 end
 
@@ -31,7 +31,7 @@ def test_guards
     b&.strip  # OK - safe navigation
     b.strip if b  # OK
     b.close if b && !b.closed # OK
-    b.blowup if b || !b.blownup #$ Alert
+    b.blowup if b || !b.blownup # $ Alert
 
     if false
         c = "0"
@@ -64,7 +64,7 @@ def test_loop
             a = 0
         else
             set_a
-        end   
+        end
     end until a  # OK
     a.strip  # OK - given previous until
 end
@@ -73,5 +73,5 @@ def test_for
     for i in ["foo", "bar"]  # OK - since 0..10 cannot raise
         puts i.strip
     end
-    i.strip  #$ SPURIOUS: Alert
-end
\ No newline at end of file
+    i.strip  # $ SPURIOUS: Alert
+end
diff --git a/rust/ql/lib/CHANGELOG.md b/rust/ql/lib/CHANGELOG.md
index 3887b67b4df..6f7d27e23b4 100644
--- a/rust/ql/lib/CHANGELOG.md
+++ b/rust/ql/lib/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 0.2.8
+
+### Minor Analysis Improvements
+
+* Inline expectations test comments, which are of the form `// $ tag` or `// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the `$` symbol.
+* Added neutral models to inhibit spurious generated sink models for `map` and `from`. This fixes some false positive query results.
+
+## 0.2.7
+
+### Minor Analysis Improvements
+
+* Added support for neutral models (`extensible: neutralModel`) to control where generated source, sink and flow summary models apply.
+
 ## 0.2.6
 
 No user-facing changes.
diff --git a/rust/ql/lib/change-notes/released/0.2.7.md b/rust/ql/lib/change-notes/released/0.2.7.md
new file mode 100644
index 00000000000..e931f50ca0c
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.2.7.md
@@ -0,0 +1,5 @@
+## 0.2.7
+
+### Minor Analysis Improvements
+
+* Added support for neutral models (`extensible: neutralModel`) to control where generated source, sink and flow summary models apply.
diff --git a/rust/ql/lib/change-notes/released/0.2.8.md b/rust/ql/lib/change-notes/released/0.2.8.md
new file mode 100644
index 00000000000..a892527ffef
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.2.8.md
@@ -0,0 +1,6 @@
+## 0.2.8
+
+### Minor Analysis Improvements
+
+* Inline expectations test comments, which are of the form `// $ tag` or `// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the `$` symbol.
+* Added neutral models to inhibit spurious generated sink models for `map` and `from`. This fixes some false positive query results.
diff --git a/rust/ql/lib/codeql-pack.release.yml b/rust/ql/lib/codeql-pack.release.yml
index 248dd0f4594..66ad7f587f8 100644
--- a/rust/ql/lib/codeql-pack.release.yml
+++ b/rust/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.2.6
+lastReleaseVersion: 0.2.8
diff --git a/rust/ql/lib/codeql/files/FileSystem.qll b/rust/ql/lib/codeql/files/FileSystem.qll
index ebc4085fbbb..cfab33b9a44 100644
--- a/rust/ql/lib/codeql/files/FileSystem.qll
+++ b/rust/ql/lib/codeql/files/FileSystem.qll
@@ -36,6 +36,13 @@ class Folder = Impl::Folder;
 
 module Folder = Impl::Folder;
 
+/**
+ * Holds if the file identified by `relativePath` should be treated as though it is external
+ * to the target project, even though it is within the source code directory. This is used for
+ * testing.
+ */
+extensible predicate additionalExternalFile(string relativePath);
+
 /** A file. */
 class File extends Container, Impl::File {
   /**
@@ -43,7 +50,8 @@ class File extends Container, Impl::File {
    * (rather than another location such as inside a dependency).
    */
   predicate fromSource() {
-    exists(ExtractorStep s | s.getAction() = "Extract" and s.getFile() = this)
+    exists(ExtractorStep s | s.getAction() = "Extract" and s.getFile() = this) and
+    not additionalExternalFile(this.getRelativePath())
   }
 
   /**
diff --git a/rust/ql/lib/codeql/rust/dataflow/FlowBarrier.qll b/rust/ql/lib/codeql/rust/dataflow/FlowBarrier.qll
new file mode 100644
index 00000000000..49e1d676921
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/dataflow/FlowBarrier.qll
@@ -0,0 +1,85 @@
+/**
+ * Provides classes and predicates for defining barriers and barrier guards.
+ *
+ * Flow barriers and barrier guards defined here feed into data flow configurations as follows:
+ *
+ * ```text
+ * data from *.model.yml | QL extensions of FlowBarrier::Range
+ *  v                       v
+ * FlowBarrier (associated with a models-as-data kind string)
+ *  v
+ * barrierNode predicate | other QL defined barriers, for example using concepts
+ *  v                    v
+ * various Barrier classes for specific data flow configurations
+ *
+ * data from *.model.yml | QL extensions of FlowBarrierGuard::Range
+ *  v                       v
+ * FlowBarrierGuard (associated with a models-as-data kind string)
+ *  v
+ * barrierNode predicate | other QL defined barrier guards, for example using concepts
+ *  v                          v
+ * various Barrier classes for specific data flow configurations
+ * ```
+ *
+ * New barriers and barrier guards should be defined using models-as-data, QL extensions of
+ * `FlowBarrier::Range`/`FlowBarrierGuard::Range`, or concepts. Data flow configurations should use the
+ * `barrierNode` predicate and/or concepts to define their barriers.
+ */
+
+private import rust
+private import internal.FlowSummaryImpl as Impl
+private import internal.DataFlowImpl as DataFlowImpl
+
+// import all instances below
+private module Barriers {
+  private import codeql.rust.Frameworks
+  private import codeql.rust.dataflow.internal.ModelsAsData
+}
+
+/** Provides the `Range` class used to define the extent of `FlowBarrier`. */
+module FlowBarrier {
+  /** A flow barrier. */
+  abstract class Range extends Impl::Public::BarrierElement {
+    bindingset[this]
+    Range() { any() }
+
+    override predicate isBarrier(
+      string output, string kind, Impl::Public::Provenance provenance, string model
+    ) {
+      this.isBarrier(output, kind) and provenance = "manual" and model = ""
+    }
+
+    /**
+     * Holds if this element is a flow barrier of kind `kind`, where data
+     * flows out as described by `output`.
+     */
+    predicate isBarrier(string output, string kind) { none() }
+  }
+}
+
+final class FlowBarrier = FlowBarrier::Range;
+
+/** Provides the `Range` class used to define the extent of `FlowBarrierGuard`. */
+module FlowBarrierGuard {
+  /** A flow barrier guard. */
+  abstract class Range extends Impl::Public::BarrierGuardElement {
+    bindingset[this]
+    Range() { any() }
+
+    override predicate isBarrierGuard(
+      string input, string branch, string kind, Impl::Public::Provenance provenance, string model
+    ) {
+      this.isBarrierGuard(input, branch, kind) and provenance = "manual" and model = ""
+    }
+
+    /**
+     * Holds if this element is a flow barrier guard of kind `kind`, for data
+     * flowing in as described by `input`, when `this` evaluates to `branch`.
+     */
+    predicate isBarrierGuard(string input, string branch, string kind) { none() }
+  }
+}
+
+final class FlowBarrierGuard = FlowBarrierGuard::Range;
+
+predicate barrierNode = DataFlowImpl::barrierNode/2;
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
index 23424dbffd9..27773758fc4 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
@@ -1157,6 +1157,64 @@ private module Cached {
   cached
   predicate sinkNode(Node n, string kind) { n.(FlowSummaryNode).isSink(kind, _) }
 
+  private newtype TKindModelPair =
+    TMkPair(string kind, string model) {
+      FlowSummaryImpl::Private::barrierGuardSpec(_, _, _, kind, model)
+    }
+
+  private boolean convertAcceptingValue(FlowSummaryImpl::Public::AcceptingValue av) {
+    av.isTrue() and result = true
+    or
+    av.isFalse() and result = false
+    // Remaining cases are not supported yet, they depend on the shared Guards library.
+    // or
+    // av.isNoException() and result.getDualValue().isThrowsException()
+    // or
+    // av.isZero() and result.asIntValue() = 0
+    // or
+    // av.isNotZero() and result.getDualValue().asIntValue() = 0
+    // or
+    // av.isNull() and result.isNullValue()
+    // or
+    // av.isNotNull() and result.isNonNullValue()
+  }
+
+  private predicate barrierGuardChecks(AstNode g, Expr e, boolean gv, TKindModelPair kmp) {
+    exists(
+      FlowSummaryImpl::Public::BarrierGuardElement b,
+      FlowSummaryImpl::Private::SummaryComponentStack stack,
+      FlowSummaryImpl::Public::AcceptingValue acceptingvalue, string kind, string model
+    |
+      FlowSummaryImpl::Private::barrierGuardSpec(b, stack, acceptingvalue, kind, model) and
+      e = FlowSummaryImpl::StepsInput::getSinkNode(b, stack.headOfSingleton()).asExpr() and
+      kmp = TMkPair(kind, model) and
+      gv = convertAcceptingValue(acceptingvalue) and
+      g = b.getCall()
+    )
+  }
+
+  /** Holds if `n` is a flow barrier of kind `kind` and model `model`. */
+  cached
+  predicate barrierNode(Node n, string kind, string model) {
+    exists(
+      FlowSummaryImpl::Public::BarrierElement b,
+      FlowSummaryImpl::Private::SummaryComponentStack stack
+    |
+      FlowSummaryImpl::Private::barrierSpec(b, stack, kind, model)
+    |
+      n = FlowSummaryImpl::StepsInput::getSourceNode(b, stack, false)
+      or
+      // For barriers like `Argument[0]` we want to target the pre-update node
+      n =
+        FlowSummaryImpl::StepsInput::getSourceNode(b, stack, true)
+            .(PostUpdateNode)
+            .getPreUpdateNode()
+    )
+    or
+    ParameterizedBarrierGuard<TKindModelPair, barrierGuardChecks/4>::getABarrierNode(TMkPair(kind,
+        model)) = n
+  }
+
   /**
    * A step in a flow summary defined using `OptionalStep[name]`. An `OptionalStep` is "opt-in", which means
    * that by default the step is not present in the flow summary and needs to be explicitly enabled by defining
@@ -1180,3 +1238,34 @@ private module Cached {
 }
 
 import Cached
+
+/** Holds if `n` is a flow barrier of kind `kind`. */
+predicate barrierNode(Node n, string kind) { barrierNode(n, kind, _) }
+
+bindingset[this]
+private signature class ParamSig;
+
+private module WithParam<ParamSig P> {
+  /**
+   * Holds if the guard `g` validates the expression `e` upon evaluating to `gv`.
+   *
+   * The expression `e` is expected to be a syntactic part of the guard `g`.
+   * For example, the guard `g` might be a call `isSafe(x)` and the expression `e`
+   * the argument `x`.
+   */
+  signature predicate guardChecksSig(AstNode g, Expr e, boolean branch, P param);
+}
+
+/**
+ * Provides a set of barrier nodes for a guard that validates an expression.
+ *
+ * This is expected to be used in `isBarrier`/`isSanitizer` definitions
+ * in data flow and taint tracking.
+ */
+module ParameterizedBarrierGuard<ParamSig P, WithParam<P>::guardChecksSig/4 guardChecks> {
+  /** Gets a node that is safely guarded by the given guard check. */
+  Node getABarrierNode(P param) {
+    SsaFlow::asNode(result) =
+      SsaImpl::DataFlowIntegration::ParameterizedBarrierGuard<P, guardChecks/4>::getABarrierNode(param)
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
index ec468747ab6..85032814651 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
@@ -9,6 +9,7 @@ private import codeql.rust.dataflow.internal.DataFlowImpl
 private import codeql.rust.internal.PathResolution
 private import codeql.rust.dataflow.FlowSummary
 private import codeql.rust.dataflow.Ssa
+private import codeql.rust.dataflow.internal.ModelsAsData
 private import Content
 
 predicate encodeContentTupleField(TupleFieldContent c, string arg) {
@@ -46,6 +47,16 @@ module Input implements InputSig<Location, RustDataFlow> {
 
   abstract class SinkBase extends SourceSinkBase { }
 
+  predicate neutralElement(
+    Input::SummarizedCallableBase c, string kind, string provenance, boolean isExact
+  ) {
+    exists(string path |
+      neutralModel(path, kind, provenance, _) and
+      c.getCanonicalPath() = path and
+      isExact = true
+    )
+  }
+
   private class CallExprFunction extends SourceBase, SinkBase {
     private CallExpr call;
 
@@ -132,7 +143,7 @@ module Input implements InputSig<Location, RustDataFlow> {
 
 private import Make<Location, RustDataFlow, Input> as Impl
 
-private module StepsInput implements Impl::Private::StepsInputSig {
+module StepsInput implements Impl::Private::StepsInputSig {
   DataFlowCall getACall(Public::SummarizedCallable sc) { result.asCall().getStaticTarget() = sc }
 
   /** Gets the argument of `source` described by `sc`, if any. */
@@ -160,18 +171,27 @@ private module StepsInput implements Impl::Private::StepsInputSig {
     result.asCfgScope() = source.getEnclosingCfgScope()
   }
 
-  RustDataFlow::Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) {
+  additional RustDataFlow::Node getSourceNode(
+    Input::SourceBase source, Impl::Private::SummaryComponentStack s, boolean isArgPostUpdate
+  ) {
     s.head() = Impl::Private::SummaryComponent::return(_) and
-    result.asExpr() = source.getCall()
+    result.asExpr() = source.getCall() and
+    isArgPostUpdate = false
     or
     exists(RustDataFlow::ArgumentPosition pos, Expr arg |
       s.head() = Impl::Private::SummaryComponent::parameter(pos) and
       arg = getSourceNodeArgument(source, s.tail().headOfSingleton()) and
-      result.asParameter() = getCallable(arg).getParam(pos.getPosition())
+      result.asParameter() = getCallable(arg).getParam(pos.getPosition()) and
+      isArgPostUpdate = false
     )
     or
     result.(RustDataFlow::PostUpdateNode).getPreUpdateNode().asExpr() =
-      getSourceNodeArgument(source, s.headOfSingleton())
+      getSourceNodeArgument(source, s.headOfSingleton()) and
+    isArgPostUpdate = true
+  }
+
+  RustDataFlow::Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponentStack s) {
+    result = getSourceNode(source, s, _)
   }
 
   RustDataFlow::Node getSinkNode(Input::SinkBase sink, Impl::Private::SummaryComponent sc) {
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll b/rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll
index e33bc3b461b..4d28dd8de81 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll
@@ -44,6 +44,7 @@
  */
 
 private import rust
+private import codeql.rust.dataflow.FlowBarrier
 private import codeql.rust.dataflow.FlowSummary
 private import codeql.rust.dataflow.FlowSource
 private import codeql.rust.dataflow.FlowSink
@@ -89,6 +90,38 @@ extensible predicate summaryModel(
   QlBuiltins::ExtensionId madId
 );
 
+/**
+ * Holds if a neutral model exists for the function with canonical path `path`.  The only
+ * effect of a neutral model is to prevent generated and inherited models of the corresponding
+ * `kind` (`source`, `sink` or `summary`) from being applied to that function.
+ */
+extensible predicate neutralModel(
+  string path, string kind, string provenance, QlBuiltins::ExtensionId madId
+);
+
+/**
+ * Holds if in a call to the function with canonical path `path`, the value referred
+ * to by `output` is a barrier of the given `kind` and `madId` is the data
+ * extension row number.
+ */
+extensible predicate barrierModel(
+  string path, string output, string kind, string provenance, QlBuiltins::ExtensionId madId
+);
+
+/**
+ * Holds if in a call to the function with canonical path `path`, the value referred
+ * to by `input` is a barrier guard of the given `kind` and `madId` is the data
+ * extension row number.
+ *
+ * The value referred to by `input` is assumed to lead to an argument of a call
+ * (possibly `self`), and the call is guarding the argument. `branch` is either `true`
+ * or `false`, indicating which branch of the guard is protecting the argument.
+ */
+extensible predicate barrierGuardModel(
+  string path, string input, string branch, string kind, string provenance,
+  QlBuiltins::ExtensionId madId
+);
+
 /**
  * Holds if the given extension tuple `madId` should pretty-print as `model`.
  *
@@ -109,6 +142,21 @@ predicate interpretModelForTest(QlBuiltins::ExtensionId madId, string model) {
     summaryModel(path, input, output, kind, _, madId) and
     model = "Summary: " + path + "; " + input + "; " + output + "; " + kind
   )
+  or
+  exists(string path, string kind |
+    neutralModel(path, kind, _, madId) and
+    model = "Neutral: " + path + "; " + kind
+  )
+  or
+  exists(string path, string output, string kind |
+    barrierModel(path, output, kind, _, madId) and
+    model = "Barrier: " + path + "; " + output + "; " + kind
+  )
+  or
+  exists(string path, string input, string branch, string kind |
+    barrierGuardModel(path, input, branch, kind, _, madId) and
+    model = "Barrier guard: " + path + "; " + input + "; " + branch + "; " + kind
+  )
 }
 
 private class SummarizedCallableFromModel extends SummarizedCallable::Range {
@@ -124,7 +172,9 @@ private class SummarizedCallableFromModel extends SummarizedCallable::Range {
       summaryModel(path, input_, output_, kind, p, madId) and
       f.getCanonicalPath() = path
     |
-      this = f and isExact_ = true and p_ = p
+      this = f and
+      isExact_ = true and
+      p_ = p
       or
       this.implements(f) and
       isExact_ = false and
@@ -158,6 +208,12 @@ private class FlowSourceFromModel extends FlowSource::Range {
     exists(QlBuiltins::ExtensionId madId |
       sourceModel(path, output, kind, provenance, madId) and
       model = "MaD:" + madId.toString()
+    ) and
+    // Only apply generated models when no neutral model exists
+    // (the shared code only applies neutral models to summaries at present)
+    not (
+      provenance.isGenerated() and
+      neutralModel(path, "source", _, _)
     )
   }
 }
@@ -174,6 +230,46 @@ private class FlowSinkFromModel extends FlowSink::Range {
     exists(QlBuiltins::ExtensionId madId |
       sinkModel(path, input, kind, provenance, madId) and
       model = "MaD:" + madId.toString()
+    ) and
+    // Only apply generated models when no neutral model exists
+    // (the shared code only applies neutral models to summaries at present)
+    not (
+      provenance.isGenerated() and
+      neutralModel(path, "sink", _, _)
+    )
+  }
+}
+
+private class FlowBarrierFromModel extends FlowBarrier::Range {
+  private string path;
+
+  FlowBarrierFromModel() {
+    barrierModel(path, _, _, _, _) and
+    this.callResolvesTo(path)
+  }
+
+  override predicate isBarrier(string output, string kind, Provenance provenance, string model) {
+    exists(QlBuiltins::ExtensionId madId |
+      barrierModel(path, output, kind, provenance, madId) and
+      model = "MaD:" + madId.toString()
+    )
+  }
+}
+
+private class FlowBarrierGuardFromModel extends FlowBarrierGuard::Range {
+  private string path;
+
+  FlowBarrierGuardFromModel() {
+    barrierGuardModel(path, _, _, _, _, _) and
+    this.callResolvesTo(path)
+  }
+
+  override predicate isBarrierGuard(
+    string input, string branch, string kind, Provenance provenance, string model
+  ) {
+    exists(QlBuiltins::ExtensionId madId |
+      barrierGuardModel(path, input, branch, kind, provenance, madId) and
+      model = "MaD:" + madId.toString()
     )
   }
 }
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll b/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll
index 1fa3983f811..1ccb7db73f5 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll
@@ -82,12 +82,12 @@ class FlowSummaryNode extends Node, TFlowSummaryNode {
     result = this.getSummaryNode().getSinkElement()
   }
 
-  /** Holds is this node is a source node of kind `kind`. */
+  /** Holds if this node is a source node of kind `kind`. */
   predicate isSource(string kind, string model) {
     this.getSummaryNode().(FlowSummaryImpl::Private::SourceOutputNode).isEntry(kind, model)
   }
 
-  /** Holds is this node is a sink node of kind `kind`. */
+  /** Holds if this node is a sink node of kind `kind`. */
   predicate isSink(string kind, string model) {
     this.getSummaryNode().(FlowSummaryImpl::Private::SinkInputNode).isExit(kind, model)
   }
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
index 03db7c35b4d..874126f6a08 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
@@ -305,6 +305,31 @@ private module Cached {
 
       predicate getABarrierNode = getABarrierNodeImpl/0;
     }
+
+    bindingset[this]
+    private signature class ParamSig;
+
+    private module WithParam<ParamSig P> {
+      signature predicate guardChecksSig(AstNode g, Expr e, boolean branch, P param);
+    }
+
+    overlay[global]
+    cached // nothing is actually cached
+    module ParameterizedBarrierGuard<ParamSig P, WithParam<P>::guardChecksSig/4 guardChecks> {
+      private predicate guardChecksAdjTypes(
+        DataFlowIntegrationInput::Guard g, DataFlowIntegrationInput::Expr e,
+        DataFlowIntegrationInput::GuardValue branch, P param
+      ) {
+        guardChecks(g, e, branch, param)
+      }
+
+      private Node getABarrierNodeImpl(P param) {
+        result =
+          DataFlowIntegrationImpl::BarrierGuardWithState<P, guardChecksAdjTypes/4>::getABarrierNode(param)
+      }
+
+      predicate getABarrierNode = getABarrierNodeImpl/1;
+    }
   }
 }
 
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/empty.model.yml b/rust/ql/lib/codeql/rust/dataflow/internal/empty.model.yml
index 1a33951dfc3..61c0327171a 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/empty.model.yml
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/empty.model.yml
@@ -15,3 +15,13 @@ extensions:
       pack: codeql/rust-all
       extensible: summaryModel
     data: []
+
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: barrierModel
+    data: []
+
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: barrierGuardModel
+    data: []
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
index 298e07f4b3e..3ff04276c63 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
@@ -33,5 +33,11 @@ module Impl {
         result = "impl " + trait + this.getSelfTy().toAbbreviatedString() + " { ... }"
       )
     }
+
+    /**
+     * Holds if this is an inherent `impl` block, that is, one that does not implement a trait.
+     */
+    pragma[nomagic]
+    predicate isInherent() { not this.hasTrait() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/InvocationExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/InvocationExprImpl.qll
index d4f68329de9..9fad85e756f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/InvocationExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/InvocationExprImpl.qll
@@ -6,9 +6,18 @@ module Impl {
 
   private newtype TArgumentPosition =
     TPositionalArgumentPosition(int i) {
-      i in [0 .. max([any(ParamList l).getNumberOfParams(), any(ArgList l).getNumberOfArgs()]) - 1]
+      // For the type `FunctionPosition` used by type inference, we work with function-call syntax
+      // adjusted positions, so a call like `x.m(a, b, c)` needs positions `0` through `3`; for this
+      // reason, there is no `- 1` after `max(...)` below.
+      i in [0 .. max([
+                any(ParamList l).getNumberOfParams(),
+                any(ArgList l).getNumberOfArgs(),
+                any(StructFieldList l).getNumberOfFields() // Positions are used for struct expressions in type inference
+              ]
+          )]
     } or
-    TSelfArgumentPosition()
+    TSelfArgumentPosition() or
+    TTypeQualifierArgumentPosition()
 
   /** An argument position in a call. */
   class ArgumentPosition extends TArgumentPosition {
@@ -16,13 +25,28 @@ module Impl {
     int asPosition() { this = TPositionalArgumentPosition(result) }
 
     /** Holds if this call position is a self argument. */
-    predicate isSelf() { this instanceof TSelfArgumentPosition }
+    predicate isSelf() { this = TSelfArgumentPosition() }
+
+    /**
+     * Holds if this call position is a type qualifier, that is, not an actual
+     * argument, but rather an annotation that is needed to resolve the call target,
+     * just like actual arguments may be needed to resolve the call target.
+     *
+     * Example:
+     * ```rust
+     *    Vec<i64>::new();
+     * // ^^^^^^^^ type qualifier
+     * ```
+     */
+    predicate isTypeQualifier() { this = TTypeQualifierArgumentPosition() }
 
     /** Gets a string representation of this argument position. */
     string toString() {
       result = this.asPosition().toString()
       or
       this.isSelf() and result = "self"
+      or
+      this.isTypeQualifier() and result = "type qualifier"
     }
   }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StructExprImpl.qll
index d7704894c49..897196b78cb 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/StructExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructExprImpl.qll
@@ -50,5 +50,10 @@ module Impl {
       or
       result = this.getVariant().getStructField(name)
     }
+
+    /** Gets the `i`th struct field of the instantiated struct or variant. */
+    StructField getNthStructField(int i) {
+      result = [this.getStruct().getNthStructField(i), this.getVariant().getNthStructField(i)]
+    }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll
index cb4121b7224..23fa1e76d9a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructImpl.qll
@@ -35,6 +35,12 @@ module Impl {
     /** Gets a record field, if any. */
     StructField getAStructField() { result = this.getStructField(_) }
 
+    /** Gets the `i`th struct field, if any. */
+    pragma[nomagic]
+    StructField getNthStructField(int i) {
+      result = this.getFieldList().(StructFieldList).getField(i)
+    }
+
     /** Gets the `i`th tuple field, if any. */
     pragma[nomagic]
     TupleField getTupleField(int i) { result = this.getFieldList().(TupleFieldList).getField(i) }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StructPatImpl.qll
index 28afc2a5b0d..e649d2a5778 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/StructPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructPatImpl.qll
@@ -42,6 +42,13 @@ module Impl {
       )
     }
 
+    /** Gets the `i`th struct field of the instantiated struct or variant. */
+    StructField getNthStructField(int i) {
+      exists(PathResolution::ItemNode item | item = this.getResolvedPath(_) |
+        result = [item.(Struct).getNthStructField(i), item.(Variant).getNthStructField(i)]
+      )
+    }
+
     /** Gets the struct pattern for the field `name`. */
     pragma[nomagic]
     StructPatField getPatField(string name) {
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
index 755c5399a20..bba95442f6a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
@@ -32,7 +32,8 @@ module Impl {
      * Gets the `index`th type bound of this type parameter, if any.
      *
      * This includes type bounds directly on this type parameter and bounds from
-     * any `where` clauses for this type parameter.
+     * any `where` clauses for this type parameter, but restricted to `where`
+     * clauses from the item that declares this type parameter.
      */
     TypeBound getTypeBound(int index) {
       result =
@@ -43,13 +44,36 @@ module Impl {
      * Gets a type bound of this type parameter.
      *
      * This includes type bounds directly on this type parameter and bounds from
-     * any `where` clauses for this type parameter.
+     * any `where` clauses for this type parameter, but restricted to `where`
+     * clauses from the item that declares this type parameter.
      */
     TypeBound getATypeBound() { result = this.getTypeBound(_) }
 
     /** Holds if this type parameter has at least one type bound. */
     predicate hasTypeBound() { exists(this.getATypeBound()) }
 
+    /**
+     * Gets the `index`th additional type bound of this type parameter,
+     * which applies to `constrainingItem`, if any.
+     *
+     * For example, in
+     *
+     * ```rust
+     * impl<T> SomeType<T> where T: Clone {
+     *     fn foo() where T: Debug { }
+     * }
+     * ```
+     *
+     * The constraint `Debug` additionally applies to `T` in `foo`.
+     */
+    TypeBound getAdditionalTypeBound(Item constrainingItem, int index) {
+      result =
+        rank[index + 1](int i, int j |
+          |
+          this.(TypeParamItemNode).getAdditionalTypeBoundAt(constrainingItem, i, j) order by i, j
+        )
+    }
+
     override string toAbbreviatedString() { result = this.getName().getText() }
 
     override string toStringImpl() { result = this.getName().getText() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariantImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariantImpl.qll
index ed8b93f6c1d..58b061049bd 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariantImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariantImpl.qll
@@ -32,6 +32,12 @@ module Impl {
       result.getName().getText() = name
     }
 
+    /** Gets the `i`th struct field, if any. */
+    pragma[nomagic]
+    StructField getNthStructField(int i) {
+      result = this.getFieldList().(StructFieldList).getField(i)
+    }
+
     /** Gets the `i`th tuple field, if any. */
     pragma[nomagic]
     TupleField getTupleField(int i) { result = this.getFieldList().(TupleFieldList).getField(i) }
diff --git a/rust/ql/lib/codeql/rust/frameworks/empty.model.yml b/rust/ql/lib/codeql/rust/frameworks/empty.model.yml
new file mode 100644
index 00000000000..dc2aad32991
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/empty.model.yml
@@ -0,0 +1,27 @@
+extensions:
+  # Make sure that the extensible model predicates have at least one definition
+  # to avoid errors about undefined extensionals.
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sourceModel
+    data: []
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data: []
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data: []
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: excludeFieldTaintStep
+    data: []
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: neutralModel
+    data: []
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: additionalExternalFile
+    data: []
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/alloc.model.yml b/rust/ql/lib/codeql/rust/frameworks/stdlib/alloc.model.yml
index 74432649bd8..78d1cbdec29 100644
--- a/rust/ql/lib/codeql/rust/frameworks/stdlib/alloc.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/alloc.model.yml
@@ -55,4 +55,14 @@ extensions:
       - ["<alloc::string::String as core::ops::arith::Add>::add", "Argument[0].Reference", "ReturnValue", "taint", "manual"]
       # Vec
       - ["alloc::vec::from_elem", "Argument[0]", "ReturnValue.Element", "value", "manual"]
-      - ["<alloc::vec::Vec as core::ops::deref::Deref>::deref", "Argument[self].Reference.Element", "ReturnValue.Reference.Element", "value", "manual"]
\ No newline at end of file
+      - ["<alloc::vec::Vec as core::ops::deref::Deref>::deref", "Argument[self].Reference.Element", "ReturnValue.Reference.Element", "value", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: neutralModel
+    data:
+      - ["<alloc::vec::Vec as core::convert::From>::from", "sink", "manual"]
+      - ["<alloc::collections::vec_deque::VecDeque as core::convert::From>::from", "sink", "manual"]
+      - ["<alloc::sync::Arc as core::convert::From>::from", "sink", "manual"]
+      - ["<alloc::rc::Rc as core::convert::From>::from", "sink", "manual"]
+      - ["<alloc::string::String>::split_off", "sink", "manual"]
+      - ["<alloc::vec::Vec>::split_off", "sink", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/core.model.yml b/rust/ql/lib/codeql/rust/frameworks/stdlib/core.model.yml
index c81926a607b..895ebe98bd6 100644
--- a/rust/ql/lib/codeql/rust/frameworks/stdlib/core.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/core.model.yml
@@ -102,6 +102,9 @@ extensions:
       - ["<_ as core::iter::traits::iterator::Iterator>::chain", "Argument[self]", "ReturnValue", "taint", "manual"]
       - ["<_ as core::iter::traits::iterator::Iterator>::chain", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["<_ as core::iter::traits::iterator::Iterator>::take", "Argument[self]", "ReturnValue", "taint", "manual"]
+      # Option
+      - ["<core::option::Option>::map", "Argument[self].Field[core::option::Option::Some(0)]", "Argument[0].Parameter[0]", "value", "manual"]
+      - ["<core::option::Option>::map", "Argument[0].ReturnValue", "ReturnValue.Field[core::option::Option::Some(0)]", "value", "manual"]
       # Pin
       - ["<core::pin::Pin>::new", "Argument[0]", "ReturnValue.Field[core::pin::Pin::pointer]", "value", "manual"]
       # This model is not precise, but helps in cases where a `Pin` is implicitly dereferenced.
@@ -157,6 +160,12 @@ extensions:
       - ["core::ptr::write_bytes", "Argument[0]", "pointer-access", "manual"]
       - ["core::ptr::write_unaligned", "Argument[0]", "pointer-access", "manual"]
       - ["core::ptr::write_volatile", "Argument[0]", "pointer-access", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: neutralModel
+    data:
+      - ["<core::option::Option>::map", "sink", "manual"]
+      - ["<std::io::error::Error as core::convert::From>::from", "sink", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: excludeFieldTaintStep
diff --git a/rust/ql/lib/codeql/rust/internal/PathResolution.qll b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
index 76c15485bb9..c38e9bff91c 100644
--- a/rust/ql/lib/codeql/rust/internal/PathResolution.qll
+++ b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
@@ -1162,21 +1162,39 @@ private Path getWherePredPath(WherePred wp) { result = wp.getTypeRepr().(PathTyp
 final class TypeParamItemNode extends NamedItemNode, TypeItemNode instanceof TypeParam {
   /** Gets a where predicate for this type parameter, if any */
   pragma[nomagic]
-  private WherePred getAWherePred() {
+  private WherePred getAWherePred(ItemNode constrainingItem, boolean isAdditional) {
     exists(ItemNode declaringItem |
+      this = declaringItem.getTypeParam(_) and
       this = resolvePath(getWherePredPath(result)) and
-      result = declaringItem.getADescendant() and
-      this = declaringItem.getADescendant()
+      result = constrainingItem.getADescendant()
+    |
+      constrainingItem = declaringItem and
+      isAdditional = false
+      or
+      constrainingItem = declaringItem.getADescendant() and
+      isAdditional = true
     )
   }
 
   pragma[nomagic]
   TypeBound getTypeBoundAt(int i, int j) {
     exists(TypeBoundList tbl | result = tbl.getBound(j) |
-      tbl = super.getTypeBoundList() and i = 0
+      tbl = super.getTypeBoundList() and
+      i = 0
       or
       exists(WherePred wp |
-        wp = this.getAWherePred() and
+        wp = this.getAWherePred(_, false) and
+        tbl = wp.getTypeBoundList() and
+        wp = any(WhereClause wc).getPredicate(i)
+      )
+    )
+  }
+
+  pragma[nomagic]
+  TypeBound getAdditionalTypeBoundAt(Item constrainingItem, int i, int j) {
+    exists(TypeBoundList tbl | result = tbl.getBound(j) |
+      exists(WherePred wp |
+        wp = this.getAWherePred(constrainingItem, true) and
         tbl = wp.getTypeBoundList() and
         wp = any(WhereClause wc).getPredicate(i)
       )
@@ -1197,6 +1215,15 @@ final class TypeParamItemNode extends NamedItemNode, TypeItemNode instanceof Typ
 
   ItemNode resolveABound() { result = resolvePath(this.getABoundPath()) }
 
+  pragma[nomagic]
+  ItemNode resolveAdditionalBound(ItemNode constrainingItem) {
+    result =
+      resolvePath(this.getAdditionalTypeBoundAt(constrainingItem, _, _)
+            .getTypeRepr()
+            .(PathTypeRepr)
+            .getPath())
+  }
+
   override string getName() { result = TypeParam.super.getName().getText() }
 
   override Namespace getNamespace() { result.isType() }
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/AssociatedType.qll b/rust/ql/lib/codeql/rust/internal/typeinference/AssociatedType.qll
index 6bd0db33158..8469c6da092 100644
--- a/rust/ql/lib/codeql/rust/internal/typeinference/AssociatedType.qll
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/AssociatedType.qll
@@ -24,11 +24,14 @@ AssocType getTraitAssocType(Trait trait) { result.getTrait() = trait.getSupertra
 
 /** Holds if `path` is of the form `<type as trait>::name` */
 pragma[nomagic]
-predicate pathTypeAsTraitAssoc(Path path, TypeRepr typeRepr, Path traitPath, string name) {
+predicate pathTypeAsTraitAssoc(
+  Path path, TypeRepr typeRepr, PathTypeRepr traitRepr, Trait trait, string name
+) {
   exists(PathSegment segment |
     segment = path.getQualifier().getSegment() and
     typeRepr = segment.getTypeRepr() and
-    traitPath = segment.getTraitTypeRepr().getPath() and
+    traitRepr = segment.getTraitTypeRepr() and
+    trait = resolvePath(traitRepr.getPath()) and
     name = path.getText()
   )
 }
@@ -36,17 +39,17 @@ predicate pathTypeAsTraitAssoc(Path path, TypeRepr typeRepr, Path traitPath, str
 /**
  * Holds if `assoc` is accessed on `tp` in `path`.
  *
- * That is, this is the case when `path` is of the form `<tp as
- * Trait>::AssocType` or `tp::AssocType`; and `AssocType` resolves to `assoc`.
+ * That is, this is the case when `path` is of the form `<tp as Trait>::AssocType`
+ * or `tp::AssocType`; and `AssocType` resolves to `assoc`.
  */
 predicate tpAssociatedType(TypeParam tp, AssocType assoc, Path path) {
   resolvePath(path.getQualifier()) = tp and
   resolvePath(path) = assoc
   or
-  exists(PathTypeRepr typeRepr, Path traitPath, string name |
-    pathTypeAsTraitAssoc(path, typeRepr, traitPath, name) and
+  exists(PathTypeRepr typeRepr, TraitItemNode trait, string name |
+    pathTypeAsTraitAssoc(path, typeRepr, _, trait, name) and
     tp = resolvePath(typeRepr.getPath()) and
-    assoc = resolvePath(traitPath).(TraitItemNode).getAssocItem(name)
+    assoc = trait.getAssocItem(name)
   )
 }
 
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/BlanketImplementation.qll b/rust/ql/lib/codeql/rust/internal/typeinference/BlanketImplementation.qll
index 51781a47305..97dbf2d8f3a 100644
--- a/rust/ql/lib/codeql/rust/internal/typeinference/BlanketImplementation.qll
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/BlanketImplementation.qll
@@ -41,16 +41,19 @@ private predicate hasFirstNonTrivialTraitBound(TypeParamItemNode tp, Trait trait
  */
 pragma[nomagic]
 predicate isBlanketLike(ImplItemNode i, TypePath blanketSelfPath, TypeParam blanketTypeParam) {
-  blanketTypeParam = i.getBlanketImplementationTypeParam() and
-  blanketSelfPath.isEmpty()
-  or
-  exists(TypeMention tm, Type root, TypeParameter tp |
-    tm = i.(Impl).getSelfTy() and
-    complexSelfRoot(root, tp) and
-    tm.getType() = root and
-    tm.getTypeAt(blanketSelfPath) = TTypeParamTypeParameter(blanketTypeParam) and
-    blanketSelfPath = TypePath::singleton(tp) and
-    hasFirstNonTrivialTraitBound(blanketTypeParam, _)
+  i.(Impl).hasTrait() and
+  (
+    blanketTypeParam = i.getBlanketImplementationTypeParam() and
+    blanketSelfPath.isEmpty()
+    or
+    exists(TypeMention tm, Type root, TypeParameter tp |
+      tm = i.(Impl).getSelfTy() and
+      complexSelfRoot(root, tp) and
+      tm.getType() = root and
+      tm.getTypeAt(blanketSelfPath) = TTypeParamTypeParameter(blanketTypeParam) and
+      blanketSelfPath = TypePath::singleton(tp) and
+      hasFirstNonTrivialTraitBound(blanketTypeParam, _)
+    )
   )
 }
 
@@ -100,7 +103,7 @@ module SatisfiesBlanketConstraint<
   }
 
   private module SatisfiesBlanketConstraintInput implements
-    SatisfiesConstraintInputSig<ArgumentTypeAndBlanketOffset>
+    SatisfiesTypeInputSig<ArgumentTypeAndBlanketOffset>
   {
     pragma[nomagic]
     additional predicate relevantConstraint(
@@ -120,7 +123,7 @@ module SatisfiesBlanketConstraint<
   }
 
   private module SatisfiesBlanketConstraint =
-    SatisfiesConstraint<ArgumentTypeAndBlanketOffset, SatisfiesBlanketConstraintInput>;
+    SatisfiesType<ArgumentTypeAndBlanketOffset, SatisfiesBlanketConstraintInput>;
 
   /**
    * Holds if the argument type `at` satisfies the first non-trivial blanket
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/FunctionOverloading.qll b/rust/ql/lib/codeql/rust/internal/typeinference/FunctionOverloading.qll
index d96fd892c73..d217fc3760a 100644
--- a/rust/ql/lib/codeql/rust/internal/typeinference/FunctionOverloading.qll
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/FunctionOverloading.qll
@@ -13,68 +13,105 @@ private import TypeMention
 private import TypeInference
 private import FunctionType
 
-pragma[nomagic]
-private Type resolveNonTypeParameterTypeAt(TypeMention tm, TypePath path) {
-  result = tm.getTypeAt(path) and
-  not result instanceof TypeParameter
-}
-
-bindingset[t1, t2]
-private predicate typeMentionEqual(TypeMention t1, TypeMention t2) {
-  forex(TypePath path, Type type | resolveNonTypeParameterTypeAt(t1, path) = type |
-    resolveNonTypeParameterTypeAt(t2, path) = type
-  )
-}
-
-pragma[nomagic]
-private predicate implSiblingCandidate(
-  Impl impl, TraitItemNode trait, Type rootType, TypeMention selfTy
-) {
-  trait = impl.(ImplItemNode).resolveTraitTy() and
-  selfTy = impl.getSelfTy() and
-  rootType = selfTy.getType()
-}
-
-pragma[nomagic]
-private predicate blanketImplSiblingCandidate(ImplItemNode impl, Trait trait) {
-  impl.isBlanketImplementation() and
-  trait = impl.resolveTraitTy()
-}
+private signature Type resolveTypeMentionAtSig(AstNode tm, TypePath path);
 
 /**
- * Holds if `impl1` and `impl2` are a sibling implementations of `trait`. We
- * consider implementations to be siblings if they implement the same trait for
- * the same type. In that case `Self` is the same type in both implementations,
- * and method calls to the implementations cannot be resolved unambiguously
- * based only on the receiver type.
+ * Provides logic for identifying sibling implementations, parameterized over
+ * how to resolve type mentions (`PreTypeMention` vs. `TypeMention`).
  */
-pragma[inline]
-private predicate implSiblings(TraitItemNode trait, Impl impl1, Impl impl2) {
-  impl1 != impl2 and
-  (
-    exists(Type rootType, TypeMention selfTy1, TypeMention selfTy2 |
-      implSiblingCandidate(impl1, trait, rootType, selfTy1) and
-      implSiblingCandidate(impl2, trait, rootType, selfTy2) and
-      // In principle the second conjunct below should be superflous, but we still
-      // have ill-formed type mentions for types that we don't understand. For
-      // those checking both directions restricts further. Note also that we check
-      // syntactic equality, whereas equality up to renaming would be more
-      // correct.
-      typeMentionEqual(selfTy1, selfTy2) and
-      typeMentionEqual(selfTy2, selfTy1)
+private module MkSiblingImpls<resolveTypeMentionAtSig/2 resolveTypeMentionAt> {
+  pragma[nomagic]
+  private Type resolveNonTypeParameterTypeAt(AstNode tm, TypePath path) {
+    result = resolveTypeMentionAt(tm, path) and
+    not result instanceof TypeParameter
+  }
+
+  bindingset[t1, t2]
+  private predicate typeMentionEqual(AstNode t1, AstNode t2) {
+    forex(TypePath path, Type type | resolveNonTypeParameterTypeAt(t1, path) = type |
+      resolveNonTypeParameterTypeAt(t2, path) = type
     )
-    or
-    blanketImplSiblingCandidate(impl1, trait) and
-    blanketImplSiblingCandidate(impl2, trait)
-  )
+  }
+
+  pragma[nomagic]
+  private predicate implSiblingCandidate(
+    Impl impl, TraitItemNode trait, Type rootType, AstNode selfTy
+  ) {
+    trait = impl.(ImplItemNode).resolveTraitTy() and
+    selfTy = impl.getSelfTy() and
+    rootType = resolveTypeMentionAt(selfTy, TypePath::nil())
+  }
+
+  pragma[nomagic]
+  private predicate blanketImplSiblingCandidate(ImplItemNode impl, Trait trait) {
+    impl.isBlanketImplementation() and
+    trait = impl.resolveTraitTy()
+  }
+
+  /**
+   * Holds if `impl1` and `impl2` are sibling implementations of `trait`. We
+   * consider implementations to be siblings if they implement the same trait for
+   * the same type. In that case `Self` is the same type in both implementations,
+   * and method calls to the implementations cannot be resolved unambiguously
+   * based only on the receiver type.
+   */
+  pragma[inline]
+  predicate implSiblings(TraitItemNode trait, Impl impl1, Impl impl2) {
+    impl1 != impl2 and
+    (
+      exists(Type rootType, AstNode selfTy1, AstNode selfTy2 |
+        implSiblingCandidate(impl1, trait, rootType, selfTy1) and
+        implSiblingCandidate(impl2, trait, rootType, selfTy2) and
+        // In principle the second conjunct below should be superfluous, but we still
+        // have ill-formed type mentions for types that we don't understand. For
+        // those checking both directions restricts further. Note also that we check
+        // syntactic equality, whereas equality up to renaming would be more
+        // correct.
+        typeMentionEqual(selfTy1, selfTy2) and
+        typeMentionEqual(selfTy2, selfTy1)
+      )
+      or
+      blanketImplSiblingCandidate(impl1, trait) and
+      blanketImplSiblingCandidate(impl2, trait)
+    )
+  }
+
+  /**
+   * Holds if `impl` is an implementation of `trait` and if another implementation
+   * exists for the same type.
+   */
+  pragma[nomagic]
+  predicate implHasSibling(ImplItemNode impl, Trait trait) { implSiblings(trait, impl, _) }
+
+  pragma[nomagic]
+  predicate implHasAmbiguousSiblingAt(ImplItemNode impl, Trait trait, TypePath path) {
+    exists(ImplItemNode impl2, Type t1, Type t2 |
+      implSiblings(trait, impl, impl2) and
+      t1 = resolveTypeMentionAt(impl.getTraitPath(), path) and
+      t2 = resolveTypeMentionAt(impl2.getTraitPath(), path) and
+      t1 != t2
+    |
+      not t1 instanceof TypeParameter or
+      not t2 instanceof TypeParameter
+    )
+  }
 }
 
-/**
- * Holds if `impl` is an implementation of `trait` and if another implementation
- * exists for the same type.
- */
-pragma[nomagic]
-private predicate implHasSibling(ImplItemNode impl, Trait trait) { implSiblings(trait, impl, _) }
+private Type resolvePreTypeMention(AstNode tm, TypePath path) {
+  result = tm.(PreTypeMention).getTypeAt(path)
+}
+
+private module PreSiblingImpls = MkSiblingImpls<resolvePreTypeMention/2>;
+
+predicate preImplHasAmbiguousSiblingAt = PreSiblingImpls::implHasAmbiguousSiblingAt/3;
+
+private Type resolveTypeMention(AstNode tm, TypePath path) {
+  result = tm.(TypeMention).getTypeAt(path)
+}
+
+private module SiblingImpls = MkSiblingImpls<resolveTypeMention/2>;
+
+import SiblingImpls
 
 /**
  * Holds if `f` is a function declared inside `trait`, and the type of `f` at
@@ -86,7 +123,7 @@ predicate traitTypeParameterOccurrence(
   TypeParameter traitTp
 ) {
   f = trait.getAssocItem(functionName) and
-  traitTp = getAssocFunctionTypeInclNonMethodSelfAt(f, trait, pos, path) and
+  traitTp = getAssocFunctionTypeAt(f, trait, pos, path) and
   traitTp = trait.(TraitTypeAbstraction).getATypeParameter()
 }
 
@@ -124,7 +161,8 @@ private predicate functionResolutionDependsOnArgumentCand(
     implHasSibling(impl, trait) and
     traitTypeParameterOccurrence(trait, _, functionName, pos, path, traitTp) and
     f = impl.getASuccessor(functionName) and
-    not pos.isSelf()
+    not pos.isTypeQualifier() and
+    not (f instanceof Method and pos.asPosition() = 0)
   )
 }
 
@@ -141,7 +179,7 @@ pragma[nomagic]
 private Type getAssocFunctionNonTypeParameterTypeAt(
   ImplItemNode impl, Function f, FunctionPosition pos, TypePath path
 ) {
-  result = getAssocFunctionTypeInclNonMethodSelfAt(f, impl, pos, path) and
+  result = getAssocFunctionTypeAt(f, impl, pos, path) and
   not result instanceof TypeParameter
 }
 
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/FunctionType.qll b/rust/ql/lib/codeql/rust/internal/typeinference/FunctionType.qll
index 74d8385bdf2..d128875eda7 100644
--- a/rust/ql/lib/codeql/rust/internal/typeinference/FunctionType.qll
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/FunctionType.qll
@@ -6,44 +6,43 @@ private import TypeMention
 private import TypeInference
 
 private newtype TFunctionPosition =
-  TArgumentFunctionPosition(ArgumentPosition pos) or
+  TArgumentFunctionPosition(ArgumentPosition pos) { not pos.isSelf() } or
   TReturnFunctionPosition()
 
 /**
- * A position of a type related to a function.
+ * A function-call adjusted position of a type related to a function.
  *
- * Either `self`, `return`, or a positional parameter index.
+ * Either `return` or a positional parameter index, where `self` is translated
+ * to position `0` and subsequent positional parameters at index `i` are
+ * translated to position `i + 1`.
+ *
+ * Function-call adjusted positions are needed when resolving calls of the
+ * form `Foo::f(x_1, ..., x_n)`, where we do not know up front whether `f` is a
+ * method or a non-method, and hence we need to be able to match `x_1` against
+ * both a potential `self` parameter and a potential first positional parameter
+ * (and `x_2, ... x_n` against all subsequent positional parameters).
  */
 class FunctionPosition extends TFunctionPosition {
-  predicate isSelf() { this.asArgumentPosition().isSelf() }
-
   int asPosition() { result = this.asArgumentPosition().asPosition() }
 
   predicate isPosition() { exists(this.asPosition()) }
 
   ArgumentPosition asArgumentPosition() { this = TArgumentFunctionPosition(result) }
 
+  predicate isTypeQualifier() { this.asArgumentPosition().isTypeQualifier() }
+
   predicate isReturn() { this = TReturnFunctionPosition() }
 
-  /** Gets the corresponding position when `f` is invoked via a function call. */
-  bindingset[f]
-  FunctionPosition getFunctionCallAdjusted(Function f) {
-    this.isReturn() and
-    result = this
-    or
-    if f.hasSelfParam()
-    then
-      this.isSelf() and result.asPosition() = 0
-      or
-      result.asPosition() = this.asPosition() + 1
-    else result = this
-  }
-
   TypeMention getTypeMention(Function f) {
-    this.isSelf() and
-    result = getSelfParamTypeMention(f.getSelfParam())
-    or
-    result = f.getParam(this.asPosition()).getTypeRepr()
+    (
+      if f instanceof Method
+      then
+        result = f.getParam(this.asPosition() - 1).getTypeRepr()
+        or
+        result = getSelfParamTypeMention(f.getSelfParam()) and
+        this.asPosition() = 0
+      else result = f.getParam(this.asPosition()).getTypeRepr()
+    )
     or
     this.isReturn() and
     result = getReturnTypeMention(f)
@@ -82,12 +81,13 @@ private newtype TAssocFunctionType =
     // through `i`. This ensures that `parent` is either a supertrait of `i` or
     // `i` in an `impl` block implementing `parent`.
     (parent = i or BaseTypes::rootTypesSatisfaction(_, TTrait(parent), i, _, _)) and
-    // We always include the `self` position, even for non-methods, where it is used
+    // We always include the type qualifier position, even for non-methods, where it is used
     // to match type qualifiers against the `impl` or trait type, such as in `Vec::new`.
-    (exists(pos.getTypeMention(f)) or pos.isSelf())
+    (exists(pos.getTypeMention(f)) or pos.isTypeQualifier())
   }
 
 bindingset[abs, constraint, tp]
+pragma[inline_late]
 private Type getTraitConstraintTypeAt(
   TypeAbstraction abs, TypeMention constraint, TypeParameter tp, TypePath path
 ) {
@@ -116,21 +116,9 @@ Type getAssocFunctionTypeAt(Function f, ImplOrTraitItemNode i, FunctionPosition
       else result = getTraitConstraintTypeAt(i, constraint, tp, suffix)
     )
   )
-}
-
-/**
- * Same as `getAssocFunctionTypeAt`, but also includes types at the `self` position
- * for non-methods.
- */
-pragma[nomagic]
-Type getAssocFunctionTypeInclNonMethodSelfAt(
-  Function f, ImplOrTraitItemNode i, FunctionPosition pos, TypePath path
-) {
-  result = getAssocFunctionTypeAt(f, i, pos, path)
   or
   f = i.getASuccessor(_) and
-  not f.hasSelfParam() and
-  pos.isSelf() and
+  pos.isTypeQualifier() and
   result = resolveImplOrTraitType(i, path)
 }
 
@@ -192,7 +180,7 @@ class AssocFunctionType extends MkAssocFunctionType {
   Type getTypeAt(TypePath path) {
     exists(Function f, FunctionPosition pos, ImplOrTraitItemNode i, Type t |
       this.appliesTo(f, i, pos) and
-      t = getAssocFunctionTypeInclNonMethodSelfAt(f, i, pos, path)
+      t = getAssocFunctionTypeAt(f, i, pos, path)
     |
       not t instanceof SelfTypeParameter and
       result = t
@@ -205,8 +193,7 @@ class AssocFunctionType extends MkAssocFunctionType {
     exists(Function f, ImplOrTraitItemNode i, FunctionPosition pos | this.appliesTo(f, i, pos) |
       result = pos.getTypeMention(f)
       or
-      pos.isSelf() and
-      not f.hasSelfParam() and
+      pos.isTypeQualifier() and
       result = [i.(Impl).getSelfTy().(AstNode), i.(Trait).getName()]
     )
   }
@@ -227,23 +214,47 @@ private Trait getALookupTrait(Type t) {
   result = t.(DynTraitType).getTrait()
 }
 
-/**
- * Gets the type obtained by substituting in relevant traits in which to do function
- * lookup, or `t` itself when no such trait exist.
- */
 pragma[nomagic]
-Type substituteLookupTraits(Type t) {
+private Trait getAdditionalLookupTrait(ItemNode i, Type t) {
+  result =
+    t.(TypeParamTypeParameter)
+        .getTypeParam()
+        .(TypeParamItemNode)
+        .resolveAdditionalBound(i.getImmediateParent*())
+}
+
+bindingset[n, t]
+pragma[inline_late]
+Trait getALookupTrait(AstNode n, Type t) {
+  result = getALookupTrait(t)
+  or
+  result = getAdditionalLookupTrait(any(ItemNode i | n = i.getADescendant()), t)
+}
+
+bindingset[i, t]
+pragma[inline_late]
+private Type substituteLookupTraits0(ItemNode i, Type t) {
   not exists(getALookupTrait(t)) and
+  not exists(getAdditionalLookupTrait(i, t)) and
   result = t
   or
   result = TTrait(getALookupTrait(t))
+  or
+  result = TTrait(getAdditionalLookupTrait(i, t))
 }
 
 /**
- * Gets the `n`th `substituteLookupTraits` type for `t`, per some arbitrary order.
+ * Gets the type obtained by substituting in relevant traits in which to do function
+ * lookup, or `t` itself when no such trait exists, in the context of AST node `n`.
  */
+bindingset[n, t]
+pragma[inline_late]
+Type substituteLookupTraits(AstNode n, Type t) {
+  result = substituteLookupTraits0(any(ItemNode i | n = i.getADescendant()), t)
+}
+
 pragma[nomagic]
-Type getNthLookupType(Type t, int n) {
+private Type getNthLookupType(Type t, int n) {
   not exists(getALookupTrait(t)) and
   result = t and
   n = 0
@@ -258,24 +269,66 @@ Type getNthLookupType(Type t, int n) {
 }
 
 /**
- * Gets the index of the last `substituteLookupTraits` type for `t`.
+ * Gets the `n`th `substituteLookupTraits` type for `t`, per some arbitrary order,
+ * in the context of AST node `node`.
  */
+bindingset[node, t]
+pragma[inline_late]
+Type getNthLookupType(AstNode node, Type t, int n) {
+  exists(ItemNode i | node = i.getADescendant() |
+    if exists(getAdditionalLookupTrait(i, t))
+    then
+      result =
+        TTrait(rank[n + 1](Trait trait, int j |
+            trait = [getALookupTrait(t), getAdditionalLookupTrait(i, t)] and
+            j = idOfTypeParameterAstNode(trait)
+          |
+            trait order by j
+          ))
+    else result = getNthLookupType(t, n)
+  )
+}
+
 pragma[nomagic]
-int getLastLookupTypeIndex(Type t) { result = max(int n | exists(getNthLookupType(t, n))) }
+private int getLastLookupTypeIndex(Type t) { result = max(int n | exists(getNthLookupType(t, n))) }
+
+/**
+ * Gets the index of the last `substituteLookupTraits` type for `t`,
+ * in the context of AST node `node`.
+ */
+bindingset[node, t]
+pragma[inline_late]
+int getLastLookupTypeIndex(AstNode node, Type t) {
+  if exists(getAdditionalLookupTrait(node, t))
+  then result = max(int n | exists(getNthLookupType(node, t, n)))
+  else result = getLastLookupTypeIndex(t)
+}
+
+signature class ArgSig {
+  /** Gets the type of this argument at `path`. */
+  Type getTypeAt(TypePath path);
+
+  /** Gets the enclosing item node of this argument. */
+  ItemNode getEnclosingItemNode();
+
+  /** Gets a textual representation of this argument. */
+  string toString();
+
+  /** Gets the location of this argument. */
+  Location getLocation();
+}
 
 /**
  * A wrapper around `IsInstantiationOf` which ensures to substitute in lookup
  * traits when checking whether argument types are instantiations of function
  * types.
  */
-module ArgIsInstantiationOf<
-  HasTypeTreeSig Arg, IsInstantiationOfInputSig<Arg, AssocFunctionType> Input>
-{
+module ArgIsInstantiationOf<ArgSig Arg, IsInstantiationOfInputSig<Arg, AssocFunctionType> Input> {
   final private class ArgFinal = Arg;
 
   private class ArgSubst extends ArgFinal {
     Type getTypeAt(TypePath path) {
-      result = substituteLookupTraits(super.getTypeAt(path)) and
+      result = substituteLookupTraits0(this.getEnclosingItemNode(), super.getTypeAt(path)) and
       not result = TNeverType() and
       not result = TUnknownType()
     }
@@ -318,10 +371,11 @@ signature module ArgsAreInstantiationsOfInputSig {
    * Holds if `f` inside `i` needs to have the type corresponding to type parameter
    * `tp` checked.
    *
-   * If `i` is an inherent implementation, `tp` is a type parameter of the type being
-   * implemented, otherwise `tp` is a type parameter of the trait (being implemented).
+   * `tp` is a type parameter of the trait being implemented by `f` or the trait to which
+   * `f` belongs.
    *
-   * `pos` is one of the positions in `f` in which the relevant type occours.
+   * `pos` is one of the function-call adjusted positions in `f` in which the relevant
+   * type occurs.
    */
   predicate toCheck(ImplOrTraitItemNode i, Function f, TypeParameter tp, FunctionPosition pos);
 
@@ -331,6 +385,8 @@ signature module ArgsAreInstantiationsOfInputSig {
 
     Location getLocation();
 
+    ItemNode getEnclosingItemNode();
+
     Type getArgType(FunctionPosition pos, TypePath path);
 
     predicate hasTargetCand(ImplOrTraitItemNode i, Function f);
@@ -368,7 +424,7 @@ module ArgsAreInstantiationsOf<ArgsAreInstantiationsOfInputSig Input> {
   private newtype TCallAndPos =
     MkCallAndPos(Input::Call call, FunctionPosition pos) { exists(call.getArgType(pos, _)) }
 
-  /** A call tagged with a position. */
+  /** A call tagged with a function-call adjusted position. */
   private class CallAndPos extends MkCallAndPos {
     Input::Call call;
     FunctionPosition pos;
@@ -379,6 +435,8 @@ module ArgsAreInstantiationsOf<ArgsAreInstantiationsOfInputSig Input> {
 
     FunctionPosition getPos() { result = pos }
 
+    ItemNode getEnclosingItemNode() { result = call.getEnclosingItemNode() }
+
     Location getLocation() { result = call.getLocation() }
 
     Type getTypeAt(TypePath path) { result = call.getArgType(pos, path) }
@@ -421,20 +479,21 @@ module ArgsAreInstantiationsOf<ArgsAreInstantiationsOfInputSig Input> {
 
   pragma[nomagic]
   private predicate argIsInstantiationOf(
-    Input::Call call, FunctionPosition pos, ImplOrTraitItemNode i, Function f, int rnk
+    Input::Call call, ImplOrTraitItemNode i, Function f, int rnk
   ) {
-    ArgIsInstantiationOfToIndex::argIsInstantiationOf(MkCallAndPos(call, pos), i, _) and
-    toCheckRanked(i, f, _, pos, rnk)
+    exists(FunctionPosition pos |
+      ArgIsInstantiationOfToIndex::argIsInstantiationOf(MkCallAndPos(call, pos), i, _) and
+      toCheckRanked(i, f, _, pos, rnk)
+    )
   }
 
   pragma[nomagic]
   private predicate argsAreInstantiationsOfToIndex(
     Input::Call call, ImplOrTraitItemNode i, Function f, int rnk
   ) {
-    exists(FunctionPosition pos |
-      argIsInstantiationOf(call, pos, i, f, rnk) and
-      call.hasTargetCand(i, f)
-    |
+    argIsInstantiationOf(call, i, f, rnk) and
+    call.hasTargetCand(i, f) and
+    (
       rnk = 0
       or
       argsAreInstantiationsOfToIndex(call, i, f, rnk - 1)
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/Type.qll b/rust/ql/lib/codeql/rust/internal/typeinference/Type.qll
index 05b6557522a..9ae79f2d58c 100644
--- a/rust/ql/lib/codeql/rust/internal/typeinference/Type.qll
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/Type.qll
@@ -439,11 +439,11 @@ class TypeParamTypeParameter extends TypeParameter, TTypeParamTypeParameter {
  */
 class AssociatedTypeTypeParameter extends TypeParameter, TAssociatedTypeTypeParameter {
   private Trait trait;
-  private TypeAlias typeAlias;
+  private AssocType typeAlias;
 
   AssociatedTypeTypeParameter() { this = TAssociatedTypeTypeParameter(trait, typeAlias) }
 
-  TypeAlias getTypeAlias() { result = typeAlias }
+  AssocType getTypeAlias() { result = typeAlias }
 
   /** Gets the trait that contains this associated type declaration. */
   TraitItemNode getTrait() { result = trait }
@@ -457,7 +457,13 @@ class AssociatedTypeTypeParameter extends TypeParameter, TAssociatedTypeTypePara
   override ItemNode getDeclaringItem() { result = trait }
 
   override string toString() {
-    result = typeAlias.getName().getText() + "[" + trait.getName().toString() + "]"
+    exists(string fromString, TraitItemNode trait2 |
+      result = typeAlias.getName().getText() + "[" + trait.getName() + fromString + "]" and
+      trait2 = typeAlias.getTrait() and
+      if trait = trait2
+      then fromString = ""
+      else fromString = " (inherited from " + trait2.getName() + ")"
+    )
   }
 
   override Location getLocation() { result = typeAlias.getLocation() }
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll b/rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll
index a4812ad0878..0f9afcd06bb 100644
--- a/rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll
@@ -30,7 +30,7 @@ private newtype TTypeArgumentPosition =
   } or
   TTypeParamTypeArgumentPosition(TypeParam tp)
 
-private module Input implements InputSig1<Location>, InputSig2<PreTypeMention> {
+private module Input1 implements InputSig1<Location> {
   private import Type as T
   private import codeql.rust.elements.internal.generated.Raw
   private import codeql.rust.elements.internal.generated.Synth
@@ -122,22 +122,36 @@ private module Input implements InputSig1<Location>, InputSig2<PreTypeMention> {
         tp0 order by kind, id1, id2
       )
   }
+}
 
-  int getTypePathLimit() { result = 10 }
+private import Input1
 
-  PreTypeMention getABaseTypeMention(Type t) { none() }
+private module M1 = Make1<Location, Input1>;
 
-  Type getATypeParameterConstraint(TypeParameter tp, TypePath path) {
-    exists(TypeMention tm | result = tm.getTypeAt(path) |
-      tm = tp.(TypeParamTypeParameter).getTypeParam().getATypeBound().getTypeRepr() or
-      tm = tp.(SelfTypeParameter).getTrait() or
-      tm =
-        tp.(ImplTraitTypeTypeParameter)
-            .getImplTraitTypeRepr()
-            .getTypeBoundList()
-            .getABound()
-            .getTypeRepr()
-    )
+import M1
+
+predicate getTypePathLimit = Input1::getTypePathLimit/0;
+
+predicate getTypeParameterId = Input1::getTypeParameterId/1;
+
+class TypePath = M1::TypePath;
+
+module TypePath = M1::TypePath;
+
+/**
+ * Provides shared logic for implementing `InputSig2<PreTypeMention>` and
+ * `InputSig2<TypeMention>`.
+ */
+private module Input2Common {
+  AstNode getATypeParameterConstraint(TypeParameter tp) {
+    result = tp.(TypeParamTypeParameter).getTypeParam().getATypeBound().getTypeRepr() or
+    result = tp.(SelfTypeParameter).getTrait() or
+    result =
+      tp.(ImplTraitTypeTypeParameter)
+          .getImplTraitTypeRepr()
+          .getTypeBoundList()
+          .getABound()
+          .getTypeRepr()
   }
 
   /**
@@ -148,7 +162,7 @@ private module Input implements InputSig1<Location>, InputSig2<PreTypeMention> {
    * inference module for more information.
    */
   predicate conditionSatisfiesConstraint(
-    TypeAbstraction abs, PreTypeMention condition, PreTypeMention constraint, boolean transitive
+    TypeAbstraction abs, AstNode condition, AstNode constraint, boolean transitive
   ) {
     // `impl` blocks implementing traits
     transitive = false and
@@ -196,23 +210,64 @@ private module Input implements InputSig1<Location>, InputSig2<PreTypeMention> {
       )
     )
   }
+
+  predicate typeParameterIsFunctionallyDetermined(TypeParameter tp) {
+    tp instanceof AssociatedTypeTypeParameter
+  }
 }
 
-private import Input
+private module PreInput2 implements InputSig2<PreTypeMention> {
+  PreTypeMention getABaseTypeMention(Type t) { none() }
 
-private module M1 = Make1<Location, Input>;
+  PreTypeMention getATypeParameterConstraint(TypeParameter tp) {
+    result = Input2Common::getATypeParameterConstraint(tp)
+  }
 
-import M1
+  predicate conditionSatisfiesConstraint(
+    TypeAbstraction abs, PreTypeMention condition, PreTypeMention constraint, boolean transitive
+  ) {
+    Input2Common::conditionSatisfiesConstraint(abs, condition, constraint, transitive)
+  }
 
-predicate getTypePathLimit = Input::getTypePathLimit/0;
+  predicate typeAbstractionHasAmbiguousConstraintAt(
+    TypeAbstraction abs, Type constraint, TypePath path
+  ) {
+    FunctionOverloading::preImplHasAmbiguousSiblingAt(abs, constraint.(TraitType).getTrait(), path)
+  }
 
-predicate getTypeParameterId = Input::getTypeParameterId/1;
+  predicate typeParameterIsFunctionallyDetermined =
+    Input2Common::typeParameterIsFunctionallyDetermined/1;
+}
 
-class TypePath = M1::TypePath;
+/** Provides an instantiation of the shared type inference library for `PreTypeMention`s. */
+module PreM2 = Make2<PreTypeMention, PreInput2>;
 
-module TypePath = M1::TypePath;
+private module Input2 implements InputSig2<TypeMention> {
+  TypeMention getABaseTypeMention(Type t) { none() }
 
-private module M2 = Make2<PreTypeMention, Input>;
+  TypeMention getATypeParameterConstraint(TypeParameter tp) {
+    result = Input2Common::getATypeParameterConstraint(tp)
+  }
+
+  predicate conditionSatisfiesConstraint(
+    TypeAbstraction abs, TypeMention condition, TypeMention constraint, boolean transitive
+  ) {
+    Input2Common::conditionSatisfiesConstraint(abs, condition, constraint, transitive)
+  }
+
+  predicate typeAbstractionHasAmbiguousConstraintAt(
+    TypeAbstraction abs, Type constraint, TypePath path
+  ) {
+    FunctionOverloading::implHasAmbiguousSiblingAt(abs, constraint.(TraitType).getTrait(), path)
+  }
+
+  predicate typeParameterIsFunctionallyDetermined =
+    Input2Common::typeParameterIsFunctionallyDetermined/1;
+}
+
+private import Input2
+
+private module M2 = Make2<TypeMention, Input2>;
 
 import M2
 
@@ -298,13 +353,11 @@ private class FunctionDeclaration extends Function {
   }
 
   pragma[nomagic]
-  Type getParameterTypeInclNonMethodSelf(
-    ImplOrTraitItemNodeOption i, FunctionPosition pos, TypePath path
-  ) {
+  Type getParameterType(ImplOrTraitItemNodeOption i, FunctionPosition pos, TypePath path) {
     i = parent and
     (
       not pos.isReturn() and
-      result = getAssocFunctionTypeInclNonMethodSelfAt(this, i.asSome(), pos, path)
+      result = getAssocFunctionTypeAt(this, i.asSome(), pos, path)
       or
       i.isNone() and
       result = this.getParam(pos.asPosition()).getTypeRepr().(TypeMention).getTypeAt(path)
@@ -315,7 +368,7 @@ private class FunctionDeclaration extends Function {
     i = parent and
     (
       result =
-        getAssocFunctionTypeAt(this, i.asSome(), any(FunctionPosition pos | pos.isReturn()), path)
+        getAssocFunctionTypeAt(this, i.asSome(), any(FunctionPosition ret | ret.isReturn()), path)
       or
       i.isNone() and
       result = getReturnTypeMention(this).getTypeAt(path)
@@ -345,6 +398,10 @@ private class FunctionDeclaration extends Function {
   }
 }
 
+private class AssocFunctionDeclaration extends FunctionDeclaration {
+  AssocFunctionDeclaration() { this.isAssoc(_) }
+}
+
 pragma[nomagic]
 private TypeMention getCallExprTypeMentionArgument(CallExpr ce, TypeArgumentPosition apos) {
   exists(Path p, int i | p = CallExprImpl::getFunctionPath(ce) |
@@ -596,17 +653,18 @@ module CertainTypeInference {
   }
 
   /**
-   * Holds if `n` has complete and certain type information at _some_ type path.
+   * Holds if `n` has complete and certain type information at `path`.
    */
   pragma[nomagic]
-  predicate hasInferredCertainType(AstNode n) { exists(inferCertainType(n, _)) }
+  predicate hasInferredCertainType(AstNode n, TypePath path) { exists(inferCertainType(n, path)) }
 
   /**
-   * Holds if `n` having type `t` at `path` conflicts with certain type information.
+   * Holds if `n` having type `t` at `path` conflicts with certain type information
+   * at `prefix`.
    */
-  bindingset[n, path, t]
+  bindingset[n, prefix, path, t]
   pragma[inline_late]
-  predicate certainTypeConflict(AstNode n, TypePath path, Type t) {
+  predicate certainTypeConflict(AstNode n, TypePath prefix, TypePath path, Type t) {
     inferCertainType(n, path) != t
     or
     // If we infer that `n` has _some_ type at `T1.T2....Tn`, and we also
@@ -615,7 +673,7 @@ module CertainTypeInference {
     // otherwise there is a conflict.
     //
     // Below, `prefix` is `T1.T2...Ti` and `tp` is `T(i+1)`.
-    exists(TypePath prefix, TypePath suffix, TypeParameter tp, Type certainType |
+    exists(TypePath suffix, TypeParameter tp, Type certainType |
       path = prefix.appendInverse(suffix) and
       tp = suffix.getHead() and
       inferCertainType(n, prefix) = certainType and
@@ -778,13 +836,6 @@ private predicate typeEquality(AstNode n1, TypePath prefix1, AstNode n2, TypePat
   prefix1 = TypePath::singleton(getArrayTypeParameter()) and
   prefix2.isEmpty()
   or
-  exists(Struct s |
-    n2 = [n1.(RangeExpr).getStart(), n1.(RangeExpr).getEnd()] and
-    prefix1 = TypePath::singleton(TTypeParamTypeParameter(s.getGenericParamList().getATypeParam())) and
-    prefix2.isEmpty() and
-    s = getRangeType(n1)
-  )
-  or
   exists(ClosureExpr ce, int index |
     n1 = ce and
     n2 = ce.getParam(index).getPat() and
@@ -829,6 +880,12 @@ private predicate lubCoercion(AstNode parent, AstNode child, TypePath prefix) {
   bodyReturns(parent, child) and
   strictcount(Expr e | bodyReturns(parent, e)) > 1 and
   prefix.isEmpty()
+  or
+  exists(Struct s |
+    child = [parent.(RangeExpr).getStart(), parent.(RangeExpr).getEnd()] and
+    prefix = TypePath::singleton(TTypeParamTypeParameter(s.getGenericParamList().getATypeParam())) and
+    s = getRangeType(parent)
+  )
 }
 
 /**
@@ -871,185 +928,6 @@ private Type inferTypeEquality(AstNode n, TypePath path) {
   )
 }
 
-/**
- * A matching configuration for resolving types of struct expressions
- * like `Foo { bar = baz }`.
- *
- * This also includes nullary struct expressions like `None`.
- */
-private module StructExprMatchingInput implements MatchingInputSig {
-  private newtype TPos =
-    TFieldPos(string name) { exists(any(Declaration decl).getField(name)) } or
-    TStructPos()
-
-  class DeclarationPosition extends TPos {
-    string asFieldPos() { this = TFieldPos(result) }
-
-    predicate isStructPos() { this = TStructPos() }
-
-    string toString() {
-      result = this.asFieldPos()
-      or
-      this.isStructPos() and
-      result = "(struct)"
-    }
-  }
-
-  abstract class Declaration extends AstNode {
-    final TypeParameter getTypeParameter(TypeParameterPosition ppos) {
-      typeParamMatchPosition(this.getTypeItem().getGenericParamList().getATypeParam(), result, ppos)
-    }
-
-    abstract StructField getField(string name);
-
-    abstract TypeItem getTypeItem();
-
-    Type getDeclaredType(DeclarationPosition dpos, TypePath path) {
-      // type of a field
-      exists(TypeMention tp |
-        tp = this.getField(dpos.asFieldPos()).getTypeRepr() and
-        result = tp.getTypeAt(path)
-      )
-      or
-      // type parameter of the struct itself
-      dpos.isStructPos() and
-      result = this.getTypeParameter(_) and
-      path = TypePath::singleton(result)
-      or
-      // type of the struct or enum itself
-      dpos.isStructPos() and
-      path.isEmpty() and
-      result = TDataType(this.getTypeItem())
-    }
-  }
-
-  private class StructDecl extends Declaration, Struct {
-    StructDecl() { this.isStruct() or this.isUnit() }
-
-    override StructField getField(string name) { result = this.getStructField(name) }
-
-    override TypeItem getTypeItem() { result = this }
-  }
-
-  private class StructVariantDecl extends Declaration, Variant {
-    StructVariantDecl() { this.isStruct() or this.isUnit() }
-
-    override StructField getField(string name) { result = this.getStructField(name) }
-
-    override TypeItem getTypeItem() { result = this.getEnum() }
-  }
-
-  class AccessPosition = DeclarationPosition;
-
-  abstract class Access extends AstNode {
-    pragma[nomagic]
-    abstract AstNode getNodeAt(AccessPosition apos);
-
-    pragma[nomagic]
-    Type getInferredType(AccessPosition apos, TypePath path) {
-      result = inferType(this.getNodeAt(apos), path)
-    }
-
-    pragma[nomagic]
-    abstract Path getStructPath();
-
-    pragma[nomagic]
-    Declaration getTarget() { result = resolvePath(this.getStructPath()) }
-
-    pragma[nomagic]
-    Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
-      // Handle constructions that use `Self {...}` syntax
-      exists(TypeMention tm, TypePath path0 |
-        tm = this.getStructPath() and
-        result = tm.getTypeAt(path0) and
-        path0.isCons(TTypeParamTypeParameter(apos.asTypeParam()), path)
-      )
-    }
-
-    /**
-     * Holds if the return type of this struct expression at `path` may have to
-     * be inferred from the context.
-     */
-    pragma[nomagic]
-    predicate hasUnknownTypeAt(DeclarationPosition pos, TypePath path) {
-      exists(Declaration d, TypeParameter tp |
-        d = this.getTarget() and
-        pos.isStructPos() and
-        tp = d.getDeclaredType(pos, path) and
-        not exists(DeclarationPosition fieldPos |
-          not fieldPos.isStructPos() and
-          tp = d.getDeclaredType(fieldPos, _)
-        ) and
-        // check that no explicit type arguments have been supplied for `tp`
-        not exists(TypeArgumentPosition tapos |
-          exists(this.getTypeArgument(tapos, _)) and
-          TTypeParamTypeParameter(tapos.asTypeParam()) = tp
-        )
-      )
-    }
-  }
-
-  private class StructExprAccess extends Access, StructExpr {
-    override Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
-      result = super.getTypeArgument(apos, path)
-      or
-      exists(TypePath suffix |
-        suffix.isCons(TTypeParamTypeParameter(apos.asTypeParam()), path) and
-        result = CertainTypeInference::inferCertainType(this, suffix)
-      )
-    }
-
-    override AstNode getNodeAt(AccessPosition apos) {
-      result = this.getFieldExpr(apos.asFieldPos()).getExpr()
-      or
-      result = this and
-      apos.isStructPos()
-    }
-
-    override Path getStructPath() { result = this.getPath() }
-  }
-
-  /**
-   * A potential nullary struct/variant construction such as `None`.
-   */
-  private class PathExprAccess extends Access, PathExpr {
-    PathExprAccess() { not exists(CallExpr ce | this = ce.getFunction()) }
-
-    override AstNode getNodeAt(AccessPosition apos) {
-      result = this and
-      apos.isStructPos()
-    }
-
-    override Path getStructPath() { result = this.getPath() }
-  }
-
-  predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
-    apos = dpos
-  }
-}
-
-private module StructExprMatching = Matching<StructExprMatchingInput>;
-
-pragma[nomagic]
-private Type inferStructExprType0(AstNode n, boolean isReturn, TypePath path) {
-  exists(StructExprMatchingInput::Access a, StructExprMatchingInput::AccessPosition apos |
-    n = a.getNodeAt(apos) and
-    if apos.isStructPos() then isReturn = true else isReturn = false
-  |
-    result = StructExprMatching::inferAccessType(a, apos, path)
-    or
-    a.hasUnknownTypeAt(apos, path) and
-    result = TUnknownType()
-  )
-}
-
-/**
- * Gets the type of `n` at `path`, where `n` is either a struct expression or
- * a field expression of a struct expression.
- */
-private predicate inferStructExprType =
-  ContextTyping::CheckContextTyping<inferStructExprType0/3>::check/2;
-
 pragma[nomagic]
 private TupleType inferTupleRootType(AstNode n) {
   // `typeEquality` handles the non-root cases
@@ -1109,10 +987,67 @@ private Trait getCallExprTraitQualifier(CallExpr ce) {
   )
 }
 
+pragma[nomagic]
+private predicate nonAssocFunction(ItemNode i) { not i instanceof AssocFunctionDeclaration }
+
+/**
+ * A call expression that can only resolve to something that is not an associated
+ * function, and hence does not need type inference for resolution.
+ */
+private class NonAssocCallExpr extends CallExpr {
+  NonAssocCallExpr() {
+    forex(ItemNode i | i = CallExprImpl::getResolvedFunction(this) | nonAssocFunction(i))
+  }
+
+  /**
+   * Gets the target of this call, which can be resolved using only path resolution.
+   */
+  ItemNode resolveCallTargetViaPathResolution() { result = CallExprImpl::getResolvedFunction(this) }
+
+  pragma[nomagic]
+  Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
+    result = getCallExprTypeArgument(this, apos, path)
+  }
+
+  AstNode getNodeAt(FunctionPosition pos) {
+    result = this.getSyntacticArgument(pos.asArgumentPosition())
+    or
+    result = this and pos.isReturn()
+  }
+
+  pragma[nomagic]
+  Type getInferredType(FunctionPosition pos, TypePath path) {
+    pos.isTypeQualifier() and
+    result = getCallExprTypeQualifier(this, path, false)
+    or
+    result = inferType(this.getNodeAt(pos), path)
+  }
+}
+
 /**
  * Provides functionality related to context-based typing of calls.
  */
 private module ContextTyping {
+  /**
+   * Holds if `f` mentions type parameter `tp` at some non-return position,
+   * possibly via a constraint on another mentioned type parameter.
+   */
+  pragma[nomagic]
+  private predicate assocFunctionMentionsTypeParameterAtNonRetPos(
+    ImplOrTraitItemNode i, Function f, TypeParameter tp
+  ) {
+    exists(FunctionPosition nonRetPos |
+      not nonRetPos.isReturn() and
+      not nonRetPos.isTypeQualifier() and
+      tp = getAssocFunctionTypeAt(f, i, nonRetPos, _)
+    )
+    or
+    exists(TypeParameter mid |
+      assocFunctionMentionsTypeParameterAtNonRetPos(i, f, mid) and
+      tp = getATypeParameterConstraint(mid).getTypeAt(_)
+    )
+  }
+
   /**
    * Holds if the return type of the function `f` inside `i` at `path` is type
    * parameter `tp`, and `tp` does not appear in the type of any parameter of
@@ -1129,12 +1064,7 @@ private module ContextTyping {
   ) {
     pos.isReturn() and
     tp = getAssocFunctionTypeAt(f, i, pos, path) and
-    not exists(FunctionPosition nonResPos | not nonResPos.isReturn() |
-      tp = getAssocFunctionTypeAt(f, i, nonResPos, _)
-      or
-      // `Self` types in traits implicitly mention all type parameters of the trait
-      getAssocFunctionTypeAt(f, i, nonResPos, _) = TSelfTypeParameter(i)
-    )
+    not assocFunctionMentionsTypeParameterAtNonRetPos(i, f, tp)
   }
 
   /**
@@ -1145,9 +1075,7 @@ private module ContextTyping {
   abstract class ContextTypedCallCand extends AstNode {
     abstract Type getTypeArgument(TypeArgumentPosition apos, TypePath path);
 
-    private predicate hasTypeArgument(TypeArgumentPosition apos) {
-      exists(this.getTypeArgument(apos, _))
-    }
+    predicate hasTypeArgument(TypeArgumentPosition apos) { exists(this.getTypeArgument(apos, _)) }
 
     /**
      * Holds if this call resolves to `target` inside `i`, and the return type
@@ -1184,7 +1112,12 @@ private module ContextTyping {
   pragma[nomagic]
   private predicate hasUnknownType(AstNode n) { hasUnknownTypeAt(n, _) }
 
-  signature Type inferCallTypeSig(AstNode n, boolean isReturn, TypePath path);
+  newtype FunctionPositionKind =
+    SelfKind() or
+    ReturnKind() or
+    PositionalKind()
+
+  signature Type inferCallTypeSig(AstNode n, FunctionPositionKind kind, TypePath path);
 
   /**
    * Given a predicate `inferCallType` for inferring the type of a call at a given
@@ -1194,60 +1127,31 @@ private module ContextTyping {
    */
   module CheckContextTyping<inferCallTypeSig/3 inferCallType> {
     pragma[nomagic]
-    private Type inferCallTypeFromContextCand(AstNode n, TypePath prefix, TypePath path) {
-      result = inferCallType(n, false, path) and
+    private Type inferCallNonReturnType(
+      AstNode n, FunctionPositionKind kind, TypePath prefix, TypePath path
+    ) {
+      result = inferCallType(n, kind, path) and
       hasUnknownType(n) and
+      kind != ReturnKind() and
       prefix = path.getAPrefix()
     }
 
     pragma[nomagic]
     Type check(AstNode n, TypePath path) {
-      result = inferCallType(n, true, path)
+      result = inferCallType(n, ReturnKind(), path)
       or
-      exists(TypePath prefix |
-        result = inferCallTypeFromContextCand(n, prefix, path) and
+      exists(FunctionPositionKind kind, TypePath prefix |
+        result = inferCallNonReturnType(n, kind, prefix, path) and
         hasUnknownTypeAt(n, prefix)
+      |
+        // Never propagate type information directly into the receiver, since its type
+        // must already have been known in order to resolve the call
+        if kind = SelfKind() then not prefix.isEmpty() else any()
       )
     }
   }
 }
 
-/**
- * Holds if function `f` with the name `name` and the arity `arity` exists in
- * `i`, and the type at position `pos` is `t`.
- */
-pragma[nomagic]
-private predicate assocFunctionInfo(
-  Function f, string name, int arity, ImplOrTraitItemNode i, FunctionPosition pos,
-  AssocFunctionType t
-) {
-  f = i.getASuccessor(name) and
-  arity = f.getParamList().getNumberOfParams() and
-  t.appliesTo(f, i, pos)
-}
-
-/**
- * Holds if function `f` with the name `name` and the arity `arity` exists in
- * blanket (like) implementation `impl` of `trait`, and the type at position
- * `pos` is `t`.
- *
- * `blanketPath` points to the type `blanketTypeParam` inside `t`, which
- * is the type parameter used in the blanket implementation.
- */
-pragma[nomagic]
-private predicate functionInfoBlanketLike(
-  Function f, string name, int arity, ImplItemNode impl, Trait trait, FunctionPosition pos,
-  AssocFunctionType t, TypePath blanketPath, TypeParam blanketTypeParam
-) {
-  exists(TypePath blanketSelfPath |
-    assocFunctionInfo(f, name, arity, impl, pos, t) and
-    TTypeParamTypeParameter(blanketTypeParam) = t.getTypeAt(blanketPath) and
-    blanketPath = any(string s) + blanketSelfPath and
-    BlanketImplementation::isBlanketLike(impl, blanketSelfPath, blanketTypeParam) and
-    trait = impl.resolveTraitTy()
-  )
-}
-
 /**
  * Holds if the type path `path` pointing to `type` is stripped of any leading
  * complex root type allowed for `self` parameters, such as `&`, `Box`, `Rc`,
@@ -1303,7 +1207,7 @@ private class BorrowKind extends TBorrowKind {
 }
 
 /**
- * Provides logic for resolving calls to methods.
+ * Provides logic for resolving calls to associated functions.
  *
  * When resolving a method call, a list of [candidate receiver types][1] is constructed
  *
@@ -1337,194 +1241,342 @@ private class BorrowKind extends TBorrowKind {
  *
  * [1]: https://doc.rust-lang.org/reference/expressions/method-call-expr.html#r-expr.method.candidate-receivers
  */
-private module MethodResolution {
+private module AssocFunctionResolution {
   /**
-   * Holds if method `m` with the name `name` and the arity `arity` exists in
-   * `i`, and the type of the `self` parameter is `selfType`.
-   *
-   * `strippedTypePath` points to the type `strippedType` inside `selfType`,
-   * which is the (possibly complex-stripped) root type of `selfType`. For example,
-   * if `m` has a `&self` parameter, then `strippedTypePath` is `getRefSharedTypeParameter()`
-   * and `strippedType` is the type inside the reference.
+   * Holds if function `f` with the name `name` and the arity `arity` exists in
+   * `i`, and the type at function-call adjusted position `pos` is `t`.
    */
   pragma[nomagic]
-  private predicate methodInfo(
-    Method m, string name, int arity, ImplOrTraitItemNode i, AssocFunctionType selfType,
-    TypePath strippedTypePath, Type strippedType
+  private predicate assocFunctionInfo(
+    Function f, string name, int arity, ImplOrTraitItemNode i, FunctionPosition pos,
+    AssocFunctionType t
   ) {
-    exists(FunctionPosition pos |
-      assocFunctionInfo(m, name, arity, i, pos, selfType) and
-      strippedType = selfType.getTypeAt(strippedTypePath) and
-      isComplexRootStripped(strippedTypePath, strippedType) and
-      pos.isSelf()
+    f = i.getASuccessor(name) and
+    arity = f.getNumberOfParamsInclSelf() and
+    t.appliesTo(f, i, pos)
+  }
+
+  /**
+   * Holds if the non-method trait function `f` mentions the implicit `Self` type
+   * parameter at position `pos`.
+   */
+  pragma[nomagic]
+  private predicate traitSelfTypeParameterOccurrence(
+    TraitItemNode trait, NonMethodFunction f, FunctionPosition pos
+  ) {
+    FunctionOverloading::traitTypeParameterOccurrence(trait, f, _, pos, _, TSelfTypeParameter(trait))
+  }
+
+  /**
+   * Holds if the non-method function `f` implements a trait function that mentions
+   * the implicit `Self` type parameter at position `pos`.
+   */
+  pragma[nomagic]
+  private predicate traitImplSelfTypeParameterOccurrence(
+    ImplItemNode impl, NonMethodFunction f, FunctionPosition pos
+  ) {
+    exists(NonMethodFunction traitFunction |
+      f = impl.getAnAssocItem() and
+      f.implements(traitFunction) and
+      traitSelfTypeParameterOccurrence(_, traitFunction, pos)
     )
   }
 
-  pragma[nomagic]
-  private predicate methodInfoTypeParam(
-    Method m, string name, int arity, ImplOrTraitItemNode i, AssocFunctionType selfType,
-    TypePath strippedTypePath, TypeParam tp
-  ) {
-    methodInfo(m, name, arity, i, selfType, strippedTypePath, TTypeParamTypeParameter(tp))
-  }
+  private module TypeOption = Option<Type>;
+
+  private class TypeOption = TypeOption::Option;
 
   /**
-   * Same as `methodInfo`, but restricted to non-blanket implementations, and
-   * allowing for any `strippedType` when the corresponding type inside `m` is
-   * a type parameter.
+   * Holds if function `f` with the name `name` and the arity `arity` exists in
+   * `i`, and the type at function-call adjusted position `selfPos` is `selfType`.
+   *
+   * `selfPos` is a position relevant for call resolution: either a position
+   * corresponding to the `self` parameter of `f` (if present); a type qualifier
+   * position; or a position where the implicit `Self` type parameter of some trait
+   * is mentioned in some non-method function `f_trait`, and either `f = f_trait`
+   * or `f` implements `f_trait`.
+   *
+   * `strippedTypePath` points to the type `strippedType` inside `selfType`, which
+   * is the (possibly complex-stripped) root type of `selfType`. For example, if
+   * `f` has a `&self` parameter, then `strippedTypePath` is `getRefSharedTypeParameter()`
+   * and `strippedType` is the type inside the reference.
+   *
+   * `implType` is the type being implemented by `i` (`None` when `i` is a trait).
+   *
+   * `trait` is the trait being implemented by `i` or `i` itself (`None` when `i` is inherent).
+   *
+   * `isMethod` indicates whether `f` is a method.
    */
-  pragma[inline]
-  private predicate methodInfoNonBlanket(
-    Method m, string name, int arity, ImplOrTraitItemNode i, AssocFunctionType selfType,
-    TypePath strippedTypePath, Type strippedType
+  pragma[nomagic]
+  private predicate assocFunctionInfo(
+    Function f, string name, int arity, FunctionPosition selfPos, ImplOrTraitItemNode i,
+    AssocFunctionType selfType, TypePath strippedTypePath, Type strippedType, TypeOption implType,
+    TypeOption trait, boolean isMethod
   ) {
+    assocFunctionInfo(f, name, arity, i, selfPos, selfType) and
+    strippedType = selfType.getTypeAt(strippedTypePath) and
     (
-      methodInfo(m, name, arity, i, selfType, strippedTypePath, strippedType) or
-      methodInfoTypeParam(m, name, arity, i, selfType, strippedTypePath, _)
+      isComplexRootStripped(strippedTypePath, strippedType)
+      or
+      selfPos.isTypeQualifier() and strippedTypePath.isEmpty()
     ) and
-    not BlanketImplementation::isBlanketLike(i, _, _)
+    (
+      f instanceof Method and
+      selfPos.asPosition() = 0
+      or
+      selfPos.isTypeQualifier()
+      or
+      traitSelfTypeParameterOccurrence(i, f, selfPos)
+      or
+      traitImplSelfTypeParameterOccurrence(i, f, selfPos)
+    ) and
+    (
+      implType.asSome() = resolveImplSelfTypeAt(i, TypePath::nil())
+      or
+      i instanceof Trait and
+      implType.isNone()
+    ) and
+    (
+      trait.asSome() =
+        [
+          TTrait(i).(Type),
+          TTrait(i.(ImplItemNode).resolveTraitTy()).(Type)
+        ]
+      or
+      i.(Impl).isInherent() and trait.isNone()
+    ) and
+    if f instanceof Method then isMethod = true else isMethod = false
   }
 
   /**
-   * Holds if method `m` with the name `name` and the arity `arity` exists in
-   * blanket (like) implementation `impl` of `trait`, and the type of the `self`
-   * parameter is `selfType`.
+   * Holds if function `f` with the name `name` and the arity `arity` exists in
+   * blanket (like) implementation `impl`, and the type at function-call adjusted
+   * position `selfPos` is `selfType`.
+   *
+   * `selfPos` is a position relevant for call resolution: either a position
+   * corresponding to the `self` parameter of `f` (if present); a type qualifier
+   * position; or a position where the implicit `Self` type parameter of some trait
+   * is mentioned in some non-method function `f_trait`, and `f` implements `f_trait`.
    *
    * `blanketPath` points to the type `blanketTypeParam` inside `selfType`, which
    * is the type parameter used in the blanket implementation.
+   *
+   * `implType` is the type being implemented by `i`.
+   *
+   * `trait` is the trait being implemented by `i`.
+   *
+   * `isMethod` indicates whether `f` is a method.
    */
   pragma[nomagic]
-  private predicate methodInfoBlanketLike(
-    Method m, string name, int arity, ImplItemNode impl, Trait trait, AssocFunctionType selfType,
-    TypePath blanketPath, TypeParam blanketTypeParam
+  private predicate assocFunctionInfoBlanketLike(
+    Function f, string name, int arity, ImplItemNode impl, TypeOption implType, TypeOption trait,
+    FunctionPosition selfPos, AssocFunctionType selfType, TypePath blanketPath,
+    TypeParam blanketTypeParam, boolean isMethod
   ) {
-    exists(FunctionPosition pos |
-      functionInfoBlanketLike(m, name, arity, impl, trait, pos, selfType, blanketPath,
-        blanketTypeParam) and
-      pos.isSelf()
+    exists(TypePath blanketSelfPath |
+      assocFunctionInfo(f, name, arity, selfPos, impl, selfType, _, _, implType, trait, isMethod) and
+      TTypeParamTypeParameter(blanketTypeParam) = selfType.getTypeAt(blanketPath) and
+      blanketPath = any(string s) + blanketSelfPath and
+      BlanketImplementation::isBlanketLike(impl, blanketSelfPath, blanketTypeParam)
     )
   }
 
   pragma[nomagic]
-  private predicate methodTraitInfo(string name, int arity, Trait trait) {
+  private predicate assocFunctionTraitInfo(string name, int arity, Trait trait) {
     exists(ImplItemNode i |
-      methodInfo(_, name, arity, i, _, _, _) and
+      assocFunctionInfo(_, name, arity, i, _, _) and
       trait = i.resolveTraitTy()
     )
     or
-    methodInfo(_, name, arity, trait, _, _, _)
+    assocFunctionInfo(_, name, arity, trait, _, _)
   }
 
   pragma[nomagic]
-  private predicate methodCallTraitCandidate(Element mc, Trait trait) {
-    mc =
-      any(MethodCall mc0 |
+  private predicate assocFunctionCallTraitCandidate(Element afc, Trait trait) {
+    afc =
+      any(AssocFunctionCall afc0 |
         exists(string name, int arity |
-          mc0.hasNameAndArity(name, arity) and
-          methodTraitInfo(name, arity, trait)
-        |
-          not mc0.hasTrait()
-          or
-          trait = mc0.getTrait()
+          afc0.hasNameAndArity(name, arity) and
+          assocFunctionTraitInfo(name, arity, trait) and
+          // we only need to check visibility of traits that are not mentioned explicitly
+          not afc0.hasATrait()
         )
       )
   }
 
-  private module MethodTraitIsVisible = TraitIsVisible<methodCallTraitCandidate/2>;
+  private module AssocFunctionTraitIsVisible = TraitIsVisible<assocFunctionCallTraitCandidate/2>;
 
-  private predicate methodCallVisibleTraitCandidate = MethodTraitIsVisible::traitIsVisible/2;
-
-  bindingset[mc, impl]
+  bindingset[afc, impl]
   pragma[inline_late]
-  private predicate methodCallVisibleImplTraitCandidate(MethodCall mc, ImplItemNode impl) {
-    methodCallVisibleTraitCandidate(mc, impl.resolveTraitTy())
+  private predicate callVisibleImplTraitCandidate(AssocFunctionCall afc, ImplItemNode impl) {
+    AssocFunctionTraitIsVisible::traitIsVisible(afc, impl.resolveTraitTy())
   }
 
   /**
-   * Holds if method call `mc` may target a method in `i` with `self` parameter having
-   * type `selfType`.
+   * Checks that the explicit type qualifier of a call (if any), `typeQualifier`,
+   * matches the type being implemented by the target, `implType`.
+   */
+  bindingset[implType]
+  private predicate callTypeQualifierCheck(TypeOption implType, TypeOption typeQualifier) {
+    typeQualifier = [implType, TypeOption::none_()]
+  }
+
+  /**
+   * Checks that the explicit trait qualifier of a call (if any), `traitQualifier`,
+   * matches the trait being implemented by the target (or in which the target is defined),
+   * `trait`, and that when a receiver is present in the call, the target is a method.
+   */
+  bindingset[trait, isMethod]
+  pragma[inline_late]
+  private predicate callTraitQualifierAndReceiverCheck(
+    TypeOption trait, Boolean isMethod, TypeOption traitQualifier, boolean hasReceiver
+  ) {
+    traitQualifier = [trait, TypeOption::none_()] and
+    hasReceiver = [isMethod, false]
+  }
+
+  bindingset[implType, trait, isMethod]
+  private predicate callCheck(
+    TypeOption implType, TypeOption trait, Boolean isMethod, TypeOption typeQualifier,
+    TypeOption traitQualifier, boolean hasReceiver
+  ) {
+    callTypeQualifierCheck(implType, typeQualifier) and
+    callTraitQualifierAndReceiverCheck(trait, isMethod, traitQualifier, hasReceiver)
+  }
+
+  pragma[nomagic]
+  private predicate assocFunctionInfoNonBlanketLikeCheck(
+    Function f, string name, int arity, FunctionPosition selfPos, ImplOrTraitItemNode i,
+    AssocFunctionType selfType, TypePath strippedTypePath, Type strippedType,
+    TypeOption typeQualifier, TypeOption traitQualifier, boolean hasReceiver
+  ) {
+    exists(TypeOption implType, TypeOption trait, boolean isMethod |
+      assocFunctionInfo(f, name, arity, selfPos, i, selfType, strippedTypePath, strippedType,
+        implType, trait, isMethod) and
+      not BlanketImplementation::isBlanketLike(i, _, _) and
+      callCheck(implType, trait, isMethod, typeQualifier, traitQualifier, hasReceiver)
+    )
+  }
+
+  pragma[nomagic]
+  private predicate assocFunctionInfoNonBlanketLikeTypeParamCheck(
+    Function f, string name, int arity, FunctionPosition selfPos, ImplOrTraitItemNode i,
+    AssocFunctionType selfType, TypePath strippedTypePath, TypeOption typeQualifier,
+    TypeOption traitQualifier, boolean hasReceiver
+  ) {
+    assocFunctionInfoNonBlanketLikeCheck(f, name, arity, selfPos, i, selfType, strippedTypePath,
+      TTypeParamTypeParameter(_), typeQualifier, traitQualifier, hasReceiver)
+  }
+
+  /**
+   * Holds if call `afc` may target function `f` in `i` with type `selfType` at
+   * function-call adjusted position `selfPos`.
    *
    * `strippedTypePath` points to the type `strippedType` inside `selfType`,
    * which is the (possibly complex-stripped) root type of `selfType`.
-   *
-   * This predicate only checks for matching method names and arities, and whether
-   * the trait being implemented by `i` (when `i` is not a trait itself) is visible
-   * at `mc`.
    */
-  bindingset[mc, strippedTypePath, strippedType]
+  bindingset[afc, strippedTypePath, strippedType]
   pragma[inline_late]
-  private predicate methodCallNonBlanketCandidate(
-    MethodCall mc, Method m, ImplOrTraitItemNode i, AssocFunctionType self,
-    TypePath strippedTypePath, Type strippedType
+  private predicate nonBlanketLikeCandidate(
+    AssocFunctionCall afc, Function f, FunctionPosition selfPos, ImplOrTraitItemNode i,
+    AssocFunctionType selfType, TypePath strippedTypePath, Type strippedType
   ) {
-    exists(string name, int arity |
-      mc.hasNameAndArity(name, arity) and
-      methodInfoNonBlanket(m, name, arity, i, self, strippedTypePath, strippedType)
+    exists(
+      string name, int arity, TypeOption typeQualifier, TypeOption traitQualifier,
+      boolean hasReceiver
     |
-      i =
-        any(Impl impl |
-          not impl.hasTrait()
-          or
-          methodCallVisibleImplTraitCandidate(mc, impl)
-        )
+      afc.hasSyntacticInfo(name, arity, typeQualifier, traitQualifier, hasReceiver) and
+      if not afc.hasATrait() and i.(Impl).hasTrait()
+      then callVisibleImplTraitCandidate(afc, i)
+      else any()
+    |
+      assocFunctionInfoNonBlanketLikeCheck(f, name, arity, selfPos, i, selfType, strippedTypePath,
+        strippedType, typeQualifier, traitQualifier, hasReceiver)
       or
-      methodCallVisibleTraitCandidate(mc, i)
-      or
-      i.(ImplItemNode).resolveTraitTy() = mc.getTrait()
+      assocFunctionInfoNonBlanketLikeTypeParamCheck(f, name, arity, selfPos, i, selfType,
+        strippedTypePath, typeQualifier, traitQualifier, hasReceiver)
+    )
+  }
+
+  bindingset[name, arity, typeQualifier, traitQualifier, hasReceiver]
+  pragma[inline_late]
+  private predicate assocFunctionInfoBlanketLikeCheck(
+    Function f, string name, int arity, FunctionPosition selfPos, ImplItemNode impl,
+    AssocFunctionType selfType, TypePath blanketPath, TypeParam blanketTypeParam,
+    TypeOption typeQualifier, TypeOption traitQualifier, boolean hasReceiver
+  ) {
+    exists(TypeOption implType, TypeOption trait, boolean isMethod |
+      assocFunctionInfoBlanketLike(f, name, arity, impl, implType, trait, selfPos, selfType,
+        blanketPath, blanketTypeParam, isMethod) and
+      callTraitQualifierAndReceiverCheck(trait, isMethod, traitQualifier, hasReceiver) and
+      if impl.isBlanketImplementation()
+      then any()
+      else callTypeQualifierCheck(implType, typeQualifier)
     )
   }
 
   /**
-   * Holds if method call `mc` may target a method in blanket (like) implementation
-   * `impl` with `self` parameter having type `selfType`.
+   * Holds if call `afc` may target function `f` in blanket (like) implementation
+   * `impl` with type `selfType` at function-call adjusted position `selfPos`.
    *
    * `blanketPath` points to the type `blanketTypeParam` inside `selfType`, which
    * is the type parameter used in the blanket implementation.
-   *
-   * This predicate only checks for matching method names and arities, and whether
-   * the trait being implemented by `i` (when `i` is not a trait itself) is visible
-   * at `mc`.
    */
-  bindingset[mc]
+  bindingset[afc]
   pragma[inline_late]
-  private predicate methodCallBlanketLikeCandidate(
-    MethodCall mc, Method m, ImplItemNode impl, AssocFunctionType self, TypePath blanketPath,
-    TypeParam blanketTypeParam
+  private predicate blanketLikeCandidate(
+    AssocFunctionCall afc, Function f, FunctionPosition selfPos, ImplItemNode impl,
+    AssocFunctionType self, TypePath blanketPath, TypeParam blanketTypeParam
   ) {
-    exists(string name, int arity |
-      mc.hasNameAndArity(name, arity) and
-      methodInfoBlanketLike(m, name, arity, impl, _, self, blanketPath, blanketTypeParam)
+    exists(
+      string name, int arity, TypeOption typeQualifier, TypeOption traitQualifier,
+      boolean hasReceiver
     |
-      methodCallVisibleImplTraitCandidate(mc, impl)
-      or
-      impl.resolveTraitTy() = mc.getTrait()
+      afc.hasSyntacticInfo(name, arity, typeQualifier, traitQualifier, hasReceiver) and
+      assocFunctionInfoBlanketLikeCheck(f, name, arity, selfPos, impl, self, blanketPath,
+        blanketTypeParam, typeQualifier, traitQualifier, hasReceiver)
+    |
+      if not afc.hasATrait() then callVisibleImplTraitCandidate(afc, impl) else any()
     )
   }
 
   /**
-   * A (potential) method call.
+   * A (potential) call to an associated function.
    *
    * This is either:
    *
-   * 1. `MethodCallMethodCallExpr`: an actual method call, `x.m()`;
-   * 2. `MethodCallIndexExpr`: an index expression, `x[i]`, which is [syntactic sugar][1]
+   * 1. `AssocFunctionCallMethodCallExpr`: a method call, `x.m()`;
+   * 2. `AssocFunctionCallIndexExpr`: an index expression, `x[i]`, which is [syntactic sugar][1]
    *    for `*x.index(i)`;
-   * 3. `MethodCallCallExpr`: a qualified function call, `Q::m(x)`, where `m` is a method;
-   *    or
-   * 4. `MethodCallOperation`: an operation expression, `x + y`, which is syntactic sugar
+   * 3. `AssocFunctionCallCallExpr`: a qualified function call, `Q::f(x)`; or
+   * 4. `AssocFunctionCallOperation`: an operation expression, `x + y`, which is syntactic sugar
    *    for `Add::add(x, y)`.
    *
    * Note that only in case 1 and 2 is auto-dereferencing and borrowing allowed.
    *
-   * Note also that only case 4 is a _potential_ method call; in all other cases, we are
-   * guaranteed that the target is a method.
+   * Note also that only case 3 is a _potential_ call; in all other cases, we are guaranteed that
+   * the target is an associated function (in fact, a method).
    *
    * [1]: https://doc.rust-lang.org/std/ops/trait.Index.html
    */
-  abstract class MethodCall extends Expr {
+  abstract class AssocFunctionCall extends Expr {
+    /**
+     * Holds if this call targets a function named `name` with `arity` parameters
+     * (including `self`).
+     */
+    pragma[nomagic]
     abstract predicate hasNameAndArity(string name, int arity);
 
-    abstract Expr getArg(ArgumentPosition pos);
+    abstract Expr getNonReturnNodeAt(FunctionPosition pos);
+
+    AstNode getNodeAt(FunctionPosition pos) {
+      result = this.getNonReturnNodeAt(pos)
+      or
+      result = this and pos.isReturn()
+    }
+
+    /** Holds if this call has a receiver and hence must target a method. */
+    abstract predicate hasReceiver();
 
     abstract predicate supportsAutoDerefAndBorrow();
 
@@ -1534,313 +1586,452 @@ private module MethodResolution {
     /** Holds if this call targets a trait. */
     predicate hasTrait() { exists(this.getTrait()) }
 
-    AstNode getNodeAt(FunctionPosition apos) {
-      result = this.getArg(apos.asArgumentPosition())
+    Trait getATrait() {
+      result = this.getTrait()
       or
-      result = this and apos.isReturn()
+      result = getALookupTrait(this, getCallExprTypeQualifier(this, TypePath::nil(), _))
     }
 
-    Type getArgumentTypeAt(ArgumentPosition pos, TypePath path) {
-      result = inferType(this.getArg(pos), path)
-    }
+    predicate hasATrait() { exists(this.getATrait()) }
 
-    private Type getReceiverTypeAt(TypePath path) {
-      result = this.getArgumentTypeAt(any(ArgumentPosition pos | pos.isSelf()), path)
+    private Type getNonTypeParameterTypeQualifier() {
+      result = getCallExprTypeQualifier(this, TypePath::nil(), _) and
+      not result instanceof TypeParameter
     }
 
     /**
-     * Same as `getACandidateReceiverTypeAt`, but without borrows.
+     * Holds if this call has the given purely syntactic information, that is,
+     * information that does not rely on type inference.
      */
     pragma[nomagic]
-    Type getACandidateReceiverTypeAtNoBorrow(DerefChain derefChain, TypePath path) {
-      result = this.getReceiverTypeAt(path) and
-      derefChain.isEmpty()
-      or
-      exists(DerefImplItemNode impl, DerefChain suffix |
-        result = ImplicitDeref::getDereferencedCandidateReceiverType(this, impl, suffix, path) and
-        derefChain = DerefChain::cons(impl, suffix)
+    predicate hasSyntacticInfo(
+      string name, int arity, TypeOption typeQualifier, TypeOption traitQualifier,
+      boolean hasReceiver
+    ) {
+      this.hasNameAndArity(name, arity) and
+      (if this.hasReceiver() then hasReceiver = true else hasReceiver = false) and
+      (
+        typeQualifier.asSome() = this.getNonTypeParameterTypeQualifier()
+        or
+        not exists(this.getNonTypeParameterTypeQualifier()) and
+        typeQualifier.isNone()
+      ) and
+      (
+        traitQualifier.asSome() = TTrait(this.getATrait())
+        or
+        not this.hasATrait() and
+        traitQualifier.isNone()
       )
     }
 
+    Type getTypeAt(FunctionPosition pos, TypePath path) {
+      result = inferType(this.getNodeAt(pos), path)
+    }
+
     /**
-     * Holds if the method inside `i` with matching name and arity can be ruled
+     * Holds if `selfPos` is a potentially relevant function-call adjusted position
+     * for resolving this call.
+     *
+     * Only holds when we don't know for sure that the target is a method (in those
+     * cases we rely on the receiver only).
+     */
+    pragma[nomagic]
+    private predicate isRelevantSelfPos(FunctionPosition selfPos) {
+      not this.hasReceiver() and
+      exists(TypePath strippedTypePath, Type strippedType |
+        strippedType = substituteLookupTraits(this, this.getTypeAt(selfPos, strippedTypePath)) and
+        strippedType != TNeverType() and
+        strippedType != TUnknownType()
+      |
+        nonBlanketLikeCandidate(this, _, selfPos, _, _, strippedTypePath, strippedType)
+        or
+        blanketLikeCandidate(this, _, selfPos, _, _, strippedTypePath, _)
+      )
+    }
+
+    predicate hasReceiverAtPos(FunctionPosition pos) { this.hasReceiver() and pos.asPosition() = 0 }
+
+    /**
+     * Holds if the function inside `i` with matching name and arity can be ruled
      * out as a target of this call, because the candidate receiver type represented
-     * by `derefChain` and `borrow` is incompatible with the `self` parameter type.
+     * by `derefChain` and `borrow` is incompatible with the type at function-call
+     * adjusted position `selfPos`.
      *
      * The types are incompatible because they disagree on a concrete type somewhere
      * inside `root`.
      */
     pragma[nomagic]
     private predicate hasIncompatibleTarget(
-      ImplOrTraitItemNode i, DerefChain derefChain, BorrowKind borrow, Type root
+      ImplOrTraitItemNode i, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow,
+      Type root
     ) {
       exists(TypePath path |
-        ReceiverIsInstantiationOfSelfParam::argIsNotInstantiationOf(MkMethodCallCand(this,
-            derefChain, borrow), i, _, path) and
+        SelfArgIsInstantiationOf::argIsNotInstantiationOf(this, i, selfPos, derefChain, borrow, path) and
         path.isCons(root.getATypeParameter(), _)
       )
+      or
+      exists(AssocFunctionType selfType |
+        SelfArgIsInstantiationOf::argIsInstantiationOf(this, i, selfPos, derefChain, borrow,
+          selfType) and
+        OverloadedCallArgsAreInstantiationsOf::argsAreNotInstantiationsOf(this, i) and
+        root = selfType.getTypeAt(TypePath::nil())
+      )
     }
 
     /**
-     * Holds if the method inside blanket-like implementation `impl` with matching name
+     * Holds if the function inside blanket-like implementation `impl` with matching name
      * and arity can be ruled out as a target of this call, either because the candidate
-     * receiver type represented by `derefChain` and `borrow` is incompatible with the `self`
-     * parameter type, or because the blanket constraint is not satisfied.
+     * receiver type represented by `derefChain` and `borrow` is incompatible with the type
+     * at function-call adjusted position `selfPos`, or because the blanket constraint
+     * is not satisfied.
      */
     pragma[nomagic]
     private predicate hasIncompatibleBlanketLikeTarget(
-      ImplItemNode impl, DerefChain derefChain, BorrowKind borrow
+      ImplItemNode impl, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
     ) {
-      ReceiverIsNotInstantiationOfBlanketLikeSelfParam::argIsNotInstantiationOf(MkMethodCallCand(this,
-          derefChain, borrow), impl, _, _)
+      SelfArgIsNotInstantiationOfBlanketLike::argIsNotInstantiationOf(MkAssocFunctionCallCand(this,
+          selfPos, derefChain, borrow), impl, _, _)
       or
-      ReceiverSatisfiesBlanketLikeConstraint::dissatisfiesBlanketConstraint(MkMethodCallCand(this,
-          derefChain, borrow), impl)
+      ArgSatisfiesBlanketLikeConstraint::dissatisfiesBlanketConstraint(MkAssocFunctionCallCand(this,
+          selfPos, derefChain, borrow), impl)
+    }
+
+    pragma[nomagic]
+    private predicate hasNoInherentTargetCheck(
+      FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
+    ) {
+      MkAssocFunctionCallCand(this, selfPos, derefChain, borrow)
+          .(AssocFunctionCallCand)
+          .hasNoInherentTargetCheck()
+    }
+
+    pragma[nomagic]
+    private predicate hasNoInherentTargetTypeQualifierCheck() {
+      exists(FunctionPosition typeQualifierPos |
+        typeQualifierPos.isTypeQualifier() and
+        this.hasNoInherentTargetCheck(typeQualifierPos, DerefChain::nil(), TNoBorrowKind())
+      )
+    }
+
+    pragma[nomagic]
+    predicate hasNoInherentTarget(FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow) {
+      this.hasNoInherentTargetCheck(selfPos, derefChain, borrow) and
+      if exists(this.getNonTypeParameterTypeQualifier()) and not selfPos.isTypeQualifier()
+      then
+        // If this call is of the form `Foo::bar(x)` and we are resolving with respect to the type
+        // of `x`, then we additionally need to check that the type qualifier does not give rise
+        // to an inherent target
+        this.hasNoInherentTargetTypeQualifierCheck()
+      else any()
     }
 
     /**
-     * Same as `getACandidateReceiverTypeAt`, but excludes pseudo types `!` and `unknown`.
+     * Same as `getSelfTypeAt`, but excludes pseudo types `!` and `unknown`.
      */
     pragma[nomagic]
-    Type getANonPseudoCandidateReceiverTypeAt(
-      DerefChain derefChain, BorrowKind borrow, TypePath path
+    Type getANonPseudoSelfTypeAt(
+      FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow, TypePath path
     ) {
-      result = this.getACandidateReceiverTypeAt(derefChain, borrow, path) and
+      result = this.getSelfTypeAt(selfPos, derefChain, borrow, path) and
       result != TNeverType() and
       result != TUnknownType()
     }
 
     pragma[nomagic]
-    private Type getComplexStrippedType(
-      DerefChain derefChain, BorrowKind borrow, TypePath strippedTypePath
+    private Type getComplexStrippedSelfType(
+      FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow, TypePath strippedTypePath
     ) {
-      result = this.getANonPseudoCandidateReceiverTypeAt(derefChain, borrow, strippedTypePath) and
-      isComplexRootStripped(strippedTypePath, result)
+      result = this.getANonPseudoSelfTypeAt(selfPos, derefChain, borrow, strippedTypePath) and
+      (
+        isComplexRootStripped(strippedTypePath, result)
+        or
+        selfPos.isTypeQualifier() and strippedTypePath.isEmpty()
+      )
     }
 
     bindingset[derefChain, borrow, strippedTypePath, strippedType]
     private predicate hasNoCompatibleNonBlanketLikeTargetCheck(
-      DerefChain derefChain, BorrowKind borrow, TypePath strippedTypePath, Type strippedType
+      FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow, TypePath strippedTypePath,
+      Type strippedType
     ) {
       forall(ImplOrTraitItemNode i |
-        methodCallNonBlanketCandidate(this, _, i, _, strippedTypePath, strippedType)
+        nonBlanketLikeCandidate(this, _, selfPos, i, _, strippedTypePath, strippedType)
       |
-        this.hasIncompatibleTarget(i, derefChain, borrow, strippedType)
+        this.hasIncompatibleTarget(i, selfPos, derefChain, borrow, strippedType)
       )
     }
 
     bindingset[derefChain, borrow, strippedTypePath, strippedType]
     private predicate hasNoCompatibleTargetCheck(
-      DerefChain derefChain, BorrowKind borrow, TypePath strippedTypePath, Type strippedType
+      FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow, TypePath strippedTypePath,
+      Type strippedType
     ) {
-      this.hasNoCompatibleNonBlanketLikeTargetCheck(derefChain, borrow, strippedTypePath,
+      this.hasNoCompatibleNonBlanketLikeTargetCheck(selfPos, derefChain, borrow, strippedTypePath,
         strippedType) and
-      forall(ImplItemNode i | methodCallBlanketLikeCandidate(this, _, i, _, _, _) |
-        this.hasIncompatibleBlanketLikeTarget(i, derefChain, borrow)
+      forall(ImplItemNode i | blanketLikeCandidate(this, _, selfPos, i, _, _, _) |
+        this.hasIncompatibleBlanketLikeTarget(i, selfPos, derefChain, borrow)
       )
     }
 
     bindingset[derefChain, borrow, strippedTypePath, strippedType]
     private predicate hasNoCompatibleNonBlanketTargetCheck(
-      DerefChain derefChain, BorrowKind borrow, TypePath strippedTypePath, Type strippedType
+      FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow, TypePath strippedTypePath,
+      Type strippedType
     ) {
-      this.hasNoCompatibleNonBlanketLikeTargetCheck(derefChain, borrow, strippedTypePath,
+      this.hasNoCompatibleNonBlanketLikeTargetCheck(selfPos, derefChain, borrow, strippedTypePath,
         strippedType) and
       forall(ImplItemNode i |
-        methodCallBlanketLikeCandidate(this, _, i, _, _, _) and not i.isBlanketImplementation()
+        blanketLikeCandidate(this, _, selfPos, i, _, _, _) and
+        not i.isBlanketImplementation()
       |
-        this.hasIncompatibleBlanketLikeTarget(i, derefChain, borrow)
+        this.hasIncompatibleBlanketLikeTarget(i, selfPos, derefChain, borrow)
       )
     }
 
     // forex using recursion
     pragma[nomagic]
     private predicate hasNoCompatibleTargetNoBorrowToIndex(
-      DerefChain derefChain, TypePath strippedTypePath, Type strippedType, int n
+      FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
+      int n
     ) {
-      (
-        this.supportsAutoDerefAndBorrow()
-        or
-        // needed for the `hasNoCompatibleTarget` check in
-        // `ReceiverSatisfiesBlanketLikeConstraintInput::hasBlanketCandidate`
-        derefChain.isEmpty()
-      ) and
-      strippedType = this.getComplexStrippedType(derefChain, TNoBorrowKind(), strippedTypePath) and
+      this.supportsAutoDerefAndBorrow() and
+      this.hasReceiverAtPos(selfPos) and
+      strippedType =
+        this.getComplexStrippedSelfType(selfPos, derefChain, TNoBorrowKind(), strippedTypePath) and
       n = -1
       or
-      this.hasNoCompatibleTargetNoBorrowToIndex(derefChain, strippedTypePath, strippedType, n - 1) and
-      exists(Type t | t = getNthLookupType(strippedType, n) |
-        this.hasNoCompatibleTargetCheck(derefChain, TNoBorrowKind(), strippedTypePath, t)
+      this.hasNoCompatibleTargetNoBorrowToIndex(selfPos, derefChain, strippedTypePath, strippedType,
+        n - 1) and
+      exists(Type t |
+        t = getNthLookupType(this, strippedType, n) and
+        this.hasNoCompatibleTargetCheck(selfPos, derefChain, TNoBorrowKind(), strippedTypePath, t)
       )
     }
 
     /**
      * Holds if the candidate receiver type represented by `derefChain` does not
-     * have a matching method target.
+     * have a matching call target at function-call adjusted position `selfPos`.
      */
     pragma[nomagic]
-    predicate hasNoCompatibleTargetNoBorrow(DerefChain derefChain) {
+    predicate hasNoCompatibleTargetNoBorrow(FunctionPosition selfPos, DerefChain derefChain) {
       exists(Type strippedType |
-        this.hasNoCompatibleTargetNoBorrowToIndex(derefChain, _, strippedType,
-          getLastLookupTypeIndex(strippedType))
+        this.hasNoCompatibleTargetNoBorrowToIndex(selfPos, derefChain, _, strippedType,
+          getLastLookupTypeIndex(this, strippedType))
       )
     }
 
     // forex using recursion
     pragma[nomagic]
     private predicate hasNoCompatibleNonBlanketTargetNoBorrowToIndex(
-      DerefChain derefChain, TypePath strippedTypePath, Type strippedType, int n
+      FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
+      int n
     ) {
       (
-        this.supportsAutoDerefAndBorrow()
+        this.supportsAutoDerefAndBorrow() and
+        this.hasReceiverAtPos(selfPos)
         or
-        // needed for the `hasNoCompatibleTarget` check in
-        // `ReceiverSatisfiesBlanketLikeConstraintInput::hasBlanketCandidate`
-        derefChain.isEmpty()
+        // needed for the `hasNoCompatibleNonBlanketTarget` check in
+        // `ArgSatisfiesBlanketLikeConstraintInput::hasBlanketCandidate`
+        exists(ImplItemNode i |
+          derefChain.isEmpty() and
+          blanketLikeCandidate(this, _, selfPos, i, _, _, _) and
+          i.isBlanketImplementation()
+        )
       ) and
-      strippedType = this.getComplexStrippedType(derefChain, TNoBorrowKind(), strippedTypePath) and
+      strippedType =
+        this.getComplexStrippedSelfType(selfPos, derefChain, TNoBorrowKind(), strippedTypePath) and
       n = -1
       or
-      this.hasNoCompatibleNonBlanketTargetNoBorrowToIndex(derefChain, strippedTypePath,
+      this.hasNoCompatibleNonBlanketTargetNoBorrowToIndex(selfPos, derefChain, strippedTypePath,
         strippedType, n - 1) and
-      exists(Type t | t = getNthLookupType(strippedType, n) |
-        this.hasNoCompatibleNonBlanketTargetCheck(derefChain, TNoBorrowKind(), strippedTypePath, t)
+      exists(Type t |
+        t = getNthLookupType(this, strippedType, n) and
+        this.hasNoCompatibleNonBlanketTargetCheck(selfPos, derefChain, TNoBorrowKind(),
+          strippedTypePath, t)
       )
     }
 
     /**
      * Holds if the candidate receiver type represented by `derefChain` does not have
-     * a matching non-blanket method target.
+     * a matching non-blanket call target at function-call adjusted position `selfPos`.
      */
     pragma[nomagic]
-    predicate hasNoCompatibleNonBlanketTargetNoBorrow(DerefChain derefChain) {
+    predicate hasNoCompatibleNonBlanketTargetNoBorrow(
+      FunctionPosition selfPos, DerefChain derefChain
+    ) {
       exists(Type strippedType |
-        this.hasNoCompatibleNonBlanketTargetNoBorrowToIndex(derefChain, _, strippedType,
-          getLastLookupTypeIndex(strippedType))
+        this.hasNoCompatibleNonBlanketTargetNoBorrowToIndex(selfPos, derefChain, _, strippedType,
+          getLastLookupTypeIndex(this, strippedType))
       )
     }
 
     // forex using recursion
     pragma[nomagic]
     private predicate hasNoCompatibleTargetSharedBorrowToIndex(
-      DerefChain derefChain, TypePath strippedTypePath, Type strippedType, int n
+      FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
+      int n
     ) {
-      this.hasNoCompatibleTargetNoBorrow(derefChain) and
+      this.hasNoCompatibleTargetNoBorrow(selfPos, derefChain) and
       strippedType =
-        this.getComplexStrippedType(derefChain, TSomeBorrowKind(false), strippedTypePath) and
+        this.getComplexStrippedSelfType(selfPos, derefChain, TSomeBorrowKind(false),
+          strippedTypePath) and
       n = -1
       or
-      this.hasNoCompatibleTargetSharedBorrowToIndex(derefChain, strippedTypePath, strippedType,
-        n - 1) and
-      exists(Type t | t = getNthLookupType(strippedType, n) |
-        this.hasNoCompatibleNonBlanketLikeTargetCheck(derefChain, TSomeBorrowKind(false),
+      this.hasNoCompatibleTargetSharedBorrowToIndex(selfPos, derefChain, strippedTypePath,
+        strippedType, n - 1) and
+      exists(Type t |
+        t = getNthLookupType(this, strippedType, n) and
+        this.hasNoCompatibleNonBlanketLikeTargetCheck(selfPos, derefChain, TSomeBorrowKind(false),
           strippedTypePath, t)
       )
     }
 
     /**
      * Holds if the candidate receiver type represented by `derefChain`, followed
-     * by a shared borrow, does not have a matching method target.
+     * by a shared borrow, does not have a matching call target at function-call
+     * adjusted position `selfPos`.
      */
     pragma[nomagic]
-    predicate hasNoCompatibleTargetSharedBorrow(DerefChain derefChain) {
+    predicate hasNoCompatibleTargetSharedBorrow(FunctionPosition selfPos, DerefChain derefChain) {
       exists(Type strippedType |
-        this.hasNoCompatibleTargetSharedBorrowToIndex(derefChain, _, strippedType,
-          getLastLookupTypeIndex(strippedType))
+        this.hasNoCompatibleTargetSharedBorrowToIndex(selfPos, derefChain, _, strippedType,
+          getLastLookupTypeIndex(this, strippedType))
       )
     }
 
     // forex using recursion
     pragma[nomagic]
     private predicate hasNoCompatibleTargetMutBorrowToIndex(
-      DerefChain derefChain, TypePath strippedTypePath, Type strippedType, int n
+      FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
+      int n
     ) {
-      this.hasNoCompatibleTargetSharedBorrow(derefChain) and
+      this.hasNoCompatibleTargetSharedBorrow(selfPos, derefChain) and
       strippedType =
-        this.getComplexStrippedType(derefChain, TSomeBorrowKind(true), strippedTypePath) and
+        this.getComplexStrippedSelfType(selfPos, derefChain, TSomeBorrowKind(true), strippedTypePath) and
       n = -1
       or
-      this.hasNoCompatibleTargetMutBorrowToIndex(derefChain, strippedTypePath, strippedType, n - 1) and
-      exists(Type t | t = getNthLookupType(strippedType, n) |
-        this.hasNoCompatibleNonBlanketLikeTargetCheck(derefChain, TSomeBorrowKind(true),
+      this.hasNoCompatibleTargetMutBorrowToIndex(selfPos, derefChain, strippedTypePath,
+        strippedType, n - 1) and
+      exists(Type t |
+        t = getNthLookupType(this, strippedType, n) and
+        this.hasNoCompatibleNonBlanketLikeTargetCheck(selfPos, derefChain, TSomeBorrowKind(true),
           strippedTypePath, t)
       )
     }
 
     /**
      * Holds if the candidate receiver type represented by `derefChain`, followed
-     * by a `mut` borrow, does not have a matching method target.
+     * by a `mut` borrow, does not have a matching call target at function-call
+     * adjusted position `selfPos`.
      */
     pragma[nomagic]
-    predicate hasNoCompatibleTargetMutBorrow(DerefChain derefChain) {
+    predicate hasNoCompatibleTargetMutBorrow(FunctionPosition selfPos, DerefChain derefChain) {
       exists(Type strippedType |
-        this.hasNoCompatibleTargetMutBorrowToIndex(derefChain, _, strippedType,
-          getLastLookupTypeIndex(strippedType))
+        this.hasNoCompatibleTargetMutBorrowToIndex(selfPos, derefChain, _, strippedType,
+          getLastLookupTypeIndex(this, strippedType))
       )
     }
 
     // forex using recursion
     pragma[nomagic]
     private predicate hasNoCompatibleNonBlanketTargetSharedBorrowToIndex(
-      DerefChain derefChain, TypePath strippedTypePath, Type strippedType, int n
+      FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
+      int n
     ) {
-      this.hasNoCompatibleTargetNoBorrow(derefChain) and
+      this.hasNoCompatibleTargetNoBorrow(selfPos, derefChain) and
       strippedType =
-        this.getComplexStrippedType(derefChain, TSomeBorrowKind(false), strippedTypePath) and
+        this.getComplexStrippedSelfType(selfPos, derefChain, TSomeBorrowKind(false),
+          strippedTypePath) and
       n = -1
       or
-      this.hasNoCompatibleNonBlanketTargetSharedBorrowToIndex(derefChain, strippedTypePath,
+      this.hasNoCompatibleNonBlanketTargetSharedBorrowToIndex(selfPos, derefChain, strippedTypePath,
         strippedType, n - 1) and
-      exists(Type t | t = getNthLookupType(strippedType, n) |
-        this.hasNoCompatibleNonBlanketTargetCheck(derefChain, TSomeBorrowKind(false),
+      exists(Type t |
+        t = getNthLookupType(this, strippedType, n) and
+        this.hasNoCompatibleNonBlanketTargetCheck(selfPos, derefChain, TSomeBorrowKind(false),
           strippedTypePath, t)
       )
     }
 
     /**
      * Holds if the candidate receiver type represented by `derefChain`, followed
-     * by a shared borrow, does not have a matching non-blanket method target.
+     * by a shared borrow, does not have a matching non-blanket call target at
+     * function-call adjusted position `selfPos`.
      */
     pragma[nomagic]
-    predicate hasNoCompatibleNonBlanketTargetSharedBorrow(DerefChain derefChain) {
+    predicate hasNoCompatibleNonBlanketTargetSharedBorrow(
+      FunctionPosition selfPos, DerefChain derefChain
+    ) {
       exists(Type strippedType |
-        this.hasNoCompatibleNonBlanketTargetSharedBorrowToIndex(derefChain, _, strippedType,
-          getLastLookupTypeIndex(strippedType))
+        this.hasNoCompatibleNonBlanketTargetSharedBorrowToIndex(selfPos, derefChain, _,
+          strippedType, getLastLookupTypeIndex(this, strippedType))
       )
     }
 
     // forex using recursion
     pragma[nomagic]
     private predicate hasNoCompatibleNonBlanketTargetMutBorrowToIndex(
-      DerefChain derefChain, TypePath strippedTypePath, Type strippedType, int n
+      FunctionPosition selfPos, DerefChain derefChain, TypePath strippedTypePath, Type strippedType,
+      int n
     ) {
-      this.hasNoCompatibleNonBlanketTargetSharedBorrow(derefChain) and
+      this.hasNoCompatibleNonBlanketTargetSharedBorrow(selfPos, derefChain) and
       strippedType =
-        this.getComplexStrippedType(derefChain, TSomeBorrowKind(true), strippedTypePath) and
+        this.getComplexStrippedSelfType(selfPos, derefChain, TSomeBorrowKind(true), strippedTypePath) and
       n = -1
       or
-      this.hasNoCompatibleNonBlanketTargetMutBorrowToIndex(derefChain, strippedTypePath,
+      this.hasNoCompatibleNonBlanketTargetMutBorrowToIndex(selfPos, derefChain, strippedTypePath,
         strippedType, n - 1) and
-      exists(Type t | t = getNthLookupType(strippedType, n) |
-        this.hasNoCompatibleNonBlanketTargetCheck(derefChain, TSomeBorrowKind(true),
+      exists(Type t |
+        t = getNthLookupType(this, strippedType, n) and
+        this.hasNoCompatibleNonBlanketTargetCheck(selfPos, derefChain, TSomeBorrowKind(true),
           strippedTypePath, t)
       )
     }
 
     /**
      * Holds if the candidate receiver type represented by `derefChain`, followed
-     * by a `mut` borrow, does not have a matching non-blanket method target.
+     * by a `mut` borrow, does not have a matching non-blanket call target at
+     * function-call adjusted position `selfPos`.
      */
     pragma[nomagic]
-    predicate hasNoCompatibleNonBlanketTargetMutBorrow(DerefChain derefChain) {
+    predicate hasNoCompatibleNonBlanketTargetMutBorrow(
+      FunctionPosition selfPos, DerefChain derefChain
+    ) {
       exists(Type strippedType |
-        this.hasNoCompatibleNonBlanketTargetMutBorrowToIndex(derefChain, _, strippedType,
-          getLastLookupTypeIndex(strippedType))
+        this.hasNoCompatibleNonBlanketTargetMutBorrowToIndex(selfPos, derefChain, _, strippedType,
+          getLastLookupTypeIndex(this, strippedType))
       )
     }
 
     /**
-     * Gets a [candidate receiver type][1] of this method call at `path`.
+     * Same as `getSelfTypeAt`, but without borrows.
+     */
+    pragma[nomagic]
+    Type getSelfTypeAtNoBorrow(FunctionPosition selfPos, DerefChain derefChain, TypePath path) {
+      result = this.getTypeAt(selfPos, path) and
+      derefChain.isEmpty() and
+      (
+        this.hasReceiverAtPos(selfPos)
+        or
+        selfPos.isTypeQualifier()
+        or
+        this.isRelevantSelfPos(selfPos)
+      )
+      or
+      exists(DerefImplItemNode impl, DerefChain suffix |
+        result =
+          ImplicitDeref::getDereferencedCandidateReceiverType(this, selfPos, impl, suffix, path) and
+        derefChain = DerefChain::cons(impl, suffix)
+      )
+    }
+
+    /**
+     * Gets the type of this call at function-call adjusted position `selfPos` and
+     * type path `path`.
+     *
+     * In case this call supports auto-dereferencing and borrowing and `selfPos` is
+     * position 0 (corresponding to the receiver), the result is a
+     * [candidate receiver type][1]:
      *
      * The type is obtained by repeatedly dereferencing the receiver expression's type,
      * as long as the method cannot be resolved in an earlier candidate type, and possibly
@@ -1852,18 +2043,19 @@ private module MethodResolution {
      * [1]: https://doc.rust-lang.org/reference/expressions/method-call-expr.html#r-expr.method.candidate-receivers
      */
     pragma[nomagic]
-    Type getACandidateReceiverTypeAt(DerefChain derefChain, BorrowKind borrow, TypePath path) {
-      result = this.getACandidateReceiverTypeAtNoBorrow(derefChain, path) and
+    Type getSelfTypeAt(
+      FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow, TypePath path
+    ) {
+      result = this.getSelfTypeAtNoBorrow(selfPos, derefChain, path) and
       borrow.isNoBorrow()
       or
       exists(RefType rt |
         // first try shared borrow
-        this.supportsAutoDerefAndBorrow() and
-        this.hasNoCompatibleTargetNoBorrow(derefChain) and
+        this.hasNoCompatibleTargetNoBorrow(selfPos, derefChain) and
         borrow.isSharedBorrow()
         or
         // then try mutable borrow
-        this.hasNoCompatibleTargetSharedBorrow(derefChain) and
+        this.hasNoCompatibleTargetSharedBorrow(selfPos, derefChain) and
         borrow.isMutableBorrow()
       |
         rt = borrow.getRefType() and
@@ -1872,7 +2064,7 @@ private module MethodResolution {
           result = rt
           or
           exists(TypePath suffix |
-            result = this.getACandidateReceiverTypeAtNoBorrow(derefChain, suffix) and
+            result = this.getSelfTypeAtNoBorrow(selfPos, derefChain, suffix) and
             path = TypePath::cons(rt.getPositionalTypeParameter(0), suffix)
           )
         )
@@ -1880,15 +2072,17 @@ private module MethodResolution {
     }
 
     /**
-     * Gets a method that this call resolves to after having applied a sequence of
-     * dereferences and possibly a borrow on the receiver type, encoded in `derefChain`
-     * and `borrow`.
+     * Gets a function that this call resolves to after having applied a sequence of
+     * dereferences and possibly a borrow on the receiver type at `selfPos`, encoded
+     * in `derefChain` and `borrow`.
      */
     pragma[nomagic]
-    Method resolveCallTarget(ImplOrTraitItemNode i, DerefChain derefChain, BorrowKind borrow) {
-      exists(MethodCallCand mcc |
-        mcc = MkMethodCallCand(this, derefChain, borrow) and
-        result = mcc.resolveCallTarget(i)
+    AssocFunctionDeclaration resolveCallTarget(
+      ImplOrTraitItemNode i, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
+    ) {
+      exists(AssocFunctionCallCand afcc |
+        afcc = MkAssocFunctionCallCand(this, selfPos, derefChain, borrow) and
+        result = afcc.resolveCallTarget(i)
       )
     }
 
@@ -1898,21 +2092,28 @@ private module MethodResolution {
      * resolve the call target.
      */
     predicate argumentHasImplicitDerefChainBorrow(Expr arg, DerefChain derefChain, BorrowKind borrow) {
-      exists(this.resolveCallTarget(_, derefChain, borrow)) and
-      arg = this.getArg(any(ArgumentPosition pos | pos.isSelf())) and
-      not (derefChain.isEmpty() and borrow.isNoBorrow())
+      exists(FunctionPosition selfAdj |
+        this.hasReceiverAtPos(selfAdj) and
+        exists(this.resolveCallTarget(_, selfAdj, derefChain, borrow)) and
+        arg = this.getNodeAt(selfAdj) and
+        not (derefChain.isEmpty() and borrow.isNoBorrow())
+      )
     }
   }
 
-  private class MethodCallMethodCallExpr extends MethodCall instanceof MethodCallExpr {
-    pragma[nomagic]
+  private class AssocFunctionCallMethodCallExpr extends AssocFunctionCall instanceof MethodCallExpr {
     override predicate hasNameAndArity(string name, int arity) {
       name = super.getIdentifier().getText() and
-      arity = super.getArgList().getNumberOfArgs()
+      arity = super.getNumberOfSyntacticArguments()
     }
 
-    override Expr getArg(ArgumentPosition pos) {
-      result = MethodCallExpr.super.getSyntacticArgument(pos)
+    override predicate hasReceiver() { any() }
+
+    override Expr getNonReturnNodeAt(FunctionPosition pos) {
+      result = super.getReceiver() and
+      pos.asPosition() = 0
+      or
+      result = super.getPositionalArgument(pos.asPosition() - 1)
     }
 
     override predicate supportsAutoDerefAndBorrow() { any() }
@@ -1920,24 +2121,25 @@ private module MethodResolution {
     override Trait getTrait() { none() }
   }
 
-  private class MethodCallIndexExpr extends MethodCall instanceof IndexExpr {
+  private class AssocFunctionCallIndexExpr extends AssocFunctionCall, IndexExpr {
     private predicate isInMutableContext() {
       // todo: does not handle all cases yet
       VariableImpl::assignmentOperationDescendant(_, this)
     }
 
-    pragma[nomagic]
     override predicate hasNameAndArity(string name, int arity) {
       (if this.isInMutableContext() then name = "index_mut" else name = "index") and
-      arity = 1
+      arity = 2
     }
 
-    override Expr getArg(ArgumentPosition pos) {
-      pos.isSelf() and
-      result = super.getBase()
-      or
+    override predicate hasReceiver() { any() }
+
+    override Expr getNonReturnNodeAt(FunctionPosition pos) {
       pos.asPosition() = 0 and
-      result = super.getIndex()
+      result = this.getBase()
+      or
+      pos.asPosition() = 1 and
+      result = this.getIndex()
     }
 
     override predicate supportsAutoDerefAndBorrow() { any() }
@@ -1949,67 +2151,32 @@ private module MethodResolution {
     }
   }
 
-  private class MethodCallCallExpr extends MethodCall instanceof CallExpr {
-    MethodCallCallExpr() {
+  private class AssocFunctionCallCallExpr extends AssocFunctionCall, CallExpr {
+    AssocFunctionCallCallExpr() {
       exists(getCallExprPathQualifier(this)) and
-      // even if a method cannot be resolved by path resolution, it may still
+      // even if a target cannot be resolved by path resolution, it may still
       // be possible to resolve a blanket implementation (so not `forex`)
-      forall(ItemNode i | i = CallExprImpl::getResolvedFunction(this) | i instanceof Method)
-    }
-
-    bindingset[this, f]
-    pragma[inline_late]
-    private predicate hasTypeQualifiedCandidateFilter(Function f, ImplItemNode impl) {
-      f = impl.getAnAssocItem()
-      or
-      exists(TraitItemNode trait |
-        f = trait.getAnAssocItem() and
-        methodCallVisibleTraitCandidate(this, trait) and
-        impl.resolveTraitTy() = trait
+      forall(ItemNode i | i = CallExprImpl::getResolvedFunction(this) |
+        i instanceof AssocFunctionDeclaration
       )
     }
 
-    /**
-     * Holds if this call has a type qualifier, and we are able to resolve,
-     * using path resolution, the method to a member of `impl` or the trait
-     * being implemented by `impl` (when this call os of the kind
-     * `<Foo as Bar>::f()`).
-     *
-     * When this is the case, we still want to check that the type qualifier
-     * is an instance of the type being implemented, which is done in
-     * `TypeQualifierIsInstantiationOfImplSelfInput`.
-     */
-    pragma[nomagic]
-    predicate hasTypeQualifiedCandidate(ImplItemNode impl) {
-      exists(Function f |
-        exists(getCallExprTypeQualifier(this, _, _)) and
-        f = CallExprImpl::getResolvedFunction(this) and
-        this.hasTypeQualifiedCandidateFilter(f, impl)
-      )
-    }
-
-    pragma[nomagic]
     override predicate hasNameAndArity(string name, int arity) {
       name = CallExprImpl::getFunctionPath(this).getText() and
-      arity = super.getArgList().getNumberOfArgs() - 1
+      arity = this.getNumberOfSyntacticArguments()
     }
 
-    override Expr getArg(ArgumentPosition pos) {
-      pos.isSelf() and
-      result = super.getSyntacticPositionalArgument(0)
+    override predicate hasReceiver() { none() }
+
+    override Expr getNonReturnNodeAt(FunctionPosition pos) {
+      result = this.getSyntacticPositionalArgument(pos.asPosition())
+    }
+
+    override Type getTypeAt(FunctionPosition pos, TypePath path) {
+      result = super.getTypeAt(pos, path)
       or
-      result = super.getSyntacticPositionalArgument(pos.asPosition() + 1)
-    }
-
-    // needed for `TypeQualifierIsInstantiationOfImplSelfInput`
-    Type getTypeAt(TypePath path) {
-      result = substituteLookupTraits(getCallExprTypeQualifier(this, path, _))
-    }
-
-    pragma[nomagic]
-    predicate hasNoInherentTarget() {
-      // `_` is fine below, because auto-deref/borrow is not supported
-      MkMethodCallCand(this, _, _).(MethodCallCand).hasNoInherentTarget()
+      pos.isTypeQualifier() and
+      result = getCallExprTypeQualifier(this, path, _)
     }
 
     override predicate supportsAutoDerefAndBorrow() { none() }
@@ -2017,33 +2184,31 @@ private module MethodResolution {
     override Trait getTrait() { result = getCallExprTraitQualifier(this) }
   }
 
-  final class MethodCallOperation extends MethodCall instanceof Operation {
-    pragma[nomagic]
+  final class AssocFunctionCallOperation extends AssocFunctionCall, Operation {
     override predicate hasNameAndArity(string name, int arity) {
-      super.isOverloaded(_, name, _) and
-      arity = super.getNumberOfOperands() - 1
+      this.isOverloaded(_, name, _) and
+      arity = this.getNumberOfOperands()
     }
 
-    override Expr getArg(ArgumentPosition pos) {
-      pos.isSelf() and
-      result = super.getOperand(0)
-      or
-      result = super.getOperand(pos.asPosition() + 1)
+    override predicate hasReceiver() { any() }
+
+    override Expr getNonReturnNodeAt(FunctionPosition pos) {
+      result = this.getOperand(pos.asPosition())
     }
 
-    private predicate implicitBorrowAt(ArgumentPosition pos, boolean isMutable) {
-      exists(int borrows | super.isOverloaded(_, _, borrows) |
-        pos.isSelf() and
+    private predicate implicitBorrowAt(FunctionPosition pos, boolean isMutable) {
+      exists(int borrows | this.isOverloaded(_, _, borrows) |
+        pos.asPosition() = 0 and
         borrows >= 1 and
         if this instanceof CompoundAssignmentExpr then isMutable = true else isMutable = false
         or
-        pos.asPosition() = 0 and
+        pos.asPosition() = 1 and
         borrows = 2 and
         isMutable = false
       )
     }
 
-    override Type getArgumentTypeAt(ArgumentPosition pos, TypePath path) {
+    override Type getTypeAt(FunctionPosition pos, TypePath path) {
       exists(boolean isMutable, RefType rt |
         this.implicitBorrowAt(pos, isMutable) and
         rt = getRefType(isMutable)
@@ -2052,21 +2217,21 @@ private module MethodResolution {
         path.isEmpty()
         or
         exists(TypePath path0 |
-          result = inferType(this.getArg(pos), path0) and
+          result = inferType(this.getNodeAt(pos), path0) and
           path = TypePath::cons(rt.getPositionalTypeParameter(0), path0)
         )
       )
       or
       not this.implicitBorrowAt(pos, _) and
-      result = inferType(this.getArg(pos), path)
+      result = inferType(this.getNodeAt(pos), path)
     }
 
     override predicate argumentHasImplicitDerefChainBorrow(
       Expr arg, DerefChain derefChain, BorrowKind borrow
     ) {
-      exists(ArgumentPosition pos, boolean isMutable |
+      exists(FunctionPosition pos, boolean isMutable |
         this.implicitBorrowAt(pos, isMutable) and
-        arg = this.getArg(pos) and
+        arg = this.getNodeAt(pos) and
         derefChain = DerefChain::nil() and
         borrow = TSomeBorrowKind(isMutable)
       )
@@ -2074,165 +2239,195 @@ private module MethodResolution {
 
     override predicate supportsAutoDerefAndBorrow() { none() }
 
-    override Trait getTrait() { super.isOverloaded(result, _, _) }
+    override Trait getTrait() { this.isOverloaded(result, _, _) }
   }
 
   pragma[nomagic]
-  private Method getMethodSuccessor(ImplOrTraitItemNode i, string name, int arity) {
+  private AssocFunctionDeclaration getAssocFunctionSuccessor(
+    ImplOrTraitItemNode i, string name, int arity
+  ) {
     result = i.getASuccessor(name) and
-    arity = result.getParamList().getNumberOfParams()
+    arity = result.getNumberOfParamsInclSelf()
   }
 
-  private newtype TMethodCallCand =
-    MkMethodCallCand(MethodCall mc, DerefChain derefChain, BorrowKind borrow) {
-      exists(mc.getACandidateReceiverTypeAt(derefChain, borrow, _))
+  private newtype TAssocFunctionCallCand =
+    MkAssocFunctionCallCand(
+      AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain, BorrowKind borrow
+    ) {
+      exists(afc.getANonPseudoSelfTypeAt(selfPos, derefChain, borrow, _))
     }
 
-  /** A method call with a dereference chain and a potential borrow. */
-  private class MethodCallCand extends MkMethodCallCand {
-    MethodCall mc_;
+  /** A call with a dereference chain and a potential borrow at a given position. */
+  final private class AssocFunctionCallCand extends MkAssocFunctionCallCand {
+    AssocFunctionCall afc_;
+    FunctionPosition selfPos_;
     DerefChain derefChain;
     BorrowKind borrow;
 
-    MethodCallCand() { this = MkMethodCallCand(mc_, derefChain, borrow) }
+    AssocFunctionCallCand() { this = MkAssocFunctionCallCand(afc_, selfPos_, derefChain, borrow) }
 
-    MethodCall getMethodCall() { result = mc_ }
+    AssocFunctionCall getAssocFunctionCall() { result = afc_ }
+
+    ItemNode getEnclosingItemNode() { result.getADescendant() = afc_ }
 
     Type getTypeAt(TypePath path) {
       result =
-        substituteLookupTraits(mc_.getANonPseudoCandidateReceiverTypeAt(derefChain, borrow, path))
+        substituteLookupTraits(afc_,
+          afc_.getANonPseudoSelfTypeAt(selfPos_, derefChain, borrow, path))
     }
 
     pragma[nomagic]
     predicate hasNoCompatibleNonBlanketTarget() {
-      mc_.hasNoCompatibleNonBlanketTargetSharedBorrow(derefChain) and
+      afc_.hasNoCompatibleNonBlanketTargetSharedBorrow(selfPos_, derefChain) and
       borrow.isSharedBorrow()
       or
-      mc_.hasNoCompatibleNonBlanketTargetMutBorrow(derefChain) and
+      afc_.hasNoCompatibleNonBlanketTargetMutBorrow(selfPos_, derefChain) and
       borrow.isMutableBorrow()
       or
-      mc_.hasNoCompatibleNonBlanketTargetNoBorrow(derefChain) and
+      afc_.hasNoCompatibleNonBlanketTargetNoBorrow(selfPos_, derefChain) and
       borrow.isNoBorrow()
     }
 
     pragma[nomagic]
     predicate hasSignature(
-      MethodCall mc, TypePath strippedTypePath, Type strippedType, string name, int arity
+      AssocFunctionCall afc, FunctionPosition selfPos, TypePath strippedTypePath, Type strippedType,
+      string name, int arity
     ) {
       strippedType = this.getTypeAt(strippedTypePath) and
-      isComplexRootStripped(strippedTypePath, strippedType) and
-      mc = mc_ and
-      mc.hasNameAndArity(name, arity)
+      (
+        isComplexRootStripped(strippedTypePath, strippedType)
+        or
+        selfPos_.isTypeQualifier() and strippedTypePath.isEmpty()
+      ) and
+      afc = afc_ and
+      afc.hasNameAndArity(name, arity) and
+      selfPos = selfPos_
     }
 
     /**
-     * Holds if the inherent method inside `impl` with matching name and arity can be
+     * Holds if the inherent function inside `impl` with matching name and arity can be
      * ruled out as a candidate for this call.
      */
     pragma[nomagic]
     private predicate hasIncompatibleInherentTarget(Impl impl) {
-      ReceiverIsNotInstantiationOfInherentSelfParam::argIsNotInstantiationOf(this, impl, _, _)
+      SelfArgIsNotInstantiationOfInherent::argIsNotInstantiationOf(this, impl, _, _)
     }
 
-    /**
-     * Holds if this method call has no inherent target, i.e., it does not
-     * resolve to a method in an `impl` block for the type of the receiver.
-     */
     pragma[nomagic]
-    predicate hasNoInherentTarget() {
-      mc_.hasTrait()
-      or
-      exists(TypePath strippedTypePath, Type strippedType, string name, int arity |
-        this.hasSignature(_, strippedTypePath, strippedType, name, arity) and
+    predicate hasNoInherentTargetCheck() {
+      exists(
+        TypePath strippedTypePath, Type strippedType, string name, int arity,
+        TypeOption typeQualifier, TypeOption traitQualifier, boolean hasReceiver,
+        boolean targetMustBeMethod
+      |
+        // Calls to inherent functions are always of the form `x.m(...)` or `Foo::bar(...)`,
+        // where `Foo` is a type. In case `bar` is a method, we can use both the type qualifier
+        // and the type of the first argument to rule out candidates
+        selfPos_.isTypeQualifier() and targetMustBeMethod = false
+        or
+        selfPos_.asPosition() = 0 and targetMustBeMethod = true
+      |
+        afc_.hasSyntacticInfo(name, arity, typeQualifier, traitQualifier, hasReceiver) and
+        (if hasReceiver = true then targetMustBeMethod = true else any()) and
+        this.hasSignature(_, selfPos_, strippedTypePath, strippedType, name, arity) and
         forall(Impl i |
-          methodInfoNonBlanket(_, name, arity, i, _, strippedTypePath, strippedType) and
-          not i.hasTrait()
+          i.isInherent() and
+          (
+            assocFunctionInfoNonBlanketLikeCheck(_, name, arity, selfPos_, i, _, strippedTypePath,
+              strippedType, typeQualifier, traitQualifier, targetMustBeMethod)
+            or
+            assocFunctionInfoNonBlanketLikeTypeParamCheck(_, name, arity, selfPos_, i, _,
+              strippedTypePath, typeQualifier, traitQualifier, targetMustBeMethod)
+          )
         |
           this.hasIncompatibleInherentTarget(i)
         )
       )
     }
 
+    /**
+     * Holds if this function call has no inherent target, i.e., it does not
+     * resolve to a function in an `impl` block for the type of the receiver.
+     */
     pragma[nomagic]
-    private predicate typeQualifierIsInstantiationOf(ImplItemNode i) {
-      TypeQualifierIsInstantiationOfImplSelf::isInstantiationOf(mc_, i, _)
+    predicate hasNoInherentTarget() {
+      afc_.hasTrait()
+      or
+      afc_.hasNoInherentTarget(selfPos_, derefChain, borrow)
     }
 
     pragma[nomagic]
-    private predicate argIsInstantiationOf(ImplOrTraitItemNode i, string name, int arity) {
-      (
-        ReceiverIsInstantiationOfSelfParam::argIsInstantiationOf(this, i, _)
-        or
-        this.typeQualifierIsInstantiationOf(i)
-      ) and
-      mc_.hasNameAndArity(name, arity)
+    private predicate selfArgIsInstantiationOf(ImplOrTraitItemNode i, string name, int arity) {
+      SelfArgIsInstantiationOf::argIsInstantiationOf(this, i, _) and
+      afc_.hasNameAndArity(name, arity)
     }
 
     pragma[nomagic]
-    Method resolveCallTargetCand(ImplOrTraitItemNode i) {
+    AssocFunctionDeclaration resolveCallTargetCand(ImplOrTraitItemNode i) {
       exists(string name, int arity |
-        this.argIsInstantiationOf(i, name, arity) and
-        result = getMethodSuccessor(i, name, arity)
+        this.selfArgIsInstantiationOf(i, name, arity) and
+        result = getAssocFunctionSuccessor(i, name, arity)
       )
     }
 
-    /** Gets a method that matches this method call. */
+    /** Gets the associated function targeted by this call, if any. */
     pragma[nomagic]
-    Method resolveCallTarget(ImplOrTraitItemNode i) {
+    AssocFunctionDeclaration resolveCallTarget(ImplOrTraitItemNode i) {
       result = this.resolveCallTargetCand(i) and
       not FunctionOverloading::functionResolutionDependsOnArgument(i, result, _, _)
       or
-      MethodArgsAreInstantiationsOf::argsAreInstantiationsOf(this, i, result)
+      OverloadedCallArgsAreInstantiationsOf::argsAreInstantiationsOf(this, i, result)
     }
 
     string toString() {
-      result = mc_.toString() + " [" + derefChain.toString() + "; " + borrow + "]"
+      result = afc_ + " at " + selfPos_ + " [" + derefChain.toString() + "; " + borrow + "]"
     }
 
-    Location getLocation() { result = mc_.getLocation() }
+    Location getLocation() { result = afc_.getLocation() }
   }
 
   /**
    * Provides logic for resolving implicit `Deref::deref` calls.
    */
   private module ImplicitDeref {
-    private newtype TMethodCallDerefCand =
-      MkMethodCallDerefCand(MethodCall mc, DerefChain derefChain) {
-        mc.supportsAutoDerefAndBorrow() and
-        mc.hasNoCompatibleTargetMutBorrow(derefChain) and
-        exists(mc.getACandidateReceiverTypeAtNoBorrow(derefChain, TypePath::nil()))
+    private newtype TCallDerefCand =
+      MkCallDerefCand(AssocFunctionCall afc, FunctionPosition selfPos, DerefChain derefChain) {
+        afc.supportsAutoDerefAndBorrow() and
+        afc.hasReceiverAtPos(selfPos) and
+        afc.hasNoCompatibleTargetMutBorrow(selfPos, derefChain) and
+        exists(afc.getSelfTypeAtNoBorrow(selfPos, derefChain, TypePath::nil()))
       }
 
-    /** A method call with a dereference chain. */
-    private class MethodCallDerefCand extends MkMethodCallDerefCand {
-      MethodCall mc;
+    /** A call with a dereference chain. */
+    private class CallDerefCand extends MkCallDerefCand {
+      AssocFunctionCall afc;
+      FunctionPosition selfPos;
       DerefChain derefChain;
 
-      MethodCallDerefCand() { this = MkMethodCallDerefCand(mc, derefChain) }
+      CallDerefCand() { this = MkCallDerefCand(afc, selfPos, derefChain) }
 
       Type getTypeAt(TypePath path) {
-        result = substituteLookupTraits(mc.getACandidateReceiverTypeAtNoBorrow(derefChain, path)) and
+        result = substituteLookupTraits(afc, afc.getSelfTypeAtNoBorrow(selfPos, derefChain, path)) and
         result != TNeverType() and
         result != TUnknownType()
       }
 
-      string toString() { result = mc.toString() + " [" + derefChain.toString() + "]" }
+      string toString() { result = afc + " [" + derefChain.toString() + "]" }
 
-      Location getLocation() { result = mc.getLocation() }
+      Location getLocation() { result = afc.getLocation() }
     }
 
-    private module MethodCallSatisfiesDerefConstraintInput implements
-      SatisfiesConstraintInputSig<MethodCallDerefCand>
+    private module CallSatisfiesDerefConstraintInput implements SatisfiesTypeInputSig<CallDerefCand>
     {
       pragma[nomagic]
-      predicate relevantConstraint(MethodCallDerefCand mc, Type constraint) {
+      predicate relevantConstraint(CallDerefCand mc, Type constraint) {
         exists(mc) and
         constraint.(TraitType).getTrait() instanceof DerefTrait
       }
     }
 
-    private module MethodCallSatisfiesDerefConstraint =
-      SatisfiesConstraint<MethodCallDerefCand, MethodCallSatisfiesDerefConstraintInput>;
+    private module CallSatisfiesDerefConstraint =
+      SatisfiesType<CallDerefCand, CallSatisfiesDerefConstraintInput>;
 
     pragma[nomagic]
     private AssociatedTypeTypeParameter getDerefTargetTypeParameter() {
@@ -2240,37 +2435,38 @@ private module MethodResolution {
     }
 
     /**
-     * Gets the type of the receiver of `mc` at `path` after applying the implicit
+     * Gets the type of the receiver of `afc` at `path` after applying the implicit
      * dereference inside `impl`, following the existing dereference chain `derefChain`.
      */
     pragma[nomagic]
     Type getDereferencedCandidateReceiverType(
-      MethodCall mc, DerefImplItemNode impl, DerefChain derefChain, TypePath path
+      AssocFunctionCall afc, FunctionPosition selfPos, DerefImplItemNode impl,
+      DerefChain derefChain, TypePath path
     ) {
-      exists(MethodCallDerefCand mcc, TypePath exprPath |
-        mcc = MkMethodCallDerefCand(mc, derefChain) and
-        MethodCallSatisfiesDerefConstraint::satisfiesConstraintTypeThrough(mcc, impl, _, exprPath,
-          result) and
+      exists(CallDerefCand cdc, TypePath exprPath |
+        cdc = MkCallDerefCand(afc, selfPos, derefChain) and
+        CallSatisfiesDerefConstraint::satisfiesConstraintTypeThrough(cdc, impl, _, exprPath, result) and
         exprPath.isCons(getDerefTargetTypeParameter(), path)
       )
     }
   }
 
-  private module ReceiverSatisfiesBlanketLikeConstraintInput implements
-    BlanketImplementation::SatisfiesBlanketConstraintInputSig<MethodCallCand>
+  private module ArgSatisfiesBlanketLikeConstraintInput implements
+    BlanketImplementation::SatisfiesBlanketConstraintInputSig<AssocFunctionCallCand>
   {
     pragma[nomagic]
     predicate hasBlanketCandidate(
-      MethodCallCand mcc, ImplItemNode impl, TypePath blanketPath, TypeParam blanketTypeParam
+      AssocFunctionCallCand afcc, ImplItemNode impl, TypePath blanketPath,
+      TypeParam blanketTypeParam
     ) {
-      exists(MethodCall mc, BorrowKind borrow |
-        mcc = MkMethodCallCand(mc, _, borrow) and
-        methodCallBlanketLikeCandidate(mc, _, impl, _, blanketPath, blanketTypeParam) and
+      exists(AssocFunctionCall afc, FunctionPosition selfPos, BorrowKind borrow |
+        afcc = MkAssocFunctionCallCand(afc, selfPos, _, borrow) and
+        blanketLikeCandidate(afc, _, selfPos, impl, _, blanketPath, blanketTypeParam) and
         // Only apply blanket implementations when no other implementations are possible;
         // this is to account for codebases that use the (unstable) specialization feature
         // (https://rust-lang.github.io/rfcs/1210-impl-specialization.html), as well as
         // cases where our blanket implementation filtering is not precise enough.
-        (mcc.hasNoCompatibleNonBlanketTarget() or not impl.isBlanketImplementation())
+        if impl.isBlanketImplementation() then afcc.hasNoCompatibleNonBlanketTarget() else any()
       |
         borrow.isNoBorrow()
         or
@@ -2279,151 +2475,141 @@ private module MethodResolution {
     }
   }
 
-  private module ReceiverSatisfiesBlanketLikeConstraint =
-    BlanketImplementation::SatisfiesBlanketConstraint<MethodCallCand,
-      ReceiverSatisfiesBlanketLikeConstraintInput>;
+  private module ArgSatisfiesBlanketLikeConstraint =
+    BlanketImplementation::SatisfiesBlanketConstraint<AssocFunctionCallCand,
+      ArgSatisfiesBlanketLikeConstraintInput>;
 
   /**
-   * A configuration for matching the type of a receiver against the type of
-   * a `self` parameter.
+   * A configuration for matching the type of an argument against the type of
+   * a function at a function-call adjusted position relevant for dispatch
+   * (such as a `self` parameter).
    */
-  private module ReceiverIsInstantiationOfSelfParamInput implements
-    IsInstantiationOfInputSig<MethodCallCand, AssocFunctionType>
+  private module SelfArgIsInstantiationOfInput implements
+    IsInstantiationOfInputSig<AssocFunctionCallCand, AssocFunctionType>
   {
     pragma[nomagic]
     additional predicate potentialInstantiationOf0(
-      MethodCallCand mcc, ImplOrTraitItemNode i, AssocFunctionType selfType
+      AssocFunctionCallCand afcc, ImplOrTraitItemNode i, AssocFunctionType selfType
     ) {
       exists(
-        MethodCall mc, Method m, string name, int arity, TypePath strippedTypePath,
+        AssocFunctionCall afc, FunctionPosition selfPos, Function f, TypePath strippedTypePath,
         Type strippedType
       |
-        mcc.hasSignature(mc, strippedTypePath, strippedType, name, arity)
+        afcc.hasSignature(afc, selfPos, strippedTypePath, strippedType, _, _)
       |
-        methodCallNonBlanketCandidate(mc, m, i, selfType, strippedTypePath, strippedType)
+        nonBlanketLikeCandidate(afc, f, selfPos, i, selfType, strippedTypePath, strippedType)
         or
-        methodCallBlanketLikeCandidate(mc, m, i, selfType, _, _) and
-        ReceiverSatisfiesBlanketLikeConstraint::satisfiesBlanketConstraint(mcc, i)
+        blanketLikeCandidate(afc, f, selfPos, i, selfType, _, _) and
+        ArgSatisfiesBlanketLikeConstraint::satisfiesBlanketConstraint(afcc, i)
       )
     }
 
     pragma[nomagic]
     predicate potentialInstantiationOf(
-      MethodCallCand mcc, TypeAbstraction abs, AssocFunctionType constraint
+      AssocFunctionCallCand afcc, TypeAbstraction abs, AssocFunctionType constraint
     ) {
-      potentialInstantiationOf0(mcc, abs, constraint) and
+      potentialInstantiationOf0(afcc, abs, constraint) and
       if abs.(Impl).hasTrait()
       then
-        // inherent methods take precedence over trait methods, so only allow
-        // trait methods when there are no matching inherent methods
-        mcc.hasNoInherentTarget()
+        // inherent functions take precedence over trait functions, so only allow
+        // trait functions when there are no matching inherent functions
+        afcc.hasNoInherentTarget()
       else any()
     }
 
     predicate relevantConstraint(AssocFunctionType constraint) {
-      methodInfo(_, _, _, _, constraint, _, _)
+      assocFunctionInfo(_, _, _, _, _, constraint, _, _, _, _, _)
     }
   }
 
-  private module ReceiverIsInstantiationOfSelfParam =
-    ArgIsInstantiationOf<MethodCallCand, ReceiverIsInstantiationOfSelfParamInput>;
+  private module SelfArgIsInstantiationOf {
+    import ArgIsInstantiationOf<AssocFunctionCallCand, SelfArgIsInstantiationOfInput>
+
+    pragma[nomagic]
+    predicate argIsNotInstantiationOf(
+      AssocFunctionCall afc, ImplOrTraitItemNode i, FunctionPosition selfPos, DerefChain derefChain,
+      BorrowKind borrow, TypePath path
+    ) {
+      argIsNotInstantiationOf(MkAssocFunctionCallCand(afc, selfPos, derefChain, borrow), i, _, path)
+    }
+
+    pragma[nomagic]
+    predicate argIsInstantiationOf(
+      AssocFunctionCall afc, ImplOrTraitItemNode i, FunctionPosition selfPos, DerefChain derefChain,
+      BorrowKind borrow, AssocFunctionType selfType
+    ) {
+      argIsInstantiationOf(MkAssocFunctionCallCand(afc, selfPos, derefChain, borrow), i, selfType)
+    }
+  }
 
   /**
-   * A configuration for anti-matching the type of a receiver against the type of
-   * a `self` parameter belonging to a blanket (like) implementation.
+   * A configuration for anti-matching the type of an argument against the type of
+   * a function at a function-call adjusted position relevant for dispatch
+   * (such as a `self` parameter) in a blanket (like) implementation.
    */
-  private module ReceiverIsNotInstantiationOfBlanketLikeSelfParamInput implements
-    IsInstantiationOfInputSig<MethodCallCand, AssocFunctionType>
+  private module SelfArgIsNotInstantiationOfBlanketLikeInput implements
+    IsInstantiationOfInputSig<AssocFunctionCallCand, AssocFunctionType>
   {
     pragma[nomagic]
     predicate potentialInstantiationOf(
-      MethodCallCand mcc, TypeAbstraction abs, AssocFunctionType constraint
+      AssocFunctionCallCand afcc, TypeAbstraction abs, AssocFunctionType constraint
     ) {
-      methodCallBlanketLikeCandidate(mcc.getMethodCall(), _, abs, constraint, _, _) and
-      if abs.(Impl).hasTrait()
-      then
-        // inherent methods take precedence over trait methods, so only allow
-        // trait methods when there are no matching inherent methods
-        mcc.hasNoInherentTarget()
-      else any()
+      exists(AssocFunctionCall afc, FunctionPosition selfPos |
+        afcc = MkAssocFunctionCallCand(afc, selfPos, _, _) and
+        blanketLikeCandidate(afc, _, selfPos, abs, constraint, _, _) and
+        if abs.(Impl).hasTrait()
+        then
+          // inherent functions take precedence over trait functions, so only allow
+          // trait functions when there are no matching inherent functions
+          afcc.hasNoInherentTarget()
+        else any()
+      )
     }
   }
 
-  private module ReceiverIsNotInstantiationOfBlanketLikeSelfParam =
-    ArgIsInstantiationOf<MethodCallCand, ReceiverIsNotInstantiationOfBlanketLikeSelfParamInput>;
+  private module SelfArgIsNotInstantiationOfBlanketLike =
+    ArgIsInstantiationOf<AssocFunctionCallCand, SelfArgIsNotInstantiationOfBlanketLikeInput>;
 
   /**
-   * A configuration for matching the type qualifier of a method call
-   * against the type being implemented in an `impl` block. For example,
-   * in `Foo::<Bar>::m(x)`, we check that the type `Foo<Bar>` is an
-   * instance of the type being implemented.
+   * A configuration for anti-matching the type of an argument against the type of
+   * a function at a function-call adjusted position relevant for dispatch (such as
+   * a `self` parameter) in an inherent function.
    */
-  private module TypeQualifierIsInstantiationOfImplSelfInput implements
-    IsInstantiationOfInputSig<MethodCallCallExpr, TypeMention>
-  {
-    pragma[nomagic]
-    private predicate potentialInstantiationOf0(
-      MethodCallCallExpr ce, ImplItemNode impl, TypeMention constraint
-    ) {
-      ce.hasTypeQualifiedCandidate(impl) and
-      constraint = impl.getSelfPath()
-    }
-
-    pragma[nomagic]
-    predicate potentialInstantiationOf(
-      MethodCallCallExpr ce, TypeAbstraction abs, TypeMention constraint
-    ) {
-      potentialInstantiationOf0(ce, abs, constraint) and
-      if abs.(Impl).hasTrait()
-      then
-        // inherent methods take precedence over trait methods, so only allow
-        // trait methods when there are no matching inherent methods
-        ce.hasNoInherentTarget()
-      else any()
-    }
-
-    predicate relevantConstraint(TypeMention constraint) {
-      potentialInstantiationOf0(_, _, constraint)
-    }
-  }
-
-  private module TypeQualifierIsInstantiationOfImplSelf =
-    IsInstantiationOf<MethodCallCallExpr, TypeMention, TypeQualifierIsInstantiationOfImplSelfInput>;
-
-  /**
-   * A configuration for anti-matching the type of a receiver against the type of
-   * a `self` parameter in an inherent method.
-   */
-  private module ReceiverIsNotInstantiationOfInherentSelfParamInput implements
-    IsInstantiationOfInputSig<MethodCallCand, AssocFunctionType>
+  private module SelfArgIsNotInstantiationOfInherentInput implements
+    IsInstantiationOfInputSig<AssocFunctionCallCand, AssocFunctionType>
   {
     pragma[nomagic]
     predicate potentialInstantiationOf(
-      MethodCallCand mcc, TypeAbstraction abs, AssocFunctionType constraint
+      AssocFunctionCallCand afcc, TypeAbstraction abs, AssocFunctionType constraint
     ) {
-      ReceiverIsInstantiationOfSelfParamInput::potentialInstantiationOf0(mcc, abs, constraint) and
-      abs = any(Impl i | not i.hasTrait())
+      SelfArgIsInstantiationOfInput::potentialInstantiationOf0(afcc, abs, constraint) and
+      abs.(Impl).isInherent() and
+      exists(AssocFunctionCall afc, FunctionPosition selfPos |
+        afcc = MkAssocFunctionCallCand(afc, selfPos, _, _)
+      |
+        selfPos.isTypeQualifier() or
+        afc.hasReceiverAtPos(selfPos)
+      )
     }
   }
 
-  private module ReceiverIsNotInstantiationOfInherentSelfParam =
-    ArgIsInstantiationOf<MethodCallCand, ReceiverIsNotInstantiationOfInherentSelfParamInput>;
+  private module SelfArgIsNotInstantiationOfInherent =
+    ArgIsInstantiationOf<AssocFunctionCallCand, SelfArgIsNotInstantiationOfInherentInput>;
 
   /**
    * A configuration for matching the types of positional arguments against the
    * types of parameters, when needed to disambiguate the call.
    */
-  private module MethodArgsAreInstantiationsOfInput implements ArgsAreInstantiationsOfInputSig {
+  private module OverloadedCallArgsAreInstantiationsOfInput implements
+    ArgsAreInstantiationsOfInputSig
+  {
     predicate toCheck(ImplOrTraitItemNode i, Function f, TypeParameter traitTp, FunctionPosition pos) {
       FunctionOverloading::functionResolutionDependsOnArgument(i, f, traitTp, pos)
     }
 
-    class Call extends MethodCallCand {
+    class Call extends AssocFunctionCallCand {
       Type getArgType(FunctionPosition pos, TypePath path) {
-        result = mc_.getArgumentTypeAt(pos.asArgumentPosition(), path)
-        or
-        pos.isReturn() and
-        result = inferType(mc_.getNodeAt(pos), path)
+        result = this.getAssocFunctionCall().getTypeAt(pos, path)
       }
 
       predicate hasTargetCand(ImplOrTraitItemNode i, Function f) {
@@ -2432,50 +2618,74 @@ private module MethodResolution {
     }
   }
 
-  private module MethodArgsAreInstantiationsOf =
-    ArgsAreInstantiationsOf<MethodArgsAreInstantiationsOfInput>;
+  private module OverloadedCallArgsAreInstantiationsOf {
+    import ArgsAreInstantiationsOf<OverloadedCallArgsAreInstantiationsOfInput>
+
+    pragma[nomagic]
+    predicate argsAreNotInstantiationsOf(AssocFunctionCall afc, ImplOrTraitItemNode i) {
+      argsAreNotInstantiationsOf(MkAssocFunctionCallCand(afc, _, _, _), i, _)
+    }
+  }
 }
 
 /**
- * A matching configuration for resolving types of method call expressions
- * like `foo.bar(baz)`.
+ * A matching configuration for resolving types of function call expressions
+ * like `foo.bar(baz)` and `Foo::bar(baz)`.
  */
-private module MethodCallMatchingInput implements MatchingWithEnvironmentInputSig {
+private module FunctionCallMatchingInput implements MatchingWithEnvironmentInputSig {
   import FunctionPositionMatchingInput
 
-  private class MethodDeclaration extends Method, FunctionDeclaration { }
-
   private newtype TDeclaration =
-    TMethodFunctionDeclaration(ImplOrTraitItemNode i, MethodDeclaration m) { m.isAssoc(i) }
+    TFunctionDeclaration(ImplOrTraitItemNodeOption i, FunctionDeclaration f) { f.isFor(i) }
 
-  final class Declaration extends TMethodFunctionDeclaration {
-    ImplOrTraitItemNode parent;
-    ImplOrTraitItemNodeOption someParent;
-    MethodDeclaration m;
+  final class Declaration extends TFunctionDeclaration {
+    ImplOrTraitItemNodeOption i;
+    FunctionDeclaration f;
 
-    Declaration() {
-      this = TMethodFunctionDeclaration(parent, m) and
-      someParent.asSome() = parent
-    }
+    Declaration() { this = TFunctionDeclaration(i, f) }
 
-    predicate isMethod(ImplOrTraitItemNode i, Method method) {
-      this = TMethodFunctionDeclaration(i, method)
+    FunctionDeclaration getFunction() { result = f }
+
+    predicate isAssocFunction(ImplOrTraitItemNode i_, Function f_) {
+      i_ = i.asSome() and
+      f_ = f
     }
 
     TypeParameter getTypeParameter(TypeParameterPosition ppos) {
-      result = m.getTypeParameter(someParent, ppos)
+      result = f.getTypeParameter(i, ppos)
     }
 
-    Type getDeclaredType(DeclarationPosition dpos, TypePath path) {
-      result = m.getParameterTypeInclNonMethodSelf(someParent, dpos, path)
+    Type getDeclaredType(FunctionPosition pos, TypePath path) {
+      result = f.getParameterType(i, pos, path)
       or
-      dpos.isReturn() and
-      result = m.getReturnType(someParent, path)
+      pos.isReturn() and
+      result = f.getReturnType(i, path)
     }
 
-    string toString() { result = m.toStringExt(parent) }
+    string toString() {
+      i.isNone() and result = f.toString()
+      or
+      result = f.toStringExt(i.asSome())
+    }
 
-    Location getLocation() { result = m.getLocation() }
+    Location getLocation() { result = f.getLocation() }
+  }
+
+  pragma[nomagic]
+  private TypeMention getAdditionalTypeParameterConstraint(TypeParameter tp, Declaration decl) {
+    result =
+      tp.(TypeParamTypeParameter)
+          .getTypeParam()
+          .getAdditionalTypeBound(decl.getFunction(), _)
+          .getTypeRepr()
+  }
+
+  bindingset[decl]
+  TypeMention getATypeParameterConstraint(TypeParameter tp, Declaration decl) {
+    result = Input2::getATypeParameterConstraint(tp) and
+    exists(decl)
+    or
+    result = getAdditionalTypeParameterConstraint(tp, decl)
   }
 
   class AccessEnvironment = string;
@@ -2496,10 +2706,32 @@ private module MethodCallMatchingInput implements MatchingWithEnvironmentInputSi
     )
   }
 
-  final private class MethodCallFinal = MethodResolution::MethodCall;
+  private string noDerefChainBorrow() {
+    exists(DerefChain derefChain, BorrowKind borrow |
+      derefChain.isEmpty() and
+      borrow.isNoBorrow() and
+      result = encodeDerefChainBorrow(derefChain, borrow)
+    )
+  }
 
-  class Access extends MethodCallFinal, ContextTyping::ContextTypedCallCand {
-    Access() {
+  abstract class Access extends ContextTyping::ContextTypedCallCand {
+    abstract AstNode getNodeAt(FunctionPosition pos);
+
+    bindingset[derefChainBorrow]
+    abstract Type getInferredType(string derefChainBorrow, FunctionPosition pos, TypePath path);
+
+    abstract Declaration getTarget(string derefChainBorrow);
+
+    /**
+     * Holds if the return type of this call at `path` may have to be inferred
+     * from the context.
+     */
+    abstract predicate hasUnknownTypeAt(string derefChainBorrow, FunctionPosition pos, TypePath path);
+  }
+
+  private class AssocFunctionCallAccess extends Access instanceof AssocFunctionResolution::AssocFunctionCall
+  {
+    AssocFunctionCallAccess() {
       // handled in the `OperationMatchingInput` module
       not this instanceof Operation
     }
@@ -2516,102 +2748,160 @@ private module MethodCallMatchingInput implements MatchingWithEnvironmentInputSi
       result = getCallExprTypeArgument(this, apos, path)
     }
 
+    override AstNode getNodeAt(FunctionPosition pos) {
+      result = AssocFunctionResolution::AssocFunctionCall.super.getNodeAt(pos)
+    }
+
     pragma[nomagic]
-    private Type getInferredSelfType(AccessPosition apos, string derefChainBorrow, TypePath path) {
+    private Type getInferredSelfType(FunctionPosition pos, string derefChainBorrow, TypePath path) {
       exists(DerefChain derefChain, BorrowKind borrow |
-        result = this.getACandidateReceiverTypeAt(derefChain, borrow, path) and
+        result = super.getSelfTypeAt(pos, derefChain, borrow, path) and
         derefChainBorrow = encodeDerefChainBorrow(derefChain, borrow) and
-        apos.isSelf()
+        super.hasReceiverAtPos(pos)
       )
     }
 
     pragma[nomagic]
-    Type getInferredNonSelfType(AccessPosition apos, TypePath path) {
+    private Type getInferredNonSelfType(FunctionPosition pos, TypePath path) {
       if
         // index expression `x[i]` desugars to `*x.index(i)`, so we must account for
         // the implicit deref
-        apos.isReturn() and
+        pos.isReturn() and
         this instanceof IndexExpr
       then
         path.isEmpty() and
         result instanceof RefType
         or
         exists(TypePath suffix |
-          result = inferType(this.getNodeAt(apos), suffix) and
+          result = super.getTypeAt(pos, suffix) and
           path = TypePath::cons(getRefTypeParameter(_), suffix)
         )
       else (
-        not apos.isSelf() and
-        result = inferType(this.getNodeAt(apos), path)
+        not super.hasReceiverAtPos(pos) and
+        result = super.getTypeAt(pos, path)
       )
     }
 
     bindingset[derefChainBorrow]
-    Type getInferredType(string derefChainBorrow, AccessPosition apos, TypePath path) {
-      result = this.getInferredSelfType(apos, derefChainBorrow, path)
+    override Type getInferredType(string derefChainBorrow, FunctionPosition pos, TypePath path) {
+      result = this.getInferredSelfType(pos, derefChainBorrow, path)
       or
-      result = this.getInferredNonSelfType(apos, path)
+      result = this.getInferredNonSelfType(pos, path)
     }
 
-    Method getTarget(ImplOrTraitItemNode i, string derefChainBorrow) {
+    private AssocFunctionDeclaration getTarget(ImplOrTraitItemNode i, string derefChainBorrow) {
       exists(DerefChain derefChain, BorrowKind borrow |
         derefChainBorrow = encodeDerefChainBorrow(derefChain, borrow) and
-        result = this.resolveCallTarget(i, derefChain, borrow) // mutual recursion; resolving method calls requires resolving types and vice versa
+        result = super.resolveCallTarget(i, _, derefChain, borrow) // mutual recursion; resolving method calls requires resolving types and vice versa
       )
     }
 
-    Declaration getTarget(string derefChainBorrow) {
-      exists(ImplOrTraitItemNode i, Method m |
-        m = this.getTarget(i, derefChainBorrow) and
-        result = TMethodFunctionDeclaration(i, m)
-      )
+    override Declaration getTarget(string derefChainBorrow) {
+      exists(ImplOrTraitItemNode i | result.isAssocFunction(i, this.getTarget(i, derefChainBorrow)))
     }
 
-    /**
-     * Holds if the return type of this call at `path` may have to be inferred
-     * from the context.
-     */
     pragma[nomagic]
-    predicate hasUnknownTypeAt(string derefChainBorrow, FunctionPosition pos, TypePath path) {
+    override predicate hasUnknownTypeAt(string derefChainBorrow, FunctionPosition pos, TypePath path) {
       exists(ImplOrTraitItemNode i |
         this.hasUnknownTypeAt(i, this.getTarget(i, derefChainBorrow), pos, path)
       )
+      or
+      derefChainBorrow = noDerefChainBorrow() and
+      forex(ImplOrTraitItemNode i, Function f |
+        f = CallExprImpl::getResolvedFunction(this) and
+        f = i.getAnAssocItem()
+      |
+        this.hasUnknownTypeAt(i, f, pos, path)
+      )
+    }
+  }
+
+  private class NonAssocFunctionCallAccess extends Access instanceof NonAssocCallExpr,
+    CallExprImpl::CallExprCall
+  {
+    pragma[nomagic]
+    override Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
+      result = NonAssocCallExpr.super.getTypeArgument(apos, path)
+    }
+
+    override AstNode getNodeAt(FunctionPosition pos) {
+      result = NonAssocCallExpr.super.getNodeAt(pos)
+    }
+
+    pragma[nomagic]
+    private Type getInferredType(FunctionPosition pos, TypePath path) {
+      result = super.getInferredType(pos, path)
+    }
+
+    bindingset[derefChainBorrow]
+    override Type getInferredType(string derefChainBorrow, FunctionPosition pos, TypePath path) {
+      exists(derefChainBorrow) and
+      result = this.getInferredType(pos, path)
+    }
+
+    pragma[nomagic]
+    private Declaration getTarget() {
+      result =
+        TFunctionDeclaration(ImplOrTraitItemNodeOption::none_(),
+          super.resolveCallTargetViaPathResolution())
+    }
+
+    override Declaration getTarget(string derefChainBorrow) {
+      result = this.getTarget() and
+      derefChainBorrow = noDerefChainBorrow()
+    }
+
+    pragma[nomagic]
+    override predicate hasUnknownTypeAt(string derefChainBorrow, FunctionPosition pos, TypePath path) {
+      derefChainBorrow = noDerefChainBorrow() and
+      exists(FunctionDeclaration f, TypeParameter tp |
+        f = super.resolveCallTargetViaPathResolution() and
+        pos.isReturn() and
+        tp = f.getReturnType(_, path) and
+        not tp = f.getParameterType(_, _, _) and
+        // check that no explicit type arguments have been supplied for `tp`
+        not exists(TypeArgumentPosition tapos |
+          this.hasTypeArgument(tapos) and
+          TTypeParamTypeParameter(tapos.asTypeParam()) = tp
+        )
+      )
     }
   }
 }
 
-private module MethodCallMatching = MatchingWithEnvironment<MethodCallMatchingInput>;
+private module FunctionCallMatching = MatchingWithEnvironment<FunctionCallMatchingInput>;
 
 pragma[nomagic]
-private Type inferMethodCallType0(
-  MethodCallMatchingInput::Access a, MethodCallMatchingInput::AccessPosition apos, AstNode n,
-  string derefChainBorrow, TypePath path
+private Type inferFunctionCallType0(
+  FunctionCallMatchingInput::Access call, FunctionPosition pos, AstNode n, DerefChain derefChain,
+  BorrowKind borrow, TypePath path
 ) {
   exists(TypePath path0 |
-    n = a.getNodeAt(apos) and
-    (
-      result = MethodCallMatching::inferAccessType(a, derefChainBorrow, apos, path0)
+    n = call.getNodeAt(pos) and
+    exists(string derefChainBorrow |
+      FunctionCallMatchingInput::decodeDerefChainBorrow(derefChainBorrow, derefChain, borrow)
+    |
+      result = FunctionCallMatching::inferAccessType(call, derefChainBorrow, pos, path0)
       or
-      a.hasUnknownTypeAt(derefChainBorrow, apos, path0) and
+      call.hasUnknownTypeAt(derefChainBorrow, pos, path0) and
       result = TUnknownType()
     )
   |
     if
       // index expression `x[i]` desugars to `*x.index(i)`, so we must account for
       // the implicit deref
-      apos.isReturn() and
-      a instanceof IndexExpr
+      pos.isReturn() and
+      call instanceof IndexExpr
     then path0.isCons(getRefTypeParameter(_), path)
     else path = path0
   )
 }
 
 pragma[nomagic]
-private Type inferMethodCallTypeNonSelf(AstNode n, boolean isReturn, TypePath path) {
-  exists(MethodCallMatchingInput::AccessPosition apos |
-    result = inferMethodCallType0(_, apos, n, _, path) and
-    not apos.isSelf() and
-    if apos.isReturn() then isReturn = true else isReturn = false
+private Type inferFunctionCallTypeNonSelf(AstNode n, FunctionPosition pos, TypePath path) {
+  exists(FunctionCallMatchingInput::Access call |
+    result = inferFunctionCallType0(call, pos, n, _, _, path) and
+    not call.(AssocFunctionResolution::AssocFunctionCall).hasReceiverAtPos(pos)
   )
 }
 
@@ -2623,14 +2913,12 @@ private Type inferMethodCallTypeNonSelf(AstNode n, boolean isReturn, TypePath pa
  * empty, at which point the inferred type can be applied back to `n`.
  */
 pragma[nomagic]
-private Type inferMethodCallTypeSelf(AstNode n, DerefChain derefChain, TypePath path) {
-  exists(
-    MethodCallMatchingInput::AccessPosition apos, string derefChainBorrow, BorrowKind borrow,
-    TypePath path0
-  |
-    result = inferMethodCallType0(_, apos, n, derefChainBorrow, path0) and
-    apos.isSelf() and
-    MethodCallMatchingInput::decodeDerefChainBorrow(derefChainBorrow, derefChain, borrow)
+private Type inferFunctionCallTypeSelf(
+  FunctionCallMatchingInput::Access call, AstNode n, DerefChain derefChain, TypePath path
+) {
+  exists(FunctionPosition pos, BorrowKind borrow, TypePath path0 |
+    call.(AssocFunctionResolution::AssocFunctionCall).hasReceiverAtPos(pos) and
+    result = inferFunctionCallType0(call, pos, n, derefChain, borrow, path0)
   |
     borrow.isNoBorrow() and
     path = path0
@@ -2647,7 +2935,7 @@ private Type inferMethodCallTypeSelf(AstNode n, DerefChain derefChain, TypePath
     DerefChain derefChain0, Type t0, TypePath path0, DerefImplItemNode impl, Type selfParamType,
     TypePath selfPath
   |
-    t0 = inferMethodCallTypeSelf(n, derefChain0, path0) and
+    t0 = inferFunctionCallTypeSelf(call, n, derefChain0, path0) and
     derefChain0.isCons(impl, derefChain) and
     selfParamType = impl.resolveSelfTypeAt(selfPath)
   |
@@ -2664,452 +2952,39 @@ private Type inferMethodCallTypeSelf(AstNode n, DerefChain derefChain, TypePath
   )
 }
 
-private Type inferMethodCallTypePreCheck(AstNode n, boolean isReturn, TypePath path) {
-  result = inferMethodCallTypeNonSelf(n, isReturn, path)
+private Type inferFunctionCallTypePreCheck(
+  AstNode n, ContextTyping::FunctionPositionKind kind, TypePath path
+) {
+  exists(FunctionPosition pos |
+    result = inferFunctionCallTypeNonSelf(n, pos, path) and
+    if pos.isPosition()
+    then kind = ContextTyping::PositionalKind()
+    else kind = ContextTyping::ReturnKind()
+  )
   or
-  result = inferMethodCallTypeSelf(n, DerefChain::nil(), path) and
-  isReturn = false
+  exists(FunctionCallMatchingInput::Access a |
+    result = inferFunctionCallTypeSelf(a, n, DerefChain::nil(), path) and
+    if a.(AssocFunctionResolution::AssocFunctionCall).hasReceiver()
+    then kind = ContextTyping::SelfKind()
+    else kind = ContextTyping::PositionalKind()
+  )
 }
 
 /**
- * Gets the type of `n` at `path`, where `n` is either a method call or an
- * argument/receiver of a method call.
+ * Gets the type of `n` at `path`, where `n` is either a function call or an
+ * argument/receiver of a function call.
  */
-private predicate inferMethodCallType =
-  ContextTyping::CheckContextTyping<inferMethodCallTypePreCheck/3>::check/2;
+private predicate inferFunctionCallType =
+  ContextTyping::CheckContextTyping<inferFunctionCallTypePreCheck/3>::check/2;
 
-/**
- * Provides logic for resolving calls to non-method items. This includes
- * "calls" to tuple variants and tuple structs.
- */
-private module NonMethodResolution {
-  pragma[nomagic]
-  private predicate traitFunctionResolutionDependsOnArgument0(
-    TraitItemNode trait, NonMethodFunction traitFunction, FunctionPosition pos, ImplItemNode impl,
-    NonMethodFunction implFunction, TypePath path, TypeParameter traitTp
-  ) {
-    implFunction = impl.getAnAssocItem() and
-    implFunction.implements(traitFunction) and
-    FunctionOverloading::traitTypeParameterOccurrence(trait, traitFunction, _, pos, path, traitTp) and
-    (
-      traitTp = TSelfTypeParameter(trait)
-      or
-      FunctionOverloading::functionResolutionDependsOnArgument(impl, implFunction, traitTp, pos)
-    )
-  }
-
-  /**
-   * Holds if resolving the function `implFunction` in `impl` requires inspecting
-   * the type of applied _arguments_ or possibly knowing the return type.
-   *
-   * `traitTp` is a type parameter of the trait being implemented by `impl`, and
-   * we need to check that the type of `f` corresponding to `traitTp` is satisfied
-   * at any one of the positions `pos` in which that type occurs in `f` (at `path`).
-   *
-   * As for method resolution, we always check the type being implemented (corresponding
-   * to `traitTp` being the special `Self` type parameter).
-   */
-  pragma[nomagic]
-  private predicate traitFunctionResolutionDependsOnArgument(
-    TraitItemNode trait, NonMethodFunction traitFunction, FunctionPosition pos, ImplItemNode impl,
-    NonMethodFunction implFunction, TypePath path, TypeParameter traitTp
-  ) {
-    traitFunctionResolutionDependsOnArgument0(trait, traitFunction, pos, impl, implFunction, path,
-      traitTp) and
-    // Exclude functions where we cannot resolve all relevant type mentions; this allows
-    // for blanket implementations to be applied in those cases
-    forall(TypeParameter traitTp0 |
-      traitFunctionResolutionDependsOnArgument0(trait, traitFunction, _, impl, implFunction, _,
-        traitTp0)
-    |
-      exists(FunctionPosition pos0, TypePath path0 |
-        traitFunctionResolutionDependsOnArgument0(trait, traitFunction, pos0, impl, implFunction,
-          path0, traitTp0) and
-        exists(getAssocFunctionTypeInclNonMethodSelfAt(implFunction, impl, pos0, path0))
-      )
-    )
-  }
-
-  /**
-   * Holds if `f` inside `i` either implements trait function `traitFunction` inside `trait`
-   * or is equal to `traitFunction`, and the type of `f` at `pos` and `path` is `t`, which
-   * corresponds to the `Self` type parameter of `trait`.
-   */
-  pragma[nomagic]
-  private predicate traitFunctionHasSelfType(
-    TraitItemNode trait, NonMethodFunction traitFunction, FunctionPosition pos, TypePath path,
-    Type t, ImplOrTraitItemNode i, NonMethodFunction f
-  ) {
-    exists(ImplItemNode impl, NonMethodFunction implFunction, AssocFunctionType aft |
-      traitFunctionResolutionDependsOnArgument(trait, traitFunction, pos, impl, implFunction, path,
-        TSelfTypeParameter(trait)) and
-      aft.appliesTo(f, i, pos) and
-      t = aft.getTypeAt(path)
-    |
-      i = trait and
-      f = traitFunction
-      or
-      i = impl and
-      f = implFunction and
-      not BlanketImplementation::isBlanketLike(i, _, _)
-    )
-  }
-
-  pragma[nomagic]
-  private predicate functionResolutionDependsOnArgument(
-    ImplItemNode impl, NonMethodFunction f, FunctionPosition pos, TypeParameter tp
-  ) {
-    traitFunctionResolutionDependsOnArgument(_, _, pos, impl, f, _, tp)
-    or
-    // For inherent implementations of generic types, we also need to check the type being
-    // implemented. We arbitrarily choose the first type parameter of the type being implemented
-    // to represent this case.
-    f = impl.getAnAssocItem() and
-    not impl.(Impl).hasTrait() and
-    tp = TTypeParamTypeParameter(impl.resolveSelfTy().getTypeParam(0)) and
-    pos.isSelf()
-  }
-
-  pragma[nomagic]
-  private predicate functionInfoBlanketLikeRelevantPos(
-    NonMethodFunction f, string name, int arity, ImplItemNode impl, Trait trait,
-    FunctionPosition pos, AssocFunctionType t, TypePath blanketPath, TypeParam blanketTypeParam
-  ) {
-    functionInfoBlanketLike(f, name, arity, impl, trait, pos, t, blanketPath, blanketTypeParam) and
-    (
-      if pos.isReturn()
-      then
-        // We only check that the context of the call provides relevant type information
-        // when no argument can
-        not exists(FunctionPosition pos0 |
-          functionInfoBlanketLike(f, name, arity, impl, trait, pos0, _, _, _) and
-          not pos0.isReturn()
-        )
-      else any()
-    )
-  }
-
-  pragma[nomagic]
-  private predicate blanketLikeCallTraitCandidate(Element fc, Trait trait) {
-    fc =
-      any(NonMethodCall nmc |
-        exists(string name, int arity |
-          nmc.hasNameAndArity(name, arity) and
-          functionInfoBlanketLikeRelevantPos(_, name, arity, _, trait, _, _, _, _)
-        |
-          not nmc.hasTrait()
-          or
-          trait = nmc.getTrait()
-        )
-      )
-  }
-
-  private module BlanketTraitIsVisible = TraitIsVisible<blanketLikeCallTraitCandidate/2>;
-
-  /** A (potential) non-method call, `f(x)`. */
-  final class NonMethodCall extends CallExpr {
-    NonMethodCall() {
-      // even if a function cannot be resolved by path resolution, it may still
-      // be possible to resolve a blanket implementation (so not `forex`)
-      forall(Function f | f = CallExprImpl::getResolvedFunction(this) |
-        f instanceof NonMethodFunction
-      )
-    }
-
-    pragma[nomagic]
-    predicate hasNameAndArity(string name, int arity) {
-      name = CallExprImpl::getFunctionPath(this).getText() and
-      arity = this.getArgList().getNumberOfArgs()
-    }
-
-    /**
-     * Gets the item that this function call resolves to using path resolution,
-     * if any.
-     */
-    private ItemNode getPathResolutionResolved() {
-      result = CallExprImpl::getResolvedFunction(this) and
-      not result.(Function).hasSelfParam()
-    }
-
-    /**
-     * Gets the associated function that this function call resolves to using path
-     * resolution, if any.
-     */
-    pragma[nomagic]
-    NonMethodFunction getPathResolutionResolved(ImplOrTraitItemNode i) {
-      result = this.getPathResolutionResolved() and
-      result = i.getAnAssocItem()
-    }
-
-    /**
-     * Gets the blanket function that this call may resolve to, if any.
-     */
-    pragma[nomagic]
-    NonMethodFunction resolveCallTargetBlanketCand(ImplItemNode impl) {
-      exists(string name |
-        this.hasNameAndArity(pragma[only_bind_into](name), _) and
-        ArgIsInstantiationOfBlanketParam::argIsInstantiationOf(MkCallAndBlanketPos(this, _), impl, _) and
-        result = impl.getASuccessor(pragma[only_bind_into](name))
-      )
-    }
-
-    /** Gets the trait targeted by this call, if any. */
-    Trait getTrait() { result = getCallExprTraitQualifier(this) }
-
-    /** Holds if this call targets a trait. */
-    predicate hasTrait() { exists(this.getTrait()) }
-
-    AstNode getNodeAt(FunctionPosition pos) {
-      result = this.getSyntacticArgument(pos.asArgumentPosition())
-      or
-      result = this and pos.isReturn()
-    }
-
-    Type getTypeAt(FunctionPosition pos, TypePath path) {
-      result = inferType(this.getNodeAt(pos), path)
-    }
-
-    pragma[nomagic]
-    NonMethodFunction resolveCallTargetNonBlanketCand(ImplItemNode i) {
-      not this.hasTrait() and
-      result = this.getPathResolutionResolved(i) and
-      not exists(this.resolveCallTargetViaPathResolution()) and
-      functionResolutionDependsOnArgument(i, result, _, _)
-    }
-
-    pragma[nomagic]
-    predicate resolveCallTargetBlanketLikeCand(
-      ImplItemNode impl, FunctionPosition pos, TypePath blanketPath, TypeParam blanketTypeParam
-    ) {
-      exists(string name, int arity, Trait trait, AssocFunctionType t |
-        this.hasNameAndArity(name, arity) and
-        exists(this.getTypeAt(pos, blanketPath)) and
-        functionInfoBlanketLikeRelevantPos(_, name, arity, impl, trait, pos, t, blanketPath,
-          blanketTypeParam) and
-        BlanketTraitIsVisible::traitIsVisible(this, trait)
-      |
-        not this.hasTrait()
-        or
-        trait = this.getTrait()
-      )
-    }
-
-    pragma[nomagic]
-    predicate hasTraitResolved(TraitItemNode trait, NonMethodFunction resolved) {
-      resolved = this.getPathResolutionResolved() and
-      trait = this.getTrait()
-    }
-
-    /**
-     * Holds if this call has no compatible non-blanket target, and it has some
-     * candidate blanket target.
-     */
-    pragma[nomagic]
-    predicate hasNoCompatibleNonBlanketTarget() {
-      this.resolveCallTargetBlanketLikeCand(_, _, _, _) and
-      not exists(this.resolveCallTargetViaPathResolution()) and
-      forall(ImplOrTraitItemNode i, Function f | f = this.resolveCallTargetNonBlanketCand(i) |
-        NonMethodArgsAreInstantiationsOfNonBlanket::argsAreNotInstantiationsOf(this, i, f)
-      ) and
-      (
-        not this.hasTraitResolved(_, _)
-        or
-        exists(
-          TraitItemNode trait, NonMethodFunction resolved, FunctionPosition pos, TypePath path,
-          Type t
-        |
-          this.(NonMethodArgsAreInstantiationsOfNonBlanketInput::Call)
-              .hasTraitResolvedSelfType(trait, resolved, pos, path, t)
-        |
-          forall(ImplOrTraitItemNode i, Function f |
-            traitFunctionHasSelfType(trait, resolved, pos, path, t, i, f)
-          |
-            NonMethodArgsAreInstantiationsOfNonBlanket::argsAreNotInstantiationsOf(this, i, f)
-          )
-        )
-      )
-    }
-
-    /**
-     * Gets the target of this call, which can be resolved using only path resolution.
-     */
-    pragma[nomagic]
-    ItemNode resolveCallTargetViaPathResolution() {
-      not this.hasTrait() and
-      result = this.getPathResolutionResolved() and
-      not functionResolutionDependsOnArgument(_, result, _, _)
-    }
-
-    /**
-     * Gets the target of this call, which can be resolved using type inference.
-     */
-    pragma[nomagic]
-    NonMethodFunction resolveCallTargetViaTypeInference(ImplOrTraitItemNode i) {
-      result = this.resolveCallTargetBlanketCand(i) and
-      not FunctionOverloading::functionResolutionDependsOnArgument(_, result, _, _)
-      or
-      NonMethodArgsAreInstantiationsOfBlanket::argsAreInstantiationsOf(this, i, result)
-      or
-      NonMethodArgsAreInstantiationsOfNonBlanket::argsAreInstantiationsOf(this, i, result)
-    }
-  }
-
-  private newtype TCallAndBlanketPos =
-    MkCallAndBlanketPos(NonMethodCall fc, FunctionPosition pos) {
-      fc.resolveCallTargetBlanketLikeCand(_, pos, _, _)
-    }
-
-  /** A call tagged with a position. */
-  private class CallAndBlanketPos extends MkCallAndBlanketPos {
-    NonMethodCall fc;
-    FunctionPosition pos;
-
-    CallAndBlanketPos() { this = MkCallAndBlanketPos(fc, pos) }
-
-    Location getLocation() { result = fc.getLocation() }
-
-    Type getTypeAt(TypePath path) { result = fc.getTypeAt(pos, path) }
-
-    string toString() { result = fc.toString() + " [arg " + pos + "]" }
-  }
-
-  private module ArgSatisfiesBlanketConstraintInput implements
-    BlanketImplementation::SatisfiesBlanketConstraintInputSig<CallAndBlanketPos>
-  {
-    pragma[nomagic]
-    predicate hasBlanketCandidate(
-      CallAndBlanketPos fcp, ImplItemNode impl, TypePath blanketPath, TypeParam blanketTypeParam
-    ) {
-      exists(NonMethodCall fc, FunctionPosition pos |
-        fcp = MkCallAndBlanketPos(fc, pos) and
-        fc.resolveCallTargetBlanketLikeCand(impl, pos, blanketPath, blanketTypeParam) and
-        // Only apply blanket implementations when no other implementations are possible;
-        // this is to account for codebases that use the (unstable) specialization feature
-        // (https://rust-lang.github.io/rfcs/1210-impl-specialization.html), as well as
-        // cases where our blanket implementation filtering is not precise enough.
-        (fc.hasNoCompatibleNonBlanketTarget() or not impl.isBlanketImplementation())
-      )
-    }
-  }
-
-  private module ArgSatisfiesBlanketConstraint =
-    BlanketImplementation::SatisfiesBlanketConstraint<CallAndBlanketPos,
-      ArgSatisfiesBlanketConstraintInput>;
-
-  /**
-   * A configuration for matching the type of an argument against the type of
-   * a parameter that mentions a satisfied blanket type parameter.
-   */
-  private module ArgIsInstantiationOfBlanketParamInput implements
-    IsInstantiationOfInputSig<CallAndBlanketPos, AssocFunctionType>
-  {
-    pragma[nomagic]
-    predicate potentialInstantiationOf(
-      CallAndBlanketPos fcp, TypeAbstraction abs, AssocFunctionType constraint
-    ) {
-      exists(FunctionPosition pos |
-        ArgSatisfiesBlanketConstraint::satisfiesBlanketConstraint(fcp, abs) and
-        fcp = MkCallAndBlanketPos(_, pos) and
-        functionInfoBlanketLikeRelevantPos(_, _, _, abs, _, pos, constraint, _, _)
-      )
-    }
-
-    predicate relevantConstraint(AssocFunctionType constraint) {
-      functionInfoBlanketLikeRelevantPos(_, _, _, _, _, _, constraint, _, _)
-    }
-  }
-
-  private module ArgIsInstantiationOfBlanketParam =
-    ArgIsInstantiationOf<CallAndBlanketPos, ArgIsInstantiationOfBlanketParamInput>;
-
-  private Type getArgType(
-    NonMethodCall call, FunctionPosition pos, TypePath path, boolean isDefaultTypeArg
-  ) {
-    result = inferType(call.getNodeAt(pos), path) and
-    isDefaultTypeArg = false
-    or
-    result = getCallExprTypeQualifier(call, path, isDefaultTypeArg) and
-    pos.isSelf()
-  }
-
-  private module NonMethodArgsAreInstantiationsOfBlanketInput implements
-    ArgsAreInstantiationsOfInputSig
-  {
-    predicate toCheck(ImplOrTraitItemNode i, Function f, TypeParameter tp, FunctionPosition pos) {
-      functionResolutionDependsOnArgument(i, f, pos, tp)
-    }
-
-    final class Call extends NonMethodCall {
-      Type getArgType(FunctionPosition pos, TypePath path) {
-        result = getArgType(this, pos, path, false)
-      }
-
-      predicate hasTargetCand(ImplOrTraitItemNode i, Function f) {
-        f = this.resolveCallTargetBlanketCand(i)
-      }
-    }
-  }
-
-  private module NonMethodArgsAreInstantiationsOfBlanket =
-    ArgsAreInstantiationsOf<NonMethodArgsAreInstantiationsOfBlanketInput>;
-
-  private module NonMethodArgsAreInstantiationsOfNonBlanketInput implements
-    ArgsAreInstantiationsOfInputSig
-  {
-    predicate toCheck(ImplOrTraitItemNode i, Function f, TypeParameter traitTp, FunctionPosition pos) {
-      functionResolutionDependsOnArgument(i, f, pos, traitTp)
-      or
-      // Also match against the trait function itself
-      FunctionOverloading::traitTypeParameterOccurrence(i, f, _, pos, _, traitTp) and
-      traitTp = TSelfTypeParameter(i)
-    }
-
-    class Call extends NonMethodCall {
-      Type getArgType(FunctionPosition pos, TypePath path) {
-        result = getArgType(this, pos, path, _)
-      }
-
-      /**
-       * Holds if this call is of the form `Trait::function(args)`, and the type at `pos` and
-       * `path` matches the `Self` type parameter of `Trait`.
-       */
-      pragma[nomagic]
-      predicate hasTraitResolvedSelfType(
-        TraitItemNode trait, NonMethodFunction function, FunctionPosition pos, TypePath path, Type t
-      ) {
-        this.hasTraitResolved(trait, function) and
-        FunctionOverloading::traitTypeParameterOccurrence(trait, function, _, pos, path,
-          TSelfTypeParameter(trait)) and
-        t = substituteLookupTraits(this.getArgType(pos, path)) and
-        t != TUnknownType()
-      }
-
-      predicate hasTargetCand(ImplOrTraitItemNode i, Function f) {
-        f = this.resolveCallTargetNonBlanketCand(i)
-        or
-        exists(
-          TraitItemNode trait, NonMethodFunction resolved, FunctionPosition pos, TypePath path,
-          Type t
-        |
-          this.hasTraitResolvedSelfType(trait, resolved, pos, path, t) and
-          traitFunctionHasSelfType(trait, resolved, pos, path, t, i, f)
-        )
-      }
-    }
-  }
-
-  private module NonMethodArgsAreInstantiationsOfNonBlanket =
-    ArgsAreInstantiationsOf<NonMethodArgsAreInstantiationsOfNonBlanketInput>;
-}
-
-abstract private class TupleLikeConstructor extends Addressable {
+abstract private class Constructor extends Addressable {
   final TypeParameter getTypeParameter(TypeParameterPosition ppos) {
     typeParamMatchPosition(this.getTypeItem().getGenericParamList().getATypeParam(), result, ppos)
   }
 
   abstract TypeItem getTypeItem();
 
-  abstract TupleField getTupleField(int i);
+  abstract TypeRepr getParameterTypeRepr(int pos);
 
   Type getReturnType(TypePath path) {
     result = TDataType(this.getTypeItem()) and
@@ -3120,174 +2995,63 @@ abstract private class TupleLikeConstructor extends Addressable {
   }
 
   Type getDeclaredType(FunctionPosition pos, TypePath path) {
-    result = this.getParameterType(pos, path)
+    result = this.getParameterType(pos.asPosition(), path)
     or
     pos.isReturn() and
     result = this.getReturnType(path)
-    or
-    pos.isSelf() and
-    result = this.getReturnType(path)
   }
 
-  Type getParameterType(FunctionPosition pos, TypePath path) {
-    result = this.getTupleField(pos.asPosition()).getTypeRepr().(TypeMention).getTypeAt(path)
+  Type getParameterType(int pos, TypePath path) {
+    result = this.getParameterTypeRepr(pos).(TypeMention).getTypeAt(path)
   }
 }
 
-private class TupleLikeStruct extends TupleLikeConstructor instanceof Struct {
-  TupleLikeStruct() { this.isTuple() }
-
+private class StructConstructor extends Constructor instanceof Struct {
   override TypeItem getTypeItem() { result = this }
 
-  override TupleField getTupleField(int i) { result = Struct.super.getTupleField(i) }
+  override TypeRepr getParameterTypeRepr(int i) {
+    result = [super.getTupleField(i).getTypeRepr(), super.getNthStructField(i).getTypeRepr()]
+  }
 }
 
-private class TupleLikeVariant extends TupleLikeConstructor instanceof Variant {
-  TupleLikeVariant() { this.isTuple() }
-
+private class VariantConstructor extends Constructor instanceof Variant {
   override TypeItem getTypeItem() { result = super.getEnum() }
 
-  override TupleField getTupleField(int i) { result = Variant.super.getTupleField(i) }
+  override TypeRepr getParameterTypeRepr(int i) {
+    result = [super.getTupleField(i).getTypeRepr(), super.getNthStructField(i).getTypeRepr()]
+  }
 }
 
 /**
- * A matching configuration for resolving types of calls like
- * `foo::bar(baz)` where the target is not a method.
- *
- * This also includes "calls" to tuple variants and tuple structs such
- * as `Result::Ok(42)`.
+ * A matching configuration for resolving types of constructions of enums and
+ * structs, such as `Result::Ok(42)`, `Foo { bar: 1 }` and `None`.
  */
-private module NonMethodCallMatchingInput implements MatchingInputSig {
+private module ConstructionMatchingInput implements MatchingInputSig {
   import FunctionPositionMatchingInput
 
-  private class NonMethodFunctionDeclaration extends NonMethodFunction, FunctionDeclaration { }
+  class Declaration = Constructor;
 
-  private newtype TDeclaration =
-    TNonMethodFunctionDeclaration(ImplOrTraitItemNodeOption i, NonMethodFunctionDeclaration f) {
-      f.isFor(i)
-    } or
-    TTupleLikeConstructorDeclaration(TupleLikeConstructor tc)
+  abstract class Access extends AstNode {
+    abstract Type getInferredType(FunctionPosition pos, TypePath path);
 
-  abstract class Declaration extends TDeclaration {
-    abstract TypeParameter getTypeParameter(TypeParameterPosition ppos);
+    abstract Declaration getTarget();
 
-    pragma[nomagic]
-    abstract Type getParameterType(DeclarationPosition dpos, TypePath path);
+    abstract AstNode getNodeAt(AccessPosition apos);
 
-    abstract Type getReturnType(TypePath path);
-
-    Type getDeclaredType(DeclarationPosition dpos, TypePath path) {
-      result = this.getParameterType(dpos, path)
-      or
-      dpos.isReturn() and
-      result = this.getReturnType(path)
-    }
-
-    abstract string toString();
-
-    abstract Location getLocation();
-  }
-
-  private class NonMethodFunctionDecl extends Declaration, TNonMethodFunctionDeclaration {
-    private ImplOrTraitItemNodeOption i;
-    private NonMethodFunctionDeclaration f;
-
-    NonMethodFunctionDecl() { this = TNonMethodFunctionDeclaration(i, f) }
-
-    override TypeParameter getTypeParameter(TypeParameterPosition ppos) {
-      result = f.getTypeParameter(i, ppos)
-    }
-
-    override Type getParameterType(DeclarationPosition dpos, TypePath path) {
-      result = f.getParameterTypeInclNonMethodSelf(i, dpos, path)
-    }
-
-    override Type getReturnType(TypePath path) { result = f.getReturnType(i, path) }
-
-    override string toString() {
-      i.isNone() and result = f.toString()
-      or
-      result = f.toStringExt(i.asSome())
-    }
-
-    override Location getLocation() { result = f.getLocation() }
-  }
-
-  private class TupleLikeConstructorDeclaration extends Declaration,
-    TTupleLikeConstructorDeclaration
-  {
-    TupleLikeConstructor tc;
-
-    TupleLikeConstructorDeclaration() { this = TTupleLikeConstructorDeclaration(tc) }
-
-    override TypeParameter getTypeParameter(TypeParameterPosition ppos) {
-      result = tc.getTypeParameter(ppos)
-    }
-
-    override Type getParameterType(DeclarationPosition dpos, TypePath path) {
-      result = tc.getParameterType(dpos, path)
-    }
-
-    override Type getReturnType(TypePath path) { result = tc.getReturnType(path) }
-
-    override string toString() { result = tc.toString() }
-
-    override Location getLocation() { result = tc.getLocation() }
-  }
-
-  class Access extends NonMethodResolution::NonMethodCall, ContextTyping::ContextTypedCallCand {
-    pragma[nomagic]
-    override Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
-      result = getCallExprTypeArgument(this, apos, path)
-    }
-
-    pragma[nomagic]
-    Type getInferredType(AccessPosition apos, TypePath path) {
-      apos.isSelf() and
-      result = getCallExprTypeQualifier(this, path, false)
-      or
-      result = inferType(this.getNodeAt(apos), path)
-    }
-
-    pragma[inline]
-    Declaration getTarget() {
-      exists(ImplOrTraitItemNodeOption i, NonMethodFunctionDeclaration f |
-        result = TNonMethodFunctionDeclaration(i, f)
-      |
-        f = this.resolveCallTargetViaTypeInference(i.asSome()) // mutual recursion; resolving some associated function calls requires resolving types
-        or
-        f = this.resolveCallTargetViaPathResolution() and
-        f.isDirectlyFor(i)
-      )
-      or
-      exists(ItemNode i | i = this.resolveCallTargetViaPathResolution() |
-        result = TTupleLikeConstructorDeclaration(i)
-      )
-    }
+    abstract Type getTypeArgument(TypeArgumentPosition apos, TypePath path);
 
     /**
-     * Holds if the return type of this call at `path` may have to be inferred
-     * from the context.
+     * Holds if the return type of this construction expression at `path` may
+     * have to be inferred from the context. For example in `Result::Ok(42)` the
+     * error type has to be inferred from the context.
      */
     pragma[nomagic]
     predicate hasUnknownTypeAt(FunctionPosition pos, TypePath path) {
-      exists(ImplOrTraitItemNodeOption i, NonMethodFunctionDeclaration f |
-        TNonMethodFunctionDeclaration(i, f) = this.getTarget() and
-        this.hasUnknownTypeAt(i.asSome(), f, pos, path)
-      )
-      or
-      forex(ImplOrTraitItemNode i, NonMethodFunctionDeclaration f |
-        f = this.getPathResolutionResolved(i)
-      |
-        this.hasUnknownTypeAt(i, f, pos, path)
-      )
-      or
-      // Tuple declarations, such as `Result::Ok(...)`, may also be context typed
-      exists(TupleLikeConstructor tc, TypeParameter tp |
-        tc = this.resolveCallTargetViaPathResolution() and
+      exists(Declaration d, TypeParameter tp |
+        d = this.getTarget() and
         pos.isReturn() and
-        tp = tc.getReturnType(path) and
-        not tp = tc.getParameterType(_, _) and
+        tp = d.getReturnType(path) and
+        not exists(FunctionPosition pos2 | not pos2.isReturn() and tp = d.getDeclaredType(pos2, _)) and
         // check that no explicit type arguments have been supplied for `tp`
         not exists(TypeArgumentPosition tapos |
           exists(this.getTypeArgument(tapos, _)) and
@@ -3296,25 +3060,99 @@ private module NonMethodCallMatchingInput implements MatchingInputSig {
       )
     }
   }
+
+  private class NonAssocCallAccess extends Access, NonAssocCallExpr,
+    ContextTyping::ContextTypedCallCand
+  {
+    NonAssocCallAccess() {
+      this instanceof CallExprImpl::TupleStructExpr or
+      this instanceof CallExprImpl::TupleVariantExpr
+    }
+
+    override Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
+      result = NonAssocCallExpr.super.getTypeArgument(apos, path)
+    }
+
+    override AstNode getNodeAt(AccessPosition apos) {
+      result = NonAssocCallExpr.super.getNodeAt(apos)
+    }
+
+    override Type getInferredType(FunctionPosition pos, TypePath path) {
+      result = NonAssocCallExpr.super.getInferredType(pos, path)
+    }
+
+    override Declaration getTarget() { result = this.resolveCallTargetViaPathResolution() }
+  }
+
+  abstract private class StructAccess extends Access instanceof PathAstNode {
+    pragma[nomagic]
+    override Type getInferredType(AccessPosition apos, TypePath path) {
+      result = inferType(this.getNodeAt(apos), path)
+    }
+
+    pragma[nomagic]
+    override Declaration getTarget() { result = resolvePath(super.getPath()) }
+
+    pragma[nomagic]
+    override Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
+      // Handle constructions that use `Self {...}` syntax
+      exists(TypeMention tm, TypePath path0 |
+        tm = super.getPath() and
+        result = tm.getTypeAt(path0) and
+        path0.isCons(TTypeParamTypeParameter(apos.asTypeParam()), path)
+      )
+    }
+  }
+
+  private class StructExprAccess extends StructAccess, StructExpr {
+    override Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
+      result = super.getTypeArgument(apos, path)
+      or
+      exists(TypePath suffix |
+        suffix.isCons(TTypeParamTypeParameter(apos.asTypeParam()), path) and
+        result = CertainTypeInference::inferCertainType(this, suffix)
+      )
+    }
+
+    override AstNode getNodeAt(AccessPosition apos) {
+      result =
+        this.getFieldExpr(pragma[only_bind_into](this.getNthStructField(apos.asPosition())
+              .getName()
+              .getText())).getExpr()
+      or
+      result = this and apos.isReturn()
+    }
+  }
+
+  /** A potential nullary struct/variant construction such as `None`. */
+  private class PathExprAccess extends StructAccess, PathExpr {
+    PathExprAccess() { not exists(CallExpr ce | this = ce.getFunction()) }
+
+    override AstNode getNodeAt(AccessPosition apos) { result = this and apos.isReturn() }
+  }
 }
 
-private module NonMethodCallMatching = Matching<NonMethodCallMatchingInput>;
+private module ConstructionMatching = Matching<ConstructionMatchingInput>;
 
 pragma[nomagic]
-private Type inferNonMethodCallType0(AstNode n, boolean isReturn, TypePath path) {
-  exists(NonMethodCallMatchingInput::Access a, NonMethodCallMatchingInput::AccessPosition apos |
-    n = a.getNodeAt(apos) and
-    if apos.isReturn() then isReturn = true else isReturn = false
+private Type inferConstructionTypePreCheck(
+  AstNode n, ContextTyping::FunctionPositionKind kind, TypePath path
+) {
+  exists(ConstructionMatchingInput::Access a, FunctionPosition pos |
+    n = a.getNodeAt(pos) and
+    if pos.isPosition()
+    then kind = ContextTyping::PositionalKind()
+    else kind = ContextTyping::ReturnKind()
   |
-    result = NonMethodCallMatching::inferAccessType(a, apos, path)
+    result = ConstructionMatching::inferAccessType(a, pos, path)
     or
-    a.hasUnknownTypeAt(apos, path) and
+    a.hasUnknownTypeAt(pos, path) and
     result = TUnknownType()
   )
 }
 
-private predicate inferNonMethodCallType =
-  ContextTyping::CheckContextTyping<inferNonMethodCallType0/3>::check/2;
+private predicate inferConstructionType =
+  ContextTyping::CheckContextTyping<inferConstructionTypePreCheck/3>::check/2;
 
 /**
  * A matching configuration for resolving types of operations like `a + b`.
@@ -3323,22 +3161,22 @@ private module OperationMatchingInput implements MatchingInputSig {
   private import codeql.rust.elements.internal.OperationImpl::Impl as OperationImpl
   import FunctionPositionMatchingInput
 
-  class Declaration extends MethodCallMatchingInput::Declaration {
+  class Declaration extends FunctionCallMatchingInput::Declaration {
     private Method getSelfOrImpl() {
-      result = m
+      result = f
       or
-      m.implements(result)
+      f.implements(result)
     }
 
     pragma[nomagic]
-    private predicate borrowsAt(DeclarationPosition pos) {
+    private predicate borrowsAt(FunctionPosition pos) {
       exists(TraitItemNode t, string path, string method |
         this.getSelfOrImpl() = t.getAssocItem(method) and
         path = t.getCanonicalPath(_) and
         exists(int borrows | OperationImpl::isOverloaded(_, _, path, method, borrows) |
-          pos.isSelf() and borrows >= 1
+          pos.asPosition() = 0 and borrows >= 1
           or
-          pos.asPosition() = 0 and
+          pos.asPosition() = 1 and
           borrows >= 2
         )
       )
@@ -3347,30 +3185,30 @@ private module OperationMatchingInput implements MatchingInputSig {
     pragma[nomagic]
     private predicate derefsReturn() { this.getSelfOrImpl() = any(DerefTrait t).getDerefFunction() }
 
-    Type getDeclaredType(DeclarationPosition dpos, TypePath path) {
+    Type getDeclaredType(FunctionPosition pos, TypePath path) {
       exists(TypePath path0 |
-        result = super.getDeclaredType(dpos, path0) and
+        result = super.getDeclaredType(pos, path0) and
         if
-          this.borrowsAt(dpos)
+          this.borrowsAt(pos)
           or
-          dpos.isReturn() and this.derefsReturn()
+          pos.isReturn() and this.derefsReturn()
         then path0.isCons(getRefTypeParameter(_), path)
         else path0 = path
       )
     }
   }
 
-  class Access extends MethodResolution::MethodCallOperation {
+  class Access extends AssocFunctionResolution::AssocFunctionCallOperation {
     Type getTypeArgument(TypeArgumentPosition apos, TypePath path) { none() }
 
     pragma[nomagic]
-    Type getInferredType(AccessPosition apos, TypePath path) {
-      result = inferType(this.getNodeAt(apos), path)
+    Type getInferredType(FunctionPosition pos, TypePath path) {
+      result = inferType(this.getNodeAt(pos), path)
     }
 
     Declaration getTarget() {
       exists(ImplOrTraitItemNode i |
-        result.isMethod(i, this.resolveCallTarget(i, _, _)) // mutual recursion
+        result.isAssocFunction(i, this.resolveCallTarget(i, _, _, _)) // mutual recursion
       )
     }
   }
@@ -3379,16 +3217,23 @@ private module OperationMatchingInput implements MatchingInputSig {
 private module OperationMatching = Matching<OperationMatchingInput>;
 
 pragma[nomagic]
-private Type inferOperationType0(AstNode n, boolean isReturn, TypePath path) {
-  exists(OperationMatchingInput::Access a, OperationMatchingInput::AccessPosition apos |
-    n = a.getNodeAt(apos) and
-    result = OperationMatching::inferAccessType(a, apos, path) and
-    if apos.isReturn() then isReturn = true else isReturn = false
+private Type inferOperationTypePreCheck(
+  AstNode n, ContextTyping::FunctionPositionKind kind, TypePath path
+) {
+  exists(OperationMatchingInput::Access a, FunctionPosition pos |
+    n = a.getNodeAt(pos) and
+    result = OperationMatching::inferAccessType(a, pos, path) and
+    if pos.asPosition() = 0
+    then kind = ContextTyping::SelfKind()
+    else
+      if pos.isPosition()
+      then kind = ContextTyping::PositionalKind()
+      else kind = ContextTyping::ReturnKind()
   )
 }
 
 private predicate inferOperationType =
-  ContextTyping::CheckContextTyping<inferOperationType0/3>::check/2;
+  ContextTyping::CheckContextTyping<inferOperationTypePreCheck/3>::check/2;
 
 pragma[nomagic]
 private Type getFieldExprLookupType(FieldExpr fe, string name, DerefChain derefChain) {
@@ -3708,7 +3553,7 @@ final private class AwaitTarget extends Expr {
   Type getTypeAt(TypePath path) { result = inferType(this, path) }
 }
 
-private module AwaitSatisfiesConstraintInput implements SatisfiesConstraintInputSig<AwaitTarget> {
+private module AwaitSatisfiesTypeInput implements SatisfiesTypeInputSig<AwaitTarget> {
   pragma[nomagic]
   predicate relevantConstraint(AwaitTarget term, Type constraint) {
     exists(term) and
@@ -3716,11 +3561,12 @@ private module AwaitSatisfiesConstraintInput implements SatisfiesConstraintInput
   }
 }
 
+private module AwaitSatisfiesType = SatisfiesType<AwaitTarget, AwaitSatisfiesTypeInput>;
+
 pragma[nomagic]
 private Type inferAwaitExprType(AstNode n, TypePath path) {
   exists(TypePath exprPath |
-    SatisfiesConstraint<AwaitTarget, AwaitSatisfiesConstraintInput>::satisfiesConstraintType(n.(AwaitExpr)
-          .getExpr(), _, exprPath, result) and
+    AwaitSatisfiesType::satisfiesConstraintType(n.(AwaitExpr).getExpr(), _, exprPath, result) and
     exprPath.isCons(getFutureOutputTypeParameter(), path)
   )
 }
@@ -3796,100 +3642,59 @@ private Type inferDereferencedExprPtrType(AstNode n, TypePath path) {
 }
 
 /**
- * A matching configuration for resolving types of struct patterns
- * like `let Foo { bar } = ...`.
+ * A matching configuration for resolving types of deconstruction patterns like
+ * `let Foo { bar } = ...` or `let Some(x) = ...`.
  */
-private module StructPatMatchingInput implements MatchingInputSig {
-  class DeclarationPosition = StructExprMatchingInput::DeclarationPosition;
-
-  class Declaration = StructExprMatchingInput::Declaration;
-
-  class AccessPosition = DeclarationPosition;
-
-  class Access extends StructPat {
-    Type getTypeArgument(TypeArgumentPosition apos, TypePath path) { none() }
-
-    AstNode getNodeAt(AccessPosition apos) {
-      result = this.getPatField(apos.asFieldPos()).getPat()
-      or
-      result = this and
-      apos.isStructPos()
-    }
-
-    Type getInferredType(AccessPosition apos, TypePath path) {
-      result = inferType(this.getNodeAt(apos), path)
-      or
-      // The struct/enum type is supplied explicitly as a type qualifier, e.g.
-      // `let Foo<Bar>::Variant { ... } = ...`.
-      apos.isStructPos() and
-      result = this.getPath().(TypeMention).getTypeAt(path)
-    }
-
-    Declaration getTarget() { result = resolvePath(this.getPath()) }
-  }
-
-  predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
-    apos = dpos
-  }
-}
-
-private module StructPatMatching = Matching<StructPatMatchingInput>;
-
-/**
- * Gets the type of `n` at `path`, where `n` is either a struct pattern or
- * a field pattern of a struct pattern.
- */
-pragma[nomagic]
-private Type inferStructPatType(AstNode n, TypePath path) {
-  exists(StructPatMatchingInput::Access a, StructPatMatchingInput::AccessPosition apos |
-    n = a.getNodeAt(apos) and
-    result = StructPatMatching::inferAccessType(a, apos, path)
-  )
-}
-
-/**
- * A matching configuration for resolving types of tuple struct patterns
- * like `let Some(x) = ...`.
- */
-private module TupleStructPatMatchingInput implements MatchingInputSig {
+private module DeconstructionPatMatchingInput implements MatchingInputSig {
   import FunctionPositionMatchingInput
 
-  class Declaration = TupleLikeConstructor;
+  class Declaration = ConstructionMatchingInput::Declaration;
+
+  class Access extends Pat instanceof PathAstNode {
+    Access() { this instanceof TupleStructPat or this instanceof StructPat }
 
-  class Access extends TupleStructPat {
     Type getTypeArgument(TypeArgumentPosition apos, TypePath path) { none() }
 
     AstNode getNodeAt(AccessPosition apos) {
-      result = this.getField(apos.asPosition())
+      this =
+        any(StructPat sp |
+          result =
+            sp.getPatField(pragma[only_bind_into](sp.getNthStructField(apos.asPosition())
+                  .getName()
+                  .getText())).getPat()
+        )
+      or
+      result = this.(TupleStructPat).getField(apos.asPosition())
       or
       result = this and
-      apos.isSelf()
+      apos.isReturn()
     }
 
     Type getInferredType(AccessPosition apos, TypePath path) {
       result = inferType(this.getNodeAt(apos), path)
       or
       // The struct/enum type is supplied explicitly as a type qualifier, e.g.
+      // `let Foo::<Bar>::Variant { ... } = ...` or
       // `let Option::<Foo>::Some(x) = ...`.
-      apos.isSelf() and
-      result = this.getPath().(TypeMention).getTypeAt(path)
+      apos.isReturn() and
+      result = super.getPath().(TypeMention).getTypeAt(path)
     }
 
-    Declaration getTarget() { result = resolvePath(this.getPath()) }
+    Declaration getTarget() { result = resolvePath(super.getPath()) }
   }
 }
 
-private module TupleStructPatMatching = Matching<TupleStructPatMatchingInput>;
+private module DeconstructionPatMatching = Matching<DeconstructionPatMatchingInput>;
 
 /**
- * Gets the type of `n` at `path`, where `n` is either a tuple struct pattern or
- * a positional pattern of a tuple struct pattern.
+ * Gets the type of `n` at `path`, where `n` is a pattern for a constructor,
+ * either a struct pattern or a tuple-struct pattern.
  */
 pragma[nomagic]
-private Type inferTupleStructPatType(AstNode n, TypePath path) {
-  exists(TupleStructPatMatchingInput::Access a, TupleStructPatMatchingInput::AccessPosition apos |
+private Type inferDeconstructionPatType(AstNode n, TypePath path) {
+  exists(DeconstructionPatMatchingInput::Access a, FunctionPosition apos |
     n = a.getNodeAt(apos) and
-    result = TupleStructPatMatching::inferAccessType(a, apos, path)
+    result = DeconstructionPatMatching::inferAccessType(a, apos, path)
   )
 }
 
@@ -3899,9 +3704,7 @@ final private class ForIterableExpr extends Expr {
   Type getTypeAt(TypePath path) { result = inferType(this, path) }
 }
 
-private module ForIterableSatisfiesConstraintInput implements
-  SatisfiesConstraintInputSig<ForIterableExpr>
-{
+private module ForIterableSatisfiesTypeInput implements SatisfiesTypeInputSig<ForIterableExpr> {
   predicate relevantConstraint(ForIterableExpr term, Type constraint) {
     exists(term) and
     exists(Trait t | t = constraint.(TraitType).getTrait() |
@@ -3922,13 +3725,15 @@ private AssociatedTypeTypeParameter getIntoIteratorItemTypeParameter() {
   result = getAssociatedTypeTypeParameter(any(IntoIteratorTrait t).getItemType())
 }
 
+private module ForIterableSatisfiesType =
+  SatisfiesType<ForIterableExpr, ForIterableSatisfiesTypeInput>;
+
 pragma[nomagic]
 private Type inferForLoopExprType(AstNode n, TypePath path) {
   // type of iterable -> type of pattern (loop variable)
   exists(ForExpr fe, TypePath exprPath, AssociatedTypeTypeParameter tp |
     n = fe.getPat() and
-    SatisfiesConstraint<ForIterableExpr, ForIterableSatisfiesConstraintInput>::satisfiesConstraintType(fe.getIterable(),
-      _, exprPath, result) and
+    ForIterableSatisfiesType::satisfiesConstraintType(fe.getIterable(), _, exprPath, result) and
     exprPath.isCons(tp, path)
   |
     tp = getIntoIteratorItemTypeParameter()
@@ -3954,8 +3759,7 @@ final private class InvokedClosureExpr extends Expr {
   CallExpr getCall() { result = call }
 }
 
-private module InvokedClosureSatisfiesConstraintInput implements
-  SatisfiesConstraintInputSig<InvokedClosureExpr>
+private module InvokedClosureSatisfiesTypeInput implements SatisfiesTypeInputSig<InvokedClosureExpr>
 {
   predicate relevantConstraint(InvokedClosureExpr term, Type constraint) {
     exists(term) and
@@ -3963,10 +3767,12 @@ private module InvokedClosureSatisfiesConstraintInput implements
   }
 }
 
+private module InvokedClosureSatisfiesType =
+  SatisfiesType<InvokedClosureExpr, InvokedClosureSatisfiesTypeInput>;
+
 /** Gets the type of `ce` when viewed as an implementation of `FnOnce`. */
 private Type invokedClosureFnTypeAt(InvokedClosureExpr ce, TypePath path) {
-  SatisfiesConstraint<InvokedClosureExpr, InvokedClosureSatisfiesConstraintInput>::satisfiesConstraintType(ce,
-    _, path, result)
+  InvokedClosureSatisfiesType::satisfiesConstraintType(ce, _, path, result)
 }
 
 /**
@@ -4076,7 +3882,8 @@ private module Cached {
   cached
   predicate implicitDerefChainBorrow(Expr e, DerefChain derefChain, boolean borrow) {
     exists(BorrowKind bk |
-      any(MethodResolution::MethodCall mc).argumentHasImplicitDerefChainBorrow(e, derefChain, bk) and
+      any(AssocFunctionResolution::AssocFunctionCall afc)
+          .argumentHasImplicitDerefChainBorrow(e, derefChain, bk) and
       if bk.isNoBorrow() then borrow = false else borrow = true
     )
     or
@@ -4101,15 +3908,14 @@ private module Cached {
   cached
   Addressable resolveCallTarget(InvocationExpr call, boolean dispatch) {
     dispatch = false and
-    result = call.(NonMethodResolution::NonMethodCall).resolveCallTargetViaPathResolution()
+    result = call.(NonAssocCallExpr).resolveCallTargetViaPathResolution()
     or
     exists(ImplOrTraitItemNode i |
       i instanceof TraitItemNode and dispatch = true
       or
       i instanceof ImplItemNode and dispatch = false
     |
-      result = call.(MethodResolution::MethodCall).resolveCallTarget(i, _, _) or
-      result = call.(NonMethodResolution::NonMethodCall).resolveCallTargetViaTypeInference(i)
+      result = call.(AssocFunctionResolution::AssocFunctionCall).resolveCallTarget(i, _, _, _)
     )
   }
 
@@ -4186,21 +3992,20 @@ private module Cached {
     or
     // Don't propagate type information into a node which conflicts with certain
     // type information.
-    (
-      if CertainTypeInference::hasInferredCertainType(n)
-      then not CertainTypeInference::certainTypeConflict(n, path, result)
-      else any()
+    forall(TypePath prefix |
+      CertainTypeInference::hasInferredCertainType(n, prefix) and
+      prefix.isPrefixOf(path)
+    |
+      not CertainTypeInference::certainTypeConflict(n, prefix, path, result)
     ) and
     (
       result = inferAssignmentOperationType(n, path)
       or
       result = inferTypeEquality(n, path)
       or
-      result = inferStructExprType(n, path)
+      result = inferFunctionCallType(n, path)
       or
-      result = inferMethodCallType(n, path)
-      or
-      result = inferNonMethodCallType(n, path)
+      result = inferConstructionType(n, path)
       or
       result = inferOperationType(n, path)
       or
@@ -4222,9 +4027,7 @@ private module Cached {
       or
       result = inferClosureExprType(n, path)
       or
-      result = inferStructPatType(n, path)
-      or
-      result = inferTupleStructPatType(n, path)
+      result = inferDeconstructionPatType(n, path)
     )
   }
 }
@@ -4241,8 +4044,8 @@ private module Debug {
   Locatable getRelevantLocatable() {
     exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
       result.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
-      filepath.matches("%/sqlx.rs") and
-      startline = [56 .. 60]
+      filepath.matches("%/main.rs") and
+      startline = 103
     )
   }
 
@@ -4260,7 +4063,7 @@ private module Debug {
     TypeAbstraction abs, TypeMention condition, TypeMention constraint, boolean transitive
   ) {
     abs = getRelevantLocatable() and
-    Input::conditionSatisfiesConstraint(abs, condition, constraint, transitive)
+    Input2::conditionSatisfiesConstraint(abs, condition, constraint, transitive)
   }
 
   predicate debugInferShorthandSelfType(ShorthandSelfParameterMention self, TypePath path, Type t) {
@@ -4268,14 +4071,14 @@ private module Debug {
     t = self.getTypeAt(path)
   }
 
-  predicate debugInferMethodCallType(AstNode n, TypePath path, Type t) {
+  predicate debugInferFunctionCallType(AstNode n, TypePath path, Type t) {
     n = getRelevantLocatable() and
-    t = inferMethodCallType(n, path)
+    t = inferFunctionCallType(n, path)
   }
 
-  predicate debugInferNonMethodCallType(AstNode n, TypePath path, Type t) {
+  predicate debugInferConstructionType(AstNode n, TypePath path, Type t) {
     n = getRelevantLocatable() and
-    t = inferNonMethodCallType(n, path)
+    t = inferConstructionType(n, path)
   }
 
   predicate debugTypeMention(TypeMention tm, TypePath path, Type type) {
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/TypeMention.qll b/rust/ql/lib/codeql/rust/internal/typeinference/TypeMention.qll
index ef54fe18bb9..70dfbeda848 100644
--- a/rust/ql/lib/codeql/rust/internal/typeinference/TypeMention.qll
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/TypeMention.qll
@@ -205,6 +205,13 @@ private module MkTypeMention<getAdditionalPathTypeAtSig/2 getAdditionalPathTypeA
       )
       or
       exists(TypeParamItemNode tp | this = tp.getABoundPath() and result = tp)
+      or
+      // `<result as this>::...`
+      exists(PathTypeRepr typeRepr, PathTypeRepr traitRepr |
+        pathTypeAsTraitAssoc(_, typeRepr, traitRepr, _, _) and
+        this = traitRepr.getPath() and
+        result = typeRepr.getPath()
+      )
     }
 
     pragma[nomagic]
@@ -696,12 +703,26 @@ private module PreTypeMention = MkTypeMention<preGetAdditionalPathTypeAt/2>;
 
 class PreTypeMention = PreTypeMention::TypeMention;
 
+private class TraitOrTmTrait extends AstNode {
+  Type getTypeAt(TypePath path) {
+    pathTypeAsTraitAssoc(_, _, this, _, _) and
+    result = this.(PreTypeMention).getTypeAt(path)
+    or
+    result = TTrait(this) and
+    path.isEmpty()
+  }
+}
+
 /**
  * Holds if `path` accesses an associated type `alias` from `trait` on a
  * concrete type given by `tm`.
+ *
+ * `traitOrTmTrait` is either the mention that resolves to `trait` when `path`
+ * is of the form `<Type as Trait>::AssocType`, or the trait being implemented
+ * when `path` is of the form `Self::AssocType` within an `impl` block.
  */
 private predicate pathConcreteTypeAssocType(
-  Path path, PreTypeMention tm, Trait trait, TypeAlias alias
+  Path path, PreTypeMention tm, TraitItemNode trait, TraitOrTmTrait traitOrTmTrait, TypeAlias alias
 ) {
   exists(Path qualifier |
     qualifier = path.getQualifier() and
@@ -709,9 +730,9 @@ private predicate pathConcreteTypeAssocType(
   |
     // path of the form `<Type as Trait>::AssocType`
     //                    ^^^ tm          ^^^^^^^^^ name
-    exists(string name, Path traitPath |
-      pathTypeAsTraitAssoc(path, tm, traitPath, name) and
-      trait = resolvePath(traitPath) and
+    //                            ^^^^^ traitOrTmTrait
+    exists(string name |
+      pathTypeAsTraitAssoc(path, tm, traitOrTmTrait, trait, name) and
       getTraitAssocType(trait, name) = alias
     )
     or
@@ -721,29 +742,35 @@ private predicate pathConcreteTypeAssocType(
       alias = resolvePath(path) and
       qualifier = impl.getASelfPath() and
       tm = impl.(Impl).getSelfTy() and
-      trait.(TraitItemNode).getAnAssocItem() = alias
+      trait.getAnAssocItem() = alias and
+      traitOrTmTrait = trait
     )
   )
 }
 
-private module PathSatisfiesConstraintInput implements SatisfiesConstraintInputSig<PreTypeMention> {
-  predicate relevantConstraint(PreTypeMention tm, Type constraint) {
-    pathConcreteTypeAssocType(_, tm, constraint.(TraitType).getTrait(), _)
+private module PathSatisfiesConstraintInput implements
+  PreM2::SatisfiesConstraintInputSig<PreTypeMention, TraitOrTmTrait>
+{
+  predicate relevantConstraint(PreTypeMention tm, TraitOrTmTrait constraint) {
+    pathConcreteTypeAssocType(_, tm, _, constraint, _)
   }
 }
 
 private module PathSatisfiesConstraint =
-  SatisfiesConstraint<PreTypeMention, PathSatisfiesConstraintInput>;
+  PreM2::SatisfiesConstraint<PreTypeMention, TraitOrTmTrait, PathSatisfiesConstraintInput>;
 
 /**
  * Gets the type of `path` at `typePath` when `path` accesses an associated type
  * on a concrete type.
  */
 private Type getPathConcreteAssocTypeAt(Path path, TypePath typePath) {
-  exists(PreTypeMention tm, TraitItemNode t, TypeAlias alias, TypePath path0 |
-    pathConcreteTypeAssocType(path, tm, t, alias) and
-    PathSatisfiesConstraint::satisfiesConstraintType(tm, TTrait(t), path0, result) and
-    path0.isCons(TAssociatedTypeTypeParameter(t, alias), typePath)
+  exists(
+    PreTypeMention tm, ImplItemNode impl, TraitItemNode trait, TraitOrTmTrait traitOrTmTrait,
+    TypeAlias alias, TypePath path0
+  |
+    pathConcreteTypeAssocType(path, tm, trait, traitOrTmTrait, alias) and
+    PathSatisfiesConstraint::satisfiesConstraintTypeThrough(tm, impl, traitOrTmTrait, path0, result) and
+    path0.isCons(TAssociatedTypeTypeParameter(trait, alias), typePath)
   )
 }
 
diff --git a/rust/ql/lib/codeql/rust/security/AccessInvalidPointerExtensions.qll b/rust/ql/lib/codeql/rust/security/AccessInvalidPointerExtensions.qll
index 117f67a7b4e..89a0a2c5c92 100644
--- a/rust/ql/lib/codeql/rust/security/AccessInvalidPointerExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/AccessInvalidPointerExtensions.qll
@@ -5,6 +5,7 @@
 
 import rust
 private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowBarrier
 private import codeql.rust.dataflow.FlowSource
 private import codeql.rust.dataflow.FlowSink
 private import codeql.rust.Concepts
@@ -69,6 +70,13 @@ module AccessInvalidPointer {
     ModelsAsDataSink() { sinkNode(this, "pointer-access") }
   }
 
+  /**
+   * A barrier for invalid pointer access from model data.
+   */
+  private class ModelsAsDataBarrier extends Barrier {
+    ModelsAsDataBarrier() { barrierNode(this, "pointer-access") }
+  }
+
   /**
    * A barrier for invalid pointer access vulnerabilities for values checked to
    * be non-`null`.
diff --git a/rust/ql/lib/codeql/rust/security/CleartextLoggingExtensions.qll b/rust/ql/lib/codeql/rust/security/CleartextLoggingExtensions.qll
index f634992fb81..c728d29f015 100644
--- a/rust/ql/lib/codeql/rust/security/CleartextLoggingExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/CleartextLoggingExtensions.qll
@@ -5,6 +5,7 @@
 
 import rust
 private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowBarrier
 private import codeql.rust.dataflow.FlowSink
 private import codeql.rust.security.SensitiveData
 private import codeql.rust.Concepts
@@ -44,6 +45,13 @@ module CleartextLogging {
     ModelsAsDataSink() { sinkNode(this, "log-injection") }
   }
 
+  /**
+   * A barrier for logging from model data.
+   */
+  private class ModelsAsDataBarrier extends Barrier {
+    ModelsAsDataBarrier() { barrierNode(this, "log-injection") }
+  }
+
   private class BooleanTypeBarrier extends Barrier instanceof Barriers::BooleanTypeBarrier { }
 
   private class FieldlessEnumTypeBarrier extends Barrier instanceof Barriers::FieldlessEnumTypeBarrier
diff --git a/rust/ql/lib/codeql/rust/security/CleartextStorageDatabaseExtensions.qll b/rust/ql/lib/codeql/rust/security/CleartextStorageDatabaseExtensions.qll
index f92b2df1dc0..afbf27e5bc9 100644
--- a/rust/ql/lib/codeql/rust/security/CleartextStorageDatabaseExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/CleartextStorageDatabaseExtensions.qll
@@ -45,4 +45,11 @@ module CleartextStorageDatabase {
   private class ModelsAsDataSink extends Sink {
     ModelsAsDataSink() { sinkNode(this, ["sql-injection", "database-store"]) }
   }
+
+  /**
+   * A barrier for cleartext storage vulnerabilities from model data.
+   */
+  private class ModelsAsDataBarrier extends Barrier {
+    ModelsAsDataBarrier() { barrierNode(this, ["sql-injection", "database-store"]) }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/security/CleartextTransmissionExtensions.qll b/rust/ql/lib/codeql/rust/security/CleartextTransmissionExtensions.qll
index 7d5a91a55f7..14ee95186c3 100644
--- a/rust/ql/lib/codeql/rust/security/CleartextTransmissionExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/CleartextTransmissionExtensions.qll
@@ -6,6 +6,7 @@
 private import codeql.util.Unit
 private import rust
 private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowBarrier
 private import codeql.rust.dataflow.FlowSink
 private import codeql.rust.security.SensitiveData
 private import codeql.rust.Concepts
@@ -55,4 +56,11 @@ module CleartextTransmission {
   private class ModelsAsDataSink extends Sink {
     ModelsAsDataSink() { sinkNode(this, ["transmission", "request-url"]) }
   }
+
+  /**
+   * A barrier defined through MaD.
+   */
+  private class ModelsAsDataBarrier extends Barrier {
+    ModelsAsDataBarrier() { barrierNode(this, ["transmission", "request-url"]) }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/security/DisabledCertificateCheckExtensions.qll b/rust/ql/lib/codeql/rust/security/DisabledCertificateCheckExtensions.qll
index a86ee506dfa..a5933bc74b1 100644
--- a/rust/ql/lib/codeql/rust/security/DisabledCertificateCheckExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/DisabledCertificateCheckExtensions.qll
@@ -5,6 +5,7 @@
 
 import rust
 private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowBarrier
 private import codeql.rust.dataflow.FlowSink
 private import codeql.rust.Concepts
 private import codeql.rust.dataflow.internal.Node as Node
@@ -21,6 +22,11 @@ module DisabledCertificateCheckExtensions {
     override string getSinkType() { result = "DisabledCertificateCheck" }
   }
 
+  /**
+   * A data flow barrier for disabled certificate check vulnerabilities.
+   */
+  abstract class Barrier extends DataFlow::Node { }
+
   /**
    * A sink for disabled certificate check vulnerabilities from model data.
    */
@@ -42,4 +48,11 @@ module DisabledCertificateCheckExtensions {
       )
     }
   }
+
+  /**
+   * A barrier for disabled certificate check vulnerabilities from model data.
+   */
+  private class ModelsAsDataBarrier extends Barrier {
+    ModelsAsDataBarrier() { barrierNode(this, "disable-certificate") }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/security/HardcodedCryptographicValueExtensions.qll b/rust/ql/lib/codeql/rust/security/HardcodedCryptographicValueExtensions.qll
index 9bdfc53971e..09e2505eb5c 100644
--- a/rust/ql/lib/codeql/rust/security/HardcodedCryptographicValueExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/HardcodedCryptographicValueExtensions.qll
@@ -5,6 +5,7 @@
 
 import rust
 private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowBarrier
 private import codeql.rust.dataflow.FlowSource
 private import codeql.rust.dataflow.FlowSink
 private import codeql.rust.Concepts
@@ -130,6 +131,19 @@ module HardcodedCryptographicValue {
     override CryptographicValueKind getKind() { result = kind }
   }
 
+  /**
+   * An externally modeled barrier for hard-coded cryptographic value vulnerabilities.
+   *
+   * Note that a barrier will block flow to all hard-coded cryptographic value
+   * sinks, regardless of the `kind` that is specified. For example a barrier of
+   * kind `credentials-key` will block flow to a sink of kind `credentials-iv`.
+   */
+  private class ModelsAsDataBarrier extends Barrier {
+    ModelsAsDataBarrier() {
+      exists(CryptographicValueKind kind | barrierNode(this, "credentials-" + kind))
+    }
+  }
+
   /**
    * A call to `getrandom` that is a barrier.
    */
diff --git a/rust/ql/lib/codeql/rust/security/InsecureCookieExtensions.qll b/rust/ql/lib/codeql/rust/security/InsecureCookieExtensions.qll
index 87d37d6b85b..bd74dcb8728 100644
--- a/rust/ql/lib/codeql/rust/security/InsecureCookieExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/InsecureCookieExtensions.qll
@@ -5,6 +5,7 @@
 
 import rust
 private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowBarrier
 private import codeql.rust.dataflow.FlowSource
 private import codeql.rust.dataflow.FlowSink
 private import codeql.rust.Concepts
@@ -48,6 +49,13 @@ module InsecureCookie {
     ModelsAsDataSink() { sinkNode(this, "cookie-use") }
   }
 
+  /**
+   * A barrier for insecure cookie vulnerabilities from model data.
+   */
+  private class ModelsAsDataBarrier extends Barrier {
+    ModelsAsDataBarrier() { barrierNode(this, "cookie-use") }
+  }
+
   /**
    * Holds if a models-as-data optional barrier for cookies is specified for `summaryNode`,
    * with arguments `attrib` (`secure` or `partitioned`) and `arg` (argument index). For example,
diff --git a/rust/ql/lib/codeql/rust/security/LogInjectionExtensions.qll b/rust/ql/lib/codeql/rust/security/LogInjectionExtensions.qll
index 31403b625f9..40d11362355 100644
--- a/rust/ql/lib/codeql/rust/security/LogInjectionExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/LogInjectionExtensions.qll
@@ -5,6 +5,7 @@
 
 import rust
 private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowBarrier
 private import codeql.rust.dataflow.FlowSink
 private import codeql.rust.Concepts
 private import codeql.util.Unit
@@ -44,6 +45,13 @@ module LogInjection {
     ModelsAsDataSink() { sinkNode(this, "log-injection") }
   }
 
+  /**
+   * A barrier for log-injection from model data.
+   */
+  private class ModelsAsDataBarrier extends Barrier {
+    ModelsAsDataBarrier() { barrierNode(this, "log-injection") }
+  }
+
   /**
    * A barrier for log injection vulnerabilities for nodes whose type is a
    * numeric type, which is unlikely to expose any vulnerability.
diff --git a/rust/ql/lib/codeql/rust/security/RequestForgeryExtensions.qll b/rust/ql/lib/codeql/rust/security/RequestForgeryExtensions.qll
index 1822baff644..d5b75258ad4 100644
--- a/rust/ql/lib/codeql/rust/security/RequestForgeryExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/RequestForgeryExtensions.qll
@@ -5,6 +5,7 @@
 
 import rust
 private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowBarrier
 private import codeql.rust.dataflow.FlowSink
 private import codeql.rust.dataflow.FlowSource
 private import codeql.rust.Concepts
@@ -46,4 +47,11 @@ module RequestForgery {
   private class ModelsAsDataSink extends Sink {
     ModelsAsDataSink() { sinkNode(this, "request-url") }
   }
+
+  /**
+   * A barrier for request forgery from model data.
+   */
+  private class ModelsAsDataBarrier extends Barrier {
+    ModelsAsDataBarrier() { barrierNode(this, "request-url") }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll b/rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll
index f36ab264987..de2622974f6 100644
--- a/rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll
@@ -6,6 +6,7 @@
 
 import rust
 private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowBarrier
 private import codeql.rust.dataflow.FlowSink
 private import codeql.rust.Concepts
 private import codeql.util.Unit
@@ -53,12 +54,19 @@ module SqlInjection {
   }
 
   /**
-   * A sink for sql-injection from model data.
+   * A sink for SQL injection from model data.
    */
   private class ModelsAsDataSink extends Sink {
     ModelsAsDataSink() { sinkNode(this, "sql-injection") }
   }
 
+  /**
+   * A barrier for SQL injection from model data.
+   */
+  private class ModelsAsDataBarrier extends Barrier {
+    ModelsAsDataBarrier() { barrierNode(this, "sql-injection") }
+  }
+
   /**
    * A barrier for SQL injection vulnerabilities for nodes whose type is a numeric
    * type, which is unlikely to expose any vulnerability.
diff --git a/rust/ql/lib/codeql/rust/security/TaintedPathExtensions.qll b/rust/ql/lib/codeql/rust/security/TaintedPathExtensions.qll
index ccf3736ceb4..2bd009909f6 100644
--- a/rust/ql/lib/codeql/rust/security/TaintedPathExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/TaintedPathExtensions.qll
@@ -47,6 +47,11 @@ module TaintedPath {
   private class ModelsAsDataSinks extends Sink {
     ModelsAsDataSinks() { sinkNode(this, "path-injection") }
   }
+
+  /** A barrier for path-injection from model data. */
+  private class ModelsAsDataBarriers extends Barrier {
+    ModelsAsDataBarriers() { barrierNode(this, "path-injection") }
+  }
 }
 
 private predicate sanitizerGuard(AstNode g, Expr e, boolean branch) {
diff --git a/rust/ql/lib/codeql/rust/security/UncontrolledAllocationSizeExtensions.qll b/rust/ql/lib/codeql/rust/security/UncontrolledAllocationSizeExtensions.qll
index 0390ca77932..f0c0bed0009 100644
--- a/rust/ql/lib/codeql/rust/security/UncontrolledAllocationSizeExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/UncontrolledAllocationSizeExtensions.qll
@@ -6,6 +6,7 @@
 import rust
 private import codeql.rust.Concepts
 private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowBarrier
 private import codeql.rust.dataflow.FlowSink
 
 /**
@@ -32,6 +33,13 @@ module UncontrolledAllocationSize {
     ModelsAsDataSink() { sinkNode(this, ["alloc-size", "alloc-layout"]) }
   }
 
+  /**
+   * A barrier for uncontrolled allocation size from model data.
+   */
+  private class ModelsAsDataBarrier extends Barrier {
+    ModelsAsDataBarrier() { barrierNode(this, ["alloc-size", "alloc-layout"]) }
+  }
+
   /**
    * A barrier for uncontrolled allocation size that is an upper bound check / guard.
    */
@@ -63,17 +71,4 @@ module UncontrolledAllocationSize {
         branch = false
       )
   }
-
-  /**
-   * A barrier for uncontrolled allocation size flow into particular functions.
-   */
-  private class ModeledBarrier extends Barrier {
-    ModeledBarrier() {
-      exists(MethodCall c |
-        c.getStaticTarget().getCanonicalPath() =
-          ["<alloc::string::String>::split_off", "<alloc::vec::Vec>::split_off"] and
-        this.asExpr() = c.getAnArgument()
-      )
-    }
-  }
 }
diff --git a/rust/ql/lib/codeql/rust/security/UseOfHttpExtensions.qll b/rust/ql/lib/codeql/rust/security/UseOfHttpExtensions.qll
index 076ed42edfb..f4dd5a1e1a8 100644
--- a/rust/ql/lib/codeql/rust/security/UseOfHttpExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/UseOfHttpExtensions.qll
@@ -5,6 +5,7 @@
 
 import rust
 private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowBarrier
 private import codeql.rust.dataflow.FlowSink
 private import codeql.rust.Concepts
 
@@ -59,4 +60,11 @@ module UseOfHttp {
   private class ModelsAsDataSink extends Sink {
     ModelsAsDataSink() { sinkNode(this, "request-url") }
   }
+
+  /**
+   * A barrier for use of HTTP URLs from model data.
+   */
+  private class ModelsAsDataBarrier extends Barrier {
+    ModelsAsDataBarrier() { barrierNode(this, "request-url") }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/security/XssExtensions.qll b/rust/ql/lib/codeql/rust/security/XssExtensions.qll
index 97318ff8173..74ed161acb0 100644
--- a/rust/ql/lib/codeql/rust/security/XssExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/XssExtensions.qll
@@ -5,6 +5,7 @@
 
 import rust
 private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowBarrier
 private import codeql.rust.dataflow.FlowSink
 private import codeql.rust.Concepts
 private import codeql.util.Unit
@@ -44,6 +45,13 @@ module Xss {
     ModelsAsDataSink() { sinkNode(this, "html-injection") }
   }
 
+  /**
+   * A barrier for XSS from model data.
+   */
+  private class ModelsAsDataBarrier extends Barrier {
+    ModelsAsDataBarrier() { barrierNode(this, "html-injection") }
+  }
+
   /**
    * A barrier for XSS vulnerabilities for nodes whose type is a
    * numeric or boolean type, which is unlikely to expose any vulnerability.
diff --git a/rust/ql/lib/codeql/rust/security/regex/RegexInjectionExtensions.qll b/rust/ql/lib/codeql/rust/security/regex/RegexInjectionExtensions.qll
index 7cb0dc47c9f..3f1dbbafb7d 100644
--- a/rust/ql/lib/codeql/rust/security/regex/RegexInjectionExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/regex/RegexInjectionExtensions.qll
@@ -6,6 +6,7 @@
 private import codeql.util.Unit
 private import rust
 private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowBarrier
 private import codeql.rust.dataflow.FlowSink
 private import codeql.rust.Concepts
 private import codeql.rust.security.Barriers as Barriers
@@ -69,6 +70,13 @@ module RegexInjection {
     ModelsAsDataSink() { sinkNode(this, "regex-use") }
   }
 
+  /**
+   * A barrier for regular expression injection from model data.
+   */
+  private class ModelsAsDataBarrier extends Barrier {
+    ModelsAsDataBarrier() { barrierNode(this, "regex-use") }
+  }
+
   /**
    * An escape barrier for regular expression injection vulnerabilities.
    */
diff --git a/rust/ql/lib/qlpack.yml b/rust/ql/lib/qlpack.yml
index f7428ef1087..b7d2e253cfb 100644
--- a/rust/ql/lib/qlpack.yml
+++ b/rust/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rust-all
-version: 0.2.7-dev
+version: 0.2.9-dev
 groups: rust
 extractor: rust
 dbscheme: rust.dbscheme
diff --git a/rust/ql/src/CHANGELOG.md b/rust/ql/src/CHANGELOG.md
index 72f10e760fc..a3b3c7b516e 100644
--- a/rust/ql/src/CHANGELOG.md
+++ b/rust/ql/src/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.1.29
+
+No user-facing changes.
+
+## 0.1.28
+
+### Minor Analysis Improvements
+
+* The macro resolution metric has been removed from `rust/diagnostic/database-quality`. This metric was found to be an unreliable indicator of database quality in many cases, leading to false alarms on the tool status page.
+
 ## 0.1.27
 
 No user-facing changes.
diff --git a/rust/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md b/rust/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md
new file mode 100644
index 00000000000..8bfc5be1551
--- /dev/null
+++ b/rust/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md
@@ -0,0 +1,5 @@
+---
+category: queryMetadata
+---
+* The `@security-severity` metadata of `rust/log-injection` has been increased from 2.6 (low) to 6.1 (medium).
+* The `@security-severity` metadata of `rust/xss` has been increased from 6.1 (medium) to 7.8 (high).
diff --git a/rust/ql/src/change-notes/2026-02-18-database-quality.md b/rust/ql/src/change-notes/released/0.1.28.md
similarity index 83%
rename from rust/ql/src/change-notes/2026-02-18-database-quality.md
rename to rust/ql/src/change-notes/released/0.1.28.md
index ef2f1b3139c..0ee7b4828f1 100644
--- a/rust/ql/src/change-notes/2026-02-18-database-quality.md
+++ b/rust/ql/src/change-notes/released/0.1.28.md
@@ -1,4 +1,5 @@
----
-category: minorAnalysis
----
+## 0.1.28
+
+### Minor Analysis Improvements
+
 * The macro resolution metric has been removed from `rust/diagnostic/database-quality`. This metric was found to be an unreliable indicator of database quality in many cases, leading to false alarms on the tool status page.
diff --git a/rust/ql/src/change-notes/released/0.1.29.md b/rust/ql/src/change-notes/released/0.1.29.md
new file mode 100644
index 00000000000..040d04d51d3
--- /dev/null
+++ b/rust/ql/src/change-notes/released/0.1.29.md
@@ -0,0 +1,3 @@
+## 0.1.29
+
+No user-facing changes.
diff --git a/rust/ql/src/codeql-pack.release.yml b/rust/ql/src/codeql-pack.release.yml
index 35535ba43d5..7517c5cff32 100644
--- a/rust/ql/src/codeql-pack.release.yml
+++ b/rust/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.1.27
+lastReleaseVersion: 0.1.29
diff --git a/rust/ql/src/qlpack.yml b/rust/ql/src/qlpack.yml
index 21011bd93d5..c36bcc3f951 100644
--- a/rust/ql/src/qlpack.yml
+++ b/rust/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rust-queries
-version: 0.1.28-dev
+version: 0.1.30-dev
 groups:
   - rust
   - queries
diff --git a/rust/ql/src/queries/security/CWE-079/XSS.ql b/rust/ql/src/queries/security/CWE-079/XSS.ql
index 3c43f5043c7..e7609196b3e 100644
--- a/rust/ql/src/queries/security/CWE-079/XSS.ql
+++ b/rust/ql/src/queries/security/CWE-079/XSS.ql
@@ -4,7 +4,7 @@
  *              allows for a cross-site scripting vulnerability.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 6.1
+ * @security-severity 7.8
  * @precision high
  * @id rust/xss
  * @tags security
diff --git a/rust/ql/src/queries/security/CWE-117/LogInjection.ql b/rust/ql/src/queries/security/CWE-117/LogInjection.ql
index 64d9c47c790..c00ac310ef6 100644
--- a/rust/ql/src/queries/security/CWE-117/LogInjection.ql
+++ b/rust/ql/src/queries/security/CWE-117/LogInjection.ql
@@ -4,7 +4,7 @@
  *              insertion of forged log entries by a malicious user.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 2.6
+ * @security-severity 6.1
  * @precision medium
  * @id rust/log-injection
  * @tags security
diff --git a/rust/ql/src/queries/security/CWE-295/DisabledCertificateCheck.ql b/rust/ql/src/queries/security/CWE-295/DisabledCertificateCheck.ql
index ae22a3c9d2c..3e978e2934b 100644
--- a/rust/ql/src/queries/security/CWE-295/DisabledCertificateCheck.ql
+++ b/rust/ql/src/queries/security/CWE-295/DisabledCertificateCheck.ql
@@ -33,6 +33,8 @@ module DisabledCertificateCheckConfig implements DataFlow::ConfigSig {
 
   predicate isSink(DataFlow::Node node) { node instanceof Sink }
 
+  predicate isBarrier(DataFlow::Node node) { node instanceof Barrier }
+
   predicate observeDiffInformedIncrementalMode() { any() }
 }
 
diff --git a/rust/ql/src/queries/security/CWE-825/AccessAfterLifetime.ql b/rust/ql/src/queries/security/CWE-825/AccessAfterLifetime.ql
index 2f299167893..b27251c397c 100644
--- a/rust/ql/src/queries/security/CWE-825/AccessAfterLifetime.ql
+++ b/rust/ql/src/queries/security/CWE-825/AccessAfterLifetime.ql
@@ -50,6 +50,10 @@ module AccessAfterLifetimeConfig implements DataFlow::ConfigSig {
       result = [target.getLocation(), source.getLocation()]
     )
   }
+
+  DataFlow::FlowFeature getAFeature() {
+    result instanceof DataFlow::FeatureEscapesSourceCallContextOrEqualSourceSinkCallContext
+  }
 }
 
 module AccessAfterLifetimeFlow = TaintTracking::Global<AccessAfterLifetimeConfig>;
@@ -64,53 +68,22 @@ predicate sinkBlock(Sink s, BlockExpr be) {
   be = s.asExpr().getEnclosingBlock()
 }
 
-private predicate tcStep(BlockExpr a, BlockExpr b) {
-  // propagate through function calls
-  exists(Call call |
-    a = call.getEnclosingBlock() and
-    call.getARuntimeTarget() = b.getEnclosingCallable()
-  )
-}
-
-private predicate isTcSource(BlockExpr be) { sourceBlock(_, _, be) }
-
-private predicate isTcSink(BlockExpr be) { sinkBlock(_, be) }
-
-/**
- * Holds if block `a` contains block `b`, in the sense that a stack allocated variable in
- * `a` may still be on the stack during execution of `b`. This is interprocedural,
- * but is an overapproximation that doesn't accurately track call contexts
- * (for example if `f` and `g` both call `b`, then depending on the
- * caller a variable in `f` or `g` may or may-not be on the stack during `b`).
- */
-private predicate mayEncloseOnStack(BlockExpr a, BlockExpr b) =
-  doublyBoundedFastTC(tcStep/2, isTcSource/1, isTcSink/1)(a, b)
-
-/**
- * Holds if the pair `(source, sink)`, that represents a flow from a
- * pointer or reference to a dereference, has its dereference outside the
- * lifetime of the target variable `target`.
- */
-predicate dereferenceAfterLifetime(Source source, Sink sink, Variable target) {
-  AccessAfterLifetimeFlow::flow(source, sink) and
-  sourceValueScope(source, target, _) and
-  not exists(BlockExpr beSource, BlockExpr beSink |
-    sourceBlock(source, target, beSource) and
-    sinkBlock(sink, beSink)
-  |
-    beSource = beSink
-    or
-    mayEncloseOnStack(beSource, beSink)
-  )
-}
-
 from
   AccessAfterLifetimeFlow::PathNode sourceNode, AccessAfterLifetimeFlow::PathNode sinkNode,
-  Variable target
+  Source source, Sink sink, Variable target
 where
   // flow from a pointer or reference to the dereference
   AccessAfterLifetimeFlow::flowPath(sourceNode, sinkNode) and
-  // check that the dereference is outside the lifetime of the target
-  dereferenceAfterLifetime(sourceNode.getNode(), sinkNode.getNode(), target)
+  source = sourceNode.getNode() and
+  sink = sinkNode.getNode() and
+  sourceValueScope(source, target, _) and
+  // check that the dereference is outside the lifetime of the target, when the source
+  // and the sink are in the same callable
+  // (`FeatureEscapesSourceCallContextOrEqualSourceSinkCallContext` handles the case when
+  // they are not)
+  not exists(BlockExpr be |
+    sourceBlock(source, target, be) and
+    sinkBlock(sink, be)
+  )
 select sinkNode.getNode(), sourceNode, sinkNode,
   "Access of a pointer to $@ after its lifetime has ended.", target, target.toString()
diff --git a/rust/ql/src/utils/modelgenerator/internal/CaptureModels.qll b/rust/ql/src/utils/modelgenerator/internal/CaptureModels.qll
index fb71423503d..8ec2f3354db 100644
--- a/rust/ql/src/utils/modelgenerator/internal/CaptureModels.qll
+++ b/rust/ql/src/utils/modelgenerator/internal/CaptureModels.qll
@@ -138,7 +138,10 @@ private module SummaryModelGeneratorInput implements SummaryModelGeneratorInputS
 
   Parameter asParameter(NodeExtended node) { result = node.asParameter() }
 
-  predicate isAdditionalContentFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) { none() }
+  predicate isAdditionalContentFlowStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
+    RustTaintTracking::defaultAdditionalTaintStep(nodeFrom, nodeTo, _) and
+    not RustDataFlow::readStep(nodeFrom, _, nodeTo)
+  }
 
   predicate isField(DataFlow::ContentSet c) {
     c.(SingletonContentSet).getContent() instanceof FieldContent
diff --git a/rust/ql/test/library-tests/dataflow/barrier/inline-flow.expected b/rust/ql/test/library-tests/dataflow/barrier/inline-flow.expected
index 68da00c4312..0514da67333 100644
--- a/rust/ql/test/library-tests/dataflow/barrier/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/barrier/inline-flow.expected
@@ -1,41 +1,20 @@
 models
 edges
-| main.rs:9:13:9:19 | ...: ... | main.rs:10:11:10:11 | s | provenance |  |
-| main.rs:10:11:10:11 | s | main.rs:12:9:12:9 | s | provenance |  |
-| main.rs:12:9:12:9 | s | main.rs:9:30:14:1 | { ... } | provenance |  |
 | main.rs:21:9:21:9 | s | main.rs:22:10:22:10 | s | provenance |  |
 | main.rs:21:13:21:21 | source(...) | main.rs:21:9:21:9 | s | provenance |  |
-| main.rs:26:9:26:9 | s | main.rs:27:22:27:22 | s | provenance |  |
-| main.rs:26:13:26:21 | source(...) | main.rs:26:9:26:9 | s | provenance |  |
-| main.rs:27:9:27:9 | s | main.rs:28:10:28:10 | s | provenance |  |
-| main.rs:27:13:27:23 | sanitize(...) | main.rs:27:9:27:9 | s | provenance |  |
-| main.rs:27:22:27:22 | s | main.rs:9:13:9:19 | ...: ... | provenance |  |
-| main.rs:27:22:27:22 | s | main.rs:27:13:27:23 | sanitize(...) | provenance |  |
 | main.rs:32:9:32:9 | s | main.rs:33:10:33:10 | s | provenance |  |
 | main.rs:32:13:32:21 | source(...) | main.rs:32:9:32:9 | s | provenance |  |
 nodes
-| main.rs:9:13:9:19 | ...: ... | semmle.label | ...: ... |
-| main.rs:9:30:14:1 | { ... } | semmle.label | { ... } |
-| main.rs:10:11:10:11 | s | semmle.label | s |
-| main.rs:12:9:12:9 | s | semmle.label | s |
 | main.rs:17:10:17:18 | source(...) | semmle.label | source(...) |
 | main.rs:21:9:21:9 | s | semmle.label | s |
 | main.rs:21:13:21:21 | source(...) | semmle.label | source(...) |
 | main.rs:22:10:22:10 | s | semmle.label | s |
-| main.rs:26:9:26:9 | s | semmle.label | s |
-| main.rs:26:13:26:21 | source(...) | semmle.label | source(...) |
-| main.rs:27:9:27:9 | s | semmle.label | s |
-| main.rs:27:13:27:23 | sanitize(...) | semmle.label | sanitize(...) |
-| main.rs:27:22:27:22 | s | semmle.label | s |
-| main.rs:28:10:28:10 | s | semmle.label | s |
 | main.rs:32:9:32:9 | s | semmle.label | s |
 | main.rs:32:13:32:21 | source(...) | semmle.label | source(...) |
 | main.rs:33:10:33:10 | s | semmle.label | s |
 subpaths
-| main.rs:27:22:27:22 | s | main.rs:9:13:9:19 | ...: ... | main.rs:9:30:14:1 | { ... } | main.rs:27:13:27:23 | sanitize(...) |
 testFailures
 #select
 | main.rs:17:10:17:18 | source(...) | main.rs:17:10:17:18 | source(...) | main.rs:17:10:17:18 | source(...) | $@ | main.rs:17:10:17:18 | source(...) | source(...) |
 | main.rs:22:10:22:10 | s | main.rs:21:13:21:21 | source(...) | main.rs:22:10:22:10 | s | $@ | main.rs:21:13:21:21 | source(...) | source(...) |
-| main.rs:28:10:28:10 | s | main.rs:26:13:26:21 | source(...) | main.rs:28:10:28:10 | s | $@ | main.rs:26:13:26:21 | source(...) | source(...) |
 | main.rs:33:10:33:10 | s | main.rs:32:13:32:21 | source(...) | main.rs:33:10:33:10 | s | $@ | main.rs:32:13:32:21 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ext.yml b/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ext.yml
new file mode 100644
index 00000000000..58e55a040d2
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ext.yml
@@ -0,0 +1,11 @@
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: barrierModel
+    data:
+      - ["main::sanitize", "ReturnValue", "test-barrier", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: barrierGuardModel
+    data:
+      - ["main::verify_safe", "Argument[0]", "true", "test-barrier", "manual"]
diff --git a/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ql b/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ql
index 5dcb7ee70a9..7cc30bf6350 100644
--- a/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ql
+++ b/rust/ql/test/library-tests/dataflow/barrier/inline-flow.ql
@@ -3,8 +3,19 @@
  */
 
 import rust
+import codeql.rust.dataflow.DataFlow
+import codeql.rust.dataflow.FlowBarrier
 import utils.test.InlineFlowTest
-import DefaultFlowTest
+
+module CustomConfig implements DataFlow::ConfigSig {
+  predicate isSource = DefaultFlowConfig::isSource/1;
+
+  predicate isSink = DefaultFlowConfig::isSink/1;
+
+  predicate isBarrier(DataFlow::Node n) { barrierNode(n, "test-barrier") }
+}
+
+import FlowTest<CustomConfig, CustomConfig>
 import TaintFlow::PathGraph
 
 from TaintFlow::PathNode source, TaintFlow::PathNode sink
diff --git a/rust/ql/test/library-tests/dataflow/barrier/main.rs b/rust/ql/test/library-tests/dataflow/barrier/main.rs
index 14935f0f328..268a8673bc9 100644
--- a/rust/ql/test/library-tests/dataflow/barrier/main.rs
+++ b/rust/ql/test/library-tests/dataflow/barrier/main.rs
@@ -25,10 +25,24 @@ fn through_variable() {
 fn with_barrier() {
     let s = source(1);
     let s = sanitize(s);
-    sink(s); // $ SPURIOUS: hasValueFlow=1
+    sink(s);
 }
 
 fn main() {
     let s = source(1);
     sink(s); // $ hasValueFlow=1
 }
+
+fn verify_safe(s: &str) -> bool {
+    match s {
+        "dangerous" => false,
+        _ => true,
+    }
+}
+
+fn with_barrier_guard() {
+    let s = source(1);
+    if verify_safe(s) {
+        sink(s);
+    }
+}
diff --git a/rust/ql/test/library-tests/dataflow/models/external_file.rs b/rust/ql/test/library-tests/dataflow/models/external_file.rs
new file mode 100644
index 00000000000..0e351a475d3
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/models/external_file.rs
@@ -0,0 +1,30 @@
+
+pub fn generated_source(i: i64) -> i64 {
+    0
+}
+
+pub fn neutral_generated_source(i: i64) -> i64 {
+    0
+}
+
+pub fn neutral_manual_source(i: i64) -> i64 {
+    0
+}
+
+pub fn generated_sink(i: i64) {}
+
+pub fn neutral_generated_sink(i: i64) {}
+
+pub fn neutral_manual_sink(i: i64) {}
+
+pub fn generated_summary(i: i64) -> i64 {
+    0
+}
+
+pub fn neutral_generated_summary(i: i64) -> i64 {
+    0
+}
+
+pub fn neutral_manual_summary(i: i64) -> i64 {
+    0
+}
diff --git a/rust/ql/test/library-tests/dataflow/models/main.rs b/rust/ql/test/library-tests/dataflow/models/main.rs
index f4bb9e99678..61e5928636d 100644
--- a/rust/ql/test/library-tests/dataflow/models/main.rs
+++ b/rust/ql/test/library-tests/dataflow/models/main.rs
@@ -410,6 +410,26 @@ fn test_trait_model<T: Ord>(x: T) {
     sink(x7);
 }
 
+mod external_file;
+use external_file::*;
+
+fn test_neutrals() {
+    // neutral models should cause corresponding generated models to be ignored.
+    // Thus the `neutral_generated_source`, `neutral_generated_sink` and
+    // `neutral_generated_summary`, which have both a generated and a neutral
+    // model, should not have flow.
+
+    sink(generated_source(1)); // $ hasValueFlow=1
+    sink(neutral_generated_source(2));
+    sink(neutral_manual_source(3)); // $ hasValueFlow=3
+    generated_sink(source(4)); // $ hasValueFlow=4
+    neutral_generated_sink(source(5));
+    neutral_manual_sink(source(6)); // $ hasValueFlow=6
+    sink(generated_summary(source(7))); // $ hasValueFlow=7
+    sink(neutral_generated_summary(source(8)));
+    sink(neutral_manual_summary(source(9))); // $ hasValueFlow=9
+}
+
 #[tokio::main]
 async fn main() {
     test_identify();
@@ -431,5 +451,6 @@ async fn main() {
     test_simple_sink();
     test_get_async_number().await;
     test_arg_source();
+    test_neutrals();
     let dummy = Some(0); // ensure that the the `lang:core` crate is extracted
 }
diff --git a/rust/ql/test/library-tests/dataflow/models/models.expected b/rust/ql/test/library-tests/dataflow/models/models.expected
index f9848542dd7..e5ea563eaef 100644
--- a/rust/ql/test/library-tests/dataflow/models/models.expected
+++ b/rust/ql/test/library-tests/dataflow/models/models.expected
@@ -1,30 +1,36 @@
 models
 | 1 | Sink: <main::MyFieldEnum>::sink; Argument[self].Field[main::MyFieldEnum::D::field_d]; test-sink |
 | 2 | Sink: main::enum_sink; Argument[0].Field[main::MyFieldEnum::C::field_c]; test-sink |
-| 3 | Sink: main::simple_sink; Argument[0]; test-sink |
-| 4 | Source: <main::MyFieldEnum>::source; ReturnValue.Field[main::MyFieldEnum::C::field_c]; test-source |
-| 5 | Source: main::arg_source; Argument[0]; test-source |
-| 6 | Source: main::enum_source; ReturnValue.Field[main::MyFieldEnum::D::field_d]; test-source |
-| 7 | Source: main::simple_source; ReturnValue; test-source |
-| 8 | Source: main::source_into_function::pass_source; Argument[1].Parameter[0]; test-source |
-| 9 | Summary: <_ as core::cmp::Ord>::max; Argument[self,0]; ReturnValue; value |
-| 10 | Summary: <_ as core::cmp::PartialOrd>::lt; Argument[self].Reference; ReturnValue; taint |
-| 11 | Summary: <_ as core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
-| 12 | Summary: main::apply; Argument[0]; Argument[1].Parameter[0]; value |
-| 13 | Summary: main::apply; Argument[1].ReturnValue; ReturnValue; value |
-| 14 | Summary: main::coerce; Argument[0]; ReturnValue; taint |
-| 15 | Summary: main::get_array_element; Argument[0].Element; ReturnValue; value |
-| 16 | Summary: main::get_async_number; Argument[0]; ReturnValue.Future; value |
-| 17 | Summary: main::get_struct_field; Argument[0].Field[main::MyStruct::field1]; ReturnValue; value |
-| 18 | Summary: main::get_tuple_element; Argument[0].Field[0]; ReturnValue; value |
-| 19 | Summary: main::get_var_field; Argument[0].Field[main::MyFieldEnum::C::field_c]; ReturnValue; value |
-| 20 | Summary: main::get_var_pos; Argument[0].Field[main::MyPosEnum::A(0)]; ReturnValue; value |
-| 21 | Summary: main::set_array_element; Argument[0]; ReturnValue.Element; value |
-| 22 | Summary: main::set_struct_field; Argument[0]; ReturnValue.Field[main::MyStruct::field2]; value |
-| 23 | Summary: main::set_tuple_element; Argument[0]; ReturnValue.Field[1]; value |
-| 24 | Summary: main::set_var_field; Argument[0]; ReturnValue.Field[main::MyFieldEnum::D::field_d]; value |
-| 25 | Summary: main::set_var_pos; Argument[0]; ReturnValue.Field[main::MyPosEnum::B(0)]; value |
-| 26 | Summary: main::snd; Argument[1]; ReturnValue; value |
+| 3 | Sink: main::external_file::generated_sink; Argument[0]; test-sink |
+| 4 | Sink: main::external_file::neutral_manual_sink; Argument[0]; test-sink |
+| 5 | Sink: main::simple_sink; Argument[0]; test-sink |
+| 6 | Source: <main::MyFieldEnum>::source; ReturnValue.Field[main::MyFieldEnum::C::field_c]; test-source |
+| 7 | Source: main::arg_source; Argument[0]; test-source |
+| 8 | Source: main::enum_source; ReturnValue.Field[main::MyFieldEnum::D::field_d]; test-source |
+| 9 | Source: main::external_file::generated_source; ReturnValue; test-source |
+| 10 | Source: main::external_file::neutral_manual_source; ReturnValue; test-source |
+| 11 | Source: main::simple_source; ReturnValue; test-source |
+| 12 | Source: main::source_into_function::pass_source; Argument[1].Parameter[0]; test-source |
+| 13 | Summary: <_ as core::cmp::Ord>::max; Argument[self,0]; ReturnValue; value |
+| 14 | Summary: <_ as core::cmp::PartialOrd>::lt; Argument[self].Reference; ReturnValue; taint |
+| 15 | Summary: <_ as core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
+| 16 | Summary: main::apply; Argument[0]; Argument[1].Parameter[0]; value |
+| 17 | Summary: main::apply; Argument[1].ReturnValue; ReturnValue; value |
+| 18 | Summary: main::coerce; Argument[0]; ReturnValue; taint |
+| 19 | Summary: main::external_file::generated_summary; Argument[0]; ReturnValue; value |
+| 20 | Summary: main::external_file::neutral_manual_summary; Argument[0]; ReturnValue; value |
+| 21 | Summary: main::get_array_element; Argument[0].Element; ReturnValue; value |
+| 22 | Summary: main::get_async_number; Argument[0]; ReturnValue.Future; value |
+| 23 | Summary: main::get_struct_field; Argument[0].Field[main::MyStruct::field1]; ReturnValue; value |
+| 24 | Summary: main::get_tuple_element; Argument[0].Field[0]; ReturnValue; value |
+| 25 | Summary: main::get_var_field; Argument[0].Field[main::MyFieldEnum::C::field_c]; ReturnValue; value |
+| 26 | Summary: main::get_var_pos; Argument[0].Field[main::MyPosEnum::A(0)]; ReturnValue; value |
+| 27 | Summary: main::set_array_element; Argument[0]; ReturnValue.Element; value |
+| 28 | Summary: main::set_struct_field; Argument[0]; ReturnValue.Field[main::MyStruct::field2]; value |
+| 29 | Summary: main::set_tuple_element; Argument[0]; ReturnValue.Field[1]; value |
+| 30 | Summary: main::set_var_field; Argument[0]; ReturnValue.Field[main::MyFieldEnum::D::field_d]; value |
+| 31 | Summary: main::set_var_pos; Argument[0]; ReturnValue.Field[main::MyPosEnum::B(0)]; value |
+| 32 | Summary: main::snd; Argument[1]; ReturnValue; value |
 edges
 | main.rs:15:9:15:9 | s | main.rs:16:19:16:19 | s | provenance |  |
 | main.rs:15:9:15:9 | s | main.rs:16:19:16:19 | s | provenance |  |
@@ -34,13 +40,13 @@ edges
 | main.rs:16:19:16:19 | s | main.rs:16:10:16:20 | identity(...) | provenance | QL |
 | main.rs:25:9:25:9 | s | main.rs:26:17:26:17 | s | provenance |  |
 | main.rs:25:13:25:22 | source(...) | main.rs:25:9:25:9 | s | provenance |  |
-| main.rs:26:17:26:17 | s | main.rs:26:10:26:18 | coerce(...) | provenance | MaD:14 |
+| main.rs:26:17:26:17 | s | main.rs:26:10:26:18 | coerce(...) | provenance | MaD:18 |
 | main.rs:41:9:41:10 | s1 | main.rs:42:17:42:18 | s1 | provenance |  |
 | main.rs:41:9:41:10 | s1 | main.rs:42:17:42:18 | s1 | provenance |  |
 | main.rs:41:14:41:23 | source(...) | main.rs:41:9:41:10 | s1 | provenance |  |
 | main.rs:41:14:41:23 | source(...) | main.rs:41:9:41:10 | s1 | provenance |  |
-| main.rs:42:17:42:18 | s1 | main.rs:42:10:42:19 | snd(...) | provenance | MaD:26 |
-| main.rs:42:17:42:18 | s1 | main.rs:42:10:42:19 | snd(...) | provenance | MaD:26 |
+| main.rs:42:17:42:18 | s1 | main.rs:42:10:42:19 | snd(...) | provenance | MaD:32 |
+| main.rs:42:17:42:18 | s1 | main.rs:42:10:42:19 | snd(...) | provenance | MaD:32 |
 | main.rs:54:9:54:9 | s | main.rs:55:27:55:27 | s | provenance |  |
 | main.rs:54:9:54:9 | s | main.rs:55:27:55:27 | s | provenance |  |
 | main.rs:54:13:54:21 | source(...) | main.rs:54:9:54:9 | s | provenance |  |
@@ -51,8 +57,8 @@ edges
 | main.rs:55:14:55:28 | ...::A(...) [A] | main.rs:55:9:55:10 | e1 [A] | provenance |  |
 | main.rs:55:27:55:27 | s | main.rs:55:14:55:28 | ...::A(...) [A] | provenance |  |
 | main.rs:55:27:55:27 | s | main.rs:55:14:55:28 | ...::A(...) [A] | provenance |  |
-| main.rs:56:22:56:23 | e1 [A] | main.rs:56:10:56:24 | get_var_pos(...) | provenance | MaD:20 |
-| main.rs:56:22:56:23 | e1 [A] | main.rs:56:10:56:24 | get_var_pos(...) | provenance | MaD:20 |
+| main.rs:56:22:56:23 | e1 [A] | main.rs:56:10:56:24 | get_var_pos(...) | provenance | MaD:26 |
+| main.rs:56:22:56:23 | e1 [A] | main.rs:56:10:56:24 | get_var_pos(...) | provenance | MaD:26 |
 | main.rs:67:9:67:9 | s | main.rs:68:26:68:26 | s | provenance |  |
 | main.rs:67:9:67:9 | s | main.rs:68:26:68:26 | s | provenance |  |
 | main.rs:67:13:67:21 | source(...) | main.rs:67:9:67:9 | s | provenance |  |
@@ -61,8 +67,8 @@ edges
 | main.rs:68:9:68:10 | e1 [B] | main.rs:69:11:69:12 | e1 [B] | provenance |  |
 | main.rs:68:14:68:27 | set_var_pos(...) [B] | main.rs:68:9:68:10 | e1 [B] | provenance |  |
 | main.rs:68:14:68:27 | set_var_pos(...) [B] | main.rs:68:9:68:10 | e1 [B] | provenance |  |
-| main.rs:68:26:68:26 | s | main.rs:68:14:68:27 | set_var_pos(...) [B] | provenance | MaD:25 |
-| main.rs:68:26:68:26 | s | main.rs:68:14:68:27 | set_var_pos(...) [B] | provenance | MaD:25 |
+| main.rs:68:26:68:26 | s | main.rs:68:14:68:27 | set_var_pos(...) [B] | provenance | MaD:31 |
+| main.rs:68:26:68:26 | s | main.rs:68:14:68:27 | set_var_pos(...) [B] | provenance | MaD:31 |
 | main.rs:69:11:69:12 | e1 [B] | main.rs:71:9:71:23 | ...::B(...) [B] | provenance |  |
 | main.rs:69:11:69:12 | e1 [B] | main.rs:71:9:71:23 | ...::B(...) [B] | provenance |  |
 | main.rs:71:9:71:23 | ...::B(...) [B] | main.rs:71:22:71:22 | i | provenance |  |
@@ -79,8 +85,8 @@ edges
 | main.rs:87:14:87:42 | ...::C {...} [C] | main.rs:87:9:87:10 | e1 [C] | provenance |  |
 | main.rs:87:40:87:40 | s | main.rs:87:14:87:42 | ...::C {...} [C] | provenance |  |
 | main.rs:87:40:87:40 | s | main.rs:87:14:87:42 | ...::C {...} [C] | provenance |  |
-| main.rs:88:24:88:25 | e1 [C] | main.rs:88:10:88:26 | get_var_field(...) | provenance | MaD:19 |
-| main.rs:88:24:88:25 | e1 [C] | main.rs:88:10:88:26 | get_var_field(...) | provenance | MaD:19 |
+| main.rs:88:24:88:25 | e1 [C] | main.rs:88:10:88:26 | get_var_field(...) | provenance | MaD:25 |
+| main.rs:88:24:88:25 | e1 [C] | main.rs:88:10:88:26 | get_var_field(...) | provenance | MaD:25 |
 | main.rs:99:9:99:9 | s | main.rs:100:28:100:28 | s | provenance |  |
 | main.rs:99:9:99:9 | s | main.rs:100:28:100:28 | s | provenance |  |
 | main.rs:99:13:99:21 | source(...) | main.rs:99:9:99:9 | s | provenance |  |
@@ -89,8 +95,8 @@ edges
 | main.rs:100:9:100:10 | e1 [D] | main.rs:101:11:101:12 | e1 [D] | provenance |  |
 | main.rs:100:14:100:29 | set_var_field(...) [D] | main.rs:100:9:100:10 | e1 [D] | provenance |  |
 | main.rs:100:14:100:29 | set_var_field(...) [D] | main.rs:100:9:100:10 | e1 [D] | provenance |  |
-| main.rs:100:28:100:28 | s | main.rs:100:14:100:29 | set_var_field(...) [D] | provenance | MaD:24 |
-| main.rs:100:28:100:28 | s | main.rs:100:14:100:29 | set_var_field(...) [D] | provenance | MaD:24 |
+| main.rs:100:28:100:28 | s | main.rs:100:14:100:29 | set_var_field(...) [D] | provenance | MaD:30 |
+| main.rs:100:28:100:28 | s | main.rs:100:14:100:29 | set_var_field(...) [D] | provenance | MaD:30 |
 | main.rs:101:11:101:12 | e1 [D] | main.rs:103:9:103:37 | ...::D {...} [D] | provenance |  |
 | main.rs:101:11:101:12 | e1 [D] | main.rs:103:9:103:37 | ...::D {...} [D] | provenance |  |
 | main.rs:103:9:103:37 | ...::D {...} [D] | main.rs:103:35:103:35 | i | provenance |  |
@@ -107,8 +113,8 @@ edges
 | main.rs:119:21:122:5 | MyStruct {...} [MyStruct.field1] | main.rs:119:9:119:17 | my_struct [MyStruct.field1] | provenance |  |
 | main.rs:120:17:120:17 | s | main.rs:119:21:122:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
 | main.rs:120:17:120:17 | s | main.rs:119:21:122:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
-| main.rs:123:27:123:35 | my_struct [MyStruct.field1] | main.rs:123:10:123:36 | get_struct_field(...) | provenance | MaD:17 |
-| main.rs:123:27:123:35 | my_struct [MyStruct.field1] | main.rs:123:10:123:36 | get_struct_field(...) | provenance | MaD:17 |
+| main.rs:123:27:123:35 | my_struct [MyStruct.field1] | main.rs:123:10:123:36 | get_struct_field(...) | provenance | MaD:23 |
+| main.rs:123:27:123:35 | my_struct [MyStruct.field1] | main.rs:123:10:123:36 | get_struct_field(...) | provenance | MaD:23 |
 | main.rs:140:9:140:9 | s | main.rs:141:38:141:38 | s | provenance |  |
 | main.rs:140:9:140:9 | s | main.rs:141:38:141:38 | s | provenance |  |
 | main.rs:140:13:140:21 | source(...) | main.rs:140:9:140:9 | s | provenance |  |
@@ -117,16 +123,16 @@ edges
 | main.rs:141:9:141:17 | my_struct [MyStruct.field2] | main.rs:143:10:143:18 | my_struct [MyStruct.field2] | provenance |  |
 | main.rs:141:21:141:39 | set_struct_field(...) [MyStruct.field2] | main.rs:141:9:141:17 | my_struct [MyStruct.field2] | provenance |  |
 | main.rs:141:21:141:39 | set_struct_field(...) [MyStruct.field2] | main.rs:141:9:141:17 | my_struct [MyStruct.field2] | provenance |  |
-| main.rs:141:38:141:38 | s | main.rs:141:21:141:39 | set_struct_field(...) [MyStruct.field2] | provenance | MaD:22 |
-| main.rs:141:38:141:38 | s | main.rs:141:21:141:39 | set_struct_field(...) [MyStruct.field2] | provenance | MaD:22 |
+| main.rs:141:38:141:38 | s | main.rs:141:21:141:39 | set_struct_field(...) [MyStruct.field2] | provenance | MaD:28 |
+| main.rs:141:38:141:38 | s | main.rs:141:21:141:39 | set_struct_field(...) [MyStruct.field2] | provenance | MaD:28 |
 | main.rs:143:10:143:18 | my_struct [MyStruct.field2] | main.rs:143:10:143:25 | my_struct.field2 | provenance |  |
 | main.rs:143:10:143:18 | my_struct [MyStruct.field2] | main.rs:143:10:143:25 | my_struct.field2 | provenance |  |
 | main.rs:152:9:152:9 | s | main.rs:153:29:153:29 | s | provenance |  |
 | main.rs:152:9:152:9 | s | main.rs:153:29:153:29 | s | provenance |  |
 | main.rs:152:13:152:21 | source(...) | main.rs:152:9:152:9 | s | provenance |  |
 | main.rs:152:13:152:21 | source(...) | main.rs:152:9:152:9 | s | provenance |  |
-| main.rs:153:28:153:30 | [...] [element] | main.rs:153:10:153:31 | get_array_element(...) | provenance | MaD:15 |
-| main.rs:153:28:153:30 | [...] [element] | main.rs:153:10:153:31 | get_array_element(...) | provenance | MaD:15 |
+| main.rs:153:28:153:30 | [...] [element] | main.rs:153:10:153:31 | get_array_element(...) | provenance | MaD:21 |
+| main.rs:153:28:153:30 | [...] [element] | main.rs:153:10:153:31 | get_array_element(...) | provenance | MaD:21 |
 | main.rs:153:29:153:29 | s | main.rs:153:28:153:30 | [...] [element] | provenance |  |
 | main.rs:153:29:153:29 | s | main.rs:153:28:153:30 | [...] [element] | provenance |  |
 | main.rs:162:9:162:9 | s | main.rs:163:33:163:33 | s | provenance |  |
@@ -137,10 +143,10 @@ edges
 | main.rs:163:9:163:11 | arr [element] | main.rs:164:10:164:12 | arr [element] | provenance |  |
 | main.rs:163:15:163:34 | set_array_element(...) [element] | main.rs:163:9:163:11 | arr [element] | provenance |  |
 | main.rs:163:15:163:34 | set_array_element(...) [element] | main.rs:163:9:163:11 | arr [element] | provenance |  |
-| main.rs:163:33:163:33 | s | main.rs:163:15:163:34 | set_array_element(...) [element] | provenance | MaD:21 |
-| main.rs:163:33:163:33 | s | main.rs:163:15:163:34 | set_array_element(...) [element] | provenance | MaD:21 |
-| main.rs:164:10:164:12 | arr [element] | main.rs:164:10:164:15 | arr[0] | provenance | MaD:11 |
-| main.rs:164:10:164:12 | arr [element] | main.rs:164:10:164:15 | arr[0] | provenance | MaD:11 |
+| main.rs:163:33:163:33 | s | main.rs:163:15:163:34 | set_array_element(...) [element] | provenance | MaD:27 |
+| main.rs:163:33:163:33 | s | main.rs:163:15:163:34 | set_array_element(...) [element] | provenance | MaD:27 |
+| main.rs:164:10:164:12 | arr [element] | main.rs:164:10:164:15 | arr[0] | provenance | MaD:15 |
+| main.rs:164:10:164:12 | arr [element] | main.rs:164:10:164:15 | arr[0] | provenance | MaD:15 |
 | main.rs:173:9:173:9 | s | main.rs:174:14:174:14 | s | provenance |  |
 | main.rs:173:9:173:9 | s | main.rs:174:14:174:14 | s | provenance |  |
 | main.rs:173:13:173:22 | source(...) | main.rs:173:9:173:9 | s | provenance |  |
@@ -151,8 +157,8 @@ edges
 | main.rs:174:13:174:18 | TupleExpr [tuple.0] | main.rs:174:9:174:9 | t [tuple.0] | provenance |  |
 | main.rs:174:14:174:14 | s | main.rs:174:13:174:18 | TupleExpr [tuple.0] | provenance |  |
 | main.rs:174:14:174:14 | s | main.rs:174:13:174:18 | TupleExpr [tuple.0] | provenance |  |
-| main.rs:175:28:175:28 | t [tuple.0] | main.rs:175:10:175:29 | get_tuple_element(...) | provenance | MaD:18 |
-| main.rs:175:28:175:28 | t [tuple.0] | main.rs:175:10:175:29 | get_tuple_element(...) | provenance | MaD:18 |
+| main.rs:175:28:175:28 | t [tuple.0] | main.rs:175:10:175:29 | get_tuple_element(...) | provenance | MaD:24 |
+| main.rs:175:28:175:28 | t [tuple.0] | main.rs:175:10:175:29 | get_tuple_element(...) | provenance | MaD:24 |
 | main.rs:186:9:186:9 | s | main.rs:187:31:187:31 | s | provenance |  |
 | main.rs:186:9:186:9 | s | main.rs:187:31:187:31 | s | provenance |  |
 | main.rs:186:13:186:22 | source(...) | main.rs:186:9:186:9 | s | provenance |  |
@@ -161,8 +167,8 @@ edges
 | main.rs:187:9:187:9 | t [tuple.1] | main.rs:189:10:189:10 | t [tuple.1] | provenance |  |
 | main.rs:187:13:187:32 | set_tuple_element(...) [tuple.1] | main.rs:187:9:187:9 | t [tuple.1] | provenance |  |
 | main.rs:187:13:187:32 | set_tuple_element(...) [tuple.1] | main.rs:187:9:187:9 | t [tuple.1] | provenance |  |
-| main.rs:187:31:187:31 | s | main.rs:187:13:187:32 | set_tuple_element(...) [tuple.1] | provenance | MaD:23 |
-| main.rs:187:31:187:31 | s | main.rs:187:13:187:32 | set_tuple_element(...) [tuple.1] | provenance | MaD:23 |
+| main.rs:187:31:187:31 | s | main.rs:187:13:187:32 | set_tuple_element(...) [tuple.1] | provenance | MaD:29 |
+| main.rs:187:31:187:31 | s | main.rs:187:13:187:32 | set_tuple_element(...) [tuple.1] | provenance | MaD:29 |
 | main.rs:189:10:189:10 | t [tuple.1] | main.rs:189:10:189:12 | t.1 | provenance |  |
 | main.rs:189:10:189:10 | t [tuple.1] | main.rs:189:10:189:12 | t.1 | provenance |  |
 | main.rs:201:9:201:9 | s | main.rs:206:11:206:11 | s | provenance |  |
@@ -171,8 +177,8 @@ edges
 | main.rs:201:13:201:22 | source(...) | main.rs:201:9:201:9 | s | provenance |  |
 | main.rs:202:14:202:14 | ... | main.rs:203:14:203:14 | n | provenance |  |
 | main.rs:202:14:202:14 | ... | main.rs:203:14:203:14 | n | provenance |  |
-| main.rs:206:11:206:11 | s | main.rs:202:14:202:14 | ... | provenance | MaD:12 |
-| main.rs:206:11:206:11 | s | main.rs:202:14:202:14 | ... | provenance | MaD:12 |
+| main.rs:206:11:206:11 | s | main.rs:202:14:202:14 | ... | provenance | MaD:16 |
+| main.rs:206:11:206:11 | s | main.rs:202:14:202:14 | ... | provenance | MaD:16 |
 | main.rs:210:13:210:22 | source(...) | main.rs:212:23:212:23 | f [captured s] | provenance |  |
 | main.rs:210:13:210:22 | source(...) | main.rs:212:23:212:23 | f [captured s] | provenance |  |
 | main.rs:211:40:211:40 | s | main.rs:211:17:211:42 | if ... {...} else {...} | provenance |  |
@@ -181,14 +187,14 @@ edges
 | main.rs:212:9:212:9 | t | main.rs:213:10:213:10 | t | provenance |  |
 | main.rs:212:13:212:24 | apply(...) | main.rs:212:9:212:9 | t | provenance |  |
 | main.rs:212:13:212:24 | apply(...) | main.rs:212:9:212:9 | t | provenance |  |
-| main.rs:212:23:212:23 | f [captured s] | main.rs:211:40:211:40 | s | provenance | MaD:12 |
-| main.rs:212:23:212:23 | f [captured s] | main.rs:211:40:211:40 | s | provenance | MaD:12 |
-| main.rs:212:23:212:23 | f [captured s] | main.rs:211:40:211:40 | s | provenance | MaD:13 |
-| main.rs:212:23:212:23 | f [captured s] | main.rs:211:40:211:40 | s | provenance | MaD:13 |
-| main.rs:212:23:212:23 | f [captured s] | main.rs:212:13:212:24 | apply(...) | provenance | MaD:12 |
-| main.rs:212:23:212:23 | f [captured s] | main.rs:212:13:212:24 | apply(...) | provenance | MaD:12 |
-| main.rs:212:23:212:23 | f [captured s] | main.rs:212:13:212:24 | apply(...) | provenance | MaD:13 |
-| main.rs:212:23:212:23 | f [captured s] | main.rs:212:13:212:24 | apply(...) | provenance | MaD:13 |
+| main.rs:212:23:212:23 | f [captured s] | main.rs:211:40:211:40 | s | provenance | MaD:16 |
+| main.rs:212:23:212:23 | f [captured s] | main.rs:211:40:211:40 | s | provenance | MaD:16 |
+| main.rs:212:23:212:23 | f [captured s] | main.rs:211:40:211:40 | s | provenance | MaD:17 |
+| main.rs:212:23:212:23 | f [captured s] | main.rs:211:40:211:40 | s | provenance | MaD:17 |
+| main.rs:212:23:212:23 | f [captured s] | main.rs:212:13:212:24 | apply(...) | provenance | MaD:16 |
+| main.rs:212:23:212:23 | f [captured s] | main.rs:212:13:212:24 | apply(...) | provenance | MaD:16 |
+| main.rs:212:23:212:23 | f [captured s] | main.rs:212:13:212:24 | apply(...) | provenance | MaD:17 |
+| main.rs:212:23:212:23 | f [captured s] | main.rs:212:13:212:24 | apply(...) | provenance | MaD:17 |
 | main.rs:217:9:217:9 | s | main.rs:219:19:219:19 | s | provenance |  |
 | main.rs:217:9:217:9 | s | main.rs:219:19:219:19 | s | provenance |  |
 | main.rs:217:13:217:22 | source(...) | main.rs:217:9:217:9 | s | provenance |  |
@@ -199,10 +205,10 @@ edges
 | main.rs:219:9:219:9 | t | main.rs:220:10:220:10 | t | provenance |  |
 | main.rs:219:13:219:23 | apply(...) | main.rs:219:9:219:9 | t | provenance |  |
 | main.rs:219:13:219:23 | apply(...) | main.rs:219:9:219:9 | t | provenance |  |
-| main.rs:219:19:219:19 | s | main.rs:218:14:218:14 | ... | provenance | MaD:12 |
-| main.rs:219:19:219:19 | s | main.rs:218:14:218:14 | ... | provenance | MaD:12 |
-| main.rs:219:19:219:19 | s | main.rs:219:13:219:23 | apply(...) | provenance | MaD:12 |
-| main.rs:219:19:219:19 | s | main.rs:219:13:219:23 | apply(...) | provenance | MaD:12 |
+| main.rs:219:19:219:19 | s | main.rs:218:14:218:14 | ... | provenance | MaD:16 |
+| main.rs:219:19:219:19 | s | main.rs:218:14:218:14 | ... | provenance | MaD:16 |
+| main.rs:219:19:219:19 | s | main.rs:219:13:219:23 | apply(...) | provenance | MaD:16 |
+| main.rs:219:19:219:19 | s | main.rs:219:13:219:23 | apply(...) | provenance | MaD:16 |
 | main.rs:229:9:229:9 | s | main.rs:230:30:230:30 | s | provenance |  |
 | main.rs:229:9:229:9 | s | main.rs:230:30:230:30 | s | provenance |  |
 | main.rs:229:13:229:22 | source(...) | main.rs:229:9:229:9 | s | provenance |  |
@@ -213,12 +219,12 @@ edges
 | main.rs:230:13:230:31 | get_async_number(...) [future] | main.rs:230:13:230:37 | await ... | provenance |  |
 | main.rs:230:13:230:37 | await ... | main.rs:230:9:230:9 | t | provenance |  |
 | main.rs:230:13:230:37 | await ... | main.rs:230:9:230:9 | t | provenance |  |
-| main.rs:230:30:230:30 | s | main.rs:230:13:230:31 | get_async_number(...) [future] | provenance | MaD:16 |
-| main.rs:230:30:230:30 | s | main.rs:230:13:230:31 | get_async_number(...) [future] | provenance | MaD:16 |
+| main.rs:230:30:230:30 | s | main.rs:230:13:230:31 | get_async_number(...) [future] | provenance | MaD:22 |
+| main.rs:230:30:230:30 | s | main.rs:230:13:230:31 | get_async_number(...) [future] | provenance | MaD:22 |
 | main.rs:250:9:250:9 | s [D] | main.rs:251:11:251:11 | s [D] | provenance |  |
 | main.rs:250:9:250:9 | s [D] | main.rs:251:11:251:11 | s [D] | provenance |  |
-| main.rs:250:13:250:23 | enum_source | main.rs:250:13:250:27 | enum_source(...) [D] | provenance | Src:MaD:6  |
-| main.rs:250:13:250:23 | enum_source | main.rs:250:13:250:27 | enum_source(...) [D] | provenance | Src:MaD:6  |
+| main.rs:250:13:250:23 | enum_source | main.rs:250:13:250:27 | enum_source(...) [D] | provenance | Src:MaD:8  |
+| main.rs:250:13:250:23 | enum_source | main.rs:250:13:250:27 | enum_source(...) [D] | provenance | Src:MaD:8  |
 | main.rs:250:13:250:27 | enum_source(...) [D] | main.rs:250:9:250:9 | s [D] | provenance |  |
 | main.rs:250:13:250:27 | enum_source(...) [D] | main.rs:250:9:250:9 | s [D] | provenance |  |
 | main.rs:251:11:251:11 | s [D] | main.rs:253:9:253:37 | ...::D {...} [D] | provenance |  |
@@ -231,8 +237,8 @@ edges
 | main.rs:259:9:259:9 | s [C] | main.rs:260:11:260:11 | s [C] | provenance |  |
 | main.rs:259:13:259:24 | e.source(...) [C] | main.rs:259:9:259:9 | s [C] | provenance |  |
 | main.rs:259:13:259:24 | e.source(...) [C] | main.rs:259:9:259:9 | s [C] | provenance |  |
-| main.rs:259:15:259:20 | source | main.rs:259:13:259:24 | e.source(...) [C] | provenance | Src:MaD:4  |
-| main.rs:259:15:259:20 | source | main.rs:259:13:259:24 | e.source(...) [C] | provenance | Src:MaD:4  |
+| main.rs:259:15:259:20 | source | main.rs:259:13:259:24 | e.source(...) [C] | provenance | Src:MaD:6  |
+| main.rs:259:15:259:20 | source | main.rs:259:13:259:24 | e.source(...) [C] | provenance | Src:MaD:6  |
 | main.rs:260:11:260:11 | s [C] | main.rs:261:9:261:37 | ...::C {...} [C] | provenance |  |
 | main.rs:260:11:260:11 | s [C] | main.rs:261:9:261:37 | ...::C {...} [C] | provenance |  |
 | main.rs:261:9:261:37 | ...::C {...} [C] | main.rs:261:35:261:35 | i | provenance |  |
@@ -241,18 +247,18 @@ edges
 | main.rs:261:35:261:35 | i | main.rs:261:47:261:47 | i | provenance |  |
 | main.rs:275:18:275:18 | ... | main.rs:275:26:275:26 | a | provenance |  |
 | main.rs:275:18:275:18 | ... | main.rs:275:26:275:26 | a | provenance |  |
-| main.rs:276:9:276:19 | pass_source | main.rs:275:18:275:18 | ... | provenance | Src:MaD:8  |
-| main.rs:276:9:276:19 | pass_source | main.rs:275:18:275:18 | ... | provenance | Src:MaD:8  |
-| main.rs:278:9:278:19 | pass_source | main.rs:278:25:278:25 | ... | provenance | Src:MaD:8  |
-| main.rs:278:9:278:19 | pass_source | main.rs:278:25:278:25 | ... | provenance | Src:MaD:8  |
+| main.rs:276:9:276:19 | pass_source | main.rs:275:18:275:18 | ... | provenance | Src:MaD:12  |
+| main.rs:276:9:276:19 | pass_source | main.rs:275:18:275:18 | ... | provenance | Src:MaD:12  |
+| main.rs:278:9:278:19 | pass_source | main.rs:278:25:278:25 | ... | provenance | Src:MaD:12  |
+| main.rs:278:9:278:19 | pass_source | main.rs:278:25:278:25 | ... | provenance | Src:MaD:12  |
 | main.rs:278:25:278:25 | ... | main.rs:279:18:279:18 | a | provenance |  |
 | main.rs:278:25:278:25 | ... | main.rs:279:18:279:18 | a | provenance |  |
 | main.rs:282:14:282:19 | ...: i64 | main.rs:283:18:283:18 | a | provenance |  |
 | main.rs:282:14:282:19 | ...: i64 | main.rs:283:18:283:18 | a | provenance |  |
-| main.rs:285:9:285:19 | pass_source | main.rs:282:14:282:19 | ...: i64 | provenance | Src:MaD:8  |
-| main.rs:285:9:285:19 | pass_source | main.rs:282:14:282:19 | ...: i64 | provenance | Src:MaD:8  |
-| main.rs:287:9:287:19 | pass_source | main.rs:287:36:287:36 | ... | provenance | Src:MaD:8  |
-| main.rs:287:9:287:19 | pass_source | main.rs:287:36:287:36 | ... | provenance | Src:MaD:8  |
+| main.rs:285:9:285:19 | pass_source | main.rs:282:14:282:19 | ...: i64 | provenance | Src:MaD:12  |
+| main.rs:285:9:285:19 | pass_source | main.rs:282:14:282:19 | ...: i64 | provenance | Src:MaD:12  |
+| main.rs:287:9:287:19 | pass_source | main.rs:287:36:287:36 | ... | provenance | Src:MaD:12  |
+| main.rs:287:9:287:19 | pass_source | main.rs:287:36:287:36 | ... | provenance | Src:MaD:12  |
 | main.rs:287:36:287:36 | ... | main.rs:288:18:288:18 | a | provenance |  |
 | main.rs:287:36:287:36 | ... | main.rs:288:18:288:18 | a | provenance |  |
 | main.rs:297:9:297:9 | s | main.rs:298:41:298:41 | s | provenance |  |
@@ -277,48 +283,60 @@ edges
 | main.rs:305:5:305:5 | e [D] | main.rs:305:7:305:10 | sink | provenance | MaD:1 Sink:MaD:1 |
 | main.rs:314:9:314:9 | s | main.rs:315:10:315:10 | s | provenance |  |
 | main.rs:314:9:314:9 | s | main.rs:315:10:315:10 | s | provenance |  |
-| main.rs:314:13:314:25 | simple_source | main.rs:314:13:314:29 | simple_source(...) | provenance | Src:MaD:7 MaD:7 |
-| main.rs:314:13:314:25 | simple_source | main.rs:314:13:314:29 | simple_source(...) | provenance | Src:MaD:7 MaD:7 |
+| main.rs:314:13:314:25 | simple_source | main.rs:314:13:314:29 | simple_source(...) | provenance | Src:MaD:11 MaD:11 |
+| main.rs:314:13:314:25 | simple_source | main.rs:314:13:314:29 | simple_source(...) | provenance | Src:MaD:11 MaD:11 |
 | main.rs:314:13:314:29 | simple_source(...) | main.rs:314:9:314:9 | s | provenance |  |
 | main.rs:314:13:314:29 | simple_source(...) | main.rs:314:9:314:9 | s | provenance |  |
 | main.rs:322:9:322:9 | s | main.rs:323:17:323:17 | s | provenance |  |
 | main.rs:322:9:322:9 | s | main.rs:323:17:323:17 | s | provenance |  |
 | main.rs:322:13:322:22 | source(...) | main.rs:322:9:322:9 | s | provenance |  |
 | main.rs:322:13:322:22 | source(...) | main.rs:322:9:322:9 | s | provenance |  |
-| main.rs:323:17:323:17 | s | main.rs:323:5:323:15 | simple_sink | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:323:17:323:17 | s | main.rs:323:5:323:15 | simple_sink | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:331:5:331:14 | arg_source | main.rs:331:16:331:16 | [post] i | provenance | Src:MaD:5 MaD:5 |
-| main.rs:331:5:331:14 | arg_source | main.rs:331:16:331:16 | [post] i | provenance | Src:MaD:5 MaD:5 |
+| main.rs:323:17:323:17 | s | main.rs:323:5:323:15 | simple_sink | provenance | MaD:5 Sink:MaD:5 |
+| main.rs:323:17:323:17 | s | main.rs:323:5:323:15 | simple_sink | provenance | MaD:5 Sink:MaD:5 |
+| main.rs:331:5:331:14 | arg_source | main.rs:331:16:331:16 | [post] i | provenance | Src:MaD:7 MaD:7 |
+| main.rs:331:5:331:14 | arg_source | main.rs:331:16:331:16 | [post] i | provenance | Src:MaD:7 MaD:7 |
 | main.rs:331:16:331:16 | [post] i | main.rs:332:10:332:10 | i | provenance |  |
 | main.rs:331:16:331:16 | [post] i | main.rs:332:10:332:10 | i | provenance |  |
 | main.rs:384:9:384:10 | x1 | main.rs:385:10:385:11 | x1 | provenance |  |
 | main.rs:384:9:384:10 | x1 | main.rs:385:10:385:11 | x1 | provenance |  |
-| main.rs:384:14:384:23 | source(...) | main.rs:384:14:384:30 | ... .max(...) | provenance | MaD:9 |
-| main.rs:384:14:384:23 | source(...) | main.rs:384:14:384:30 | ... .max(...) | provenance | MaD:9 |
+| main.rs:384:14:384:23 | source(...) | main.rs:384:14:384:30 | ... .max(...) | provenance | MaD:13 |
+| main.rs:384:14:384:23 | source(...) | main.rs:384:14:384:30 | ... .max(...) | provenance | MaD:13 |
 | main.rs:384:14:384:30 | ... .max(...) | main.rs:384:9:384:10 | x1 | provenance |  |
 | main.rs:384:14:384:30 | ... .max(...) | main.rs:384:9:384:10 | x1 | provenance |  |
 | main.rs:387:9:387:10 | x2 [MyStruct.field1] | main.rs:395:10:395:11 | x2 [MyStruct.field1] | provenance |  |
 | main.rs:387:9:387:10 | x2 [MyStruct.field1] | main.rs:395:10:395:11 | x2 [MyStruct.field1] | provenance |  |
 | main.rs:387:14:394:6 | ... .max(...) [MyStruct.field1] | main.rs:387:9:387:10 | x2 [MyStruct.field1] | provenance |  |
 | main.rs:387:14:394:6 | ... .max(...) [MyStruct.field1] | main.rs:387:9:387:10 | x2 [MyStruct.field1] | provenance |  |
-| main.rs:387:15:390:5 | MyStruct {...} [MyStruct.field1] | main.rs:387:14:394:6 | ... .max(...) [MyStruct.field1] | provenance | MaD:9 |
-| main.rs:387:15:390:5 | MyStruct {...} [MyStruct.field1] | main.rs:387:14:394:6 | ... .max(...) [MyStruct.field1] | provenance | MaD:9 |
+| main.rs:387:15:390:5 | MyStruct {...} [MyStruct.field1] | main.rs:387:14:394:6 | ... .max(...) [MyStruct.field1] | provenance | MaD:13 |
+| main.rs:387:15:390:5 | MyStruct {...} [MyStruct.field1] | main.rs:387:14:394:6 | ... .max(...) [MyStruct.field1] | provenance | MaD:13 |
 | main.rs:388:17:388:26 | source(...) | main.rs:387:15:390:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
 | main.rs:388:17:388:26 | source(...) | main.rs:387:15:390:5 | MyStruct {...} [MyStruct.field1] | provenance |  |
 | main.rs:395:10:395:11 | x2 [MyStruct.field1] | main.rs:395:10:395:18 | x2.field1 | provenance |  |
 | main.rs:395:10:395:11 | x2 [MyStruct.field1] | main.rs:395:10:395:18 | x2.field1 | provenance |  |
 | main.rs:400:9:400:10 | x4 | main.rs:401:10:401:11 | x4 | provenance |  |
 | main.rs:400:9:400:10 | x4 | main.rs:401:10:401:11 | x4 | provenance |  |
-| main.rs:400:14:400:23 | source(...) | main.rs:400:14:400:30 | ... .max(...) | provenance | MaD:9 |
-| main.rs:400:14:400:23 | source(...) | main.rs:400:14:400:30 | ... .max(...) | provenance | MaD:9 |
+| main.rs:400:14:400:23 | source(...) | main.rs:400:14:400:30 | ... .max(...) | provenance | MaD:13 |
+| main.rs:400:14:400:23 | source(...) | main.rs:400:14:400:30 | ... .max(...) | provenance | MaD:13 |
 | main.rs:400:14:400:30 | ... .max(...) | main.rs:400:9:400:10 | x4 | provenance |  |
 | main.rs:400:14:400:30 | ... .max(...) | main.rs:400:9:400:10 | x4 | provenance |  |
 | main.rs:403:9:403:10 | x5 | main.rs:404:10:404:11 | x5 | provenance |  |
-| main.rs:403:14:403:23 | source(...) | main.rs:403:14:403:30 | ... .lt(...) | provenance | MaD:10 |
+| main.rs:403:14:403:23 | source(...) | main.rs:403:14:403:30 | ... .lt(...) | provenance | MaD:14 |
 | main.rs:403:14:403:30 | ... .lt(...) | main.rs:403:9:403:10 | x5 | provenance |  |
 | main.rs:406:9:406:10 | x6 | main.rs:407:10:407:11 | x6 | provenance |  |
-| main.rs:406:14:406:23 | source(...) | main.rs:406:14:406:27 | ... < ... | provenance | MaD:10 |
+| main.rs:406:14:406:23 | source(...) | main.rs:406:14:406:27 | ... < ... | provenance | MaD:14 |
 | main.rs:406:14:406:27 | ... < ... | main.rs:406:9:406:10 | x6 | provenance |  |
+| main.rs:422:10:422:25 | generated_source | main.rs:422:10:422:28 | generated_source(...) | provenance | Src:MaD:9 MaD:9 |
+| main.rs:422:10:422:25 | generated_source | main.rs:422:10:422:28 | generated_source(...) | provenance | Src:MaD:9 MaD:9 |
+| main.rs:424:10:424:30 | neutral_manual_source | main.rs:424:10:424:33 | neutral_manual_source(...) | provenance | Src:MaD:10 MaD:10 |
+| main.rs:424:10:424:30 | neutral_manual_source | main.rs:424:10:424:33 | neutral_manual_source(...) | provenance | Src:MaD:10 MaD:10 |
+| main.rs:425:20:425:28 | source(...) | main.rs:425:5:425:18 | generated_sink | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:425:20:425:28 | source(...) | main.rs:425:5:425:18 | generated_sink | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:427:25:427:33 | source(...) | main.rs:427:5:427:23 | neutral_manual_sink | provenance | MaD:4 Sink:MaD:4 |
+| main.rs:427:25:427:33 | source(...) | main.rs:427:5:427:23 | neutral_manual_sink | provenance | MaD:4 Sink:MaD:4 |
+| main.rs:428:28:428:36 | source(...) | main.rs:428:10:428:37 | generated_summary(...) | provenance | MaD:19 |
+| main.rs:428:28:428:36 | source(...) | main.rs:428:10:428:37 | generated_summary(...) | provenance | MaD:19 |
+| main.rs:430:33:430:41 | source(...) | main.rs:430:10:430:42 | neutral_manual_summary(...) | provenance | MaD:20 |
+| main.rs:430:33:430:41 | source(...) | main.rs:430:10:430:42 | neutral_manual_summary(...) | provenance | MaD:20 |
 nodes
 | main.rs:15:9:15:9 | s | semmle.label | s |
 | main.rs:15:9:15:9 | s | semmle.label | s |
@@ -672,6 +690,30 @@ nodes
 | main.rs:406:14:406:23 | source(...) | semmle.label | source(...) |
 | main.rs:406:14:406:27 | ... < ... | semmle.label | ... < ... |
 | main.rs:407:10:407:11 | x6 | semmle.label | x6 |
+| main.rs:422:10:422:25 | generated_source | semmle.label | generated_source |
+| main.rs:422:10:422:25 | generated_source | semmle.label | generated_source |
+| main.rs:422:10:422:28 | generated_source(...) | semmle.label | generated_source(...) |
+| main.rs:422:10:422:28 | generated_source(...) | semmle.label | generated_source(...) |
+| main.rs:424:10:424:30 | neutral_manual_source | semmle.label | neutral_manual_source |
+| main.rs:424:10:424:30 | neutral_manual_source | semmle.label | neutral_manual_source |
+| main.rs:424:10:424:33 | neutral_manual_source(...) | semmle.label | neutral_manual_source(...) |
+| main.rs:424:10:424:33 | neutral_manual_source(...) | semmle.label | neutral_manual_source(...) |
+| main.rs:425:5:425:18 | generated_sink | semmle.label | generated_sink |
+| main.rs:425:5:425:18 | generated_sink | semmle.label | generated_sink |
+| main.rs:425:20:425:28 | source(...) | semmle.label | source(...) |
+| main.rs:425:20:425:28 | source(...) | semmle.label | source(...) |
+| main.rs:427:5:427:23 | neutral_manual_sink | semmle.label | neutral_manual_sink |
+| main.rs:427:5:427:23 | neutral_manual_sink | semmle.label | neutral_manual_sink |
+| main.rs:427:25:427:33 | source(...) | semmle.label | source(...) |
+| main.rs:427:25:427:33 | source(...) | semmle.label | source(...) |
+| main.rs:428:10:428:37 | generated_summary(...) | semmle.label | generated_summary(...) |
+| main.rs:428:10:428:37 | generated_summary(...) | semmle.label | generated_summary(...) |
+| main.rs:428:28:428:36 | source(...) | semmle.label | source(...) |
+| main.rs:428:28:428:36 | source(...) | semmle.label | source(...) |
+| main.rs:430:10:430:42 | neutral_manual_summary(...) | semmle.label | neutral_manual_summary(...) |
+| main.rs:430:10:430:42 | neutral_manual_summary(...) | semmle.label | neutral_manual_summary(...) |
+| main.rs:430:33:430:41 | source(...) | semmle.label | source(...) |
+| main.rs:430:33:430:41 | source(...) | semmle.label | source(...) |
 subpaths
 | main.rs:212:23:212:23 | f [captured s] | main.rs:211:40:211:40 | s | main.rs:211:17:211:42 | if ... {...} else {...} | main.rs:212:13:212:24 | apply(...) |
 | main.rs:212:23:212:23 | f [captured s] | main.rs:211:40:211:40 | s | main.rs:211:17:211:42 | if ... {...} else {...} | main.rs:212:13:212:24 | apply(...) |
@@ -743,3 +785,15 @@ invalidSpecComponent
 | main.rs:401:10:401:11 | x4 | main.rs:400:14:400:23 | source(...) | main.rs:401:10:401:11 | x4 | $@ | main.rs:400:14:400:23 | source(...) | source(...) |
 | main.rs:404:10:404:11 | x5 | main.rs:403:14:403:23 | source(...) | main.rs:404:10:404:11 | x5 | $@ | main.rs:403:14:403:23 | source(...) | source(...) |
 | main.rs:407:10:407:11 | x6 | main.rs:406:14:406:23 | source(...) | main.rs:407:10:407:11 | x6 | $@ | main.rs:406:14:406:23 | source(...) | source(...) |
+| main.rs:422:10:422:28 | generated_source(...) | main.rs:422:10:422:25 | generated_source | main.rs:422:10:422:28 | generated_source(...) | $@ | main.rs:422:10:422:25 | generated_source | generated_source |
+| main.rs:422:10:422:28 | generated_source(...) | main.rs:422:10:422:25 | generated_source | main.rs:422:10:422:28 | generated_source(...) | $@ | main.rs:422:10:422:25 | generated_source | generated_source |
+| main.rs:424:10:424:33 | neutral_manual_source(...) | main.rs:424:10:424:30 | neutral_manual_source | main.rs:424:10:424:33 | neutral_manual_source(...) | $@ | main.rs:424:10:424:30 | neutral_manual_source | neutral_manual_source |
+| main.rs:424:10:424:33 | neutral_manual_source(...) | main.rs:424:10:424:30 | neutral_manual_source | main.rs:424:10:424:33 | neutral_manual_source(...) | $@ | main.rs:424:10:424:30 | neutral_manual_source | neutral_manual_source |
+| main.rs:425:5:425:18 | generated_sink | main.rs:425:20:425:28 | source(...) | main.rs:425:5:425:18 | generated_sink | $@ | main.rs:425:20:425:28 | source(...) | source(...) |
+| main.rs:425:5:425:18 | generated_sink | main.rs:425:20:425:28 | source(...) | main.rs:425:5:425:18 | generated_sink | $@ | main.rs:425:20:425:28 | source(...) | source(...) |
+| main.rs:427:5:427:23 | neutral_manual_sink | main.rs:427:25:427:33 | source(...) | main.rs:427:5:427:23 | neutral_manual_sink | $@ | main.rs:427:25:427:33 | source(...) | source(...) |
+| main.rs:427:5:427:23 | neutral_manual_sink | main.rs:427:25:427:33 | source(...) | main.rs:427:5:427:23 | neutral_manual_sink | $@ | main.rs:427:25:427:33 | source(...) | source(...) |
+| main.rs:428:10:428:37 | generated_summary(...) | main.rs:428:28:428:36 | source(...) | main.rs:428:10:428:37 | generated_summary(...) | $@ | main.rs:428:28:428:36 | source(...) | source(...) |
+| main.rs:428:10:428:37 | generated_summary(...) | main.rs:428:28:428:36 | source(...) | main.rs:428:10:428:37 | generated_summary(...) | $@ | main.rs:428:28:428:36 | source(...) | source(...) |
+| main.rs:430:10:430:42 | neutral_manual_summary(...) | main.rs:430:33:430:41 | source(...) | main.rs:430:10:430:42 | neutral_manual_summary(...) | $@ | main.rs:430:33:430:41 | source(...) | source(...) |
+| main.rs:430:10:430:42 | neutral_manual_summary(...) | main.rs:430:33:430:41 | source(...) | main.rs:430:10:430:42 | neutral_manual_summary(...) | $@ | main.rs:430:33:430:41 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/models/models.ext.yml b/rust/ql/test/library-tests/dataflow/models/models.ext.yml
index 294440cc60d..4e3377881a3 100644
--- a/rust/ql/test/library-tests/dataflow/models/models.ext.yml
+++ b/rust/ql/test/library-tests/dataflow/models/models.ext.yml
@@ -8,6 +8,9 @@ extensions:
       - ["<main::MyFieldEnum>::source", "ReturnValue.Field[main::MyFieldEnum::C::field_c]", "test-source", "manual"]
       - ["main::arg_source", "Argument[0]", "test-source", "manual"]
       - ["main::source_into_function::pass_source", "Argument[1].Parameter[0]", "test-source", "manual"]
+      - ["main::external_file::generated_source", "ReturnValue", "test-source", "dfc-generated"] # not actually generated, but we want to test behaviour of generated models here.
+      - ["main::external_file::neutral_generated_source", "ReturnValue", "test-source", "dfc-generated"]
+      - ["main::external_file::neutral_manual_source", "ReturnValue", "test-source", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sinkModel
@@ -15,6 +18,9 @@ extensions:
       - ["main::simple_sink", "Argument[0]", "test-sink", "manual"]
       - ["main::enum_sink", "Argument[0].Field[main::MyFieldEnum::C::field_c]", "test-sink", "manual"]
       - ["<main::MyFieldEnum>::sink", "Argument[self].Field[main::MyFieldEnum::D::field_d]", "test-sink", "manual"]
+      - ["main::external_file::generated_sink", "Argument[0]", "test-sink", "dfc-generated"]
+      - ["main::external_file::neutral_generated_sink", "Argument[0]", "test-sink", "dfc-generated"]
+      - ["main::external_file::neutral_manual_sink", "Argument[0]", "test-sink", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: summaryModel
@@ -39,3 +45,21 @@ extensions:
       - ["<_ as core::cmp::PartialOrd>::lt", "Argument[self].Reference", "ReturnValue", "taint", "manual"]
       # Overwrites the generic trait model for i32
       - ["<core::i32 as core::cmp::PartialOrd>::lt", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["main::external_file::generated_summary", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["main::external_file::neutral_generated_summary", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["main::external_file::neutral_manual_summary", "Argument[0]", "ReturnValue", "value", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: neutralModel
+    data:
+      - ["main::external_file::neutral_generated_source", "source", "manual"]
+      - ["main::external_file::neutral_manual_source", "source", "manual"]
+      - ["main::external_file::neutral_generated_sink", "sink", "manual"]
+      - ["main::external_file::neutral_manual_sink", "sink", "manual"]
+      - ["main::external_file::neutral_generated_summary", "summary", "manual"]
+      - ["main::external_file::neutral_manual_summary", "summary", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: additionalExternalFile
+    data:
+      - ["external_file.rs"]
diff --git a/rust/ql/test/library-tests/dataflow/sources/net/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/dataflow/sources/net/CONSISTENCY/PathResolutionConsistency.expected
index 8ca58acd1d0..e69de29bb2d 100644
--- a/rust/ql/test/library-tests/dataflow/sources/net/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/library-tests/dataflow/sources/net/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,6 +0,0 @@
-multipleResolvedTargets
-| test.rs:389:30:389:67 | pinned.poll_read(...) |
-| test.rs:416:26:416:54 | pinned.poll_fill_buf(...) |
-| test.rs:423:27:423:71 | ... .poll_fill_buf(...) |
-| test.rs:447:30:447:67 | pinned.poll_read(...) |
-| test.rs:470:26:470:54 | pinned.poll_fill_buf(...) |
diff --git a/rust/ql/test/library-tests/dataflow/taint/inline-taint-flow.expected b/rust/ql/test/library-tests/dataflow/taint/inline-taint-flow.expected
index 255af4cc86e..763bff966d3 100644
--- a/rust/ql/test/library-tests/dataflow/taint/inline-taint-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/taint/inline-taint-flow.expected
@@ -100,7 +100,9 @@ edges
 | main.rs:161:10:161:18 | source(...) | main.rs:161:10:161:25 | ... .shr(...) | provenance | MaD:30 |
 | main.rs:162:19:162:27 | source(...) | main.rs:162:10:162:28 | 1i64.shr(...) | provenance | MaD:30 |
 | main.rs:164:10:164:18 | source(...) | main.rs:164:10:164:30 | ... .bitor(...) | provenance | MaD:19 |
+| main.rs:165:10:165:18 | source(...) | main.rs:165:10:165:27 | ... .bitor(...) | provenance | MaD:19 |
 | main.rs:166:21:166:29 | source(...) | main.rs:166:10:166:30 | 1i64.bitor(...) | provenance | MaD:19 |
+| main.rs:167:18:167:26 | source(...) | main.rs:167:10:167:27 | 1.bitor(...) | provenance | MaD:19 |
 | main.rs:170:5:170:5 | [post] a | main.rs:171:5:171:5 | a | provenance |  |
 | main.rs:170:5:170:5 | [post] a | main.rs:172:5:172:5 | a | provenance |  |
 | main.rs:170:5:170:5 | [post] a | main.rs:173:5:173:5 | a | provenance |  |
@@ -351,8 +353,12 @@ nodes
 | main.rs:162:19:162:27 | source(...) | semmle.label | source(...) |
 | main.rs:164:10:164:18 | source(...) | semmle.label | source(...) |
 | main.rs:164:10:164:30 | ... .bitor(...) | semmle.label | ... .bitor(...) |
+| main.rs:165:10:165:18 | source(...) | semmle.label | source(...) |
+| main.rs:165:10:165:27 | ... .bitor(...) | semmle.label | ... .bitor(...) |
 | main.rs:166:10:166:30 | 1i64.bitor(...) | semmle.label | 1i64.bitor(...) |
 | main.rs:166:21:166:29 | source(...) | semmle.label | source(...) |
+| main.rs:167:10:167:27 | 1.bitor(...) | semmle.label | 1.bitor(...) |
+| main.rs:167:18:167:26 | source(...) | semmle.label | source(...) |
 | main.rs:170:5:170:5 | [post] a | semmle.label | [post] a |
 | main.rs:170:18:170:26 | source(...) | semmle.label | source(...) |
 | main.rs:171:5:171:5 | [post] a | semmle.label | [post] a |
@@ -516,7 +522,9 @@ testFailures
 | main.rs:161:10:161:25 | ... .shr(...) | main.rs:161:10:161:18 | source(...) | main.rs:161:10:161:25 | ... .shr(...) | $@ | main.rs:161:10:161:18 | source(...) | source(...) |
 | main.rs:162:10:162:28 | 1i64.shr(...) | main.rs:162:19:162:27 | source(...) | main.rs:162:10:162:28 | 1i64.shr(...) | $@ | main.rs:162:19:162:27 | source(...) | source(...) |
 | main.rs:164:10:164:30 | ... .bitor(...) | main.rs:164:10:164:18 | source(...) | main.rs:164:10:164:30 | ... .bitor(...) | $@ | main.rs:164:10:164:18 | source(...) | source(...) |
+| main.rs:165:10:165:27 | ... .bitor(...) | main.rs:165:10:165:18 | source(...) | main.rs:165:10:165:27 | ... .bitor(...) | $@ | main.rs:165:10:165:18 | source(...) | source(...) |
 | main.rs:166:10:166:30 | 1i64.bitor(...) | main.rs:166:21:166:29 | source(...) | main.rs:166:10:166:30 | 1i64.bitor(...) | $@ | main.rs:166:21:166:29 | source(...) | source(...) |
+| main.rs:167:10:167:27 | 1.bitor(...) | main.rs:167:18:167:26 | source(...) | main.rs:167:10:167:27 | 1.bitor(...) | $@ | main.rs:167:18:167:26 | source(...) | source(...) |
 | main.rs:176:10:176:10 | a | main.rs:170:18:170:26 | source(...) | main.rs:176:10:176:10 | a | $@ | main.rs:170:18:170:26 | source(...) | source(...) |
 | main.rs:176:10:176:10 | a | main.rs:171:18:171:26 | source(...) | main.rs:176:10:176:10 | a | $@ | main.rs:171:18:171:26 | source(...) | source(...) |
 | main.rs:176:10:176:10 | a | main.rs:172:18:172:26 | source(...) | main.rs:176:10:176:10 | a | $@ | main.rs:172:18:172:26 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/taint/main.rs b/rust/ql/test/library-tests/dataflow/taint/main.rs
index 07770cc7118..05dbd1eb702 100644
--- a/rust/ql/test/library-tests/dataflow/taint/main.rs
+++ b/rust/ql/test/library-tests/dataflow/taint/main.rs
@@ -162,9 +162,9 @@ fn std_ops() {
     sink(1i64.shr(source(2))); // $ hasTaintFlow=2
 
     sink(source(1).bitor(2i64)); // $ hasTaintFlow=1
-    sink(source(1).bitor(2)); // $ MISSING: hasTaintFlow=1
+    sink(source(1).bitor(2)); // $ hasTaintFlow=1
     sink(1i64.bitor(source(2))); // $ hasTaintFlow=2
-    sink(1.bitor(source(2))); // $ MISSING: hasTaintFlow=2
+    sink(1.bitor(source(2))); // $ hasTaintFlow=2
 
     let mut a: i64 = 1;
     a.add_assign(source(2));
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 73460116968..2ac439e085b 100644
--- a/rust/ql/test/library-tests/type-inference/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/library-tests/type-inference/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,4 +1,4 @@
 multipleResolvedTargets
 | main.rs:2223:9:2223:31 | ... .my_add(...) |
 | main.rs:2225:9:2225:29 | ... .my_add(...) |
-| main.rs:2723:13:2723:17 | x.f() |
+| main.rs:2740:13:2740:17 | x.f() |
diff --git a/rust/ql/test/library-tests/type-inference/CONSISTENCY/TypeInferenceConsistency.expected b/rust/ql/test/library-tests/type-inference/CONSISTENCY/TypeInferenceConsistency.expected
deleted file mode 100644
index 2dc4ca7791a..00000000000
--- a/rust/ql/test/library-tests/type-inference/CONSISTENCY/TypeInferenceConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-nonUniqueCertainType
-| associated_types.rs:232:9:234:9 | { ... } |  |
diff --git a/rust/ql/test/library-tests/type-inference/associated_types.rs b/rust/ql/test/library-tests/type-inference/associated_types.rs
index ea050377c21..a678a531f8d 100644
--- a/rust/ql/test/library-tests/type-inference/associated_types.rs
+++ b/rust/ql/test/library-tests/type-inference/associated_types.rs
@@ -236,8 +236,8 @@ mod concrete_type_as_generic_access_associated_type {
 
     pub fn test() {
         let s = S;
-        let _a = s.convert(true); // $ target=S::convert type=_a:i32 SPURIOUS: bool
-        let _b = s.convert(42); // $ target=S::convert type=_b:bool SPURIOUS: i32
+        let _a = s.convert(true); // $ target=S::convert $ MISSING: type=_a:i32
+        let _b = s.convert(42); // $ target=S::convert $ MISSING: type=_b:bool
     }
 }
 
diff --git a/rust/ql/test/library-tests/type-inference/main.rs b/rust/ql/test/library-tests/type-inference/main.rs
index 204bd7e55cb..6c9f2c801d5 100644
--- a/rust/ql/test/library-tests/type-inference/main.rs
+++ b/rust/ql/test/library-tests/type-inference/main.rs
@@ -2636,6 +2636,17 @@ mod block_types {
 }
 
 mod context_typed {
+    #[derive(Default)]
+    struct S;
+
+    impl S {
+        fn f(self) {}
+    }
+
+    fn free_function<T: Default>() -> T {
+        Default::default() // $ target=default
+    }
+
     pub fn f() {
         let x = None; // $ type=x:T.i32
         let x: Option<i32> = x;
@@ -2683,6 +2694,12 @@ mod context_typed {
 
         let y = Default::default(); // $ type=y:i32 target=default
         x.push(y); // $ target=push
+
+        let s = Default::default(); // $ target=default type=s:S
+        S::f(s); // $ target=f
+
+        let z = free_function(); // $ target=free_function type=z:i32
+        x.push(z); // $ target=push
     }
 }
 
@@ -2740,6 +2757,7 @@ mod blanket_impl;
 mod closure;
 mod dereference;
 mod dyn_type;
+mod regressions;
 
 fn main() {
     field_access::f(); // $ target=f
diff --git a/rust/ql/test/library-tests/type-inference/overloading.rs b/rust/ql/test/library-tests/type-inference/overloading.rs
index 0bf6598c1d1..06353a12c8f 100644
--- a/rust/ql/test/library-tests/type-inference/overloading.rs
+++ b/rust/ql/test/library-tests/type-inference/overloading.rs
@@ -400,3 +400,124 @@ mod from_default {
         x
     }
 }
+
+mod inherent_before_trait {
+    struct S<T>(T);
+
+    trait Trait {
+        fn foo(&self);
+        fn bar(&self);
+    }
+
+    impl S<i32> {
+        // S<i32>::foo
+        fn foo(x: &Self) {}
+
+        // S<i32>::bar
+        fn bar(&self) {}
+    }
+
+    impl Trait for S<i32> {
+        // <S<i32>_as_Trait>::foo
+        fn foo(&self) {
+            S::foo(self); // $ MISSING: target=S<i32>::foo
+            S::<i32>::foo(self); // $ target=S<i32>::foo
+            self.foo() // $ target=<S<i32>_as_Trait>::foo
+        }
+
+        // <S<i32>_as_Trait>::bar
+        fn bar(&self) {
+            S::bar(self); // $ target=S<i32>::bar
+            S::<i32>::bar(self); // $ target=S<i32>::bar
+            self.bar() // $ target=S<i32>::bar
+        }
+    }
+
+    impl Trait for S<i64> {
+        // <S<i64>_as_Trait>::foo
+        fn foo(&self) {
+            // `S::foo(self);` is not valid
+            S::<i64>::foo(self); // $ target=<S<i64>_as_Trait>::foo
+            self.foo() // $ target=<S<i64>_as_Trait>::foo
+        }
+
+        // <S<i64>_as_Trait>::bar
+        fn bar(&self) {
+            // `S::bar(self);` is not valid
+            S::<i64>::bar(self); // $ target=<S<i64>_as_Trait>::bar
+            self.bar() // $ target=<S<i64>_as_Trait>::bar
+        }
+    }
+}
+
+mod trait_bound_impl_overlap {
+    trait MyTrait<T> {
+        fn f(&self) -> T;
+    }
+
+    trait MyTrait2<T = Self> {
+        type Output;
+
+        fn f(&self, x: T) -> Self::Output;
+    }
+
+    struct S<T>(T);
+
+    impl MyTrait<i32> for S<i32> {
+        fn f(&self) -> i32 {
+            0
+        }
+    }
+
+    impl MyTrait<i64> for S<i32> {
+        fn f(&self) -> i64 {
+            0
+        }
+    }
+
+    impl MyTrait2<S<i32>> for S<i32> {
+        type Output = i32;
+
+        fn f(&self, x: S<i32>) -> Self::Output {
+            0
+        }
+    }
+
+    impl MyTrait2<S<i64>> for S<i32> {
+        type Output = <Self as MyTrait2<S<bool>>>::Output;
+
+        fn f(&self, x: S<i64>) -> Self::Output {
+            0
+        }
+    }
+
+    impl MyTrait2<S<bool>> for S<i32> {
+        type Output = i64;
+
+        fn f(&self, x: S<bool>) -> Self::Output {
+            0
+        }
+    }
+
+    fn call_f<T1, T2: MyTrait<T1>>(x: T2) -> T1 {
+        x.f() // $ target=f
+    }
+
+    fn call_f2<T1, T2: MyTrait2<T1>>(x: T1, y: T2) -> T2::Output {
+        y.f(x) // $ target=f
+    }
+
+    fn test() {
+        let x = S(0);
+        let y = call_f(x); // $ target=call_f type=y:i32
+        let z: i32 = y;
+
+        let x = S(0);
+        let y = call_f::<i32, _>(x); // $ target=call_f type=y:i32
+
+        let x = S(0);
+        let y = call_f2(S(0i32), x); // $ target=call_f2 type=y:i32
+        let x = S(0);
+        let y = call_f2(S(0i64), x); // $ target=call_f2 type=y:i64
+    }
+}
diff --git a/rust/ql/test/library-tests/type-inference/regressions.rs b/rust/ql/test/library-tests/type-inference/regressions.rs
new file mode 100644
index 00000000000..e1b47479f5d
--- /dev/null
+++ b/rust/ql/test/library-tests/type-inference/regressions.rs
@@ -0,0 +1,132 @@
+mod regression1 {
+
+    pub struct S<T>(T);
+
+    pub enum E {
+        V { vec: Vec<E> },
+    }
+
+    impl<T> From<S<T>> for Option<T> {
+        fn from(s: S<T>) -> Self {
+            Some(s.0) // $ fieldof=S
+        }
+    }
+
+    pub fn f() -> E {
+        let mut vec_e = Vec::new(); // $ target=new
+        let mut opt_e = None;
+
+        let e = E::V { vec: Vec::new() }; // $ target=new
+
+        if let Some(e) = opt_e {
+            vec_e.push(e); // $ target=push
+        }
+        opt_e = e.into(); // $ target=into
+
+        #[rustfmt::skip]
+        let _ = if let Some(last) = vec_e.pop() // $ target=pop
+        {
+            opt_e = last.into(); // $ target=into
+        };
+
+        opt_e.unwrap() // $ target=unwrap
+    }
+}
+
+mod regression2 {
+    use std::ops::Sub;
+
+    #[derive(Copy, Clone)]
+    struct S1;
+    #[derive(Copy, Clone)]
+    struct S2;
+
+    impl Sub for S1 {
+        type Output = Self;
+
+        // S1SubS1
+        fn sub(self, _rhs: Self) -> Self::Output {
+            S1
+        }
+    }
+
+    impl Sub<S2> for S1 {
+        type Output = S2;
+
+        // S1SubS2
+        fn sub(self, _rhs: S2) -> Self::Output {
+            S2
+        }
+    }
+
+    impl Sub<&S2> for S1 {
+        type Output = <S1 as Sub<S2>>::Output;
+
+        // S1SubRefS2
+        fn sub(self, other: &S2) -> <S1 as Sub<S2>>::Output {
+            Sub::sub(self, *other) // $ target=S1SubS2 target=deref
+        }
+    }
+
+    fn foo() {
+        let s1 = S1;
+        let s2 = S2;
+        let x = s1 - &s2; // $ target=S1SubRefS2 type=x:S2
+    }
+}
+
+mod regression3 {
+    trait SomeTrait {}
+
+    trait MyFrom<T> {
+        fn my_from(value: T) -> Self;
+    }
+
+    impl<T> MyFrom<T> for T {
+        fn my_from(s: T) -> Self {
+            s
+        }
+    }
+
+    impl<T> MyFrom<T> for Option<T> {
+        fn my_from(val: T) -> Option<T> {
+            Some(val)
+        }
+    }
+
+    pub struct S<Ts>(Ts);
+
+    pub fn f<T1, T2>(x: T2) -> T2
+    where
+        T2: SomeTrait + MyFrom<Option<T1>>,
+        Option<T1>: MyFrom<T2>,
+    {
+        let y = MyFrom::my_from(x); // $ target=my_from
+        let z = MyFrom::my_from(y); // $ target=my_from
+        z
+    }
+}
+
+mod regression4 {
+    trait MyTrait {
+        // MyTrait::m
+        fn m(self);
+    }
+
+    impl<T> MyTrait for &T {
+        // RefAsMyTrait::m
+        fn m(self) {}
+    }
+
+    struct S<T>(T);
+
+    impl<T> S<T> {
+        fn call_m(self)
+        where
+            T: MyTrait,
+        {
+            let S(s) = self;
+            s.m(); // $ target=MyTrait::m
+        }
+    }
+}
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 1b750fab458..1e2c753b242 100644
--- a/rust/ql/test/library-tests/type-inference/type-inference.expected
+++ b/rust/ql/test/library-tests/type-inference/type-inference.expected
@@ -105,8 +105,6 @@ inferCertainType
 | associated_types.rs:229:23:229:27 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:229:23:229:27 | SelfParam | TRef | associated_types.rs:10:1:11:9 | S |
 | associated_types.rs:229:30:229:30 | t |  | associated_types.rs:229:20:229:20 | T |
-| associated_types.rs:232:9:234:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| associated_types.rs:232:9:234:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:233:24:233:24 | t |  | associated_types.rs:229:20:229:20 | T |
 | associated_types.rs:237:19:241:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:239:28:239:31 | true |  | {EXTERNAL LOCATION} | bool |
@@ -211,15 +209,15 @@ inferCertainType
 | associated_types.rs:454:24:454:28 | SelfParam | TRef | associated_types.rs:452:5:455:5 | Self [trait Subtrait] |
 | associated_types.rs:463:23:463:27 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:463:23:463:27 | SelfParam | TRef | associated_types.rs:457:5:467:5 | Self [trait Subtrait2] |
-| associated_types.rs:463:30:463:31 | c1 |  | associated_types.rs:20:5:20:16 | Output[Subtrait2] |
-| associated_types.rs:463:48:463:49 | c2 |  | associated_types.rs:20:5:20:16 | Output[Subtrait2] |
+| associated_types.rs:463:30:463:31 | c1 |  | associated_types.rs:20:5:20:16 | Output[Subtrait2 (inherited from GetSet)] |
+| associated_types.rs:463:48:463:49 | c2 |  | associated_types.rs:20:5:20:16 | Output[Subtrait2 (inherited from GetSet)] |
 | associated_types.rs:463:66:466:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:464:13:464:16 | self |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:464:13:464:16 | self | TRef | associated_types.rs:457:5:467:5 | Self [trait Subtrait2] |
-| associated_types.rs:464:22:464:23 | c1 |  | associated_types.rs:20:5:20:16 | Output[Subtrait2] |
+| associated_types.rs:464:22:464:23 | c1 |  | associated_types.rs:20:5:20:16 | Output[Subtrait2 (inherited from GetSet)] |
 | associated_types.rs:465:13:465:16 | self |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:465:13:465:16 | self | TRef | associated_types.rs:457:5:467:5 | Self [trait Subtrait2] |
-| associated_types.rs:465:22:465:23 | c2 |  | associated_types.rs:20:5:20:16 | Output[Subtrait2] |
+| associated_types.rs:465:22:465:23 | c2 |  | associated_types.rs:20:5:20:16 | Output[Subtrait2 (inherited from GetSet)] |
 | associated_types.rs:474:16:474:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:474:16:474:20 | SelfParam | TRef | associated_types.rs:469:5:469:24 | MyType |
 | associated_types.rs:474:16:474:20 | SelfParam | TRef.T | associated_types.rs:471:10:471:16 | T |
@@ -3630,129 +3628,135 @@ inferCertainType
 | main.rs:2633:18:2633:29 | ...::_print(...) |  | {EXTERNAL LOCATION} | () |
 | main.rs:2633:18:2633:29 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2633:29:2633:29 | a |  | {EXTERNAL LOCATION} | () |
-| main.rs:2639:16:2686:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2641:13:2641:13 | x |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2641:13:2641:13 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2645:26:2645:28 | opt |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2645:26:2645:28 | opt | T | main.rs:2645:23:2645:23 | T |
-| main.rs:2645:42:2645:42 | x |  | main.rs:2645:23:2645:23 | T |
-| main.rs:2645:48:2645:49 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2648:9:2648:24 | pin_option(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2655:13:2655:13 | x |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2655:17:2655:39 | ...::A {...} |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2656:13:2656:13 | x |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2656:13:2656:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2656:13:2656:13 | x | T2 | {EXTERNAL LOCATION} | String |
-| main.rs:2656:40:2656:40 | x |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2657:13:2657:13 | x |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2657:13:2657:13 | x | T2 | {EXTERNAL LOCATION} | String |
-| main.rs:2657:17:2657:52 | ...::A {...} |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2657:17:2657:52 | ...::A {...} | T2 | {EXTERNAL LOCATION} | String |
-| main.rs:2659:13:2659:13 | x |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2659:13:2659:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2659:17:2661:9 | ...::B::<...> {...} |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2659:17:2661:9 | ...::B::<...> {...} | T1 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2660:20:2660:32 | ...::new(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2663:29:2663:29 | e |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2663:29:2663:29 | e | T1 | main.rs:2663:26:2663:26 | T |
-| main.rs:2663:29:2663:29 | e | T2 | {EXTERNAL LOCATION} | String |
-| main.rs:2663:53:2663:53 | x |  | main.rs:2663:26:2663:26 | T |
-| main.rs:2663:59:2663:60 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2666:13:2666:13 | x |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2666:17:2668:9 | ...::B {...} |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2667:20:2667:32 | ...::new(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2669:9:2669:27 | pin_my_either(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2669:23:2669:23 | x |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2672:13:2672:13 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2672:13:2672:13 | x | E | {EXTERNAL LOCATION} | String |
-| main.rs:2672:13:2672:13 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2676:29:2676:31 | res |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2676:29:2676:31 | res | E | main.rs:2676:26:2676:26 | E |
-| main.rs:2676:29:2676:31 | res | T | main.rs:2676:23:2676:23 | T |
-| main.rs:2676:48:2676:48 | x |  | main.rs:2676:26:2676:26 | E |
-| main.rs:2676:54:2676:55 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2679:9:2679:28 | pin_result(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2679:23:2679:27 | false |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2681:17:2681:17 | x |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2681:17:2681:17 | x | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2681:21:2681:30 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2681:21:2681:30 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2682:9:2682:9 | x |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2682:9:2682:9 | x | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2685:9:2685:9 | x |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2685:9:2685:9 | x | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2692:14:2692:17 | SelfParam |  | main.rs:2690:5:2698:5 | Self [trait MyTrait] |
-| main.rs:2695:14:2695:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
-| main.rs:2695:14:2695:18 | SelfParam | TRef | main.rs:2690:5:2698:5 | Self [trait MyTrait] |
-| main.rs:2695:21:2695:25 | other |  | {EXTERNAL LOCATION} | & |
-| main.rs:2695:21:2695:25 | other | TRef | main.rs:2690:5:2698:5 | Self [trait MyTrait] |
-| main.rs:2695:44:2697:9 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:2695:44:2697:9 | { ... } | TRef | main.rs:2690:5:2698:5 | Self [trait MyTrait] |
-| main.rs:2696:13:2696:16 | self |  | {EXTERNAL LOCATION} | & |
-| main.rs:2696:13:2696:16 | self | TRef | main.rs:2690:5:2698:5 | Self [trait MyTrait] |
-| main.rs:2702:14:2702:17 | SelfParam |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2702:28:2704:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2703:13:2703:16 | self |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2709:14:2709:17 | SelfParam |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2709:28:2711:9 | { ... } |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2710:13:2710:16 | self |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2716:14:2716:17 | SelfParam |  | {EXTERNAL LOCATION} | & |
-| main.rs:2716:14:2716:17 | SelfParam | TRef | main.rs:2714:10:2714:10 | T |
-| main.rs:2716:28:2718:9 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:2716:28:2718:9 | { ... } | TRef | main.rs:2714:10:2714:10 | T |
-| main.rs:2717:13:2717:16 | self |  | {EXTERNAL LOCATION} | & |
-| main.rs:2717:13:2717:16 | self | TRef | main.rs:2714:10:2714:10 | T |
-| main.rs:2721:25:2725:5 | { ... } |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2727:12:2735:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2728:13:2728:13 | x |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2729:13:2729:13 | y |  | {EXTERNAL LOCATION} | & |
-| main.rs:2729:17:2729:18 | &1 |  | {EXTERNAL LOCATION} | & |
-| main.rs:2730:17:2730:17 | x |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2730:21:2730:21 | y |  | {EXTERNAL LOCATION} | & |
-| main.rs:2733:13:2733:13 | y |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2734:23:2734:23 | y |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2744:11:2779:1 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2745:5:2745:21 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2746:5:2746:20 | ...::f(...) |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2747:5:2747:60 | ...::g(...) |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2747:20:2747:38 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2747:41:2747:59 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2748:5:2748:35 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2749:5:2749:41 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2750:5:2750:45 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2751:5:2751:30 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2752:5:2752:21 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2753:5:2753:27 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2754:5:2754:32 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2755:5:2755:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2756:5:2756:36 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2757:5:2757:35 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2758:5:2758:29 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2759:5:2759:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2760:5:2760:24 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2761:5:2761:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2762:5:2762:18 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2763:5:2763:15 | ...::f(...) |  | {EXTERNAL LOCATION} | dyn Future |
-| main.rs:2763:5:2763:15 | ...::f(...) | dyn(Output) | {EXTERNAL LOCATION} | () |
-| main.rs:2764:5:2764:19 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2765:5:2765:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2766:5:2766:14 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2767:5:2767:27 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2768:5:2768:15 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2769:5:2769:43 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2770:5:2770:15 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2771:5:2771:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2772:5:2772:28 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2773:5:2773:23 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2774:5:2774:41 | ...::test_all_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2775:5:2775:49 | ...::box_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2776:5:2776:20 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2777:5:2777:20 | ...::f(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2777:5:2777:20 | ...::f(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2777:5:2777:20 | ...::f(...) | T | main.rs:2547:5:2549:5 | dyn MyTrait |
-| main.rs:2777:5:2777:20 | ...::f(...) | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2777:16:2777:19 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2778:5:2778:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2643:14:2643:17 | SelfParam |  | main.rs:2639:5:2640:13 | S |
+| main.rs:2643:20:2643:21 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2646:41:2648:5 | { ... } |  | main.rs:2646:22:2646:31 | T |
+| main.rs:2650:16:2703:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2652:13:2652:13 | x |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2652:13:2652:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2656:26:2656:28 | opt |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2656:26:2656:28 | opt | T | main.rs:2656:23:2656:23 | T |
+| main.rs:2656:42:2656:42 | x |  | main.rs:2656:23:2656:23 | T |
+| main.rs:2656:48:2656:49 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2659:9:2659:24 | pin_option(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2666:13:2666:13 | x |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2666:17:2666:39 | ...::A {...} |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2667:13:2667:13 | x |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2667:13:2667:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2667:13:2667:13 | x | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2667:40:2667:40 | x |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2668:13:2668:13 | x |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2668:13:2668:13 | x | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2668:17:2668:52 | ...::A {...} |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2668:17:2668:52 | ...::A {...} | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2670:13:2670:13 | x |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2670:13:2670:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2670:17:2672:9 | ...::B::<...> {...} |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2670:17:2672:9 | ...::B::<...> {...} | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2671:20:2671:32 | ...::new(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2674:29:2674:29 | e |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2674:29:2674:29 | e | T1 | main.rs:2674:26:2674:26 | T |
+| main.rs:2674:29:2674:29 | e | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2674:53:2674:53 | x |  | main.rs:2674:26:2674:26 | T |
+| main.rs:2674:59:2674:60 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2677:13:2677:13 | x |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2677:17:2679:9 | ...::B {...} |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2678:20:2678:32 | ...::new(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2680:9:2680:27 | pin_my_either(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2680:23:2680:23 | x |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2683:13:2683:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2683:13:2683:13 | x | E | {EXTERNAL LOCATION} | String |
+| main.rs:2683:13:2683:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2687:29:2687:31 | res |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2687:29:2687:31 | res | E | main.rs:2687:26:2687:26 | E |
+| main.rs:2687:29:2687:31 | res | T | main.rs:2687:23:2687:23 | T |
+| main.rs:2687:48:2687:48 | x |  | main.rs:2687:26:2687:26 | E |
+| main.rs:2687:54:2687:55 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2690:9:2690:28 | pin_result(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2690:23:2690:27 | false |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2692:17:2692:17 | x |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2692:17:2692:17 | x | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2692:21:2692:30 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2692:21:2692:30 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2693:9:2693:9 | x |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2693:9:2693:9 | x | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2696:9:2696:9 | x |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2696:9:2696:9 | x | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2699:9:2699:15 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2702:9:2702:9 | x |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2702:9:2702:9 | x | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2709:14:2709:17 | SelfParam |  | main.rs:2707:5:2715:5 | Self [trait MyTrait] |
+| main.rs:2712:14:2712:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| main.rs:2712:14:2712:18 | SelfParam | TRef | main.rs:2707:5:2715:5 | Self [trait MyTrait] |
+| main.rs:2712:21:2712:25 | other |  | {EXTERNAL LOCATION} | & |
+| main.rs:2712:21:2712:25 | other | TRef | main.rs:2707:5:2715:5 | Self [trait MyTrait] |
+| main.rs:2712:44:2714:9 | { ... } |  | {EXTERNAL LOCATION} | & |
+| main.rs:2712:44:2714:9 | { ... } | TRef | main.rs:2707:5:2715:5 | Self [trait MyTrait] |
+| main.rs:2713:13:2713:16 | self |  | {EXTERNAL LOCATION} | & |
+| main.rs:2713:13:2713:16 | self | TRef | main.rs:2707:5:2715:5 | Self [trait MyTrait] |
+| main.rs:2719:14:2719:17 | SelfParam |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2719:28:2721:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2720:13:2720:16 | self |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2726:14:2726:17 | SelfParam |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2726:28:2728:9 | { ... } |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2727:13:2727:16 | self |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2733:14:2733:17 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| main.rs:2733:14:2733:17 | SelfParam | TRef | main.rs:2731:10:2731:10 | T |
+| main.rs:2733:28:2735:9 | { ... } |  | {EXTERNAL LOCATION} | & |
+| main.rs:2733:28:2735:9 | { ... } | TRef | main.rs:2731:10:2731:10 | T |
+| main.rs:2734:13:2734:16 | self |  | {EXTERNAL LOCATION} | & |
+| main.rs:2734:13:2734:16 | self | TRef | main.rs:2731:10:2731:10 | T |
+| main.rs:2738:25:2742:5 | { ... } |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2744:12:2752:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2745:13:2745:13 | x |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2746:13:2746:13 | y |  | {EXTERNAL LOCATION} | & |
+| main.rs:2746:17:2746:18 | &1 |  | {EXTERNAL LOCATION} | & |
+| main.rs:2747:17:2747:17 | x |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2747:21:2747:21 | y |  | {EXTERNAL LOCATION} | & |
+| main.rs:2750:13:2750:13 | y |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2751:23:2751:23 | y |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2762:11:2797:1 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2763:5:2763:21 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2764:5:2764:20 | ...::f(...) |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2765:5:2765:60 | ...::g(...) |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2765:20:2765:38 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2765:41:2765:59 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2766:5:2766:35 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2767:5:2767:41 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2768:5:2768:45 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2769:5:2769:30 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2770:5:2770:21 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2771:5:2771:27 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2772:5:2772:32 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2773:5:2773:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2774:5:2774:36 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2775:5:2775:35 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2776:5:2776:29 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2777:5:2777:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2778:5:2778:24 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2779:5:2779:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2780:5:2780:18 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2781:5:2781:15 | ...::f(...) |  | {EXTERNAL LOCATION} | dyn Future |
+| main.rs:2781:5:2781:15 | ...::f(...) | dyn(Output) | {EXTERNAL LOCATION} | () |
+| main.rs:2782:5:2782:19 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2783:5:2783:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2784:5:2784:14 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2785:5:2785:27 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2786:5:2786:15 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2787:5:2787:43 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2788:5:2788:15 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2789:5:2789:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2790:5:2790:28 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2791:5:2791:23 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2792:5:2792:41 | ...::test_all_patterns(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2793:5:2793:49 | ...::box_patterns(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2794:5:2794:20 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2795:5:2795:20 | ...::f(...) |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2795:5:2795:20 | ...::f(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2795:5:2795:20 | ...::f(...) | T | main.rs:2547:5:2549:5 | dyn MyTrait |
+| main.rs:2795:5:2795:20 | ...::f(...) | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2795:16:2795:19 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2796:5:2796:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:4:19:4:23 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:4:19:4:23 | SelfParam | TRef | overloading.rs:2:5:11:5 | Self [trait FirstTrait] |
 | overloading.rs:4:34:6:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
@@ -4011,6 +4015,115 @@ inferCertainType
 | overloading.rs:397:10:397:10 | b |  | {EXTERNAL LOCATION} | bool |
 | overloading.rs:397:25:401:5 | { ... } |  | overloading.rs:372:5:372:14 | S1 |
 | overloading.rs:398:20:398:20 | b |  | {EXTERNAL LOCATION} | bool |
+| overloading.rs:408:16:408:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:408:16:408:20 | SelfParam | TRef | overloading.rs:407:5:410:5 | Self [trait Trait] |
+| overloading.rs:409:16:409:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:409:16:409:20 | SelfParam | TRef | overloading.rs:407:5:410:5 | Self [trait Trait] |
+| overloading.rs:414:16:414:16 | x |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:414:16:414:16 | x | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:414:16:414:16 | x | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:414:26:414:27 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:417:16:417:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:417:16:417:20 | SelfParam | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:417:16:417:20 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:417:23:417:24 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:422:16:422:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:422:16:422:20 | SelfParam | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:422:16:422:20 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:422:23:426:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:423:13:423:24 | ...::foo(...) |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:423:20:423:23 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:423:20:423:23 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:423:20:423:23 | self | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:424:13:424:31 | ...::foo(...) |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:424:27:424:30 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:424:27:424:30 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:424:27:424:30 | self | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:425:13:425:16 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:425:13:425:16 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:425:13:425:16 | self | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:429:16:429:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:429:16:429:20 | SelfParam | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:429:16:429:20 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:429:23:433:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:430:13:430:24 | ...::bar(...) |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:430:20:430:23 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:430:20:430:23 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:430:20:430:23 | self | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:431:13:431:31 | ...::bar(...) |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:431:27:431:30 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:431:27:431:30 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:431:27:431:30 | self | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:432:13:432:16 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:432:13:432:16 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:432:13:432:16 | self | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:438:16:438:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:438:16:438:20 | SelfParam | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:438:16:438:20 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:438:23:442:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:440:13:440:31 | ...::foo(...) |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:440:27:440:30 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:440:27:440:30 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:440:27:440:30 | self | TRef.T | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:441:13:441:16 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:441:13:441:16 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:441:13:441:16 | self | TRef.T | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:445:16:445:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:445:16:445:20 | SelfParam | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:445:16:445:20 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:445:23:449:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:447:13:447:31 | ...::bar(...) |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:447:27:447:30 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:447:27:447:30 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:447:27:447:30 | self | TRef.T | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:448:13:448:16 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:448:13:448:16 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:448:13:448:16 | self | TRef.T | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:455:14:455:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:455:14:455:18 | SelfParam | TRef | overloading.rs:454:5:456:5 | Self [trait MyTrait] |
+| overloading.rs:461:14:461:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:461:14:461:18 | SelfParam | TRef | overloading.rs:458:5:462:5 | Self [trait MyTrait2] |
+| overloading.rs:461:21:461:21 | x |  | overloading.rs:458:20:458:27 | T |
+| overloading.rs:467:14:467:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:467:14:467:18 | SelfParam | TRef | overloading.rs:464:5:464:19 | S |
+| overloading.rs:467:14:467:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:467:28:469:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:473:14:473:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:473:14:473:18 | SelfParam | TRef | overloading.rs:464:5:464:19 | S |
+| overloading.rs:473:14:473:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:473:28:475:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:481:14:481:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:481:14:481:18 | SelfParam | TRef | overloading.rs:464:5:464:19 | S |
+| overloading.rs:481:14:481:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:481:21:481:21 | x |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:481:21:481:21 | x | T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:481:48:483:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:489:14:489:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:489:14:489:18 | SelfParam | TRef | overloading.rs:464:5:464:19 | S |
+| overloading.rs:489:14:489:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:489:21:489:21 | x |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:489:21:489:21 | x | T | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:489:48:491:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:497:14:497:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:497:14:497:18 | SelfParam | TRef | overloading.rs:464:5:464:19 | S |
+| overloading.rs:497:14:497:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:497:21:497:21 | x |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:497:21:497:21 | x | T | {EXTERNAL LOCATION} | bool |
+| overloading.rs:497:49:499:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:502:36:502:36 | x |  | overloading.rs:502:19:502:33 | T2 |
+| overloading.rs:502:49:504:5 | { ... } |  | overloading.rs:502:15:502:16 | T1 |
+| overloading.rs:503:9:503:9 | x |  | overloading.rs:502:19:502:33 | T2 |
+| overloading.rs:506:38:506:38 | x |  | overloading.rs:506:16:506:17 | T1 |
+| overloading.rs:506:45:506:45 | y |  | overloading.rs:506:20:506:35 | T2 |
+| overloading.rs:506:66:508:5 | { ... } |  | overloading.rs:506:20:506:35 | T2::Output[MyTrait2] |
+| overloading.rs:507:9:507:9 | y |  | overloading.rs:506:20:506:35 | T2 |
+| overloading.rs:507:13:507:13 | x |  | overloading.rs:506:16:506:17 | T1 |
+| overloading.rs:510:15:522:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:513:13:513:13 | z |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:516:13:516:13 | y |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:516:17:516:35 | call_f::<...>(...) |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:519:27:519:30 | 0i32 |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:521:27:521:30 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
 | pattern_matching.rs:13:26:133:1 | { ... } |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:13:26:133:1 | { ... } | T | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:15:5:18:5 | if ... {...} |  | {EXTERNAL LOCATION} | () |
@@ -4920,6 +5033,65 @@ inferCertainType
 | raw_pointer.rs:58:19:58:23 | false |  | {EXTERNAL LOCATION} | bool |
 | raw_pointer.rs:59:5:59:30 | raw_type_from_deref(...) |  | {EXTERNAL LOCATION} | () |
 | raw_pointer.rs:59:25:59:29 | false |  | {EXTERNAL LOCATION} | bool |
+| regressions.rs:10:17:10:17 | s |  | regressions.rs:3:5:3:23 | S |
+| regressions.rs:10:17:10:17 | s | T | regressions.rs:9:10:9:10 | T |
+| regressions.rs:10:34:12:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:10:34:12:9 | { ... } | T | regressions.rs:9:10:9:10 | T |
+| regressions.rs:11:18:11:18 | s |  | regressions.rs:3:5:3:23 | S |
+| regressions.rs:11:18:11:18 | s | T | regressions.rs:9:10:9:10 | T |
+| regressions.rs:15:21:33:5 | { ... } |  | regressions.rs:5:5:7:5 | E |
+| regressions.rs:16:17:16:21 | vec_e |  | {EXTERNAL LOCATION} | Vec |
+| regressions.rs:16:17:16:21 | vec_e | A | {EXTERNAL LOCATION} | Global |
+| regressions.rs:16:25:16:34 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
+| regressions.rs:16:25:16:34 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| regressions.rs:19:13:19:13 | e |  | regressions.rs:5:5:7:5 | E |
+| regressions.rs:19:17:19:40 | ...::V {...} |  | regressions.rs:5:5:7:5 | E |
+| regressions.rs:19:29:19:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
+| regressions.rs:19:29:19:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| regressions.rs:21:9:23:9 | if ... {...} |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:21:32:23:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:22:13:22:17 | vec_e |  | {EXTERNAL LOCATION} | Vec |
+| regressions.rs:22:13:22:17 | vec_e | A | {EXTERNAL LOCATION} | Global |
+| regressions.rs:24:17:24:17 | e |  | regressions.rs:5:5:7:5 | E |
+| regressions.rs:27:17:30:9 | if ... {...} |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:27:37:27:41 | vec_e |  | {EXTERNAL LOCATION} | Vec |
+| regressions.rs:27:37:27:41 | vec_e | A | {EXTERNAL LOCATION} | Global |
+| regressions.rs:28:9:30:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:48:16:48:19 | SelfParam |  | regressions.rs:39:5:40:14 | S1 |
+| regressions.rs:48:22:48:25 | _rhs |  | regressions.rs:39:5:40:14 | S1 |
+| regressions.rs:48:50:50:9 | { ... } |  | regressions.rs:39:5:40:14 | S1 |
+| regressions.rs:57:16:57:19 | SelfParam |  | regressions.rs:39:5:40:14 | S1 |
+| regressions.rs:57:22:57:25 | _rhs |  | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:57:48:59:9 | { ... } |  | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:66:16:66:19 | SelfParam |  | regressions.rs:39:5:40:14 | S1 |
+| regressions.rs:66:22:66:26 | other |  | {EXTERNAL LOCATION} | & |
+| regressions.rs:66:22:66:26 | other | TRef | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:66:61:68:9 | { ... } |  | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:67:22:67:25 | self |  | regressions.rs:39:5:40:14 | S1 |
+| regressions.rs:67:29:67:33 | other |  | {EXTERNAL LOCATION} | & |
+| regressions.rs:67:29:67:33 | other | TRef | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:71:14:75:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:74:22:74:24 | &s2 |  | {EXTERNAL LOCATION} | & |
+| regressions.rs:82:20:82:24 | value |  | regressions.rs:81:18:81:18 | T |
+| regressions.rs:86:20:86:20 | s |  | regressions.rs:85:10:85:10 | T |
+| regressions.rs:86:34:88:9 | { ... } |  | regressions.rs:85:10:85:10 | T |
+| regressions.rs:87:13:87:13 | s |  | regressions.rs:85:10:85:10 | T |
+| regressions.rs:92:20:92:22 | val |  | regressions.rs:91:10:91:10 | T |
+| regressions.rs:92:41:94:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:92:41:94:9 | { ... } | T | regressions.rs:91:10:91:10 | T |
+| regressions.rs:93:18:93:20 | val |  | regressions.rs:91:10:91:10 | T |
+| regressions.rs:99:22:99:22 | x |  | regressions.rs:99:18:99:19 | T2 |
+| regressions.rs:103:5:107:5 | { ... } |  | regressions.rs:99:18:99:19 | T2 |
+| regressions.rs:104:33:104:33 | x |  | regressions.rs:99:18:99:19 | T2 |
+| regressions.rs:113:14:113:17 | SelfParam |  | regressions.rs:111:5:114:5 | Self [trait MyTrait] |
+| regressions.rs:118:14:118:17 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| regressions.rs:118:14:118:17 | SelfParam | TRef | regressions.rs:116:10:116:10 | T |
+| regressions.rs:118:20:118:21 | { ... } |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:124:19:124:22 | SelfParam |  | regressions.rs:121:5:121:19 | S |
+| regressions.rs:124:19:124:22 | SelfParam | T | regressions.rs:123:10:123:10 | T |
+| regressions.rs:127:9:130:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:128:24:128:27 | self |  | regressions.rs:121:5:121:19 | S |
+| regressions.rs:128:24:128:27 | self | T | regressions.rs:123:10:123:10 | T |
 inferType
 | associated_types.rs:5:15:5:18 | SelfParam |  | associated_types.rs:1:1:2:21 | Wrapper |
 | associated_types.rs:5:15:5:18 | SelfParam | A | associated_types.rs:4:6:4:6 | A |
@@ -5087,25 +5259,13 @@ inferType
 | associated_types.rs:229:23:229:27 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:229:23:229:27 | SelfParam | TRef | associated_types.rs:10:1:11:9 | S |
 | associated_types.rs:229:30:229:30 | t |  | associated_types.rs:229:20:229:20 | T |
-| associated_types.rs:232:9:234:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| associated_types.rs:232:9:234:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| associated_types.rs:233:13:233:25 | ...::through(...) |  | {EXTERNAL LOCATION} | bool |
-| associated_types.rs:233:13:233:25 | ...::through(...) |  | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:233:24:233:24 | t |  | associated_types.rs:229:20:229:20 | T |
 | associated_types.rs:237:19:241:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:238:13:238:13 | s |  | associated_types.rs:10:1:11:9 | S |
 | associated_types.rs:238:17:238:17 | S |  | associated_types.rs:10:1:11:9 | S |
-| associated_types.rs:239:13:239:14 | _a |  | {EXTERNAL LOCATION} | bool |
-| associated_types.rs:239:13:239:14 | _a |  | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:239:18:239:18 | s |  | associated_types.rs:10:1:11:9 | S |
-| associated_types.rs:239:18:239:32 | s.convert(...) |  | {EXTERNAL LOCATION} | bool |
-| associated_types.rs:239:18:239:32 | s.convert(...) |  | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:239:28:239:31 | true |  | {EXTERNAL LOCATION} | bool |
-| associated_types.rs:240:13:240:14 | _b |  | {EXTERNAL LOCATION} | bool |
-| associated_types.rs:240:13:240:14 | _b |  | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:240:18:240:18 | s |  | associated_types.rs:10:1:11:9 | S |
-| associated_types.rs:240:18:240:30 | s.convert(...) |  | {EXTERNAL LOCATION} | bool |
-| associated_types.rs:240:18:240:30 | s.convert(...) |  | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:240:28:240:29 | 42 |  | {EXTERNAL LOCATION} | i32 |
 | associated_types.rs:248:30:248:34 | thing |  | associated_types.rs:248:19:248:27 | T |
 | associated_types.rs:248:65:250:5 | { ... } |  | associated_types.rs:248:19:248:27 | T::Output[GetSet] |
@@ -5290,17 +5450,17 @@ inferType
 | associated_types.rs:454:24:454:28 | SelfParam | TRef | associated_types.rs:452:5:455:5 | Self [trait Subtrait] |
 | associated_types.rs:463:23:463:27 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:463:23:463:27 | SelfParam | TRef | associated_types.rs:457:5:467:5 | Self [trait Subtrait2] |
-| associated_types.rs:463:30:463:31 | c1 |  | associated_types.rs:20:5:20:16 | Output[Subtrait2] |
-| associated_types.rs:463:48:463:49 | c2 |  | associated_types.rs:20:5:20:16 | Output[Subtrait2] |
+| associated_types.rs:463:30:463:31 | c1 |  | associated_types.rs:20:5:20:16 | Output[Subtrait2 (inherited from GetSet)] |
+| associated_types.rs:463:48:463:49 | c2 |  | associated_types.rs:20:5:20:16 | Output[Subtrait2 (inherited from GetSet)] |
 | associated_types.rs:463:66:466:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | associated_types.rs:464:13:464:16 | self |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:464:13:464:16 | self | TRef | associated_types.rs:457:5:467:5 | Self [trait Subtrait2] |
 | associated_types.rs:464:13:464:24 | self.set(...) |  | {EXTERNAL LOCATION} | () |
-| associated_types.rs:464:22:464:23 | c1 |  | associated_types.rs:20:5:20:16 | Output[Subtrait2] |
+| associated_types.rs:464:22:464:23 | c1 |  | associated_types.rs:20:5:20:16 | Output[Subtrait2 (inherited from GetSet)] |
 | associated_types.rs:465:13:465:16 | self |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:465:13:465:16 | self | TRef | associated_types.rs:457:5:467:5 | Self [trait Subtrait2] |
 | associated_types.rs:465:13:465:24 | self.set(...) |  | {EXTERNAL LOCATION} | () |
-| associated_types.rs:465:22:465:23 | c2 |  | associated_types.rs:20:5:20:16 | Output[Subtrait2] |
+| associated_types.rs:465:22:465:23 | c2 |  | associated_types.rs:20:5:20:16 | Output[Subtrait2 (inherited from GetSet)] |
 | associated_types.rs:474:16:474:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | associated_types.rs:474:16:474:20 | SelfParam | TRef | associated_types.rs:469:5:469:24 | MyType |
 | associated_types.rs:474:16:474:20 | SelfParam | TRef.T | associated_types.rs:471:10:471:16 | T |
@@ -9488,7 +9648,6 @@ inferType
 | main.rs:1412:17:1412:20 | self | TRef.TSlice | main.rs:1410:14:1410:23 | T |
 | main.rs:1412:17:1412:27 | self.get(...) |  | {EXTERNAL LOCATION} | Option |
 | main.rs:1412:17:1412:27 | self.get(...) | T | {EXTERNAL LOCATION} | & |
-| main.rs:1412:17:1412:27 | self.get(...) | T.TRef | main.rs:1410:14:1410:23 | T |
 | main.rs:1412:17:1412:36 | ... .unwrap() |  | {EXTERNAL LOCATION} | & |
 | main.rs:1412:17:1412:36 | ... .unwrap() | TRef | main.rs:1410:14:1410:23 | T |
 | main.rs:1412:26:1412:26 | 0 |  | {EXTERNAL LOCATION} | i32 |
@@ -10625,7 +10784,6 @@ inferType
 | main.rs:2032:56:2034:9 | { ... } |  | {EXTERNAL LOCATION} | & |
 | main.rs:2032:56:2034:9 | { ... } | TRef | main.rs:2028:10:2028:10 | T |
 | main.rs:2033:13:2033:29 | &... |  | {EXTERNAL LOCATION} | & |
-| main.rs:2033:13:2033:29 | &... | TRef | {EXTERNAL LOCATION} | u8 |
 | main.rs:2033:13:2033:29 | &... | TRef | main.rs:2028:10:2028:10 | T |
 | main.rs:2033:14:2033:17 | self |  | {EXTERNAL LOCATION} | & |
 | main.rs:2033:14:2033:17 | self | TRef | main.rs:2013:5:2016:5 | MyVec |
@@ -10633,7 +10791,6 @@ inferType
 | main.rs:2033:14:2033:22 | self.data |  | {EXTERNAL LOCATION} | Vec |
 | main.rs:2033:14:2033:22 | self.data | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2033:14:2033:22 | self.data | T | main.rs:2028:10:2028:10 | T |
-| main.rs:2033:14:2033:29 | ...[index] |  | {EXTERNAL LOCATION} | u8 |
 | main.rs:2033:14:2033:29 | ...[index] |  | main.rs:2028:10:2028:10 | T |
 | main.rs:2033:24:2033:28 | index |  | {EXTERNAL LOCATION} | usize |
 | main.rs:2037:22:2037:26 | slice |  | {EXTERNAL LOCATION} | & |
@@ -11151,12 +11308,15 @@ inferType
 | main.rs:2319:18:2319:23 | range1 | Idx | {EXTERNAL LOCATION} | u16 |
 | main.rs:2319:25:2319:26 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2323:13:2323:17 | vals3 |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2323:13:2323:17 | vals3 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2323:21:2323:33 | MacroExpr |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2323:21:2323:33 | MacroExpr | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2323:26:2323:26 | 1 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2323:29:2323:29 | 2 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2323:32:2323:32 | 3 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2324:9:2324:25 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2324:18:2324:22 | vals3 |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2324:18:2324:22 | vals3 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2324:24:2324:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2326:13:2326:18 | vals4a |  | {EXTERNAL LOCATION} | Vec |
 | main.rs:2326:13:2326:18 | vals4a | A | {EXTERNAL LOCATION} | Global |
@@ -11246,18 +11406,25 @@ inferType
 | main.rs:2340:18:2340:22 | vals7 | T | {EXTERNAL LOCATION} | u8 |
 | main.rs:2340:24:2340:25 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2342:13:2342:19 | matrix1 |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2342:13:2342:19 | matrix1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2342:23:2342:50 | MacroExpr |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2342:23:2342:50 | MacroExpr | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2342:28:2342:37 | (...) |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2342:28:2342:37 | (...) | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2342:28:2342:37 | MacroExpr |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2342:28:2342:37 | MacroExpr | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2342:33:2342:33 | 1 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2342:36:2342:36 | 2 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2342:40:2342:49 | (...) |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2342:40:2342:49 | (...) | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2342:40:2342:49 | MacroExpr |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2342:40:2342:49 | MacroExpr | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2342:45:2342:45 | 3 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2342:48:2342:48 | 4 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:2344:13:2344:13 | _ |  | {EXTERNAL LOCATION} | () |
 | main.rs:2344:17:2347:9 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2344:28:2344:34 | matrix1 |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2344:28:2344:34 | matrix1 | A | {EXTERNAL LOCATION} | Global |
 | main.rs:2344:36:2347:9 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2345:13:2346:13 | for ... in ... { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2345:29:2346:13 | { ... } |  | {EXTERNAL LOCATION} | () |
@@ -11937,245 +12104,260 @@ inferType
 | main.rs:2633:18:2633:29 | { ... } |  | {EXTERNAL LOCATION} | () |
 | main.rs:2633:29:2633:29 | a |  | {EXTERNAL LOCATION} | () |
 | main.rs:2634:9:2634:9 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2639:16:2686:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2640:13:2640:13 | x |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2640:13:2640:13 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2640:17:2640:20 | None |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2640:17:2640:20 | None | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2641:13:2641:13 | x |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2641:13:2641:13 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2641:30:2641:30 | x |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2641:30:2641:30 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2642:13:2642:13 | x |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2642:13:2642:13 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2642:17:2642:35 | ...::None |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2642:17:2642:35 | ...::None | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2643:13:2643:13 | x |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2643:13:2643:13 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2643:17:2643:35 | ...::None::<...> |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2643:17:2643:35 | ...::None::<...> | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2645:26:2645:28 | opt |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2645:26:2645:28 | opt | T | main.rs:2645:23:2645:23 | T |
-| main.rs:2645:42:2645:42 | x |  | main.rs:2645:23:2645:23 | T |
-| main.rs:2645:48:2645:49 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2647:13:2647:13 | x |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2647:13:2647:13 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2647:17:2647:20 | None |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2647:17:2647:20 | None | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2648:9:2648:24 | pin_option(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2648:20:2648:20 | x |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2648:20:2648:20 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2648:23:2648:23 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2655:13:2655:13 | x |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2655:13:2655:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2655:13:2655:13 | x | T2 | {EXTERNAL LOCATION} | String |
-| main.rs:2655:17:2655:39 | ...::A {...} |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2655:17:2655:39 | ...::A {...} | T1 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2655:17:2655:39 | ...::A {...} | T2 | {EXTERNAL LOCATION} | String |
-| main.rs:2655:37:2655:37 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2656:13:2656:13 | x |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2656:13:2656:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2656:13:2656:13 | x | T2 | {EXTERNAL LOCATION} | String |
-| main.rs:2656:40:2656:40 | x |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2656:40:2656:40 | x | T1 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2656:40:2656:40 | x | T2 | {EXTERNAL LOCATION} | String |
-| main.rs:2657:13:2657:13 | x |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2657:13:2657:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2657:13:2657:13 | x | T2 | {EXTERNAL LOCATION} | String |
-| main.rs:2657:17:2657:52 | ...::A {...} |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2657:17:2657:52 | ...::A {...} | T1 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2657:17:2657:52 | ...::A {...} | T2 | {EXTERNAL LOCATION} | String |
-| main.rs:2657:50:2657:50 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2659:13:2659:13 | x |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2659:13:2659:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2659:13:2659:13 | x | T2 | {EXTERNAL LOCATION} | String |
-| main.rs:2659:17:2661:9 | ...::B::<...> {...} |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2659:17:2661:9 | ...::B::<...> {...} | T1 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2659:17:2661:9 | ...::B::<...> {...} | T2 | {EXTERNAL LOCATION} | String |
-| main.rs:2660:20:2660:32 | ...::new(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2663:29:2663:29 | e |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2663:29:2663:29 | e | T1 | main.rs:2663:26:2663:26 | T |
-| main.rs:2663:29:2663:29 | e | T2 | {EXTERNAL LOCATION} | String |
-| main.rs:2663:53:2663:53 | x |  | main.rs:2663:26:2663:26 | T |
-| main.rs:2663:59:2663:60 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2666:13:2666:13 | x |  | main.rs:2650:9:2653:9 | MyEither |
+| main.rs:2643:14:2643:17 | SelfParam |  | main.rs:2639:5:2640:13 | S |
+| main.rs:2643:20:2643:21 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2646:41:2648:5 | { ... } |  | main.rs:2646:22:2646:31 | T |
+| main.rs:2647:9:2647:26 | ...::default(...) |  | main.rs:2646:22:2646:31 | T |
+| main.rs:2650:16:2703:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2651:13:2651:13 | x |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2651:13:2651:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2651:17:2651:20 | None |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2651:17:2651:20 | None | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2652:13:2652:13 | x |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2652:13:2652:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2652:30:2652:30 | x |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2652:30:2652:30 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2653:13:2653:13 | x |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2653:13:2653:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2653:17:2653:35 | ...::None |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2653:17:2653:35 | ...::None | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2654:13:2654:13 | x |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2654:13:2654:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2654:17:2654:35 | ...::None::<...> |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2654:17:2654:35 | ...::None::<...> | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2656:26:2656:28 | opt |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2656:26:2656:28 | opt | T | main.rs:2656:23:2656:23 | T |
+| main.rs:2656:42:2656:42 | x |  | main.rs:2656:23:2656:23 | T |
+| main.rs:2656:48:2656:49 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2658:13:2658:13 | x |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2658:13:2658:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2658:17:2658:20 | None |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2658:17:2658:20 | None | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2659:9:2659:24 | pin_option(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2659:20:2659:20 | x |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2659:20:2659:20 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2659:23:2659:23 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2666:13:2666:13 | x |  | main.rs:2661:9:2664:9 | MyEither |
 | main.rs:2666:13:2666:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
 | main.rs:2666:13:2666:13 | x | T2 | {EXTERNAL LOCATION} | String |
-| main.rs:2666:17:2668:9 | ...::B {...} |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2666:17:2668:9 | ...::B {...} | T1 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2666:17:2668:9 | ...::B {...} | T2 | {EXTERNAL LOCATION} | String |
-| main.rs:2667:20:2667:32 | ...::new(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2669:9:2669:27 | pin_my_either(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2669:23:2669:23 | x |  | main.rs:2650:9:2653:9 | MyEither |
-| main.rs:2669:23:2669:23 | x | T1 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2669:23:2669:23 | x | T2 | {EXTERNAL LOCATION} | String |
-| main.rs:2669:26:2669:26 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2671:13:2671:13 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2671:13:2671:13 | x | E | {EXTERNAL LOCATION} | String |
-| main.rs:2671:13:2671:13 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2671:17:2671:29 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2671:17:2671:29 | ...::Ok(...) | E | {EXTERNAL LOCATION} | String |
-| main.rs:2671:17:2671:29 | ...::Ok(...) | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2671:28:2671:28 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2672:13:2672:13 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2672:13:2672:13 | x | E | {EXTERNAL LOCATION} | String |
-| main.rs:2672:13:2672:13 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2672:38:2672:38 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2672:38:2672:38 | x | E | {EXTERNAL LOCATION} | String |
-| main.rs:2672:38:2672:38 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2673:13:2673:13 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2673:13:2673:13 | x | E | {EXTERNAL LOCATION} | String |
-| main.rs:2673:13:2673:13 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2673:17:2673:44 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2673:17:2673:44 | ...::Ok(...) | E | {EXTERNAL LOCATION} | String |
-| main.rs:2673:17:2673:44 | ...::Ok(...) | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2673:43:2673:43 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2674:13:2674:13 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2674:13:2674:13 | x | E | {EXTERNAL LOCATION} | String |
-| main.rs:2674:13:2674:13 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2674:17:2674:44 | ...::Ok::<...>(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2674:17:2674:44 | ...::Ok::<...>(...) | E | {EXTERNAL LOCATION} | String |
-| main.rs:2674:17:2674:44 | ...::Ok::<...>(...) | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2674:43:2674:43 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2676:29:2676:31 | res |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2676:29:2676:31 | res | E | main.rs:2676:26:2676:26 | E |
-| main.rs:2676:29:2676:31 | res | T | main.rs:2676:23:2676:23 | T |
-| main.rs:2676:48:2676:48 | x |  | main.rs:2676:26:2676:26 | E |
-| main.rs:2676:54:2676:55 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2678:13:2678:13 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2678:13:2678:13 | x | E | {EXTERNAL LOCATION} | bool |
-| main.rs:2678:13:2678:13 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2678:17:2678:29 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2678:17:2678:29 | ...::Ok(...) | E | {EXTERNAL LOCATION} | bool |
-| main.rs:2678:17:2678:29 | ...::Ok(...) | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2678:28:2678:28 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2679:9:2679:28 | pin_result(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2679:20:2679:20 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2679:20:2679:20 | x | E | {EXTERNAL LOCATION} | bool |
-| main.rs:2679:20:2679:20 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2679:23:2679:27 | false |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2681:17:2681:17 | x |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2681:17:2681:17 | x | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2681:17:2681:17 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2681:21:2681:30 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2681:21:2681:30 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2681:21:2681:30 | ...::new(...) | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2682:9:2682:9 | x |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2682:9:2682:9 | x | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2682:9:2682:9 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2682:9:2682:17 | x.push(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2682:16:2682:16 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2684:13:2684:13 | y |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2684:17:2684:34 | ...::default(...) |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2685:9:2685:9 | x |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2685:9:2685:9 | x | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2685:9:2685:9 | x | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2685:9:2685:17 | x.push(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2685:16:2685:16 | y |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2692:14:2692:17 | SelfParam |  | main.rs:2690:5:2698:5 | Self [trait MyTrait] |
-| main.rs:2695:14:2695:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
-| main.rs:2695:14:2695:18 | SelfParam | TRef | main.rs:2690:5:2698:5 | Self [trait MyTrait] |
-| main.rs:2695:21:2695:25 | other |  | {EXTERNAL LOCATION} | & |
-| main.rs:2695:21:2695:25 | other | TRef | main.rs:2690:5:2698:5 | Self [trait MyTrait] |
-| main.rs:2695:44:2697:9 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:2695:44:2697:9 | { ... } | TRef | main.rs:2690:5:2698:5 | Self [trait MyTrait] |
-| main.rs:2696:13:2696:16 | self |  | {EXTERNAL LOCATION} | & |
-| main.rs:2696:13:2696:16 | self | TRef | main.rs:2690:5:2698:5 | Self [trait MyTrait] |
-| main.rs:2696:13:2696:20 | self.f() |  | {EXTERNAL LOCATION} | & |
-| main.rs:2696:13:2696:20 | self.f() | TRef | main.rs:2690:5:2698:5 | Self [trait MyTrait] |
-| main.rs:2702:14:2702:17 | SelfParam |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2702:28:2704:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2703:13:2703:16 | self |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2709:14:2709:17 | SelfParam |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2709:28:2711:9 | { ... } |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2710:13:2710:16 | self |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2716:14:2716:17 | SelfParam |  | {EXTERNAL LOCATION} | & |
-| main.rs:2716:14:2716:17 | SelfParam | TRef | main.rs:2714:10:2714:10 | T |
-| main.rs:2716:28:2718:9 | { ... } |  | {EXTERNAL LOCATION} | & |
-| main.rs:2716:28:2718:9 | { ... } | TRef | main.rs:2714:10:2714:10 | T |
-| main.rs:2717:13:2717:16 | self |  | {EXTERNAL LOCATION} | & |
-| main.rs:2717:13:2717:16 | self | TRef | main.rs:2714:10:2714:10 | T |
-| main.rs:2721:25:2725:5 | { ... } |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2722:17:2722:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2722:17:2722:17 | x |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2722:21:2722:21 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2722:21:2722:21 | 0 |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2723:9:2723:9 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2723:9:2723:9 | x |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2723:9:2723:17 | ... = ... |  | {EXTERNAL LOCATION} | () |
-| main.rs:2723:13:2723:13 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2723:13:2723:13 | x |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2723:13:2723:17 | x.f() |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2723:13:2723:17 | x.f() |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2724:9:2724:9 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2724:9:2724:9 | x |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2727:12:2735:5 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2728:13:2728:13 | x |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2728:24:2728:24 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2728:24:2728:24 | 0 |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2729:13:2729:13 | y |  | {EXTERNAL LOCATION} | & |
-| main.rs:2729:13:2729:13 | y | TRef | {EXTERNAL LOCATION} | i32 |
-| main.rs:2729:17:2729:18 | &1 |  | {EXTERNAL LOCATION} | & |
-| main.rs:2729:17:2729:18 | &1 | TRef | {EXTERNAL LOCATION} | i32 |
-| main.rs:2729:18:2729:18 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2730:13:2730:13 | z |  | {EXTERNAL LOCATION} | & |
-| main.rs:2730:13:2730:13 | z | TRef | {EXTERNAL LOCATION} | usize |
-| main.rs:2730:17:2730:17 | x |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2730:17:2730:22 | x.g(...) |  | {EXTERNAL LOCATION} | & |
-| main.rs:2730:17:2730:22 | x.g(...) | TRef | {EXTERNAL LOCATION} | usize |
-| main.rs:2730:21:2730:21 | y |  | {EXTERNAL LOCATION} | & |
-| main.rs:2730:21:2730:21 | y | TRef | {EXTERNAL LOCATION} | i32 |
-| main.rs:2732:13:2732:13 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2732:17:2732:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2733:13:2733:13 | y |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2733:24:2733:24 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2733:24:2733:24 | 1 |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2734:13:2734:13 | z |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2734:17:2734:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2734:17:2734:24 | x.max(...) |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2734:23:2734:23 | y |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2744:11:2779:1 | { ... } |  | {EXTERNAL LOCATION} | () |
-| main.rs:2745:5:2745:21 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2746:5:2746:20 | ...::f(...) |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2747:5:2747:60 | ...::g(...) |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2747:20:2747:38 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2747:41:2747:59 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2748:5:2748:35 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2749:5:2749:41 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2750:5:2750:45 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2751:5:2751:30 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2752:5:2752:21 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2753:5:2753:27 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2754:5:2754:32 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2755:5:2755:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2756:5:2756:36 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2757:5:2757:35 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2758:5:2758:29 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2759:5:2759:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2760:5:2760:24 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2761:5:2761:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2762:5:2762:18 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2763:5:2763:15 | ...::f(...) |  | {EXTERNAL LOCATION} | dyn Future |
-| main.rs:2763:5:2763:15 | ...::f(...) | dyn(Output) | {EXTERNAL LOCATION} | () |
-| main.rs:2764:5:2764:19 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2765:5:2765:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2766:5:2766:14 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2767:5:2767:27 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2768:5:2768:15 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2769:5:2769:43 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2770:5:2770:15 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2771:5:2771:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2772:5:2772:28 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2773:5:2773:23 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2774:5:2774:41 | ...::test_all_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2775:5:2775:49 | ...::box_patterns(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2776:5:2776:20 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
-| main.rs:2777:5:2777:20 | ...::f(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2777:5:2777:20 | ...::f(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2777:5:2777:20 | ...::f(...) | T | main.rs:2547:5:2549:5 | dyn MyTrait |
-| main.rs:2777:5:2777:20 | ...::f(...) | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2777:16:2777:19 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2778:5:2778:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2666:17:2666:39 | ...::A {...} |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2666:17:2666:39 | ...::A {...} | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2666:17:2666:39 | ...::A {...} | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2666:37:2666:37 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2667:13:2667:13 | x |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2667:13:2667:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2667:13:2667:13 | x | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2667:40:2667:40 | x |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2667:40:2667:40 | x | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2667:40:2667:40 | x | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2668:13:2668:13 | x |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2668:13:2668:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2668:13:2668:13 | x | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2668:17:2668:52 | ...::A {...} |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2668:17:2668:52 | ...::A {...} | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2668:17:2668:52 | ...::A {...} | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2668:50:2668:50 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2670:13:2670:13 | x |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2670:13:2670:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2670:13:2670:13 | x | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2670:17:2672:9 | ...::B::<...> {...} |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2670:17:2672:9 | ...::B::<...> {...} | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2670:17:2672:9 | ...::B::<...> {...} | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2671:20:2671:32 | ...::new(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2674:29:2674:29 | e |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2674:29:2674:29 | e | T1 | main.rs:2674:26:2674:26 | T |
+| main.rs:2674:29:2674:29 | e | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2674:53:2674:53 | x |  | main.rs:2674:26:2674:26 | T |
+| main.rs:2674:59:2674:60 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2677:13:2677:13 | x |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2677:13:2677:13 | x | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2677:13:2677:13 | x | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2677:17:2679:9 | ...::B {...} |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2677:17:2679:9 | ...::B {...} | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2677:17:2679:9 | ...::B {...} | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2678:20:2678:32 | ...::new(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2680:9:2680:27 | pin_my_either(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2680:23:2680:23 | x |  | main.rs:2661:9:2664:9 | MyEither |
+| main.rs:2680:23:2680:23 | x | T1 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2680:23:2680:23 | x | T2 | {EXTERNAL LOCATION} | String |
+| main.rs:2680:26:2680:26 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2682:13:2682:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2682:13:2682:13 | x | E | {EXTERNAL LOCATION} | String |
+| main.rs:2682:13:2682:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2682:17:2682:29 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2682:17:2682:29 | ...::Ok(...) | E | {EXTERNAL LOCATION} | String |
+| main.rs:2682:17:2682:29 | ...::Ok(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2682:28:2682:28 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2683:13:2683:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2683:13:2683:13 | x | E | {EXTERNAL LOCATION} | String |
+| main.rs:2683:13:2683:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2683:38:2683:38 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2683:38:2683:38 | x | E | {EXTERNAL LOCATION} | String |
+| main.rs:2683:38:2683:38 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2684:13:2684:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2684:13:2684:13 | x | E | {EXTERNAL LOCATION} | String |
+| main.rs:2684:13:2684:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2684:17:2684:44 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2684:17:2684:44 | ...::Ok(...) | E | {EXTERNAL LOCATION} | String |
+| main.rs:2684:17:2684:44 | ...::Ok(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2684:43:2684:43 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2685:13:2685:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2685:13:2685:13 | x | E | {EXTERNAL LOCATION} | String |
+| main.rs:2685:13:2685:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2685:17:2685:44 | ...::Ok::<...>(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2685:17:2685:44 | ...::Ok::<...>(...) | E | {EXTERNAL LOCATION} | String |
+| main.rs:2685:17:2685:44 | ...::Ok::<...>(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2685:43:2685:43 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2687:29:2687:31 | res |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2687:29:2687:31 | res | E | main.rs:2687:26:2687:26 | E |
+| main.rs:2687:29:2687:31 | res | T | main.rs:2687:23:2687:23 | T |
+| main.rs:2687:48:2687:48 | x |  | main.rs:2687:26:2687:26 | E |
+| main.rs:2687:54:2687:55 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2689:13:2689:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2689:13:2689:13 | x | E | {EXTERNAL LOCATION} | bool |
+| main.rs:2689:13:2689:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2689:17:2689:29 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2689:17:2689:29 | ...::Ok(...) | E | {EXTERNAL LOCATION} | bool |
+| main.rs:2689:17:2689:29 | ...::Ok(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2689:28:2689:28 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2690:9:2690:28 | pin_result(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2690:20:2690:20 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2690:20:2690:20 | x | E | {EXTERNAL LOCATION} | bool |
+| main.rs:2690:20:2690:20 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2690:23:2690:27 | false |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2692:17:2692:17 | x |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2692:17:2692:17 | x | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2692:17:2692:17 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2692:21:2692:30 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2692:21:2692:30 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2692:21:2692:30 | ...::new(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2693:9:2693:9 | x |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2693:9:2693:9 | x | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2693:9:2693:9 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2693:9:2693:17 | x.push(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2693:16:2693:16 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2695:13:2695:13 | y |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2695:17:2695:34 | ...::default(...) |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2696:9:2696:9 | x |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2696:9:2696:9 | x | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2696:9:2696:9 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2696:9:2696:17 | x.push(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2696:16:2696:16 | y |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2698:13:2698:13 | s |  | main.rs:2639:5:2640:13 | S |
+| main.rs:2698:17:2698:34 | ...::default(...) |  | main.rs:2639:5:2640:13 | S |
+| main.rs:2699:9:2699:15 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2699:14:2699:14 | s |  | main.rs:2639:5:2640:13 | S |
+| main.rs:2701:13:2701:13 | z |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2701:17:2701:31 | free_function(...) |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2702:9:2702:9 | x |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2702:9:2702:9 | x | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2702:9:2702:9 | x | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2702:9:2702:17 | x.push(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2702:16:2702:16 | z |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2709:14:2709:17 | SelfParam |  | main.rs:2707:5:2715:5 | Self [trait MyTrait] |
+| main.rs:2712:14:2712:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| main.rs:2712:14:2712:18 | SelfParam | TRef | main.rs:2707:5:2715:5 | Self [trait MyTrait] |
+| main.rs:2712:21:2712:25 | other |  | {EXTERNAL LOCATION} | & |
+| main.rs:2712:21:2712:25 | other | TRef | main.rs:2707:5:2715:5 | Self [trait MyTrait] |
+| main.rs:2712:44:2714:9 | { ... } |  | {EXTERNAL LOCATION} | & |
+| main.rs:2712:44:2714:9 | { ... } | TRef | main.rs:2707:5:2715:5 | Self [trait MyTrait] |
+| main.rs:2713:13:2713:16 | self |  | {EXTERNAL LOCATION} | & |
+| main.rs:2713:13:2713:16 | self | TRef | main.rs:2707:5:2715:5 | Self [trait MyTrait] |
+| main.rs:2713:13:2713:20 | self.f() |  | {EXTERNAL LOCATION} | & |
+| main.rs:2713:13:2713:20 | self.f() | TRef | main.rs:2707:5:2715:5 | Self [trait MyTrait] |
+| main.rs:2719:14:2719:17 | SelfParam |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2719:28:2721:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2720:13:2720:16 | self |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2726:14:2726:17 | SelfParam |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2726:28:2728:9 | { ... } |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2727:13:2727:16 | self |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2733:14:2733:17 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| main.rs:2733:14:2733:17 | SelfParam | TRef | main.rs:2731:10:2731:10 | T |
+| main.rs:2733:28:2735:9 | { ... } |  | {EXTERNAL LOCATION} | & |
+| main.rs:2733:28:2735:9 | { ... } | TRef | main.rs:2731:10:2731:10 | T |
+| main.rs:2734:13:2734:16 | self |  | {EXTERNAL LOCATION} | & |
+| main.rs:2734:13:2734:16 | self | TRef | main.rs:2731:10:2731:10 | T |
+| main.rs:2738:25:2742:5 | { ... } |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2739:17:2739:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2739:17:2739:17 | x |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2739:21:2739:21 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2739:21:2739:21 | 0 |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2740:9:2740:9 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2740:9:2740:9 | x |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2740:9:2740:17 | ... = ... |  | {EXTERNAL LOCATION} | () |
+| main.rs:2740:13:2740:13 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2740:13:2740:13 | x |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2740:13:2740:17 | x.f() |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2740:13:2740:17 | x.f() |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2741:9:2741:9 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2741:9:2741:9 | x |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2744:12:2752:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2745:13:2745:13 | x |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2745:24:2745:24 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2745:24:2745:24 | 0 |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2746:13:2746:13 | y |  | {EXTERNAL LOCATION} | & |
+| main.rs:2746:13:2746:13 | y | TRef | {EXTERNAL LOCATION} | i32 |
+| main.rs:2746:17:2746:18 | &1 |  | {EXTERNAL LOCATION} | & |
+| main.rs:2746:17:2746:18 | &1 | TRef | {EXTERNAL LOCATION} | i32 |
+| main.rs:2746:18:2746:18 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2747:13:2747:13 | z |  | {EXTERNAL LOCATION} | & |
+| main.rs:2747:13:2747:13 | z | TRef | {EXTERNAL LOCATION} | usize |
+| main.rs:2747:17:2747:17 | x |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2747:17:2747:22 | x.g(...) |  | {EXTERNAL LOCATION} | & |
+| main.rs:2747:17:2747:22 | x.g(...) | TRef | {EXTERNAL LOCATION} | usize |
+| main.rs:2747:21:2747:21 | y |  | {EXTERNAL LOCATION} | & |
+| main.rs:2747:21:2747:21 | y | TRef | {EXTERNAL LOCATION} | i32 |
+| main.rs:2749:13:2749:13 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2749:17:2749:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2750:13:2750:13 | y |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2750:24:2750:24 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2750:24:2750:24 | 1 |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2751:13:2751:13 | z |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2751:17:2751:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2751:17:2751:24 | x.max(...) |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2751:23:2751:23 | y |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2762:11:2797:1 | { ... } |  | {EXTERNAL LOCATION} | () |
+| main.rs:2763:5:2763:21 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2764:5:2764:20 | ...::f(...) |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2765:5:2765:60 | ...::g(...) |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2765:20:2765:38 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2765:41:2765:59 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2766:5:2766:35 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2767:5:2767:41 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2768:5:2768:45 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2769:5:2769:30 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2770:5:2770:21 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2771:5:2771:27 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2772:5:2772:32 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2773:5:2773:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2774:5:2774:36 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2775:5:2775:35 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2776:5:2776:29 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2777:5:2777:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2778:5:2778:24 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2779:5:2779:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2780:5:2780:18 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2781:5:2781:15 | ...::f(...) |  | {EXTERNAL LOCATION} | dyn Future |
+| main.rs:2781:5:2781:15 | ...::f(...) | dyn(Output) | {EXTERNAL LOCATION} | () |
+| main.rs:2782:5:2782:19 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2783:5:2783:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2784:5:2784:14 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2785:5:2785:27 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2786:5:2786:15 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2787:5:2787:43 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2788:5:2788:15 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2789:5:2789:17 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2790:5:2790:28 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2791:5:2791:23 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2792:5:2792:41 | ...::test_all_patterns(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2793:5:2793:49 | ...::box_patterns(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2794:5:2794:20 | ...::test(...) |  | {EXTERNAL LOCATION} | () |
+| main.rs:2795:5:2795:20 | ...::f(...) |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2795:5:2795:20 | ...::f(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2795:5:2795:20 | ...::f(...) | T | main.rs:2547:5:2549:5 | dyn MyTrait |
+| main.rs:2795:5:2795:20 | ...::f(...) | T.dyn(T) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2795:16:2795:19 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2796:5:2796:23 | ...::f(...) |  | {EXTERNAL LOCATION} | () |
 | overloading.rs:4:19:4:23 | SelfParam |  | {EXTERNAL LOCATION} | & |
 | overloading.rs:4:19:4:23 | SelfParam | TRef | overloading.rs:2:5:11:5 | Self [trait FirstTrait] |
 | overloading.rs:4:34:6:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
@@ -12632,6 +12814,168 @@ inferType
 | overloading.rs:399:17:399:29 | ...::from(...) |  | overloading.rs:372:5:372:14 | S1 |
 | overloading.rs:399:28:399:28 | s |  | overloading.rs:364:5:365:13 | S |
 | overloading.rs:400:9:400:9 | x |  | overloading.rs:372:5:372:14 | S1 |
+| overloading.rs:408:16:408:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:408:16:408:20 | SelfParam | TRef | overloading.rs:407:5:410:5 | Self [trait Trait] |
+| overloading.rs:409:16:409:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:409:16:409:20 | SelfParam | TRef | overloading.rs:407:5:410:5 | Self [trait Trait] |
+| overloading.rs:414:16:414:16 | x |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:414:16:414:16 | x | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:414:16:414:16 | x | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:414:26:414:27 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:417:16:417:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:417:16:417:20 | SelfParam | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:417:16:417:20 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:417:23:417:24 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:422:16:422:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:422:16:422:20 | SelfParam | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:422:16:422:20 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:422:23:426:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:423:13:423:24 | ...::foo(...) |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:423:20:423:23 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:423:20:423:23 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:423:20:423:23 | self | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:424:13:424:31 | ...::foo(...) |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:424:27:424:30 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:424:27:424:30 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:424:27:424:30 | self | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:425:13:425:16 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:425:13:425:16 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:425:13:425:16 | self | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:425:13:425:22 | self.foo() |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:429:16:429:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:429:16:429:20 | SelfParam | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:429:16:429:20 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:429:23:433:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:430:13:430:24 | ...::bar(...) |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:430:20:430:23 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:430:20:430:23 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:430:20:430:23 | self | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:431:13:431:31 | ...::bar(...) |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:431:27:431:30 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:431:27:431:30 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:431:27:431:30 | self | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:432:13:432:16 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:432:13:432:16 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:432:13:432:16 | self | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:432:13:432:22 | self.bar() |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:438:16:438:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:438:16:438:20 | SelfParam | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:438:16:438:20 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:438:23:442:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:440:13:440:31 | ...::foo(...) |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:440:27:440:30 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:440:27:440:30 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:440:27:440:30 | self | TRef.T | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:441:13:441:16 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:441:13:441:16 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:441:13:441:16 | self | TRef.T | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:441:13:441:22 | self.foo() |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:445:16:445:20 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:445:16:445:20 | SelfParam | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:445:16:445:20 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:445:23:449:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:447:13:447:31 | ...::bar(...) |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:447:27:447:30 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:447:27:447:30 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:447:27:447:30 | self | TRef.T | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:448:13:448:16 | self |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:448:13:448:16 | self | TRef | overloading.rs:405:5:405:19 | S |
+| overloading.rs:448:13:448:16 | self | TRef.T | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:448:13:448:22 | self.bar() |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:455:14:455:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:455:14:455:18 | SelfParam | TRef | overloading.rs:454:5:456:5 | Self [trait MyTrait] |
+| overloading.rs:461:14:461:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:461:14:461:18 | SelfParam | TRef | overloading.rs:458:5:462:5 | Self [trait MyTrait2] |
+| overloading.rs:461:21:461:21 | x |  | overloading.rs:458:20:458:27 | T |
+| overloading.rs:467:14:467:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:467:14:467:18 | SelfParam | TRef | overloading.rs:464:5:464:19 | S |
+| overloading.rs:467:14:467:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:467:28:469:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:468:13:468:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:473:14:473:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:473:14:473:18 | SelfParam | TRef | overloading.rs:464:5:464:19 | S |
+| overloading.rs:473:14:473:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:473:28:475:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:474:13:474:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:474:13:474:13 | 0 |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:481:14:481:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:481:14:481:18 | SelfParam | TRef | overloading.rs:464:5:464:19 | S |
+| overloading.rs:481:14:481:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:481:21:481:21 | x |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:481:21:481:21 | x | T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:481:48:483:9 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:482:13:482:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:489:14:489:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:489:14:489:18 | SelfParam | TRef | overloading.rs:464:5:464:19 | S |
+| overloading.rs:489:14:489:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:489:21:489:21 | x |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:489:21:489:21 | x | T | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:489:48:491:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:490:13:490:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:490:13:490:13 | 0 |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:497:14:497:18 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| overloading.rs:497:14:497:18 | SelfParam | TRef | overloading.rs:464:5:464:19 | S |
+| overloading.rs:497:14:497:18 | SelfParam | TRef.T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:497:21:497:21 | x |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:497:21:497:21 | x | T | {EXTERNAL LOCATION} | bool |
+| overloading.rs:497:49:499:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:498:13:498:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:498:13:498:13 | 0 |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:502:36:502:36 | x |  | overloading.rs:502:19:502:33 | T2 |
+| overloading.rs:502:49:504:5 | { ... } |  | overloading.rs:502:15:502:16 | T1 |
+| overloading.rs:503:9:503:9 | x |  | overloading.rs:502:19:502:33 | T2 |
+| overloading.rs:503:9:503:13 | x.f() |  | overloading.rs:502:15:502:16 | T1 |
+| overloading.rs:506:38:506:38 | x |  | overloading.rs:506:16:506:17 | T1 |
+| overloading.rs:506:45:506:45 | y |  | overloading.rs:506:20:506:35 | T2 |
+| overloading.rs:506:66:508:5 | { ... } |  | overloading.rs:506:20:506:35 | T2::Output[MyTrait2] |
+| overloading.rs:507:9:507:9 | y |  | overloading.rs:506:20:506:35 | T2 |
+| overloading.rs:507:9:507:14 | y.f(...) |  | overloading.rs:506:20:506:35 | T2::Output[MyTrait2] |
+| overloading.rs:507:13:507:13 | x |  | overloading.rs:506:16:506:17 | T1 |
+| overloading.rs:510:15:522:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| overloading.rs:511:13:511:13 | x |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:511:13:511:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:511:17:511:20 | S(...) |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:511:17:511:20 | S(...) | T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:511:19:511:19 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:512:13:512:13 | y |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:512:17:512:25 | call_f(...) |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:512:24:512:24 | x |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:512:24:512:24 | x | T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:513:13:513:13 | z |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:513:22:513:22 | y |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:515:13:515:13 | x |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:515:13:515:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:515:17:515:20 | S(...) |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:515:17:515:20 | S(...) | T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:515:19:515:19 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:516:13:516:13 | y |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:516:17:516:35 | call_f::<...>(...) |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:516:34:516:34 | x |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:516:34:516:34 | x | T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:518:13:518:13 | x |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:518:13:518:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:518:17:518:20 | S(...) |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:518:17:518:20 | S(...) | T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:518:19:518:19 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:519:13:519:13 | y |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:519:17:519:35 | call_f2(...) |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:519:25:519:31 | S(...) |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:519:25:519:31 | S(...) | T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:519:27:519:30 | 0i32 |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:519:34:519:34 | x |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:519:34:519:34 | x | T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:520:13:520:13 | x |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:520:13:520:13 | x | T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:520:17:520:20 | S(...) |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:520:17:520:20 | S(...) | T | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:520:19:520:19 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| overloading.rs:521:13:521:13 | y |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:521:17:521:35 | call_f2(...) |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:521:25:521:31 | S(...) |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:521:25:521:31 | S(...) | T | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:521:27:521:30 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
+| overloading.rs:521:34:521:34 | x |  | overloading.rs:464:5:464:19 | S |
+| overloading.rs:521:34:521:34 | x | T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:13:26:133:1 | { ... } |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:13:26:133:1 | { ... } | T | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:14:9:14:13 | value |  | {EXTERNAL LOCATION} | Option |
@@ -14468,7 +14812,9 @@ inferType
 | pattern_matching.rs:788:41:788:45 | tuple | T2 | {EXTERNAL LOCATION} | bool |
 | pattern_matching.rs:792:35:824:1 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:794:9:794:14 | points |  | {EXTERNAL LOCATION} | Vec |
+| pattern_matching.rs:794:9:794:14 | points | A | {EXTERNAL LOCATION} | Global |
 | pattern_matching.rs:794:18:794:65 | MacroExpr |  | {EXTERNAL LOCATION} | Vec |
+| pattern_matching.rs:794:18:794:65 | MacroExpr | A | {EXTERNAL LOCATION} | Global |
 | 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 |
@@ -14482,6 +14828,7 @@ inferType
 | 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:795:27:795:32 | points |  | {EXTERNAL LOCATION} | Vec |
+| pattern_matching.rs:795:27:795:32 | points | A | {EXTERNAL LOCATION} | Global |
 | pattern_matching.rs:795:34:799:5 | { ... } |  | {EXTERNAL LOCATION} | () |
 | pattern_matching.rs:796:13:796:18 | loop_x |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:796:22:796:22 | x |  | {EXTERNAL LOCATION} | i32 |
@@ -14681,4 +15028,134 @@ inferType
 | raw_pointer.rs:58:19:58:23 | false |  | {EXTERNAL LOCATION} | bool |
 | raw_pointer.rs:59:5:59:30 | raw_type_from_deref(...) |  | {EXTERNAL LOCATION} | () |
 | raw_pointer.rs:59:25:59:29 | false |  | {EXTERNAL LOCATION} | bool |
+| regressions.rs:10:17:10:17 | s |  | regressions.rs:3:5:3:23 | S |
+| regressions.rs:10:17:10:17 | s | T | regressions.rs:9:10:9:10 | T |
+| regressions.rs:10:34:12:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:10:34:12:9 | { ... } | T | regressions.rs:9:10:9:10 | T |
+| regressions.rs:11:13:11:21 | Some(...) |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:11:13:11:21 | Some(...) | T | regressions.rs:9:10:9:10 | T |
+| regressions.rs:11:18:11:18 | s |  | regressions.rs:3:5:3:23 | S |
+| regressions.rs:11:18:11:18 | s | T | regressions.rs:9:10:9:10 | T |
+| regressions.rs:11:18:11:20 | s.0 |  | regressions.rs:9:10:9:10 | T |
+| regressions.rs:15:21:33:5 | { ... } |  | regressions.rs:5:5:7:5 | E |
+| regressions.rs:16:17:16:21 | vec_e |  | {EXTERNAL LOCATION} | Vec |
+| regressions.rs:16:17:16:21 | vec_e | A | {EXTERNAL LOCATION} | Global |
+| regressions.rs:16:17:16:21 | vec_e | T | regressions.rs:5:5:7:5 | E |
+| regressions.rs:16:25:16:34 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
+| regressions.rs:16:25:16:34 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| regressions.rs:16:25:16:34 | ...::new(...) | T | regressions.rs:5:5:7:5 | E |
+| regressions.rs:17:17:17:21 | opt_e |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:17:17:17:21 | opt_e | T | regressions.rs:5:5:7:5 | E |
+| regressions.rs:17:25:17:28 | None |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:17:25:17:28 | None | T | regressions.rs:5:5:7:5 | E |
+| regressions.rs:19:13:19:13 | e |  | regressions.rs:5:5:7:5 | E |
+| regressions.rs:19:17:19:40 | ...::V {...} |  | regressions.rs:5:5:7:5 | E |
+| regressions.rs:19:29:19:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
+| regressions.rs:19:29:19:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| regressions.rs:19:29:19:38 | ...::new(...) | T | regressions.rs:5:5:7:5 | E |
+| regressions.rs:21:9:23:9 | if ... {...} |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:21:16:21:22 | Some(...) |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:21:16:21:22 | Some(...) | T | regressions.rs:5:5:7:5 | E |
+| regressions.rs:21:21:21:21 | e |  | regressions.rs:5:5:7:5 | E |
+| regressions.rs:21:26:21:30 | opt_e |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:21:26:21:30 | opt_e | T | regressions.rs:5:5:7:5 | E |
+| regressions.rs:21:32:23:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:22:13:22:17 | vec_e |  | {EXTERNAL LOCATION} | Vec |
+| regressions.rs:22:13:22:17 | vec_e | A | {EXTERNAL LOCATION} | Global |
+| regressions.rs:22:13:22:17 | vec_e | T | regressions.rs:5:5:7:5 | E |
+| regressions.rs:22:13:22:25 | vec_e.push(...) |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:22:24:22:24 | e |  | regressions.rs:5:5:7:5 | E |
+| regressions.rs:24:9:24:13 | opt_e |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:24:9:24:13 | opt_e | T | regressions.rs:5:5:7:5 | E |
+| regressions.rs:24:9:24:24 | ... = ... |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:24:17:24:17 | e |  | regressions.rs:5:5:7:5 | E |
+| regressions.rs:24:17:24:24 | e.into() |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:24:17:24:24 | e.into() | T | regressions.rs:5:5:7:5 | E |
+| regressions.rs:27:13:27:13 | _ |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:27:17:30:9 | if ... {...} |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:27:24:27:33 | Some(...) |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:27:24:27:33 | Some(...) | T | regressions.rs:5:5:7:5 | E |
+| regressions.rs:27:29:27:32 | last |  | regressions.rs:5:5:7:5 | E |
+| regressions.rs:27:37:27:41 | vec_e |  | {EXTERNAL LOCATION} | Vec |
+| regressions.rs:27:37:27:41 | vec_e | A | {EXTERNAL LOCATION} | Global |
+| regressions.rs:27:37:27:41 | vec_e | T | regressions.rs:5:5:7:5 | E |
+| regressions.rs:27:37:27:47 | vec_e.pop() |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:27:37:27:47 | vec_e.pop() | T | regressions.rs:5:5:7:5 | E |
+| regressions.rs:28:9:30:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:29:13:29:17 | opt_e |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:29:13:29:17 | opt_e | T | regressions.rs:5:5:7:5 | E |
+| regressions.rs:29:13:29:31 | ... = ... |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:29:21:29:24 | last |  | regressions.rs:5:5:7:5 | E |
+| regressions.rs:29:21:29:31 | last.into() |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:29:21:29:31 | last.into() | T | regressions.rs:5:5:7:5 | E |
+| regressions.rs:32:9:32:13 | opt_e |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:32:9:32:13 | opt_e | T | regressions.rs:5:5:7:5 | E |
+| regressions.rs:32:9:32:22 | opt_e.unwrap() |  | regressions.rs:5:5:7:5 | E |
+| regressions.rs:48:16:48:19 | SelfParam |  | regressions.rs:39:5:40:14 | S1 |
+| regressions.rs:48:22:48:25 | _rhs |  | regressions.rs:39:5:40:14 | S1 |
+| regressions.rs:48:50:50:9 | { ... } |  | regressions.rs:39:5:40:14 | S1 |
+| regressions.rs:49:13:49:14 | S1 |  | regressions.rs:39:5:40:14 | S1 |
+| regressions.rs:57:16:57:19 | SelfParam |  | regressions.rs:39:5:40:14 | S1 |
+| regressions.rs:57:22:57:25 | _rhs |  | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:57:48:59:9 | { ... } |  | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:58:13:58:14 | S2 |  | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:66:16:66:19 | SelfParam |  | regressions.rs:39:5:40:14 | S1 |
+| regressions.rs:66:22:66:26 | other |  | {EXTERNAL LOCATION} | & |
+| regressions.rs:66:22:66:26 | other | TRef | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:66:61:68:9 | { ... } |  | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:67:13:67:34 | ...::sub(...) |  | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:67:22:67:25 | self |  | regressions.rs:39:5:40:14 | S1 |
+| regressions.rs:67:28:67:33 | * ... |  | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:67:29:67:33 | other |  | {EXTERNAL LOCATION} | & |
+| regressions.rs:67:29:67:33 | other | TRef | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:71:14:75:5 | { ... } |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:72:13:72:14 | s1 |  | regressions.rs:39:5:40:14 | S1 |
+| regressions.rs:72:18:72:19 | S1 |  | regressions.rs:39:5:40:14 | S1 |
+| regressions.rs:73:13:73:14 | s2 |  | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:73:18:73:19 | S2 |  | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:74:13:74:13 | x |  | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:74:17:74:18 | s1 |  | regressions.rs:39:5:40:14 | S1 |
+| regressions.rs:74:17:74:24 | ... - ... |  | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:74:22:74:24 | &s2 |  | {EXTERNAL LOCATION} | & |
+| regressions.rs:74:22:74:24 | &s2 | TRef | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:74:23:74:24 | s2 |  | regressions.rs:41:5:42:14 | S2 |
+| regressions.rs:82:20:82:24 | value |  | regressions.rs:81:18:81:18 | T |
+| regressions.rs:86:20:86:20 | s |  | regressions.rs:85:10:85:10 | T |
+| regressions.rs:86:34:88:9 | { ... } |  | regressions.rs:85:10:85:10 | T |
+| regressions.rs:87:13:87:13 | s |  | regressions.rs:85:10:85:10 | T |
+| regressions.rs:92:20:92:22 | val |  | regressions.rs:91:10:91:10 | T |
+| regressions.rs:92:41:94:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:92:41:94:9 | { ... } | T | regressions.rs:91:10:91:10 | T |
+| regressions.rs:93:13:93:21 | Some(...) |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:93:13:93:21 | Some(...) | T | regressions.rs:91:10:91:10 | T |
+| regressions.rs:93:18:93:20 | val |  | regressions.rs:91:10:91:10 | T |
+| regressions.rs:99:22:99:22 | x |  | regressions.rs:99:18:99:19 | T2 |
+| regressions.rs:103:5:107:5 | { ... } |  | regressions.rs:99:18:99:19 | T2 |
+| regressions.rs:104:13:104:13 | y |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:104:13:104:13 | y | T | regressions.rs:99:14:99:15 | T1 |
+| regressions.rs:104:13:104:13 | y | T | regressions.rs:99:18:99:19 | T2 |
+| regressions.rs:104:17:104:34 | ...::my_from(...) |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:104:17:104:34 | ...::my_from(...) | T | regressions.rs:99:14:99:15 | T1 |
+| regressions.rs:104:17:104:34 | ...::my_from(...) | T | regressions.rs:99:18:99:19 | T2 |
+| regressions.rs:104:33:104:33 | x |  | regressions.rs:99:18:99:19 | T2 |
+| regressions.rs:105:13:105:13 | z |  | regressions.rs:99:18:99:19 | T2 |
+| regressions.rs:105:17:105:34 | ...::my_from(...) |  | regressions.rs:99:18:99:19 | T2 |
+| regressions.rs:105:33:105:33 | y |  | {EXTERNAL LOCATION} | Option |
+| regressions.rs:105:33:105:33 | y | T | regressions.rs:99:14:99:15 | T1 |
+| regressions.rs:105:33:105:33 | y | T | regressions.rs:99:18:99:19 | T2 |
+| regressions.rs:106:9:106:9 | z |  | regressions.rs:99:18:99:19 | T2 |
+| regressions.rs:113:14:113:17 | SelfParam |  | regressions.rs:111:5:114:5 | Self [trait MyTrait] |
+| regressions.rs:118:14:118:17 | SelfParam |  | {EXTERNAL LOCATION} | & |
+| regressions.rs:118:14:118:17 | SelfParam | TRef | regressions.rs:116:10:116:10 | T |
+| regressions.rs:118:20:118:21 | { ... } |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:124:19:124:22 | SelfParam |  | regressions.rs:121:5:121:19 | S |
+| regressions.rs:124:19:124:22 | SelfParam | T | regressions.rs:123:10:123:10 | T |
+| regressions.rs:127:9:130:9 | { ... } |  | {EXTERNAL LOCATION} | () |
+| regressions.rs:128:17:128:20 | S(...) |  | regressions.rs:121:5:121:19 | S |
+| regressions.rs:128:17:128:20 | S(...) | T | regressions.rs:123:10:123:10 | T |
+| regressions.rs:128:19:128:19 | s |  | regressions.rs:123:10:123:10 | T |
+| regressions.rs:128:24:128:27 | self |  | regressions.rs:121:5:121:19 | S |
+| regressions.rs:128:24:128:27 | self | T | regressions.rs:123:10:123:10 | T |
+| regressions.rs:129:13:129:13 | s |  | regressions.rs:123:10:123:10 | T |
+| regressions.rs:129:13:129:17 | s.m() |  | {EXTERNAL LOCATION} | () |
 testFailures
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 00000000000..402598911ad
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-117/CONSISTENCY/PathResolutionConsistency.expected
@@ -0,0 +1,2 @@
+multipleResolvedTargets
+| main.rs:123:28:123:48 | ...::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
index a4c67f043d0..7629f8fa2fe 100644
--- a/rust/ql/test/query-tests/security/CWE-117/Cargo.lock
+++ b/rust/ql/test/query-tests/security/CWE-117/Cargo.lock
@@ -34,6 +34,58 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
+[[package]]
+name = "axum"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8"
+dependencies = [
+ "axum-core",
+ "bytes",
+ "form_urlencoded",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "serde_core",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "http-body-util",
+ "mime",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.75"
@@ -339,6 +391,12 @@ version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
 [[package]]
 name = "humantime"
 version = "2.2.0"
@@ -358,6 +416,7 @@ dependencies = [
  "http",
  "http-body",
  "httparse",
+ "httpdate",
  "itoa",
  "pin-project-lite",
  "smallvec",
@@ -592,6 +651,12 @@ version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
+[[package]]
+name = "matchit"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
+
 [[package]]
 name = "memchr"
 version = "2.7.5"
@@ -951,18 +1016,27 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -981,6 +1055,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_path_to_error"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457"
+dependencies = [
+ "itoa",
+ "serde",
+ "serde_core",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -1111,6 +1196,7 @@ dependencies = [
 name = "test"
 version = "0.0.1"
 dependencies = [
+ "axum",
  "env_logger",
  "log",
  "reqwest",
@@ -1138,9 +1224,21 @@ dependencies = [
  "mio",
  "pin-project-lite",
  "socket2",
+ "tokio-macros",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "tokio-macros"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "tokio-native-tls"
 version = "0.3.1"
@@ -1174,6 +1272,28 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tower"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
 [[package]]
 name = "tower-service"
 version = "0.3.3"
@@ -1186,6 +1306,7 @@ version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
+ "log",
  "pin-project-lite",
  "tracing-core",
 ]
diff --git a/rust/ql/test/query-tests/security/CWE-117/LogInjection.expected b/rust/ql/test/query-tests/security/CWE-117/LogInjection.expected
index e326a87c42d..4349f3738eb 100644
--- a/rust/ql/test/query-tests/security/CWE-117/LogInjection.expected
+++ b/rust/ql/test/query-tests/security/CWE-117/LogInjection.expected
@@ -15,12 +15,13 @@
 | main.rs:115:9:115:14 | ...::log | main.rs:109:25:109:38 | ...::args | main.rs:115:9:115:14 | ...::log | Log entry depends on a $@. | main.rs:109:25:109:38 | ...::args | user-provided value |
 | main.rs:116:9:116:14 | ...::log | main.rs:109:25:109:38 | ...::args | main.rs:116:9:116:14 | ...::log | Log entry depends on a $@. | main.rs:109:25:109:38 | ...::args | user-provided value |
 | main.rs:119:9:119:13 | ...::log | main.rs:109:25:109:38 | ...::args | main.rs:119:9:119:13 | ...::log | Log entry depends on a $@. | main.rs:109:25:109:38 | ...::args | user-provided value |
-| main.rs:126:9:126:16 | ...::_print | main.rs:123:25:123:37 | ...::var | main.rs:126:9:126:16 | ...::_print | Log entry depends on a $@. | main.rs:123:25:123:37 | ...::var | user-provided value |
-| main.rs:127:9:127:17 | ...::_eprint | main.rs:123:25:123:37 | ...::var | main.rs:127:9:127:17 | ...::_eprint | Log entry depends on a $@. | main.rs:123:25:123:37 | ...::var | user-provided value |
+| main.rs:130:9:130:16 | ...::_print | main.rs:127:25:127:37 | ...::var | main.rs:130:9:130:16 | ...::_print | Log entry depends on a $@. | main.rs:127:25:127:37 | ...::var | user-provided value |
+| main.rs:131:9:131:17 | ...::_eprint | main.rs:127:25:127:37 | ...::var | main.rs:131:9:131:17 | ...::_eprint | Log entry depends on a $@. | main.rs:127:25:127:37 | ...::var | user-provided value |
+| main.rs:143:9:143:16 | ...::_print | main.rs:150:28:150:30 | get | main.rs:143:9:143:16 | ...::_print | Log entry depends on a $@. | main.rs:150:28:150:30 | get | user-provided value |
 edges
 | main.rs:8:9:8:12 | args [element] | main.rs:9:20:9:23 | args [element] | provenance |  |
-| main.rs:8:29:8:37 | ...::args | main.rs:8:29:8:39 | ...::args(...) [element] | provenance | Src:MaD:5  |
-| main.rs:8:29:8:39 | ...::args(...) [element] | main.rs:8:29:8:49 | ... .collect() [element] | provenance | MaD:9 |
+| main.rs:8:29:8:37 | ...::args | main.rs:8:29:8:39 | ...::args(...) [element] | provenance | Src:MaD:6  |
+| main.rs:8:29:8:39 | ...::args(...) [element] | main.rs:8:29:8:49 | ... .collect() [element] | provenance | MaD:10 |
 | main.rs:8:29:8:49 | ... .collect() [element] | main.rs:8:9:8:12 | args [element] | provenance |  |
 | main.rs:9:9:9:16 | username | main.rs:15:11:15:36 | MacroExpr | provenance |  |
 | main.rs:9:9:9:16 | username | main.rs:18:12:18:37 | MacroExpr | provenance |  |
@@ -28,21 +29,21 @@ edges
 | main.rs:9:9:9:16 | username | main.rs:26:55:26:62 | username | provenance |  |
 | main.rs:9:9:9:16 | username | main.rs:30:11:30:66 | MacroExpr | provenance |  |
 | main.rs:9:9:9:16 | username | main.rs:52:29:52:36 | username | provenance |  |
-| main.rs:9:20:9:23 | args [element] | main.rs:9:20:9:30 | args.get(...) [Some, &ref] | provenance | MaD:12 |
-| main.rs:9:20:9:30 | args.get(...) [Some, &ref] | main.rs:9:20:9:64 | ... .unwrap_or(...) [&ref] | provenance | MaD:13 |
-| main.rs:9:20:9:64 | ... .unwrap_or(...) [&ref] | main.rs:9:20:9:72 | ... .clone() | provenance | MaD:8 |
+| main.rs:9:20:9:23 | args [element] | main.rs:9:20:9:30 | args.get(...) [Some, &ref] | provenance | MaD:13 |
+| main.rs:9:20:9:30 | args.get(...) [Some, &ref] | main.rs:9:20:9:64 | ... .unwrap_or(...) [&ref] | provenance | MaD:16 |
+| main.rs:9:20:9:64 | ... .unwrap_or(...) [&ref] | main.rs:9:20:9:72 | ... .clone() | provenance | MaD:9 |
 | main.rs:9:20:9:72 | ... .clone() | main.rs:9:9:9:16 | username | provenance |  |
 | 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:16 |
+| main.rs:10:22:10:34 | ...::var | main.rs:10:22:10:48 | ...::var(...) [Ok] | provenance | Src:MaD:7  |
+| main.rs:10:22:10:48 | ...::var(...) [Ok] | main.rs:10:22:10:81 | ... .unwrap_or(...) | provenance | MaD:19 |
 | 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:15 |
-| main.rs:11:23:12:17 | ... .unwrap() | main.rs:11:23:12:24 | ... .text() [Ok] | provenance | MaD:18 |
-| main.rs:11:23:12:24 | ... .text() [Ok] | main.rs:11:23:12:61 | ... .unwrap_or(...) | provenance | MaD:16 |
+| main.rs:11:23:11:44 | ...::get | main.rs:11:23:11:71 | ...::get(...) [Ok] | provenance | Src:MaD:5  |
+| main.rs:11:23:11:71 | ...::get(...) [Ok] | main.rs:11:23:12:17 | ... .unwrap() | provenance | MaD:18 |
+| main.rs:11:23:12:17 | ... .unwrap() | main.rs:11:23:12:24 | ... .text() [Ok] | provenance | MaD:21 |
+| main.rs:11:23:12:24 | ... .text() [Ok] | main.rs:11:23:12:61 | ... .unwrap_or(...) | provenance | MaD:19 |
 | main.rs:11:23:12:61 | ... .unwrap_or(...) | main.rs:11:9:11:19 | remote_data | provenance |  |
 | main.rs:15:11:15:36 | MacroExpr | main.rs:15:5:15:9 | ...::log | provenance | MaD:1 Sink:MaD:1 |
 | main.rs:16:11:16:44 | MacroExpr | main.rs:16:5:16:9 | ...::log | provenance | MaD:1 Sink:MaD:1 |
@@ -52,12 +53,12 @@ edges
 | main.rs:22:9:22:21 | formatted_msg | main.rs:23:11:23:29 | MacroExpr | provenance |  |
 | main.rs:22:33:22:63 | ...::format(...) | main.rs:22:33:22:63 | { ... } | provenance |  |
 | main.rs:22:33:22:63 | ...::must_use(...) | main.rs:22:9:22:21 | formatted_msg | provenance |  |
-| main.rs:22:33:22:63 | MacroExpr | main.rs:22:33:22:63 | ...::format(...) | provenance | MaD:19 |
-| main.rs:22:33:22:63 | { ... } | main.rs:22:33:22:63 | ...::must_use(...) | provenance | MaD:20 |
+| main.rs:22:33:22:63 | MacroExpr | main.rs:22:33:22:63 | ...::format(...) | provenance | MaD:22 |
+| main.rs:22:33:22:63 | { ... } | main.rs:22:33:22:63 | ...::must_use(...) | provenance | MaD:23 |
 | main.rs:23:11:23:29 | MacroExpr | main.rs:23:5:23:9 | ...::log | provenance | MaD:1 Sink:MaD:1 |
 | main.rs:26:9:26:18 | concat_msg | main.rs:27:11:27:26 | MacroExpr | provenance |  |
 | main.rs:26:22:26:62 | ... + ... | main.rs:26:9:26:18 | concat_msg | provenance |  |
-| main.rs:26:54:26:62 | &username [&ref] | main.rs:26:22:26:62 | ... + ... | provenance | MaD:11 |
+| main.rs:26:54:26:62 | &username [&ref] | main.rs:26:22:26:62 | ... + ... | provenance | MaD:12 |
 | main.rs:26:55:26:62 | username | main.rs:26:54:26:62 | &username [&ref] | provenance |  |
 | main.rs:27:11:27:26 | MacroExpr | main.rs:27:5:27:9 | ...::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 |
@@ -66,7 +67,7 @@ edges
 | main.rs:56:27:56:40 | ...: ... [&ref] | main.rs:65:38:65:45 | username [&ref] | provenance |  |
 | main.rs:65:9:65:17 | user_info [UserInfo] | main.rs:66:28:66:36 | user_info [UserInfo] | provenance |  |
 | main.rs:65:21:65:59 | UserInfo {...} [UserInfo] | main.rs:65:9:65:17 | user_info [UserInfo] | provenance |  |
-| main.rs:65:38:65:45 | username [&ref] | main.rs:65:38:65:57 | username.to_string() | provenance | MaD:7 |
+| main.rs:65:38:65:45 | username [&ref] | main.rs:65:38:65:57 | username.to_string() | provenance | MaD:8 |
 | main.rs:65:38:65:57 | username.to_string() | main.rs:65:21:65:59 | UserInfo {...} [UserInfo] | provenance |  |
 | main.rs:66:11:66:41 | MacroExpr | main.rs:66:5:66:9 | ...::log | provenance | MaD:1 Sink:MaD:1 |
 | main.rs:66:28:66:36 | user_info [UserInfo] | main.rs:66:28:66:41 | user_info.name | provenance |  |
@@ -77,9 +78,9 @@ edges
 | main.rs:109:13:109:21 | user_data | main.rs:115:16:115:37 | MacroExpr | provenance |  |
 | main.rs:109:13:109:21 | user_data | main.rs:116:16:116:37 | MacroExpr | provenance |  |
 | main.rs:109:13:109:21 | user_data | main.rs:119:15:119:75 | MacroExpr | provenance |  |
-| main.rs:109:25:109:38 | ...::args | main.rs:109:25:109:40 | ...::args(...) [element] | provenance | Src:MaD:5  |
-| main.rs:109:25:109:40 | ...::args(...) [element] | main.rs:109:25:109:47 | ... .nth(...) [Some] | provenance | MaD:10 |
-| main.rs:109:25:109:47 | ... .nth(...) [Some] | main.rs:109:25:109:67 | ... .unwrap_or_default() | provenance | MaD:14 |
+| main.rs:109:25:109:38 | ...::args | main.rs:109:25:109:40 | ...::args(...) [element] | provenance | Src:MaD:6  |
+| main.rs:109:25:109:40 | ...::args(...) [element] | main.rs:109:25:109:47 | ... .nth(...) [Some] | provenance | MaD:11 |
+| main.rs:109:25:109:47 | ... .nth(...) [Some] | main.rs:109:25:109:67 | ... .unwrap_or_default() | provenance | MaD:17 |
 | main.rs:109:25:109:67 | ... .unwrap_or_default() | main.rs:109:13:109:21 | user_data | provenance |  |
 | main.rs:112:15:112:35 | MacroExpr | main.rs:112:9:112:13 | ...::log | provenance | MaD:1 Sink:MaD:1 |
 | main.rs:113:15:113:38 | MacroExpr | main.rs:113:9:113:13 | ...::log | provenance | MaD:1 Sink:MaD:1 |
@@ -87,34 +88,47 @@ edges
 | main.rs:115:16:115:37 | MacroExpr | main.rs:115:9:115:14 | ...::log | provenance | MaD:1 Sink:MaD:1 |
 | main.rs:116:16:116:37 | MacroExpr | main.rs:116:9:116:14 | ...::log | provenance | MaD:1 Sink:MaD:1 |
 | main.rs:119:15:119:75 | MacroExpr | main.rs:119:9:119:13 | ...::log | provenance | MaD:1 Sink:MaD:1 |
-| main.rs:123:13:123:21 | user_data | main.rs:126:18:126:38 | MacroExpr | provenance |  |
-| main.rs:123:13:123:21 | user_data | main.rs:127:19:127:49 | MacroExpr | provenance |  |
-| main.rs:123:25:123:37 | ...::var | main.rs:123:25:123:45 | ...::var(...) [Ok] | provenance | Src:MaD:6  |
-| main.rs:123:25:123:45 | ...::var(...) [Ok] | main.rs:123:25:123:65 | ... .unwrap_or_default() | provenance | MaD:17 |
-| main.rs:123:25:123:65 | ... .unwrap_or_default() | main.rs:123:13:123:21 | user_data | provenance |  |
-| main.rs:126:18:126:38 | MacroExpr | main.rs:126:9:126:16 | ...::_print | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:127:19:127:49 | MacroExpr | main.rs:127:9:127:17 | ...::_eprint | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:127:13:127:21 | user_data | main.rs:130:18:130:38 | MacroExpr | provenance |  |
+| main.rs:127:13:127:21 | user_data | main.rs:131:19:131:49 | MacroExpr | provenance |  |
+| main.rs:127:25:127:37 | ...::var | main.rs:127:25:127:45 | ...::var(...) [Ok] | provenance | Src:MaD:7  |
+| main.rs:127:25:127:45 | ...::var(...) [Ok] | main.rs:127:25:127:65 | ... .unwrap_or_default() | provenance | MaD:20 |
+| main.rs:127:25:127:65 | ... .unwrap_or_default() | main.rs:127:13:127:21 | user_data | provenance |  |
+| main.rs:130:18:130:38 | MacroExpr | main.rs:130:9:130:16 | ...::_print | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:131:19:131:49 | MacroExpr | main.rs:131:9:131:17 | ...::_eprint | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:140:32:140:59 | ...: Option::<...> | main.rs:141:22:141:27 | o_path | provenance |  |
+| main.rs:141:13:141:18 | m_path [Some] | main.rs:143:26:143:31 | m_path [Some] | provenance |  |
+| main.rs:141:22:141:27 | o_path | main.rs:141:22:141:38 | o_path.map(...) [Some] | provenance | MaD:14 |
+| main.rs:141:22:141:27 | o_path | main.rs:141:34:141:34 | ... | provenance | MaD:14 |
+| main.rs:141:22:141:38 | o_path.map(...) [Some] | main.rs:141:13:141:18 | m_path [Some] | provenance |  |
+| main.rs:141:34:141:34 | ... | main.rs:141:37:141:37 | x | provenance |  |
+| main.rs:143:18:143:40 | MacroExpr | main.rs:143:9:143:16 | ...::_print | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:143:26:143:31 | m_path [Some] | main.rs:143:26:143:40 | m_path.unwrap() | provenance | MaD:15 |
+| main.rs:143:26:143:40 | m_path.unwrap() | main.rs:143:18:143:40 | MacroExpr | provenance |  |
+| main.rs:150:28:150:30 | get | main.rs:140:32:140:59 | ...: Option::<...> | provenance | Src:MaD:4  |
 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 alloc::string::ToString>::to_string; Argument[self].Reference; ReturnValue; taint |
-| 8 | Summary: <_ as core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
-| 9 | Summary: <_ as core::iter::traits::iterator::Iterator>::collect; Argument[self].Element; ReturnValue.Element; value |
-| 10 | Summary: <_ as core::iter::traits::iterator::Iterator>::nth; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
-| 11 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[0].Reference; ReturnValue; taint |
-| 12 | Summary: <alloc::vec::Vec as core::ops::deref::Deref>::deref; Argument[self].Reference.Element; ReturnValue.Reference.Element; value |
-| 13 | Summary: <core::option::Option>::unwrap_or; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
-| 14 | Summary: <core::option::Option>::unwrap_or_default; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
-| 15 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
-| 16 | Summary: <core::result::Result>::unwrap_or; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
-| 17 | Summary: <core::result::Result>::unwrap_or_default; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
-| 18 | Summary: <reqwest::blocking::response::Response>::text; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
-| 19 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
-| 20 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
+| 4 | Source: axum::routing::method_routing::get; Argument[0].Parameter[0..7]; remote |
+| 5 | Source: reqwest::blocking::get; ReturnValue.Field[core::result::Result::Ok(0)]; remote |
+| 6 | Source: std::env::args; ReturnValue.Element; commandargs |
+| 7 | Source: std::env::var; ReturnValue.Field[core::result::Result::Ok(0)]; environment |
+| 8 | Summary: <_ as alloc::string::ToString>::to_string; Argument[self].Reference; ReturnValue; taint |
+| 9 | Summary: <_ as core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
+| 10 | Summary: <_ as core::iter::traits::iterator::Iterator>::collect; Argument[self].Element; ReturnValue.Element; value |
+| 11 | Summary: <_ as core::iter::traits::iterator::Iterator>::nth; Argument[self].Reference.Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
+| 12 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[0].Reference; ReturnValue; taint |
+| 13 | Summary: <alloc::vec::Vec as core::ops::deref::Deref>::deref; Argument[self].Reference.Element; ReturnValue.Reference.Element; value |
+| 14 | Summary: <core::option::Option>::map; Argument[self].Field[core::option::Option::Some(0)]; Argument[0].Parameter[0]; value |
+| 15 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 16 | Summary: <core::option::Option>::unwrap_or; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 17 | Summary: <core::option::Option>::unwrap_or_default; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 18 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 19 | Summary: <core::result::Result>::unwrap_or; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 20 | Summary: <core::result::Result>::unwrap_or_default; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 21 | Summary: <reqwest::blocking::response::Response>::text; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+| 22 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
+| 23 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
 nodes
 | main.rs:8:9:8:12 | args [element] | semmle.label | args [element] |
 | main.rs:8:29:8:37 | ...::args | semmle.label | ...::args |
@@ -188,12 +202,24 @@ nodes
 | main.rs:116:16:116:37 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:119:9:119:13 | ...::log | semmle.label | ...::log |
 | main.rs:119:15:119:75 | MacroExpr | semmle.label | MacroExpr |
-| main.rs:123:13:123:21 | user_data | semmle.label | user_data |
-| main.rs:123:25:123:37 | ...::var | semmle.label | ...::var |
-| main.rs:123:25:123:45 | ...::var(...) [Ok] | semmle.label | ...::var(...) [Ok] |
-| main.rs:123:25:123:65 | ... .unwrap_or_default() | semmle.label | ... .unwrap_or_default() |
-| main.rs:126:9:126:16 | ...::_print | semmle.label | ...::_print |
-| main.rs:126:18:126:38 | MacroExpr | semmle.label | MacroExpr |
-| main.rs:127:9:127:17 | ...::_eprint | semmle.label | ...::_eprint |
-| main.rs:127:19:127:49 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:127:13:127:21 | user_data | semmle.label | user_data |
+| main.rs:127:25:127:37 | ...::var | semmle.label | ...::var |
+| main.rs:127:25:127:45 | ...::var(...) [Ok] | semmle.label | ...::var(...) [Ok] |
+| main.rs:127:25:127:65 | ... .unwrap_or_default() | semmle.label | ... .unwrap_or_default() |
+| main.rs:130:9:130:16 | ...::_print | semmle.label | ...::_print |
+| main.rs:130:18:130:38 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:131:9:131:17 | ...::_eprint | semmle.label | ...::_eprint |
+| main.rs:131:19:131:49 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:140:32:140:59 | ...: Option::<...> | semmle.label | ...: Option::<...> |
+| main.rs:141:13:141:18 | m_path [Some] | semmle.label | m_path [Some] |
+| main.rs:141:22:141:27 | o_path | semmle.label | o_path |
+| main.rs:141:22:141:38 | o_path.map(...) [Some] | semmle.label | o_path.map(...) [Some] |
+| main.rs:141:34:141:34 | ... | semmle.label | ... |
+| main.rs:141:37:141:37 | x | semmle.label | x |
+| main.rs:143:9:143:16 | ...::_print | semmle.label | ...::_print |
+| main.rs:143:18:143:40 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:143:26:143:31 | m_path [Some] | semmle.label | m_path [Some] |
+| main.rs:143:26:143:40 | m_path.unwrap() | semmle.label | m_path.unwrap() |
+| main.rs:150:28:150:30 | get | semmle.label | get |
 subpaths
+| main.rs:141:22:141:27 | o_path | main.rs:141:34:141:34 | ... | main.rs:141:37:141:37 | x | main.rs:141:22:141:38 | o_path.map(...) [Some] |
diff --git a/rust/ql/test/query-tests/security/CWE-117/main.rs b/rust/ql/test/query-tests/security/CWE-117/main.rs
index 9fb3558b3d2..21eabac01c6 100644
--- a/rust/ql/test/query-tests/security/CWE-117/main.rs
+++ b/rust/ql/test/query-tests/security/CWE-117/main.rs
@@ -117,6 +117,10 @@ mod additional_tests {
 
         // BAD: Complex format strings
         info!("User {} did action {} at time {}", user_data, "login", "now"); // $ Alert[rust/log-injection]=commandargs
+
+        // GOOD: non-sinks
+        let _ : Vec<u8> = From::from(user_data.clone());
+        let _ : Box<str> = From::from(user_data);
     }
 
     pub fn test_println_patterns() {
@@ -127,3 +131,22 @@ mod additional_tests {
         eprintln!("Error for user: {}", user_data); // $ Alert[rust/log-injection]=environment
     }
 }
+
+mod axum_tests {
+    use axum::extract::Path;
+    use axum::routing::get;
+    use axum::Router;
+
+    async fn my_axum_handler_1(o_path: Option<Path<String>>) -> &'static str {
+        let m_path = o_path.map(|x| x);
+
+        println!("{:?}", m_path.unwrap()); // $ Alert[rust/log-injection]=post_handler
+
+        ""
+    }
+
+    async fn test_axum() {
+        let app = Router::<()>::new()
+            .route("/{a}", get(my_axum_handler_1)); // $ Source=post_handler
+    }
+}
diff --git a/rust/ql/test/query-tests/security/CWE-117/options.yml b/rust/ql/test/query-tests/security/CWE-117/options.yml
index fae9beded52..8807ab63631 100644
--- a/rust/ql/test/query-tests/security/CWE-117/options.yml
+++ b/rust/ql/test/query-tests/security/CWE-117/options.yml
@@ -2,4 +2,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
+    - reqwest = { version = "0.12.9", features = ["blocking"] }
+    - axum = { version = "0.8.7" }
diff --git a/rust/ql/test/query-tests/security/CWE-312/test_logging.rs b/rust/ql/test/query-tests/security/CWE-312/test_logging.rs
index 02451c92d91..43bcd8894f3 100644
--- a/rust/ql/test/query-tests/security/CWE-312/test_logging.rs
+++ b/rust/ql/test/query-tests/security/CWE-312/test_logging.rs
@@ -97,7 +97,7 @@ fn test_log(harmless: String, password: String, encrypted_password: String) {
     info!("{}", m2); // $ Alert[rust/cleartext-logging]=m2
 
     let m3 = format!("message = {}", password); // $ Source[rust/cleartext-logging]=m3
-    info!("{}", m3); // $  Alert[rust/cleartext-logging]=m3
+    info!("{}", m3); // $ Alert[rust/cleartext-logging]=m3
 
     let mut m4 = String::new();
     write!(&mut m4, "message = {}", password); // $ MISSING: Source=m4
diff --git a/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/BrokenCryptoAlgorithm.expected b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/BrokenCryptoAlgorithm.expected
index ef0a9e0d806..a04fd96739c 100644
--- a/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/BrokenCryptoAlgorithm.expected
+++ b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/BrokenCryptoAlgorithm.expected
@@ -21,3 +21,9 @@
 | 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 |
+| test_cipher.rs:136:23:136:76 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:136:23:136:76 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:139:23:139:64 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:139:23:139:64 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:142:23:142:76 | ...::new_from_slices(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:142:23:142:76 | ...::new_from_slices(...) | The cryptographic algorithm DES |
+| test_cipher.rs:145:23:145:76 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:145:23:145:76 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:171:23:171:65 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:171:23:171:65 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:175:23:175:65 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:175:23:175:65 | ...::new(...) | The cryptographic algorithm RC2 |
diff --git a/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/CONSISTENCY/PathResolutionConsistency.expected
deleted file mode 100644
index 18400b7ab59..00000000000
--- a/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/CONSISTENCY/PathResolutionConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-multipleResolvedTargets
-| test_cipher.rs:114:23:114:50 | ...::new(...) |
diff --git a/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/test_cipher.rs b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/test_cipher.rs
index 17db0f9ceb1..81964436720 100644
--- a/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/test_cipher.rs
+++ b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm/test_cipher.rs
@@ -133,16 +133,16 @@ 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()); // $ MISSING: Alert[rust/weak-cryptographic-algorithm]
+    let des_cipher1 = cbc::Encryptor::<des::Des>::new(key.into(), iv.into()); // $ 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]
+    let des_cipher2 = MyDesEncryptor::new(key.into(), iv.into()); // $ 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(); // $ MISSING: Alert[rust/weak-cryptographic-algorithm]
+    let des_cipher3 = cbc::Encryptor::<des::Des>::new_from_slices(&key, &iv).unwrap(); // $ 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()); // $ MISSING: Alert[rust/weak-cryptographic-algorithm]
+    let des_cipher4 = cbc::Encryptor::<des::Des>::new(key.into(), iv.into()); // $ Alert[rust/weak-cryptographic-algorithm]
     _ = des_cipher4.encrypt_padded_b2b_mut::<des::cipher::block_padding::Pkcs7>(input, data).unwrap();
 }
 
@@ -168,10 +168,10 @@ fn test_ecb(
     _ = aes_cipher4.encrypt_padded_b2b_mut::<aes::cipher::block_padding::Pkcs7>(input, data).unwrap();
 
     // des with ECB (broken cipher + weak block mode)
-    let des_cipher1 = ecb::Encryptor::<des::Des>::new(key.into()); // $ MISSING: Alert[rust/weak-cryptographic-algorithm]
+    let des_cipher1 = ecb::Encryptor::<des::Des>::new(key.into()); // $ Alert[rust/weak-cryptographic-algorithm]
     _ = des_cipher1.encrypt_padded_mut::<des::cipher::block_padding::Pkcs7>(data, data_len).unwrap();
 
     // rc2 with ECB (broken cipher + weak block mode)
-    let rc2_cipher1 = ecb::Encryptor::<rc2::Rc2>::new(key.into()); // $ MISSING: Alert[rust/weak-cryptographic-algorithm]
+    let rc2_cipher1 = ecb::Encryptor::<rc2::Rc2>::new(key.into()); // $ Alert[rust/weak-cryptographic-algorithm]
     _ = rc2_cipher1.encrypt_padded_mut::<rc2::cipher::block_padding::Pkcs7>(data, data_len).unwrap();
 }
diff --git a/rust/ql/test/query-tests/security/CWE-770/UncontrolledAllocationSize.expected b/rust/ql/test/query-tests/security/CWE-770/UncontrolledAllocationSize.expected
index 070e05c8ae6..477dbee0e0f 100644
--- a/rust/ql/test/query-tests/security/CWE-770/UncontrolledAllocationSize.expected
+++ b/rust/ql/test/query-tests/security/CWE-770/UncontrolledAllocationSize.expected
@@ -1,56 +1,57 @@
 #select
-| main.rs:18:13:18:31 | ...::realloc | main.rs:320:13:320:26 | ...::args | main.rs:18:13:18:31 | ...::realloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:21:13:21:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:21:13:21:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:22:13:22:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:22:13:22:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:23:13:23:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:23:13:23:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:24:13:24:36 | ...::alloc_zeroed | main.rs:320:13:320:26 | ...::args | main.rs:24:13:24:36 | ...::alloc_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:30:13:30:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:30:13:30:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:33:13:33:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:33:13:33:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:37:13:37:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:37:13:37:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:40:13:40:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:40:13:40:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:50:13:50:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:50:13:50:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:51:13:51:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:51:13:51:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:53:13:53:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:53:13:53:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:54:13:54:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:54:13:54:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:59:13:59:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:59:13:59:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:61:13:61:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:61:13:61:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:63:13:63:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:63:13:63:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:64:13:64:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:64:13:64:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:65:13:65:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:65:13:65:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:68:13:68:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:68:13:68:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:88:13:88:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:88:13:88:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:96:17:96:33 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:96:17:96:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:102:17:102:33 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:102:17:102:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:103:17:103:33 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:103:17:103:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:109:17:109:33 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:109:17:109:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:111:17:111:33 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:111:17:111:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:146:17:146:33 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:146:17:146:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:148:17:148:33 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:148:17:148:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:152:13:152:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:152:13:152:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:155:13:155:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:155:13:155:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:162:17:162:33 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:162:17:162:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:169:17:169:33 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:169:17:169:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:177:13:177:29 | ...::alloc | main.rs:320:13:320:26 | ...::args | main.rs:177:13:177:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:193:32:193:36 | alloc | main.rs:320:13:320:26 | ...::args | main.rs:193:32:193:36 | alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:194:32:194:43 | alloc_zeroed | main.rs:320:13:320:26 | ...::args | main.rs:194:32:194:43 | alloc_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:195:32:195:39 | allocate | main.rs:320:13:320:26 | ...::args | main.rs:195:32:195:39 | allocate | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:196:32:196:46 | allocate_zeroed | main.rs:320:13:320:26 | ...::args | main.rs:196:32:196:46 | allocate_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:197:32:197:39 | allocate | main.rs:320:13:320:26 | ...::args | main.rs:197:32:197:39 | allocate | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:198:32:198:46 | allocate_zeroed | main.rs:320:13:320:26 | ...::args | main.rs:198:32:198:46 | allocate_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:202:32:202:38 | realloc | main.rs:320:13:320:26 | ...::args | main.rs:202:32:202:38 | realloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:208:40:208:43 | grow | main.rs:320:13:320:26 | ...::args | main.rs:208:40:208:43 | grow | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:210:40:210:50 | grow_zeroed | main.rs:320:13:320:26 | ...::args | main.rs:210:40:210:50 | grow_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:213:36:213:41 | shrink | main.rs:320:13:320:26 | ...::args | main.rs:213:36:213:41 | shrink | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:219:13:219:24 | ...::malloc | main.rs:320:13:320:26 | ...::args | main.rs:219:13:219:24 | ...::malloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:220:13:220:31 | ...::aligned_alloc | main.rs:320:13:320:26 | ...::args | main.rs:220:13:220:31 | ...::aligned_alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:222:13:222:24 | ...::calloc | main.rs:320:13:320:26 | ...::args | main.rs:222:13:222:24 | ...::calloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:223:13:223:24 | ...::calloc | main.rs:320:13:320:26 | ...::args | main.rs:223:13:223:24 | ...::calloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:224:13:224:25 | ...::realloc | main.rs:320:13:320:26 | ...::args | main.rs:224:13:224:25 | ...::realloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:228:13:228:41 | ...::try_with_capacity | main.rs:320:13:320:26 | ...::args | main.rs:228:13:228:41 | ...::try_with_capacity | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:229:13:229:37 | ...::with_capacity | main.rs:320:13:320:26 | ...::args | main.rs:229:13:229:37 | ...::with_capacity | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:230:13:230:44 | ...::try_with_capacity_in | main.rs:320:13:320:26 | ...::args | main.rs:230:13:230:44 | ...::try_with_capacity_in | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
-| main.rs:231:13:231:40 | ...::with_capacity_in | main.rs:320:13:320:26 | ...::args | main.rs:231:13:231:40 | ...::with_capacity_in | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:320:13:320:26 | ...::args | user-provided value |
+| main.rs:18:13:18:31 | ...::realloc | main.rs:339:13:339:26 | ...::args | main.rs:18:13:18:31 | ...::realloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:21:13:21:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:21:13:21:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:22:13:22:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:22:13:22:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:23:13:23:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:23:13:23:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:24:13:24:36 | ...::alloc_zeroed | main.rs:339:13:339:26 | ...::args | main.rs:24:13:24:36 | ...::alloc_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:30:13:30:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:30:13:30:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:33:13:33:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:33:13:33:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:37:13:37:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:37:13:37:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:40:13:40:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:40:13:40:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:50:13:50:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:50:13:50:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:51:13:51:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:51:13:51:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:53:13:53:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:53:13:53:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:54:13:54:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:54:13:54:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:59:13:59:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:59:13:59:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:61:13:61:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:61:13:61:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:63:13:63:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:63:13:63:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:64:13:64:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:64:13:64:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:65:13:65:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:65:13:65:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:68:13:68:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:68:13:68:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:88:13:88:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:88:13:88:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:96:17:96:33 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:96:17:96:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:102:17:102:33 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:102:17:102:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:103:17:103:33 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:103:17:103:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:109:17:109:33 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:109:17:109:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:111:17:111:33 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:111:17:111:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:146:17:146:33 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:146:17:146:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:148:17:148:33 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:148:17:148:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:152:13:152:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:152:13:152:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:155:13:155:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:155:13:155:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:162:17:162:33 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:162:17:162:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:169:17:169:33 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:169:17:169:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:177:13:177:29 | ...::alloc | main.rs:339:13:339:26 | ...::args | main.rs:177:13:177:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:193:32:193:36 | alloc | main.rs:339:13:339:26 | ...::args | main.rs:193:32:193:36 | alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:194:32:194:43 | alloc_zeroed | main.rs:339:13:339:26 | ...::args | main.rs:194:32:194:43 | alloc_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:195:32:195:39 | allocate | main.rs:339:13:339:26 | ...::args | main.rs:195:32:195:39 | allocate | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:196:32:196:46 | allocate_zeroed | main.rs:339:13:339:26 | ...::args | main.rs:196:32:196:46 | allocate_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:197:32:197:39 | allocate | main.rs:339:13:339:26 | ...::args | main.rs:197:32:197:39 | allocate | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:198:32:198:46 | allocate_zeroed | main.rs:339:13:339:26 | ...::args | main.rs:198:32:198:46 | allocate_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:202:32:202:38 | realloc | main.rs:339:13:339:26 | ...::args | main.rs:202:32:202:38 | realloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:208:40:208:43 | grow | main.rs:339:13:339:26 | ...::args | main.rs:208:40:208:43 | grow | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:210:40:210:50 | grow_zeroed | main.rs:339:13:339:26 | ...::args | main.rs:210:40:210:50 | grow_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:213:36:213:41 | shrink | main.rs:339:13:339:26 | ...::args | main.rs:213:36:213:41 | shrink | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:219:13:219:24 | ...::malloc | main.rs:339:13:339:26 | ...::args | main.rs:219:13:219:24 | ...::malloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:220:13:220:31 | ...::aligned_alloc | main.rs:339:13:339:26 | ...::args | main.rs:220:13:220:31 | ...::aligned_alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:222:13:222:24 | ...::calloc | main.rs:339:13:339:26 | ...::args | main.rs:222:13:222:24 | ...::calloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:223:13:223:24 | ...::calloc | main.rs:339:13:339:26 | ...::args | main.rs:223:13:223:24 | ...::calloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:224:13:224:25 | ...::realloc | main.rs:339:13:339:26 | ...::args | main.rs:224:13:224:25 | ...::realloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:228:13:228:41 | ...::try_with_capacity | main.rs:339:13:339:26 | ...::args | main.rs:228:13:228:41 | ...::try_with_capacity | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:229:13:229:37 | ...::with_capacity | main.rs:339:13:339:26 | ...::args | main.rs:229:13:229:37 | ...::with_capacity | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:230:13:230:44 | ...::try_with_capacity_in | main.rs:339:13:339:26 | ...::args | main.rs:230:13:230:44 | ...::try_with_capacity_in | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
+| main.rs:231:13:231:40 | ...::with_capacity_in | main.rs:339:13:339:26 | ...::args | main.rs:231:13:231:40 | ...::with_capacity_in | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
 | main.rs:287:22:287:38 | ...::alloc | main.rs:311:25:311:38 | ...::args | main.rs:287:22:287:38 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:311:25:311:38 | ...::args | user-provided value |
+| main.rs:331:13:331:24 | ...::malloc | main.rs:339:13:339:26 | ...::args | main.rs:331:13:331:24 | ...::malloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:339:13:339:26 | ...::args | user-provided value |
 edges
 | main.rs:12:36:12:43 | ...: usize | main.rs:18:41:18:41 | v | provenance |  |
 | main.rs:18:41:18:41 | v | main.rs:18:13:18:31 | ...::realloc | provenance | MaD:17 Sink:MaD:17 |
@@ -270,24 +271,28 @@ edges
 | main.rs:311:25:311:40 | ...::args(...) [element] | main.rs:311:25:311:47 | ... .nth(...) [Some] | provenance | MaD:23 |
 | main.rs:311:25:311:47 | ... .nth(...) [Some] | main.rs:311:25:311:74 | ... .unwrap_or(...) | provenance | MaD:39 |
 | main.rs:311:25:311:74 | ... .unwrap_or(...) | main.rs:282:24:282:41 | ...: String | provenance |  |
-| main.rs:320:9:320:9 | v | main.rs:323:34:323:34 | v | provenance |  |
-| main.rs:320:9:320:9 | v | main.rs:324:42:324:42 | v | provenance |  |
-| main.rs:320:9:320:9 | v | main.rs:325:36:325:36 | v | provenance |  |
-| main.rs:320:9:320:9 | v | main.rs:326:27:326:27 | v | provenance |  |
-| main.rs:320:9:320:9 | v | main.rs:327:25:327:25 | v | provenance |  |
-| main.rs:320:9:320:9 | v | main.rs:328:22:328:22 | v | provenance |  |
-| main.rs:320:13:320:26 | ...::args | main.rs:320:13:320:28 | ...::args(...) [element] | provenance | Src:MaD:22  |
-| main.rs:320:13:320:28 | ...::args(...) [element] | main.rs:320:13:320:35 | ... .nth(...) [Some] | provenance | MaD:23 |
-| main.rs:320:13:320:35 | ... .nth(...) [Some] | main.rs:320:13:320:65 | ... .unwrap_or(...) | provenance | MaD:39 |
-| main.rs:320:13:320:65 | ... .unwrap_or(...) | main.rs:320:13:320:82 | ... .parse() [Ok] | provenance | MaD:26 |
-| main.rs:320:13:320:82 | ... .parse() [Ok] | main.rs:320:13:320:91 | ... .unwrap() | provenance | MaD:41 |
-| main.rs:320:13:320:91 | ... .unwrap() | main.rs:320:9:320:9 | v | provenance |  |
-| main.rs:323:34:323:34 | v | main.rs:12:36:12:43 | ...: usize | provenance |  |
-| main.rs:324:42:324:42 | v | main.rs:43:44:43:51 | ...: usize | provenance |  |
-| main.rs:325:36:325:36 | v | main.rs:91:38:91:45 | ...: usize | provenance |  |
-| main.rs:326:27:326:27 | v | main.rs:183:29:183:36 | ...: usize | provenance |  |
-| main.rs:327:25:327:25 | v | main.rs:217:27:217:34 | ...: usize | provenance |  |
-| main.rs:328:22:328:22 | v | main.rs:227:24:227:31 | ...: usize | provenance |  |
+| main.rs:317:26:317:33 | ...: usize | main.rs:331:26:331:26 | a | provenance |  |
+| main.rs:331:26:331:26 | a | main.rs:331:13:331:24 | ...::malloc | provenance | MaD:20 Sink:MaD:20 |
+| main.rs:339:9:339:9 | v | main.rs:342:34:342:34 | v | provenance |  |
+| main.rs:339:9:339:9 | v | main.rs:343:42:343:42 | v | provenance |  |
+| main.rs:339:9:339:9 | v | main.rs:344:36:344:36 | v | provenance |  |
+| main.rs:339:9:339:9 | v | main.rs:345:27:345:27 | v | provenance |  |
+| main.rs:339:9:339:9 | v | main.rs:346:25:346:25 | v | provenance |  |
+| main.rs:339:9:339:9 | v | main.rs:347:22:347:22 | v | provenance |  |
+| main.rs:339:9:339:9 | v | main.rs:349:24:349:24 | v | provenance |  |
+| main.rs:339:13:339:26 | ...::args | main.rs:339:13:339:28 | ...::args(...) [element] | provenance | Src:MaD:22  |
+| main.rs:339:13:339:28 | ...::args(...) [element] | main.rs:339:13:339:35 | ... .nth(...) [Some] | provenance | MaD:23 |
+| main.rs:339:13:339:35 | ... .nth(...) [Some] | main.rs:339:13:339:65 | ... .unwrap_or(...) | provenance | MaD:39 |
+| main.rs:339:13:339:65 | ... .unwrap_or(...) | main.rs:339:13:339:82 | ... .parse() [Ok] | provenance | MaD:26 |
+| main.rs:339:13:339:82 | ... .parse() [Ok] | main.rs:339:13:339:91 | ... .unwrap() | provenance | MaD:41 |
+| main.rs:339:13:339:91 | ... .unwrap() | main.rs:339:9:339:9 | v | provenance |  |
+| main.rs:342:34:342:34 | v | main.rs:12:36:12:43 | ...: usize | provenance |  |
+| main.rs:343:42:343:42 | v | main.rs:43:44:43:51 | ...: usize | provenance |  |
+| main.rs:344:36:344:36 | v | main.rs:91:38:91:45 | ...: usize | provenance |  |
+| main.rs:345:27:345:27 | v | main.rs:183:29:183:36 | ...: usize | provenance |  |
+| main.rs:346:25:346:25 | v | main.rs:217:27:217:34 | ...: usize | provenance |  |
+| main.rs:347:22:347:22 | v | main.rs:227:24:227:31 | ...: usize | provenance |  |
+| main.rs:349:24:349:24 | v | main.rs:317:26:317:33 | ...: usize | provenance |  |
 models
 | 1 | Sink: <alloc::alloc::Global as core::alloc::Allocator>::allocate; Argument[0]; alloc-layout |
 | 2 | Sink: <alloc::alloc::Global as core::alloc::Allocator>::allocate_zeroed; Argument[0]; alloc-layout |
@@ -555,17 +560,21 @@ nodes
 | main.rs:311:25:311:40 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
 | main.rs:311:25:311:47 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
 | main.rs:311:25:311:74 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
-| main.rs:320:9:320:9 | v | semmle.label | v |
-| main.rs:320:13:320:26 | ...::args | semmle.label | ...::args |
-| main.rs:320:13:320:28 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
-| main.rs:320:13:320:35 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
-| main.rs:320:13:320:65 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
-| main.rs:320:13:320:82 | ... .parse() [Ok] | semmle.label | ... .parse() [Ok] |
-| main.rs:320:13:320:91 | ... .unwrap() | semmle.label | ... .unwrap() |
-| main.rs:323:34:323:34 | v | semmle.label | v |
-| main.rs:324:42:324:42 | v | semmle.label | v |
-| main.rs:325:36:325:36 | v | semmle.label | v |
-| main.rs:326:27:326:27 | v | semmle.label | v |
-| main.rs:327:25:327:25 | v | semmle.label | v |
-| main.rs:328:22:328:22 | v | semmle.label | v |
+| main.rs:317:26:317:33 | ...: usize | semmle.label | ...: usize |
+| main.rs:331:13:331:24 | ...::malloc | semmle.label | ...::malloc |
+| main.rs:331:26:331:26 | a | semmle.label | a |
+| main.rs:339:9:339:9 | v | semmle.label | v |
+| main.rs:339:13:339:26 | ...::args | semmle.label | ...::args |
+| main.rs:339:13:339:28 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
+| main.rs:339:13:339:35 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
+| main.rs:339:13:339:65 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
+| main.rs:339:13:339:82 | ... .parse() [Ok] | semmle.label | ... .parse() [Ok] |
+| main.rs:339:13:339:91 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:342:34:342:34 | v | semmle.label | v |
+| main.rs:343:42:343:42 | v | semmle.label | v |
+| main.rs:344:36:344:36 | v | semmle.label | v |
+| main.rs:345:27:345:27 | v | semmle.label | v |
+| main.rs:346:25:346:25 | v | semmle.label | v |
+| main.rs:347:22:347:22 | v | semmle.label | v |
+| main.rs:349:24:349:24 | v | semmle.label | v |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-770/main.rs b/rust/ql/test/query-tests/security/CWE-770/main.rs
index 916bc55ad7d..7ab9f9445fb 100644
--- a/rust/ql/test/query-tests/security/CWE-770/main.rs
+++ b/rust/ql/test/query-tests/security/CWE-770/main.rs
@@ -312,6 +312,25 @@ fn test_examples() {
     allocate_buffer_good(std::env::args().nth(1).unwrap_or("0".to_string()));
 }
 
+extern crate alloc;
+
+unsafe fn test_non_sinks(a: usize) {
+    let b = a as u64;
+
+    let _ = Vec::from([a]);
+    let _ = std::vec::Vec::from([a]);
+    let _ = alloc::vec::Vec::from([a]);
+
+    let _ : Vec<usize> = From::from([a]);
+    let _ : std::vec::Vec<usize> = From::from([a]);
+    let _ : alloc::vec::Vec<usize> = From::from([a]);
+
+    let _ = i128 ::from(b);
+    let _ : i128 = From::from(b);
+
+    let _ = libc::malloc(a); // $ Alert[rust/uncontrolled-allocation-size]=arg1
+}
+
 // --- main ---
 
 fn main() {
@@ -327,6 +346,7 @@ fn main() {
         test_libc_alloc(v);
         test_vectors(v);
         test_examples();
+        test_non_sinks(v);
     }
 
     println!("--- end ---");
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 92e11e895cd..a301fad6560 100644
--- a/rust/ql/test/query-tests/security/CWE-825/AccessAfterLifetime.expected
+++ b/rust/ql/test/query-tests/security/CWE-825/AccessAfterLifetime.expected
@@ -9,6 +9,7 @@
 | lifetime.rs:76:4:76:5 | p2 | lifetime.rs:27:9:27:22 | &mut my_local2 | lifetime.rs:76:4:76:5 | p2 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:25:10:25:18 | my_local2 | my_local2 |
 | lifetime.rs:77:4:77:5 | p4 | lifetime.rs:39:9:39:26 | &raw mut my_local4 | lifetime.rs:77:4:77:5 | p4 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:37:10:37:18 | my_local4 | my_local4 |
 | lifetime.rs:172:13:172:15 | ptr | lifetime.rs:187:12:187:21 | &my_local1 | lifetime.rs:172:13:172:15 | ptr | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:186:6:186:14 | my_local1 | my_local1 |
+| lifetime.rs:180:13:180:15 | ptr | lifetime.rs:187:12:187:21 | &my_local1 | lifetime.rs:180:13:180:15 | ptr | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:186:6:186:14 | my_local1 | my_local1 |
 | lifetime.rs:255:14:255:17 | prev | lifetime.rs:251:10:251:19 | &my_local2 | lifetime.rs:255:14:255:17 | prev | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:242:7:242:15 | my_local2 | my_local2 |
 | lifetime.rs:310:31:310:32 | e1 | lifetime.rs:272:30:272:32 | &e1 | lifetime.rs:310:31:310:32 | e1 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:271:6:271:7 | e1 | e1 |
 | lifetime.rs:314:23:314:24 | p2 | lifetime.rs:279:28:279:30 | &v2 | lifetime.rs:314:23:314:24 | p2 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:278:6:278:7 | v2 | v2 |
@@ -55,39 +56,23 @@ edges
 | lifetime.rs:59:11:59:36 | get_local_field_dangling(...) | lifetime.rs:59:6:59:7 | p6 | provenance |  |
 | lifetime.rs:63:3:63:4 | p7 | lifetime.rs:75:13:75:14 | p7 | provenance |  |
 | lifetime.rs:63:8:63:27 | &raw const my_local7 | lifetime.rs:63:3:63:4 | p7 | provenance |  |
-| lifetime.rs:91:17:91:30 | ...: ... | lifetime.rs:101:14:101:15 | p1 | provenance |  |
-| lifetime.rs:91:33:91:44 | ...: ... | lifetime.rs:102:14:102:15 | p2 | provenance |  |
-| lifetime.rs:91:33:91:44 | ...: ... | lifetime.rs:110:5:110:6 | p2 | provenance |  |
 | lifetime.rs:94:2:94:3 | p3 | lifetime.rs:103:14:103:15 | p3 | provenance |  |
 | lifetime.rs:94:7:94:16 | &my_local1 | lifetime.rs:94:2:94:3 | p3 | provenance |  |
-| lifetime.rs:119:15:119:24 | &my_local3 | lifetime.rs:91:17:91:30 | ...: ... | provenance |  |
-| lifetime.rs:119:27:119:44 | &mut my_local_mut4 | lifetime.rs:91:33:91:44 | ...: ... | provenance |  |
-| lifetime.rs:161:17:161:31 | ...: ... | lifetime.rs:164:13:164:15 | ptr | provenance |  |
 | lifetime.rs:169:17:169:31 | ...: ... | lifetime.rs:172:13:172:15 | ptr | provenance |  |
 | lifetime.rs:177:17:177:31 | ...: ... | lifetime.rs:180:13:180:15 | ptr | provenance |  |
-| lifetime.rs:187:6:187:8 | ptr | lifetime.rs:189:15:189:17 | ptr | provenance |  |
-| lifetime.rs:187:6:187:8 | ptr | lifetime.rs:190:15:190:17 | ptr | provenance |  |
 | lifetime.rs:187:6:187:8 | ptr | lifetime.rs:192:2:192:11 | return ptr | provenance |  |
 | lifetime.rs:187:12:187:21 | &my_local1 | lifetime.rs:187:6:187:8 | ptr | provenance |  |
-| lifetime.rs:189:15:189:17 | ptr | lifetime.rs:161:17:161:31 | ...: ... | provenance |  |
-| lifetime.rs:190:15:190:17 | ptr | lifetime.rs:177:17:177:31 | ...: ... | provenance |  |
 | lifetime.rs:192:2:192:11 | return ptr | lifetime.rs:196:12:196:36 | access_and_get_dangling(...) | provenance |  |
 | lifetime.rs:196:6:196:8 | ptr | lifetime.rs:200:15:200:17 | ptr | provenance |  |
 | lifetime.rs:196:6:196:8 | ptr | lifetime.rs:201:15:201:17 | ptr | provenance |  |
 | lifetime.rs:196:12:196:36 | access_and_get_dangling(...) | lifetime.rs:196:6:196:8 | ptr | provenance |  |
 | lifetime.rs:200:15:200:17 | ptr | lifetime.rs:169:17:169:31 | ...: ... | provenance |  |
 | lifetime.rs:201:15:201:17 | ptr | lifetime.rs:177:17:177:31 | ...: ... | provenance |  |
-| lifetime.rs:206:19:206:36 | ...: ... | lifetime.rs:216:16:216:21 | ptr_up | provenance |  |
-| lifetime.rs:208:6:208:13 | ptr_ours | lifetime.rs:211:33:211:40 | ptr_ours | provenance |  |
 | lifetime.rs:208:6:208:13 | ptr_ours | lifetime.rs:225:2:225:16 | return ptr_ours | provenance |  |
 | lifetime.rs:208:17:208:29 | &my_local_rec | lifetime.rs:208:6:208:13 | ptr_ours | provenance |  |
 | lifetime.rs:211:7:211:14 | ptr_down | lifetime.rs:218:18:218:25 | ptr_down | provenance |  |
 | lifetime.rs:211:18:211:52 | access_ptr_rec(...) | lifetime.rs:211:7:211:14 | ptr_down | provenance |  |
-| lifetime.rs:211:33:211:40 | ptr_ours | lifetime.rs:206:19:206:36 | ...: ... | provenance |  |
 | lifetime.rs:225:2:225:16 | return ptr_ours | lifetime.rs:211:18:211:52 | access_ptr_rec(...) | provenance |  |
-| lifetime.rs:230:6:230:14 | ptr_start | lifetime.rs:232:21:232:29 | ptr_start | provenance |  |
-| lifetime.rs:230:18:230:31 | &my_local_rec2 | lifetime.rs:230:6:230:14 | ptr_start | provenance |  |
-| lifetime.rs:232:21:232:29 | ptr_start | lifetime.rs:206:19:206:36 | ...: ... | provenance |  |
 | lifetime.rs:239:6:239:13 | mut prev | lifetime.rs:247:15:247:18 | prev | provenance |  |
 | lifetime.rs:239:6:239:13 | mut prev | lifetime.rs:255:14:255:17 | prev | provenance |  |
 | lifetime.rs:239:34:239:43 | &my_local1 | lifetime.rs:239:6:239:13 | mut prev | provenance |  |
@@ -215,43 +200,26 @@ nodes
 | lifetime.rs:75:13:75:14 | p7 | semmle.label | p7 |
 | lifetime.rs:76:4:76:5 | p2 | semmle.label | p2 |
 | lifetime.rs:77:4:77:5 | p4 | semmle.label | p4 |
-| lifetime.rs:91:17:91:30 | ...: ... | semmle.label | ...: ... |
-| lifetime.rs:91:33:91:44 | ...: ... | semmle.label | ...: ... |
 | lifetime.rs:94:2:94:3 | p3 | semmle.label | p3 |
 | lifetime.rs:94:7:94:16 | &my_local1 | semmle.label | &my_local1 |
-| lifetime.rs:101:14:101:15 | p1 | semmle.label | p1 |
-| lifetime.rs:102:14:102:15 | p2 | semmle.label | p2 |
 | lifetime.rs:103:14:103:15 | p3 | semmle.label | p3 |
-| lifetime.rs:110:5:110:6 | p2 | semmle.label | p2 |
-| lifetime.rs:119:15:119:24 | &my_local3 | semmle.label | &my_local3 |
-| lifetime.rs:119:27:119:44 | &mut my_local_mut4 | semmle.label | &mut my_local_mut4 |
-| lifetime.rs:161:17:161:31 | ...: ... | semmle.label | ...: ... |
-| lifetime.rs:164:13:164:15 | ptr | semmle.label | ptr |
 | lifetime.rs:169:17:169:31 | ...: ... | semmle.label | ...: ... |
 | lifetime.rs:172:13:172:15 | ptr | semmle.label | ptr |
 | lifetime.rs:177:17:177:31 | ...: ... | semmle.label | ...: ... |
 | lifetime.rs:180:13:180:15 | ptr | semmle.label | ptr |
 | lifetime.rs:187:6:187:8 | ptr | semmle.label | ptr |
 | lifetime.rs:187:12:187:21 | &my_local1 | semmle.label | &my_local1 |
-| lifetime.rs:189:15:189:17 | ptr | semmle.label | ptr |
-| lifetime.rs:190:15:190:17 | ptr | semmle.label | ptr |
 | lifetime.rs:192:2:192:11 | return ptr | semmle.label | return ptr |
 | lifetime.rs:196:6:196:8 | ptr | semmle.label | ptr |
 | lifetime.rs:196:12:196:36 | access_and_get_dangling(...) | semmle.label | access_and_get_dangling(...) |
 | lifetime.rs:200:15:200:17 | ptr | semmle.label | ptr |
 | lifetime.rs:201:15:201:17 | ptr | semmle.label | ptr |
-| lifetime.rs:206:19:206:36 | ...: ... | semmle.label | ...: ... |
 | lifetime.rs:208:6:208:13 | ptr_ours | semmle.label | ptr_ours |
 | lifetime.rs:208:17:208:29 | &my_local_rec | semmle.label | &my_local_rec |
 | lifetime.rs:211:7:211:14 | ptr_down | semmle.label | ptr_down |
 | lifetime.rs:211:18:211:52 | access_ptr_rec(...) | semmle.label | access_ptr_rec(...) |
-| lifetime.rs:211:33:211:40 | ptr_ours | semmle.label | ptr_ours |
-| lifetime.rs:216:16:216:21 | ptr_up | semmle.label | ptr_up |
 | lifetime.rs:218:18:218:25 | ptr_down | semmle.label | ptr_down |
 | lifetime.rs:225:2:225:16 | return ptr_ours | semmle.label | return ptr_ours |
-| lifetime.rs:230:6:230:14 | ptr_start | semmle.label | ptr_start |
-| lifetime.rs:230:18:230:31 | &my_local_rec2 | semmle.label | &my_local_rec2 |
-| lifetime.rs:232:21:232:29 | ptr_start | semmle.label | ptr_start |
 | lifetime.rs:239:6:239:13 | mut prev | semmle.label | mut prev |
 | lifetime.rs:239:34:239:43 | &my_local1 | semmle.label | &my_local1 |
 | lifetime.rs:247:15:247:18 | prev | semmle.label | prev |
diff --git a/rust/ql/test/query-tests/security/CWE-825/lifetime.rs b/rust/ql/test/query-tests/security/CWE-825/lifetime.rs
index 05a099e903f..51042b56ecc 100644
--- a/rust/ql/test/query-tests/security/CWE-825/lifetime.rs
+++ b/rust/ql/test/query-tests/security/CWE-825/lifetime.rs
@@ -177,7 +177,7 @@ fn access_ptr_2(ptr: *const i64) {
 fn access_ptr_3(ptr: *const i64) {
 	// called from contexts with `ptr` safe and dangling
 	unsafe {
-		let v3 = *ptr; // $ MISSING: Alert
+		let v3 = *ptr; // $ Alert[rust/access-after-lifetime-ended]=local1
 		println!("	v3 = {v3} (!)"); // corrupt in practice (in one context)
 	}
 }
diff --git a/rust/ql/test/utils-tests/modelgenerator/option.rs b/rust/ql/test/utils-tests/modelgenerator/option.rs
index fd5cd649c2c..701073564b1 100644
--- a/rust/ql/test/utils-tests/modelgenerator/option.rs
+++ b/rust/ql/test/utils-tests/modelgenerator/option.rs
@@ -416,7 +416,7 @@ impl<T> MyOption<&T> {
         }
     }
 
-    // MISSING: summary=<test::option::MyOption>::cloned;Argument[self].Field[test::option::MyOption::MySome(0)].Reference;ReturnValue.Field[test::option::MyOption::MySome(0)];value;dfc-generated
+    // summary=<test::option::MyOption>::cloned;Argument[self].Field[test::option::MyOption::MySome(0)].Reference;ReturnValue.Field[test::option::MyOption::MySome(0)];value;dfc-generated
     pub fn cloned(self) -> MyOption<T>
     where
         T: Clone,
@@ -440,7 +440,7 @@ impl<T> MyOption<&mut T> {
         }
     }
 
-    // MISSING: summary=<test::option::MyOption>::cloned;Argument[self].Field[test::option::MyOption::MySome(0)].Reference;ReturnValue.Field[test::option::MyOption::MySome(0)];value;dfc-generated
+    // summary=<test::option::MyOption>::cloned;Argument[self].Field[test::option::MyOption::MySome(0)].Reference;ReturnValue.Field[test::option::MyOption::MySome(0)];value;dfc-generated
     pub fn cloned(self) -> MyOption<T>
     where
         T: Clone,
diff --git a/shared/concepts/CHANGELOG.md b/shared/concepts/CHANGELOG.md
index 933fc5e7cd9..61720754dff 100644
--- a/shared/concepts/CHANGELOG.md
+++ b/shared/concepts/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.0.18
+
+No user-facing changes.
+
+## 0.0.17
+
+No user-facing changes.
+
 ## 0.0.16
 
 No user-facing changes.
diff --git a/shared/concepts/change-notes/released/0.0.17.md b/shared/concepts/change-notes/released/0.0.17.md
new file mode 100644
index 00000000000..62cc89030a6
--- /dev/null
+++ b/shared/concepts/change-notes/released/0.0.17.md
@@ -0,0 +1,3 @@
+## 0.0.17
+
+No user-facing changes.
diff --git a/shared/concepts/change-notes/released/0.0.18.md b/shared/concepts/change-notes/released/0.0.18.md
new file mode 100644
index 00000000000..86c60b8abe7
--- /dev/null
+++ b/shared/concepts/change-notes/released/0.0.18.md
@@ -0,0 +1,3 @@
+## 0.0.18
+
+No user-facing changes.
diff --git a/shared/concepts/codeql-pack.release.yml b/shared/concepts/codeql-pack.release.yml
index a49f7be4cff..a0d2bc59d97 100644
--- a/shared/concepts/codeql-pack.release.yml
+++ b/shared/concepts/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.16
+lastReleaseVersion: 0.0.18
diff --git a/shared/concepts/qlpack.yml b/shared/concepts/qlpack.yml
index 240ee962cfd..c23e61f19fb 100644
--- a/shared/concepts/qlpack.yml
+++ b/shared/concepts/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/concepts
-version: 0.0.17-dev
+version: 0.0.19-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/controlflow/CHANGELOG.md b/shared/controlflow/CHANGELOG.md
index 88666b4ad28..cd52e9f754d 100644
--- a/shared/controlflow/CHANGELOG.md
+++ b/shared/controlflow/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2.0.28
+
+No user-facing changes.
+
+## 2.0.27
+
+No user-facing changes.
+
 ## 2.0.26
 
 No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.27.md b/shared/controlflow/change-notes/released/2.0.27.md
new file mode 100644
index 00000000000..639cf77090e
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.27.md
@@ -0,0 +1,3 @@
+## 2.0.27
+
+No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.28.md b/shared/controlflow/change-notes/released/2.0.28.md
new file mode 100644
index 00000000000..3f9412b6e63
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.28.md
@@ -0,0 +1,3 @@
+## 2.0.28
+
+No user-facing changes.
diff --git a/shared/controlflow/codeql-pack.release.yml b/shared/controlflow/codeql-pack.release.yml
index 63d57bef481..ec5bd6ba369 100644
--- a/shared/controlflow/codeql-pack.release.yml
+++ b/shared/controlflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.26
+lastReleaseVersion: 2.0.28
diff --git a/shared/controlflow/codeql/controlflow/BasicBlock.qll b/shared/controlflow/codeql/controlflow/BasicBlock.qll
index ed86ae5aa8b..163ddee70f0 100644
--- a/shared/controlflow/codeql/controlflow/BasicBlock.qll
+++ b/shared/controlflow/codeql/controlflow/BasicBlock.qll
@@ -177,6 +177,9 @@ module Make<LocationSig Location, InputSig<Location> Input> implements CfgSig<Lo
     /** Gets the CFG scope of this basic block. */
     CfgScope getScope() { result = nodeGetCfgScope(this.getFirstNode()) }
 
+    /** Gets the enclosing callable of this basic block. */
+    CfgScope getEnclosingCallable() { result = nodeGetCfgScope(this.getFirstNode()) }
+
     /** Gets the location of this basic block. */
     Location getLocation() { result = this.getFirstNode().getLocation() }
 
diff --git a/shared/controlflow/codeql/controlflow/ControlFlowGraph.qll b/shared/controlflow/codeql/controlflow/ControlFlowGraph.qll
new file mode 100644
index 00000000000..ac7c5b59cfe
--- /dev/null
+++ b/shared/controlflow/codeql/controlflow/ControlFlowGraph.qll
@@ -0,0 +1,1906 @@
+/**
+ * Provides a shared implementation of control flow graphs (CFGs).
+ *
+ * The implementation is built on a common AST signature, which contains many
+ * AST constructs that are common across languages. Language-specific AST
+ * constructs can be given control flow semantics separately and seamlessly
+ * integrated into the shared CFG. Any parts of the AST without explicit
+ * control flow semantics will be given a default left-to-right evaluation
+ * order with an option to choose between pre-order and post-order. By default,
+ * most expressions are evaluated in post-order, while most statements are
+ * evaluated in pre-order, but there are several exceptions to this.
+ *
+ * Control flow nodes are synthesized such that each AST node is represented by
+ * a unique control flow node. Each AST node also gets associated "before" and
+ * "after" control flow nodes, which represent the points in the control flow
+ * before and after the normal execution of the AST node, respectively. For
+ * simple leaf nodes, the "before" and "after" nodes are merged into a single
+ * node. For AST nodes in conditional contexts, there are two different "after"
+ * nodes representing the different possible values of the AST node.
+ */
+overlay[local?]
+module;
+
+private import codeql.util.Boolean
+private import codeql.util.FileSystem
+private import codeql.util.Location
+private import SuccessorType
+
+signature class TypSig;
+
+signature module AstSig<LocationSig Location> {
+  /** An AST node. */
+  class AstNode {
+    /** Gets a textual representation of this AST node. */
+    string toString();
+
+    /** Gets the location of this AST node. */
+    Location getLocation();
+  }
+
+  /** Gets the child of this AST node at the specified index. */
+  AstNode getChild(AstNode n, int index);
+
+  /** Gets the immediately enclosing callable that contains this node. */
+  Callable getEnclosingCallable(AstNode node);
+
+  /** A callable, for example a function, method, constructor, or top-level script. */
+  class Callable extends AstNode;
+
+  /** Gets the body of this callable, if any. */
+  AstNode callableGetBody(Callable c);
+
+  /** A statement. */
+  class Stmt extends AstNode;
+
+  /** An expression. */
+  class Expr extends AstNode;
+
+  /**
+   * A block statement, which is a sequence of statements that are executed in
+   * order.
+   */
+  class BlockStmt extends Stmt {
+    /** Gets the `n`th (zero-based) statement in this block. */
+    Stmt getStmt(int n);
+
+    /** Gets the last statement in this block. */
+    Stmt getLastStmt();
+  }
+
+  /** An expression statement. */
+  class ExprStmt extends Stmt {
+    /** Gets the expression in this expression statement. */
+    Expr getExpr();
+  }
+
+  /** An `if` statement. */
+  class IfStmt extends Stmt {
+    /** Gets the condition of this `if` statement. */
+    Expr getCondition();
+
+    /** Gets the `then` (true) branch of this `if` statement. */
+    Stmt getThen();
+
+    /** Gets the `else` (false) branch of this `if` statement, if any. */
+    Stmt getElse();
+  }
+
+  /**
+   * A loop statement. Loop statements are further subclassed into specific
+   * types of loops.
+   */
+  class LoopStmt extends Stmt {
+    /** Gets the body of this loop statement. */
+    Stmt getBody();
+  }
+
+  /** A `while` loop statement. */
+  class WhileStmt extends LoopStmt {
+    /** Gets the boolean condition of this `while` loop. */
+    Expr getCondition();
+  }
+
+  /** A `do-while` loop statement. */
+  class DoStmt extends LoopStmt {
+    /** Gets the boolean condition of this `do-while` loop. */
+    Expr getCondition();
+  }
+
+  /** A traditional C-style `for` loop. */
+  class ForStmt extends LoopStmt {
+    /** Gets the initializer expression of the loop at the specified (zero-based) position, if any. */
+    Expr getInit(int index);
+
+    /** Gets the boolean condition of this `for` loop. */
+    Expr getCondition();
+
+    /** Gets the update expression of this loop at the specified (zero-based) position, if any. */
+    Expr getUpdate(int index);
+  }
+
+  /** A for-loop that iterates over the elements of a collection. */
+  class ForeachStmt extends LoopStmt {
+    /** Gets the variable declaration of this `foreach` loop. */
+    Expr getVariable();
+
+    /** Gets the collection expression of this `foreach` loop. */
+    Expr getCollection();
+  }
+
+  /**
+   * A `break` statement.
+   *
+   * Break statements complete abruptly and break out of a loop or switch.
+   */
+  class BreakStmt extends Stmt;
+
+  /**
+   * A `continue` statement.
+   *
+   * Continue statements complete abruptly and continue to the next iteration
+   * of a loop.
+   */
+  class ContinueStmt extends Stmt;
+
+  /**
+   * A `return` statement.
+   *
+   * Return statements complete abruptly and return control to the caller of
+   * the enclosing callable.
+   */
+  class ReturnStmt extends Stmt {
+    /** Gets the expression being returned, if any. */
+    Expr getExpr();
+  }
+
+  /**
+   * A `throw` statement.
+   *
+   * Throw statements complete abruptly and throw an exception.
+   */
+  class ThrowStmt extends Stmt {
+    /** Gets the expression being thrown. */
+    Expr getExpr();
+  }
+
+  /** A `try` statement with `catch` and/or `finally` clauses. */
+  class TryStmt extends Stmt {
+    /** Gets the body of this `try` statement. */
+    Stmt getBody();
+
+    /**
+     * Gets the `catch` clause at the specified (zero-based) position `index`
+     * in this `try` statement.
+     */
+    CatchClause getCatch(int index);
+
+    /** Gets the `finally` block of this `try` statement, if any. */
+    Stmt getFinally();
+  }
+
+  /**
+   * Gets the initializer of this `try` statement at the specified (zero-based)
+   * position `index`, if any.
+   *
+   * An example of this are resource declarations in Java's try-with-resources
+   * statement.
+   */
+  default AstNode getTryInit(TryStmt try, int index) { none() }
+
+  /**
+   * Gets the `else` block of this `try` statement, if any.
+   *
+   * Only some languages (e.g. Python) support `try-else` constructs.
+   */
+  default AstNode getTryElse(TryStmt try) { none() }
+
+  /** A catch clause in a try statement. */
+  class CatchClause extends AstNode {
+    /** Gets the variable declared by this catch clause. */
+    AstNode getVariable();
+
+    /** Gets the guard condition of this catch clause, if any. */
+    Expr getCondition();
+
+    /** Gets the body of this catch clause. */
+    Stmt getBody();
+  }
+
+  /**
+   * A switch.
+   *
+   * A switch tests an expression against a number of cases, and executes the
+   * body of the first matching case.
+   */
+  class Switch extends AstNode {
+    /**
+     * Gets the expression being switched on.
+     *
+     * In some languages this is optional, in which case this predicate then
+     * might not hold.
+     */
+    Expr getExpr();
+
+    /** Gets the case at the specified (zero-based) `index`. */
+    Case getCase(int index);
+
+    /**
+     * Gets the statement at the specified (zero-based) `index`, if any.
+     *
+     * Depending on the language, switches may have their case bodies nested
+     * under the case nodes, which may or may not be statements themselves, or
+     * the switches may have a flat structure where the cases are just labels
+     * and the case bodies are sequences of statements between case statements.
+     * This predicate accommodates the latter.
+     */
+    Stmt getStmt(int index);
+  }
+
+  /** A case in a switch. */
+  class Case extends AstNode {
+    /** Gets a pattern being matched by this case. */
+    AstNode getAPattern();
+
+    /** Gets the guard expression of this case, if any. */
+    Expr getGuard();
+
+    /**
+     * Gets the body of this case, if any.
+     *
+     * A case can either have a body as a single child AST node given by this
+     * predicate, or it can have an implicit body given by the sequence of
+     * statements between this case and the next case.
+     */
+    AstNode getBody();
+  }
+
+  class DefaultCase extends Case;
+
+  /**
+   * Holds if this case can fall through to the next case if it is not
+   * otherwise prevented with a `break` or similar.
+   */
+  default predicate fallsThrough(Case c) { not exists(c.getBody()) }
+
+  /** A ternary conditional expression. */
+  class ConditionalExpr extends Expr {
+    /** Gets the condition of this expression. */
+    Expr getCondition();
+
+    /** Gets the true branch of this expression. */
+    Expr getThen();
+
+    /** Gets the false branch of this expression. */
+    Expr getElse();
+  }
+
+  /** A binary expression. */
+  class BinaryExpr extends Expr {
+    /** Gets the left operand of this binary expression. */
+    Expr getLeftOperand();
+
+    /** Gets the right operand of this binary expression. */
+    Expr getRightOperand();
+  }
+
+  /** A short-circuiting logical AND expression. */
+  class LogicalAndExpr extends BinaryExpr;
+
+  /** A short-circuiting logical OR expression. */
+  class LogicalOrExpr extends BinaryExpr;
+
+  /** A short-circuiting null-coalescing expression. */
+  class NullCoalescingExpr extends BinaryExpr;
+
+  /** A unary expression. */
+  class UnaryExpr extends Expr {
+    /** Gets the operand of this unary expression. */
+    Expr getOperand();
+  }
+
+  /** A logical NOT expression. */
+  class LogicalNotExpr extends UnaryExpr;
+
+  /** A boolean literal expression. */
+  class BooleanLiteral extends Expr {
+    /** Gets the boolean value of this literal. */
+    boolean getValue();
+  }
+}
+
+/**
+ * Constructs the initial setup for a control flow graph. The construction is
+ * completed by subsequent instatiation of `Make1` and `Make2`.
+ *
+ * A complete instantiation can look as follows:
+ * ```ql
+ *   private module Input implements InputSig1, InputSig2 { .. }
+ *   private module Cfg0 = Make0<Location, Ast>;
+ *   private module Cfg1 = Make1<Input>;
+ *   private module Cfg2 = Make2<Input>;
+ *   private import Cfg0
+ *   private import Cfg1
+ *   private import Cfg2
+ *   import Public
+ * ```
+ */
+module Make0<LocationSig Location, AstSig<Location> Ast> {
+  private import Ast
+
+  signature module InputSig1 {
+    /**
+     * Reference to the cached stage of the control flow graph. Should be
+     * instantiated with `CfgCachedStage::ref()`.
+     */
+    predicate cfgCachedStageRef();
+
+    /**
+     * A label used for matching jump sources and targets, for example in goto
+     * statements.
+     */
+    class Label {
+      /** Gets a textual representation of this label. */
+      string toString();
+    }
+
+    /**
+     * Holds if the node `n` has the label `l`. For example, a label in a goto
+     * statement or a goto target.
+     */
+    default predicate hasLabel(AstNode n, Label l) { none() }
+
+    /**
+     * Holds if the value of `child` is propagated to `parent`. For example,
+     * the right-hand side of short-circuiting expressions.
+     *
+     * This predicate is only relevant for AST constructs that are not already
+     * handled by this library.
+     */
+    default predicate propagatesValue(AstNode child, AstNode parent) { none() }
+
+    /**
+     * Holds if `n` is in a conditional context of kind `kind`. For example,
+     * the left-hand side of a short-circuiting `&&` expression is in a
+     * boolean conditional context.
+     *
+     * This predicate is only relevant for AST constructs that are not already
+     * handled by this library.
+     */
+    default predicate inConditionalContext(AstNode n, ConditionKind kind) { none() }
+
+    /**
+     * Holds if `e` is executed in pre-order. This is typical for expressions
+     * that are pure control-flow constructions without calculation or side
+     * effects, such as `ConditionalExpr` and `Switch` expressions.
+     *
+     * This predicate is only relevant for AST constructs that are not already
+     * handled by this library.
+     */
+    default predicate preOrderExpr(Expr e) { none() }
+
+    /**
+     * Holds if `n` is executed in post-order or in-order. This means that an
+     * additional node is created to represent `n` in the control flow graph.
+     * Otherwise, `n` is represented by the "before" node.
+     *
+     * This predicate is only relevant for AST constructs that are not already
+     * handled by this library.
+     */
+    default predicate postOrInOrder(AstNode n) { none() }
+
+    /**
+     * Holds if an additional node tagged with `tag` should be created for
+     * `n`. Edges targeting such nodes are labeled with `t` and therefore `t`
+     * should be unique for a given `(n,tag)` pair.
+     *
+     * This predicate is only relevant for AST constructs that are not already
+     * handled by this library.
+     */
+    default predicate additionalNode(AstNode n, string tag, NormalSuccessor t) { none() }
+
+    /**
+     * Holds if `t1` implies `t2`.
+     *
+     * For example, in JavaScript, true (truthy) implies not-null, and null implies false (falsy).
+     */
+    default predicate successorValueImplies(ConditionalSuccessor t1, ConditionalSuccessor t2) {
+      none()
+    }
+  }
+
+  /**
+   * Partially constructs the control flow graph. The construction is completed
+   * by subsequent instatiation of `Make2`.
+   */
+  module Make1<InputSig1 Input1> {
+    /**
+     * Holds if `n` is executed in post-order or in-order. This means that an
+     * additional node is created to represent `n` in the control flow graph.
+     * Otherwise, `n` is represented by the "before" node.
+     */
+    cached
+    private predicate postOrInOrder(AstNode n) {
+      Input1::cfgCachedStageRef() and
+      Input1::postOrInOrder(n)
+      or
+      n instanceof ReturnStmt
+      or
+      n instanceof ThrowStmt
+      or
+      n instanceof BreakStmt
+      or
+      n instanceof ContinueStmt
+      or
+      n instanceof Expr and
+      exists(getChild(n, _)) and
+      not Input1::preOrderExpr(n) and
+      not n instanceof LogicalAndExpr and
+      not n instanceof LogicalOrExpr and
+      not n instanceof NullCoalescingExpr and
+      not n instanceof LogicalNotExpr and
+      not n instanceof ConditionalExpr and
+      not n instanceof Switch and
+      not n instanceof Case
+    }
+
+    /**
+     * Holds if `expr` is a short-circuiting expression and `shortcircuitValue`
+     * is the value that causes the short-circuit.
+     */
+    private predicate shortCircuiting(BinaryExpr expr, ConditionalSuccessor shortcircuitValue) {
+      expr instanceof LogicalAndExpr and shortcircuitValue.(BooleanSuccessor).getValue() = false
+      or
+      expr instanceof LogicalOrExpr and shortcircuitValue.(BooleanSuccessor).getValue() = true
+      or
+      expr instanceof NullCoalescingExpr and shortcircuitValue.(NullnessSuccessor).getValue() = true
+    }
+
+    /**
+     * Holds if the value of `child` is propagated to `parent`. For example,
+     * the right-hand side of short-circuiting expressions.
+     */
+    private predicate propagatesValue(AstNode child, AstNode parent) {
+      Input1::propagatesValue(child, parent)
+      or
+      // For now, the `not postOrInOrder(parent)` is superfluous, as we don't
+      // have any short-circuiting post-order expressions yet, but this will
+      // change once we add support for e.g. C#'s `??=`.
+      shortCircuiting(parent, _) and
+      not postOrInOrder(parent) and
+      parent.(BinaryExpr).getRightOperand() = child
+      or
+      parent = any(ConditionalExpr ce | child = [ce.getThen(), ce.getElse()])
+      or
+      parent.(BlockStmt).getLastStmt() = child
+      or
+      parent.(ExprStmt).getExpr() = child
+    }
+
+    /**
+     * Holds if `n` is in a conditional context of kind `kind`. For example,
+     * the left-hand side of a short-circuiting `&&` expression is in a
+     * boolean conditional context.
+     */
+    private predicate inConditionalContext(AstNode n, ConditionKind kind) {
+      Input1::inConditionalContext(n, kind)
+      or
+      exists(AstNode parent |
+        propagatesValue(n, parent) and
+        inConditionalContext(parent, kind)
+      )
+      or
+      exists(LogicalNotExpr notexpr |
+        n = notexpr.getOperand() and
+        inConditionalContext(notexpr, kind) and
+        kind.isBoolean()
+      )
+      or
+      exists(BinaryExpr binexpr, ConditionalSuccessor shortcircuitValue |
+        shortCircuiting(binexpr, shortcircuitValue) and
+        n = binexpr.getLeftOperand() and
+        kind = shortcircuitValue.getKind()
+      )
+      or
+      kind.isBoolean() and
+      (
+        any(IfStmt ifstmt).getCondition() = n or
+        any(WhileStmt whilestmt).getCondition() = n or
+        any(DoStmt dostmt).getCondition() = n or
+        any(ForStmt forstmt).getCondition() = n or
+        any(ConditionalExpr condexpr).getCondition() = n or
+        any(CatchClause catch).getCondition() = n or
+        any(Case case).getGuard() = n
+      )
+      or
+      any(ForeachStmt foreachstmt).getCollection() = n and kind.isEmptiness()
+      or
+      n instanceof CatchClause and kind.isMatching()
+      or
+      n instanceof Case and kind.isMatching()
+    }
+
+    /**
+     * Holds if `n` is a simple leaf node in the AST that does not appear in a
+     * conditional context. For such nodes, there is no need to create separate
+     * "before" and "after" control flow nodes, so we merge them.
+     */
+    cached
+    private predicate simpleLeafNode(AstNode n) {
+      Input1::cfgCachedStageRef() and
+      not exists(getChild(n, _)) and
+      not postOrInOrder(n) and
+      not inConditionalContext(n, _)
+    }
+
+    private string loopHeaderTag() { result = "[LoopHeader]" }
+
+    /**
+     * Holds if an additional node tagged with `tag` should be created for
+     * `n`. Edges targeting such nodes are labeled with `t` and therefore `t`
+     * should be unique for a given `(n,tag)` pair.
+     */
+    private predicate additionalNode(AstNode n, string tag, NormalSuccessor t) {
+      Input1::additionalNode(n, tag, t)
+      or
+      n instanceof LoopStmt and
+      tag = loopHeaderTag() and
+      t instanceof DirectSuccessor
+    }
+
+    /**
+     * Holds if `n` cannot terminate normally. For these cases there is no
+     * need to create an "after" node as that would be unreachable.
+     * Furthermore, skipping these nodes improves precision slightly for
+     * finally blocks, as the corresponding try blocks are otherwise generally
+     * assumed to be able to terminate normally, and hence allows for
+     * a normal successor from the finally block.
+     */
+    private predicate cannotTerminateNormally(AstNode n) {
+      n instanceof BreakStmt
+      or
+      n instanceof ContinueStmt
+      or
+      n instanceof ReturnStmt
+      or
+      n instanceof ThrowStmt
+      or
+      cannotTerminateNormally(n.(BlockStmt).getLastStmt())
+      or
+      cannotTerminateNormally(n.(ExprStmt).getExpr())
+      or
+      exists(IfStmt ifstmt |
+        ifstmt = n and
+        cannotTerminateNormally(ifstmt.getThen()) and
+        cannotTerminateNormally(ifstmt.getElse())
+      )
+      or
+      exists(TryStmt trystmt |
+        trystmt = n and
+        cannotTerminateNormally(trystmt.getBody()) and
+        forall(CatchClause catch | trystmt.getCatch(_) = catch |
+          cannotTerminateNormally(catch.getBody())
+        )
+      )
+    }
+
+    /*
+     * - Every AST node has "before" and "after" control flow nodes (except simple leaf nodes).
+     * - CFG snippets always start at the "before" node.
+     * - In case of normal termination, the final node is an "after" node.
+     * - Boolean and other conditional completions are encoded in the "after" nodes.
+     * - The number of "after" nodes for a given AST node depends on whether the AST
+     *   node is in a conditional context.
+     * - Successors are specified as simple steps between control flow nodes for
+     *   NormalSuccessors, and as pairs of half-edges for AbruptSuccessors. This
+     *   allows all specifications to be local.
+     * - Every AST node has a unique control flow node representing it. For
+     *   preorder this is the "before" node, and for inorder/postorder this is an
+     *   additional node that typically sits just before "after" (but may or may
+     *   not step to it, since "after" represents normal termination).
+     */
+
+    cached
+    private newtype TNode =
+      TBeforeNode(AstNode n) { Input1::cfgCachedStageRef() and exists(getEnclosingCallable(n)) } or
+      TAstNode(AstNode n) { postOrInOrder(n) and exists(getEnclosingCallable(n)) } or
+      TAfterValueNode(AstNode n, ConditionalSuccessor t) {
+        inConditionalContext(n, t.getKind()) and exists(getEnclosingCallable(n))
+      } or
+      TAfterNode(AstNode n) {
+        exists(getEnclosingCallable(n)) and
+        not inConditionalContext(n, _) and
+        not cannotTerminateNormally(n) and
+        not simpleLeafNode(n)
+      } or
+      TAdditionalNode(AstNode n, string tag) {
+        additionalNode(n, tag, _) and exists(getEnclosingCallable(n))
+      } or
+      TEntryNode(Callable c) { exists(callableGetBody(c)) } or
+      TAnnotatedExitNode(Callable c, Boolean normal) { exists(callableGetBody(c)) } or
+      TExitNode(Callable c) { exists(callableGetBody(c)) }
+
+    private class NodeImpl extends TNode {
+      /**
+       * Holds if this is the node representing the point in the control flow
+       * before the execution of `n`.
+       */
+      predicate isBefore(AstNode n) { this = TBeforeNode(n) }
+
+      /**
+       * Holds if this is a node representing the point in the control flow
+       * after the normal termination of `n`. For simple leaf nodes, this is
+       * merged with the "before" node and is hence equal to it. For nodes in
+       * conditional contexts, this may be one of two possible "after" nodes
+       * representing the different possible values of `n`.
+       */
+      predicate isAfter(AstNode n) {
+        this = TAfterNode(n)
+        or
+        this = TAfterValueNode(n, _)
+        or
+        this = TBeforeNode(n) and simpleLeafNode(n)
+      }
+
+      /**
+       * Holds if this is the node representing the normal termination of `n`
+       * with the value `t`.
+       *
+       * Note that `n`, and most importantly `t`, must be bound, and if this
+       * predicate is used to identify the starting point of a step, then
+       * `inConditionalContext(n, t.getKind())` must hold. On the other hand, if
+       * this is used to identify the end point of a step, then there is no
+       * such requirement - in that case `t` will be translated to the
+       * appropriate `SuccessorType` for `n`.
+       */
+      bindingset[n, t]
+      predicate isAfterValue(AstNode n, ConditionalSuccessor t) {
+        this = TAfterNode(n) and exists(t)
+        or
+        this = TBeforeNode(n) and simpleLeafNode(n) and exists(t)
+        or
+        this = TAfterValueNode(n, t)
+        or
+        exists(ConditionalSuccessor t0 | this = TAfterValueNode(n, t0) |
+          // When this predicate is used to identify the end point of a step,
+          // the kinds of `t` and `t0` may not match. For example, in
+          // `(x || y) ?? z`, the `||` may short-circuit with a known boolean
+          // value `t`, but it occurs in a nullness conditional context, which
+          // means that the `t0` has nullness kind. In these cases we check
+          // whether there is an implication that allows translation from `t`
+          // to `t0`, and if not `t0` is simply unrestricted. If the kinds did
+          // match, then no translation is needed and we're covered by the
+          // `this = TAfterValueNode(n, t)` case above.
+          Input1::successorValueImplies(t, t0)
+          or
+          not Input1::successorValueImplies(t, _) and
+          t.getKind() != t0.getKind()
+        )
+      }
+
+      /**
+       * Holds if this is the node representing the evaluation of `n` to the
+       * value `true`.
+       *
+       * Note that if this predicate is used to identify the starting point of
+       * a step, then `inConditionalContext(n, BooleanCondition())` must hold.
+       * On the other hand, if this is used to identify the end point of a
+       * step, then there is no such requirement.
+       */
+      predicate isAfterTrue(AstNode n) {
+        this.isAfterValue(n, any(BooleanSuccessor b | b.getValue() = true))
+      }
+
+      /**
+       * Holds if this is the node representing the evaluation of `n` to the
+       * value `false`.
+       *
+       * Note that if this predicate is used to identify the starting point of
+       * a step, then `inConditionalContext(n, BooleanCondition())` must hold.
+       * On the other hand, if this is used to identify the end point of a
+       * step, then there is no such requirement.
+       */
+      predicate isAfterFalse(AstNode n) {
+        this.isAfterValue(n, any(BooleanSuccessor b | b.getValue() = false))
+      }
+
+      /**
+       * Holds if this is the node representing the given AST node when `n`
+       * has an in-order or post-order execution.
+       */
+      predicate isIn(AstNode n) { this = TAstNode(n) }
+
+      /**
+       * Holds if this is an additional control flow node with the given tag
+       * for the given AST node.
+       */
+      predicate isAdditional(AstNode n, string tag) { this = TAdditionalNode(n, tag) }
+
+      /**
+       * Holds if this is the unique control flow node that represents the
+       * given AST node.
+       */
+      predicate injects(AstNode n) {
+        if postOrInOrder(n) then this = TAstNode(n) else this = TBeforeNode(n)
+      }
+
+      /** Gets the statement this control flow node uniquely represents, if any. */
+      Stmt asStmt() { this.injects(result) }
+
+      /** Gets the expression this control flow node uniquely represents, if any. */
+      Expr asExpr() { this.injects(result) }
+
+      /** Gets the enclosing callable of this control flow node. */
+      Callable getEnclosingCallable() { result = getEnclosingCallable(this.getAstNode()) }
+
+      /**
+       * Gets the AST node with which this control flow node is associated.
+       * Note that several control flow nodes are usually associated with the
+       * same AST node, but each control flow node is associated with a unique
+       * AST node.
+       */
+      abstract AstNode getAstNode();
+
+      /**
+       * INTERNAL: Do not use.
+       *
+       * Gets a tag such that the pair `(getAstNode(), getIdTag())` uniquely
+       * identifies this node.
+       */
+      abstract string getIdTag();
+
+      /** Gets a textual representation of this node. */
+      abstract string toString();
+
+      /** Gets the source location for this node. */
+      Location getLocation() { result = this.getAstNode().getLocation() }
+    }
+
+    /**
+     * A control flow node without the successor relation. This is used to
+     * reference control flow nodes during the construction of the control flow
+     * graph.
+     */
+    final class PreControlFlowNode = NodeImpl;
+
+    private class BeforeNode extends NodeImpl, TBeforeNode {
+      private AstNode n;
+
+      BeforeNode() { this = TBeforeNode(n) }
+
+      override AstNode getAstNode() { result = n }
+
+      override string getIdTag() { result = "before" }
+
+      override string toString() {
+        if postOrInOrder(n) then result = "Before " + n else result = n.toString()
+      }
+    }
+
+    private class MidNode extends NodeImpl, TAstNode {
+      private AstNode n;
+
+      MidNode() { this = TAstNode(n) }
+
+      override AstNode getAstNode() { result = n }
+
+      override string getIdTag() { result = "ast" }
+
+      override string toString() { result = n.toString() }
+    }
+
+    private class AfterValueNode extends NodeImpl, TAfterValueNode {
+      private AstNode n;
+      private ConditionalSuccessor t;
+
+      AfterValueNode() { this = TAfterValueNode(n, t) }
+
+      override AstNode getAstNode() { result = n }
+
+      override string getIdTag() {
+        t.getValue() = true and result = "after-true"
+        or
+        t.getValue() = false and result = "after-false"
+      }
+
+      override string toString() { result = "After " + n + " [" + t + "]" }
+    }
+
+    private class AfterNode extends NodeImpl, TAfterNode {
+      private AstNode n;
+
+      AfterNode() { this = TAfterNode(n) }
+
+      override AstNode getAstNode() { result = n }
+
+      override string getIdTag() { result = "after" }
+
+      override string toString() { result = "After " + n }
+    }
+
+    private class AdditionalNode extends NodeImpl, TAdditionalNode {
+      private AstNode n;
+      private string tag;
+
+      AdditionalNode() { this = TAdditionalNode(n, tag) }
+
+      override AstNode getAstNode() { result = n }
+
+      NormalSuccessor getSuccessorType() { additionalNode(n, tag, result) }
+
+      override string getIdTag() { result = "add. " + tag }
+
+      override string toString() { result = tag + " " + n }
+    }
+
+    final private class EntryNodeImpl extends NodeImpl, TEntryNode {
+      private Callable c;
+
+      EntryNodeImpl() { this = TEntryNode(c) }
+
+      override Callable getEnclosingCallable() { result = c }
+
+      override AstNode getAstNode() { result = c }
+
+      override string getIdTag() { result = "entry" }
+
+      override string toString() { result = "Entry" }
+    }
+
+    /** A control flow node indicating the normal or exceptional termination of a callable. */
+    final private class AnnotatedExitNodeImpl extends NodeImpl, TAnnotatedExitNode {
+      Callable c;
+      boolean normal;
+
+      AnnotatedExitNodeImpl() { this = TAnnotatedExitNode(c, normal) }
+
+      override Callable getEnclosingCallable() { result = c }
+
+      override AstNode getAstNode() { result = c }
+
+      override string getIdTag() {
+        normal = true and result = "exit-normal"
+        or
+        normal = false and result = "exit-exc"
+      }
+
+      override string toString() {
+        normal = true and result = "Normal Exit"
+        or
+        normal = false and result = "Exceptional Exit"
+      }
+    }
+
+    /** A control flow node indicating normal termination of a callable. */
+    final private class NormalExitNodeImpl extends AnnotatedExitNodeImpl {
+      NormalExitNodeImpl() { this = TAnnotatedExitNode(_, true) }
+    }
+
+    /** A control flow node indicating exceptional termination of a callable. */
+    final private class ExceptionalExitNodeImpl extends AnnotatedExitNodeImpl {
+      ExceptionalExitNodeImpl() { this = TAnnotatedExitNode(_, false) }
+    }
+
+    /** A control flow node indicating the termination of a callable. */
+    final private class ExitNodeImpl extends NodeImpl, TExitNode {
+      Callable c;
+
+      ExitNodeImpl() { this = TExitNode(c) }
+
+      override Callable getEnclosingCallable() { result = c }
+
+      override AstNode getAstNode() { result = c }
+
+      override string getIdTag() { result = "exit" }
+
+      override string toString() { result = "Exit" }
+    }
+
+    private newtype TAbruptCompletion =
+      TSimpleAbruptCompletion(AbruptSuccessor t) or
+      TLabeledAbruptCompletion(JumpSuccessor t, Input1::Label l)
+
+    /**
+     * A value indicating an abrupt completion of an AST node in the control
+     * flow graph. This is mostly equivalent to an AbruptSuccessor, but may
+     * also carry a label to, for example, link a goto statement with its target.
+     */
+    class AbruptCompletion extends TAbruptCompletion {
+      /** Gets a textual representation of this abrupt completion. */
+      string toString() {
+        exists(AbruptSuccessor t | this = TSimpleAbruptCompletion(t) and result = t.toString())
+        or
+        exists(AbruptSuccessor t, Input1::Label l |
+          this = TLabeledAbruptCompletion(t, l) and
+          result = t + " " + l
+        )
+      }
+
+      /** Gets the successor type of this abrupt completion. */
+      AbruptSuccessor getSuccessorType() {
+        this = TSimpleAbruptCompletion(result) or this = TLabeledAbruptCompletion(result, _)
+      }
+
+      /**
+       * Gets the successor type of this abrupt completion, if this is an
+       * abrupt completion without a label.
+       */
+      AbruptSuccessor asSimpleAbruptCompletion() { this = TSimpleAbruptCompletion(result) }
+
+      /** Holds if this abrupt completion has label `l`. */
+      predicate hasLabel(Input1::Label l) { this = TLabeledAbruptCompletion(_, l) }
+    }
+
+    signature module InputSig2 {
+      /** Holds if this catch clause catches all exceptions. */
+      default predicate catchAll(CatchClause catch) { none() }
+
+      /**
+       * Holds if this case matches all possible values, for example, if it is a
+       * `default` case or a match-all pattern like `Object o` or if it is the
+       * final case in a switch that is known to be exhaustive.
+       *
+       * A match-all case can still ultimately fail to match if it has a guard.
+       */
+      default predicate matchAll(Case c) { c instanceof DefaultCase }
+
+      /**
+       * Holds if `ast` may result in an abrupt completion `c` originating at
+       * `n`. The boolean `always`  indicates whether the abrupt completion
+       * always occurs or whether `n` may also terminate normally.
+       *
+       * This predicate is only relevant for AST constructs that are not already
+       * handled by this library.
+       */
+      predicate beginAbruptCompletion(
+        AstNode ast, PreControlFlowNode n, AbruptCompletion c, boolean always
+      );
+
+      /**
+       * Holds if an abrupt completion `c` from within `ast` is caught with
+       * flow continuing at `n`.
+       *
+       * This predicate is only relevant for AST constructs that are not already
+       * handled by this library.
+       */
+      predicate endAbruptCompletion(AstNode ast, PreControlFlowNode n, AbruptCompletion c);
+
+      /**
+       * Holds if there is a local non-abrupt step from `n1` to `n2`.
+       *
+       * This predicate is only relevant for AST constructs that are not already
+       * handled by this library.
+       */
+      predicate step(PreControlFlowNode n1, PreControlFlowNode n2);
+    }
+
+    /** Completes the construction of the control flow graph. */
+    module Make2<InputSig2 Input2> {
+      /**
+       * Holds if `ast` may result in an abrupt completion `c` originating at
+       * `n`. The boolean `always` indicates whether the abrupt completion
+       * always occurs or whether `n` may also terminate normally.
+       */
+      private predicate beginAbruptCompletion(
+        AstNode ast, PreControlFlowNode n, AbruptCompletion c, boolean always
+      ) {
+        Input2::beginAbruptCompletion(ast, n, c, always)
+        or
+        n.isIn(ast) and
+        always = true and
+        (
+          ast instanceof ReturnStmt and
+          c.getSuccessorType() instanceof ReturnSuccessor
+          or
+          ast instanceof ThrowStmt and
+          c.getSuccessorType() instanceof ExceptionSuccessor
+          or
+          ast instanceof BreakStmt and
+          c.getSuccessorType() instanceof BreakSuccessor
+          or
+          ast instanceof ContinueStmt and
+          c.getSuccessorType() instanceof ContinueSuccessor
+        ) and
+        (
+          not Input1::hasLabel(ast, _) and not c.hasLabel(_)
+          or
+          exists(Input1::Label l |
+            Input1::hasLabel(ast, l) and
+            c.hasLabel(l)
+          )
+        )
+        or
+        exists(TryStmt trystmt, int i, CatchClause catchclause |
+          trystmt.getCatch(i) = catchclause and
+          not exists(trystmt.getCatch(i + 1)) and
+          ast = catchclause and
+          n.isAfterValue(catchclause, any(MatchingSuccessor t | t.getValue() = false)) and
+          c.getSuccessorType() instanceof ExceptionSuccessor and
+          always = true
+        )
+      }
+
+      /**
+       * Holds if an abrupt completion `c` from within `ast` is caught with
+       * flow continuing at `n`.
+       */
+      private predicate endAbruptCompletion(AstNode ast, PreControlFlowNode n, AbruptCompletion c) {
+        Input2::endAbruptCompletion(ast, n, c)
+        or
+        exists(Callable callable | ast = callableGetBody(callable) |
+          c.getSuccessorType() instanceof ReturnSuccessor and
+          n.(NormalExitNodeImpl).getEnclosingCallable() = callable
+          or
+          c.getSuccessorType() instanceof ExceptionSuccessor and
+          n.(ExceptionalExitNodeImpl).getEnclosingCallable() = callable
+          or
+          c.getSuccessorType() instanceof ExitSuccessor and
+          n.(ExceptionalExitNodeImpl).getEnclosingCallable() = callable
+        )
+        or
+        exists(LoopStmt loop | ast = pragma[only_bind_into](loop).getBody() |
+          (
+            c.getSuccessorType() instanceof BreakSuccessor and
+            n.isAfter(loop)
+            or
+            c.getSuccessorType() instanceof ContinueSuccessor and
+            n.isAdditional(loop, loopHeaderTag())
+          ) and
+          (
+            not c.hasLabel(_)
+            or
+            exists(Input1::Label l |
+              c.hasLabel(l) and
+              Input1::hasLabel(loop, l)
+            )
+          )
+        )
+        or
+        exists(TryStmt trystmt |
+          ast = getTryInit(trystmt, _)
+          or
+          ast = trystmt.getBody()
+        |
+          c.getSuccessorType() instanceof ExceptionSuccessor and
+          (
+            n.isBefore(trystmt.getCatch(0))
+            or
+            not exists(trystmt.getCatch(_)) and
+            n.isBefore(trystmt.getFinally())
+          )
+          or
+          (
+            // Exit completions skip the finally block
+            c.getSuccessorType() instanceof ReturnSuccessor or
+            c.getSuccessorType() instanceof JumpSuccessor
+          ) and
+          n.isBefore(trystmt.getFinally())
+        )
+        or
+        exists(TryStmt trystmt |
+          ast = trystmt.getCatch(_)
+          or
+          ast = getTryElse(trystmt)
+        |
+          n.isBefore(trystmt.getFinally()) and
+          not c.getSuccessorType() instanceof ExitSuccessor
+        )
+        or
+        exists(Switch switch |
+          ast = getCaseBodyElement(switch.getCase(_), _) and
+          n.isAfter(switch) and
+          c.getSuccessorType() instanceof BreakSuccessor
+        |
+          not c.hasLabel(_)
+          or
+          exists(Input1::Label l |
+            c.hasLabel(l) and
+            Input1::hasLabel(switch, l)
+          )
+        )
+      }
+
+      /**
+       * Gets an integer indicating the control flow order of a case within a
+       * switch. This is equal to the AST order, except that default cases are
+       * always last in control flow order, even if some languages allow them
+       * to appear before other cases in the AST.
+       */
+      private int getCaseControlFlowOrder(Switch s, Case c) {
+        exists(int pos | s.getCase(pos) = c |
+          // if a default case is not last in the AST, move it last in the CFG order
+          if c instanceof DefaultCase and exists(s.getCase(pos + 1))
+          then result = strictcount(s.getCase(_))
+          else result = pos
+        )
+      }
+
+      private Case getRankedCaseCfgOrder(Switch s, int rnk) {
+        result = rank[rnk](Case c, int i | getCaseControlFlowOrder(s, c) = i | c order by i)
+      }
+
+      private int numberOfStmts(Switch s) { result = strictcount(s.getStmt(_)) }
+
+      private predicate caseIndex(Switch s, Case c, int caseIdx, int caseStmtPos) {
+        c = s.getCase(caseIdx) and
+        c = s.getStmt(caseStmtPos)
+      }
+
+      /**
+       * Gets the body element of `case` at the specified (zero-based) `index`.
+       *
+       * This is either unique when the case has a single right-hand side, or it
+       * is the sequence of statements between this case and the next case.
+       */
+      private AstNode getCaseBodyElement(Case case, int index) {
+        result = case.getBody() and index = 0
+        or
+        not exists(case.getBody()) and
+        exists(Switch s, int caseIdx, int caseStmtPos, int nextCaseStmtPos |
+          caseIndex(pragma[only_bind_into](s), case, caseIdx, caseStmtPos) and
+          (
+            caseIndex(pragma[only_bind_into](s), _, caseIdx + 1, nextCaseStmtPos)
+            or
+            not exists(s.getCase(caseIdx + 1)) and
+            nextCaseStmtPos = numberOfStmts(s)
+          ) and
+          index = [0 .. nextCaseStmtPos - caseStmtPos - 2] and
+          result = pragma[only_bind_into](s).getStmt(caseStmtPos + 1 + index)
+        )
+      }
+
+      private AstNode getFirstCaseBodyElement(Case case) {
+        result = getCaseBodyElement(case, 0)
+        or
+        not exists(getCaseBodyElement(case, 0)) and
+        exists(Switch s, int i |
+          fallsThrough(case) and
+          // fall-through follows AST order, not case control flow order:
+          s.getCase(i) = case and
+          result = getFirstCaseBodyElement(s.getCase(i + 1))
+        )
+      }
+
+      private AstNode getNextCaseBodyElement(AstNode bodyElement) {
+        exists(Case case, int i | getCaseBodyElement(case, i) = bodyElement |
+          result = getCaseBodyElement(case, i + 1)
+          or
+          not exists(getCaseBodyElement(case, i + 1)) and
+          exists(Switch s, int j |
+            fallsThrough(case) and
+            // fall-through follows AST order, not case control flow order:
+            s.getCase(j) = case and
+            result = getFirstCaseBodyElement(s.getCase(j + 1))
+          )
+        )
+      }
+
+      /** Holds if there is a local non-abrupt step from `n1` to `n2`. */
+      private predicate explicitStep(PreControlFlowNode n1, PreControlFlowNode n2) {
+        Input2::step(n1, n2)
+        or
+        exists(Callable c |
+          n1.(EntryNodeImpl).getEnclosingCallable() = c and
+          n2.isBefore(callableGetBody(c))
+          or
+          n1.isAfter(callableGetBody(c)) and
+          n2.(NormalExitNodeImpl).getEnclosingCallable() = c
+          or
+          n1.(AnnotatedExitNodeImpl).getEnclosingCallable() = c and
+          n2.(ExitNodeImpl).getEnclosingCallable() = c
+        )
+        or
+        exists(AstNode child, AstNode parent | propagatesValue(child, parent) |
+          exists(ConditionalSuccessor t |
+            inConditionalContext(parent, t.getKind()) and
+            n1.isAfterValue(child, t) and
+            n2.isAfterValue(parent, t)
+          )
+          or
+          not inConditionalContext(parent, _) and
+          n1.isAfter(child) and
+          n2.isAfter(parent)
+        )
+        or
+        exists(BinaryExpr binexpr, ConditionalSuccessor shortcircuitValue |
+          shortCircuiting(binexpr, shortcircuitValue)
+        |
+          n1.isBefore(binexpr) and
+          n2.isBefore(binexpr.getLeftOperand())
+          or
+          n1.isAfterValue(binexpr.getLeftOperand(), shortcircuitValue.getDual()) and
+          n2.isBefore(binexpr.getRightOperand())
+          or
+          n1.isAfterValue(binexpr.getLeftOperand(), shortcircuitValue) and
+          n2.isAfterValue(binexpr, shortcircuitValue)
+          or
+          // short-circuiting operations with side-effects (e.g. `x &&= y`, `x?.Prop = y`) are in post-order:
+          n1.isAfter(binexpr.getRightOperand()) and
+          n2.isIn(binexpr)
+          or
+          n1.isIn(binexpr) and
+          n2.isAfter(binexpr)
+        )
+        or
+        exists(LogicalNotExpr notexpr |
+          n1.isBefore(notexpr) and
+          n2.isBefore(notexpr.getOperand())
+          or
+          exists(BooleanSuccessor t |
+            n1.isAfterValue(notexpr.getOperand(), t) and
+            n2.isAfterValue(notexpr, t.getDual())
+          )
+        )
+        or
+        exists(ConditionalExpr condexpr |
+          n1.isBefore(condexpr) and
+          n2.isBefore(condexpr.getCondition())
+          or
+          n1.isAfterTrue(condexpr.getCondition()) and
+          n2.isBefore(condexpr.getThen())
+          or
+          n1.isAfterFalse(condexpr.getCondition()) and
+          n2.isBefore(condexpr.getElse())
+        )
+        or
+        exists(BooleanLiteral boollit |
+          inConditionalContext(boollit, _) and
+          n1.isBefore(boollit) and
+          n2.isAfterValue(boollit, any(BooleanSuccessor t | t.getValue() = boollit.getValue()))
+        )
+        or
+        exists(IfStmt ifstmt |
+          n1.isBefore(ifstmt) and
+          n2.isBefore(ifstmt.getCondition())
+          or
+          n1.isAfterTrue(ifstmt.getCondition()) and
+          n2.isBefore(ifstmt.getThen())
+          or
+          n1.isAfterFalse(ifstmt.getCondition()) and
+          (
+            n2.isBefore(ifstmt.getElse())
+            or
+            not exists(ifstmt.getElse()) and
+            n2.isAfter(ifstmt)
+          )
+          or
+          n1.isAfter(ifstmt.getThen()) and
+          n2.isAfter(ifstmt)
+          or
+          n1.isAfter(ifstmt.getElse()) and
+          n2.isAfter(ifstmt)
+        )
+        or
+        exists(WhileStmt whilestmt |
+          n1.isBefore(whilestmt) and
+          n2.isAdditional(whilestmt, loopHeaderTag())
+        )
+        or
+        exists(DoStmt dostmt |
+          n1.isBefore(dostmt) and
+          n2.isBefore(dostmt.getBody())
+        )
+        or
+        exists(LoopStmt loopstmt, AstNode cond |
+          loopstmt.(WhileStmt).getCondition() = cond or loopstmt.(DoStmt).getCondition() = cond
+        |
+          n1.isAdditional(loopstmt, loopHeaderTag()) and
+          n2.isBefore(cond)
+          or
+          n1.isAfterTrue(cond) and
+          n2.isBefore(loopstmt.getBody())
+          or
+          n1.isAfterFalse(cond) and
+          n2.isAfter(loopstmt)
+          or
+          n1.isAfter(loopstmt.getBody()) and
+          n2.isAdditional(loopstmt, loopHeaderTag())
+        )
+        or
+        exists(ForeachStmt foreachstmt |
+          n1.isBefore(foreachstmt) and
+          n2.isBefore(foreachstmt.getCollection())
+          or
+          n1.isAfterValue(foreachstmt.getCollection(),
+            any(EmptinessSuccessor t | t.getValue() = true)) and
+          n2.isAfter(foreachstmt)
+          or
+          n1.isAfterValue(foreachstmt.getCollection(),
+            any(EmptinessSuccessor t | t.getValue() = false)) and
+          n2.isBefore(foreachstmt.getVariable())
+          or
+          n1.isAfter(foreachstmt.getVariable()) and
+          n2.isBefore(foreachstmt.getBody())
+          or
+          n1.isAfter(foreachstmt.getBody()) and
+          n2.isAdditional(foreachstmt, loopHeaderTag())
+          or
+          n1.isAdditional(foreachstmt, loopHeaderTag()) and
+          n2.isAfter(foreachstmt)
+          or
+          n1.isAdditional(foreachstmt, loopHeaderTag()) and
+          n2.isBefore(foreachstmt.getVariable())
+        )
+        or
+        exists(ForStmt forstmt, PreControlFlowNode condentry |
+          // Any part of the control flow that aims for the condition needs to hit either the condition...
+          condentry.isBefore(forstmt.getCondition())
+          or
+          // ...or the body if the for doesn't include a condition.
+          not exists(forstmt.getCondition()) and condentry.isBefore(forstmt.getBody())
+        |
+          n1.isBefore(forstmt) and
+          (
+            n2.isBefore(forstmt.getInit(0))
+            or
+            not exists(forstmt.getInit(_)) and n2 = condentry
+          )
+          or
+          exists(int i | n1.isAfter(forstmt.getInit(i)) |
+            n2.isBefore(forstmt.getInit(i + 1))
+            or
+            not exists(forstmt.getInit(i + 1)) and n2 = condentry
+          )
+          or
+          n1.isAfterTrue(forstmt.getCondition()) and
+          n2.isBefore(forstmt.getBody())
+          or
+          n1.isAfterFalse(forstmt.getCondition()) and
+          n2.isAfter(forstmt)
+          or
+          n1.isAfter(forstmt.getBody()) and
+          n2.isAdditional(forstmt, loopHeaderTag())
+          or
+          n1.isAdditional(forstmt, loopHeaderTag()) and
+          (
+            n2.isBefore(forstmt.getUpdate(0))
+            or
+            not exists(forstmt.getUpdate(_)) and n2 = condentry
+          )
+          or
+          exists(int i | n1.isAfter(forstmt.getUpdate(i)) |
+            n2.isBefore(forstmt.getUpdate(i + 1))
+            or
+            not exists(forstmt.getUpdate(i + 1)) and n2 = condentry
+          )
+        )
+        or
+        exists(TryStmt trystmt |
+          n1.isBefore(trystmt) and
+          (
+            n2.isBefore(getTryInit(trystmt, 0))
+            or
+            not exists(getTryInit(trystmt, _)) and n2.isBefore(trystmt.getBody())
+          )
+          or
+          exists(int i | n1.isAfter(getTryInit(trystmt, i)) |
+            n2.isBefore(getTryInit(trystmt, i + 1))
+            or
+            not exists(getTryInit(trystmt, i + 1)) and n2.isBefore(trystmt.getBody())
+          )
+          or
+          exists(PreControlFlowNode beforeElse, PreControlFlowNode beforeFinally |
+            (
+              beforeElse.isBefore(getTryElse(trystmt))
+              or
+              not exists(getTryElse(trystmt)) and beforeElse = beforeFinally
+            ) and
+            (
+              beforeFinally.isBefore(trystmt.getFinally())
+              or
+              not exists(trystmt.getFinally()) and beforeFinally.isAfter(trystmt)
+            )
+          |
+            n1.isAfter(trystmt.getBody()) and
+            n2 = beforeElse
+            or
+            n1.isAfter(getTryElse(trystmt)) and
+            n2 = beforeFinally
+            or
+            n1.isAfter(trystmt.getCatch(_).getBody()) and
+            n2 = beforeFinally
+          )
+          or
+          n1.isAfter(trystmt.getFinally()) and
+          n2.isAfter(trystmt)
+          or
+          exists(int i |
+            n1.isAfterValue(trystmt.getCatch(i), any(MatchingSuccessor t | t.getValue() = false)) and
+            n2.isBefore(trystmt.getCatch(i + 1))
+          )
+        )
+        or
+        exists(CatchClause catchclause |
+          exists(MatchingSuccessor t |
+            n1.isBefore(catchclause) and
+            n2.isAfterValue(catchclause, t) and
+            if Input2::catchAll(catchclause) then t.getValue() = true else any()
+          )
+          or
+          exists(PreControlFlowNode beforeVar, PreControlFlowNode beforeCond |
+            (
+              beforeVar.isBefore(catchclause.getVariable())
+              or
+              not exists(catchclause.getVariable()) and beforeVar = beforeCond
+            ) and
+            (
+              beforeCond.isBefore(catchclause.getCondition())
+              or
+              not exists(catchclause.getCondition()) and beforeCond.isBefore(catchclause.getBody())
+            )
+          |
+            n1.isAfterValue(catchclause, any(MatchingSuccessor t | t.getValue() = true)) and
+            n2 = beforeVar
+            or
+            n1.isAfter(catchclause.getVariable()) and
+            n2 = beforeCond
+          )
+          or
+          n1.isAfterTrue(catchclause.getCondition()) and
+          n2.isBefore(catchclause.getBody())
+          or
+          n1.isAfterFalse(catchclause.getCondition()) and
+          n2.isAfterValue(catchclause, any(MatchingSuccessor t | t.getValue() = false))
+        )
+        or
+        exists(Switch switch, PreControlFlowNode firstCase |
+          firstCase.isBefore(getRankedCaseCfgOrder(switch, 1))
+          or
+          not exists(getRankedCaseCfgOrder(switch, _)) and firstCase.isAfter(switch)
+        |
+          n1.isBefore(switch) and
+          n2.isBefore(switch.getExpr())
+          or
+          n1.isBefore(switch) and
+          not exists(switch.getExpr()) and
+          n2 = firstCase
+          or
+          n1.isAfter(switch.getExpr()) and
+          n2 = firstCase
+          or
+          exists(int i |
+            n1.isAfterValue(getRankedCaseCfgOrder(switch, i),
+              any(MatchingSuccessor t | t.getValue() = false))
+            or
+            n1.isAfterFalse(getRankedCaseCfgOrder(switch, i).getGuard())
+          |
+            n2.isBefore(getRankedCaseCfgOrder(switch, i + 1))
+            or
+            not exists(getRankedCaseCfgOrder(switch, i + 1)) and
+            n2.isAfter(switch)
+          )
+        )
+        or
+        exists(Case case |
+          exists(MatchingSuccessor t |
+            n1.isBefore(case) and
+            n2.isAfterValue(case, t) and
+            if Input2::matchAll(case) then t.getValue() = true else any()
+          )
+          or
+          exists(
+            PreControlFlowNode beforePattern, PreControlFlowNode beforeGuard,
+            PreControlFlowNode beforeBody
+          |
+            (
+              beforePattern.isBefore(case.getAPattern())
+              or
+              not exists(case.getAPattern()) and beforePattern = beforeGuard
+            ) and
+            (
+              beforeGuard.isBefore(case.getGuard())
+              or
+              not exists(case.getGuard()) and beforeGuard = beforeBody
+            ) and
+            (
+              beforeBody.isBefore(getFirstCaseBodyElement(case))
+              or
+              not exists(getFirstCaseBodyElement(case)) and
+              beforeBody.isAfter(any(Switch s | s.getCase(_) = case))
+            )
+          |
+            n1.isAfterValue(case, any(MatchingSuccessor t | t.getValue() = true)) and
+            n2 = beforePattern
+            or
+            n1.isAfter(case.getAPattern()) and
+            n2 = beforeGuard
+            or
+            n1.isAfterTrue(case.getGuard()) and
+            n2 = beforeBody
+          )
+        )
+        or
+        exists(AstNode caseBodyElement |
+          n1.isAfter(caseBodyElement) and
+          n2.isBefore(getNextCaseBodyElement(caseBodyElement))
+          or
+          n1.isAfter(caseBodyElement) and
+          not exists(getNextCaseBodyElement(caseBodyElement)) and
+          n2.isAfter(any(Switch s | getCaseBodyElement(s.getCase(_), _) = caseBodyElement))
+        )
+      }
+
+      /**
+       * Holds if `ast` does not have explicitly defined control flow steps
+       * and therefore should use default left-to-right evaluation.
+       */
+      private predicate defaultCfg(AstNode ast) {
+        not explicitStep(any(PreControlFlowNode n | n.isBefore(ast)), _)
+      }
+
+      private AstNode getRankedChild(AstNode parent, int rnk) {
+        defaultCfg(parent) and
+        result = rank[rnk](AstNode c, int ix | c = getChild(parent, ix) | c order by ix)
+      }
+
+      /**
+       * Holds if `n1` to `n2` is a default left-to-right evaluation step for
+       * an `AstNode` that does not otherwise have explicitly defined control
+       * flow.
+       */
+      private predicate defaultStep(PreControlFlowNode n1, PreControlFlowNode n2) {
+        exists(AstNode ast | defaultCfg(ast) |
+          n1.isBefore(ast) and
+          n2.isBefore(getRankedChild(ast, 1))
+          or
+          exists(int i |
+            n1.isAfter(getRankedChild(ast, i)) and
+            n2.isBefore(getRankedChild(ast, i + 1))
+          )
+          or
+          (
+            n1.isBefore(ast) and not exists(getRankedChild(ast, _)) and not simpleLeafNode(ast)
+            or
+            exists(int i, AstNode last |
+              last = getRankedChild(ast, i) and
+              not exists(getRankedChild(ast, i + 1)) and
+              n1.isAfter(last) and
+              not propagatesValue(last, ast)
+            )
+          ) and
+          (if postOrInOrder(ast) then n2.isIn(ast) else n2.isAfter(ast))
+          or
+          n1.isIn(ast) and
+          n2.isAfter(ast) and
+          not beginAbruptCompletion(ast, n1, _, true)
+        )
+      }
+
+      /** Holds if there is a local non-abrupt step from `n1` to `n2`. */
+      private predicate step(PreControlFlowNode n1, PreControlFlowNode n2) {
+        explicitStep(n1, n2) or defaultStep(n1, n2)
+      }
+
+      /**
+       * Holds if the execution of `ast` may result in an abrupt completion
+       * `c` originating at `last`.
+       */
+      private predicate last(AstNode ast, PreControlFlowNode last, AbruptCompletion c) {
+        // Require a predecessor as a coarse approximation of reachability.
+        // In particular, this prevents a catch-all catch clause preceding a
+        // finally block from adding exception edges out of the finally.
+        step(_, last) and
+        beginAbruptCompletion(ast, last, c, _)
+        or
+        exists(AstNode child |
+          getChild(ast, _) = child and
+          last(child, last, c) and
+          not endAbruptCompletion(child, _, c)
+        )
+        or
+        exists(
+          AstNode inner, TryStmt try, Stmt finally, PreControlFlowNode finallyEntry,
+          PreControlFlowNode finallyExit
+        |
+          try.getFinally() = finally and
+          ast = finally and
+          finallyEntry.isBefore(finally) and
+          finallyExit.isAfter(finally) and
+          endAbruptCompletion(inner, finallyEntry, c) and
+          last(inner, _, c) and
+          last = finallyExit
+        )
+      }
+
+      private predicate preSucc(PreControlFlowNode n1, PreControlFlowNode n2, SuccessorType t) {
+        step(n1, n2) and n2 = TAfterValueNode(_, t)
+        or
+        step(n1, n2) and n2.(AdditionalNode).getSuccessorType() = t
+        or
+        step(n1, n2) and
+        not n2 instanceof AfterValueNode and
+        not n2 instanceof AdditionalNode and
+        t instanceof DirectSuccessor
+        or
+        exists(AstNode ast, AbruptCompletion c |
+          last(ast, n1, c) and endAbruptCompletion(ast, n2, c) and t = c.getSuccessorType()
+        )
+      }
+
+      /** Holds if `n` is reachable from an entry node. */
+      cached
+      private predicate reachable(PreControlFlowNode n) {
+        Input1::cfgCachedStageRef() and
+        n instanceof EntryNodeImpl
+        or
+        exists(PreControlFlowNode mid | reachable(mid) and preSucc(mid, n, _))
+      }
+
+      cached
+      private predicate succ(ControlFlowNode n1, ControlFlowNode n2, SuccessorType t) {
+        Input1::cfgCachedStageRef() and
+        preSucc(n1, n2, t)
+      }
+
+      /** The cached stage of the control flow graph. */
+      cached
+      module CfgCachedStage {
+        /** Reference to the cached stage of the control flow graph. */
+        cached
+        predicate ref() { any() }
+
+        /** Reverse references to the predicates that reference `ref()`. */
+        cached
+        predicate revRef() {
+          (postOrInOrder(_) implies any()) and
+          (simpleLeafNode(_) implies any()) and
+          (exists(TBeforeNode(_)) implies any()) and
+          (reachable(_) implies any()) and
+          (succ(_, _, _) implies any())
+        }
+      }
+
+      import Public
+
+      /** The public API of the control flow graph library. */
+      module Public {
+        /**
+         * A node in the control flow graph. This is restricted to nodes that
+         * are reachable from an entry node.
+         */
+        final class ControlFlowNode extends PreControlFlowNode {
+          ControlFlowNode() { reachable(this) }
+
+          /** Gets the basic block containing this control flow node. */
+          BasicBlock getBasicBlock() { result.getANode() = this }
+
+          /** Gets an immediate successor of a given type, if any. */
+          ControlFlowNode getASuccessor(SuccessorType t) { succ(this, result, t) }
+
+          /** Gets an immediate successor of this node, if this is not an `ExitNode`. */
+          ControlFlowNode getASuccessor() { result = this.getASuccessor(_) }
+
+          /** Gets an immediate predecessor of this node, if this is not an `EntryNode`. */
+          ControlFlowNode getAPredecessor() { result.getASuccessor() = this }
+
+          /**
+           * Gets a normal successor of this node, if any. This includes direct
+           * successors and conditional successors.
+           */
+          ControlFlowNode getANormalSuccessor() {
+            result = this.getASuccessor(any(NormalSuccessor t))
+          }
+
+          /** Gets an exception successor of this node, if any. */
+          ControlFlowNode getAnExceptionSuccessor() {
+            result = this.getASuccessor(any(ExceptionSuccessor t))
+          }
+        }
+
+        /** Provides additional classes for interacting with the control flow graph. */
+        module ControlFlow {
+          /** The control flow node at the entry point of a callable. */
+          final class EntryNode extends ControlFlowNode, EntryNodeImpl { }
+
+          /** A control flow node indicating the normal or exceptional termination of a callable. */
+          final class AnnotatedExitNode extends ControlFlowNode, AnnotatedExitNodeImpl { }
+
+          /** A control flow node indicating normal termination of a callable. */
+          final class NormalExitNode extends AnnotatedExitNode, NormalExitNodeImpl { }
+
+          /** A control flow node indicating exceptional termination of a callable. */
+          final class ExceptionalExitNode extends AnnotatedExitNode, ExceptionalExitNodeImpl { }
+
+          /** A control flow node indicating the termination of a callable. */
+          final class ExitNode extends ControlFlowNode, ExitNodeImpl { }
+
+          import Additional
+        }
+
+        private import codeql.controlflow.BasicBlock as BB
+
+        private module BbInput implements BB::InputSig<Location> {
+          predicate successorTypeIsCondition(SuccessorType t) { none() }
+
+          class CfgScope = Ast::Callable;
+
+          class Node = ControlFlowNode;
+
+          CfgScope nodeGetCfgScope(Node node) { node.getEnclosingCallable() = result }
+
+          Node nodeGetASuccessor(Node node, SuccessorType t) { result = node.getASuccessor(t) }
+
+          predicate nodeIsDominanceEntry(Node node) { node instanceof ControlFlow::EntryNode }
+
+          predicate nodeIsPostDominanceExit(Node node) {
+            node instanceof ControlFlow::NormalExitNode
+          }
+        }
+
+        module Cfg = BB::Make<Location, BbInput>;
+
+        private module CfgAlias = Cfg;
+
+        import CfgAlias
+      }
+
+      private module Additional {
+        /*
+         * CFG printing
+         */
+
+        private import PrintGraph as Pp
+
+        private class ControlFlowNodeAlias = ControlFlowNode;
+
+        private module PrintGraphInput implements Pp::InputSig<Location> {
+          class Callable = Ast::Callable;
+
+          class ControlFlowNode = ControlFlowNodeAlias;
+
+          ControlFlowNode getASuccessor(ControlFlowNode n, SuccessorType t) {
+            result = n.getASuccessor(t)
+          }
+        }
+
+        import Pp::PrintGraph<Location, PrintGraphInput>
+
+        /** Provides a set of consistency queries. */
+        module Consistency {
+          /**
+           * Holds if `node` is lacking a successor.
+           *
+           * There should be no dead ends except at `ExitNode`s.
+           */
+          query predicate deadEnd(ControlFlowNode node) {
+            not node instanceof ControlFlow::ExitNode and
+            not exists(node.getASuccessor(_))
+          }
+
+          /**
+           * Holds if `n` is in a conditional context with multiple condition kinds.
+           *
+           * For `inConditionalContext(n, kind)`, the `kind` must be unique for a given `n`.
+           */
+          query predicate nonUniqueInConditionalContext(AstNode n) {
+            1 < strictcount(ConditionKind kind | inConditionalContext(n, kind))
+          }
+
+          /**
+           * Holds if `n1` steps to `n2` with successor type `t` but they belong
+           * to different callables.
+           *
+           * Flow must preserve `getEnclosingCallable`.
+           */
+          query predicate nonLocalStep(ControlFlowNode n1, SuccessorType t, ControlFlowNode n2) {
+            n1.getASuccessor(t) = n2 and
+            n1.getEnclosingCallable() != n2.getEnclosingCallable()
+          }
+
+          /**
+           * Holds if the additional node for a given AST node and tag has
+           * multiple successor types.
+           *
+           * For `additionalNode(AstNode n, string tag, NormalSuccessor t)`,
+           * the `t` must be unique for a given `(n, tag)`.
+           */
+          query predicate ambiguousAdditionalNode(AstNode n, string tag) {
+            1 < strictcount(NormalSuccessor t | additionalNode(n, tag, t))
+          }
+
+          /**
+           * Holds if the "in" node is unreachable for a post-or-in-order AST node.
+           *
+           * If the "before" node of a post-or-in-order AST node is reachable,
+           * then the "in" node should generally be reachable as well. If not,
+           * it may indicate missing control flow edges.
+           */
+          query predicate missingInNodeForPostOrInOrder(AstNode ast) {
+            postOrInOrder(ast) and
+            exists(ControlFlowNode before | before.isBefore(ast)) and
+            not exists(ControlFlowNode mid | mid.isIn(ast)) and
+            // A non-terminating child could prevent reaching the "in" node, and that's fine:
+            not exists(AstNode child |
+              getChild(ast, _) = child and
+              exists(ControlFlowNode beforeChild | beforeChild.isBefore(child)) and
+              not exists(ControlFlowNode afterChild | afterChild.isAfter(child))
+            )
+          }
+
+          private predicate labelledAbruptSuccessor(
+            ControlFlowNode n1, ControlFlowNode n2, SuccessorType t, Input1::Label l
+          ) {
+            exists(AstNode ast, AbruptCompletion c |
+              last(ast, n1, c) and
+              endAbruptCompletion(ast, n2, c) and
+              t = c.getSuccessorType() and
+              c.hasLabel(l)
+            )
+          }
+
+          /**
+           * Holds if `node` has multiple successors of the same type `t`.
+           *
+           * In most cases, multiple successors are distinguished by their
+           * successor types, for example the true and false successors of a
+           * condition.
+           */
+          query predicate multipleSuccessors(
+            ControlFlowNode node, SuccessorType t, ControlFlowNode successor
+          ) {
+            exists(int n |
+              n = strictcount(node.getASuccessor(t)) and
+              n > 1 and
+              // allow multiple abrupt successors with different labels (e.g. a finally block with multiple GotoSuccessors)
+              n - count(Input1::Label l | labelledAbruptSuccessor(node, _, t, l)) > 1
+            ) and
+            successor = node.getASuccessor(t) and
+            // allow for loop headers in foreach loops (they're checking emptiness on the iterator, not the collection)
+            not (
+              t instanceof DirectSuccessor and
+              node.isAdditional(any(ForeachStmt foreach), loopHeaderTag())
+            ) and
+            // allow for disjunctive patterns (e.g. `case "foo", "bar":`)
+            not (
+              t instanceof DirectSuccessor and
+              node.isAfterValue(any(Case c | 2 <= strictcount(c.getAPattern())),
+                any(MatchingSuccessor m | m.getValue() = true))
+            ) and
+            // allow for functions with multiple bodies
+            not (t instanceof DirectSuccessor and node instanceof ControlFlow::EntryNode)
+          }
+
+          /**
+           * Holds if `node` has conditional successors of different kinds.
+           *
+           * The kind of a conditional successor is determined by the context
+           * of the node. For example, a condition in an `if` statement has
+           * boolean successors.
+           */
+          query predicate multipleConditionalSuccessorKinds(
+            ControlFlowNode node, ConditionalSuccessor t1, ConditionalSuccessor t2,
+            ControlFlowNode succ1, ControlFlowNode succ2
+          ) {
+            t1.getKind() != t2.getKind() and
+            succ1 = node.getASuccessor(t1) and
+            succ2 = node.getASuccessor(t2)
+          }
+
+          /**
+           * Holds if `node` has both a direct and a conditional successor type.
+           *
+           * If a node is in a conditional context, it should only have
+           * conditional successors of the appropriate kind, and not other
+           * normal successors.
+           */
+          query predicate directAndConditionalSuccessors(
+            ControlFlowNode node, ConditionalSuccessor t1, DirectSuccessor t2,
+            ControlFlowNode succ1, ControlFlowNode succ2
+          ) {
+            succ1 = node.getASuccessor(t1) and
+            succ2 = node.getASuccessor(t2)
+          }
+
+          /**
+           * Holds if `node` has a self-loop with successor type `t`.
+           *
+           * Self-loops are not expected in control flow graphs.
+           */
+          query predicate selfLoop(ControlFlowNode node, SuccessorType t) {
+            node.getASuccessor(t) = node
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/shared/controlflow/codeql/controlflow/Guards.qll b/shared/controlflow/codeql/controlflow/Guards.qll
index f6774db1eb9..e12535b4b32 100644
--- a/shared/controlflow/codeql/controlflow/Guards.qll
+++ b/shared/controlflow/codeql/controlflow/Guards.qll
@@ -597,6 +597,12 @@ module Make<
   module Logic<LogicInputSig LogicInput> {
     private import LogicInput
 
+    bindingset[bb1, bb2]
+    pragma[inline_late]
+    private predicate strictlyDominatesCheck(BasicBlock bb1, BasicBlock bb2) {
+      bb1.strictlyDominates(bb2)
+    }
+
     /**
      * Holds if `guard` evaluating to `v` directly controls `phi` taking the value
      * `inp`. This means that `guard` evaluating to `v` must control all the input
@@ -614,7 +620,7 @@ module Make<
       exists(BasicBlock bbPhi |
         phi.hasInputFromBlock(inp, _) and
         phi.getBasicBlock() = bbPhi and
-        guard.getBasicBlock().strictlyDominates(bbPhi) and
+        strictlyDominatesCheck(guard.getBasicBlock(), bbPhi) and
         not guard.directlyValueControls(bbPhi, _) and
         forex(BasicBlock bbInput | phi.hasInputFromBlock(inp, bbInput) |
           guard.directlyValueControls(bbInput, v) or
@@ -634,7 +640,11 @@ module Make<
       Guard guard, GuardValue v, SsaPhiDefinition phi, Expr input
     ) {
       exists(GuardValue dv, SsaExplicitWrite inp |
-        guardControlsPhiBranch(guard, v, phi, inp) and
+        // The `forall` below implies that there's only one `inp` guarded by
+        // `guard == v`, but checking this upfront using `unique` as opposed to
+        // merely stating `guardControlsPhiBranch(guard, v, phi, inp)` improves
+        // performance of the `forall` check.
+        inp = unique(SsaDefinition inp0 | guardControlsPhiBranch(guard, v, phi, inp0)) and
         inp.getValue() = input and
         dv = v.getDualValue() and
         forall(SsaDefinition other | phi.hasInputFromBlock(other, _) and other != inp |
@@ -735,7 +745,7 @@ module Make<
       possibleValue(v, false, e, k) and
       not possibleValue(v, true, e, k) and
       // there's only one expression with the value `k`
-      1 = strictcount(Expr e0 | possibleValue(v, _, e0, k)) and
+      e = unique(Expr e0 | possibleValue(v, _, e0, k)) and
       // and `v` has at least two possible values
       2 <= strictcount(GuardValue k0 | possibleValue(v, _, _, k0))
     }
diff --git a/shared/controlflow/codeql/controlflow/SuccessorType.qll b/shared/controlflow/codeql/controlflow/SuccessorType.qll
index cc673c9e5ca..2e6666d2c20 100644
--- a/shared/controlflow/codeql/controlflow/SuccessorType.qll
+++ b/shared/controlflow/codeql/controlflow/SuccessorType.qll
@@ -28,6 +28,38 @@ module;
 
 private import codeql.util.Boolean
 
+private newtype TConditionKind =
+  TBooleanCondition() or
+  TNullnessCondition() or
+  TMatchingCondition() or
+  TEmptinessCondition()
+
+/** A condition kind. This is used to classify different `ConditionalSuccessor`s. */
+class ConditionKind extends TConditionKind {
+  /** Gets a textual representation of this condition kind. */
+  string toString() {
+    this instanceof TBooleanCondition and result = "Boolean"
+    or
+    this instanceof TNullnessCondition and result = "Nullness"
+    or
+    this instanceof TMatchingCondition and result = "Matching"
+    or
+    this instanceof TEmptinessCondition and result = "Emptiness"
+  }
+
+  /** Holds if this condition kind identifies `BooleanSuccessor`s. */
+  predicate isBoolean() { this instanceof TBooleanCondition }
+
+  /** Holds if this condition kind identifies `NullnessSuccessor`s. */
+  predicate isNullness() { this instanceof TNullnessCondition }
+
+  /** Holds if this condition kind identifies `MatchingSuccessor`s. */
+  predicate isMatching() { this instanceof TMatchingCondition }
+
+  /** Holds if this condition kind identifies `EmptinessSuccessor`s. */
+  predicate isEmptiness() { this instanceof TEmptinessCondition }
+}
+
 private newtype TSuccessorType =
   TDirectSuccessor() or
   TBooleanSuccessor(Boolean branch) or
@@ -83,6 +115,18 @@ private class TConditionalSuccessor =
 abstract private class ConditionalSuccessorImpl extends NormalSuccessorImpl, TConditionalSuccessor {
   /** Gets the Boolean value of this successor. */
   abstract boolean getValue();
+
+  /** Gets the condition kind of this conditional successor. */
+  abstract ConditionKind getKind();
+
+  /**
+   * Gets the dual of this conditional successor. That is, the conditional
+   * successor of the same kind but with the opposite value.
+   */
+  ConditionalSuccessor getDual() {
+    this.getValue().booleanNot() = result.getValue() and
+    this.getKind() = result.getKind()
+  }
 }
 
 final class ConditionalSuccessor = ConditionalSuccessorImpl;
@@ -116,6 +160,8 @@ final class ConditionalSuccessor = ConditionalSuccessorImpl;
 class BooleanSuccessor extends ConditionalSuccessorImpl, TBooleanSuccessor {
   override boolean getValue() { this = TBooleanSuccessor(result) }
 
+  override ConditionKind getKind() { result = TBooleanCondition() }
+
   override string toString() { result = this.getValue().toString() }
 }
 
@@ -151,6 +197,8 @@ class NullnessSuccessor extends ConditionalSuccessorImpl, TNullnessSuccessor {
 
   override boolean getValue() { this = TNullnessSuccessor(result) }
 
+  override ConditionKind getKind() { result = TNullnessCondition() }
+
   override string toString() { if this.isNull() then result = "null" else result = "non-null" }
 }
 
@@ -192,6 +240,8 @@ class MatchingSuccessor extends ConditionalSuccessorImpl, TMatchingSuccessor {
 
   override boolean getValue() { this = TMatchingSuccessor(result) }
 
+  override ConditionKind getKind() { result = TMatchingCondition() }
+
   override string toString() { if this.isMatch() then result = "match" else result = "no-match" }
 }
 
@@ -233,6 +283,8 @@ class EmptinessSuccessor extends ConditionalSuccessorImpl, TEmptinessSuccessor {
 
   override boolean getValue() { this = TEmptinessSuccessor(result) }
 
+  override ConditionKind getKind() { result = TEmptinessCondition() }
+
   override string toString() { if this.isEmpty() then result = "empty" else result = "non-empty" }
 }
 
diff --git a/shared/controlflow/qlpack.yml b/shared/controlflow/qlpack.yml
index 6ae58a799e6..35b09b7dc63 100644
--- a/shared/controlflow/qlpack.yml
+++ b/shared/controlflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/controlflow
-version: 2.0.27-dev
+version: 2.0.29-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/dataflow/CHANGELOG.md b/shared/dataflow/CHANGELOG.md
index f9d35bda41d..d669cdf14da 100644
--- a/shared/dataflow/CHANGELOG.md
+++ b/shared/dataflow/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 2.1.0
+
+### New Features
+
+* Two new flow features `FeatureEscapesSourceCallContext` and `FeatureEscapesSourceCallContextOrEqualSourceSinkCallContext` have been added. The former implies that the sink must be reached from the source by escaping the source call context, that is, flow must either return from the callable containing the source or use a jump-step before reaching the sink. The latter is the disjunction of the former and the existing `FeatureEqualSourceSinkCallContext` flow feature.
+
+## 2.0.27
+
+No user-facing changes.
+
 ## 2.0.26
 
 No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.0.27.md b/shared/dataflow/change-notes/released/2.0.27.md
new file mode 100644
index 00000000000..639cf77090e
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.0.27.md
@@ -0,0 +1,3 @@
+## 2.0.27
+
+No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.1.0.md b/shared/dataflow/change-notes/released/2.1.0.md
new file mode 100644
index 00000000000..3190a39d325
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.1.0.md
@@ -0,0 +1,5 @@
+## 2.1.0
+
+### New Features
+
+* Two new flow features `FeatureEscapesSourceCallContext` and `FeatureEscapesSourceCallContextOrEqualSourceSinkCallContext` have been added. The former implies that the sink must be reached from the source by escaping the source call context, that is, flow must either return from the callable containing the source or use a jump-step before reaching the sink. The latter is the disjunction of the former and the existing `FeatureEqualSourceSinkCallContext` flow feature.
diff --git a/shared/dataflow/codeql-pack.release.yml b/shared/dataflow/codeql-pack.release.yml
index 63d57bef481..487a1a58b2b 100644
--- a/shared/dataflow/codeql-pack.release.yml
+++ b/shared/dataflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.26
+lastReleaseVersion: 2.1.0
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
index aa74e44a8e8..506774857d8 100644
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
@@ -567,7 +567,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         ) {
           sourceNode(node) and
           (if hasSourceCallCtx() then cc = ccSomeCall() else cc = ccNone()) and
-          summaryCtx = TSummaryCtxNone() and
+          summaryCtx.isSourceCtx() and
           t = getNodeTyp(node) and
           ap instanceof ApNil and
           apa = getApprox(ap) and
@@ -602,18 +602,19 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           apa = getApprox(ap)
           or
           // flow into a callable without summary context
-          fwdFlowInNoFlowThrough(node, cc, t, ap, stored) and
+          fwdFlowInNoFlowThrough(node, cc, summaryCtx, t, ap, stored) and
           apa = getApprox(ap) and
-          summaryCtx = TSummaryCtxNone() and
           // When the call contexts of source and sink needs to match then there's
           // never any reason to enter a callable except to find a summary. See also
           // the comment in `PathNodeMid::isAtSink`.
           not Config::getAFeature() instanceof FeatureEqualSourceSinkCallContext
           or
           // flow into a callable with summary context (non-linear recursion)
-          fwdFlowInFlowThrough(node, cc, t, ap, stored) and
-          apa = getApprox(ap) and
-          summaryCtx = TSummaryCtxSome(node, t, ap, stored)
+          exists(boolean mustReturn |
+            fwdFlowInFlowThrough(node, cc, t, ap, stored, mustReturn) and
+            apa = getApprox(ap) and
+            summaryCtx = TSummaryCtxSome(node, t, ap, stored, mustReturn)
+          )
           or
           // flow out of a callable
           fwdFlowOut(_, _, node, cc, summaryCtx, t, ap, stored) and
@@ -630,9 +631,10 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
         private newtype TSummaryCtx =
           TSummaryCtxNone() or
-          TSummaryCtxSome(ParamNd p, Typ t, Ap ap, TypOption stored) {
-            fwdFlowInFlowThrough(p, _, t, ap, stored)
-          }
+          TSummaryCtxSome(ParamNd p, Typ t, Ap ap, TypOption stored, boolean mustReturn) {
+            fwdFlowInFlowThrough(p, _, t, ap, stored, mustReturn)
+          } or
+          TSummaryCtxSource(Boolean mustEscape)
 
         /**
          * A context for generating flow summaries. This represents flow entry through
@@ -644,6 +646,69 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           abstract string toString();
 
           abstract Location getLocation();
+
+          /**
+           * Holds if this context is the unique context used at flow sources.
+           */
+          predicate isSourceCtx() {
+            exists(boolean strict |
+              Stage1::hasFeatureEscapesSourceCallContext(strict) and
+              this = TSummaryCtxSource(strict)
+            )
+            or
+            not Stage1::hasFeatureEscapesSourceCallContext(_) and
+            this = TSummaryCtxNone()
+          }
+
+          pragma[nomagic]
+          private predicate isSome(boolean mustReturn) {
+            this = TSummaryCtxSome(_, _, _, _, mustReturn)
+          }
+
+          /**
+           * Holds if this context is valid as a flow-in context when no flow-through is possible,
+           * in which case `innerSummaryCtx` is the summary context to be used when entering the
+           * callable.
+           */
+          pragma[nomagic]
+          predicate isValidForFlowInNoThrough(SummaryCtx innerSummaryCtx) {
+            this = TSummaryCtxNone() and
+            innerSummaryCtx = TSummaryCtxNone()
+            or
+            this.isSome(false) and
+            innerSummaryCtx = TSummaryCtxNone()
+            or
+            // Even if we must escape the source call context, we can still allow for flow-in
+            // without flow-through, as long as the inner context is escaped (which must then
+            // necessarily be via a jump-step -- possibly after even more flow-in
+            // without-flow-through steps).
+            this = TSummaryCtxSource(_) and
+            innerSummaryCtx = TSummaryCtxSource(true)
+          }
+
+          /**
+           * Holds if this context is valid as a flow-in context when flow-through is possible.
+           *
+           * The boolean `mustReturn` indicates whether flow must return.
+           */
+          predicate isValidForFlowThrough(boolean mustReturn) {
+            this = TSummaryCtxSource(_) and
+            mustReturn = true
+            or
+            this = TSummaryCtxNone() and
+            mustReturn = false
+            or
+            this.isSome(mustReturn)
+          }
+
+          /** Holds if this context is valid as a sink context. */
+          predicate isASinkCtx() {
+            this = TSummaryCtxNone()
+            or
+            this.isSome(false)
+            or
+            this = TSummaryCtxSource(false)
+          }
         }
 
         /** A summary context from which no flow summary can be generated. */
@@ -659,20 +724,43 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           private Typ t;
           private Ap ap;
           private TypOption stored;
+          private boolean mustReturn;
 
-          SummaryCtxSome() { this = TSummaryCtxSome(p, t, ap, stored) }
+          SummaryCtxSome() { this = TSummaryCtxSome(p, t, ap, stored, mustReturn) }
 
           ParamNd getParamNode() { result = p }
 
           private string ppTyp() { result = t.toString() and result != "" }
 
+          private string ppMustReturn() {
+            if mustReturn = true then result = " <mustReturn>" else result = ""
+          }
+
           override string toString() {
-            result = p + concat(" : " + this.ppTyp()) + " " + ap + ppStored(stored)
+            result =
+              p + concat(" : " + this.ppTyp()) + " " + ap + ppStored(stored) + this.ppMustReturn()
           }
 
           override Location getLocation() { result = p.getLocation() }
         }
 
+        /**
+         * A special summary context that is used when the flow feature
+         * `FeatureEscapesSourceCallContext(OrEqualSourceSinkCallContext)`
+         * is enabled.
+         */
+        private class SummaryCtxSource extends SummaryCtx, TSummaryCtxSource {
+          private boolean mustEscape;
+
+          SummaryCtxSource() { this = TSummaryCtxSource(mustEscape) }
+
+          override string toString() {
+            if mustEscape = true then result = "<source-must-escape>" else result = "<source>"
+          }
+
+          override Location getLocation() { result.hasLocationInfo("", 0, 0, 0, 0) }
+        }
+
         private predicate fwdFlowJump(Nd node, Typ t, Ap ap, TypOption stored) {
           exists(Nd mid |
             fwdFlow(mid, _, _, t, ap, stored) and
@@ -915,9 +1003,12 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
         pragma[nomagic]
         private predicate fwdFlowInNoFlowThrough(
-          ParamNd p, CcCall innercc, Typ t, Ap ap, TypOption stored
+          ParamNd p, CcCall innercc, SummaryCtx innerSummaryCtx, Typ t, Ap ap, TypOption stored
         ) {
-          FwdFlowInNoThrough::fwdFlowIn(_, _, _, p, _, innercc, _, t, ap, stored, _)
+          exists(SummaryCtx summaryCtx |
+            FwdFlowInNoThrough::fwdFlowIn(_, _, _, p, _, innercc, summaryCtx, t, ap, stored, _) and
+            summaryCtx.isValidForFlowInNoThrough(innerSummaryCtx)
+          )
         }
 
         private predicate top() { any() }
@@ -926,9 +1017,12 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
         pragma[nomagic]
         private predicate fwdFlowInFlowThrough(
-          ParamNd p, CcCall innercc, Typ t, Ap ap, TypOption stored
+          ParamNd p, CcCall innercc, Typ t, Ap ap, TypOption stored, boolean mustReturn
         ) {
-          FwdFlowInThrough::fwdFlowIn(_, _, _, p, _, innercc, _, t, ap, stored, _)
+          exists(SummaryCtx summaryCtx |
+            FwdFlowInThrough::fwdFlowIn(_, _, _, p, _, innercc, summaryCtx, t, ap, stored, _) and
+            summaryCtx.isValidForFlowThrough(mustReturn)
+          )
         }
 
         pragma[nomagic]
@@ -999,7 +1093,8 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           TypOption stored
         ) {
           exists(RetNd ret, CcNoCall innercc, boolean allowsFieldFlow |
-            fwdFlowIntoRet(ret, innercc, summaryCtx, t, ap, stored) and
+            fwdFlowIntoRet(ret, innercc, _, t, ap, stored) and
+            summaryCtx = TSummaryCtxNone() and
             fwdFlowOutValidEdge(call, ret, innercc, inner, out, outercc, allowsFieldFlow) and
             if allowsFieldFlow = false then ap instanceof ApNil else any()
           )
@@ -1090,7 +1185,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
             instanceofCcCall(ccc) and
             fwdFlow(pragma[only_bind_into](ret), ccc, summaryCtx, t, ap, stored) and
             summaryCtx =
-              TSummaryCtxSome(pragma[only_bind_into](p), _, pragma[only_bind_into](argAp), _) and
+              TSummaryCtxSome(pragma[only_bind_into](p), _, pragma[only_bind_into](argAp), _, _) and
             kind = ret.getKind() and
             Stage1::parameterFlowThroughAllowed(p, kind) and
             PrevStage::returnMayFlowThrough(ret, kind)
@@ -1116,9 +1211,10 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         pragma[nomagic]
         private predicate fwdFlowIsEntered0(
           Call call, ArgNd arg, Cc cc, CcCall innerCc, SummaryCtx summaryCtx, ParamNd p, Typ t,
-          Ap ap, TypOption stored
+          Ap ap, TypOption stored, boolean mustReturn
         ) {
-          FwdFlowInThrough::fwdFlowIn(call, arg, _, p, cc, innerCc, summaryCtx, t, ap, stored, _)
+          FwdFlowInThrough::fwdFlowIn(call, arg, _, p, cc, innerCc, summaryCtx, t, ap, stored, _) and
+          summaryCtx.isValidForFlowThrough(mustReturn)
         }
 
         /**
@@ -1130,9 +1226,9 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           Call call, ArgNd arg, Cc cc, CcCall innerCc, SummaryCtx summaryCtx,
           SummaryCtxSome innerSummaryCtx
         ) {
-          exists(ParamNd p, Typ t, Ap ap, TypOption stored |
-            fwdFlowIsEntered0(call, arg, cc, innerCc, summaryCtx, p, t, ap, stored) and
-            innerSummaryCtx = TSummaryCtxSome(p, t, ap, stored)
+          exists(ParamNd p, Typ t, Ap ap, TypOption stored, boolean mustReturn |
+            fwdFlowIsEntered0(call, arg, cc, innerCc, summaryCtx, p, t, ap, stored, mustReturn) and
+            innerSummaryCtx = TSummaryCtxSome(p, t, ap, stored, mustReturn)
           )
         }
 
@@ -1160,7 +1256,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           TypOption argStored, Ap ap
         ) {
           exists(Call call, boolean allowsFieldFlow |
-            returnFlowsThrough0(call, ccc, ap, ret, TSummaryCtxSome(p, argT, argAp, argStored)) and
+            returnFlowsThrough0(call, ccc, ap, ret, TSummaryCtxSome(p, argT, argAp, argStored, _)) and
             flowThroughOutOfCall(call, ret, _, allowsFieldFlow) and
             pos = ret.getReturnPosition() and
             if allowsFieldFlow = false then ap instanceof ApNil else any()
@@ -1216,7 +1312,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
         pragma[nomagic]
         private predicate revFlow0(Nd node, ReturnCtx returnCtx, ApOption returnAp, Ap ap) {
-          fwdFlow(node, _, _, _, ap, _) and
+          fwdFlow(node, _, any(SummaryCtx sinkCtx | sinkCtx.isASinkCtx()), _, ap, _) and
           sinkNode(node) and
           (
             if hasSinkCallCtx()
@@ -1490,7 +1586,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           exists(Ap ap0 |
             parameterMayFlowThrough(p, _) and
             revFlow(n, TReturnCtxMaybeFlowThrough(_), _, ap0) and
-            fwdFlow(n, any(CcCall ccc), TSummaryCtxSome(p, _, ap, _), _, ap0, _)
+            fwdFlow(n, any(CcCall ccc), TSummaryCtxSome(p, _, ap, _, _), _, ap0, _)
           )
         }
 
@@ -1962,6 +2058,8 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
             private string ppSummaryCtx() {
               summaryCtx instanceof SummaryCtxNone and result = ""
               or
+              result = " " + summaryCtx.(SummaryCtxSource)
+              or
               summaryCtx instanceof SummaryCtxSome and
               result = " <" + summaryCtx + ">"
             }
@@ -1983,7 +2081,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
             override predicate isSource() {
               sourceNode(node) and
               (if hasSourceCallCtx() then cc = ccSomeCall() else cc = ccNone()) and
-              summaryCtx = TSummaryCtxNone() and
+              summaryCtx.isSourceCtx() and
               t = getNodeTyp(node) and
               ap instanceof ApNil
             }
@@ -1991,6 +2089,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
             predicate isAtSink() {
               sinkNode(node) and
               ap instanceof ApNil and
+              summaryCtx.isASinkCtx() and
               // For `FeatureHasSinkCallContext` the condition `cc instanceof CallContextNoCall`
               // is exactly what we need to check.
               // For `FeatureEqualSourceSinkCallContext` the initial call
@@ -2042,10 +2141,12 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
             override predicate isSource() { sourceNode(node) }
           }
 
-          bindingset[p, t, ap, stored]
+          bindingset[p, t, ap, stored, mustReturn]
           pragma[inline_late]
-          private SummaryCtxSome mkSummaryCtxSome(ParamNd p, Typ t, Ap ap, TypOption stored) {
-            result = TSummaryCtxSome(p, t, ap, stored)
+          private SummaryCtxSome mkSummaryCtxSome(
+            ParamNd p, Typ t, Ap ap, TypOption stored, boolean mustReturn
+          ) {
+            result = TSummaryCtxSome(p, t, ap, stored, mustReturn)
           }
 
           pragma[nomagic]
@@ -2055,11 +2156,14 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           ) {
             FwdFlowInNoThrough::fwdFlowIn(_, arg, _, p, outercc, innercc, outerSummaryCtx, t, ap,
               stored, _) and
-            innerSummaryCtx = TSummaryCtxNone()
+            outerSummaryCtx.isValidForFlowInNoThrough(innerSummaryCtx)
             or
-            FwdFlowInThrough::fwdFlowIn(_, arg, _, p, outercc, innercc, outerSummaryCtx, t, ap,
-              stored, _) and
-            innerSummaryCtx = mkSummaryCtxSome(p, t, ap, stored)
+            exists(boolean mustReturn |
+              FwdFlowInThrough::fwdFlowIn(_, arg, _, p, outercc, innercc, outerSummaryCtx, t, ap,
+                stored, _) and
+              outerSummaryCtx.isValidForFlowThrough(mustReturn) and
+              innerSummaryCtx = mkSummaryCtxSome(p, t, ap, stored, mustReturn)
+            )
           }
 
           pragma[nomagic]
@@ -2098,7 +2202,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
             |
               fwdFlowThroughStep0(call, arg, cc, ccc, summaryCtx, t, ap, stored, ret,
                 innerSummaryCtx) and
-              innerSummaryCtx = TSummaryCtxSome(p, innerArgT, innerArgAp, innerArgStored) and
+              innerSummaryCtx = TSummaryCtxSome(p, innerArgT, innerArgAp, innerArgStored, _) and
               pn1 = mkPathNode(arg, cc, summaryCtx, innerArgT, innerArgAp, innerArgStored) and
               pn2 =
                 typeStrengthenToPathNode(p, ccc, innerSummaryCtx, innerArgT, innerArgAp,
@@ -2212,11 +2316,14 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
             )
             or
             // flow out of a callable
-            exists(RetNd ret, CcNoCall innercc, boolean allowsFieldFlow |
-              pn1 = TPathNodeMid(ret, innercc, summaryCtx, t, ap, stored) and
-              fwdFlowIntoRet(ret, innercc, summaryCtx, t, ap, stored) and
+            exists(
+              RetNd ret, CcNoCall innercc, SummaryCtx innerSummaryCtx, boolean allowsFieldFlow
+            |
+              pn1 = TPathNodeMid(ret, innercc, innerSummaryCtx, t, ap, stored) and
+              fwdFlowIntoRet(ret, innercc, innerSummaryCtx, t, ap, stored) and
               fwdFlowOutValidEdge(_, ret, innercc, _, node, cc, allowsFieldFlow) and
               label = "" and
+              summaryCtx = TSummaryCtxNone() and
               if allowsFieldFlow = false then ap instanceof ApNil else any()
             )
           }
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
index 288814c4c51..51ebb3f8a73 100644
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
@@ -3,6 +3,7 @@ module;
 
 private import codeql.dataflow.DataFlow
 private import codeql.typetracking.TypeTracking as Tt
+private import codeql.util.Boolean
 private import codeql.util.Location
 private import codeql.util.Option
 private import codeql.util.Unit
@@ -49,7 +50,9 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
     private newtype TFlowFeature =
       TFeatureHasSourceCallContext() or
       TFeatureHasSinkCallContext() or
-      TFeatureEqualSourceSinkCallContext()
+      TFeatureEqualSourceSinkCallContext() or
+      TFeatureEscapesSourceCallContext() or
+      TFeatureEscapesSourceCallContextOrEqualSourceSinkCallContext()
 
     /** A flow configuration feature for use in `Configuration::getAFeature()`. */
     class FlowFeature extends TFlowFeature {
@@ -80,6 +83,28 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
       override string toString() { result = "FeatureEqualSourceSinkCallContext" }
     }
 
+    /**
+     * A flow configuration feature that implies that the sink must be reached from
+     * the source by escaping the source call context, that is, flow must either
+     * return from the callable containing the source or use a jump-step before reaching
+     * the sink.
+     */
+    class FeatureEscapesSourceCallContext extends FlowFeature, TFeatureEscapesSourceCallContext {
+      override string toString() { result = "FeatureEscapesSourceCallContext" }
+    }
+
+    /**
+     * A flow configuration feature that is the disjunction of `FeatureEscapesSourceCallContext`
+     * and `FeatureEqualSourceSinkCallContext`.
+     */
+    class FeatureEscapesSourceCallContextOrEqualSourceSinkCallContext extends FlowFeature,
+      TFeatureEscapesSourceCallContextOrEqualSourceSinkCallContext
+    {
+      override string toString() {
+        result = "FeatureEscapesSourceCallContextOrEqualSourceSinkCallContext"
+      }
+    }
+
     /**
      * Holds if `source` is a relevant data flow source.
      */
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImplStage1.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImplStage1.qll
index bb79ff62f5b..426576d3ace 100644
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImplStage1.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImplStage1.qll
@@ -64,6 +64,8 @@ module MakeImplStage1<LocationSig Location, InputSig<Location> Lang> {
 
     predicate hasSourceCallCtx();
 
+    predicate hasFeatureEscapesSourceCallContext(boolean strict);
+
     predicate hasSinkCallCtx();
 
     predicate jumpStepEx(Nd node1, Nd node2);
@@ -1016,6 +1018,13 @@ module MakeImplStage1<LocationSig Location, InputSig<Location> Lang> {
         )
       }
 
+      predicate hasFeatureEscapesSourceCallContext(boolean strict) {
+        Config::getAFeature() instanceof FeatureEscapesSourceCallContext and strict = true
+        or
+        Config::getAFeature() instanceof FeatureEscapesSourceCallContextOrEqualSourceSinkCallContext and
+        strict = false
+      }
+
       predicate hasSinkCallCtx() {
         exists(FlowFeature feature | feature = Config::getAFeature() |
           feature instanceof FeatureHasSinkCallContext or
diff --git a/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll b/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll
index d7667257192..8b25c54bfa0 100644
--- a/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll
+++ b/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll
@@ -368,6 +368,34 @@ module Make<
       abstract predicate isSink(string input, string kind, Provenance provenance, string model);
     }
 
+    /** A barrier element. */
+    abstract class BarrierElement extends SourceBaseFinal {
+      bindingset[this]
+      BarrierElement() { any() }
+
+      /**
+       * Holds if this element is a flow barrier of kind `kind`, where data
+       * flows out as described by `output`.
+       */
+      pragma[nomagic]
+      abstract predicate isBarrier(string output, string kind, Provenance provenance, string model);
+    }
+
+    /** A barrier guard element. */
+    abstract class BarrierGuardElement extends SinkBaseFinal {
+      bindingset[this]
+      BarrierGuardElement() { any() }
+
+      /**
+       * Holds if this element is a flow barrier guard of kind `kind`, for data
+       * flowing in as described by `input`, when `this` evaluates to `branch`.
+       */
+      pragma[nomagic]
+      abstract predicate isBarrierGuard(
+        string input, string branch, string kind, Provenance provenance, string model
+      );
+    }
+
     private signature predicate hasKindSig(string kind);
 
     signature class NeutralCallableSig extends SummarizedCallableBaseFinal {
@@ -723,7 +751,32 @@ module Make<
       )
     }
 
-    private predicate summarySpec(string spec) {
+    private predicate isRelevantBarrier(
+      BarrierElement e, string output, string kind, Provenance provenance, string model
+    ) {
+      e.isBarrier(output, kind, provenance, model) and
+      (
+        provenance.isManual()
+        or
+        provenance.isGenerated() and
+        not exists(Provenance p | p.isManual() and e.isBarrier(_, kind, p, _))
+      )
+    }
+
+    private predicate isRelevantBarrierGuard(
+      BarrierGuardElement e, string input, string branch, string kind, Provenance provenance,
+      string model
+    ) {
+      e.isBarrierGuard(input, branch, kind, provenance, model) and
+      (
+        provenance.isManual()
+        or
+        provenance.isGenerated() and
+        not exists(Provenance p | p.isManual() and e.isBarrierGuard(_, _, kind, p, _))
+      )
+    }
+
+    private predicate flowSpec(string spec) {
       exists(SummarizedCallable c |
         c.propagatesFlow(spec, _, _, _, _, _)
         or
@@ -732,10 +785,14 @@ module Make<
       or
       isRelevantSource(_, spec, _, _, _)
       or
+      isRelevantBarrier(_, spec, _, _, _)
+      or
+      isRelevantBarrierGuard(_, spec, _, _, _, _)
+      or
       isRelevantSink(_, spec, _, _, _)
     }
 
-    import AccessPathSyntax::AccessPath<summarySpec/1>
+    import AccessPathSyntax::AccessPath<flowSpec/1>
 
     /** Holds if specification component `token` parses as parameter `pos`. */
     predicate parseParam(AccessPathToken token, ArgumentPosition pos) {
@@ -1515,6 +1572,31 @@ module Make<
       )
     }
 
+    /**
+     * Holds if `barrier` is a relevant barrier element with output specification `outSpec`.
+     */
+    predicate barrierSpec(
+      BarrierElement barrier, SummaryComponentStack outSpec, string kind, string model
+    ) {
+      exists(string output |
+        isRelevantBarrier(barrier, output, kind, _, model) and
+        External::interpretSpec(output, outSpec)
+      )
+    }
+
+    /**
+     * Holds if `barrierGuard` is a relevant barrier guard element with input specification `inSpec`.
+     */
+    predicate barrierGuardSpec(
+      BarrierGuardElement barrierGuard, SummaryComponentStack inSpec, string branch, string kind,
+      string model
+    ) {
+      exists(string input |
+        isRelevantBarrierGuard(barrierGuard, input, branch, kind, _, model) and
+        External::interpretSpec(input, inSpec)
+      )
+    }
+
     signature module TypesInputSig {
       /** Gets the type of content `c`. */
       DataFlowType getContentType(ContentSet c);
diff --git a/shared/dataflow/qlpack.yml b/shared/dataflow/qlpack.yml
index d16d8379bbb..2dd531eda0a 100644
--- a/shared/dataflow/qlpack.yml
+++ b/shared/dataflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/dataflow
-version: 2.0.27-dev
+version: 2.1.1-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/mad/CHANGELOG.md b/shared/mad/CHANGELOG.md
index 7fe382ef31d..ac2f534d1f0 100644
--- a/shared/mad/CHANGELOG.md
+++ b/shared/mad/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.0.44
+
+No user-facing changes.
+
+## 1.0.43
+
+No user-facing changes.
+
 ## 1.0.42
 
 No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.43.md b/shared/mad/change-notes/released/1.0.43.md
new file mode 100644
index 00000000000..ace72ed890f
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.43.md
@@ -0,0 +1,3 @@
+## 1.0.43
+
+No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.44.md b/shared/mad/change-notes/released/1.0.44.md
new file mode 100644
index 00000000000..9a8d400d319
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.44.md
@@ -0,0 +1,3 @@
+## 1.0.44
+
+No user-facing changes.
diff --git a/shared/mad/codeql-pack.release.yml b/shared/mad/codeql-pack.release.yml
index 53e8667626a..59728e63980 100644
--- a/shared/mad/codeql-pack.release.yml
+++ b/shared/mad/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.42
+lastReleaseVersion: 1.0.44
diff --git a/shared/mad/qlpack.yml b/shared/mad/qlpack.yml
index 9adf5d48ad5..cade13e956c 100644
--- a/shared/mad/qlpack.yml
+++ b/shared/mad/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/mad
-version: 1.0.43-dev
+version: 1.0.45-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/quantum/CHANGELOG.md b/shared/quantum/CHANGELOG.md
index 7ac497bdb32..356c331b5df 100644
--- a/shared/quantum/CHANGELOG.md
+++ b/shared/quantum/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.0.22
+
+No user-facing changes.
+
+## 0.0.21
+
+No user-facing changes.
+
 ## 0.0.20
 
 No user-facing changes.
diff --git a/shared/quantum/change-notes/released/0.0.21.md b/shared/quantum/change-notes/released/0.0.21.md
new file mode 100644
index 00000000000..d32472e976d
--- /dev/null
+++ b/shared/quantum/change-notes/released/0.0.21.md
@@ -0,0 +1,3 @@
+## 0.0.21
+
+No user-facing changes.
diff --git a/shared/quantum/change-notes/released/0.0.22.md b/shared/quantum/change-notes/released/0.0.22.md
new file mode 100644
index 00000000000..00226747438
--- /dev/null
+++ b/shared/quantum/change-notes/released/0.0.22.md
@@ -0,0 +1,3 @@
+## 0.0.22
+
+No user-facing changes.
diff --git a/shared/quantum/codeql-pack.release.yml b/shared/quantum/codeql-pack.release.yml
index d2e86745bca..11aaa2243f5 100644
--- a/shared/quantum/codeql-pack.release.yml
+++ b/shared/quantum/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.20
+lastReleaseVersion: 0.0.22
diff --git a/shared/quantum/qlpack.yml b/shared/quantum/qlpack.yml
index 91774b4db2d..4e7f48d621d 100644
--- a/shared/quantum/qlpack.yml
+++ b/shared/quantum/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/quantum
-version: 0.0.21-dev
+version: 0.0.23-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/rangeanalysis/CHANGELOG.md b/shared/rangeanalysis/CHANGELOG.md
index 56497c3d31e..7fe3864e2a9 100644
--- a/shared/rangeanalysis/CHANGELOG.md
+++ b/shared/rangeanalysis/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.0.44
+
+No user-facing changes.
+
+## 1.0.43
+
+No user-facing changes.
+
 ## 1.0.42
 
 No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.43.md b/shared/rangeanalysis/change-notes/released/1.0.43.md
new file mode 100644
index 00000000000..ace72ed890f
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.43.md
@@ -0,0 +1,3 @@
+## 1.0.43
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.44.md b/shared/rangeanalysis/change-notes/released/1.0.44.md
new file mode 100644
index 00000000000..9a8d400d319
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.44.md
@@ -0,0 +1,3 @@
+## 1.0.44
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/codeql-pack.release.yml b/shared/rangeanalysis/codeql-pack.release.yml
index 53e8667626a..59728e63980 100644
--- a/shared/rangeanalysis/codeql-pack.release.yml
+++ b/shared/rangeanalysis/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.42
+lastReleaseVersion: 1.0.44
diff --git a/shared/rangeanalysis/qlpack.yml b/shared/rangeanalysis/qlpack.yml
index a5e5998c4a7..5c2fc87098b 100644
--- a/shared/rangeanalysis/qlpack.yml
+++ b/shared/rangeanalysis/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rangeanalysis
-version: 1.0.43-dev
+version: 1.0.45-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/regex/CHANGELOG.md b/shared/regex/CHANGELOG.md
index 48478854251..76740aca838 100644
--- a/shared/regex/CHANGELOG.md
+++ b/shared/regex/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.0.44
+
+No user-facing changes.
+
+## 1.0.43
+
+No user-facing changes.
+
 ## 1.0.42
 
 No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.43.md b/shared/regex/change-notes/released/1.0.43.md
new file mode 100644
index 00000000000..ace72ed890f
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.43.md
@@ -0,0 +1,3 @@
+## 1.0.43
+
+No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.44.md b/shared/regex/change-notes/released/1.0.44.md
new file mode 100644
index 00000000000..9a8d400d319
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.44.md
@@ -0,0 +1,3 @@
+## 1.0.44
+
+No user-facing changes.
diff --git a/shared/regex/codeql-pack.release.yml b/shared/regex/codeql-pack.release.yml
index 53e8667626a..59728e63980 100644
--- a/shared/regex/codeql-pack.release.yml
+++ b/shared/regex/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.42
+lastReleaseVersion: 1.0.44
diff --git a/shared/regex/qlpack.yml b/shared/regex/qlpack.yml
index 2dd53258318..26f585673ec 100644
--- a/shared/regex/qlpack.yml
+++ b/shared/regex/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/regex
-version: 1.0.43-dev
+version: 1.0.45-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/ssa/CHANGELOG.md b/shared/ssa/CHANGELOG.md
index 49bac05febb..8e2eb4bd049 100644
--- a/shared/ssa/CHANGELOG.md
+++ b/shared/ssa/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2.0.20
+
+No user-facing changes.
+
+## 2.0.19
+
+No user-facing changes.
+
 ## 2.0.18
 
 No user-facing changes.
diff --git a/shared/ssa/change-notes/released/2.0.19.md b/shared/ssa/change-notes/released/2.0.19.md
new file mode 100644
index 00000000000..b37b6798b12
--- /dev/null
+++ b/shared/ssa/change-notes/released/2.0.19.md
@@ -0,0 +1,3 @@
+## 2.0.19
+
+No user-facing changes.
diff --git a/shared/ssa/change-notes/released/2.0.20.md b/shared/ssa/change-notes/released/2.0.20.md
new file mode 100644
index 00000000000..6756bd5f6c1
--- /dev/null
+++ b/shared/ssa/change-notes/released/2.0.20.md
@@ -0,0 +1,3 @@
+## 2.0.20
+
+No user-facing changes.
diff --git a/shared/ssa/codeql-pack.release.yml b/shared/ssa/codeql-pack.release.yml
index 16342205c73..cde101f3516 100644
--- a/shared/ssa/codeql-pack.release.yml
+++ b/shared/ssa/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.18
+lastReleaseVersion: 2.0.20
diff --git a/shared/ssa/qlpack.yml b/shared/ssa/qlpack.yml
index 5e567790cfe..4cfd1100a80 100644
--- a/shared/ssa/qlpack.yml
+++ b/shared/ssa/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ssa
-version: 2.0.19-dev
+version: 2.0.21-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/threat-models/CHANGELOG.md b/shared/threat-models/CHANGELOG.md
index e91058f491a..83afe3edcec 100644
--- a/shared/threat-models/CHANGELOG.md
+++ b/shared/threat-models/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.0.44
+
+No user-facing changes.
+
+## 1.0.43
+
+No user-facing changes.
+
 ## 1.0.42
 
 No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.43.md b/shared/threat-models/change-notes/released/1.0.43.md
new file mode 100644
index 00000000000..ace72ed890f
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.43.md
@@ -0,0 +1,3 @@
+## 1.0.43
+
+No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.44.md b/shared/threat-models/change-notes/released/1.0.44.md
new file mode 100644
index 00000000000..9a8d400d319
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.44.md
@@ -0,0 +1,3 @@
+## 1.0.44
+
+No user-facing changes.
diff --git a/shared/threat-models/codeql-pack.release.yml b/shared/threat-models/codeql-pack.release.yml
index 53e8667626a..59728e63980 100644
--- a/shared/threat-models/codeql-pack.release.yml
+++ b/shared/threat-models/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.42
+lastReleaseVersion: 1.0.44
diff --git a/shared/threat-models/qlpack.yml b/shared/threat-models/qlpack.yml
index 65539cd3c1b..9e47885b303 100644
--- a/shared/threat-models/qlpack.yml
+++ b/shared/threat-models/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/threat-models
-version: 1.0.43-dev
+version: 1.0.45-dev
 library: true
 groups: shared
 dataExtensions:
diff --git a/shared/tutorial/CHANGELOG.md b/shared/tutorial/CHANGELOG.md
index 4ecb5dcd241..403c4b8589a 100644
--- a/shared/tutorial/CHANGELOG.md
+++ b/shared/tutorial/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.0.44
+
+No user-facing changes.
+
+## 1.0.43
+
+No user-facing changes.
+
 ## 1.0.42
 
 No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.43.md b/shared/tutorial/change-notes/released/1.0.43.md
new file mode 100644
index 00000000000..ace72ed890f
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.43.md
@@ -0,0 +1,3 @@
+## 1.0.43
+
+No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.44.md b/shared/tutorial/change-notes/released/1.0.44.md
new file mode 100644
index 00000000000..9a8d400d319
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.44.md
@@ -0,0 +1,3 @@
+## 1.0.44
+
+No user-facing changes.
diff --git a/shared/tutorial/codeql-pack.release.yml b/shared/tutorial/codeql-pack.release.yml
index 53e8667626a..59728e63980 100644
--- a/shared/tutorial/codeql-pack.release.yml
+++ b/shared/tutorial/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.42
+lastReleaseVersion: 1.0.44
diff --git a/shared/tutorial/qlpack.yml b/shared/tutorial/qlpack.yml
index d632d0426b4..2313b64956a 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.43-dev
+version: 1.0.45-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/typeflow/CHANGELOG.md b/shared/typeflow/CHANGELOG.md
index 176ba027afe..b57a022aa47 100644
--- a/shared/typeflow/CHANGELOG.md
+++ b/shared/typeflow/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.0.44
+
+No user-facing changes.
+
+## 1.0.43
+
+No user-facing changes.
+
 ## 1.0.42
 
 No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.43.md b/shared/typeflow/change-notes/released/1.0.43.md
new file mode 100644
index 00000000000..ace72ed890f
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.43.md
@@ -0,0 +1,3 @@
+## 1.0.43
+
+No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.44.md b/shared/typeflow/change-notes/released/1.0.44.md
new file mode 100644
index 00000000000..9a8d400d319
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.44.md
@@ -0,0 +1,3 @@
+## 1.0.44
+
+No user-facing changes.
diff --git a/shared/typeflow/codeql-pack.release.yml b/shared/typeflow/codeql-pack.release.yml
index 53e8667626a..59728e63980 100644
--- a/shared/typeflow/codeql-pack.release.yml
+++ b/shared/typeflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.42
+lastReleaseVersion: 1.0.44
diff --git a/shared/typeflow/qlpack.yml b/shared/typeflow/qlpack.yml
index 19f16908768..1cd9c4b5f7b 100644
--- a/shared/typeflow/qlpack.yml
+++ b/shared/typeflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeflow
-version: 1.0.43-dev
+version: 1.0.45-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typeinference/CHANGELOG.md b/shared/typeinference/CHANGELOG.md
index 4d23ebe8abb..8d524a11a09 100644
--- a/shared/typeinference/CHANGELOG.md
+++ b/shared/typeinference/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.0.25
+
+No user-facing changes.
+
+## 0.0.24
+
+No user-facing changes.
+
 ## 0.0.23
 
 No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.24.md b/shared/typeinference/change-notes/released/0.0.24.md
new file mode 100644
index 00000000000..84995db2aff
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.24.md
@@ -0,0 +1,3 @@
+## 0.0.24
+
+No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.25.md b/shared/typeinference/change-notes/released/0.0.25.md
new file mode 100644
index 00000000000..e41a9acfa06
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.25.md
@@ -0,0 +1,3 @@
+## 0.0.25
+
+No user-facing changes.
diff --git a/shared/typeinference/codeql-pack.release.yml b/shared/typeinference/codeql-pack.release.yml
index cc2195603d8..6d0e80a50c3 100644
--- a/shared/typeinference/codeql-pack.release.yml
+++ b/shared/typeinference/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.23
+lastReleaseVersion: 0.0.25
diff --git a/shared/typeinference/codeql/typeinference/internal/TypeInference.qll b/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
index c33c49e7a16..0b23b08aad6 100644
--- a/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
+++ b/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
@@ -336,7 +336,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
      * ```
      * the type parameter `T` has the constraint `IComparable<T>`.
      */
-    Type getATypeParameterConstraint(TypeParameter tp, TypePath path);
+    TypeMention getATypeParameterConstraint(TypeParameter tp);
 
     /**
      * Holds if
@@ -385,6 +385,45 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
     predicate conditionSatisfiesConstraint(
       TypeAbstraction abs, TypeMention condition, TypeMention constraint, boolean transitive
     );
+
+    /**
+     * Holds if the constraint belonging to `abs` with root type `constraint` is
+     * ambiguous at `path`, meaning that there is _some_ other abstraction `abs2`
+     * with a structurally identical condition and same root constraint type
+     * `constraint`, and where the constraints differ at `path`.
+     *
+     * Example:
+     *
+     * ```rust
+     * trait Trait<T1, T2> { }
+     *
+     *    impl<T> Trait<i32, bool> for Foo<T> { ... }
+     * //     ^^^ `abs`
+     * //         ^^^^^ `constraint`
+     * //                              ^^^^^^ `condition`
+     *
+     *    impl<T> Trait<i64, bool> for Foo<T> { }
+     * //     ^^^ `abs2`
+     * //         ^^^^^ `constraint`
+     * //                              ^^^^^^ `condition2`
+     * ```
+     *
+     * In the above, `abs` and `abs2` have structurally identical conditions,
+     * `condition` and `condition2`, and they differ at the path `"T1"`, but
+     * not at the path `"T2"`.
+     */
+    predicate typeAbstractionHasAmbiguousConstraintAt(
+      TypeAbstraction abs, Type constraint, TypePath path
+    );
+
+    /**
+     * Holds if all instantiations of `tp` are functionally determined by the
+     * instantiations of the other type parameters in the same abstraction.
+     *
+     * For example, in Rust all associated types act as functionally determined
+     * type parameters.
+     */
+    predicate typeParameterIsFunctionallyDetermined(TypeParameter tp);
   }
 
   module Make2<HasTypeTreeSig TypeMention, InputSig2<TypeMention> Input2> {
@@ -661,6 +700,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
        * Holds if the type mention `condition` satisfies `constraint` with the
        * type `t` at the path `path`.
        */
+      pragma[nomagic]
       predicate conditionSatisfiesConstraintTypeAt(
         TypeAbstraction abs, TypeMention condition, TypeMention constraint, TypePath path, Type t
       ) {
@@ -820,38 +860,58 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
 
     private import BaseTypes
 
-    signature module SatisfiesConstraintInputSig<HasTypeTreeSig HasTypeTree> {
+    /** Provides the input to `SatisfiesConstraintWithTypeMatching`. */
+    signature module SatisfiesConstraintWithTypeMatchingInputSig<
+      HasTypeTreeSig Term, HasTypeTreeSig Constraint>
+    {
       /** Holds if it is relevant to know if `term` satisfies `constraint`. */
-      predicate relevantConstraint(HasTypeTree term, Type constraint);
+      predicate relevantConstraint(Term term, Constraint constraint);
+
+      /** A context in which a type parameter can be matched with an instantiation. */
+      class TypeMatchingContext;
+
+      /** Gets the type matching context for `t`. */
+      TypeMatchingContext getTypeMatchingContext(Term t);
+
+      /**
+       * Holds if `tp` can be matched with the type `t` at `path` in the context `ctx`.
+       *
+       * This may be used to disambiguate between multiple constraints that a term may satisfy.
+       */
+      predicate typeMatch(TypeMatchingContext ctx, TypeParameter tp, TypePath path, Type t);
     }
 
-    module SatisfiesConstraint<
-      HasTypeTreeSig HasTypeTree, SatisfiesConstraintInputSig<HasTypeTree> Input>
+    module SatisfiesConstraintWithTypeMatching<
+      HasTypeTreeSig Term, HasTypeTreeSig Constraint,
+      SatisfiesConstraintWithTypeMatchingInputSig<Term, Constraint> Input>
     {
       private import Input
 
       pragma[nomagic]
-      private Type getTypeAt(HasTypeTree term, TypePath path) {
+      private Type getTypeAt(Term term, TypePath path) {
         relevantConstraint(term, _) and
         result = term.getTypeAt(path)
       }
 
       /** Holds if the type tree has the type `type` and should satisfy `constraint`. */
       pragma[nomagic]
-      private predicate hasTypeConstraint(HasTypeTree term, Type type, Type constraint) {
+      private predicate hasTypeConstraint(
+        Term term, Type type, Constraint constraint, Type constraintRoot
+      ) {
         type = getTypeAt(term, TypePath::nil()) and
-        relevantConstraint(term, constraint)
+        relevantConstraint(term, constraint) and
+        constraintRoot = constraint.getTypeAt(TypePath::nil())
       }
 
-      private module IsInstantiationOfInput implements
-        IsInstantiationOfInputSig<HasTypeTree, TypeMention>
+      private module TermIsInstantiationOfConditionInput implements
+        IsInstantiationOfInputSig<Term, TypeMention>
       {
-        predicate potentialInstantiationOf(HasTypeTree tt, TypeAbstraction abs, TypeMention cond) {
-          exists(Type constraint, Type type |
-            hasTypeConstraint(tt, type, constraint) and
-            rootTypesSatisfaction(type, constraint, abs, cond, _) and
+        predicate potentialInstantiationOf(Term term, TypeAbstraction abs, TypeMention cond) {
+          exists(Constraint constraint, Type type, Type constraintRoot |
+            hasTypeConstraint(term, type, constraint, constraintRoot) and
+            rootTypesSatisfaction(type, constraintRoot, abs, cond, _) and
             // We only need to check instantiations where there are multiple candidates.
-            multipleConstraintImplementations(type, constraint)
+            multipleConstraintImplementations(type, constraintRoot)
           )
         }
 
@@ -860,18 +920,18 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         }
       }
 
-      private module SatisfiesConstraintIsInstantiationOf =
-        IsInstantiationOf<HasTypeTree, TypeMention, IsInstantiationOfInput>;
+      private module TermIsInstantiationOfCondition =
+        IsInstantiationOf<Term, TypeMention, TermIsInstantiationOfConditionInput>;
 
       /**
-       * Holds if `tt` satisfies `constraint` through `abs`, `sub`, and `constraintMention`.
+       * Holds if `term` satisfies `constraint` through `abs`, `sub`, and `constraintMention`.
        */
       pragma[nomagic]
       private predicate hasConstraintMention(
-        HasTypeTree tt, TypeAbstraction abs, TypeMention condition, Type constraint,
-        TypeMention constraintMention
+        Term term, TypeAbstraction abs, TypeMention condition, Constraint constraint,
+        Type constraintRoot, TypeMention constraintMention
       ) {
-        exists(Type type | hasTypeConstraint(tt, type, constraint) |
+        exists(Type type | hasTypeConstraint(term, type, constraint, constraintRoot) |
           // TODO: Handle universal conditions properly, which means checking type parameter constraints
           // Also remember to update logic in `hasNotConstraintMention`
           //
@@ -880,35 +940,37 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           // getTypeMentionRoot(condition) = abs.getATypeParameter() and
           // constraint = getTypeMentionRoot(constraintMention)
           // or
-          countConstraintImplementations(type, constraint) > 0 and
-          rootTypesSatisfaction(type, constraint, abs, condition, constraintMention) and
+          countConstraintImplementations(type, constraintRoot) > 0 and
+          rootTypesSatisfaction(type, constraintRoot, 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 SatisfiesConstraintIsInstantiationOf::isInstantiationOf(tt, abs, condition)
+          if multipleConstraintImplementations(type, constraintRoot)
+          then TermIsInstantiationOfCondition::isInstantiationOf(term, abs, condition)
           else any()
         )
       }
 
       pragma[nomagic]
       private predicate isNotInstantiationOf(
-        HasTypeTree tt, TypeAbstraction abs, TypeMention condition, Type root
+        Term term, TypeAbstraction abs, TypeMention condition, Type root
       ) {
         exists(TypePath path |
-          SatisfiesConstraintIsInstantiationOf::isNotInstantiationOf(tt, abs, condition, path) and
+          TermIsInstantiationOfCondition::isNotInstantiationOf(term, abs, condition, path) and
           path.isCons(root.getATypeParameter(), _)
         )
       }
 
       /**
-       * Holds if `tt` does not satisfy `constraint`.
+       * Holds if `term` does not satisfy `constraint`.
        *
-       * This predicate is an approximation of `not hasConstraintMention(tt, constraint)`.
+       * This predicate is an approximation of `not hasConstraintMention(term, constraint)`.
        */
       pragma[nomagic]
-      private predicate hasNotConstraintMention(HasTypeTree tt, Type constraint) {
-        exists(Type type | hasTypeConstraint(tt, type, constraint) |
+      private predicate hasNotConstraintMention(
+        Term term, Constraint constraint, Type constraintRoot
+      ) {
+        exists(Type type | hasTypeConstraint(term, type, constraint, constraintRoot) |
           // TODO: Handle universal conditions properly, which means taking type parameter constraints into account
           // (
           //   exists(countConstraintImplementations(type, constraint))
@@ -921,15 +983,15 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           //   )
           // ) and
           (
-            countConstraintImplementations(type, constraint) = 0
+            countConstraintImplementations(type, constraintRoot) = 0
             or
-            not rootTypesSatisfaction(type, constraint, _, _, _)
+            not rootTypesSatisfaction(type, constraintRoot, _, _, _)
             or
-            multipleConstraintImplementations(type, constraint) and
+            multipleConstraintImplementations(type, constraintRoot) and
             forex(TypeAbstraction abs, TypeMention condition |
-              rootTypesSatisfaction(type, constraint, abs, condition, _)
+              rootTypesSatisfaction(type, constraintRoot, abs, condition, _)
             |
-              isNotInstantiationOf(tt, abs, condition, type)
+              isNotInstantiationOf(term, abs, condition, type)
             )
           )
         )
@@ -937,21 +999,113 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
 
       pragma[nomagic]
       private predicate satisfiesConstraintTypeMention0(
-        HasTypeTree tt, Type constraint, TypeAbstraction abs, TypeMention sub, TypePath path, Type t
+        Term term, Constraint constraint, TypeMention constraintMention, TypeAbstraction abs,
+        TypeMention sub, TypePath path, Type t, boolean ambiguous
       ) {
-        exists(TypeMention constraintMention |
-          hasConstraintMention(tt, abs, sub, constraint, constraintMention) and
-          conditionSatisfiesConstraintTypeAt(abs, sub, constraintMention, path, t)
+        exists(Type constraintRoot |
+          hasConstraintMention(term, abs, sub, constraint, constraintRoot, constraintMention) and
+          conditionSatisfiesConstraintTypeAt(abs, sub, constraintMention, path, t) and
+          if
+            exists(TypePath prefix |
+              typeAbstractionHasAmbiguousConstraintAt(abs, constraintRoot, prefix) and
+              prefix.isPrefixOf(path)
+            )
+          then ambiguous = true
+          else ambiguous = false
+        )
+      }
+
+      pragma[nomagic]
+      private predicate conditionSatisfiesConstraintTypeAtForDisambiguation(
+        TypeAbstraction abs, TypeMention condition, TypeMention constraint, TypePath path, Type t
+      ) {
+        conditionSatisfiesConstraintTypeAt(abs, condition, constraint, path, t) and
+        not t instanceof TypeParameter and
+        not typeParameterIsFunctionallyDetermined(path.getHead())
+      }
+
+      pragma[nomagic]
+      private predicate constraintTypeMatchForDisambiguation0(
+        Term term, Constraint constraint, TypePath path, TypePath suffix, TypeParameter tp
+      ) {
+        exists(
+          TypeMention constraintMention, TypeAbstraction abs, TypeMention sub, TypePath prefix
+        |
+          satisfiesConstraintTypeMention0(term, constraint, constraintMention, abs, sub, _, _, true) and
+          conditionSatisfiesConstraintTypeAtForDisambiguation(abs, sub, constraintMention, path, _) and
+          tp = constraint.getTypeAt(prefix) and
+          path = prefix.appendInverse(suffix)
+        )
+      }
+
+      pragma[nomagic]
+      private predicate constraintTypeMatchForDisambiguation1(
+        Term term, Constraint constraint, TypePath path, TypeMatchingContext ctx, TypePath suffix,
+        TypeParameter tp
+      ) {
+        constraintTypeMatchForDisambiguation0(term, constraint, path, suffix, tp) and
+        ctx = getTypeMatchingContext(term)
+      }
+
+      /**
+       * Holds if the type of `constraint` at `path` is `t` because it is possible
+       * to match some type parameter that occurs in `constraint` at a prefix of
+       * `path` in the context of `term`.
+       *
+       * For example, if we have
+       *
+       * ```rust
+       * fn f<T1, T2: SomeTrait<T1>>(x: T1, y: T2) -> T2::Output { ... }
+       * ```
+       *
+       * then at a call like `f(true, ...)` the constraint `SomeTrait<T1>` has the
+       * type `bool` substituted for `T1`.
+       */
+      pragma[nomagic]
+      private predicate constraintTypeMatchForDisambiguation(
+        Term term, Constraint constraint, TypePath path, Type t
+      ) {
+        exists(TypeMatchingContext ctx, TypeParameter tp, TypePath suffix |
+          constraintTypeMatchForDisambiguation1(term, constraint, path, ctx, suffix, tp) and
+          typeMatch(ctx, tp, suffix, t)
+        )
+      }
+
+      pragma[nomagic]
+      private predicate satisfiesConstraintTypeMention1(
+        Term term, Constraint constraint, TypeAbstraction abs, TypeMention sub, TypePath path,
+        Type t
+      ) {
+        exists(TypeMention constraintMention, boolean ambiguous |
+          satisfiesConstraintTypeMention0(term, constraint, constraintMention, abs, sub, path, t,
+            ambiguous)
+        |
+          if ambiguous = true
+          then
+            // When the constraint is not uniquely satisfied, we check that the satisfying
+            // abstraction is not more specific than the constraint to be satisfied. For example,
+            // if the constraint is `MyTrait<i32>` and there is both `impl MyTrait<i32> for ...` and
+            // `impl MyTrait<i64> for ...`, then the latter will be filtered away
+            forall(TypePath path1, Type t1 |
+              conditionSatisfiesConstraintTypeAtForDisambiguation(abs, sub, constraintMention,
+                path1, t1)
+            |
+              t1 = constraint.getTypeAt(path1)
+              or
+              // The constraint may contain a type parameter, which we can match to the right type
+              constraintTypeMatchForDisambiguation(term, constraint, path1, t1)
+            )
+          else any()
         )
       }
 
       pragma[inline]
       private predicate satisfiesConstraintTypeMentionInline(
-        HasTypeTree tt, TypeAbstraction abs, Type constraint, TypePath path,
+        Term term, Constraint constraint, TypeAbstraction abs, TypePath path,
         TypePath pathToTypeParamInSub
       ) {
         exists(TypeMention sub, TypeParameter tp |
-          satisfiesConstraintTypeMention0(tt, constraint, abs, sub, path, tp) and
+          satisfiesConstraintTypeMention1(term, constraint, abs, sub, path, tp) and
           tp = abs.getATypeParameter() and
           sub.getTypeAt(pathToTypeParamInSub) = tp
         )
@@ -959,91 +1113,154 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
 
       pragma[nomagic]
       private predicate satisfiesConstraintTypeMention(
-        HasTypeTree tt, Type constraint, TypePath path, TypePath pathToTypeParamInSub
+        Term term, Constraint constraint, TypePath path, TypePath pathToTypeParamInSub
       ) {
-        satisfiesConstraintTypeMentionInline(tt, _, constraint, path, pathToTypeParamInSub)
+        satisfiesConstraintTypeMentionInline(term, constraint, _, path, pathToTypeParamInSub)
       }
 
       pragma[nomagic]
       private predicate satisfiesConstraintTypeMentionThrough(
-        HasTypeTree tt, TypeAbstraction abs, Type constraint, TypePath path,
+        Term term, Constraint constraint, TypeAbstraction abs, TypePath path,
         TypePath pathToTypeParamInSub
       ) {
-        satisfiesConstraintTypeMentionInline(tt, abs, constraint, path, pathToTypeParamInSub)
+        satisfiesConstraintTypeMentionInline(term, constraint, abs, path, pathToTypeParamInSub)
       }
 
       pragma[inline]
       private predicate satisfiesConstraintTypeNonTypeParamInline(
-        HasTypeTree tt, TypeAbstraction abs, Type constraint, TypePath path, Type t
+        Term term, TypeAbstraction abs, Constraint constraint, TypePath path, Type t
       ) {
-        satisfiesConstraintTypeMention0(tt, constraint, abs, _, path, t) and
+        satisfiesConstraintTypeMention1(term, constraint, abs, _, path, t) and
         not t = abs.getATypeParameter()
       }
 
       pragma[nomagic]
-      private predicate hasTypeConstraint(HasTypeTree term, Type constraint) {
-        hasTypeConstraint(term, constraint, constraint)
+      private predicate hasTypeConstraint(Term term, Constraint constraint) {
+        exists(Type constraintRoot |
+          hasTypeConstraint(term, constraintRoot, constraint, constraintRoot)
+        )
       }
 
       /**
-       * Holds if the type tree at `tt` satisfies the constraint `constraint`
+       * Holds if the type tree at `term` satisfies the constraint `constraint`
        * with the type `t` at `path`.
        */
       pragma[nomagic]
-      predicate satisfiesConstraintType(HasTypeTree tt, Type constraint, TypePath path, Type t) {
-        satisfiesConstraintTypeNonTypeParamInline(tt, _, constraint, path, t)
+      predicate satisfiesConstraintType(Term term, Constraint constraint, TypePath path, Type t) {
+        satisfiesConstraintTypeNonTypeParamInline(term, _, constraint, path, t)
         or
         exists(TypePath prefix0, TypePath pathToTypeParamInSub, TypePath suffix |
-          satisfiesConstraintTypeMention(tt, constraint, prefix0, pathToTypeParamInSub) and
-          getTypeAt(tt, pathToTypeParamInSub.appendInverse(suffix)) = t and
+          satisfiesConstraintTypeMention(term, constraint, prefix0, pathToTypeParamInSub) and
+          getTypeAt(term, pathToTypeParamInSub.appendInverse(suffix)) = t and
           path = prefix0.append(suffix)
         )
         or
-        hasTypeConstraint(tt, constraint) and
-        t = getTypeAt(tt, path)
+        hasTypeConstraint(term, constraint) and
+        t = getTypeAt(term, path)
       }
 
       /**
-       * Holds if the type tree at `tt` satisfies the constraint `constraint`
+       * Holds if the type tree at `term` satisfies the constraint `constraint`
        * through `abs` with the type `t` at `path`.
        */
       pragma[nomagic]
       predicate satisfiesConstraintTypeThrough(
-        HasTypeTree tt, TypeAbstraction abs, Type constraint, TypePath path, Type t
+        Term term, TypeAbstraction abs, Constraint constraint, TypePath path, Type t
       ) {
-        satisfiesConstraintTypeNonTypeParamInline(tt, abs, constraint, path, t)
+        satisfiesConstraintTypeNonTypeParamInline(term, abs, constraint, path, t)
         or
         exists(TypePath prefix0, TypePath pathToTypeParamInSub, TypePath suffix |
-          satisfiesConstraintTypeMentionThrough(tt, abs, constraint, prefix0, pathToTypeParamInSub) and
-          getTypeAt(tt, pathToTypeParamInSub.appendInverse(suffix)) = t and
+          satisfiesConstraintTypeMentionThrough(term, constraint, abs, prefix0, pathToTypeParamInSub) and
+          getTypeAt(term, pathToTypeParamInSub.appendInverse(suffix)) = t and
           path = prefix0.append(suffix)
         )
       }
 
       /**
-       * Holds if the type tree at `tt` does _not_ satisfy the constraint `constraint`.
+       * Holds if the type tree at `term` does _not_ satisfy the constraint `constraint`.
        *
-       * This is an approximation of `not satisfiesConstraintType(tt, constraint, _, _)`,
+       * This is an approximation of `not satisfiesConstraintType(term, constraint, _, _)`,
        * but defined without a negative occurrence of `satisfiesConstraintType`.
        *
        * Due to the approximation, both `satisfiesConstraintType` and `dissatisfiesConstraint`
-       * can hold for the same values. For example, if `tt` has two different types `t1`
+       * can hold for the same values. For example, if `term` has two different types `t1`
        * and `t2`, and `t1` satisfies `constraint` while `t2` does not, then both
        * `satisfiesConstraintType` and `dissatisfiesConstraint` will hold.
        *
-       * Dually, if `tt` does not have a type, then neither `satisfiesConstraintType` nor
+       * Dually, if `term` does not have a type, then neither `satisfiesConstraintType` nor
        * `dissatisfiesConstraint` will hold.
        */
       pragma[nomagic]
-      predicate dissatisfiesConstraint(HasTypeTree tt, Type constraint) {
-        hasNotConstraintMention(tt, constraint) and
-        exists(Type t |
-          hasTypeConstraint(tt, t, constraint) and
-          t != constraint
+      predicate dissatisfiesConstraint(Term term, Constraint constraint) {
+        hasNotConstraintMention(term, constraint, _) and
+        exists(Type t, Type constraintRoot |
+          hasTypeConstraint(term, t, constraint, constraintRoot) and
+          t != constraintRoot
         )
       }
     }
 
+    /** Provides the input to `SatisfiesConstraint`. */
+    signature module SatisfiesConstraintInputSig<HasTypeTreeSig Term, HasTypeTreeSig Constraint> {
+      /** Holds if it is relevant to know if `term` satisfies `constraint`. */
+      predicate relevantConstraint(Term term, Constraint constraint);
+    }
+
+    module SatisfiesConstraint<
+      HasTypeTreeSig Term, HasTypeTreeSig Constraint,
+      SatisfiesConstraintInputSig<Term, Constraint> Input>
+    {
+      private module Inp implements SatisfiesConstraintWithTypeMatchingInputSig<Term, Constraint> {
+        private import codeql.util.Void
+
+        predicate relevantConstraint(Term term, Constraint constraint) {
+          Input::relevantConstraint(term, constraint)
+        }
+
+        class TypeMatchingContext = Void;
+
+        TypeMatchingContext getTypeMatchingContext(Term t) { none() }
+
+        predicate typeMatch(TypeMatchingContext ctx, TypeParameter tp, TypePath path, Type t) {
+          none()
+        }
+      }
+
+      import SatisfiesConstraintWithTypeMatching<Term, Constraint, Inp>
+    }
+
+    /** Provides the input to `SatisfiesType`. */
+    signature module SatisfiesTypeInputSig<HasTypeTreeSig Term> {
+      /** Holds if it is relevant to know if `term` satisfies `type`. */
+      predicate relevantConstraint(Term term, Type type);
+    }
+
+    /**
+     * A helper module wrapping `SatisfiesConstraint` where the constraint is simply a type.
+     */
+    module SatisfiesType<HasTypeTreeSig Term, SatisfiesTypeInputSig<Term> Input> {
+      private import Input
+
+      final private class TypeFinal = Type;
+
+      private class TypeAsTypeTree extends TypeFinal {
+        Type getTypeAt(TypePath path) {
+          result = this and
+          path.isEmpty()
+        }
+      }
+
+      private module SatisfiesConstraintInput implements
+        SatisfiesConstraintInputSig<Term, TypeAsTypeTree>
+      {
+        predicate relevantConstraint(Term term, TypeAsTypeTree constraint) {
+          Input::relevantConstraint(term, constraint)
+        }
+      }
+
+      import SatisfiesConstraint<Term, TypeAsTypeTree, SatisfiesConstraintInput>
+    }
+
     /** Provides the input to `MatchingWithEnvironment`. */
     signature module MatchingWithEnvironmentInputSig {
       /**
@@ -1079,6 +1296,15 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         Type getDeclaredType(DeclarationPosition dpos, TypePath path);
       }
 
+      /**
+       * Gets a type constraint on the type parameter `tp` that applies to `decl`,
+       * if any.
+       */
+      bindingset[decl]
+      default TypeMention getATypeParameterConstraint(TypeParameter tp, Declaration decl) {
+        result = getATypeParameterConstraint(tp)
+      }
+
       /**
        * A position inside an access. For example, the integer position of an
        * argument inside a method call.
@@ -1264,9 +1490,9 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
       }
 
       private module AccessConstraint {
-        predicate relevantAccessConstraint(
+        private predicate relevantAccessConstraint(
           Access a, AccessEnvironment e, Declaration target, AccessPosition apos, TypePath path,
-          Type constraint
+          TypeMention constraint
         ) {
           target = a.getTarget(e) and
           typeParameterConstraintHasTypeParameter(target, apos, path, constraint, _, _)
@@ -1289,12 +1515,13 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
 
           RelevantAccess() { this = MkRelevantAccess(a, apos, e, path) }
 
+          pragma[nomagic]
           Type getTypeAt(TypePath suffix) {
             result = a.getInferredType(e, apos, path.appendInverse(suffix))
           }
 
           /** Gets the constraint that this relevant access should satisfy. */
-          Type getConstraint(Declaration target) {
+          TypeMention getConstraint(Declaration target) {
             relevantAccessConstraint(a, e, target, apos, path, result)
           }
 
@@ -1305,22 +1532,37 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           Location getLocation() { result = a.getLocation() }
         }
 
-        private module SatisfiesConstraintInput implements
-          SatisfiesConstraintInputSig<RelevantAccess>
+        private module SatisfiesTypeParameterConstraintInput implements
+          SatisfiesConstraintWithTypeMatchingInputSig<RelevantAccess, TypeMention>
         {
-          predicate relevantConstraint(RelevantAccess at, Type constraint) {
+          predicate relevantConstraint(RelevantAccess at, TypeMention constraint) {
             constraint = at.getConstraint(_)
           }
+
+          class TypeMatchingContext = Access;
+
+          TypeMatchingContext getTypeMatchingContext(RelevantAccess at) {
+            at = MkRelevantAccess(result, _, _, _)
+          }
+
+          pragma[nomagic]
+          predicate typeMatch(TypeMatchingContext ctx, TypeParameter tp, TypePath path, Type t) {
+            typeMatch(ctx, _, _, path, t, tp)
+          }
         }
 
+        private module SatisfiesTypeParameterConstraint =
+          SatisfiesConstraintWithTypeMatching<RelevantAccess, TypeMention,
+            SatisfiesTypeParameterConstraintInput>;
+
+        pragma[nomagic]
         predicate satisfiesConstraintType(
           Access a, AccessEnvironment e, Declaration target, AccessPosition apos, TypePath prefix,
-          Type constraint, TypePath path, Type t
+          TypeMention constraint, TypePath path, Type t
         ) {
           exists(RelevantAccess ra |
             ra = MkRelevantAccess(a, apos, e, prefix) and
-            SatisfiesConstraint<RelevantAccess, SatisfiesConstraintInput>::satisfiesConstraintType(ra,
-              constraint, path, t) and
+            SatisfiesTypeParameterConstraint::satisfiesConstraintType(ra, constraint, path, t) and
             constraint = ra.getConstraint(target)
           )
         }
@@ -1410,6 +1652,24 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         t = getTypeArgument(a, target, tp, path)
       }
 
+      /**
+       * Holds if the type parameter `constrainedTp` occurs in the declared type of
+       * `target` at `apos` and `pathToConstrained`, and there is a constraint
+       * `constraint` on `constrainedTp`.
+       */
+      pragma[nomagic]
+      private predicate typeParameterHasConstraint(
+        Declaration target, AccessPosition apos, TypeParameter constrainedTp,
+        TypePath pathToConstrained, TypeMention constraint
+      ) {
+        exists(DeclarationPosition dpos |
+          accessDeclarationPositionMatch(apos, dpos) and
+          constrainedTp = target.getTypeParameter(_) and
+          constrainedTp = target.getDeclaredType(dpos, pathToConstrained) and
+          constraint = getATypeParameterConstraint(constrainedTp, target)
+        )
+      }
+
       /**
        * Holds if the declared type of `target` contains a type parameter at
        * `apos` and `pathToConstrained` that must satisfy `constraint` and `tp`
@@ -1429,17 +1689,14 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
        */
       pragma[nomagic]
       private predicate typeParameterConstraintHasTypeParameter(
-        Declaration target, AccessPosition apos, TypePath pathToConstrained, Type constraint,
+        Declaration target, AccessPosition apos, TypePath pathToConstrained, TypeMention constraint,
         TypePath pathToTp, TypeParameter tp
       ) {
-        exists(DeclarationPosition dpos, TypeParameter constrainedTp |
-          accessDeclarationPositionMatch(apos, dpos) and
-          constrainedTp = target.getTypeParameter(_) and
+        exists(TypeParameter constrainedTp |
+          typeParameterHasConstraint(target, apos, constrainedTp, pathToConstrained, constraint) and
           tp = target.getTypeParameter(_) and
-          tp = getATypeParameterConstraint(constrainedTp, pathToTp) and
-          constrainedTp != tp and
-          constrainedTp = target.getDeclaredType(dpos, pathToConstrained) and
-          constraint = getATypeParameterConstraint(constrainedTp, TypePath::nil())
+          tp = constraint.getTypeAt(pathToTp) and
+          constrainedTp != tp
         )
       }
 
@@ -1448,7 +1705,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         Access a, AccessEnvironment e, Declaration target, TypePath path, Type t, TypeParameter tp
       ) {
         not exists(getTypeArgument(a, target, tp, _)) and
-        exists(Type constraint, AccessPosition apos, TypePath pathToTp, TypePath pathToTp2 |
+        exists(TypeMention constraint, AccessPosition apos, TypePath pathToTp, TypePath pathToTp2 |
           typeParameterConstraintHasTypeParameter(target, apos, pathToTp2, constraint, pathToTp, tp) and
           AccessConstraint::satisfiesConstraintType(a, e, target, apos, pathToTp2, constraint,
             pathToTp.appendInverse(path), t)
@@ -1566,6 +1823,15 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         Type getDeclaredType(DeclarationPosition dpos, TypePath path);
       }
 
+      /**
+       * Gets a type constraint on the type parameter `tp` that applies to `decl`,
+       * if any.
+       */
+      bindingset[decl]
+      default TypeMention getATypeParameterConstraint(TypeParameter tp, Declaration decl) {
+        result = getATypeParameterConstraint(tp)
+      }
+
       /**
        * A position inside an access. For example, the integer position of an
        * argument inside a method call.
@@ -1623,6 +1889,8 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         private import codeql.util.Unit
         import Input
 
+        predicate getATypeParameterConstraint = Input::getATypeParameterConstraint/2;
+
         class AccessEnvironment = Unit;
 
         final private class AccessFinal = Input::Access;
diff --git a/shared/typeinference/qlpack.yml b/shared/typeinference/qlpack.yml
index cd15cfac986..533847824b1 100644
--- a/shared/typeinference/qlpack.yml
+++ b/shared/typeinference/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeinference
-version: 0.0.24-dev
+version: 0.0.26-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typetracking/CHANGELOG.md b/shared/typetracking/CHANGELOG.md
index d5ca15b5be7..553f1b75bfd 100644
--- a/shared/typetracking/CHANGELOG.md
+++ b/shared/typetracking/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2.0.28
+
+No user-facing changes.
+
+## 2.0.27
+
+No user-facing changes.
+
 ## 2.0.26
 
 No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.27.md b/shared/typetracking/change-notes/released/2.0.27.md
new file mode 100644
index 00000000000..639cf77090e
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.27.md
@@ -0,0 +1,3 @@
+## 2.0.27
+
+No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.28.md b/shared/typetracking/change-notes/released/2.0.28.md
new file mode 100644
index 00000000000..3f9412b6e63
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.28.md
@@ -0,0 +1,3 @@
+## 2.0.28
+
+No user-facing changes.
diff --git a/shared/typetracking/codeql-pack.release.yml b/shared/typetracking/codeql-pack.release.yml
index 63d57bef481..ec5bd6ba369 100644
--- a/shared/typetracking/codeql-pack.release.yml
+++ b/shared/typetracking/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.26
+lastReleaseVersion: 2.0.28
diff --git a/shared/typetracking/qlpack.yml b/shared/typetracking/qlpack.yml
index 41e4b42ff3b..41a197cff1d 100644
--- a/shared/typetracking/qlpack.yml
+++ b/shared/typetracking/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typetracking
-version: 2.0.27-dev
+version: 2.0.29-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typos/CHANGELOG.md b/shared/typos/CHANGELOG.md
index 9e886726714..277af7bfafe 100644
--- a/shared/typos/CHANGELOG.md
+++ b/shared/typos/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.0.44
+
+No user-facing changes.
+
+## 1.0.43
+
+No user-facing changes.
+
 ## 1.0.42
 
 No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.43.md b/shared/typos/change-notes/released/1.0.43.md
new file mode 100644
index 00000000000..ace72ed890f
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.43.md
@@ -0,0 +1,3 @@
+## 1.0.43
+
+No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.44.md b/shared/typos/change-notes/released/1.0.44.md
new file mode 100644
index 00000000000..9a8d400d319
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.44.md
@@ -0,0 +1,3 @@
+## 1.0.44
+
+No user-facing changes.
diff --git a/shared/typos/codeql-pack.release.yml b/shared/typos/codeql-pack.release.yml
index 53e8667626a..59728e63980 100644
--- a/shared/typos/codeql-pack.release.yml
+++ b/shared/typos/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.42
+lastReleaseVersion: 1.0.44
diff --git a/shared/typos/qlpack.yml b/shared/typos/qlpack.yml
index cf3df223c88..547c266fb94 100644
--- a/shared/typos/qlpack.yml
+++ b/shared/typos/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typos
-version: 1.0.43-dev
+version: 1.0.45-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/util/CHANGELOG.md b/shared/util/CHANGELOG.md
index de6fbcff12f..4f086cb994a 100644
--- a/shared/util/CHANGELOG.md
+++ b/shared/util/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2.0.31
+
+No user-facing changes.
+
+## 2.0.30
+
+No user-facing changes.
+
 ## 2.0.29
 
 No user-facing changes.
diff --git a/shared/util/change-notes/released/2.0.30.md b/shared/util/change-notes/released/2.0.30.md
new file mode 100644
index 00000000000..607e69a6259
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.30.md
@@ -0,0 +1,3 @@
+## 2.0.30
+
+No user-facing changes.
diff --git a/shared/util/change-notes/released/2.0.31.md b/shared/util/change-notes/released/2.0.31.md
new file mode 100644
index 00000000000..b3cd05e3de4
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.31.md
@@ -0,0 +1,3 @@
+## 2.0.31
+
+No user-facing changes.
diff --git a/shared/util/codeql-pack.release.yml b/shared/util/codeql-pack.release.yml
index 1425cb159e4..783d47207cd 100644
--- a/shared/util/codeql-pack.release.yml
+++ b/shared/util/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.29
+lastReleaseVersion: 2.0.31
diff --git a/shared/util/codeql/util/Option.qll b/shared/util/codeql/util/Option.qll
index 77cc89504f5..2be9e10fef5 100644
--- a/shared/util/codeql/util/Option.qll
+++ b/shared/util/codeql/util/Option.qll
@@ -56,6 +56,9 @@ module Option<TypeWithToString T> {
 
   /** Gets the given element wrapped as an `Option`. */
   Some some(T c) { result = TSome(c) }
+
+  /** Gets the `None` value. */
+  None none_() { any() }
 }
 
 /**
diff --git a/shared/util/codeql/util/UnboundList.qll b/shared/util/codeql/util/UnboundList.qll
index 79fac6506d6..6f05d6cddfc 100644
--- a/shared/util/codeql/util/UnboundList.qll
+++ b/shared/util/codeql/util/UnboundList.qll
@@ -167,6 +167,14 @@ module Make<LocationSig Location, InputSig<Location> Input> {
      */
     bindingset[this]
     UnboundList getAPrefix() { result = [this, this.getAProperPrefix()] }
+
+    /**
+     * Holds if this list is a prefix of `other`.
+     *
+     * This is equivalent to `this = other.getAPrefix()`, but more performant.
+     */
+    bindingset[this, other]
+    predicate isPrefixOf(UnboundList other) { this = other.prefix(this.stringLength()) }
   }
 
   /** Provides predicates for constructing `UnboundList`s. */
diff --git a/shared/util/codeql/util/test/InlineExpectationsTest.qll b/shared/util/codeql/util/test/InlineExpectationsTest.qll
index ccae8c1fc85..0d4bb3d9710 100644
--- a/shared/util/codeql/util/test/InlineExpectationsTest.qll
+++ b/shared/util/codeql/util/test/InlineExpectationsTest.qll
@@ -521,7 +521,7 @@ module Make<InlineExpectationsTestSig Impl> {
  * is treated as part of the expected results, except that the comment may contain a `//` sequence
  * to treat the remainder of the line as a regular (non-interpreted) comment.
  */
-private string expectationCommentPattern() { result = "\\s*\\$((?:[^/]|/[^/])*)(?://.*)?" }
+private string expectationCommentPattern() { result = "\\s*\\$ ((?:[^/]|/[^/])*)(?://.*)?" }
 
 /**
  * The possible columns in an expectation comment. The `TDefaultColumn` branch represents the first
diff --git a/shared/util/qlpack.yml b/shared/util/qlpack.yml
index 18d1315e0da..1b3f89c4ef7 100644
--- a/shared/util/qlpack.yml
+++ b/shared/util/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/util
-version: 2.0.30-dev
+version: 2.0.32-dev
 groups: shared
 library: true
 dependencies: null
diff --git a/shared/xml/CHANGELOG.md b/shared/xml/CHANGELOG.md
index c642973980d..ecdc24c85be 100644
--- a/shared/xml/CHANGELOG.md
+++ b/shared/xml/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.0.44
+
+No user-facing changes.
+
+## 1.0.43
+
+No user-facing changes.
+
 ## 1.0.42
 
 No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.43.md b/shared/xml/change-notes/released/1.0.43.md
new file mode 100644
index 00000000000..ace72ed890f
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.43.md
@@ -0,0 +1,3 @@
+## 1.0.43
+
+No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.44.md b/shared/xml/change-notes/released/1.0.44.md
new file mode 100644
index 00000000000..9a8d400d319
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.44.md
@@ -0,0 +1,3 @@
+## 1.0.44
+
+No user-facing changes.
diff --git a/shared/xml/codeql-pack.release.yml b/shared/xml/codeql-pack.release.yml
index 53e8667626a..59728e63980 100644
--- a/shared/xml/codeql-pack.release.yml
+++ b/shared/xml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.42
+lastReleaseVersion: 1.0.44
diff --git a/shared/xml/qlpack.yml b/shared/xml/qlpack.yml
index 63b5786ba44..392bdb18282 100644
--- a/shared/xml/qlpack.yml
+++ b/shared/xml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/xml
-version: 1.0.43-dev
+version: 1.0.45-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/yaml/CHANGELOG.md b/shared/yaml/CHANGELOG.md
index b2c9cee85a6..62c04d103a4 100644
--- a/shared/yaml/CHANGELOG.md
+++ b/shared/yaml/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.0.44
+
+No user-facing changes.
+
+## 1.0.43
+
+No user-facing changes.
+
 ## 1.0.42
 
 No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.43.md b/shared/yaml/change-notes/released/1.0.43.md
new file mode 100644
index 00000000000..ace72ed890f
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.43.md
@@ -0,0 +1,3 @@
+## 1.0.43
+
+No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.44.md b/shared/yaml/change-notes/released/1.0.44.md
new file mode 100644
index 00000000000..9a8d400d319
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.44.md
@@ -0,0 +1,3 @@
+## 1.0.44
+
+No user-facing changes.
diff --git a/shared/yaml/codeql-pack.release.yml b/shared/yaml/codeql-pack.release.yml
index 53e8667626a..59728e63980 100644
--- a/shared/yaml/codeql-pack.release.yml
+++ b/shared/yaml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.42
+lastReleaseVersion: 1.0.44
diff --git a/shared/yaml/qlpack.yml b/shared/yaml/qlpack.yml
index 1ecff982de7..b951c408c85 100644
--- a/shared/yaml/qlpack.yml
+++ b/shared/yaml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/yaml
-version: 1.0.43-dev
+version: 1.0.45-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/swift/extractor/main.cpp b/swift/extractor/main.cpp
index 8019d1bfc66..6da464d7194 100644
--- a/swift/extractor/main.cpp
+++ b/swift/extractor/main.cpp
@@ -76,11 +76,12 @@ static void processFrontendOptions(codeql::SwiftExtractorState& state,
   }
 }
 
-static void turnOffSilVerifications(swift::SILOptions& options) {
+static void turnOffSilVerificationsAndStackProtection(swift::SILOptions& options) {
   options.VerifyAll = false;
   options.VerifyExclusivity = false;
   options.VerifyNone = true;
   options.VerifySILOwnership = false;
+  options.EnableStackProtection = false;  // Causes crashes on Linux
 }
 
 codeql::TrapDomain invocationTrapDomain(codeql::SwiftExtractorState& state);
@@ -98,7 +99,7 @@ class Observer : public swift::FrontendObserver {
     options.KeepASTContext = true;
     lockOutputSwiftModuleTraps(state, options);
     processFrontendOptions(state, options);
-    turnOffSilVerifications(invocation.getSILOptions());
+    turnOffSilVerificationsAndStackProtection(invocation.getSILOptions());
   }
 
   void configuredCompiler(swift::CompilerInstance& instance) override {
diff --git a/swift/ql/integration-tests/posix/deduplication/test.py b/swift/ql/integration-tests/posix/deduplication/test.py
index d9915ed3770..3e52638fdc0 100644
--- a/swift/ql/integration-tests/posix/deduplication/test.py
+++ b/swift/ql/integration-tests/posix/deduplication/test.py
@@ -1,6 +1,8 @@
+import pytest
 import runs_on
 
 
 @runs_on.posix
+@pytest.mark.ql_test("DB-CHECK", xfail=runs_on.linux)
 def test(codeql, swift):
     codeql.database.create(command="swift build", keep_trap=True)
diff --git a/swift/ql/integration-tests/posix/hello-world/test.py b/swift/ql/integration-tests/posix/hello-world/test.py
index 2b81f139383..eb0ccd23b46 100644
--- a/swift/ql/integration-tests/posix/hello-world/test.py
+++ b/swift/ql/integration-tests/posix/hello-world/test.py
@@ -1,9 +1,9 @@
 import pytest
-
 import runs_on
 
 
 @runs_on.posix
+@pytest.mark.ql_test("DB-CHECK", xfail=runs_on.linux)
 def test(codeql, swift):
     codeql.database.create(command="swift build")
 
diff --git a/swift/ql/lib/CHANGELOG.md b/swift/ql/lib/CHANGELOG.md
index 65446a02bf3..f105831909f 100644
--- a/swift/ql/lib/CHANGELOG.md
+++ b/swift/ql/lib/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 6.3.0
+
+### Major Analysis Improvements
+
+* Upgraded to allow analysis of Swift 6.2.4.
+
+### Minor Analysis Improvements
+
+* Inline expectations test comments, which are of the form `// $ tag` or `// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the `$` symbol.
+
+## 6.2.3
+
+No user-facing changes.
+
 ## 6.2.2
 
 No user-facing changes.
diff --git a/swift/ql/lib/change-notes/released/6.2.3.md b/swift/ql/lib/change-notes/released/6.2.3.md
new file mode 100644
index 00000000000..d34fa215264
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/6.2.3.md
@@ -0,0 +1,3 @@
+## 6.2.3
+
+No user-facing changes.
diff --git a/swift/ql/lib/change-notes/released/6.3.0.md b/swift/ql/lib/change-notes/released/6.3.0.md
new file mode 100644
index 00000000000..5d010b9d110
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/6.3.0.md
@@ -0,0 +1,9 @@
+## 6.3.0
+
+### Major Analysis Improvements
+
+* Upgraded to allow analysis of Swift 6.2.4.
+
+### Minor Analysis Improvements
+
+* Inline expectations test comments, which are of the form `// $ tag` or `// $ tag=value`, are now parsed more strictly and will not be recognized if there isn't a space after the `$` symbol.
diff --git a/swift/ql/lib/codeql-pack.release.yml b/swift/ql/lib/codeql-pack.release.yml
index 0d8f9cf7547..ae5210e925a 100644
--- a/swift/ql/lib/codeql-pack.release.yml
+++ b/swift/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 6.2.2
+lastReleaseVersion: 6.3.0
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Security.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Security.qll
index d824d1bd386..d31e21cc632 100644
--- a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Security.qll
+++ b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Security.qll
@@ -1,5 +1,5 @@
 /**
- * Provides models for standard library Swift classses related to security
+ * Provides models for standard library Swift classes related to security
  * (certificate, key and trust services).
  */
 
diff --git a/swift/ql/lib/qlpack.yml b/swift/ql/lib/qlpack.yml
index da06170849b..3343e056833 100644
--- a/swift/ql/lib/qlpack.yml
+++ b/swift/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-all
-version: 6.2.3-dev
+version: 6.3.1-dev
 groups: swift
 extractor: swift
 dbscheme: swift.dbscheme
diff --git a/swift/ql/src/CHANGELOG.md b/swift/ql/src/CHANGELOG.md
index 0b3d34fc0f5..40371bcbb8d 100644
--- a/swift/ql/src/CHANGELOG.md
+++ b/swift/ql/src/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.2.18
+
+No user-facing changes.
+
+## 1.2.17
+
+No user-facing changes.
+
 ## 1.2.16
 
 No user-facing changes.
diff --git a/swift/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md b/swift/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md
new file mode 100644
index 00000000000..a46302ed146
--- /dev/null
+++ b/swift/ql/src/change-notes/2026-03-13-adjust-xss-and-log-injection-severity.md
@@ -0,0 +1,4 @@
+---
+category: queryMetadata
+---
+* The `@security-severity` metadata of `swift/unsafe-webview-fetch` has been increased from 6.1 (medium) to 7.8 (high).
diff --git a/swift/ql/src/change-notes/released/1.2.17.md b/swift/ql/src/change-notes/released/1.2.17.md
new file mode 100644
index 00000000000..a8f995d1ee1
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.2.17.md
@@ -0,0 +1,3 @@
+## 1.2.17
+
+No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.2.18.md b/swift/ql/src/change-notes/released/1.2.18.md
new file mode 100644
index 00000000000..e7b808777a2
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.2.18.md
@@ -0,0 +1,3 @@
+## 1.2.18
+
+No user-facing changes.
diff --git a/swift/ql/src/codeql-pack.release.yml b/swift/ql/src/codeql-pack.release.yml
index 11aa69f2d7a..e414238818d 100644
--- a/swift/ql/src/codeql-pack.release.yml
+++ b/swift/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.2.16
+lastReleaseVersion: 1.2.18
diff --git a/swift/ql/src/diagnostics/SuccessfullyExtractedLines.ql b/swift/ql/src/diagnostics/SuccessfullyExtractedLines.ql
index 5aec16da4ef..0de0cb1ae1a 100644
--- a/swift/ql/src/diagnostics/SuccessfullyExtractedLines.ql
+++ b/swift/ql/src/diagnostics/SuccessfullyExtractedLines.ql
@@ -9,4 +9,4 @@
 
 import swift
 
-select sum(File f | | f.getNumberOfLinesOfCode())
+select sum(File f | exists(f.getRelativePath()) | f.getNumberOfLinesOfCode())
diff --git a/swift/ql/src/qlpack.yml b/swift/ql/src/qlpack.yml
index 58dd667f57b..80a16a8099d 100644
--- a/swift/ql/src/qlpack.yml
+++ b/swift/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-queries
-version: 1.2.17-dev
+version: 1.2.19-dev
 groups:
   - swift
   - queries
diff --git a/swift/ql/src/queries/Security/CWE-079/UnsafeWebViewFetch.ql b/swift/ql/src/queries/Security/CWE-079/UnsafeWebViewFetch.ql
index 7243d2216a5..3a2de3fa80a 100644
--- a/swift/ql/src/queries/Security/CWE-079/UnsafeWebViewFetch.ql
+++ b/swift/ql/src/queries/Security/CWE-079/UnsafeWebViewFetch.ql
@@ -3,7 +3,7 @@
  * @description Fetching data in a WebView without restricting the base URL may allow an attacker to access sensitive local data, or enable cross-site scripting attack.
  * @kind path-problem
  * @problem.severity warning
- * @security-severity 6.1
+ * @security-severity 7.8
  * @precision high
  * @id swift/unsafe-webview-fetch
  * @tags security
diff --git a/swift/ql/test/library-tests/dataflow/taint/libraries/nsstring.swift b/swift/ql/test/library-tests/dataflow/taint/libraries/nsstring.swift
index b26110b79b3..3093f151d33 100644
--- a/swift/ql/test/library-tests/dataflow/taint/libraries/nsstring.swift
+++ b/swift/ql/test/library-tests/dataflow/taint/libraries/nsstring.swift
@@ -203,7 +203,7 @@ func taintThroughInterpolatedStrings() {
 
   sink(arg: try! NSString(contentsOfFile: sourceString(), encoding: 0)) // $ tainted=204
   sink(arg: try! NSString(contentsOfFile: sourceString(), usedEncoding: nil)) // $ tainted=205
-  sink(arg: try! NSString(contentsOf: sourceURL(), encoding: 0)) // $: tainted=206
+  sink(arg: try! NSString(contentsOf: sourceURL(), encoding: 0)) // $ tainted=206
   sink(arg: try! NSString(contentsOf: URL(string: sourceString())!, encoding: 0)) // $ tainted=207
   sink(arg: try! NSString(contentsOf: sourceURL(), usedEncoding: nil)) // $ tainted=208
   sink(arg: try! NSString(contentsOf: URL(string: sourceString())!, usedEncoding: nil)) // $ tainted=209
diff --git a/swift/ql/test/query-tests/Diagnostics/SuccessfullyExtractedLines.expected b/swift/ql/test/query-tests/Diagnostics/SuccessfullyExtractedLines.expected
index beaf5bb6a1f..b5a514b9ffa 100644
--- a/swift/ql/test/query-tests/Diagnostics/SuccessfullyExtractedLines.expected
+++ b/swift/ql/test/query-tests/Diagnostics/SuccessfullyExtractedLines.expected
@@ -1 +1 @@
-| 299 |
+| 4 |
diff --git a/swift/third_party/BUILD.binlog.bazel b/swift/third_party/BUILD.binlog.bazel
index 78db04fa3e2..24f0f7e0fd3 100644
--- a/swift/third_party/BUILD.binlog.bazel
+++ b/swift/third_party/BUILD.binlog.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
+
 cc_library(
     name = "binlog",
     srcs = glob(["include/**/*.cpp"]),
diff --git a/swift/third_party/BUILD.fmt.bazel b/swift/third_party/BUILD.fmt.bazel
deleted file mode 100644
index 78a3639bf26..00000000000
--- a/swift/third_party/BUILD.fmt.bazel
+++ /dev/null
@@ -1,10 +0,0 @@
-cc_library(
-    name = "fmt",
-    srcs = [
-        "src/format.cc",
-        "src/os.cc",
-    ],
-    hdrs = glob(["include/**/*.h"]),
-    includes = ["include"],
-    visibility = ["//visibility:public"],
-)
diff --git a/swift/third_party/BUILD.picosha2.bazel b/swift/third_party/BUILD.picosha2.bazel
index b6eb4292cb8..dd6ca9c080f 100644
--- a/swift/third_party/BUILD.picosha2.bazel
+++ b/swift/third_party/BUILD.picosha2.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
 cc_library(
     name = "picosha2",
     hdrs = glob(["*.h"]),
diff --git a/swift/third_party/BUILD.swift-llvm-support.bazel b/swift/third_party/BUILD.swift-llvm-support.bazel
index 231500b35ab..6390ca31718 100644
--- a/swift/third_party/BUILD.swift-llvm-support.bazel
+++ b/swift/third_party/BUILD.swift-llvm-support.bazel
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
 cc_library(
     name = "swift-llvm-support-static",
     srcs = glob(
diff --git a/swift/third_party/load.bzl b/swift/third_party/load.bzl
index d19345a1880..f2ebfa74877 100644
--- a/swift/third_party/load.bzl
+++ b/swift/third_party/load.bzl
@@ -1,6 +1,7 @@
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 load("//misc/bazel:lfs.bzl", "lfs_archive", "lfs_files")
 
 _override = {
@@ -117,7 +118,7 @@ def test_no_override():
         content = test_body,
         is_executable = True,
     )
-    native.sh_test(
+    sh_test(
         name = "test-no-override",
         srcs = [":test-no-override-gen"],
         tags = ["override"],
diff --git a/swift/third_party/resources/resource-dir-linux.zip b/swift/third_party/resources/resource-dir-linux.zip
index 2daa0182274..a6e0fe2fa12 100644
--- a/swift/third_party/resources/resource-dir-linux.zip
+++ b/swift/third_party/resources/resource-dir-linux.zip
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab0279edb35706dbd5c238f6ea29b2a275bb837e1d6485e150801551c7f0740e
-size 385211225
+oid sha256:34e30361f98e5c3abec7be1d7136252cad97eba4916a87e3c08992e0289eb00f
+size 385238500
diff --git a/swift/third_party/resources/resource-dir-macos.zip b/swift/third_party/resources/resource-dir-macos.zip
index 3bcca5372ba..80411222aab 100644
--- a/swift/third_party/resources/resource-dir-macos.zip
+++ b/swift/third_party/resources/resource-dir-macos.zip
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e358d99dab2bf07d70a06d8d4119c05ee40e33cdc659ad787595dc56cb405755
-size 613934298
+oid sha256:e3966e6e8039fba5730dc49bf0a51986c6da28a94aa86552c187b66dc3716a9b
+size 613938283
diff --git a/swift/third_party/resources/swift-prebuilt-linux.tar.zst b/swift/third_party/resources/swift-prebuilt-linux.tar.zst
index 5caeaeb8b5f..2aedff45fc8 100644
--- a/swift/third_party/resources/swift-prebuilt-linux.tar.zst
+++ b/swift/third_party/resources/swift-prebuilt-linux.tar.zst
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad8d6611bfd3c749435e44fa25a300082efb308c21c5da1305c65bd2c5d8fec4
-size 132921192
+oid sha256:1960a80b5cbc7e1ec0ef4b221254efdd6d266eaed11c7fa6fff5388648d1881b
+size 132800316
diff --git a/swift/third_party/resources/swift-prebuilt-macos.tar.zst b/swift/third_party/resources/swift-prebuilt-macos.tar.zst
index b57ed126f8f..aaf3d1c42af 100644
--- a/swift/third_party/resources/swift-prebuilt-macos.tar.zst
+++ b/swift/third_party/resources/swift-prebuilt-macos.tar.zst
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a96536acde3a054a2528feedbb6ffa71fb7ffa6b68f0838f2f007e7474fc0b84
-size 115338478
+oid sha256:2b7ec0e2bd28b16ca9a16cb3d1ad8c917ad4641cf1d0fe574e75381871beeda4
+size 115351244